diff options
Diffstat (limited to 'sw/source/ui/inc')
198 files changed, 4285 insertions, 4285 deletions
diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/ui/inc/DropDownFieldDialog.hxx index 293d76c7a3dc..51d58c698349 100644 --- a/sw/source/ui/inc/DropDownFieldDialog.hxx +++ b/sw/source/ui/inc/DropDownFieldDialog.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,7 +41,7 @@ class SwWrtShell; Dialog to edit drop down field selection --------------------------------------------------------------------*/ namespace sw -{ +{ class DropDownFieldDialog : public SvxStandardDialog { FixedLine aItemsFL; @@ -56,7 +56,7 @@ class DropDownFieldDialog : public SvxStandardDialog SwWrtShell &rSh; SwDropDownField* pDropField; - + DECL_LINK(ButtonHdl, PushButton*); virtual void Apply(); public: diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx index 4b2af9f3238e..1ba734f68847 100644 --- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/ui/inc/SwSpellDialogChildWindow.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 @@ -59,12 +59,12 @@ protected: public: SwSpellDialogChildWindow ( - Window*pParent, + Window*pParent, USHORT nId, - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWinInfo* pInfo); ~SwSpellDialogChildWindow(); - + SFX_DECL_CHILDWINDOW(SwSpellDialogChildWindow); void InvalidateSpellDialog(); diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx index 85752c0bc9ca..907cca8fac68 100644 --- a/sw/source/ui/inc/SwXFilterOptions.hxx +++ b/sw/source/ui/inc/SwXFilterOptions.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 @@ -69,7 +69,7 @@ public: // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -78,18 +78,18 @@ public: ::com::sun::star::uno::RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx index adc56934d32e..00f2780d14e4 100644 --- a/sw/source/ui/inc/abstract.hxx +++ b/sw/source/ui/inc/abstract.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 @@ -43,14 +43,14 @@ class SwInsertAbstractDlg : public SfxModalDialog { FixedLine aFL; - FixedText aLevelFT; - NumericField aLevelNF; - FixedText aParaFT; - NumericField aParaNF; - FixedText aDescFT; - OKButton aOkPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + FixedText aLevelFT; + NumericField aLevelNF; + FixedText aParaFT; + NumericField aParaNF; + FixedText aDescFT; + OKButton aOkPB; + CancelButton aCancelPB; + HelpButton aHelpPB; protected: @@ -58,8 +58,8 @@ public: SwInsertAbstractDlg( Window* pParent ); ~SwInsertAbstractDlg(); - BYTE GetLevel() const; - BYTE GetPara() const; + BYTE GetLevel() const; + BYTE GetPara() const; }; #endif diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index a43d78b11b19..98bb29ff95a3 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.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 @@ -32,21 +32,21 @@ #include "swdllapi.h" /*-------------------------------------------------------------------- - Beschreibung: numerische Eingabe + Beschreibung: numerische Eingabe --------------------------------------------------------------------*/ class SW_DLLPUBLIC NumEditAction: public NumericField { Link aActionLink; protected: - virtual void Action(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual void Action(); + virtual long Notify( NotifyEvent& rNEvt ); public: NumEditAction( Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} - void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - const Link& GetActionHdl() const { return aActionLink; } + void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} + const Link& GetActionHdl() const { return aActionLink; } }; @@ -58,13 +58,13 @@ class SW_DLLPUBLIC NoSpaceEdit : public Edit String sForbiddenChars; protected: virtual void KeyInput( const KeyEvent& ); - virtual void Modify(); + virtual void Modify(); public: NoSpaceEdit( Window* pParent, const ResId& rResId); virtual ~NoSpaceEdit(); - void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;} - const String& GetForbiddenChars(){return sForbiddenChars;} + void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;} + const String& GetForbiddenChars(){return sForbiddenChars;} }; /* -----------------21.04.98 08:33------------------- @@ -92,7 +92,7 @@ public: void SetReturnActionLink(const Link& rLink) { aReturnActionLink = rLink;} -}; +}; #endif diff --git a/sw/source/ui/inc/addrdlg.hxx b/sw/source/ui/inc/addrdlg.hxx index de798ad12f5d..bfb98b0707d6 100644 --- a/sw/source/ui/inc/addrdlg.hxx +++ b/sw/source/ui/inc/addrdlg.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 diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/ui/inc/annotsh.hxx index 5d6d74a7614e..8a1a0676db56 100644 --- a/sw/source/ui/inc/annotsh.hxx +++ b/sw/source/ui/inc/annotsh.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 @@ -35,40 +35,40 @@ class SwView; class SwAnnotationShell: public SfxShell { - SwView& rView; + SwView& rView; public: SFX_DECL_INTERFACE(SW_ANNOTATIONSHELL) TYPEINFO(); SwAnnotationShell(SwView&); - virtual ~SwAnnotationShell(); + virtual ~SwAnnotationShell(); void StateDisableItems(SfxItemSet &); - void Exec(SfxRequest &); + void Exec(SfxRequest &); - void GetState(SfxItemSet &); - void StateInsert(SfxItemSet &rSet); + void GetState(SfxItemSet &); + void StateInsert(SfxItemSet &rSet); - void NoteExec(SfxRequest &); - void GetNoteState(SfxItemSet &); + void NoteExec(SfxRequest &); + void GetNoteState(SfxItemSet &); - void ExecLingu(SfxRequest &rReq); - void GetLinguState(SfxItemSet &); + void ExecLingu(SfxRequest &rReq); + void GetLinguState(SfxItemSet &); - void ExecClpbrd(SfxRequest &rReq); - void StateClpbrd(SfxItemSet &rSet); + void ExecClpbrd(SfxRequest &rReq); + void StateClpbrd(SfxItemSet &rSet); - void ExecTransliteration(SfxRequest &); + void ExecTransliteration(SfxRequest &); - void ExecUndo(SfxRequest &rReq); - void StateUndo(SfxItemSet &rSet); + void ExecUndo(SfxRequest &rReq); + void StateUndo(SfxItemSet &rSet); - void StateStatusLine(SfxItemSet &rSet); + void StateStatusLine(SfxItemSet &rSet); - void InsertSymbol(SfxRequest& rReq); + void InsertSymbol(SfxRequest& rReq); - void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); + void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); void StateSearch(SfxItemSet &); diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index edf7014a4e4f..0ecc117ba9b5 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.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,57 +31,57 @@ #include "rcid.hrc" // Default Bitmap fuer ToolBox -#define BMP_FEHLT (RC_APP_BEGIN + 1) +#define BMP_FEHLT (RC_APP_BEGIN + 1) // Document-Icon -#define RC_DOC_ICON (RC_APP_BEGIN + 2) +#define RC_DOC_ICON (RC_APP_BEGIN + 2) //Soll das Clipboard fuer andere Applikationen... -#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3) +#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3) -#define STR_CANTCREATE (RC_APP_BEGIN + 4) -#define STR_CANTOPEN (RC_APP_BEGIN + 5) +#define STR_CANTCREATE (RC_APP_BEGIN + 4) +#define STR_CANTOPEN (RC_APP_BEGIN + 5) // Messages -#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6) +#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6) #define MSG_SAVE_HTML_QUERY ( RC_APP_BEGIN + 7) //Fuer das Interface, weil der RID_APP_BEGIN jetzt Desktop ist. -#define RID_SW_NAME ( RC_APP_BEGIN + 8) +#define RID_SW_NAME ( RC_APP_BEGIN + 8) #define MSG_SAVEAS_HTML_QUERY ( RC_APP_BEGIN + 9) -#define STR_UNBENANNT (RC_APP_BEGIN + 13) -#define STR_VERSION (RC_APP_BEGIN + 14) -#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15) -#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16) +#define STR_UNBENANNT (RC_APP_BEGIN + 13) +#define STR_VERSION (RC_APP_BEGIN + 14) +#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15) +#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16) // Bitmap fuer die NumerierungsVorlagen im Organizer -#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17) -#define BMP_STYLES_FAMILY_NUM_HC (RC_APP_BEGIN + 18) +#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17) +#define BMP_STYLES_FAMILY_NUM_HC (RC_APP_BEGIN + 18) // Strings fuer Bereiche in der Konfiguration -#define STR_GRP_FILE (RC_APP_BEGIN + 56) -#define STR_GRP_EDIT (RC_APP_BEGIN + 57) -#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58) -#define STR_GRP_VIEW (RC_APP_BEGIN + 59) -#define STR_GRP_INSERT (RC_APP_BEGIN + 60) -#define STR_GRP_FORMAT (RC_APP_BEGIN + 61) -#define STR_GRP_STYLE (RC_APP_BEGIN + 62) -#define STR_GRP_TEXT (RC_APP_BEGIN + 63) -#define STR_GRP_FRAME (RC_APP_BEGIN + 64) -#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65) -#define STR_GRP_TABLE (RC_APP_BEGIN + 66) -#define STR_GRP_TOOLS (RC_APP_BEGIN + 67) -#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68) -#define STR_GRP_WINDOW (RC_APP_BEGIN + 69) -#define STR_GRP_MISC (RC_APP_BEGIN + 70) -#define STR_GRP_MACRO (RC_APP_BEGIN + 71) -#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72) -#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73) -#define STR_PAGEOFFSET (RC_APP_BEGIN + 74) -#define STR_PAGEBREAK (RC_APP_BEGIN + 75) -#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) +#define STR_GRP_FILE (RC_APP_BEGIN + 56) +#define STR_GRP_EDIT (RC_APP_BEGIN + 57) +#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58) +#define STR_GRP_VIEW (RC_APP_BEGIN + 59) +#define STR_GRP_INSERT (RC_APP_BEGIN + 60) +#define STR_GRP_FORMAT (RC_APP_BEGIN + 61) +#define STR_GRP_STYLE (RC_APP_BEGIN + 62) +#define STR_GRP_TEXT (RC_APP_BEGIN + 63) +#define STR_GRP_FRAME (RC_APP_BEGIN + 64) +#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65) +#define STR_GRP_TABLE (RC_APP_BEGIN + 66) +#define STR_GRP_TOOLS (RC_APP_BEGIN + 67) +#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68) +#define STR_GRP_WINDOW (RC_APP_BEGIN + 69) +#define STR_GRP_MISC (RC_APP_BEGIN + 70) +#define STR_GRP_MACRO (RC_APP_BEGIN + 71) +#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72) +#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73) +#define STR_PAGEOFFSET (RC_APP_BEGIN + 74) +#define STR_PAGEBREAK (RC_APP_BEGIN + 75) +#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) #define STR_WESTERN_FONT (RC_APP_BEGIN + 77) #define STR_CJK_FONT (RC_APP_BEGIN + 78) //#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79) @@ -92,17 +92,17 @@ #define PB_MERGE_OK 2 #define PB_MERGE_CANCEL 3 #define IMG_MERGE 4 -#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89) +#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89) -#define STR_ENV_TITLE (RC_APP_BEGIN + 91) -#define STR_LAB_TITLE (RC_APP_BEGIN + 92) +#define STR_ENV_TITLE (RC_APP_BEGIN + 91) +#define STR_LAB_TITLE (RC_APP_BEGIN + 92) -#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93) +#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93) #define RID_SW_ERRHDL (RC_APP_BEGIN + 95) #define STR_FDLG_TEMPLATE_BUTTON (RC_APP_BEGIN + 1) -#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2) +#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2) // Ids fuer die einzelnen PopUpMenues @@ -170,8 +170,8 @@ #define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104) // <-- //#outline level,zhaojianwei -#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105) -#define STR_FDLG_STYLE (RC_APP_BEGIN + 106) +#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105) +#define STR_FDLG_STYLE (RC_APP_BEGIN + 106) //<-end,zhaojianwei #define APP_ACT_END STR_FDLG_STYLE diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index 59d0ca231b07..23c929f0e659 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.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 @@ -42,19 +42,19 @@ class SwDocShell; class SwAsciiFilterDlg : public SfxModalDialog { FixedLine aFL; - FixedText aCharSetFT; - SvxTextEncodingBox aCharSetLB; - FixedText aFontFT; - ListBox aFontLB; - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; - FixedText aCRLF_FT; - RadioButton aCRLF_RB, aCR_RB, aLF_RB; - OKButton aOkPB; - CancelButton aCancelPB; - HelpButton aHelpPB; - String sSystemCharSet; - BOOL bSaveLineStatus; + FixedText aCharSetFT; + SvxTextEncodingBox aCharSetLB; + FixedText aFontFT; + ListBox aFontLB; + FixedText aLanguageFT; + SvxLanguageBox aLanguageLB; + FixedText aCRLF_FT; + RadioButton aCRLF_RB, aCR_RB, aLF_RB; + OKButton aOkPB; + CancelButton aCancelPB; + HelpButton aHelpPB; + String sSystemCharSet; + BOOL bSaveLineStatus; DECL_LINK( CharSetSelHdl, SvxTextEncodingBox* ); DECL_LINK( LineEndHdl, RadioButton* ); @@ -62,8 +62,8 @@ class SwAsciiFilterDlg : public SfxModalDialog LineEnd GetCRLF() const; public: - // CTOR: for import - pStream is the inputstream - // for export - pStream must be 0 + // CTOR: for import - pStream is the inputstream + // for export - pStream must be 0 SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, SvStream* pStream ); virtual ~SwAsciiFilterDlg(); diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx index 7c3a9f197362..c3221a76ee0e 100644 --- a/sw/source/ui/inc/autoedit.hxx +++ b/sw/source/ui/inc/autoedit.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 diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/ui/inc/barcfg.hxx index cb5f06a76b47..bedf9c5d9095 100644 --- a/sw/source/ui/inc/barcfg.hxx +++ b/sw/source/ui/inc/barcfg.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 diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index b5c6fe86df68..f3c2284c650a 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.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 @@ -56,8 +56,8 @@ class SwBaseShell: public SfxShell static FlyMode eFrameMode; // Bug 75078 - if in GetState the asynch call of GetGraphic returns - // synch, the set the state directly into the itemset - SfxItemSet* pGetStateSet; + // synch, the set the state directly into the itemset + SfxItemSet* pGetStateSet; //Update-Timer fuer Graphic SvUShortsSort aGrfUpdateSlots; @@ -65,17 +65,17 @@ class SwBaseShell: public SfxShell DECL_LINK( GraphicArrivedHdl, SwCrsrShell* ); protected: - SwWrtShell& GetShell(); - SwWrtShell* GetShellPtr(); + SwWrtShell& GetShell(); + SwWrtShell* GetShellPtr(); - inline SwView& GetView() { return rView; } - inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } - inline BOOL AddGrfUpdateSlot( USHORT nSlot ){ return aGrfUpdateSlots.Insert( nSlot ); } + inline SwView& GetView() { return rView; } + inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } + inline BOOL AddGrfUpdateSlot( USHORT nSlot ){ return aGrfUpdateSlots.Insert( nSlot ); } - DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* ); + DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* ); - void InsertURLButton( const String& rURL, const String& rTarget, const String& rTxt ); - void InsertTable( SfxRequest& _rRequest ); + void InsertURLButton( const String& rURL, const String& rTarget, const String& rTxt ); + void InsertTable( SfxRequest& _rRequest ); public: SwBaseShell(SwView &rShell); @@ -96,8 +96,8 @@ public: void GetState(SfxItemSet &); void StateStyle(SfxItemSet &); - void ExecuteGallery(SfxRequest&); - void GetGalleryState(SfxItemSet&); + void ExecuteGallery(SfxRequest&); + void GetGalleryState(SfxItemSet&); void ExecDlg(SfxRequest &); @@ -105,18 +105,18 @@ public: void ExecTxtCtrl(SfxRequest& rReq); void GetTxtFontCtrlState(SfxItemSet& rSet); void GetTxtCtrlState(SfxItemSet& rSet); - void GetBorderState(SfxItemSet &rSet); + void GetBorderState(SfxItemSet &rSet); void GetBckColState(SfxItemSet &rSet); void ExecBckCol(SfxRequest& rReq); - void SetWrapMode( USHORT nSlot ); + void SetWrapMode( USHORT nSlot ); - void StateDisableItems(SfxItemSet &); + void StateDisableItems(SfxItemSet &); - void EditRegionDialog(SfxRequest& rReq); - void InsertRegionDialog(SfxRequest& rReq); + void EditRegionDialog(SfxRequest& rReq); + void InsertRegionDialog(SfxRequest& rReq); - void ExecField(SfxRequest& rReq); + void ExecField(SfxRequest& rReq); static void SetFrmMode( FlyMode eMode, SwWrtShell *pShell ); //Mit Update! static void _SetFrmMode( FlyMode eMode ) { eFrameMode = eMode; } diff --git a/sw/source/ui/inc/beziersh.hxx b/sw/source/ui/inc/beziersh.hxx index 1fa2750c0433..2e821feee391 100644 --- a/sw/source/ui/inc/beziersh.hxx +++ b/sw/source/ui/inc/beziersh.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 @@ -38,8 +38,8 @@ public: SwBezierShell(SwView &rView); - void GetState(SfxItemSet &); - void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void Execute(SfxRequest &); }; #endif diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx index ebc22332885e..051dcd914592 100644 --- a/sw/source/ui/inc/bmpwin.hxx +++ b/sw/source/ui/inc/bmpwin.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 @@ -34,7 +34,7 @@ #include <vcl/window.hxx> /*-------------------------------------------------------------------- - Beschreibung: Extended Page fuer Grafiken + Beschreibung: Extended Page fuer Grafiken --------------------------------------------------------------------*/ class BmpWindow : public Window { diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx index c426aa93c071..d51fb6d009bd 100644 --- a/sw/source/ui/inc/bookctrl.hxx +++ b/sw/source/ui/inc/bookctrl.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,7 +40,7 @@ class SwBookmarkControl : public SfxStatusBarControl virtual void Command( const CommandEvent& rCEvt ); public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index 54492b201196..b14b2182fc78 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.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 @@ #include <vcl/button.hxx> -#include "swlbox.hxx" // SwComboBox +#include "swlbox.hxx" // SwComboBox class SwWrtShell; class SfxRequest; @@ -44,16 +44,16 @@ class SfxRequest; class BookmarkCombo : public SwComboBox { - USHORT GetFirstSelEntryPos() const; - USHORT GetNextSelEntryPos(USHORT nPos) const; - USHORT GetSelEntryPos(USHORT nPos) const; + USHORT GetFirstSelEntryPos() const; + USHORT GetNextSelEntryPos(USHORT nPos) const; + USHORT GetSelEntryPos(USHORT nPos) const; - virtual long PreNotify(NotifyEvent& rNEvt); + virtual long PreNotify(NotifyEvent& rNEvt); public: BookmarkCombo( Window* pWin, const ResId& rResId ); - USHORT GetSelectEntryCount() const; - USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; + USHORT GetSelectEntryCount() const; + USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; static const String aForbiddenChars; }; @@ -64,14 +64,14 @@ public: class SwInsertBookmarkDlg: public SvxStandardDialog { - BookmarkCombo aBookmarkBox; + BookmarkCombo aBookmarkBox; FixedLine aBookmarkFl; - OKButton aOkBtn; - CancelButton aCancelBtn; - PushButton aDeleteBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + PushButton aDeleteBtn; - String sRemoveWarning; - SwWrtShell &rSh; + String sRemoveWarning; + SwWrtShell &rSh; SfxRequest& rReq; DECL_LINK( ModifyHdl, BookmarkCombo * ); diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx index 1d4236a90575..1b488c0398b5 100644 --- a/sw/source/ui/inc/break.hxx +++ b/sw/source/ui/inc/break.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 @@ -42,25 +42,25 @@ class SwWrtShell; class SwBreakDlg: public SvxStandardDialog { - SwWrtShell &rSh; - RadioButton aLineBtn; - RadioButton aColumnBtn; - RadioButton aPageBtn; - FixedText aPageCollText; - ListBox aPageCollBox; - CheckBox aPageNumBox; - NumericField aPageNumEdit; + SwWrtShell &rSh; + RadioButton aLineBtn; + RadioButton aColumnBtn; + RadioButton aPageBtn; + FixedText aPageCollText; + ListBox aPageCollBox; + CheckBox aPageNumBox; + NumericField aPageNumEdit; FixedLine aBreakFL; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; String aTemplate; USHORT nKind; USHORT nPgNum; - BOOL bHtmlMode; + BOOL bHtmlMode; DECL_LINK( ClickHdl, void * ); DECL_LINK( PageNumHdl, CheckBox * ); diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index 119f20a4f257..c60fa6178d52 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.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 @@ -48,60 +48,60 @@ private: // sal_Unicode cSeparator; String sSeparator; String sCharacterStyle; - + BOOL bIgnoreSeqOpts; // wird nicht gespeichert - BOOL bCopyAttributes; // -""- + BOOL bCopyAttributes; // -""- public: InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = 0); InsCaptionOpt(const InsCaptionOpt&); ~InsCaptionOpt(); - inline BOOL& UseCaption() { return bUseCaption; } - inline BOOL UseCaption() const { return bUseCaption; } + inline BOOL& UseCaption() { return bUseCaption; } + inline BOOL UseCaption() const { return bUseCaption; } - inline SwCapObjType GetObjType() const { return eObjType; } - inline void SetObjType(const SwCapObjType eType) { eObjType = eType; } + inline SwCapObjType GetObjType() const { return eObjType; } + inline void SetObjType(const SwCapObjType eType) { eObjType = eType; } - inline const SvGlobalName& GetOleId() const { return aOleId; } - inline void SetOleId(const SvGlobalName &rId) { aOleId = rId; } + inline const SvGlobalName& GetOleId() const { return aOleId; } + inline void SetOleId(const SvGlobalName &rId) { aOleId = rId; } - inline const String& GetCategory() const { return sCategory; } - inline void SetCategory(const String& rCat) { sCategory = rCat; } + inline const String& GetCategory() const { return sCategory; } + inline void SetCategory(const String& rCat) { sCategory = rCat; } - inline USHORT GetNumType() const { return nNumType; } - inline void SetNumType(const USHORT nNT) { nNumType = nNT; } + inline USHORT GetNumType() const { return nNumType; } + inline void SetNumType(const USHORT nNT) { nNumType = nNT; } const ::rtl::OUString& GetNumSeparator() const { return sNumberSeparator; } void SetNumSeparator(const ::rtl::OUString& rSet) {sNumberSeparator = rSet;} inline const String& GetCaption() const { return sCaption; } - inline void SetCaption(const String& rCap) { sCaption = rCap; } + inline void SetCaption(const String& rCap) { sCaption = rCap; } - inline USHORT GetPos() const { return nPos; } - inline void SetPos(const USHORT nP) { nPos = nP; } + inline USHORT GetPos() const { return nPos; } + inline void SetPos(const USHORT nP) { nPos = nP; } - inline USHORT GetLevel() const { return nLevel; } - inline void SetLevel(const USHORT nLvl) { nLevel = nLvl; } + inline USHORT GetLevel() const { return nLevel; } + inline void SetLevel(const USHORT nLvl) { nLevel = nLvl; } -// inline sal_Unicode GetSeparator() const { return cSeparator; } -// inline void SetSeparator(const sal_Unicode cSep){ cSeparator = cSep; } - inline const String& GetSeparator() const { return sSeparator; } - inline void SetSeparator(const String& rSep) { sSeparator = rSep; } +// inline sal_Unicode GetSeparator() const { return cSeparator; } +// inline void SetSeparator(const sal_Unicode cSep){ cSeparator = cSep; } + inline const String& GetSeparator() const { return sSeparator; } + inline void SetSeparator(const String& rSep) { sSeparator = rSep; } const String& GetCharacterStyle() const { return sCharacterStyle; } - void SetCharacterStyle(const String& rStyle) + void SetCharacterStyle(const String& rStyle) { sCharacterStyle = rStyle; } - inline BOOL& IgnoreSeqOpts() { return bIgnoreSeqOpts; } - inline BOOL IgnoreSeqOpts() const { return bIgnoreSeqOpts; } + inline BOOL& IgnoreSeqOpts() { return bIgnoreSeqOpts; } + inline BOOL IgnoreSeqOpts() const { return bIgnoreSeqOpts; } - inline BOOL& CopyAttributes() { return bCopyAttributes; } - inline BOOL CopyAttributes() const { return bCopyAttributes; } + inline BOOL& CopyAttributes() { return bCopyAttributes; } + inline BOOL CopyAttributes() const { return bCopyAttributes; } - BOOL operator==( const InsCaptionOpt& rOpt ) const; - InsCaptionOpt& operator= ( const InsCaptionOpt& rOpt ); - inline BOOL operator< ( const InsCaptionOpt & rObj ) const + BOOL operator==( const InsCaptionOpt& rOpt ) const; + InsCaptionOpt& operator= ( const InsCaptionOpt& rOpt ); + inline BOOL operator< ( const InsCaptionOpt & rObj ) const { return aOleId < rObj.aOleId; } // friend SvStream& operator>>( SvStream& rIStream, InsCaptionOpt& rCapOpt ); // friend SvStream& operator<<( SvStream& rOStream, const InsCaptionOpt& rCapOpt ); diff --git a/sw/source/ui/inc/cfgdesc.hxx b/sw/source/ui/inc/cfgdesc.hxx index 9de404744078..6ffab5c21cde 100644 --- a/sw/source/ui/inc/cfgdesc.hxx +++ b/sw/source/ui/inc/cfgdesc.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 @@ -42,14 +42,14 @@ protected: ~SwCfgDesc(); public: - void SetEvent(USHORT nE); // inline - void SetFuncText(const String &rStr); // inline + void SetEvent(USHORT nE); // inline + void SetFuncText(const String &rStr); // inline void SetMacro(const String &rLib, const String &rMac); BOOL IsMacro() const; - USHORT GetEvent() const; // inline - String GetFuncText() const; // inline - String GetMacro() const; // inline - String GetLib() const; // inline + USHORT GetEvent() const; // inline + String GetFuncText() const; // inline + String GetMacro() const; // inline + String GetLib() const; // inline }; // INLINE METHODE -------------------------------------------------------- @@ -61,10 +61,10 @@ inline void SwCfgDesc::SetFuncText(const String &rStr) { aFuncText = rStr; } -inline USHORT SwCfgDesc::GetEvent() const { return nEvent; } -inline String SwCfgDesc::GetFuncText() const { return aFuncText; } -inline String SwCfgDesc::GetMacro() const { return aFuncText; } -inline String SwCfgDesc::GetLib() const { return aLibName; } +inline USHORT SwCfgDesc::GetEvent() const { return nEvent; } +inline String SwCfgDesc::GetFuncText() const { return aFuncText; } +inline String SwCfgDesc::GetMacro() const { return aFuncText; } +inline String SwCfgDesc::GetLib() const { return aLibName; } #endif diff --git a/sw/source/ui/inc/cfgid.h b/sw/source/ui/inc/cfgid.h index d4602a2e89e5..b8b794b7b729 100644 --- a/sw/source/ui/inc/cfgid.h +++ b/sw/source/ui/inc/cfgid.h @@ -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 @@ -31,11 +31,11 @@ #include <sfx2/sfx.hrc> #define CFG_STATUSBAR (SFX_ITEMTYPE_SW_BEGIN +13) -#define CFG_SW_MENU (SFX_ITEMTYPE_SW_BEGIN +16) -#define CFG_SW_ACCEL (SFX_ITEMTYPE_SW_BEGIN +17) +#define CFG_SW_MENU (SFX_ITEMTYPE_SW_BEGIN +16) +#define CFG_SW_ACCEL (SFX_ITEMTYPE_SW_BEGIN +17) #define CFG_SWWEB_MENU (SFX_ITEMTYPE_SW_BEGIN +19) #define CFG_SWWEB_ACCEL (SFX_ITEMTYPE_SW_BEGIN +20) -#define CFG_INSERT_DBCOLUMN_ITEM (SFX_ITEMTYPE_SW_BEGIN +25) +#define CFG_INSERT_DBCOLUMN_ITEM (SFX_ITEMTYPE_SW_BEGIN +25) #define CFG_SWGLOBAL_MENU (SFX_ITEMTYPE_SW_BEGIN +29) #endif diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index 8793a6d8ff00..5ce83a95fcb6 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.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 @@ -49,7 +49,7 @@ class SwShdwCrsrOptionsTabPage; class SwDocEditDialog; SfxPrinter* GetPrt( ViewShell* ); -void SetPrt( SfxPrinter* ); +void SetPrt( SfxPrinter* ); /*--------OS 12.01.95 ----------------------------------- Item fuer Einstellungsdialog - Dokumentanzeige @@ -82,10 +82,10 @@ public: USHORT nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - void operator=( const SwDocDisplayItem& ); - void FillViewOptions( SwViewOption& rVOpt) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + void operator=( const SwDocDisplayItem& ); + void FillViewOptions( SwViewOption& rVOpt) const; }; /*--------OS 12.01.95 ----------------------------------- @@ -95,22 +95,22 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem { //view BOOL bHorzScrollbar :1; - BOOL bVertScrollbar :1; + BOOL bVertScrollbar :1; BOOL bAnyRuler : 1; BOOL bHorzRuler :1; - BOOL bVertRuler :1; + BOOL bVertRuler :1; BOOL bVertRulerRight:1; BOOL bSmoothScroll :1; //visual aids - BOOL bCrosshair :1; - BOOL bHandles :1; - BOOL bBigHandles :1; + BOOL bCrosshair :1; + BOOL bHandles :1; + BOOL bBigHandles :1; //display BOOL bTable :1; - BOOL bGraphic :1; - BOOL bDrawing :1; - BOOL bFieldName :1; - BOOL bNotes :1; + BOOL bGraphic :1; + BOOL bDrawing :1; + BOOL bFieldName :1; + BOOL bNotes :1; friend class SwContentOptPage; @@ -123,9 +123,9 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - void operator=( const SwElemItem& ); + void operator=( const SwElemItem& ); - void FillViewOptions( SwViewOption& rVOpt) const; + void FillViewOptions( SwViewOption& rVOpt) const; }; @@ -149,7 +149,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; const rtl::OUString &GetFax() const { return sFaxName; } - void SetFax( const String& rFax) { sFaxName = rFax; } + void SetFax( const String& rFax) { sFaxName = rFax; } BOOL IsPrintProspect() const { return bPrintProspect; } @@ -159,7 +159,7 @@ public: BOOL IsPrintGraphic () const { return bPrintGraphic; } BOOL IsPrintTable () const { return bPrintTable; } BOOL IsPrintDraw () const { return bPrintDraw; } - BOOL IsPrintControl () const { return bPrintControl; } + BOOL IsPrintControl () const { return bPrintControl; } BOOL IsPrintLeftPage () const { return bPrintLeftPages; } BOOL IsPrintRightPage() const { return bPrintRightPages; } BOOL IsPrintReverse () const { return bPrintReverse; } @@ -192,15 +192,15 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - void operator=( const SwShadowCursorItem& ); + void operator=( const SwShadowCursorItem& ); void FillViewOptions( SwViewOption& rVOpt) const; - BYTE GetMode() const { return eMode; } - BOOL IsOn() const { return bOn; } + BYTE GetMode() const { return eMode; } + BOOL IsOn() const { return bOn; } - void SetMode( BYTE eM ) { eMode = eM; } - void SetOn( BOOL bFlag ) { bOn = bFlag; } + void SetMode( BYTE eM ) { eMode = eM; } + void SetOn( BOOL bFlag ) { bOn = bFlag; } }; #if OSL_DEBUG_LEVEL > 1 @@ -215,14 +215,14 @@ class SW_DLLPUBLIC SwTestItem : public SfxPoolItem friend class SwTestTabPage; friend class SwDocEditDialog; - BOOL bTest1:1; - BOOL bTest2:1; - BOOL bTest3:1; - BOOL bTest4:1; - BOOL bTest5:1; - BOOL bTest6:1; - BOOL bTest7:1; - BOOL bTest8:1; + BOOL bTest1:1; + BOOL bTest2:1; + BOOL bTest3:1; + BOOL bTest4:1; + BOOL bTest5:1; + BOOL bTest6:1; + BOOL bTest7:1; + BOOL bTest8:1; BOOL bTest9:1; BOOL bTest10:1; diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index de5c57dd9671..85f5fa0baa13 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.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 @@ -49,34 +49,34 @@ struct SwDBData; class SwChangeDBDlg: public SvxStandardDialog { FixedLine aDBListFL; - FixedText aUsedDBFT; - FixedText aAvailDBFT; - SvTreeListBox aUsedDBTLB; - SwDBTreeList aAvailDBTLB; + FixedText aUsedDBFT; + FixedText aAvailDBFT; + SvTreeListBox aUsedDBTLB; + SwDBTreeList aAvailDBTLB; PushButton aAddDBPB; - FixedInfo aDescFT; - FixedText aDocDBTextFT; - FixedText aDocDBNameFT; - OKButton aOKBT; - CancelButton aCancelBT; - HelpButton aHelpBT; -// PushButton aChangeBT; + FixedInfo aDescFT; + FixedText aDocDBTextFT; + FixedText aDocDBNameFT; + OKButton aOKBT; + CancelButton aCancelBT; + HelpButton aHelpBT; +// PushButton aChangeBT; ImageList aImageList; ImageList aImageListHC; SwWrtShell *pSh; - SwFldMgr *pMgr; + SwFldMgr *pMgr; DECL_LINK(TreeSelectHdl, SvTreeListBox* pBox = 0); DECL_LINK(ButtonHdl, Button* pBtn); DECL_LINK(AddDBHdl, PushButton*); - virtual void Apply(); - void UpdateFlds(); - void FillDBPopup(); - SvLBoxEntry* Insert(const String& rDBName); - void ShowDBName(const SwDBData& rDBData); + virtual void Apply(); + void UpdateFlds(); + void FillDBPopup(); + SvLBoxEntry* Insert(const String& rDBName); + void ShowDBName(const SwDBData& rDBData); public: SwChangeDBDlg(SwView& rVw); diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx index 4b6de648be57..668f587e60b9 100644 --- a/sw/source/ui/inc/chartins.hxx +++ b/sw/source/ui/inc/chartins.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 diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/ui/inc/chldwrap.hxx index 4bd104d860c8..f034948def6f 100644 --- a/sw/source/ui/inc/chldwrap.hxx +++ b/sw/source/ui/inc/chldwrap.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,7 +45,7 @@ protected: SwChildWinWrapper(Window *pParentWindow, USHORT nId); public: - virtual BOOL ReInitDlg(SwDocShell *pDocSh); + virtual BOOL ReInitDlg(SwDocShell *pDocSh); inline SwDocShell* GetOldDocShell() { return m_pDocSh; } inline void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx index 7f3679beacf7..5b7319607013 100644 --- a/sw/source/ui/inc/chrdlg.hxx +++ b/sw/source/ui/inc/chrdlg.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,7 +45,7 @@ class SwView; class SvxMacroItem; /*-------------------------------------------------------------------- - Beschreibung: Der Tabdialog Traeger der TabPages + Beschreibung: Der Tabdialog Traeger der TabPages --------------------------------------------------------------------*/ class SwCharDlg: public SfxTabDialog @@ -70,24 +70,24 @@ class SwCharURLPage : public SfxTabPage { FixedLine aURLFL; - FixedText aURLFT; + FixedText aURLFT; Edit aURLED; - FixedText aTextFT; + FixedText aTextFT; Edit aTextED; - FixedText aNameFT; + FixedText aNameFT; Edit aNameED; - FixedText aTargetFrmFT; - ComboBox aTargetFrmLB; - PushButton aURLPB; - PushButton aEventPB; + FixedText aTargetFrmFT; + ComboBox aTargetFrmLB; + PushButton aURLPB; + PushButton aEventPB; FixedLine aStyleFL; - FixedText aVisitedFT; + FixedText aVisitedFT; ListBox aVisitedLB; FixedText aNotVisitedFT; ListBox aNotVisitedLB; - SvxMacroItem* pINetItem; - BOOL bModified; + SvxMacroItem* pINetItem; + BOOL bModified; DECL_LINK( InsertFileHdl, PushButton * ); DECL_LINK( EventHdl, PushButton * ); diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx index 81eed9995b8d..c3be731cbdf8 100644 --- a/sw/source/ui/inc/cnttab.hxx +++ b/sw/source/ui/inc/cnttab.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 @@ -54,8 +54,8 @@ struct CurTOXType { - TOXTypes eType; - USHORT nIndex; //for TOX_USER only + TOXTypes eType; + USHORT nIndex; //for TOX_USER only BOOL operator==(const CurTOXType aCmp) { @@ -70,13 +70,13 @@ struct CurTOXType class SwOLENames : public Resource { - ResStringArray aNamesAry; + ResStringArray aNamesAry; public: SwOLENames(const ResId& rResId) : Resource(rResId), aNamesAry(ResId(1,*rResId.GetResMgr())){FreeResource();} - ResStringArray& GetNames() { return aNamesAry;} + ResStringArray& GetNames() { return aNamesAry;} }; diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/ui/inc/colex.hxx index fb93c8d11ffa..ce4aac9a2fd3 100644 --- a/sw/source/ui/inc/colex.hxx +++ b/sw/source/ui/inc/colex.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 @@ -68,8 +68,8 @@ public: class SW_DLLPUBLIC SwColExample : public SwPageExample { - SwColMgr* pColMgr; - + SwColMgr* pColMgr; + using SwPageExample::UpdateExample; protected: diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx index cc2ecd26bd24..6c96475a20c1 100644 --- a/sw/source/ui/inc/colmgr.hxx +++ b/sw/source/ui/inc/colmgr.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 @@ -42,47 +42,47 @@ public: ~SwColMgr(); - inline USHORT GetCount() const; - void SetCount(USHORT nCount, USHORT nGutterWidth); - USHORT GetGutterWidth(USHORT nPos = USHRT_MAX) const; - void SetGutterWidth(USHORT nWidth, USHORT nPos = USHRT_MAX); + inline USHORT GetCount() const; + void SetCount(USHORT nCount, USHORT nGutterWidth); + USHORT GetGutterWidth(USHORT nPos = USHRT_MAX) const; + void SetGutterWidth(USHORT nWidth, USHORT nPos = USHRT_MAX); - USHORT GetColWidth(USHORT nIdx) const; - void SetColWidth(USHORT nIdx, USHORT nWidth); + USHORT GetColWidth(USHORT nIdx) const; + void SetColWidth(USHORT nIdx, USHORT nWidth); - inline BOOL IsAutoWidth() const; - void SetAutoWidth(BOOL bOn = TRUE, USHORT lGutterWidth = 0); + inline BOOL IsAutoWidth() const; + void SetAutoWidth(BOOL bOn = TRUE, USHORT lGutterWidth = 0); - inline BOOL HasLine() const; - inline void SetNoLine(); + inline BOOL HasLine() const; + inline void SetNoLine(); - inline void SetLineWidthAndColor(ULONG nWidth, const Color& rCol); - inline ULONG GetLineWidth() const; + inline void SetLineWidthAndColor(ULONG nWidth, const Color& rCol); + inline ULONG GetLineWidth() const; inline const Color& GetLineColor() const; inline SwColLineAdj GetAdjust() const; - inline void SetAdjust(SwColLineAdj); + inline void SetAdjust(SwColLineAdj); - short GetLineHeightPercent() const; - void SetLineHeightPercent(short nPercent); + short GetLineHeightPercent() const; + void SetLineHeightPercent(short nPercent); - inline void NoCols(); - void Update(); + inline void NoCols(); + void Update(); - const SwFmtCol& GetColumns() const { return aFmtCol; } + const SwFmtCol& GetColumns() const { return aFmtCol; } - void SetActualWidth(USHORT nW); - USHORT GetActualSize() const { return nWidth; } + void SetActualWidth(USHORT nW); + USHORT GetActualSize() const { return nWidth; } private: - SwFmtCol aFmtCol; - USHORT nWidth; + SwFmtCol aFmtCol; + USHORT nWidth; }; // INLINE METHODE -------------------------------------------------------- -inline USHORT SwColMgr::GetCount() const +inline USHORT SwColMgr::GetCount() const { return aFmtCol.GetNumCols(); } @@ -93,7 +93,7 @@ inline void SwColMgr::SetLineWidthAndColor(ULONG nLWidth, const Color& r aFmtCol.SetLineColor(rCol); } -inline ULONG SwColMgr::GetLineWidth() const +inline ULONG SwColMgr::GetLineWidth() const { return aFmtCol.GetLineWidth(); } @@ -103,12 +103,12 @@ inline const Color& SwColMgr::GetLineColor() const return aFmtCol.GetLineColor(); } -inline SwColLineAdj SwColMgr::GetAdjust() const +inline SwColLineAdj SwColMgr::GetAdjust() const { return aFmtCol.GetLineAdj(); } -inline void SwColMgr::SetAdjust(SwColLineAdj eAdj) +inline void SwColMgr::SetAdjust(SwColLineAdj eAdj) { aFmtCol.SetLineAdj(eAdj); } @@ -123,7 +123,7 @@ inline void SwColMgr::SetAutoWidth(BOOL bOn, USHORT nGutterWidth) aFmtCol.SetOrtho(bOn, nGutterWidth, nWidth); } -inline void SwColMgr::NoCols() +inline void SwColMgr::NoCols() { aFmtCol.GetColumns().DeleteAndDestroy(0, aFmtCol.GetColumns().Count()); } diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 0ebdf821a42a..7f5cb000b103 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.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 @@ -53,28 +53,28 @@ class SwColumnPage; class SwColumnDlg : public SfxModalDialog { - OKButton aOK; - CancelButton aCancel; - HelpButton aHelp; + OKButton aOK; + CancelButton aCancel; + HelpButton aHelp; - FixedText aApplyToFT; - ListBox aApplyToLB; + FixedText aApplyToFT; + ListBox aApplyToLB; - SwWrtShell& rWrtShell; - SwColumnPage* pTabPage; - SfxItemSet* pPageSet; - SfxItemSet* pSectionSet; - SfxItemSet* pSelectionSet; - SfxItemSet* pFrameSet; + SwWrtShell& rWrtShell; + SwColumnPage* pTabPage; + SfxItemSet* pPageSet; + SfxItemSet* pSectionSet; + SfxItemSet* pSelectionSet; + SfxItemSet* pFrameSet; - long nOldSelection; - long nSelectionWidth; - long nPageWidth; + long nOldSelection; + long nSelectionWidth; + long nPageWidth; - BOOL bPageChanged : 1; - BOOL bSectionChanged : 1; - BOOL bSelSectionChanged : 1; - BOOL bFrameChanged : 1; + BOOL bPageChanged : 1; + BOOL bSectionChanged : 1; + BOOL bSelSectionChanged : 1; + BOOL bFrameChanged : 1; DECL_LINK(ObjectHdl, ListBox*); @@ -84,7 +84,7 @@ public: SwColumnDlg(Window* pParent, SwWrtShell& rSh); virtual ~SwColumnDlg(); - SwWrtShell& GetWrtShell() { return rWrtShell; } + SwWrtShell& GetWrtShell() { return rWrtShell; } }; class ColumnValueSet : public ValueSet @@ -94,46 +94,46 @@ class ColumnValueSet : public ValueSet ValueSet(pParent, rResId){} ~ColumnValueSet(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; /*-------------------------------------------------------------------- - Beschreibung: Spaltendialog jetzt als TabPage + Beschreibung: Spaltendialog jetzt als TabPage --------------------------------------------------------------------*/ class SwColumnPage : public SfxTabPage { - FixedText aClNrLbl; - NumericField aCLNrEdt; - ColumnValueSet aDefaultVS; - ImageList aPreColsIL; - CheckBox aBalanceColsCB; - FixedLine aFLGroup; - - ImageButton aBtnUp; + FixedText aClNrLbl; + NumericField aCLNrEdt; + ColumnValueSet aDefaultVS; + ImageList aPreColsIL; + CheckBox aBalanceColsCB; + FixedLine aFLGroup; + + ImageButton aBtnUp; FixedText aColumnFT; - FixedText aWidthFT; - FixedText aDistFT; + FixedText aWidthFT; + FixedText aDistFT; FixedText aLbl1; - PercentField aEd1; - PercentField aDistEd1; + PercentField aEd1; + PercentField aDistEd1; FixedText aLbl2; - PercentField aEd2; - PercentField aDistEd2; + PercentField aEd2; + PercentField aDistEd2; FixedText aLbl3; - PercentField aEd3; - ImageButton aBtnDown; - CheckBox aAutoWidthBox; + PercentField aEd3; + ImageButton aBtnDown; + CheckBox aAutoWidthBox; - FixedLine aFLLayout; + FixedLine aFLLayout; - FixedText aLineTypeLbl; - LineListBox aLineTypeDLB; - FixedText aLineHeightLbl; - MetricField aLineHeightEdit; - FixedText aLinePosLbl; - ListBox aLinePosDLB; - FixedLine aFLLineType; + FixedText aLineTypeLbl; + LineListBox aLineTypeDLB; + FixedText aLineHeightLbl; + MetricField aLineHeightEdit; + FixedText aLinePosLbl; + ListBox aLinePosDLB; + FixedLine aFLLineType; FixedLine aVertFL; FixedLine aPropertiesFL; @@ -141,21 +141,21 @@ class SwColumnPage : public SfxTabPage ListBox aTextDirectionLB; // Example - SwColExample aPgeExampleWN; - SwColumnOnlyExample aFrmExampleWN; + SwColExample aPgeExampleWN; + SwColumnOnlyExample aFrmExampleWN; SwColMgr* pColMgr; - USHORT nFirstVis; - USHORT nCols; - long nColWidth[nMaxCols]; - long nColDist[nMaxCols]; - USHORT nMinWidth; - PercentField *pModifiedField; - BOOL bFormat; - BOOL bFrm; - BOOL bHtmlMode; - BOOL bLockUpdate; + USHORT nFirstVis; + USHORT nCols; + long nColWidth[nMaxCols]; + long nColDist[nMaxCols]; + USHORT nMinWidth; + PercentField *pModifiedField; + BOOL bFormat; + BOOL bFrm; + BOOL bHtmlMode; + BOOL bLockUpdate; // Handler DECL_LINK( ColModify, NumericField * ); @@ -167,20 +167,20 @@ class SwColumnPage : public SfxTabPage DECL_LINK( Up, Button * ); DECL_LINK( Down, Button * ); - void Apply(Button *); + void Apply(Button *); DECL_LINK( UpdateColMgr, void* ); - void Update(); - void UpdateCols(); - void Init(); - void ResetColWidth(); - void SetLabels( USHORT nVis ); + void Update(); + void UpdateCols(); + void Init(); + void ResetColWidth(); + void SetLabels( USHORT nVis ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); SwColumnPage(Window *pParent, const SfxItemSet &rSet); @@ -190,8 +190,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static USHORT* GetRanges(); - virtual BOOL FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual void Reset(const SfxItemSet &rSet); void SetFrmMode(BOOL bMod); void SetPageWidth(long nPageWidth); diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/ui/inc/conarc.hxx index 720af53b9057..e1e6666e25d3 100644 --- a/sw/source/ui/inc/conarc.hxx +++ b/sw/source/ui/inc/conarc.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,15 +45,15 @@ public: ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); + virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Funktion aktivieren - virtual void Deactivate(); + virtual void Activate(const USHORT nSlotId); // Funktion aktivieren + virtual void Deactivate(); }; -#endif // _CONARC_HXX +#endif // _CONARC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx index 85c096ed2c71..36abb80ca39a 100644 --- a/sw/source/ui/inc/concustomshape.hxx +++ b/sw/source/ui/inc/concustomshape.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 @@ -56,7 +56,7 @@ class ConstCustomShape : public SwDrawBase virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren rtl::OUString GetShapeType() const; static rtl::OUString GetShapeTypeFromRequest( SfxRequest& rReq ); @@ -69,6 +69,6 @@ class ConstCustomShape : public SwDrawBase -#endif // _SW_CONRECT_HXX +#endif // _SW_CONRECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx index 4cd343986171..f44514eca353 100644 --- a/sw/source/ui/inc/condedit.hxx +++ b/sw/source/ui/inc/condedit.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 @@ -36,16 +36,16 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper { BOOL bBrackets, bEnableDrop; - SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); public: ConditionEdit( Window* pParent, const ResId& rResId ); - inline void ShowBrackets(BOOL bShow) { bBrackets = bShow; } + inline void ShowBrackets(BOOL bShow) { bBrackets = bShow; } - inline void SetDropEnable( BOOL bFlag ) { bEnableDrop = bFlag; } - inline BOOL IsDropEnable() const { return bEnableDrop; } + inline void SetDropEnable( BOOL bFlag ) { bEnableDrop = bFlag; } + inline BOOL IsDropEnable() const { return bEnableDrop; } }; #endif diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/ui/inc/conform.hxx index 7f450e730a98..be9094af8b3c 100644 --- a/sw/source/ui/inc/conform.hxx +++ b/sw/source/ui/inc/conform.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 @@ -38,7 +38,7 @@ public: // Mouse- & Key-Events virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren virtual void CreateDefaultObject(); }; diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/ui/inc/conpoly.hxx index 43244db17b2a..124b51564c30 100644 --- a/sw/source/ui/inc/conpoly.hxx +++ b/sw/source/ui/inc/conpoly.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 @@ -48,10 +48,10 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren }; -#endif // _CONPOLY_HXX +#endif // _CONPOLY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/ui/inc/conrect.hxx index 3f07874a10d0..2694f7c3df91 100644 --- a/sw/source/ui/inc/conrect.hxx +++ b/sw/source/ui/inc/conrect.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 @@ -43,7 +43,7 @@ class ConstRectangle : public SwDrawBase BOOL bCapVertical; // #93382# - sal_Bool mbVertical; + sal_Bool mbVertical; public: ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); @@ -52,11 +52,11 @@ class ConstRectangle : public SwDrawBase virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren }; -#endif // _SW_CONRECT_HXX +#endif // _SW_CONRECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index 5abb7ec6cfb4..3230f8ecb7f4 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONTENT_HXX #define _CONTENT_HXX -#include <limits.h> // USHRT_MAX +#include <limits.h> // USHRT_MAX #include "swcont.hxx" #include <vcl/menu.hxx> @@ -41,12 +41,12 @@ class SwTOXBase; class SwRedline; //---------------------------------------------------------------------------- -// Hilfsklassen +// Hilfsklassen //---------------------------------------------------------------------------- class SwPopup : public PopupMenu { - USHORT nCurId; + USHORT nCurId; virtual void Select(){nCurId = GetCurItemId();} public: @@ -54,7 +54,7 @@ public: PopupMenu(), nCurId(USHRT_MAX){} - USHORT GetCurId() const { return nCurId; } + USHORT GetCurId() const { return nCurId; } }; @@ -62,38 +62,38 @@ public: class SwOutlineContent : public SwContent { - USHORT nOutlinePos; - BYTE nOutlineLevel; - BOOL bIsMoveable; + USHORT nOutlinePos; + BYTE nOutlineLevel; + BOOL bIsMoveable; public: - SwOutlineContent( const SwContentType* pCnt, + SwOutlineContent( const SwContentType* pCnt, const String& rName, USHORT nArrPos, BYTE nLevel, BOOL bMove, long nYPos) : - SwContent(pCnt, rName, nYPos), + SwContent(pCnt, rName, nYPos), nOutlinePos(nArrPos), nOutlineLevel(nLevel), bIsMoveable(bMove) {} - USHORT GetPos(){return nOutlinePos;} - BYTE GetOutlineLevel(){return nOutlineLevel;} - BOOL IsMoveable(){return bIsMoveable;}; + USHORT GetPos(){return nOutlinePos;} + BYTE GetOutlineLevel(){return nOutlineLevel;} + BOOL IsMoveable(){return bIsMoveable;}; }; //---------------------------------------------------------------------------- class SwRegionContent : public SwContent { - BYTE nRegionLevel; + BYTE nRegionLevel; public: - SwRegionContent( const SwContentType* pCnt, + SwRegionContent( const SwContentType* pCnt, const String& rName, BYTE nLevel, long nYPos) : SwContent(pCnt, rName, nYPos), nRegionLevel(nLevel){} - BYTE GetRegionLevel() const {return nRegionLevel;} + BYTE GetRegionLevel() const {return nRegionLevel;} }; //---------------------------------------------------------------------------- @@ -103,7 +103,7 @@ class SwURLFieldContent : public SwContent const SwTxtINetFmt* pINetAttr; public: - SwURLFieldContent( const SwContentType* pCnt, + SwURLFieldContent( const SwContentType* pCnt, const String& rName, const String& rURL, const SwTxtINetFmt* pAttr, @@ -111,17 +111,17 @@ public: : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr ) {} - virtual BOOL IsProtect() const; - const String& GetURL() { return sURL; } - const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } + virtual BOOL IsProtect() const; + const String& GetURL() { return sURL; } + const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } }; //---------------------------------------------------------------------------- class SwPostItContent : public SwContent { - const SwFmtFld* pFld; - SwRedline* pRedline; - bool mbPostIt; + const SwFmtFld* pFld; + SwRedline* pRedline; + bool mbPostIt; public: SwPostItContent( const SwContentType* pCnt, const String& rName, @@ -136,24 +136,24 @@ public: : SwContent( pCnt, rName, nYPos ), pRedline( pRed ),mbPostIt(false) {} - const SwFmtFld* GetPostIt() { return pFld; } - SwRedline* GetRedline() { return pRedline; } - virtual BOOL IsProtect() const; - bool IsPostIt() {return mbPostIt; } + const SwFmtFld* GetPostIt() { return pFld; } + SwRedline* GetRedline() { return pRedline; } + virtual BOOL IsProtect() const; + bool IsPostIt() {return mbPostIt; } }; //---------------------------------------------------------------------------- class SwGraphicContent : public SwContent { - String sLink; + String sLink; public: SwGraphicContent(const SwContentType* pCnt, const String& rName, const String& rLink, long nYPos) : SwContent( pCnt, rName, nYPos ), sLink( rLink ) {} virtual ~SwGraphicContent(); - const String& GetLink() const {return sLink;} + const String& GetLink() const {return sLink;} }; //---------------------------------------------------------------------------- @@ -179,45 +179,45 @@ public: class SwContentType : public SwTypeNumber { - SwWrtShell* pWrtShell; - SwContentArr* pMember; // Array fuer Inhalte - String sContentTypeName; // Name der Inhaltsform - String sSingleContentTypeName; // Name der Inhaltsform, Singular - String sTypeToken; // Anhaengsel fuer URL - USHORT nMemberCount; // Inhaltsanzahl - USHORT nContentType; // Id der Inhaltsform - BYTE nOutlineLevel; - BOOL bMemberFilled : 1; // wurden die Inhalte bereits eingefuegt? - BOOL bIsInternalDrag:1; // koennen die Inhalte verschoben werden? - BOOL bDataValid : 1; // - BOOL bEdit: 1; // kann diese Type bearbeitet werden ? - BOOL bDelete: 1; // kann diese Type geloescht werden ? + SwWrtShell* pWrtShell; + SwContentArr* pMember; // Array fuer Inhalte + String sContentTypeName; // Name der Inhaltsform + String sSingleContentTypeName; // Name der Inhaltsform, Singular + String sTypeToken; // Anhaengsel fuer URL + USHORT nMemberCount; // Inhaltsanzahl + USHORT nContentType; // Id der Inhaltsform + BYTE nOutlineLevel; + BOOL bMemberFilled : 1; // wurden die Inhalte bereits eingefuegt? + BOOL bIsInternalDrag:1; // koennen die Inhalte verschoben werden? + BOOL bDataValid : 1; // + BOOL bEdit: 1; // kann diese Type bearbeitet werden ? + BOOL bDelete: 1; // kann diese Type geloescht werden ? protected: - void RemoveNewline(String&); + void RemoveNewline(String&); public: SwContentType(SwWrtShell* pParent, USHORT nType, BYTE nLevel ); ~SwContentType(); - void Init(BOOL* pbInvalidateWindow = 0); - void FillMemberList(BOOL* pbLevelChanged = NULL); - USHORT GetMemberCount() const + void Init(BOOL* pbInvalidateWindow = 0); + void FillMemberList(BOOL* pbLevelChanged = NULL); + USHORT GetMemberCount() const {return nMemberCount;}; - USHORT GetType() const {return nContentType;} - const SwContent* GetMember(USHORT nIndex); - const String& GetName() {return sContentTypeName;} - const String& GetSingleName() const {return sSingleContentTypeName;} - const String& GetTypeToken() const{return sTypeToken;} + USHORT GetType() const {return nContentType;} + const SwContent* GetMember(USHORT nIndex); + const String& GetName() {return sContentTypeName;} + const String& GetSingleName() const {return sSingleContentTypeName;} + const String& GetTypeToken() const{return sTypeToken;} - void SetOutlineLevel(BYTE nNew) + void SetOutlineLevel(BYTE nNew) { nOutlineLevel = nNew; Invalidate(); } - void Invalidate(); // nur nMemberCount wird neu gelesen + void Invalidate(); // nur nMemberCount wird neu gelesen - BOOL IsEditable() const {return bEdit;} - BOOL IsDeletable() const {return bDelete;} + BOOL IsEditable() const {return bEdit;} + BOOL IsDeletable() const {return bDelete;} }; #endif diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 877e74799b33..ddfa451d2c5e 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.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,62 +45,62 @@ class SwGlblDocContent; class SfxObjectShell; -#define EDIT_MODE_EDIT 0 -#define EDIT_MODE_UPD_IDX 1 -#define EDIT_MODE_RMV_IDX 2 -#define EDIT_UNPROTECT_TABLE 3 -#define EDIT_MODE_DELETE 4 -#define EDIT_MODE_RENAME 5 +#define EDIT_MODE_EDIT 0 +#define EDIT_MODE_UPD_IDX 1 +#define EDIT_MODE_RMV_IDX 2 +#define EDIT_UNPROTECT_TABLE 3 +#define EDIT_MODE_DELETE 4 +#define EDIT_MODE_RENAME 5 //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- class SwContentTree : public SvTreeListBox { - ImageList aEntryImages; - String sSpace; - AutoTimer aUpdTimer; + ImageList aEntryImages; + String sSpace; + AutoTimer aUpdTimer; - SwContentType* aActiveContentArr[CONTENT_TYPE_MAX]; - SwContentType* aHiddenContentArr[CONTENT_TYPE_MAX]; - String aContextStrings[CONTEXT_COUNT + 1]; + SwContentType* aActiveContentArr[CONTENT_TYPE_MAX]; + SwContentType* aHiddenContentArr[CONTENT_TYPE_MAX]; + String aContextStrings[CONTEXT_COUNT + 1]; String sRemoveIdx; String sUpdateIdx; String sUnprotTbl; - String sRename; - String sReadonlyIdx; - String sInvisible; - String sPostItShow; - String sPostItHide; - String sPostItDelete; + String sRename; + String sReadonlyIdx; + String sInvisible; + String sPostItShow; + String sPostItHide; + String sPostItDelete; - SwWrtShell* pHiddenShell; // gedropptes Doc - SwWrtShell* pActiveShell; // die aktive oder eine konst. offene View - SwNavigationConfig* pConfig; + SwWrtShell* pHiddenShell; // gedropptes Doc + SwWrtShell* pActiveShell; // die aktive oder eine konst. offene View + SwNavigationConfig* pConfig; std::map< void*, sal_Bool > mOutLineNodeMap; sal_Int32 nActiveBlock; - USHORT nHiddenBlock; - USHORT nRootType; - USHORT nLastSelType; - BYTE nOutlineLevel; - - BOOL bIsActive :1; - BOOL bIsConstant :1; - BOOL bIsHidden :1; - BOOL bDocChgdInDragging :1; - BOOL bIsInternalDrag :1; - BOOL bIsRoot :1; - BOOL bIsIdleClear :1; - BOOL bIsLastReadOnly :1; - BOOL bIsOutlineMoveable :1; - BOOL bViewHasChanged :1; - BOOL bIsImageListInitialized : 1; - - static BOOL bIsInDrag; - - void FindActiveTypeAndRemoveUserData(); + USHORT nHiddenBlock; + USHORT nRootType; + USHORT nLastSelType; + BYTE nOutlineLevel; + + BOOL bIsActive :1; + BOOL bIsConstant :1; + BOOL bIsHidden :1; + BOOL bDocChgdInDragging :1; + BOOL bIsInternalDrag :1; + BOOL bIsRoot :1; + BOOL bIsIdleClear :1; + BOOL bIsLastReadOnly :1; + BOOL bIsOutlineMoveable :1; + BOOL bViewHasChanged :1; + BOOL bIsImageListInitialized : 1; + + static BOOL bIsInDrag; + + void FindActiveTypeAndRemoveUserData(); using SvLBox::ExecuteDrop; using SvTreeListBox::EditEntry; @@ -110,22 +110,22 @@ class SwContentTree : public SvTreeListBox protected: // virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); virtual void DataChanged( const DataChangedEvent& rDCEvt ); SwNavigationPI* GetParentWindow(){return (SwNavigationPI*)Window::GetParent();} - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void DragFinished( sal_Int8 ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - sal_Bool FillTransferData( TransferDataContainer& rTransfer, + sal_Bool FillTransferData( TransferDataContainer& rTransfer, sal_Int8& rDragMode ); - BOOL HasContentChanged(); + BOOL HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* ); @@ -143,10 +143,10 @@ protected: ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); - void EditEntry( SvLBoxEntry* pEntry, BYTE nMode ); - - void GotoContent(SwContent* pCnt); - static void SetInDrag(BOOL bSet) {bIsInDrag = bSet;} + void EditEntry( SvLBoxEntry* pEntry, BYTE nMode ); + + void GotoContent(SwContent* pCnt); + static void SetInDrag(BOOL bSet) {bIsInDrag = bSet;} virtual PopupMenu* CreateContextMenu( void ); virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); @@ -155,57 +155,57 @@ public: SwContentTree(Window* pParent, const ResId& rResId); ~SwContentTree(); - BOOL ToggleToRoot(); - BOOL IsRoot() const {return bIsRoot;} - USHORT GetRootType() const {return nRootType;} - void SetRootType(USHORT nType); - void Display( BOOL bActiveView ); - void Clear(); - void SetHiddenShell(SwWrtShell* pSh); - void ShowHiddenShell(); - void ShowActualView(); - void SetActiveShell(SwWrtShell* pSh); - void SetConstantShell(SwWrtShell* pSh); - - SwWrtShell* GetWrtShell() + BOOL ToggleToRoot(); + BOOL IsRoot() const {return bIsRoot;} + USHORT GetRootType() const {return nRootType;} + void SetRootType(USHORT nType); + void Display( BOOL bActiveView ); + void Clear(); + void SetHiddenShell(SwWrtShell* pSh); + void ShowHiddenShell(); + void ShowActualView(); + void SetActiveShell(SwWrtShell* pSh); + void SetConstantShell(SwWrtShell* pSh); + + SwWrtShell* GetWrtShell() {return bIsActive||bIsConstant ? pActiveShell : pHiddenShell;} - static BOOL IsInDrag() {return bIsInDrag;} - BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} + static BOOL IsInDrag() {return bIsInDrag;} + BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} sal_Int32 GetActiveBlock() const {return nActiveBlock;} - BYTE GetOutlineLevel()const {return nOutlineLevel;} - void SetOutlineLevel(BYTE nSet); - - BOOL Expand( SvLBoxEntry* pParent ); - - BOOL Collapse( SvLBoxEntry* pParent ); - - void ExecCommand(USHORT nCmd, BOOL bModifier); - - void ShowTree(); - void HideTree(); - - BOOL IsConstantView() {return bIsConstant;} - BOOL IsActiveView() {return bIsActive;} - BOOL IsHiddenView() {return bIsHidden;} - - const SwWrtShell* GetActiveWrtShell() {return pActiveShell;} - SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;} + BYTE GetOutlineLevel()const {return nOutlineLevel;} + void SetOutlineLevel(BYTE nSet); + + BOOL Expand( SvLBoxEntry* pParent ); + + BOOL Collapse( SvLBoxEntry* pParent ); + + void ExecCommand(USHORT nCmd, BOOL bModifier); + + void ShowTree(); + void HideTree(); + + BOOL IsConstantView() {return bIsConstant;} + BOOL IsActiveView() {return bIsActive;} + BOOL IsHiddenView() {return bIsHidden;} + + const SwWrtShell* GetActiveWrtShell() {return pActiveShell;} + SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;} DECL_LINK( ContentDoubleClickHdl, SwContentTree * ); // DECL_LINK( PopupHdl, Menu* ); DECL_LINK( TimerUpdate, Timer * ); virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual void RequestingChilds( SvLBoxEntry* pParent ); virtual void GetFocus(); virtual void KeyInput(const KeyEvent& rKEvt); - - virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); + + virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); }; @@ -232,10 +232,10 @@ namespace sfx2 { class FileDialogHelper; } class SwGlobalTree : public SvTreeListBox { private: - AutoTimer aUpdateTimer; - String aContextStrings[GLOBAL_CONTEXT_COUNT]; + AutoTimer aUpdateTimer; + String aContextStrings[GLOBAL_CONTEXT_COUNT]; - ImageList aEntryImages; + ImageList aEntryImages; SwWrtShell* pActiveShell; // SvLBoxEntry* pEmphasisEntry; // Drag'n Drop-Emphasis @@ -246,9 +246,9 @@ private: SwGlblDocContent* pDocContent; sfx2::DocumentInserter* pDocInserter; - BOOL bIsInternalDrag :1; - BOOL bLastEntryEmphasis :1; // Drag'n Drop - BOOL bIsImageListInitialized : 1; + BOOL bIsInternalDrag :1; + BOOL bLastEntryEmphasis :1; // Drag'n Drop + BOOL bIsImageListInitialized : 1; static const SfxObjectShell* pShowShell; @@ -264,12 +264,12 @@ private: protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); virtual BOOL NotifyMoving( SvLBoxEntry* pTarget, @@ -283,8 +283,8 @@ protected: ULONG& rNewChildPos ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void DragFinished( sal_Int8 ); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* ); virtual BOOL NotifyAcceptDrop( SvLBoxEntry* ); @@ -292,26 +292,26 @@ protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput(const KeyEvent& rKEvt); virtual void GetFocus(); - virtual void SelectHdl(); - virtual void DeselectHdl(); + virtual void SelectHdl(); + virtual void DeselectHdl(); virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); - void Clear(); + void Clear(); - DECL_LINK( PopupHdl, Menu* ); - DECL_LINK( Timeout, Timer* ); - DECL_LINK( DoubleClickHdl, SwGlobalTree * ); + DECL_LINK( PopupHdl, Menu* ); + DECL_LINK( Timeout, Timer* ); + DECL_LINK( DoubleClickHdl, SwGlobalTree * ); - BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} + BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} SwNavigationPI* GetParentWindow() { return (SwNavigationPI*)Window::GetParent(); } - void OpenDoc(const SwGlblDocContent*); - void GotoContent(const SwGlblDocContent*); - USHORT GetEnableFlags() const; + void OpenDoc(const SwGlblDocContent*); + void GotoContent(const SwGlblDocContent*); + USHORT GetEnableFlags() const; - static const SfxObjectShell* GetShowShell() {return pShowShell;} - static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} + static const SfxObjectShell* GetShowShell() {return pShowShell;} + static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*); virtual PopupMenu* CreateContextMenu( void ); @@ -321,19 +321,19 @@ public: SwGlobalTree(Window* pParent, const ResId& rResId); virtual ~SwGlobalTree(); - void TbxMenuHdl(USHORT nTbxId, ToolBox* pBox); - void InsertRegion( const SwGlblDocContent* pCont, + void TbxMenuHdl(USHORT nTbxId, ToolBox* pBox); + void InsertRegion( const SwGlblDocContent* pCont, const String* pFileName = 0 ); - void EditContent(const SwGlblDocContent* pCont ); - - void ShowTree(); - void HideTree(); - - void ExecCommand(USHORT nCmd); + void EditContent(const SwGlblDocContent* pCont ); + + void ShowTree(); + void HideTree(); - void Display(BOOL bOnlyUpdateUserData = FALSE); + void ExecCommand(USHORT nCmd); - BOOL Update(BOOL bHard); + void Display(BOOL bOnlyUpdateUserData = FALSE); + + BOOL Update(BOOL bHard); }; #endif diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index 3fc218459f68..b6b3ff07d772 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.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 @@ -42,35 +42,35 @@ struct SwInsertTableOptions; class SwConvertTableDlg: public SfxModalDialog { - RadioButton aTabBtn; - RadioButton aSemiBtn; - RadioButton aParaBtn; - RadioButton aOtherBtn; - Edit aOtherEd; - CheckBox aKeepColumn; + RadioButton aTabBtn; + RadioButton aSemiBtn; + RadioButton aParaBtn; + RadioButton aOtherBtn; + Edit aOtherEd; + CheckBox aKeepColumn; FixedLine aDelimFL; - CheckBox aHeaderCB; - CheckBox aRepeatHeaderCB; - + CheckBox aHeaderCB; + CheckBox aRepeatHeaderCB; + FixedText aRepeatHeaderFT; // "dummy" to build before and after FT FixedText aRepeatHeaderBeforeFT; NumericField aRepeatHeaderNF; FixedText aRepeatHeaderAfterFT; TextControlCombo aRepeatHeaderCombo; - + FixedLine aOptionsFL; CheckBox aDontSplitCB; - CheckBox aBorderCB; + CheckBox aBorderCB; PushButton aAutoFmtBtn; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; - String sConvertTextTable; - SwTableAutoFmt* pTAutoFmt; - SwWrtShell* pShell; + String sConvertTextTable; + SwTableAutoFmt* pTAutoFmt; + SwWrtShell* pShell; DECL_LINK( AutoFmtHdl, PushButton* ); DECL_LINK( BtnHdl, Button* ); diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index b2a74794d7de..b6fe3e7ef901 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.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 @@ -68,28 +68,28 @@ class SwCaptionDialog : public SvxStandardDialog : ComboBox( pParent, rResId ) {} - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); }; - FixedText aTextText; - Edit aTextEdit; + FixedText aTextText; + Edit aTextEdit; FixedLine aSettingsFL; - FixedText aCategoryText; - CategoryBox aCategoryBox; - FixedText aFormatText; - ListBox aFormatBox; - //#i61007# order of captions + FixedText aCategoryText; + CategoryBox aCategoryBox; + FixedText aFormatText; + ListBox aFormatBox; + //#i61007# order of captions FixedText aNumberingSeparatorFT; Edit aNumberingSeparatorED; FixedText aSepText; Edit aSepEdit; - FixedText aPosText; - ListBox aPosBox; - OKButton aOKButton; + FixedText aPosText; + ListBox aPosBox; + OKButton aOKButton; CancelButton aCancelButton; - HelpButton aHelpButton; + HelpButton aHelpButton; PushButton aAutoCaptionButton; - PushButton aOptionButton; + PushButton aOptionButton; String sNone; @@ -101,11 +101,11 @@ class SwCaptionDialog : public SvxStandardDialog String sCharacterStyle; String sObjectName; - bool bCopyAttributes; + bool bCopyAttributes; bool bOrderNumberingFirst; //#i61007# order of captions - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xNameAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > xNamed; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xNameAccess; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > xNamed; DECL_LINK( SelectHdl, ListBox * ); DECL_LINK( ModifyHdl, Edit * ); @@ -116,7 +116,7 @@ class SwCaptionDialog : public SvxStandardDialog void DrawSample(); void CheckButtonWidth(); - void ApplyCaptionOrder(); //#i61007# order of captions + void ApplyCaptionOrder(); //#i61007# order of captions public: SwCaptionDialog( Window *pParent, SwView &rV ); diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/ui/inc/dbconfig.hxx index f8da4b00c8d9..2b64258983c1 100644 --- a/sw/source/ui/inc/dbconfig.hxx +++ b/sw/source/ui/inc/dbconfig.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,8 +44,8 @@ public: SwDBConfig(); virtual ~SwDBConfig(); - void Load(); - const SwDBData& GetAddressSource(); + void Load(); + const SwDBData& GetAddressSource(); const SwDBData& GetBibliographySource(); virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 9ca9c15b06ef..a060c278cbb5 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.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 @@ -91,59 +91,59 @@ SV_DECL_PTRARR_SORT_DEL( SwInsDBColumns, SwInsDBColumnPtr, 32, 32 ) class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem { - FixedText aFtInsertData; - RadioButton aRbAsTable; - RadioButton aRbAsField; - RadioButton aRbAsText; + FixedText aFtInsertData; + RadioButton aRbAsTable; + RadioButton aRbAsField; + RadioButton aRbAsText; FixedLine aFlHead; - FixedText aFtDbColumn; + FixedText aFtDbColumn; - ListBox aLbTblDbColumn; - ListBox aLbTxtDbColumn; + ListBox aLbTblDbColumn; + ListBox aLbTxtDbColumn; FixedLine aFlFormat; - RadioButton aRbDbFmtFromDb; - RadioButton aRbDbFmtFromUsr; + RadioButton aRbDbFmtFromDb; + RadioButton aRbDbFmtFromUsr; NumFormatListBox aLbDbFmtFromUsr; /* ----- Page Text/Field ------- */ ImageButton aIbDbcolToEdit; - MultiLineEdit aEdDbText; - FixedText aFtDbParaColl; - ListBox aLbDbParaColl; + MultiLineEdit aEdDbText; + FixedText aFtDbParaColl; + ListBox aLbDbParaColl; /* ----- Page Table ------------ */ ImageButton aIbDbcolAllTo; ImageButton aIbDbcolOneTo; ImageButton aIbDbcolOneFrom; ImageButton aIbDbcolAllFrom; - FixedText aFtTableCol; - ListBox aLbTableCol; - CheckBox aCbTableHeadon; - RadioButton aRbHeadlColnms; - RadioButton aRbHeadlEmpty; - PushButton aPbTblFormat; - PushButton aPbTblAutofmt; - - OKButton aBtOk; - CancelButton aBtCancel; - HelpButton aBtHelp; + FixedText aFtTableCol; + ListBox aLbTableCol; + CheckBox aCbTableHeadon; + RadioButton aRbHeadlColnms; + RadioButton aRbHeadlEmpty; + PushButton aPbTblFormat; + PushButton aPbTblAutofmt; + + OKButton aBtOk; + CancelButton aBtCancel; + HelpButton aBtHelp; FixedLine aFlBottom; SwInsDBColumns aDBColumns; - const SwDBData aDBData; + const SwDBData aDBData; - Link aOldNumFmtLnk; - String sNoTmpl; + Link aOldNumFmtLnk; + String sNoTmpl; - SwView* pView; - SwTableAutoFmt* pTAutoFmt; + SwView* pView; + SwTableAutoFmt* pTAutoFmt; - SfxItemSet* pTblSet; - SwTableRep* pRep; - USHORT nGBFmtLen; + SfxItemSet* pTblSet; + SwTableRep* pRep; + USHORT nGBFmtLen; DECL_LINK( PageHdl, Button* ); DECL_LINK( AutoFmtHdl, PushButton* ); @@ -157,8 +157,8 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem BOOL SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, BOOL bInsField ); using SfxModalDialog::Notify; virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void Commit(); - void Load(); + virtual void Commit(); + void Load(); // setze die Tabellen - Eigenschaften void SetTabSet(); diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx index c3f53c513842..6a874595cb27 100644 --- a/sw/source/ui/inc/dbtree.hxx +++ b/sw/source/ui/inc/dbtree.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,23 +45,23 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox { ImageList aImageList; ImageList aImageListHC; - Image aDBBMP; - Image aTableBMP; - Image aQueryBMP; + Image aDBBMP; + Image aTableBMP; + Image aQueryBMP; - String sDefDBName; - BOOL bInitialized; - BOOL bShowColumns; + String sDefDBName; + BOOL bInitialized; + BOOL bShowColumns; SwDBTreeList_Impl* pImpl; SW_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* ); - SW_DLLPRIVATE void InitTreeList(); - SW_DLLPRIVATE virtual void RequestingChilds( SvLBoxEntry* pParent ); + SW_DLLPRIVATE void InitTreeList(); + SW_DLLPRIVATE virtual void RequestingChilds( SvLBoxEntry* pParent ); SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); using SvTreeListBox::Select; @@ -74,12 +74,12 @@ public: String GetDBName( String& rTableName, String& rColumnName, BOOL* pbIsTable = 0); - void Select( const String& rDBName, const String& rTableName, + void Select( const String& rDBName, const String& rTableName, const String& rColumnName ); - void ShowColumns(BOOL bShowCol); + void ShowColumns(BOOL bShowCol); void SetWrtShell(SwWrtShell& rSh); - + void AddDataSource(const String& rSource); }; diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index 95a5864ef9d1..0a490f9a8f01 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.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 @@ -43,14 +43,14 @@ public: MONITOR_TYPE_MAIL, MONITOR_TYPE_SAVE }; - FixedText aDocName; - FixedText aPrinting; - FixedText aPrinter; - FixedText aPrintInfo; - CancelButton aCancel; + FixedText aDocName; + FixedText aPrinting; + FixedText aPrinter; + FixedText aPrintInfo; + CancelButton aCancel; PrintMonitor( Window *pParent, PrintMonitorType eType ); - + void ResizeControls(); }; @@ -68,11 +68,11 @@ private: //methods void UpdateCountingText(); private: //member - FixedText m_aStatus; - FixedText m_aProgress; - FixedText m_aCreateDocuments; - FixedText m_aCounting; - CancelButton m_aCancelButton; + FixedText m_aStatus; + FixedText m_aProgress; + FixedText m_aCreateDocuments; + FixedText m_aCounting; + CancelButton m_aCancelButton; String m_sCountingPattern; String m_sVariable_Total; diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/ui/inc/dialmgr.hxx index 7be3129b8a5b..dba1a878330b 100644 --- a/sw/source/ui/inc/dialmgr.hxx +++ b/sw/source/ui/inc/dialmgr.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 @@ -38,13 +38,13 @@ class ResMgr; struct SwDialogsResMgr { - static ResMgr* GetResMgr(); + static ResMgr* GetResMgr(); }; -#define SWDIALOG_MGR() SwDialogsResMgr::GetResMgr() -#define SW_RES(i) ResId(i,SWDIALOG_MGR()) -#define SW_RESSTR(i) UniString(ResId(i,SWDIALOG_MGR())) -#define SW_RESSSTR(i) String(ResId(i,SWDIALOG_MGR())) +#define SWDIALOG_MGR() SwDialogsResMgr::GetResMgr() +#define SW_RES(i) ResId(i,SWDIALOG_MGR()) +#define SW_RESSTR(i) UniString(ResId(i,SWDIALOG_MGR())) +#define SW_RESSSTR(i) String(ResId(i,SWDIALOG_MGR())) #endif diff --git a/sw/source/ui/inc/docfnote.hxx b/sw/source/ui/inc/docfnote.hxx index 69b65f12ae1e..b8bffcc346ea 100644 --- a/sw/source/ui/inc/docfnote.hxx +++ b/sw/source/ui/inc/docfnote.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 diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx index fd48d593ee3f..388e12e7537f 100644 --- a/sw/source/ui/inc/docstdlg.hxx +++ b/sw/source/ui/inc/docstdlg.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 @@ -71,11 +71,11 @@ private: FixedInfo aCharNo; FixedInfo aLineNo; - PushButton aUpdatePB; + PushButton aUpdatePB; SwDocStat aDocStat; void Update(); - + using Window::SetData; void SetData(const SwDocStat &rStat); }; diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx index fa306a080db1..14df0b150e29 100644 --- a/sw/source/ui/inc/drawbase.hxx +++ b/sw/source/ui/inc/drawbase.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 @@ -36,7 +36,7 @@ class SwEditWin; class KeyEvent; class MouseEvent; -#define MIN_FREEHAND_DISTANCE 10 +#define MIN_FREEHAND_DISTANCE 10 /************************************************************************* |* @@ -61,8 +61,8 @@ public: SwDrawBase(SwWrtShell *pSh, SwEditWin* pWin, SwView* pView); virtual ~SwDrawBase(); - void SetDrawPointer(); - void EnterSelectMode(const MouseEvent& rMEvt); + void SetDrawPointer(); + void EnterSelectMode(const MouseEvent& rMEvt); inline BOOL IsInsertForm() const { return m_bInsForm; } inline BOOL IsCreateObj() const { return m_bCreateObj; } @@ -72,12 +72,12 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - void BreakCreate(); + void BreakCreate(); void SetSlotId(USHORT nSlot) {m_nSlotId = nSlot;} USHORT GetSlotId() { return m_nSlotId;} - virtual void Activate(const USHORT nSlotId); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren virtual void CreateDefaultObject(); @@ -87,6 +87,6 @@ public: -#endif // _SW_DRAWBASE_HXX +#endif // _SW_DRAWBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drawsh.hxx b/sw/source/ui/inc/drawsh.hxx index 4325661414f9..fc39b69bac0f 100644 --- a/sw/source/ui/inc/drawsh.hxx +++ b/sw/source/ui/inc/drawsh.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,14 +40,14 @@ public: SwDrawShell(SwView &rView); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); - void ExecDrawDlg(SfxRequest& rReq); - void ExecDrawAttrArgs(SfxRequest& rReq); - void GetDrawAttrState(SfxItemSet &rSet); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void ExecDrawDlg(SfxRequest& rReq); + void ExecDrawAttrArgs(SfxRequest& rReq); + void GetDrawAttrState(SfxItemSet &rSet); - void ExecFormText(SfxRequest& rReq); - void GetFormTextState(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq); + void GetFormTextState(SfxItemSet& rSet); }; #endif diff --git a/sw/source/ui/inc/drformsh.hxx b/sw/source/ui/inc/drformsh.hxx index 061b2f4aad23..ca08eb8b54e6 100644 --- a/sw/source/ui/inc/drformsh.hxx +++ b/sw/source/ui/inc/drformsh.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 @@ -39,10 +39,10 @@ public: TYPEINFO(); SwDrawFormShell(SwView &rView); - virtual ~SwDrawFormShell(); + virtual ~SwDrawFormShell(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); }; #endif diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx index 75ce9441c6ea..ccf15d8da08f 100644 --- a/sw/source/ui/inc/drpcps.hxx +++ b/sw/source/ui/inc/drpcps.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 @@ -63,27 +63,27 @@ class SwDropCapsPage : public SfxTabPage { friend class SwDropCapsPict; - CheckBox aDropCapsBox; - CheckBox aWholeWordCB; - FixedText aSwitchText; - NumericField aDropCapsField; - FixedText aLinesText; - NumericField aLinesField; - FixedText aDistanceText; - MetricField aDistanceField; + CheckBox aDropCapsBox; + CheckBox aWholeWordCB; + FixedText aSwitchText; + NumericField aDropCapsField; + FixedText aLinesText; + NumericField aLinesField; + FixedText aDistanceText; + MetricField aDistanceField; FixedLine aSettingsFL; - FixedText aTextText; - Edit aTextEdit; - FixedText aTemplateText; - ListBox aTemplateBox; + FixedText aTextText; + Edit aTextEdit; + FixedText aTemplateText; + ListBox aTemplateBox; FixedLine aContentFL; - SwDropCapsPict *pPict; + SwDropCapsPict *pPict; - BOOL bModified; - BOOL bFormat; - BOOL bHtmlMode; + BOOL bModified; + BOOL bFormat; + BOOL bHtmlMode; SwWrtShell &rSh; @@ -91,7 +91,7 @@ friend class SwDropCapsPict; ~SwDropCapsPage(); virtual int DeactivatePage(SfxItemSet *pSet); - void FillSet( SfxItemSet &rSet ); + void FillSet( SfxItemSet &rSet ); DECL_LINK( ClickHdl, Button * ); DECL_LINK( ModifyHdl, Edit * ); @@ -109,7 +109,7 @@ public: virtual BOOL FillItemSet( SfxItemSet &rSet); virtual void Reset (const SfxItemSet &rSet); - void SetFormat(BOOL bSet){bFormat = bSet;} + void SetFormat(BOOL bSet){bFormat = bSet;} }; #endif diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/ui/inc/drwbassh.hxx index e57cf394183f..60b9ecc90239 100644 --- a/sw/source/ui/inc/drwbassh.hxx +++ b/sw/source/ui/inc/drwbassh.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 @@ -37,11 +37,11 @@ struct SvxSwFrameValidation; class SwDrawBaseShell: public SwBaseShell { - SwDrawBase* pDrawActual; + SwDrawBase* pDrawActual; - UINT16 eDrawMode; - BOOL bRotate : 1; - BOOL bSelMove: 1; + UINT16 eDrawMode; + BOOL bRotate : 1; + BOOL bSelMove: 1; DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* ); DECL_LINK(ValidatePosition, SvxSwFrameValidation* ); @@ -52,12 +52,12 @@ public: SFX_DECL_INTERFACE(SW_DRAWBASESHELL) TYPEINFO(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); - void DisableState(SfxItemSet &rSet) { Disable(rSet);} - BOOL Disable(SfxItemSet& rSet, USHORT nWhich = 0); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void DisableState(SfxItemSet &rSet) { Disable(rSet);} + BOOL Disable(SfxItemSet& rSet, USHORT nWhich = 0); - void StateStatusline(SfxItemSet &rSet); + void StateStatusline(SfxItemSet &rSet); }; diff --git a/sw/source/ui/inc/drwtxtsh.hxx b/sw/source/ui/inc/drwtxtsh.hxx index a77eadf598b1..115bae7fa76c 100644 --- a/sw/source/ui/inc/drwtxtsh.hxx +++ b/sw/source/ui/inc/drwtxtsh.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 @@ -38,49 +38,49 @@ class SfxModule; class SwDrawTextShell: public SfxShell { - SwView &rView; + SwView &rView; - SdrView *pSdrView; + SdrView *pSdrView; - BOOL bRotate : 1; - BOOL bSelMove: 1; + BOOL bRotate : 1; + BOOL bSelMove: 1; - void SetAttrToMarked(const SfxItemSet& rAttr); + void SetAttrToMarked(const SfxItemSet& rAttr); void InsertSymbol(SfxRequest& rReq); - BOOL IsTextEdit(); + BOOL IsTextEdit(); public: SFX_DECL_INTERFACE(SW_DRWTXTSHELL) TYPEINFO(); - SwView &GetView() { return rView; } + SwView &GetView() { return rView; } SwWrtShell &GetShell(); SwDrawTextShell(SwView &rView); - virtual ~SwDrawTextShell(); + virtual ~SwDrawTextShell(); virtual SfxUndoManager* GetUndoManager(); void StateDisableItems(SfxItemSet &); - void Execute(SfxRequest &); - void ExecDraw(SfxRequest &); - void GetState(SfxItemSet &); - void GetDrawTxtCtrlState(SfxItemSet&); + void Execute(SfxRequest &); + void ExecDraw(SfxRequest &); + void GetState(SfxItemSet &); + void GetDrawTxtCtrlState(SfxItemSet&); - void ExecFontWork(SfxRequest& rReq); - void StateFontWork(SfxItemSet& rSet); - void ExecFormText(SfxRequest& rReq); - void GetFormTextState(SfxItemSet& rSet); - void ExecDrawLingu(SfxRequest &rReq); - void ExecUndo(SfxRequest &rReq); - void StateUndo(SfxItemSet &rSet); - void ExecClpbrd(SfxRequest &rReq); - void StateClpbrd(SfxItemSet &rSet); - void StateInsert(SfxItemSet &rSet); - void ExecTransliteration(SfxRequest &); + void ExecFontWork(SfxRequest& rReq); + void StateFontWork(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq); + void GetFormTextState(SfxItemSet& rSet); + void ExecDrawLingu(SfxRequest &rReq); + void ExecUndo(SfxRequest &rReq); + void StateUndo(SfxItemSet &rSet); + void ExecClpbrd(SfxRequest &rReq); + void StateClpbrd(SfxItemSet &rSet); + void StateInsert(SfxItemSet &rSet); + void ExecTransliteration(SfxRequest &); - void Init(); - void StateStatusline(SfxItemSet &rSet); + void Init(); + void StateStatusline(SfxItemSet &rSet); }; #endif diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/ui/inc/dselect.hxx index 68af7d2a9366..40d559a2afea 100644 --- a/sw/source/ui/inc/dselect.hxx +++ b/sw/source/ui/inc/dselect.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,11 +44,11 @@ class DrawSelection : public SwDrawBase // Mouse- & Key-Events virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren }; -#endif // _SW_DSELECT_HXX +#endif // _SW_DSELECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index 3cc702f8cd3b..b139e723d6f4 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.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 @@ -38,47 +38,47 @@ #define _SVSTDARR_STRINGSISORTDTOR #include <svl/svstdarr.hxx> -class SwWrtShell; -class SwView; -class SwRect; -class ViewShell; -class SwAnchorMarker; -class SdrObject; -class SwShadowCursor; -class DataChangedEvent; +class SwWrtShell; +class SwView; +class SwRect; +class ViewShell; +class SwAnchorMarker; +class SdrObject; +class SwShadowCursor; +class DataChangedEvent; class SvxAutoCorrCfg; class SvxAutoCorrect; class SwPaM; -struct SwApplyTemplate; -struct QuickHelpData; +struct SwApplyTemplate; +struct QuickHelpData; class SdrDropMarkerOverlay; /*-------------------------------------------------------------------- - Beschreibung: Eingabe-Fenster + Beschreibung: Eingabe-Fenster --------------------------------------------------------------------*/ class SwEditWin: public Window, public DropTargetHelper, public DragSourceHelper { -friend void ScrollMDI(ViewShell* pVwSh, const SwRect&, +friend void ScrollMDI(ViewShell* pVwSh, const SwRect&, USHORT nRangeX, USHORT nRangeY); -friend BOOL IsScrollMDI(ViewShell* pVwSh, const SwRect&); +friend BOOL IsScrollMDI(ViewShell* pVwSh, const SwRect&); -friend void SizeNotify(ViewShell* pVwSh, const Size &); +friend void SizeNotify(ViewShell* pVwSh, const Size &); -friend void PageNumNotify( ViewShell* pVwSh, +friend void PageNumNotify( ViewShell* pVwSh, USHORT nPhyNum, USHORT nVirtNum, const String& rPg ); static QuickHelpData* pQuickHlpData; - static BOOL bReplaceQuote; - static long nDDStartPosX, nDDStartPosY; + static BOOL bReplaceQuote; + static long nDDStartPosX, nDDStartPosY; - static Color aTextColor; //Textfarbe, fuer die Giesskanne - static BOOL bTransparentBackColor; // Hintergrund transparent - static Color aTextBackColor; //Texthintergrundfarbe, fuer die Giesskanne + static Color aTextColor; //Textfarbe, fuer die Giesskanne + static BOOL bTransparentBackColor; // Hintergrund transparent + static Color aTextBackColor; //Texthintergrundfarbe, fuer die Giesskanne /* * Timer und Handler fuer das Weiterscrollen, wenn der @@ -86,82 +86,82 @@ friend void PageNumNotify( ViewShell* pVwSh, * EditWin stehen bleibt. In regelmaessigen Intervallen wird * die Selektion in Richtung der Mausposition vergroessert. */ - AutoTimer aTimer; + AutoTimer aTimer; // Timer fuer verschachtelte KeyInputs (z.B. fuer Tabellen) - Timer aKeyInputTimer; + Timer aKeyInputTimer; // timer for ANY-KeyInut question without a following KeyInputEvent - Timer aKeyInputFlushTimer; + Timer aKeyInputFlushTimer; - String aInBuffer; + String aInBuffer; LanguageType eBufferLanguage; - Point aStartPos; - Point aMovePos; - Point aRszMvHdlPt; - Timer aTemplateTimer; + Point aStartPos; + Point aMovePos; + Point aRszMvHdlPt; + Timer aTemplateTimer; // Type/Objecte ueber dem der MousePointer steht SwCallMouseEvent aSaveCallEvent; - SwApplyTemplate *pApplyTempl; - SwAnchorMarker *pAnchorMarker; // zum Verschieben eines Ankers + SwApplyTemplate *pApplyTempl; + SwAnchorMarker *pAnchorMarker; // zum Verschieben eines Ankers - SdrDropMarkerOverlay *pUserMarker; - SdrObject *pUserMarkerObj; - SwShadowCursor *pShadCrsr; - Point *pRowColumnSelectionStart; // save position where table row/column selection has been started + SdrDropMarkerOverlay *pUserMarker; + SdrObject *pUserMarkerObj; + SwShadowCursor *pShadCrsr; + Point *pRowColumnSelectionStart; // save position where table row/column selection has been started - SwView &rView; + SwView &rView; - int aActHitType; // aktueller Mauspointer + int aActHitType; // aktueller Mauspointer ULONG m_nDropFormat; //Format aus dem letzten QueryDrop USHORT m_nDropAction; //Action aus dem letzten QueryDrop USHORT m_nDropDestination; //Ziel aus dem letzten QueryDrop - UINT16 eBezierMode; - UINT16 nInsFrmColCount; //Spaltenzahl fuer interaktiven Rahmen - SdrObjKind eDrawMode; - BOOL bLinkRemoved : 1, - bMBPressed : 1, - bInsDraw : 1, - bInsFrm : 1, - bIsInMove : 1, - bIsInDrag : 1, //StartExecuteDrag nich doppelt ausfuehren - bOldIdle : 1, //Zum abschalten des Idle'ns - bOldIdleSet : 1, //waehrend QeueryDrop - bTblInsDelMode : 1, // - bTblIsInsMode : 1, // - bTblIsColMode : 1, // - bChainMode : 1, //Rahmen verbinden - bWasShdwCrsr : 1, //ShadowCrsr war im MouseButtonDown an + UINT16 eBezierMode; + UINT16 nInsFrmColCount; //Spaltenzahl fuer interaktiven Rahmen + SdrObjKind eDrawMode; + BOOL bLinkRemoved : 1, + bMBPressed : 1, + bInsDraw : 1, + bInsFrm : 1, + bIsInMove : 1, + bIsInDrag : 1, //StartExecuteDrag nich doppelt ausfuehren + bOldIdle : 1, //Zum abschalten des Idle'ns + bOldIdleSet : 1, //waehrend QeueryDrop + bTblInsDelMode : 1, // + bTblIsInsMode : 1, // + bTblIsColMode : 1, // + bChainMode : 1, //Rahmen verbinden + bWasShdwCrsr : 1, //ShadowCrsr war im MouseButtonDown an bLockInput : 1, //Lock waehrend die Rechenleiste aktiv ist bIsRowDrag : 1, //selection of rows is used, in combination with pRowColumnSelectionStart /** #i42732# display status of font size/name depending on either the input language or the selection position depending on what has changed lately */ bUseInputLanguage: 1, - bObjectSelect : 1; + bObjectSelect : 1; USHORT nKS_NUMDOWN_Count; // #i23725# USHORT nKS_NUMINDENTINC_Count; - void LeaveArea(const Point &); - void JustifyAreaTimer(); - inline void EnterArea(); + void LeaveArea(const Point &); + void JustifyAreaTimer(); + inline void EnterArea(); - void RstMBDownFlags(); + void RstMBDownFlags(); - void ChangeFly( BYTE nDir, BOOL bWeb = FALSE ); + void ChangeFly( BYTE nDir, BOOL bWeb = FALSE ); void ChangeDrawing( BYTE nDir ); - BOOL EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos); + BOOL EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos); BOOL RulerColumnDrag( const MouseEvent& rMEvt, BOOL bVerticalMode); //Hilfsfunktionen fuer D&D - void DropCleanup(); - void CleanupDropUserMarker(); - USHORT GetDropDestination( const Point& rPixPnt, + void DropCleanup(); + void CleanupDropUserMarker(); + USHORT GetDropDestination( const Point& rPixPnt, SdrObject ** ppObj = 0 ); //select the object/cursor at the mouse position of the context menu request BOOL SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ); @@ -173,8 +173,8 @@ friend void PageNumNotify( ViewShell* pVwSh, * vergroessert. */ DECL_LINK( TimerHandler, Timer * ); - void StartDDTimer(); - void StopDDTimer(SwWrtShell *, const Point &); + void StartDDTimer(); + void StopDDTimer(SwWrtShell *, const Point &); DECL_LINK( DDHandler, Timer * ); // timer for ANY-KeyInut question without a following KeyInputEvent @@ -190,90 +190,90 @@ friend void PageNumNotify( ViewShell* pVwSh, protected: - virtual void DataChanged( const DataChangedEvent& ); - virtual void PrePaint(); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput(const KeyEvent &rKEvt); + virtual void DataChanged( const DataChangedEvent& ); + virtual void PrePaint(); + virtual void Paint( const Rectangle& rRect ); + virtual void KeyInput(const KeyEvent &rKEvt); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus(); + virtual void LoseFocus(); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void RequestHelp(const HelpEvent& rEvt); + virtual void MouseMove(const MouseEvent& rMEvt); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void MouseButtonUp(const MouseEvent& rMEvt); + virtual void RequestHelp(const HelpEvent& rEvt); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ); // Drag & Drop Interface - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; - + void ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg, SvxAutoCorrect* pACorr, sal_Bool bFromIME = sal_False ); public: - void UpdatePointer(const Point &, USHORT nButtons = 0); + void UpdatePointer(const Point &, USHORT nButtons = 0); - BOOL IsDrawSelMode(); - BOOL IsDrawAction() { return (bInsDraw); } - void SetDrawAction(BOOL bFlag) { bInsDraw = bFlag; } + BOOL IsDrawSelMode(); + BOOL IsDrawAction() { return (bInsDraw); } + void SetDrawAction(BOOL bFlag) { bInsDraw = bFlag; } - void SetObjectSelect( BOOL bVal ) { bObjectSelect = bVal; } - BOOL IsObjectSelect() const { return bObjectSelect; } + void SetObjectSelect( BOOL bVal ) { bObjectSelect = bVal; } + BOOL IsObjectSelect() const { return bObjectSelect; } - inline SdrObjKind GetSdrDrawMode(/*BOOL bBuf = FALSE*/) const { return eDrawMode; } - inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { eDrawMode = eSdrObjectKind; SetObjectSelect( FALSE ); } - void StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect ); + inline SdrObjKind GetSdrDrawMode(/*BOOL bBuf = FALSE*/) const { return eDrawMode; } + inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { eDrawMode = eSdrObjectKind; SetObjectSelect( FALSE ); } + void StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect ); - BOOL IsFrmAction() { return (bInsFrm); } - inline UINT16 GetBezierMode() { return eBezierMode; } - void SetBezierMode(UINT16 eBezMode) { eBezierMode = eBezMode; } - void EnterDrawTextMode(const Point& aDocPos); // DrawTextEditMode einschalten - void InsFrm(USHORT nCols); - void StopInsFrm(); - UINT16 GetFrmColCount() const {return nInsFrmColCount;} //Spaltenzahl fuer interaktiven Rahmen + BOOL IsFrmAction() { return (bInsFrm); } + inline UINT16 GetBezierMode() { return eBezierMode; } + void SetBezierMode(UINT16 eBezMode) { eBezierMode = eBezMode; } + void EnterDrawTextMode(const Point& aDocPos); // DrawTextEditMode einschalten + void InsFrm(USHORT nCols); + void StopInsFrm(); + UINT16 GetFrmColCount() const {return nInsFrmColCount;} //Spaltenzahl fuer interaktiven Rahmen - void SetChainMode( BOOL bOn ); - BOOL IsChainMode() const { return bChainMode; } + void SetChainMode( BOOL bOn ); + BOOL IsChainMode() const { return bChainMode; } void FlushInBuffer(); BOOL IsInputSequenceCheckingRequired( const String &rText, const SwPaM& rCrsr ) const; - static void SetReplaceQuote(BOOL bOn = TRUE) { bReplaceQuote = bOn; } - static BOOL IsReplaceQuote() { return bReplaceQuote; } + static void SetReplaceQuote(BOOL bOn = TRUE) { bReplaceQuote = bOn; } + static BOOL IsReplaceQuote() { return bReplaceQuote; } - void SetApplyTemplate(const SwApplyTemplate &); + void SetApplyTemplate(const SwApplyTemplate &); SwApplyTemplate* GetApplyTemplate() const { return pApplyTempl; } - void StartExecuteDrag(); - void DragFinished(); + void StartExecuteDrag(); + void DragFinished(); USHORT GetDropAction() const { return m_nDropAction; } ULONG GetDropFormat() const { return m_nDropFormat; } - Color GetTextColor() { return aTextColor; } + Color GetTextColor() { return aTextColor; } - void SetTextColor(const Color& rCol ) { aTextColor = rCol; } + void SetTextColor(const Color& rCol ) { aTextColor = rCol; } - Color GetTextBackColor() + Color GetTextBackColor() { return aTextBackColor; } - void SetTextBackColor(const Color& rCol ) + void SetTextBackColor(const Color& rCol ) { aTextBackColor = rCol; } - void SetTextBackColorTransparent(BOOL bSet) + void SetTextBackColorTransparent(BOOL bSet) { bTransparentBackColor = bSet; } - BOOL IsTextBackColorTransparent() + BOOL IsTextBackColorTransparent() { return bTransparentBackColor; } - void LockKeyInput(BOOL bSet){bLockInput = bSet;} + void LockKeyInput(BOOL bSet){bLockInput = bSet;} const SwView &GetView() const { return rView; } - SwView &GetView() { return rView; } + SwView &GetView() { return rView; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); @@ -283,8 +283,8 @@ public: static inline long GetDDStartPosX() { return nDDStartPosX; } static inline long GetDDStartPosY() { return nDDStartPosY; } - static void _InitStaticData(); - static void _FinitStaticData(); + static void _InitStaticData(); + static void _FinitStaticData(); //#i3370# remove quick help to prevent saving of autocorrection suggestions void StopQuickHelp(); diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx index d086b5bb8e2a..03f6277c0015 100644 --- a/sw/source/ui/inc/envimg.hxx +++ b/sw/source/ui/inc/envimg.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 @@ -52,16 +52,16 @@ class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem public: rtl::OUString aAddrText; // Text fuer Empfaenger - sal_Bool bSend; // Absender? - rtl::OUString aSendText; // Text fuer Absender + sal_Bool bSend; // Absender? + rtl::OUString aSendText; // Text fuer Absender sal_Int32 lAddrFromLeft; // Linker Abstand fuer Empfaenger (twips) sal_Int32 lAddrFromTop; // Oberer Abstand fuer Empfaenger (twips) sal_Int32 lSendFromLeft; // Linker Abstand fuer Absender (twips) sal_Int32 lSendFromTop; // Oberer Abstand fuer Absender (twips) sal_Int32 lWidth; // Breite des Umschlags (twips) sal_Int32 lHeight; // Hoehe des Umschlags (twips) - SwEnvAlign eAlign; // Ausrichtung beim Einzug - sal_Bool bPrintFromAbove; // Von oben drucken? + SwEnvAlign eAlign; // Ausrichtung beim Einzug + sal_Bool bPrintFromAbove; // Von oben drucken? sal_Int32 lShiftRight; // Verschiebung nach rechts (twips) sal_Int32 lShiftDown; // Verschiebung nach unten (twips) @@ -76,7 +76,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; // class SwEnvCfgItem ------------------------------------------------------- @@ -91,7 +91,7 @@ public: SwEnvItem& GetItem() {return aEnvItem;} - virtual void Commit(); + virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); }; diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index 470edbf2661b..62b3df48e9df 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.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 @@ -71,16 +71,16 @@ friend class SwEnvFmtPage; friend class SwEnvPrtPage; friend class SwEnvPreview; - String sInsert; - String sChange; - SwEnvItem aEnvItem; - SwWrtShell *pSh; - Printer *pPrinter; - SfxItemSet *pAddresseeSet; - SfxItemSet *pSenderSet; + String sInsert; + String sChange; + SwEnvItem aEnvItem; + SwWrtShell *pSh; + Printer *pPrinter; + SfxItemSet *pAddresseeSet; + SfxItemSet *pSenderSet; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual short Ok(); public: SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert); @@ -92,13 +92,13 @@ class SwEnvPage : public SfxTabPage { FixedText aAddrText; MultiLineEdit aAddrEdit; - FixedText aDatabaseFT; - ListBox aDatabaseLB; - FixedText aTableFT; - ListBox aTableLB; + FixedText aDatabaseFT; + ListBox aDatabaseLB; + FixedText aTableFT; + ListBox aTableLB; ImageButton aInsertBT; - FixedText aDBFieldFT; - ListBox aDBFieldLB; + FixedText aDBFieldFT; + ListBox aDBFieldLB; CheckBox aSenderBox; MultiLineEdit aSenderEdit; SwEnvPreview aPreview; diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/ui/inc/fldedt.hxx index 47b85163e7a7..7a32185a709f 100644 --- a/sw/source/ui/inc/fldedt.hxx +++ b/sw/source/ui/inc/fldedt.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 @@ -38,13 +38,13 @@ class SwFldEditDlg : public SfxSingleTabDialog SwWrtShell* pSh; ImageButton aPrevBT; ImageButton aNextBT; - PushButton aAddressBT; + PushButton aAddressBT; DECL_LINK( AddressHdl, PushButton *pBt = 0 ); DECL_LINK( NextPrevHdl, Button *pBt = 0 ); - void Init(); - SfxTabPage* CreatePage(USHORT nGroup); + void Init(); + SfxTabPage* CreatePage(USHORT nGroup); public: @@ -53,10 +53,10 @@ public: DECL_LINK( OKHdl, Button * ); - virtual short Execute(); + virtual short Execute(); - void EnableInsert(BOOL bEnable); - void InsertHdl(); + void EnableInsert(BOOL bEnable); + void InsertHdl(); }; #endif diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index da36b2ebed85..85afff1957d1 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.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 @@ -114,21 +114,21 @@ struct SwInsertFld_Data class SW_DLLPUBLIC SwFldMgr { private: - SwField* pCurFld; - SbModule* pModule; - const SvxMacroItem* pMacroItem; - SwWrtShell* pWrtShell; // darf auch NULL sein! - String aCurPar1; - String aCurPar2; - String sCurFrame; + SwField* pCurFld; + SbModule* pModule; + const SvxMacroItem* pMacroItem; + SwWrtShell* pWrtShell; // darf auch NULL sein! + String aCurPar1; + String aCurPar2; + String sCurFrame; String sMacroPath; String sMacroName; - ULONG nCurFmt; - BOOL bEvalExp; + ULONG nCurFmt; + BOOL bEvalExp; - SW_DLLPRIVATE USHORT GetCurrLanguage() const; + SW_DLLPRIVATE USHORT GetCurrLanguage() const; com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xDBContext; com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> xNumberingInfo; @@ -139,13 +139,13 @@ public: ~SwFldMgr(); void SetWrtShell( SwWrtShell* pShell ) - { pWrtShell = pShell; } - + { pWrtShell = pShell; } + // Feld einfuegen ueber TypeId (TYP_ ...) BOOL InsertFld( const SwInsertFld_Data& rData ); // Direkt das aktuelle Feld aendern - void UpdateCurFld(ULONG nFormat, + void UpdateCurFld(ULONG nFormat, const String& rPar1, const String& rPar2, SwField * _pField = 0); // #111840# @@ -155,44 +155,44 @@ public: inline ULONG GetCurFldFmt() const; // Ein Feld ermitteln - SwField* GetCurFld(); + SwField* GetCurFld(); - void InsertFldType(SwFieldType& rType); + void InsertFldType(SwFieldType& rType); - BOOL ChooseMacro(const String &rSelMacro = aEmptyStr); - void SetMacroPath(const String& rPath); - inline const String& GetMacroPath() const { return (sMacroPath); } - inline const String& GetMacroName() const { return (sMacroName); } - inline void SetMacroModule(SbModule* pMod) { pModule = pMod; } + BOOL ChooseMacro(const String &rSelMacro = aEmptyStr); + void SetMacroPath(const String& rPath); + inline const String& GetMacroPath() const { return (sMacroPath); } + inline const String& GetMacroName() const { return (sMacroName); } + inline void SetMacroModule(SbModule* pMod) { pModule = pMod; } // Vorheriger Naechster gleichen Typ BOOL GoNextPrev( BOOL bNext = TRUE, SwFieldType* pTyp = 0 ); - BOOL GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( TRUE, pTyp ); } - BOOL GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( FALSE, pTyp ); } + BOOL GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( TRUE, pTyp ); } + BOOL GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( FALSE, pTyp ); } // Erfragen von Werten aus Datenbankfeldern (BASIC ) -// String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh); - BOOL IsDBNumeric(const String& rDBName, const String& rTblQryName, +// String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh); + BOOL IsDBNumeric(const String& rDBName, const String& rTblQryName, BOOL bIsTable, const String& rFldName); // RefMark mit Namen organisieren - BOOL CanInsertRefMark( const String& rStr ); + BOOL CanInsertRefMark( const String& rStr ); // Zugriff ueber ResId auf Feldtypen - USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX) const; - SwFieldType* GetFldType(USHORT nResId, USHORT nId = 0) const; - SwFieldType* GetFldType(USHORT nResId, const String& rName) const; + USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX) const; + SwFieldType* GetFldType(USHORT nResId, USHORT nId = 0) const; + SwFieldType* GetFldType(USHORT nResId, const String& rName) const; - void RemoveFldType(USHORT nResId, const String& rName); + void RemoveFldType(USHORT nResId, const String& rName); // Zugriff ueber TypeId aus dem Dialog // Ids fuer einen Bereich von Feldern const SwFldGroupRgn& GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) const; - USHORT GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType = 0) const; + USHORT GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType = 0) const; // TypeId des aktuellen Feldes - USHORT GetCurTypeId() const; + USHORT GetCurTypeId() const; // TypeId fuer einen konkrete Pos in der Liste static USHORT GetTypeId(USHORT nPos); @@ -206,16 +206,16 @@ public: BOOL GetSubTypes(USHORT nId, SvStringsDtor& rToFill); // Formate zu einem Typ - USHORT GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode = FALSE) const; - String GetFormatStr(USHORT nTypeId, ULONG nFormatId) const; - USHORT GetFormatId(USHORT nTypeId, ULONG nFormatId) const; - ULONG GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L); + USHORT GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode = FALSE) const; + String GetFormatStr(USHORT nTypeId, ULONG nFormatId) const; + USHORT GetFormatId(USHORT nTypeId, ULONG nFormatId) const; + ULONG GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L); // Evaluierung der ExpressionFelder ausschalten fuer das Einfuegen // vieler Expressionfelder (siehe Etiketten) // - inline void SetEvalExpFlds(BOOL bEval); - void EvalExpFlds(SwWrtShell* pSh = NULL); + inline void SetEvalExpFlds(BOOL bEval); + void EvalExpFlds(SwWrtShell* pSh = NULL); }; inline void SwFldMgr::SetEvalExpFlds(BOOL bEval) diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/ui/inc/fldtdlg.hxx index e8959a98e123..61ee679d3cb3 100644 --- a/sw/source/ui/inc/fldtdlg.hxx +++ b/sw/source/ui/inc/fldtdlg.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,12 +41,12 @@ class SwFldDlg: public SfxTabDialog BOOL m_bHtmlMode; BOOL m_bDataBaseMode; - virtual BOOL Close(); - virtual SfxItemSet* CreateInputItemSet( USHORT nId ); - virtual void Activate(); + virtual BOOL Close(); + virtual SfxItemSet* CreateInputItemSet( USHORT nId ); + virtual void Activate(); virtual void PageCreated(USHORT nId, SfxTabPage& rPage); - void ReInitTabPage( USHORT nPageId, + void ReInitTabPage( USHORT nPageId, BOOL bOnlyActivate = FALSE ); public: @@ -55,10 +55,10 @@ public: DECL_LINK( OKHdl, Button * ); - void Initialize(SfxChildWinInfo *pInfo); - void ReInitDlg(); - void EnableInsert(BOOL bEnable); - void InsertHdl(); + void Initialize(SfxChildWinInfo *pInfo); + void ReInitDlg(); + void EnableInsert(BOOL bEnable); + void InsertHdl(); void ActivateDatabasePage(); }; diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/ui/inc/fldwrap.hxx index 54479e9b232b..88ecbbea0ad1 100644 --- a/sw/source/ui/inc/fldwrap.hxx +++ b/sw/source/ui/inc/fldwrap.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,8 +40,8 @@ public: SFX_DECL_CHILDWINDOW(SwFldDlgWrapper); - virtual BOOL ReInitDlg(SwDocShell *pDocSh); - void ShowPage(USHORT nPage = 0); + virtual BOOL ReInitDlg(SwDocShell *pDocSh); + void ShowPage(USHORT nPage = 0); }; /* -----------------04.02.2003 14:14----------------- diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index 554c5ccc88c4..7ffbe2eb9200 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.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 @@ -85,7 +85,7 @@ public: SwStdFontConfig(); ~SwStdFontConfig(); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); const String& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];} @@ -111,7 +111,7 @@ public: void SetFontHeight( sal_Int32 nHeight, sal_uInt8 nFont, sal_uInt8 nScriptType ) { ChangeInt(nFont + FONT_PER_GROUP * nScriptType, nHeight);} - + sal_Int32 GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang ); static String GetDefaultFor(USHORT nFontType, LanguageType eLang); diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/ui/inc/formatclipboard.hxx index 07891a0b5874..0de096964c3f 100644 --- a/sw/source/ui/inc/formatclipboard.hxx +++ b/sw/source/ui/inc/formatclipboard.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 diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx index f303f1e6f1d7..835b67d4b556 100644 --- a/sw/source/ui/inc/formedt.hxx +++ b/sw/source/ui/inc/formedt.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,7 +44,7 @@ class SwWrtShell; class SwForm; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Beschreibung: Markierung fuer Verzeichniseintrag einfuegen --------------------------------------------------------------------*/ class SwIdxFormDlg : public SvxStandardDialog { @@ -58,38 +58,38 @@ class SwIdxFormDlg : public SvxStandardDialog DECL_LINK( DoubleClickHdl, Button * ); DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( AssignHdl, Button * ); - void UpdatePattern(); - void Apply(); + void UpdatePattern(); + void Apply(); - ListBox aEntryLB; - OKButton aOKBtn; - CancelButton aCancelBT; - FixedText aLevelFT; - Edit aEntryED; - PushButton aEntryBT; - PushButton aTabBT; - PushButton aPageBT; - PushButton aJumpBT; + ListBox aEntryLB; + OKButton aOKBtn; + CancelButton aCancelBT; + FixedText aLevelFT; + Edit aEntryED; + PushButton aEntryBT; + PushButton aTabBT; + PushButton aPageBT; + PushButton aJumpBT; FixedLine aEntryFL; - FixedText aLevelFT2; - ListBox aLevelLB; - FixedText aTemplateFT; - ListBox aParaLayLB; - PushButton aStdBT; - PushButton aAssignBT; + FixedText aLevelFT2; + ListBox aLevelLB; + FixedText aTemplateFT; + ListBox aParaLayLB; + PushButton aStdBT; + PushButton aAssignBT; FixedLine aFormatFL; - SwWrtShell &rSh; - SwForm *pForm; - USHORT nAktLevel; - BOOL bLastLinkIsEnd; + SwWrtShell &rSh; + SwForm *pForm; + USHORT nAktLevel; + BOOL bLastLinkIsEnd; public: SwIdxFormDlg( Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); ~SwIdxFormDlg(); - static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); - const SwForm& GetTOXForm(); + static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); + const SwForm& GetTOXForm(); }; inline const SwForm& SwIdxFormDlg::GetTOXForm() diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx index d5e8b484384e..a94d961719ff 100644 --- a/sw/source/ui/inc/frmdlg.hxx +++ b/sw/source/ui/inc/frmdlg.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 @@ -34,7 +34,7 @@ class SwWrtShell; /*-------------------------------------------------------------------- - Beschreibung: Rahmendialog + Beschreibung: Rahmendialog --------------------------------------------------------------------*/ class SwFrmDlg : public SfxTabDialog { @@ -49,13 +49,13 @@ class SwFrmDlg : public SfxTabDialog virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: - SwFrmDlg( SfxViewFrame *pFrame, Window *pParent, + SwFrmDlg( SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, - BOOL bNewFrm = TRUE, - USHORT nResType = DLG_FRM_STD, - BOOL bFmt = FALSE, - UINT16 nDefPage = 0, - const String* pFmtStr = 0); + BOOL bNewFrm = TRUE, + USHORT nResType = DLG_FRM_STD, + BOOL bFmt = FALSE, + UINT16 nDefPage = 0, + const String* pFmtStr = 0); ~SwFrmDlg(); diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/ui/inc/frmmgr.hxx index de84a1ba1061..e13b820802b5 100644 --- a/sw/source/ui/inc/frmmgr.hxx +++ b/sw/source/ui/inc/frmmgr.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 @@ -38,42 +38,42 @@ #include <fmtanchr.hxx> #include "swdllapi.h" -class SwWrtShell; +class SwWrtShell; struct SvxSwFrameValidation; struct SwPosition; -class SwFmt; -class SwFmtCol; +class SwFmt; +class SwFmtCol; -const SwTwips DFLT_WIDTH = MM50 * 4; -const SwTwips DFLT_HEIGHT = MM50; +const SwTwips DFLT_WIDTH = MM50 * 4; +const SwTwips DFLT_HEIGHT = MM50; -#define FULL_ATTRSET 0xffff +#define FULL_ATTRSET 0xffff -#define FRMMGR_TYPE_NONE 0x00 -#define FRMMGR_TYPE_TEXT 0x01 -#define FRMMGR_TYPE_GRF 0x02 -#define FRMMGR_TYPE_OLE 0x04 +#define FRMMGR_TYPE_NONE 0x00 +#define FRMMGR_TYPE_TEXT 0x01 +#define FRMMGR_TYPE_GRF 0x02 +#define FRMMGR_TYPE_OLE 0x04 #define FRMMGR_TYPE_LABEL 0x08 -#define FRMMGR_TYPE_ENVELP 0x10 +#define FRMMGR_TYPE_ENVELP 0x10 class SW_DLLPUBLIC SwFlyFrmAttrMgr { - SfxItemSet aSet; - Point aAbsPos; - SwWrtShell *pOwnSh; + SfxItemSet aSet; + Point aAbsPos; + SwWrtShell *pOwnSh; - BOOL bAbsPos, + BOOL bAbsPos, bNewFrm; BOOL bIsInVertical; // interne Verrechnung fuer Umrandung - SW_DLLPRIVATE SwTwips CalcTopSpace(); - SW_DLLPRIVATE SwTwips CalcBottomSpace(); - SW_DLLPRIVATE SwTwips CalcLeftSpace(); - SW_DLLPRIVATE SwTwips CalcRightSpace(); + SW_DLLPRIVATE SwTwips CalcTopSpace(); + SW_DLLPRIVATE SwTwips CalcBottomSpace(); + SW_DLLPRIVATE SwTwips CalcLeftSpace(); + SW_DLLPRIVATE SwTwips CalcRightSpace(); - SW_DLLPRIVATE void _UpdateFlyFrm(); //Nacharbeit nach Einfuegen oder Update + SW_DLLPRIVATE void _UpdateFlyFrm(); //Nacharbeit nach Einfuegen oder Update public: SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ); @@ -81,65 +81,65 @@ public: //CopyCtor fuer die Dialoge, zum Pruefen der Metrics SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell *pSh, const SfxItemSet &rSet ); - inline SwWrtShell* GetShell() { return pOwnSh; } + inline SwWrtShell* GetShell() { return pOwnSh; } - void SetAnchor(RndStdIds eId); - inline RndStdIds GetAnchor() const; + void SetAnchor(RndStdIds eId); + inline RndStdIds GetAnchor() const; void SetHorzOrientation(sal_Int16 eOrient); void SetVertOrientation(sal_Int16 eOrient); // Absolute Position - void SetAbsPos(const Point& rLPoint); + void SetAbsPos(const Point& rLPoint); // Relative Position vom Anker - void SetPos(const Point& rLPoint); - inline Point GetPos() const; + void SetPos(const Point& rLPoint); + inline Point GetPos() const; // Groesse - void SetSize(const Size& rLSize); - inline const Size& GetSize() const; + void SetSize(const Size& rLSize); + inline const Size& GetSize() const; - inline USHORT GetHeightPercent() const; + inline USHORT GetHeightPercent() const; void SetHeightSizeType(SwFrmSize eType); // Abstand zum Inhalt - void SetLRSpace( long nLeft = LONG_MAX, + void SetLRSpace( long nLeft = LONG_MAX, long nRight = LONG_MAX ); - void SetULSpace( long nTop = LONG_MAX, + void SetULSpace( long nTop = LONG_MAX, long nBottom= LONG_MAX ); - void SetCol( const SwFmtCol &rCol); + void SetCol( const SwFmtCol &rCol); // Attribute aendern und erfragen - void UpdateAttrMgr(); - void UpdateFlyFrm(); + void UpdateAttrMgr(); + void UpdateFlyFrm(); // neuen Rahmen erzeugen - BOOL InsertFlyFrm(); - void InsertFlyFrm(RndStdIds eAnchorType, - const Point &rPos, - const Size &rSize, - BOOL bAbsPos = FALSE); + BOOL InsertFlyFrm(); + void InsertFlyFrm(RndStdIds eAnchorType, + const Point &rPos, + const Size &rSize, + BOOL bAbsPos = FALSE); // Metriken pruefen und aendern void ValidateMetrics(SvxSwFrameValidation& rVal, const SwPosition* pToCharCntntPos, BOOL bOnlyPercentRefValue = FALSE); - void DelAttr(USHORT nId); + void DelAttr(USHORT nId); // Set rausreichen inline const SfxItemSet &GetAttrSet() const { return aSet; } - inline SfxItemSet &GetAttrSet() { return aSet; } - void SetAttrSet(const SfxItemSet& rSet); + inline SfxItemSet &GetAttrSet() { return aSet; } + void SetAttrSet(const SfxItemSet& rSet); inline const SwFmtVertOrient &GetVertOrient() const; inline const SwFmtHoriOrient &GetHoriOrient() const; inline const SvxShadowItem &GetShadow() const; - inline const SvxBoxItem &GetBox() const; - inline const SwFmtSurround &GetSurround() const; + inline const SvxBoxItem &GetBox() const; + inline const SwFmtSurround &GetSurround() const; inline const SwFmtFrmSize &GetFrmSize() const; long CalcWidthBorder() { return CalcLeftSpace()+CalcRightSpace(); } @@ -167,7 +167,7 @@ inline const SvxShadowItem &SwFlyFrmAttrMgr::GetShadow() const { return ((SvxShadowItem&)aSet.Get(RES_SHADOW)); } -inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const +inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const { return ((SvxBoxItem&)aSet.Get(RES_BOX)); } diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 1e82d3d75574..dea90b5cbb52 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.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 @@ -48,48 +48,48 @@ struct FrmMap; struct SwPosition; /*-------------------------------------------------------------------- - Beschreibung: Rahmendialog + Beschreibung: Rahmendialog --------------------------------------------------------------------*/ class SwFrmPage: public SfxTabPage { // Size - FixedText aWidthFT; - FixedText aWidthAutoFT; - PercentField aWidthED; - CheckBox aRelWidthCB; - CheckBox aAutoWidthCB; - FixedText aHeightFT; - FixedText aHeightAutoFT; - PercentField aHeightED; - CheckBox aRelHeightCB; - CheckBox aAutoHeightCB; - CheckBox aFixedRatioCB; - PushButton aRealSizeBT; + FixedText aWidthFT; + FixedText aWidthAutoFT; + PercentField aWidthED; + CheckBox aRelWidthCB; + CheckBox aAutoWidthCB; + FixedText aHeightFT; + FixedText aHeightAutoFT; + PercentField aHeightED; + CheckBox aRelHeightCB; + CheckBox aAutoHeightCB; + CheckBox aFixedRatioCB; + PushButton aRealSizeBT; FixedLine aSizeFL; // Anker FixedLine aTypeFL; FixedLine aTypeSepFL; - RadioButton aAnchorAtPageRB; - RadioButton aAnchorAtParaRB; - RadioButton aAnchorAtCharRB; - RadioButton aAnchorAsCharRB; - RadioButton aAnchorAtFrameRB; + RadioButton aAnchorAtPageRB; + RadioButton aAnchorAtParaRB; + RadioButton aAnchorAtCharRB; + RadioButton aAnchorAsCharRB; + RadioButton aAnchorAtFrameRB; // Position - FixedText aHorizontalFT; - ListBox aHorizontalDLB; - FixedText aAtHorzPosFT; - MetricField aAtHorzPosED; - FixedText aHoriRelationFT; - ListBox aHoriRelationLB; - CheckBox aMirrorPagesCB; - FixedText aVerticalFT; - ListBox aVerticalDLB; - FixedText aAtVertPosFT; - MetricField aAtVertPosED; - FixedText aVertRelationFT; - ListBox aVertRelationLB; + FixedText aHorizontalFT; + ListBox aHorizontalDLB; + FixedText aAtHorzPosFT; + MetricField aAtHorzPosED; + FixedText aHoriRelationFT; + ListBox aHoriRelationLB; + CheckBox aMirrorPagesCB; + FixedText aVerticalFT; + ListBox aVerticalDLB; + FixedText aAtVertPosFT; + MetricField aAtVertPosED; + FixedText aVertRelationFT; + ListBox aVertRelationLB; // OD 02.10.2003 #i18732# - check box for new option 'FollowTextFlow' CheckBox aFollowTextFlowCB; FixedLine aPositionFL; @@ -104,18 +104,18 @@ class SwFrmPage: public SfxTabPage BOOL bAtVertPosModified; BOOL bFormat; - BOOL bNew; - BOOL bNoModifyHdl; + BOOL bNew; + BOOL bNoModifyHdl; BOOL bVerticalChanged; //check done whether frame is in vertical environment BOOL bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged BOOL bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged BOOL bHtmlMode; USHORT nHtmlMode; - USHORT nDlgType; - Size aGrfSize; - Size aWrap; - SwTwips nUpperBorder; - SwTwips nLowerBorder; + USHORT nDlgType; + Size aGrfSize; + Size aWrap; + SwTwips nUpperBorder; + SwTwips nLowerBorder; double fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button // OD 12.11.2003 #i22341# - keep content position of character for @@ -132,7 +132,7 @@ class SwFrmPage: public SfxTabPage FrmMap* pHMap; virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual int DeactivatePage(SfxItemSet *pSet); DECL_LINK( RangeModifyHdl, Edit * ); @@ -140,8 +140,8 @@ class SwFrmPage: public SfxTabPage DECL_LINK( PosHdl, ListBox * ); DECL_LINK( RelHdl, ListBox * ); void InitPos(RndStdIds eId, USHORT nH, USHORT nHRel, - USHORT nV, USHORT nVRel, - long nX, long nY); + USHORT nV, USHORT nVRel, + long nX, long nY); DECL_LINK( RealSizeHdl, Button * ); DECL_LINK( RelSizeClickHdl, CheckBox * ); @@ -151,10 +151,10 @@ class SwFrmPage: public SfxTabPage DECL_LINK( AutoHeightClickHdl, void* ); // Beispiel aktualisieren - void UpdateExample(); + void UpdateExample(); DECL_LINK( ModifyHdl, Edit * ); - void Init(const SfxItemSet& rSet, BOOL bReset = FALSE); + void Init(const SfxItemSet& rSet, BOOL bReset = FALSE); // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous // in the alignment. USHORT FillPosLB( const FrmMap* _pMap, @@ -174,7 +174,7 @@ class SwFrmPage: public SfxTabPage short GetRelation(FrmMap *pMap, ListBox &rRelationLB); RndStdIds GetAnchor(); - void EnableGraficMode( void ); // hides auto check boxes and re-org controls for "Real Size" button + void EnableGraficMode( void ); // hides auto check boxes and re-org controls for "Real Size" button SwFrmPage(Window *pParent, const SfxItemSet &rSet); ~SwFrmPage(); @@ -190,40 +190,40 @@ public: virtual BOOL FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); - void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } - void SetFormatUsed(BOOL bFmt); - void SetFrmType(USHORT nType) { nDlgType = nType; } - inline BOOL IsInGraficMode( void ) { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; } + void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } + void SetFormatUsed(BOOL bFmt); + void SetFrmType(USHORT nType) { nDlgType = nType; } + inline BOOL IsInGraficMode( void ) { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; } }; class SwGrfExtPage: public SfxTabPage { // Spiegeln FixedLine aMirrorFL; - CheckBox aMirrorVertBox; - CheckBox aMirrorHorzBox; - RadioButton aAllPagesRB; - RadioButton aLeftPagesRB; - RadioButton aRightPagesRB; - BmpWindow aBmpWin; + CheckBox aMirrorVertBox; + CheckBox aMirrorHorzBox; + RadioButton aAllPagesRB; + RadioButton aLeftPagesRB; + RadioButton aRightPagesRB; + BmpWindow aBmpWin; FixedLine aConnectFL; - FixedText aConnectFT; - Edit aConnectED; - PushButton aBrowseBT; + FixedText aConnectFT; + Edit aConnectED; + PushButton aBrowseBT; - String aFilterName; - String aGrfName, aNewGrfName; + String aFilterName; + String aGrfName, aNewGrfName; ::sfx2::FileDialogHelper* pGrfDlg; - BOOL bHtmlMode; + BOOL bHtmlMode; // Handler fuer Spiegeln DECL_LINK( MirrorHdl, CheckBox * ); DECL_LINK( BrowseHdl, Button * ); - virtual void ActivatePage(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet); SwGrfExtPage(Window *pParent, const SfxItemSet &rSet); ~SwGrfExtPage(); @@ -243,25 +243,25 @@ class SwFrmURLPage : public SfxTabPage { //Hyperlink FixedLine aHyperLinkFL; - FixedText aURLFT; - Edit aURLED; - PushButton aSearchPB; - FixedText aNameFT; - Edit aNameED; - FixedText aFrameFT; - ComboBox aFrameCB; + FixedText aURLFT; + Edit aURLED; + PushButton aSearchPB; + FixedText aNameFT; + Edit aNameED; + FixedText aFrameFT; + ComboBox aFrameCB; //Image map FixedLine aImageFL; - CheckBox aServerCB; - CheckBox aClientCB; + CheckBox aServerCB; + CheckBox aClientCB; DECL_LINK( InsertFileHdl, PushButton * ); SwFrmURLPage(Window *pParent, const SfxItemSet &rSet); ~SwFrmURLPage(); - + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -275,23 +275,23 @@ public: class SwFrmAddPage : public SfxTabPage { - FixedText aNameFT; - Edit aNameED; - FixedText aAltNameFT; - Edit aAltNameED; - FixedText aPrevFT; + FixedText aNameFT; + Edit aNameED; + FixedText aAltNameFT; + Edit aAltNameED; + FixedText aPrevFT; ListBox aPrevLB; - FixedText aNextFT; + FixedText aNextFT; ListBox aNextLB; FixedLine aNamesFL; - CheckBox aProtectContentCB; - CheckBox aProtectFrameCB; - CheckBox aProtectSizeCB; + CheckBox aProtectContentCB; + CheckBox aProtectFrameCB; + CheckBox aProtectSizeCB; FixedLine aProtectFL; - CheckBox aEditInReadonlyCB; - CheckBox aPrintFrameCB; + CheckBox aEditInReadonlyCB; + CheckBox aPrintFrameCB; FixedText aTextFlowFT; ListBox aTextFlowLB; @@ -299,10 +299,10 @@ class SwFrmAddPage : public SfxTabPage SwWrtShell* pWrtSh; - USHORT nDlgType; - BOOL bHtmlMode; - BOOL bFormat; - BOOL bNew; + USHORT nDlgType; + BOOL bHtmlMode; + BOOL bFormat; + BOOL bNew; DECL_LINK(EditModifyHdl, Edit*); DECL_LINK(ChainModifyHdl, ListBox*); @@ -312,16 +312,16 @@ class SwFrmAddPage : public SfxTabPage public: - static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); - static USHORT* GetRanges(); + static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); + static USHORT* GetRanges(); virtual BOOL FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); - void SetFormatUsed(BOOL bFmt); - void SetFrmType(USHORT nType) { nDlgType = nType; } - void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } - void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } + void SetFormatUsed(BOOL bFmt); + void SetFrmType(USHORT nType) { nDlgType = nType; } + void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } + void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } }; diff --git a/sw/source/ui/inc/frmsh.hxx b/sw/source/ui/inc/frmsh.hxx index 0e83ccbc6bf7..5eeb05538eda 100644 --- a/sw/source/ui/inc/frmsh.hxx +++ b/sw/source/ui/inc/frmsh.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 @@ -37,15 +37,15 @@ public: SFX_DECL_INTERFACE(SW_FRAMESHELL) SwFrameShell(SwView &rView); - virtual ~SwFrameShell(); + virtual ~SwFrameShell(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); - void ExecFrameStyle(SfxRequest& rReq); - void GetLineStyleState(SfxItemSet &rSet); - void StateInsert(SfxItemSet &rSet); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void ExecFrameStyle(SfxRequest& rReq); + void GetLineStyleState(SfxItemSet &rSet); + void StateInsert(SfxItemSet &rSet); - void StateStatusline(SfxItemSet &rSet); + void StateStatusline(SfxItemSet &rSet); }; #endif diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc index 4c71fff51b40..bb06c7157623 100644 --- a/sw/source/ui/inc/frmui.hrc +++ b/sw/source/ui/inc/frmui.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 @@ -41,17 +41,17 @@ #define DLG_VIEW_HEADER (RC_FRMDLG_BEGIN + 8) #define DLG_FORMAT_COLUMN (RC_FRMDLG_BEGIN + 10) #define DLG_CAPTION (RC_FRMDLG_BEGIN + 11) -#define DLG_SEQUENCE_OPTION (RC_FRMDLG_BEGIN + 12) +#define DLG_SEQUENCE_OPTION (RC_FRMDLG_BEGIN + 12) -#define TP_FOOTNOTEOPTION (RC_FRMDLG_BEGIN + 12) -#define TP_ENDNOTEOPTION (RC_FRMDLG_BEGIN + 13) +#define TP_FOOTNOTEOPTION (RC_FRMDLG_BEGIN + 12) +#define TP_ENDNOTEOPTION (RC_FRMDLG_BEGIN + 13) #define STR_PATTERN_BRD (RC_FRMDLG_BEGIN + 13) #define STR_SHPATTERN (RC_FRMDLG_BEGIN + 14) #define STR_LNPATTERN (RC_FRMDLG_BEGIN + 15) #define STR_FRMUI_BORDER (RC_FRMDLG_BEGIN + 16) #define STR_FRMUI_PATTERN (RC_FRMDLG_BEGIN + 17) -#define STR_FRMUI_WRAP (RC_FRMDLG_BEGIN + 18) +#define STR_FRMUI_WRAP (RC_FRMDLG_BEGIN + 18) #define BMP_PORTRAIT (RC_FRMDLG_BEGIN + 16) #define BMP_LANDSCAPE (RC_FRMDLG_BEGIN + 17) @@ -95,44 +95,44 @@ /* #define STR_FRAME (STR_FRMDLG_BEGIN + 20) -#define STR_PRTAREA (STR_FRMDLG_BEGIN + 21) -#define STR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 22) -#define STR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 23) -#define STR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 24) -#define STR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 25) -#define STR_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 26) -#define STR_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 27) -#define STR_MIR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 28) -#define STR_MIR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 29) -#define STR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 30) -#define STR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 31) -#define STR_REL_BASE (STR_FRMDLG_BEGIN + 32) -#define STR_REL_CHAR (STR_FRMDLG_BEGIN + 33) -#define STR_REL_ROW (STR_FRMDLG_BEGIN + 34) -#define STR_REL_BORDER (STR_FRMDLG_BEGIN + 35) -#define STR_REL_PRTAREA (STR_FRMDLG_BEGIN + 36) -#define STR_FLY_REL_PG_LEFT (STR_FRMDLG_BEGIN + 37) -#define STR_FLY_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 38) -#define STR_FLY_REL_PG_FRAME (STR_FRMDLG_BEGIN + 39) -#define STR_FLY_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 40) -#define STR_FLY_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 41) -#define STR_FLY_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 42) -#define STR_FLY_MIR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 43) +#define STR_PRTAREA (STR_FRMDLG_BEGIN + 21) +#define STR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 22) +#define STR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 23) +#define STR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 24) +#define STR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 25) +#define STR_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 26) +#define STR_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 27) +#define STR_MIR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 28) +#define STR_MIR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 29) +#define STR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 30) +#define STR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 31) +#define STR_REL_BASE (STR_FRMDLG_BEGIN + 32) +#define STR_REL_CHAR (STR_FRMDLG_BEGIN + 33) +#define STR_REL_ROW (STR_FRMDLG_BEGIN + 34) +#define STR_REL_BORDER (STR_FRMDLG_BEGIN + 35) +#define STR_REL_PRTAREA (STR_FRMDLG_BEGIN + 36) +#define STR_FLY_REL_PG_LEFT (STR_FRMDLG_BEGIN + 37) +#define STR_FLY_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 38) +#define STR_FLY_REL_PG_FRAME (STR_FRMDLG_BEGIN + 39) +#define STR_FLY_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 40) +#define STR_FLY_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 41) +#define STR_FLY_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 42) +#define STR_FLY_MIR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 43) #define STR_FLY_MIR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 44)*/ -#define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45) +#define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45) #define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46) #define STR_COLL_HEADER (STR_FRMDLG_BEGIN + 47) #define MSG_COLUMN_ERR_BOUNDWIDTH (STR_FRMDLG_BEGIN + 48) -#define STR_EDIT_GRF (STR_FRMDLG_BEGIN + 49) - -#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50) -#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51) -#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52) -#define STR_CHAR_TOP (STR_FRMDLG_BEGIN + 53) -#define STR_CHAR_BOTTOM (STR_FRMDLG_BEGIN + 54) -#define STR_CHAR_CENTER (STR_FRMDLG_BEGIN + 55) +#define STR_EDIT_GRF (STR_FRMDLG_BEGIN + 49) + +#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50) +#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51) +#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52) +#define STR_CHAR_TOP (STR_FRMDLG_BEGIN + 53) +#define STR_CHAR_BOTTOM (STR_FRMDLG_BEGIN + 54) +#define STR_CHAR_CENTER (STR_FRMDLG_BEGIN + 55) #define FRMDLG_ACT_END STR_CHAR_CENTER diff --git a/sw/source/ui/inc/globals.h b/sw/source/ui/inc/globals.h index 530fef285f9a..7a404392ab2e 100644 --- a/sw/source/ui/inc/globals.h +++ b/sw/source/ui/inc/globals.h @@ -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/inc/globdoc.hrc b/sw/source/ui/inc/globdoc.hrc index cf06e4de05ca..1a27e6236222 100644 --- a/sw/source/ui/inc/globdoc.hrc +++ b/sw/source/ui/inc/globdoc.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 @@ -30,10 +30,10 @@ #include "rcid.hrc" -#define STR_HUMAN_SWGLOBDOC_NAME (RC_GLOBDOC_BEGIN + 2) -#define STR_WRITER_GLOBALDOC_FULLTYPE_40 (RC_GLOBDOC_BEGIN + 3) -#define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4) -#define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5) +#define STR_HUMAN_SWGLOBDOC_NAME (RC_GLOBDOC_BEGIN + 2) +#define STR_WRITER_GLOBALDOC_FULLTYPE_40 (RC_GLOBDOC_BEGIN + 3) +#define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4) +#define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5) #define MN_GLOBALFILE (RC_GLOBDOC_BEGIN + 30) #define MN_GLOBALEDIT (RC_GLOBDOC_BEGIN + 31) diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx index 8c38b3e91efd..09495c424dd2 100644 --- a/sw/source/ui/inc/glosbib.hxx +++ b/sw/source/ui/inc/glosbib.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 @@ -63,35 +63,35 @@ public: SwGlossaryGroupTLB(Window* pParent, const ResId& rResId) : SvTabListBox(pParent, rResId) {} - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); }; class SwGlossaryGroupDlg : public SvxStandardDialog { - FEdit aNameED; - ListBox aPathLB; - SwGlossaryGroupTLB aGroupTLB; + FEdit aNameED; + ListBox aPathLB; + SwGlossaryGroupTLB aGroupTLB; - OKButton aOkPB; - CancelButton aCancelPB; - HelpButton aHelpPB; - PushButton aNewPB; - PushButton aDelPB; - PushButton aRenamePB; + OKButton aOkPB; + CancelButton aCancelPB; + HelpButton aHelpPB; + PushButton aNewPB; + PushButton aDelPB; + PushButton aRenamePB; FixedText aBibFT; FixedText aPathFT; FixedText aSelectFT; - SvStrings* pRemovedArr; - SvStrings* pInsertedArr; - SvStrings* pRenamedArr; + SvStrings* pRemovedArr; + SvStrings* pInsertedArr; + SvStrings* pRenamedArr; - SwGlossaryHdl *pGlosHdl; + SwGlossaryHdl *pGlosHdl; - String sCreatedGroup; + String sCreatedGroup; - BOOL IsDeleteAllowed(const String &rGroup); + BOOL IsDeleteAllowed(const String &rGroup); protected: virtual void Apply(); @@ -107,7 +107,7 @@ public: SwGlossaryHdl *pGlosHdl); ~SwGlossaryGroupDlg(); - const String& GetCreatedGroupName() const {return sCreatedGroup;} + const String& GetCreatedGroupName() const {return sCreatedGroup;} }; #endif diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx index 8a88d86fe3a6..89f09207a3e9 100644 --- a/sw/source/ui/inc/glosdoc.hxx +++ b/sw/source/ui/inc/glosdoc.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 @@ -70,8 +70,8 @@ class SW_DLLPUBLIC SwGlossaries SvStrings *m_pGlosArr; BOOL m_bError; - SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const; - SW_DLLPRIVATE SvStrings *GetNameList(); + SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const; + SW_DLLPRIVATE SvStrings *GetNameList(); // implementation in unoatxt.cxx SW_DLLPRIVATE void RemoveFileFromList( const String& rGroup ); @@ -119,28 +119,28 @@ public: bool _bCreate = false ); - USHORT GetGroupCnt(); - String GetGroupName(USHORT ); - String GetGroupTitle( const String& rGroupName ); + USHORT GetGroupCnt(); + String GetGroupName(USHORT ); + String GetGroupTitle( const String& rGroupName ); - BOOL FindGroupName(String & rGroup); + BOOL FindGroupName(String & rGroup); - SwTextBlocks* GetGroupDoc(const String &rName, + SwTextBlocks* GetGroupDoc(const String &rName, BOOL bCreate = FALSE) const; - SwTextBlocks* GetDefGroupDoc() const {return GetGroupDoc(GetDefName());} - void PutGroupDoc(SwTextBlocks *pBlock); - static String GetDefName(); - static String GetExtension(); - - String GetCompleteGroupName( const ::rtl::OUString& GroupName ); - - BOOL NewGroupDoc(String &rGroupName, const String& rTitle); - BOOL RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle); - BOOL DelGroupDoc(const String &); - SwDocShellRef EditGroupDoc(const String &rGrpName, const String& rShortName, BOOL bShow = TRUE ); - void SaveGroupDoc(const String &rGrpName, const String& rLongName ); - void UpdateGlosPath(BOOL bFull); - void ShowError(); + SwTextBlocks* GetDefGroupDoc() const {return GetGroupDoc(GetDefName());} + void PutGroupDoc(SwTextBlocks *pBlock); + static String GetDefName(); + static String GetExtension(); + + String GetCompleteGroupName( const ::rtl::OUString& GroupName ); + + BOOL NewGroupDoc(String &rGroupName, const String& rTitle); + BOOL RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle); + BOOL DelGroupDoc(const String &); + SwDocShellRef EditGroupDoc(const String &rGrpName, const String& rShortName, BOOL bShow = TRUE ); + void SaveGroupDoc(const String &rGrpName, const String& rLongName ); + void UpdateGlosPath(BOOL bFull); + void ShowError(); inline ULONG IsGlosPathErr() { return m_bError; } const SvStrings* GetPathArray() const {return m_pPathArr;} }; diff --git a/sw/source/ui/inc/gloshdl.hxx b/sw/source/ui/inc/gloshdl.hxx index 7e5d9fbfd619..6abf6ddacb83 100644 --- a/sw/source/ui/inc/gloshdl.hxx +++ b/sw/source/ui/inc/gloshdl.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,68 +41,68 @@ class SfxViewFrame; class SW_DLLPUBLIC SwGlossaryHdl { - SwGlossaries& rStatGlossaries; - String aCurGrp; - SfxViewFrame* pViewFrame; - SwWrtShell* pWrtShell; - SwTextBlocks* pCurGrp; + SwGlossaries& rStatGlossaries; + String aCurGrp; + SfxViewFrame* pViewFrame; + SwWrtShell* pWrtShell; + SwTextBlocks* pCurGrp; - SW_DLLPRIVATE void _SetMacros(const String &rName, + SW_DLLPRIVATE void _SetMacros(const String &rName, const SvxMacro *pStart, const SvxMacro *pEnd); - SW_DLLPRIVATE BOOL Expand( const String& rShortName, + SW_DLLPRIVATE BOOL Expand( const String& rShortName, SwGlossaries* pGlossaries, SwTextBlocks *pGlossary ); public: BOOL ConvertToNew(SwTextBlocks& rOld); - void GlossaryDlg(); + void GlossaryDlg(); - USHORT GetGroupCnt() const; - String GetGroupName( USHORT, String* pTitle = 0 ); - BOOL NewGroup(String & rGroupName, const String& rTitle); - BOOL DelGroup(const String &); - BOOL RenameGroup(const String & rOld, String& rNew, const String& rNewTitle); - void SetCurGroup(const String &aGrp, BOOL bApi = FALSE, BOOL bAlwaysCreateNew = FALSE); + USHORT GetGroupCnt() const; + String GetGroupName( USHORT, String* pTitle = 0 ); + BOOL NewGroup(String & rGroupName, const String& rTitle); + BOOL DelGroup(const String &); + BOOL RenameGroup(const String & rOld, String& rNew, const String& rNewTitle); + void SetCurGroup(const String &aGrp, BOOL bApi = FALSE, BOOL bAlwaysCreateNew = FALSE); const String &GetCurGroup() const { return aCurGrp; } - USHORT GetGlossaryCnt(); - String GetGlossaryName(USHORT); - String GetGlossaryShortName(const String &rName); - String GetGlossaryShortName(USHORT); + USHORT GetGlossaryCnt(); + String GetGlossaryName(USHORT); + String GetGlossaryShortName(const String &rName); + String GetGlossaryShortName(USHORT); BOOL Rename( const String& rOldShortName, const String& rNewShortName, const String& rNewName); BOOL CopyOrMove( const String& rSourceGroupName, String& rSourceShortName, const String& rDestGroupName, const String& rLongName, BOOL bMove ); - BOOL HasShortName(const String &rShortName) const; + BOOL HasShortName(const String &rShortName) const; //wird NewGlossary vom Basic gerufen, dann soll dir zuvor eingestellte //Gruppe ggf. neu erstellt werden - BOOL NewGlossary(const String &rName, const String &rShortName, + BOOL NewGlossary(const String &rName, const String &rShortName, BOOL bApiCall = FALSE, BOOL bNoAttr = FALSE ); - BOOL DelGlossary(const String&); - BOOL CopyToClipboard(SwWrtShell& rSh, const String& rShortName); + BOOL DelGlossary(const String&); + BOOL CopyToClipboard(SwWrtShell& rSh, const String& rShortName); BOOL ExpandGlossary(); - BOOL InsertGlossary(const String &rName); + BOOL InsertGlossary(const String &rName); - void SetMacros(const String& rName, + void SetMacros(const String& rName, const SvxMacro* pStart, const SvxMacro* pEnd, SwTextBlocks *pGlossary = 0 ); - void GetMacros(const String& rShortName, + void GetMacros(const String& rShortName, SvxMacro& rStart, SvxMacro& rEnd, SwTextBlocks* pGlossary = 0 ); - BOOL IsReadOnly( const String* = 0 ) const; - BOOL IsOld() const; + BOOL IsReadOnly( const String* = 0 ) const; + BOOL IsOld() const; - BOOL FindGroupName(String & rGroup); // Gruppe ohne Pfadindex finden + BOOL FindGroupName(String & rGroup); // Gruppe ohne Pfadindex finden - BOOL ImportGlossaries( const String& rName ); + BOOL ImportGlossaries( const String& rName ); SwGlossaryHdl(SfxViewFrame* pViewFrame, SwWrtShell *); ~SwGlossaryHdl(); diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index dc50675b0ca5..762734fd7883 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.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,12 +40,12 @@ class SvStringsISortDtor; struct AutoTextGroup { - USHORT nCount; - String sName; - String sTitle; - String sLongNames; // durch 0x0A getrennte Langnamen - String sShortNames; // durch 0x0A getrennte Kurznamen - DateTime aDateModified; + USHORT nCount; + String sName; + String sTitle; + String sLongNames; // durch 0x0A getrennte Langnamen + String sShortNames; // durch 0x0A getrennte Kurznamen + DateTime aDateModified; }; @@ -54,31 +54,31 @@ SV_DECL_PTRARR(AutoTextGroups, AutoTextGroupPtr, 4, 4) class SwGlossaryList : public AutoTimer { - AutoTextGroups aGroupArr; - String sPath; - BOOL bFilled; + AutoTextGroups aGroupArr; + String sPath; + BOOL bFilled; - AutoTextGroup* FindGroup(const String& rGroupName); - void FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss); + AutoTextGroup* FindGroup(const String& rGroupName); + void FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss); public: SwGlossaryList(); ~SwGlossaryList(); - BOOL HasLongName(const String& rBegin, SvStringsISortDtor* pLongNames ); - BOOL GetShortName(const String& rLongName, + BOOL HasLongName(const String& rBegin, SvStringsISortDtor* pLongNames ); + BOOL GetShortName(const String& rLongName, String& rShortName, String& rGroupName ); - USHORT GetGroupCount(); - String GetGroupName(USHORT nPos, BOOL bNoPath = TRUE, String* pTitle = 0); - USHORT GetBlockCount(USHORT nGroup); - String GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName); + USHORT GetGroupCount(); + String GetGroupName(USHORT nPos, BOOL bNoPath = TRUE, String* pTitle = 0); + USHORT GetBlockCount(USHORT nGroup); + String GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName); - void Update(); + void Update(); - virtual void Timeout(); + virtual void Timeout(); - void ClearGroups(); + void ClearGroups(); }; #endif diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index f987b382562f..303c44f9ba26 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.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 @@ -65,7 +65,7 @@ const short RET_EDIT = 100; class SwGlTreeListBox : public SvTreeListBox { - const String sReadonly; + const String sReadonly; SvLBoxEntry* pDragEntry; @@ -78,15 +78,15 @@ class SwGlTreeListBox : public SvTreeListBox SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, + virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos); + ULONG& rNewChildPos); public: SwGlTreeListBox(Window* pParent, const ResId& rResId); - virtual void RequestHelp( const HelpEvent& rHEvt ); - void Clear(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + void Clear(); }; //------------------------------------------------------------------ @@ -96,44 +96,44 @@ class SwGlossaryDlg : public SvxStandardDialog friend class SwNewGlosNameDlg; friend class SwGlTreeListBox; - CheckBox aInsertTipCB; - FixedText aNameLbl; - Edit aNameED; - FixedText aShortNameLbl; - NoSpaceEdit aShortNameEdit; - SwGlTreeListBox aCategoryBox; + CheckBox aInsertTipCB; + FixedText aNameLbl; + Edit aNameED; + FixedText aShortNameLbl; + NoSpaceEdit aShortNameEdit; + SwGlTreeListBox aCategoryBox; FixedLine aRelativeFL; - CheckBox aFileRelCB; - CheckBox aNetRelCB; + CheckBox aFileRelCB; + CheckBox aNetRelCB; Window aExampleWIN; Window aExampleDummyWIN; CheckBox aShowExampleCB; - OKButton aInsertBtn; - CancelButton aCloseBtn; - HelpButton aHelpBtn; - MenuButton aEditBtn; - PushButton aBibBtn; - PushButton aPathBtn; + OKButton aInsertBtn; + CancelButton aCloseBtn; + HelpButton aHelpBtn; + MenuButton aEditBtn; + PushButton aBibBtn; + PushButton aPathBtn; - String sReadonlyPath; + String sReadonlyPath; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText; - SwOneExampleFrame* pExampleFrame; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText; + SwOneExampleFrame* pExampleFrame; - PopupMenu* pMenu; - SwGlossaryHdl* pGlossaryHdl; + PopupMenu* pMenu; + SwGlossaryHdl* pGlossaryHdl; - String sResumeGroup; - String sResumeShortName; - BOOL bResume; + String sResumeGroup; + String sResumeShortName; + BOOL bResume; - const sal_Bool bSelection : 1; - sal_Bool bReadOnly : 1; - sal_Bool bIsOld : 1; - sal_Bool bIsDocReadOnly:1; + const sal_Bool bSelection : 1; + sal_Bool bReadOnly : 1; + sal_Bool bIsOld : 1; + sal_Bool bIsDocReadOnly:1; - SwWrtShell* pSh; + SwWrtShell* pSh; void EnableShortName(sal_Bool bOn = sal_True); @@ -150,26 +150,26 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( PreviewLoadedHdl, void * ); - virtual void Apply(); - void Init(); - SvLBoxEntry* DoesBlockExist(const String& sBlock, const String& rShort); - void ShowAutoText(const String& rGroup, const String& rShortName); - void ResumeShowAutoText(); + virtual void Apply(); + void Init(); + SvLBoxEntry* DoesBlockExist(const String& sBlock, const String& rShort); + void ShowAutoText(const String& rGroup, const String& rShortName); + void ResumeShowAutoText(); - BOOL GetResumeData(String& rGroup, String& rShortName) + BOOL GetResumeData(String& rGroup, String& rShortName) {rGroup = sResumeGroup; rShortName = sResumeShortName; return bResume;} - void SetResumeData(const String& rGroup, const String& rShortName) + void SetResumeData(const String& rGroup, const String& rShortName) {sResumeGroup = rGroup; sResumeShortName = rShortName; bResume = TRUE;} - void ResetResumeData() {bResume = FALSE;} + void ResetResumeData() {bResume = FALSE;} public: SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); ~SwGlossaryDlg(); - String GetCurrGrpName() const; - inline String GetCurrLongName() const; - inline String GetCurrShortName() const; + String GetCurrGrpName() const; + inline String GetCurrLongName() const; + inline String GetCurrShortName() const; static String GetCurrGroup(); - static void SetActGroup(const String& rNewGroup); - static String GetExtension(); + static void SetActGroup(const String& rNewGroup); + static String GetExtension(); }; inline String SwGlossaryDlg::GetCurrLongName() const diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx index be8cd87ad1ba..f258613dd3a7 100644 --- a/sw/source/ui/inc/glshell.hxx +++ b/sw/source/ui/inc/glshell.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 @@ -31,10 +31,10 @@ class SwGlosDocShell : public SwDocShell { - String aLongName; - String aShortName; - String aGroupName; - sal_Bool bShow; + String aLongName; + String aShortName; + String aGroupName; + sal_Bool bShow; using SotObject::GetInterface; @@ -45,27 +45,27 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SW_GLOSDOCSHELL) - + SwGlosDocShell( sal_Bool bNewShow = sal_True); virtual ~SwGlosDocShell(); - void Execute( SfxRequest& ); - void GetState( SfxItemSet& ); - void SetLongName( const String& rLongName ) + void Execute( SfxRequest& ); + void GetState( SfxItemSet& ); + void SetLongName( const String& rLongName ) { aLongName = rLongName; } - void SetShortName( const String& rShortName ) + void SetShortName( const String& rShortName ) { aShortName = rShortName; } - void SetGroupName( const String& rGroupName ) + void SetGroupName( const String& rGroupName ) { aGroupName = rGroupName; } - const String& GetShortName(){return aShortName;} + const String& GetShortName(){return aShortName;} }; class SwWebGlosDocShell : public SwWebDocShell { - String aLongName; - String aShortName; - String aGroupName; + String aLongName; + String aShortName; + String aGroupName; using SotObject::GetInterface; @@ -76,19 +76,19 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SW_WEBGLOSDOCSHELL) - + SwWebGlosDocShell(); virtual ~SwWebGlosDocShell(); - void Execute( SfxRequest& ); - void GetState( SfxItemSet& ); - void SetLongName( const String& rLongName ) + void Execute( SfxRequest& ); + void GetState( SfxItemSet& ); + void SetLongName( const String& rLongName ) { aLongName = rLongName; } - void SetShortName( const String& rShortName ) + void SetShortName( const String& rShortName ) { aShortName = rShortName; } - void SetGroupName( const String& rGroupName ) + void SetGroupName( const String& rGroupName ) { aGroupName = rGroupName; } - const String& GetShortName(){return aShortName;} + const String& GetShortName(){return aShortName;} }; #endif diff --git a/sw/source/ui/inc/grfsh.hxx b/sw/source/ui/inc/grfsh.hxx index 231cc170baab..3bbe9e3e5eeb 100644 --- a/sw/source/ui/inc/grfsh.hxx +++ b/sw/source/ui/inc/grfsh.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 @@ -35,9 +35,9 @@ class SwGrfShell: public SwBaseShell public: SFX_DECL_INTERFACE(SW_GRFSHELL) - void Execute(SfxRequest &); - void ExecAttr(SfxRequest &); - void GetAttrState(SfxItemSet &); + void Execute(SfxRequest &); + void ExecAttr(SfxRequest &); + void GetAttrState(SfxItemSet &); SwGrfShell(SwView &rView); }; diff --git a/sw/source/ui/inc/hidfunc.h b/sw/source/ui/inc/hidfunc.h index 819f63ecbe72..0dd616e22353 100644 --- a/sw/source/ui/inc/hidfunc.h +++ b/sw/source/ui/inc/hidfunc.h @@ -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 @@ -25,329 +25,329 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define HID_EXIT 1017 -#define HID_NEW_WINDOW 1701 -#define HID_ARRANGE_CASCADE_WIN 1703 -#define HID_ARRANGE_HORZ_WIN 1704 -#define HID_ARRANGE_VERT_WIN 1705 -#define HID_ARRANGE_ALL_WIN 1702 -#define HID_SHOW_HELP_INDEX 1802 -#define HID_NEW_FILE 1005 -#define HID_NEW_FILE_DEFAULT 1024 -#define HID_CLOSE_FILE 1001 -#define HID_DOC_MGR_DLG 1032 -#define HID_CONFIG_TOOLBOX 1629 -#define HID_CONFIG_MENU 1630 -#define HID_CONFIG_KEY 1631 -#define HID_TEMPLATE_PI 1657 -#define HID_ADDR_PI 1658 -#define HID_AUTO_FORMAT 1651 -#define HID_NAVIGATION_PI 1656 -#define HID_NAVIGATION_PI_GOTO_PAGE 1659 -#define HID_HELP_PI 1655 -#define HID_FORMAT_DROPCAPS 1454 -#define HID_CONFIG_VIEWOPTIONS 1635 -#define HID_CONFIG_COLORS 1636 -#define HID_TOOLBOX 1213 -#define HID_RIBBON 1210 -#define HID_RULER 1211 -#define HID_VLINEAL 1216 -#define HID_VSCROLLBAR 1217 -#define HID_HSCROLLBAR 1218 -#define HID_SAVE_FILE 1013 -#define HID_SAVE_ALL 1023 -#define HID_SAVE_FILE_AS 1012 -#define HID_OPEN_LASTVERSION 1009 -#define HID_STATUSBAR 1212 -#define HID_ABOUT_DLG 1806 -#define HID_SEND_MAIL 1022 -#define HID_OPEN_FILE 1007 -#define HID_INSERT_FILE 1309 -#define HID_DOCSTAT_DLG 1020 -#define HID_LOAD_TEMPLATE_DLG 1021 -#define HID_ESCAPE 1941 -#define HID_PLAY_MACRO_DLG 1624 -#define HID_RECORD_MACRO_DLG 1622 -#define HID_ASSIGN_LOCAL_MACRO_DLG 1632 -#define HID_COMPILE_MACRO 1633 -#define HID_CREATE_DOCUMENT 1019 -#define HID_PAGEUP 1937 -#define HID_PAGEDOWN 1938 -#define HID_SET_LEFT_PARA 1418 -#define HID_SET_RIGHT_PARA 1419 -#define HID_SET_CENTER_PARA 1420 -#define HID_SET_JUSTIFY_PARA 1421 -#define HID_SET_ADJUST 1428 -#define HID_FORMAT_RESET 1469 -#define HID_INDENT_TO_TABSTOP 1417 -#define HID_UNINDENT_TO_TABSTOP 1431 -#define HID_SET_BOLD 1405 -#define HID_SET_ITALIC 1406 -#define HID_SET_UNDERLINE 1409 -#define HID_SET_STRIKEOUT 1410 -#define HID_SET_OUTLINE 1408 -#define HID_SET_SHADOW 1407 -#define HID_SET_SUPER_SCRIPT 1411 -#define HID_SET_SUB_SCRIPT 1412 -#define HID_SET_COLOR 1413 -#define HID_SET_CASEMAP 1414 -#define HID_SET_LANGUAGE 1415 -#define HID_SET_KERNING 1416 -#define HID_SET_FONT 1401 -#define HID_SET_FONT_SIZE 1402 -#define HID_GROW_FONT_SIZE 1403 -#define HID_SHRINK_FONT_SIZE 1404 -#define HID_SET_LINE_SPACE_1 1422 -#define HID_SET_LINE_SPACE_15 1423 -#define HID_SET_LINE_SPACE_2 1424 -#define HID_SET_PROP_LINE_SPACE 1540 -#define HID_SET_ABS_LINE_SPACE 1541 -#define HID_INSERT_SYMBOL 1328 -#define HID_INSERT_OBJECT_DLG 1322 -#define HID_EDIT_OBJECT 1110 -#define HID_EDIT_LINK_DLG 1109 -#define HID_EDIT_FILE_INFO_DLG 1107 -#define HID_EDIT_IDX_ENTRY_DLG 1123 -#define HID_NUM_BULLET_DOWN 1130 -#define HID_NUM_BULLET_MOVEUP 1134 -#define HID_NUM_BULLET_MOVEDOWN 1135 -#define HID_NUM_BULLET_UP 1131 -#define HID_NUM_BULLET_PREV 1132 -#define HID_NUM_BULLET_NEXT 1133 -#define HID_NUM_BULLET_OUTLINE_MOVEDOWN 1142 -#define HID_NUM_BULLET_OUTLINE_MOVEUP 1141 -#define HID_NUM_BULLET_OUTLINE_UP 1140 -#define HID_NUM_BULLET_OUTLINE_DOWN 1139 -#define HID_NUM_BULLET_NONUM 1136 -#define HID_NUM_NUMBERING_ON 1144 -#define HID_NUM_BULLET_ON 1138 -#define HID_NUM_BULLET_OFF 1137 -#define HID_INSERT_IDX_ENTRY_DLG 1335 -#define HID_POSTIT 1329 -#define HID_INSERT_CAPTION 1310 -#define HID_INSERT_IDX 1336 -#define HID_INSERT_USERIDX 1337 -#define HID_INSERT_CNTNTIDX 1338 -#define HID_INSERT_IDX_ENTRY 1340 -#define HID_INSERT_USERIDX_ENTRY 1341 -#define HID_INSERT_CNTNTIDX_ENTRY 1342 -#define HID_INSERT_FRAME 1334 -#define HID_INSERT_FRAME_INTERACT 1333 -#define HID_INSERT_SOFT_HYPHEN 1350 -#define HID_INSERT_HARD_SPACE 1351 -#define HID_FORMAT_FRAME_DLG 1456 -#define HID_FRAME_TO_TOP 1470 -#define HID_FRAME_TO_BOTTOM 1471 -#define HID_FRAME_NOWRAP 1472 -#define HID_FRAME_WRAP 1473 -#define HID_FRAME_WRAPTHRU 1474 -#define HID_FRAME_ALIGN_HORZ_LEFT 1475 -#define HID_FRAME_ALIGN_HORZ_RIGHT 1476 -#define HID_FRAME_ALIGN_HORZ_CENTER 1477 -#define HID_FRAME_ALIGN_VERT_TOP 1478 -#define HID_FRAME_ALIGN_VERT_BOTTOM 1479 -#define HID_FRAME_ALIGN_VERT_CENTER 1480 -#define HID_EDIT_FIELD 1104 -#define HID_SET_FIELD_VALUE 1112 -#define HID_INSERT_FIELD 1308 -#define HID_INSERT_MERGEFIELD_DLG 1320 -#define HID_EXECUTE_MACROFIELD 1127 -#define HID_UPDATE_FIELDS 1126 -#define HID_UPDATE_INPUTFIELDS 1143 -#define HID_CALC_TABLE 1129 -#define HID_INSERT_BREAK_DLG 1304 -#define HID_INSERT_BOOKMARK 1302 -#define HID_DELETE_BOOKMARK 1301 -#define HID_INSERT_GRAFIC 1315 -#define HID_FORMAT_TABLE_DLG 1460 -#define HID_INSERT_TABLE 1330 -#define HID_INSERT_COLS 1332 -#define HID_PAGE_STYLE_SET_COLS 1538 -#define HID_CONVERT_TEXT_TABLE 1500 -#define HID_TABLE_INSERT_ROW 1501 -#define HID_TABLE_INSERT_COL 1502 -#define HID_TABLE_DELETE_ROW 1503 -#define HID_TABLE_DELETE_COL 1504 -#define HID_TABLE_SPLIT_CELLS 1505 -#define HID_TABLE_MERGE_CELLS 1506 -#define HID_TABLE_SET_ROW_HEIGHT 1507 -#define HID_TABLE_SET_COL_WIDTH 1508 -#define HID_TABLE_SET_ULSPACE 1509 -#define HID_TABLE_SET_GRID 1510 -#define HID_TABLE_SET_SHADOW 1511 -#define HID_FORMAT_CHAR_DLG 1441 -#define HID_FORMAT_PAGE_DLG 1452 -#define HID_CHANGE_PAGENUM 1634 -#define HID_FORMAT_PARA_DLG 1443 -#define HID_FORMAT_TAB_DLG 1445 -#define HID_FORMAT_BORDER_DLG 1447 -#define HID_FORMAT_BORDER 1439 -#define HID_FORMAT_SHADOW 1438 -#define HID_FORMAT_BACKGROUND 1448 -#define HID_FORMAT_BACKGROUND_DLG 1450 -#define HID_SET_FRM_SIZE 1481 -#define HID_SET_FRM_POSITION 1482 -#define HID_SET_FRM_ANCHOR 1483 -#define HID_SET_FRM_WRAP 1484 -#define HID_SET_FRM_DIST 1485 -#define HID_SET_FRM_OPTIONS 1486 -#define HID_SET_FRM_MACRO 1494 -#define HID_SET_FRM_COLUMNS 1495 -#define HID_SET_FRM_COLUMN_WIDTH 1496 -#define HID_SET_GRF_MIRROR 1488 -#define HID_SET_TABLE_WIDTH 1489 -#define HID_SET_TABLE_ALIGN 1490 -#define HID_TABLE_SET_READ_ONLY_CELLS 1517 -#define HID_TABLE_UNSET_READ_ONLY_CELLS 1519 -#define HID_NEW_STYLE_BY_EXAMPLE 1462 -#define HID_UPDATE_STYLES_DIRECT 1497 -#define HID_UPDATE_STYLE_BY_EXAMPLE 1463 -#define HID_STYLE_SHEET_FRAME_DLG 1464 -#define HID_STYLE_SHEET_DOC_DLG 1465 -#define HID_SET_STANDARD_FONTS 1442 -#define HID_COPY 1102 -#define HID_PASTE 1113 -#define HID_PASTEUNFORMATTED 1115 -#define HID_PASTESPECIAL 1114 -#define HID_CUT 1103 -#define HID_FLIP_HORZ_GRAFIC 1425 -#define HID_FLIP_VERT_GRAFIC 1426 -#define HID_FORMAT_GRAFIC_DLG 1458 -#define HID_VIEW_BOUNDS 1214 -#define HID_VIEW_FIELDS 1215 -#define HID_VIEW_META_CHARS 1224 -#define HID_VIEW_MARKS 1225 -#define HID_VIEW_FIELDNAME 1226 -#define HID_VIEW_TABLEGRID 1227 -#define HID_SEARCH 1117 -#define HID_REPEAT_SEARCH 1150 -#define HID_REPLACE 1118 -#define HID_GOTO 1111 -#define HID_SETUP_PRINTER_DLG 1015 -#define HID_PRINT_FILE 1010 -#define HID_PRINT_FILE_DEFAULT 1025 -#define HID_FAX 1028 -#define HID_PRINT_FILE_OPTIONS 1011 -#define HID_THESAURUS_DLG 1604 -#define HID_SPELLING_DLG 1601 -#define HID_HYPHENATE_OPT_DLG 1607 -#define HID_MERGE_FILE_DLG 1004 -#define HID_SELECT_DATABASE 1030 -#define HID_DOC_INFO_DLG 1031 -#define HID_MERGE_FILE 1003 -#define HID_MERGE_RECORD 1327 -#define HID_INSERT_RECORD 1326 -#define HID_NUMBERING_OUTLINE_DLG 1612 -#define HID_NUMBER_BULLETS 1121 -#define HID_ZOOM 1231 -#define HID_SORTING 1613 -#define HID_SORTING_DLG 1614 -#define HID_CALCULATE 1615 -#define HID_REFRESH_VIEW 1201 -#define HID_CHAR_LEFT 1901 -#define HID_CHAR_RIGHT 1902 -#define HID_LINE_UP 1903 -#define HID_LINE_DOWN 1904 -#define HID_START_OF_LINE 1905 -#define HID_END_OF_LINE 1906 -#define HID_START_OF_DOCUMENT 1907 -#define HID_END_OF_DOCUMENT 1908 -#define HID_SELECT_WORD 1943 -#define HID_SELECT_ALL 1119 -#define HID_START_OF_NEXT_PAGE 1909 -#define HID_END_OF_NEXT_PAGE 1910 -#define HID_START_OF_PREV_PAGE 1911 -#define HID_END_OF_PREV_PAGE 1912 -#define HID_START_OF_PAGE 1913 -#define HID_END_OF_PAGE 1914 -#define HID_NEXT_WORD 1921 -#define HID_START_OF_PARA 1919 -#define HID_END_OF_PARA 1920 -#define HID_PREV_WORD 1922 -#define HID_NEXT_SENT 1923 -#define HID_PREV_SENT 1924 -#define HID_SET_INS_MODE 1936 -#define HID_SET_ADD_MODE 1939 -#define HID_SET_EXT_MODE 1940 -#define HID_START_TABLE 1947 -#define HID_END_TABLE 1948 -#define HID_NEXT_TABLE 1949 -#define HID_PREV_TABLE 1950 -#define HID_TABLE_SELECT_ALL 1515 -#define HID_TABLE_SELECT_COL 1514 -#define HID_TABLE_SELECT_ROW 1513 -#define HID_START_OF_COLUMN 1917 -#define HID_END_OF_COLUMN 1918 -#define HID_START_OF_NEXT_COLUMN 1951 -#define HID_END_OF_NEXT_COLUMN 1952 -#define HID_START_OF_PREV_COLUMN 1953 -#define HID_END_OF_PREV_COLUMN 1954 -#define HID_FOOTNOTE_TO_ANCHOR 1955 -#define HID_NEXT_FOOTNOTE 1956 -#define HID_PREV_FOOTNOTE 1957 -#define HID_CNTNT_TO_NEXT_FRAME 1958 -#define HID_FRAME_TO_ANCHOR 1959 -#define HID_TO_HEADER 1960 -#define HID_TO_FOOTER 1961 -#define HID_IDX_MARK_TO_IDX 1962 -#define HID_DELETE 1925 -#define HID_BACKSPACE 1926 -#define HID_DELETE_SENT 1927 -#define HID_DELETE_BACK_SENT 1928 -#define HID_DELETE_WORD 1929 -#define HID_DELETE_BACK_WORD 1930 -#define HID_DELETE_LINE 1931 -#define HID_DELETE_BACK_LINE 1932 -#define HID_DELETE_PARA 1933 -#define HID_DELETE_BACK_PARA 1934 -#define HID_DELETE_WHOLE_LINE 1935 -#define HID_INSERT_BREAK 1303 -#define HID_INSERT_PAGEBREAK 1323 -#define HID_INSERT_LINEBREAK 1318 -#define HID_INSERT_COLUMN_BREAK 1305 -#define HID_INSERT_FOOTNOTE 1311 -#define HID_INSERT_FOOTNOTE_DLG 1312 -#define HID_FORMAT_FOOTNOTE_DLG 1468 -#define HID_UNDO 1120 -#define HID_REDO 1116 -#define HID_REPEAT 1122 -#define HID_REPAGINATE 1161 -#define HID_SHOW_UPDATE_HELP 1805 -#define HID_SHOW_KEYBOARD_HELP 1803 -#define HID_SHOW_HELP_MANUAL 1804 -#define HID_GLOSSARY_DLG 1620 -#define HID_EXPAND_GLOSSARY 1628 -#define HID_INSERT_GLOSSARY 1640 -#define HID_AUTO_CORRECT_DLG 1650 -#define HID_AUTO_CORRECT 1649 -#define HID_CONFIG_DLG 1627 -#define HID_INSERT_STRING 1331 -#define HID_SET_CHAR_STYLE 1491 -#define HID_SET_PARA_STYLE 1492 -#define HID_SET_PAGE_STYLE 1493 -#define HID_SET_LRMARGIN 1429 -#define HID_SET_ULMARGIN 1430 -#define HID_SET_HYPHEN_ZONE 1432 -#define HID_SET_PAGE_BREAK 1433 -#define HID_FORMAT_PAGE 1451 -#define HID_SET_KEEP_TOGETHER 1434 -#define HID_SET_WIDOW 1436 -#define HID_SET_ORPHAN 1437 -#define HID_BUFFER_UPDATE 1124 -#define HID_FORMAT_TAB 1444 -#define HID_IS_END_OF_PARA 2000 -#define HID_IS_END_OF_WORD 2000 -#define HID_IS_END_OF_DOC 2000 -#define HID_IS_START_OF_PARA 2000 -#define HID_IS_START_OF_WORD 2000 -#define HID_IS_START_OF_DOC 2000 -#define HID_EDIT_FORMULA 1128 -#define HID_ENVELOP 2050 -#define HID_LABEL 2051 -#define HID_AGENDA_WIZZARD 1663 -#define HID_MEMO_WIZZARD 1662 -#define HID_FAX_WIZZARD 1661 -#define HID_LETTER_WIZZARD 1660 -#define HID_LAUNCH_REGISTRY 1002 +#define HID_EXIT 1017 +#define HID_NEW_WINDOW 1701 +#define HID_ARRANGE_CASCADE_WIN 1703 +#define HID_ARRANGE_HORZ_WIN 1704 +#define HID_ARRANGE_VERT_WIN 1705 +#define HID_ARRANGE_ALL_WIN 1702 +#define HID_SHOW_HELP_INDEX 1802 +#define HID_NEW_FILE 1005 +#define HID_NEW_FILE_DEFAULT 1024 +#define HID_CLOSE_FILE 1001 +#define HID_DOC_MGR_DLG 1032 +#define HID_CONFIG_TOOLBOX 1629 +#define HID_CONFIG_MENU 1630 +#define HID_CONFIG_KEY 1631 +#define HID_TEMPLATE_PI 1657 +#define HID_ADDR_PI 1658 +#define HID_AUTO_FORMAT 1651 +#define HID_NAVIGATION_PI 1656 +#define HID_NAVIGATION_PI_GOTO_PAGE 1659 +#define HID_HELP_PI 1655 +#define HID_FORMAT_DROPCAPS 1454 +#define HID_CONFIG_VIEWOPTIONS 1635 +#define HID_CONFIG_COLORS 1636 +#define HID_TOOLBOX 1213 +#define HID_RIBBON 1210 +#define HID_RULER 1211 +#define HID_VLINEAL 1216 +#define HID_VSCROLLBAR 1217 +#define HID_HSCROLLBAR 1218 +#define HID_SAVE_FILE 1013 +#define HID_SAVE_ALL 1023 +#define HID_SAVE_FILE_AS 1012 +#define HID_OPEN_LASTVERSION 1009 +#define HID_STATUSBAR 1212 +#define HID_ABOUT_DLG 1806 +#define HID_SEND_MAIL 1022 +#define HID_OPEN_FILE 1007 +#define HID_INSERT_FILE 1309 +#define HID_DOCSTAT_DLG 1020 +#define HID_LOAD_TEMPLATE_DLG 1021 +#define HID_ESCAPE 1941 +#define HID_PLAY_MACRO_DLG 1624 +#define HID_RECORD_MACRO_DLG 1622 +#define HID_ASSIGN_LOCAL_MACRO_DLG 1632 +#define HID_COMPILE_MACRO 1633 +#define HID_CREATE_DOCUMENT 1019 +#define HID_PAGEUP 1937 +#define HID_PAGEDOWN 1938 +#define HID_SET_LEFT_PARA 1418 +#define HID_SET_RIGHT_PARA 1419 +#define HID_SET_CENTER_PARA 1420 +#define HID_SET_JUSTIFY_PARA 1421 +#define HID_SET_ADJUST 1428 +#define HID_FORMAT_RESET 1469 +#define HID_INDENT_TO_TABSTOP 1417 +#define HID_UNINDENT_TO_TABSTOP 1431 +#define HID_SET_BOLD 1405 +#define HID_SET_ITALIC 1406 +#define HID_SET_UNDERLINE 1409 +#define HID_SET_STRIKEOUT 1410 +#define HID_SET_OUTLINE 1408 +#define HID_SET_SHADOW 1407 +#define HID_SET_SUPER_SCRIPT 1411 +#define HID_SET_SUB_SCRIPT 1412 +#define HID_SET_COLOR 1413 +#define HID_SET_CASEMAP 1414 +#define HID_SET_LANGUAGE 1415 +#define HID_SET_KERNING 1416 +#define HID_SET_FONT 1401 +#define HID_SET_FONT_SIZE 1402 +#define HID_GROW_FONT_SIZE 1403 +#define HID_SHRINK_FONT_SIZE 1404 +#define HID_SET_LINE_SPACE_1 1422 +#define HID_SET_LINE_SPACE_15 1423 +#define HID_SET_LINE_SPACE_2 1424 +#define HID_SET_PROP_LINE_SPACE 1540 +#define HID_SET_ABS_LINE_SPACE 1541 +#define HID_INSERT_SYMBOL 1328 +#define HID_INSERT_OBJECT_DLG 1322 +#define HID_EDIT_OBJECT 1110 +#define HID_EDIT_LINK_DLG 1109 +#define HID_EDIT_FILE_INFO_DLG 1107 +#define HID_EDIT_IDX_ENTRY_DLG 1123 +#define HID_NUM_BULLET_DOWN 1130 +#define HID_NUM_BULLET_MOVEUP 1134 +#define HID_NUM_BULLET_MOVEDOWN 1135 +#define HID_NUM_BULLET_UP 1131 +#define HID_NUM_BULLET_PREV 1132 +#define HID_NUM_BULLET_NEXT 1133 +#define HID_NUM_BULLET_OUTLINE_MOVEDOWN 1142 +#define HID_NUM_BULLET_OUTLINE_MOVEUP 1141 +#define HID_NUM_BULLET_OUTLINE_UP 1140 +#define HID_NUM_BULLET_OUTLINE_DOWN 1139 +#define HID_NUM_BULLET_NONUM 1136 +#define HID_NUM_NUMBERING_ON 1144 +#define HID_NUM_BULLET_ON 1138 +#define HID_NUM_BULLET_OFF 1137 +#define HID_INSERT_IDX_ENTRY_DLG 1335 +#define HID_POSTIT 1329 +#define HID_INSERT_CAPTION 1310 +#define HID_INSERT_IDX 1336 +#define HID_INSERT_USERIDX 1337 +#define HID_INSERT_CNTNTIDX 1338 +#define HID_INSERT_IDX_ENTRY 1340 +#define HID_INSERT_USERIDX_ENTRY 1341 +#define HID_INSERT_CNTNTIDX_ENTRY 1342 +#define HID_INSERT_FRAME 1334 +#define HID_INSERT_FRAME_INTERACT 1333 +#define HID_INSERT_SOFT_HYPHEN 1350 +#define HID_INSERT_HARD_SPACE 1351 +#define HID_FORMAT_FRAME_DLG 1456 +#define HID_FRAME_TO_TOP 1470 +#define HID_FRAME_TO_BOTTOM 1471 +#define HID_FRAME_NOWRAP 1472 +#define HID_FRAME_WRAP 1473 +#define HID_FRAME_WRAPTHRU 1474 +#define HID_FRAME_ALIGN_HORZ_LEFT 1475 +#define HID_FRAME_ALIGN_HORZ_RIGHT 1476 +#define HID_FRAME_ALIGN_HORZ_CENTER 1477 +#define HID_FRAME_ALIGN_VERT_TOP 1478 +#define HID_FRAME_ALIGN_VERT_BOTTOM 1479 +#define HID_FRAME_ALIGN_VERT_CENTER 1480 +#define HID_EDIT_FIELD 1104 +#define HID_SET_FIELD_VALUE 1112 +#define HID_INSERT_FIELD 1308 +#define HID_INSERT_MERGEFIELD_DLG 1320 +#define HID_EXECUTE_MACROFIELD 1127 +#define HID_UPDATE_FIELDS 1126 +#define HID_UPDATE_INPUTFIELDS 1143 +#define HID_CALC_TABLE 1129 +#define HID_INSERT_BREAK_DLG 1304 +#define HID_INSERT_BOOKMARK 1302 +#define HID_DELETE_BOOKMARK 1301 +#define HID_INSERT_GRAFIC 1315 +#define HID_FORMAT_TABLE_DLG 1460 +#define HID_INSERT_TABLE 1330 +#define HID_INSERT_COLS 1332 +#define HID_PAGE_STYLE_SET_COLS 1538 +#define HID_CONVERT_TEXT_TABLE 1500 +#define HID_TABLE_INSERT_ROW 1501 +#define HID_TABLE_INSERT_COL 1502 +#define HID_TABLE_DELETE_ROW 1503 +#define HID_TABLE_DELETE_COL 1504 +#define HID_TABLE_SPLIT_CELLS 1505 +#define HID_TABLE_MERGE_CELLS 1506 +#define HID_TABLE_SET_ROW_HEIGHT 1507 +#define HID_TABLE_SET_COL_WIDTH 1508 +#define HID_TABLE_SET_ULSPACE 1509 +#define HID_TABLE_SET_GRID 1510 +#define HID_TABLE_SET_SHADOW 1511 +#define HID_FORMAT_CHAR_DLG 1441 +#define HID_FORMAT_PAGE_DLG 1452 +#define HID_CHANGE_PAGENUM 1634 +#define HID_FORMAT_PARA_DLG 1443 +#define HID_FORMAT_TAB_DLG 1445 +#define HID_FORMAT_BORDER_DLG 1447 +#define HID_FORMAT_BORDER 1439 +#define HID_FORMAT_SHADOW 1438 +#define HID_FORMAT_BACKGROUND 1448 +#define HID_FORMAT_BACKGROUND_DLG 1450 +#define HID_SET_FRM_SIZE 1481 +#define HID_SET_FRM_POSITION 1482 +#define HID_SET_FRM_ANCHOR 1483 +#define HID_SET_FRM_WRAP 1484 +#define HID_SET_FRM_DIST 1485 +#define HID_SET_FRM_OPTIONS 1486 +#define HID_SET_FRM_MACRO 1494 +#define HID_SET_FRM_COLUMNS 1495 +#define HID_SET_FRM_COLUMN_WIDTH 1496 +#define HID_SET_GRF_MIRROR 1488 +#define HID_SET_TABLE_WIDTH 1489 +#define HID_SET_TABLE_ALIGN 1490 +#define HID_TABLE_SET_READ_ONLY_CELLS 1517 +#define HID_TABLE_UNSET_READ_ONLY_CELLS 1519 +#define HID_NEW_STYLE_BY_EXAMPLE 1462 +#define HID_UPDATE_STYLES_DIRECT 1497 +#define HID_UPDATE_STYLE_BY_EXAMPLE 1463 +#define HID_STYLE_SHEET_FRAME_DLG 1464 +#define HID_STYLE_SHEET_DOC_DLG 1465 +#define HID_SET_STANDARD_FONTS 1442 +#define HID_COPY 1102 +#define HID_PASTE 1113 +#define HID_PASTEUNFORMATTED 1115 +#define HID_PASTESPECIAL 1114 +#define HID_CUT 1103 +#define HID_FLIP_HORZ_GRAFIC 1425 +#define HID_FLIP_VERT_GRAFIC 1426 +#define HID_FORMAT_GRAFIC_DLG 1458 +#define HID_VIEW_BOUNDS 1214 +#define HID_VIEW_FIELDS 1215 +#define HID_VIEW_META_CHARS 1224 +#define HID_VIEW_MARKS 1225 +#define HID_VIEW_FIELDNAME 1226 +#define HID_VIEW_TABLEGRID 1227 +#define HID_SEARCH 1117 +#define HID_REPEAT_SEARCH 1150 +#define HID_REPLACE 1118 +#define HID_GOTO 1111 +#define HID_SETUP_PRINTER_DLG 1015 +#define HID_PRINT_FILE 1010 +#define HID_PRINT_FILE_DEFAULT 1025 +#define HID_FAX 1028 +#define HID_PRINT_FILE_OPTIONS 1011 +#define HID_THESAURUS_DLG 1604 +#define HID_SPELLING_DLG 1601 +#define HID_HYPHENATE_OPT_DLG 1607 +#define HID_MERGE_FILE_DLG 1004 +#define HID_SELECT_DATABASE 1030 +#define HID_DOC_INFO_DLG 1031 +#define HID_MERGE_FILE 1003 +#define HID_MERGE_RECORD 1327 +#define HID_INSERT_RECORD 1326 +#define HID_NUMBERING_OUTLINE_DLG 1612 +#define HID_NUMBER_BULLETS 1121 +#define HID_ZOOM 1231 +#define HID_SORTING 1613 +#define HID_SORTING_DLG 1614 +#define HID_CALCULATE 1615 +#define HID_REFRESH_VIEW 1201 +#define HID_CHAR_LEFT 1901 +#define HID_CHAR_RIGHT 1902 +#define HID_LINE_UP 1903 +#define HID_LINE_DOWN 1904 +#define HID_START_OF_LINE 1905 +#define HID_END_OF_LINE 1906 +#define HID_START_OF_DOCUMENT 1907 +#define HID_END_OF_DOCUMENT 1908 +#define HID_SELECT_WORD 1943 +#define HID_SELECT_ALL 1119 +#define HID_START_OF_NEXT_PAGE 1909 +#define HID_END_OF_NEXT_PAGE 1910 +#define HID_START_OF_PREV_PAGE 1911 +#define HID_END_OF_PREV_PAGE 1912 +#define HID_START_OF_PAGE 1913 +#define HID_END_OF_PAGE 1914 +#define HID_NEXT_WORD 1921 +#define HID_START_OF_PARA 1919 +#define HID_END_OF_PARA 1920 +#define HID_PREV_WORD 1922 +#define HID_NEXT_SENT 1923 +#define HID_PREV_SENT 1924 +#define HID_SET_INS_MODE 1936 +#define HID_SET_ADD_MODE 1939 +#define HID_SET_EXT_MODE 1940 +#define HID_START_TABLE 1947 +#define HID_END_TABLE 1948 +#define HID_NEXT_TABLE 1949 +#define HID_PREV_TABLE 1950 +#define HID_TABLE_SELECT_ALL 1515 +#define HID_TABLE_SELECT_COL 1514 +#define HID_TABLE_SELECT_ROW 1513 +#define HID_START_OF_COLUMN 1917 +#define HID_END_OF_COLUMN 1918 +#define HID_START_OF_NEXT_COLUMN 1951 +#define HID_END_OF_NEXT_COLUMN 1952 +#define HID_START_OF_PREV_COLUMN 1953 +#define HID_END_OF_PREV_COLUMN 1954 +#define HID_FOOTNOTE_TO_ANCHOR 1955 +#define HID_NEXT_FOOTNOTE 1956 +#define HID_PREV_FOOTNOTE 1957 +#define HID_CNTNT_TO_NEXT_FRAME 1958 +#define HID_FRAME_TO_ANCHOR 1959 +#define HID_TO_HEADER 1960 +#define HID_TO_FOOTER 1961 +#define HID_IDX_MARK_TO_IDX 1962 +#define HID_DELETE 1925 +#define HID_BACKSPACE 1926 +#define HID_DELETE_SENT 1927 +#define HID_DELETE_BACK_SENT 1928 +#define HID_DELETE_WORD 1929 +#define HID_DELETE_BACK_WORD 1930 +#define HID_DELETE_LINE 1931 +#define HID_DELETE_BACK_LINE 1932 +#define HID_DELETE_PARA 1933 +#define HID_DELETE_BACK_PARA 1934 +#define HID_DELETE_WHOLE_LINE 1935 +#define HID_INSERT_BREAK 1303 +#define HID_INSERT_PAGEBREAK 1323 +#define HID_INSERT_LINEBREAK 1318 +#define HID_INSERT_COLUMN_BREAK 1305 +#define HID_INSERT_FOOTNOTE 1311 +#define HID_INSERT_FOOTNOTE_DLG 1312 +#define HID_FORMAT_FOOTNOTE_DLG 1468 +#define HID_UNDO 1120 +#define HID_REDO 1116 +#define HID_REPEAT 1122 +#define HID_REPAGINATE 1161 +#define HID_SHOW_UPDATE_HELP 1805 +#define HID_SHOW_KEYBOARD_HELP 1803 +#define HID_SHOW_HELP_MANUAL 1804 +#define HID_GLOSSARY_DLG 1620 +#define HID_EXPAND_GLOSSARY 1628 +#define HID_INSERT_GLOSSARY 1640 +#define HID_AUTO_CORRECT_DLG 1650 +#define HID_AUTO_CORRECT 1649 +#define HID_CONFIG_DLG 1627 +#define HID_INSERT_STRING 1331 +#define HID_SET_CHAR_STYLE 1491 +#define HID_SET_PARA_STYLE 1492 +#define HID_SET_PAGE_STYLE 1493 +#define HID_SET_LRMARGIN 1429 +#define HID_SET_ULMARGIN 1430 +#define HID_SET_HYPHEN_ZONE 1432 +#define HID_SET_PAGE_BREAK 1433 +#define HID_FORMAT_PAGE 1451 +#define HID_SET_KEEP_TOGETHER 1434 +#define HID_SET_WIDOW 1436 +#define HID_SET_ORPHAN 1437 +#define HID_BUFFER_UPDATE 1124 +#define HID_FORMAT_TAB 1444 +#define HID_IS_END_OF_PARA 2000 +#define HID_IS_END_OF_WORD 2000 +#define HID_IS_END_OF_DOC 2000 +#define HID_IS_START_OF_PARA 2000 +#define HID_IS_START_OF_WORD 2000 +#define HID_IS_START_OF_DOC 2000 +#define HID_EDIT_FORMULA 1128 +#define HID_ENVELOP 2050 +#define HID_LABEL 2051 +#define HID_AGENDA_WIZZARD 1663 +#define HID_MEMO_WIZZARD 1662 +#define HID_FAX_WIZZARD 1661 +#define HID_LETTER_WIZZARD 1660 +#define HID_LAUNCH_REGISTRY 1002 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/hyp.hxx b/sw/source/ui/inc/hyp.hxx index 110c02540473..d8d49e0734f0 100644 --- a/sw/source/ui/inc/hyp.hxx +++ b/sw/source/ui/inc/hyp.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 @@ -38,29 +38,29 @@ class SwView; class SwHyphWrapper : public SvxSpellWrapper { private: SwView* pView; - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > xHyph; - Link aOldLnk; - LanguageType nLangError; // nicht vorhandene Sprache - sal_uInt16 nPageCount; // Seitenanzahl fuer Progressanzeige - sal_uInt16 nPageStart; // 1. gepruefte Seite - sal_Bool bInSelection : 1; // Trennen von selektiertem Text - sal_Bool bShowError : 1; // nicht vorhandene Sprache melden - sal_Bool bAutomatic : 1; // Trennstellen ohne Rueckfrage einfuegen + Link aOldLnk; + LanguageType nLangError; // nicht vorhandene Sprache + sal_uInt16 nPageCount; // Seitenanzahl fuer Progressanzeige + sal_uInt16 nPageStart; // 1. gepruefte Seite + sal_Bool bInSelection : 1; // Trennen von selektiertem Text + sal_Bool bShowError : 1; // nicht vorhandene Sprache melden + sal_Bool bAutomatic : 1; // Trennstellen ohne Rueckfrage einfuegen sal_Bool bInfoBox : 1; // display info-box when ending DECL_LINK( SpellError, LanguageType * ); protected: - virtual void SpellStart( SvxSpellArea eSpell ); - virtual sal_Bool SpellContinue(); - virtual void SpellEnd( ); - virtual sal_Bool SpellMore(); + virtual void SpellStart( SvxSpellArea eSpell ); + virtual sal_Bool SpellContinue(); + virtual void SpellEnd( ); + virtual sal_Bool SpellMore(); virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen public: - SwHyphWrapper( SwView* pVw, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > &rxHyph, + SwHyphWrapper( SwView* pVw, + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XHyphenator > &rxHyph, sal_Bool bStart, sal_Bool bOther, sal_Bool bSelect ); ~SwHyphWrapper(); }; diff --git a/sw/source/ui/inc/idxmrk.hxx b/sw/source/ui/inc/idxmrk.hxx index 22e71dbc6168..ff5c56270570 100644 --- a/sw/source/ui/inc/idxmrk.hxx +++ b/sw/source/ui/inc/idxmrk.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 @@ -38,7 +38,7 @@ class SwInsertIdxMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; protected: - SwInsertIdxMarkWrapper( Window *pParentWindow, + SwInsertIdxMarkWrapper( Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -46,14 +46,14 @@ protected: SFX_DECL_CHILDWINDOW(SwInsertIdxMarkWrapper); public: - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; class SwInsertAuthMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; protected: - SwInsertAuthMarkWrapper( Window *pParentWindow, + SwInsertAuthMarkWrapper( Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -61,7 +61,7 @@ protected: SFX_DECL_CHILDWINDOW(SwInsertAuthMarkWrapper); public: - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; #endif // _IDXMRK_HXX diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/ui/inc/imaildsplistener.hxx index f12fbc1f3256..f90a4b8b5395 100644 --- a/sw/source/ui/inc/imaildsplistener.hxx +++ b/sw/source/ui/inc/imaildsplistener.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 @@ -37,10 +37,10 @@ class MailDispatcher; /** MailDispatcher listener interface. - Clients may implement and register instances of the + Clients may implement and register instances of the mail dispatcher interface in order to get notifications - about the MailDispatcher status. - + about the MailDispatcher status. + @see MailDispatcher */ class IMailDispatcherListener : public ::salhelper::ReferenceObject @@ -50,29 +50,29 @@ public: Called when the MailDispatcher is started. */ virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) = 0; - + /** Called when the MailDispatcher is stopped. */ virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) = 0; - + /** Called when there are no more mail messages - to deliver. + to deliver. */ virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) = 0; - + /** - Called for every mail message that has been + Called for every mail message that has been successfully delivered. */ - virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage) = 0; - + virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage) = 0; + /** Called for every mail message whose delivery failed. */ - virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage) = 0; + virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage) = 0; }; #endif // INCLUDED_IMAILDISPATCHERLISTENER_HXX diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx index 2bb8665d9712..f2698c6b7a84 100644 --- a/sw/source/ui/inc/initui.hxx +++ b/sw/source/ui/inc/initui.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,13 +41,13 @@ class SvStringsDtor; /* * Extern Definitions */ -extern SwThesaurus* pThes; +extern SwThesaurus* pThes; -extern String* pOldGrfCat; -extern String* pOldTabCat; -extern String* pOldFrmCat; +extern String* pOldGrfCat; +extern String* pOldTabCat; +extern String* pOldFrmCat; -extern String* pCurrGlosGroup; +extern String* pCurrGlosGroup; SW_DLLPUBLIC String* GetOldGrfCat(); SW_DLLPUBLIC String* GetOldTabCat(); @@ -57,10 +57,10 @@ SW_DLLPUBLIC String* GetOldDrwCat(); SW_DLLPUBLIC String* GetCurrGlosGroup(); SW_DLLPUBLIC void SetCurrGlosGroup(String* pStr); -extern SvStringsDtor* pDBNameList; +extern SvStringsDtor* pDBNameList; -extern SvStringsDtor* pAuthFieldNameList; -extern SvStringsDtor* pAuthFieldTypeList; +extern SvStringsDtor* pAuthFieldNameList; +extern SvStringsDtor* pAuthFieldTypeList; // stellt die Textbausteinverwaltung zur Verfuegung class SwGlossaries; @@ -71,8 +71,8 @@ class SwGlossaryList; BOOL HasGlossaryList(); SwGlossaryList* GetGlossaryList(); -extern void _InitUI(); -extern void _FinitUI(); +extern void _InitUI(); +extern void _FinitUI(); extern void _InitSpell(); extern void _FinitSpell(); diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index 35aa82ed6c17..3634dd120a69 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.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 @@ -46,27 +46,27 @@ class SwWrtShell; class SwFldInputDlg: public SvxStandardDialog { - virtual void Apply(); + virtual void Apply(); virtual void StateChanged( StateChangedType ); - SwWrtShell &rSh; - SwInputField* pInpFld; - SwSetExpField* pSetFld; - SwUserFieldType* pUsrType; + SwWrtShell &rSh; + SwInputField* pInpFld; + SwSetExpField* pSetFld; + SwUserFieldType* pUsrType; - Edit aLabelED; + Edit aLabelED; - MultiLineEdit aEditED; + MultiLineEdit aEditED; FixedLine aEditFL; - OKButton aOKBT; - CancelButton aCancelBT; - PushButton aNextBT; - HelpButton aHelpBT; + OKButton aOKBT; + CancelButton aCancelBT; + PushButton aNextBT; + HelpButton aHelpBT; DECL_LINK(NextHdl, PushButton*); public: - SwFldInputDlg( Window *pParent, SwWrtShell &rSh, + SwFldInputDlg( Window *pParent, SwWrtShell &rSh, SwField* pField, BOOL bNextButton = FALSE ); ~SwFldInputDlg(); }; diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 72750bb7d251..e409b1b9f453 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.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 @@ -46,11 +46,11 @@ public: InputEdit(Window* pParent, WinBits nStyle) : Edit(pParent , nStyle){} - void UpdateRange(const String& aSel, + void UpdateRange(const String& aSel, const String& aTblName ); protected: - virtual void KeyInput( const KeyEvent& ); + virtual void KeyInput( const KeyEvent& ); }; //======================================================================== @@ -59,23 +59,23 @@ class SwInputWindow : public ToolBox { friend class InputEdit; - Edit aPos; - InputEdit aEdit; - PopupMenu aPopMenu; - SwFldMgr* pMgr; - SwWrtShell* pWrtShell; - SwView* pView; + Edit aPos; + InputEdit aEdit; + PopupMenu aPopMenu; + SwFldMgr* pMgr; + SwWrtShell* pWrtShell; + SwView* pView; SfxBindings* pBindings; - String aAktTableName, sOldFml; - USHORT nActionCnt; + String aAktTableName, sOldFml; + USHORT nActionCnt; - BOOL bFirst : 1; //Initialisierungen beim ersten Aufruf - BOOL bActive : 1; //fuer Hide/Show beim Dokumentwechsel - BOOL bIsTable : 1; - BOOL bDelSel : 1; - BOOL bDoesUndo : 1; - BOOL bResetUndo : 1; - BOOL bCallUndo : 1; + BOOL bFirst : 1; //Initialisierungen beim ersten Aufruf + BOOL bActive : 1; //fuer Hide/Show beim Dokumentwechsel + BOOL bIsTable : 1; + BOOL bDelSel : 1; + BOOL bDoesUndo : 1; + BOOL bResetUndo : 1; + BOOL bCallUndo : 1; void DelBoxCntnt(); @@ -84,35 +84,35 @@ friend class InputEdit; using Window::IsActive; protected: - virtual void Resize(); - virtual void Click(); + virtual void Resize(); + virtual void Click(); DECL_LINK( MenuHdl, Menu * ); DECL_LINK( DropdownClickHdl, ToolBox* ); - void ApplyFormula(); - void CancelFormula(); + void ApplyFormula(); + void CancelFormula(); public: SwInputWindow( Window* pParent, SfxBindings* pBindings ); - virtual ~SwInputWindow(); + virtual ~SwInputWindow(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SelectHdl( ToolBox*); - - void ShowWin(); - - BOOL IsActive(){ return bActive; }; - + void SelectHdl( ToolBox*); + + void ShowWin(); + + BOOL IsActive(){ return bActive; }; + DECL_LINK( SelTblCellsNotify, SwWrtShell * ); - void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ); - const SwView* GetView() const{return pView;} + void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ); + const SwView* GetView() const{return pView;} }; class SwInputChild : public SfxChildWindow { - BOOL bObjVis; - SfxDispatcher* pDispatch; + BOOL bObjVis; + SfxDispatcher* pDispatch; public: SwInputChild( Window* , USHORT nId, @@ -120,10 +120,10 @@ public: SfxChildWinInfo* ); ~SwInputChild(); SFX_DECL_CHILDWINDOW( SwInputChild ); - void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ) + void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ) { ((SwInputWindow*)pWindow)->SetFormula( rFormula, bDelSel ); } - const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();} + const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();} }; diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx index 3e16d9f75840..208709f40d9a 100644 --- a/sw/source/ui/inc/insfnote.hxx +++ b/sw/source/ui/inc/insfnote.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 @@ -39,30 +39,30 @@ class SwWrtShell; class SwInsFootNoteDlg: public SvxStandardDialog { - SwWrtShell &rSh; + SwWrtShell &rSh; //Alles fuer das/die Zeichen - String aFontName; - CharSet eCharSet; - char cExtChar; - BOOL bExtCharAvailable; - BOOL bEdit; - RadioButton aNumberAutoBtn; - RadioButton aNumberCharBtn; - Edit aNumberCharEdit; - PushButton aNumberExtChar; + String aFontName; + CharSet eCharSet; + char cExtChar; + BOOL bExtCharAvailable; + BOOL bEdit; + RadioButton aNumberAutoBtn; + RadioButton aNumberCharBtn; + Edit aNumberCharEdit; + PushButton aNumberExtChar; FixedLine aNumberFL; //Alles fuer die Auswahl Fussnote/Endnote - RadioButton aFtnBtn; - RadioButton aEndNoteBtn; + RadioButton aFtnBtn; + RadioButton aEndNoteBtn; FixedLine aTypeFL; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - ImageButton aPrevBT; - ImageButton aNextBT; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + ImageButton aPrevBT; + ImageButton aNextBT; DECL_LINK( NumberCharHdl, Button * ); DECL_LINK( NumberEditHdl, void * ); @@ -70,9 +70,9 @@ class SwInsFootNoteDlg: public SvxStandardDialog DECL_LINK( NumberExtCharHdl, Button *); DECL_LINK( NextPrevHdl, Button * ); - virtual void Apply(); + virtual void Apply(); - void Init(); + void Init(); public: SwInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx index e6d02f2ac22d..d9066762acdd 100644 --- a/sw/source/ui/inc/insrule.hxx +++ b/sw/source/ui/inc/insrule.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 @@ -37,14 +37,14 @@ class ValueSet; class SwInsertGrfRulerDlg : public SfxModalDialog { FixedLine aSelectionFL; - OKButton aOkPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOkPB; + CancelButton aCancelPB; + HelpButton aHelpPB; - List aGrfNames; - String sSimple; + List aGrfNames; + String sSimple; String sRulers; - USHORT nSelPos; + USHORT nSelPos; SwRulerValueSet* pExampleVS; @@ -56,9 +56,9 @@ public: SwInsertGrfRulerDlg( Window* pParent ); ~SwInsertGrfRulerDlg(); - String GetGraphicName(); - BOOL IsSimpleLine() {return nSelPos == 1;} - BOOL HasImages() const {return 0 != aGrfNames.Count();} + String GetGraphicName(); + BOOL IsSimpleLine() {return nSelPos == 1;} + BOOL HasImages() const {return 0 != aGrfNames.Count();} }; #endif diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index a65320e294a6..24b7a71e9f7b 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.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 @@ -49,29 +49,29 @@ class SwInsTableDlg : public SfxModalDialog FixedLine aFL; FixedText aColLbl; - NumericField aColEdit; - FixedText aRowLbl; - NumericField aRowEdit; + NumericField aColEdit; + FixedText aRowLbl; + NumericField aRowEdit; FixedLine aOptionsFL; CheckBox aHeaderCB; - CheckBox aRepeatHeaderCB; - FixedText aRepeatHeaderFT; // "dummy" to build before and after FT - FixedText aRepeatHeaderBeforeFT; - NumericField aRepeatHeaderNF; - FixedText aRepeatHeaderAfterFT; - TextControlCombo aRepeatHeaderCombo; + CheckBox aRepeatHeaderCB; + FixedText aRepeatHeaderFT; // "dummy" to build before and after FT + FixedText aRepeatHeaderBeforeFT; + NumericField aRepeatHeaderNF; + FixedText aRepeatHeaderAfterFT; + TextControlCombo aRepeatHeaderCombo; - CheckBox aDontSplitCB; - CheckBox aBorderCB; + CheckBox aDontSplitCB; + CheckBox aBorderCB; OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - PushButton aAutoFmtBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + PushButton aAutoFmtBtn; - SwWrtShell* pShell; - SwTableAutoFmt* pTAutoFmt; + SwWrtShell* pShell; + SwTableAutoFmt* pTAutoFmt; sal_Int64 nEnteredValRepeatHeaderNF; DECL_LINK( ModifyName, Edit * ); diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index b1529ba85afd..b931de046030 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.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 @@ -52,11 +52,11 @@ class SwJavaEditDialog : public SvxStandardDialog { private: FixedText aTypeFT; - Edit aTypeED; + Edit aTypeED; RadioButton aUrlRB; RadioButton aEditRB; - PushButton aUrlPB; - Edit aUrlED; + PushButton aUrlPB; + Edit aUrlED; MultiLineEdit aEditED; FixedLine aPostItFL; @@ -69,7 +69,7 @@ private: String aText; String aType; - BOOL bNew; + BOOL bNew; BOOL bIsUrl; SwScriptField* pFld; @@ -85,10 +85,10 @@ private: DECL_LINK( InsertFileHdl, PushButton * ); DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper * ); - virtual void Apply(); + virtual void Apply(); - void CheckTravel(); - void SetFld(); + void CheckTravel(); + void SetFld(); using Window::GetText; using Window::GetType; @@ -98,9 +98,9 @@ public: ~SwJavaEditDialog(); String GetText() { return aText; } - + String GetType() { return aType; } - + BOOL IsUrl() { return bIsUrl; } BOOL IsNew() { return bNew; } BOOL IsUpdate(); diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx index 20791d16c43a..debf93978dfe 100644 --- a/sw/source/ui/inc/label.hxx +++ b/sw/source/ui/inc/label.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 Printer; class SwLabDlg : public SfxTabDialog { - SwLabelConfig aLabelsCfg; - SwNewDBMgr* pNewDBMgr; - SwLabPrtPage* pPrtPage; - - SvUShorts aTypeIds; - SvStringsDtor aMakes; - - SwLabRecs* pRecs; - String aLstGroup; - String sBusinessCardDlg; - String sFormat; - String sMedium; - BOOL m_bLabel; + SwLabelConfig aLabelsCfg; + SwNewDBMgr* pNewDBMgr; + SwLabPrtPage* pPrtPage; + + SvUShorts aTypeIds; + SvStringsDtor aMakes; + + SwLabRecs* pRecs; + String aLstGroup; + String sBusinessCardDlg; + String sFormat; + String sMedium; + BOOL m_bLabel; void _ReplaceGroup( const String &rMake ); virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); @@ -67,17 +67,17 @@ public: SwNewDBMgr* pNewDBMgr, BOOL bLabel); ~SwLabDlg(); - SwLabRec* GetRecord(const String &rRecName, BOOL bCont); - void GetLabItem(SwLabItem &rItem); + SwLabRec* GetRecord(const String &rRecName, BOOL bCont); + void GetLabItem(SwLabItem &rItem); - SwLabRecs &Recs() { return *pRecs; } - const SwLabRecs &Recs() const { return *pRecs; } + SwLabRecs &Recs() { return *pRecs; } + const SwLabRecs &Recs() const { return *pRecs; } - SvUShorts &TypeIds() { return aTypeIds; } + SvUShorts &TypeIds() { return aTypeIds; } const SvUShorts &TypeIds() const { return aTypeIds; } - SvStringsDtor &Makes() { return aMakes; } - const SvStringsDtor &Makes() const { return aMakes; } + SvStringsDtor &Makes() { return aMakes; } + const SvStringsDtor &Makes() const { return aMakes; } Printer *GetPrt(); inline void ReplaceGroup( const String &rMake ); diff --git a/sw/source/ui/inc/labelcfg.hxx b/sw/source/ui/inc/labelcfg.hxx index 34b5e0786d8e..f178c91fc824 100644 --- a/sw/source/ui/inc/labelcfg.hxx +++ b/sw/source/ui/inc/labelcfg.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 @@ -47,12 +47,12 @@ public: virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void FillLabels(const rtl::OUString& rManufacturer, SwLabRecs& rLabArr); + void FillLabels(const rtl::OUString& rManufacturer, SwLabRecs& rLabArr); const com::sun::star::uno::Sequence<rtl::OUString>& GetManufacturers() const {return aNodeNames;} - sal_Bool HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType); - void SaveLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType, + sal_Bool HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType); + void SaveLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType, const SwLabRec& rRec); }; diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/ui/inc/labimg.hxx index 197887906b45..c36538b1d38d 100644 --- a/sw/source/ui/inc/labimg.hxx +++ b/sw/source/ui/inc/labimg.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 @@ -48,80 +48,80 @@ public: virtual int operator ==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - - rtl::OUString aLstMake; //Letzte Auswahl merken. - rtl::OUString aLstType; - rtl::OUString sDBName; // Verwendete Datenbank - - rtl::OUString aWriting; // Aufschrift - rtl::OUString aMake; // Etikettenmarke - rtl::OUString aType; // Etikettentyp - rtl::OUString aBin; // Druckerschacht - sal_Int32 lHDist; // Horizontaler Abstand (Benutzer) - sal_Int32 lVDist; // Vertikaler Abstand (Benutzer) - sal_Int32 lWidth; // Breite (Benutzer) - sal_Int32 lHeight; // Hoehe (Benutzer) - sal_Int32 lLeft; // Rand links (Benutzer) - sal_Int32 lUpper; // Rand oben (Benutzer) - sal_Int32 nCols; // Anzahl Spalten (Benutzer) - sal_Int32 nRows; // Anzahl Zeilen (Benutzer) - sal_Int32 nCol; // Spalte fuer Einzeldruck - sal_Int32 nRow; // Zeile fuer Einzeldruck - sal_Bool bAddr;// Adresse als Aufschrift? - sal_Bool bCont;// Endlospapier? - sal_Bool bPage;// Ganze Seite oder einzelnes Etikett? - sal_Bool bSynchron;// Alle Etiketten synchronisieren + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; + + rtl::OUString aLstMake; //Letzte Auswahl merken. + rtl::OUString aLstType; + rtl::OUString sDBName; // Verwendete Datenbank + + rtl::OUString aWriting; // Aufschrift + rtl::OUString aMake; // Etikettenmarke + rtl::OUString aType; // Etikettentyp + rtl::OUString aBin; // Druckerschacht + sal_Int32 lHDist; // Horizontaler Abstand (Benutzer) + sal_Int32 lVDist; // Vertikaler Abstand (Benutzer) + sal_Int32 lWidth; // Breite (Benutzer) + sal_Int32 lHeight; // Hoehe (Benutzer) + sal_Int32 lLeft; // Rand links (Benutzer) + sal_Int32 lUpper; // Rand oben (Benutzer) + sal_Int32 nCols; // Anzahl Spalten (Benutzer) + sal_Int32 nRows; // Anzahl Zeilen (Benutzer) + sal_Int32 nCol; // Spalte fuer Einzeldruck + sal_Int32 nRow; // Zeile fuer Einzeldruck + sal_Bool bAddr;// Adresse als Aufschrift? + sal_Bool bCont;// Endlospapier? + sal_Bool bPage;// Ganze Seite oder einzelnes Etikett? + sal_Bool bSynchron;// Alle Etiketten synchronisieren //parts of the business card - rtl::OUString aPrivFirstName; - rtl::OUString aPrivName; - rtl::OUString aPrivShortCut; - rtl::OUString aPrivFirstName2; - rtl::OUString aPrivName2; - rtl::OUString aPrivShortCut2; - rtl::OUString aPrivStreet; - rtl::OUString aPrivZip; - rtl::OUString aPrivCity; - rtl::OUString aPrivCountry; - rtl::OUString aPrivState; - rtl::OUString aPrivTitle; - rtl::OUString aPrivProfession; - rtl::OUString aPrivPhone; - rtl::OUString aPrivMobile; - rtl::OUString aPrivFax; - rtl::OUString aPrivWWW; - rtl::OUString aPrivMail; - rtl::OUString aCompCompany; - rtl::OUString aCompCompanyExt; - rtl::OUString aCompSlogan; - rtl::OUString aCompStreet; - rtl::OUString aCompZip; - rtl::OUString aCompCity; - rtl::OUString aCompCountry; - rtl::OUString aCompState; - rtl::OUString aCompPosition; - rtl::OUString aCompPhone; - rtl::OUString aCompMobile; - rtl::OUString aCompFax; - rtl::OUString aCompWWW; - rtl::OUString aCompMail; - - rtl::OUString sGlossaryGroup; - rtl::OUString sGlossaryBlockName; + rtl::OUString aPrivFirstName; + rtl::OUString aPrivName; + rtl::OUString aPrivShortCut; + rtl::OUString aPrivFirstName2; + rtl::OUString aPrivName2; + rtl::OUString aPrivShortCut2; + rtl::OUString aPrivStreet; + rtl::OUString aPrivZip; + rtl::OUString aPrivCity; + rtl::OUString aPrivCountry; + rtl::OUString aPrivState; + rtl::OUString aPrivTitle; + rtl::OUString aPrivProfession; + rtl::OUString aPrivPhone; + rtl::OUString aPrivMobile; + rtl::OUString aPrivFax; + rtl::OUString aPrivWWW; + rtl::OUString aPrivMail; + rtl::OUString aCompCompany; + rtl::OUString aCompCompanyExt; + rtl::OUString aCompSlogan; + rtl::OUString aCompStreet; + rtl::OUString aCompZip; + rtl::OUString aCompCity; + rtl::OUString aCompCountry; + rtl::OUString aCompState; + rtl::OUString aCompPosition; + rtl::OUString aCompPhone; + rtl::OUString aCompMobile; + rtl::OUString aCompFax; + rtl::OUString aCompWWW; + rtl::OUString aCompMail; + + rtl::OUString sGlossaryGroup; + rtl::OUString sGlossaryBlockName; }; // class SwLabCfgItem ------------------------------------------------------- class SwLabCfgItem : public utl::ConfigItem { - SwLabItem aItem; - sal_Bool bIsLabel; + SwLabItem aItem; + sal_Bool bIsLabel; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: SwLabCfgItem(sal_Bool bLabel); - SwLabItem& GetItem() {return aItem;} + SwLabItem& GetItem() {return aItem;} virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); diff --git a/sw/source/ui/inc/langhelper.hxx b/sw/source/ui/inc/langhelper.hxx index c798a34c7b93..21bdfa05040f 100644 --- a/sw/source/ui/inc/langhelper.hxx +++ b/sw/source/ui/inc/langhelper.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 @@ -42,26 +42,26 @@ namespace SwLangHelper extern bool SetLanguageStatus( OutlinerView* pOLV, SfxRequest &rReq, SwView &rView, SwWrtShell &rSh ); extern void SetLanguage( SwWrtShell &rWrtSh, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); -// extern void SetLanguage( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); +// extern void SetLanguage( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); extern void SetLanguage( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); extern void SetLanguage_None( SwWrtShell &rWrtSh, bool bIsForSelection, SfxItemSet &rCoreSet ); -// extern void SetLanguage_None( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet ); +// extern void SetLanguage_None( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet ); extern void SetLanguage_None( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet ); extern void ResetLanguages( SwWrtShell &rWrtSh, bool bIsForSelection ); -// extern void ResetLanguages( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection ); +// extern void ResetLanguages( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection ); extern void ResetLanguages( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, bool bIsForSelection ); - + // document extern void SelectCurrentPara( SwWrtShell &rWrtSh ); // EditView extern void SelectPara( EditView &rEditView, const ESelection &rCurSel ); - + extern String GetTextForLanguageGuessing( EditEngine* rEditEngine, ESelection aDocSelection ); extern String GetTextForLanguageGuessing( SwWrtShell &rSh ); - + extern LanguageType GetLanguage( SfxItemSet aSet, USHORT nLangWhichId ); extern LanguageType GetLanguage( SwWrtShell &rSh, USHORT nLangWhichId ); - + extern LanguageType GetCurrentLanguage( SfxItemSet aSet, USHORT nScriptType ); extern LanguageType GetCurrentLanguage( SwWrtShell &rSh ); } diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx index e8a7c800aa93..ae99c2f505f2 100644 --- a/sw/source/ui/inc/linenum.hxx +++ b/sw/source/ui/inc/linenum.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 @@ -62,31 +62,31 @@ public: --------------------------------------------------------------------*/ class SwLineNumberingPage : public SfxTabPage { - CheckBox aNumberingOnCB; - FixedText aCharStyleFT; - ListBox aCharStyleLB; - FixedText aFormatFT; - SwNumberingTypeListBox aFormatLB; - FixedText aPosFT; - ListBox aPosLB; - FixedText aOffsetFT; - MetricField aOffsetMF; - FixedText aNumIntervalFT; - NumericField aNumIntervalNF; - FixedText aNumRowsFT; + CheckBox aNumberingOnCB; + FixedText aCharStyleFT; + ListBox aCharStyleLB; + FixedText aFormatFT; + SwNumberingTypeListBox aFormatLB; + FixedText aPosFT; + ListBox aPosLB; + FixedText aOffsetFT; + MetricField aOffsetMF; + FixedText aNumIntervalFT; + NumericField aNumIntervalNF; + FixedText aNumRowsFT; FixedLine aDisplayFL; - FixedText aDivisorFT; - Edit aDivisorED; - FixedText aDivIntervalFT; - NumericField aDivIntervalNF; - FixedText aDivRowsFT; + FixedText aDivisorFT; + Edit aDivisorED; + FixedText aDivIntervalFT; + NumericField aDivIntervalNF; + FixedText aDivRowsFT; FixedLine aDivisorFL; - CheckBox aCountEmptyLinesCB; - CheckBox aCountFrameLinesCB; - CheckBox aRestartEachPageCB; + CheckBox aCountEmptyLinesCB; + CheckBox aCountFrameLinesCB; + CheckBox aRestartEachPageCB; FixedLine aCountFL; - SwWrtShell* pSh; + SwWrtShell* pSh; SwLineNumberingPage( Window* pParent, const SfxItemSet& rSet ); ~SwLineNumberingPage(); @@ -96,10 +96,10 @@ class SwLineNumberingPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sw/source/ui/inc/listsh.hxx b/sw/source/ui/inc/listsh.hxx index 30a97c04c0f2..939f3cc6ef3c 100644 --- a/sw/source/ui/inc/listsh.hxx +++ b/sw/source/ui/inc/listsh.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 @@ -38,8 +38,8 @@ public: SwListShell(SwView &rView); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); }; #endif diff --git a/sw/source/ui/inc/macassgn.hxx b/sw/source/ui/inc/macassgn.hxx index bb6cb134e34b..1872e5394a6d 100644 --- a/sw/source/ui/inc/macassgn.hxx +++ b/sw/source/ui/inc/macassgn.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 diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index 9f2929771891..fded1cb9fcd7 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.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 @@ -43,7 +43,7 @@ class SwMailConfigPage : public SfxTabPage friend class SwTestAccountSettingsDialog; FixedLine m_aIdentityFL; - + FixedText m_aDisplayNameFT; Edit m_aDisplayNameED; FixedText m_aAddressFT; @@ -52,7 +52,7 @@ class SwMailConfigPage : public SfxTabPage CheckBox m_aReplyToCB; FixedText m_aReplyToFT; Edit m_aReplyToED; - + FixedLine m_aSMTPFL; FixedText m_aServerFT; @@ -60,10 +60,10 @@ class SwMailConfigPage : public SfxTabPage FixedText m_aPortFT; NumericField m_aPortNF; - CheckBox m_aSecureCB; + CheckBox m_aSecureCB; PushButton m_aServerAuthenticationPB; - + FixedLine m_aSeparatorFL; PushButton m_aTestPB; diff --git a/sw/source/ui/inc/maildispatcher.hxx b/sw/source/ui/inc/maildispatcher.hxx index ad5521d3814a..5e1ec613356c 100644 --- a/sw/source/ui/inc/maildispatcher.hxx +++ b/sw/source/ui/inc/maildispatcher.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 @@ -43,25 +43,25 @@ class IMailDispatcherListener; A MailDispatcher should be used for sending a bunch a mail messages asynchronously. Usually a client enqueues a number of mail messages and then calls start to begin sending them. An instance of this class - must not be shared among different client threads. Instead each client + must not be shared among different client threads. Instead each client thread should create an own instance of this class. -*/ +*/ class MailDispatcher : public ::salhelper::ReferenceObject, private ::osl::Thread { public: - // bringing operator new/delete into scope + // bringing operator new/delete into scope using osl::Thread::operator new; using osl::Thread::operator delete; using osl::Thread::join; - + public: - /** + /** @param xSmtpService [in] a reference to a mail server. A user must be connected to the mail server otherwise errors occur during the delivery of mail messages. - + @throws ::com::sun::star::uno::RuntimeException on errors during construction of an instance of this class. */ @@ -70,39 +70,39 @@ public: /** Shutdown the mail dispatcher. Every mail messages not yet sent will be discarded. - */ + */ virtual ~MailDispatcher(); - + /** Enqueue a mail message for delivery. A client must - start the mail dispatcher in order to send the + start the mail dispatcher in order to send the enqueued mail messages. - + @param xMailMessage [in] a mail message that should be send. */ void enqueueMailMessage(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage); - /** - Dequeues a mail message. + /** + Dequeues a mail message. This enables the caller to remove attachments when sending mails is to be cancelled. */ ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> dequeueMailMessage(); - + /** Start sending mail messages asynchronously. A client may register - a listener for mail dispatcher events. For every mail message sent - the notification will be sent. While handling such notification a + a listener for mail dispatcher events. For every mail message sent + the notification will be sent. While handling such notification a client may enqueue new mail messages. If there are no more mail messages to send an respective notification is sent and the mail dispatcher waits for more mail messages. - + @precond not isStarted() */ void start(); - + /** Stop sending mail messages. - + @precond isStarted() */ void stop(); @@ -114,52 +114,52 @@ public: mail dispatcher thread will never end. */ void shutdown(); - + /** Check whether the mail dispatcher is started or not. - - @return + + @return <TRUE/> if the sending thread is running. */ bool isStarted() const; - + /** returns if the thread is still running */ using osl::Thread::isRunning; - + /** returns if shutdown has already been called */ - bool isShutdownRequested() const - { return shutdown_requested_; } + bool isShutdownRequested() const + { return shutdown_requested_; } /** Register a listener for mail dispatcher events. */ void addListener(::rtl::Reference<IMailDispatcherListener> listener); - + /** Unregister a listener for mail dispatcher events */ void removeListener(::rtl::Reference<IMailDispatcherListener> listener); - + protected: virtual void SAL_CALL run(); virtual void SAL_CALL onTerminated(); private: std::list< ::rtl::Reference<IMailDispatcherListener> > cloneListener(); - void sendMailMessageNotifyListener(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> message); - -private: - ::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> mailserver_; + void sendMailMessageNotifyListener(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> message); + +private: + ::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> mailserver_; ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage > > messages_; - ::std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_; + ::std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_; ::osl::Mutex message_container_mutex_; - ::osl::Mutex listener_container_mutex_; + ::osl::Mutex listener_container_mutex_; ::osl::Mutex thread_status_mutex_; ::osl::Condition mail_dispatcher_active_; - ::osl::Condition wakening_call_; + ::osl::Condition wakening_call_; ::rtl::Reference<MailDispatcher> m_xSelfReference; - bool run_; + bool run_; bool shutdown_requested_; }; diff --git a/sw/source/ui/inc/mailmergechildwindow.hxx b/sw/source/ui/inc/mailmergechildwindow.hxx index afa4af930ce4..f79055a837f0 100644 --- a/sw/source/ui/inc/mailmergechildwindow.hxx +++ b/sw/source/ui/inc/mailmergechildwindow.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 diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx index f2e160ab81c7..9aec2cb3e515 100644 --- a/sw/source/ui/inc/mailmergehelper.hxx +++ b/sw/source/ui/inc/mailmergehelper.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 diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx index ea413b445b13..da0e68442be6 100644 --- a/sw/source/ui/inc/mailmergewizard.hxx +++ b/sw/source/ui/inc/mailmergewizard.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 @@ -42,7 +42,7 @@ class SwMailMergeConfigItem; #define MM_MERGEPAGE 6 #define MM_OUTPUTPAGE 7 -class SwMailMergeWizard : public ::svt::RoadmapWizard +class SwMailMergeWizard : public ::svt::RoadmapWizard { SwView* m_pSwView; String sDocumentURL; @@ -69,11 +69,11 @@ protected: virtual svt::OWizardPage* createPage(WizardState _nState); virtual void enterState( WizardState _nState ); -// roadmap feature ?? +// roadmap feature ?? // virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason ); virtual String getStateDisplayName( WizardState _nState ) const; -public: +public: SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); ~SwMailMergeWizard(); @@ -92,13 +92,13 @@ public: sal_uInt16 GetRestartPage() const {return m_nRestartPage;} void SetRestartPage(sal_uInt16 nPage) { m_nRestartPage = nPage;} - sal_Bool skipUntil( sal_uInt16 nPage) + sal_Bool skipUntil( sal_uInt16 nPage) {return ::svt::RoadmapWizard::skipUntil(WizardState(nPage));} - void updateRoadmapItemLabel( WizardState _nState ); + void updateRoadmapItemLabel( WizardState _nState ); - virtual short Execute(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ); + virtual short Execute(); + virtual void StartExecuteModal( const Link& rEndDialogHdl ); }; #endif diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index 810f98adf492..b229e511e6b0 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.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 @@ -63,62 +63,62 @@ class SwMailMergeDlg : public SvxStandardDialog Window* pBeamerWin; RadioButton aAllRB; - RadioButton aMarkedRB; - RadioButton aFromRB; - NumericField aFromNF; - FixedText aBisFT; - NumericField aToNF; + RadioButton aMarkedRB; + RadioButton aFromRB; + NumericField aFromNF; + FixedText aBisFT; + NumericField aToNF; FixedLine aRecordFL; FixedLine aSeparatorFL; RadioButton aPrinterRB; - RadioButton aMailingRB; - RadioButton aFileRB; + RadioButton aMailingRB; + RadioButton aFileRB; - CheckBox aSingleJobsCB; + CheckBox aSingleJobsCB; FixedLine aSaveMergedDocumentFL; RadioButton aSaveSingleDocRB; RadioButton aSaveIndividualRB; CheckBox aGenerateFromDataBaseCB; - + FixedText aColumnFT; ListBox aColumnLB; FixedText aPathFT; - Edit aPathED; - PushButton aPathPB; + Edit aPathED; + PushButton aPathPB; FixedText aFilterFT; ListBox aFilterLB; - ListBox aAddressFldLB; - FixedText aSubjectFT; - Edit aSubjectED; - FixedText aFormatFT; - FixedText aAttachFT; - Edit aAttachED; - PushButton aAttachPB; - CheckBox aFormatHtmlCB; - CheckBox aFormatRtfCB; - CheckBox aFormatSwCB; + ListBox aAddressFldLB; + FixedText aSubjectFT; + Edit aSubjectED; + FixedText aFormatFT; + FixedText aAttachFT; + Edit aAttachED; + PushButton aAttachPB; + CheckBox aFormatHtmlCB; + CheckBox aFormatRtfCB; + CheckBox aFormatSwCB; FixedLine aDestFL; FixedLine aBottomSeparatorFL; OKButton aOkBTN; - CancelButton aCancelBTN; - HelpButton aHelpBTN; + CancelButton aCancelBTN; + HelpButton aHelpBTN; SwMailMergeDlg_Impl* pImpl; SwWrtShell& rSh; SwModuleOptions* pModOpt; - const String& rDBName; - const String& rTableName; + const String& rDBName; + const String& rTableName; - USHORT nMergeType; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection; + USHORT nMergeType; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; Size m_aDialogSize; @@ -133,7 +133,7 @@ class SwMailMergeDlg : public SvxStandardDialog DECL_LINK( ModifyHdl, NumericField* pLB ); DECL_LINK( SaveTypeHdl, RadioButton* pBtn ); - virtual void Apply(); + virtual void Apply(); virtual void Resize(); bool ExecQryShell(); @@ -146,8 +146,8 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0); ~SwMailMergeDlg(); - inline USHORT GetMergeType() { return nMergeType; } - const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;} + inline USHORT GetMergeType() { return nMergeType; } + const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;} inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; @@ -180,9 +180,9 @@ class SwMailMergeFieldConnectionsDlg : public ModalDialog OKButton aOK; CancelButton aCancel; HelpButton aHelp; -public: +public: SwMailMergeFieldConnectionsDlg(Window* pParent); - ~SwMailMergeFieldConnectionsDlg(); + ~SwMailMergeFieldConnectionsDlg(); BOOL IsUseExistingConnections() const {return aUseExistingRB.IsChecked();} }; diff --git a/sw/source/ui/inc/mediash.hxx b/sw/source/ui/inc/mediash.hxx index d01dc6692d96..f90a18d551e6 100644 --- a/sw/source/ui/inc/mediash.hxx +++ b/sw/source/ui/inc/mediash.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 @@ -35,8 +35,8 @@ class SwMediaShell: public SwBaseShell public: SFX_DECL_INTERFACE(SW_MEDIASHELL) - void ExecMedia(SfxRequest &); - void GetMediaState(SfxItemSet &); + void ExecMedia(SfxRequest &); + void GetMediaState(SfxItemSet &); SwMediaShell(SwView &rView); }; diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index fb37057c40ec..0b765ea6cedc 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.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 @@ -36,14 +36,14 @@ class SwMergeTblDlg : public SvxStandardDialog { - OKButton aOKPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOKPB; + CancelButton aCancelPB; + HelpButton aHelpPB; FixedLine aMergeFL; - RadioButton aMergePrevRB; - RadioButton aMergeNextRB; + RadioButton aMergePrevRB; + RadioButton aMergeNextRB; - BOOL& rMergePrev; + BOOL& rMergePrev; protected: virtual void Apply(); diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc index 39f33d39d677..6e71237edf06 100644 --- a/sw/source/ui/inc/misc.hrc +++ b/sw/source/ui/inc/misc.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 @@ -30,78 +30,78 @@ #include "rcid.hrc" -#define DLG_QUERY_DELETE (RC_MISC_BEGIN + 2) +#define DLG_QUERY_DELETE (RC_MISC_BEGIN + 2) -#define DLG_MASTERDOC_PAGE (RC_MISC_BEGIN + 3) -#define DLG_QUERY_ADD (RC_MISC_BEGIN + 4) +#define DLG_MASTERDOC_PAGE (RC_MISC_BEGIN + 3) +#define DLG_QUERY_ADD (RC_MISC_BEGIN + 4) -#define STR_GLOSSARY_BIB_DLG (RC_MISC_BEGIN + 5) -#define STR_DOCUMENT_BIB_DLG (RC_MISC_BEGIN + 6) +#define STR_GLOSSARY_BIB_DLG (RC_MISC_BEGIN + 5) +#define STR_DOCUMENT_BIB_DLG (RC_MISC_BEGIN + 6) -#define WIN_GLOBAL_DOC (RC_MISC_BEGIN + 7) -#define DLG_GLOBAL_DOC_OPTION (RC_MISC_BEGIN + 8) -#define DLG_NUMBERING (RC_MISC_BEGIN + 9) -#define DLG_ZOOM (RC_MISC_BEGIN + 10) -#define DLG_GLOSSARY (RC_MISC_BEGIN + 11) -#define DLG_INS_FOOTNOTE (RC_MISC_BEGIN + 12) +#define WIN_GLOBAL_DOC (RC_MISC_BEGIN + 7) +#define DLG_GLOBAL_DOC_OPTION (RC_MISC_BEGIN + 8) +#define DLG_NUMBERING (RC_MISC_BEGIN + 9) +#define DLG_ZOOM (RC_MISC_BEGIN + 10) +#define DLG_GLOSSARY (RC_MISC_BEGIN + 11) +#define DLG_INS_FOOTNOTE (RC_MISC_BEGIN + 12) #define DLG_DOC_FOOTNOTE (RC_MISC_BEGIN + 13) -#define DLG_PG_FOOTNOTE (RC_MISC_BEGIN + 14) -#define DLG_NUMBERING_OUTLINE (RC_MISC_BEGIN + 15) -#define DLG_BIB_BASE (RC_MISC_BEGIN + 16) -#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) -#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) -#define DLG_SORTING (RC_MISC_BEGIN + 19) -#define DLG_CHARMAP (RC_MISC_BEGIN + 20) -#define DLG_AUTOCORR (RC_MISC_BEGIN + 23) -#define DLG_AUTOFMT_OPT (RC_MISC_BEGIN + 24) -#define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25) -#define DLG_AUTOFMT_TAB (RC_MISC_BEGIN + 26) +#define DLG_PG_FOOTNOTE (RC_MISC_BEGIN + 14) +#define DLG_NUMBERING_OUTLINE (RC_MISC_BEGIN + 15) +#define DLG_BIB_BASE (RC_MISC_BEGIN + 16) +#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) +#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) +#define DLG_SORTING (RC_MISC_BEGIN + 19) +#define DLG_CHARMAP (RC_MISC_BEGIN + 20) +#define DLG_AUTOCORR (RC_MISC_BEGIN + 23) +#define DLG_AUTOFMT_OPT (RC_MISC_BEGIN + 24) +#define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25) +#define DLG_AUTOFMT_TAB (RC_MISC_BEGIN + 26) #define DLG_PRCNT_SET (RC_MISC_BEGIN + 27) #define DLG_INSERT_RULER (RC_MISC_BEGIN + 28) #define DLG_REDLINE_ACCEPT (RC_MISC_BEGIN + 29) -#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31) +#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31) #define DLG_MOD_REDLINE_ACCEPT (RC_MISC_BEGIN + 32) -#define MSG_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30) -#define MSG_QUERY_DELETE (RC_MISC_BEGIN + 31) -#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32) -#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33) -#define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34) +#define MSG_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30) +#define MSG_QUERY_DELETE (RC_MISC_BEGIN + 31) +#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32) +#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33) +#define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34) -#define MSG_BLOCK_CREATE_ERR (RC_MISC_BEGIN + 40) -#define MSG_BLOCK_DELETE_ERR (RC_MISC_BEGIN + 41) -#define MSG_SRTERR (RC_MISC_BEGIN + 42) +#define MSG_BLOCK_CREATE_ERR (RC_MISC_BEGIN + 40) +#define MSG_BLOCK_DELETE_ERR (RC_MISC_BEGIN + 41) +#define MSG_SRTERR (RC_MISC_BEGIN + 42) -#define STR_GLOSSARY (RC_MISC_BEGIN + 43) -#define STR_CHANGE_START (RC_MISC_BEGIN + 44) -#define STR_CHANGE_END (RC_MISC_BEGIN + 45) +#define STR_GLOSSARY (RC_MISC_BEGIN + 43) +#define STR_CHANGE_START (RC_MISC_BEGIN + 44) +#define STR_CHANGE_END (RC_MISC_BEGIN + 45) #define STR_SAVE_GLOSSARY (RC_MISC_BEGIN + 46) #define STR_FULLNUMS_START (RC_MISC_BEGIN + 47) -#define STR_FULLNUMS_1 (STR_FULLNUMS_START ) -#define STR_FULLNUMS_2 (STR_FULLNUMS_START + 1) -#define STR_FULLNUMS_3 (STR_FULLNUMS_START + 2) -#define STR_FULLNUMS_4 (STR_FULLNUMS_START + 3) -#define STR_FULLNUMS_5 (STR_FULLNUMS_START + 4) -#define STR_FULLNUMS_6 (STR_FULLNUMS_START + 5) -#define STR_FULLNUMS_7 (STR_FULLNUMS_START + 6) -#define STR_FULLNUMS_8 (STR_FULLNUMS_START + 7) - -#define STR_BULLET_THEME (RC_MISC_BEGIN + 55) -#define MSG_NO_BULLETS (RC_MISC_BEGIN + 56) - -#define STR_NUMRULE_UNKNOWN (RC_MISC_BEGIN + 60) -#define MN_REDLINE_POPUP (RC_MISC_BEGIN + 61) +#define STR_FULLNUMS_1 (STR_FULLNUMS_START ) +#define STR_FULLNUMS_2 (STR_FULLNUMS_START + 1) +#define STR_FULLNUMS_3 (STR_FULLNUMS_START + 2) +#define STR_FULLNUMS_4 (STR_FULLNUMS_START + 3) +#define STR_FULLNUMS_5 (STR_FULLNUMS_START + 4) +#define STR_FULLNUMS_6 (STR_FULLNUMS_START + 5) +#define STR_FULLNUMS_7 (STR_FULLNUMS_START + 6) +#define STR_FULLNUMS_8 (STR_FULLNUMS_START + 7) + +#define STR_BULLET_THEME (RC_MISC_BEGIN + 55) +#define MSG_NO_BULLETS (RC_MISC_BEGIN + 56) + +#define STR_NUMRULE_UNKNOWN (RC_MISC_BEGIN + 60) +#define MN_REDLINE_POPUP (RC_MISC_BEGIN + 61) #define STR_REMOVE_WARNING (RC_MISC_BEGIN + 62) -#define STRRES_NUMTYPES (RC_MISC_BEGIN + 63) -#define STR_MY_AUTOTEXT (RC_MISC_BEGIN + 64) +#define STRRES_NUMTYPES (RC_MISC_BEGIN + 63) +#define STR_MY_AUTOTEXT (RC_MISC_BEGIN + 64) -#define MISC_ACT_END STRRES_NUMTYPES +#define MISC_ACT_END STRRES_NUMTYPES #if MISC_ACT_END > RC_MISC_END #error Resource-Id Ueberlauf in #file, #line #endif -#endif // _MISC_HRC +#endif // _MISC_HRC diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx index 9fa90ea19c34..1bdace009700 100644 --- a/sw/source/ui/inc/mmconfigitem.hxx +++ b/sw/source/ui/inc/mmconfigitem.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 @@ -103,8 +103,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> GetColumnsSupplier(); - - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> + + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; void DisposeResultSet(); @@ -136,14 +136,14 @@ public: sal_Bool IsAddressBlock()const; void SetAddressBlock(sal_Bool bSet); - + sal_Bool IsHideEmptyParagraphs() const; void SetHideEmptyParagraphs(sal_Bool bSet); - const com::sun::star::uno::Sequence< ::rtl::OUString> + const com::sun::star::uno::Sequence< ::rtl::OUString> GetAddressBlocks() const; void SetAddressBlocks(const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks); - + void SetCurrentAddressBlockIndex( sal_Int32 nSet ); sal_Int32 GetCurrentAddressBlockIndex() const; @@ -178,7 +178,7 @@ public: bool IsAddressFieldsAssigned() const; bool IsGreetingFieldsAssigned() const; - //e-Mail settings: + //e-Mail settings: ::rtl::OUString GetMailDisplayName() const; void SetMailDisplayName(const ::rtl::OUString& rName); diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx index e6b4ccc22c50..52da8a77b931 100644 --- a/sw/source/ui/inc/multmrk.hxx +++ b/sw/source/ui/inc/multmrk.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 @@ -43,7 +43,7 @@ class SwTOXMgr; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Beschreibung: Markierung fuer Verzeichniseintrag einfuegen --------------------------------------------------------------------*/ class SwMultiTOXMarkDlg : public SvxStandardDialog @@ -51,17 +51,17 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog DECL_LINK( SelectHdl, ListBox * ); FixedLine aTOXFL; - FixedText aEntryFT; - FixedInfo aTextFT; - FixedText aTOXFT; - ListBox aTOXLB; - OKButton aOkBT; - CancelButton aCancelBT; + FixedText aEntryFT; + FixedInfo aTextFT; + FixedText aTOXFT; + ListBox aTOXLB; + OKButton aOkBT; + CancelButton aCancelBT; - SwTOXMgr &rMgr; - USHORT nPos; + SwTOXMgr &rMgr; + USHORT nPos; - void Apply(); + void Apply(); public: SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr &rTOXMgr ); ~SwMultiTOXMarkDlg(); diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx index e7993325209c..8306ea4549c3 100644 --- a/sw/source/ui/inc/navicfg.hxx +++ b/sw/source/ui/inc/navicfg.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 @@ -32,13 +32,13 @@ class SwNavigationConfig : public utl::ConfigItem { - sal_Int32 nRootType; //RootType - sal_Int32 nSelectedPos; //SelectedPosition - sal_Int32 nOutlineLevel; //OutlineLevel - sal_Int32 nRegionMode; //InsertMode - sal_Int32 nActiveBlock; //ActiveBlock//Expand/CollapsState - sal_Bool bIsSmall; //ShowListBox - sal_Bool bIsGlobalActive; //GlobalDocMode// Globalansicht fuer GlobalDoc gueltig? + sal_Int32 nRootType; //RootType + sal_Int32 nSelectedPos; //SelectedPosition + sal_Int32 nOutlineLevel; //OutlineLevel + sal_Int32 nRegionMode; //InsertMode + sal_Int32 nActiveBlock; //ActiveBlock//Expand/CollapsState + sal_Bool bIsSmall; //ShowListBox + sal_Bool bIsGlobalActive; //GlobalDocMode// Globalansicht fuer GlobalDoc gueltig? com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); @@ -49,8 +49,8 @@ public: virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - sal_Int32 GetRootType()const {return nRootType;} - void SetRootType(sal_Int32 nSet){ + sal_Int32 GetRootType()const {return nRootType;} + void SetRootType(sal_Int32 nSet){ if(nRootType != nSet) { SetModified(); @@ -58,8 +58,8 @@ public: } } - sal_Int32 GetSelectedPos()const {return nSelectedPos;} - void SetSelectedPos(sal_Int32 nSet){ + sal_Int32 GetSelectedPos()const {return nSelectedPos;} + void SetSelectedPos(sal_Int32 nSet){ if(nSelectedPos != nSet) { SetModified(); @@ -68,8 +68,8 @@ public: } - sal_Int32 GetOutlineLevel()const {return nOutlineLevel;} - void SetOutlineLevel(sal_Int32 nSet){ + sal_Int32 GetOutlineLevel()const {return nOutlineLevel;} + void SetOutlineLevel(sal_Int32 nSet){ if(nOutlineLevel != nSet) { SetModified(); @@ -77,8 +77,8 @@ public: } } - sal_Int32 GetRegionMode()const {return nRegionMode;} - void SetRegionMode(sal_Int32 nSet){ + sal_Int32 GetRegionMode()const {return nRegionMode;} + void SetRegionMode(sal_Int32 nSet){ if(nRegionMode != nSet) { SetModified(); @@ -88,7 +88,7 @@ public: sal_Int32 GetActiveBlock()const {return nActiveBlock;} - void SetActiveBlock(sal_Int32 nSet){ + void SetActiveBlock(sal_Int32 nSet){ if(nActiveBlock != nSet) { SetModified(); @@ -96,8 +96,8 @@ public: } } - sal_Bool IsSmall() const {return bIsSmall;} - void SetSmall(sal_Bool bSet){ + sal_Bool IsSmall() const {return bIsSmall;} + void SetSmall(sal_Bool bSet){ if(bIsSmall != bSet) { SetModified(); @@ -105,8 +105,8 @@ public: } } - sal_Bool IsGlobalActive() const {return bIsGlobalActive;} - void SetGlobalActive(sal_Bool bSet){ + sal_Bool IsGlobalActive() const {return bIsGlobalActive;} + void SetGlobalActive(sal_Bool bSet){ if(bIsGlobalActive != bSet) { SetModified(); diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx index 94e833d41dc7..d9bce94770a0 100644 --- a/sw/source/ui/inc/navicont.hxx +++ b/sw/source/ui/inc/navicont.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 @@ -35,28 +35,28 @@ class SwDocShell; class TransferDataContainer; class TransferableDataHelper; -/* [Beschreibung] +/* [Beschreibung] Navigator-Bookmark zur eindeutigen Identifizierung im Sw */ class NaviContentBookmark { - String aUrl; // URL inkl. Sprungmarke - String aDescr; // Description - long nDocSh; // Adresse der DocShell - USHORT nDefDrag; // Description enthaelt defaultDragType + String aUrl; // URL inkl. Sprungmarke + String aDescr; // Description + long nDocSh; // Adresse der DocShell + USHORT nDefDrag; // Description enthaelt defaultDragType public: NaviContentBookmark(); NaviContentBookmark( const String &rUrl, const String& rDesc, USHORT nDragType, const SwDocShell* ); - const String& GetURL() const { return aUrl; } - const String& GetDescription() const { return aDescr; } - USHORT GetDefaultDragType() const { return nDefDrag; } - long GetDocShell() const { return nDocSh; } - void Copy( TransferDataContainer& rData ) const; - BOOL Paste( TransferableDataHelper& rData ); + const String& GetURL() const { return aUrl; } + const String& GetDescription() const { return aDescr; } + USHORT GetDefaultDragType() const { return nDefDrag; } + long GetDocShell() const { return nDocSh; } + void Copy( TransferDataContainer& rData ) const; + BOOL Paste( TransferableDataHelper& rData ); }; #endif diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index 21a3ecd4dcf4..2c042bc98bec 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.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 @@ -52,8 +52,8 @@ class SwNavigationPI; class SwNavHelpToolBox : public SwHelpToolBox { - virtual void MouseButtonDown(const MouseEvent &rEvt); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonDown(const MouseEvent &rEvt); + virtual void RequestHelp( const HelpEvent& rHEvt ); public: SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; @@ -67,44 +67,44 @@ class SwNavigationPI : public Window, friend class SwGlobalTree; // --------- members ----------------------------- - SwNavHelpToolBox aContentToolBox; - SwHelpToolBox aGlobalToolBox; - ImageList aContentImageList; + SwNavHelpToolBox aContentToolBox; + SwHelpToolBox aGlobalToolBox; + ImageList aContentImageList; ImageList aContentImageListH; - SwContentTree aContentTree; + SwContentTree aContentTree; SwGlobalTree aGlobalTree; - ListBox aDocListBox; - Timer aPageChgTimer; - String sContentFileName; - String aContextArr[3]; - String aStatusArr[4]; - Point aBoxBottomLeft; // Pos., wenn Box unten ist - - SfxObjectShellLock *pxObjectShell; - SwView *pContentView; - SwWrtShell *pContentWrtShell; - SwView *pActContView; - SwView *pCreateView; + ListBox aDocListBox; + Timer aPageChgTimer; + String sContentFileName; + String aContextArr[3]; + String aStatusArr[4]; + Point aBoxBottomLeft; // Pos., wenn Box unten ist + + SfxObjectShellLock *pxObjectShell; + SwView *pContentView; + SwWrtShell *pContentWrtShell; + SwView *pActContView; + SwView *pCreateView; SfxPopupWindow *pPopupWindow; SfxPopupWindow *pFloatingWindow; SfxChildWindowContext* pContextWin; - SwNavigationConfig *pConfig; - SfxBindings &rBindings; + SwNavigationConfig *pConfig; + SfxBindings &rBindings; - long nDocLBIniHeight; - long nWishWidth; - USHORT nAutoMarkIdx; - USHORT nRegionMode; // 0 - URL, 1 - Bereich mit Link 2 - B. ohne Link - short nZoomIn; - short nZoomOutInit; - short nZoomOut; + long nDocLBIniHeight; + long nWishWidth; + USHORT nAutoMarkIdx; + USHORT nRegionMode; // 0 - URL, 1 - Bereich mit Link 2 - B. ohne Link + short nZoomIn; + short nZoomOutInit; + short nZoomOut; - BOOL bSmallMode : 1; - BOOL bIsZoomedIn : 1; - BOOL bPageCtrlsVisible : 1; - BOOL bGlobalMode : 1; + BOOL bSmallMode : 1; + BOOL bIsZoomedIn : 1; + BOOL bPageCtrlsVisible : 1; + BOOL bGlobalMode : 1; // --------- methods ----------------------------- BOOL _IsZoomedIn() const {return bIsZoomedIn;} @@ -139,43 +139,43 @@ class SwNavigationPI : public Window, protected: - virtual BOOL Close(); - virtual void Resize(); + virtual BOOL Close(); + virtual void Resize(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); // zum App-Ende rechtzeitig ObjectShellLock loslassen - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - NumEditAction& GetPageEdit(); - BOOL ToggleTree(); - void SetGlobalMode(BOOL bSet) {bGlobalMode = bSet;} + NumEditAction& GetPageEdit(); + BOOL ToggleTree(); + void SetGlobalMode(BOOL bSet) {bGlobalMode = bSet;} public: SwNavigationPI(SfxBindings*, SfxChildWindowContext*, Window*); ~SwNavigationPI(); - void GotoPage(); // Seite anspringen; bindbare Funktion + void GotoPage(); // Seite anspringen; bindbare Funktion - void Update() { FillBox(); } - void UpdateListBox(); - void MoveOutline(USHORT nSource, USHORT nTarget, BOOL bWithCilds); + void Update() { FillBox(); } + void UpdateListBox(); + void MoveOutline(USHORT nSource, USHORT nTarget, BOOL bWithCilds); virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - static String CreateDropFileName( TransferableDataHelper& rData ); - static void CleanEntry( String& rEntry ); + static String CreateDropFileName( TransferableDataHelper& rData ); + static void CleanEntry( String& rEntry ); - USHORT GetRegionDropMode() const {return nRegionMode;} - void SetRegionDropMode(USHORT nNewMode); + USHORT GetRegionDropMode() const {return nRegionMode;} + void SetRegionDropMode(USHORT nNewMode); - sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - BOOL IsGlobalDoc() const; - BOOL IsGlobalMode() const {return bGlobalMode;} + BOOL IsGlobalDoc() const; + BOOL IsGlobalMode() const {return bGlobalMode;} SwView* GetCreateView() const; void CreateNavigationTool(const Rectangle& rRect, BOOL bSetFocus); diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 332ca4f81d50..0c293bad2ca1 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.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 @@ -52,15 +52,15 @@ class SwOutlineTabDialog; struct SwBmpItemInfo { - SvxBrushItem* pBrushItem; - USHORT nItemId; + SvxBrushItem* pBrushItem; + USHORT nItemId; }; /*-----------------07.02.97 15.37------------------- --------------------------------------------------*/ -#define NUM_PAGETYPE_BULLET 0 +#define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 #define NUM_PAGETYPE_BMP 3 @@ -73,20 +73,20 @@ class SwNumPositionTabPage : public SfxTabPage { FixedLine aPositionFL; FixedLine aLevelFL; - MultiListBox aLevelLB; + MultiListBox aLevelLB; // --> OD 2008-02-01 #newlistlevelattrs# // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION - FixedText aDistBorderFT; - MetricField aDistBorderMF; - CheckBox aRelativeCB; - FixedText aIndentFT; - MetricField aIndentMF; - FixedText aDistNumFT; - MetricField aDistNumMF; - FixedText aAlignFT; - ListBox aAlignLB; + FixedText aDistBorderFT; + MetricField aDistBorderMF; + CheckBox aRelativeCB; + FixedText aIndentFT; + MetricField aIndentMF; + FixedText aDistNumFT; + MetricField aDistNumMF; + FixedText aAlignFT; + ListBox aAlignLB; // <-- // --> OD 2008-02-01 #newlistlevelattrs# @@ -104,25 +104,25 @@ class SwNumPositionTabPage : public SfxTabPage MetricField aIndentAtMF; // <-- - PushButton aStandardPB; + PushButton aStandardPB; - NumberingPreview aPreviewWIN; + NumberingPreview aPreviewWIN; - SwNumRule* pActNum; - SwNumRule* pSaveNum; - SwWrtShell* pWrtSh; + SwNumRule* pActNum; + SwNumRule* pSaveNum; + SwWrtShell* pWrtSh; - SwOutlineTabDialog* pOutlineDlg; - USHORT nActNumLvl; + SwOutlineTabDialog* pOutlineDlg; + USHORT nActNumLvl; - BOOL bModified : 1; - BOOL bPreset : 1; - BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein + BOOL bModified : 1; + BOOL bPreset : 1; + BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein // --> OD 2008-02-01 #newlistlevelattrs# bool bLabelAlignmentPosAndSpaceModeActive; // <-- - void InitControls(); + void InitControls(); DECL_LINK( LevelHdl, ListBox * ); DECL_LINK( EditModifyHdl, Edit*); @@ -149,20 +149,20 @@ public: const SfxItemSet& rSet); ~SwNumPositionTabPage(); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} - void SetWrtShell(SwWrtShell* pSh); + void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} + void SetWrtShell(SwWrtShell* pSh); #if OSL_DEBUG_LEVEL > 1 - void SetModified(BOOL bRepaint = TRUE); + void SetModified(BOOL bRepaint = TRUE); #else - void SetModified(BOOL bRepaint = TRUE) + void SetModified(BOOL bRepaint = TRUE) { bModified = TRUE; if(bRepaint) { @@ -175,14 +175,14 @@ public: class SwSvxNumBulletTabDialog : public SfxTabDialog { - SwWrtShell& rWrtSh; + SwWrtShell& rWrtSh; - String sRemoveText; - int nRetOptionsDialog; + String sRemoveText; + int nRetOptionsDialog; protected: - virtual short Ok(); - virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); + virtual short Ok(); + virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); DECL_LINK(RemoveNumberingHdl, PushButton*); public: SwSvxNumBulletTabDialog(Window* pParent, diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx index 3ac0d047b436..68ba9615fc2a 100644 --- a/sw/source/ui/inc/numberingtypelistbox.hxx +++ b/sw/source/ui/inc/numberingtypelistbox.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 @@ -31,9 +31,9 @@ #include <vcl/lstbox.hxx> #include "swdllapi.h" -#define INSERT_NUM_TYPE_NO_NUMBERING 0x01 -#define INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING 0x02 -#define INSERT_NUM_TYPE_BITMAP 0x04 +#define INSERT_NUM_TYPE_NO_NUMBERING 0x01 +#define INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING 0x02 +#define INSERT_NUM_TYPE_BITMAP 0x04 #define INSERT_NUM_TYPE_BULLET 0x08 #define INSERT_NUM_EXTENDED_TYPES 0x10 @@ -48,10 +48,10 @@ public: USHORT nTypeFlags = INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING|INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES ); ~SwNumberingTypeListBox(); - void Reload(USHORT nTypeFlags); + void Reload(USHORT nTypeFlags); - sal_Int16 GetSelectedNumberingType(); - sal_Bool SelectNumberingType(sal_Int16 nType); + sal_Int16 GetSelectedNumberingType(); + sal_Bool SelectNumberingType(sal_Int16 nType); }; diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx index 31ef802ebbb1..cb72486f718e 100644 --- a/sw/source/ui/inc/numfmtlb.hxx +++ b/sw/source/ui/inc/numfmtlb.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 @@ -36,13 +36,13 @@ class SwView; class SW_DLLPUBLIC NumFormatListBox : public ListBox { - short nCurrFormatType; - USHORT nStdEntry; - BOOL bOneArea; - ULONG nDefFormat; - SwView* pVw; - SvNumberFormatter* pOwnFormatter; - LanguageType eCurLanguage; + short nCurrFormatType; + USHORT nStdEntry; + BOOL bOneArea; + ULONG nDefFormat; + SwView* pVw; + SvNumberFormatter* pOwnFormatter; + LanguageType eCurLanguage; BOOL bShowLanguageControl; //determine whether the language control has //to be shown in the number format dialog BOOL bUseAutomaticLanguage;//determine whether language is automatically assigned @@ -51,7 +51,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox SW_DLLPRIVATE double GetDefValue(const short nFormatType) const; SW_DLLPRIVATE void Init(short nFormatType, BOOL bUsrFmts); - SW_DLLPRIVATE SwView* GetView(); + SW_DLLPRIVATE SwView* GetView(); public: NumFormatListBox( Window* pWin, const ResId& rResId, @@ -66,14 +66,14 @@ public: void Clear(); - inline void SetOneArea(BOOL bOnlyOne = TRUE) { bOneArea = bOnlyOne; } + inline void SetOneArea(BOOL bOnlyOne = TRUE) { bOneArea = bOnlyOne; } - void SetFormatType(const short nFormatType); - inline short GetFormatType() const { return nCurrFormatType; } - void SetDefFormat(const ULONG nDefFmt); - ULONG GetFormat() const; + void SetFormatType(const short nFormatType); + inline short GetFormatType() const { return nCurrFormatType; } + void SetDefFormat(const ULONG nDefFmt); + ULONG GetFormat() const; - inline LanguageType GetCurLanguage() const { return eCurLanguage;} + inline LanguageType GetCurLanguage() const { return eCurLanguage;} void SetLanguage(LanguageType eSet) { eCurLanguage = eSet;} void SetAutomaticLanguage(BOOL bSet){bUseAutomaticLanguage = bSet;} diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index 236c0205c9a0..d084a5d8a043 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.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 @@ -43,30 +43,30 @@ ---------------------------------------------------------------------------*/ class SwParagraphNumTabPage : public SfxTabPage { - FixedLine aOutlineStartFL; - FixedText aOutlineLvFT; - ListBox aOutlineLvLB; + FixedLine aOutlineStartFL; + FixedText aOutlineLvFT; + ListBox aOutlineLvLB; FixedText aNumberStyleFT; - ListBox aNumberStyleLB; + ListBox aNumberStyleLB; FixedLine aNewStartFL; - TriStateBox aNewStartCB; + TriStateBox aNewStartCB; TriStateBox aNewStartNumberCB; - NumericField aNewStartNF; + NumericField aNewStartNF; FixedLine aCountParaFL; - TriStateBox aCountParaCB; - TriStateBox aRestartParaCountCB; - FixedText aRestartFT; - NumericField aRestartNF; + TriStateBox aCountParaCB; + TriStateBox aRestartParaCountCB; + FixedText aRestartFT; + NumericField aRestartNF; // --> OD 2008-04-14 #outlinelevel# const String msOutlineNumbering; // <-- - BOOL bModified : 1; - BOOL bCurNumrule : 1; + BOOL bModified : 1; + BOOL bCurNumrule : 1; DECL_LINK( NewStartHdl_Impl, CheckBox* ); DECL_LINK( StyleHdl_Impl, ListBox* ); @@ -78,18 +78,18 @@ protected: public: ~SwParagraphNumTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void EnableNewStart(); - void DisableOutline(); - void DisableNumbering(); + void EnableNewStart(); + void DisableOutline(); + void DisableNumbering(); - ListBox& GetStyleBox() {return aNumberStyleLB;}; + ListBox& GetStyleBox() {return aNumberStyleLB;}; }; diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx index 1d0002f0d56e..53636d279e9f 100644 --- a/sw/source/ui/inc/numprevw.hxx +++ b/sw/source/ui/inc/numprevw.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 @@ -39,15 +39,15 @@ class SwNumRule; class NumberingPreview : public Window { - const SwNumRule* pActNum; - Font aStdFont; - long nPageWidth; - const String* pOutlineNames; - BOOL bPosition; - UINT16 nActLevel; + const SwNumRule* pActNum; + Font aStdFont; + long nPageWidth; + const String* pOutlineNames; + BOOL bPosition; + UINT16 nActLevel; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); public: NumberingPreview(Window* pParent, const ResId& rResId ) : @@ -55,15 +55,15 @@ class NumberingPreview : public Window pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(FALSE), nActLevel(USHRT_MAX) {} ~NumberingPreview(); - void SetNumRule(const SwNumRule* pNum) + void SetNumRule(const SwNumRule* pNum) {pActNum = pNum; Invalidate();}; - void SetPageWidth(long nPgWidth) + void SetPageWidth(long nPgWidth) {nPageWidth = nPgWidth;} - void SetOutlineNames(const String* pNames) + void SetOutlineNames(const String* pNames) {pOutlineNames = pNames;} - void SetPositionMode() + void SetPositionMode() { bPosition = TRUE;} - void SetLevel(USHORT nSet) {nActLevel = nSet;} + void SetLevel(USHORT nSet) {nActLevel = nSet;} }; diff --git a/sw/source/ui/inc/olesh.hxx b/sw/source/ui/inc/olesh.hxx index c4c220b795e0..2a36cbf73cb7 100644 --- a/sw/source/ui/inc/olesh.hxx +++ b/sw/source/ui/inc/olesh.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 diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx index f83feb7f27db..df7e083e2dca 100644 --- a/sw/source/ui/inc/olmenu.hxx +++ b/sw/source/ui/inc/olmenu.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,14 +45,14 @@ class SwWrtShell; class SwSpellPopup : public PopupMenu { - SwWrtShell* pSh; + SwWrtShell* pSh; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > > aDics; + ::com::sun::star::linguistic2::XDictionary > > aDics; ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellAlternatives > xSpellAlt; + ::com::sun::star::linguistic2::XSpellAlternatives > xSpellAlt; ::com::sun::star::uno::Sequence< rtl::OUString > aSuggestions; - + LanguageType nCheckedLanguage; LanguageType nGuessLangWord; LanguageType nGuessLangPara; @@ -64,9 +64,9 @@ class SwSpellPopup : public PopupMenu bool bGrammarResults; // show grammar results? Or show spellcheck results? Image aInfo16; - - void fillLangPopupMenu( PopupMenu *pPopupMenu, USHORT nLangStart, - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq, SwWrtShell* pWrtSh, + + void fillLangPopupMenu( PopupMenu *pPopupMenu, USHORT nLangStart, + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq, SwWrtShell* pWrtSh, std::map< sal_Int16, ::rtl::OUString > &rLangTable ); using PopupMenu::Execute; @@ -82,7 +82,7 @@ public: sal_Int32 nErrorInResult, const ::com::sun::star::uno::Sequence< rtl::OUString > &rSuggestions, const String & rParaText ); - + sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin ); void Execute( USHORT nId ); diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx index c4758b649ead..6d2c525460b5 100644 --- a/sw/source/ui/inc/optcomp.hxx +++ b/sw/source/ui/inc/optcomp.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 @@ -42,45 +42,45 @@ class SwCompatibilityOptPage : public SfxTabPage { private: // controls - FixedLine m_aMainFL; - FixedText m_aFormattingFT; - ListBox m_aFormattingLB; - FixedText m_aOptionsFT; - SvxCheckListBox m_aOptionsLB; - PushButton m_aResetPB; - PushButton m_aDefaultPB; + FixedLine m_aMainFL; + FixedText m_aFormattingFT; + ListBox m_aFormattingLB; + FixedText m_aOptionsFT; + SvxCheckListBox m_aOptionsLB; + PushButton m_aResetPB; + PushButton m_aDefaultPB; // config item - SvtCompatibilityOptions m_aConfigItem; + SvtCompatibilityOptions m_aConfigItem; // text of the user entry - String m_sUserEntry; + String m_sUserEntry; // text of the "use as default" querybox - String m_sUseAsDefaultQuery; + String m_sUseAsDefaultQuery; // shell of the current document - SwWrtShell* m_pWrtShell; + SwWrtShell* m_pWrtShell; // impl object SwCompatibilityOptPage_Impl* m_pImpl; // saved options after "Reset"; used in "FillItemSet" for comparison - ULONG m_nSavedOptions; + ULONG m_nSavedOptions; // handler - DECL_LINK( SelectHdl, ListBox* ); - DECL_LINK( UseAsDefaultHdl, PushButton* ); + DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK( UseAsDefaultHdl, PushButton* ); // private methods - void InitControls( const SfxItemSet& rSet ); - void ReplaceFormatName( String& rEntry ); - void SetCurrentOptions( ULONG nOptions ); - ULONG GetDocumentOptions() const; - void WriteOptions(); + void InitControls( const SfxItemSet& rSet ); + void ReplaceFormatName( String& rEntry ); + void SetCurrentOptions( ULONG nOptions ); + ULONG GetDocumentOptions() const; + void WriteOptions(); public: SwCompatibilityOptPage( Window* pParent, const SfxItemSet& rSet ); ~SwCompatibilityOptPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index fb2bb6c26189..bbef62cc589f 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.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 @@ -50,12 +50,12 @@ private: FixedLine aUpdateFL; FixedText aLinkFT; RadioButton aAlwaysRB; - RadioButton aRequestRB; - RadioButton aNeverRB; + RadioButton aRequestRB; + RadioButton aNeverRB; FixedText aFieldFT; CheckBox aAutoUpdateFields; - CheckBox aAutoUpdateCharts; + CheckBox aAutoUpdateCharts; FixedLine aSettingsFL; FixedText aMetricFT; @@ -65,7 +65,7 @@ private: CheckBox aUseSquaredPageMode; CheckBox aUseCharUnit; - SwWrtShell* pWrtShell; + SwWrtShell* pWrtShell; sal_Bool bHTMLMode; UINT16 nLastTab; sal_Int32 nOldLinkMode; @@ -77,11 +77,11 @@ public: SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ); ~SwLoadOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; class SwCaptionOptDlg : public SfxSingleTabDialog @@ -105,69 +105,69 @@ public: class SwCaptionPreview : public Window { private: - String maText; - Point maDrawPos; + String maText; + Point maDrawPos; public: SwCaptionPreview( Window* pParent, const ResId& rResId ); - void SetPreviewText( const String& rText ); - virtual void Paint( const Rectangle& rRect ); + void SetPreviewText( const String& rText ); + virtual void Paint( const Rectangle& rRect ); }; class SwCaptionOptPage : public SfxTabPage { private: - FixedText aCheckFT; - SvxCheckListBox aCheckLB; + FixedText aCheckFT; + SvxCheckListBox aCheckLB; FixedText aFtCaptionOrder; ListBox aLbCaptionOrder; - + SwCaptionPreview aPreview; - + FixedLine aSettingsGroupFL; - FixedText aCategoryText; - CaptionComboBox aCategoryBox; - FixedText aFormatText; - ListBox aFormatBox; - //#i61007# order of captions + FixedText aCategoryText; + CaptionComboBox aCategoryBox; + FixedText aFormatText; + ListBox aFormatBox; + //#i61007# order of captions FixedText aNumberingSeparatorFT; Edit aNumberingSeparatorED; - FixedText aTextText; - Edit aTextEdit; - FixedText aPosText; - ListBox aPosBox; - - FixedLine aNumCaptFL; - FixedText aFtLevel; - ListBox aLbLevel; - FixedText aFtDelim; - Edit aEdDelim; - - FixedLine aCategoryFL; - FixedText aCharStyleFT; - ListBox aCharStyleLB; - CheckBox aApplyBorderCB; - - String sSWTable; - String sSWFrame; - String sSWGraphic; - String sOLE; - - String sIllustration; - String sTable; - String sText; + FixedText aTextText; + Edit aTextEdit; + FixedText aPosText; + ListBox aPosBox; + + FixedLine aNumCaptFL; + FixedText aFtLevel; + ListBox aLbLevel; + FixedText aFtDelim; + Edit aEdDelim; + + FixedLine aCategoryFL; + FixedText aCharStyleFT; + ListBox aCharStyleLB; + CheckBox aApplyBorderCB; + + String sSWTable; + String sSWFrame; + String sSWGraphic; + String sOLE; + + String sIllustration; + String sTable; + String sText; String sDrawing; - String sBegin; - String sEnd; - String sAbove; - String sBelow; + String sBegin; + String sEnd; + String sAbove; + String sBelow; String sNone; - SwFldMgr *pMgr; - USHORT eType; - BOOL bHTMLMode; + SwFldMgr *pMgr; + USHORT eType; + BOOL bHTMLMode; DECL_LINK( SelectHdl, ListBox *pLB = 0 ); DECL_LINK( ModifyHdl, Edit *pEdt = 0 ); @@ -175,23 +175,23 @@ private: DECL_LINK( ShowEntryHdl, SvxCheckListBox *pLB = 0 ); DECL_LINK( SaveEntryHdl, SvxCheckListBox *pLB = 0 ); - void DelUserData(); - void SetOptions( const USHORT nPos, + void DelUserData(); + void SetOptions( const USHORT nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0); - void SaveEntry( SvLBoxEntry* pEntry ); - void DrawSample(); + void SaveEntry( SvLBoxEntry* pEntry ); + void DrawSample(); public: SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ); ~SwCaptionOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 86a197bdc922..2fdb986bf222 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.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 @@ -51,29 +51,29 @@ class SwContentOptPage : public SfxTabPage { //visual aids FixedLine aLineFL; - CheckBox aCrossCB; - CheckBox aSolidHandleCB; - CheckBox aBigHandleCB; + CheckBox aCrossCB; + CheckBox aSolidHandleCB; + CheckBox aBigHandleCB; //view FixedLine aWindowFL; - CheckBox aHScrollBox; - CheckBox aVScrollBox; + CheckBox aHScrollBox; + CheckBox aVScrollBox; CheckBox aAnyRulerCB; CheckBox aHRulerCBox; ListBox aHMetric; - CheckBox aVRulerCBox; + CheckBox aVRulerCBox; CheckBox aVRulerRightCBox; ListBox aVMetric; - CheckBox aSmoothCBox; + CheckBox aSmoothCBox; //display FixedLine aDispFL; - CheckBox aGrfCB; - CheckBox aTblCB; - CheckBox aDrwCB; - CheckBox aFldNameCB; - CheckBox aPostItCB; + CheckBox aGrfCB; + CheckBox aTblCB; + CheckBox aDrwCB; + CheckBox aFldNameCB; + CheckBox aPostItCB; FixedLine aSettingsFL; FixedText aMetricFT; @@ -86,11 +86,11 @@ public: const SfxItemSet& rSet ); ~SwContentOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; @@ -101,11 +101,11 @@ class SwAddPrinterTabPage : public SfxTabPage { FixedLine aFL1; CheckBox aGrfCB; -// CheckBox aTabCB; -// CheckBox aDrawCB; - CheckBox aCtrlFldCB; - CheckBox aBackgroundCB; - CheckBox aBlackFontCB; +// CheckBox aTabCB; +// CheckBox aDrawCB; + CheckBox aCtrlFldCB; + CheckBox aBackgroundCB; + CheckBox aBlackFontCB; CheckBox aPrintHiddenTextCB; CheckBox aPrintTextPlaceholderCB; @@ -113,8 +113,8 @@ class SwAddPrinterTabPage : public SfxTabPage FixedLine aFL2; CheckBox aLeftPageCB; - CheckBox aRightPageCB; -// CheckBox aReverseCB; + CheckBox aRightPageCB; +// CheckBox aReverseCB; CheckBox aProspectCB; CheckBox aProspectCB_RTL; @@ -128,15 +128,15 @@ class SwAddPrinterTabPage : public SfxTabPage FixedLine aFL4; CheckBox aPrintEmptyPagesCB; // CheckBox aSingleJobsCB; - CheckBox aPaperFromSetupCB; + CheckBox aPaperFromSetupCB; FixedText aFaxFT; ListBox aFaxLB; String sNone; - BOOL bAttrModified; - BOOL bPreview; + BOOL bAttrModified; + BOOL bPreview; - void Init(); + void Init(); DECL_LINK( AutoClickHdl, CheckBox * ); DECL_LINK( SelectHdl, ListBox * ); @@ -145,14 +145,14 @@ class SwAddPrinterTabPage : public SfxTabPage const SfxItemSet& rSet ); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - void SetFax( const SvStringsDtor& ); - void SelectFax( const String& ); - void SetPreview(BOOL bPrev); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + void SetFax( const SvStringsDtor& ); + void SelectFax( const String& ); + void SetPreview(BOOL bPrev); virtual void PageCreated (SfxAllItemSet aSet); }; @@ -164,49 +164,49 @@ class SwStdFontTabPage : public SfxTabPage FixedText aTypeFT; FixedText aStandardLbl; - ComboBox aStandardBox; + ComboBox aStandardBox; FixedText aHeightFT; FontSizeBox aStandardHeightLB; FixedText aTitleLbl ; - ComboBox aTitleBox ; + ComboBox aTitleBox ; FontSizeBox aTitleHeightLB; - FixedText aListLbl ; - ComboBox aListBox ; + FixedText aListLbl ; + ComboBox aListBox ; FontSizeBox aListHeightLB; - FixedText aLabelLbl ; - ComboBox aLabelBox ; + FixedText aLabelLbl ; + ComboBox aLabelBox ; FontSizeBox aLabelHeightLB; - FixedText aIdxLbl ; - ComboBox aIdxBox ; + FixedText aIdxLbl ; + ComboBox aIdxBox ; FontSizeBox aIndexHeightLB; - CheckBox aDocOnlyCB ; + CheckBox aDocOnlyCB ; PushButton aStandardPB; - String sShellStd; - String sShellTitle; - String sShellList; + String sShellStd; + String sShellTitle; + String sShellList; String sShellLabel; String sShellIndex; - SfxPrinter* pPrt; + SfxPrinter* pPrt; FontList* pFontList; - SwStdFontConfig* pFontConfig; - SwWrtShell* pWrtShell; + SwStdFontConfig* pFontConfig; + SwWrtShell* pWrtShell; LanguageType eLanguage; // waren nur defaults vorhanden? wurden sie mit den Boxen ueberschrieben - BOOL bListDefault :1; - BOOL bSetListDefault :1; - BOOL bLabelDefault :1; - BOOL bSetLabelDefault :1; - BOOL bIdxDefault :1; - BOOL bSetIdxDefault :1; - BOOL bDeletePrinter :1; + BOOL bListDefault :1; + BOOL bSetListDefault :1; + BOOL bLabelDefault :1; + BOOL bSetLabelDefault :1; + BOOL bIdxDefault :1; + BOOL bSetIdxDefault :1; + BOOL bDeletePrinter :1; BOOL bListHeightDefault :1; BOOL bSetListHeightDefault :1; @@ -231,11 +231,11 @@ class SwStdFontTabPage : public SfxTabPage ~SwStdFontTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} virtual void PageCreated (SfxAllItemSet aSet); @@ -245,39 +245,39 @@ class SwTableOptionsTabPage : public SfxTabPage { FixedLine aTableFL; CheckBox aHeaderCB; - CheckBox aRepeatHeaderCB; - CheckBox aDontSplitCB; - CheckBox aBorderCB; + CheckBox aRepeatHeaderCB; + CheckBox aDontSplitCB; + CheckBox aBorderCB; FixedLine aSeparatorFL; FixedLine aTableInsertFL; - CheckBox aNumFormattingCB; - CheckBox aNumFmtFormattingCB; - CheckBox aNumAlignmentCB; + CheckBox aNumFormattingCB; + CheckBox aNumFmtFormattingCB; + CheckBox aNumAlignmentCB; FixedLine aMoveFL; FixedText aMoveFT; FixedText aRowMoveFT; - MetricField aRowMoveMF; - FixedText aColMoveFT; - MetricField aColMoveMF; + MetricField aRowMoveMF; + FixedText aColMoveFT; + MetricField aColMoveMF; FixedText aInsertFT; - FixedText aRowInsertFT; - MetricField aRowInsertMF; - FixedText aColInsertFT; - MetricField aColInsertMF; + FixedText aRowInsertFT; + MetricField aRowInsertMF; + FixedText aColInsertFT; + MetricField aColInsertMF; FixedText aHandlingFT; - RadioButton aFixRB; + RadioButton aFixRB; RadioButton aFixPropRB; RadioButton aVarRB; - FixedText aFixFT; - FixedText aFixPropFT; - FixedText aVarFT; + FixedText aFixFT; + FixedText aFixPropFT; + FixedText aVarFT; - SwWrtShell* pWrtShell; + SwWrtShell* pWrtShell; BOOL bHTMLMode; DECL_LINK(CheckBoxHdl, CheckBox *pCB); @@ -289,11 +289,11 @@ class SwTableOptionsTabPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} virtual void PageCreated (SfxAllItemSet aSet); @@ -307,12 +307,12 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage { //nonprinting characters FixedLine aUnprintFL; - CheckBox aParaCB; - CheckBox aSHyphCB; - CheckBox aSpacesCB; - CheckBox aHSpacesCB; - CheckBox aTabCB; - CheckBox aBreakCB; + CheckBox aParaCB; + CheckBox aSHyphCB; + CheckBox aSpacesCB; + CheckBox aHSpacesCB; + CheckBox aTabCB; + CheckBox aBreakCB; CheckBox aCharHiddenCB; CheckBox aFldHiddenCB; CheckBox aFldHiddenParaCB; @@ -320,26 +320,26 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage FixedLine aSeparatorFL; FixedLine aFlagFL; - CheckBox aOnOffCB; + CheckBox aOnOffCB; - FixedText aFillModeFT; + FixedText aFillModeFT; RadioButton aFillMarginRB; RadioButton aFillIndentRB; RadioButton aFillTabRB; RadioButton aFillSpaceRB; FixedLine aCrsrOptFL; - CheckBox aCrsrInProtCB; + CheckBox aCrsrInProtCB; SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwShdwCrsrOptionsTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; /*----------------------------------------------------------------------- @@ -347,36 +347,36 @@ public: -----------------------------------------------------------------------*/ class SwMarkPreview : public Window { - Color m_aBgCol; // background - Color m_aTransCol; // transparency - Color m_aMarkCol; // marks - Color m_aLineCol; // general lines - Color m_aShadowCol; // shadow - Color m_aTxtCol; // text - Color m_aPrintAreaCol; // frame for print area + Color m_aBgCol; // background + Color m_aTransCol; // transparency + Color m_aMarkCol; // marks + Color m_aLineCol; // general lines + Color m_aShadowCol; // shadow + Color m_aTxtCol; // text + Color m_aPrintAreaCol; // frame for print area - Rectangle aPage; - Rectangle aLeftPagePrtArea; - Rectangle aRightPagePrtArea; + Rectangle aPage; + Rectangle aLeftPagePrtArea; + Rectangle aRightPagePrtArea; - USHORT nMarkPos; + USHORT nMarkPos; using OutputDevice::DrawRect; - void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); + void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); - void Paint(const Rectangle&); - void PaintPage(const Rectangle &rRect); - void InitColors( void ); + void Paint(const Rectangle&); + void PaintPage(const Rectangle &rRect); + void InitColors( void ); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: SwMarkPreview(Window* pParent, const ResId& rResID); - virtual ~SwMarkPreview(); + virtual ~SwMarkPreview(); - inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } - inline void SetMarkPos(USHORT nPos) { nMarkPos = nPos; } + inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } + inline void SetMarkPos(USHORT nPos) { nMarkPos = nPos; } }; /*----------------------------------------------------------------------- @@ -388,9 +388,9 @@ class SwRedlineOptionsTabPage : public SfxTabPage FixedText aInsertFT; FixedText aInsertAttrFT; - ListBox aInsertLB; + ListBox aInsertLB; FixedText aInsertColorFT; - ColorListBox aInsertColorLB; + ColorListBox aInsertColorLB; SvxFontPrevWindow aInsertedPreviewWN; FixedText aDeletedFT; @@ -410,13 +410,13 @@ class SwRedlineOptionsTabPage : public SfxTabPage FixedLine aChangedFL; FixedText aMarkPosFT; - ListBox aMarkPosLB; - FixedText aMarkColorFT; - ColorListBox aMarkColorLB; - SwMarkPreview aMarkPreviewWN; + ListBox aMarkPosLB; + FixedText aMarkColorFT; + ColorListBox aMarkColorLB; + SwMarkPreview aMarkPreviewWN; String sAuthor; - String sNone; + String sNone; SwRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwRedlineOptionsTabPage(); @@ -425,14 +425,14 @@ class SwRedlineOptionsTabPage : public SfxTabPage DECL_LINK( ChangedMaskPrevHdl, ListBox *pLB = 0 ); DECL_LINK( ColorHdl, ColorListBox *pColorLB ); - void InitFontStyle(SvxFontPrevWindow& rExampleWin); + void InitFontStyle(SvxFontPrevWindow& rExampleWin); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; /*--------OS 11.01.95 ----------------------------------- @@ -447,11 +447,11 @@ public: SwTestTabPage( Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); private: FixedLine aTestFL; @@ -466,9 +466,9 @@ private: CheckBox aTest9CBox; CheckBox aTest10CBox; - BOOL bAttrModified; + BOOL bAttrModified; - void Init(); + void Init(); DECL_LINK( AutoClickHdl, CheckBox * ); }; diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 52e6e3fb1aa2..4992bb6dd541 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.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,7 +44,7 @@ #include <vcl/field.hxx> -#include "swtypes.hxx" //fuer MAXLEVEL +#include "swtypes.hxx" //fuer MAXLEVEL #include <numprevw.hxx> #include <numberingtypelistbox.hxx> @@ -57,12 +57,12 @@ class SwOutlineTabDialog : public SfxTabDialog static USHORT nNumLevel; String aNullStr; - String aCollNames[MAXLEVEL]; - PopupMenu aFormMenu; + String aCollNames[MAXLEVEL]; + PopupMenu aFormMenu; - SwWrtShell& rWrtSh; - SwNumRule* pNumRule; - SwChapterNumRules* pChapterNumRules; + SwWrtShell& rWrtSh; + SwNumRule* pNumRule; + SwChapterNumRules* pChapterNumRules; BOOL bModified : 1; @@ -71,8 +71,8 @@ class SwOutlineTabDialog : public SfxTabDialog DECL_LINK( FormHdl, Button * ); DECL_LINK( MenuSelectHdl, Menu * ); - virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); - virtual short Ok(); + virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); + virtual short Ok(); public: SwOutlineTabDialog(Window* pParent, @@ -80,9 +80,9 @@ class SwOutlineTabDialog : public SfxTabDialog SwWrtShell &); ~SwOutlineTabDialog(); - SwNumRule* GetNumRule() {return pNumRule;} - USHORT GetLevel(const String &rFmtName) const; - String* GetCollNames() {return aCollNames;} + SwNumRule* GetNumRule() {return pNumRule;} + USHORT GetLevel(const String &rFmtName) const; + String* GetCollNames() {return aCollNames;} static USHORT GetActNumLevel() {return nNumLevel;} static void SetActNumLevel(USHORT nSet) {nNumLevel = nSet;} @@ -90,33 +90,33 @@ class SwOutlineTabDialog : public SfxTabDialog class SwOutlineSettingsTabPage : public SfxTabPage { - ListBox aLevelLB; + ListBox aLevelLB; FixedLine aLevelFL; - FixedText aCollLbl; - ListBox aCollBox; - FixedText aNumberLbl; - SwNumberingTypeListBox aNumberBox; - FixedText aCharFmtFT; - ListBox aCharFmtLB; + FixedText aCollLbl; + ListBox aCollBox; + FixedText aNumberLbl; + SwNumberingTypeListBox aNumberBox; + FixedText aCharFmtFT; + ListBox aCharFmtLB; FixedText aAllLevelFT; - NumericField aAllLevelNF; - FixedText aDelim; - FixedText aPrefixFT; - Edit aPrefixED; - FixedText aSuffixFT; - Edit aSuffixED; - FixedText aStartLbl; - NumericField aStartEdit; + NumericField aAllLevelNF; + FixedText aDelim; + FixedText aPrefixFT; + Edit aPrefixED; + FixedText aSuffixFT; + Edit aSuffixED; + FixedText aStartLbl; + NumericField aStartEdit; FixedLine aNumberFL; NumberingPreview aPreviewWIN; - String aNoFmtName; - String aSaveCollNames[MAXLEVEL]; - SwWrtShell* pSh; - SwNumRule* pNumRule; - String* pCollNames; - USHORT nActLevel; + String aNoFmtName; + String aSaveCollNames[MAXLEVEL]; + SwWrtShell* pSh; + SwNumRule* pNumRule; + String* pCollNames; + USHORT nActLevel; DECL_LINK( LevelHdl, ListBox * ); DECL_LINK( ToggleComplete, NumericField * ); @@ -127,9 +127,9 @@ class SwOutlineSettingsTabPage : public SfxTabPage DECL_LINK( StartModified, NumericField * ); DECL_LINK( CharFmtHdl, ListBox * ); - void Update(); + void Update(); - void SetModified(){aPreviewWIN.Invalidate();} + void SetModified(){aPreviewWIN.Invalidate();} void CheckForStartValue_Impl(sal_uInt16 nNumberingType); using SfxTabPage::ActivatePage; @@ -141,12 +141,12 @@ public: void SetWrtShell(SwWrtShell* pShell); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; diff --git a/sw/source/ui/inc/pardlg.hxx b/sw/source/ui/inc/pardlg.hxx index 2bb0be8dc5fe..1ee9b31c1377 100644 --- a/sw/source/ui/inc/pardlg.hxx +++ b/sw/source/ui/inc/pardlg.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 @@ -34,8 +34,8 @@ class SwView; class SfxItemSet; //DialogModes: -#define DLG_STD 0 -#define DLG_ENVELOP 2 +#define DLG_STD 0 +#define DLG_ENVELOP 2 #endif diff --git a/sw/source/ui/inc/pattern.hxx b/sw/source/ui/inc/pattern.hxx index d8bfd1a5e179..d28afaafc89b 100644 --- a/sw/source/ui/inc/pattern.hxx +++ b/sw/source/ui/inc/pattern.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 diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx index ac46e739f863..22a262962506 100644 --- a/sw/source/ui/inc/pgfnote.hxx +++ b/sw/source/ui/inc/pgfnote.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 @@ -38,7 +38,7 @@ #include <svtools/ctrlbox.hxx> /*-------------------------------------------------------------------- - Beschreibung: Fussnoteneinstellungs-TabPage + Beschreibung: Fussnoteneinstellungs-TabPage --------------------------------------------------------------------*/ class SwFootNotePage: public SfxTabPage { @@ -53,34 +53,34 @@ private: SwFootNotePage(Window *pParent, const SfxItemSet &rSet); ~SwFootNotePage(); - RadioButton aMaxHeightPageBtn; - RadioButton aMaxHeightBtn; - MetricField aMaxHeightEdit; - FixedText aDistLbl; - MetricField aDistEdit; - FixedLine aPosHeader; - - FixedText aLinePosLbl; - ListBox aLinePosBox; - FixedText aLineTypeLbl; - LineListBox aLineTypeBox; - FixedText aLineWidthLbl; - MetricField aLineWidthEdit; - FixedText aLineDistLbl; - MetricField aLineDistEdit; - FixedLine aLineHeader; + RadioButton aMaxHeightPageBtn; + RadioButton aMaxHeightBtn; + MetricField aMaxHeightEdit; + FixedText aDistLbl; + MetricField aDistEdit; + FixedLine aPosHeader; + + FixedText aLinePosLbl; + ListBox aLinePosBox; + FixedText aLineTypeLbl; + LineListBox aLineTypeBox; + FixedText aLineWidthLbl; + MetricField aLineWidthEdit; + FixedText aLineDistLbl; + MetricField aLineDistEdit; + FixedLine aLineHeader; DECL_LINK( HeightPage, Button * ); DECL_LINK( HeightMetric, Button * ); DECL_LINK( HeightModify, MetricField * ); - long lMaxHeight; + long lMaxHeight; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx index 4b4ccc9bbdce..c580aa5fb5c1 100644 --- a/sw/source/ui/inc/pggrid.hxx +++ b/sw/source/ui/inc/pggrid.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 @@ -61,8 +61,8 @@ class SwTextGridPage: public SfxTabPage FixedText aCharsRangeFT; FixedText aCharWidthFT; - MetricField aCharWidthMF; - + MetricField aCharWidthMF; + FixedText aRubySizeFT; MetricField aRubySizeMF; @@ -81,7 +81,7 @@ class SwTextGridPage: public SfxTabPage sal_Bool m_bRubyUserValue; Size m_aPageSize; sal_Bool m_bVertical; - sal_Bool m_bSquaredMode; + sal_Bool m_bSquaredMode; sal_Bool m_bHRulerChanged; sal_Bool m_bVRulerChanged; @@ -109,7 +109,7 @@ public: virtual void Reset(const SfxItemSet &rSet); virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; #endif diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx index 6377f43c81b4..198159a70b56 100644 --- a/sw/source/ui/inc/popbox.hxx +++ b/sw/source/ui/inc/popbox.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 @@ -37,21 +37,21 @@ class SwNavigationPI; class SwHelpToolBox: public ToolBox, public DropTargetHelper { Link aDoubleClickLink; - Link aRightClickLink; // Link bekommt MouseEvent als Parameter !!! + Link aRightClickLink; // Link bekommt MouseEvent als Parameter !!! using ToolBox::DoubleClick; protected: virtual void MouseButtonDown(const MouseEvent &rEvt); virtual long DoubleClick(ToolBox *); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); public: SwHelpToolBox(SwNavigationPI* pParent, const ResId &); ~SwHelpToolBox(); - void SetDoubleClickLink(const Link &); // inline - void SetRightClickLink(const Link &); // inline + void SetDoubleClickLink(const Link &); // inline + void SetRightClickLink(const Link &); // inline }; inline void SwHelpToolBox::SetDoubleClickLink(const Link &rLink) { diff --git a/sw/source/ui/inc/popup.hrc b/sw/source/ui/inc/popup.hrc index 62f210938a36..72fc074b526b 100644 --- a/sw/source/ui/inc/popup.hrc +++ b/sw/source/ui/inc/popup.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 @@ -30,24 +30,24 @@ #include "rcid.hrc" -#define MN_TEXT_POPUPMENU (RC_POPUPS_BEGIN + 0) -#define MN_TAB_POPUPMENU (RC_POPUPS_BEGIN + 1) -#define MN_FRM_POPUPMENU (RC_POPUPS_BEGIN + 2) -#define MN_DRAW_POPUPMENU (RC_POPUPS_BEGIN + 3) -#define MN_DRWTXT_POPUPMENU (RC_POPUPS_BEGIN + 4) -#define MN_GRF_POPUPMENU (RC_POPUPS_BEGIN + 5) -#define MN_OLE_POPUPMENU (RC_POPUPS_BEGIN + 6) -#define MN_PPREVIEW_POPUPMENU (RC_POPUPS_BEGIN + 7) +#define MN_TEXT_POPUPMENU (RC_POPUPS_BEGIN + 0) +#define MN_TAB_POPUPMENU (RC_POPUPS_BEGIN + 1) +#define MN_FRM_POPUPMENU (RC_POPUPS_BEGIN + 2) +#define MN_DRAW_POPUPMENU (RC_POPUPS_BEGIN + 3) +#define MN_DRWTXT_POPUPMENU (RC_POPUPS_BEGIN + 4) +#define MN_GRF_POPUPMENU (RC_POPUPS_BEGIN + 5) +#define MN_OLE_POPUPMENU (RC_POPUPS_BEGIN + 6) +#define MN_PPREVIEW_POPUPMENU (RC_POPUPS_BEGIN + 7) #define MN_SRCVIEW_POPUPMENU (RC_POPUPS_BEGIN + 8) -#define MN_DRAWFORM_POPUPMENU (RC_POPUPS_BEGIN + 9) -#define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10) -#define MN_LANGUAGE_FOR_TEXT (RC_POPUPS_BEGIN + 11) -#define MN_LANGUAGE_FOR_PARAGRAPH (RC_POPUPS_BEGIN + 12) -#define MN_LANGUAGE_FOR_DOCUMENT (RC_POPUPS_BEGIN + 13) -#define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14) -#define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15) -#define MN_REDCOMMENT_POPUPMENU (RC_POPUPS_BEGIN + 16) -#define MN_REDCOMMENT_BUTTON (RC_POPUPS_BEGIN + 17) +#define MN_DRAWFORM_POPUPMENU (RC_POPUPS_BEGIN + 9) +#define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10) +#define MN_LANGUAGE_FOR_TEXT (RC_POPUPS_BEGIN + 11) +#define MN_LANGUAGE_FOR_PARAGRAPH (RC_POPUPS_BEGIN + 12) +#define MN_LANGUAGE_FOR_DOCUMENT (RC_POPUPS_BEGIN + 13) +#define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14) +#define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15) +#define MN_REDCOMMENT_POPUPMENU (RC_POPUPS_BEGIN + 16) +#define MN_REDCOMMENT_BUTTON (RC_POPUPS_BEGIN + 17) #if MN_MEDIA_POPUPMENU > RC_POPUPS_END diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx index aafe5510983c..20df4cf8e1df 100644 --- a/sw/source/ui/inc/prcntfld.hxx +++ b/sw/source/ui/inc/prcntfld.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,8 +40,8 @@ class SW_DLLPUBLIC PercentField : public MetricField sal_Int64 nOldBaseValue; sal_Int64 nLastPercent; sal_Int64 nLastValue; - USHORT nOldDigits; - FieldUnit eOldUnit; + USHORT nOldDigits; + FieldUnit eOldUnit; sal_Bool bLockAutoCalculation; //prevent recalcution of percent values when the //reference value is changed @@ -69,7 +69,7 @@ public: sal_Int64 GetValue(FieldUnit eOutUnit = FUNIT_NONE); - BOOL IsValueModified(); + BOOL IsValueModified(); //using NumericFormatter::SetMax; void SetMax(sal_Int64 nNewMax, FieldUnit eInUnit = FUNIT_NONE); @@ -86,9 +86,9 @@ public: sal_Int64 Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit); - void ShowPercent(BOOL bPercent); + void ShowPercent(BOOL bPercent); - USHORT GetOldDigits() const {return nOldDigits;} + USHORT GetOldDigits() const {return nOldDigits;} void LockAutoCalculation(sal_Bool bLock) {bLockAutoCalculation = bLock;} sal_Bool IsAutoCalculationLocked()const {return bLockAutoCalculation;} diff --git a/sw/source/ui/inc/prtopt.hxx b/sw/source/ui/inc/prtopt.hxx index a2c47fd47066..ee2454db4448 100644 --- a/sw/source/ui/inc/prtopt.hxx +++ b/sw/source/ui/inc/prtopt.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 @@ -42,7 +42,7 @@ public: virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void doSetModified( ) { bModified = sal_True; SetModified();} + virtual void doSetModified( ) { bModified = sal_True; SetModified();} SwPrintOptions& operator=(const SwPrintData& rData) { diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index 04206297a9d3..3350689bbb6c 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.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 @@ -180,7 +180,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell // aktuelle Dispatcher-Shell SwPagePreViewWin aViewWin; //viewdata of the previous SwView and the new crsrposition - String sSwViewData, + String sSwViewData, //and the new cursor position if the user double click in the PagePreView sNewCrsrPos; // to support keyboard the number of the page to go to can be set too @@ -197,7 +197,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell *pPageDownBtn; // Dummy-Window zum F�llen der rechten unteren Ecke, wenn beide Scrollbars // aktiv sind - Window *pScrollFill; + Window *pScrollFill; USHORT mnPageCount; BOOL bNormalPrint; @@ -245,7 +245,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual Size GetOptimalSizePixel() const; + virtual Size GetOptimalSizePixel() const; void SetZoom(SvxZoomType eSet, USHORT nFactor); @@ -276,11 +276,11 @@ public: USHORT GetPageCount() const { return mnPageCount; } - BOOL HandleWheelCommands( const CommandEvent& ); + BOOL HandleWheelCommands( const CommandEvent& ); - const String& GetPrevSwViewData() const { return sSwViewData; } - void SetNewCrsrPos( const String& rStr ) { sNewCrsrPos = rStr; } - const String& GetNewCrsrPos() const { return sNewCrsrPos; } + const String& GetPrevSwViewData() const { return sSwViewData; } + void SetNewCrsrPos( const String& rStr ) { sNewCrsrPos = rStr; } + const String& GetNewCrsrPos() const { return sNewCrsrPos; } USHORT GetNewPage() const {return nNewPage;} void SetNewPage(USHORT nSet) {nNewPage = nSet;} diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index 685d03c824c6..40f70e0f9243 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.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 SwChildWinWrapper; struct SwRedlineDataChild { - const SwRedlineData* pChild; // Verweis auf originale gestackte Daten - const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten - SvLBoxEntry* pTLBChild; // zugehoeriger TreeListBox-Eintrag + const SwRedlineData* pChild; // Verweis auf originale gestackte Daten + const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten + SvLBoxEntry* pTLBChild; // zugehoeriger TreeListBox-Eintrag }; struct SwRedlineDataParent { - const SwRedlineData* pData; // RedlineDataPtr - const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten - SvLBoxEntry* pTLBParent; // zugehoeriger TreeListBox-Eintrag - String sComment; // Redline-Kommentar + const SwRedlineData* pData; // RedlineDataPtr + const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten + SvLBoxEntry* pTLBParent; // zugehoeriger TreeListBox-Eintrag + String sComment; // Redline-Kommentar - inline BOOL operator==( const SwRedlineDataParent& rObj ) const + inline BOOL operator==( const SwRedlineDataParent& rObj ) const { return (pData && pData->GetSeqNo() == rObj.pData->GetSeqNo()); } - inline BOOL operator< ( const SwRedlineDataParent& rObj ) const + inline BOOL operator< ( const SwRedlineDataParent& rObj ) const { return (pData && pData->GetSeqNo() < rObj.pData->GetSeqNo()); } }; @@ -78,52 +78,52 @@ SV_DECL_PTRARR(SvLBoxEntryArr, SvLBoxEntryPtr, 100, 100) class SW_DLLPUBLIC SwRedlineAcceptDlg { - Dialog* pParentDlg; - SwRedlineDataParentArr aRedlineParents; - SwRedlineDataChildArr aRedlineChilds; + Dialog* pParentDlg; + SwRedlineDataParentArr aRedlineParents; + SwRedlineDataChildArr aRedlineChilds; SwRedlineDataParentSortArr aUsedSeqNo; - SvxAcceptChgCtr aTabPagesCTRL; - PopupMenu aPopup; - Timer aDeselectTimer; - Timer aSelectTimer; - String sInserted; - String sDeleted; - String sFormated; - String sTableChgd; - String sFmtCollSet; - String sFilterAction; - String sAutoFormat; - Size aBorderSz; - SvxTPView* pTPView; - SvxRedlinTable* pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox - Link aOldSelectHdl; - Link aOldDeselectHdl; - BOOL bOnlyFormatedRedlines; - BOOL bHasReadonlySel; - BOOL bRedlnAutoFmt; + SvxAcceptChgCtr aTabPagesCTRL; + PopupMenu aPopup; + Timer aDeselectTimer; + Timer aSelectTimer; + String sInserted; + String sDeleted; + String sFormated; + String sTableChgd; + String sFmtCollSet; + String sFilterAction; + String sAutoFormat; + Size aBorderSz; + SvxTPView* pTPView; + SvxRedlinTable* pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox + Link aOldSelectHdl; + Link aOldDeselectHdl; + BOOL bOnlyFormatedRedlines; + BOOL bHasReadonlySel; + BOOL bRedlnAutoFmt; // prevent update dialog data during longer operations (cf #102657#) bool bInhibitActivate; - SW_DLLPRIVATE DECL_LINK( AcceptHdl, void* ); - SW_DLLPRIVATE DECL_LINK( AcceptAllHdl, void* ); - SW_DLLPRIVATE DECL_LINK( RejectHdl, void* ); - SW_DLLPRIVATE DECL_LINK( RejectAllHdl, void* ); - SW_DLLPRIVATE DECL_LINK( UndoHdl, void* ); - SW_DLLPRIVATE DECL_LINK( DeselectHdl, void* ); - SW_DLLPRIVATE DECL_LINK( SelectHdl, void* ); - SW_DLLPRIVATE DECL_LINK( GotoHdl, void* ); - SW_DLLPRIVATE DECL_LINK( CommandHdl, void* ); - - SW_DLLPRIVATE USHORT CalcDiff(USHORT nStart, BOOL bChild); - SW_DLLPRIVATE void InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const USHORT nAutoFmt); - SW_DLLPRIVATE void InsertParents(USHORT nStart, USHORT nEnd = USHRT_MAX); - SW_DLLPRIVATE void RemoveParents(USHORT nStart, USHORT nEnd); - SW_DLLPRIVATE void InitAuthors(); - - SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, USHORT nStack = 0); - SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, USHORT nStack = 0); - SW_DLLPRIVATE USHORT GetRedlinePos( const SvLBoxEntry& rEntry) const; + SW_DLLPRIVATE DECL_LINK( AcceptHdl, void* ); + SW_DLLPRIVATE DECL_LINK( AcceptAllHdl, void* ); + SW_DLLPRIVATE DECL_LINK( RejectHdl, void* ); + SW_DLLPRIVATE DECL_LINK( RejectAllHdl, void* ); + SW_DLLPRIVATE DECL_LINK( UndoHdl, void* ); + SW_DLLPRIVATE DECL_LINK( DeselectHdl, void* ); + SW_DLLPRIVATE DECL_LINK( SelectHdl, void* ); + SW_DLLPRIVATE DECL_LINK( GotoHdl, void* ); + SW_DLLPRIVATE DECL_LINK( CommandHdl, void* ); + + SW_DLLPRIVATE USHORT CalcDiff(USHORT nStart, BOOL bChild); + SW_DLLPRIVATE void InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const USHORT nAutoFmt); + SW_DLLPRIVATE void InsertParents(USHORT nStart, USHORT nEnd = USHRT_MAX); + SW_DLLPRIVATE void RemoveParents(USHORT nStart, USHORT nEnd); + SW_DLLPRIVATE void InitAuthors(); + + SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, USHORT nStack = 0); + SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, USHORT nStack = 0); + SW_DLLPRIVATE USHORT GetRedlinePos( const SvLBoxEntry& rEntry) const; public: SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt = FALSE); @@ -131,17 +131,17 @@ public: DECL_LINK( FilterChangedHdl, void *pDummy = 0 ); - inline SvxAcceptChgCtr* GetChgCtrl() { return &aTabPagesCTRL; } - inline BOOL HasRedlineAutoFmt() const { return bRedlnAutoFmt; } + inline SvxAcceptChgCtr* GetChgCtrl() { return &aTabPagesCTRL; } + inline BOOL HasRedlineAutoFmt() const { return bRedlnAutoFmt; } - void Init(USHORT nStart = 0); - void CallAcceptReject( BOOL bSelect, BOOL bAccept ); + void Init(USHORT nStart = 0); + void CallAcceptReject( BOOL bSelect, BOOL bAccept ); - void Initialize(const String &rExtraData); - void FillInfo(String &rExtraData) const; + void Initialize(const String &rExtraData); + void FillInfo(String &rExtraData) const; - virtual void Activate(); - virtual void Resize(); + virtual void Activate(); + virtual void Resize(); }; /*------------------------------------------------------------------------ @@ -150,18 +150,18 @@ public: class SwModelessRedlineAcceptDlg : public SfxModelessDialog { - SwRedlineAcceptDlg* pImplDlg; - SwChildWinWrapper* pChildWin; + SwRedlineAcceptDlg* pImplDlg; + SwChildWinWrapper* pChildWin; - virtual void Resize(); + virtual void Resize(); public: SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, Window *pParent); ~SwModelessRedlineAcceptDlg(); - virtual void Activate(); - virtual void FillInfo(SfxChildWinInfo&) const; - void Initialize (SfxChildWinInfo* pInfo); + virtual void Activate(); + virtual void FillInfo(SfxChildWinInfo&) const; + void Initialize (SfxChildWinInfo* pInfo); }; @@ -172,14 +172,14 @@ public: class SwRedlineAcceptChild : public SwChildWinWrapper { public: - SwRedlineAcceptChild( Window* , + SwRedlineAcceptChild( Window* , USHORT nId, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SwRedlineAcceptChild ); - virtual BOOL ReInitDlg(SwDocShell *pDocSh); + virtual BOOL ReInitDlg(SwDocShell *pDocSh); }; diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index 0019b4b1b291..d175d09d6548 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.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 @@ -76,10 +76,10 @@ class SwEditRegionDlg : public SfxModalDialog FixedLine aLinkFL; TriStateBox aFileCB; - CheckBox aDDECB; - FixedText aFileNameFT; - FixedText aDDECommandFT; - Edit aFileNameED; + CheckBox aDDECB; + FixedText aFileNameFT; + FixedText aDDECommandFT; + Edit aFileNameED; PushButton aFilePB; FixedText aSubRegionFT; ComboBox aSubRegionED; @@ -93,7 +93,7 @@ class SwEditRegionDlg : public SfxModalDialog FixedLine aHideFL; TriStateBox aHideCB; FixedText aConditionFT; - ConditionEdit aConditionED; + ConditionEdit aConditionED; // --> FME 2004-06-22 #114856# edit in readonly sections FixedLine aPropertiesFL; @@ -101,10 +101,10 @@ class SwEditRegionDlg : public SfxModalDialog // <-- OKButton aOK; - CancelButton aCancel; - PushButton aOptionsPB; - PushButton aDismiss; - HelpButton aHelp; + CancelButton aCancel; + PushButton aOptionsPB; + PushButton aDismiss; + HelpButton aHelp; ImageList aImageIL; ImageList aImageILH; @@ -116,13 +116,13 @@ class SwEditRegionDlg : public SfxModalDialog Window* m_pOldDefDlgParent; BOOL bDontCheckPasswd :1; - BOOL bWeb :1; + BOOL bWeb :1; Image BuildBitmap(BOOL bProtect,BOOL bHidden,BOOL bHighContrast); void RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry); - USHORT FindArrPos(const SwSectionFmt* pFmt); + USHORT FindArrPos(const SwSectionFmt* pFmt); DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); DECL_LINK( DeselectHdl, SvTreeListBox * ); @@ -166,13 +166,13 @@ class SwInsertSectionTabPage : public SfxTabPage FixedLine aLinkFL; CheckBox aFileCB; - CheckBox aDDECB; - FixedText aDDECommandFT; - FixedText aFileNameFT; - Edit aFileNameED; + CheckBox aDDECB; + FixedText aDDECommandFT; + FixedText aFileNameFT; + Edit aFileNameED; PushButton aFilePB; FixedText aSubRegionFT; - ComboBox aSubRegionED; + ComboBox aSubRegionED; FixedLine aProtectFL; CheckBox aProtectCB; @@ -182,7 +182,7 @@ class SwInsertSectionTabPage : public SfxTabPage FixedLine aHideFL; CheckBox aHideCB; FixedText aConditionFT; - ConditionEdit aConditionED; + ConditionEdit aConditionED; // --> FME 2004-06-22 #114856# edit in readonly sections FixedLine aPropertiesFL; @@ -193,7 +193,7 @@ class SwInsertSectionTabPage : public SfxTabPage String m_sFilterName; String m_sFilePasswd; -// SwFmtCol* pCols; +// SwFmtCol* pCols; ::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd; SwWrtShell* m_pWrtSh; sfx2::DocumentInserter* m_pDocInserter; @@ -215,44 +215,44 @@ public: SwInsertSectionTabPage(Window *pParent, const SfxItemSet &rAttrSet); virtual ~SwInsertSectionTabPage(); - void SetWrtShell(SwWrtShell& rSh); + void SetWrtShell(SwWrtShell& rSh); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; class SwSectionFtnEndTabPage : public SfxTabPage { FixedLine aFtnFL; - CheckBox aFtnNtAtTextEndCB; + CheckBox aFtnNtAtTextEndCB; - CheckBox aFtnNtNumCB; - FixedText aFtnOffsetLbl; - NumericField aFtnOffsetFld; + CheckBox aFtnNtNumCB; + FixedText aFtnOffsetLbl; + NumericField aFtnOffsetFld; - CheckBox aFtnNtNumFmtCB; - FixedText aFtnPrefixFT; - Edit aFtnPrefixED; - SwNumberingTypeListBox aFtnNumViewBox; - FixedText aFtnSuffixFT; - Edit aFtnSuffixED; + CheckBox aFtnNtNumFmtCB; + FixedText aFtnPrefixFT; + Edit aFtnPrefixED; + SwNumberingTypeListBox aFtnNumViewBox; + FixedText aFtnSuffixFT; + Edit aFtnSuffixED; FixedLine aEndFL; - CheckBox aEndNtAtTextEndCB; + CheckBox aEndNtAtTextEndCB; - CheckBox aEndNtNumCB; - FixedText aEndOffsetLbl; - NumericField aEndOffsetFld; + CheckBox aEndNtNumCB; + FixedText aEndOffsetLbl; + NumericField aEndOffsetFld; - CheckBox aEndNtNumFmtCB; - FixedText aEndPrefixFT; - Edit aEndPrefixED; - SwNumberingTypeListBox aEndNumViewBox; - FixedText aEndSuffixFT; - Edit aEndSuffixED; + CheckBox aEndNtNumFmtCB; + FixedText aEndPrefixFT; + Edit aEndPrefixED; + SwNumberingTypeListBox aEndNumViewBox; + FixedText aEndSuffixFT; + Edit aEndSuffixED; DECL_LINK( FootEndHdl, CheckBox * ); @@ -262,10 +262,10 @@ public: SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; @@ -295,12 +295,12 @@ public: class SwInsertSectionTabDialog : public SfxTabDialog { - SwWrtShell& rWrtSh; + SwWrtShell& rWrtSh; ::std::auto_ptr<SwSectionData> m_pSectionData; protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual short Ok(); public: SwInsertSectionTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwInsertSectionTabDialog(); @@ -313,7 +313,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog { SwWrtShell& rWrtSh; protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: SwSectionPropertyTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog(); diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc index 45c494b6f136..892261512a83 100644 --- a/sw/source/ui/inc/ribbar.hrc +++ b/sw/source/ui/inc/ribbar.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,59 +29,59 @@ #include "rcid.hrc" -#define MN_FORM1 1 // Defines fuer NumNames-Popup +#define MN_FORM1 1 // Defines fuer NumNames-Popup #define MN_FORMBASE MN_FORM1 #define MN_FORM2 2 #define MN_FORM3 3 #define MN_FORM4 4 #define MN_FORM5 5 -#define WIN_RIBBAR RC_RIBBAR_BEGIN - -#define CB_FORMAT (RC_RIBBAR_BEGIN +1) -#define CB_FONT (RC_RIBBAR_BEGIN +2) -#define CB_SIZE (RC_RIBBAR_BEGIN +3) -#define PB_FORMULA_OK (RC_RIBBAR_BEGIN +4) -#define PB_FORMULA_CANCEL (RC_RIBBAR_BEGIN +5) -#define BMP_OK PB_FORMULA_OK -#define BMP_CANCEL PB_FORMULA_CANCEL -#define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6) -#define FT_POS (RC_RIBBAR_BEGIN +7) -#define BT_FORMULA (RC_RIBBAR_BEGIN +8) +#define WIN_RIBBAR RC_RIBBAR_BEGIN + +#define CB_FORMAT (RC_RIBBAR_BEGIN +1) +#define CB_FONT (RC_RIBBAR_BEGIN +2) +#define CB_SIZE (RC_RIBBAR_BEGIN +3) +#define PB_FORMULA_OK (RC_RIBBAR_BEGIN +4) +#define PB_FORMULA_CANCEL (RC_RIBBAR_BEGIN +5) +#define BMP_OK PB_FORMULA_OK +#define BMP_CANCEL PB_FORMULA_CANCEL +#define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6) +#define FT_POS (RC_RIBBAR_BEGIN +7) +#define BT_FORMULA (RC_RIBBAR_BEGIN +8) #define STR_TBL_FORMULA (RC_RIBBAR_BEGIN +9) -#define STR_BACKGROUND_PATTERN (RC_RIBBAR_BEGIN + 10) -#define STR_BACKGROUND_COLOR (RC_RIBBAR_BEGIN + 11) -#define STR_BORDER_COLOR (RC_RIBBAR_BEGIN + 12) -#define STR_BORDER_STYLE (RC_RIBBAR_BEGIN + 13) -#define STR_BORDER_LINE (RC_RIBBAR_BEGIN + 14) -#define STR_TEXT_COLOR (RC_RIBBAR_BEGIN + 15) -#define STR_NUMLIST (RC_RIBBAR_BEGIN + 16) +#define STR_BACKGROUND_PATTERN (RC_RIBBAR_BEGIN + 10) +#define STR_BACKGROUND_COLOR (RC_RIBBAR_BEGIN + 11) +#define STR_BORDER_COLOR (RC_RIBBAR_BEGIN + 12) +#define STR_BORDER_STYLE (RC_RIBBAR_BEGIN + 13) +#define STR_BORDER_LINE (RC_RIBBAR_BEGIN + 14) +#define STR_TEXT_COLOR (RC_RIBBAR_BEGIN + 15) +#define STR_NUMLIST (RC_RIBBAR_BEGIN + 16) -#define STR_HELP_TOOLBOX_TOGGLE (RC_RIBBAR_BEGIN + 17) +#define STR_HELP_TOOLBOX_TOGGLE (RC_RIBBAR_BEGIN + 17) -#define RID_DRAW_WIN (RC_RIBBAR_BEGIN + 18) -#define RID_CNTRLR_WIN (RC_RIBBAR_BEGIN + 19) -#define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 20) +#define RID_DRAW_WIN (RC_RIBBAR_BEGIN + 18) +#define RID_CNTRLR_WIN (RC_RIBBAR_BEGIN + 19) +#define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 20) //Resourcen fuer Inputwin (Rechenleiste) -#define RID_WIN_FORMULA (RC_RIBBAR_BEGIN + 21) -#define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22) +#define RID_WIN_FORMULA (RC_RIBBAR_BEGIN + 21) +#define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22) -#define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23) +#define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23) #define RID_INSERT_CTRL (RC_RIBBAR_BEGIN + 24) #define RID_INSERT_OBJ_CTRL (RC_RIBBAR_BEGIN + 25) #define RID_INSERT_FIELD_CTRL (RC_RIBBAR_BEGIN + 26) #define RID_TBL_OPT_CTRL (RC_RIBBAR_BEGIN + 27) -#define RID_BEZIER_WIN (RC_RIBBAR_BEGIN + 28) +#define RID_BEZIER_WIN (RC_RIBBAR_BEGIN + 28) #define RID_SCROLL_NAVI_TBX (RC_RIBBAR_BEGIN + 29) #define RID_SCROLL_NAVIGATION_WIN (RC_RIBBAR_BEGIN + 30) #define RID_PVIEW_ZOOM_LB (RC_RIBBAR_BEGIN + 31) -#define STR_IMGBTN_START (RC_RIBBAR_BEGIN + 31) +#define STR_IMGBTN_START (RC_RIBBAR_BEGIN + 31) #define STR_IMGBTN_NEXT_DOWN (STR_IMGBTN_START + 0) -#define STR_IMGBTN_PREV_DOWN (STR_IMGBTN_START + 1) +#define STR_IMGBTN_PREV_DOWN (STR_IMGBTN_START + 1) #define STR_IMGBTN_TBL_DOWN (STR_IMGBTN_START + 2) #define STR_IMGBTN_FRM_DOWN (STR_IMGBTN_START + 3) #define STR_IMGBTN_PGE_DOWN (STR_IMGBTN_START + 4) @@ -98,11 +98,11 @@ #define STR_IMGBTN_POSTIT_DOWN (STR_IMGBTN_START +15) #define STR_IMGBTN_SRCH_REP_DOWN (STR_IMGBTN_START +16) #define STR_IMGBTN_INDEX_ENTRY_DOWN (STR_IMGBTN_START +17) -#define STR_IMGBTN_TBLFML_DOWN (STR_IMGBTN_START +18) +#define STR_IMGBTN_TBLFML_DOWN (STR_IMGBTN_START +18) #define STR_IMGBTN_TBLFML_ERR_DOWN (STR_IMGBTN_START +19) #define STR_IMGBTN_NEXT_UP (STR_IMGBTN_START +20) -#define STR_IMGBTN_PREV_UP (STR_IMGBTN_START +21) +#define STR_IMGBTN_PREV_UP (STR_IMGBTN_START +21) #define STR_IMGBTN_TBL_UP (STR_IMGBTN_START +22) #define STR_IMGBTN_FRM_UP (STR_IMGBTN_START +23) #define STR_IMGBTN_PGE_UP (STR_IMGBTN_START +24) @@ -119,16 +119,16 @@ #define STR_IMGBTN_POSTIT_UP (STR_IMGBTN_START +35) #define STR_IMGBTN_SRCH_REP_UP (STR_IMGBTN_START +36) #define STR_IMGBTN_INDEX_ENTRY_UP (STR_IMGBTN_START +37) -#define STR_IMGBTN_TBLFML_UP (STR_IMGBTN_START +38) +#define STR_IMGBTN_TBLFML_UP (STR_IMGBTN_START +38) #define STR_IMGBTN_TBLFML_ERR_UP (STR_IMGBTN_START +39) #define BTN_NAVI (STR_IMGBTN_START +40) #define MN_ANCHOR_POPUP (STR_IMGBTN_START +41) -#define RC_RIBBAR_ACT_END MN_ANCHOR_POPUP +#define RC_RIBBAR_ACT_END MN_ANCHOR_POPUP -#if RC_RIBBAR_ACT_END > RC_RIBBAR_END +#if RC_RIBBAR_ACT_END > RC_RIBBAR_END #error Resource-Id Ueberlauf in #file, #line #endif diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx index 9f5e24e93018..f292473c27b7 100644 --- a/sw/source/ui/inc/rowht.hxx +++ b/sw/source/ui/inc/rowht.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 @@ -42,13 +42,13 @@ class SwWrtShell; class SwTableHeightDlg : public SvxStandardDialog { - MetricField aHeightEdit; - CheckBox aAutoHeightCB; + MetricField aHeightEdit; + CheckBox aAutoHeightCB; FixedLine aHeightFL; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - SwWrtShell &rSh; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + SwWrtShell &rSh; protected: virtual void Apply(); diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 6d360af5671f..2293db4f555a 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.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 @@ -32,14 +32,14 @@ class SwScrollbar: public ScrollBar { Size aDocSz; - BOOL bHori :1; // Horizontal = TRUE, sonst Vertikal - BOOL bAuto :1; // fuer Scrollingmode - BOOL bThumbEnabled:1; - BOOL bVisible :1; // Show/Hide sollen nur noch dieses Flag setzen - BOOL bSizeSet :1; // wurde die Groesse bereits gesetzt? - - void AutoShow(); + BOOL bHori :1; // Horizontal = TRUE, sonst Vertikal + BOOL bAuto :1; // fuer Scrollingmode + BOOL bThumbEnabled:1; + BOOL bVisible :1; // Show/Hide sollen nur noch dieses Flag setzen + BOOL bSizeSet :1; // wurde die Groesse bereits gesetzt? + void AutoShow(); + using Window::Hide; using Window::SetPosSizePixel; using Window::IsVisible; @@ -47,19 +47,19 @@ class SwScrollbar: public ScrollBar public: void ExtendedShow( BOOL bVisible = TRUE ); - void Hide() { Show( FALSE ); } - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); - BOOL IsVisible(BOOL bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } + void Hide() { Show( FALSE ); } + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + BOOL IsVisible(BOOL bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } // Aenderung der Dokumentgroesse - void DocSzChgd(const Size &rNewSize); + void DocSzChgd(const Size &rNewSize); // Aenderung des sichtbaren Bereiches - void ViewPortChgd(const Rectangle &rRectangle); + void ViewPortChgd(const Rectangle &rRectangle); // was fuer einer ist es denn ?? BOOL IsHoriScroll() const { return bHori; } - void SetAuto(BOOL bSet); - BOOL IsAuto() { return bAuto;} + void SetAuto(BOOL bSet); + BOOL IsAuto() { return bAuto;} SwScrollbar(Window *pParent, BOOL bHori = TRUE ); ~SwScrollbar(); diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx index d8c86a972de2..925a73809541 100644 --- a/sw/source/ui/inc/selglos.hxx +++ b/sw/source/ui/inc/selglos.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 @@ -38,19 +38,19 @@ class SwSelGlossaryDlg : public ModalDialog { protected: - ListBox aGlosBox; + ListBox aGlosBox; FixedLine aGlosFL; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; DECL_LINK(DoubleClickHdl, ListBox*); public: SwSelGlossaryDlg(Window * pParent, const String &rShortName); ~SwSelGlossaryDlg(); - void InsertGlos(const String &rRegion, const String &rGlosName); // inline - USHORT GetSelectedIdx() const; // inline - void SelectEntryPos(USHORT nIdx); // inline + void InsertGlos(const String &rRegion, const String &rGlosName); // inline + USHORT GetSelectedIdx() const; // inline + void SelectEntryPos(USHORT nIdx); // inline }; inline void SwSelGlossaryDlg::InsertGlos(const String &rRegion, @@ -62,9 +62,9 @@ inline void SwSelGlossaryDlg::InsertGlos(const String &rRegion, aGlosBox.InsertEntry( aTmp ); } inline USHORT SwSelGlossaryDlg::GetSelectedIdx() const -{ return aGlosBox.GetSelectEntryPos(); } +{ return aGlosBox.GetSelectEntryPos(); } inline void SwSelGlossaryDlg::SelectEntryPos(USHORT nIdx) -{ aGlosBox.SelectEntryPos(nIdx); } +{ aGlosBox.SelectEntryPos(nIdx); } #endif diff --git a/sw/source/ui/inc/sharedconnection.hxx b/sw/source/ui/inc/sharedconnection.hxx index cf61e646b9cc..faa27c384cec 100644 --- a/sw/source/ui/inc/sharedconnection.hxx +++ b/sw/source/ui/inc/sharedconnection.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 diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/ui/inc/shdwcrsr.hxx index 8b1a4e9123de..d01bc5bccfe1 100644 --- a/sw/source/ui/inc/shdwcrsr.hxx +++ b/sw/source/ui/inc/shdwcrsr.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 @@ -55,9 +55,9 @@ public: void Paint(); - const Point& GetPoint() const { return aOldPt; } - long GetHeight() const { return nOldHeight; } - USHORT GetMode() const { return nOldMode; } + const Point& GetPoint() const { return aOldPt; } + long GetHeight() const { return nOldHeight; } + USHORT GetMode() const { return nOldMode; } Rectangle GetRect() const; }; diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc index 2058b6432ed8..243c4fcf9256 100644 --- a/sw/source/ui/inc/shells.hrc +++ b/sw/source/ui/inc/shells.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 @@ -38,12 +38,12 @@ #define STR_GRFILTER_TOOBIG (RC_SHELLS_BEGIN + 6) #define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7) #define STR_NOTIZ_INSERT (RC_SHELLS_BEGIN + 8) -#define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9) +#define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9) #define STR_NO_ADDRESSBOOK (RC_SHELLS_BEGIN + 10) -#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11) -#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12) -#define STR_REDLINE_DELETED (RC_SHELLS_BEGIN + 13) -#define STR_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 14) +#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11) +#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12) +#define STR_REDLINE_DELETED (RC_SHELLS_BEGIN + 13) +#define STR_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 14) #define RID_TEXT_TOOLBOX (RC_SHELLS_BEGIN + 15) #define RID_TABLE_TOOLBOX (RC_SHELLS_BEGIN + 16) @@ -69,7 +69,7 @@ #define RID_BEZIER_TOOLBOX (RC_SHELLS_BEGIN + 33) #define STR_SHELLNAME_BEZIER (RC_SHELLS_BEGIN + 34) -#define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37) +#define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37) #define STR_SWBG_GRAPHIC (RC_SHELLS_BEGIN + 38) #define STR_SWBG_OLE (RC_SHELLS_BEGIN + 39) #define STR_SWBG_FRAME (RC_SHELLS_BEGIN + 40) @@ -84,23 +84,23 @@ #define STR_SHELLNAME_DRAWFORM (RC_SHELLS_BEGIN + 48) // FREE -#define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50) -#define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51) +#define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50) +#define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51) -#define STR_REDLINE_TITLE (RC_SHELLS_BEGIN + 52) -#define STR_REDLINE_MSG (RC_SHELLS_BEGIN + 53) -#define STR_REDLINE_ACCEPT_ALL (RC_SHELLS_BEGIN + 54) -#define STR_REDLINE_REJECT_ALL (RC_SHELLS_BEGIN + 55) -#define STR_REDLINE_EDIT (RC_SHELLS_BEGIN + 56) -#define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57) +#define STR_REDLINE_TITLE (RC_SHELLS_BEGIN + 52) +#define STR_REDLINE_MSG (RC_SHELLS_BEGIN + 53) +#define STR_REDLINE_ACCEPT_ALL (RC_SHELLS_BEGIN + 54) +#define STR_REDLINE_REJECT_ALL (RC_SHELLS_BEGIN + 55) +#define STR_REDLINE_EDIT (RC_SHELLS_BEGIN + 56) +#define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57) -// #i68101# no longer needed +// #i68101# no longer needed // #define STR_NAME_SHAPE_LABEL (RC_SHELLS_BEGIN + 58) // #define STR_NAME_SHAPE_DIALOG (RC_SHELLS_BEGIN + 59) #define RID_MODULE_TOOLBOX (RC_SHELLS_BEGIN + 60) -#define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61) +#define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61) #define SHELLS_ACT_END RID_MEDIA_TOOLBOX diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx index a49e131cd666..661c063abdbd 100644 --- a/sw/source/ui/inc/split.hxx +++ b/sw/source/ui/inc/split.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 @@ -42,17 +42,17 @@ class SwWrtShell; class SwSplitTableDlg : public SvxStandardDialog { - FixedText aCountLbl; - NumericField aCountEdit; + FixedText aCountLbl; + NumericField aCountEdit; FixedLine aCountFL; - ImageRadioButton aHorzBox; + ImageRadioButton aHorzBox; ImageRadioButton aVertBox; CheckBox aPropCB; FixedLine aDirFL; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - SwWrtShell& rSh; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + SwWrtShell& rSh; protected: virtual void Apply(); diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/ui/inc/splittbl.hxx index f570d05fd0f3..8e8da96dadce 100644 --- a/sw/source/ui/inc/splittbl.hxx +++ b/sw/source/ui/inc/splittbl.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 @@ -36,16 +36,16 @@ class SwWrtShell; class SwSplitTblDlg : public SvxStandardDialog { - OKButton aOKPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOKPB; + CancelButton aCancelPB; + HelpButton aHelpPB; FixedLine aSplitFL; - RadioButton aCntntCopyRB; - RadioButton aBoxAttrCopyWithParaRB ; - RadioButton aBoxAttrCopyNoParaRB ; - RadioButton aBorderCopyRB; + RadioButton aCntntCopyRB; + RadioButton aBoxAttrCopyWithParaRB ; + RadioButton aBoxAttrCopyNoParaRB ; + RadioButton aBorderCopyRB; - SwWrtShell &rShell; + SwWrtShell &rShell; USHORT m_nSplit; protected: diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index 485cd94f1d84..05fb56e88d44 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.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 @@ -50,22 +50,22 @@ namespace utl class TextViewOutWin : public Window { - ExtTextView* pTextView; + ExtTextView* pTextView; protected: - virtual void Paint( const Rectangle& ); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void DataChanged( const DataChangedEvent& ); + virtual void Paint( const Rectangle& ); + virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void DataChanged( const DataChangedEvent& ); public: TextViewOutWin(Window* pParent, WinBits nBits) : Window(pParent, nBits), pTextView(0){} - void SetTextView( ExtTextView* pView ) {pTextView = pView;} + void SetTextView( ExtTextView* pView ) {pTextView = pView;} }; @@ -74,27 +74,27 @@ namespace svt{ class SourceViewConfig;} class SwSrcEditWindow : public Window, public SfxListener, public utl::ConfigurationListener { private: - ExtTextView* pTextView; - ExtTextEngine* pTextEngine; + ExtTextView* pTextView; + ExtTextEngine* pTextEngine; - TextViewOutWin* pOutWin; - ScrollBar *pHScrollbar, + TextViewOutWin* pOutWin; + ScrollBar *pHScrollbar, *pVScrollbar; - SwSrcView* pSrcView; + SwSrcView* pSrcView; utl::SourceViewConfig* pSourceViewConfig; - long nCurTextWidth; - USHORT nStartLine; + long nCurTextWidth; + USHORT nStartLine; rtl_TextEncoding eSourceEncoding; - BOOL bReadonly; - BOOL bDoSyntaxHighlight; - BOOL bHighlighting; + BOOL bReadonly; + BOOL bDoSyntaxHighlight; + BOOL bHighlighting; - Timer aSyntaxIdleTimer; - Table aSyntaxLineTable; + Timer aSyntaxIdleTimer; + Table aSyntaxLineTable; - void ImpDoHighlight( const String& rSource, USHORT nLineOff ); + void ImpDoHighlight( const String& rSource, USHORT nLineOff ); using OutputDevice::SetFont; void SetFont(); @@ -107,15 +107,15 @@ private: protected: - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& ); - virtual void GetFocus(); -// virtual void LoseFocus(); + virtual void Resize(); + virtual void DataChanged( const DataChangedEvent& ); + virtual void GetFocus(); +// virtual void LoseFocus(); - void CreateTextEngine(); - void DoSyntaxHighlight( USHORT nPara ); + void CreateTextEngine(); + void DoSyntaxHighlight( USHORT nPara ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); DECL_LINK(ScrollHdl, ScrollBar*); @@ -124,38 +124,38 @@ public: SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ); ~SwSrcEditWindow(); - void SetScrollBarRanges(); - void InitScrollBars(); - ULONG Read( SvStream& rInput) + void SetScrollBarRanges(); + void InitScrollBars(); + ULONG Read( SvStream& rInput) {return pTextEngine->Read(rInput);} - ULONG Write( SvStream& rOutput) + ULONG Write( SvStream& rOutput) {return pTextEngine->Write(rOutput);} - ExtTextView* GetTextView() + ExtTextView* GetTextView() {return pTextView;} - TextEngine* GetTextEngine() + TextEngine* GetTextEngine() {return pTextEngine;} - SwSrcView* GetSrcView() {return pSrcView;} + SwSrcView* GetSrcView() {return pSrcView;} - TextViewOutWin* GetOutWin() {return pOutWin;} + TextViewOutWin* GetOutWin() {return pOutWin;} virtual void Invalidate( USHORT nFlags = 0 ); - void ClearModifyFlag() + void ClearModifyFlag() { pTextEngine->SetModified(FALSE); } - BOOL IsModified() const + BOOL IsModified() const { return pTextEngine->IsModified();} - void CreateScrollbars(); + void CreateScrollbars(); - void SetReadonly(BOOL bSet){bReadonly = bSet;} - BOOL IsReadonly(){return bReadonly;} + void SetReadonly(BOOL bSet){bReadonly = bSet;} + BOOL IsReadonly(){return bReadonly;} - void DoDelayedSyntaxHighlight( USHORT nPara ); + void DoDelayedSyntaxHighlight( USHORT nPara ); - void SetStartLine(USHORT nLine){nStartLine = nLine;} + void SetStartLine(USHORT nLine){nStartLine = nLine;} - virtual void Command( const CommandEvent& rCEvt ); - void HandleWheelCommand( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ); + void HandleWheelCommand( const CommandEvent& rCEvt ); void SetTextEncoding(rtl_TextEncoding eEncoding); }; diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index 1e99efb2f895..b4d6d55a7b91 100644 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.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,20 +41,20 @@ class SfxMedium; class SwSrcView: public SfxViewShell { - SwSrcEditWindow aEditWin; + SwSrcEditWindow aEditWin; - SvxSearchItem* pSearchItem; + SvxSearchItem* pSearchItem; - BOOL bSourceSaved :1; + BOOL bSourceSaved :1; rtl_TextEncoding eLoadEncoding; void Init(); // fuer Readonly-Umschaltung - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); protected: - USHORT StartSearchAndReplace(const SvxSearchItem& rItem, + USHORT StartSearchAndReplace(const SvxSearchItem& rItem, BOOL bFromStart, BOOL bApi, BOOL bRecursive = FALSE); @@ -71,30 +71,30 @@ public: ~SwSrcView(); - SwDocShell* GetDocShell(); + SwDocShell* GetDocShell(); SwSrcEditWindow& GetEditWin() {return aEditWin;} - void SaveContent(const String& rTmpFile); - void SaveContentTo(SfxMedium& rMed); + void SaveContent(const String& rTmpFile); + void SaveContentTo(SfxMedium& rMed); - BOOL IsModified() {return aEditWin.IsModified();} + BOOL IsModified() {return aEditWin.IsModified();} - void Execute(SfxRequest&); - void GetState(SfxItemSet&); + void Execute(SfxRequest&); + void GetState(SfxItemSet&); - SvxSearchItem* GetSearchItem(); - void SetSearchItem( const SvxSearchItem& rItem ); + SvxSearchItem* GetSearchItem(); + void SetSearchItem( const SvxSearchItem& rItem ); - void Load(SwDocShell* pDocShell); + void Load(SwDocShell* pDocShell); virtual USHORT SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - + sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly ); - void SourceSaved() {bSourceSaved = TRUE;} - BOOL HasSourceSaved() const {return bSourceSaved;} + void SourceSaved() {bSourceSaved = TRUE;} + BOOL HasSourceSaved() const {return bSourceSaved;} }; diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx index 8b689fad973a..4863e737f4cd 100644 --- a/sw/source/ui/inc/srtdlg.hxx +++ b/sw/source/ui/inc/srtdlg.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,38 +40,38 @@ class CollatorRessource; class SwSortDlg : public SvxStandardDialog { - FixedText aColLbl; - FixedText aTypLbl; - FixedText aDirLbl; + FixedText aColLbl; + FixedText aTypLbl; + FixedText aDirLbl; FixedLine aDirFL; - CheckBox aKeyCB1; - NumericField aColEdt1; - ListBox aTypDLB1; - RadioButton aSortUpRB; - RadioButton aSortDnRB; + CheckBox aKeyCB1; + NumericField aColEdt1; + ListBox aTypDLB1; + RadioButton aSortUpRB; + RadioButton aSortDnRB; - CheckBox aKeyCB2; - NumericField aColEdt2; - ListBox aTypDLB2; - RadioButton aSortUp2RB; - RadioButton aSortDn2RB; + CheckBox aKeyCB2; + NumericField aColEdt2; + ListBox aTypDLB2; + RadioButton aSortUp2RB; + RadioButton aSortDn2RB; - CheckBox aKeyCB3; - NumericField aColEdt3; - ListBox aTypDLB3; - RadioButton aSortUp3RB; - RadioButton aSortDn3RB; + CheckBox aKeyCB3; + NumericField aColEdt3; + ListBox aTypDLB3; + RadioButton aSortUp3RB; + RadioButton aSortDn3RB; FixedLine aSortFL; - RadioButton aColumnRB; - RadioButton aRowRB; + RadioButton aColumnRB; + RadioButton aRowRB; FixedLine aDelimFL; - RadioButton aDelimTabRB; - RadioButton aDelimFreeRB; - Edit aDelimEdt; + RadioButton aDelimTabRB; + RadioButton aDelimFreeRB; + Edit aDelimEdt; PushButton aDelimPB; FixedLine aLangFL; @@ -80,22 +80,22 @@ class SwSortDlg : public SvxStandardDialog FixedLine aSortOptFL; CheckBox aCaseCB; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; String aColTxt; String aRowTxt; String aNumericTxt; - SwWrtShell &rSh; + SwWrtShell &rSh; CollatorRessource* pColRes; USHORT nX; USHORT nY; - virtual void Apply(); - sal_Unicode GetDelimChar() const; + virtual void Apply(); + sal_Unicode GetDelimChar() const; DECL_LINK( CheckHdl, CheckBox * ); DECL_LINK( DelimHdl, RadioButton* ); diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/ui/inc/stmenu.hxx index f72de63e0c81..61ba61034b62 100644 --- a/sw/source/ui/inc/stmenu.hxx +++ b/sw/source/ui/inc/stmenu.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 @@ -62,7 +62,7 @@ class SwSmartTagPopup : public PopupMenu sal_uInt32 mnActionID; InvokeAction( com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > xAction, com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xSmartTagProperties, - sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {} + sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {} }; std::vector< InvokeAction > maInvokeActions; @@ -70,7 +70,7 @@ class SwSmartTagPopup : public PopupMenu using PopupMenu::Execute; public: - SwSmartTagPopup( SwView* _pSwView, + SwSmartTagPopup( SwView* _pSwView, ::com::sun::star::uno::Sequence< rtl::OUString >& rSmartTagTypes, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > xTextRange ); diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index be57eddd40ff..6f7358eab7a4 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.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 @@ -34,33 +34,33 @@ class SwContentType; //Reihenfolge und Anzahl mit ResIds abgleichen!! -#define CONTENT_TYPE_OUTLINE 0 -#define CONTENT_TYPE_TABLE 1 +#define CONTENT_TYPE_OUTLINE 0 +#define CONTENT_TYPE_TABLE 1 #define CONTENT_TYPE_FRAME 2 #define CONTENT_TYPE_GRAPHIC 3 #define CONTENT_TYPE_OLE 4 #define CONTENT_TYPE_BOOKMARK 5 #define CONTENT_TYPE_REGION 6 -#define CONTENT_TYPE_URLFIELD 7 +#define CONTENT_TYPE_URLFIELD 7 #define CONTENT_TYPE_REFERENCE 8 -#define CONTENT_TYPE_INDEX 9 -#define CONTENT_TYPE_POSTIT 10 +#define CONTENT_TYPE_INDEX 9 +#define CONTENT_TYPE_POSTIT 10 #define CONTENT_TYPE_DRAWOBJECT 11 -#define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1 +#define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1 // Typen fuer das Globaldokument -#define GLOBAL_CONTENT_REGION 100 +#define GLOBAL_CONTENT_REGION 100 #define GLOBAL_CONTENT_INDEX 101 -#define GLOBAL_CONTENT_TEXT 102 -#define GLOBAL_CONTENT_MAX 3 +#define GLOBAL_CONTENT_TEXT 102 +#define GLOBAL_CONTENT_MAX 3 // Strings fuer Kontextmenue -#define CONTEXT_COUNT 12 +#define CONTEXT_COUNT 12 #define GLOBAL_CONTEXT_COUNT 14 // Modi fuer Drag 'n Drop -#define REGION_MODE_NONE 0 +#define REGION_MODE_NONE 0 #define REGION_MODE_LINK 1 #define REGION_MODE_EMBEDDED 2 @@ -76,28 +76,28 @@ class SwTypeNumber SwTypeNumber(BYTE nId) :nTypeId(nId){} virtual ~SwTypeNumber(); - virtual BYTE GetTypeId(); + virtual BYTE GetTypeId(); }; //---------------------------------------------------------------------------- class SwContent : public SwTypeNumber { - const SwContentType* pParent; - String sContentName; - long nYPosition; - BOOL bInvisible; + const SwContentType* pParent; + String sContentName; + long nYPosition; + BOOL bInvisible; public: SwContent(const SwContentType* pCnt, const String& rName, long nYPos ); - virtual BOOL IsProtect() const; - const SwContentType* GetParent() const {return pParent;} - const String& GetName() const {return sContentName;} - int operator==(const SwContent& /*rCont*/) const + virtual BOOL IsProtect() const; + const SwContentType* GetParent() const {return pParent;} + const String& GetName() const {return sContentName;} + int operator==(const SwContent& /*rCont*/) const { //gleich sind sie nie, sonst fallen sie aus dem Array return FALSE; } - int operator<(const SwContent& rCont) const + int operator<(const SwContent& rCont) const { //zuerst nach Position dann nach Name sortieren return nYPosition != rCont.nYPosition ? @@ -105,10 +105,10 @@ public: sContentName < rCont.sContentName;; } - long GetYPos() const {return nYPosition;} + long GetYPos() const {return nYPosition;} - BOOL IsInvisible() const {return bInvisible;} - void SetInvisible(){ bInvisible = TRUE;} + BOOL IsInvisible() const {return bInvisible;} + void SetInvisible(){ bInvisible = TRUE;} }; #endif diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index 9a3274a61f1c..9776574d34f4 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.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 @@ -50,41 +50,41 @@ class SwView_Impl; typedef sal_uInt16 TransferBufferType; namespace nsTransferBufferType { - const sal_uInt16 TRNSFR_NONE = 0x0000; - const sal_uInt16 TRNSFR_DOCUMENT = 0x0001; - const sal_uInt16 TRNSFR_DOCUMENT_WORD = 0x0002; - const sal_uInt16 TRNSFR_GRAPHIC = 0x0004; - const sal_uInt16 TRNSFR_TABELLE = 0x0008; - const sal_uInt16 TRNSFR_DDELINK = 0x0010; - const sal_uInt16 TRNSFR_OLE = 0x0020; - const sal_uInt16 TRNSFR_INETFLD = 0x0040; - const sal_uInt16 TRNSFR_DRAWING = 0x0081; //Drawing ist auch intern! + const sal_uInt16 TRNSFR_NONE = 0x0000; + const sal_uInt16 TRNSFR_DOCUMENT = 0x0001; + const sal_uInt16 TRNSFR_DOCUMENT_WORD = 0x0002; + const sal_uInt16 TRNSFR_GRAPHIC = 0x0004; + const sal_uInt16 TRNSFR_TABELLE = 0x0008; + const sal_uInt16 TRNSFR_DDELINK = 0x0010; + const sal_uInt16 TRNSFR_OLE = 0x0020; + const sal_uInt16 TRNSFR_INETFLD = 0x0040; + const sal_uInt16 TRNSFR_DRAWING = 0x0081; //Drawing ist auch intern! } -#define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor +#define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor class SwTransferable : public TransferableHelper { friend class SwView_Impl; SfxObjectShellRef aDocShellRef; - TransferableDataHelper aOleData; - TransferableObjectDescriptor aObjDesc; + TransferableDataHelper aOleData; + TransferableObjectDescriptor aObjDesc; ::sfx2::SvBaseLinkRef refDdeLink; - SwWrtShell *pWrtShell; + SwWrtShell *pWrtShell; /* #96392# Added pCreatorView to distinguish SwFrameShell from SwWrtShell. */ const ViewShell *pCreatorView; - SwDocFac *pClpDocFac; - Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf; - INetBookmark *pBkmk; // URL und Beschreibung! - ImageMap *pImageMap; - INetImage *pTargetURL; + SwDocFac *pClpDocFac; + Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf; + INetBookmark *pBkmk; // URL und Beschreibung! + ImageMap *pImageMap; + INetImage *pTargetURL; TransferBufferType eBufferType; - BOOL bOldIdle :1; //D&D Idle flag from the viewsettings - BOOL bCleanUp :1; //D&D cleanup after Drop (not by internal Drop) + BOOL bOldIdle :1; //D&D Idle flag from the viewsettings + BOOL bCleanUp :1; //D&D cleanup after Drop (not by internal Drop) // helper methods for the copy com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const; @@ -144,17 +144,17 @@ class SwTransferable : public TransferableHelper // not available SwTransferable(); SwTransferable( const SwTransferable& ); - SwTransferable& operator=( const SwTransferable& ); + SwTransferable& operator=( const SwTransferable& ); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const DATA_FLAVOR& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const DATA_FLAVOR& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const DATA_FLAVOR& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); - virtual void ObjectReleased(); + virtual void DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); using TransferableHelper::StartDrag; @@ -169,17 +169,17 @@ public: static void InitOle( SfxObjectShell* pDoc, SwDoc& rDoc ); // copy - methods and helper methods for the copy - int Cut(); - int Copy( BOOL bIsCut = FALSE ); + int Cut(); + int Copy( BOOL bIsCut = FALSE ); int PrepareForCopy( BOOL bIsCut = FALSE ); - int CalculateAndCopy(); // special for Calculator + int CalculateAndCopy(); // special for Calculator int CopyGlossary( SwTextBlocks& rGlossary, const String& rStr ); // remove the DDE-Link format promise void RemoveDDELinkFormat( const Window& rWin ); // paste - methods and helper methods for the paste - static BOOL IsPaste( const SwWrtShell&, const TransferableDataHelper& ); + static BOOL IsPaste( const SwWrtShell&, const TransferableDataHelper& ); static int Paste( SwWrtShell&, TransferableDataHelper& ); static int PasteData( TransferableDataHelper& rData, SwWrtShell& rSh, USHORT nAction, ULONG nFormat, @@ -201,9 +201,9 @@ public: // Interfaces for Drag & Drop void StartDrag( Window* pWin, const Point& rPos ); - - SwWrtShell* GetShell() { return pWrtShell; } - void SetCleanUp( BOOL bFlag ) { bCleanUp = bFlag; } + + SwWrtShell* GetShell() { return pWrtShell; } + void SetCleanUp( BOOL bFlag ) { bCleanUp = bFlag; } // Interfaces for Selection /* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */ diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 6f8122277bd5..678eaf09e89e 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.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 @@ -47,8 +47,8 @@ class SW_DLLPUBLIC SwBoxEntry { friend class SwComboBox; - BOOL bModified : 1; - BOOL bNew : 1; + BOOL bModified : 1; + BOOL bNew : 1; String aName; USHORT nId; @@ -68,26 +68,26 @@ typedef USHORT SwComboBoxStyle; namespace nsSwComboBoxStyle { - const SwComboBoxStyle CBS_UPPER = 0x01; - const SwComboBoxStyle CBS_LOWER = 0x02; - const SwComboBoxStyle CBS_ALL = 0x04; - const SwComboBoxStyle CBS_FILENAME = 0x08; + const SwComboBoxStyle CBS_UPPER = 0x01; + const SwComboBoxStyle CBS_LOWER = 0x02; + const SwComboBoxStyle CBS_ALL = 0x04; + const SwComboBoxStyle CBS_FILENAME = 0x08; #ifdef WIN - const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER; + const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER; #else - const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME; + const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME; #endif } class SW_DLLPUBLIC SwComboBox : public ComboBox { - SwEntryLst aEntryLst; - SwEntryLst aDelEntryLst; - SwBoxEntry aDefault; - USHORT nStyle; + SwEntryLst aEntryLst; + SwEntryLst aDelEntryLst; + SwBoxEntry aDefault; + USHORT nStyle; - SW_DLLPRIVATE void InitComboBox(); - SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry); + SW_DLLPRIVATE void InitComboBox(); + SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry); using ComboBox::InsertEntry; using ComboBox::RemoveEntry; @@ -101,24 +101,24 @@ public: USHORT nStyleBits = nsSwComboBoxStyle::CBS_ALL); ~SwComboBox(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); void InsertEntry(const SwBoxEntry&); - USHORT InsertEntry( const XubString& rStr, USHORT = 0) - { InsertEntry( SwBoxEntry( rStr ) ); return 0; } + USHORT InsertEntry( const XubString& rStr, USHORT = 0) + { InsertEntry( SwBoxEntry( rStr ) ); return 0; } - void RemoveEntry(USHORT nPos); + void RemoveEntry(USHORT nPos); - USHORT GetEntryPos(const SwBoxEntry& rEntry) const; - const SwBoxEntry& GetEntry(USHORT) const; + USHORT GetEntryPos(const SwBoxEntry& rEntry) const; + const SwBoxEntry& GetEntry(USHORT) const; - USHORT GetRemovedCount() const; - const SwBoxEntry& GetRemovedEntry(USHORT nPos) const; + USHORT GetRemovedCount() const; + const SwBoxEntry& GetRemovedEntry(USHORT nPos) const; - USHORT GetStyle() const { return nStyle; } - void SetStyle(const USHORT nSt) { nStyle = nSt; } + USHORT GetStyle() const { return nStyle; } + void SetStyle(const USHORT nSt) { nStyle = nSt; } - String GetText() const; + String GetText() const; }; #endif /* _SWLBOX_HXX */ diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc index eed234a6d886..697617aeb4ef 100644 --- a/sw/source/ui/inc/swmn_tmpl.hrc +++ b/sw/source/ui/inc/swmn_tmpl.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 @@ -38,7 +38,7 @@ /* --------------------- F O R M A T --------------------------------- */ -#define SEPARATOR MenuItem { Separator = TRUE; } +#define SEPARATOR MenuItem { Separator = TRUE; } //define for ITEM_FORMAT_NUMBERING #define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS @@ -242,7 +242,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml Identifier = FN_REDLINE_REJECT_DIRECT ; \ HelpID = FN_REDLINE_REJECT_DIRECT ; \ Text [ en-US ] = "Reject Change" ; \ - }; \ + }; \ SEPARATOR ; #define _MN_EDIT_BIB_ENTRY_DLG \ MenuItem \ @@ -275,14 +275,14 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml Identifier = FN_REMOVE_HYPERLINK ; \ HelpID = FN_REMOVE_HYPERLINK ; \ Text [ en-US ] = "Remo~ve Hyperlink"; \ - }; + }; #define _MN_EDIT_OPEN_SMARTTAGMENU \ MenuItem \ { \ ITEM_OPEN_SMARTTAGMENU \ }; - + #define _MN_EDIT__HYPERLINK \ MenuItem\ {\ @@ -290,7 +290,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml HelpID = FN_EDIT_HYPERLINK ; \ Text [ en-US ] = "~Edit Hyperlink" ; \ }; - + #define _DEFAULT_TEXT_EDIT_ELEMENTS \ _MN_EDIT_FIELD \ _MN_EDIT_FOOTNOTE \ @@ -339,7 +339,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml Identifier = FN_NUM_BULLET_DOWN; \ HelpId = FN_NUM_BULLET_DOWN; \ Text[ en-US ] = "Down One Level"; \ - }; + }; #define BASE_TEXT_POPUPMENU_BEGIN \ { \ @@ -353,7 +353,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MN_TXT \ MN_NUMBERING \ ITEM_TRANSLITERATE_MENU \ - SEPARATOR ; + SEPARATOR ; // not in Writer/Web #define BASE_TEXT_POPUPMENU_NOWEB \ @@ -375,12 +375,12 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml HelpID = FN_REMOVE_CUR_TOX; \ Text [ en-US ] = "Delete Index/Table"; \ }; \ - SEPARATOR ; + SEPARATOR ; #define BASE_TEXT_POPUPMENU_END \ _DEFAULT_TEXT_EDIT_ELEMENTS \ }; \ -}; +}; -#endif +#endif diff --git a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx b/sw/source/ui/inc/swmodalredlineacceptdlg.hxx index 7b4a9b4afd74..583870434a6e 100644 --- a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/ui/inc/swmodalredlineacceptdlg.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 @@ -34,16 +34,16 @@ class SwRedlineAcceptDlg; class SwModalRedlineAcceptDlg : public SfxModalDialog { - SwRedlineAcceptDlg* pImplDlg; + SwRedlineAcceptDlg* pImplDlg; - virtual void Resize(); + virtual void Resize(); public: SwModalRedlineAcceptDlg(Window *pParent); ~SwModalRedlineAcceptDlg(); - void AcceptAll( BOOL bAccept ); - virtual void Activate(); + void AcceptAll( BOOL bAccept ); + virtual void Activate(); }; #endif diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index 1d51a0ef5e5d..30b8961cb4fa 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.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,16 +44,16 @@ class SwRenameXNamedDlg : public ModalDialog { - FixedText aNewNameFT; - NoSpaceEdit aNewNameED; + FixedText aNewNameFT; + NoSpaceEdit aNewNameED; FixedLine aNameFL; - OKButton aOk; - CancelButton aCancel; - HelpButton aHelp; + OKButton aOk; + CancelButton aCancel; + HelpButton aHelp; - String sRemoveWarning; + String sRemoveWarning; - STAR_REFERENCE( container::XNamed ) & xNamed; + STAR_REFERENCE( container::XNamed ) & xNamed; STAR_REFERENCE( container::XNameAccess ) & xNameAccess; STAR_REFERENCE( container::XNameAccess ) xSecondAccess; STAR_REFERENCE( container::XNameAccess ) xThirdAccess; @@ -66,7 +66,7 @@ public: STAR_REFERENCE( container::XNamed ) & xNamed, STAR_REFERENCE( container::XNameAccess ) & xNameAccess ); - void SetForbiddenChars( const String& rSet ) + void SetForbiddenChars( const String& rSet ) { aNewNameED.SetForbiddenChars( rSet ); } void SetAlternativeAccess( diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx index 5867deb610eb..e0684fcb13d3 100644 --- a/sw/source/ui/inc/swtablerep.hxx +++ b/sw/source/ui/inc/swtablerep.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 @@ -37,59 +37,59 @@ class SwTabCols; struct TColumn; class SW_DLLPUBLIC SwTableRep { - TColumn* pTColumns; - - SwTwips nTblWidth; - SwTwips nSpace; - SwTwips nLeftSpace; - SwTwips nRightSpace; - USHORT nAlign; - USHORT nColCount; - USHORT nAllCols; - USHORT nWidthPercent; - BOOL bComplex : 1; - BOOL bLineSelected : 1; - BOOL bWidthChanged : 1; - BOOL bColsChanged : 1; + TColumn* pTColumns; + + SwTwips nTblWidth; + SwTwips nSpace; + SwTwips nLeftSpace; + SwTwips nRightSpace; + USHORT nAlign; + USHORT nColCount; + USHORT nAllCols; + USHORT nWidthPercent; + BOOL bComplex : 1; + BOOL bLineSelected : 1; + BOOL bWidthChanged : 1; + BOOL bColsChanged : 1; public: SwTableRep( const SwTabCols& rTabCol, BOOL bComplex ); ~SwTableRep(); - BOOL FillTabCols( SwTabCols& rTabCol ) const; + BOOL FillTabCols( SwTabCols& rTabCol ) const; - SwTwips GetLeftSpace() const {return nLeftSpace;} - void SetLeftSpace(SwTwips nSet) {nLeftSpace = nSet;} + SwTwips GetLeftSpace() const {return nLeftSpace;} + void SetLeftSpace(SwTwips nSet) {nLeftSpace = nSet;} - SwTwips GetRightSpace() const {return nRightSpace;} - void SetRightSpace(SwTwips nSet) {nRightSpace = nSet;} + SwTwips GetRightSpace() const {return nRightSpace;} + void SetRightSpace(SwTwips nSet) {nRightSpace = nSet;} - SwTwips GetWidth() const {return nTblWidth;} - void SetWidth(SwTwips nSet) {nTblWidth = nSet;} + SwTwips GetWidth() const {return nTblWidth;} + void SetWidth(SwTwips nSet) {nTblWidth = nSet;} - USHORT GetWidthPercent() const {return nWidthPercent;} - void SetWidthPercent(USHORT nSet) {nWidthPercent = nSet;} + USHORT GetWidthPercent() const {return nWidthPercent;} + void SetWidthPercent(USHORT nSet) {nWidthPercent = nSet;} - USHORT GetAlign() const {return nAlign;} - void SetAlign(USHORT nSet) {nAlign = nSet;} + USHORT GetAlign() const {return nAlign;} + void SetAlign(USHORT nSet) {nAlign = nSet;} - BOOL IsComplex() const {return bComplex;} - USHORT GetColCount() const {return nColCount;} - USHORT GetAllColCount() const {return nAllCols;} + BOOL IsComplex() const {return bComplex;} + USHORT GetColCount() const {return nColCount;} + USHORT GetAllColCount() const {return nAllCols;} - BOOL HasColsChanged() const {return bColsChanged;} - void SetColsChanged() {bColsChanged = TRUE;} + BOOL HasColsChanged() const {return bColsChanged;} + void SetColsChanged() {bColsChanged = TRUE;} - BOOL HasWidthChanged() const {return bWidthChanged;} - void SetWidthChanged() {bWidthChanged = TRUE;} + BOOL HasWidthChanged() const {return bWidthChanged;} + void SetWidthChanged() {bWidthChanged = TRUE;} - BOOL IsLineSelected() const {return bLineSelected;} - void SetLineSelected(BOOL bSet) {bLineSelected = bSet;} + BOOL IsLineSelected() const {return bLineSelected;} + void SetLineSelected(BOOL bSet) {bLineSelected = bSet;} - SwTwips GetSpace() const { return nSpace;} - void SetSpace(SwTwips nSet) {nSpace = nSet;} + SwTwips GetSpace() const { return nSpace;} + void SetSpace(SwTwips nSet) {nSpace = nSet;} - TColumn* GetColumns() const {return pTColumns;} + TColumn* GetColumns() const {return pTColumns;} }; #endif diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index 20f951af4ed8..a1ae526a98cf 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.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 @@ -36,29 +36,29 @@ class SwFmt; class SwCondCollPage : public SfxTabPage { FixedLine aConditionFL; - CheckBox aConditionCB; + CheckBox aConditionCB; - FixedText aContextFT; - FixedText aUsedFT; - SvTabListBox aTbLinks; + FixedText aContextFT; + FixedText aUsedFT; + SvTabListBox aTbLinks; - FixedText aStyleFT; - ListBox aStyleLB; - ListBox aFilterLB; + FixedText aStyleFT; + ListBox aStyleLB; + ListBox aFilterLB; - PushButton aRemovePB; - PushButton aAssignPB; + PushButton aRemovePB; + PushButton aAssignPB; - String sNoTmpl; - ResStringArray aStrArr; + String sNoTmpl; + ResStringArray aStrArr; - SwWrtShell &rSh; + SwWrtShell &rSh; const CommandStruct*pCmds; - SwFmt* pFmt; + SwFmt* pFmt; - CollName* pNms; + CollName* pNms; - BOOL bNewTemplate; + BOOL bNewTemplate; SwCondCollPage(Window *pParent, const SfxItemSet &rSet); diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 527f38499e7f..a0358f9ce178 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.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 @@ -70,32 +70,32 @@ struct SwIndexSections_Impl; class SwMultiTOXTabDialog : public SfxTabDialog { - Window aExampleContainerWIN; + Window aExampleContainerWIN; Window aExampleWIN; - CheckBox aShowExampleCB; - SwTOXMgr* pMgr; - SwWrtShell& rSh; + CheckBox aShowExampleCB; + SwTOXMgr* pMgr; + SwWrtShell& rSh; - SwOneExampleFrame* pExampleFrame; + SwOneExampleFrame* pExampleFrame; - SwTOXDescription** pDescArr; // - SwForm** pFormArr; // - SwIndexSections_Impl** pxIndexSectionsArr; + SwTOXDescription** pDescArr; // + SwForm** pFormArr; // + SwIndexSections_Impl** pxIndexSectionsArr; - SwTOXBase* pParamTOXBase; + SwTOXBase* pParamTOXBase; - CurTOXType eCurrentTOXType; + CurTOXType eCurrentTOXType; - String sUserDefinedIndex; - USHORT nTypeCount; - USHORT nInitialTOXType; + String sUserDefinedIndex; + USHORT nTypeCount; + USHORT nInitialTOXType; - BOOL bEditTOX; - BOOL bExampleCreated; - BOOL bGlobalFlag; + BOOL bEditTOX; + BOOL bExampleCreated; + BOOL bGlobalFlag; - virtual short Ok(); - SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); + virtual short Ok(); + SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); DECL_LINK(CreateExample_Hdl, void* ); DECL_LINK(ShowPreviewHdl, CheckBox*); @@ -107,26 +107,26 @@ public: BOOL bGlobal = FALSE); ~SwMultiTOXTabDialog(); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - SwForm* GetForm(CurTOXType eType); + SwForm* GetForm(CurTOXType eType); - CurTOXType GetCurrentTOXType() const { return eCurrentTOXType;} - void SetCurrentTOXType(CurTOXType eSet) + CurTOXType GetCurrentTOXType() const { return eCurrentTOXType;} + void SetCurrentTOXType(CurTOXType eSet) { eCurrentTOXType = eSet; } - void UpdateExample(); - BOOL IsTOXEditMode() const { return bEditTOX;} + void UpdateExample(); + BOOL IsTOXEditMode() const { return bEditTOX;} - SwWrtShell& GetWrtShell() {return rSh;} + SwWrtShell& GetWrtShell() {return rSh;} - SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes); - void CreateOrUpdateExample( + SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes); + void CreateOrUpdateExample( TOXTypes nTOXIndex, USHORT nPage = 0, USHORT nCurLevel = USHRT_MAX); - static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); + static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); }; class IndexEntryRessource; @@ -135,65 +135,65 @@ class IndexEntrySupplierWrapper; class SwTOXSelectTabPage : public SfxTabPage { FixedLine aTypeTitleFL; - FixedText aTitleFT; - Edit aTitleED; - FixedText aTypeFT; - ListBox aTypeLB; - CheckBox aReadOnlyCB; + FixedText aTitleFT; + Edit aTitleED; + FixedText aTypeFT; + ListBox aTypeLB; + CheckBox aReadOnlyCB; FixedLine aAreaFL; FixedText aAreaFT; ListBox aAreaLB; - FixedText aLevelFT; //content, user - NumericField aLevelNF; //content, user + FixedText aLevelFT; //content, user + NumericField aLevelNF; //content, user //content FixedLine aCreateFromFL; // content, user, illustration - CheckBox aFromHeadingsCB; -// PushButton aChapterDlgPB; //#outline level,removed by zhaojianwei - CheckBox aAddStylesCB; - PushButton aAddStylesPB; + CheckBox aFromHeadingsCB; +// PushButton aChapterDlgPB; //#outline level,removed by zhaojianwei + CheckBox aAddStylesCB; + PushButton aAddStylesPB; //user - CheckBox aFromTablesCB; - CheckBox aFromFramesCB; - CheckBox aFromGraphicsCB; - CheckBox aFromOLECB; - CheckBox aLevelFromChapterCB; + CheckBox aFromTablesCB; + CheckBox aFromFramesCB; + CheckBox aFromGraphicsCB; + CheckBox aFromOLECB; + CheckBox aLevelFromChapterCB; //illustration + table - RadioButton aFromCaptionsRB; + RadioButton aFromCaptionsRB; RadioButton aFromObjectNamesRB; //illustration and tables - FixedText aCaptionSequenceFT; - ListBox aCaptionSequenceLB; - FixedText aDisplayTypeFT; - ListBox aDisplayTypeLB; + FixedText aCaptionSequenceFT; + ListBox aCaptionSequenceLB; + FixedText aDisplayTypeFT; + ListBox aDisplayTypeLB; //all but illustration and table - CheckBox aTOXMarksCB; + CheckBox aTOXMarksCB; // //index only - CheckBox aCollectSameCB; - CheckBox aUseFFCB; - CheckBox aUseDashCB; - CheckBox aCaseSensitiveCB; - CheckBox aInitialCapsCB; - CheckBox aKeyAsEntryCB; - CheckBox aFromFileCB; - MenuButton aAutoMarkPB; + CheckBox aCollectSameCB; + CheckBox aUseFFCB; + CheckBox aUseDashCB; + CheckBox aCaseSensitiveCB; + CheckBox aInitialCapsCB; + CheckBox aKeyAsEntryCB; + CheckBox aFromFileCB; + MenuButton aAutoMarkPB; FixedLine aIdxOptionsFL; // index only // object only - SwOLENames aFromNames; - SvxCheckListBox aFromObjCLB; + SwOLENames aFromNames; + SvxCheckListBox aFromObjCLB; FixedLine aFromObjFL; - CheckBox aSequenceCB; - FixedText aBracketFT; - ListBox aBracketLB; + CheckBox aSequenceCB; + FixedText aBracketFT; + ListBox aBracketLB; FixedLine aAuthorityFormatFL; //all @@ -206,34 +206,34 @@ class SwTOXSelectTabPage : public SfxTabPage IndexEntryRessource* pIndexRes; Point aCBLeftPos1; - Point aCBLeftPos2; - Point aCBLeftPos3; + Point aCBLeftPos2; + Point aCBLeftPos3; - String aStyleArr[MAXLEVEL]; - String sAutoMarkURL; - String sAutoMarkType; - String sAddStyleUser; - String sAddStyleContent; + String aStyleArr[MAXLEVEL]; + String sAutoMarkURL; + String sAutoMarkType; + String sAddStyleUser; + String sAddStyleContent; const IndexEntrySupplierWrapper* pIndexEntryWrapper; - BOOL bFirstCall; + BOOL bFirstCall; - DECL_LINK(TOXTypeHdl, ListBox* ); - DECL_LINK(TOXAreaHdl, ListBox* ); -// DECL_LINK(ChapterHdl, PushButton* ); //#outline level,removed by zhaojianwei + DECL_LINK(TOXTypeHdl, ListBox* ); + DECL_LINK(TOXAreaHdl, ListBox* ); +// DECL_LINK(ChapterHdl, PushButton* ); //#outline level,removed by zhaojianwei DECL_LINK(AddStylesHdl, PushButton* ); DECL_LINK(MenuEnableHdl, Menu*); DECL_LINK(MenuExecuteHdl, Menu*); DECL_LINK(LanguageHdl, ListBox*); - DECL_LINK(CheckBoxHdl, CheckBox* ); + DECL_LINK(CheckBoxHdl, CheckBox* ); DECL_LINK(RadioButtonHdl, RadioButton* ); DECL_LINK(ModifyHdl, void*); - void ApplyTOXDescription(); - void FillTOXDescription(); - + void ApplyTOXDescription(); + void FillTOXDescription(); + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -241,17 +241,17 @@ public: SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXSelectTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc - void SetWrtShell(SwWrtShell& rSh); + void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc + void SetWrtShell(SwWrtShell& rSh); }; DECLARE_LIST(TOXControlList, Control*) @@ -262,21 +262,21 @@ class SwTOXEntryTabPage; class SwTokenWindow : public Window { - ImageButton aLeftScrollWin; - Window aCtrlParentWin; - ImageButton aRightScrollWin; - TOXControlList aControlList; - SwForm* pForm; - USHORT nLevel; - BOOL bValid; - String aButtonTexts[TOKEN_END]; // Text of the buttons - String aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons - String sCharStyle; - Link aButtonSelectedHdl; - Control* pActiveCtrl; - Link aModifyHdl; - - SwTOXEntryTabPage* m_pParent; + ImageButton aLeftScrollWin; + Window aCtrlParentWin; + ImageButton aRightScrollWin; + TOXControlList aControlList; + SwForm* pForm; + USHORT nLevel; + BOOL bValid; + String aButtonTexts[TOKEN_END]; // Text of the buttons + String aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons + String sCharStyle; + Link aButtonSelectedHdl; + Control* pActiveCtrl; + Link aModifyHdl; + + SwTOXEntryTabPage* m_pParent; DECL_LINK(EditResize, Edit*); DECL_LINK(NextItemHdl, SwTOXEdit* ); @@ -285,46 +285,46 @@ class SwTokenWindow : public Window DECL_LINK(TbxFocusBtnHdl, SwTOXButton* ); DECL_LINK(ScrollHdl, ImageButton* ); - void SetActiveControl(Control* pSet); + void SetActiveControl(Control* pSet); - Control* InsertItem(const String& rText, const SwFormToken& aToken); - void AdjustPositions(); - void AdjustScrolling(); - void MoveControls(long nOffset); + Control* InsertItem(const String& rText, const SwFormToken& aToken); + void AdjustPositions(); + void AdjustScrolling(); + void MoveControls(long nOffset); public: SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId); ~SwTokenWindow(); - void SetForm(SwForm& rForm, USHORT nLevel); - USHORT GetLastLevel()const {return nLevel;}; + void SetForm(SwForm& rForm, USHORT nLevel); + USHORT GetLastLevel()const {return nLevel;}; - BOOL IsValid() const {return bValid;} + BOOL IsValid() const {return bValid;} - void SetInvalid() {bValid = FALSE;} + void SetInvalid() {bValid = FALSE;} - String GetPattern() const; + String GetPattern() const; - void SetButtonSelectedHdl(const Link& rLink) + void SetButtonSelectedHdl(const Link& rLink) { aButtonSelectedHdl = rLink;} - void SetModifyHdl(const Link& rLink){aModifyHdl = rLink;} + void SetModifyHdl(const Link& rLink){aModifyHdl = rLink;} - Control* GetActiveControl() + Control* GetActiveControl() { return pActiveCtrl;} - void InsertAtSelection(const String& rText, const SwFormToken& aToken); - void RemoveControl(SwTOXButton* pDel, BOOL bInternalCall = FALSE); + void InsertAtSelection(const String& rText, const SwFormToken& aToken); + void RemoveControl(SwTOXButton* pDel, BOOL bInternalCall = FALSE); - BOOL Contains(FormTokenType) const; + BOOL Contains(FormTokenType) const; - BOOL DetermineLinkStart(); + BOOL DetermineLinkStart(); //helper for pattern buttons and edits - BOOL CreateQuickHelp(Control* pCtrl, + BOOL CreateQuickHelp(Control* pCtrl, const SwFormToken& rToken, const HelpEvent& ); - virtual void Resize(); + virtual void Resize(); virtual void GetFocus(); }; @@ -346,81 +346,81 @@ class SwTOXEntryTabPage : public SfxTabPage FixedText aTokenFT; SwTokenWindow aTokenWIN; - PushButton aAllLevelsPB; - - PushButton aEntryNoPB; - PushButton aEntryPB; - PushButton aTabPB; - PushButton aChapterInfoPB; - PushButton aPageNoPB; - PushButton aHyperLinkPB; - - ListBox aAuthFieldsLB; - PushButton aAuthInsertPB; - PushButton aAuthRemovePB; - - FixedText aCharStyleFT; - ListBox aCharStyleLB; // character style of the current token - PushButton aEditStylePB; - - FixedText aChapterEntryFT; - ListBox aChapterEntryLB; // type of chapter info - - FixedText aNumberFormatFT; - ListBox aNumberFormatLB; //!< format for numbering (E#) - - FixedText aEntryOutlineLevelFT; //!< Fixed text, for i53420 - NumericField aEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420 - FixedText aFillCharFT; - ComboBox aFillCharCB; // fill char for tab stop - FixedText aTabPosFT; - MetricField aTabPosMF; // tab stop position - CheckBox aAutoRightCB; + PushButton aAllLevelsPB; + + PushButton aEntryNoPB; + PushButton aEntryPB; + PushButton aTabPB; + PushButton aChapterInfoPB; + PushButton aPageNoPB; + PushButton aHyperLinkPB; + + ListBox aAuthFieldsLB; + PushButton aAuthInsertPB; + PushButton aAuthRemovePB; + + FixedText aCharStyleFT; + ListBox aCharStyleLB; // character style of the current token + PushButton aEditStylePB; + + FixedText aChapterEntryFT; + ListBox aChapterEntryLB; // type of chapter info + + FixedText aNumberFormatFT; + ListBox aNumberFormatLB; //!< format for numbering (E#) + + FixedText aEntryOutlineLevelFT; //!< Fixed text, for i53420 + NumericField aEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420 + FixedText aFillCharFT; + ComboBox aFillCharCB; // fill char for tab stop + FixedText aTabPosFT; + MetricField aTabPosMF; // tab stop position + CheckBox aAutoRightCB; FixedLine aEntryFL; - CheckBox aRelToStyleCB; // position relative to the right margin of the para style - FixedText aMainEntryStyleFT; - ListBox aMainEntryStyleLB; // character style of main entries in indexes - CheckBox aAlphaDelimCB; - CheckBox aCommaSeparatedCB; + CheckBox aRelToStyleCB; // position relative to the right margin of the para style + FixedText aMainEntryStyleFT; + ListBox aMainEntryStyleLB; // character style of main entries in indexes + CheckBox aAlphaDelimCB; + CheckBox aCommaSeparatedCB; FixedLine aFormatFL; - RadioButton aSortDocPosRB; - RadioButton aSortContentRB; + RadioButton aSortDocPosRB; + RadioButton aSortContentRB; FixedLine aSortingFL; - FixedText aFirstKeyFT; - ListBox aFirstKeyLB; + FixedText aFirstKeyFT; + ListBox aFirstKeyLB; ImageRadioButton aFirstSortUpRB; ImageRadioButton aFirstSortDownRB; - FixedText aSecondKeyFT; - ListBox aSecondKeyLB; + FixedText aSecondKeyFT; + ListBox aSecondKeyLB; ImageRadioButton aSecondSortUpRB; ImageRadioButton aSecondSortDownRB; - FixedText aThirdKeyFT; - ListBox aThirdKeyLB; + FixedText aThirdKeyFT; + ListBox aThirdKeyLB; ImageRadioButton aThirdSortUpRB; ImageRadioButton aThirdSortDownRB; FixedLine aSortKeyFL; - String sDelimStr; - String sLevelStr; - String sAuthTypeStr; + String sDelimStr; + String sLevelStr; + String sAuthTypeStr; - String sNoCharStyle; - String sNoCharSortKey; - Point aButtonPositions[5]; + String sNoCharStyle; + String sNoCharSortKey; + Point aButtonPositions[5]; SwForm* m_pCurrentForm; - Point aRelToStylePos; - Point aRelToStyleIdxPos; + Point aRelToStylePos; + Point aRelToStyleIdxPos; Size aLevelFLSize; - CurTOXType aLastTOXType; - BOOL bInLevelHdl; + CurTOXType aLastTOXType; + BOOL bInLevelHdl; Point aChapterEntryFTPosition; //!< holds position of ChapterEntryFT control, //to be used in moving the element among different tokens @@ -443,9 +443,9 @@ class SwTOXEntryTabPage : public SfxTabPage DECL_LINK(AllLevelsHdl, PushButton*); - void EnableButtons(); - void WriteBackLevel(); - void UpdateDescriptor(); + void EnableButtons(); + void WriteBackLevel(); + void UpdateDescriptor(); DECL_LINK(ModifyHdl, void*); using SfxTabPage::ActivatePage; @@ -455,33 +455,33 @@ public: SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXEntryTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SetWrtShell(SwWrtShell& rSh); + void SetWrtShell(SwWrtShell& rSh); - String GetLevelHelp(USHORT nLevel) const; + String GetLevelHelp(USHORT nLevel) const; - void PreTokenButtonRemoved(const SwFormToken& rToken); + void PreTokenButtonRemoved(const SwFormToken& rToken); }; class SwTOXStylesTabPage : public SfxTabPage { - FixedText aLevelFT2; - ListBox aLevelLB; - FixedText aTemplateFT; - ListBox aParaLayLB; - PushButton aStdBT; + FixedText aLevelFT2; + ListBox aLevelLB; + FixedText aTemplateFT; + ListBox aParaLayLB; + PushButton aStdBT; ImageButton aAssignBT; - PushButton aEditStyleBT; + PushButton aEditStyleBT; FixedLine aFormatFL; SwForm* m_pCurrentForm; -// void UpdatePattern(); +// void UpdatePattern(); DECL_LINK( EditStyleHdl, Button *); DECL_LINK( StdHdl, Button * ); @@ -490,7 +490,7 @@ class SwTOXStylesTabPage : public SfxTabPage DECL_LINK( AssignHdl, Button * ); DECL_LINK( ModifyHdl, void*); - SwForm& GetForm() + SwForm& GetForm() { SwMultiTOXTabDialog* pDlg = (SwMultiTOXTabDialog*)GetTabDialog(); return *pDlg->GetForm(pDlg->GetCurrentTOXType()); @@ -503,13 +503,13 @@ public: SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXStylesTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 2fb8470d6087..e4a179612fbe 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.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 @@ -52,7 +52,7 @@ class SwWrtShell; class SwTOXMgr; class SwTOXMark; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Beschreibung: Markierung fuer Verzeichniseintrag einfuegen --------------------------------------------------------------------*/ class SwIndexMarkFloatDlg; class SwIndexMarkModalDlg; @@ -61,66 +61,66 @@ class SwIndexMarkDlg : public Window { friend class SwIndexMarkFloatDlg; friend class SwIndexMarkModalDlg; - FixedText aTypeFT; - ListBox aTypeDCB; - ImageButton aNewBT; - - FixedText aEntryFT; - Edit aEntryED; - FixedText aPhoneticFT0; - Edit aPhoneticED0; - - FixedText aKeyFT; - ComboBox aKeyDCB; - FixedText aPhoneticFT1; - Edit aPhoneticED1; - - FixedText aKey2FT; - ComboBox aKey2DCB; - FixedText aPhoneticFT2; - Edit aPhoneticED2; - - FixedText aLevelFT; - NumericField aLevelED; - CheckBox aMainEntryCB; - CheckBox aApplyToAllCB; - CheckBox aSearchCaseSensitiveCB; - CheckBox aSearchCaseWordOnlyCB; + FixedText aTypeFT; + ListBox aTypeDCB; + ImageButton aNewBT; + + FixedText aEntryFT; + Edit aEntryED; + FixedText aPhoneticFT0; + Edit aPhoneticED0; + + FixedText aKeyFT; + ComboBox aKeyDCB; + FixedText aPhoneticFT1; + Edit aPhoneticED1; + + FixedText aKey2FT; + ComboBox aKey2DCB; + FixedText aPhoneticFT2; + Edit aPhoneticED2; + + FixedText aLevelFT; + NumericField aLevelED; + CheckBox aMainEntryCB; + CheckBox aApplyToAllCB; + CheckBox aSearchCaseSensitiveCB; + CheckBox aSearchCaseWordOnlyCB; FixedLine aIndexFL; - OKButton aOKBT; - CancelButton aCancelBT; - HelpButton aHelpBT; - PushButton aDelBT; - //PushButton aNewBT; - - ImageButton aPrevSameBT; - ImageButton aNextSameBT; - ImageButton aPrevBT; - ImageButton aNextBT; - - String aOrgStr; - sal_Int32 nOptionsId; - sal_Bool bDel; - sal_Bool bNewMark; - sal_Bool bSelected; - - BOOL bPhoneticED0_ChangedByUser; - BOOL bPhoneticED1_ChangedByUser; - BOOL bPhoneticED2_ChangedByUser; - LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal - BOOL bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry + OKButton aOKBT; + CancelButton aCancelBT; + HelpButton aHelpBT; + PushButton aDelBT; + //PushButton aNewBT; + + ImageButton aPrevSameBT; + ImageButton aNextSameBT; + ImageButton aPrevBT; + ImageButton aNextBT; + + String aOrgStr; + sal_Int32 nOptionsId; + sal_Bool bDel; + sal_Bool bNewMark; + sal_Bool bSelected; + + BOOL bPhoneticED0_ChangedByUser; + BOOL bPhoneticED1_ChangedByUser; + BOOL bPhoneticED2_ChangedByUser; + LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal + BOOL bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier > xExtendedIndexEntrySupplier; - SwTOXMgr* pTOXMgr; - SwWrtShell* pSh; + SwTOXMgr* pTOXMgr; + SwWrtShell* pSh; - void Apply(); - void InitControls(); - void InsertMark(); - void UpdateMark(); + void Apply(); + void InitControls(); + void InsertMark(); + void UpdateMark(); DECL_LINK( InsertHdl, Button * ); DECL_LINK( CloseHdl, Button * ); @@ -138,15 +138,15 @@ class SwIndexMarkDlg : public Window //this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled' //it needs to be called ones if this dialog is opened to create a new entry (in InitControls), //or otherwise it has to be called for each changed TOXMark (in UpdateDialog) - void UpdateLanguageDependenciesForPhoneticReading(); - String GetDefaultPhoneticReading( const String& rText ); + void UpdateLanguageDependenciesForPhoneticReading(); + String GetDefaultPhoneticReading( const String& rText ); - void UpdateKeyBoxes(); + void UpdateKeyBoxes(); - void UpdateDialog(); - void InsertUpdate(); + void UpdateDialog(); + void InsertUpdate(); - virtual void Activate(); + virtual void Activate(); public: @@ -160,72 +160,72 @@ public: ~SwIndexMarkDlg(); void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0); - sal_Bool IsTOXType(const String& rName) + sal_Bool IsTOXType(const String& rName) {return LISTBOX_ENTRY_NOTFOUND != aTypeDCB.GetEntryPos(rName);} }; class SwIndexMarkFloatDlg : public SfxModelessDialog { - SwIndexMarkDlg aDlg; - virtual void Activate(); + SwIndexMarkDlg aDlg; + virtual void Activate(); public: - SwIndexMarkFloatDlg( SfxBindings* pBindings, + SwIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, sal_Bool bNew=sal_True); - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; class SwIndexMarkModalDlg : public SvxStandardDialog { - SwIndexMarkDlg aDlg; + SwIndexMarkDlg aDlg; public: SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); - virtual void Apply(); - void ReInitDlg(SwWrtShell& rWrtShell); + virtual void Apply(); + void ReInitDlg(SwWrtShell& rWrtShell); }; class SwAuthMarkModalDlg; class SwAuthMarkDlg : public Window { - static sal_Bool bIsFromComponent; + static sal_Bool bIsFromComponent; friend class SwAuthMarkModalDlg; friend class SwAuthMarkFloatDlg; RadioButton aFromComponentRB; - RadioButton aFromDocContentRB; - FixedText aAuthorFT; - FixedInfo aAuthorFI; - FixedText aTitleFT; - FixedInfo aTitleFI; - FixedText aEntryFT; - Edit aEntryED; - ListBox aEntryLB; + RadioButton aFromDocContentRB; + FixedText aAuthorFT; + FixedInfo aAuthorFI; + FixedText aTitleFT; + FixedInfo aTitleFI; + FixedText aEntryFT; + Edit aEntryED; + ListBox aEntryLB; FixedLine aEntryFL; - OKButton aOKBT; - CancelButton aCancelBT; - HelpButton aHelpBT; - PushButton aCreateEntryPB; - PushButton aEditEntryPB; + OKButton aOKBT; + CancelButton aCancelBT; + HelpButton aHelpBT; + PushButton aCreateEntryPB; + PushButton aEditEntryPB; - String sChangeST; - sal_Bool bNewEntry; - sal_Bool bBibAccessInitialized; + String sChangeST; + sal_Bool bNewEntry; + sal_Bool bBibAccessInitialized; - SwWrtShell* pSh; + SwWrtShell* pSh; - String m_sColumnTitles[AUTH_FIELD_END]; - String m_sFields[AUTH_FIELD_END]; + String m_sColumnTitles[AUTH_FIELD_END]; + String m_sFields[AUTH_FIELD_END]; - String m_sCreatedEntry[AUTH_FIELD_END]; + String m_sCreatedEntry[AUTH_FIELD_END]; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess; DECL_LINK(InsertHdl, PushButton*); DECL_LINK(CloseHdl, PushButton*); @@ -244,30 +244,30 @@ public: sal_Bool bNew=sal_True); ~SwAuthMarkDlg(); - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; class SwAuthMarkFloatDlg : public SfxModelessDialog { - SwAuthMarkDlg aDlg; - virtual void Activate(); + SwAuthMarkDlg aDlg; + virtual void Activate(); public: - SwAuthMarkFloatDlg( SfxBindings* pBindings, + SwAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, sal_Bool bNew=sal_True); - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; class SwAuthMarkModalDlg : public SvxStandardDialog { - SwAuthMarkDlg aDlg; + SwAuthMarkDlg aDlg; public: SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh); - virtual void Apply(); - void ReInitDlg(SwWrtShell& rWrtShell); + virtual void Apply(); + void ReInitDlg(SwWrtShell& rWrtShell); }; #endif // _SWUI_IDXMRK_HXX diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/ui/inc/swuipardlg.hxx index 753e3c93cae2..2da315933548 100644 --- a/sw/source/ui/inc/swuipardlg.hxx +++ b/sw/source/ui/inc/swuipardlg.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 @@ -49,6 +49,6 @@ public: ~SwParaDlg(); }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swvset.hxx b/sw/source/ui/inc/swvset.hxx index fcfcbda25f54..9ab00e2623b7 100644 --- a/sw/source/ui/inc/swvset.hxx +++ b/sw/source/ui/inc/swvset.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 @@ -36,7 +36,7 @@ class SwRulerValueSet : public SvxBmpNumValueSet SwRulerValueSet( Window* pParent, const ResId& rResId ); ~SwRulerValueSet(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); }; #endif diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx index 27621fd3e9fd..5a2872cf6202 100644 --- a/sw/source/ui/inc/swwrtshitem.hxx +++ b/sw/source/ui/inc/swwrtshitem.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 @@ -34,7 +34,7 @@ class SwWrtShell; class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem { - SwWrtShell* pWrtSh; + SwWrtShell* pWrtSh; public: TYPEINFO(); @@ -43,10 +43,10 @@ public: SwWrtShellItem( const SwWrtShellItem& ); - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - SwWrtShell* GetValue() const { return pWrtSh; } + SwWrtShell* GetValue() const { return pWrtSh; } }; diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index 348b60cafaef..268d6311f984 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.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,9 +40,9 @@ class SwSyncBtnDlg : public SfxFloatingWindow { - PushButton aSyncBtn; + PushButton aSyncBtn; - DECL_LINK( BtnHdl, PushButton* pBtn = 0 ); + DECL_LINK( BtnHdl, PushButton* pBtn = 0 ); public: SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, Window *pParent); @@ -57,7 +57,7 @@ public: class SwSyncChildWin : public SfxChildWindow { public: - SwSyncChildWin( Window* , + SwSyncChildWin( Window* , USHORT nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/ui/inc/table.hrc b/sw/source/ui/inc/table.hrc index 076028925804..721c6de5b67c 100644 --- a/sw/source/ui/inc/table.hrc +++ b/sw/source/ui/inc/table.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 @@ -27,23 +27,23 @@ #include "rcid.hrc" -#define DLG_INSERT_TABLE RC_TABLE_BEGIN -#define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1) -#define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2) -//#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) moved to svx -#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4) -#define DLG_SPLIT (RC_TABLE_BEGIN + 5) -#define DLG_COL_WIDTH (RC_TABLE_BEGIN + 6) -#define MSG_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7) -#define DLG_AUTOFMT_TABLE (RC_TABLE_BEGIN + 9) -#define DLG_SWDLG_STRINPUT (RC_TABLE_BEGIN + 10) -#define TP_TABLE_COLUMN (RC_TABLE_BEGIN + 11) -#define DLG_INSERT_CHART (RC_TABLE_BEGIN + 12) +#define DLG_INSERT_TABLE RC_TABLE_BEGIN +#define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1) +#define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2) +//#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) moved to svx +#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4) +#define DLG_SPLIT (RC_TABLE_BEGIN + 5) +#define DLG_COL_WIDTH (RC_TABLE_BEGIN + 6) +#define MSG_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7) +#define DLG_AUTOFMT_TABLE (RC_TABLE_BEGIN + 9) +#define DLG_SWDLG_STRINPUT (RC_TABLE_BEGIN + 10) +#define TP_TABLE_COLUMN (RC_TABLE_BEGIN + 11) +#define DLG_INSERT_CHART (RC_TABLE_BEGIN + 12) #define MSG_WRONG_TABLENAME (RC_TABLE_BEGIN + 13) -#define DLG_SPLIT_TABLE (RC_TABLE_BEGIN + 14) -#define DLG_MERGE_TABLE (RC_TABLE_BEGIN + 15) +#define DLG_SPLIT_TABLE (RC_TABLE_BEGIN + 14) +#define DLG_MERGE_TABLE (RC_TABLE_BEGIN + 15) -#define TABLE_ACT_END DLG_MERGE_TABLE +#define TABLE_ACT_END DLG_MERGE_TABLE #if TABLE_ACT_END > RC_TABLE_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx index ed8f3cd8630a..3b233cdaefd4 100644 --- a/sw/source/ui/inc/tabledlg.hxx +++ b/sw/source/ui/inc/tabledlg.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,9 +44,9 @@ struct TColumn; class SwTableTabDlg : public SfxTabDialog { SwWrtShell* pShell; - USHORT nHtmlMode; + USHORT nHtmlMode; - virtual void PageCreated(USHORT nId, SfxTabPage& rPage); + virtual void PageCreated(USHORT nId, SfxTabPage& rPage); public: SwTableTabDlg( Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh ); diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx index 135569ab6561..e00bb6538267 100644 --- a/sw/source/ui/inc/tablemgr.hxx +++ b/sw/source/ui/inc/tablemgr.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 @@ -51,10 +51,10 @@ const char cParaDelim = 0x0a; class SW_DLLPUBLIC SwTableFUNC { - SwFrmFmt *pFmt; - SwWrtShell *pSh; - BOOL bCopy; - SwTabCols aCols; + SwFrmFmt *pFmt; + SwWrtShell *pSh; + BOOL bCopy; + SwTabCols aCols; private: SW_DLLPRIVATE int GetRightSeparator(int nNum) const; @@ -64,13 +64,13 @@ public: SwTableFUNC(SwWrtShell *pShell, BOOL bCopyFmt = FALSE); ~SwTableFUNC(); - void InitTabCols(); - void ColWidthDlg(Window *pParent ); + void InitTabCols(); + void ColWidthDlg(Window *pParent ); SwTwips GetColWidth(USHORT nNum) const; SwTwips GetMaxColWidth(USHORT nNum) const; - void SetColWidth(USHORT nNum, SwTwips nWidth ); - USHORT GetColCount() const; - USHORT GetCurColNum() const; + void SetColWidth(USHORT nNum, SwTwips nWidth ); + USHORT GetColCount() const; + USHORT GetCurColNum() const; BOOL IsTableSelected() const { return pFmt != 0; } @@ -82,7 +82,7 @@ public: void UpdateChart(); /// @return the XModel of the newly inserted chart if successfull - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const rtl::OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 ); }; diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/ui/inc/tabsh.hxx index 544cab3b66e4..5e2ba33f430d 100644 --- a/sw/source/ui/inc/tabsh.hxx +++ b/sw/source/ui/inc/tabsh.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,13 +45,13 @@ public: SFX_DECL_INTERFACE(SW_TABSHELL) TYPEINFO(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); - void GetFrmBorderState(SfxItemSet &rSet); - void GetLineStyleState(SfxItemSet &rSet); - void ExecTableStyle(SfxRequest& rReq); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void GetFrmBorderState(SfxItemSet &rSet); + void GetLineStyleState(SfxItemSet &rSet); + void ExecTableStyle(SfxRequest& rReq); - void ExecNumberFormat(SfxRequest& rReq); + void ExecNumberFormat(SfxRequest& rReq); SwTableShell(SwView &rView); }; diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index 1b3c0260cb60..d78b44a8903b 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.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 @@ -53,36 +53,36 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; class SwAutoFormatDlg : public SfxModalDialog { FixedLine aFlFormat; - ListBox aLbFormat; - CheckBox aBtnNumFormat; - CheckBox aBtnBorder; - CheckBox aBtnFont; - CheckBox aBtnPattern; - CheckBox aBtnAlignment; + ListBox aLbFormat; + CheckBox aBtnNumFormat; + CheckBox aBtnBorder; + CheckBox aBtnFont; + CheckBox aBtnPattern; + CheckBox aBtnAlignment; FixedLine aFlFormats; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - PushButton aBtnRename; - MoreButton aBtnMore; - String aStrTitle; - String aStrLabel; - String aStrClose; - String aStrDelTitle; - String aStrDelMsg; - String aStrRenameTitle; - String aStrInvalidFmt; - AutoFmtPreview* pWndPreview; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + PushButton aBtnRename; + MoreButton aBtnMore; + String aStrTitle; + String aStrLabel; + String aStrClose; + String aStrDelTitle; + String aStrDelMsg; + String aStrRenameTitle; + String aStrInvalidFmt; + AutoFmtPreview* pWndPreview; //------------------------ - SwWrtShell* pShell; - SwTableAutoFmtTbl* pTableTbl; - BYTE nIndex; - BYTE nDfltStylePos; - BOOL bCoreDataChanged : 1; - BOOL bSetAutoFmt : 1; + SwWrtShell* pShell; + SwTableAutoFmtTbl* pTableTbl; + BYTE nIndex; + BYTE nDfltStylePos; + BOOL bCoreDataChanged : 1; + BOOL bSetAutoFmt : 1; void Init( const SwTableAutoFmt* pSelFmt ); diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/ui/inc/tblctrl.hxx index cb0c01371745..df2e1a079974 100644 --- a/sw/source/ui/inc/tblctrl.hxx +++ b/sw/source/ui/inc/tblctrl.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,8 +45,8 @@ public: SwTableOptimizeCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~SwTableOptimizeCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); }; diff --git a/sw/source/ui/inc/tblnumfm.hxx b/sw/source/ui/inc/tblnumfm.hxx index ca93e3a0ec07..d385f4122d3d 100644 --- a/sw/source/ui/inc/tblnumfm.hxx +++ b/sw/source/ui/inc/tblnumfm.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 diff --git a/sw/source/ui/inc/tbxanchr.hxx b/sw/source/ui/inc/tbxanchr.hxx index c36b31007f4a..a79ae1e76908 100644 --- a/sw/source/ui/inc/tbxanchr.hxx +++ b/sw/source/ui/inc/tbxanchr.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 diff --git a/sw/source/ui/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx index 6f95b73acb6a..ba4deea8a359 100644 --- a/sw/source/ui/inc/textcontrolcombo.hxx +++ b/sw/source/ui/inc/textcontrolcombo.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 @@ -38,9 +38,9 @@ class SW_DLLPUBLIC TextControlCombo : public Window { protected: - Control& mrCtrl; - FixedText& mrFTbefore; - FixedText& mrFTafter; + Control& mrCtrl; + FixedText& mrFTbefore; + FixedText& mrFTafter; public: @@ -49,16 +49,16 @@ public: TextControlCombo( Window* _pParent, const ResId& _rResId, Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter ); - virtual ~TextControlCombo(); + virtual ~TextControlCombo(); - void Arrange( FixedText& _rOrg, BOOL bShow = true ); + void Arrange( FixedText& _rOrg, BOOL bShow = true ); // identical to window functionality - void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); - void Hide( USHORT nFlags = 0 ) { Show( FALSE, nFlags ); } - - void Enable( BOOL bEnable = TRUE, BOOL bChild = TRUE ); - void Disable( BOOL bChild = TRUE ) { Enable( FALSE, bChild ); } + void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); + void Hide( USHORT nFlags = 0 ) { Show( FALSE, nFlags ); } + + void Enable( BOOL bEnable = TRUE, BOOL bChild = TRUE ); + void Disable( BOOL bChild = TRUE ) { Enable( FALSE, bChild ); } }; diff --git a/sw/source/ui/inc/textsh.hxx b/sw/source/ui/inc/textsh.hxx index 5817013c9ca9..a8215b653e3f 100644 --- a/sw/source/ui/inc/textsh.hxx +++ b/sw/source/ui/inc/textsh.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 @@ -37,7 +37,7 @@ class SvxHyperlinkItem; class SwTextShell: public SwBaseShell { - SwFldMgr* pPostItFldMgr; + SwFldMgr* pPostItFldMgr; void InsertSymbol( SfxRequest& ); void InsertHyperlink(const SvxHyperlinkItem& rHlnkItem); @@ -51,34 +51,34 @@ public: DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * ); DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog * ); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); - void ExecInsert(SfxRequest &); - void StateInsert(SfxItemSet&); - void ExecDelete(SfxRequest &); - void ExecEnterNum(SfxRequest &); - void ExecBasicMove(SfxRequest &); - void ExecMove(SfxRequest &); - void ExecMovePage(SfxRequest &); - void ExecMoveCol(SfxRequest &); - void ExecMoveLingu(SfxRequest &); - void ExecMoveMisc(SfxRequest &); - void ExecField(SfxRequest &rReq); - void StateField(SfxItemSet &); - void ExecIdx(SfxRequest &); - void GetIdxState(SfxItemSet &); - void ExecGlossary(SfxRequest &); + void ExecInsert(SfxRequest &); + void StateInsert(SfxItemSet&); + void ExecDelete(SfxRequest &); + void ExecEnterNum(SfxRequest &); + void ExecBasicMove(SfxRequest &); + void ExecMove(SfxRequest &); + void ExecMovePage(SfxRequest &); + void ExecMoveCol(SfxRequest &); + void ExecMoveLingu(SfxRequest &); + void ExecMoveMisc(SfxRequest &); + void ExecField(SfxRequest &rReq); + void StateField(SfxItemSet &); + void ExecIdx(SfxRequest &); + void GetIdxState(SfxItemSet &); + void ExecGlossary(SfxRequest &); - void ExecCharAttr(SfxRequest &); - void ExecCharAttrArgs(SfxRequest &); - void ExecParaAttr(SfxRequest &); - void ExecParaAttrArgs(SfxRequest &); - void ExecAttr(SfxRequest &); - void ExecDB(SfxRequest &); - void ExecTransliteration(SfxRequest &); + void ExecCharAttr(SfxRequest &); + void ExecCharAttrArgs(SfxRequest &); + void ExecParaAttr(SfxRequest &); + void ExecParaAttrArgs(SfxRequest &); + void ExecAttr(SfxRequest &); + void ExecDB(SfxRequest &); + void ExecTransliteration(SfxRequest &); - void GetAttrState(SfxItemSet &); + void GetAttrState(SfxItemSet &); SwTextShell(SwView &rView); virtual ~SwTextShell(); diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/ui/inc/tmpdlg.hxx index ddb24179758e..7729dcac97cc 100644 --- a/sw/source/ui/inc/tmpdlg.hxx +++ b/sw/source/ui/inc/tmpdlg.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,8 +41,8 @@ class SwTemplateDlg: public SfxStyleDialog USHORT nType; USHORT nHtmlMode; - SwWrtShell* pWrtShell; - BOOL bNewStyle; + SwWrtShell* pWrtShell; + BOOL bNewStyle; DECL_LINK( NumOptionsHdl, PushButton* ); @@ -50,9 +50,9 @@ public: SwTemplateDlg( Window* pParent, SfxStyleSheetBase& rBase, USHORT nRegion, - BOOL bColumn = FALSE, - SwWrtShell* pActShell = 0, - BOOL bNew = FALSE ); + BOOL bColumn = FALSE, + SwWrtShell* pActShell = 0, + BOOL bNew = FALSE ); ~SwTemplateDlg(); const SfxItemSet* GetRefreshedSet(); diff --git a/sw/source/ui/inc/tmplctrl.hxx b/sw/source/ui/inc/tmplctrl.hxx index 25a946a1c98c..81ef7b73b84c 100644 --- a/sw/source/ui/inc/tmplctrl.hxx +++ b/sw/source/ui/inc/tmplctrl.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 @@ -38,7 +38,7 @@ class SwTemplateControl : public SfxStatusBarControl protected: virtual void Command( const CommandEvent& rCEvt ); public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); diff --git a/sw/source/ui/inc/toolbox_tmpl.hrc b/sw/source/ui/inc/toolbox_tmpl.hrc index 73ab3059d705..8c73a70c6041 100644 --- a/sw/source/ui/inc/toolbox_tmpl.hrc +++ b/sw/source/ui/inc/toolbox_tmpl.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 diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx index c8c01a0ac777..22d4914f0cc0 100644 --- a/sw/source/ui/inc/toxmgr.hxx +++ b/sw/source/ui/inc/toxmgr.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 @@ -42,32 +42,32 @@ class SwForm; //one single method will be sufficient to insert AND upate indexes class SW_DLLPUBLIC SwTOXDescription { - TOXTypes eTOXType; - String aStyleNames[MAXLEVEL]; - String sSequenceName; - String sMainEntryCharStyle; - String sAutoMarkURL; - String* pTitle; - String* pTOUName; - SwForm* pForm; - USHORT nContent; - USHORT nIndexOptions; - USHORT nOLEOptions; + TOXTypes eTOXType; + String aStyleNames[MAXLEVEL]; + String sSequenceName; + String sMainEntryCharStyle; + String sAutoMarkURL; + String* pTitle; + String* pTOUName; + SwForm* pForm; + USHORT nContent; + USHORT nIndexOptions; + USHORT nOLEOptions; LanguageType eLanguage; String sSortAlgorithm; String sAuthBrackets; - SwCaptionDisplay eCaptionDisplay; - SwTOXSortKey eSortKey1; - SwTOXSortKey eSortKey2; - SwTOXSortKey eSortKey3; - BYTE nLevel; - BOOL bFromObjectNames : 1; - BOOL bFromChapter : 1; - BOOL bReadonly: 1; - BOOL bLevelFromChapter : 1; - BOOL bIsAuthSequence :1; - BOOL bSortByDocument :1; + SwCaptionDisplay eCaptionDisplay; + SwTOXSortKey eSortKey1; + SwTOXSortKey eSortKey2; + SwTOXSortKey eSortKey3; + BYTE nLevel; + BOOL bFromObjectNames : 1; + BOOL bFromChapter : 1; + BOOL bReadonly: 1; + BOOL bLevelFromChapter : 1; + BOOL bIsAuthSequence :1; + BOOL bSortByDocument :1; //TODO: TemplateNames //const String* pTemplateName = 0, ??? @@ -104,67 +104,67 @@ public: delete pTOUName; } - void SetTOXType(TOXTypes eSet) { eTOXType = eSet;} - TOXTypes GetTOXType() const { return eTOXType;} + void SetTOXType(TOXTypes eSet) { eTOXType = eSet;} + TOXTypes GetTOXType() const { return eTOXType;} const String& GetStyleNames(USHORT nLvl) const {return aStyleNames[nLvl];} void SetStyleNames(const String& rSet, USHORT nLvl) {aStyleNames[nLvl] = rSet; } - const String& GetAutoMarkURL() const { return sAutoMarkURL;} - void SetAutoMarkURL(const String& rSet) {sAutoMarkURL = rSet;} + const String& GetAutoMarkURL() const { return sAutoMarkURL;} + void SetAutoMarkURL(const String& rSet) {sAutoMarkURL = rSet;} - void SetTitle(const String& pSet) {delete pTitle; pTitle = new String(pSet);} - const String* GetTitle() const {return pTitle; } + void SetTitle(const String& pSet) {delete pTitle; pTitle = new String(pSet);} + const String* GetTitle() const {return pTitle; } - void SetTOUName(const String& pSet) {delete pTOUName; pTOUName = new String(pSet);} - const String* GetTOUName() const {return pTOUName; } + void SetTOUName(const String& pSet) {delete pTOUName; pTOUName = new String(pSet);} + const String* GetTOUName() const {return pTOUName; } - void SetForm(const SwForm& rSet) {delete pForm; pForm = new SwForm(rSet);} - const SwForm* GetForm() const {return pForm;} + void SetForm(const SwForm& rSet) {delete pForm; pForm = new SwForm(rSet);} + const SwForm* GetForm() const {return pForm;} - void SetContentOptions(USHORT nSet) { nContent = nSet;} - USHORT GetContentOptions() const { return nContent;} + void SetContentOptions(USHORT nSet) { nContent = nSet;} + USHORT GetContentOptions() const { return nContent;} - void SetIndexOptions(USHORT nSet) { nIndexOptions = nSet;} - USHORT GetIndexOptions() const { return nIndexOptions;} + void SetIndexOptions(USHORT nSet) { nIndexOptions = nSet;} + USHORT GetIndexOptions() const { return nIndexOptions;} - const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;} - void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;} + const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;} + void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;} - void SetLevel(BYTE nSet) {nLevel = nSet;} - BYTE GetLevel()const {return nLevel; } + void SetLevel(BYTE nSet) {nLevel = nSet;} + BYTE GetLevel()const {return nLevel; } - void SetCreateFromObjectNames(BOOL bSet) { bFromObjectNames = bSet;} - BOOL IsCreateFromObjectNames() const {return bFromObjectNames;} + void SetCreateFromObjectNames(BOOL bSet) { bFromObjectNames = bSet;} + BOOL IsCreateFromObjectNames() const {return bFromObjectNames;} - const String& GetSequenceName() const {return sSequenceName;} - void SetSequenceName(const String& rSet) {sSequenceName = rSet;} + const String& GetSequenceName() const {return sSequenceName;} + void SetSequenceName(const String& rSet) {sSequenceName = rSet;} - SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;} - void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;} + SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;} + void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;} - void SetFromChapter(BOOL bSet) { bFromChapter = bSet;} - BOOL IsFromChapter() const {return bFromChapter;} + void SetFromChapter(BOOL bSet) { bFromChapter = bSet;} + BOOL IsFromChapter() const {return bFromChapter;} - void SetReadonly(BOOL bSet){bReadonly = bSet;} - BOOL IsReadonly() const {return bReadonly;} + void SetReadonly(BOOL bSet){bReadonly = bSet;} + BOOL IsReadonly() const {return bReadonly;} - USHORT GetOLEOptions() const {return nOLEOptions;} - void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;} + USHORT GetOLEOptions() const {return nOLEOptions;} + void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;} - BOOL IsLevelFromChapter() const {return bLevelFromChapter;} - void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;} + BOOL IsLevelFromChapter() const {return bLevelFromChapter;} + void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;} - String GetAuthBrackets() const {return sAuthBrackets;} - void SetAuthBrackets(const String& rSet) {sAuthBrackets = rSet;} + String GetAuthBrackets() const {return sAuthBrackets;} + void SetAuthBrackets(const String& rSet) {sAuthBrackets = rSet;} - BOOL IsAuthSequence() const {return bIsAuthSequence;} - void SetAuthSequence(BOOL bSet){bIsAuthSequence = bSet;} + BOOL IsAuthSequence() const {return bIsAuthSequence;} + void SetAuthSequence(BOOL bSet){bIsAuthSequence = bSet;} - BOOL IsSortByDocument()const {return bSortByDocument ;} - void SetSortByDocument(BOOL bSet) {bSortByDocument = bSet;} + BOOL IsSortByDocument()const {return bSortByDocument ;} + void SetSortByDocument(BOOL bSet) {bSortByDocument = bSet;} void SetSortKeys(SwTOXSortKey eKey1, SwTOXSortKey eKey2, @@ -186,18 +186,18 @@ public: class SwTOXMarkDescription { - TOXTypes eTOXType; - int nLevel; - BOOL bMainEntry; + TOXTypes eTOXType; + int nLevel; + BOOL bMainEntry; - String* pPrimKey; - String* pSecKey; - String* pAltStr; - String* pTOUName; + String* pPrimKey; + String* pSecKey; + String* pAltStr; + String* pTOUName; - String* pPhoneticReadingOfAltStr; - String* pPhoneticReadingOfPrimKey; - String* pPhoneticReadingOfSecKey; + String* pPhoneticReadingOfAltStr; + String* pPhoneticReadingOfPrimKey; + String* pPhoneticReadingOfSecKey; // forbidden and not implemented. SwTOXMarkDescription(); @@ -230,51 +230,51 @@ public: delete pPhoneticReadingOfSecKey; } - TOXTypes GetTOXType()const {return eTOXType;} + TOXTypes GetTOXType()const {return eTOXType;} - void SetLevel(int nSet) {nLevel = nSet;} - int GetLevel() const {return nLevel;} + void SetLevel(int nSet) {nLevel = nSet;} + int GetLevel() const {return nLevel;} - void SetMainEntry(BOOL bSet) {bMainEntry = bSet;} - BOOL IsMainEntry() const {return bMainEntry;} + void SetMainEntry(BOOL bSet) {bMainEntry = bSet;} + BOOL IsMainEntry() const {return bMainEntry;} - void SetPrimKey(const String& rSet) + void SetPrimKey(const String& rSet) {delete pPrimKey; pPrimKey = new String(rSet);} - const String* GetPrimKey() const {return pPrimKey;} + const String* GetPrimKey() const {return pPrimKey;} - void SetSecKey(const String& rSet) + void SetSecKey(const String& rSet) {delete pSecKey; pSecKey = new String(rSet);} - const String* GetSecKey() const { return pSecKey; } + const String* GetSecKey() const { return pSecKey; } - void SetAltStr(const String& rSet) + void SetAltStr(const String& rSet) {delete pAltStr; pAltStr = new String(rSet);} - const String* GetAltStr() const { return pAltStr; } + const String* GetAltStr() const { return pAltStr; } - void SetTOUName(const String& rSet) + void SetTOUName(const String& rSet) {delete pTOUName; pTOUName = new String(rSet);} - const String* GetTOUName() const {return pTOUName;} + const String* GetTOUName() const {return pTOUName;} - void SetPhoneticReadingOfAltStr(const String& rSet) + void SetPhoneticReadingOfAltStr(const String& rSet) {delete pPhoneticReadingOfAltStr; pPhoneticReadingOfAltStr = new String(rSet);} - const String* GetPhoneticReadingOfAltStr() const { return pPhoneticReadingOfAltStr; } + const String* GetPhoneticReadingOfAltStr() const { return pPhoneticReadingOfAltStr; } - void SetPhoneticReadingOfPrimKey(const String& rSet) + void SetPhoneticReadingOfPrimKey(const String& rSet) {delete pPhoneticReadingOfPrimKey; pPhoneticReadingOfPrimKey = new String(rSet);} - const String* GetPhoneticReadingOfPrimKey() const { return pPhoneticReadingOfPrimKey; } + const String* GetPhoneticReadingOfPrimKey() const { return pPhoneticReadingOfPrimKey; } - void SetPhoneticReadingOfSecKey(const String& rSet) + void SetPhoneticReadingOfSecKey(const String& rSet) {delete pPhoneticReadingOfSecKey; pPhoneticReadingOfSecKey = new String(rSet);} - const String* GetPhoneticReadingOfSecKey() const { return pPhoneticReadingOfSecKey; } + const String* GetPhoneticReadingOfSecKey() const { return pPhoneticReadingOfSecKey; } }; class SW_DLLPUBLIC SwTOXMgr { - SwWrtShell* pSh; - SwTOXMark* pCurTOXMark; - SwTOXMarks aCurMarks; + SwWrtShell* pSh; + SwTOXMark* pCurTOXMark; + SwTOXMarks aCurMarks; - SW_DLLPRIVATE USHORT GetUserTypeID(const String& rStr); + SW_DLLPRIVATE USHORT GetUserTypeID(const String& rStr); public: // single argument ctors shall be explicit. @@ -283,29 +283,29 @@ public: // // Methoden fuer Verzeichnismarkierungen // - void InsertTOXMark(const SwTOXMarkDescription& rDesc); + void InsertTOXMark(const SwTOXMarkDescription& rDesc); - void UpdateTOXMark(const SwTOXMarkDescription& rDesc); + void UpdateTOXMark(const SwTOXMarkDescription& rDesc); - void DeleteTOXMark(); - void NextTOXMark(BOOL bSame=FALSE); - void PrevTOXMark(BOOL bSame=FALSE); + void DeleteTOXMark(); + void NextTOXMark(BOOL bSame=FALSE); + void PrevTOXMark(BOOL bSame=FALSE); // Aktuelle TOXmarks holen - USHORT GetTOXMarks(); - USHORT GetTOXMarkCount(); - SwTOXMark* GetTOXMark(USHORT nId); - SwTOXMark* GetCurTOXMark(); - void SetCurTOXMark(USHORT nId); + USHORT GetTOXMarks(); + USHORT GetTOXMarkCount(); + SwTOXMark* GetTOXMark(USHORT nId); + SwTOXMark* GetCurTOXMark(); + void SetCurTOXMark(USHORT nId); // // Methoden fuer Verzeichnisse // - BOOL UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); + BOOL UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); - const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const; - const SwTOXBase* GetCurTOX(); + const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const; + const SwTOXBase* GetCurTOX(); }; @@ -313,10 +313,10 @@ public: Beschreibung: Inlines --------------------------------------------------------------------*/ inline USHORT SwTOXMgr::GetTOXMarkCount() - { return aCurMarks.Count(); } + { return aCurMarks.Count(); } inline SwTOXMark* SwTOXMgr::GetCurTOXMark() - { return pCurTOXMark; } + { return pCurTOXMark; } #endif diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx index 5dd02380cb85..f8f426f8f84a 100644 --- a/sw/source/ui/inc/uiborder.hxx +++ b/sw/source/ui/inc/uiborder.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 diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx index dfd891839572..8990e15eb843 100644 --- a/sw/source/ui/inc/uiitems.hxx +++ b/sw/source/ui/inc/uiitems.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 @@ -58,11 +58,11 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SwPageFtnInfo& GetPageFtnInfo() { return aFtnInfo; } const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; } - void SetPageFtnInfo(SwPageFtnInfo& rInf) { aFtnInfo = rInf; } + void SetPageFtnInfo(SwPageFtnInfo& rInf) { aFtnInfo = rInf; } }; class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem @@ -76,8 +76,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - void SetValue(void * pPtr) { pMisc= pPtr; } - void* GetValue() const { return pMisc; } + void SetValue(void * pPtr) { pMisc= pPtr; } + void* GetValue() const { return pMisc; } }; class SW_DLLPUBLIC SwUINumRuleItem : public SfxPoolItem @@ -92,11 +92,11 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - const SwNumRule* GetNumRule() const { return pRule; } - SwNumRule* GetNumRule() { return pRule; } + const SwNumRule* GetNumRule() const { return pRule; } + SwNumRule* GetNumRule() { return pRule; } }; class SwBackgroundDestinationItem : public SfxUInt16Item diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx index 2cb957b7dc0b..230119359742 100644 --- a/sw/source/ui/inc/uinums.hxx +++ b/sw/source/ui/inc/uinums.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 @@ -78,7 +78,7 @@ public: const SwNumRulesWithName &operator=(const SwNumRulesWithName &); - const String& GetName() const { return aName; } + const String& GetName() const { return aName; } void MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const; void Store( SvStream& ); @@ -87,24 +87,24 @@ public: class SwBaseNumRules { public: - enum { nMaxRules = MAX_NUM_RULES }; // zur Zeit 9 definierte Forms + enum { nMaxRules = MAX_NUM_RULES }; // zur Zeit 9 definierte Forms protected: - SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; - String sFileName; - USHORT nVersion; - BOOL bModified; + SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; + String sFileName; + USHORT nVersion; + BOOL bModified; - virtual int Load(SvStream&); - virtual BOOL Store(SvStream&); + virtual int Load(SvStream&); + virtual BOOL Store(SvStream&); - void Init(); + void Init(); public: SwBaseNumRules(const String& rFileName); virtual ~SwBaseNumRules(); - inline const SwNumRulesWithName* GetRules(USHORT nIdx) const; - virtual void ApplyNumRules( + inline const SwNumRulesWithName* GetRules(USHORT nIdx) const; + virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, USHORT nIdx); @@ -117,7 +117,7 @@ public: SwChapterNumRules(); virtual ~SwChapterNumRules(); - virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, + virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, USHORT nIdx); }; diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index 5f0e1d93f2cd..ef4d99c412d9 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.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 @@ -57,13 +57,13 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ); void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet); // Auffuellen der Tabs mit DefaultTabs -SW_DLLPUBLIC void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs); +SW_DLLPUBLIC void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs); // DefaultTabs loeschen aus dem TabStopArray -//void EraseDefTabs(SvxTabStopItem& rTabs); +//void EraseDefTabs(SvxTabStopItem& rTabs); // Abstand zwischen dem 1. und zweitem Element ermitteln -SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs); +SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs); // erfrage ob im Set eine Sfx-PageDesc-Kombination vorliegt // und setze diesen im Set und loesche die Transport Items @@ -71,8 +71,8 @@ SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs); void SwToSfxPageDescAttr( SfxItemSet& rSet ); void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ); -SW_DLLPUBLIC FieldUnit GetDfltMetric(BOOL bWeb); -void SetDfltMetric(FieldUnit eMetric, BOOL bWeb); +SW_DLLPUBLIC FieldUnit GetDfltMetric(BOOL bWeb); +void SetDfltMetric(FieldUnit eMetric, BOOL bWeb); SW_DLLPUBLIC BOOL HasCharUnit( BOOL bWeb ); void SetApplyCharUnit(BOOL bApplyChar, BOOL bWeb); @@ -89,7 +89,7 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, USHORT *pPercent, String GetAppLangDateTimeString( const DateTime& ); -// search for a command string withing the menu structure and execute it +// search for a command string withing the menu structure and execute it // at the dispatcher if there is one, if executed return true bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, USHORT nId ); diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index e92eb71dcf23..e8941ab6c062 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.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 @@ -34,7 +34,7 @@ #include <sfx2/objsh.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> -#include <cppuhelper/implbase1.hxx> // helper for implementations +#include <cppuhelper/implbase1.hxx> // helper for implementations #include <swunodef.hxx> #include <cppuhelper/weakref.hxx> @@ -56,7 +56,7 @@ namespace com{ namespace sun{ namespace star { class SwScannerEventListener : public ::cppu::WeakImplHelper1< STAR_NMSPC::lang::XEventListener > { - SwView* pView; + SwView* pView; public: @@ -74,7 +74,7 @@ public: class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< CLIP_NMSPC::XClipboardListener > { - SwView* pView; + SwView* pView; // XEventListener virtual void SAL_CALL disposing( const STAR_NMSPC::lang::EventObject& rEventObject ) @@ -86,7 +86,7 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< public: SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {} - virtual ~SwClipboardChangeListener(); + virtual ~SwClipboardChangeListener(); void ViewDestroyed() { pView = 0; } @@ -97,10 +97,10 @@ class SwMailMergeConfigItem; class SwView_Impl { - STAR_REFERENCE( lang::XEventListener ) xScanEvtLstnr; - STAR_REFERENCE( lang::XEventListener ) xClipEvtLstnr; - STAR_REFERENCE( frame::XDispatchProviderInterceptor ) xDisProvInterceptor; - STAR_REFERENCE( view::XSelectionSupplier ) *pxXTextView; // UNO object + STAR_REFERENCE( lang::XEventListener ) xScanEvtLstnr; + STAR_REFERENCE( lang::XEventListener ) xClipEvtLstnr; + STAR_REFERENCE( frame::XDispatchProviderInterceptor ) xDisProvInterceptor; + STAR_REFERENCE( view::XSelectionSupplier ) *pxXTextView; // UNO object com::sun::star::uno::WeakReference< com::sun::star::lang::XUnoTunnel > xTransferable; // temporary document for printing text of selection / multi selection @@ -109,9 +109,9 @@ class SwView_Impl SfxObjectShellRef aEmbeddedObjRef; SwView* pView; - SwScannerEventListener* pScanEvtLstnr; - SwClipboardChangeListener* pClipEvtLstnr; - ShellModes eShellMode; + SwScannerEventListener* pScanEvtLstnr; + SwClipboardChangeListener* pClipEvtLstnr; + ShellModes eShellMode; SwMailMergeConfigItem* pConfigItem; sal_uInt16 nMailMergeRestartPage; @@ -129,18 +129,18 @@ public: SwView_Impl(SwView* pShell); ~SwView_Impl(); - void SetShellMode(ShellModes eSet); + void SetShellMode(ShellModes eSet); ::com::sun::star::view::XSelectionSupplier* GetUNOObject(); - SwXTextView* GetUNOObject_Impl(); + SwXTextView* GetUNOObject_Impl(); void Invalidate(); - ShellModes GetShellMode() {return eShellMode;} + ShellModes GetShellMode() {return eShellMode;} void ExecuteScan(SfxRequest& rReq); - SwScannerEventListener& GetScannerEventListener(); + SwScannerEventListener& GetScannerEventListener(); - void AddClipboardListener(); + void AddClipboardListener(); SfxObjectShellRef & GetTmpSelectionDoc() { return xTmpSelDocSh; } diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index 039769abda5f..dc7710055265 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.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 @@ -61,11 +61,11 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3 // ::osl::Mutex m_aMutex;#102295# solar mutex has to be used currently // the component which's dispatches we're intercepting - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> m_xIntercepted; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> m_xIntercepted; // chaining - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> m_xDispatch; diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index af9a7a3a73c6..c58e98779ba9 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.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 @@ -47,16 +47,16 @@ class SwOneExampleFrame; class SwFrmCtrlWindow : public Window { - SwOneExampleFrame* pExampleFrame; + SwOneExampleFrame* pExampleFrame; public: - SwFrmCtrlWindow(Window* pParent, WinBits nBits, SwOneExampleFrame* pFrame); + SwFrmCtrlWindow(Window* pParent, WinBits nBits, SwOneExampleFrame* pFrame); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ); }; class MenuResource : public Resource { - ResStringArray aMenuArray; + ResStringArray aMenuArray; public: MenuResource(const ResId& rResId); @@ -64,7 +64,7 @@ public: ResStringArray& GetMenuArray() {return aMenuArray;} }; -#define EX_SHOW_ONLINE_LAYOUT 0x001 +#define EX_SHOW_ONLINE_LAYOUT 0x001 // hard zoom value #define EX_SHOW_BUSINESS_CARDS 0x02 @@ -80,28 +80,28 @@ class SW_DLLPUBLIC SwOneExampleFrame ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > _xController; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > _xCursor; - SwFrmCtrlWindow aTopWindow; - Window& rWindow; - Timer aLoadedTimer; - Link aInitializedLink; + SwFrmCtrlWindow aTopWindow; + Window& rWindow; + Timer aLoadedTimer; + Link aInitializedLink; - MenuResource aMenuRes; - String sArgumentURL; + MenuResource aMenuRes; + String sArgumentURL; - SwView* pModuleView; + SwView* pModuleView; - sal_uInt32 nStyleFlags; + sal_uInt32 nStyleFlags; - sal_Bool bIsInitialized; - sal_Bool bServiceAvailable; + sal_Bool bIsInitialized; + sal_Bool bServiceAvailable; - static sal_Bool bShowServiceNotAvailableMessage; + static sal_Bool bShowServiceNotAvailableMessage; SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer* ); SW_DLLPRIVATE DECL_LINK( PopupHdl, Menu* ); - SW_DLLPRIVATE void CreateControl(); - SW_DLLPRIVATE void DisposeControl(); + SW_DLLPRIVATE void CreateControl(); + SW_DLLPRIVATE void DisposeControl(); public: SwOneExampleFrame(Window& rWin, @@ -110,10 +110,10 @@ public: String* pURL = 0); ~SwOneExampleFrame(); - STAR_REFERENCE( awt::XControl ) & GetControl() {return _xControl; } - STAR_REFERENCE( frame::XModel ) & GetModel() {return _xModel;} - STAR_REFERENCE( frame::XController ) & GetController() {return _xController;} - STAR_REFERENCE( text::XTextCursor ) & GetTextCursor() {return _xCursor;} + STAR_REFERENCE( awt::XControl ) & GetControl() {return _xControl; } + STAR_REFERENCE( frame::XModel ) & GetModel() {return _xModel;} + STAR_REFERENCE( frame::XController ) & GetController() {return _xController;} + STAR_REFERENCE( text::XTextCursor ) & GetTextCursor() {return _xCursor;} void ClearDocument( BOOL bStartTimer = FALSE ); @@ -122,7 +122,7 @@ public: void CreatePopup(const Point& rPt); - static void CreateErrorMessage(Window* pParent); + static void CreateErrorMessage(Window* pParent); }; #endif diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index 974eef497bfa..726cebaf04e7 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.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,7 +44,7 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/datatransfer/XTransferableSupplier.hpp> -#include <cppuhelper/implbase8.hxx> // helper for implementations +#include <cppuhelper/implbase8.hxx> // helper for implementations #include <svl/itemprop.hxx> #include "calbck.hxx" #include "TextCursorHelper.hxx" @@ -75,8 +75,8 @@ class SwXTextView : const SfxItemPropertySet* m_pPropSet; // property map for SwXTextView properties // (not related to pxViewSettings!) - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > * pxTextViewCursor; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings; + ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > * pxTextViewCursor; SdrObject* GetControl( @@ -89,7 +89,7 @@ public: SwXTextView(SwView* pSwView); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire( ) throw(); virtual void SAL_CALL release( ) throw(); @@ -147,7 +147,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException); - void NotifySelChanged(); + void NotifySelChanged(); void NotifyDBChanged(); SwView* GetView() {return m_pView;} @@ -258,10 +258,10 @@ public: void Invalidate(){m_pView = 0;} // ITextCursorHelper - virtual const SwPaM* GetPaM() const; - virtual SwPaM* GetPaM(); - virtual const SwDoc* GetDoc() const; - virtual SwDoc* GetDoc(); + virtual const SwPaM* GetPaM() const; + virtual SwPaM* GetPaM(); + virtual const SwDoc* GetDoc() const; + virtual SwDoc* GetDoc(); }; #endif diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index 3d2ec33f14b1..db607c05b423 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.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 @@ -39,8 +39,8 @@ class SwMasterUsrPref; class SwContentViewConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; - BOOL bWeb; + SwMasterUsrPref& rParent; + BOOL bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: @@ -52,13 +52,13 @@ class SwContentViewConfig : public utl::ConfigItem virtual void Commit(); void Load(); - void SetModified(){ConfigItem::SetModified();} + void SetModified(){ConfigItem::SetModified();} }; class SwLayoutViewConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; - BOOL bWeb; + SwMasterUsrPref& rParent; + BOOL bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: @@ -66,15 +66,15 @@ class SwLayoutViewConfig : public utl::ConfigItem ~SwLayoutViewConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void Commit(); - void Load(); - void SetModified(){ConfigItem::SetModified();} + virtual void Commit(); + void Load(); + void SetModified(){ConfigItem::SetModified();} }; class SwGridConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; - BOOL bWeb; + SwMasterUsrPref& rParent; + BOOL bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: @@ -83,13 +83,13 @@ class SwGridConfig : public utl::ConfigItem virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void Load(); - void SetModified(){ConfigItem::SetModified();} + void Load(); + void SetModified(){ConfigItem::SetModified();} }; class SwCursorConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; + SwMasterUsrPref& rParent; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: @@ -98,13 +98,13 @@ class SwCursorConfig : public utl::ConfigItem virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void Load(); - void SetModified(){ConfigItem::SetModified();} + void Load(); + void SetModified(){ConfigItem::SetModified();} }; class SwWebColorConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; + SwMasterUsrPref& rParent; com::sun::star::uno::Sequence<rtl::OUString> aPropNames; public: @@ -113,8 +113,8 @@ class SwWebColorConfig : public utl::ConfigItem virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void Load(); - void SetModified(){ConfigItem::SetModified();} + void Load(); + void SetModified(){ConfigItem::SetModified();} }; class SwMasterUsrPref : public SwViewOption @@ -126,14 +126,14 @@ class SwMasterUsrPref : public SwViewOption friend class SwWebColorConfig; SwFldUpdateFlags eFldUpdateFlags; //udpate of fields and charts - sal_Int32 nLinkUpdateMode; - FieldUnit eUserMetric; + sal_Int32 nLinkUpdateMode; + FieldUnit eUserMetric; FieldUnit eHScrollMetric; sal_Bool bIsHScrollMetricSet; FieldUnit eVScrollMetric; sal_Bool bIsVScrollMetricSet; - sal_Int32 nDefTab; //default tab stop distance + sal_Int32 nDefTab; //default tab stop distance sal_Bool bIsSquaredPageMode; //default page mode for text grid SwContentViewConfig aContentConfig; @@ -218,7 +218,7 @@ public: }; sal_Bool IsUpdateCharts()const {return eFldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; } - FieldUnit GetMetric() const { return eUserMetric;} + FieldUnit GetMetric() const { return eUserMetric;} void SetMetric(FieldUnit eSet, sal_Bool bNoModify = sal_False) { eUserMetric = eSet; @@ -262,14 +262,14 @@ public: if(!bNoModify) aLayoutConfig.SetModified(); } - + //default page mode for text grid sal_Bool IsSquaredPageMode() const {return bIsSquaredPageMode;} - void SetDefaultPageMode( sal_Bool bVal, sal_Bool bNoModify = sal_False ) - { + void SetDefaultPageMode( sal_Bool bVal, sal_Bool bNoModify = sal_False ) + { bIsSquaredPageMode = bVal; if(!bNoModify) - aLayoutConfig.SetModified(); + aLayoutConfig.SetModified(); } }; diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc index aa7dab24054a..17961add6636 100644 --- a/sw/source/ui/inc/utlui.hrc +++ b/sw/source/ui/inc/utlui.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,21 +31,21 @@ #include "rcid.hrc" -#define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1) -#define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2) +#define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1) +#define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2) // ------------------------------------------------------------------------ // Strings in NumberFormatter-Listbox -#define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4) +#define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4) // hyperlink status bar control #define STR_HYPERCTRL_SEL (RC_UTLUI_BEGIN + 5) #define STR_HYPERCTRL_HYP (RC_UTLUI_BEGIN + 6) // Namene der Inhaltstypen (RC_UTLUI_BEGIN + 7) #define STR_CONTENT_TYPE_FIRST (RC_UTLUI_BEGIN + 8) -#define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST -#define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9) +#define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST +#define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9) #define STR_CONTENT_TYPE_FRAME (RC_UTLUI_BEGIN + 10) #define STR_CONTENT_TYPE_GRAPHIC (RC_UTLUI_BEGIN + 11) #define STR_CONTENT_TYPE_OLE (RC_UTLUI_BEGIN + 12) @@ -53,14 +53,14 @@ #define STR_CONTENT_TYPE_REGION (RC_UTLUI_BEGIN + 14) #define STR_CONTENT_TYPE_URLFIELD (RC_UTLUI_BEGIN + 15) #define STR_CONTENT_TYPE_REFERENCE (RC_UTLUI_BEGIN + 16) -#define STR_CONTENT_TYPE_INDEX (RC_UTLUI_BEGIN + 17) -#define STR_CONTENT_TYPE_POSTIT (RC_UTLUI_BEGIN + 18) -#define STR_CONTENT_TYPE_DRAWOBJECT (RC_UTLUI_BEGIN + 19) -#define STR_CONTENT_END (RC_UTLUI_BEGIN + 19) - -#define STR_CONTENT_TYPE_SINGLE_FIRST (STR_CONTENT_END + 1) -#define STR_CONTENT_TYPE_SINGLE_OUTLINE (STR_CONTENT_TYPE_SINGLE_FIRST + 0) -#define STR_CONTENT_TYPE_SINGLE_TABLE (STR_CONTENT_TYPE_SINGLE_FIRST + 1) +#define STR_CONTENT_TYPE_INDEX (RC_UTLUI_BEGIN + 17) +#define STR_CONTENT_TYPE_POSTIT (RC_UTLUI_BEGIN + 18) +#define STR_CONTENT_TYPE_DRAWOBJECT (RC_UTLUI_BEGIN + 19) +#define STR_CONTENT_END (RC_UTLUI_BEGIN + 19) + +#define STR_CONTENT_TYPE_SINGLE_FIRST (STR_CONTENT_END + 1) +#define STR_CONTENT_TYPE_SINGLE_OUTLINE (STR_CONTENT_TYPE_SINGLE_FIRST + 0) +#define STR_CONTENT_TYPE_SINGLE_TABLE (STR_CONTENT_TYPE_SINGLE_FIRST + 1) #define STR_CONTENT_TYPE_SINGLE_FRAME (STR_CONTENT_TYPE_SINGLE_FIRST + 2) #define STR_CONTENT_TYPE_SINGLE_GRAPHIC (STR_CONTENT_TYPE_SINGLE_FIRST + 3) #define STR_CONTENT_TYPE_SINGLE_OLE (STR_CONTENT_TYPE_SINGLE_FIRST + 4) @@ -71,24 +71,24 @@ #define STR_CONTENT_TYPE_SINGLE_INDEX (STR_CONTENT_TYPE_SINGLE_FIRST + 9) #define STR_CONTENT_TYPE_SINGLE_POSTIT (STR_CONTENT_TYPE_SINGLE_FIRST + 10) #define STR_CONTENT_TYPE_SINGLE_DRAWOBJECT (STR_CONTENT_TYPE_SINGLE_FIRST + 11) -#define STR_CONTENT_SINGLE_END STR_CONTENT_TYPE_SINGLE_DRAWOBJECT - -#define FLD_DOCINFO_BEGIN STR_CONTENT_SINGLE_END -#define FLD_DOCINFO_TITEL FLD_DOCINFO_BEGIN -#define FLD_DOCINFO_THEMA (FLD_DOCINFO_BEGIN + 1) -#define FLD_DOCINFO_KEYS (FLD_DOCINFO_BEGIN + 2) -#define FLD_DOCINFO_COMMENT (FLD_DOCINFO_BEGIN + 3) -#define FLD_DOCINFO_CREATE (FLD_DOCINFO_BEGIN + 4) -#define FLD_DOCINFO_CHANGE (FLD_DOCINFO_BEGIN + 5) -#define FLD_DOCINFO_PRINT (FLD_DOCINFO_BEGIN + 6) -#define FLD_DOCINFO_DOCNO (FLD_DOCINFO_BEGIN + 7) -#define FLD_DOCINFO_EDIT (FLD_DOCINFO_BEGIN + 8) -#define FLD_DOCINFO_END (FLD_DOCINFO_BEGIN + 9) - -#define STR_SERVICE_UNAVAILABLE (FLD_DOCINFO_END + 1) - -#define STR_AUTH_TYPE_START (FLD_DOCINFO_END + 2) -#define STR_AUTH_TYPE_ARTICLE (STR_AUTH_TYPE_START + 0) +#define STR_CONTENT_SINGLE_END STR_CONTENT_TYPE_SINGLE_DRAWOBJECT + +#define FLD_DOCINFO_BEGIN STR_CONTENT_SINGLE_END +#define FLD_DOCINFO_TITEL FLD_DOCINFO_BEGIN +#define FLD_DOCINFO_THEMA (FLD_DOCINFO_BEGIN + 1) +#define FLD_DOCINFO_KEYS (FLD_DOCINFO_BEGIN + 2) +#define FLD_DOCINFO_COMMENT (FLD_DOCINFO_BEGIN + 3) +#define FLD_DOCINFO_CREATE (FLD_DOCINFO_BEGIN + 4) +#define FLD_DOCINFO_CHANGE (FLD_DOCINFO_BEGIN + 5) +#define FLD_DOCINFO_PRINT (FLD_DOCINFO_BEGIN + 6) +#define FLD_DOCINFO_DOCNO (FLD_DOCINFO_BEGIN + 7) +#define FLD_DOCINFO_EDIT (FLD_DOCINFO_BEGIN + 8) +#define FLD_DOCINFO_END (FLD_DOCINFO_BEGIN + 9) + +#define STR_SERVICE_UNAVAILABLE (FLD_DOCINFO_END + 1) + +#define STR_AUTH_TYPE_START (FLD_DOCINFO_END + 2) +#define STR_AUTH_TYPE_ARTICLE (STR_AUTH_TYPE_START + 0) #define STR_AUTH_TYPE_BOOK (STR_AUTH_TYPE_START + 1) #define STR_AUTH_TYPE_BOOKLET (STR_AUTH_TYPE_START + 2) #define STR_AUTH_TYPE_CONFERENCE (STR_AUTH_TYPE_START + 3) @@ -110,10 +110,10 @@ #define STR_AUTH_TYPE_CUSTOM3 (STR_AUTH_TYPE_START + 19) #define STR_AUTH_TYPE_CUSTOM4 (STR_AUTH_TYPE_START + 20) #define STR_AUTH_TYPE_CUSTOM5 (STR_AUTH_TYPE_START + 21) -#define STR_AUTH_TYPE_END (STR_AUTH_TYPE_CUSTOM5) +#define STR_AUTH_TYPE_END (STR_AUTH_TYPE_CUSTOM5) -#define STR_AUTH_FIELD_START (STR_AUTH_TYPE_END + 1) -#define STR_AUTH_FIELD_IDENTIFIER (STR_AUTH_FIELD_START + 0) +#define STR_AUTH_FIELD_START (STR_AUTH_TYPE_END + 1) +#define STR_AUTH_FIELD_IDENTIFIER (STR_AUTH_FIELD_START + 0) #define STR_AUTH_FIELD_AUTHORITY_TYPE (STR_AUTH_FIELD_START + 1) #define STR_AUTH_FIELD_ADDRESS (STR_AUTH_FIELD_START + 2) #define STR_AUTH_FIELD_ANNOTE (STR_AUTH_FIELD_START + 3) @@ -144,24 +144,24 @@ #define STR_AUTH_FIELD_CUSTOM4 (STR_AUTH_FIELD_START + 28) #define STR_AUTH_FIELD_CUSTOM5 (STR_AUTH_FIELD_START + 29) #define STR_AUTH_FIELD_ISBN (STR_AUTH_FIELD_START + 30) -#define STR_AUTH_FIELD_END (STR_AUTH_FIELD_ISBN) +#define STR_AUTH_FIELD_END (STR_AUTH_FIELD_ISBN) -#define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) +#define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) -#define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1) +#define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1) #define DLG_ADDR_PI (RC_UTLUI_BEGIN + 2) #define DLG_GLOSSARY_DECIDE_DLG (RC_UTLUI_BEGIN + 3) -#define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4) +#define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4) #define IMG_NAVI_ENTRYBMPH (RC_UTLUI_BEGIN + 5) #define ILIST_DB_DLG (RC_UTLUI_BEGIN + 6) #define ILIST_DB_DLG_HC (RC_UTLUI_BEGIN + 7) -#define IMG_ONE_LEFT_HC (RC_UTLUI_BEGIN + 8) -#define IMG_ONE_RIGHT_HC (RC_UTLUI_BEGIN + 9) -#define IMG_ALL_LEFT_HC (RC_UTLUI_BEGIN + 10) -#define IMG_ALL_RIGHT_HC (RC_UTLUI_BEGIN + 11) +#define IMG_ONE_LEFT_HC (RC_UTLUI_BEGIN + 8) +#define IMG_ONE_RIGHT_HC (RC_UTLUI_BEGIN + 9) +#define IMG_ALL_LEFT_HC (RC_UTLUI_BEGIN + 10) +#define IMG_ALL_RIGHT_HC (RC_UTLUI_BEGIN + 11) #define IMG_VIEWLAYOUT_AUTOMATIC (RC_UTLUI_BEGIN + 12) @@ -185,7 +185,7 @@ #define IMG_DBTABLE 2 #define IMG_DBQUERY 3 -#define UTLUI_ACT_END RES_FRMEX_MENU +#define UTLUI_ACT_END RES_FRMEX_MENU #if UTLUI_ACT_END > RC_UTLUI_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 6a5b63db7628..eb788c5c0876 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.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 @@ -102,8 +102,8 @@ namespace com{ namespace sun { namespace star { namespace sfx2 { class FileDialogHelper; } const long nLeftOfst = -370; -const long nScrollX = 30; -const long nScrollY = 30; +const long nScrollX = 30; +const long nScrollY = 30; #define MINZOOM 20 #define MAXZOOM 600 @@ -134,7 +134,7 @@ enum ShellModes }; /*-------------------------------------------------------------------- - Beschreibung: Anwendung einer Vorlage + Beschreibung: Anwendung einer Vorlage --------------------------------------------------------------------*/ struct SwApplyTemplate { @@ -142,9 +142,9 @@ struct SwApplyTemplate { SwTxtFmtColl* pTxtColl; SwPageDesc* pPageDesc; - SwFrmFmt* pFrmFmt; - SwCharFmt* pCharFmt; - SwNumRule* pNumRule; + SwFrmFmt* pFrmFmt; + SwCharFmt* pCharFmt; + SwNumRule* pNumRule; } aColl; int eType; @@ -163,7 +163,7 @@ struct SwApplyTemplate }; /*-------------------------------------------------------------------- - Beschreibung: Sicht auf ein Dokument + Beschreibung: Sicht auf ein Dokument --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwView: public SfxViewShell { @@ -180,90 +180,90 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SvxSearchDialog *pSrchDlg; static SvxSearchItem *pSrchItem; - static USHORT nInsertCtrlState; - static USHORT nWebInsertCtrlState; - static USHORT nInsertObjectCtrlState; - static USHORT nInsertFieldCtrlState; - static USHORT nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi) + static USHORT nInsertCtrlState; + static USHORT nWebInsertCtrlState; + static USHORT nInsertObjectCtrlState; + static USHORT nInsertFieldCtrlState; + static USHORT nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi) static sal_Int32 nActMark; // aktuelle Sprungmarke fuer unbenannte Merker static BOOL bExtra; static BOOL bFound; - static BOOL bJustOpened; + static BOOL bJustOpened; static SearchAttrItemList* pSrchList; static SearchAttrItemList* pReplList; SvxHtmlOptions aHTMLOpt; - Timer aTimer; //Fuer verzoegerte ChgLnks waehrend + Timer aTimer; //Fuer verzoegerte ChgLnks waehrend //einer Aktion - String aPageStr; //Statusanzeige, aktuelle Seite - String sSwViewData, + String aPageStr; //Statusanzeige, aktuelle Seite + String sSwViewData, //and the new cursor position if the user double click in the PagePreView sNewCrsrPos; // to support keyboard the number of the page to go to can be set too USHORT nNewPage; - Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus + Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus //aus dem Dokument heraus. SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule #i23726# - Size aDocSz; // aktuelle Dokumentgroesse - Rectangle aVisArea; // sichtbarer Bereich + Size aDocSz; // aktuelle Dokumentgroesse + Rectangle aVisArea; // sichtbarer Bereich - SwEditWin *pEditWin; - SwWrtShell *pWrtShell; + SwEditWin *pEditWin; + SwWrtShell *pWrtShell; - SfxShell *pShell; //aktuelle SubShell auf dem Dispatcher - FmFormShell *pFormShell; // DB-FormShell + SfxShell *pShell; //aktuelle SubShell auf dem Dispatcher + FmFormShell *pFormShell; // DB-FormShell - SwView_Impl *pViewImpl; // Impl-Daten fuer UNO + Basic + SwView_Impl *pViewImpl; // Impl-Daten fuer UNO + Basic - SwScrollbar *pHScrollbar, // MDI Bedienelemente + SwScrollbar *pHScrollbar, // MDI Bedienelemente *pVScrollbar; - Window *pScrollFill; // Dummy-Window zum Fuellen der rechten + Window *pScrollFill; // Dummy-Window zum Fuellen der rechten // unteren Ecke, wenn beide Scrollbars // aktiv sind SvxRuler *pHRuler, *pVRuler; - ImageButton *pTogglePageBtn; + ImageButton *pTogglePageBtn; - SwHlpImageButton *pPageUpBtn, + SwHlpImageButton *pPageUpBtn, *pPageDownBtn; - SwNaviImageButton *pNaviBtn; - SwGlossaryHdl *pGlosHdl; // Henkel Textbausteine - SwDrawBase *pDrawActual; + SwNaviImageButton *pNaviBtn; + SwGlossaryHdl *pGlosHdl; // Henkel Textbausteine + SwDrawBase *pDrawActual; - const SwFrmFmt *pLastTableFormat; + const SwFrmFmt *pLastTableFormat; SwFormatClipboard *pFormatClipboard; //holds data for format paintbrush - SwPostItMgr *mpPostItMgr; + SwPostItMgr *mpPostItMgr; - int nSelectionType; + int nSelectionType; static const int MASTERENUMCOMMANDS = 6; - String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; + String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; USHORT nPageCnt; // Aktueller Drawmode - USHORT nDrawSfxId; + USHORT nDrawSfxId; String sDrawCustom; //some drawing types are marked with strings! - USHORT nFormSfxId; - USHORT nLastPasteDestination; + USHORT nFormSfxId; + USHORT nLastPasteDestination; // save the border distance status from SwView::StateTabWin to re-use it in SwView::ExecTabWin() USHORT nLeftBorderDistance; USHORT nRightBorderDistance; - BOOL bCenterCrsr : 1, + BOOL bCenterCrsr : 1, bTopCrsr : 1, bAllwaysShowSel : 1, bTabColFromDoc : 1, @@ -289,17 +289,17 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // Methoden fuers Suchen // Suchkontext setzen - SW_DLLPRIVATE BOOL SearchAndWrap(BOOL bApi = FALSE); - SW_DLLPRIVATE BOOL SearchAll(USHORT* pFound = 0); - SW_DLLPRIVATE ULONG FUNC_Search( const SwSearchOptions& rOptions ); - SW_DLLPRIVATE void Replace(); + SW_DLLPRIVATE BOOL SearchAndWrap(BOOL bApi = FALSE); + SW_DLLPRIVATE BOOL SearchAll(USHORT* pFound = 0); + SW_DLLPRIVATE ULONG FUNC_Search( const SwSearchOptions& rOptions ); + SW_DLLPRIVATE void Replace(); - BOOL IsDocumentBorder(); + BOOL IsDocumentBorder(); - SW_DLLPRIVATE BOOL IsTextTool() const; + SW_DLLPRIVATE BOOL IsTextTool() const; // Bedienelemente verwalten anlegen - SW_DLLPRIVATE void CreateBtns(); + SW_DLLPRIVATE void CreateBtns(); SW_DLLPRIVATE DECL_LINK( BtnPage, Button * ); SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer * ); @@ -307,38 +307,38 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * ); - inline long GetXScroll() const; - inline long GetYScroll() const; - SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; - SW_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect, + inline long GetXScroll() const; + inline long GetYScroll() const; + SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; + SW_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect, USHORT nRangeX = USHRT_MAX, USHORT nRangeY = USHRT_MAX); - SW_DLLPRIVATE BOOL GetPageScrollUpOffset(SwTwips& rOff) const; - SW_DLLPRIVATE BOOL GetPageScrollDownOffset(SwTwips& rOff) const; + SW_DLLPRIVATE BOOL GetPageScrollUpOffset(SwTwips& rOff) const; + SW_DLLPRIVATE BOOL GetPageScrollDownOffset(SwTwips& rOff) const; // Scrollbar Movements - SW_DLLPRIVATE long PageUp(); - SW_DLLPRIVATE long PageDown(); - SW_DLLPRIVATE long PageUpCrsr(BOOL bSelect); - SW_DLLPRIVATE long PageDownCrsr(BOOL bSelect); - SW_DLLPRIVATE long PhyPageUp(); - SW_DLLPRIVATE long PhyPageDown(); + SW_DLLPRIVATE long PageUp(); + SW_DLLPRIVATE long PageDown(); + SW_DLLPRIVATE long PageUpCrsr(BOOL bSelect); + SW_DLLPRIVATE long PageDownCrsr(BOOL bSelect); + SW_DLLPRIVATE long PhyPageUp(); + SW_DLLPRIVATE long PhyPageDown(); SW_DLLPRIVATE int _CreateScrollbar( BOOL bHori ); SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * ); SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * ); SW_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); - SW_DLLPRIVATE BOOL UpdateScrollbars(); - SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz ); + SW_DLLPRIVATE BOOL UpdateScrollbars(); + SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz ); SW_DLLPRIVATE void CreatePageButtons(BOOL bShow); // Linguistik-Funktionen - SW_DLLPRIVATE void HyphenateDocument(); - SW_DLLPRIVATE BOOL IsDrawTextHyphenate(); - SW_DLLPRIVATE void HyphenateDrawText(); - SW_DLLPRIVATE void StartThesaurus(); + SW_DLLPRIVATE void HyphenateDocument(); + SW_DLLPRIVATE BOOL IsDrawTextHyphenate(); + SW_DLLPRIVATE void HyphenateDrawText(); + SW_DLLPRIVATE void StartThesaurus(); // text conversion SW_DLLPRIVATE void StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ); @@ -349,60 +349,60 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 ); SW_DLLPRIVATE void HyphStart( SvxSpellArea eSpell ); - SW_DLLPRIVATE BOOL CheckSpecialCntnt(); - SW_DLLPRIVATE void SpellKontext(BOOL bOn = TRUE) + SW_DLLPRIVATE BOOL CheckSpecialCntnt(); + SW_DLLPRIVATE void SpellKontext(BOOL bOn = TRUE) { bCenterCrsr = bOn; bAllwaysShowSel = bOn; } // Methoden fuers Printing - SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window* pParent ); - SfxTabPage* CreatePrintOptionsPage( Window* pParent, + SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); + SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window* pParent ); + SfxTabPage* CreatePrintOptionsPage( Window* pParent, const SfxItemSet& rSet); // fuer Readonly-Umschaltung - SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - SW_DLLPRIVATE void _CheckReadonlyState(); - SW_DLLPRIVATE void _CheckReadonlySelection(); + SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + SW_DLLPRIVATE void _CheckReadonlyState(); + SW_DLLPRIVATE void _CheckReadonlySelection(); // Methode fuer PageDesc drehen - SW_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR); + SW_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR); - SW_DLLPRIVATE void _SetZoom( const Size &rEditSz, + SW_DLLPRIVATE void _SetZoom( const Size &rEditSz, SvxZoomType eZoomType, short nFactor = 100, BOOL bViewOnly = FALSE); - SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, BOOL bInner ); + SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, BOOL bInner ); - SW_DLLPRIVATE void ShowAtResize(); + SW_DLLPRIVATE void ShowAtResize(); - SW_DLLPRIVATE virtual void Move(); + SW_DLLPRIVATE virtual void Move(); SW_DLLPRIVATE BOOL InsertGraphicDlg( SfxRequest& ); protected: - SwView_Impl* GetViewImpl() {return pViewImpl;} + SwView_Impl* GetViewImpl() {return pViewImpl;} void ImpSetVerb( int nSelType ); - int GetSelectionType() const { return nSelectionType; } - void SetSelectionType(int nSet) { nSelectionType = nSet;} + int GetSelectionType() const { return nSelectionType; } + void SetSelectionType(int nSet) { nSelectionType = nSet;} // fuer die SwWebView - void SetShell( SfxShell* pS ) { pShell = pS; } - void SetFormShell( FmFormShell* pSh ) { pFormShell = pSh; } + void SetShell( SfxShell* pS ) { pShell = pS; } + void SetFormShell( FmFormShell* pSh ) { pFormShell = pSh; } - virtual void SelectShell(); + virtual void SelectShell(); - virtual void Activate(BOOL); - virtual void Deactivate(BOOL); - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual Size GetOptimalSizePixel() const; + virtual void Activate(BOOL); + virtual void Deactivate(BOOL); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual Size GetOptimalSizePixel() const; - void SetImageButtonColor(Color& rColor); + void SetImageButtonColor(Color& rColor); const SwFrmFmt* GetLastTblFrmFmt() const {return pLastTableFormat;} - void SetLastTblFrmFmt(const SwFrmFmt* pSet) {pLastTableFormat = pSet;} + void SetLastTblFrmFmt(const SwFrmFmt* pSet) {pLastTableFormat = pSet;} // form letter execution void GenerateFormLetter(BOOL bUseCurrentDocument); @@ -415,26 +415,26 @@ public: SFX_DECL_INTERFACE(SW_VIEWSHELL) TYPEINFO(); - SfxDispatcher &GetDispatcher(); + SfxDispatcher &GetDispatcher(); void GotFocus() const; - virtual SdrView* GetDrawView() const; - virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); - virtual void ShowCursor( bool bOn = TRUE ); - virtual ErrCode DoVerb( long nVerb ); + virtual SdrView* GetDrawView() const; + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); + virtual void ShowCursor( bool bOn = TRUE ); + virtual ErrCode DoVerb( long nVerb ); - virtual USHORT SetPrinter( SfxPrinter* pNew, + virtual USHORT SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false); - ShellModes GetShellMode(); + ShellModes GetShellMode(); - com::sun::star::view::XSelectionSupplier* GetUNOObject(); + com::sun::star::view::XSelectionSupplier* GetUNOObject(); - String GetSelectionTextParam( BOOL bCompleteWords, + String GetSelectionTextParam( BOOL bCompleteWords, BOOL bEraseTrail ); - virtual BOOL HasSelection( BOOL bText ) const; - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - virtual void MarginChanged(); + virtual BOOL HasSelection( BOOL bText ) const; + virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); + virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual void MarginChanged(); // replace word/selection with text from the thesaurus // (this code has special handling for "in word" character) @@ -443,12 +443,12 @@ public: String GetThesaurusLookUpText( bool bSelection ) const; // Shell sofort wechseln -> fuer GetSelectionObject - void StopShellTimer(); + void StopShellTimer(); - inline SwWrtShell& GetWrtShell () const { return *pWrtShell; } - inline SwWrtShell* GetWrtShellPtr() const { return pWrtShell; } + inline SwWrtShell& GetWrtShell () const { return *pWrtShell; } + inline SwWrtShell* GetWrtShellPtr() const { return pWrtShell; } - inline SwEditWin &GetEditWin() { return *pEditWin; } + inline SwEditWin &GetEditWin() { return *pEditWin; } inline const SwEditWin &GetEditWin () const { return *pEditWin; } #if defined WIN || defined WNT || defined UNX @@ -456,29 +456,29 @@ public: #endif //Handler fuer Textbausteine an die Textshell rausreichen, gfs. anlegen - SwGlossaryHdl* GetGlosHdl(); + SwGlossaryHdl* GetGlosHdl(); - inline const Rectangle& GetVisArea() const { return aVisArea; } + inline const Rectangle& GetVisArea() const { return aVisArea; } - BOOL IsScroll(const Rectangle& rRect) const; - void Scroll( const Rectangle& rRect, + BOOL IsScroll(const Rectangle& rRect) const; + void Scroll( const Rectangle& rRect, USHORT nRangeX = USHRT_MAX, USHORT nRangeY = USHRT_MAX); - long SetVScrollMax(long lMax); - long SetHScrollMax(long lMax); + long SetVScrollMax(long lMax); + long SetHScrollMax(long lMax); DECL_LINK( SpellError, LanguageType * ); - BOOL ExecSpellPopup( const Point& rPt ); + BOOL ExecSpellPopup( const Point& rPt ); BOOL ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); // SMARTTAGS BOOL ExecSmartTagPopup( const Point& rPt ); DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*); - BOOL ExecDrwTxtSpellPopup(const Point& rPt); + BOOL ExecDrwTxtSpellPopup(const Point& rPt); - void SetTabColFromDocPos( const Point &rPt ) { aTabColFromDocPos = rPt; } - void SetTabColFromDoc( BOOL b ) { bTabColFromDoc = b; } + void SetTabColFromDocPos( const Point &rPt ) { aTabColFromDocPos = rPt; } + void SetTabColFromDoc( BOOL b ) { bTabColFromDoc = b; } BOOL IsTabColFromDoc() const { return bTabColFromDoc; } void SetTabRowFromDoc( BOOL b ) { bTabRowFromDoc = b; } BOOL IsTabRowFromDoc() const { return bTabRowFromDoc; } @@ -490,26 +490,26 @@ public: BOOL IsNumIndentFromDoc() const { return NULL != pNumRuleNodeFromDoc; } // <- #i23726# - void DocSzChgd( const Size& rNewSize ); - const Size& GetDocSz() const { return aDocSz; } - virtual void SetVisArea( const Rectangle&, BOOL bUpdateScrollbar = TRUE); - void SetVisArea( const Point&, BOOL bUpdateScrollbar = TRUE); - void CheckVisArea(); + void DocSzChgd( const Size& rNewSize ); + const Size& GetDocSz() const { return aDocSz; } + virtual void SetVisArea( const Rectangle&, BOOL bUpdateScrollbar = TRUE); + void SetVisArea( const Point&, BOOL bUpdateScrollbar = TRUE); + void CheckVisArea(); static LAYOUT_NS Dialog* GetSearchDialog(); - static USHORT GetMoveType(); - static void SetMoveType(USHORT nSet); + static USHORT GetMoveType(); + static void SetMoveType(USHORT nSet); DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416# - static void SetActMark(sal_Int32 nSet); + static void SetActMark(sal_Int32 nSet); - BOOL HandleWheelCommands( const CommandEvent& ); + BOOL HandleWheelCommands( const CommandEvent& ); // Rahmen einfuegen - void InsFrmMode(USHORT nCols); + void InsFrmMode(USHORT nCols); - void SetZoom( SvxZoomType eZoomType, short nFactor = 100, BOOL bViewOnly = FALSE); - virtual void SetZoomFactor( const Fraction &rX, const Fraction & ); + void SetZoom( SvxZoomType eZoomType, short nFactor = 100, BOOL bViewOnly = FALSE); + virtual void SetZoomFactor( const Fraction &rX, const Fraction & ); void SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly = FALSE ); @@ -525,63 +525,63 @@ public: int KillTab(); int StatVLineal() const { return ((Window*)pVRuler)->IsVisible(); } - void ChangeVLinealMetric(FieldUnit eUnit); + void ChangeVLinealMetric(FieldUnit eUnit); void GetVLinealMetric(FieldUnit& rToFill) const; int StatTab() const { return ((Window*)pHRuler)->IsVisible(); } SvxRuler& GetHLineal() { return *pHRuler; } SvxRuler& GetVLineal() { return *pVRuler; } - void InvalidateRulerPos(); - void ChangeTabMetric(FieldUnit eUnit); + void InvalidateRulerPos(); + void ChangeTabMetric(FieldUnit eUnit); void GetHLinealMetric(FieldUnit& rToFill) const; // Handler - void Execute(SfxRequest&); - void ExecPageMove(SfxRequest&); - void ExecStyle(SfxRequest&); - void ExecLingu(SfxRequest&); - void ExecDataBase(SfxRequest&); - void ExecDlg(SfxRequest&); - void ExecDlgExt(SfxRequest&); - void ExecDBDlg(SfxRequest &); - void ExecColl(SfxRequest&); - void ExecutePrint(SfxRequest&); - void ExecDraw(SfxRequest&); - void ExecTabWin(SfxRequest&); - void ExecuteStatusLine(SfxRequest&); + void Execute(SfxRequest&); + void ExecPageMove(SfxRequest&); + void ExecStyle(SfxRequest&); + void ExecLingu(SfxRequest&); + void ExecDataBase(SfxRequest&); + void ExecDlg(SfxRequest&); + void ExecDlgExt(SfxRequest&); + void ExecDBDlg(SfxRequest &); + void ExecColl(SfxRequest&); + void ExecutePrint(SfxRequest&); + void ExecDraw(SfxRequest&); + void ExecTabWin(SfxRequest&); + void ExecuteStatusLine(SfxRequest&); DECL_LINK( ExecRulerClick, Ruler * ); - void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); + void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); void ExecViewOptions(SfxRequest &); void StateViewOptions(SfxItemSet &); void StateSearch(SfxItemSet &); - void GetState(SfxItemSet&); - void StateStatusLine(SfxItemSet&); + void GetState(SfxItemSet&); + void StateStatusLine(SfxItemSet&); // Funktionen fuer Drawing - void SetDrawFuncPtr(SwDrawBase* pFuncPtr); - inline SwDrawBase* GetDrawFuncPtr(/*BOOL bBuf = FALSE*/) const { return pDrawActual; } - void GetDrawState(SfxItemSet &rSet); - void ExitDraw(); - inline BOOL IsDrawRotate() { return bDrawRotate; } - inline void FlipDrawRotate() { bDrawRotate = !bDrawRotate; } - inline BOOL IsDrawSelMode() { return bDrawSelMode; } - void SetSelDrawSlot(); - inline void FlipDrawSelMode() { bDrawSelMode = !bDrawSelMode; } - void NoRotate(); // Rotate-Mode abschalten - BOOL EnterDrawTextMode(const Point& aDocPos); + void SetDrawFuncPtr(SwDrawBase* pFuncPtr); + inline SwDrawBase* GetDrawFuncPtr(/*BOOL bBuf = FALSE*/) const { return pDrawActual; } + void GetDrawState(SfxItemSet &rSet); + void ExitDraw(); + inline BOOL IsDrawRotate() { return bDrawRotate; } + inline void FlipDrawRotate() { bDrawRotate = !bDrawRotate; } + inline BOOL IsDrawSelMode() { return bDrawSelMode; } + void SetSelDrawSlot(); + inline void FlipDrawSelMode() { bDrawSelMode = !bDrawSelMode; } + void NoRotate(); // Rotate-Mode abschalten + BOOL EnterDrawTextMode(const Point& aDocPos); void LeaveDrawCreate() { nDrawSfxId = nFormSfxId = USHRT_MAX; sDrawCustom.Erase();} - BOOL IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); } - BOOL IsFormMode() const; - BOOL IsBezierEditMode(); - BOOL AreOnlyFormsSelected() const; - BOOL HasDrwObj(SdrObject *pSdrObj) const; - BOOL HasOnlyObj(SdrObject *pSdrObj, UINT32 eObjInventor) const; - BOOL BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL, + BOOL IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); } + BOOL IsFormMode() const; + BOOL IsBezierEditMode(); + BOOL AreOnlyFormsSelected() const; + BOOL HasDrwObj(SdrObject *pSdrObj) const; + BOOL HasOnlyObj(SdrObject *pSdrObj, UINT32 eObjInventor) const; + BOOL BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL, Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false ); - void StateTabWin(SfxItemSet&); + void StateTabWin(SfxItemSet&); // Attribute haben sich geaendert DECL_LINK( AttrChangedNotify, SwWrtShell * ); @@ -590,34 +590,34 @@ public: DECL_LINK( FormControlActivated, FmFormShell* ); // Links bearbeiten - void EditLinkDlg(); - void AutoCaption(const USHORT nType, const SvGlobalName *pOleId = 0); - void InsertCaption(const InsCaptionOpt *pOpt); + void EditLinkDlg(); + void AutoCaption(const USHORT nType, const SvGlobalName *pOleId = 0); + void InsertCaption(const InsCaptionOpt *pOpt); // Async Aufruf durch Core void UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr); - String GetPageStr(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr); + String GetPageStr(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr); // Shell rausreichen - SfxShell *GetCurShell() { return pShell; } - SwDocShell *GetDocShell(); - inline const SwDocShell *GetDocShell() const; - inline FmFormShell *GetFormShell() { return pFormShell; } - inline const FmFormShell *GetFormShell() const { return pFormShell; } + SfxShell *GetCurShell() { return pShell; } + SwDocShell *GetDocShell(); + inline const SwDocShell *GetDocShell() const; + inline FmFormShell *GetFormShell() { return pFormShell; } + inline const FmFormShell *GetFormShell() const { return pFormShell; } //damit in DToren der SubShells ggf. pShell zurueckgesetzt werden kann - void ResetSubShell() { pShell = 0; } + void ResetSubShell() { pShell = 0; } - virtual void WriteUserData(String &, BOOL bBrowse = FALSE ); - virtual void ReadUserData(const String &, BOOL bBrowse = FALSE ); + virtual void WriteUserData(String &, BOOL bBrowse = FALSE ); + virtual void ReadUserData(const String &, BOOL bBrowse = FALSE ); virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse ); virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse ); void SetCrsrAtTop( BOOL bFlag, BOOL bCenter = FALSE ) { bTopCrsr = bFlag, bCenterCrsr = bCenter; } - BOOL IsCrsrAtTop() const { return bTopCrsr; } - BOOL IsCrsrAtCenter() const { return bCenterCrsr; } + BOOL IsCrsrAtTop() const { return bTopCrsr; } + BOOL IsCrsrAtCenter() const { return bCenterCrsr; } BOOL JumpToSwMark( const String& rMark ); @@ -681,12 +681,12 @@ inline long SwView::GetYScroll() const return aVisArea.GetHeight() * nScrollY / 100L; } -inline const SwDocShell *SwView::GetDocShell() const +inline const SwDocShell *SwView::GetDocShell() const { return ((SwView*)this)->GetDocShell(); } -SfxTabPage* CreatePrintOptionsPage( Window *pParent, +SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions, BOOL bPreview); diff --git a/sw/source/ui/inc/viewlayoutctrl.hxx b/sw/source/ui/inc/viewlayoutctrl.hxx index 8363955a165e..ccab207954d7 100644 --- a/sw/source/ui/inc/viewlayoutctrl.hxx +++ b/sw/source/ui/inc/viewlayoutctrl.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 diff --git a/sw/source/ui/inc/web.hrc b/sw/source/ui/inc/web.hrc index e9e446d62cdb..7f6f1b8c85f6 100644 --- a/sw/source/ui/inc/web.hrc +++ b/sw/source/ui/inc/web.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 @@ -30,37 +30,37 @@ #include "rcid.hrc" -#define RC_WEB_ICON (RC_WEB_BEGIN + 1) -#define RID_WEBTOOLS_TOOLBOX (RC_WEB_BEGIN + 2) -#define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3) -#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4) -#define STR_WRITER_WEBDOC_FULLTYPE_40 (RC_WEB_BEGIN + 5) -#define STR_SHELLNAME_WEBTEXT (RC_WEB_BEGIN + 6) -#define STR_SHELLNAME_WEBFRAME (RC_WEB_BEGIN + 7) -#define RID_WEBFRAME_TOOLBOX (RC_WEB_BEGIN + 8) -#define STR_WRITER_WEBDOC_FULLTYPE_50 (RC_WEB_BEGIN + 9) -#define RID_WEBGRAPHIC_TOOLBOX (RC_WEB_BEGIN + 10) -#define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) -#define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) +#define RC_WEB_ICON (RC_WEB_BEGIN + 1) +#define RID_WEBTOOLS_TOOLBOX (RC_WEB_BEGIN + 2) +#define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3) +#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4) +#define STR_WRITER_WEBDOC_FULLTYPE_40 (RC_WEB_BEGIN + 5) +#define STR_SHELLNAME_WEBTEXT (RC_WEB_BEGIN + 6) +#define STR_SHELLNAME_WEBFRAME (RC_WEB_BEGIN + 7) +#define RID_WEBFRAME_TOOLBOX (RC_WEB_BEGIN + 8) +#define STR_WRITER_WEBDOC_FULLTYPE_50 (RC_WEB_BEGIN + 9) +#define RID_WEBGRAPHIC_TOOLBOX (RC_WEB_BEGIN + 10) +#define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) +#define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) -#define MN_WEBFILE (RC_WEB_BEGIN + 30) -#define MN_WEBEDIT (RC_WEB_BEGIN + 31) -#define MN_WEBVIEW (RC_WEB_BEGIN + 32) -#define MN_WEBINS (RC_WEB_BEGIN + 33) -#define MN_WEBFORMAT (RC_WEB_BEGIN + 34) -#define MN_WEBEXTRA (RC_WEB_BEGIN + 35) -#define MN_WEBWIN (RC_WEB_BEGIN + 36) +#define MN_WEBFILE (RC_WEB_BEGIN + 30) +#define MN_WEBEDIT (RC_WEB_BEGIN + 31) +#define MN_WEBVIEW (RC_WEB_BEGIN + 32) +#define MN_WEBINS (RC_WEB_BEGIN + 33) +#define MN_WEBFORMAT (RC_WEB_BEGIN + 34) +#define MN_WEBEXTRA (RC_WEB_BEGIN + 35) +#define MN_WEBWIN (RC_WEB_BEGIN + 36) -#define MN_WEB_TEXT_POPUPMENU (RC_WEB_BEGIN + 46) +#define MN_WEB_TEXT_POPUPMENU (RC_WEB_BEGIN + 46) -#define MN_WEBFILE_PORT (RC_WEB_BEGIN + 47) -#define MN_WEBEDIT_PORT (RC_WEB_BEGIN + 48) -#define MN_WEBVIEW_PORT (RC_WEB_BEGIN + 49) -#define MN_WEBINS_PORT (RC_WEB_BEGIN + 50) -#define MN_WEBFORMAT_PORT (RC_WEB_BEGIN + 51) -#define MN_WEBEXTRA_PORT (RC_WEB_BEGIN + 52) -#define MN_WEBWIN_PORT (RC_WEB_BEGIN + 53) +#define MN_WEBFILE_PORT (RC_WEB_BEGIN + 47) +#define MN_WEBEDIT_PORT (RC_WEB_BEGIN + 48) +#define MN_WEBVIEW_PORT (RC_WEB_BEGIN + 49) +#define MN_WEBINS_PORT (RC_WEB_BEGIN + 50) +#define MN_WEBFORMAT_PORT (RC_WEB_BEGIN + 51) +#define MN_WEBEXTRA_PORT (RC_WEB_BEGIN + 52) +#define MN_WEBWIN_PORT (RC_WEB_BEGIN + 53) // ------------------------------------------------------------------------ diff --git a/sw/source/ui/inc/wformsh.hxx b/sw/source/ui/inc/wformsh.hxx index 38e587ff5e35..44fc9769d0d7 100644 --- a/sw/source/ui/inc/wformsh.hxx +++ b/sw/source/ui/inc/wformsh.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 diff --git a/sw/source/ui/inc/wfrmsh.hxx b/sw/source/ui/inc/wfrmsh.hxx index a141842440f2..31750dd38902 100644 --- a/sw/source/ui/inc/wfrmsh.hxx +++ b/sw/source/ui/inc/wfrmsh.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 diff --git a/sw/source/ui/inc/wgrfsh.hxx b/sw/source/ui/inc/wgrfsh.hxx index eaf5e4625007..3d0d9921fbb7 100644 --- a/sw/source/ui/inc/wgrfsh.hxx +++ b/sw/source/ui/inc/wgrfsh.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 diff --git a/sw/source/ui/inc/wlistsh.hxx b/sw/source/ui/inc/wlistsh.hxx index dd3fe48ac9ba..2f34938e0d68 100644 --- a/sw/source/ui/inc/wlistsh.hxx +++ b/sw/source/ui/inc/wlistsh.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 diff --git a/sw/source/ui/inc/wolesh.hxx b/sw/source/ui/inc/wolesh.hxx index 6d714580b8e4..ffb6c81270be 100644 --- a/sw/source/ui/inc/wolesh.hxx +++ b/sw/source/ui/inc/wolesh.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 diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx index 5c6dbabea04f..3d640caac2dd 100644 --- a/sw/source/ui/inc/wordcountdialog.hxx +++ b/sw/source/ui/inc/wordcountdialog.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 @@ -56,7 +56,7 @@ class SwWordCountDialog : public SfxModalDialog OKButton aOK; HelpButton aHelp; -public: +public: SwWordCountDialog(Window* pParent); ~SwWordCountDialog(); diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 364d0d3ab418..ff5ca137ff8f 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.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 @@ -39,8 +39,8 @@ class SwView; // doppelter Eintrag! hrc und hxx // diese Ids bestimmen, was die Buttons unter dem Scrollbar tun #define NID_START 20000 -#define NID_NEXT 20000 -#define NID_PREV 20001 +#define NID_NEXT 20000 +#define NID_PREV 20001 #define NID_TBL 20002 #define NID_FRM 20003 #define NID_PGE 20004 @@ -48,17 +48,17 @@ class SwView; #define NID_CTRL 20006 #define NID_REG 20007 #define NID_BKM 20008 -#define NID_GRF 20009 -#define NID_OLE 20010 -#define NID_OUTL 20011 -#define NID_SEL 20012 -#define NID_FTN 20013 -#define NID_MARK 20014 +#define NID_GRF 20009 +#define NID_OLE 20010 +#define NID_OUTL 20011 +#define NID_SEL 20012 +#define NID_FTN 20013 +#define NID_MARK 20014 #define NID_POSTIT 20015 #define NID_SRCH_REP 20016 #define NID_INDEX_ENTRY 20017 -#define NID_TABLE_FORMULA 20018 -#define NID_TABLE_FORMULA_ERROR 20019 +#define NID_TABLE_FORMULA 20018 +#define NID_TABLE_FORMULA_ERROR 20019 #define NID_COUNT 20 @@ -69,10 +69,10 @@ class SwView; class SwTbxInsertCtrl : public SfxToolBoxControl { - USHORT nLastSlotId; + USHORT nLastSlotId; using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( BOOL bMod1 = FALSE ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -80,9 +80,9 @@ public: SwTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~SwTbxInsertCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); @@ -95,20 +95,20 @@ public: class SwTbxAutoTextCtrl : public SfxToolBoxControl { - PopupMenu* pPopup; - SwView* pView; + PopupMenu* pPopup; + SwView* pView; - void DelPopup(); + void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); SwTbxAutoTextCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~SwTbxAutoTextCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); @@ -122,8 +122,8 @@ public: class SwScrollNaviToolBox : public ToolBox { - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); public: SwScrollNaviToolBox(Window* pParent, WinBits nWinStyle ) : @@ -135,16 +135,16 @@ class SwScrollNaviPopup : public SfxPopupWindow SwScrollNaviToolBox aToolBox; FixedLine aSeparator; FixedInfo aInfoField; - ImageList aIList; + ImageList aIList; ImageList aIListH; - String sQuickHelp[2 * NID_COUNT]; + String sQuickHelp[2 * NID_COUNT]; - USHORT nFwdId; - USHORT nBackId; + USHORT nFwdId; + USHORT nBackId; void ApplyImageList(); - + using Window::GetQuickHelpText; protected: @@ -155,8 +155,8 @@ public: SwScrollNaviPopup( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); ~SwScrollNaviPopup(); - static String GetQuickHelpText(BOOL bNext); - + static String GetQuickHelpText(BOOL bNext); + virtual SfxPopupWindow* Clone() const; void GrabFocus(){aToolBox.GrabFocus();} }; @@ -167,8 +167,8 @@ public: class SwNaviImageButton : public ImageButton { - SwScrollNaviPopup* pPopup; - Image aImage; + SwScrollNaviPopup* pPopup; + Image aImage; Image aImageH; String sQuickText; SfxPopupWindow* pPopupWindow; @@ -178,7 +178,7 @@ class SwNaviImageButton : public ImageButton protected: DECL_LINK( PopupModeEndHdl, void * ); DECL_LINK( ClosePopupWindow, SfxPopupWindow * ); - + virtual void Click(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); void SetPopupWindow( SfxPopupWindow* pWindow ); @@ -188,21 +188,21 @@ class SwNaviImageButton : public ImageButton }; //---------------------------------------------------------------------------- -// Die ImageButtons muessen sich bei Bedarf den HelpText selbst setzen +// Die ImageButtons muessen sich bei Bedarf den HelpText selbst setzen //---------------------------------------------------------------------------- class SwHlpImageButton : public ImageButton { - BOOL bUp; + BOOL bUp; public: SwHlpImageButton(Window* pParent, const ResId& rResId, BOOL bUpBtn) : ImageButton(pParent, rResId), bUp(bUpBtn){} - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); }; /* -----------------26.11.2002 09:25----------------- - * + * * --------------------------------------------------*/ class SwPreviewZoomControl : public SfxToolBoxControl { diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index ef8172ec7218..ce0172e5539d 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.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,63 +45,63 @@ class SwWrtShell; class SwWrapDlg : public SfxSingleTabDialog { - SwWrtShell* pWrtShell; + SwWrtShell* pWrtShell; public: SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode); ~SwWrapDlg(); - inline SwWrtShell* GetWrtShell() { return pWrtShell; } + inline SwWrtShell* GetWrtShell() { return pWrtShell; } }; /*-------------------------------------------------------------------- - Beschreibung: Umlauf-TabPage + Beschreibung: Umlauf-TabPage --------------------------------------------------------------------*/ class SwWrapTabPage: public SfxTabPage { // WRAPPING FixedLine aWrapFLC; - ImageRadioButton aNoWrapRB; - ImageRadioButton aWrapLeftRB; - ImageRadioButton aWrapRightRB; - ImageRadioButton aWrapParallelRB; - ImageRadioButton aWrapThroughRB; - ImageRadioButton aIdealWrapRB; + ImageRadioButton aNoWrapRB; + ImageRadioButton aWrapLeftRB; + ImageRadioButton aWrapRightRB; + ImageRadioButton aWrapParallelRB; + ImageRadioButton aWrapThroughRB; + ImageRadioButton aIdealWrapRB; // MARGIN FixedLine aMarginFL; - FixedText aLeftMarginFT; - MetricField aLeftMarginED; - FixedText aRightMarginFT; - MetricField aRightMarginED; - FixedText aTopMarginFT; - MetricField aTopMarginED; - FixedText aBottomMarginFT; - MetricField aBottomMarginED; + FixedText aLeftMarginFT; + MetricField aLeftMarginED; + FixedText aRightMarginFT; + MetricField aRightMarginED; + FixedText aTopMarginFT; + MetricField aTopMarginED; + FixedText aBottomMarginFT; + MetricField aBottomMarginED; // OPTIONS FixedLine aOptionsSepFL; FixedLine aOptionsFL; CheckBox aWrapAnchorOnlyCB; - CheckBox aWrapTransparentCB; - CheckBox aWrapOutlineCB; - CheckBox aWrapOutsideCB; + CheckBox aWrapTransparentCB; + CheckBox aWrapOutlineCB; + CheckBox aWrapOutsideCB; - ImageList aWrapIL; + ImageList aWrapIL; ImageList aWrapILH; - USHORT nOldLeftMargin; - USHORT nOldRightMargin; - USHORT nOldUpperMargin; - USHORT nOldLowerMargin; + USHORT nOldLeftMargin; + USHORT nOldRightMargin; + USHORT nOldUpperMargin; + USHORT nOldLowerMargin; RndStdIds nAnchorId; - USHORT nHtmlMode; + USHORT nHtmlMode; Size aFrmSize; - SwWrtShell* pWrtSh; + SwWrtShell* pWrtSh; BOOL bFormat; BOOL bNew; @@ -114,8 +114,8 @@ class SwWrapTabPage: public SfxTabPage void ApplyImageList(); void EnableModes(const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); virtual void DataChanged( const DataChangedEvent& rDCEvt ); DECL_LINK( RangeModifyHdl, MetricField * ); @@ -129,14 +129,14 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual BOOL FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual void Reset(const SfxItemSet &rSet); - static USHORT* GetRanges(); - inline void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } - inline void SetFormatUsed(BOOL bFmt, BOOL bDrw) { bFormat = bFmt; + static USHORT* GetRanges(); + inline void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } + inline void SetFormatUsed(BOOL bFmt, BOOL bDrw) { bFormat = bFmt; bDrawMode = bDrw; } - inline void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } + inline void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } }; #endif diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index d35f0246c9db..cd9af8f07a78 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.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 @@ -69,22 +69,22 @@ namespace com { namespace sun { namespace star { namespace util { typedef sal_Int32 SelectionType; namespace nsSelectionType { - const SelectionType SEL_TXT = CNT_TXT; // Text, niemals auch Rahmen 0x0001 - const SelectionType SEL_GRF = CNT_GRF; // Grafik 0x0002 - const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010 - const SelectionType SEL_FRM = 0x000020; // Rahmen, keine Inhaltsform - const SelectionType SEL_NUM = 0x000040; // NumListe - const SelectionType SEL_TBL = 0x000080; // Cursor steht in Tabelle - const SelectionType SEL_TBL_CELLS = 0x000100; // Tabellenzellen sind selektiert - const SelectionType SEL_DRW = 0x000200; // Zeichenobjekte (Rechteck, Kreis...) - const SelectionType SEL_DRW_TXT = 0x000400; // Draw-Textobjekte im Editmode - const SelectionType SEL_BEZ = 0x000800; // Bezierobjekte editieren - const SelectionType SEL_DRW_FORM = 0x001000; // Zeichenobjekte: DB-Forms - const SelectionType SEL_FOC_FRM_CTRL = 0x002000; // a form control is focused. Neither set nor evaluated by the SwWrtShell itself, only by it's clients. - const SelectionType SEL_MEDIA = 0x004000; // Media object - const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape - const SelectionType SEL_FONTWORK = 0x010000; // fontwork - const SelectionType SEL_POSTIT = 0x020000; //annotation + const SelectionType SEL_TXT = CNT_TXT; // Text, niemals auch Rahmen 0x0001 + const SelectionType SEL_GRF = CNT_GRF; // Grafik 0x0002 + const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010 + const SelectionType SEL_FRM = 0x000020; // Rahmen, keine Inhaltsform + const SelectionType SEL_NUM = 0x000040; // NumListe + const SelectionType SEL_TBL = 0x000080; // Cursor steht in Tabelle + const SelectionType SEL_TBL_CELLS = 0x000100; // Tabellenzellen sind selektiert + const SelectionType SEL_DRW = 0x000200; // Zeichenobjekte (Rechteck, Kreis...) + const SelectionType SEL_DRW_TXT = 0x000400; // Draw-Textobjekte im Editmode + const SelectionType SEL_BEZ = 0x000800; // Bezierobjekte editieren + const SelectionType SEL_DRW_FORM = 0x001000; // Zeichenobjekte: DB-Forms + const SelectionType SEL_FOC_FRM_CTRL = 0x002000; // a form control is focused. Neither set nor evaluated by the SwWrtShell itself, only by it's clients. + const SelectionType SEL_MEDIA = 0x004000; // Media object + const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape + const SelectionType SEL_FONTWORK = 0x010000; // fontwork + const SelectionType SEL_POSTIT = 0x020000; //annotation } @@ -109,10 +109,10 @@ public: typedef long (SwWrtShell::*SELECTFUNC)(const Point *, BOOL bProp ); - SELECTFUNC fnDrag; - SELECTFUNC fnSetCrsr; - SELECTFUNC fnEndDrag; - SELECTFUNC fnKillSel; + SELECTFUNC fnDrag; + SELECTFUNC fnSetCrsr; + SELECTFUNC fnEndDrag; + SELECTFUNC fnKillSel; // Alle Selektionen aufheben long ResetSelect( const Point *, BOOL ); @@ -120,112 +120,112 @@ public: //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down //zurueck, falls ein Stack aufgebaut ist inline void ResetCursorStack(); - SelectionType GetSelectionType() const; + SelectionType GetSelectionType() const; - BOOL IsModePushed() const { return 0 != pModeStack; } - void PushMode(); - void PopMode(); + BOOL IsModePushed() const { return 0 != pModeStack; } + void PushMode(); + void PopMode(); - void SttSelect(); - void EndSelect(); - BOOL IsInSelect() const { return bInSelect; } - void SetInSelect(BOOL bSel = TRUE) { bInSelect = bSel; } + void SttSelect(); + void EndSelect(); + BOOL IsInSelect() const { return bInSelect; } + void SetInSelect(BOOL bSel = TRUE) { bInSelect = bSel; } // Liegt eine Text- oder Rahmenselektion vor? BOOL HasSelection() const { return SwCrsrShell::HasSelection() || IsMultiSelection() || IsSelFrmMode() || IsObjSelected(); } BOOL Pop( BOOL bOldCrsr = TRUE ); - void EnterStdMode(); - BOOL IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; } + void EnterStdMode(); + BOOL IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; } - void EnterExtMode(); - void LeaveExtMode(); - long ToggleExtMode(); - BOOL IsExtMode() const { return bExtMode; } + void EnterExtMode(); + void LeaveExtMode(); + long ToggleExtMode(); + BOOL IsExtMode() const { return bExtMode; } - void EnterAddMode(); - void LeaveAddMode(); - long ToggleAddMode(); - BOOL IsAddMode() const { return bAddMode; } + void EnterAddMode(); + void LeaveAddMode(); + long ToggleAddMode(); + BOOL IsAddMode() const { return bAddMode; } - void EnterBlockMode(); - void LeaveBlockMode(); - long ToggleBlockMode(); - BOOL IsBlockMode() const { return bBlockMode; } + void EnterBlockMode(); + void LeaveBlockMode(); + long ToggleBlockMode(); + BOOL IsBlockMode() const { return bBlockMode; } - void SetInsMode( BOOL bOn = TRUE ); - void ToggleInsMode() { SetInsMode( !bIns ); } - BOOL IsInsMode() const { return bIns; } + void SetInsMode( BOOL bOn = TRUE ); + void ToggleInsMode() { SetInsMode( !bIns ); } + BOOL IsInsMode() const { return bIns; } void SetRedlineModeAndCheckInsMode( USHORT eMode ); - void EnterSelFrmMode(const Point *pStartDrag = 0); - void LeaveSelFrmMode(); - BOOL IsSelFrmMode() const { return bLayoutMode; } + void EnterSelFrmMode(const Point *pStartDrag = 0); + void LeaveSelFrmMode(); + BOOL IsSelFrmMode() const { return bLayoutMode; } // Selektion von Rahmen aufheben - void UnSelectFrm(); + void UnSelectFrm(); - void Invalidate(); + void Invalidate(); // Tabellenzellen selektieren fuer Bearbeiten von Formeln in der Ribbonbar inline void SelTblCells( const Link &rLink, BOOL bMark = TRUE ); - inline void EndSelTblCells(); + inline void EndSelTblCells(); //Wortweisen oder zeilenweisen Selektionsmodus verlassen. Wird //in der Regel in MB-Up gerufen. - BOOL IsExtSel() const { return bSelWrd || bSelLn; } + BOOL IsExtSel() const { return bSelWrd || bSelLn; } // erfrage, ob der akt. fnDrag - Pointer auf BeginDrag gesetzt ist // Wird fuer MouseMove gebraucht, um die Bugs 55592/55931 zu umgehen. - inline BOOL Is_FnDragEQBeginDrag() const; + inline BOOL Is_FnDragEQBeginDrag() const; //Basisabfragen - BOOL IsInWrd() { return IsInWord(); } - BOOL IsSttWrd() { return IsStartWord(); } - BOOL IsEndWrd(); - BOOL IsSttOfPara() const { return IsSttPara(); } - BOOL IsEndOfPara() const { return IsEndPara(); } + BOOL IsInWrd() { return IsInWord(); } + BOOL IsSttWrd() { return IsStartWord(); } + BOOL IsEndWrd(); + BOOL IsSttOfPara() const { return IsSttPara(); } + BOOL IsEndOfPara() const { return IsEndPara(); } //Word bzw. Satz selektieren. - BOOL SelNearestWrd(); - BOOL SelWrd (const Point * = 0, BOOL bProp=FALSE ); + BOOL SelNearestWrd(); + BOOL SelWrd (const Point * = 0, BOOL bProp=FALSE ); // --> FME 2004-07-30 #i32329# Enhanced selection void SelSentence (const Point * = 0, BOOL bProp=FALSE ); void SelPara (const Point * = 0, BOOL bProp=FALSE ); // <-- - long SelAll(); + long SelAll(); //Basiscursortravelling typedef BOOL (SwWrtShell:: *FNSimpleMove)(); BOOL SimpleMove( FNSimpleMove, BOOL bSelect ); - BOOL Left ( USHORT nMode, BOOL bSelect, + BOOL Left ( USHORT nMode, BOOL bSelect, USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE ); - BOOL Right ( USHORT nMode, BOOL bSelect, + BOOL Right ( USHORT nMode, BOOL bSelect, USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE ); - BOOL Up ( BOOL bSelect = FALSE, USHORT nCount = 1, + BOOL Up ( BOOL bSelect = FALSE, USHORT nCount = 1, BOOL bBasicCall = FALSE ); - BOOL Down ( BOOL bSelect = FALSE, USHORT nCount = 1, + BOOL Down ( BOOL bSelect = FALSE, USHORT nCount = 1, BOOL bBasicCall = FALSE ); - BOOL NxtWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); } - BOOL PrvWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); } + BOOL NxtWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); } + BOOL PrvWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); } - BOOL LeftMargin ( BOOL bSelect, BOOL bBasicCall ); + BOOL LeftMargin ( BOOL bSelect, BOOL bBasicCall ); BOOL RightMargin( BOOL bSelect, BOOL bBasicCall ); - BOOL SttDoc ( BOOL bSelect = FALSE ); - BOOL EndDoc ( BOOL bSelect = FALSE ); - - BOOL SttNxtPg ( BOOL bSelect = FALSE ); - BOOL SttPrvPg ( BOOL bSelect = FALSE ); - BOOL EndNxtPg ( BOOL bSelect = FALSE ); - BOOL EndPrvPg ( BOOL bSelect = FALSE ); - BOOL SttPg ( BOOL bSelect = FALSE ); - BOOL EndPg ( BOOL bSelect = FALSE ); - BOOL SttPara ( BOOL bSelect = FALSE ); - BOOL EndPara ( BOOL bSelect = FALSE ); - BOOL FwdPara ( BOOL bSelect = FALSE ) + BOOL SttDoc ( BOOL bSelect = FALSE ); + BOOL EndDoc ( BOOL bSelect = FALSE ); + + BOOL SttNxtPg ( BOOL bSelect = FALSE ); + BOOL SttPrvPg ( BOOL bSelect = FALSE ); + BOOL EndNxtPg ( BOOL bSelect = FALSE ); + BOOL EndPrvPg ( BOOL bSelect = FALSE ); + BOOL SttPg ( BOOL bSelect = FALSE ); + BOOL EndPg ( BOOL bSelect = FALSE ); + BOOL SttPara ( BOOL bSelect = FALSE ); + BOOL EndPara ( BOOL bSelect = FALSE ); + BOOL FwdPara ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_FwdPara, bSelect ); } - BOOL BwdPara ( BOOL bSelect = FALSE ) + BOOL BwdPara ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_BwdPara, bSelect ); } BOOL FwdSentence( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_FwdSentence, bSelect ); } @@ -242,30 +242,30 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); BOOL SelectTxtAttr( USHORT nWhich, const SwTxtAttr* pAttr = 0 ); // Spaltenweise Spruenge - BOOL StartOfColumn ( BOOL bSelect = FALSE ); - BOOL EndOfColumn ( BOOL bSelect = FALSE ); - BOOL StartOfNextColumn ( BOOL bSelect = FALSE ); - BOOL EndOfNextColumn ( BOOL bSelect = FALSE ); - BOOL StartOfPrevColumn ( BOOL bSelect = FALSE ); - BOOL EndOfPrevColumn ( BOOL bSelect = FALSE ); + BOOL StartOfColumn ( BOOL bSelect = FALSE ); + BOOL EndOfColumn ( BOOL bSelect = FALSE ); + BOOL StartOfNextColumn ( BOOL bSelect = FALSE ); + BOOL EndOfNextColumn ( BOOL bSelect = FALSE ); + BOOL StartOfPrevColumn ( BOOL bSelect = FALSE ); + BOOL EndOfPrevColumn ( BOOL bSelect = FALSE ); // setze den Cursor auf die Seite "nPage" an den Anfang // zusaetzlich zu der gleichnamigen Implementierung in crsrsh.hxx // werden hier alle bestehenden Selektionen vor dem Setzen des // Cursors aufgehoben - BOOL GotoPage( USHORT nPage, BOOL bRecord ); + BOOL GotoPage( USHORT nPage, BOOL bRecord ); //setzen des Cursors; merken der alten Position fuer Zurueckblaettern. DECL_LINK( ExecFlyMac, void * ); - BOOL PageCrsr(SwTwips lOffset, BOOL bSelect); + BOOL PageCrsr(SwTwips lOffset, BOOL bSelect); // Felder Update - void UpdateInputFlds( SwInputFieldList* pLst = 0, BOOL bOnlyInSel = FALSE ); + void UpdateInputFlds( SwInputFieldList* pLst = 0, BOOL bOnlyInSel = FALSE ); - void NoEdit(BOOL bHideCrsr = TRUE); - void Edit(); - BOOL IsNoEdit() const { return bNoEdit; } + void NoEdit(BOOL bHideCrsr = TRUE); + void Edit(); + BOOL IsNoEdit() const { return bNoEdit; } BOOL IsRetainSelection() const { return mbRetainSelection; } void SetRetainSelection( BOOL bRet ) { mbRetainSelection = bRet; } @@ -274,20 +274,20 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); void ChgDBData(const SwDBData& SwDBData); // Loeschen - long DelToEndOfLine(); - long DelToStartOfLine(); - long DelLine(); - long DelLeft(); + long DelToEndOfLine(); + long DelToStartOfLine(); + long DelLine(); + long DelLeft(); // loescht auch Rahmen bzw. setzt den Cursor in den Rahmen, // wenn bDelFrm == FALSE ist long DelRight(); - long DelToEndOfPara(); - long DelToStartOfPara(); - long DelToEndOfSentence(); - long DelToStartOfSentence(); - long DelNxtWord(); - long DelPrvWord(); + long DelToEndOfPara(); + long DelToStartOfPara(); + long DelToEndOfSentence(); + long DelToStartOfSentence(); + long DelNxtWord(); + long DelPrvWord(); // Prueft, ob eine Wortselektion vorliegt. // Gemaess den Regeln fuer intelligentes Cut / Paste @@ -299,27 +299,27 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); WORD_SPACE_AFTER = 2, WORD_NO_SPACE = 3 }; - int IntelligentCut(int nSelectionType, BOOL bCut = TRUE); + int IntelligentCut(int nSelectionType, BOOL bCut = TRUE); // Editieren - void Insert(SwField &); - void Insert(const String &); + void Insert(SwField &); + void Insert(const String &); // Graphic - void Insert( const String &rPath, const String &rFilter, + void Insert( const String &rPath, const String &rFilter, const Graphic &, SwFlyFrmAttrMgr * = 0, BOOL bRule = FALSE ); - void InsertByWord( const String & ); - void InsertPageBreak(const String *pPageDesc = 0, USHORT nPgNum = 0 ); - void InsertLineBreak(); - void InsertColumnBreak(); - void InsertFootnote(const String &, BOOL bEndNote = FALSE, BOOL bEdit = TRUE ); - void SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE ); - BOOL CanInsert(); + void InsertByWord( const String & ); + void InsertPageBreak(const String *pPageDesc = 0, USHORT nPgNum = 0 ); + void InsertLineBreak(); + void InsertColumnBreak(); + void InsertFootnote(const String &, BOOL bEndNote = FALSE, BOOL bEdit = TRUE ); + void SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE ); + BOOL CanInsert(); // Verzeichnisse - void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); - BOOL UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); + void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); + BOOL UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); // Numerierung und Bullets /** @@ -328,21 +328,21 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); @param bNum TRUE: turn on numbering FALSE: turn on bullets */ - void NumOrBulletOn(BOOL bNum); // #i29560# - void NumOrBulletOff(); // #i29560# + void NumOrBulletOn(BOOL bNum); // #i29560# + void NumOrBulletOff(); // #i29560# void NumOn(); - void BulletOn(); + void BulletOn(); //OLE void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 fuer Clipboard const svt::EmbeddedObjectRef&, - SvGlobalName *pName = 0, // != 0 entspr. Object erzeugen. + SvGlobalName *pName = 0, // != 0 entspr. Object erzeugen. BOOL bActivate = TRUE, USHORT nSlotId = 0); // SlotId fuer Dialog BOOL InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 ); - void LaunchOLEObj( long nVerb = 0 ); // Server starten - BOOL IsOLEObj() const { return GetCntType() == CNT_OLE;} + void LaunchOLEObj( long nVerb = 0 ); // Server starten + BOOL IsOLEObj() const { return GetCntType() == CNT_OLE;} virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ); virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, @@ -353,29 +353,29 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); // Vorlagen und Formate // enum gibt an, was geschehen soll, wenn das Style nicht gefunden wurde - enum GetStyle { GETSTYLE_NOCREATE, // keins anlegen + enum GetStyle { GETSTYLE_NOCREATE, // keins anlegen GETSTYLE_CREATESOME, // falls auf PoolId mapt anlegen - GETSTYLE_CREATEANY }; // ggfs Standard returnen + GETSTYLE_CREATEANY }; // ggfs Standard returnen - SwTxtFmtColl* GetParaStyle(const String &rCollName, + SwTxtFmtColl* GetParaStyle(const String &rCollName, GetStyle eCreate = GETSTYLE_NOCREATE); - SwCharFmt* GetCharStyle(const String &rFmtName, + SwCharFmt* GetCharStyle(const String &rFmtName, GetStyle eCreate = GETSTYLE_NOCREATE); - SwFrmFmt* GetTblStyle(const String &rFmtName); + SwFrmFmt* GetTblStyle(const String &rFmtName); - void SetPageStyle(const String &rCollName); + void SetPageStyle(const String &rCollName); - String GetCurPageStyle( const BOOL bCalcFrm = TRUE ) const; + String GetCurPageStyle( const BOOL bCalcFrm = TRUE ) const; // Aktuelle Vorlage anhand der geltenden Attribute aendern - void QuickUpdateStyle(); + void QuickUpdateStyle(); enum DoType { UNDO, REDO, REPEAT }; - void Do( DoType eDoType, USHORT nCnt = 1 ); - String GetDoString( DoType eDoType ) const; - String GetRepeatString() const; - USHORT GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const; + void Do( DoType eDoType, USHORT nCnt = 1 ); + String GetDoString( DoType eDoType ) const; + String GetRepeatString() const; + USHORT GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const; //Suchen oder Ersetzen ULONG SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt, @@ -400,7 +400,7 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); // Aktion vor Cursorbewegung // Hebt gfs. Selektionen auf, triggert Timer und GCAttr() - void MoveCrsr( BOOL bWithSelect = FALSE ); + void MoveCrsr( BOOL bWithSelect = FALSE ); // Eingabefelder updaten BOOL StartInputFldDlg(SwField*, BOOL bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0); @@ -426,8 +426,8 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); BOOL SelectNextPrevHyperlink( BOOL bNext = TRUE ); // Zugehoerige SwView ermitteln - const SwView& GetView() const { return rView; } - SwView& GetView() { return rView; } + const SwView& GetView() const { return rView; } + SwView& GetView() { return rView; } //Weil es sonst keiner macht, gibt es hier eine ExecMacro() void ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 ); @@ -474,17 +474,17 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); private: - SW_DLLPRIVATE void OpenMark(); - SW_DLLPRIVATE void CloseMark( BOOL bOkFlag ); + SW_DLLPRIVATE void OpenMark(); + SW_DLLPRIVATE void CloseMark( BOOL bOkFlag ); - SW_DLLPRIVATE String GetWrdDelim(); - SW_DLLPRIVATE String GetSDelim(); - SW_DLLPRIVATE String GetBothDelim(); + SW_DLLPRIVATE String GetWrdDelim(); + SW_DLLPRIVATE String GetSDelim(); + SW_DLLPRIVATE String GetBothDelim(); struct ModeStack { - ModeStack *pNext; - BOOL bAdd, + ModeStack *pNext; + BOOL bAdd, bBlock, bExt, bIns; @@ -527,13 +527,13 @@ private: } *pCrsrStack; - SwView &rView; + SwView &rView; - Point aDest; - BOOL bDestOnStack; - BOOL HasCrsrStack() const { return 0 != pCrsrStack; } - SW_DLLPRIVATE BOOL PushCrsr(SwTwips lOffset, BOOL bSelect); - SW_DLLPRIVATE BOOL PopCrsr(BOOL bUpdate, BOOL bSelect = FALSE); + Point aDest; + BOOL bDestOnStack; + BOOL HasCrsrStack() const { return 0 != pCrsrStack; } + SW_DLLPRIVATE BOOL PushCrsr(SwTwips lOffset, BOOL bSelect); + SW_DLLPRIVATE BOOL PopCrsr(BOOL bUpdate, BOOL bSelect = FALSE); // ENDE Cursor bei PageUp / -Down mitnehmen SW_DLLPRIVATE BOOL _SttWrd(); @@ -549,63 +549,63 @@ private: BOOL _FwdPara(); SW_DLLPRIVATE BOOL _BwdPara(); - // Selektionen - BOOL bIns :1; - BOOL bInSelect :1; - BOOL bExtMode :1; - BOOL bAddMode :1; + // Selektionen + BOOL bIns :1; + BOOL bInSelect :1; + BOOL bExtMode :1; + BOOL bAddMode :1; BOOL bBlockMode :1; - BOOL bLayoutMode :1; - BOOL bNoEdit :1; - BOOL bCopy :1; - BOOL bSelWrd :1; - BOOL bSelLn :1; - BOOL bIsInClickToEdit:1; - BOOL bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen + BOOL bLayoutMode :1; + BOOL bNoEdit :1; + BOOL bCopy :1; + BOOL bSelWrd :1; + BOOL bSelLn :1; + BOOL bIsInClickToEdit:1; + BOOL bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen BOOL mbRetainSelection :1; // Do not remove selections - Point aStart; - Link aSelTblLink; + Point aStart; + Link aSelTblLink; - SELECTFUNC fnLeaveSelect; + SELECTFUNC fnLeaveSelect; //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down zurueck. - SW_DLLPRIVATE void _ResetCursorStack(); + SW_DLLPRIVATE void _ResetCursorStack(); - SW_DLLPRIVATE void SttDragDrop(Timer *); + SW_DLLPRIVATE void SttDragDrop(Timer *); using SwCrsrShell::SetCrsr; - SW_DLLPRIVATE long SetCrsr(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long SetCrsr(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long SetCrsrKillSel(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long SetCrsrKillSel(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long StdSelect(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long BeginDrag(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long Drag(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long EndDrag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long StdSelect(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long BeginDrag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long Drag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long EndDrag(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long ExtSelWrd(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long ExtSelLn(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long ExtSelWrd(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long ExtSelLn(const Point *, BOOL bProp=FALSE ); //Verschieben von Text aus Drag and Drop; Point ist //Destination fuer alle Selektionen. - SW_DLLPRIVATE long MoveText(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long MoveText(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long BeginFrmDrag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long BeginFrmDrag(const Point *, BOOL bProp=FALSE ); //nach SSize/Move eines Frames Update; Point ist Destination. - SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long SttLeaveSelect(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long AddLeaveSelect(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long Ignore(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long SttLeaveSelect(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long AddLeaveSelect(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long Ignore(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = FALSE;} - SW_DLLPRIVATE BOOL _CanInsert(); + SW_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = FALSE;} + SW_DLLPRIVATE BOOL _CanInsert(); - SW_DLLPRIVATE BOOL GoStart(BOOL KeepArea = FALSE, BOOL * = 0, + SW_DLLPRIVATE BOOL GoStart(BOOL KeepArea = FALSE, BOOL * = 0, BOOL bSelect = FALSE, BOOL bDontMoveRegion = FALSE); - SW_DLLPRIVATE BOOL GoEnd(BOOL KeepArea = FALSE, BOOL * = 0); + SW_DLLPRIVATE BOOL GoEnd(BOOL KeepArea = FALSE, BOOL * = 0); enum BookMarkMove { @@ -638,10 +638,10 @@ inline void SwWrtShell::EndSelTblCells() inline BOOL SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; } -inline BOOL SwWrtShell::Is_FnDragEQBeginDrag() const +inline BOOL SwWrtShell::Is_FnDragEQBeginDrag() const { #ifdef GCC - SELECTFUNC fnTmp = &SwWrtShell::BeginDrag; + SELECTFUNC fnTmp = &SwWrtShell::BeginDrag; return fnDrag == fnTmp; #else return sal::static_int_cast< BOOL >(fnDrag == &SwWrtShell::BeginDrag); diff --git a/sw/source/ui/inc/wtabsh.hxx b/sw/source/ui/inc/wtabsh.hxx index fbb5b4d9c57f..d88dea2474d4 100644 --- a/sw/source/ui/inc/wtabsh.hxx +++ b/sw/source/ui/inc/wtabsh.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 diff --git a/sw/source/ui/inc/wtextsh.hxx b/sw/source/ui/inc/wtextsh.hxx index b94199828613..e558bcf6aeec 100644 --- a/sw/source/ui/inc/wtextsh.hxx +++ b/sw/source/ui/inc/wtextsh.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 diff --git a/sw/source/ui/inc/wview.hxx b/sw/source/ui/inc/wview.hxx index c76d8bd7d5e1..2c60c6307fe3 100644 --- a/sw/source/ui/inc/wview.hxx +++ b/sw/source/ui/inc/wview.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 @@ -34,7 +34,7 @@ class SW_DLLPUBLIC SwWebView: public SwView { protected: - virtual void SelectShell(); + virtual void SelectShell(); public: SFX_DECL_VIEWFACTORY(SwWebView); diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/ui/inc/zoomctrl.hxx index cfd0c41784ba..ed69f44a621a 100644 --- a/sw/source/ui/inc/zoomctrl.hxx +++ b/sw/source/ui/inc/zoomctrl.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 @@ -36,7 +36,7 @@ private: String sPreviewZoom; public: virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); |