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/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/inc')
176 files changed, 278 insertions, 873 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 6140be949154..38028102ed3a 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -45,7 +45,6 @@ class SwTable; class SwNumberTreeNode; class SvxLanguageItem; - /* * Mapping of OOo elements to tagged pdf elements: * diff --git a/sw/inc/IDocumentChartDataProviderAccess.hxx b/sw/inc/IDocumentChartDataProviderAccess.hxx index 8e217ccf5927..8a53ae447b7d 100644 --- a/sw/inc/IDocumentChartDataProviderAccess.hxx +++ b/sw/inc/IDocumentChartDataProviderAccess.hxx @@ -30,7 +30,6 @@ class SwTable; class SwChartDataProvider; class SwChartLockController_Helper; - /** Give access to the data-provider for chart */ class IDocumentChartDataProviderAccess diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx index 3a9313d6bf90..b9a8e10ea0d6 100644 --- a/sw/inc/IDocumentExternalData.hxx +++ b/sw/inc/IDocumentExternalData.hxx @@ -41,7 +41,6 @@ public: typedef ::boost::shared_ptr<ExternalData> tExternalDataPointer; } - class IDocumentExternalData { protected: diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index 7d263ef7caab..0b8c38b3d4a6 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -112,7 +112,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) = 0; - // In Calculator set all SetExpression fields that are valid up to the indicated position // (Node [ + ::com::sun::star::ucb::Content]). // A generated list of all fields may be passed along too diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index 4256155c9431..784b45f2e922 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -218,7 +218,6 @@ class IDocumentMarkAccess */ virtual const_iterator_t findMark(const OUString& rMark) const =0; - // interface IBookmarks (BOOKMARK, CROSSREF_NUMITEM_BOOKMARK, CROSSREF_HEADING_BOOKMARK ) /** returns a STL-like random access iterator to the begin of the sequence the IBookmarks. @@ -243,7 +242,6 @@ class IDocumentMarkAccess */ virtual const_iterator_t findBookmark(const OUString& rMark) const =0; - // Fieldmarks virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& pos) const =0; virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& pos) const =0; diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx index 02d6504fe73d..86e70a05da7e 100644 --- a/sw/inc/IDocumentUndoRedo.hxx +++ b/sw/inc/IDocumentUndoRedo.hxx @@ -24,7 +24,6 @@ #include <swundo.hxx> - class SwRewriter; class SwNodes; class SwUndo; @@ -33,8 +32,6 @@ namespace sw { class RepeatContext; } - - /** IDocumentUndoRedo */ class IDocumentUndoRedo @@ -202,7 +199,6 @@ protected: virtual ~IDocumentUndoRedo() {}; }; - namespace sw { class UndoGuard @@ -270,7 +266,6 @@ private: bool const m_bDrawUndoWasEnabled; }; - } // namespace sw #endif diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx index 8359e2eac0b5..d073085420a1 100644 --- a/sw/inc/IMark.hxx +++ b/sw/inc/IMark.hxx @@ -32,7 +32,6 @@ SV_DECL_REF( SwServerObject ) #endif - struct SwPosition; namespace sw { namespace mark diff --git a/sw/inc/IShellCursorSupplier.hxx b/sw/inc/IShellCursorSupplier.hxx index fe7c690c6425..e1c8085ae7ea 100644 --- a/sw/inc/IShellCursorSupplier.hxx +++ b/sw/inc/IShellCursorSupplier.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX #define INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX - class SwPaM; - namespace sw { /** The Undo actions need to create new Shell cursors. diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index faf101432635..1467beddc312 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -66,7 +66,6 @@ class Window; typedef std::list<SwSidebarItem*> SwSidebarItem_list; typedef std::list<SwSidebarItem*>::iterator SwSidebarItem_iterator; - struct SwPostItPageItem { bool bScrollbar; @@ -257,7 +256,6 @@ class SwPostItMgr: public SfxListener static Color GetColorLight(sal_uInt16 aAuthorIndex); static Color GetColorAnchor(sal_uInt16 aAuthorIndex); - void RegisterAnswer(OutlinerParaObject* pAnswer) { mpAnswer = pAnswer;} OutlinerParaObject* IsAnswer() {return mpAnswer;} void CheckMetaText(); diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index ee34d832e3eb..f98a2ef88a1c 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -57,7 +57,6 @@ typedef sal_Int64 SwPostItBits; #define PB_Preview ((SwPostItBits)0x00000001) - class SwSidebarWin : public Window { public: diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx index c41fd2c6de53..2445cdff0ede 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> - #include <sfx2/frmhtml.hxx> #include <sfx2/frmhtmlw.hxx> #include <vcl/wrkwin.hxx> diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index 0f1d01269340..485d2f43c9ed 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -22,7 +22,6 @@ #include <svx/SmartTagMgr.hxx> - /************************************************************************* * class SwSmartTagMgr * diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx index 91e56ce4de83..923889f614da 100644 --- a/sw/inc/SwUndoField.hxx +++ b/sw/inc/SwUndoField.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/uno/Any.h> - class SwDoc; class SwField; class SwMsgPoolItem; diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx index 950fee743797..aba4e3dc9083 100644 --- a/sw/inc/TextCursorHelper.hxx +++ b/sw/inc/TextCursorHelper.hxx @@ -46,5 +46,4 @@ protected: #endif // INCLUDED_SW_INC_TEXTCURSORHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 13a609a205aa..3a168227e6af 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -261,7 +261,6 @@ public: void FireEvents(); - // IAccessibleViewForwarder virtual bool IsValid() const; diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx index 2a9f3d2c8201..dde48539bf37 100644 --- a/sw/inc/acmplwrd.hxx +++ b/sw/inc/acmplwrd.hxx @@ -73,7 +73,6 @@ public: bool GetWordsMatching(OUString aMatch, std::vector<OUString>& aWords) const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 7ed66caf97fb..5b360af0807e 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -126,7 +126,6 @@ class SW_DLLPUBLIC SwAnchoredObject mbPositioningInProgress = _bPosInProgress; } - /** check anchor character rectangle helper method for method <CheckCharRectAndTopOfLine()> @@ -550,9 +549,8 @@ class SW_DLLPUBLIC SwAnchoredObject virtual const char* getElementName( ) { return "SwAnchoredObject"; } }; -// ============================================================================ // helper class for notify that positioning of an anchored object is in progress -// ============================================================================ + class SwObjPositioningInProgress { private: diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx index 865092a7abfe..463e48351948 100644 --- a/sw/inc/authratr.hxx +++ b/sw/inc/authratr.hxx @@ -42,7 +42,6 @@ public: } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx index 0d517e0dd679..541be142ceec 100644 --- a/sw/inc/bparr.hxx +++ b/sw/inc/bparr.hxx @@ -43,13 +43,11 @@ protected: }; typedef BigPtrEntry* ElementPtr; - typedef bool (*FnForEach)( const ElementPtr&, void* pArgs ); // 1000 entries per Block = a bit less then 4K #define MAXENTRY 1000 - // number of entries that may remain free during compression // this value is for the worst case; because we defined MAXBLOCK with ca 25% // overhead, 80% = 800 entries are enough @@ -102,8 +100,6 @@ public: void ForEach( sal_uLong nStart, sal_uLong nEnd, FnForEach fn, void* pArgs = NULL ); }; - - inline sal_uLong BigPtrEntry::GetPos() const { assert(this == pBlock->pData[ nOffset ]); // element not in the block @@ -115,7 +111,6 @@ inline BigPtrArray& BigPtrEntry::GetArray() const return *pBlock->pBigArr; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 497dcf005e68..89ea5d12f093 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -33,7 +33,6 @@ * class SwBreakIt *************************************************************************/ - class SW_DLLPUBLIC SwBreakIt : private ::boost::noncopyable { com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 863608539faf..26320f9e657f 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -56,9 +56,7 @@ class SfxHint; code gets polluted by pointer casts (see switerator.hxx). */ -// ---------- // SwClient -// ---------- class SW_DLLPUBLIC SwClient : ::boost::noncopyable { @@ -116,9 +114,7 @@ inline SwClient::SwClient() : pLeft(0), pRight(0), pRegisteredIn(0), mbIsAllowedToBeRemovedInModifyCall(false) {} -// ---------- // SwModify -// ---------- // class has a doubly linked list for dependencies class SW_DLLPUBLIC SwModify: public SwClient @@ -172,9 +168,7 @@ public: bool IsLastDepend() { return pRoot && pRoot->IsLast(); } }; -// ---------- // SwDepend -// ---------- /* * Helper class for objects that need to depend on more than one SwClient @@ -196,7 +190,6 @@ protected: virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ); }; - class SwClientIter { friend SwClient* SwModify::Remove(SwClient *); ///< for pointer adjustments diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 9b83a5c6a1cd..2d00ab550020 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -120,7 +120,6 @@ public: {} virtual ~SwSbxValue(); - sal_Bool GetBool() const; double GetDouble() const; SwSbxValue& MakeDouble(); @@ -182,7 +181,6 @@ class SwCalc SwCalcOper eCurrListOper; SwCalcError eError; - SwCalcOper GetToken(); SwSbxValue Expr(); SwSbxValue Term(); diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 8889873e9400..10bc398e237e 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -30,15 +30,11 @@ #include "swdllapi.h" #include "cmdid.h" -//*********************************************************** - struct CollName { sal_uLong nCnd; sal_uLong nSubCond; }; -//*********************************************************** - #define COND_COMMAND_COUNT 28 struct CommandStruct @@ -47,13 +43,9 @@ struct CommandStruct sal_uLong nSubCond; }; -//*********************************************************** - sal_Int16 GetCommandContextIndex( const OUString &rContextName ); OUString GetCommandContextByIndex( sal_Int16 nIndex ); -//*********************************************************** - class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem { static const CommandStruct aCmds[COND_COMMAND_COUNT]; diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 9407a9475486..2ba21cf95884 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -97,10 +97,6 @@ public: double GetValue() const { return nValue; } }; - - -//*************************************************************************** - inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(sal_Bool bInP) const { return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); } inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(sal_Bool bInP) const @@ -108,8 +104,6 @@ inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(sal_Bool bInP) inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(sal_Bool bInP) const { return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); } -//*************************************************************************** - inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(sal_Bool bInP) const { return aSet.GetTblBoxNumFmt(bInP); } inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(sal_Bool bInP) const diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index abece1eaecc2..0b5c6b92009a 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -51,8 +51,6 @@ public: void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; } }; - - class SwTableFormula { typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&, @@ -147,8 +145,6 @@ public: bool HasValidBoxes() const; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index 40d43046d505..402a2dbcdf3c 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -22,7 +22,6 @@ #include <format.hxx> #include <hintids.hxx> - // implementation of the character attribute methods of SwAttrSet inline const SvxPostureItem &SwAttrSet::GetPosture(sal_Bool bInP) const diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx index 3876be6b62bf..6eb9e809d086 100644 --- a/sw/inc/charfmt.hxx +++ b/sw/inc/charfmt.hxx @@ -35,7 +35,6 @@ class SW_DLLPUBLIC SwCharFmt : public SwFmt : SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT ) {} - public: TYPEINFO(); // already in base class Client }; @@ -49,6 +48,4 @@ namespace CharFmt #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/chcmprse.hxx b/sw/inc/chcmprse.hxx index 963aaee805ec..37574b3856c6 100644 --- a/sw/inc/chcmprse.hxx +++ b/sw/inc/chcmprse.hxx @@ -24,6 +24,5 @@ enum SwCharCompressType{ CHARCOMPRESS_NONE, CHARCOMPRESS_PUNCTUATION, CHARCOMPRESS_PUNCTUATION_KANA }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index ef9d86ed1f49..891e43e57a05 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -21,12 +21,10 @@ #include "fldbas.hxx" - class SwFrm; class SwCntntNode; class SwTxtNode; - enum SwChapterFormat { CF_BEGIN, diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 303642a621d6..2e78df9b5b12 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -935,17 +935,17 @@ included in c-context files, so c++ style stuff will cause problems. #define MID_13 0xfa // defines for Event-assignments per Macro -#define MAC_EVENT_MOUSEOVER 0x01 // -#define MAC_EVENT_MOUSECLICK 0x02 // -#define MAC_EVENT_MOUSEOUT 0x03 // -#define MAC_EVENT_OBJECT_SELECT 0x04 // -#define MAC_EVENT_KEYINPUT_ALPHA 0x05 // -#define MAC_EVENT_KEYINPUT_NOALPHA 0x06 // -#define MAC_EVENT_FRM_RESIZE 0x07 // -#define MAC_EVENT_FRM_MOVE 0x08 // -#define MAC_EVENT_IMAGE_LOAD 0x09 // -#define MAC_EVENT_IMAGE_ABORT 0x0a // -#define MAC_EVENT_IMAGE_ERROR 0x0b // +#define MAC_EVENT_MOUSEOVER 0x01 +#define MAC_EVENT_MOUSECLICK 0x02 +#define MAC_EVENT_MOUSEOUT 0x03 +#define MAC_EVENT_OBJECT_SELECT 0x04 +#define MAC_EVENT_KEYINPUT_ALPHA 0x05 +#define MAC_EVENT_KEYINPUT_NOALPHA 0x06 +#define MAC_EVENT_FRM_RESIZE 0x07 +#define MAC_EVENT_FRM_MOVE 0x08 +#define MAC_EVENT_IMAGE_LOAD 0x09 +#define MAC_EVENT_IMAGE_ABORT 0x0a +#define MAC_EVENT_IMAGE_ERROR 0x0b #endif // INCLUDED_SW_INC_CMDID_H diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index eb3495314f85..30559a47c681 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -19,14 +19,11 @@ #ifndef INCLUDED_SW_INC_COLWD_HXX #define INCLUDED_SW_INC_COLWD_HXX - #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <vcl/button.hxx> - - class SwTableFUNC; class SwTableWidthDlg : public SvxStandardDialog diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc index eb1b3e22f2e9..67a018792d63 100644 --- a/sw/inc/comcore.hrc +++ b/sw/inc/comcore.hrc @@ -21,9 +21,9 @@ #include "rcid.hrc" -// --------------- + // Strings -// --------------- + #define STR_COMCORE_READERROR (RC_COMCORE_BEGIN + 0) #define MSG_COMCORE_ASKSEARCH (RC_COMCORE_BEGIN + 1) diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx index 6dae1e2e3392..a1ed1027eabf 100644 --- a/sw/inc/crsskip.hxx +++ b/sw/inc/crsskip.hxx @@ -22,7 +22,6 @@ #include <tools/solar.h> - // define for cursor travelling normally in western text cells and chars do // the same, but in complex text cell skip over legatures and char skip // into it. diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index 7ad58f5144da..9ab7ae276f53 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -24,7 +24,6 @@ #include <swtypes.hxx> #include <swrect.hxx> - enum SwFillMode { FILL_TAB, ///< default, fill with tabs @@ -202,8 +201,6 @@ struct SwCrsrMoveState {} }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx index c5a188200c48..b28484c58633 100644 --- a/sw/inc/cshtyp.hxx +++ b/sw/inc/cshtyp.hxx @@ -30,7 +30,6 @@ class SwLayoutFrm; struct SwMoveFnCollection; typedef SwMoveFnCollection* SwMoveFn; - // Type definition for CrsrShell. // Direction-parameter for MovePage (initialized in SwCntntFrm). typedef SwLayoutFrm * (*SwWhichPage)( const SwLayoutFrm * ); @@ -68,7 +67,6 @@ typedef sal_Bool (*SwWhichRegion)( SwPaM&, SwPosRegion, sal_Bool bInReadOnly ); extern SwWhichRegion fnRegionPrev, fnRegionCurr, fnRegionNext, fnRegionCurrAndSkip; extern SwPosRegion fnRegionStart, fnRegionEnd; - /* * The following combinations are allowed: * - find one in body -> FND_IN_BODY @@ -86,7 +84,6 @@ enum FindRanges FND_IN_SELALL = 0x01 ///< All (only in non-body and selections). }; - enum SwDocPositions { DOCPOS_START, diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 83da26a9c1be..31314d2db46c 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -33,7 +33,7 @@ class SwFrm; class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType { - SwDBData aDBData; // + SwDBData aDBData; OUString sName; ///< only used in ::GetName() ! OUString sColumn; long nRefCnt; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index e5ab96e26d46..3c1588c08c33 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -72,8 +72,6 @@ class SwDbtoolsClient; class SwXMailMerge; class SwMailMergeConfigItem; -// ----------------------------------------------------------------------- - enum DBMgrOptions { DBMGR_MERGE, ///< Data records in fields. @@ -85,8 +83,6 @@ enum DBMgrOptions DBMGR_MERGE_SINGLE_FILE ///< Save merge as single file. }; -// ----------------------------------------------------------------------- - /*-------------------------------------------------------------------- Administration of (new) logical databases. --------------------------------------------------------------------*/ @@ -204,7 +200,6 @@ friend class SwConnectionDisposedListener_Impl; SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate); SAL_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, sal_Bool bCreate); - SAL_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * ); /// Insert data record as text into document. @@ -247,7 +242,6 @@ public: inline void SetSubject(const OUString& sSbj) { sSubject = sSbj; } inline void SetAttachment(const OUString& sAtt) { sAttached = sAtt; } - /// Fill listbox with all table names of a database. sal_Bool GetTableNames(ListBox* pListBox, const OUString& rDBName ); @@ -303,7 +297,6 @@ public: {return FindDSData(rData, sal_True);} const SwDSParamArr& GetDSParamArray() const {return aDataSourceParams;} - /// close all data sources - after fields were updated void CloseAll(sal_Bool bIncludingMerge = sal_True); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 739fc743857c..84cea92113bb 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -147,7 +147,6 @@ public: */ virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj ); - // ------------------------------------------------------------------------- /** some virtual helper methods for information about the object (Writer fly frame resp. drawing object) */ const SwFmtAnchor& GetAnchorFmt() const @@ -172,8 +171,6 @@ public: const SwIndex& GetCntntAnchorIndex() const; - // ------------------------------------------------------------------------- - /** get data collection of anchored objects, handled by with contact */ @@ -323,7 +320,6 @@ class SwDrawVirtObj : public SdrVirtObj bool CheckControlLayer( const SdrObject *pObj ); - /** ContactObject for connection of formats as representatives of draw objects in SwClient and the objects themselves in Drawing (SDrObjUserCall). */ class NestedUserCallHdl; diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 97dfe92b2b33..3fa8df5cb08c 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -106,7 +106,6 @@ public: virtual void SetPar2(const OUString& rStr); }; - #endif // INCLUDED_SW_INC_DDEFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index e98a41c83183..e1d19a85b547 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/frame/XDesktop2.hpp> #include <cppuhelper/implbase2.hxx> - namespace com { namespace sun { namespace star { namespace linguistic2 { class XDictionaryList; @@ -39,12 +38,10 @@ namespace com { namespace sun { namespace star { } } } } -/////////////////////////////////////////////////////////////////////////// // SwLinguServiceEventListener // is a EventListener that triggers spellchecking // and hyphenation when relevant changes (to the // dictionaries of the dictionary list, or properties) were made. -// class SwLinguServiceEventListener : public cppu::WeakImplHelper2 @@ -82,7 +79,6 @@ public: virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx index 1b2e9cfbbae3..b76fb541c766 100644 --- a/sw/inc/dobjfac.hxx +++ b/sw/inc/dobjfac.hxx @@ -21,9 +21,8 @@ #include <tools/link.hxx> -//----------------------- // class SwObjectFactory -//----------------------- + class SdrObjFactory; class SwObjectFactory @@ -34,7 +33,6 @@ public: extern SwObjectFactory aSwObjectFactory; - #endif // INCLUDED_SW_INC_DOBJFAC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index d15b353158de..2f030ba3613c 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -19,8 +19,7 @@ #ifndef INCLUDED_SW_INC_DOC_HXX #define INCLUDED_SW_INC_DOC_HXX -/** SwDoc interfaces */ - +// SwDoc interfaces #include <IInterface.hxx> #include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> @@ -212,13 +211,13 @@ namespace sw { namespace com { namespace sun { namespace star { namespace i18n { - struct ForbiddenCharacters; ///< comes from the I18N UNO interface + struct ForbiddenCharacters; //< comes from the I18N UNO interface } namespace uno { template < class > class Sequence; } namespace container { - class XNameContainer; ///< for getXForms()/isXForms()/initXForms() methods + class XNameContainer; //< for getXForms()/isXForms()/initXForms() methods } }}} @@ -228,21 +227,21 @@ namespace sfx2 { class LinkManager; } -/// PageDescriptor-interface, Array because of inlines. +// PageDescriptor-interface, Array because of inlines. class SwPageDescs : public std::vector<SwPageDesc*> { public: - /// the destructor will free all objects still in the vector + // the destructor will free all objects still in the vector ~SwPageDescs(); }; -/// forward declaration +// forward declaration void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem ); -/// global function to start grammar checking in the document +// global function to start grammar checking in the document void StartGrammarChecking( SwDoc &rDoc ); -/// Represents the model of a Writer document. +// Represents the model of a Writer document. class SW_DLLPUBLIC SwDoc : public IInterface, public IDocumentSettingAccess, @@ -268,119 +267,114 @@ class SW_DLLPUBLIC SwDoc : friend void _InitCore(); friend void _FinitCore(); - //---------------- private Member -------------------------------- - - // ------------------------------------------------------------------- - ::boost::scoped_ptr<SwNodes> m_pNodes; ///< document content (Nodes Array) - SwAttrPool* mpAttrPool; ///< the attribute pool - SwPageDescs maPageDescs; ///< PageDescriptors - Link maOle2Link; ///< OLE 2.0-notification + // private Member + ::boost::scoped_ptr<SwNodes> m_pNodes; //< document content (Nodes Array) + SwAttrPool* mpAttrPool; //< the attribute pool + SwPageDescs maPageDescs; //< PageDescriptors + Link maOle2Link; //< OLE 2.0-notification /* @@@MAINTAINABILITY-HORROR@@@ Timer should not be members of the model */ - Timer maIdleTimer; ///< Own IdleTimer - Timer maOLEModifiedTimer; ///< Timer for update modified OLE-Objecs - Timer maStatsUpdateTimer; ///< Timer for asynchronous stats calculation - SwDBData maDBData; ///< database descriptor + Timer maIdleTimer; //< Own IdleTimer + Timer maOLEModifiedTimer; //< Timer for update modified OLE-Objecs + Timer maStatsUpdateTimer; //< Timer for asynchronous stats calculation + SwDBData maDBData; //< database descriptor ::com::sun::star::uno::Sequence <sal_Int8 > maRedlinePasswd; - OUString msTOIAutoMarkURL; ///< ::com::sun::star::util::URL of table of index AutoMark file + OUString msTOIAutoMarkURL; //< ::com::sun::star::util::URL of table of index AutoMark file boost::ptr_vector< boost::nullable<OUString> > maPatternNms; // Array for names of document-templates com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> - mxXForms; ///< container with XForms models + mxXForms; //< container with XForms models mutable com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > m_xGCIterator; const ::boost::scoped_ptr< ::sw::mark::MarkManager> mpMarkManager; const ::boost::scoped_ptr< ::sw::MetaFieldManager > m_pMetaFieldManager; const ::boost::scoped_ptr< ::sw::UndoManager > m_pUndoManager; - // ------------------------------------------------------------------- // Pointer - - SwFrmFmt *mpDfltFrmFmt; ///< Default formats. - SwFrmFmt *mpEmptyPageFmt; ///< Format for the default empty page - SwFrmFmt *mpColumnContFmt; ///< Format for column container + SwFrmFmt *mpDfltFrmFmt; //< Default formats. + SwFrmFmt *mpEmptyPageFmt; //< Format for the default empty page + SwFrmFmt *mpColumnContFmt; //< Format for column container SwCharFmt *mpDfltCharFmt; - SwTxtFmtColl *mpDfltTxtFmtColl; ///< Defaultformatcollections + SwTxtFmtColl *mpDfltTxtFmtColl; //< Defaultformatcollections SwGrfFmtColl *mpDfltGrfFmtColl; - SwFrmFmts *mpFrmFmtTbl; ///< Format table + SwFrmFmts *mpFrmFmtTbl; //< Format table SwCharFmts *mpCharFmtTbl; SwFrmFmts *mpSpzFrmFmtTbl; SwSectionFmts *mpSectionFmtTbl; - SwFrmFmts *mpTblFrmFmtTbl; ///< For tables - SwTxtFmtColls *mpTxtFmtCollTbl; ///< FormatCollections + SwFrmFmts *mpTblFrmFmtTbl; //< For tables + SwTxtFmtColls *mpTxtFmtCollTbl; //< FormatCollections SwGrfFmtColls *mpGrfFmtCollTbl; - SwTOXTypes *mpTOXTypes; ///< Tables/indices - SwDefTOXBase_Impl * mpDefTOXBases; ///< defaults of SwTOXBase's + SwTOXTypes *mpTOXTypes; //< Tables/indices + SwDefTOXBase_Impl * mpDefTOXBases; //< defaults of SwTOXBase's - SwViewShell *mpCurrentView; ///< SwDoc should get a new member mpCurrentView - SdrModel *mpDrawModel; ///< StarView Drawing + SwViewShell *mpCurrentView; //< SwDoc should get a new member mpCurrentView + SdrModel *mpDrawModel; //< StarView Drawing - SwDocUpdtFld *mpUpdtFlds; ///< Struct for updating fields + SwDocUpdtFld *mpUpdtFlds; //< Struct for updating fields SwFldTypes *mpFldTypes; SwNewDBMgr *mpNewDBMgr; /**< Pointer to the new DBMgr for evaluation of DB-fields. */ - VirtualDevice *mpVirDev; ///< can be used for formatting - SfxPrinter *mpPrt; ///< can be used for formatting - SwPrintData *mpPrtData; ///< Print configuration + VirtualDevice *mpVirDev; //< can be used for formatting + SfxPrinter *mpPrt; //< can be used for formatting + SwPrintData *mpPrtData; //< Print configuration - SwDoc *mpGlossaryDoc; ///< Pointer to glossary-document. + SwDoc *mpGlossaryDoc; //< Pointer to glossary-document. SwNumRule *mpOutlineRule; SwFtnInfo *mpFtnInfo; SwEndNoteInfo *mpEndNoteInfo; SwLineNumberInfo*mpLineNumberInfo; SwFtnIdxs *mpFtnIdxs; - SwDocStat *mpDocStat; ///< Statistics information. + SwDocStat *mpDocStat; //< Statistics information. - SwDocShell *mpDocShell; ///< Ptr to SfxDocShell of Doc. - SfxObjectShellLock mxTmpDocShell; ///< A temporary shell that is used to copy OLE-Nodes + SwDocShell *mpDocShell; //< Ptr to SfxDocShell of Doc. + SfxObjectShellLock mxTmpDocShell; //< A temporary shell that is used to copy OLE-Nodes - - sfx2::LinkManager *mpLinkMgr; ///< List of linked stuff (graphics/DDE/OLE). + sfx2::LinkManager *mpLinkMgr; //< List of linked stuff (graphics/DDE/OLE). SwAutoCorrExceptWord *mpACEWord; /**< For the automated takeover of auto-corrected words that are "re-corrected". */ - SwURLStateChanged *mpURLStateChgd; ///< SfxClient for changes in INetHistory - SvNumberFormatter *mpNumberFormatter;///< NumFormatter for tables / fields + SwURLStateChanged *mpURLStateChgd; //< SfxClient for changes in INetHistory + SvNumberFormatter *mpNumberFormatter;//< NumFormatter for tables / fields - mutable SwNumRuleTbl *mpNumRuleTbl; ///< List of all named NumRules. + mutable SwNumRuleTbl *mpNumRuleTbl; //< List of all named NumRules. - /// Hash map to find numrules by name + // Hash map to find numrules by name mutable boost::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap; typedef boost::unordered_map<OUString, SwList*, OUStringHash> tHashMapForLists; - /// container to hold the lists of the text document + // container to hold the lists of the text document tHashMapForLists maLists; - /// relation between list style and its default list + // relation between list style and its default list tHashMapForLists maListStyleLists; - SwRedlineTbl *mpRedlineTbl; ///< List of all Ranged Redlines. - SwExtraRedlineTbl *mpExtraRedlineTbl; ///< List of all Extra Redlines. - OUString *mpAutoFmtRedlnComment; ///< Comment for Redlines inserted via AutoFormat. + SwRedlineTbl *mpRedlineTbl; //< List of all Ranged Redlines. + SwExtraRedlineTbl *mpExtraRedlineTbl; //< List of all Extra Redlines. + OUString *mpAutoFmtRedlnComment; //< Comment for Redlines inserted via AutoFormat. SwUnoCrsrTbl *mpUnoCrsrTbl; - SwPagePreviewPrtData *mpPgPViewPrtData; ///< Indenting / spacing for printing of page view. + SwPagePreviewPrtData *mpPgPViewPrtData; //< Indenting / spacing for printing of page view. SwPaM *mpExtInputRing; SwLayouter *mpLayouter; /**< ::com::sun::star::frame::Controller for complex layout formatting like footnote/endnote in sections */ - IStyleAccess *mpStyleAccess; ///< handling of automatic styles + IStyleAccess *mpStyleAccess; //< handling of automatic styles SwLayoutCache *mpLayoutCache; /**< Layout cache to read and save with the document for a faster formatting */ SwModify *mpUnoCallBack; - IGrammarContact *mpGrammarContact; ///< for grammar checking in paragraphs during editing + IGrammarContact *mpGrammarContact; //< for grammar checking in paragraphs during editing mutable comphelper::ImplementationReference< SwChartDataProvider , ::com::sun::star::chart2::data::XDataProvider > maChartDataProviderImplRef; SwChartLockController_Helper *mpChartControllerHelper; - /// table of forbidden characters of this document + // table of forbidden characters of this document rtl::Reference<SvxForbiddenCharactersTable> mxForbiddenCharsTable; com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents; com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache; @@ -397,26 +391,25 @@ private: ::std::auto_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry; - // ------------------------------------------------------------------- // other - sal_uInt16 mnUndoCnt; ///< Count of Undo Actions. - sal_uInt16 mnUndoSttEnd; ///< != 0 -> within parentheses. + sal_uInt16 mnUndoCnt; //< Count of Undo Actions. + sal_uInt16 mnUndoSttEnd; //< != 0 -> within parentheses. sal_uInt16 mnAutoFmtRedlnCommentNo; /**< SeqNo for conjoining of AutoFmt-Redlines. by the UI. Managed by SwAutoFmt! */ - sal_uInt16 mnLinkUpdMode; ///< UpdateMode for links. - SwFldUpdateFlags meFldUpdMode;///< Automatically Update Mode for fields/charts. - RedlineMode_t meRedlineMode; ///< Current Redline Mode. - SwCharCompressType meChrCmprType;///< for ASIAN: compress punctuation/kana + sal_uInt16 mnLinkUpdMode; //< UpdateMode for links. + SwFldUpdateFlags meFldUpdMode;//< Automatically Update Mode for fields/charts. + RedlineMode_t meRedlineMode; //< Current Redline Mode. + SwCharCompressType meChrCmprType;//< for ASIAN: compress punctuation/kana - sal_uInt32 mnRsid; ///< current session ID of the document - sal_uInt32 mnRsidRoot; ///< session ID when the document was created + sal_uInt32 mnRsid; //< current session ID of the document + sal_uInt32 mnRsidRoot; //< session ID when the document was created sal_Int32 mReferenceCount; sal_Int32 mIdleBlockCount; - sal_Int8 mnLockExpFld; ///< If != 0 UpdateExpFlds() has no effect! + sal_Int8 mnLockExpFld; //< If != 0 UpdateExpFlds() has no effect! /** Draw Model Layer IDs * LayerIds, Heaven == above document @@ -430,55 +423,54 @@ private: SdrLayerID mnInvisibleHell; SdrLayerID mnInvisibleControls; - bool mbGlossDoc : 1; ///< TRUE: glossary document. - bool mbModified : 1; ///< TRUE: document has changed. + bool mbGlossDoc : 1; //< TRUE: glossary document. + bool mbModified : 1; //< TRUE: document has changed. bool mbDtor : 1; /**< TRUE: is in SwDoc DTOR. and unfortunately temorarily also in SwSwgReader::InLayout() when flawed frames need deletion. */ - bool mbPageNums : 1; ///< TRUE: There are virtual page numbers. - bool mbLoaded : 1; ///< TRUE: Doc loaded. - bool mbUpdateExpFld : 1; ///< TRUE: Update expression fields. - bool mbNewDoc : 1; ///< TRUE: new Doc. - bool mbNewFldLst : 1; ///< TRUE: Rebuild field-list. - bool mbCopyIsMove : 1; ///< TRUE: Copy is a hidden Move. - bool mbVisibleLinks : 1; ///< TRUE: Links are inserted visibly. - bool mbInReading : 1; ///< TRUE: Document is in the process of being read. - bool mbInXMLImport : 1; ///< TRUE: During xml import, attribute portion building is not necessary. - bool mbUpdateTOX : 1; ///< TRUE: After loading document, update TOX. - bool mbInLoadAsynchron : 1; ///< TRUE: Document is in the process of being loaded asynchronously. - bool mbHTMLMode : 1; ///< TRUE: Document is in HTMLMode. - bool mbInCallModified : 1; ///< TRUE: in Set/Reset-Modified link. - bool mbIsGlobalDoc : 1; ///< TRUE: It's a global document. - bool mbGlblDocSaveLinks : 1; ///< TRUE: Save sections linked in global document. - bool mbIsLabelDoc : 1; ///< TRUE: It's a label document. - bool mbIsAutoFmtRedline : 1; ///< TRUE: Redlines are recorded by Autoformat. + bool mbPageNums : 1; //< TRUE: There are virtual page numbers. + bool mbLoaded : 1; //< TRUE: Doc loaded. + bool mbUpdateExpFld : 1; //< TRUE: Update expression fields. + bool mbNewDoc : 1; //< TRUE: new Doc. + bool mbNewFldLst : 1; //< TRUE: Rebuild field-list. + bool mbCopyIsMove : 1; //< TRUE: Copy is a hidden Move. + bool mbVisibleLinks : 1; //< TRUE: Links are inserted visibly. + bool mbInReading : 1; //< TRUE: Document is in the process of being read. + bool mbInXMLImport : 1; //< TRUE: During xml import, attribute portion building is not necessary. + bool mbUpdateTOX : 1; //< TRUE: After loading document, update TOX. + bool mbInLoadAsynchron : 1; //< TRUE: Document is in the process of being loaded asynchronously. + bool mbHTMLMode : 1; //< TRUE: Document is in HTMLMode. + bool mbInCallModified : 1; //< TRUE: in Set/Reset-Modified link. + bool mbIsGlobalDoc : 1; //< TRUE: It's a global document. + bool mbGlblDocSaveLinks : 1; //< TRUE: Save sections linked in global document. + bool mbIsLabelDoc : 1; //< TRUE: It's a label document. + bool mbIsAutoFmtRedline : 1; //< TRUE: Redlines are recorded by Autoformat. bool mbOLEPrtNotifyPending : 1; /**< TRUE: Printer has changed. At creation of ::com::sun::star::sdbcx::View notification of OLE-Objects PrtOLENotify() is required. */ - bool mbAllOLENotify : 1; ///< True: Notification of all objects is required. - bool mbIsRedlineMove : 1; ///< True: Redlines are moved into to / out of the section. - bool mbInsOnlyTxtGlssry : 1; ///< True: insert 'only text' glossary into doc - bool mbContains_MSVBasic : 1; ///< True: MS-VBasic exist is in our storage - bool mbPurgeOLE : 1; ///< sal_True: Purge OLE-Objects - bool mbKernAsianPunctuation : 1; ///< sal_True: kerning also for ASIAN punctuation - bool mbReadlineChecked : 1; ///< sal_True: if the query was already shown + bool mbAllOLENotify : 1; //< True: Notification of all objects is required. + bool mbIsRedlineMove : 1; //< True: Redlines are moved into to / out of the section. + bool mbInsOnlyTxtGlssry : 1; //< True: insert 'only text' glossary into doc + bool mbContains_MSVBasic : 1; //< True: MS-VBasic exist is in our storage + bool mbPurgeOLE : 1; //< sal_True: Purge OLE-Objects + bool mbKernAsianPunctuation : 1; //< sal_True: kerning also for ASIAN punctuation + bool mbReadlineChecked : 1; //< sal_True: if the query was already shown bool mbLinksUpdated : 1; /**< #i38810# flag indicating, that the links have been updated. */ - bool mbClipBoard : 1; ///< TRUE: this document represents the clipboard + bool mbClipBoard : 1; //< TRUE: this document represents the clipboard bool mbColumnSelection : 1; /**< TRUE: this content has bee created by a column selection (clipboard docs only) */ bool mbIsPrepareSelAll : 1; #ifdef DBG_UTIL - bool mbXMLExport : 1; ///< sal_True: during XML export + bool mbXMLExport : 1; //< sal_True: during XML export #endif // true: Document contains at least one anchored object, which is anchored AT_PAGE with a content position. // Thus, certain adjustment needed during formatting for these kind of anchored objects. bool mbContainsAtPageObjWithContentAnchor : 1; - // // COMPATIBILITY FLAGS START // // @@ -556,9 +548,9 @@ private: // attribute 'WrapInfluenceOnObjPos'. bool mbMathBaselineAlignment : 1; // TL 2010-10-29 #i972# bool mbStylesNoDefault : 1; - bool mbFloattableNomargins : 1; ///< If paragraph margins next to a floating table should be ignored. - bool mEmbedFonts : 1; ///< Whether to embed fonts used by the document when saving. - bool mEmbedSystemFonts : 1; ///< Whether to embed also system fonts. + bool mbFloattableNomargins : 1; //< If paragraph margins next to a floating table should be ignored. + bool mEmbedFonts : 1; //< Whether to embed fonts used by the document when saving. + bool mEmbedSystemFonts : 1; //< Whether to embed also system fonts. // non-ui-compatibility flags: bool mbOldNumbering : 1; @@ -589,18 +581,15 @@ private: sal_uInt32 mn32DummyCompatabilityOptions1; sal_uInt32 mn32DummyCompatabilityOptions2; - // // COMPATIBILITY FLAGS END - // - bool mbStartIdleTimer; ///< idle timer mode start/stop + bool mbStartIdleTimer; //< idle timer mode start/stop - static SwAutoCompleteWord *mpACmpltWords; ///< List of all words for AutoComplete + static SwAutoCompleteWord *mpACmpltWords; //< List of all words for AutoComplete - //---------------- private methods ------------------------------ + // private methods void checkRedlining(RedlineMode_t& _rReadlineMode); - DECL_LINK( AddDrawUndo, SdrUndoAction * ); // DrawModel void DrawNotifyUndoHdl(); @@ -642,14 +631,14 @@ private: Care has to be taken of the necessary invalidations and notifications. */ - /// gcc: aFtnInfo::CopyCtor is private, therefore we too have to protect ourselves. + // gcc: aFtnInfo::CopyCtor is private, therefore we too have to protect ourselves. SwDoc( const SwDoc &); // For fields: - void _InitFieldTypes(); ///< Called by CTOR!! + void _InitFieldTypes(); //< Called by CTOR!! void _MakeFldList( int eMode ); - /// Database fields: + // Database fields: void UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc ); void AddUsedDBToList( std::vector<OUString>& rDBNameList, const std::vector<OUString>& rUsedDBNames ); @@ -674,15 +663,15 @@ private: bool SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, const SwTxtFmtColl* pSplitColl, int nOutlineLevel = 0 ); - /// Update charts of given table. + // Update charts of given table. void _UpdateCharts( const SwTable& rTbl, SwViewShell& rVSh ) const; sal_Bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, sal_uInt16 nMode ); - /// Our own 'IdleTimer' calls the following method + // Our own 'IdleTimer' calls the following method DECL_LINK( DoIdleJobs, Timer * ); - /// CharTimer calls this method. + // CharTimer calls this method. void DoUpdateAllCharts(); DECL_LINK( DoUpdateModifiedOLE, Timer * ); @@ -711,8 +700,7 @@ public: DocumentType GetDocumentType(){ return meDocType; } void SetDocumentType( DocumentType eDocType ) { meDocType = eDocType; } - /** Life cycle - */ + // Life cycle SwDoc(); ~SwDoc(); @@ -724,14 +712,12 @@ public: SwNodes & GetNodes() { return *m_pNodes; } SwNodes const& GetNodes() const { return *m_pNodes; } - /** IInterface - */ + // IInterface virtual sal_Int32 acquire(); virtual sal_Int32 release(); virtual sal_Int32 getReferenceCount() const; - /** IDocumentSettingAccess - */ + // IDocumentSettingAccess virtual bool get(/*[in]*/ DocumentSettingId id) const; virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value); virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const; @@ -749,8 +735,7 @@ public: virtual sal_uInt32 getRsidRoot() const; virtual void setRsidRoot( sal_uInt32 nVal ); - /** IDocumentDeviceAccess - */ + // IDocumentDeviceAccess virtual SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const; virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ); virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const; @@ -762,13 +747,11 @@ public: virtual const SwPrintData & getPrintData() const; virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData); - /** IDocumentMarkAccess - */ + // IDocumentMarkAccess IDocumentMarkAccess* getIDocumentMarkAccess(); const IDocumentMarkAccess* getIDocumentMarkAccess() const; - /** IDocumentRedlineAccess - */ + // IDocumentRedlineAccess virtual RedlineMode_t GetRedlineMode() const; virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode); virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode); @@ -801,13 +784,11 @@ public: virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const; virtual void SetRedlinePassword(/*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword); - /** IDocumentUndoRedo - */ + // IDocumentUndoRedo IDocumentUndoRedo & GetIDocumentUndoRedo(); IDocumentUndoRedo const& GetIDocumentUndoRedo() const; - /** IDocumentLinksAdministration - */ + // IDocumentLinksAdministration virtual bool IsVisibleLinks() const; virtual void SetVisibleLinks(bool bFlag); virtual sfx2::LinkManager& GetLinkManager(); @@ -820,8 +801,7 @@ public: virtual void SetLinksUpdated(const bool bNewLinksUpdated); virtual bool LinksUpdated() const; - /** IDocumentFieldsAccess - */ + // IDocumentFieldsAccess virtual const SwFldTypes *GetFldTypes() const; virtual SwFieldType *InsertFldType(const SwFieldType &); virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const; @@ -862,8 +842,7 @@ public: static SwTxtFld* GetTxtFldAtPos(const SwPosition& rPos); bool containsUpdatableFields(); - /** IDocumentContentOperations - */ + // IDocumentContentOperations virtual bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll) const; virtual void DeleteSection(SwNode* pNode); virtual bool DeleteRange(SwPaM&); @@ -891,7 +870,7 @@ public: virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*); - /// Add a para for the char attribute exp... + // Add a para for the char attribute exp... virtual bool InsertPoolItem( const SwPaM &rRg, const SfxPoolItem&, @@ -911,8 +890,7 @@ public: const bool bRegExReplace); virtual void RemoveLeadingWhiteSpace(const SwPosition & rPos ); - /** IDocumentStylePoolAccess - */ + // IDocumentStylePoolAccess virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ); virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ); virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ); @@ -923,21 +901,18 @@ public: virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const; virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const; - /** IDocumentLineNumberAccess - */ + // IDocumentLineNumberAccess virtual const SwLineNumberInfo& GetLineNumberInfo() const; virtual void SetLineNumberInfo(const SwLineNumberInfo& rInfo); - /** IDocumentStatistics - */ + // IDocumentStatistics virtual void DocInfoChgd(); virtual const SwDocStat &GetDocStat() const; virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true); virtual void SetDocStat(const SwDocStat& rStat); virtual void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true); - /** IDocumentState - */ + // IDocumentState virtual void SetModified(); virtual void ResetModified(); virtual bool IsModified() const; @@ -950,8 +925,7 @@ public: virtual void SetUpdateExpFldStat(bool b); virtual void SetLoaded(bool b); - /** IDocumentDrawModelAccess - */ + // IDocumentDrawModelAccess virtual const SdrModel* GetDrawModel() const; virtual SdrModel* GetDrawModel(); virtual SdrLayerID GetHeavenId() const; @@ -967,8 +941,7 @@ public: virtual SdrModel* _MakeDrawModel(); virtual SdrModel* GetOrCreateDrawModel(); - /** IDocumentLayoutAccess - */ + // IDocumentLayoutAccess virtual void SetCurrentViewShell( SwViewShell* pNew ); virtual SwLayouter* GetLayouter(); virtual const SwLayouter* GetLayouter() const; @@ -977,28 +950,25 @@ public: virtual void DelLayoutFmt( SwFrmFmt *pFmt ); virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms ); virtual const SwViewShell *GetCurrentViewShell() const; - virtual SwViewShell *GetCurrentViewShell(); ///< It must be able to communicate to a SwViewShell.This is going to be removerd later. + virtual SwViewShell *GetCurrentViewShell(); //< It must be able to communicate to a SwViewShell.This is going to be removerd later. virtual const SwRootFrm *GetCurrentLayout() const; virtual SwRootFrm *GetCurrentLayout(); virtual bool HasLayout() const; void ClearSwLayouterEntries(); - /** IDocumentTimerAccess - */ + // IDocumentTimerAccess virtual void StartIdling(); virtual void StopIdling(); virtual void BlockIdling(); virtual void UnblockIdling(); virtual void StartBackgroundJobs(); - /** IDocumentChartDataProviderAccess - */ + // IDocumentChartDataProviderAccess virtual SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const; virtual void CreateChartInternalDataProviders( const SwTable *pTable ); virtual SwChartLockController_Helper & GetChartControllerHelper(); - /** IDocumentListItems - */ + // IDocumentListItems virtual void addListItem( const SwNodeNum& rNodeNum ); virtual void removeListItem( const SwNodeNum& rNodeNum ); virtual OUString getListItemText( const SwNodeNum& rNodeNum, @@ -1007,8 +977,7 @@ public: virtual void getListItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const; virtual void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const; - /** IDocumentOutlineNodes - */ + // IDocumentOutlineNodes virtual sal_Int32 getOutlineNodesCount() const; virtual int getOutlineLevel( const sal_Int32 nIdx ) const; virtual OUString getOutlineText( const sal_Int32 nIdx, @@ -1018,8 +987,7 @@ public: virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const; virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const; - /** IDocumentListsAccess - */ + // IDocumentListsAccess virtual SwList* createList( const OUString& rListId, const OUString& rDefaultListStyleName ); virtual void deleteList( const OUString& rListId ); @@ -1030,7 +998,7 @@ public: virtual void trackChangeOfListStyleName( const OUString& rListStyleName, const OUString& rNewListStyleName ); - /** IDocumentExternalData */ + // IDocumentExternalData virtual void setExternalData(::sw::tExternalDataType eType, ::sw::tExternalDataPointer pPayload); virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType); @@ -1040,14 +1008,11 @@ public: virtual void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } virtual const OUString getDocAccTitle() const { return msDocAccTitle; } - /** INextInterface here - */ - + // INextInterface here DECL_STATIC_LINK( SwDoc, BackgroundDone, SvxBrushItem *); DECL_LINK(CalcFieldValueHdl, EditFieldInfo*); - /** OLE ??? - */ + // OLE ??? bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; } inline void SetOLEPrtNotifyPending( bool bSet = true ); void PrtOLENotify( sal_Bool bAll ); //All or only marked @@ -1081,7 +1046,7 @@ public: bool bDrawAlso = false, bool bAsCharAlso = false ) const; - /// Because swrtf.cxx and define private public here now. + // Because swrtf.cxx and define private public here now. SwFlyFrmFmt *MakeFlyFrmFmt (const OUString &rFmtName, SwFrmFmt *pDerivedFrom); SwDrawFrmFmt *MakeDrawFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom); @@ -1124,8 +1089,7 @@ public: void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt, const OUString& sNewDescription ); - /** Footnotes - */ + // Footnotes // Footnote information const SwFtnInfo& GetFtnInfo() const { return *mpFtnInfo; } void SetFtnInfo(const SwFtnInfo& rInfo); @@ -1133,7 +1097,7 @@ public: void SetEndNoteInfo(const SwEndNoteInfo& rInfo); SwFtnIdxs& GetFtnIdxs() { return *mpFtnIdxs; } const SwFtnIdxs& GetFtnIdxs() const { return *mpFtnIdxs; } - /// change footnotes in area + // change footnotes in area bool SetCurFtn( const SwPaM& rPam, const OUString& rNumStr, sal_uInt16 nNumber, bool bIsEndNote ); @@ -1151,10 +1115,10 @@ public: Hyphenate( SwPaM *pPam, const Point &rCrsrPos, sal_uInt16* pPageCnt, sal_uInt16* pPageSt ); - /// count words in pam + // count words in pam void CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const; - /// Glossary Document + // Glossary Document void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; } bool IsInsOnlyTextGlossary() const { return mbInsOnlyTxtGlssry; } @@ -1169,15 +1133,14 @@ public: bool IsInVerticalText( const SwPosition& rPos, const Point* pPt = 0 ) const; - /** Database and DB-Manager - */ + // Database and DB-Manager void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { mpNewDBMgr = pNewMgr; } SwNewDBMgr* GetNewDBMgr() const { return mpNewDBMgr; } void ChangeDBFields( const std::vector<OUString>& rOldNames, const OUString& rNewName ); void SetInitDBFields(sal_Bool b); - /// Find out which databases are used by fields. + // Find out which databases are used by fields. void GetAllUsedDB( std::vector<OUString>& rDBNameList, const std::vector<OUString>* pAllDBNames = 0 ); @@ -1186,8 +1149,7 @@ public: const SwDBData& GetDBDesc(); const SwDBData& _GetDBDesc() const { return maDBData; } - /** Some helper functions - */ + // Some helper functions OUString GetUniqueGrfName() const; OUString GetUniqueOLEName() const; OUString GetUniqueFrameName() const; @@ -1199,7 +1161,7 @@ public: void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName ) const; - /// Set a valid name for all Flys that have none (Called by Readers after reading). + // Set a valid name for all Flys that have none (Called by Readers after reading). void SetAllUniqueFlyNames(); /** Reset attributes. All TxtHints and (if completely selected) all hard- @@ -1219,7 +1181,7 @@ public: * If Undo is enabled, the old values is added to the Undo history. */ void SetAttr( const SfxItemSet&, SwFmt& ); - /// method to reset a certain attribute at the given format + // method to reset a certain attribute at the given format void ResetAttrAtFormat( const sal_uInt16 nWhichId, SwFmt& rChangedFormat ); @@ -1228,18 +1190,18 @@ public: void SetDefault( const SfxPoolItem& ); void SetDefault( const SfxItemSet& ); - /// Query default attribute in this document. + // Query default attribute in this document. const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const; - /// Do not expand text attributes. + // Do not expand text attributes. bool DontExpandFmt( const SwPosition& rPos, bool bFlag = true ); - /* Formats */ + // Formats const SwFrmFmts* GetFrmFmts() const { return mpFrmFmtTbl; } SwFrmFmts* GetFrmFmts() { return mpFrmFmtTbl; } const SwCharFmts* GetCharFmts() const { return mpCharFmtTbl;} - /** LayoutFormats (frames, DrawObjects), sometimes const sometimes not */ + // LayoutFormats (frames, DrawObjects), sometimes const sometimes not const SwFrmFmts* GetSpzFrmFmts() const { return mpSpzFrmFmtTbl; } SwFrmFmts* GetSpzFrmFmts() { return mpSpzFrmFmtTbl; } @@ -1252,10 +1214,10 @@ public: const SwCharFmt *GetDfltCharFmt() const { return mpDfltCharFmt;} SwCharFmt *GetDfltCharFmt() { return mpDfltCharFmt;} - /// @return the interface of the management of (auto)styles + // @return the interface of the management of (auto)styles IStyleAccess& GetIStyleAccess() { return *mpStyleAccess; } - /// Remove all language dependencies from all existing formats + // Remove all language dependencies from all existing formats void RemoveAllFmtLanguageDependencies(); SwFrmFmt *MakeFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom, @@ -1272,7 +1234,7 @@ public: SwCharFmt* FindCharFmtByName( const OUString& rName ) const { return (SwCharFmt*)FindFmtByName( (SwFmtsBase&)*mpCharFmtTbl, rName ); } - /* Formatcollections (styles) */ + // Formatcollections (styles) // TXT const SwTxtFmtColl* GetDfltTxtFmtColl() const { return mpDfltTxtFmtColl; } const SwTxtFmtColls *GetTxtFmtColls() const { return mpTxtFmtCollTbl; } @@ -1307,7 +1269,7 @@ public: SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const { return (SwGrfFmtColl*)FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName ); } - /// Table formatting + // Table formatting const SwFrmFmts* GetTblFrmFmts() const { return mpTblFrmFmtTbl; } SwFrmFmts* GetTblFrmFmts() { return mpTblFrmFmtTbl; } sal_uInt16 GetTblFrmFmtCount( bool bUsed ) const; @@ -1321,29 +1283,29 @@ public: sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL) const; SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = FLYCNTTYPE_ALL); - /// Copy formats in own arrays and return them. + // Copy formats in own arrays and return them. SwFrmFmt *CopyFrmFmt ( const SwFrmFmt& ); SwCharFmt *CopyCharFmt( const SwCharFmt& ); SwTxtFmtColl* CopyTxtColl( const SwTxtFmtColl& rColl ); SwGrfFmtColl* CopyGrfColl( const SwGrfFmtColl& rColl ); - /// Replace all styles with those from rSource. + // Replace all styles with those from rSource. void ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles = true ); - /// Replace all property defaults with those from rSource. + // Replace all property defaults with those from rSource. void ReplaceDefaults( const SwDoc& rSource ); - /// Replace all compatability options with those from rSource. + // Replace all compatability options with those from rSource. void ReplaceCompatabilityOptions(const SwDoc& rSource); - /// Query if style (paragraph- / character- / frame- / page-) is used. + // Query if style (paragraph- / character- / frame- / page-) is used. bool IsUsed( const SwModify& ) const; bool IsUsed( const SwNumRule& ) const; - /// Set name of newly loaded document template. + // Set name of newly loaded document template. sal_uInt16 SetDocPattern( const OUString& rPatternName ); - /// @return name of document template. Can be 0! + // @return name of document template. Can be 0! const OUString* GetDocPattern( sal_uInt16 nPos ) const { if(nPos >= maPatternNms.size()) @@ -1353,13 +1315,13 @@ public: return &(maPatternNms[nPos]); } - /// Delete all unreferenced field types. - void GCFieldTypes(); ///< impl. in docfld.cxx + // Delete all unreferenced field types. + void GCFieldTypes(); //< impl. in docfld.cxx - /// Query / connect current document with glossary document. + // Query / connect current document with glossary document. void SetGlossaryDoc( SwDoc* pDoc ) { mpGlossaryDoc = pDoc; } - /// travel over PaM Ring + // travel over PaM Ring bool InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry, SwPaM& rPaM, SwCrsrShell* pShell = 0); @@ -1372,7 +1334,7 @@ public: void CalculatePagePairsForProspectPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, sal_Int32 nDocPageCount ); - /// PageDescriptor interface. + // PageDescriptor interface. sal_uInt16 GetPageDescCnt() const { return maPageDescs.size(); } const SwPageDesc& GetPageDesc( const sal_uInt16 i ) const { return *maPageDescs[i]; } SwPageDesc& GetPageDesc( sal_uInt16 i ) { return *maPageDescs[i]; } @@ -1394,8 +1356,7 @@ public: void CopyFooter( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt ) { CopyPageDescHeaderFooterImpl( false, rSrcFmt, rDestFmt ); } - //For Reader. - + // For Reader SwPageDesc * GetPageDesc( const OUString & rName ); void ChgPageDesc( const OUString & rName, const SwPageDesc& ); void ChgPageDesc( sal_uInt16 i, const SwPageDesc& ); @@ -1414,14 +1375,13 @@ public: correct this. */ void CheckDefaultPageFmt(); - /// Methods for tables/indices. - + // Methods for tables/indices sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& ) const; void DeleteTOXMark( const SwTOXMark* pTOXMark ); const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark, SwTOXSearch eDir, sal_Bool bInReadOnly ); - /// Insert/Renew table/indes. + // Insert/Renew table/indes const SwTOXBaseSection* InsertTableOf( const SwPosition& rPos, const SwTOXBase& rTOX, const SfxItemSet* pSet = 0, @@ -1439,7 +1399,7 @@ public: bool SetTOXBaseName(const SwTOXBase& rTOXBase, const OUString& rName); void SetTOXBaseProtection(const SwTOXBase& rTOXBase, sal_Bool bProtect); - /// After reading file update all tables/indices. + // After reading file update all tables/indices void SetUpdateTOX( bool bFlag = true ) { mbUpdateTOX = bFlag; } bool IsUpdateTOX() const { return mbUpdateTOX; } @@ -1451,7 +1411,7 @@ public: void SetInReading( bool bNew ) { mbInReading = bNew; } bool IsClipBoard() const { return mbClipBoard; } - /// N.B.: must be called right after constructor! (@see GetXmlIdRegistry) + // N.B.: must be called right after constructor! (@see GetXmlIdRegistry) void SetClipBoard( bool bNew ) { mbClipBoard = bNew; } bool IsColumnSelection() const { return mbColumnSelection; } @@ -1460,7 +1420,7 @@ public: bool IsInXMLImport() const { return mbInXMLImport; } void SetInXMLImport( bool bNew ) { mbInXMLImport = bNew; } - /// Manage types of tables/indices. + // Manage types of tables/indices sal_uInt16 GetTOXTypeCount( TOXTypes eTyp ) const; const SwTOXType* GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const; sal_Bool DeleteTOXType( TOXTypes eTyp, sal_uInt16 nId ); @@ -1470,10 +1430,10 @@ public: const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false ); void SetDefaultTOXBase(const SwTOXBase& rBase); - /// Key for management of index. + // Key for management of index. sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const; - /// Sort table text. + // Sort table text. bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&); bool SortText(const SwPaM&, const SwSortOptions&); @@ -1481,34 +1441,34 @@ public: // e. g. ::com::sun::star::text::Bookmarks or tables/indices. // If bMoveCrsr is set move Crsr too. - /// Set everything in rOldNode on rNewPos + Offset. + // Set everything in rOldNode on rNewPos + Offset. void CorrAbs( const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset = 0, sal_Bool bMoveCrsr = sal_False ); - /// Set everything in the range of [rStartNode, rEndNode] to rNewPos. + // Set everything in the range of [rStartNode, rEndNode] to rNewPos. void CorrAbs( const SwNodeIndex& rStartNode, const SwNodeIndex& rEndNode, const SwPosition& rNewPos, sal_Bool bMoveCrsr = sal_False ); - /// Set everything in this range from rRange to rNewPos. + // Set everything in this range from rRange to rNewPos. void CorrAbs( const SwPaM& rRange, const SwPosition& rNewPos, sal_Bool bMoveCrsr = sal_False ); - /// Set everything in rOldNode to relative Pos. + // Set everything in rOldNode to relative Pos. void CorrRel( const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset = 0, sal_Bool bMoveCrsr = sal_False ); - /// Query / set rules for Outline. + // Query / set rules for Outline. inline SwNumRule* GetOutlineNumRule() const { return mpOutlineRule; @@ -1516,10 +1476,10 @@ public: void SetOutlineNumRule( const SwNumRule& rRule ); void PropagateOutlineRule(); - /// Outline - promote / demote. + // Outline - promote / demote. bool OutlineUpDown( const SwPaM& rPam, short nOffset = 1 ); - /// Ountline - move up / move down. + // Ountline - move up / move down. bool MoveOutlinePara( const SwPaM& rPam, short nOffset = 1); bool GotoOutline( SwPosition& rPos, const OUString& rName ) const; @@ -1557,7 +1517,7 @@ public: */ void AddNumRule(SwNumRule * pRule); - /// add optional parameter <eDefaultNumberFormatPositionAndSpaceMode> + // add optional parameter <eDefaultNumberFormatPositionAndSpaceMode> sal_uInt16 MakeNumRule( const OUString &rName, const SwNumRule* pCpy = 0, bool bBroadcast = false, @@ -1566,18 +1526,18 @@ public: sal_uInt16 FindNumRule( const OUString& rName ) const; SwNumRule* FindNumRulePtr( const OUString& rName ) const; - /// Deletion only possible if ::com::sun::star::chaos::Rule is not used! + // Deletion only possible if ::com::sun::star::chaos::Rule is not used! bool RenameNumRule(const OUString & aOldName, const OUString & aNewName, bool bBroadcast = false); bool DelNumRule( const OUString& rName, bool bBroadCast = false ); OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const; - void UpdateNumRule(); /// Update all invalids. + void UpdateNumRule(); // Update all invalids. void ChgNumRuleFmts( const SwNumRule& rRule ); bool ReplaceNumRule( const SwPosition& rPos, const OUString& rOldRule, const OUString& rNewRule ); - /// Goto next/previous on same level. + // Goto next/previous on same level. bool GotoNextNum( SwPosition&, bool bOverUpper = true, sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 ); bool GotoPrevNum( SwPosition&, bool bOverUpper = true, @@ -1614,13 +1574,13 @@ public: OUString& sListId, const bool bInvestigateStartNode = false ); - /// Paragraphs without numbering but with indents. + // Paragraphs without numbering but with indents. bool NoNum( const SwPaM& ); - /// Delete, splitting of numbering list. + // Delete, splitting of numbering list. void DelNumRules( const SwPaM& ); - /// Invalidates all numrules + // Invalidates all numrules void InvalidateNumRules(); bool NumUpDown( const SwPaM&, bool bDown = true ); @@ -1651,22 +1611,22 @@ public: sal_Bool bCalledFromShell = sal_False, sal_Bool bNewModel = sal_True ); - /// If index is in a table, return TableNode, else 0. + // If index is in a table, return TableNode, else 0. SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ); inline const SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ) const; - /// Create a balanced table out of the selected range. + // Create a balanced table out of the selected range. const SwTable* TextToTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER, const SwPaM& rRange, sal_Unicode cCh, short eAdjust, const SwTableAutoFmt* = 0 ); - /// text to table conversion - API support + // text to table conversion - API support const SwTable* TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes ); sal_Bool TableToText( const SwTableNode* pTblNd, sal_Unicode cCh ); - /// Create columns / rows in table. + // Create columns / rows in table. bool InsertCol( const SwCursor& rCursor, sal_uInt16 nCnt = 1, bool bBehind = true ); bool InsertCol( const SwSelBoxes& rBoxes, @@ -1676,23 +1636,23 @@ public: bool InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt = 1, bool bBehind = true ); - /// Delete Columns/Rows in table. + // Delete Columns/Rows in table. sal_Bool DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn = false ); sal_Bool DeleteRow( const SwCursor& rCursor ); sal_Bool DeleteCol( const SwCursor& rCursor ); - /// Split / concatenate boxes in table. + // Split / concatenate boxes in table. sal_Bool SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert = sal_True, sal_uInt16 nCnt = 1, sal_Bool bSameHeight = sal_False ); - /// @return enum TableMergeErr. + // @return enum TableMergeErr. sal_uInt16 MergeTbl( SwPaM& rPam ); OUString GetUniqueTblName() const; sal_Bool IsInsTblFormatNum() const; sal_Bool IsInsTblChangeNumFormat() const; sal_Bool IsInsTblAlignNum() const; - /// From FEShell (for Undo and BModified). + // From FEShell (for Undo and BModified). void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ) const; void SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly, @@ -1702,16 +1662,16 @@ public: void SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ); - /// Direct access for UNO. + // Direct access for UNO. void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld, const SwTableBox *pStart, sal_Bool bCurRowOnly); void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet ); - /// AutoFormat for table/table selection. + // AutoFormat for table/table selection. sal_Bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew ); - /// Query attributes. + // Query attributes. sal_Bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet ); void AppendUndoForInsertFromDB( const SwPaM& rPam, sal_Bool bIsTable ); @@ -1721,7 +1681,7 @@ public: SwTableBoxFmt* MakeTableBoxFmt(); SwTableLineFmt* MakeTableLineFmt(); - /// Check if box has numerical valule. Change format of box if required. + // Check if box has numerical valule. Change format of box if required. void ChkBoxNumFmt( SwTableBox& rAktBox, sal_Bool bCallUpdate ); void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet ); void ClearBoxNumAttrs( const SwNodeIndex& rNode ); @@ -1738,7 +1698,7 @@ public: const OUString* pTblName = 0, sal_Bool* pFullTblProtection = 0 ); - /// Split table at baseline position, i.e. create a new table. + // Split table at baseline position, i.e. create a new table. sal_Bool SplitTable( const SwPosition& rPos, sal_uInt16 eMode = 0, sal_Bool bCalcNewSize = sal_False ); @@ -1747,26 +1707,26 @@ public: sal_Bool MergeTable( const SwPosition& rPos, sal_Bool bWithPrev = sal_True, sal_uInt16 nMode = 0 ); - /// Make charts of given table update. + // Make charts of given table update. void UpdateCharts( const OUString &rName ) const; - /// Update all charts, for that exists any table. + // Update all charts, for that exists any table. void UpdateAllCharts() { DoUpdateAllCharts(); } - /// Table is renamed and refreshes charts. + // Table is renamed and refreshes charts. void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName ); - /// @return the reference in document that is set for name. + // @return the reference in document that is set for name. const SwFmtRefMark* GetRefMark( const OUString& rName ) const; - /// @return RefMark via index - for UNO. + // @return RefMark via index - for UNO. const SwFmtRefMark* GetRefMark( sal_uInt16 nIndex ) const; /** @return names of all references that are set in document. If array pointer is 0 return only whether a RefMark is set in document. */ sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const; - /// Insert label. If a FlyFormat is created, return it. + // Insert label. If a FlyFormat is created, return it. SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberingSeparator, const sal_Bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx, @@ -1776,19 +1736,19 @@ public: const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator, const sal_uInt16 nId, const OUString& rCharacterStyle, SdrObject& rObj ); - /// Query attribute pool. + // Query attribute pool. const SwAttrPool& GetAttrPool() const { return *mpAttrPool; } SwAttrPool& GetAttrPool() { return *mpAttrPool; } - /// Search an EditShell or, if appropriate, a SwViewShell via layout. + // Search an EditShell or, if appropriate, a SwViewShell via layout. SwEditShell* GetEditShell( SwViewShell** ppSh = 0 ) const; ::sw::IShellCursorSupplier * GetIShellCursorSupplier(); - /// OLE 2.0-notification. + // OLE 2.0-notification. inline void SetOle2Link(const Link& rLink) {maOle2Link = rLink;} inline const Link& GetOle2Link() const {return maOle2Link;} - /// insert section (the ODF kind of section, not the nodesarray kind) + // insert section (the ODF kind of section, not the nodesarray kind) SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &, SwTOXBase const*const pTOXBase = 0, SfxItemSet const*const pAttr = 0, bool const bUpdate = true); @@ -1818,20 +1778,20 @@ public: void SetTmpDocShell( SfxObjectShellLock rLock ) { mxTmpDocShell = rLock; } SfxObjectShellLock GetTmpDocShell() { return mxTmpDocShell; } - /// For Autotexts? (text modules) They have only one SVPersist at their disposal. + // For Autotexts? (text modules) They have only one SVPersist at their disposal. SfxObjectShell* GetPersist() const; - /// Pointer to storage of SfxDocShells. Can be 0!!! + // Pointer to storage of SfxDocShells. Can be 0!!! ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetDocStorage(); - /// Query / set flag indicating if document is loaded asynchronously at this moment. + // Query / set flag indicating if document is loaded asynchronously at this moment. bool IsInLoadAsynchron() const { return mbInLoadAsynchron; } void SetInLoadAsynchron( bool bFlag ) { mbInLoadAsynchron = bFlag; } bool SelectServerObj( const OUString& rStr, SwPaM*& rpPam, SwNodeRange*& rpRange ) const; - /// For Drag&Move: (e.g. allow "moving" of RefMarks) + // For Drag&Move: (e.g. allow "moving" of RefMarks) bool IsCopyIsMove() const { return mbCopyIsMove; } void SetCopyIsMove( bool bFlag ) { mbCopyIsMove = bFlag; } @@ -1839,7 +1799,7 @@ public: void UnGroupSelection( SdrView& ); bool DeleteSelection( SwDrawView& ); - /// Invalidates OnlineSpell-WrongLists. + // Invalidates OnlineSpell-WrongLists. void SpellItAgainSam( bool bInvalid, bool bOnlyWrong, bool bSmartTags ); void InvalidateAutoCompleteFlag(); @@ -1850,16 +1810,16 @@ public: // In this case the document name has to be set in front. bool IsVisitedURL( const OUString& rURL ) const; - /// Save current values for automatic registration of exceptions in Autocorrection. + // Save current values for automatic registration of exceptions in Autocorrection. void SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew ); SwAutoCorrExceptWord* GetAutoCorrExceptWord() { return mpACEWord; } const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const; - /// Call into intransparent Basic; expect possible Return String. + // Call into intransparent Basic; expect possible Return String. bool ExecMacro( const SvxMacro& rMacro, OUString* pRet = 0, SbxArray* pArgs = 0 ); - /// Call into intransparent Basic / JavaScript. + // Call into intransparent Basic / JavaScript. sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, bool bChkPtr = false, SbxArray* pArgs = 0, const Link* pCallBack = 0 ); @@ -1870,20 +1830,20 @@ public: void MoveLeftMargin( const SwPaM& rPam, bool bRight = true, bool bModulus = true ); - /// Query NumberFormatter. + // Query NumberFormatter. inline SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True ); inline const SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True ) const; bool HasInvisibleContent() const; - /// delete invisible content, like hidden sections and paragraphs + // delete invisible content, like hidden sections and paragraphs bool RemoveInvisibleContent(); - /// restore the invisible content if it's available on the undo stack + // restore the invisible content if it's available on the undo stack bool RestoreInvisibleContent(); bool ConvertFieldsToText(); - /// Create sub-documents according to given collection. - /// If no collection is given, use chapter styles for 1st level. + // Create sub-documents according to given collection. + // If no collection is given, use chapter styles for 1st level. sal_Bool GenerateGlobalDoc( const OUString& rPath, const SwTxtFmtColl* pSplitColl = 0 ); sal_Bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 ); @@ -1891,10 +1851,10 @@ public: const SwTxtFmtColl* pSplitColl = 0 ); sal_Bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 ); - /// Compare two documents. + // Compare two documents. long CompareDoc( const SwDoc& rDoc ); - /// Merge two documents. + // Merge two documents. long MergeDoc( const SwDoc& rDoc ); /** Set comment-text for Redline. It then comes in via AppendRedLine. @@ -1905,15 +1865,15 @@ public: bool IsAutoFmtRedline() const { return mbIsAutoFmtRedline; } void SetAutoFmtRedline( bool bFlag ) { mbIsAutoFmtRedline = bFlag; } - /// For AutoFormat: with Undo/Redlining. + // For AutoFormat: with Undo/Redlining. void SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId, const SfxItemSet* pSet = 0 ); void SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& ); - /// Only for SW-textbloxks! Does not pay any attention to layout! + // Only for SW-textbloxks! Does not pay any attention to layout! void ClearDoc(); // Deletes all content! - /// Query /set data for PagePreview. + // Query /set data for PagePreview. const SwPagePreviewPrtData* GetPreviewPrtData() const { return mpPgPViewPrtData; } // If pointer == 0 destroy pointer in document. @@ -1926,11 +1886,11 @@ public: void SetOLEObjModified() { if( GetCurrentViewShell() ) maOLEModifiedTimer.Start(); } - // -------------------- Uno - Interfaces --------------------------- + // Uno - Interfaces const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *mpUnoCrsrTbl; } SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false ); - // -------------------- FeShell - Interfaces ----------------------- + // FeShell - Interfaces // !!! These assume always an existing layout !!! bool ChgAnchor( const SdrMarkList& _rMrkList, RndStdIds _eAnchorType, @@ -1973,23 +1933,22 @@ public: SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false, bool bInsInPage = true ); - // - // -------------------- FeShell - Interface end ------------------ + // FeShell - Interface end - /// Interface for TextInputData - for text input of Chinese and Japanese. + // Interface for TextInputData - for text input of Chinese and Japanese. SwExtTextInput* CreateExtTextInput( const SwPaM& rPam ); void DeleteExtTextInput( SwExtTextInput* pDel ); SwExtTextInput* GetExtTextInput( const SwNode& rNd, sal_Int32 nCntntPos = -1) const; SwExtTextInput* GetExtTextInput() const; - /// Interface for access to AutoComplete-List. + // Interface for access to AutoComplete-List. static SwAutoCompleteWord& GetAutoCompleteWords() { return *mpACmpltWords; } bool ContainsMSVBasic() const { return mbContains_MSVBasic; } void SetContainsMSVBasic( bool bFlag ) { mbContains_MSVBasic = bFlag; } - /// Interface for the list of Ruby - texts/attributes + // Interface for the list of Ruby - texts/attributes sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList, sal_uInt16 nMode ); sal_uInt16 SetRubyList( const SwPaM& rPam, const SwRubyList& rList, @@ -2005,7 +1964,7 @@ public: */ bool ContainsHiddenChars() const; - /// call back for API wrapper + // call back for API wrapper SwModify* GetUnoCallBack() const; IGrammarContact* getGrammarContact() const { return mpGrammarContact; } @@ -2036,13 +1995,13 @@ public: const int nListLevel, const bool bValue ); - /// Change a format undoable. + // Change a format undoable. void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet); void RenameFmt(SwFmt & rFmt, const OUString & sNewName, bool bBroadcast = false); - /// Change a TOX undoable. + // Change a TOX undoable. void ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew); /** @@ -2068,19 +2027,19 @@ public: // access methods for XForms model(s) - /// access container for XForms model; will be NULL if !isXForms() + // access container for XForms model; will be NULL if !isXForms() com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> getXForms() const; com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > GetGCIterator() const; - /// #i31958# is this an XForms document? + // #i31958# is this an XForms document? bool isXForms() const; - /// #i31958# initialize XForms models; turn this into an XForms document + // #i31958# initialize XForms models; turn this into an XForms document void initXForms( bool bCreateDefaultModel ); - /// #i113606# for disposing XForms + // #i113606# for disposing XForms void disposeXForms( ); //Update all the page masters @@ -2119,9 +2078,9 @@ public: void dumpAsXml( xmlTextWriterPtr writer = NULL ); private: - /// Copies master header to left / first one, if necessary - used by ChgPageDesc(). + // Copies master header to left / first one, if necessary - used by ChgPageDesc(). void CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc *pDesc, bool bLeft, bool bFirst); - /// Copies master footer to left / first one, if necessary - used by ChgPageDesc(). + // Copies master footer to left / first one, if necessary - used by ChgPageDesc(). void CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc *pDesc, bool bLeft, bool bFirst); /** continue computing a chunk of document statistics @@ -2132,7 +2091,7 @@ private: */ bool IncrementalDocStatCalculate(long nChars, bool bFields = true); - /// Our own 'StatsUpdateTimer' calls the following method + // Our own 'StatsUpdateTimer' calls the following method DECL_LINK( DoIdleStatsUpdate, Timer * ); }; diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 01cf94659b94..33fa5257a8d8 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -207,7 +207,6 @@ public: bool IsEmpty() const { return m_aExtraRedlines.empty(); } }; - class SwUnoCrsrTbl : public std::set<SwUnoCrsr*> { public: /// the destructor will free all objects still in the set @@ -216,7 +215,6 @@ public: class SwOLENodes : public std::vector<SwOLENode*> {}; - #endif // INCLUDED_SW_INC_DOCARY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 04471ea26633..6a2541832742 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -52,7 +52,6 @@ class IDocumentSettingAccess; class IDocumentTimerAccess; class IDocumentChartDataProviderAccess; - class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener { SwDoc* pDoc; ///< Document. @@ -136,7 +135,6 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener SAL_DLLPRIVATE void Init_Impl(); SAL_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* ); - using SfxObjectShell::GetVisArea; protected: @@ -191,7 +189,6 @@ public: const IDocumentSettingAccess* getIDocumentSettingAccess() const; IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess(); - void UpdateFontList(); void UpdateChildWindows(); @@ -215,7 +212,6 @@ public: const SwFEShell *GetFEShell() const { return ((SwDocShell*)this)->GetFEShell(); } - /// For inserting document. Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, SwCrsrShell* pCrsrSh = 0, SwPaM* pPaM = 0); @@ -274,7 +270,6 @@ public: /// #i20883# Digital Signatures and Encryption virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); - /** #i42634# Overwrites SfxObjectShell::UpdateLinks This new function is necessary to trigger update of links in docs read by the binary filter: */ diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx index 704c739b8f61..98b917c0af5d 100644 --- a/sw/inc/docstat.hxx +++ b/sw/inc/docstat.hxx @@ -22,7 +22,6 @@ #include <tools/solar.h> #include "swdllapi.h" - struct SW_DLLPUBLIC SwDocStat { sal_uInt16 nTbl; diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index c0dbc80708ad..2e2654ba5dd4 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -66,7 +66,6 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase sal_Bool bPhysical; - /// Make empty shell a real StyleSheet (Core). SAL_DLLPRIVATE void Create(); @@ -183,14 +182,12 @@ public: void InvalidateIterator(); }; - class SwDocStyleSheetPool : public SfxStyleSheetBasePool { rtl::Reference< SwDocStyleSheet > mxStyleSheet; SwDoc& rDoc; sal_Bool bOrganizer : 1; ///< Organizer - virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 nMask); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ); @@ -234,7 +231,6 @@ private: SwDocStyleSheetPool( const SwDocStyleSheetPool& ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 5d655b0de285..017d4bcdf8b4 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -19,11 +19,9 @@ #ifndef INCLUDED_SW_INC_DOCUFLD_HXX #define INCLUDED_SW_INC_DOCUFLD_HXX - #include <tools/date.hxx> #include <tools/datetime.hxx> - #include <svl/macitem.hxx> #include "fldbas.hxx" @@ -82,7 +80,6 @@ namespace nsSwDocInfoSubType const SwDocInfoSubType DI_CUSTOM = 9; const SwDocInfoSubType DI_SUBTYPE_END = 10; - const SwDocInfoSubType DI_SUB_AUTHOR = 0x0100; const SwDocInfoSubType DI_SUB_TIME = 0x0200; const SwDocInfoSubType DI_SUB_DATE = 0x0300; @@ -90,7 +87,6 @@ namespace nsSwDocInfoSubType const SwDocInfoSubType DI_SUB_MASK = 0xff00; } - enum RegInfoFormat ///< Only for loading of old documents!!! { RF_AUTHOR, @@ -289,7 +285,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; - /*-------------------------------------------------------------------- Document statistics --------------------------------------------------------------------*/ @@ -396,7 +391,6 @@ public: virtual void SetPar2(const OUString& rStr); virtual OUString GetPar2() const; - virtual sal_uInt16 GetSubType() const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; @@ -496,7 +490,6 @@ public: static sal_Bool isScriptURL( const OUString& str ); }; - /*-------------------------------------------------------------------- PostIts --------------------------------------------------------------------*/ @@ -612,7 +605,6 @@ public: Extended User settings. --------------------------------------------------------------------*/ - class SwExtUserFieldType : public SwFieldType { OUString aData; @@ -645,7 +637,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; - /*-------------------------------------------------------------------- Relative page numbers - field. --------------------------------------------------------------------*/ @@ -852,7 +843,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; - #endif // INCLUDED_SW_INC_DOCUFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index b86460a36db4..e9f414858467 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -50,6 +50,4 @@ public: #endif // INCLUDED_SW_INC_DPAGE_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index 3cc5d3ce62e2..e5eaad641c0b 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -24,8 +24,6 @@ class SwDoc; class SwDocShell; -//================================================================== - class SwDrawDocument : public FmFormModel { SwDoc* pDoc; @@ -49,7 +47,6 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx index 56ecb9b61b92..42b3f0b1bf37 100644 --- a/sw/inc/edglbldc.hxx +++ b/sw/inc/edglbldc.hxx @@ -60,7 +60,6 @@ public: { return GetDocPos() < rCmp.GetDocPos(); } }; - class SwGlblDocContents : public o3tl::sorted_vector<SwGlblDocContent*, o3tl::less_ptr_to<SwGlblDocContent> > { public: ~SwGlblDocContents() { DeleteAndDestroyAll(); } diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx index 1434f3e297cb..d3f73f20439d 100644 --- a/sw/inc/edimp.hxx +++ b/sw/inc/edimp.hxx @@ -38,8 +38,6 @@ class SwNodeIndex; } while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != __pStartCrsr ); \ } - - struct SwPamRange { sal_uLong nStart, nEnd; @@ -69,7 +67,6 @@ public: { return _SwPamRanges::operator[](nPos); } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index b90c626bd561..3bf465c99249 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -509,7 +509,6 @@ public: /// Detect highest and lowest level to check moving of outline levels. void GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower ); - /// Get Outline level of current paragraph. int GetCurrentParaOutlineLevel( ) const; @@ -571,7 +570,6 @@ public: bool Redo(sal_uInt16 const nCount = 1); bool Repeat(sal_uInt16 const nCount); - /// For all views of this document. void StartAllAction(); void EndAllAction(); @@ -759,7 +757,6 @@ public: ::com::sun::star::linguistic2::XSpellAlternatives > GetCorrection( const Point* pPt, SwRect& rSelectRect ); - bool GetGrammarCorrection( ::com::sun::star::linguistic2::ProofreadingResult /*out*/ &rResult, sal_Int32 /*out*/ &rErrorPosInText, sal_Int32 /*out*/ &rErrorIndexInResult, @@ -895,12 +892,10 @@ public: sal_Bool AcceptRedline( sal_uInt16 nPos ); sal_Bool RejectRedline( sal_uInt16 nPos ); - /** Search Redline for this Data and @return position in array. If not found, return USHRT_MAX. */ sal_uInt16 FindRedlineOfData( const SwRedlineData& ) const; - /// Set comment to Redline at position. sal_Bool SetRedlineComment( const OUString& rS ); const SwRangeRedline* GetCurrRedline() const; diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index f2e3eba573e7..6a47e0627075 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -208,7 +208,6 @@ inline sal_uInt16 SwSetExpFieldType::GetType() const inline OUString SwSetExpFieldType::GetSetRefName() const { return sName; } - class SW_DLLPUBLIC SwSetExpField : public SwFormulaField { OUString sExpand; @@ -278,7 +277,6 @@ inline sal_Bool SwSetExpField::GetInputFlag() const inline sal_Bool SwSetExpField::IsSequenceFld() const { return 0 != (nsSwGetSetExpType::GSE_SEQ & ((SwSetExpFieldType*)GetTyp())->GetType()); } - class SwInputFieldType : public SwFieldType { SwDoc* pDoc; @@ -290,7 +288,6 @@ public: SwDoc* GetDoc() const { return pDoc; } }; - class SW_DLLPUBLIC SwInputField : public SwField { mutable OUString aContent; @@ -389,7 +386,6 @@ public: virtual SwFieldType* Copy() const; }; - class SwTblField : public SwValueField, public SwTableFormula { OUString sExpand; @@ -425,7 +421,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; - #endif // INCLUDED_SW_INC_EXPFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index ac3a264c2c0f..ae3c29102753 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_FCHRFMT_HXX #define INCLUDED_SW_INC_FCHRFMT_HXX - #include <svl/poolitem.hxx> #include <calbck.hxx> #include <format.hxx> @@ -30,7 +29,6 @@ class IntlWrapper; // ATT_CHARFMT ********************************************* - class SW_DLLPUBLIC SwFmtCharFmt: public SfxPoolItem, public SwClient { friend class SwTxtCharFmt; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 7fd2dfd7274a..65cf7c514e25 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -57,7 +57,6 @@ namespace svx class ISdrObjectFilter; } - // return values for GetFrmType() und GetSelFrmType(). //! values can be combined via logival or #define FRMTYPE_NONE (sal_uInt16) 0 @@ -234,7 +233,6 @@ public: /// Is selected frame within another frame? const SwFrmFmt* IsFlyInFly(); - /** If an object as been given, exactly this object is selected (instead of searching over position). */ sal_Bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = 0 ); @@ -344,7 +342,6 @@ public: OUString GetObjDescription() const; void SetObjDescription( const OUString& rDescription ); - sal_Bool IsFrmSelected() const; sal_Bool GetFlyFrmAttr( SfxItemSet &rSet ) const; bool SetFlyFrmAttr( SfxItemSet &rSet ); @@ -540,8 +537,6 @@ public: /// aligns all formulas with anchor 'as char' to baseline void AlignAllFormulasToBaseline(); - - /// Provide information about content situated closes to given Point. Point GetCntntPos( const Point& rPoint, sal_Bool bNext ) const; @@ -572,7 +567,6 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& = ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >() ) const; - /// Page number of the page containing Point, O if no page. sal_uInt16 GetPageNumber( const Point &rPoint ) const; sal_Bool GetPageNumber( long nYPos, sal_Bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index f1c6ac9d93a1..26df00f5b8ff 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -210,7 +210,6 @@ enum SwInputFieldSubType INP_VAR = 0x03 }; - enum SwUserType { UF_STRING = 0x01, @@ -224,7 +223,6 @@ enum SwDateTimeSubType TIMEFLD = 4 }; - /// General tools. OUString GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM); void SetErrorStr(const OUString& rStr); @@ -378,7 +376,6 @@ inline sal_uInt32 SwField::GetFormat() const inline sal_uInt16 SwField::GetLanguage() const { return nLang; } - /// Fields containing values that have to be formated via number formatter. class SwValueFieldType : public SwFieldType { diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index d1cea2d08958..8b854ff89435 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -26,7 +26,6 @@ class DateTime; class Date; class Time; - enum SwDateFormat { DF_BEGIN, @@ -81,7 +80,6 @@ enum SwDateSubFormat DATE_VAR }; - class SwDateTimeFieldType : public SwValueFieldType { public: @@ -90,7 +88,6 @@ public: virtual SwFieldType* Copy() const; }; - class SW_DLLPUBLIC SwDateTimeField : public SwValueField { sal_uInt16 nSubType; diff --git a/sw/inc/fldupde.hxx b/sw/inc/fldupde.hxx index ed78edc6636d..788ec5966282 100644 --- a/sw/inc/fldupde.hxx +++ b/sw/inc/fldupde.hxx @@ -27,7 +27,6 @@ enum SwFldUpdateFlags AUTOUPD_GLOBALSETTING }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/flyenum.hxx b/sw/inc/flyenum.hxx index fc48ac5a6c88..743adc2bd00f 100644 --- a/sw/inc/flyenum.hxx +++ b/sw/inc/flyenum.hxx @@ -39,9 +39,6 @@ enum FlyCntType #define SW_CHAIN_SOURCE_CHAINED 5 ///< Source already has a follow. #define SW_CHAIN_SELF 6 ///< Self-chaining is not allowed. - - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx index c4b5ab74666f..f3434bdb2ed9 100644 --- a/sw/inc/flypos.hxx +++ b/sw/inc/flypos.hxx @@ -26,7 +26,6 @@ class SwFrmFmt; class SwNodeIndex; - /// For querying current flys in document. class SW_DLLPUBLIC SwPosFlyFrm { diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 69954cb9e241..74b3395406bb 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -27,7 +27,6 @@ #include <boost/scoped_ptr.hpp> - struct SwPosition; class IntlWrapper; diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index 9a88dadcc557..9858727e45e8 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_SW_INC_FMTAUTOFMT_HXX #define INCLUDED_SW_INC_FMTAUTOFMT_HXX - #include <svl/poolitem.hxx> #include <format.hxx> #include <boost/shared_ptr.hpp> // ATT_AUTOFMT ********************************************* - class SwFmtAutoFmt: public SfxPoolItem { boost::shared_ptr<SfxItemSet> mpHandle; diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index d9e1b4e785ef..c7ee3440f76b 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_FMTCLBL_HXX #define INCLUDED_SW_INC_FMTCLBL_HXX - #include <svl/eitem.hxx> #include <hintids.hxx> #include <format.hxx> @@ -35,7 +34,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; }; - inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(sal_Bool bInP) const { return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); } diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 0e733d7dec9d..81f2f0e06207 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -43,7 +43,6 @@ public: sal_Bool operator==( const SwColumn & ) const; - void SetWishWidth( sal_uInt16 nNew ) { nWish = nNew; } void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; } void SetLower( sal_uInt16 nNew ) { nLower = nNew; } @@ -120,7 +119,6 @@ public: sal_uLong GetLineWidth() const { return nLineWidth;} const Color& GetLineColor() const { return aLineColor;} - SwColLineAdj GetLineAdj() const { return eAdj; } sal_Bool IsOrtho() const { return bOrtho; } sal_uInt16 GetWishWidth() const { return nWidth; } diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index e626a0523fd6..690857eb5bef 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -24,7 +24,6 @@ #include <format.hxx> #include <calbck.hxx> - class SwFlyFrmFmt; class IntlWrapper; @@ -34,7 +33,6 @@ class SW_DLLPUBLIC SwFmtChain: public SfxPoolItem SwClient aPrev, ///< Previous SwFlyFrmFmt (if existent). aNext; ///< Next SwFlyFrmFmt (if existent). - public: SwFmtChain() : SfxPoolItem( RES_CHAIN ) {} SwFmtChain( const SwFmtChain &rCpy ); @@ -55,7 +53,6 @@ public: SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); } SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); } - void SetPrev( SwFlyFrmFmt *pFmt ); void SetNext( SwFlyFrmFmt *pFmt ); }; @@ -67,7 +64,6 @@ SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy ) return *this; } - inline const SwFmtChain &SwAttrSet::GetChain(sal_Bool bInP) const { return (const SwFmtChain&)Get( RES_CHAIN,bInP); } diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 333f9eed8a04..87d83bc51949 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -26,7 +26,6 @@ class SwNodeIndex; class SwStartNode; - /// Cntnt, content of frame (header, footer, fly). class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem { diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index f4e0d49b1ec4..665138608996 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -180,7 +180,7 @@ enum Master_CollConditions PARA_IN_FOOTER = 0x0080, PARA_IN_HEADER = 0x0100, PARA_IN_ENDNOTE = 0x0200, - // ... + USRFLD_EXPRESSION = (int)0x8000 }; diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index cddba4754283..28ee643974ca 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_FMTEIRO_HXX #define INCLUDED_SW_INC_FMTEIRO_HXX - #include <svl/eitem.hxx> #include <hintids.hxx> #include <format.hxx> diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 48039542e67b..81f7e4d21896 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_FMTFLCNT_HXX #define INCLUDED_SW_INC_FMTFLCNT_HXX - #include <svl/poolitem.hxx> class SwFrmFmt; diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 46021a44cf01..42865e685291 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -89,7 +89,6 @@ public: */ void SetField( SwField * pField ); - const SwTxtFld* GetTxtFld() const { return mpTxtFld; @@ -101,7 +100,6 @@ public: void SetTxtFld( SwTxtFld& rTxtFld ); void ClearTxtFld(); - void RegisterToFieldType( SwFieldType& ); bool IsFldInDoc() const; sal_Bool IsProtect() const; diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index a28f97976d3c..afce213f5294 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX #define INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX - #include <svl/eitem.hxx> #include <hintids.hxx> #include <format.hxx> diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index 6ba2a23de68d..10de916409a9 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -23,7 +23,6 @@ #include <hintids.hxx> #include <format.hxx> - enum SwFillOrder { SW_FILL_ORDER_BEGIN, diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 407d05af34a3..e5920260216e 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -59,8 +59,6 @@ class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem // the object is placed (PrtArea) and to the screen width // minus borders in BrowseView if the environment is the page. - - public: SwFmtFrmSize( SwFrmSize eSize = ATT_VAR_SIZE, SwTwips nWidth = 0, SwTwips nHeight = 0 ); diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index 1e8e1487d216..c4716fc95cf1 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -71,7 +71,6 @@ public: OUString GetViewNumStr( const SwDoc& rDoc, sal_Bool bInclStrs = sal_False ) const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 6b3d8a6036a4..6d86c2ef9044 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -34,7 +34,6 @@ enum SwFtnEndPosEnum FTNEND_ATTXTEND_END }; - class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem { OUString sPrefix; @@ -112,7 +111,6 @@ inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(sal_Bool bInP) const inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(sal_Bool bInP) const { return (const SwFmtEndAtTxtEnd&)Get( RES_END_AT_TXTEND, bInP); } - inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(sal_Bool bInP) const { return aSet.GetFtnAtTxtEnd(bInP); } inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(sal_Bool bInP) const diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 3d433cce0dd1..e0fbca252568 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -64,7 +64,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - const SwTxtINetFmt* GetTxtINetFmt() const { return mpTxtAttr; @@ -143,7 +142,6 @@ public: const SvxMacro* GetMacro( sal_uInt16 nEvent ) const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 64a6ea8d589e..9e9375893713 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_FMTLINE_HXX #define INCLUDED_SW_INC_FMTLINE_HXX - #include <svl/poolitem.hxx> #include <hintids.hxx> #include <format.hxx> diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index c6a186125a7b..806be2c608d0 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -30,14 +30,12 @@ #include <vector> - namespace com { namespace sun { namespace star { namespace text { class XTextField; } }}} - /** * The classes that make up a meta entity are: * <dl> @@ -118,7 +116,6 @@ public: ::sw::Meta * GetMeta() { return m_pMeta.get(); } }; - namespace sw { class MetaFieldManager; diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 1c8584abe243..69925328fab6 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -28,7 +28,6 @@ #include <format.hxx> #include <svl/poolitem.hxx> - class IntlWrapper; class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem @@ -65,7 +64,6 @@ public: void SetPos( SwTwips nNew ) { nYPos = nNew; } }; - class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem { SwTwips nXPos; ///< Contains *always* the current RelPos. diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 28b96f5f7980..6e88c7115352 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_FMTPDSC_HXX #define INCLUDED_SW_INC_FMTPDSC_HXX - #include <svl/poolitem.hxx> #include "swdllapi.h" #include <hintids.hxx> @@ -83,7 +82,6 @@ public: bool KnowsPageDesc() const; }; - inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(sal_Bool bInP) const { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); } diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index e70ac456494c..e0577c7f89e4 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_FMTRUBY_HXX #define INCLUDED_SW_INC_FMTRUBY_HXX - #include <svl/poolitem.hxx> class SwTxtRuby; @@ -57,7 +56,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; } SwTxtRuby* GetTxtRuby() { return pTxtAttr; } @@ -77,7 +75,6 @@ public: void SetAdjustment( sal_uInt16 nNew ) { nAdjustment = nNew; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index a79a5a9a908d..80eea3a4694e 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -50,7 +50,6 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - SwSurround GetSurround()const { return SwSurround( GetValue() ); } sal_Bool IsAnchorOnly() const { return bAnchorOnly; } sal_Bool IsContour() const { return bContour; } diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index 022b18a08190..4cb250cec47e 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -73,7 +73,6 @@ public: void SetName( const OUString& rNm ) { sName = rNm; } }; - inline const SwFmtURL &SwAttrSet::GetURL(sal_Bool bInP) const { return (const SwFmtURL&)Get( RES_URL,bInP); } diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index cb79ce418869..7b5c1ed427fe 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -73,7 +73,6 @@ public: /// for Querying of Writer-functions. sal_uInt16 Which() const { return nWhichId; } - /// Query format information. virtual bool GetInfo( SfxPoolItem& ) const; diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx index 772eb0c3bcf6..488720d8f7ed 100644 --- a/sw/inc/frmatr.hxx +++ b/sw/inc/frmatr.hxx @@ -24,7 +24,6 @@ // Inlines - // Implementation of FrameAttribute methods of SwAttrSet. inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(sal_Bool bInP) const { return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); } @@ -59,7 +58,6 @@ inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(sal_Bool bInP) const inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(sal_Bool bInP) const { return (const SdrTextVertAdjustItem&)Get( RES_TEXT_VERT_ADJUST,bInP); } - // Implementation of FrameAttribute methods of SwFmt. inline const SvxPaperBinItem &SwFmt::GetPaperBin(sal_Bool bInP) const { return aSet.GetPaperBin(bInP); } diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 22ddea9a8029..cd6e91419330 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -78,7 +78,6 @@ public: IMapObject* GetIMapObject( const Point& rPoint, const SwFlyFrm *pFly = 0 ) const; - /** @return the real size of the frame - or an empty rectangle if no layout exists. If pPoint is given, look for the frame closest to it. */ @@ -290,7 +289,6 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx index c1f73536b7a7..8c08be3b2e64 100644 --- a/sw/inc/ftnidx.hxx +++ b/sw/inc/ftnidx.hxx @@ -32,7 +32,6 @@ class SwSectionNode; // not as inline methods (saves compile time). #define _SwTxtFtn_GetIndex( pFIdx ) (pFIdx->GetTxtNode().GetIndex()) - struct CompareSwFtnIdxs { bool operator()(SwTxtFtn* const& lhs, SwTxtFtn* const& rhs) const; @@ -49,7 +48,6 @@ public: SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, sal_uInt16* pPos = 0 ) const; }; - class SwUpdFtnEndNtAtEnd { std::vector<const SwSectionNode*> aFtnSects, aEndSects; @@ -65,8 +63,6 @@ public: sal_uInt16 ChkNumber( const SwTxtFtn& rTxtFtn ); }; - - #endif // INCLUDED_SW_INC_FTNIDX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index 84e4c151b4e5..3abf70ff12d0 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -95,7 +95,6 @@ public: SwFtnPos ePos; SwFtnNum eNum; - SwFtnInfo& operator=(const SwFtnInfo&); bool operator==( const SwFtnInfo &rInf ) const; @@ -104,7 +103,6 @@ public: SwFtnInfo(const SwFtnInfo&); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index 1ea7adf09a17..43420c17c589 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -91,10 +91,10 @@ // ACC --------------------------------------------------------------- -#define FN_CHAR_LEFT_SEL (RC_GLOBALS_BEGIN + 1) // -#define FN_CHAR_RIGHT_SEL (RC_GLOBALS_BEGIN + 2) // -#define FN_LINE_UP_SEL (RC_GLOBALS_BEGIN + 3) // -#define FN_LINE_DOWN_SEL (RC_GLOBALS_BEGIN + 4) // +#define FN_CHAR_LEFT_SEL (RC_GLOBALS_BEGIN + 1) +#define FN_CHAR_RIGHT_SEL (RC_GLOBALS_BEGIN + 2) +#define FN_LINE_UP_SEL (RC_GLOBALS_BEGIN + 3) +#define FN_LINE_DOWN_SEL (RC_GLOBALS_BEGIN + 4) #define FN_START_OF_LINE_SEL (RC_GLOBALS_BEGIN + 5) // StartOfLine #define FN_END_OF_LINE_SEL (RC_GLOBALS_BEGIN + 6) // EndOfLine #define FN_START_OF_DOCUMENT_SEL (RC_GLOBALS_BEGIN + 7) // StartOfDocument diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 3898d7629ef4..45b194345708 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -83,7 +83,6 @@ public: inline void SetGrfToggle( sal_Bool bNew ) { bGrfToggle = bNew; } }; - /****************************************************************************** * class SwAttrCropGrf ******************************************************************************/ @@ -233,7 +232,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - const double& GetValue() const { return nValue; } void SetValue( const double& rVal ) { nValue = rVal; } }; @@ -298,8 +296,6 @@ public: sal_uInt8 nMemberId = 0 ); }; - - /****************************************************************************** * Implementation of graphics attributes methods of SwAttr ******************************************************************************/ @@ -358,7 +354,6 @@ inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(sal_Bool bInP) const inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(sal_Bool bInP) const { return aSet.GetDrawModeGrf(bInP); } - #endif // INCLUDED_SW_INC_GRFATR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index b03e0b9c7f38..87e040015487 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_HFSPACINGITEM_HXX #define INCLUDED_SW_INC_HFSPACINGITEM_HXX - #include <svl/eitem.hxx> #include <hintids.hxx> #include <format.hxx> diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 18e6f77c23cc..3e4a6c790d69 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -27,8 +27,6 @@ class SwWrtShell; struct SwConversionArgs; class SwPaM; -////////////////////////////////////////////////////////////////////// - class SwHHCWrapper : public editeng::HangulHanjaConversion { SwView * m_pView; @@ -104,7 +102,6 @@ public: void Convert(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index e49255e98af4..23819823d266 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -278,8 +278,6 @@ RES_UNKNOWNATR_BEGIN = RES_BOXATR_END, RES_UNKNOWNATR_END }; - - // Format IDs enum RES_FMT { @@ -374,7 +372,6 @@ RES_FLTRATTR_END #define INVALID_HINT HINT_END #define RES_WHICHHINT_END HINT_END - inline bool isATR(const sal_uInt16 nWhich) { return (RES_CHRATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich); @@ -421,7 +418,6 @@ inline bool isUNKNOWNATR(const sal_uInt16 nWhich) return (RES_UNKNOWNATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich); } - // Take the respective default attribute from the statistical default // attributes table over the Which-value. // If none exists, return a 0 pointer!!! diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 5db74a35d1a0..7242d27578d4 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -44,10 +44,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; }; - -// --------------------------------------- // SwPtrMsgPoolItem (old SwObjectDying!) -// --------------------------------------- class SwPtrMsgPoolItem : public SwMsgPoolItem { @@ -59,8 +56,6 @@ public: {} }; - - /* * SwFmtChg is sent when a format has changed to another format. 2 Hints are always sent * the old and the new format @@ -72,7 +67,6 @@ public: SwFmtChg( SwFmt *pFmt ); }; - class SwInsTxt: public SwMsgPoolItem { public: @@ -108,7 +102,6 @@ public: SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW ); }; - /** SwRefMarkFldUpdate is sent when the referencemarks should be updated. To determine Page- / chapternumbers the current frame has to be asked. For this we need the current outputdevice */ @@ -153,7 +146,6 @@ public: SwTableFmlUpdate( const SwTable* ); }; - class SwAutoFmtGetDocNode: public SwMsgPoolItem { public: diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index b7bb4fb6eb31..59e583aab5de 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -20,14 +20,12 @@ #ifndef INCLUDED_SW_INC_HTMLTBL_HXX #define INCLUDED_SW_INC_HTMLTBL_HXX - #include <vcl/timer.hxx> #include <editeng/svxenum.hxx> #include "swtypes.hxx" #include "node.hxx" - class SwTableBox; class SwTable; class SwHTMLTableLayout; @@ -271,7 +269,6 @@ public: inline void SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight ); - void GetAvail( sal_uInt16 nCol, sal_uInt16 nColSpan, sal_uInt16& rAbsAvail, sal_uInt16& rRelAvail ) const; @@ -460,7 +457,6 @@ void SwHTMLTableLayout::SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight nInhRightBorderWidth = nRight; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index fc2caa527aba..2d1394ef8ce2 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -133,7 +133,6 @@ public: void MoveTo( SwIndexReg& rArr ); }; - #ifndef DBG_UTIL inline sal_Int32 SwIndex::operator++() diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx index 16cefd7f7669..f7feedaa1337 100644 --- a/sw/inc/init.hxx +++ b/sw/inc/init.hxx @@ -57,7 +57,6 @@ void SetShell( SwViewShell *pSh ); void _TextInit(); void _TextFinit(); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/itabenum.hxx b/sw/inc/itabenum.hxx index c21ed1d500cb..ec338edf0e53 100644 --- a/sw/inc/itabenum.hxx +++ b/sw/inc/itabenum.hxx @@ -39,7 +39,6 @@ struct SwInsertTableOptions mnInsMode( nInsMode ), mnRowsToRepeat( nRowsToRepeat ) {}; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index 4cae87215b8f..619bc1f85dd1 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -94,8 +94,6 @@ public: bool HasCharFormat() const { return GetRegisteredIn() != 0; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 2f9c5d4d0ed1..049bd7492f30 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -255,7 +255,6 @@ public: { bHTML ? (aWebTableConfig.bInsTblChangeNumFormat = b) : (aTableConfig.bInsTblChangeNumFormat = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - sal_Bool IsInsTblAlignNum(sal_Bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblAlignNum : aTableConfig.bInsTblAlignNum; } void SetInsTblAlignNum( sal_Bool bHTML, sal_Bool b ) @@ -271,7 +270,6 @@ public: const InsCaptionOpt* GetCapOption(sal_Bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId); sal_Bool SetCapOption(sal_Bool bHTML, const InsCaptionOpt* pOpt); - sal_Bool IsGrfToGalleryAsLnk() const { return aMiscConfig.bGrfToGalleryAsLnk; } void SetGrfToGalleryAsLnk( sal_Bool b ) { aMiscConfig.bGrfToGalleryAsLnk = b; aMiscConfig.SetModified();} @@ -302,7 +300,6 @@ public: aMiscConfig.bAskForMailMergeInPrint = bSet; } - OUString GetNameFromColumn() const { return aMiscConfig.sNameFromColumn; } void SetNameFromColumn( const OUString& rSet ) { aMiscConfig.sNameFromColumn = rSet; aMiscConfig.SetModified();} diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index bca043002a85..68cfe73f8801 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -64,9 +64,7 @@ class SwUndoTblToTxt; class SwUndoTxtToTbl; struct SwPosition; -// -------------------- // class SwNodes -// -------------------- typedef SwNode * SwNodePtr; typedef bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs ); diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index e6980db40a12..1485d483d810 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -205,7 +205,6 @@ public: bool IsAsyncRetrieveInputStreamPossible() const; }; - // Inline methods from Node.hxx - it is only now that we know TxtNode!! inline SwGrfNode *SwNode::GetGrfNode() { diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index a47e4567d765..58c41f14b7a3 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_NDHINTS_HXX #define INCLUDED_SW_INC_NDHINTS_HXX - #include <tools/mempool.hxx> #include <o3tl/sorted_vector.hxx> @@ -59,7 +58,6 @@ SwTxtAttr* MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem& rAttr ); - /** Class SwpHints is derived indirectly via SwpHts, because only the class SwTxtNode should be allowed to insert and remove attributes. Other classes like the Frames are given only reading access via @@ -85,7 +83,6 @@ class SwpHtEnd : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtEnd, /// Class SwpHintsArr - /// the Hints array class SwpHintsArray { @@ -127,10 +124,8 @@ public: #endif }; - // Class SwpHints - /// public interface class SwpHints : public SwpHintsArray { @@ -203,10 +198,8 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwpHints) }; - /// Inline Implementations - inline sal_uInt16 SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const { SwpHtStart::const_iterator const it = @@ -225,7 +218,6 @@ inline SwTxtAttr *SwpHintsArray::Cut( const sal_uInt16 nPosInStart ) return pHt; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 7e8a2f3434b4..575a3ee6a987 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -25,7 +25,6 @@ #include <node.hxx> - class SwNode; class SwNodes; @@ -111,9 +110,6 @@ public: const SwNode& rE, long nEndDiff = 0 ); }; - - - // For inlines node.hxx is needed which in turn needs this one. // Therefore all inlines accessing pNd are implemented here. diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index cdf8a20ddb15..0dbb0d17312c 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -65,8 +65,6 @@ public: sal_Bool IsOleRef() const; ///< To avoid unnecessary loading of object. }; - - // SwOLENode class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode @@ -142,7 +140,6 @@ public: void SetChartTblName( const OUString& rNm ) { sChartTblName = rNm; } }; - /// Inline methods from Node.hxx inline SwOLENode *SwNode::GetOLENode() { diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index a987acb4ec27..7e6e21b8de94 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -408,9 +408,7 @@ public: (Method in ndcopy.cxx!!). */ void CopyCollFmt( SwTxtNode& rDestNd ); - // // BEGIN OF BULLET/NUMBERING/OUTLINE STUFF: - // /** Returns numbering rule of this text node. @@ -653,9 +651,7 @@ public: */ OUString GetLabelFollowedBy() const; - // // END OF BULLET/NUMBERING/OUTLINE STUFF: - // void fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const; @@ -801,8 +797,6 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwTxtNode) }; -//----------------------------------------------------------------------------- - inline SwpHints & SwTxtNode::GetSwpHints() { assert( m_pSwpHints ); diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx index 9ea932588a8b..0604a49c62ef 100644 --- a/sw/inc/ndtyp.hxx +++ b/sw/inc/ndtyp.hxx @@ -58,8 +58,6 @@ enum SwStartNodeType const sal_uInt8 ND_HAS_PREV_LAYNODE = 0x01; const sal_uInt8 ND_HAS_NEXT_LAYNODE = 0x02; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 9dea06353c6f..a5ffbe409d6c 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -34,9 +34,7 @@ #include <index.hxx> #include <fmtcol.hxx> -// --------------------- // forward declarations -// --------------------- class SwCntntFrm; class SwCntntNode; @@ -327,7 +325,6 @@ private: SwStartNode & operator= ( const SwStartNode & rNode ); }; - /// Ends a section of nodes in the document model. class SwEndNode : public SwNode { @@ -349,10 +346,8 @@ private: SwEndNode & operator= ( const SwEndNode & rNode ); }; - -// -------------------- // SwCntntNode -// -------------------- + class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexReg { @@ -428,7 +423,6 @@ public: */ void DelFrms( sal_Bool bNeedDel = sal_False, sal_Bool bIsAccTableDispose = sal_True ); - /** @return count of elements of node content. Default is 1. There are differences between text node and formula node. */ virtual sal_Int32 Len() const; @@ -491,11 +485,8 @@ private: SwCntntNode & operator= ( const SwCntntNode & rNode ); }; - - -//--------- // SwTableNode -//--------- + class SW_DLLPUBLIC SwTableNode : public SwStartNode, public SwModify { friend class SwNodes; @@ -530,10 +521,8 @@ private: SwTableNode & operator= ( const SwTableNode & rNode ); }; - -//--------- // SwSectionNode -//--------- + class SwSectionNode : public SwStartNode , private ::boost::noncopyable @@ -578,13 +567,9 @@ public: a hidden sub-area. */ sal_Bool IsCntntHidden() const; - }; - -//---------------- // SwDummySectionNode -//---------------- /** This class is internal. And quite frankly I don't know what ND_SECTIONDUMMY is for, the class has been merely created to replace "SwNode( ND_SECTIONDUMMY )", the only case @@ -597,7 +582,6 @@ private: SwDummySectionNode( const SwNodeIndex &rWhere ); }; - inline SwEndNode *SwNode::GetEndNode() { return ND_ENDNODE == nNodeType ? (SwEndNode*)this : 0; @@ -639,7 +623,6 @@ inline const SwCntntNode *SwNode::GetCntntNode() const return ND_CONTENTNODE & nNodeType ? (const SwCntntNode*)this : 0; } - inline sal_Bool SwNode::IsStartNode() const { return ND_STARTNODE & nNodeType ? sal_True : sal_False; @@ -732,7 +715,6 @@ inline SwFmtColl* SwCntntNode::GetCondFmtColl() const return pCondColl ? (SwFmtColl*)pCondColl->GetRegisteredIn() : 0; } - inline SwFmtColl& SwCntntNode::GetAnyFmtColl() const { return pCondColl && pCondColl->GetRegisteredIn() diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 9d72b6c8be45..1af8ad98b264 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -338,7 +338,6 @@ public: operator SwPageDesc() const; // #i7983# }; - #endif // INCLUDED_SW_INC_PAGEDESC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index 4b9e924ea9bb..aaca0458c14d 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -35,7 +35,6 @@ class SwPageFrm; class Fraction; struct PreviewPage; -// ============================================================================= /** page preview functionality in the writer @author OD @@ -168,7 +167,6 @@ private: /** determines preview data for a given page and a given preview offset - @author OD @param _rPage diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index a95a2cf2c468..74a70a604676 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -74,7 +74,6 @@ struct SW_DLLPUBLIC SwPosition bool operator !=(const SwPosition &) const; }; - // Result of comparing positions. enum SwComparePosition { POS_BEFORE, ///< Pos1 before Pos2. @@ -302,11 +301,9 @@ public: void InvalidatePaM(); }; - bool CheckNodesRange( const SwNodeIndex&, const SwNodeIndex&, bool bChkSection ); bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove ); - #endif // INCLUDED_SW_INC_PAM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 01b06c1f831b..c7c5c004784d 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -188,8 +188,6 @@ inline SwParaConnectBorderItem& SwParaConnectBorderItem::operator=( return *this; } - - /****************************************************************************** * Implementation of paragraph-attributes methods of SwAttrSet ******************************************************************************/ diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc index b68c503cdb75..c9c87c6550d1 100644 --- a/sw/inc/poolfmt.hrc +++ b/sw/inc/poolfmt.hrc @@ -21,9 +21,9 @@ #include "rcid.hrc" -// --------------- + // The Formats -// --------------- + // Drawing Templates: #define STR_POOLCHR_FOOTNOTE (RC_POOLCHRFMT_BEGIN+ 0) @@ -63,9 +63,9 @@ #define STR_POOLFRM_WATERSIGN (RC_POOLFRMFMT_BEGIN+ 5) #define STR_POOLFRM_LABEL (RC_POOLFRMFMT_BEGIN+ 6) -// --------------- + // The Templates -// --------------- + // Category Text #define STR_POOLCOLL_STANDARD (RC_POOLCOLL_TEXT_BEGIN+ 0) #define STR_POOLCOLL_TEXT (RC_POOLCOLL_TEXT_BEGIN+ 1) @@ -233,9 +233,9 @@ #define STR_POOLCOLL_HTML_DD (RC_POOLCOLL_HTML_BEGIN+ 3) #define STR_POOLCOLL_HTML_DT (RC_POOLCOLL_HTML_BEGIN+ 4) -//----------------- + // Page styles -//----------------- + #define STR_POOLPAGE_STANDARD (RC_POOLPAGEDESC_BEGIN+ 0) #define STR_POOLPAGE_FIRST (RC_POOLPAGEDESC_BEGIN+ 1) #define STR_POOLPAGE_LEFT (RC_POOLPAGEDESC_BEGIN+ 2) @@ -247,9 +247,9 @@ #define STR_POOLPAGE_ENDNOTE (RC_POOLPAGEDESC_BEGIN+ 8) #define STR_POOLPAGE_LANDSCAPE (RC_POOLPAGEDESC_BEGIN+ 9) -//----------------- + // Numbering styles -//----------------- + #define STR_POOLNUMRULE_NUM1 (RC_POOLNUMRULE_BEGIN+ 0) #define STR_POOLNUMRULE_NUM2 (RC_POOLNUMRULE_BEGIN+ 1) #define STR_POOLNUMRULE_NUM3 (RC_POOLNUMRULE_BEGIN+ 2) diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index 75f4c8d61825..bc9126361817 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -50,7 +50,6 @@ // 1 -user // Offset: within the group */ - /** Attention: New IDs can only be added to the ends of the groups. These IDs are read and written by the Reader/Writer. They are only aware of the Offset to Start. */ @@ -90,8 +89,6 @@ inline sal_Bool IsPoolUserFmt( sal_uInt16 nId ) ? sal_True : sal_False; } - - /// IDs for the ranges. enum RES_POOLFMT { @@ -150,7 +147,6 @@ RES_POOLCHR_HTML_END, RES_POOLCHR_END = RES_POOLCHR_HTML_END }; - /// IDs for frame styles. enum RES_POOL_FRMFMT_TYPE { @@ -234,7 +230,6 @@ RES_POOLCOLL_HEADLINE10, ///< Heading 10. RES_POOLCOLL_TEXT_END, - /// Group lists. RES_POOLCOLL_LISTS_BEGIN = COLL_LISTS_BITS, @@ -262,7 +257,6 @@ RES_POOLCOLL_NUM_LEVEL5, ///< 5th level. RES_POOLCOLL_NUM_LEVEL5E, ///< End 5th level. RES_POOLCOLL_NUM_NONUM5, ///< No numbering. - ///Subgroup bullets. RES_POOLCOLL_BUL_LEVEL1S, ///< Start 1st level. RES_POOLCOLL_BUL_LEVEL1, ///< 1st level. @@ -287,7 +281,6 @@ RES_POOLCOLL_BUL_NONUM5, ///< No numbering. RES_POOLCOLL_LISTS_END, - /// Special ranges. RES_POOLCOLL_EXTRA_BEGIN = COLL_EXTRA_BITS, @@ -305,7 +298,6 @@ RES_POOLCOLL_FOOTERR, ///< Footer Right. RES_POOLCOLL_TABLE, ///< Table of Contents. RES_POOLCOLL_TABLE_HDLN, ///< Table of Contents - heading. - /// Subgroup labels. RES_POOLCOLL_LABEL, ///< Base labels. RES_POOLCOLL_LABEL_ABB, ///< Label illustration. @@ -322,7 +314,6 @@ RES_POOLCOLL_ENDNOTE, ///< Endnotes. RES_POOLCOLL_LABEL_DRAWING, ///< Label drawing objects. RES_POOLCOLL_EXTRA_END, - /// Group indices. RES_POOLCOLL_REGISTER_BEGIN = COLL_REGISTER_BITS, @@ -343,7 +334,6 @@ RES_POOLCOLL_TOX_CNTNT3, ///< Content 3rd level. RES_POOLCOLL_TOX_CNTNT4, ///< Content 4th level. RES_POOLCOLL_TOX_CNTNT5, ///< Content 5th level. - /// Subgroup user indices. RES_POOLCOLL_TOX_USERH, ///< Header. RES_POOLCOLL_TOX_USER1, ///< 1st level. @@ -352,7 +342,6 @@ RES_POOLCOLL_TOX_USER3, ///< 3rd level. RES_POOLCOLL_TOX_USER4, ///< 4th level. RES_POOLCOLL_TOX_USER5, ///< 5th level. - RES_POOLCOLL_TOX_CNTNT6, ///< Content 6th level. RES_POOLCOLL_TOX_CNTNT7, ///< Content 7th level. RES_POOLCOLL_TOX_CNTNT8, ///< Content 8th level. @@ -384,7 +373,6 @@ RES_POOLCOLL_TOX_USER10, ///< 10th level. RES_POOLCOLL_REGISTER_END, - /// Group chapter / document. RES_POOLCOLL_DOC_BEGIN = COLL_DOC_BITS, @@ -407,7 +395,6 @@ RES_POOLCOLL_HTML_END /// End of text styles collection. }; - /** Query defined parent of a POOL-ID Returns 0 if standard USHRT_MAX if no parent diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index b68860858d43..4ff41e202acd 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -44,9 +44,6 @@ class SfxViewShell; class SwPrintUIOptions; class SwRenderData; -//////////////////////////////////////////////////////////// - - class SwPrintData { const SwPrintUIOptions * m_pPrintUIOptions; // not owner @@ -173,10 +170,6 @@ public: virtual void doSetModified () { bModified = sal_True;} }; - -//////////////////////////////////////////////////////////// - - class SwPrintUIOptions : public vcl::PrinterOptionsHelper { OutputDevice* m_pLast; @@ -207,9 +200,6 @@ public: bool IsPrintDrawings() const; }; - -//////////////////////////////////////////////////////////// - /** A class that stores temporary data that is needed for rendering the document. Usually this data is created when 'getRendererCount' is called and and it is used in the 'render' function of that same interface */ @@ -254,7 +244,6 @@ public: SwRenderData(); ~SwRenderData(); - bool HasPostItData() const { return m_pPostItShell != 0; } void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev ); void DeletePostItData(); @@ -274,7 +263,6 @@ public: void MakeSwPrtOptions( SwDocShell const*const pDocShell, SwPrintUIOptions const*const pOpt, bool const bIsPDFExport ); - typedef std::vector< std::pair< sal_Int32, sal_Int32 > > PagePairsVec_t; std::set< sal_Int32 > & GetValidPagesSet() { return m_aValidPages; } @@ -299,9 +287,6 @@ public: void SetPageRange( const OUString &rRange ) { m_aPageRange = rRange; } }; - -//////////////////////////////////////////////////////////// - /// last remnants of swprtopt.hxx: #define POSTITS_NONE 0 #define POSTITS_ONLY 1 diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx index 8e4bd15d8c07..06c5189bc30c 100644 --- a/sw/inc/pvprtdat.hxx +++ b/sw/inc/pvprtdat.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_INC_PVPRTDAT_HXX #define INCLUDED_SW_INC_PVPRTDAT_HXX - #include <tools/solar.h> class SwPagePreviewPrtData @@ -64,8 +63,6 @@ public: void SetLandscape( sal_Bool b ) { bLandscape = b; } }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc index c841e2c6342a..8147e49965e6 100644 --- a/sw/inc/rcid.hrc +++ b/sw/inc/rcid.hrc @@ -22,9 +22,9 @@ #include <sfx2/sfxsids.hrc> #define IMAGE_MASK_COLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } -// ---------------------------------------------------------------- + // Areas for the UI-Directories -// ---------------------------------------------------------------- + #define RC_BASE RID_SW_START // From solar.hrc @@ -121,7 +121,7 @@ #define RC_INDEX_BEGIN RC_INDEX // RC_INDEX_END (RC_INDEX + 99) -// + #define RC_RIBBAR_BEGIN RC_RIBBAR #define RC_RIBBAR_END (RC_RIBBAR_BEGIN + 79) diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 02ff2e084ea9..9bd90c95ca76 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -103,7 +103,6 @@ public: SfxItemSet* GetItemSet( ) const; }; - class SW_DLLPUBLIC SwRedlineData { friend class SwRangeRedline; @@ -181,7 +180,6 @@ public: OUString GetDescr() const; }; - class SW_DLLPUBLIC SwRangeRedline : public SwPaM { SwRedlineData* pRedlineData; @@ -382,7 +380,6 @@ public: const SwView* GetView() const { return pView; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 0738e21eb433..0b4e3ceec585 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -55,7 +55,6 @@ enum REFERENCEMARK REF_END }; - /// Get reference. class SwGetRefFieldType : public SwFieldType @@ -77,7 +76,6 @@ public: sal_Int32* pStt, sal_Int32* pEnd = 0 ); }; - class SW_DLLPUBLIC SwGetRefField : public SwField { private: @@ -126,7 +124,6 @@ public: // #i85090# OUString GetExpandedTxtOfReferencedTxtNode() const; - /// Get/set SequenceNo (of interest only for REF_SEQUENCEFLD). sal_uInt16 GetSeqNo() const { return nSeqNo; } void SetSeqNo( sal_uInt16 n ) { nSeqNo = n; } @@ -144,7 +141,6 @@ public: virtual OUString GetDescription() const; }; - #endif /// INCLUDED_SW_INC_REFFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx index 70c85d1e8ae1..5d8e7dee0763 100644 --- a/sw/inc/ring.hxx +++ b/sw/inc/ring.hxx @@ -41,7 +41,6 @@ public: sal_uInt32 numberOf() const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx index 5ad8525725e2..5dfd0bd0a6f7 100644 --- a/sw/inc/rubylist.hxx +++ b/sw/inc/rubylist.hxx @@ -41,7 +41,6 @@ public: class SwRubyList : public boost::ptr_vector<SwRubyListEntry> {}; - #endif //_ INCLUDED_SW_INC_RUBYLIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 5a483636b9bf..539918cfd4d2 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -31,12 +31,10 @@ #include <frmfmt.hxx> #include <vector> - namespace com { namespace sun { namespace star { namespace text { class XTextSection; } } } } - class SwSectionFmt; class SwDoc; class SwSection; @@ -203,7 +201,6 @@ public: // Query (also for parents) if this section is to be hidden. sal_Bool CalcHiddenFlag() const; - inline SwSection* GetParent() const; OUString GetCondition() const { return m_Data.GetCondition(); } @@ -325,7 +322,6 @@ public: SectionSort eSort = SORTSECT_NOT, sal_Bool bAllSections = sal_True ) const; - // Query whether section is in Nodes-array or in UndoNodes-array. sal_Bool IsInNodesArr() const; @@ -384,7 +380,6 @@ inline SwSection* SwSectionFmt::GetParentSection() const return pRet; } - #endif /* _ INCLUDED_SW_INC_SECTION_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 6fe135b6e37b..e64e5ed0df3b 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -59,7 +59,6 @@ struct Writer_Impl; // is forced to wrap. It has to be always greater than 200!!! #define MAX_ASCII_PARA 10000 - class SW_DLLPUBLIC SwAsciiOptions { OUString sFont; @@ -185,8 +184,6 @@ protected: void SetBaseURL( const OUString& rURL ) { sBaseURL = rURL; } }; - - /**************** Special Readers ************************/ // Special Readers can be both!! (Excel, W4W, .. ). @@ -293,7 +290,6 @@ public: virtual void SetFltName( const OUString& r ); }; - // The given stream has to be created dynamically and must // be requested via Stream() before the instance is deleted! @@ -362,13 +358,8 @@ SW_DLLPUBLIC SwRead SwGetReaderXML(); // END source/filter/basflt/fltini.cxx - extern sal_Bool SetHTMLTemplate( SwDoc &rDoc ); //For templates from HTML before loading shellio.cxx. - - - - // Base-class of all writers. class IDocumentSettingAccess; @@ -503,7 +494,6 @@ public: SotStorage& GetStorage() const { return *pStg; } }; - // Interface class for general access on special writers. class SW_DLLPUBLIC SwWriter @@ -532,8 +522,6 @@ public: SwWriter( SfxMedium&, SwDoc & ); }; - - typedef Reader* (*FnGetReader)(); typedef void (*FnGetWriter)(const OUString&, const OUString& rBaseURL, WriterRef&); sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell&, SotStorage&, sal_Bool, const OUString& ); diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index 7703e5300616..73e431b271db 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -26,7 +26,6 @@ enum SwSortOrder { SRT_ASCENDING, SRT_DESCENDING }; enum SwSortDirection { SRT_COLUMNS, SRT_ROWS }; - struct SW_DLLPUBLIC SwSortKey { SwSortKey(); diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 03938d2912db..47bc1fbc3fc1 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -35,7 +35,6 @@ class Font; * struct SwArgsBase *************************************************************************/ - struct SwArgsBase // used for text conversion (Hangul/Hanja, ...) { SwTxtNode *pStartNode; diff --git a/sw/inc/sw_primitivetypes2d.hxx b/sw/inc/sw_primitivetypes2d.hxx index d9f75208f3c6..4ded8572088b 100644 --- a/sw/inc/sw_primitivetypes2d.hxx +++ b/sw/inc/sw_primitivetypes2d.hxx @@ -22,14 +22,10 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> -////////////////////////////////////////////////////////////////////////////// - #define PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SW| 0) #define PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE (PRIMITIVE2D_ID_RANGE_SW| 1) #define PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE (PRIMITIVE2D_ID_RANGE_SW| 2) -////////////////////////////////////////////////////////////////////////////// - #endif // INCLUDED_SW_INC_SW_PRIMITIVETYPES2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index 2072b39a2c7c..7c28933097da 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -46,7 +46,6 @@ public: virtual ~SwAutoCorrect(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index edad75436b1f..cb67b5217bf2 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -162,7 +162,6 @@ public: }; - class SW_DLLPUBLIC SwAttrSet : public SfxItemSet { // Pointer for Modify-System diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index 5a93b5fcac23..70608375bd73 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -82,7 +82,6 @@ public: sal_Bool IsNoDataFlag() const { return bNoDataFlag; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx index 307c53c90a62..be7a5d157d60 100644 --- a/sw/inc/swcalwrp.hxx +++ b/sw/inc/swcalwrp.hxx @@ -39,10 +39,8 @@ public: void LoadDefaultCalendar( sal_uInt16 nLang ); }; - salhelper::SingletonRef<SwCalendarWrapper>* s_getCalendarWrapper(); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index d2ce2bdee566..075284693f9c 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -25,14 +25,12 @@ #include <tblsel.hxx> #include <cshtyp.hxx> - struct _SwCursor_SavePos; namespace com { namespace sun { namespace star { namespace util { struct SearchOptions; } } } } - // Base structure for parameters of the find-methods. // Returns values of found-call. const int FIND_NOT_FOUND = 0; @@ -102,7 +100,6 @@ public: SwMoveFnCollection* MakeFindRange( SwDocPositions, SwDocPositions, SwPaM* ) const; - sal_uLong Find( const com::sun::star::util::SearchOptions& rSearchOpt, sal_Bool bSearchInNotes, SwDocPositions nStart, SwDocPositions nEnde, @@ -220,7 +217,6 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( SwCursor ) }; - /** A helper class to save cursor state (position). Create SwCrsrSaveState object to save current state, use SwCursor::RestoreSavePos() to actually @@ -253,8 +249,6 @@ struct _SwCursor_SavePos DECL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos ) }; - - class SwTableCursor : public virtual SwCursor { diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index e88543686da2..680a281d5166 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -45,7 +45,6 @@ protected: virtual void SwClientNotify( const SwModify&, const SfxHint& ); }; - // ----------- Inlines ----------------------------- inline const SwDDEFieldType* SwDDETable::GetDDEFldType() const diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx index e89c89e73755..31f37fd4f264 100644 --- a/sw/inc/swevent.hxx +++ b/sw/inc/swevent.hxx @@ -114,7 +114,6 @@ struct SwCallMouseEvent sal_Bool HasEvent() const { return EVENT_OBJECT_NONE != eType; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swhints.hxx b/sw/inc/swhints.hxx index 4c18982c8689..ea4a57700505 100644 --- a/sw/inc/swhints.hxx +++ b/sw/inc/swhints.hxx @@ -24,7 +24,6 @@ #define SW_BROADCASTID_START SFX_HINT_USER00 #define SW_BROADCAST_DRAWVIEWS_CREATED SW_BROADCASTID_START - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 1e34fb961306..5c02ce61b4ee 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -241,7 +241,6 @@ public: GetLanguageGuesser(); }; - inline ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener > SwModule::GetLngSvcEvtListener() @@ -256,7 +255,6 @@ inline void SwModule::SetLngSvcEvtListener( xLngSvcEvtListener = xLstnr; } - // Access to SwModule, the ::com::sun::star::sdbcx::View and the shell. #define SW_MOD() ( *(SwModule**) GetAppData(SHL_WRITER)) diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index 751767c39a76..83868781ff35 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -31,7 +31,6 @@ class SAL_WARN_UNUSED SwRect Point m_Point; Size m_Size; - public: inline SwRect(); inline SwRect( const SwRect &rRect ); @@ -287,7 +286,6 @@ inline SwRect &SwRect::operator-=( const Size &rSz ) return *this; } - // other inline Rectangle SwRect::SVRect() const { diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx index 6822991b0ba1..e9f4c46cc1b3 100644 --- a/sw/inc/swscanner.hxx +++ b/sw/inc/swscanner.hxx @@ -55,7 +55,6 @@ public: sal_uInt16 nWordType, sal_Int32 nStart, sal_Int32 nEnde, sal_Bool bClip = sal_False ); - // This next word function tries to find the language for the next word // It should currently _not_ be used for spell checking, and works only for // ! bReverse diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index a4e2dbed8638..cd3d00a14202 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -94,7 +94,6 @@ class SwTableSortBoxes : public o3tl::sorted_vector<SwTableBox*> {}; class SW_DLLPUBLIC SwTable: public SwClient //Client of FrmFmt. { - protected: SwTableLines aLines; SwTableSortBoxes m_TabSortContentBoxes; @@ -211,7 +210,6 @@ public: // CleanUpBottomRowSpan corrects the overhanging row spans at the end of the first table void CleanUpBottomRowSpan( sal_uInt16 nDelLines ); - // The following functions are "pseudo-virtual", i.e. they are different for old and new table model // It's not allowed to change the table model after the first call of one of these functions. @@ -358,7 +356,6 @@ public: const SwTableBox *GetUpper() const { return pUpper; } void SetUpper( SwTableBox *pNew ) { pUpper = pNew; } - SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index 30b878aff0d3..49412b72de0d 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -37,7 +37,6 @@ protected: : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) {} - public: TYPEINFO(); // Already in base class Content. @@ -87,7 +86,6 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt) }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 2c943b1f4b32..3cf2c8385423 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -95,7 +95,6 @@ enum SwLabelType LTYPE_DRAW // Caption for a draw object. }; - const sal_uInt8 MAXLEVEL = 10; const sal_uInt8 NO_NUMLEVEL = 0x20; // "or" with the levels. @@ -149,7 +148,6 @@ enum RndStdIds RND_DRAW_OBJECT // A draw-Object! For the SwDoc-interface only! }; - extern ResMgr* pSwResMgr; // Is in swapp0.cxx. #define SW_RES(i) ResId(i,*pSwResMgr) #define SW_RESSTR(i) SW_RES(i).toString() @@ -166,7 +164,6 @@ extern ResMgr* pSwResMgr; // Is in swapp0.cxx. // Returns the twip size of this graphic. SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev ); - // Separator for jumps to different content types in document. const sal_Unicode cMarkSeparator = '|'; // Sequences names for jumps are <name of sequence>!<no> @@ -176,7 +173,6 @@ const sal_Unicode cSequenceMarkSeparator = '!'; #define DB_DELIM ((sal_Unicode)0xff) // Database <-> table separator. #endif - typedef sal_uInt16 SetAttrMode; namespace nsSetAttrMode @@ -217,7 +213,6 @@ namespace nsSetAttrMode #define SW_CONSTASCII_DEF( n, s ) n[sizeof(s)] = s #endif - #define CHAR_HARDBLANK ((sal_Unicode)0x00A0) #define CHAR_HARDHYPHEN ((sal_Unicode)0x2011) #define CHAR_SOFTHYPHEN ((sal_Unicode)0x00AD) @@ -226,13 +221,11 @@ namespace nsSetAttrMode #define CHAR_ZWSP ((sal_Unicode)0x200B) #define CHAR_ZWNBSP ((sal_Unicode)0x2060) - // Returns the APP - CharClass instance - used for all ToUpper/ToLower/... SW_DLLPUBLIC CharClass& GetAppCharClass(); SW_DLLPUBLIC LanguageType GetAppLanguage(); SW_DLLPUBLIC const LanguageTag& GetAppLanguageTag(); - #if 0 // I18N doesn't get this right, can't specify more than one to ignore #define SW_COLLATOR_IGNORES ( \ diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx index ffaa1c2e4ed4..5d92ea80dbef 100644 --- a/sw/inc/swundo.hxx +++ b/sw/inc/swundo.hxx @@ -23,10 +23,8 @@ #include <rtl/ustring.hxx> - typedef ::std::vector< OUString > SwUndoComments_t; - // The IDs for StdActions. enum SwUndoId { @@ -172,7 +170,6 @@ enum SwUndoId UNDO_UI_TEXT_CORRECTION }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index f942b1468a23..7549eefa6fe4 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -41,7 +41,6 @@ namespace SWUnoHelper { // exceptions. sal_Int32 GetEnumAsInt32( const com::sun::star::uno::Any& rVal ); - // methods for UCB actions: // delete the file under this URL SW_DLLPUBLIC sal_Bool UCB_DeleteFile( const OUString& rURL ); diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx index 2d9e6064528d..a81a7ea6aa5f 100644 --- a/sw/inc/tblenum.hxx +++ b/sw/inc/tblenum.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_TBLENUM_HXX #define INCLUDED_SW_INC_TBLENUM_HXX - // For changing table columns/rows widths/heights. typedef sal_uInt16 TblChgWidthHeightType; @@ -34,7 +33,6 @@ namespace nsTblChgWidthHeightType const TblChgWidthHeightType WH_CELL_TOP = 6; const TblChgWidthHeightType WH_CELL_BOTTOM = 7; - // The following can "or"ed into. const TblChgWidthHeightType WH_FLAG_INSDEL = 0x4000; // Insert/Del-mode: the Bigger-Flag // tells what happens: @@ -50,7 +48,6 @@ enum TblChgMode TBLVAR_CHGABS // Table variable, change all neighbours. }; - enum SplitTbl_HeadlineOption { HEADLINE_NONE = 0, // Leave everything in place. @@ -67,7 +64,6 @@ enum TableMergeErr TBLMERGE_TOOCOMPLEX }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 62322abdae43..6e80c0fec3b2 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -74,7 +74,6 @@ SW_DLLPUBLIC void GetTblSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes, void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes, const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); - // As before, but don't start from selection but from Start- EndFrms. void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd, SwSelBoxes& rBoxes, SwCellFrms* pCells, @@ -145,8 +144,6 @@ void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart, const SwLayoutFrm *pEnd, const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); - - // These classes copy the current table selections (rBoxes) into a // separate structure while keeping the table structure. @@ -188,7 +185,6 @@ public: void ClearLineBehind() { pLineBehind = 0; } }; - class _FndLine { SwTableLine* pLine; @@ -206,7 +202,6 @@ public: void SetUpper( _FndBox* pUp ) { pUpper = pUp; } }; - struct _FndPara { const SwSelBoxes& rBoxes; @@ -223,8 +218,6 @@ struct _FndPara SW_DLLPUBLIC void ForEach_FndLineCopyCol(SwTableLines& rLines, _FndPara* pFndPara ); - - #endif // INCLUDED_SW_INC_TBLSEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index d87198c2caeb..ee3b6c6ff841 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -248,7 +248,6 @@ struct SwFormTokenEqualToFormTokenType } }; - /// Vector of tokens. typedef std::vector<SwFormToken> SwFormTokens; @@ -454,7 +453,7 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient sal_uInt16 nCreateType; // sources to create the index from sal_uInt16 nOLEOptions; // OLE sources - SwCaptionDisplay eCaptionDisplay; // + SwCaptionDisplay eCaptionDisplay; sal_Bool bProtected : 1; // index protected ? sal_Bool bFromChapter : 1; // create from chapter or document sal_Bool bFromObjectNames : 1; // create a table or object index @@ -479,7 +478,7 @@ public: // If not, so create it an copy all other used things. The return is this SwTOXBase& CopyTOXBase( SwDoc*, const SwTOXBase& ); - const SwTOXType* GetTOXType() const; // + const SwTOXType* GetTOXType() const; sal_uInt16 GetCreateType() const; // creation types @@ -568,14 +567,12 @@ public: void RegisterToTOXType( SwTOXType& rMark ); }; - /*-------------------------------------------------------------------- Description: Inlines --------------------------------------------------------------------*/ -// //SwTOXMark -// + inline OUString SwTOXMark::GetAlternativeText() const { return aAltText; } @@ -670,9 +667,8 @@ inline OUString SwTOXMark::GetSecondaryKeyReading() const return aSecondaryKeyReading; } -// //SwForm -// + inline void SwForm::SetTemplate(sal_uInt16 nLevel, const OUString& rTemplate) { SAL_WARN_IF(nLevel >= GetFormMax(), "sw", "Index >= GetFormMax()"); @@ -695,19 +691,16 @@ inline sal_uInt16 SwForm::GetFormMax() const return nFormMaxLevel; } - -// //SwTOXType -// + inline OUString SwTOXType::GetTypeName() const { return aName; } inline TOXTypes SwTOXType::GetType() const { return eType; } -// // SwTOXBase -// + inline const SwTOXType* SwTOXBase::GetTOXType() const { return (SwTOXType*)GetRegisteredIn(); } @@ -770,7 +763,6 @@ inline void SwTOXBase::SetOptions(sal_uInt16 nOpt) aData.nOptions = nOpt; } - #endif // INCLUDED_SW_INC_TOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/toxe.hxx b/sw/inc/toxe.hxx index 943a8e65a02b..dbb343539d17 100644 --- a/sw/inc/toxe.hxx +++ b/sw/inc/toxe.hxx @@ -113,7 +113,6 @@ enum ToxAuthorityField AUTH_FIELD_END }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx index 4f50f3273689..ce919c5798d0 100644 --- a/sw/inc/toxwrap.hxx +++ b/sw/inc/toxwrap.hxx @@ -34,7 +34,6 @@ namespace lang { } }}} - class SW_DLLPUBLIC IndexEntrySupplierWrapper { ::com::sun::star::lang::Locale aLcl; diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index 603b45618aac..92e1cb0495b9 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -25,7 +25,6 @@ #include <boost/utility.hpp> - class SfxItemPool; class SvXMLAttrContainerItem; class SwFmtRuby; @@ -39,7 +38,6 @@ class SwTOXMark; class SwFmtRefMark; class SwFmtMeta; - class SwTxtAttr : private boost::noncopyable { private: @@ -134,7 +132,6 @@ public: virtual sal_Int32* GetEnd(); }; - // --------------- Inline Implementations ------------------------ inline const sal_Int32* SwTxtAttr::End() const @@ -168,8 +165,6 @@ inline void SwTxtAttr::SetDontExpand( bool bDontExpand ) } } -//------------------------------------------------------------------------ - inline const SwFmtCharFmt& SwTxtAttr::GetCharFmt() const { assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT ); diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx index 5ee6d11b23f3..91717f4406dd 100644 --- a/sw/inc/txatritr.hxx +++ b/sw/inc/txatritr.hxx @@ -30,7 +30,6 @@ class SwTxtNode; class SwTxtAttr; class SfxPoolItem; - class SwScriptIterator { const OUString& m_rText; @@ -49,7 +48,6 @@ public: const OUString& GetText() const { return m_rText; } }; - class SwTxtAttrIterator { SwScriptIterator aSIter; @@ -73,7 +71,6 @@ public: sal_Int32 GetChgPos() const { return nChgPos; } }; - class SwLanguageIterator : public SwTxtAttrIterator { public: @@ -87,7 +84,6 @@ public: { return ((SvxLanguageItem&)GetAttr()).GetValue(); } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index c8bd9e648d5a..5846411107f2 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -29,7 +29,6 @@ namespace sw { class MetaFieldManager; } - // ATT_CHARFMT ********************************************* class SwTxtCharFmt : public SwTxtAttrEnd @@ -52,7 +51,6 @@ public: sal_uInt16 GetSortNumber() const { return m_nSortNumber; } }; - // ****************************** class SwTxtAttrNesting : public SwTxtAttrEnd @@ -82,7 +80,6 @@ public: void ChgTxtNode(SwTxtNode * const pNode); }; - // ****************************** class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient @@ -109,7 +106,6 @@ public: { return (const_cast<SwTxtRuby*>(this))->GetCharFmt(); } }; - inline const SwTxtNode& SwTxtRuby::GetTxtNode() const { assert( m_pTxtNode ); diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 98e3c31eba4f..751be360d858 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -137,7 +137,6 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos, SwPosition const & rStart, SwPosition const & rEnd, DelCntntType const nDelCntntType = nsDelCntntType::DELCNT_ALL); - // This class has to be inherited into an Undo-object if it saves content // for Redo/Undo... class SwUndoSaveCntnt @@ -200,7 +199,6 @@ public: SwHistory* GetHistory() { return pHistory; } }; - // This class saves the PaM as sal_uInt16's and is able to restore it // into a PaM. class SwUndRng @@ -218,7 +216,6 @@ public: ::sw::UndoRedoContext &, bool const bCorrToCntnt = false) const; }; - class SwUndoInsLayFmt; // base class for insertion of Document, Glossaries and Copy @@ -260,8 +257,6 @@ public: SwUndoCpyDoc( const SwPaM& ); }; -//-------------------------------------------------------------------- - class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection { protected: diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index ff5d831bc5f1..e4275cabd74d 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -25,12 +25,10 @@ #include <cppuhelper/implbase2.hxx> - class SfxPoolItem; class SwClient; class SwDoc; - typedef ::cppu::WeakImplHelper2 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::container::XEnumeration @@ -85,7 +83,6 @@ class UnoActionRemoveContext /// helper function for implementing SwClient::Modify void ClientModify(SwClient* pClient, const SfxPoolItem *pOld, const SfxPoolItem *pNew); - #include <boost/utility.hpp> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 17c22f435e35..73b01130d2dd 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -53,7 +53,6 @@ #include <calbck.hxx> - class SfxItemPropertySet; class SwDoc; class SwTable; @@ -63,20 +62,14 @@ struct SwRangeDescriptor; class SwSelBoxes; class SwFrmFmt; -////////////////////////////////////////////////////////////////////// - bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const OUString &rCellRangeName ); -////////////////////////////////////////////////////////////////////// - class SwChartHelper { public: static void DoUpdateAllCharts( SwDoc* pDoc ); }; -////////////////////////////////////////////////////////////////////// - class SwChartLockController_Helper { SwDoc *pDoc; @@ -85,7 +78,6 @@ class SwChartLockController_Helper Timer aUnlockTimer; // timer to unlock chart controllers bool bIsLocked; - // disallow use of d-tor, copy c-tor and assignment operator SwChartLockController_Helper( const SwChartLockController_Helper & ); SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & ); @@ -102,8 +94,6 @@ public: void Disconnect(); }; -////////////////////////////////////////////////////////////////////// - typedef cppu::WeakImplHelper4 < ::com::sun::star::chart2::data::XDataProvider, @@ -141,7 +131,6 @@ class SwChartDataProvider : }; typedef std::map< const SwTable *, Set_DataSequenceRef_t, lt_SwTable_Ptr > Map_Set_DataSequenceRef_t; - // map of all data-sequences provided directly or indirectly (e.g. via // data-source) by this object. Since there is only one object of this type // for each document it should hold references to all used data-sequences for @@ -152,7 +141,6 @@ class SwChartDataProvider : const SwDoc * pDoc; sal_Bool bDisposed; - // disallow use of c-tor and assignment operator SwChartDataProvider( const SwChartDataProvider & ); SwChartDataProvider & operator = ( const SwChartDataProvider & ); @@ -215,8 +203,6 @@ public: void AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, sal_uInt16 nLines, sal_Bool bBehind ); }; -////////////////////////////////////////////////////////////////////// - typedef cppu::WeakImplHelper2 < ::com::sun::star::chart2::data::XDataSource, @@ -248,8 +234,6 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; -////////////////////////////////////////////////////////////////////// - typedef cppu::WeakImplHelper10 < ::com::sun::star::chart2::data::XDataSequence, @@ -369,8 +353,6 @@ public: bool ExtendTo( bool bExtendCol, sal_Int32 nFirstNew, sal_Int32 nCount ); }; -////////////////////////////////////////////////////////////////////// - typedef cppu::WeakImplHelper4 < ::com::sun::star::chart2::data::XLabeledDataSequence2, @@ -399,7 +381,6 @@ class SwChartLabeledDataSequence : void SetDataSequence( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxDest, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxSource ); - public: SwChartLabeledDataSequence(); virtual ~SwChartLabeledDataSequence(); @@ -434,8 +415,6 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; -////////////////////////////////////////////////////////////////////// - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 59e0fa9602e2..9fec2d44349b 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -66,7 +66,6 @@ class SwUnoCollection virtual void Invalidate(); sal_Bool IsValid() const {return bObjectValid;} - SwDoc* GetDoc() const {return pDoc;} }; @@ -189,9 +188,8 @@ class SwUnoCollection #define SW_SERVICE_INVALID USHRT_MAX -// // case-corrected versions of service-names (see #i67811) -// + #define CSS_TEXT_TEXTFIELD_DATE_TIME "com.sun.star.text.textfield.DateTime" #define CSS_TEXT_TEXTFIELD_USER "com.sun.star.text.textfield.User" #define CSS_TEXT_TEXTFIELD_SET_EXPRESSION "com.sun.star.text.textfield.SetExpression" @@ -250,7 +248,6 @@ class SwUnoCollection #define CSS_TEXT_FIELDMASTER_DATABASE "com.sun.star.text.fieldmaster.Database" #define CSS_TEXT_FIELDMASTER_BIBLIOGRAPHY "com.sun.star.text.fieldmaster.Bibliography" - class SwXServiceProvider { public: @@ -277,7 +274,6 @@ protected: public: SwXTextTables(SwDoc* pDoc); - //XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); @@ -350,7 +346,6 @@ protected: public: SwXTextFrames(SwDoc* pDoc); - //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 ); @@ -379,7 +374,6 @@ protected: public: SwXTextEmbeddedObjects(SwDoc* pDoc); - //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 ); @@ -395,7 +389,6 @@ protected: public: SwXTextSections(SwDoc* pDoc); - //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); @@ -425,7 +418,6 @@ class SwXBookmarks : public SwCollectionBaseClass, public: SwXBookmarks(SwDoc* pDoc); - //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); @@ -509,7 +501,6 @@ protected: public: SwXReferenceMarks(SwDoc* pDoc); - //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); @@ -533,9 +524,4 @@ public: #endif - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index ecb435d8e1b7..d2830284ed0e 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -21,7 +21,6 @@ #include <swcrsr.hxx> #include <calbck.hxx> - class SwUnoCrsr : public virtual SwCursor, public SwModify { sal_Bool bRemainInSection : 1; @@ -68,8 +67,6 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr ) }; - - class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor { // The selection has the same order as the table boxes, i.e. @@ -98,8 +95,6 @@ public: const SwCursor& GetSelRing() const { return aTblSel; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index deb31f16621d..ff9a82538036 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -28,7 +28,6 @@ #include <flyenum.hxx> #include <pam.hxx> - class SfxItemSet; class SfxItemPropertySet; struct SfxItemPropertySimpleEntry; @@ -129,7 +128,6 @@ namespace SwUnoCursorHelper const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// @param bTableMode: attributes should be applied to a table selection void SetCrsrAttr(SwPaM & rPam, const SfxItemSet & rSet, const SetAttrMode nAttrMode, diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 15759d1af15e..692d75054b9f 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -224,7 +224,6 @@ protected: public: SwXShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape); - TYPEINFO(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -234,7 +233,6 @@ public: //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); - //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); @@ -287,7 +285,6 @@ protected: public: SwXGroupShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape); - 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(); @@ -306,5 +303,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 9950fca138c9..b6e4790df9b0 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -85,7 +85,6 @@ public: SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet, const SfxItemPropertySet* pPropSet); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel @@ -242,7 +241,6 @@ public: SwXTextGraphicObject( SwDoc *pDoc ); SwXTextGraphicObject(SwFrmFmt& rFmt); - 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(); @@ -289,7 +287,6 @@ public: SwXTextEmbeddedObject( SwDoc *pDoc ); SwXTextEmbeddedObject(SwFrmFmt& rFmt); - 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(); @@ -325,8 +322,6 @@ public: void SAL_CALL operator delete( void * ) throw(); }; - - class SwXOLEListener : public cppu::WeakImplHelper1 < ::com::sun::star::util::XModifyListener @@ -351,8 +346,6 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index 084abdedd81e..e95309217300 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -154,7 +154,6 @@ #define WID_SECT_CURRENTLY_VISIBLE 8012 #define WID_SECT_EDIT_IN_READONLY 8013 - // Indices/Tables of content #define WID_PRIMARY_KEY 1000 #define WID_SECONDARY_KEY 1001 @@ -288,7 +287,6 @@ #define WID_DOC_DIALOG_LIBRARIES 1105 #define WID_DOC_VBA_DOCOBJ 1106 - // AutoText #define WID_GROUP_PATH 0 #define WID_GROUP_TITLE 1 diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index 5dae4fd48356..6769a167a2a4 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -39,7 +39,6 @@ #include <unobaseclass.hxx> - struct SwPosition; class SwPaM; class SwUnoCrsr; @@ -48,7 +47,6 @@ class SwTxtNode; class SwTable; class SwXText; - typedef ::cppu::ImplInheritanceHelper10 < ::sfx2::MetadatableMixin , ::com::sun::star::lang::XUnoTunnel @@ -304,7 +302,6 @@ public: }; - class SwXParagraphEnumeration : public SwSimpleEnumeration_Base { diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index 83de197ad2cf..ad40bbc3fcf9 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -21,7 +21,6 @@ #include <unotext.hxx> - class SwRangeRedline; /** diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index a63b183d0cfb..42e4cf94f4e1 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -45,7 +45,6 @@ protected: public: SwXRedlines(SwDoc* pDoc); - //XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); @@ -76,7 +75,6 @@ protected: public: SwXRedlineEnumeration(SwDoc& rDoc); - //XEnumeration virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); @@ -90,7 +88,6 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 4f94e27de8d8..315cb77b7b8f 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -51,7 +51,6 @@ protected: public: SwXFootnoteProperties(SwDoc* pDoc); - //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); @@ -82,7 +81,6 @@ protected: public: SwXEndnoteProperties(SwDoc* pDoc); - //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); @@ -113,7 +111,6 @@ protected: public: SwXLineNumberingProperties(SwDoc* pDoc); - //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); @@ -160,12 +157,10 @@ public: SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc = NULL); // NumRule for paragraphs, numbering styles SwXNumberingRules(SwDoc& rDoc); //create a new instance - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); - //XIndexReplace virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); @@ -218,7 +213,6 @@ protected: public: SwXChapterNumbering(SwDocShell& rDocSh); - void Invalidate() {SwXNumberingRules::Invalidate();} //XServiceInfo @@ -258,8 +252,6 @@ public: SwXTextColumns(sal_uInt16 nColCount); SwXTextColumns(const SwFmtCol& rFmtCol); - - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel @@ -297,5 +289,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index f7224d1fb4ab..03a724219cd5 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -34,7 +34,6 @@ namespace com{namespace sun{namespace star{namespace util{ struct SearchOptions; }}}} - class SwXTextSearch : public cppu::WeakImplHelper3 < ::com::sun::star::util::XPropertyReplace, @@ -50,7 +49,6 @@ class SwXTextSearch : public cppu::WeakImplHelper3 SwSearchProperties_Impl* pSearchProperties; SwSearchProperties_Impl* pReplaceProperties; - const SfxItemPropertySet* m_pPropSet; sal_Bool bAll : 1; sal_Bool bWord : 1; @@ -70,8 +68,6 @@ protected: public: SwXTextSearch(); - - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 46ea30f4f8bc..da77f9e6e769 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -391,7 +391,6 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); }; - // an automatic style class SwXAutoStyle : public cppu::WeakImplHelper3 < diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 4eedfa842a9f..25579dbf8011 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -45,7 +45,6 @@ #include <TextCursorHelper.hxx> #include <unotext.hxx> - class SwUnoCrsr; class SwTable; class SwTableBox; @@ -55,7 +54,6 @@ class SwTableBoxFmt; class SwChartDataProvider; class SwFrmFmt; - typedef cppu::WeakImplHelper4 < @@ -74,7 +72,6 @@ class SwXCell : public SwXCellBaseClass, friend double sw_getValue( SwXCell &rCell ); friend void sw_setValue( SwXCell &rCell, double nVal ); - const SfxItemPropertySet* m_pPropSet; SwTableBox* pBox; // only set in non-XML import const SwStartNode* pStartNode; // only set in XML import @@ -102,7 +99,6 @@ public: SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, size_t nPos = NOTFOUND); SwXCell(SwFrmFmt* pTblFmt, const SwStartNode& rStartNode); // XML import interface - TYPEINFO(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -178,7 +174,6 @@ protected: public: SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLine); - TYPEINFO(); //XPropertySet @@ -224,7 +219,6 @@ public: SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor* pTableSelection); - DECLARE_XINTERFACE() //XTextTableCursor @@ -322,7 +316,6 @@ private: unsigned short nRows; unsigned short nColumns; - sal_Bool bFirstRowAsLabel :1; sal_Bool bFirstColumnAsLabel :1; protected: @@ -331,7 +324,6 @@ public: SwXTextTable(); SwXTextTable(SwFrmFmt& rFrmFmt); - SW_DLLPUBLIC static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel @@ -475,7 +467,6 @@ public: //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); - //XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) @@ -564,7 +555,6 @@ protected: public: SwXTableRows(SwFrmFmt& rFrmFmt); - TYPEINFO(); //XIndexAccess @@ -606,7 +596,6 @@ protected: public: SwXTableColumns(SwFrmFmt& rFrmFmt); - TYPEINFO(); //XIndexAccess @@ -636,7 +625,4 @@ public: #endif - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx index ddc506c48c94..629d3ccf01da 100644 --- a/sw/inc/unotext.hxx +++ b/sw/inc/unotext.hxx @@ -31,7 +31,6 @@ #include <unobaseclass.hxx> - namespace com { namespace sun { namespace star { namespace text { class XTextContent; @@ -45,8 +44,6 @@ class SwPaM; class OTextCursorHelper; class SwXTextRange; - - class SwXText : public ::com::sun::star::lang::XTypeProvider , public ::com::sun::star::lang::XUnoTunnel @@ -95,7 +92,6 @@ public: CreateCursor() throw (::com::sun::star::uno::RuntimeException); - // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType) diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index fb301feed93d..8ab91063668a 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -28,12 +28,10 @@ #include <unotext.hxx> - class SwDoc; class SwFrmFmt; class SwXTextCursor; - typedef ::cppu::WeakAggImplHelper2 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::container::XEnumerationAccess @@ -110,7 +108,6 @@ public: }; - typedef ::cppu::WeakImplHelper2 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::container::XEnumerationAccess diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index 12fb1e8ef405..408ef6582e3a 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -49,7 +49,6 @@ #include <unobaseclass.hxx> #include <TextCursorHelper.hxx> - class SwDoc; struct SwPosition; class SwUnoCrsr; diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index 895b2915b674..8346c866c170 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -36,7 +36,6 @@ #include <pam.hxx> #include <unobaseclass.hxx> - class SwDoc; class SwUnoCrsr; class SwFrmFmt; @@ -55,7 +54,6 @@ public: SwUnoInternalPaM& operator=(const SwPaM& rPaM); }; - namespace sw { void DeepCopyPaM(SwPaM const & rSource, SwPaM & rTarget); @@ -72,7 +70,6 @@ namespace sw { } // namespace sw - typedef ::cppu::WeakImplHelper8 < ::com::sun::star::lang::XUnoTunnel , ::com::sun::star::lang::XServiceInfo diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 22ec2f78e0f3..742e493d4715 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -428,8 +428,6 @@ public: // ::com::sun::star::util::XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - - // void Invalidate(); void Reactivate(SwDocShell* pNewDocShell); SwXDocumentPropertyHelper * GetPropertyHelper (); @@ -446,7 +444,6 @@ public: SwXDrawPage* GetDrawPage(); SwDocShell* GetDocShell() {return pDocShell;} - void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); @@ -485,7 +482,6 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException, std::exception ); - // void Invalidate() {pxDoc = 0;} }; @@ -504,7 +500,6 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4 css::uno::Reference< css::text::XTextDocument > xDoc; SwXTextDocument* pxDoc; - public: SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess > xAccess, const OUString& rLinkDisplayName, OUString sSuffix); @@ -588,7 +583,6 @@ public: virtual void onChange(); }; - /* The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of the current SwViewShell so that fields are not printed as commands and hidden characters are always invisible. Hidden text and place holders diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 14ad0b033edf..bc2a484fb51f 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -26,7 +26,6 @@ class SfxPoolItem; class SwCalc; class SwDoc; - class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType { bool bValidValue : 1; @@ -88,7 +87,6 @@ inline void SwUserFieldType::SetType(sal_uInt16 nSub) EnableFormat(!(nSub & nsSwGetSetExpType::GSE_STRING)); } - class SW_DLLPUBLIC SwUserField : public SwValueField { sal_uInt16 nSubType; diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 485be267e50b..cc9ed405a2fc 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -89,7 +89,6 @@ namespace svtools{ class ColorConfig;} #define VIEWOPT_2_SHADOWCRSR 0x01000000L #define VIEWOPT_2_V_RULER_RIGHT 0x02000000L - // Table background. #define TBL_DEST_CELL 0 #define TBL_DEST_ROW 1 @@ -268,7 +267,6 @@ public: inline void SetShowHiddenChar( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CHAR_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_CHAR_HIDDEN); } - inline sal_Bool IsShowHiddenField() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLD_HIDDEN) ? sal_True : sal_False; } inline void SetShowHiddenField( sal_Bool b ) @@ -438,7 +436,6 @@ public: inline bool operator == ( const SwViewOption &rOpt ) const; inline bool operator != ( const SwViewOption &rOpt ) const { return !(*this == rOpt); } - /*--------------------------------------------------------------------------- Options from nUIOptions ----------------------------------------------------------------------------*/ @@ -606,7 +603,6 @@ public: static void ApplyColorConfigValues(const svtools::ColorConfig& rConfig); }; - inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const { return IsEqualFlags( rOpt ) && nZoom == rOpt.GetZoom(); @@ -619,11 +615,9 @@ inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt ) nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; } - // Helper function for checking HTML-capabilities. SW_DLLPUBLIC sal_uInt16 GetHtmlMode(const SwDocShell*); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index a5f142d3efaa..9cd7d14783a9 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -107,7 +107,6 @@ class SW_DLLPUBLIC SwViewShell : public Ring // For setting visible area for page preview paint. friend class SwPagePreviewLayout; - // Set SwVisArea in order to enable clean formatting before printing. friend void SetSwVisArea( SwViewShell *pSh, const SwRect & ); @@ -138,7 +137,6 @@ class SW_DLLPUBLIC SwViewShell : public Ring SwViewOption *mpOpt; SwAccessibilityOptions* mpAccOptions; - sal_Bool mbDocSizeChgd :1; // For DocChgNotify(): Announce new DocSize // at EndAction to DocMDI. sal_Bool mbPaintWorks :1; // Normal Painting if sal_True, @@ -232,7 +230,6 @@ public: void InvalidateWindows( const SwRect &rRect ); - ////////////////////////////////////////////////////////////////////////////// // #i72754# set of Pre/PostPaints with lock counter and initial target OutDev protected: std::stack<Region> mPrePostPaintRegions; // acts also as a lock counter (empty == not locked) @@ -243,7 +240,6 @@ public: void DLPrePaint2(const Region& rRegion); void DLPostPaint2(bool bPaintFormLayer); const MapMode& getPrePostMapMode() const { return maPrePostMapMode; } - ////////////////////////////////////////////////////////////////////////////// virtual void Paint(const Rectangle &rRect); @@ -622,8 +618,6 @@ inline const SfxItemPool& SwViewShell::GetAttrPool() const return ((SwViewShell*)this)->GetAttrPool(); } - - #endif // INCLUDED_SW_INC_VIEWSH_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index b4010b991660..421f5da76b62 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -56,7 +56,6 @@ public: void SetDragCrsr( bool bFlag = true ) { m_bIsDragCrsr = bFlag; } }; - // From here classes/methods for selections. namespace sdr { namespace overlay { class OverlayObject; }} @@ -113,7 +112,6 @@ public: long* pX = 0, long* pY = 0 ); }; - class SwShellCrsr : public virtual SwCursor, public SwSelPaintRects { // Document positions of start/end characters of a SSelection. @@ -161,8 +159,6 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr ) }; - - class SwShellTableCrsr : public virtual SwShellCrsr, public virtual SwTableCursor { // The Selection has the same order as the table boxes, i.e. diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index cefe9e635b80..13600a4ffecc 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -52,5 +52,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |