diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 21:01:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 09:41:00 -0600 |
commit | a27462189d1d6a3d22be23a5eee603edca5d8ea3 (patch) | |
tree | 065df066de07f3d7194178352f3449702bc34bd5 /sw/source/ui/inc | |
parent | 150420cbff39967e9376cab05b6af45b642edae8 (diff) |
Remove visual noise from sw
Conflicts:
sw/inc/unodraw.hxx
sw/inc/unoframe.hxx
sw/sdi/swriter.sdi
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/ui/inc/unotxvw.hxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/lingu/sdrhhcwrap.cxx
sw/source/ui/uno/swdetect.hxx
Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/inc')
101 files changed, 14 insertions, 266 deletions
diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx index 8e50e3eab40c..8e39c494f529 100644 --- a/sw/source/ui/inc/SwXFilterOptions.hxx +++ b/sw/source/ui/inc/SwXFilterOptions.hxx @@ -98,5 +98,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index 8d775917ffde..0111eb1de37d 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -40,7 +40,6 @@ public: const Link& GetActionHdl() const { return aActionLink; } }; - /* -------------------------------------------------- * Edit that doesn't accept spaces * --------------------------------------------------*/ diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/ui/inc/annotsh.hxx index 5872c956d239..7592d441b29a 100644 --- a/sw/source/ui/inc/annotsh.hxx +++ b/sw/source/ui/inc/annotsh.hxx @@ -65,7 +65,6 @@ public: void ExecSearch(SfxRequest&, sal_Bool bNoMessage = sal_False); void StateSearch(SfxItemSet &); - virtual ::svl::IUndoManager* GetUndoManager(); }; diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index faf18d8b3347..040485fedc08 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -57,8 +57,6 @@ public: void FillOptions( SwAsciiOptions& rOptions ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx index 385f0d952567..94d81b771527 100644 --- a/sw/source/ui/inc/autoedit.hxx +++ b/sw/source/ui/inc/autoedit.hxx @@ -21,7 +21,6 @@ #include <vcl/edit.hxx> - class AutoEdit : public Edit { public: @@ -33,9 +32,6 @@ protected: // Implementation in autocorr.cxx - - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index bc2e4e5a028b..9875221d4c72 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.hxx @@ -110,7 +110,6 @@ public: static FlyMode GetFrmMode() { return eFrameMode; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx index 42ad20fa6218..a8ce181fd7fc 100644 --- a/sw/source/ui/inc/bookctrl.hxx +++ b/sw/source/ui/inc/bookctrl.hxx @@ -42,7 +42,6 @@ private: OUString sPageNumber; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index 89d369689dec..5f91f6f24fae 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -95,5 +95,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index e78f85057a2b..fbcafa3c228c 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -60,7 +60,6 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem Color aIndexBackgrndCol; - public: TYPEINFO(); SwDocDisplayItem( sal_uInt16 nWhich = FN_PARAM_DOCDISP ); @@ -69,7 +68,6 @@ public: SwDocDisplayItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwDocDisplayItem& ); @@ -106,7 +104,6 @@ public: SwElemItem(const SwElemItem& rElemItem); SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwElemItem& ); @@ -137,7 +134,6 @@ public: const OUString &GetFax() const { return sFaxName; } void SetFax( const OUString& rFax) { sFaxName = rFax; } - sal_Bool IsPrintProspect() const { return bPrintProspect; } sal_Bool IsPrintProspectRTL() const { return bPrintProspectRTL; } void SetPrintProspect(sal_Bool bFlag ){ bPrintProspect = bFlag; } @@ -175,7 +171,6 @@ public: SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwShadowCursorItem& ); diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index ea8e127a4b57..4e8e31acce58 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_CHANGEDB_HXX #define INCLUDED_SW_SOURCE_UI_INC_CHANGEDB_HXX - #include <vcl/bitmap.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx index e2402197c8eb..848653cf45f0 100644 --- a/sw/source/ui/inc/chartins.hxx +++ b/sw/source/ui/inc/chartins.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX #define INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX - Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ); void SwInsertChart( Window *pParent, SfxBindings *pBindings ); diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/ui/inc/chldwrap.hxx index bec1c65438ee..41f771acc2f9 100644 --- a/sw/source/ui/inc/chldwrap.hxx +++ b/sw/source/ui/inc/chldwrap.hxx @@ -42,7 +42,6 @@ public: inline void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx index c69fb5c2b1a7..b3f73001005a 100644 --- a/sw/source/ui/inc/colmgr.hxx +++ b/sw/source/ui/inc/colmgr.hxx @@ -31,7 +31,6 @@ public: SwColMgr(const SfxItemSet &rSet, sal_uInt16 nActWidth = USHRT_MAX); ~SwColMgr(); - inline sal_uInt16 GetCount() const; void SetCount(sal_uInt16 nCount, sal_uInt16 nGutterWidth); sal_uInt16 GetGutterWidth(sal_uInt16 nPos = USHRT_MAX) const; @@ -65,7 +64,6 @@ public: void SetActualWidth(sal_uInt16 nW); sal_uInt16 GetActualSize() const { return nWidth; } - private: SwFmtCol aFmtCol; diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 004b34d0dfb1..2593a35be19c 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX #define INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX - #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <vcl/image.hxx> @@ -61,7 +60,6 @@ class SwColumnDlg : public SfxModalDialog bool bSelSectionChanged : 1; bool bFrameChanged : 1; - DECL_LINK(ObjectHdl, ListBox*); DECL_LINK(OkHdl, void *); diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/ui/inc/conarc.hxx index 9eb6fa87f3da..354a625468f2 100644 --- a/sw/source/ui/inc/conarc.hxx +++ b/sw/source/ui/inc/conarc.hxx @@ -43,8 +43,6 @@ public: virtual void Deactivate(); }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/ui/inc/conform.hxx index 11adb4f045bf..a1226a21f25e 100644 --- a/sw/source/ui/inc/conform.hxx +++ b/sw/source/ui/inc/conform.hxx @@ -33,8 +33,6 @@ public: virtual void CreateDefaultObject(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/ui/inc/conpoly.hxx index 48066efde70d..d91c38e0dd6b 100644 --- a/sw/source/ui/inc/conpoly.hxx +++ b/sw/source/ui/inc/conpoly.hxx @@ -42,7 +42,6 @@ public: virtual void Activate(const sal_uInt16 nSlotId); // activate function }; - #endif // INCLUDED_SW_SOURCE_UI_INC_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 9811f9e1215e..4791935d37ce 100644 --- a/sw/source/ui/inc/conrect.hxx +++ b/sw/source/ui/inc/conrect.hxx @@ -46,8 +46,6 @@ class ConstRectangle : public SwDrawBase virtual void Activate(const sal_uInt16 nSlotId); // activate function }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_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 5ddd8f41fe44..2700bd261e83 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -31,9 +31,7 @@ class SwTxtINetFmt; class SwTOXBase; class SwRangeRedline; -//---------------------------------------------------------------------------- // helper classes -//---------------------------------------------------------------------------- class SwPopup : public PopupMenu { @@ -49,8 +47,6 @@ public: }; -//---------------------------------------------------------------------------- - class SwOutlineContent : public SwContent { sal_uInt16 nOutlinePos; @@ -71,7 +67,6 @@ class SwOutlineContent : public SwContent bool IsMoveable(){return bIsMoveable;}; }; -//---------------------------------------------------------------------------- class SwRegionContent : public SwContent { @@ -86,7 +81,6 @@ class SwRegionContent : public SwContent nRegionLevel(nLevel){} sal_uInt8 GetRegionLevel() const {return nRegionLevel;} }; -//---------------------------------------------------------------------------- class SwURLFieldContent : public SwContent { @@ -107,7 +101,6 @@ public: const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } }; -//---------------------------------------------------------------------------- class SwPostItContent : public SwContent { const SwFmtFld* pFld; @@ -139,8 +132,6 @@ public: bool IsPostIt() {return mbPostIt; } }; -//---------------------------------------------------------------------------- - class SwGraphicContent : public SwContent { OUString sLink; @@ -153,7 +144,6 @@ public: const OUString& GetLink() const {return sLink;} }; -//---------------------------------------------------------------------------- class SwTOXBaseContent : public SwContent { const SwTOXBase* pBase; @@ -171,7 +161,6 @@ public: GetMember. It is reloaded after Invalidate() only if the content should be read again. */ -//---------------------------------------------------------------------------- class SwContentType : public SwTypeNumber { @@ -183,7 +172,7 @@ class SwContentType : public SwTypeNumber sal_uInt16 nMemberCount; // content count sal_uInt16 nContentType; // content type's Id sal_uInt8 nOutlineLevel; - bool bDataValid : 1; // + bool bDataValid : 1; bool bEdit: 1; // can this type be edited? bool bDelete: 1; // can this type be deleted? protected: diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 254f13c61413..d51152a344e7 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -43,9 +43,6 @@ class SdrObject; #define EDIT_MODE_DELETE 4 #define EDIT_MODE_RENAME 5 -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- - class SwContentTree : public SvTreeListBox { ImageList aEntryImages; @@ -201,10 +198,7 @@ public: virtual sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const; }; - -//---------------------------------------------------------------------------- // TreeListBox for global documents -//---------------------------------------------------------------------------- class SwLBoxString : public SvLBoxString { @@ -231,7 +225,7 @@ private: ImageList aEntryImages; - SwWrtShell* pActiveShell; // + SwWrtShell* pActiveShell; SvTreeListEntry* pEmphasisEntry; // Drag'n Drop emphasis SvTreeListEntry* pDDSource; // source for Drag'n Drop SwGlblDocContents* pSwGlblDocContents; // array with sorted content diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index 5f4c5073a43e..e9f17a60e6e7 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -69,7 +69,6 @@ public: SwTableAutoFmt const*& prTAFmt ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index d1128efeae5d..578efcdb8e1c 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -32,7 +32,6 @@ #include <vcl/button.hxx> #include <actctrl.hxx> - #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -59,7 +58,6 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ); }; - class SwCaptionDialog : public SvxStandardDialog { Edit* m_pTextEdit; @@ -112,5 +110,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 6622e7ed6409..4d271dd41e2a 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_DBINSDLG_HXX #define INCLUDED_SW_SOURCE_UI_INC_DBINSDLG_HXX - #include <vcl/button.hxx> #include <vcl/group.hxx> #include <vcl/fixed.hxx> @@ -86,7 +85,6 @@ public: ~SwInsDBColumns() { DeleteAndDestroyAll(); } }; - class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem { RadioButton* m_pRbAsTable; diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index 94e261459149..7105b2ec0199 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.hxx @@ -24,7 +24,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> - class SW_DLLPUBLIC PrintMonitor: public ModelessDialog { public: diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx index e3abd3824408..98c111dc2a6a 100644 --- a/sw/source/ui/inc/drawbase.hxx +++ b/sw/source/ui/inc/drawbase.hxx @@ -74,8 +74,6 @@ public: virtual bool doConstructOrthogonal() const; }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_DRAWBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/ui/inc/drwbassh.hxx index c7e75dbee3a3..7bb62ad9076c 100644 --- a/sw/source/ui/inc/drwbassh.hxx +++ b/sw/source/ui/inc/drwbassh.hxx @@ -51,7 +51,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/ui/inc/dselect.hxx index c31cfb4e2822..d3905bc27e57 100644 --- a/sw/source/ui/inc/dselect.hxx +++ b/sw/source/ui/inc/dselect.hxx @@ -38,8 +38,6 @@ class DrawSelection : public SwDrawBase virtual void Activate(const sal_uInt16 nSlotId); // activate function }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_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 3d16206d9112..7b6c807a6223 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -28,7 +28,6 @@ #include <svtools/transfer.hxx> #include <swevent.hxx> - class SwWrtShell; class SwView; class SwRect; @@ -125,8 +124,8 @@ friend void PageNumNotify( SwViewShell* pVwSh, m_bIsInDrag : 1, // don't execute StartExecuteDrag twice m_bOldIdle : 1, // to stop to idle m_bOldIdleSet : 1, // during QeueryDrop - m_bTblInsDelMode : 1, // - m_bTblIsInsMode : 1, // + m_bTblInsDelMode : 1, + m_bTblIsInsMode : 1, m_bChainMode : 1, // connect frames m_bWasShdwCrsr : 1, // ShadowCrsr was on in MouseButtonDown m_bLockInput : 1, // lock while calc panel is active @@ -194,7 +193,6 @@ protected: virtual void GetFocus(); virtual void LoseFocus(); - virtual void MouseMove(const MouseEvent& rMEvt); virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void MouseButtonUp(const MouseEvent& rMEvt); @@ -240,7 +238,6 @@ public: void StopInsFrm(); sal_uInt16 GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame - void SetChainMode( sal_Bool bOn ); sal_Bool IsChainMode() const { return m_bChainMode; } diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index da04b9153ed2..62c4210cae3a 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -167,7 +167,6 @@ public: // organise RefMark with names bool CanInsertRefMark( const OUString& rStr ); - // access to field types via ResId sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX) const; SwFieldType* GetFldType(sal_uInt16 nResId, sal_uInt16 nId = 0) const; @@ -202,7 +201,7 @@ public: // turn off evaluation of expression fields for insertation // of many expressino fields (see labels) - // + inline void SetEvalExpFlds(sal_Bool bEval); void EvalExpFlds(SwWrtShell* pSh = NULL); }; diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index fd8873f8d061..49f536e8f48e 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.hxx @@ -53,7 +53,6 @@ #define FONTSIZE_CJK_DEFAULT 210 #define FONTSIZE_OUTLINE 280 - class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem { OUString sDefaultFonts[DEF_FONT_COUNT]; @@ -110,5 +109,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/ui/inc/formatclipboard.hxx index 10cf0b86dd5d..9d9335a32147 100644 --- a/sw/source/ui/inc/formatclipboard.hxx +++ b/sw/source/ui/inc/formatclipboard.hxx @@ -27,7 +27,6 @@ // header for class SfxStyleSheetBasePool #include <svl/style.hxx> -//----------------------------------------------------------------------------- /** This class acts as data container and execution class for the format paintbrush feature in writer. */ diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index b033f5132985..b9dfbb5b87bc 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -133,7 +133,6 @@ class SwFrmPage: public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - DECL_LINK(RangeModifyHdl, void *); DECL_LINK(AnchorTypeHdl, void *); DECL_LINK( PosHdl, ListBox * ); @@ -256,7 +255,6 @@ class SwFrmURLPage : public SfxTabPage DECL_LINK(InsertFileHdl, void *); - SwFrmURLPage(Window *pParent, const SfxItemSet &rSet); ~SwFrmURLPage(); diff --git a/sw/source/ui/inc/globdoc.hrc b/sw/source/ui/inc/globdoc.hrc index 8ad3e18b4e29..8c954b379294 100644 --- a/sw/source/ui/inc/globdoc.hrc +++ b/sw/source/ui/inc/globdoc.hrc @@ -30,7 +30,7 @@ #define MN_GLOBAL_TEXT_POPUPMENU (RC_GLOBDOC_BEGIN + 63) -// ------------------------------------------------------------------------ + #define GLOBDOC_ACT_END MN_GLOBAL_TEXT_POPUPMENU diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx index 80a1c3af3f9d..a5213b1179a1 100644 --- a/sw/source/ui/inc/glosdoc.hxx +++ b/sw/source/ui/inc/glosdoc.hxx @@ -130,7 +130,6 @@ public: std::vector<OUString> const& GetPathArray() const { return m_PathArr; } }; - #endif // INCLUDED_SW_SOURCE_UI_INC_GLOSDOC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index 82a5dce5bc03..fb47656da3f2 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -43,7 +43,6 @@ struct AutoTextGroup } }; - typedef std::vector<AutoTextGroup*> AutoTextGroups; class SwGlossaryList : public AutoTimer @@ -80,9 +79,4 @@ public: #endif - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index c65db5a531f3..98f441620528 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -51,8 +51,6 @@ class Menu; const short RET_EDIT = 100; -//------------------------------------------------------------------ - class SwGlTreeListBox : public SvTreeListBox { const OUString sReadonly; @@ -84,7 +82,6 @@ public: void Clear(); }; -//------------------------------------------------------------------ class SwOneExampleFrame; class SwGlossaryDlg : public SvxStandardDialog { @@ -116,7 +113,6 @@ class SwGlossaryDlg : public SvxStandardDialog OUString sResumeShortName; sal_Bool bResume; - const sal_Bool bSelection : 1; sal_Bool bReadOnly : 1; sal_Bool bIsOld : 1; @@ -139,7 +135,6 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( CheckBoxHdl, CheckBox * ); DECL_LINK( PreviewLoadedHdl, void * ); - virtual void Apply(); void Init(); SvTreeListEntry* DoesBlockExist(const OUString& sBlock, const OUString& rShort); diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx index 9a804a6c8d71..9e9513d22b77 100644 --- a/sw/source/ui/inc/glshell.hxx +++ b/sw/source/ui/inc/glshell.hxx @@ -50,7 +50,6 @@ public: const OUString& GetShortName(){return aShortName;} }; - class SwWebGlosDocShell : public SwWebDocShell { OUString aLongName; diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/ui/inc/imaildsplistener.hxx index 7a563eed9421..5b7e329df0d7 100644 --- a/sw/source/ui/inc/imaildsplistener.hxx +++ b/sw/source/ui/inc/imaildsplistener.hxx @@ -23,7 +23,6 @@ #include "com/sun/star/mail/XMailMessage.hpp" #include <salhelper/refobj.hxx> - class MailDispatcher; /** diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx index 7b39f2b48084..9d95043d3a19 100644 --- a/sw/source/ui/inc/initui.hxx +++ b/sw/source/ui/inc/initui.hxx @@ -61,7 +61,6 @@ extern void _FinitUI(); extern void _InitSpell(); extern void _FinitSpell(); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index 01f2f0c4032f..d96c59f484ad 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -58,7 +58,6 @@ public: SwField* pField, sal_Bool bNextButton = sal_False ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 879a3e3d56ab..2278f51c23d4 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -30,7 +30,6 @@ class SwWrtShell; class SwView; class SfxDispatcher; -//======================================================================== class InputEdit : public Edit { public: @@ -44,8 +43,6 @@ protected: virtual void KeyInput( const KeyEvent& ); }; -//======================================================================== - class SwInputWindow : public ToolBox { friend class InputEdit; @@ -117,8 +114,6 @@ public: }; -//================================================================== - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index 63b1fc495158..e8046d6079a1 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -32,7 +32,6 @@ class SwTableAutoFmt; class SwView; struct SwInsertTableOptions; - class SwInsTableDlg : public SfxModalDialog { TableNameEdit* m_pNameEdit; diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index 92f40772fe94..2de39fd89704 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.hxx @@ -54,7 +54,6 @@ class SwMailConfigPage : public SfxTabPage DECL_LINK(AuthenticationHdl, void *); DECL_LINK(TestHdl, void *); - public: SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ); ~SwMailConfigPage(); diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index cd62d2df0ab8..c59bfda286f8 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -115,7 +115,6 @@ class SwMailMergeDlg : public SvxStandardDialog Size m_aDialogSize; OUString m_sSaveFilter; - DECL_LINK( ButtonHdl, Button* pBtn ); DECL_LINK(InsertPathHdl, void *); DECL_LINK(AttachFileHdl, void *); diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index 8cea9ca892a7..3926c21b7376 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.hxx @@ -24,7 +24,6 @@ #include <vcl/fixed.hxx> #include <svx/stddlg.hxx> - class SwMergeTblDlg : public SvxStandardDialog { RadioButton* m_pMergePrevRB; @@ -39,5 +38,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx index b5c751d3ae70..8e53939f4bf8 100644 --- a/sw/source/ui/inc/mmconfigitem.hxx +++ b/sw/source/ui/inc/mmconfigitem.hxx @@ -255,7 +255,6 @@ public: void SetSelectedPrinter(const OUString& rSet ) {m_sSelectedPrinter = rSet;} - SwView* GetTargetView(); void SetTargetView(SwView* pView); diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx index 774fb9c9ae58..b98192765931 100644 --- a/sw/source/ui/inc/multmrk.hxx +++ b/sw/source/ui/inc/multmrk.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX #define INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX - #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> #include <svtools/stdctrl.hxx> @@ -49,7 +48,6 @@ public: ~SwMultiTOXMarkDlg(); }; - #endif // INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx index c99ba4c95443..77a14d667166 100644 --- a/sw/source/ui/inc/navicfg.hxx +++ b/sw/source/ui/inc/navicfg.hxx @@ -58,7 +58,6 @@ public: } } - sal_Int32 GetOutlineLevel()const {return nOutlineLevel;} void SetOutlineLevel(sal_Int32 nSet){ if(nOutlineLevel != nSet) @@ -77,7 +76,6 @@ public: } } - sal_Int32 GetActiveBlock()const {return nActiveBlock;} void SetActiveBlock(sal_Int32 nSet){ if(nActiveBlock != nSet) diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index 8bcd7c78991b..04a6c269c706 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -133,7 +133,6 @@ protected: virtual void Resize(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - // release ObjectShellLock early enough for app end virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/ui/inc/navmgr.hxx index 49fdc9a7f90f..0ef4af93a1f6 100644 --- a/sw/source/ui/inc/navmgr.hxx +++ b/sw/source/ui/inc/navmgr.hxx @@ -19,7 +19,6 @@ class SwWrtShell; struct SwPosition; class SwUnoCrsr; - class SwNavigationMgr { private: diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 4e0e96b2dcde..67d107588265 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_NUM_HXX #define INCLUDED_SW_SOURCE_UI_INC_NUM_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/menubtn.hxx> #include <vcl/field.hxx> diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx index 812ecf4856a8..661252fb8e84 100644 --- a/sw/source/ui/inc/numberingtypelistbox.hxx +++ b/sw/source/ui/inc/numberingtypelistbox.hxx @@ -46,7 +46,6 @@ public: sal_Bool SelectNumberingType(sal_Int16 nType); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx index e8b8cbb37ccc..d6facd3da9b5 100644 --- a/sw/source/ui/inc/numfmtlb.hxx +++ b/sw/source/ui/inc/numfmtlb.hxx @@ -68,7 +68,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index 2ea9cea19958..71602d8fc33c 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_NUMPARA_HXX #define INCLUDED_SW_SOURCE_UI_INC_NUMPARA_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <vcl/button.hxx> - /* --- class SwParagraphNumTabPage ---------------------------------------- with this TabPage numbering settings at the paragraph / paragraph style are performed. @@ -83,7 +81,6 @@ public: ListBox& GetStyleBox() {return *m_pNumberStyleLB;}; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx index ab1bbbcaa6c9..71374d899261 100644 --- a/sw/source/ui/inc/numprevw.hxx +++ b/sw/source/ui/inc/numprevw.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_NUMPREVW_HXX #define INCLUDED_SW_SOURCE_UI_INC_NUMPREVW_HXX - #include <vcl/window.hxx> class SwNumRule; @@ -69,5 +68,4 @@ class NumberingPreview : public Window #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/olesh.hxx b/sw/source/ui/inc/olesh.hxx index 504fa13c6a8d..f9b6108a8edf 100644 --- a/sw/source/ui/inc/olesh.hxx +++ b/sw/source/ui/inc/olesh.hxx @@ -32,10 +32,4 @@ public: #endif - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx index c245e208ae24..288413d5d746 100644 --- a/sw/source/ui/inc/olmenu.hxx +++ b/sw/source/ui/inc/olmenu.hxx @@ -31,7 +31,6 @@ #include <map> #include <vector> - class SwWrtShell; class SW_DLLPUBLIC SwSpellPopup : public PopupMenu diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 3e196e2eae28..802b06092eed 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -118,7 +118,6 @@ class SwAddPrinterTabPage : public SfxTabPage DECL_LINK(AutoClickHdl, void *); DECL_LINK(SelectHdl, void *); - SwAddPrinterTabPage( Window* pParent, const SfxItemSet& rSet ); public: @@ -231,7 +230,6 @@ class SwTableOptionsTabPage : public SfxTabPage DECL_LINK(CheckBoxHdl, void *); - SwTableOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwTableOptionsTabPage(); @@ -280,7 +278,6 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage SwWrtShell * m_pWrtShell; - SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwShdwCrsrOptionsTabPage(); diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 5afe786fd903..6d54f977108d 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -21,7 +21,6 @@ #include <sfx2/tabdlg.hxx> - #include <vcl/menu.hxx> #include <vcl/button.hxx> diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx index 51508c72fcfe..e085886eaa81 100644 --- a/sw/source/ui/inc/popbox.hxx +++ b/sw/source/ui/inc/popbox.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_POPBOX_HXX #define INCLUDED_SW_SOURCE_UI_INC_POPBOX_HXX - #include <vcl/toolbox.hxx> #include <svtools/transfer.hxx> @@ -53,7 +52,6 @@ inline void SwHelpToolBox::SetRightClickLink(const Link &rLink) { aRightClickLink = rLink; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index ef127fc22388..de42c7930541 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -189,7 +189,6 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * ); SAL_DLLPRIVATE bool ChgPage( int eMvMode, int bUpdateScrollbar = sal_True ); - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index 1d460a599cd5..2ee42bdef5c6 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -58,11 +58,9 @@ typedef boost::ptr_vector<SwRedlineDataParent> SwRedlineDataParentArr; class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParent*, o3tl::less_ptr_to<SwRedlineDataParent> > {}; - typedef SwRedlineDataChild* SwRedlineDataChildPtr; typedef boost::ptr_vector<SwRedlineDataChild> SwRedlineDataChildArr; - typedef SvTreeListEntry* SvLBoxEntryPtr; typedef std::vector<SvLBoxEntryPtr> SvLBoxEntryArr; @@ -159,8 +157,6 @@ public: virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index bc44e02813e2..44a9fa642684 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -102,7 +102,6 @@ class SwEditRegionDlg : public SfxModalDialog sal_Bool bDontCheckPasswd :1; sal_Bool bWeb :1; - Image BuildBitmap(sal_Bool bProtect,sal_Bool bHidden); void RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry); @@ -227,7 +226,6 @@ class SwSectionFtnEndTabPage : public SfxTabPage FixedText* pEndSuffixFT; Edit* pEndSuffixED; - DECL_LINK( FootEndHdl, CheckBox * ); void ResetState( sal_Bool bFtn, const SwFmtFtnEndAtTxtEnd& ); diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 4c100703daae..ba0f66b33398 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.hxx @@ -54,8 +54,6 @@ public: ~SwScrollbar(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/ui/inc/shdwcrsr.hxx index 5e52cd6f06cd..5fb1d9684162 100644 --- a/sw/source/ui/inc/shdwcrsr.hxx +++ b/sw/source/ui/inc/shdwcrsr.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_SHDWCRSR_HXX #define INCLUDED_SW_SOURCE_UI_INC_SHDWCRSR_HXX - #include <tools/gen.hxx> #include <tools/color.hxx> #include <limits.h> @@ -53,8 +52,6 @@ public: Rectangle GetRect() const; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/ui/inc/splittbl.hxx index 1048c380e26f..522f1d65cab4 100644 --- a/sw/source/ui/inc/splittbl.hxx +++ b/sw/source/ui/inc/splittbl.hxx @@ -46,5 +46,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index 40d42ee51558..c490dc4d6193 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -58,7 +58,6 @@ public: }; -//------------------------------------------------------------ typedef std::set<sal_uInt16> SyntaxLineSet; class SwSrcEditWindow : public Window, public SfxListener diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index 9e404e66c54c..ba91f8732278 100644 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx @@ -43,21 +43,18 @@ class SwSrcView: public SfxViewShell // for read-only switching virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - protected: sal_uInt16 StartSearchAndReplace(const SvxSearchItem& rItem, sal_Bool bFromStart, sal_Bool bApi, sal_Bool bRecursive = sal_False); - public: SFX_DECL_VIEWFACTORY(SwSrcView); SFX_DECL_INTERFACE(SW_SRC_VIEWSHELL) TYPEINFO(); - SwSrcView(SfxViewFrame* pFrame, SfxViewShell*); ~SwSrcView(); @@ -69,8 +66,6 @@ public: sal_Bool IsModified() {return aEditWin.IsModified();} - - void Execute(SfxRequest&); void GetState(SfxItemSet&); diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index ce9566f8c18c..4c9294907b79 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -51,9 +51,6 @@ class SwContentType; #define REGION_MODE_LINK 1 #define REGION_MODE_EMBEDDED 2 -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- - //mini rtti class SwTypeNumber { @@ -65,7 +62,6 @@ class SwTypeNumber sal_uInt8 GetTypeId() const; }; -//---------------------------------------------------------------------------- class SwContent : public SwTypeNumber { diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index 04bd14066f98..d68a9daac07a 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -52,7 +52,6 @@ namespace nsTransferBufferType const sal_uInt16 TRNSFR_DRAWING = 0x0081; // drawing is internal too! } - class SW_DLLPUBLIC SwTransferable : public TransferableHelper { friend class SwView_Impl; @@ -209,7 +208,6 @@ public: virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index de24d86ff303..1dfc4f2597a4 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_SWRENAMEXNAMEDDLG_HXX #define INCLUDED_SW_SOURCE_UI_INC_SWRENAMEXNAMEDDLG_HXX - #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx index 908fff827287..7f92bc0bc26b 100644 --- a/sw/source/ui/inc/swtablerep.hxx +++ b/sw/source/ui/inc/swtablerep.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_SWTABLEREP_HXX #define INCLUDED_SW_SOURCE_UI_INC_SWTABLEREP_HXX - #include <sfx2/tabdlg.hxx> #include "swdllapi.h" #include "swtypes.hxx" diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index b7516d998192..d63d7ee99243 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -47,7 +47,6 @@ class SwCondCollPage : public SfxTabPage sal_Bool bNewTemplate; - SwCondCollPage(Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); @@ -71,8 +70,6 @@ public: void SetCollection( SwFmt* pFormat, sal_Bool bNew ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 24f6dee18390..1986936f86f3 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -74,8 +74,8 @@ class SwMultiTOXTabDialog : public SfxTabDialog SwOneExampleFrame* pExampleFrame; - SwTOXDescription** pDescArr; // - SwForm** pFormArr; // + SwTOXDescription** pDescArr; + SwForm** pFormArr; SwIndexSections_Impl** pxIndexSectionsArr; SwTOXBase* pParamTOXBase; diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 21b215105325..e552586e353b 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -78,7 +78,6 @@ class SwIndexMarkPane CheckBox* m_pSearchCaseSensitiveCB; CheckBox* m_pSearchCaseWordOnlyCB; - PushButton* m_pOKBT; CloseButton* m_pCloseBT; PushButton* m_pDelBT; @@ -143,7 +142,6 @@ public: Dialog &GetDialog() { return m_rDialog; } - ~SwIndexMarkPane(); void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0); diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx index 1cf1431732ec..ba498ea7c41f 100644 --- a/sw/source/ui/inc/swwrtshitem.hxx +++ b/sw/source/ui/inc/swwrtshitem.hxx @@ -33,7 +33,6 @@ public: SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); - virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index b06c5671cf9a..468821ff2b58 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.hxx @@ -48,7 +48,6 @@ public: SFX_DECL_CHILDWINDOW( SwSyncChildWin ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx index 288e925e9ff8..d18be07670dc 100644 --- a/sw/source/ui/inc/tabledlg.hxx +++ b/sw/source/ui/inc/tabledlg.hxx @@ -21,7 +21,6 @@ #include <sfx2/tabdlg.hxx> - #include "swtypes.hxx" #include "swtablerep.hxx" @@ -45,7 +44,6 @@ public: const SfxItemSet* pItemSet, SwWrtShell* pSh ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index 9e16028e8a3b..5aac7016a944 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -35,12 +35,8 @@ class AutoFmtPreview; class SwTableAutoFmtTbl; class SwWrtShell; -//------------------------------------------------------------------------ - enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; -//======================================================================== - class SwAutoFormatDlg : public SfxModalDialog { ListBox* m_pLbFormat; @@ -64,7 +60,6 @@ class SwAutoFormatDlg : public SfxModalDialog OUString aStrInvalidFmt; AutoFmtPreview* m_pWndPreview; - //------------------------ SwWrtShell* pShell; SwTableAutoFmtTbl* pTableTbl; sal_uInt8 nIndex; @@ -72,10 +67,9 @@ class SwAutoFormatDlg : public SfxModalDialog sal_Bool bCoreDataChanged : 1; sal_Bool bSetAutoFmt : 1; - void Init( const SwTableAutoFmt* pSelFmt ); void UpdateChecks( const SwTableAutoFmt&, sal_Bool bEnableBtn ); - //------------------------ + DECL_LINK( CheckHdl, Button * ); DECL_LINK(OkHdl, void *); DECL_LINK( AddHdl, void * ); @@ -92,7 +86,6 @@ public: void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const; }; - #endif // SW_AUTOFMT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/ui/inc/tblctrl.hxx index e511a0f59c29..fbf66057e2ae 100644 --- a/sw/source/ui/inc/tblctrl.hxx +++ b/sw/source/ui/inc/tblctrl.hxx @@ -19,14 +19,8 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_TBLCTRL_HXX #define INCLUDED_SW_SOURCE_UI_INC_TBLCTRL_HXX - #include <sfx2/tbxctrl.hxx> - -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwTableOptimizeCtrl : public SfxToolBoxControl { @@ -41,10 +35,6 @@ public: }; -// -//---------------------------------------------------------------------------- - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx index 273ab7c0787d..86b2d7f5ecc5 100644 --- a/sw/source/ui/inc/toxmgr.hxx +++ b/sw/source/ui/inc/toxmgr.hxx @@ -245,7 +245,6 @@ public: {delete pTOUName; pTOUName = new OUString(rSet);} const OUString* GetTOUName() const {return pTOUName;} - void SetPhoneticReadingOfAltStr(const OUString& rSet) {delete pPhoneticReadingOfAltStr; pPhoneticReadingOfAltStr = new OUString(rSet);} const OUString* GetPhoneticReadingOfAltStr() const { return pPhoneticReadingOfAltStr; } @@ -271,14 +270,12 @@ public: // single argument ctors shall be explicit. explicit SwTOXMgr(SwWrtShell* pShell); - // // methods for directory marks - // + void InsertTOXMark(const SwTOXMarkDescription& rDesc); void UpdateTOXMark(const SwTOXMarkDescription& rDesc); - void DeleteTOXMark(); void NextTOXMark(sal_Bool bSame=sal_False); void PrevTOXMark(sal_Bool bSame=sal_False); @@ -290,9 +287,8 @@ public: SwTOXMark* GetCurTOXMark(); void SetCurTOXMark(sal_uInt16 nId); - // // methods for directories - // + sal_Bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const; diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index 345828ef8a85..075dbf626708 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.hxx @@ -160,7 +160,6 @@ public: return m_bEditingPositionSet; } - void StartDocumentInserter( const OUString& rFactory, const Link& rEndDialogHdl ); SfxMedium* CreateMedium(); void InitRequest( const SfxRequest& rRequest ); diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/ui/inc/unoatxt.hxx index b0a27da7afad..3a27de5d55e7 100644 --- a/sw/source/ui/inc/unoatxt.hxx +++ b/sw/source/ui/inc/unoatxt.hxx @@ -110,7 +110,6 @@ protected: public: SwXAutoTextGroup(const OUString& rName, SwGlossaries* pGloss); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel @@ -153,7 +152,6 @@ public: virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - // void Invalidate(); }; @@ -242,7 +240,6 @@ public: const OUString& GetEntryName() {return sEntryName;} }; - /** Implement the XNameAccess for the AutoText events */ class SwAutoTextEventDescriptor : public SvBaseEventDescriptor { @@ -281,7 +278,6 @@ protected: ::com::sun::star::uno::RuntimeException); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index 1a004ed2d893..f5992c1e0465 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.hxx @@ -87,7 +87,7 @@ public: // view destroyed void Invalidate(); }; -//--------------------------------------------------------------------------------------------------------------------- + struct StatusStruct_Impl { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener> xListener; diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/ui/inc/unomailmerge.hxx index f66a616c02c4..211c2cbfe41b 100644 --- a/sw/source/ui/inc/unomailmerge.hxx +++ b/sw/source/ui/inc/unomailmerge.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/interfacecontainer.hxx> #include <unotools/configitem.hxx> - #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -57,9 +56,6 @@ namespace com { namespace sun { namespace star { }}} - -/////////////////////////////////////////////////////////////////////////// - // uses templates from <cppuhelper/interfacecontainer.h> // and <unotools/configitem.hxx> @@ -75,8 +71,6 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar PropHashType_Impl > OPropertyListenerContainerHelper; -//////////////////////////////////////////////////////////// - class SwNewDBMgr; class MailMergeExecuteFinalizer; @@ -152,7 +146,6 @@ protected: public: SwXMailMerge(); - void LaunchMailMergeEvent( const com::sun::star::text::MailMergeEvent &rData ) const; // XJob @@ -189,14 +182,10 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; - extern com::sun::star::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception ); -//////////////////////////////////////////////////////////// - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/unomod.hxx b/sw/source/ui/inc/unomod.hxx index c0ee901688da..1d1c8823eb7c 100644 --- a/sw/source/ui/inc/unomod.hxx +++ b/sw/source/ui/inc/unomod.hxx @@ -53,7 +53,6 @@ protected: public: SwXModule(); - //XViewSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); @@ -105,7 +104,6 @@ protected: public: SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = NULL ); - //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); @@ -149,7 +147,6 @@ protected: public: SwXViewSettings(sal_Bool bWeb, SwView* pView); - //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index d5c76cf3fbf5..0b85820a62bb 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_UNOTOOLS_HXX #define INCLUDED_SW_SOURCE_UI_INC_UNOTOOLS_HXX - #include <vcl/button.hxx> #include <vcl/edit.hxx> #include <vcl/dialog.hxx> diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index f88a5e410906..76f370ca1eba 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -67,7 +67,6 @@ class SwXTextView : ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > * pxTextViewCursor; - SdrObject* GetControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xToFill ); @@ -77,7 +76,6 @@ protected: 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, std::exception); virtual void SAL_CALL acquire( ) throw(); virtual void SAL_CALL release( ) throw(); diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index 946b3d2d1e63..9169166c5a6b 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_USRPREF_HXX #define INCLUDED_SW_SOURCE_UI_INC_USRPREF_HXX - - #include <unotools/configitem.hxx> #include <fldupde.hxx> #include "viewopt.hxx" diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc index 992c66c3c029..774a0b868231 100644 --- a/sw/source/ui/inc/utlui.hrc +++ b/sw/source/ui/inc/utlui.hrc @@ -26,7 +26,7 @@ #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) diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index f1d656e0847f..91733d3da373 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -172,7 +172,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SearchAttrItemList* m_pSrchList; static SearchAttrItemList* m_pReplList; - SvxHtmlOptions m_aHTMLOpt; Timer m_aTimer; // for delayed ChgLnks during an action OUString m_aPageStr; // status view, current page @@ -199,7 +198,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwView_Impl *m_pViewImpl; // Impl-data for UNO + Basic - SwScrollbar *m_pHScrollbar, // MDI control elements *m_pVScrollbar; @@ -549,7 +547,6 @@ public: void GetState(SfxItemSet&); void StateStatusLine(SfxItemSet&); - // functions for drawing void SetDrawFuncPtr(SwDrawBase* pFuncPtr); inline SwDrawBase* GetDrawFuncPtr(/*sal_Bool bBuf = sal_False*/) const { return m_pDrawActual; } diff --git a/sw/source/ui/inc/web.hrc b/sw/source/ui/inc/web.hrc index 63540b8670cd..aef47e9d2bb1 100644 --- a/sw/source/ui/inc/web.hrc +++ b/sw/source/ui/inc/web.hrc @@ -34,7 +34,7 @@ #define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) #define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) -// ------------------------------------------------------------------------ + #define WEB_ACT_END STR_WRITER_WEBDOC_FULLTYPE diff --git a/sw/source/ui/inc/wformsh.hxx b/sw/source/ui/inc/wformsh.hxx index 02f3d29b7a79..aac9f9f69c94 100644 --- a/sw/source/ui/inc/wformsh.hxx +++ b/sw/source/ui/inc/wformsh.hxx @@ -31,8 +31,6 @@ public: TYPEINFO(); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wfrmsh.hxx b/sw/source/ui/inc/wfrmsh.hxx index 82ce2d384d22..68f7edcab86b 100644 --- a/sw/source/ui/inc/wfrmsh.hxx +++ b/sw/source/ui/inc/wfrmsh.hxx @@ -22,7 +22,6 @@ #include "frmsh.hxx" - class SwWebFrameShell: public SwFrameShell { @@ -36,6 +35,4 @@ public: #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wgrfsh.hxx b/sw/source/ui/inc/wgrfsh.hxx index d86341f3be5d..45682ac74554 100644 --- a/sw/source/ui/inc/wgrfsh.hxx +++ b/sw/source/ui/inc/wgrfsh.hxx @@ -31,8 +31,6 @@ public: TYPEINFO(); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wolesh.hxx b/sw/source/ui/inc/wolesh.hxx index 5f5d6ca1ab8d..bf9dcad60718 100644 --- a/sw/source/ui/inc/wolesh.hxx +++ b/sw/source/ui/inc/wolesh.hxx @@ -32,10 +32,4 @@ public: #endif - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 6098865bd362..eef6332e01db 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -52,12 +52,6 @@ class SwView; #define NID_TABLE_FORMULA_ERROR 20019 #define NID_COUNT 20 - - -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwTbxInsertCtrl : public SfxToolBoxControl { sal_uInt16 nLastSlotId; @@ -80,16 +74,11 @@ public: virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); }; -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwTbxAutoTextCtrl : public SfxToolBoxControl { PopupMenu* pPopup; SwView* pView; - void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -111,7 +100,6 @@ class SwTbxFieldCtrl : public SfxToolBoxControl PopupMenu* pPopup; SwView* pView; - void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -128,12 +116,6 @@ public: DECL_LINK(PopupHdl, PopupMenu*); }; - - -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwScrollNaviToolBox : public ToolBox { virtual void MouseButtonUp( const MouseEvent& rMEvt ); @@ -171,9 +153,7 @@ public: void GrabFocus(){aToolBox.GrabFocus();} }; -//---------------------------------------------------------------------------- // ImageButtons have to set the HelpText themselves if needed -//---------------------------------------------------------------------------- class SwHlpImageButton : public ImageButton { @@ -202,6 +182,4 @@ public: }; #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 211bb0961095..322b0530a749 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -39,7 +39,6 @@ public: SwWrtShell* GetWrtShell() { return pWrtShell; } }; - /*-------------------------------------------------------------------- Description: circulation TabPage --------------------------------------------------------------------*/ @@ -115,5 +114,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 8ec265c3773e..fbcdecaecf19 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -51,7 +51,6 @@ namespace com { namespace sun { namespace star { namespace util { struct SearchOptions; } } } } - typedef sal_Int32 SelectionType; namespace nsSelectionType { @@ -448,7 +447,6 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // link for inserting ranges via Drag&Drop/Clipboard DECL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData* ); - // ctor, the first one is a kind of a controlled copy ctor for more views of a document SwWrtShell( SwWrtShell&, Window *pWin, SwView &rShell); SwWrtShell( SwDoc& rDoc, Window *pWin, SwView &rShell, @@ -523,7 +521,6 @@ private: lOffset(lOff) { - } } *pCrsrStack; diff --git a/sw/source/ui/inc/wtextsh.hxx b/sw/source/ui/inc/wtextsh.hxx index 79ff56e06869..3a236f7ce307 100644 --- a/sw/source/ui/inc/wtextsh.hxx +++ b/sw/source/ui/inc/wtextsh.hxx @@ -22,7 +22,6 @@ #include "textsh.hxx" - class SwWebTextShell: public SwTextShell { @@ -36,6 +35,4 @@ public: #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/ui/inc/zoomctrl.hxx index c30af120b12c..89818fdf4f72 100644 --- a/sw/source/ui/inc/zoomctrl.hxx +++ b/sw/source/ui/inc/zoomctrl.hxx @@ -38,8 +38,6 @@ public: }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |