diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/PostItMgr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/accmap.hxx | 2 | ||||
-rw-r--r-- | sw/inc/calc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/cellfml.hxx | 6 | ||||
-rw-r--r-- | sw/inc/crsrsh.hxx | 20 | ||||
-rw-r--r-- | sw/inc/dbmgr.hxx | 10 | ||||
-rw-r--r-- | sw/inc/dcontact.hxx | 2 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 72 | ||||
-rw-r--r-- | sw/inc/docary.hxx | 2 | ||||
-rw-r--r-- | sw/inc/docufld.hxx | 8 | ||||
-rw-r--r-- | sw/inc/editsh.hxx | 16 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 4 | ||||
-rw-r--r-- | sw/inc/list.hxx | 2 | ||||
-rw-r--r-- | sw/inc/modcfg.hxx | 8 | ||||
-rw-r--r-- | sw/inc/ndarr.hxx | 24 | ||||
-rw-r--r-- | sw/inc/reffld.hxx | 4 | ||||
-rw-r--r-- | sw/inc/section.hxx | 2 | ||||
-rw-r--r-- | sw/inc/shellio.hxx | 4 | ||||
-rw-r--r-- | sw/inc/swmodule.hxx | 4 | ||||
-rw-r--r-- | sw/inc/swtable.hxx | 6 | ||||
-rw-r--r-- | sw/inc/undobj.hxx | 18 | ||||
-rw-r--r-- | sw/inc/unochart.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unodraw.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unotbl.hxx | 2 | ||||
-rw-r--r-- | sw/inc/viewopt.hxx | 18 |
25 files changed, 121 insertions, 121 deletions
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 81251741bea4..859e07434a00 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -121,7 +121,7 @@ class SwNoteProps: public utl::ConfigItem { return bIsShowAnchor; } - ::com::sun::star::uno::Sequence< OUString >& GetPropertyNames() + static ::com::sun::star::uno::Sequence< OUString >& GetPropertyNames() { static ::com::sun::star::uno::Sequence< OUString > aNames; if(!aNames.getLength()) diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index d831d95d505c..2cb5a567319b 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -166,7 +166,7 @@ public: { return mpVSh; } - bool IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh); + static bool IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh); void AddShapeContext(const SdrObject *pObj, ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccShape); diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index d103f3e49340..55cc98f0a54f 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -177,7 +177,7 @@ class SwCalc bool ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* ); - OUString GetColumnName( const OUString& rName ); + static OUString GetColumnName( const OUString& rName ); OUString GetDBName( const OUString& rName ); SwCalc( const SwCalc& ) SAL_DELETED_FUNCTION; diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index 9f06a1afbb3a..880e2918b329 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -75,12 +75,12 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&, void _SplitMergeBoxNm( const SwTable&, OUString&, OUString&, OUString* = 0, void* pPara = 0 ) const; - void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd, - SwSelBoxes& rBoxes ) const; + static void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd, + SwSelBoxes& rBoxes ); OUString ScanString( FnScanFormula fnFormula, const SwTable& rTbl, void* = 0 ) const; - const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm ) const; + static const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm ); protected: enum NameType { EXTRNL_NAME, INTRNL_NAME, REL_NAME }; diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index b84fc43f21aa..31fdbe224916 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -703,18 +703,18 @@ public: bool GotoFld( const SwFmtFld& rFld ); - SwTxtFld* GetTxtFldAtPos( + static SwTxtFld* GetTxtFldAtPos( const SwPosition* pPos, - const bool bIncludeInputFldAtStart ) const; - SwField* GetFieldAtCrsr( + const bool bIncludeInputFldAtStart ); + static SwField* GetFieldAtCrsr( const SwPaM* pCrsr, - const bool bIncludeInputFldAtStart ) const; + const bool bIncludeInputFldAtStart ); SwField* GetCurFld( const bool bIncludeInputFldAtStart = false ) const; bool CrsrInsideInputFld() const; - bool PosInsideInputFld( const SwPosition& rPos ) const; + static bool PosInsideInputFld( const SwPosition& rPos ); bool DocPtInsideInputFld( const Point& rDocPt ) const; - sal_Int32 StartOfInputFldAtPos( const SwPosition& rPos ) const; - sal_Int32 EndOfInputFldAtPos( const SwPosition& rPos ) const; + static sal_Int32 StartOfInputFldAtPos( const SwPosition& rPos ); + static sal_Int32 EndOfInputFldAtPos( const SwPosition& rPos ); // Return number of cursors in ring (The flag indicates whether // only cursors containing selections are requested). @@ -822,10 +822,10 @@ public: // is cursor or the point in/over a right to left formatted text? bool IsInRightToLeftText( const Point* pPt = 0 ) const; - void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage); + static void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage); bool bColumnChange(); - void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection); - void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn); + static void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection); + static void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn); // If the current cursor position is inside a hidden range, the hidden range // is selected and true is returned: bool SelectHiddenRange(); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 3cfafbb591bd..d420a8a4d4bf 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -238,7 +238,7 @@ public: /// Merging of data records into fields. bool MergeNew( const SwMergeDescriptor& rMergeDesc, vcl::Window* pParent = NULL ); - bool Merge(SwWrtShell* pSh); + static bool Merge(SwWrtShell* pSh); void MergeCancel(); /// Initialize data fields that lack name of database. @@ -260,11 +260,11 @@ public: /// Fill listbox with all column names of a database table. void GetColumnNames(ListBox* pListBox, const OUString& rDBName, const OUString& rTableName, bool bAppend = false); - void GetColumnNames(ListBox* pListBox, + static void GetColumnNames(ListBox* pListBox, css::uno::Reference< css::sdbc::XConnection> xConnection, const OUString& rTableName, bool bAppend = false); - sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource, + static sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xColumn, SvNumberFormatter* pNFmtr, @@ -285,7 +285,7 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties, bool bWithDataSourceBrowser = false); - void InsertText(SwWrtShell& rSh, + static void InsertText(SwWrtShell& rSh, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties); /// check if a data source is open @@ -322,7 +322,7 @@ public: sal_uInt32 GetSelectedRecordId(); bool ToRecordId(sal_Int32 nSet); - const SwDBData& GetAddressDBName(); + static const SwDBData& GetAddressDBName(); static OUString GetDBField( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xColumnProp, diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index f49c491cb52e..01298ee7689a 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -375,7 +375,7 @@ class SwDrawContact : public SwContact /// method for adding/removing 'virtual' drawing object. SwDrawVirtObj* CreateVirtObj(); - void DestroyVirtObj( SwDrawVirtObj* pVirtObj ); + static void DestroyVirtObj( SwDrawVirtObj* pVirtObj ); void RemoveAllVirtObjs(); void _InvalidateObjs( const bool _bUpdateSortedObjsList = false ); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 2dab95b69ce9..0bb1c879789d 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -412,7 +412,7 @@ private: FNCopyFmt fnCopyFmt, SwFmt& rDfltFmt ); void CopyPageDescHeaderFooterImpl( bool bCpyHeader, const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt ); - SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName ) const; + static SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName ); SwDoc( const SwDoc &) SAL_DELETED_FUNCTION; @@ -420,11 +420,11 @@ private: void AddUsedDBToList( std::vector<OUString>& rDBNameList, const std::vector<OUString>& rUsedDBNames ); void AddUsedDBToList( std::vector<OUString>& rDBNameList, const OUString& rDBName ); - bool IsNameInArray( const std::vector<OUString>& rOldNames, const OUString& rName ); + static bool IsNameInArray( const std::vector<OUString>& rOldNames, const OUString& rName ); void GetAllDBNames( std::vector<OUString>& rAllDBNames ); - OUString ReplaceUsedDBs( const std::vector<OUString>& rUsedDBNames, + static OUString ReplaceUsedDBs( const std::vector<OUString>& rUsedDBNames, const OUString& rNewName, const OUString& rFormula ); - std::vector<OUString>& FindUsedDBs( const std::vector<OUString>& rAllDBNames, + static std::vector<OUString>& FindUsedDBs( const std::vector<OUString>& rAllDBNames, const OUString& rFormula, std::vector<OUString>& rUsedDBNames ); @@ -440,7 +440,7 @@ private: // Update charts of given table. void _UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const; - bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, + static bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, sal_uInt16 nMode ); // CharTimer calls this method. @@ -710,7 +710,7 @@ public: sal_uInt16* pPageCnt, sal_uInt16* pPageSt ); // count words in pam - void CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const; + static void CountWords( const SwPaM& rPaM, SwDocStat& rStat ); // Glossary Document void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; } @@ -752,7 +752,7 @@ public: void SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName ); const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const; - void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName ) const; + static void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName ); // Set a valid name for all Flys that have none (Called by Readers after reading). void SetAllUniqueFlyNames(); @@ -912,7 +912,7 @@ public: // Query if style (paragraph- / character- / frame- / page-) is used. bool IsUsed( const SwModify& ) const; - bool IsUsed( const SwNumRule& ) const; + static bool IsUsed( const SwNumRule& ); // Set name of newly loaded document template. sal_uInt16 SetDocPattern( const OUString& rPatternName ); @@ -936,11 +936,11 @@ public: /** get the set of printable pages for the XRenderable API by evaluating the respective settings (see implementation) */ - void CalculatePagesForPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport, + static void CalculatePagesForPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport, sal_Int32 nDocPageCount ); - void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport, + static void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport, sal_Int32 nDocPageCount ); - void CalculatePagePairsForProspectPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, + static void CalculatePagePairsForProspectPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, sal_Int32 nDocPageCount ); // PageDescriptor interface. @@ -985,7 +985,7 @@ public: void CheckDefaultPageFmt(); // Methods for tables/indices - sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& ) const; + static sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& ); void DeleteTOXMark( const SwTOXMark* pTOXMark ); const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark, SwTOXSearch eDir, bool bInReadOnly ); @@ -998,8 +998,8 @@ public: const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd, const SwTOXBase& rTOX, const SfxItemSet* pSet = 0 ); - SwTOXBase* GetCurTOX( const SwPosition& rPos ); - const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX) const; + static SwTOXBase* GetCurTOX( const SwPosition& rPos ); + static const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX); bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes = false ); OUString GetUniqueTOXBaseName( const SwTOXType& rType, @@ -1061,14 +1061,14 @@ public: bool bMoveCrsr = false ); // Set everything in the range of [rStartNode, rEndNode] to rNewPos. - void CorrAbs( + static void CorrAbs( const SwNodeIndex& rStartNode, const SwNodeIndex& rEndNode, const SwPosition& rNewPos, bool bMoveCrsr = false ); // Set everything in this range from rRange to rNewPos. - void CorrAbs( + static void CorrAbs( const SwPaM& rRange, const SwPosition& rNewPos, bool bMoveCrsr = false ); @@ -1121,7 +1121,7 @@ public: void SetNumRuleStart( const SwPosition& rPos, bool bFlag = true ); void SetNodeNumStart( const SwPosition& rPos, sal_uInt16 nStt ); - SwNumRule* GetNumRuleAtPos( const SwPosition& rPos ) const; + static SwNumRule* GetNumRuleAtPos( const SwPosition& rPos ); const SwNumRuleTbl& GetNumRuleTbl() const { return *mpNumRuleTbl; } @@ -1153,9 +1153,9 @@ public: const OUString& rNewRule ); // Goto next/previous on same level. - bool GotoNextNum( SwPosition&, bool bOverUpper = true, + static bool GotoNextNum( SwPosition&, bool bOverUpper = true, sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 ); - bool GotoPrevNum( SwPosition&, bool bOverUpper = true, + static bool GotoPrevNum( SwPosition&, bool bOverUpper = true, sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 ); /** Searches for a text node with a numbering rule. @@ -1268,12 +1268,12 @@ public: bool IsInsTblAlignNum() const; // From FEShell (for Undo and BModified). - void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, - const SwCellFrm* pBoxFrm = 0 ) const; + static void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, + const SwCellFrm* pBoxFrm = 0 ); void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ); - void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr, - const SwCellFrm* pBoxFrm = 0 ) const; + static void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr, + const SwCellFrm* pBoxFrm = 0 ); void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ); @@ -1368,9 +1368,9 @@ public: SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &, SwTOXBase const*const pTOXBase = 0, SfxItemSet const*const pAttr = 0, bool const bUpdate = true); - sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange, - const SwNode** ppSttNd = 0 ) const; - SwSection* GetCurrSection( const SwPosition& rPos ) const; + static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange, + const SwNode** ppSttNd = 0 ); + static SwSection* GetCurrSection( const SwPosition& rPos ); SwSectionFmts& GetSections() { return *mpSectionFmtTbl; } const SwSectionFmts& GetSections() const { return *mpSectionFmtTbl; } SwSectionFmt *MakeSectionFmt( SwSectionFmt *pDerivedFrom ); @@ -1509,17 +1509,17 @@ public: const bool _bPosCorr ); void SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew ); - void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const; + static void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ); void SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew ); - void GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz ) const; + static void GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz ); bool BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly = true ); void SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew ); - bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) const; + static bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ); void SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ); void SetTabLineStyle( const SwCursor& rCursor, const Color* pColor, bool bSetLine, const editeng::SvxBorderLine* pBorderLine ); - void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const; + static void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ); void SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew ); /** Retrieves a box attribute from the given cursor. @@ -1531,9 +1531,9 @@ public: the values of the same property over any other boxes in the selection; if any value is different from that of the first box, the property is unset (and false is returned). */ - bool GetBoxAttr( const SwCursor& rCursor, SfxPoolItem &rToFill ) const; + static bool GetBoxAttr( const SwCursor& rCursor, SfxPoolItem &rToFill ); void SetBoxAlign( const SwCursor& rCursor, sal_uInt16 nAlign ); - sal_uInt16 GetBoxAlign( const SwCursor& rCursor ) const; + static sal_uInt16 GetBoxAlign( const SwCursor& rCursor ); void AdjustCellWidth( const SwCursor& rCursor, bool bBalance = false ); SwChainRet Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest ); @@ -1560,7 +1560,7 @@ public: void SetContainsMSVBasic( bool bFlag ) { mbContains_MSVBasic = bFlag; } // Interface for the list of Ruby - texts/attributes - sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList, + static sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList, sal_uInt16 nMode ); sal_uInt16 SetRubyList( const SwPaM& rPam, const SwRubyList& rList, sal_uInt16 nMode ); @@ -1599,7 +1599,7 @@ public: @param bValue - true mark the level - false unmark the level */ - void MarkListLevel( SwList& rList, + static void MarkListLevel( SwList& rList, const int nListLevel, const bool bValue ); @@ -1629,9 +1629,9 @@ public: @return the textual description of rPaM */ - OUString GetPaMDescr(const SwPaM & rPaM) const; + static OUString GetPaMDescr(const SwPaM & rPaM); - bool IsFirstOfNumRuleAtPos( const SwPosition & rPos ); + static bool IsFirstOfNumRuleAtPos( const SwPosition & rPos ); // access methods for XForms model(s) diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 386bf5135442..c671a695b921 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -108,7 +108,7 @@ public: bool Contains(Value const& p) const { return std::find(begin(), end(), p) != end(); } - void dumpAsXml(struct _xmlTextWriter* /*pWriter*/) const {}; + static void dumpAsXml(struct _xmlTextWriter* /*pWriter*/) {}; }; template<typename Value> diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 4129d33b47b6..5bb92646b171 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -182,7 +182,7 @@ class SwAuthorFieldType : public SwFieldType public: SwAuthorFieldType(); - OUString Expand(sal_uLong) const; + static OUString Expand(sal_uLong); virtual SwFieldType* Copy() const SAL_OVERRIDE; }; @@ -331,8 +331,8 @@ public: void Evaluate(SwDoc*); inline void SetValue(bool bHidden) { bIsHidden = bHidden; } - OUString GetColumnName(const OUString& rName); - OUString GetDBName(const OUString& rName, SwDoc *pDoc); + static OUString GetColumnName(const OUString& rName); + static OUString GetDBName(const OUString& rName, SwDoc *pDoc); /// Condition virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; @@ -531,7 +531,7 @@ public: inline void SetData(const OUString& rStr) { aData = rStr; } - OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const; + static OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat); virtual SwFieldType* Copy() const SAL_OVERRIDE; }; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index cca79a15030b..c95e682dd85f 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -423,7 +423,7 @@ public: const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false ); void SetDefaultTOXBase(const SwTOXBase& rBase); - bool IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const; + static bool IsTOXBaseReadonly(const SwTOXBase& rTOXBase); void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly); sal_uInt16 GetTOXCount() const; @@ -673,7 +673,7 @@ public: void HyphIgnore(); /// For Inserting SoftHyphen. Position is offset within the syllabificated word. - void InsertSoftHyph( const sal_Int32 nHyphPos ); + static void InsertSoftHyph( const sal_Int32 nHyphPos ); const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts, ///< ALL_TBL_INS_ATTR sal_uInt16 nRows, sal_uInt16 nCols, @@ -735,22 +735,22 @@ public: bool SpellSentence(svx::SpellPortions& rToFill, bool bIsGrammarCheck ); /// Make SpellIter start with the current sentence when called next time. - void PutSpellingToSentenceStart(); + static void PutSpellingToSentenceStart(); /// Moves the continuation position to the end of the currently checked sentence. - void MoveContinuationPosToEndOfCheckedSentence(); + static void MoveContinuationPosToEndOfCheckedSentence(); /// Applies a changed sentence. void ApplyChangedSentence(const svx::SpellPortions& rNewPortions, bool bRecheck); /// Check SwSpellIter data to see if the last sentence got grammar checked. - bool HasLastSentenceGotGrammarChecked() const; + static bool HasLastSentenceGotGrammarChecked(); /// Is text conversion active somewhere else? - bool HasConvIter() const; + static bool HasConvIter(); /// Is hyphenation active somewhere else? - bool HasHyphIter() const; + static bool HasHyphIter(); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > @@ -762,7 +762,7 @@ public: ::com::sun::star::uno::Sequence< OUString > /*out*/ &rSuggestions, const Point* pPt, SwRect& rSelectRect ); - void IgnoreGrammarErrorAt( SwPaM& rErrorPosition ); + static void IgnoreGrammarErrorAt( SwPaM& rErrorPosition ); void SetLinguRange( SwDocPositions eStart, SwDocPositions eEnd ); /// @return reference set in document according to given name. diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 0a54a79e3500..69a2b6529094 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -772,8 +772,8 @@ public: SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot); bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 ); - bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, - const Point& _rDocPos ) const; + static bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, + const Point& _rDocPos ); void ToggleHeaderFooterEdit( ); }; diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx index a0a41959984c..bf4089a959a4 100644 --- a/sw/inc/list.hxx +++ b/sw/inc/list.hxx @@ -42,7 +42,7 @@ class SwList void InsertListItem( SwNodeNum& rNodeNum, const int nLevel ); - void RemoveListItem( SwNodeNum& rNodeNum ); + static void RemoveListItem( SwNodeNum& rNodeNum ); void InvalidateListTree(); void ValidateListTree(); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index e79c23689211..7088f2784fe9 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -73,7 +73,7 @@ class SwRevisionConfig : public utl::ConfigItem sal_uInt16 nMarkAlign; //Revision/LinesChanged/Mark Color aMarkColor; //Revision/LinesChanged/Color - const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; @@ -97,7 +97,7 @@ class SwCompareConfig : public utl::ConfigItem bool bIgnorePieces; //Compare/Settings/Ignore pieces of length sal_uInt16 nPieceLen; //Compare/Settings/Ignore pieces of length - const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; @@ -152,7 +152,7 @@ class SwTableConfig : public utl::ConfigItem bool bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats. bool bInsTblAlignNum; // Table/Input/Alignment // Align numbers. - const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; @@ -182,7 +182,7 @@ class SwMiscConfig : public utl::ConfigItem OUString sMailingPath; // FormLetter/FileOutput/Path OUString sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!) - const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 4384bcfa4665..158b8dc2d0a8 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -117,7 +117,7 @@ class SW_DLLPUBLIC SwNodes bool bInDelUpdNum : 1; ///< Flag for updating of Outline. // Actions on the nodes. - void SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEnd ); + static void SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEnd ); void DelNodes( const SwNodeIndex& rStart, sal_uLong nCnt = 1 ); void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize, @@ -167,7 +167,7 @@ public: Implementation in doc.hxx (because one needs to know Doc for it) ! */ bool IsDocNodes() const; - sal_uInt16 GetSectionLevel(const SwNodeIndex &rIndex) const; + static sal_uInt16 GetSectionLevel(const SwNodeIndex &rIndex); void Delete(const SwNodeIndex &rPos, sal_uLong nNodes = 1); bool _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, @@ -183,11 +183,11 @@ public: bool CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const; - void GoStartOfSection(SwNodeIndex *) const; - void GoEndOfSection(SwNodeIndex *) const; + static void GoStartOfSection(SwNodeIndex *); + static void GoEndOfSection(SwNodeIndex *); SwCntntNode* GoNext(SwNodeIndex *) const; - SwCntntNode* GoPrevious(SwNodeIndex *) const; + static SwCntntNode* GoPrevious(SwNodeIndex *); /** Go to next/previous Cntnt/Table-node for which LayoutFrames exist. While doing this do not leave Header/Footer/Frame etc. */ @@ -198,13 +198,13 @@ public: (Both set FALSE ==> GoNext/GoPrevious!!!). */ SwCntntNode* GoNextSection( SwNodeIndex *, bool bSkipHidden = true, bool bSkipProtect = true ) const; - SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden = true, - bool bSkipProtect = true ) const; + static SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden = true, + bool bSkipProtect = true ); /** Create an empty section of Start- and EndNote. It may be called only if a new section with content is to be created, e.g. at filters/Undo/... */ - SwStartNode* MakeEmptySection( const SwNodeIndex& rIdx, + static SwStartNode* MakeEmptySection( const SwNodeIndex& rIdx, SwStartNodeType = SwNormalStartNode ); /// Implementations of "Make...Node" are in the given .cxx-files. @@ -216,7 +216,7 @@ public: SwTxtFmtColl *pColl, SwAttrSet* pAutoAttr = 0 ); - SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, + static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, @@ -224,7 +224,7 @@ public: SwAttrSet* pAutoAttr = 0, bool bDelayed = false ); ///< in ndgrf.cxx - SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, + static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const GraphicObject& rGrfObj, SwGrfFmtColl *pColl, SwAttrSet* pAutoAttr = 0 ); ///< in ndgrf.cxx @@ -253,7 +253,7 @@ public: adjust in pCntntTxtColl or pHeadlineTxtColl this adjust item overrides the item in pAttrSet. */ - SwTableNode* InsertTable( const SwNodeIndex& rNdIdx, + static SwTableNode* InsertTable( const SwNodeIndex& rNdIdx, sal_uInt16 nBoxes, SwTxtFmtColl* pCntntTxtColl, sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0, SwTxtFmtColl* pHeadlineTxtColl = 0, @@ -267,7 +267,7 @@ public: SwTxtFmtColl* pTxtColl, SwUndoTxtToTbl* pUndo = 0 ); - SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange); + static SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange); /// create a table from a vector of NodeRanges - API support SwTableNode* TextToTable( const TableRanges_t& rTableNodes, diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 740a561f6ba0..058d57d815ca 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -91,9 +91,9 @@ private: virtual SwField* Copy() const SAL_OVERRIDE; // #i81002# - OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField, + static OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField, const SwTxtNode& rTxtNodeOfReferencedItem, - const sal_uInt32 nRefNumFormat ) const; + const sal_uInt32 nRefNumFormat ); public: SwGetRefField( SwGetRefFieldType*, const OUString& rSetRef, diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index a3080ab19ec9..6dc7d17a4d88 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -236,7 +236,7 @@ public: void CreateLink( LinkCreateType eType ); - void MakeChildLinksVisible( const SwSectionNode& rSectNd ); + static void MakeChildLinksVisible( const SwSectionNode& rSectNd ); bool IsLinkType() const { return m_Data.IsLinkType(); } diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index f62df9ad2f7a..83aff3c1d44b 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -447,8 +447,8 @@ public: // Stream-specific routines. Do not use in storage-writer! // Optimizing output on stream. - SvStream& OutLong( SvStream& rStrm, long nVal ); - SvStream& OutULong( SvStream& rStrm, sal_uLong nVal ); + static SvStream& OutLong( SvStream& rStrm, long nVal ); + static SvStream& OutULong( SvStream& rStrm, sal_uLong nVal ); inline SvStream& OutLong( long nVal ) { return OutLong( Strm(), nVal ); } inline SvStream& OutULong( sal_uLong nVal ) { return OutULong( Strm(), nVal ); } diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index f016ac3cdfca..0b5504a57c3a 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -181,7 +181,7 @@ public: bool IsEmbeddedLoadSave() const { return bEmbeddedLoadSave; } void SetEmbeddedLoadSave( bool bFlag ) { bEmbeddedLoadSave = bFlag; } - void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false); + static void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false); // Table modi. bool IsInsTblFormatNum(bool bHTML) const; @@ -227,7 +227,7 @@ public: void RemoveAttrPool(); // Invalidates online spell-wrong-lists if necessary. - void CheckSpellChanges( bool bOnlineSpelling, + static void CheckSpellChanges( bool bOnlineSpelling, bool bIsSpellWrongAgain, bool bIsSpellAllAgain, bool bSmartTags ); inline ::com::sun::star::uno::Reference< diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index eb303d619e60..ac000d87757b 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -296,8 +296,8 @@ public: // rBoxes as a return value for immediate use. // steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen // bToTop = true -> up to base line, false-> else only line of box. - SwSelBoxes& SelLineFromBox( const SwTableBox* pBox, - SwSelBoxes& rBoxes, bool bToTop = true ) const; + static SwSelBoxes& SelLineFromBox( const SwTableBox* pBox, + SwSelBoxes& rBoxes, bool bToTop = true ); // Get information from client. virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; @@ -392,7 +392,7 @@ class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrmFmt. // In case Format contains formulas/values already, // a new one must be created for the new box. - SwTableBoxFmt* CheckBoxFmt( SwTableBoxFmt* ); + static SwTableBoxFmt* CheckBoxFmt( SwTableBoxFmt* ); public: TYPEINFO_OVERRIDE(); diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index a27ce713d389..9ec5e4dc7d88 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -56,9 +56,9 @@ protected: bool bCacheComment; mutable OUString * pComment; - void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = 0 ); - void RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext ); - void RemoveIdxRel( sal_uLong, const SwPosition& ); + static void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = 0 ); + static void RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext ); + static void RemoveIdxRel( sal_uLong, const SwPosition& ); static bool CanRedlineGroup( SwRedlineSaveDatas& rCurr, const SwRedlineSaveDatas& rCheck, @@ -150,10 +150,10 @@ protected: // content. So the attributes do not get expanded. // MoveTo: moves from the NodesArray into the UndoNodesArray. // MoveFrom: moves from the UndoNodesArray into the NodesArray. - void MoveToUndoNds( SwPaM& rPam, + static void MoveToUndoNds( SwPaM& rPam, SwNodeIndex* pNodeIdx = 0, sal_uLong* pEndNdIdx = 0, sal_Int32 * pEndCntIdx = 0 ); - void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx, + static void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx, SwPosition& rInsPos, sal_uLong* pEndNdIdx = 0, sal_Int32 * pEndCntIdx = 0 ); @@ -161,8 +161,8 @@ protected: // a range can be spanned for Undo/Redo. (In this case the SPoint // is before the manipulated range!!) // The flag indicates if there is content before the SPoint. - bool MovePtBackward( SwPaM& rPam ); - void MovePtForward( SwPaM& rPam, bool bMvBkwrd ); + static bool MovePtBackward( SwPaM& rPam ); + static void MovePtForward( SwPaM& rPam, bool bMvBkwrd ); // Before moving stuff into UndoNodes-Array care has to be taken that // the content-bearing attributes are removed from the nodes-array. @@ -190,8 +190,8 @@ public: SwUndoSaveSection(); ~SwUndoSaveSection(); - void SaveSection( SwDoc* pDoc, const SwNodeIndex& rSttIdx ); - void SaveSection( SwDoc* pDoc, const SwNodeRange& rRange ); + void SaveSection( const SwNodeIndex& rSttIdx ); + void SaveSection( const SwNodeRange& rRange ); void RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx, sal_uInt16 nSectType ); void RestoreSection( SwDoc* pDoc, const SwNodeIndex& rInsPos ); diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 7c85f9b24b5a..60282bf0ce52 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -150,7 +150,7 @@ class SwChartDataProvider : ::com::sun::star::uno::RuntimeException, std::exception); - OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation ); + static OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation ); protected: //SwClient diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 33c7bd9209a2..68e4d40e2910 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -60,7 +60,7 @@ public: SdrView* GetDrawView() {return mpView;} SdrPageView* GetPageView(); void RemovePageView(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetInterface( SdrObject* pObj ); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetInterface( SdrObject* pObj ); // The following method is called when a SvxShape-object is to be created. // Derived classes may obtain at this point a derivation or an object diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 20c94039808a..ffe6985b43ec 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -428,7 +428,7 @@ public: sal_uInt16 getRowCount(); sal_uInt16 getColumnCount(); - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable, + static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable, const OUString& sTLName, const OUString& sBRName, SwRangeDescriptor& rDesc); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 87dc830856c8..8f10c195d0e6 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -178,9 +178,9 @@ public: SwViewOption(const SwViewOption&); ~SwViewOption(); - void Init( vcl::Window *pWin ); // Initializing of static data. + static void Init( vcl::Window *pWin ); // Initializing of static data. - sal_uInt16 GetPixelTwips() const { return nPixelTwips; } + static sal_uInt16 GetPixelTwips() { return nPixelTwips; } inline sal_uInt32 GetCoreOptions() const {return nCoreOptions;} inline void SetUIOptions( const SwViewOption& ); @@ -244,9 +244,9 @@ public: { return (nCoreOptions & VIEWOPT_1_POSTITS) != 0; } inline void SetPostIts( bool b ) { b ? (nCoreOptions |= VIEWOPT_1_POSTITS ) : ( nCoreOptions &= ~VIEWOPT_1_POSTITS); } - void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, - bool bIsScript ) const; - sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 ) const; + static void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, + bool bIsScript ); + static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 ); inline bool IsShowHiddenChar(bool bHard = false) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) && @@ -388,7 +388,7 @@ public: inline bool IsPagePrevBookview() const { return mbBookView; } inline void SetPagePrevBookview(bool bSet) { mbBookView = bSet; } - bool IsAutoCompleteWords() const; + static bool IsAutoCompleteWords(); bool IsViewLayoutBookMode() const { return mbViewLayoutBookMode; } void SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; } @@ -422,8 +422,8 @@ public: inline sal_uInt16 GetZoom() const { return nZoom; } inline void SetZoom( sal_uInt16 n ){ nZoom = n; } - void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol ) const; - void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect ) const; + static void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol ); + static void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect ); SwViewOption& operator=( const SwViewOption &rOpt ); @@ -584,7 +584,7 @@ public: static void SetAppearanceFlag(sal_Int32 nFlag, bool bSet, bool bSaveInConfig = false); - void SetDocBoundaries(bool bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);} + static void SetDocBoundaries(bool bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);} static void ApplyColorConfigValues(const svtools::ColorConfig& rConfig); }; |