diff options
Diffstat (limited to 'sw/source/ui/fldui')
42 files changed, 649 insertions, 649 deletions
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 8385b40fb402..3a985673171f 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/DropDownFieldDialog.hrc b/sw/source/ui/fldui/DropDownFieldDialog.hrc index dc63ae58e5ac..2d3f1955e06b 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.hrc +++ b/sw/source/ui/fldui/DropDownFieldDialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ ************************************************************************/ #ifndef _SW_DROPDOWNFIELDDIALOG_HRC #define _SW_DROPDOWNFIELDDIALOG_HRC -#define FL_ITEMS 1 +#define FL_ITEMS 1 #define LB_LISTITEMS 2 #define PB_OK 3 #define PB_CANCEL 4 diff --git a/sw/source/ui/fldui/DropDownFieldDialog.src b/sw/source/ui/fldui/DropDownFieldDialog.src index 407ee199a8ef..25f6c4ac153f 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.src +++ b/sw/source/ui/fldui/DropDownFieldDialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 5a82ea186877..ee96c1e6c106 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index bbd209c119f9..94c6288034fc 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ class SwFldRefTreeListBox : public SvTreeListBox { protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); public: SwFldRefTreeListBox(Window* pParent, const ResId& rResId); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 1ad46a156ce8..a4d78cace991 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,18 +74,18 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) : SvxStandardDialog(&rVw.GetViewFrame()->GetWindow(), SW_RES(DLG_CHANGE_DB)), aDBListFL (this, SW_RES(FL_DBLIST )), - aUsedDBFT (this, SW_RES(FT_USEDDB )), - aAvailDBFT (this, SW_RES(FT_AVAILDB )), - aUsedDBTLB (this, SW_RES(TLB_USEDDB )), + aUsedDBFT (this, SW_RES(FT_USEDDB )), + aAvailDBFT (this, SW_RES(FT_AVAILDB )), + aUsedDBTLB (this, SW_RES(TLB_USEDDB )), aAvailDBTLB (this, SW_RES(TLB_AVAILDB ), 0), aAddDBPB (this, SW_RES(PB_ADDDB)), aDescFT (this, SW_RES(FT_DESC )), - aDocDBTextFT(this, SW_RES(FT_DOCDBTEXT )), - aDocDBNameFT(this, SW_RES(FT_DOCDBNAME )), - aOKBT (this, SW_RES(BT_OK )), - aCancelBT (this, SW_RES(BT_CANCEL )), - aHelpBT (this, SW_RES(BT_HELP )), -// aChangeBT (this, SW_RES(BT_CHANGEDB )), + aDocDBTextFT(this, SW_RES(FT_DOCDBTEXT )), + aDocDBNameFT(this, SW_RES(FT_DOCDBNAME )), + aOKBT (this, SW_RES(BT_OK )), + aCancelBT (this, SW_RES(BT_CANCEL )), + aHelpBT (this, SW_RES(BT_HELP )), +// aChangeBT (this, SW_RES(BT_CHANGEDB )), aImageList (SW_RES(ILIST_DB_DLG )), aImageListHC (SW_RES(ILIST_DB_DLG_HC )), @@ -228,7 +228,7 @@ __EXPORT SwChangeDBDlg::~SwChangeDBDlg() } /*-------------------------------------------------------------------- - Beschreibung: Schliessen + Beschreibung: Schliessen --------------------------------------------------------------------*/ void __EXPORT SwChangeDBDlg::Apply() { diff --git a/sw/source/ui/fldui/changedb.hrc b/sw/source/ui/fldui/changedb.hrc index f5d54aa3ad42..e121a97fcbd1 100644 --- a/sw/source/ui/fldui/changedb.hrc +++ b/sw/source/ui/fldui/changedb.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,16 +31,16 @@ // Elemente ----------------------------------------------------------------- #define FT_DESC 1 -#define FT_DOCDBTEXT 2 -#define FT_DOCDBNAME 3 -#define BT_CHANGEDB 4 -#define FT_USEDDB 5 -#define FT_AVAILDB 6 -#define TLB_USEDDB 7 -#define TLB_AVAILDB 8 +#define FT_DOCDBTEXT 2 +#define FT_DOCDBNAME 3 +#define BT_CHANGEDB 4 +#define FT_USEDDB 5 +#define FT_AVAILDB 6 +#define TLB_USEDDB 7 +#define TLB_AVAILDB 8 #define FL_DBLIST 9 -#define BT_OK 10 -#define BT_CANCEL 11 +#define BT_OK 10 +#define BT_CANCEL 11 #define BT_HELP 12 #define PB_ADDDB 13 diff --git a/sw/source/ui/fldui/changedb.src b/sw/source/ui/fldui/changedb.src index babf0b5bba13..a461a1d7ac19 100644 --- a/sw/source/ui/fldui/changedb.src +++ b/sw/source/ui/fldui/changedb.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ ModalDialog DLG_CHANGE_DB OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 286 , 175 ) ; - + Text [ en-US ] = "Exchange Databases" ; Moveable = TRUE ; FixedLine FL_DBLIST diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 143f9f225f37..9fdfc3c159b8 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,25 +47,25 @@ #include <dbconfig.hxx> #include <dbmgr.hxx> -#define USER_DATA_VERSION_1 "1" +#define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage( pParent, SW_RES( TP_FLD_DB ), rCoreSet ), - aTypeFT (this, SW_RES(FT_DBTYPE)), - aTypeLB (this, SW_RES(LB_DBTYPE)), + aTypeFT (this, SW_RES(FT_DBTYPE)), + aTypeLB (this, SW_RES(LB_DBTYPE)), aSelectionFT(this, SW_RES(FT_DBSELECTION)), aDatabaseTLB(this, SW_RES(TLB_DBLIST), 0, aEmptyStr, FALSE), aAddDBFT(this, SW_RES(FT_ADDDB)), aAddDBPB(this, SW_RES(PB_ADDDB)), aConditionFT(this, SW_RES(FT_DBCONDITION)), aConditionED(this, SW_RES(ED_DBCONDITION)), - aValueFT (this, SW_RES(FT_DBSETNUMBER)), - aValueED (this, SW_RES(ED_DBSETNUMBER)), - aDBFormatRB (this, SW_RES(RB_DBOWNFORMAT)), + aValueFT (this, SW_RES(FT_DBSETNUMBER)), + aValueED (this, SW_RES(ED_DBSETNUMBER)), + aDBFormatRB (this, SW_RES(RB_DBOWNFORMAT)), aNewFormatRB(this, SW_RES(RB_DBFORMAT)), aNumFormatLB(this, SW_RES(LB_DBNUMFORMAT)), - aFormatLB (this, SW_RES(LB_DBFORMAT)), + aFormatLB (this, SW_RES(LB_DBFORMAT)), aFormatFL (this, SW_RES(FL_DBFORMAT)), aFormatVertFL (this, SW_RES(FL_DBFORMAT_VERT)) { @@ -90,7 +90,7 @@ __EXPORT SwFldDBPage::~SwFldDBPage() --------------------------------------------------------------------*/ void __EXPORT SwFldDBPage::Reset(const SfxItemSet&) { - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung aTypeLB.SetUpdateMode(FALSE); USHORT nOldPos = aTypeLB.GetSelectEntryPos(); @@ -206,7 +206,7 @@ BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& ) if (!aData.sDataSource.getLength()) aData = pSh->GetDBData(); - if(aData.sDataSource.getLength()) // Ohne Datenbank kein neuer Feldbefehl + if(aData.sDataSource.getLength()) // Ohne Datenbank kein neuer Feldbefehl { USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); String aVal(aValueED.GetText()); @@ -260,7 +260,7 @@ BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& ) return FALSE; } -SfxTabPage* __EXPORT SwFldDBPage::Create( Window* pParent, +SfxTabPage* __EXPORT SwFldDBPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDBPage( pParent, rAttrSet ) ); @@ -319,7 +319,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) aNumFormatLB.Show(); aFormatLB.Hide(); - if (pBox) // Typ wurde vom User geaendert + if (pBox) // Typ wurde vom User geaendert aDBFormatRB.Check(); if (IsFldEdit()) @@ -494,7 +494,7 @@ IMPL_LINK( SwFldDBPage, ModifyHdl, Edit *, EMPTYARG ) return 0; } -void SwFldDBPage::FillUserData() +void SwFldDBPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 59cb0b741487..59f23fc649d0 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,31 +45,31 @@ class SwFldDBPage : public SwFldPage { - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - SwDBTreeList aDatabaseTLB; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + SwDBTreeList aDatabaseTLB; FixedText aAddDBFT; PushButton aAddDBPB; - - FixedText aConditionFT; - ConditionEdit aConditionED; - FixedText aValueFT; - Edit aValueED; - RadioButton aDBFormatRB; - RadioButton aNewFormatRB; - NumFormatListBox aNumFormatLB; - ListBox aFormatLB; + + FixedText aConditionFT; + ConditionEdit aConditionED; + FixedText aValueFT; + Edit aValueED; + RadioButton aDBFormatRB; + RadioButton aNewFormatRB; + NumFormatListBox aNumFormatLB; + ListBox aFormatLB; FixedLine aFormatFL; FixedLine aFormatVertFL; - String sOldDBName; - String sOldTableName; - String sOldColumnName; - ULONG nOldFormat; - USHORT nOldSubType; - Link aOldNumSelectHdl; + String sOldDBName; + String sOldTableName; + String sOldColumnName; + ULONG nOldFormat; + USHORT nOldSubType; + Link aOldNumSelectHdl; DECL_LINK( TypeHdl, ListBox* ); DECL_LINK( NumSelectHdl, NumFormatListBox* pLB = 0); @@ -77,12 +77,12 @@ class SwFldDBPage : public SwFldPage DECL_LINK( ModifyHdl, Edit *pED = 0 ); DECL_LINK( AddDBHdl, PushButton* ); - void CheckInsert(); + void CheckInsert(); using SwFldPage::SetWrtShell; protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldDBPage(Window* pParent, const SfxItemSet& rSet); @@ -94,9 +94,9 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); void ActivateMailMergeAddress(); - + void SetWrtShell(SwWrtShell& rSh); }; diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src index ce9f3dd8a09a..e7bc8b99f944 100644 --- a/sw/source/ui/fldui/flddb.src +++ b/sw/source/ui/fldui/flddb.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 95acf983bc5d..ec80dc058431 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,13 +66,13 @@ using namespace com::sun::star; SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) : SwFldPage( pWindow, SW_RES( TP_FLD_DOKINF ), rCoreSet ), - aTypeFT (this, SW_RES(FT_DOKINFTYPE)), - aTypeTLB (this, SW_RES(TLB_DOKINFTYPE)), + aTypeFT (this, SW_RES(FT_DOKINFTYPE)), + aTypeTLB (this, SW_RES(TLB_DOKINFTYPE)), aSelectionFT(this, SW_RES(FT_DOKINFSELECTION)), aSelectionLB(this, SW_RES(LB_DOKINFSELECTION)), - aFormatFT (this, SW_RES(FT_DOKINFFORMAT)), - aFormatLB (this, SW_RES(LB_DOKINFFORMAT)), - aFixedCB (this, SW_RES(CB_DOKINFFIXEDCONTENT)), + aFormatFT (this, SW_RES(FT_DOKINFFORMAT)), + aFormatLB (this, SW_RES(LB_DOKINFFORMAT)), + aFixedCB (this, SW_RES(CB_DOKINFFIXEDCONTENT)), pSelEntry (0), aInfoStr (SW_RES(STR_DOKINF_INFO)) @@ -101,7 +101,7 @@ __EXPORT SwFldDokInfPage::~SwFldDokInfPage() void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& ) { - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung // TypeListBox initialisieren aTypeTLB.SetUpdateMode(FALSE); @@ -262,7 +262,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) aFormatFT.Enable(FALSE); if( nSubType == DI_CUSTOM ) { - //find out which type the custom field has - for a start set to DATE format + //find out which type the custom field has - for a start set to DATE format ::rtl::OUString sName = aTypeTLB.GetEntryText(pSelEntry); try { @@ -283,7 +283,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) } catch( const uno::Exception& ) { - } + } } else return 0; @@ -356,7 +356,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) if (nNewType == NUMBERFORMAT_DATE) nFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eLang); else if (nNewType == NUMBERFORMAT_TIME) - nFormat = pFormatter->GetFormatIndex( NF_TIME_HHMM, eLang); + nFormat = pFormatter->GetFormatIndex( NF_TIME_HHMM, eLang); } } aFormatLB.SetDefFormat(nFormat); @@ -386,7 +386,7 @@ USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType) EnableInsert(nSubType != USHRT_MAX); - if (nSubType == USHRT_MAX) // Info-Text + if (nSubType == USHRT_MAX) // Info-Text nSubType = DI_SUBTYPE_BEGIN; aSelectionLB.Clear(); @@ -470,7 +470,7 @@ BOOL __EXPORT SwFldDokInfPage::FillItemSet(SfxItemSet& ) return FALSE; } -SfxTabPage* __EXPORT SwFldDokInfPage::Create( Window* pParent, +SfxTabPage* __EXPORT SwFldDokInfPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDokInfPage( pParent, rAttrSet ) ); @@ -481,7 +481,7 @@ USHORT SwFldDokInfPage::GetGroup() return GRP_REG; } -void SwFldDokInfPage::FillUserData() +void SwFldDokInfPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index ead747e26774..d10ebc0844f3 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,34 +40,34 @@ namespace com{namespace sun{ namespace star{ namespace beans{ class XPropertySet; -}}}} +}}}} class SwFldDokInfPage : public SwFldPage { - FixedText aTypeFT; - SvTreeListBox aTypeTLB; - FixedText aSelectionFT; - ListBox aSelectionLB; - FixedText aFormatFT; - NumFormatListBox aFormatLB; - CheckBox aFixedCB; - - SvLBoxEntry* pSelEntry; + FixedText aTypeFT; + SvTreeListBox aTypeTLB; + FixedText aSelectionFT; + ListBox aSelectionLB; + FixedText aFormatFT; + NumFormatListBox aFormatLB; + CheckBox aFixedCB; + + SvLBoxEntry* pSelEntry; com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xCustomPropertySet; - String aInfoStr; + String aInfoStr; - USHORT nOldSel; - ULONG nOldFormat; + USHORT nOldSel; + ULONG nOldFormat; ::rtl::OUString m_sOldCustomFieldName; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); - USHORT FillSelectionLB(USHORT nSubTypeId); + USHORT FillSelectionLB(USHORT nSubTypeId); protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldDokInfPage(Window* pWindow, const SfxItemSet& rSet); @@ -79,7 +79,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src index 8a3e86c4548b..9f65b88fa313 100644 --- a/sw/source/ui/fldui/flddinf.src +++ b/sw/source/ui/fldui/flddinf.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 1796eca2ddbc..7e6c64c4af20 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,24 +54,24 @@ SwFldDokPage::SwFldDokPage(Window* pWindow, const SfxItemSet& rCoreSet ) : SwFldPage( pWindow, SW_RES( TP_FLD_DOK ), rCoreSet ), - aTypeFT (this, SW_RES(FT_DOKTYPE)), - aTypeLB (this, SW_RES(LB_DOKTYPE)), - aSelectionFT (this, SW_RES(FT_DOKSELECTION)), - aSelectionLB (this, SW_RES(LB_DOKSELECTION)), - aValueFT (this, SW_RES(FT_DOKVALUE)), - aValueED (this, SW_RES(ED_DOKVALUE)), - aLevelED (this, SW_RES(ED_DOKLEVEL)), + aTypeFT (this, SW_RES(FT_DOKTYPE)), + aTypeLB (this, SW_RES(LB_DOKTYPE)), + aSelectionFT (this, SW_RES(FT_DOKSELECTION)), + aSelectionLB (this, SW_RES(LB_DOKSELECTION)), + aValueFT (this, SW_RES(FT_DOKVALUE)), + aValueED (this, SW_RES(ED_DOKVALUE)), + aLevelED (this, SW_RES(ED_DOKLEVEL)), aDateOffsetED (this, SW_RES(ED_DOKDATEOFF)), - aFormatFT (this, SW_RES(FT_DOKFORMAT)), - aFormatLB (this, SW_RES(LB_DOKFORMAT)), - aNumFormatLB (this, SW_RES(LB_DOKNUMFORMAT)), - aFixedCB (this, SW_RES(CB_DOKFIXEDCONTENT)), + aFormatFT (this, SW_RES(FT_DOKFORMAT)), + aFormatLB (this, SW_RES(LB_DOKFORMAT)), + aNumFormatLB (this, SW_RES(LB_DOKNUMFORMAT)), + aFixedCB (this, SW_RES(CB_DOKFIXEDCONTENT)), - sDateOffset (SW_RES(STR_DOKDATEOFF)), - sTimeOffset (SW_RES(STR_DOKTIMEOFF)), - aRootOpened (SW_RES(BMP_DOKROOT_OPENED)), - aRootClosed (SW_RES(BMP_DOKROOT_CLOSED)) + sDateOffset (SW_RES(STR_DOKDATEOFF)), + sTimeOffset (SW_RES(STR_DOKTIMEOFF)), + aRootOpened (SW_RES(BMP_DOKROOT_OPENED)), + aRootClosed (SW_RES(BMP_DOKROOT_CLOSED)) { FreeResource(); @@ -93,7 +93,7 @@ __EXPORT SwFldDokPage::~SwFldDokPage() void __EXPORT SwFldDokPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung // TypeListBox initialisieren const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup()); @@ -320,7 +320,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) nFmtType = NUMBERFORMAT_DATE; aValueFT.SetText(sDateOffset); - aDateOffsetED.SetFirst(-31); // Ein Monat + aDateOffsetED.SetFirst(-31); // Ein Monat aDateOffsetED.SetLast(31); if (IsFldEdit()) @@ -332,7 +332,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) nFmtType = NUMBERFORMAT_TIME; aValueFT.SetText(sTimeOffset); - aDateOffsetED.SetFirst(-1440); // Ein Tag + aDateOffsetED.SetFirst(-1440); // Ein Tag aDateOffsetED.SetLast(1440); if (IsFldEdit()) @@ -647,7 +647,7 @@ BOOL __EXPORT SwFldDokPage::FillItemSet(SfxItemSet& ) return FALSE; } -SfxTabPage* __EXPORT SwFldDokPage::Create( Window* pParent, +SfxTabPage* __EXPORT SwFldDokPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDokPage( pParent, rAttrSet ) ); @@ -658,7 +658,7 @@ USHORT SwFldDokPage::GetGroup() return GRP_DOC; } -void SwFldDokPage::FillUserData() +void SwFldDokPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 32031c14c247..9c87780c6607 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,36 +41,36 @@ class SwFldDokPage : public SwFldPage { - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - ListBox aSelectionLB; - FixedText aValueFT; - Edit aValueED; - NumericField aLevelED; - NumericField aDateOffsetED; - FixedText aFormatFT; - ListBox aFormatLB; - NumFormatListBox aNumFormatLB; - CheckBox aFixedCB; - - String sDateOffset; - String sTimeOffset; - Bitmap aRootOpened; - Bitmap aRootClosed; - - USHORT nOldSel; - ULONG nOldFormat; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + ListBox aSelectionLB; + FixedText aValueFT; + Edit aValueED; + NumericField aLevelED; + NumericField aDateOffsetED; + FixedText aFormatFT; + ListBox aFormatLB; + NumFormatListBox aNumFormatLB; + CheckBox aFixedCB; + + String sDateOffset; + String sTimeOffset; + Bitmap aRootOpened; + Bitmap aRootClosed; + + USHORT nOldSel; + ULONG nOldFormat; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( FormatHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); - void AddSubType(USHORT nTypeId); - USHORT FillFormatLB(USHORT nTypeId); + void AddSubType(USHORT nTypeId); + USHORT FillFormatLB(USHORT nTypeId); protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldDokPage(Window* pWindow, const SfxItemSet& rSet); @@ -82,7 +82,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src index f566ab716362..6a60f8b53fe1 100644 --- a/sw/source/ui/fldui/flddok.src +++ b/sw/source/ui/fldui/flddok.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 0b24c5327642..5e697ec1716f 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,8 +68,8 @@ namespace swui SwFldEditDlg::SwFldEditDlg(SwView& rVw) : SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), 0, 0), - pSh (rVw.GetWrtShellPtr()), - aPrevBT (this, SW_RES(BTN_FLDEDT_PREV)), + pSh (rVw.GetWrtShellPtr()), + aPrevBT (this, SW_RES(BTN_FLDEDT_PREV)), aNextBT (this, SW_RES(BTN_FLDEDT_NEXT)), aAddressBT (this, SW_RES(PB_FLDEDT_ADDRESS)) { @@ -330,30 +330,30 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, EMPTYARG ) switch(pCurFld->GetSubType()) { - case EU_FIRSTNAME: nEditPos = FIRSTNAME_EDIT; break; - case EU_NAME: nEditPos = LASTNAME_EDIT; break; - case EU_SHORTCUT: nEditPos = SHORTNAME_EDIT; break; - case EU_COMPANY: nEditPos = COMPANY_EDIT; break; - case EU_STREET: nEditPos = STREET_EDIT; break; - case EU_TITLE: nEditPos = TITLE_EDIT; break; - case EU_POSITION: nEditPos = POSITION_EDIT; break; - case EU_PHONE_PRIVATE:nEditPos = TELPRIV_EDIT; break; - case EU_PHONE_COMPANY:nEditPos = TELCOMPANY_EDIT; break; - case EU_FAX: nEditPos = FAX_EDIT; break; - case EU_EMAIL: nEditPos = EMAIL_EDIT; break; - case EU_COUNTRY: nEditPos = COUNTRY_EDIT; break; - case EU_ZIP: nEditPos = PLZ_EDIT; break; - case EU_CITY: nEditPos = CITY_EDIT; break; - case EU_STATE: nEditPos = STATE_EDIT; break; - - default: nEditPos = UNKNOWN_EDIT; break; + case EU_FIRSTNAME: nEditPos = FIRSTNAME_EDIT; break; + case EU_NAME: nEditPos = LASTNAME_EDIT; break; + case EU_SHORTCUT: nEditPos = SHORTNAME_EDIT; break; + case EU_COMPANY: nEditPos = COMPANY_EDIT; break; + case EU_STREET: nEditPos = STREET_EDIT; break; + case EU_TITLE: nEditPos = TITLE_EDIT; break; + case EU_POSITION: nEditPos = POSITION_EDIT; break; + case EU_PHONE_PRIVATE:nEditPos = TELPRIV_EDIT; break; + case EU_PHONE_COMPANY:nEditPos = TELCOMPANY_EDIT; break; + case EU_FAX: nEditPos = FAX_EDIT; break; + case EU_EMAIL: nEditPos = EMAIL_EDIT; break; + case EU_COUNTRY: nEditPos = COUNTRY_EDIT; break; + case EU_ZIP: nEditPos = PLZ_EDIT; break; + case EU_CITY: nEditPos = CITY_EDIT; break; + case EU_STATE: nEditPos = STATE_EDIT; break; + + default: nEditPos = UNKNOWN_EDIT; break; } aSet.Put(SfxUInt16Item(SID_FIELD_GRABFOCUS, nEditPos)); SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aSet, + SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aSet, pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RC_DLG_ADDR ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 21751cdabc90..f88727c2e93d 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,20 +59,20 @@ using rtl::OUString; SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage( pParent, SW_RES( TP_FLD_FUNC ), rCoreSet ), - aTypeFT (this, SW_RES(FT_FUNCTYPE)), - aTypeLB (this, SW_RES(LB_FUNCTYPE)), + aTypeFT (this, SW_RES(FT_FUNCTYPE)), + aTypeLB (this, SW_RES(LB_FUNCTYPE)), aSelectionFT(this, SW_RES(FT_FUNCSELECTION)), aSelectionLB(this, SW_RES(LB_FUNCSELECTION)), - aFormatFT (this, SW_RES(FT_FUNCFORMAT)), - aFormatLB (this, SW_RES(LB_FUNCFORMAT)), - aNameFT (this, SW_RES(FT_FUNCNAME)), - aNameED (this, SW_RES(ED_FUNCNAME)), - aValueFT (this, SW_RES(FT_FUNCVALUE)), - aValueED (this, SW_RES(ED_FUNCVALUE)), - aCond1FT (this, SW_RES(FT_FUNCCOND1)), - aCond1ED (this, SW_RES(ED_FUNCCOND1)), - aCond2FT (this, SW_RES(FT_FUNCCOND2)), - aCond2ED (this, SW_RES(ED_FUNCCOND2)), + aFormatFT (this, SW_RES(FT_FUNCFORMAT)), + aFormatLB (this, SW_RES(LB_FUNCFORMAT)), + aNameFT (this, SW_RES(FT_FUNCNAME)), + aNameED (this, SW_RES(ED_FUNCNAME)), + aValueFT (this, SW_RES(FT_FUNCVALUE)), + aValueED (this, SW_RES(ED_FUNCVALUE)), + aCond1FT (this, SW_RES(FT_FUNCCOND1)), + aCond1ED (this, SW_RES(ED_FUNCCOND1)), + aCond2FT (this, SW_RES(FT_FUNCCOND2)), + aCond2ED (this, SW_RES(ED_FUNCCOND2)), aMacroBT (this, SW_RES(BT_FUNCMACRO)), aListItemFT( this, SW_RES( FT_LISTITEM )), aListItemED( this, SW_RES( ED_LISTITEM )), @@ -98,7 +98,7 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : aCond1ED.ShowBrackets(FALSE); aCond2ED.ShowBrackets(FALSE); -// SwWrtShell* pSh = (SwWrtShell*)ViewShell::GetCurrShell(); +// SwWrtShell* pSh = (SwWrtShell*)ViewShell::GetCurrShell(); } SwFldFuncPage::~SwFldFuncPage() @@ -108,7 +108,7 @@ SwFldFuncPage::~SwFldFuncPage() void SwFldFuncPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung aTypeLB.SetUpdateMode(FALSE); aTypeLB.Clear(); @@ -144,12 +144,12 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) // alte Pos selektieren RestorePos(&aTypeLB); - aTypeLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl)); - aTypeLB.SetSelectHdl (LINK(this, SwFldFuncPage, TypeHdl)); - aSelectionLB.SetSelectHdl (LINK(this, SwFldFuncPage, SelectHdl)); - aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertMacroHdl)); - aFormatLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl)); - aMacroBT.SetClickHdl (LINK(this, SwFldFuncPage, MacroHdl)); + aTypeLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl)); + aTypeLB.SetSelectHdl (LINK(this, SwFldFuncPage, TypeHdl)); + aSelectionLB.SetSelectHdl (LINK(this, SwFldFuncPage, SelectHdl)); + aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertMacroHdl)); + aFormatLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl)); + aMacroBT.SetClickHdl (LINK(this, SwFldFuncPage, MacroHdl)); Link aListModifyLk( LINK(this, SwFldFuncPage, ListModifyHdl)); aListAddPB.SetClickHdl(aListModifyLk); aListRemovePB.SetClickHdl(aListModifyLk); @@ -608,7 +608,7 @@ BOOL SwFldFuncPage::FillItemSet(SfxItemSet& ) InsertFld( nTypeId, nSubType, aName, aVal, nFormat ); } - ModifyHdl(); // Insert ggf enablen/disablen + ModifyHdl(); // Insert ggf enablen/disablen return FALSE; } @@ -638,7 +638,7 @@ String SwFldFuncPage::TurnMacroString(const String &rMacro) return rMacro; } -SfxTabPage* SwFldFuncPage::Create( Window* pParent, +SfxTabPage* SwFldFuncPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldFuncPage( pParent, rAttrSet ) ); @@ -649,7 +649,7 @@ USHORT SwFldFuncPage::GetGroup() return GRP_FKT; } -void SwFldFuncPage::FillUserData() +void SwFldFuncPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index eafe7365da9e..32f9c3d60ce3 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,21 +44,21 @@ class SwFldFuncPage : public SwFldPage { - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - ListBox aSelectionLB; - FixedText aFormatFT; - ListBox aFormatLB; - FixedText aNameFT; - ConditionEdit aNameED; - FixedText aValueFT; - Edit aValueED; - FixedText aCond1FT; - ConditionEdit aCond1ED; - FixedText aCond2FT; - ConditionEdit aCond2ED; - PushButton aMacroBT; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + ListBox aSelectionLB; + FixedText aFormatFT; + ListBox aFormatLB; + FixedText aNameFT; + ConditionEdit aNameED; + FixedText aValueFT; + Edit aValueED; + FixedText aCond1FT; + ConditionEdit aCond1ED; + FixedText aCond2FT; + ConditionEdit aCond2ED; + PushButton aMacroBT; //controls of "Input list" FixedText aListItemFT; @@ -72,10 +72,10 @@ class SwFldFuncPage : public SwFldPage FixedText aListNameFT; Edit aListNameED; - String sOldValueFT; - String sOldNameFT; + String sOldValueFT; + String sOldNameFT; - ULONG nOldFormat; + ULONG nOldFormat; bool bDropDownLBChanged; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); @@ -88,11 +88,11 @@ class SwFldFuncPage : public SwFldPage // Macro auswhlen DECL_LINK( MacroHdl, Button * ); - void UpdateSubType(); - String TurnMacroString(const String &rMacro); + void UpdateSubType(); + String TurnMacroString(const String &rMacro); protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldFuncPage(Window* pParent, const SfxItemSet& rSet); @@ -104,7 +104,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src index 312299fac02d..ca67c448fb3f 100644 --- a/sw/source/ui/fldui/fldfunc.src +++ b/sw/source/ui/fldui/fldfunc.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index a04d14433773..7ad1e8a40c88 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,9 +60,9 @@ #include <svl/zformat.hxx> #include <vcl/mnemonic.hxx> #include <view.hxx> -#include <wrtsh.hxx> // Actives Fenster -#include <doc.hxx> // Actives Fenster -#include <docsh.hxx> // Actives Fenster +#include <wrtsh.hxx> // Actives Fenster +#include <doc.hxx> // Actives Fenster +#include <docsh.hxx> // Actives Fenster #include <swmodule.hxx> #include <charatr.hxx> #include <fmtinfmt.hxx> @@ -101,44 +101,44 @@ using namespace nsSwDocInfoSubType; --------------------------------------------------------------------*/ enum { - GRP_DOC_BEGIN = 0, - GRP_DOC_END = GRP_DOC_BEGIN + 11, + GRP_DOC_BEGIN = 0, + GRP_DOC_END = GRP_DOC_BEGIN + 11, - GRP_FKT_BEGIN = GRP_DOC_END, + GRP_FKT_BEGIN = GRP_DOC_END, GRP_FKT_END = GRP_FKT_BEGIN + 8, - GRP_REF_BEGIN = GRP_FKT_END, - GRP_REF_END = GRP_REF_BEGIN + 2, + GRP_REF_BEGIN = GRP_FKT_END, + GRP_REF_END = GRP_REF_BEGIN + 2, - GRP_REG_BEGIN = GRP_REF_END, + GRP_REG_BEGIN = GRP_REF_END, GRP_REG_END = GRP_REG_BEGIN + 1, - GRP_DB_BEGIN = GRP_REG_END, - GRP_DB_END = GRP_DB_BEGIN + 5, + GRP_DB_BEGIN = GRP_REG_END, + GRP_DB_END = GRP_DB_BEGIN + 5, - GRP_VAR_BEGIN = GRP_DB_END, - GRP_VAR_END = GRP_VAR_BEGIN + 9 + GRP_VAR_BEGIN = GRP_DB_END, + GRP_VAR_END = GRP_VAR_BEGIN + 9 }; enum { - GRP_WEB_DOC_BEGIN = 0, - GRP_WEB_DOC_END = GRP_WEB_DOC_BEGIN + 9, + GRP_WEB_DOC_BEGIN = 0, + GRP_WEB_DOC_END = GRP_WEB_DOC_BEGIN + 9, - GRP_WEB_FKT_BEGIN = GRP_WEB_DOC_END + 2, - GRP_WEB_FKT_END = GRP_WEB_FKT_BEGIN + 0, // Die Gruppe ist leer! + GRP_WEB_FKT_BEGIN = GRP_WEB_DOC_END + 2, + GRP_WEB_FKT_END = GRP_WEB_FKT_BEGIN + 0, // Die Gruppe ist leer! - GRP_WEB_REF_BEGIN = GRP_WEB_FKT_END + 6, // Die Gruppe ist leer! - GRP_WEB_REF_END = GRP_WEB_REF_BEGIN + 0, + GRP_WEB_REF_BEGIN = GRP_WEB_FKT_END + 6, // Die Gruppe ist leer! + GRP_WEB_REF_END = GRP_WEB_REF_BEGIN + 0, - GRP_WEB_REG_BEGIN = GRP_WEB_REF_END + 2, + GRP_WEB_REG_BEGIN = GRP_WEB_REF_END + 2, GRP_WEB_REG_END = GRP_WEB_REG_BEGIN + 1, - GRP_WEB_DB_BEGIN = GRP_WEB_REG_END, // Die Gruppe ist leer! - GRP_WEB_DB_END = GRP_WEB_DB_BEGIN + 0, + GRP_WEB_DB_BEGIN = GRP_WEB_REG_END, // Die Gruppe ist leer! + GRP_WEB_DB_END = GRP_WEB_DB_BEGIN + 0, - GRP_WEB_VAR_BEGIN = GRP_WEB_DB_END + 5, - GRP_WEB_VAR_END = GRP_WEB_VAR_BEGIN + 1 + GRP_WEB_VAR_BEGIN = GRP_WEB_DB_END + 5, + GRP_WEB_VAR_END = GRP_WEB_VAR_BEGIN + 1 }; /*-------------------------------------------------------------------- @@ -174,9 +174,9 @@ static const USHORT __FAR_DATA aDBFmt[] = nsSwExtendedSubType::SUB_OWN_FMT }; -static const USHORT VF_COUNT = sizeof(aGetFmt) / sizeof(USHORT); -static const USHORT VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(USHORT); -static const USHORT VF_DB_COUNT = sizeof(aDBFmt) / sizeof(USHORT); +static const USHORT VF_COUNT = sizeof(aGetFmt) / sizeof(USHORT); +static const USHORT VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(USHORT); +static const USHORT VF_DB_COUNT = sizeof(aDBFmt) / sizeof(USHORT); /*-------------------------------------------------------------------- Beschreibung: Feldtypen und Subtypes @@ -185,11 +185,11 @@ struct SwFldPack { USHORT nTypeId; - USHORT nSubTypeStart; + USHORT nSubTypeStart; USHORT nSubTypeEnd; - ULONG nFmtBegin; - ULONG nFmtEnd; + ULONG nFmtBegin; + ULONG nFmtEnd; }; /*-------------------------------------------------------------------- @@ -198,54 +198,54 @@ struct SwFldPack static const SwFldPack __FAR_DATA aSwFlds[] = { // Dokument - { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 }, - { TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END }, - { TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0 }, - { TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0 }, - { TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, - { TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, - { TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, - { TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, - { TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1 }, - - { TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END }, - { TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, + { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 }, + { TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END }, + { TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0 }, + { TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0 }, + { TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, + { TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, + { TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, + { TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, + { TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1 }, + + { TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END }, + { TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, // Funktion - { TYP_CONDTXTFLD, 0, 0, 0, 0 }, - { TYP_DROPDOWN, 0, 0, 0, 0 }, - { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, - { TYP_MACROFLD, 0, 0, 0, 0 }, - { TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END }, - { TYP_COMBINED_CHARS, 0, 0, 0, 0 }, - { TYP_HIDDENTXTFLD, 0, 0, 0, 0 }, - { TYP_HIDDENPARAFLD, 0, 0, 0, 0 }, + { TYP_CONDTXTFLD, 0, 0, 0, 0 }, + { TYP_DROPDOWN, 0, 0, 0, 0 }, + { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, + { TYP_MACROFLD, 0, 0, 0, 0 }, + { TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END }, + { TYP_COMBINED_CHARS, 0, 0, 0, 0 }, + { TYP_HIDDENTXTFLD, 0, 0, 0, 0 }, + { TYP_HIDDENPARAFLD, 0, 0, 0, 0 }, // Referenzen - { TYP_SETREFFLD, 0, 0, 0, 0 }, - { TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END }, + { TYP_SETREFFLD, 0, 0, 0, 0 }, + { TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END }, // Ablage - { TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END }, + { TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END }, // Datenbank - { TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END }, - { TYP_DBNEXTSETFLD, 0, 0, 0, 0 }, - { TYP_DBNUMSETFLD, 0, 0, 0, 0 }, - { TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, - { TYP_DBNAMEFLD, 0, 0, 0, 0 }, + { TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END }, + { TYP_DBNEXTSETFLD, 0, 0, 0, 0 }, + { TYP_DBNUMSETFLD, 0, 0, 0, 0 }, + { TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, + { TYP_DBNAMEFLD, 0, 0, 0, 0 }, // Variablen - { TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END }, - - { TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, - { TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END }, - { TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, - { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, - { TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, - { TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0 }, - { TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, - { TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END } + { TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END }, + + { TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, + { TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END }, + { TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, + { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, + { TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, + { TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0 }, + { TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, + { TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END } }; /*-------------------------------------------------------------------- @@ -261,7 +261,7 @@ static SwWrtShell* lcl_GetShell() return 0; } -inline USHORT GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); } +inline USHORT GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); } /*-------------------------------------------------------------------- Beschreibung: FieldManager regelt das Einfuegen und Updaten @@ -367,9 +367,9 @@ SwField* SwFldMgr::GetCurFld() // const USHORT nTypeId = pCurFld->GetTypeId(); - nCurFmt = pCurFld->GetFormat(); - aCurPar1 = pCurFld->GetPar1(); - aCurPar2 = pCurFld->GetPar2(); + nCurFmt = pCurFld->GetFormat(); + aCurPar1 = pCurFld->GetPar1(); + aCurPar2 = pCurFld->GetPar2(); switch( nTypeId ) { @@ -393,21 +393,21 @@ const SwFldGroupRgn& SwFldMgr::GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) cons { static SwFldGroupRgn __READONLY_DATA aRanges[] = { - { /* Dokument */ GRP_DOC_BEGIN, GRP_DOC_END }, - { /* Funktionen */ GRP_FKT_BEGIN, GRP_FKT_END }, - { /* Referenzen */ GRP_REF_BEGIN, GRP_REF_END }, - { /* Ablage */ GRP_REG_BEGIN, GRP_REG_END }, - { /* DB */ GRP_DB_BEGIN, GRP_DB_END }, - { /* User */ GRP_VAR_BEGIN, GRP_VAR_END } + { /* Dokument */ GRP_DOC_BEGIN, GRP_DOC_END }, + { /* Funktionen */ GRP_FKT_BEGIN, GRP_FKT_END }, + { /* Referenzen */ GRP_REF_BEGIN, GRP_REF_END }, + { /* Ablage */ GRP_REG_BEGIN, GRP_REG_END }, + { /* DB */ GRP_DB_BEGIN, GRP_DB_END }, + { /* User */ GRP_VAR_BEGIN, GRP_VAR_END } }; static SwFldGroupRgn __READONLY_DATA aWebRanges[] = { - { /* Dokument */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END }, - { /* Funktionen */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END }, - { /* Referenzen */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END }, - { /* Ablage */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END }, - { /* DB */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END }, - { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END } + { /* Dokument */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END }, + { /* Funktionen */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END }, + { /* Referenzen */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END }, + { /* Ablage */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END }, + { /* DB */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END }, + { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END } }; if (bHtmlMode) @@ -489,10 +489,10 @@ USHORT SwFldMgr::GetPos(USHORT nTypeId) { switch( nTypeId ) { - case TYP_FIXDATEFLD: nTypeId = TYP_DATEFLD; break; - case TYP_FIXTIMEFLD: nTypeId = TYP_TIMEFLD; break; - case TYP_SETINPFLD: nTypeId = TYP_SETFLD; break; - case TYP_USRINPFLD: nTypeId = TYP_USERFLD; break; + case TYP_FIXDATEFLD: nTypeId = TYP_DATEFLD; break; + case TYP_FIXTIMEFLD: nTypeId = TYP_TIMEFLD; break; + case TYP_SETINPFLD: nTypeId = TYP_SETFLD; break; + case TYP_USRINPFLD: nTypeId = TYP_USERFLD; break; } for(USHORT i = 0; i < GetPackCount(); i++) @@ -634,14 +634,14 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co return 2; if (nTypeId == TYP_FILENAMEFLD) - nEnd -= 2; // Kein Bereich oder Vorlage + nEnd -= 2; // Kein Bereich oder Vorlage switch(nStart) { case FMT_GETVAR_BEGIN: - case FMT_SETVAR_BEGIN: return VF_COUNT; - case FMT_USERVAR_BEGIN: return VF_USR_COUNT; - case FMT_DBFLD_BEGIN: return VF_DB_COUNT; + case FMT_SETVAR_BEGIN: return VF_COUNT; + case FMT_USERVAR_BEGIN: return VF_USR_COUNT; + case FMT_DBFLD_BEGIN: return VF_DB_COUNT; case FMT_NUM_BEGIN: { USHORT nCount = (USHORT)(nEnd - nStart); @@ -670,7 +670,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co } /*-------------------------------------------------------------------- - Beschreibung: FormatString zu einem Typ ermitteln + Beschreibung: FormatString zu einem Typ ermitteln --------------------------------------------------------------------*/ @@ -689,7 +689,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const nStart = aSwFlds[nPos].nFmtBegin; if (TYP_AUTHORFLD == nTypeId|| TYP_FILENAMEFLD == nTypeId) - nFormatId &= ~FF_FIXED; // Fixed-Flag ausmaskieren + nFormatId &= ~FF_FIXED; // Fixed-Flag ausmaskieren if((nStart + nFormatId) < aSwFlds[nPos].nFmtEnd) aRet = SW_RESSTR((USHORT)(nStart + nFormatId)); @@ -721,7 +721,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const } /*-------------------------------------------------------------------- - Beschreibung: FormatId aus Pseudo-ID ermitteln + Beschreibung: FormatId aus Pseudo-ID ermitteln --------------------------------------------------------------------*/ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const @@ -733,9 +733,9 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const case TYP_DOCINFOFLD: switch( aSwFlds[ GetPos( nTypeId ) ].nFmtBegin + nFormatId ) { - case FMT_REG_AUTHOR: nId = DI_SUB_AUTHOR; break; - case FMT_REG_TIME: nId = DI_SUB_TIME; break; - case FMT_REG_DATE: nId = DI_SUB_DATE; break; + case FMT_REG_AUTHOR: nId = DI_SUB_AUTHOR; break; + case FMT_REG_TIME: nId = DI_SUB_TIME; break; + case FMT_REG_DATE: nId = DI_SUB_DATE; break; } break; @@ -754,15 +754,15 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const { switch( nBegin + nFormatId ) { - case FMT_NUM_ABC: nId = SVX_NUM_CHARS_UPPER_LETTER; break; - case FMT_NUM_SABC: nId = SVX_NUM_CHARS_LOWER_LETTER; break; - case FMT_NUM_ROMAN: nId = SVX_NUM_ROMAN_UPPER; break; - case FMT_NUM_SROMAN: nId = SVX_NUM_ROMAN_LOWER; break; - case FMT_NUM_ARABIC: nId = SVX_NUM_ARABIC; break; - case FMT_NUM_PAGEDESC: nId = SVX_NUM_PAGEDESC; break; - case FMT_NUM_PAGESPECIAL: nId = SVX_NUM_CHAR_SPECIAL; break; - case FMT_NUM_ABC_N: nId = SVX_NUM_CHARS_UPPER_LETTER_N; break; - case FMT_NUM_SABC_N: nId = SVX_NUM_CHARS_LOWER_LETTER_N; break; + case FMT_NUM_ABC: nId = SVX_NUM_CHARS_UPPER_LETTER; break; + case FMT_NUM_SABC: nId = SVX_NUM_CHARS_LOWER_LETTER; break; + case FMT_NUM_ROMAN: nId = SVX_NUM_ROMAN_UPPER; break; + case FMT_NUM_SROMAN: nId = SVX_NUM_ROMAN_LOWER; break; + case FMT_NUM_ARABIC: nId = SVX_NUM_ARABIC; break; + case FMT_NUM_PAGEDESC: nId = SVX_NUM_PAGEDESC; break; + case FMT_NUM_PAGESPECIAL: nId = SVX_NUM_CHAR_SPECIAL; break; + case FMT_NUM_ABC_N: nId = SVX_NUM_CHARS_UPPER_LETTER_N; break; + case FMT_NUM_SABC_N: nId = SVX_NUM_CHARS_LOWER_LETTER_N; break; } } else if(xNumberingInfo.is()) @@ -981,13 +981,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) break; } case TYP_DOCSTATFLD: - { SwDocStatFieldType* pTyp = + { SwDocStatFieldType* pTyp = (SwDocStatFieldType*)pCurShell->GetFldType(0, RES_DOCSTATFLD); pFld = new SwDocStatField(pTyp, nSubType, nFormatId); break; } case TYP_AUTHORFLD: - { SwAuthorFieldType* pTyp = + { SwAuthorFieldType* pTyp = (SwAuthorFieldType*)pCurShell->GetFldType(0, RES_AUTHORFLD); pFld = new SwAuthorField(pTyp, nFormatId); break; @@ -1030,7 +1030,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) case TYP_DDEFLD: { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren - // Namen haben! Wird hier noch nicht beachtet. + // Namen haben! Wird hier noch nicht beachtet. String sCmd( rData.sPar2 ); USHORT nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); @@ -1190,7 +1190,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->GetFldType(0, RES_DBSETNUMBERFLD); pFld = new SwDBSetNumberField( pTyp, aDBData, nFormatId); bExp = TRUE; - break; + break; } } break; @@ -1336,7 +1336,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->EndAllAction(); return TRUE; -/* // In der Tabelle Tabellenformeln einfuegen +/* // In der Tabelle Tabellenformeln einfuegen SwTblFieldType* pTyp = (SwTblFieldType*)pCurShell->GetFldType( 0, RES_TABLEFLD); pFld = new SwTblField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_EXPR, nFormatId); @@ -1377,7 +1377,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) } break; default: - { OSL_ENSURE(!this, "wrong field type"); + { OSL_ENSURE(!this, "wrong field type"); return FALSE; } } @@ -1429,7 +1429,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, OSL_ENSURE(pCurFld, "no field at CursorPos"); bool bDelete = false; - SwField *pTmpFld; // mb: fixed memory leak + SwField *pTmpFld; // mb: fixed memory leak if (NULL != _pTmpFld) { pTmpFld = _pTmpFld; @@ -1460,7 +1460,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, case TYP_DDEFLD: { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren - // Namen haben! Wird hier noch nicht beachtet. + // Namen haben! Wird hier noch nicht beachtet. USHORT nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); break; @@ -1542,7 +1542,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, } break; case TYP_AUTHORITY : - { + { //#i99069# changes to a bibliography field should change the field type SwAuthorityField* pAuthorityField = static_cast<SwAuthorityField*>(pTmpFld); SwAuthorityFieldType* pAuthorityType = static_cast<SwAuthorityFieldType*>(pType); @@ -1555,10 +1555,10 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, pType->UpdateFlds(); pSh->SetModified(); } - - if( aTempEntry.GetAuthorField( AUTH_FIELD_IDENTIFIER ) == - pAuthorityField->GetFieldText( AUTH_FIELD_IDENTIFIER ) ) - bSetPar1 = FALSE; //otherwise it's a new or changed entry, the field needs to be updated + + if( aTempEntry.GetAuthorField( AUTH_FIELD_IDENTIFIER ) == + pAuthorityField->GetFieldText( AUTH_FIELD_IDENTIFIER ) ) + bSetPar1 = FALSE; //otherwise it's a new or changed entry, the field needs to be updated bSetPar2 = FALSE; } break; @@ -1618,7 +1618,7 @@ USHORT SwFldMgr::GetCurrLanguage() const void SwFieldType::_GetFldName() { - static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN; + static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN; static USHORT __READONLY_DATA coFldNms[ coFldCnt ] = { FLD_DATE_STD, diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index a64b1fcebfcf..e65e3887453a 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ SwFldPage::SwFldPage( Window *pParent, const ResId &rId, m_bRefresh (FALSE), m_bFirstHTMLInit (TRUE) { -// FreeResource(); +// FreeResource(); } SwFldPage::~SwFldPage() @@ -153,7 +153,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, SwView* pView = GetActiveView(); SwWrtShell *pSh = m_pWrtShell ? m_pWrtShell : pView->GetWrtShellPtr(); - if (!IsFldEdit()) // Neues Feld einfuegen + if (!IsFldEdit()) // Neues Feld einfuegen { SwInsertFld_Data aData(nTypeId, nSubType, rPar1, rPar2, nFormatId, 0, cSeparator, bIsAutomaticLanguage ); //#i26566# provide parent for SwWrtShell::StartInputFldDlg @@ -197,7 +197,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, } } - else // Feld aendern + else // Feld aendern { SwField *const pTmpFld = m_pCurFld->CopyField(); @@ -249,7 +249,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, { if( pFmtFld->GetFld() == m_pCurFld) { - pTyp->Add(pFmtFld); // Feld auf neuen Typ umhaengen + pTyp->Add(pFmtFld); // Feld auf neuen Typ umhaengen pTmpFld->ChgTyp(pTyp); break; } @@ -272,7 +272,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, { // User- oder SetField ? if (m_aMgr.GetFldType(RES_USERFLD, sPar1) == 0 && - !(pTmpFld->GetSubType() & INP_TXT)) // SETEXPFLD + !(pTmpFld->GetSubType() & INP_TXT)) // SETEXPFLD { SwSetExpField* pFld = (SwSetExpField*)pTmpFld; pFld->SetPromptText(sPar2); @@ -353,7 +353,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn ) pDlg->InsertHdl(); if (pBtn) - pBtn->GrabFocus(); // Wegen InputField-Dlg + pBtn->GrabFocus(); // Wegen InputField-Dlg } else { diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index f5adda90169f..afcf9ce7bdd8 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,17 +64,17 @@ protected: DECL_LINK( InsertHdl, Button *pBtn = 0 ); DECL_LINK( NumFormatHdl, ListBox *pBtn = 0 ); - void Init(); - void SavePos( const ListBox* pLst1, + void Init(); + void SavePos( const ListBox* pLst1, const ListBox* pLst2 = 0, const ListBox* pLst3 = 0); - void RestorePos( ListBox* pLst1, ListBox* pLst2 = 0, + void RestorePos( ListBox* pLst1, ListBox* pLst2 = 0, ListBox* pLst3 = 0 ); - void EnableInsert(BOOL bEnable = TRUE); + void EnableInsert(BOOL bEnable = TRUE); inline BOOL IsFldEdit() const { return m_bFldEdit; } // Feld einfuegen - BOOL InsertFld( USHORT nTypeId, + BOOL InsertFld( USHORT nTypeId, USHORT nSubType, const String& rPar1, const String& rPar2, @@ -85,18 +85,18 @@ protected: using SfxTabPage::ActivatePage; public: - SwFldPage( Window *pParent, + SwFldPage( Window *pParent, const ResId &rId, const SfxItemSet &rAttrSet ); virtual ~SwFldPage(); - virtual void ActivatePage(); + virtual void ActivatePage(); inline SwFldMgr& GetFldMgr() { return m_aMgr; } void SetWrtShell( SwWrtShell* m_pWrtShell ); - void EditNewField( BOOL bOnlyActivate = FALSE ); - virtual USHORT GetGroup() = 0; + void EditNewField( BOOL bOnlyActivate = FALSE ); + virtual USHORT GetGroup() = 0; }; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 3fc46e8b41cc..7240f986193b 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,16 +56,16 @@ // sw/inc/expfld.hxx SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* ) -#define REFFLDFLAG 0x4000 -#define REFFLDFLAG_BOOKMARK 0x4800 -#define REFFLDFLAG_FOOTNOTE 0x5000 -#define REFFLDFLAG_ENDNOTE 0x6000 +#define REFFLDFLAG 0x4000 +#define REFFLDFLAG_BOOKMARK 0x4800 +#define REFFLDFLAG_FOOTNOTE 0x5000 +#define REFFLDFLAG_ENDNOTE 0x6000 // --> OD 2007-11-09 #i83479# #define REFFLDFLAG_HEADING 0x7100 #define REFFLDFLAG_NUMITEM 0x7200 // <-- -USHORT nFldDlgFmtSel = 0; +USHORT nFldDlgFmtSel = 0; #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 @@ -78,22 +78,22 @@ USHORT nFldDlgFmtSel = 0; SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage( pParent, SW_RES( TP_FLD_REF ), rCoreSet ), - aTypeFT (this, SW_RES(FT_REFTYPE)), - aTypeLB (this, SW_RES(LB_REFTYPE)), - aSelectionFT (this, SW_RES(FT_REFSELECTION)), - aSelectionLB (this, SW_RES(LB_REFSELECTION)), + aTypeFT (this, SW_RES(FT_REFTYPE)), + aTypeLB (this, SW_RES(LB_REFTYPE)), + aSelectionFT (this, SW_RES(FT_REFSELECTION)), + aSelectionLB (this, SW_RES(LB_REFSELECTION)), // --> OD 2007-11-21 #i83479# aSelectionToolTipLB( this, SW_RES(LB_REFSELECTION_TOOLTIP) ), // <-- - aFormatFT (this, SW_RES(FT_REFFORMAT)), - aFormatLB (this, SW_RES(LB_REFFORMAT)), - aNameFT (this, SW_RES(FT_REFNAME)), - aNameED (this, SW_RES(ED_REFNAME)), - aValueFT (this, SW_RES(FT_REFVALUE)), - aValueED (this, SW_RES(ED_REFVALUE)), - - sBookmarkTxt (SW_RES(STR_REFBOOKMARK)), - sFootnoteTxt (SW_RES(STR_REFFOOTNOTE)), + aFormatFT (this, SW_RES(FT_REFFORMAT)), + aFormatLB (this, SW_RES(LB_REFFORMAT)), + aNameFT (this, SW_RES(FT_REFNAME)), + aNameED (this, SW_RES(ED_REFNAME)), + aValueFT (this, SW_RES(FT_REFVALUE)), + aValueED (this, SW_RES(ED_REFVALUE)), + + sBookmarkTxt (SW_RES(STR_REFBOOKMARK)), + sFootnoteTxt (SW_RES(STR_REFFOOTNOTE)), sEndnoteTxt (SW_RES(STR_REFENDNOTE)), // --> OD 2007-11-09 #i83479# sHeadingTxt (SW_RES(STR_REFHEADING)), @@ -194,7 +194,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) } SetSelectionSel(LISTBOX_ENTRY_NOTFOUND); SetTypeSel(LISTBOX_ENTRY_NOTFOUND); - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung // TypeListBox initialisieren aTypeLB.SetUpdateMode(FALSE); @@ -370,7 +370,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) break; } - if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // Referenz zu gel?schter Marke + if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // Referenz zu gel?schter Marke { USHORT nPos = aTypeLB.InsertEntry(sName); aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nFlag)); @@ -869,7 +869,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) { SwFieldType* pType = GetFldMgr().GetFldType(RES_SETEXPFLD, aName); - if(!pType) // Nur einfuegen, wenn es den Namen noch nicht gibt + if(!pType) // Nur einfuegen, wenn es den Namen noch nicht gibt { aSelectionLB.InsertEntry(aName); aSelectionLB.Enable(); @@ -888,13 +888,13 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) { pSh = ::GetActiveWrtShell(); } - if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken! + if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken! { aName = aNameED.GetText(); nTypeId = TYP_GETREFFLD; nSubType = REF_BOOKMARK; } - else if (REFFLDFLAG_FOOTNOTE == nTypeId) // Fussnoten + else if (REFFLDFLAG_FOOTNOTE == nTypeId) // Fussnoten { SwSeqFldList aArr; _SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 ); @@ -915,7 +915,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) else if (IsFldEdit()) aVal = String::CreateFromInt32( pRefFld->GetSeqNo() ); } - else if (REFFLDFLAG_ENDNOTE == nTypeId) // Endnoten + else if (REFFLDFLAG_ENDNOTE == nTypeId) // Endnoten { SwSeqFldList aArr; _SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 ); @@ -1023,7 +1023,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) InsertFld( nTypeId, nSubType, aName, aVal, nFormat ); } - ModifyHdl(); // Insert ggf enablen/disablen + ModifyHdl(); // Insert ggf enablen/disablen return FALSE; } @@ -1032,7 +1032,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) Beschreibung: --------------------------------------------------------------------*/ -SfxTabPage* SwFldRefPage::Create( Window* pParent, +SfxTabPage* SwFldRefPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldRefPage( pParent, rAttrSet ) ); @@ -1050,7 +1050,7 @@ USHORT SwFldRefPage::GetGroup() /* -----------------12.01.99 10:09------------------- * * --------------------------------------------------*/ -void SwFldRefPage::FillUserData() +void SwFldRefPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index b1daeaf3684f..7550ca110b93 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,19 +45,19 @@ class SwTxtNode; class SwFldRefPage : public SwFldPage { - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - ListBox aSelectionLB; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + ListBox aSelectionLB; // --> OD 2007-11-21 #i83479# SwFldRefTreeListBox aSelectionToolTipLB; // <-- - FixedText aFormatFT; - ListBox aFormatLB; - FixedText aNameFT; - Edit aNameED; - FixedText aValueFT; - Edit aValueED; + FixedText aFormatFT; + ListBox aFormatLB; + FixedText aNameFT; + Edit aNameED; + FixedText aValueFT; + Edit aValueED; const String sBookmarkTxt; const String sFootnoteTxt; const String sEndnoteTxt; @@ -79,8 +79,8 @@ class SwFldRefPage : public SwFldPage DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); DECL_LINK( ModifyHdl, Edit *pEd = 0 ); - void UpdateSubType(); - USHORT FillFormatLB(USHORT nTypeId); + void UpdateSubType(); + USHORT FillFormatLB(USHORT nTypeId); // --> OD 2007-12-05 #i83479# void SaveSelectedTxtNode(); @@ -89,7 +89,7 @@ class SwFldRefPage : public SwFldPage // <-- protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldRefPage(Window* pParent, const SfxItemSet& rSet); @@ -101,7 +101,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src index 847c9358db69..8abf02e980c6 100644 --- a/sw/source/ui/fldui/fldref.src +++ b/sw/source/ui/fldui/fldref.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 595aada6d195..db2e9b674a50 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ /*-------------------------------------------------------------------- - Beschreibung: Der Traeger des Dialoges + Beschreibung: Der Traeger des Dialoges --------------------------------------------------------------------*/ @@ -84,11 +84,11 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) GetOKButton().SetText(String(SW_RES(STR_FLD_INSERT))); GetOKButton().SetHelpId(HID_FIELD_INSERT); - GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird + GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird GetCancelButton().SetText(String(SW_RES(STR_FLD_CLOSE))); GetCancelButton().SetHelpId(HID_FIELD_CLOSE); - GetCancelButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird + GetCancelButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird FreeResource(); @@ -216,10 +216,10 @@ IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG ) { if (GetOKButton().IsEnabled()) { - SfxTabPage* pPage = GetTabPage(GetCurPageId()); + SfxTabPage* pPage = GetTabPage(GetCurPageId()); pPage->FillItemSet(*(SfxItemSet*)0); - GetOKButton().GrabFocus(); // Wegen InputField-Dlg + GetOKButton().GrabFocus(); // Wegen InputField-Dlg } return 0; @@ -271,7 +271,7 @@ void SwFldDlg::ReInitTabPage( USHORT nPageId, BOOL bOnlyActivate ) SwFldPage* pPage = (SwFldPage* )GetTabPage(nPageId); if ( pPage ) - pPage->EditNewField( bOnlyActivate ); // TabPage neu initialisieren + pPage->EditNewField( bOnlyActivate ); // TabPage neu initialisieren } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/fldui/fldtdlg.hrc b/sw/source/ui/fldui/fldtdlg.hrc index c90ece9fe4c7..dcec8a7512b5 100644 --- a/sw/source/ui/fldui/fldtdlg.hrc +++ b/sw/source/ui/fldui/fldtdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,104 +28,104 @@ #ifndef _FLDTDLG_HRC #define _FLDTDLG_HRC -#define RC_FLDTDLG_BEGIN 0 +#define RC_FLDTDLG_BEGIN 0 // Datenbankfeld-TabPage: -#define RC_TP_DB_START (RC_FLDTDLG_BEGIN) -#define FT_DBTYPE (RC_TP_DB_START + 1) -#define LB_DBTYPE (RC_TP_DB_START + 2) +#define RC_TP_DB_START (RC_FLDTDLG_BEGIN) +#define FT_DBTYPE (RC_TP_DB_START + 1) +#define LB_DBTYPE (RC_TP_DB_START + 2) #define FL_DBFORMAT (RC_TP_DB_START + 3) -#define FT_DBSELECTION (RC_TP_DB_START + 4) -#define TLB_DBLIST (RC_TP_DB_START + 5) -#define FT_DBCONDITION (RC_TP_DB_START + 6) -#define FT_DBSETNUMBER (RC_TP_DB_START + 7) -#define ED_DBCONDITION (RC_TP_DB_START + 8) -#define ED_DBSETNUMBER (RC_TP_DB_START + 9) -#define LB_DBFORMAT (RC_TP_DB_START + 10) -#define LB_DBNUMFORMAT (RC_TP_DB_START + 11) -#define RB_DBFORMAT (RC_TP_DB_START + 12) -#define RB_DBOWNFORMAT (RC_TP_DB_START + 13) -#define RC_TP_DB_END (RC_TP_DB_START + 14) +#define FT_DBSELECTION (RC_TP_DB_START + 4) +#define TLB_DBLIST (RC_TP_DB_START + 5) +#define FT_DBCONDITION (RC_TP_DB_START + 6) +#define FT_DBSETNUMBER (RC_TP_DB_START + 7) +#define ED_DBCONDITION (RC_TP_DB_START + 8) +#define ED_DBSETNUMBER (RC_TP_DB_START + 9) +#define LB_DBFORMAT (RC_TP_DB_START + 10) +#define LB_DBNUMFORMAT (RC_TP_DB_START + 11) +#define RB_DBFORMAT (RC_TP_DB_START + 12) +#define RB_DBOWNFORMAT (RC_TP_DB_START + 13) +#define RC_TP_DB_END (RC_TP_DB_START + 14) #define FL_DBFORMAT_VERT (RC_TP_DB_START + 15) #define FT_ADDDB (RC_TP_DB_START + 16) #define PB_ADDDB (RC_TP_DB_START + 17) // Dokumentinfo-TabPage: -#define RC_TP_DOCINF_START (RC_TP_DB_END) -#define FT_DOKINFTYPE (RC_TP_DOCINF_START + 1) -#define TLB_DOKINFTYPE (RC_TP_DOCINF_START + 2) +#define RC_TP_DOCINF_START (RC_TP_DB_END) +#define FT_DOKINFTYPE (RC_TP_DOCINF_START + 1) +#define TLB_DOKINFTYPE (RC_TP_DOCINF_START + 2) #define FT_DOKINFSELECTION (RC_TP_DOCINF_START + 3) -#define LB_DOKINFSELECTION (RC_TP_DOCINF_START + 4) -#define FT_DOKINFFORMAT (RC_TP_DOCINF_START + 5) -#define LB_DOKINFFORMAT (RC_TP_DOCINF_START + 6) -#define CB_DOKINFFIXEDCONTENT (RC_TP_DOCINF_START + 7) -#define BMP_DOKINFROOT_OPENED (RC_TP_DOCINF_START + 8) -#define BMP_DOKINFROOT_CLOSED (RC_TP_DOCINF_START + 9) -#define STR_DOKINF_INFO (RC_TP_DOCINF_START + 10) -#define RC_TP_DOCINF_END (RC_TP_DOCINF_START + 11) +#define LB_DOKINFSELECTION (RC_TP_DOCINF_START + 4) +#define FT_DOKINFFORMAT (RC_TP_DOCINF_START + 5) +#define LB_DOKINFFORMAT (RC_TP_DOCINF_START + 6) +#define CB_DOKINFFIXEDCONTENT (RC_TP_DOCINF_START + 7) +#define BMP_DOKINFROOT_OPENED (RC_TP_DOCINF_START + 8) +#define BMP_DOKINFROOT_CLOSED (RC_TP_DOCINF_START + 9) +#define STR_DOKINF_INFO (RC_TP_DOCINF_START + 10) +#define RC_TP_DOCINF_END (RC_TP_DOCINF_START + 11) // Variablen-TabPage: -#define RC_TP_VAR_START (RC_TP_DOCINF_END) -#define FT_VARTYPE (RC_TP_VAR_START + 1) -#define LB_VARTYPE (RC_TP_VAR_START + 2) -#define FT_VARSELECTION (RC_TP_VAR_START + 3) -#define LB_VARSELECTION (RC_TP_VAR_START + 4) -#define FT_VARNAME (RC_TP_VAR_START + 5) -#define ED_VARNAME (RC_TP_VAR_START + 6) -#define FT_VARVALUE (RC_TP_VAR_START + 7) -#define ED_VARVALUE (RC_TP_VAR_START + 8) -#define FT_VARFORMAT (RC_TP_VAR_START + 9) -#define LB_VARNUMFORMAT (RC_TP_VAR_START + 10) -#define LB_VARFORMAT (RC_TP_VAR_START + 11) +#define RC_TP_VAR_START (RC_TP_DOCINF_END) +#define FT_VARTYPE (RC_TP_VAR_START + 1) +#define LB_VARTYPE (RC_TP_VAR_START + 2) +#define FT_VARSELECTION (RC_TP_VAR_START + 3) +#define LB_VARSELECTION (RC_TP_VAR_START + 4) +#define FT_VARNAME (RC_TP_VAR_START + 5) +#define ED_VARNAME (RC_TP_VAR_START + 6) +#define FT_VARVALUE (RC_TP_VAR_START + 7) +#define ED_VARVALUE (RC_TP_VAR_START + 8) +#define FT_VARFORMAT (RC_TP_VAR_START + 9) +#define LB_VARNUMFORMAT (RC_TP_VAR_START + 10) +#define LB_VARFORMAT (RC_TP_VAR_START + 11) #define FT_VARCHAPTERHEADER (RC_TP_VAR_START + 12) #define FT_VARCHAPTERLEVEL (RC_TP_VAR_START + 13) #define LB_VARCHAPTERLEVEL (RC_TP_VAR_START + 14) -#define CB_VARINVISIBLE (RC_TP_VAR_START + 15) -#define FT_VARSEPARATOR (RC_TP_VAR_START + 16) -#define ED_VARSEPARATOR (RC_TP_VAR_START + 17) -#define TBX_VARNEWDEL (RC_TP_VAR_START + 18) -#define BT_VARAPPLY (RC_TP_VAR_START + 19) -#define BT_VARDELETE (RC_TP_VAR_START + 20) -#define RC_TP_VAR_END (RC_TP_VAR_START + 21) +#define CB_VARINVISIBLE (RC_TP_VAR_START + 15) +#define FT_VARSEPARATOR (RC_TP_VAR_START + 16) +#define ED_VARSEPARATOR (RC_TP_VAR_START + 17) +#define TBX_VARNEWDEL (RC_TP_VAR_START + 18) +#define BT_VARAPPLY (RC_TP_VAR_START + 19) +#define BT_VARDELETE (RC_TP_VAR_START + 20) +#define RC_TP_VAR_END (RC_TP_VAR_START + 21) // Dokument-TabPage: -#define RC_TP_DOC_START (RC_TP_VAR_END) -#define FT_DOKTYPE (RC_TP_DOC_START + 1) -#define LB_DOKTYPE (RC_TP_DOC_START + 2) -#define FT_DOKSELECTION (RC_TP_DOC_START + 3) -#define LB_DOKSELECTION (RC_TP_DOC_START + 4) -#define LB_DOKNUMFORMAT (RC_TP_DOC_START + 5) -#define LB_DOKFORMAT (RC_TP_DOC_START + 6) -#define FT_DOKFORMAT (RC_TP_DOC_START + 7) -#define FT_DOKVALUE (RC_TP_DOC_START + 8) -#define ED_DOKVALUE (RC_TP_DOC_START + 9) -#define ED_DOKLEVEL (RC_TP_DOC_START + 10) -#define ED_DOKDATEOFF (RC_TP_DOC_START + 11) -#define CB_DOKFIXEDCONTENT (RC_TP_DOC_START + 12) -#define STR_DOKDATEOFF (RC_TP_DOC_START + 13) -#define STR_DOKTIMEOFF (RC_TP_DOC_START + 14) -#define BMP_DOKROOT_OPENED (RC_TP_DOC_START + 15) -#define BMP_DOKROOT_CLOSED (RC_TP_DOC_START + 16) -#define RC_TP_DOC_END (RC_TP_DOC_START + 17) +#define RC_TP_DOC_START (RC_TP_VAR_END) +#define FT_DOKTYPE (RC_TP_DOC_START + 1) +#define LB_DOKTYPE (RC_TP_DOC_START + 2) +#define FT_DOKSELECTION (RC_TP_DOC_START + 3) +#define LB_DOKSELECTION (RC_TP_DOC_START + 4) +#define LB_DOKNUMFORMAT (RC_TP_DOC_START + 5) +#define LB_DOKFORMAT (RC_TP_DOC_START + 6) +#define FT_DOKFORMAT (RC_TP_DOC_START + 7) +#define FT_DOKVALUE (RC_TP_DOC_START + 8) +#define ED_DOKVALUE (RC_TP_DOC_START + 9) +#define ED_DOKLEVEL (RC_TP_DOC_START + 10) +#define ED_DOKDATEOFF (RC_TP_DOC_START + 11) +#define CB_DOKFIXEDCONTENT (RC_TP_DOC_START + 12) +#define STR_DOKDATEOFF (RC_TP_DOC_START + 13) +#define STR_DOKTIMEOFF (RC_TP_DOC_START + 14) +#define BMP_DOKROOT_OPENED (RC_TP_DOC_START + 15) +#define BMP_DOKROOT_CLOSED (RC_TP_DOC_START + 16) +#define RC_TP_DOC_END (RC_TP_DOC_START + 17) // Funktion-TabPage: -#define RC_TP_FUNC_START (RC_TP_DOC_END) -#define FT_FUNCTYPE (RC_TP_FUNC_START + 1) -#define LB_FUNCTYPE (RC_TP_FUNC_START + 2) -#define LB_FUNCSELECTION (RC_TP_FUNC_START + 3) -#define FT_FUNCSELECTION (RC_TP_FUNC_START + 4) -#define FT_FUNCFORMAT (RC_TP_FUNC_START + 5) -#define LB_FUNCFORMAT (RC_TP_FUNC_START + 6) -#define FT_FUNCNAME (RC_TP_FUNC_START + 7) -#define ED_FUNCNAME (RC_TP_FUNC_START + 8) -#define FT_FUNCVALUE (RC_TP_FUNC_START + 9) -#define ED_FUNCVALUE (RC_TP_FUNC_START + 10) -#define FT_FUNCCOND1 (RC_TP_FUNC_START + 11) -#define ED_FUNCCOND1 (RC_TP_FUNC_START + 12) -#define FT_FUNCCOND2 (RC_TP_FUNC_START + 13) -#define ED_FUNCCOND2 (RC_TP_FUNC_START + 14) -#define BT_FUNCMACRO (RC_TP_FUNC_START + 15) -#define RC_TP_FUNC_END (RC_TP_FUNC_START + 16) +#define RC_TP_FUNC_START (RC_TP_DOC_END) +#define FT_FUNCTYPE (RC_TP_FUNC_START + 1) +#define LB_FUNCTYPE (RC_TP_FUNC_START + 2) +#define LB_FUNCSELECTION (RC_TP_FUNC_START + 3) +#define FT_FUNCSELECTION (RC_TP_FUNC_START + 4) +#define FT_FUNCFORMAT (RC_TP_FUNC_START + 5) +#define LB_FUNCFORMAT (RC_TP_FUNC_START + 6) +#define FT_FUNCNAME (RC_TP_FUNC_START + 7) +#define ED_FUNCNAME (RC_TP_FUNC_START + 8) +#define FT_FUNCVALUE (RC_TP_FUNC_START + 9) +#define ED_FUNCVALUE (RC_TP_FUNC_START + 10) +#define FT_FUNCCOND1 (RC_TP_FUNC_START + 11) +#define ED_FUNCCOND1 (RC_TP_FUNC_START + 12) +#define FT_FUNCCOND2 (RC_TP_FUNC_START + 13) +#define ED_FUNCCOND2 (RC_TP_FUNC_START + 14) +#define BT_FUNCMACRO (RC_TP_FUNC_START + 15) +#define RC_TP_FUNC_END (RC_TP_FUNC_START + 16) #define FT_LISTITEM (RC_TP_FUNC_START + 17) #define ED_LISTITEM (RC_TP_FUNC_START + 18) #define PB_LISTADD (RC_TP_FUNC_START + 19) @@ -138,10 +138,10 @@ #define ED_LISTNAME (RC_TP_FUNC_START + 26) // Referenz-TabPage: -#define RC_TP_REF_START (RC_TP_FUNC_END) -#define FT_REFTYPE (RC_TP_REF_START + 1) -#define LB_REFTYPE (RC_TP_REF_START + 2) -#define FT_REFSELECTION (RC_TP_REF_START + 3) +#define RC_TP_REF_START (RC_TP_FUNC_END) +#define FT_REFTYPE (RC_TP_REF_START + 1) +#define LB_REFTYPE (RC_TP_REF_START + 2) +#define FT_REFSELECTION (RC_TP_REF_START + 3) #define LB_REFSELECTION (RC_TP_REF_START + 4) #define LB_REFSELECTION_TOOLTIP (RC_TP_REF_START + 5) #define LB_REFFORMAT (RC_TP_REF_START + 6) @@ -157,11 +157,11 @@ #define STR_REFNUMITEM (RC_TP_REF_START + 16) #define RC_TP_REF_END (RC_TP_REF_START + 17) -#define RC_TP_END (RC_TP_REF_END) +#define RC_TP_END (RC_TP_REF_END) // Strings ------------------------------------------------------------------ -#define STR_FLD_INSERT (RC_TP_END + 1) -#define STR_FLD_CLOSE (RC_TP_END + 2) +#define STR_FLD_INSERT (RC_TP_END + 1) +#define STR_FLD_CLOSE (RC_TP_END + 2) #endif diff --git a/sw/source/ui/fldui/fldtdlg.src b/sw/source/ui/fldui/fldtdlg.src index 3034146466e3..c83c0b0e9e88 100644 --- a/sw/source/ui/fldui/fldtdlg.src +++ b/sw/source/ui/fldui/fldtdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src index 7fb6a2e730c8..142e45077382 100644 --- a/sw/source/ui/fldui/fldui.src +++ b/sw/source/ui/fldui/fldui.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index abe971fab699..5d5f09d16d14 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,26 +55,26 @@ #define USER_DATA_VERSION USER_DATA_VERSION_1 SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) : - SwFldPage ( pParent, SW_RES( TP_FLD_VAR ), rCoreSet ), - aTypeFT (this, SW_RES(FT_VARTYPE)), - aTypeLB (this, SW_RES(LB_VARTYPE)), - aSelectionFT (this, SW_RES(FT_VARSELECTION)), - aSelectionLB (this, SW_RES(LB_VARSELECTION)), - aNameFT (this, SW_RES(FT_VARNAME)), - aNameED (this, SW_RES(ED_VARNAME)), - aValueFT (this, SW_RES(FT_VARVALUE)), - aValueED (this, SW_RES(ED_VARVALUE)), - aFormatFT (this, SW_RES(FT_VARFORMAT)), - aNumFormatLB (this, SW_RES(LB_VARNUMFORMAT)), - aFormatLB (this, SW_RES(LB_VARFORMAT)), + SwFldPage ( pParent, SW_RES( TP_FLD_VAR ), rCoreSet ), + aTypeFT (this, SW_RES(FT_VARTYPE)), + aTypeLB (this, SW_RES(LB_VARTYPE)), + aSelectionFT (this, SW_RES(FT_VARSELECTION)), + aSelectionLB (this, SW_RES(LB_VARSELECTION)), + aNameFT (this, SW_RES(FT_VARNAME)), + aNameED (this, SW_RES(ED_VARNAME)), + aValueFT (this, SW_RES(FT_VARVALUE)), + aValueED (this, SW_RES(ED_VARVALUE)), + aFormatFT (this, SW_RES(FT_VARFORMAT)), + aNumFormatLB (this, SW_RES(LB_VARNUMFORMAT)), + aFormatLB (this, SW_RES(LB_VARFORMAT)), aChapterHeaderFT(this, SW_RES(FT_VARCHAPTERHEADER)), - aChapterLevelFT (this, SW_RES(FT_VARCHAPTERLEVEL)), - aChapterLevelLB (this, SW_RES(LB_VARCHAPTERLEVEL)), - aInvisibleCB (this, SW_RES(CB_VARINVISIBLE)), - aSeparatorFT (this, SW_RES(FT_VARSEPARATOR)), - aSeparatorED (this, SW_RES(ED_VARSEPARATOR)), - aNewDelTBX (this, SW_RES(TBX_VARNEWDEL)), - bInit (TRUE) + aChapterLevelFT (this, SW_RES(FT_VARCHAPTERLEVEL)), + aChapterLevelLB (this, SW_RES(LB_VARCHAPTERLEVEL)), + aInvisibleCB (this, SW_RES(CB_VARINVISIBLE)), + aSeparatorFT (this, SW_RES(FT_VARSEPARATOR)), + aSeparatorED (this, SW_RES(ED_VARSEPARATOR)), + aNewDelTBX (this, SW_RES(TBX_VARNEWDEL)), + bInit (TRUE) { FreeResource(); @@ -105,7 +105,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung aTypeLB.SetUpdateMode(FALSE); aTypeLB.Clear(); @@ -147,17 +147,17 @@ void SwFldVarPage::Reset(const SfxItemSet& ) // alte Pos selektieren RestorePos(&aTypeLB); - aTypeLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); - aTypeLB.SetSelectHdl (LINK(this, SwFldVarPage, TypeHdl)); - aSelectionLB.SetSelectHdl (LINK(this, SwFldVarPage, SubTypeHdl)); - aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); - aFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); - aNumFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); - aNameED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl)); - aValueED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl)); - aNewDelTBX.SetClickHdl (LINK(this, SwFldVarPage, TBClickHdl)); - aChapterLevelLB.SetSelectHdl (LINK(this, SwFldVarPage, ChapterHdl)); - aSeparatorED.SetModifyHdl (LINK(this, SwFldVarPage, SeparatorHdl)); + aTypeLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); + aTypeLB.SetSelectHdl (LINK(this, SwFldVarPage, TypeHdl)); + aSelectionLB.SetSelectHdl (LINK(this, SwFldVarPage, SubTypeHdl)); + aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); + aFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); + aNumFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); + aNameED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl)); + aValueED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl)); + aNewDelTBX.SetClickHdl (LINK(this, SwFldVarPage, TBClickHdl)); + aChapterLevelLB.SetSelectHdl (LINK(this, SwFldVarPage, ChapterHdl)); + aSeparatorED.SetModifyHdl (LINK(this, SwFldVarPage, SeparatorHdl)); if( !IsRefresh() ) { @@ -218,7 +218,7 @@ IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG ) } aValueED.SetDropEnable(FALSE); - UpdateSubType(); // Auswahl-Listboxen initialisieren + UpdateSubType(); // Auswahl-Listboxen initialisieren } bInit = FALSE; @@ -269,7 +269,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { if (!IsFldEdit()) { - if (pBox || (bInit && !IsRefresh())) // Nur bei Interaktion mit Maus + if (pBox || (bInit && !IsRefresh())) // Nur bei Interaktion mit Maus { aNameED.SetText(pType->GetName()); @@ -280,7 +280,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) } else aValueED.SetText(pType->GetContent()); -// aValueED.SetText(pType->GetContent(aNumFormatLB.GetFormat())); +// aValueED.SetText(pType->GetContent(aNumFormatLB.GetFormat())); } } else @@ -288,7 +288,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) } else { - if (pBox) // Nur bei Interaktion mit Maus + if (pBox) // Nur bei Interaktion mit Maus { aNameED.SetText(aEmptyStr); aValueED.SetText(aEmptyStr); @@ -315,7 +315,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aNumFormatLB.SelectEntryPos(0); } // gibt es ein entprechendes SetField - if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus + if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus { if (nSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -414,7 +414,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) USHORT nInpType = 0; nInpType = static_cast< USHORT >(GetFldMgr().GetFldType(RES_USERFLD, sName) ? 0 : TYP_SETINPFLD); - if (nInpType) // SETEXPFLD + if (nInpType) // SETEXPFLD { // gibt es ein entprechendes SetField SwSetExpFieldType* pSetTyp = (SwSetExpFieldType*) @@ -422,7 +422,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if(pSetTyp) { - if (pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING) // Textuell? + if (pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING) // Textuell? { aNumFormatLB.Clear(); @@ -434,7 +434,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if (IsFldEdit() && (!pBox || bInit) ) aValueED.SetText(((SwSetExpField*)GetCurField())->GetPromptText()); } - else // USERFLD + else // USERFLD bFormat = bNumFmt = FALSE; } break; @@ -442,7 +442,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) case TYP_DDEFLD: aValueFT.SetText(SW_RESSTR(STR_DDE_CMD)); - if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus + if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus { if (nSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -454,7 +454,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aNameED.SetText(pType->GetName()); //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren - // Namen haben! Wird hier noch nicht beachtet + // Namen haben! Wird hier noch nicht beachtet String sCmd( pType->GetCmd() ); USHORT nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ' ); sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ', nTmpPos ); @@ -489,7 +489,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aValueED.SetText( ((SwSetExpField*)GetCurField())-> GetFormula() ); - if( IsFldEdit() || pBox ) // Nur bei Interaktion mit Maus + if( IsFldEdit() || pBox ) // Nur bei Interaktion mit Maus aNameED.SetText( aSelectionLB.GetSelectEntry() ); if( pFldTyp ) @@ -511,12 +511,12 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) bValue = FALSE; aValueFT.SetText( SW_RESSTR( STR_OFFSET )); - if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus + if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus aNameED.SetText(aEmptyStr); if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND) { - bValue = TRUE; // SubType OFF - kennt keinen Offset + bValue = TRUE; // SubType OFF - kennt keinen Offset if (IsFldEdit()) aValueED.SetText(String::CreateFromInt32(((SwRefPageSetField*)GetCurField())->GetOffset())); } @@ -559,7 +559,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aChapterLevelLB.Show(bChapterLevel); aInvisibleCB.Enable(bInvisible); - ModifyHdl(); // Anwenden/Einfuegen/Loeschen Status update + ModifyHdl(); // Anwenden/Einfuegen/Loeschen Status update aNumFormatLB.SetUpdateMode(TRUE); aFormatLB.SetUpdateMode(TRUE); @@ -685,7 +685,7 @@ void SwFldVarPage::UpdateSubType() if (!aSelectionLB.GetSelectEntryCount()) { aSelectionLB.SelectEntryPos(0); - pLB = &aSelectionLB; // Alle Controls neu initialisieren + pLB = &aSelectionLB; // Alle Controls neu initialisieren } } @@ -850,7 +850,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) nLen = sName.Len(); Selection aSel(aNameED.GetSelection()); aNameED.SetText( sName ); - aNameED.SetSelection( aSel ); // Cursorpos restaurieren + aNameED.SetSelection( aSel ); // Cursorpos restaurieren } break; } @@ -888,7 +888,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) bDelete = !pSh->IsUsed( *pType ); pType = GetFldMgr().GetFldType(RES_SETEXPFLD, sName); - if (!pType) // Kein Namenskonflikt mit Variablen + if (!pType) // Kein Namenskonflikt mit Variablen { // Benutzerfelder duerfen auch ohne Inhalt eingefuegt werden! // Bug #56845 @@ -1002,9 +1002,9 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) switch (nTypeId) { - case TYP_USERFLD: nId = RES_USERFLD; break; - case TYP_DDEFLD: nId = RES_DDEFLD; break; - case TYP_SETFLD: nId = RES_SETEXPFLD;break; + case TYP_USERFLD: nId = RES_USERFLD; break; + case TYP_DDEFLD: nId = RES_DDEFLD; break; + case TYP_SETFLD: nId = RES_SETEXPFLD;break; } pType = GetFldMgr().GetFldType(nId, sName); @@ -1012,7 +1012,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) if (nFormat != LISTBOX_ENTRY_NOTFOUND) nFormat = (ULONG)aFormatLB.GetEntryData((USHORT)nFormat); - if (pType) // Aendern + if (pType) // Aendern { SwWrtShell *pSh = GetWrtShell(); if(!pSh) @@ -1054,7 +1054,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) pSh->EndAllAction(); } } - else // Neu + else // Neu { if(nTypeId == TYP_USERFLD) { @@ -1080,19 +1080,19 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) if (nFormat != LISTBOX_ENTRY_NOTFOUND) { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren - // Namen haben! Wird hier noch nicht beachtet. + // Namen haben! Wird hier noch nicht beachtet. USHORT nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); SwDDEFieldType aType(sName, sValue, (USHORT)nFormat); aSelectionLB.InsertEntry(sName); aSelectionLB.SelectEntry(sName); - GetFldMgr().InsertFldType(aType); // DDE-Feld Neu + GetFldMgr().InsertFldType(aType); // DDE-Feld Neu } } } if (IsFldEdit()) - GetFldMgr().GetCurFld(); // FieldManager Updaten + GetFldMgr().GetCurFld(); // FieldManager Updaten UpdateSubType(); } @@ -1215,7 +1215,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) } case TYP_SEQFLD: { - // nSubType = nsSwGetSetExpType::GSE_SEQ; // nsSwGetSetExpType::GSE_SEQ wird im Fldmgr fest gesetzt, kann also entfallen + // nSubType = nsSwGetSetExpType::GSE_SEQ; // nsSwGetSetExpType::GSE_SEQ wird im Fldmgr fest gesetzt, kann also entfallen nSubType = aChapterLevelLB.GetSelectEntryPos(); if (nSubType == 0) nSubType = 0x7f; @@ -1253,7 +1253,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) return FALSE; } -SfxTabPage* SwFldVarPage::Create( Window* pParent, +SfxTabPage* SwFldVarPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldVarPage( pParent, rAttrSet ) ); @@ -1265,8 +1265,8 @@ USHORT SwFldVarPage::GetGroup() } SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ) : - ListBox (pDialog, rResId), - pDlg (pDialog), + ListBox (pDialog, rResId), + pDlg (pDialog), bCallAddSelection(FALSE) { } @@ -1281,20 +1281,20 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt ) const KeyCode aKeyCode = pKEvt->GetKeyCode(); const USHORT nModifier = aKeyCode.GetModifier(); if( aKeyCode.GetCode() == KEY_SPACE && !nModifier) -// bAddSel = TRUE; +// bAddSel = TRUE; bCallAddSelection = TRUE; } if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); - if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt oder Ctrl + if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt oder Ctrl //bAddSel = TRUE; bCallAddSelection = TRUE; } -// if (bAddSel) -// pDlg->AddSelection(this); +// if (bAddSel) +// pDlg->AddSelection(this); return nHandled; } diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 5f671402372e..e08187cf8bf8 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,47 +44,47 @@ class SwFldVarPage; class SelectionListBox : public ListBox { - SwFldVarPage* pDlg; - BOOL bCallAddSelection; + SwFldVarPage* pDlg; + BOOL bCallAddSelection; - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); public: SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ); - // Selektieren per Ctrl oder Alt erkennen und mit SelectHdl auswerten - BOOL IsCallAddSelection() const {return bCallAddSelection;} - void ResetCallAddSelection() {bCallAddSelection = FALSE;} + // Selektieren per Ctrl oder Alt erkennen und mit SelectHdl auswerten + BOOL IsCallAddSelection() const {return bCallAddSelection;} + void ResetCallAddSelection() {bCallAddSelection = FALSE;} }; class SwFldVarPage : public SwFldPage { friend class SelectionListBox; - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - SelectionListBox aSelectionLB; - FixedText aNameFT; - Edit aNameED; - FixedText aValueFT; - ConditionEdit aValueED; - FixedText aFormatFT; - NumFormatListBox aNumFormatLB; - ListBox aFormatLB; - FixedText aChapterHeaderFT; - FixedText aChapterLevelFT; - ListBox aChapterLevelLB; - CheckBox aInvisibleCB; - FixedText aSeparatorFT; - Edit aSeparatorED; - ToolBox aNewDelTBX; - - String sOldValueFT; - String sOldNameFT; - - ULONG nOldFormat; - BOOL bInit; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + SelectionListBox aSelectionLB; + FixedText aNameFT; + Edit aNameED; + FixedText aValueFT; + ConditionEdit aValueED; + FixedText aFormatFT; + NumFormatListBox aNumFormatLB; + ListBox aFormatLB; + FixedText aChapterHeaderFT; + FixedText aChapterLevelFT; + ListBox aChapterLevelLB; + CheckBox aInvisibleCB; + FixedText aSeparatorFT; + Edit aSeparatorED; + ToolBox aNewDelTBX; + + String sOldValueFT; + String sOldNameFT; + + ULONG nOldFormat; + BOOL bInit; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); @@ -93,11 +93,11 @@ class SwFldVarPage : public SwFldPage DECL_LINK( ChapterHdl, ListBox *pLB = 0); DECL_LINK( SeparatorHdl, Edit *pED = 0 ); - void UpdateSubType(); - USHORT FillFormatLB(USHORT nTypeId); + void UpdateSubType(); + USHORT FillFormatLB(USHORT nTypeId); protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldVarPage(Window* pParent, const SfxItemSet& rSet); @@ -109,7 +109,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src index 7405a2956849..eda28b7fb40d 100644 --- a/sw/source/ui/fldui/fldvar.src +++ b/sw/source/ui/fldui/fldvar.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx index b8d3a53f7351..abe6b8686e8c 100644 --- a/sw/source/ui/fldui/fldwrap.cxx +++ b/sw/source/ui/fldui/fldwrap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, USHORT nId) : IMPL_LINK( SwChildWinWrapper, UpdateHdl, void*, EMPTYARG ) { - GetWindow()->Activate(); // Dialog aktualisieren + GetWindow()->Activate(); // Dialog aktualisieren return 0; } @@ -78,7 +78,7 @@ BOOL SwChildWinWrapper::ReInitDlg(SwDocShell *) if (m_pDocSh != GetOldDocShell()) { m_aUpdateTimer.Stop(); - bRet = TRUE; // Sofortiges Update + bRet = TRUE; // Sofortiges Update } else m_aUpdateTimer.Start(); @@ -100,7 +100,7 @@ SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, USHORT nId, { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - + AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent, DLG_FLD_INSERT ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); pDlgInterface = pDlg; @@ -116,7 +116,7 @@ BOOL SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh) { BOOL bRet; - if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel + if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel { pDlgInterface->ReInitDlg(); } @@ -147,11 +147,11 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, USHORT nId, { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - + AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent, DLG_FLD_INSERT ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); - pDlgInterface = pDlg; - + pDlgInterface = pDlg; + pWindow = pDlg->GetWindow(); pDlg->ActivateDatabasePage(); pDlg->Start(); diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index ca7422ecac44..ed62263b221e 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, SwField* pField, BOOL bNextButton ) : - SvxStandardDialog(pParent, SW_RES(DLG_FLD_INPUT)), + SvxStandardDialog(pParent, SW_RES(DLG_FLD_INPUT)), rSh( rS ), pInpFld(0), @@ -66,12 +66,12 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, pUsrType(0), aLabelED (this, SW_RES(ED_LABEL )), - aEditED (this, SW_RES(ED_EDIT )), + aEditED (this, SW_RES(ED_EDIT )), aEditFL (this, SW_RES(FL_EDIT )), aOKBT (this, SW_RES(BT_OK )), - aCancelBT (this, SW_RES(BT_CANCEL )), - aNextBT (this, SW_RES(PB_NEXT )), + aCancelBT (this, SW_RES(BT_CANCEL )), + aNextBT (this, SW_RES(PB_NEXT )), aHelpBT (this, SW_RES(PB_HELP )) { // Font fuers Edit umschalten @@ -95,7 +95,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, // Auswertung hier String aStr; if( RES_INPUTFLD == pField->GetTyp()->Which() ) - { // Es ist eine Eingabefeld + { // Es ist eine Eingabefeld // pInpFld = (SwInputField*)pField; aLabelED.SetText( pInpFld->GetPar2() ); @@ -130,7 +130,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, } // JP 31.3.00: Inputfields in readonly regions must be allowed to - // input any content. - 74639 + // input any content. - 74639 BOOL bEnable = !rSh.IsCrsrReadonly(); /*!rSh.IsReadOnlyAvailable() || !rSh.HasReadonlySel()*/; aOKBT.Enable( bEnable ); @@ -153,7 +153,7 @@ void SwFldInputDlg::StateChanged( StateChangedType nType ) } /*-------------------------------------------------------------------- - Beschreibung: Schliessen + Beschreibung: Schliessen --------------------------------------------------------------------*/ void SwFldInputDlg::Apply() diff --git a/sw/source/ui/fldui/inpdlg.hrc b/sw/source/ui/fldui/inpdlg.hrc index bbd04c092010..8a7a3eea9073 100644 --- a/sw/source/ui/fldui/inpdlg.hrc +++ b/sw/source/ui/fldui/inpdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,11 +24,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FT_LABEL 1 -#define ED_EDIT 3 +#define FT_LABEL 1 +#define ED_EDIT 3 #define FL_EDIT 4 -#define BT_OK 5 -#define BT_CANCEL 6 -#define ED_LABEL 7 -#define PB_NEXT 8 -#define PB_HELP 9 +#define BT_OK 5 +#define BT_CANCEL 6 +#define ED_LABEL 7 +#define PB_NEXT 8 +#define PB_HELP 9 diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src index 8b60525dfe5c..f615b68f4899 100644 --- a/sw/source/ui/fldui/inpdlg.src +++ b/sw/source/ui/fldui/inpdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index f9fa94907cd3..c5f1876a9428 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,20 +67,20 @@ SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : SvxStandardDialog(pParent, SW_RES(DLG_JAVAEDIT)), - aTypeFT ( this, SW_RES( FT_TYPE ) ), - aTypeED ( this, SW_RES( ED_TYPE ) ), - aUrlRB ( this, SW_RES( RB_URL ) ), + aTypeFT ( this, SW_RES( FT_TYPE ) ), + aTypeED ( this, SW_RES( ED_TYPE ) ), + aUrlRB ( this, SW_RES( RB_URL ) ), aEditRB ( this, SW_RES( RB_EDIT ) ), aUrlPB ( this, SW_RES( PB_URL ) ), - aUrlED ( this, SW_RES( ED_URL ) ), - aEditED ( this, SW_RES( ED_EDIT ) ), + aUrlED ( this, SW_RES( ED_URL ) ), + aEditED ( this, SW_RES( ED_EDIT ) ), aPostItFL ( this, SW_RES( FL_POSTIT ) ), aOKBtn ( this, SW_RES( BTN_POST_OK ) ), - aCancelBtn ( this, SW_RES( BTN_POST_CANCEL ) ), - aPrevBtn ( this, SW_RES( BTN_PREV ) ), - aNextBtn ( this, SW_RES( BTN_NEXT ) ), - aHelpBtn ( this, SW_RES( BTN_POST_HELP ) ), + aCancelBtn ( this, SW_RES( BTN_POST_CANCEL ) ), + aPrevBtn ( this, SW_RES( BTN_PREV ) ), + aNextBtn ( this, SW_RES( BTN_NEXT ) ), + aHelpBtn ( this, SW_RES( BTN_POST_HELP ) ), bNew(TRUE), bIsUrl(FALSE), diff --git a/sw/source/ui/fldui/javaedit.hrc b/sw/source/ui/fldui/javaedit.hrc index d7448936d4cb..7c996e832e0b 100644 --- a/sw/source/ui/fldui/javaedit.hrc +++ b/sw/source/ui/fldui/javaedit.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,22 +29,22 @@ // defines ------------------------------------------------------------------ -#define FT_TYPE 10 -#define ED_TYPE 11 -#define RB_EDIT 12 -#define ED_EDIT 13 +#define FT_TYPE 10 +#define ED_TYPE 11 +#define RB_EDIT 12 +#define ED_EDIT 13 #define FL_POSTIT 14 -#define BTN_PREV 15 -#define BTN_NEXT 16 -#define STR_JAVA_EDIT 17 -#define STR_JAVA_INSERT 18 -#define RB_URL 19 -#define ED_URL 20 -#define PB_URL 21 +#define BTN_PREV 15 +#define BTN_NEXT 16 +#define STR_JAVA_EDIT 17 +#define STR_JAVA_INSERT 18 +#define RB_URL 19 +#define ED_URL 20 +#define PB_URL 21 -#define BTN_POST_OK 30 -#define BTN_POST_CANCEL 31 -#define BTN_POST_HELP 32 +#define BTN_POST_OK 30 +#define BTN_POST_CANCEL 31 +#define BTN_POST_HELP 32 #endif diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src index 45dbf468e7ae..ffeb2b84e899 100644 --- a/sw/source/ui/fldui/javaedit.src +++ b/sw/source/ui/fldui/javaedit.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx index 0e84693a8b17..5395a1101847 100644 --- a/sw/source/ui/fldui/xfldui.cxx +++ b/sw/source/ui/fldui/xfldui.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include <comphelper/processfactory.hxx> #include <fldmgr.hxx> #include <dbmgr.hxx> -#include <wrtsh.hxx> // Actives Fenster +#include <wrtsh.hxx> // Actives Fenster #include <view.hxx> #include <swmodule.hxx> |