diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:27:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:27:34 +0000 |
| commit | e9a1a7f670486df44154eb083617e830b2b427d1 (patch) | |
| tree | 0ca90a8b01bc75add31837c5b185a6f8f4e924fa | |
| parent | ea11766b0db2e7f3581f1794c3271f838880a153 (diff) | |
INTEGRATION: CWS mav09 (1.11.264); FILE MERGED
2004/09/21 17:28:07 mav 1.11.264.3: RESYNC: (1.12-1.13); FILE MERGED
2004/09/16 20:34:15 mav 1.11.264.2: RESYNC: (1.11-1.12); FILE MERGED
2004/05/18 17:00:52 mba 1.11.264.1: #i27773#: remove so3
| -rw-r--r-- | sw/source/ui/fldui/fldvar.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index fcb86de827..1d08ec146b 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldvar.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2004-09-20 12:38:22 $ + * last change: $Author: kz $ $Date: 2004-10-04 19:27:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ #endif #ifndef _LINKMGR_HXX //autogen -#include <so3/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #endif #ifndef _USRFLD_HXX @@ -111,7 +111,7 @@ #include <calc.hxx> #endif -#ifndef _ZFORMAT_HXX +#ifndef _ZFORMAT_HXX #include <svtools/zformat.hxx> #endif #ifndef _GLOBALS_HRC @@ -539,8 +539,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet String sCmd( pType->GetCmd() ); - USHORT nTmpPos = sCmd.SearchAndReplace( so3::cTokenSeperator, ' ' ); - sCmd.SearchAndReplace( so3::cTokenSeperator, ' ', nTmpPos ); + USHORT nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ' ); + sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ', nTmpPos ); aValueED.SetText( sCmd ); aFormatLB.SelectEntryPos(pType->GetType()); @@ -1116,8 +1116,8 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet. - USHORT nTmpPos = sValue.SearchAndReplace( ' ', so3::cTokenSeperator ); - sValue.SearchAndReplace( ' ', so3::cTokenSeperator, nTmpPos ); + USHORT nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); + sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); ((SwDDEFieldType*)pType)->SetCmd(sValue); ((SwDDEFieldType*)pType)->SetType((USHORT)nFormat); } @@ -1147,8 +1147,8 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet. - USHORT nTmpPos = sValue.SearchAndReplace( ' ', so3::cTokenSeperator ); - sValue.SearchAndReplace( ' ', so3::cTokenSeperator, nTmpPos ); + USHORT nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); + sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); SwDDEFieldType aType(sName, sValue, (USHORT)nFormat); aSelectionLB.InsertEntry(sName); @@ -1319,7 +1319,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& rSet) aChapterLevelLB.GetSavedValue() != aChapterLevelLB.GetSelectEntryPos() || aSeparatorED.GetSavedValue() != aSeparatorED.GetText()) { - InsertFld( nTypeId, nSubType, aName, aVal, nFormat, + InsertFld( nTypeId, nSubType, aName, aVal, nFormat, cSeparator, aNumFormatLB.IsAutomaticLanguage() ); } |