diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
| commit | 85825e0fd54551735ef05b8484f71974734b9135 (patch) | |
| tree | 8bece458e55c1b5eab7559076579bf76cca8df68 | |
| parent | fc233b52ce2acc1bcd7cecc3d51bcab870c81932 (diff) | |
Avoid reserved identifiers
Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4
334 files changed, 2939 insertions, 2939 deletions
diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx index d3fc83127fde..aa5024180a91 100644 --- a/compilerplugins/clang/badstatics.cxx +++ b/compilerplugins/clang/badstatics.cxx @@ -117,7 +117,7 @@ public: || name == "s_pGallery" // this is not entirely clear but apparently the GalleryThemeCacheEntry are deleted by GalleryBrowser2::SelectTheme() or GalleryBrowser2::dispose() || name == "s_ExtMgr" // TheExtensionManager::disposing() || name == "s_pDocLockedInsertingLinks" // not owning - || name == "s_pVout" // _FrameFinit() + || name == "s_pVout" // FrameFinit() || name == "s_pPaintQueue" // SwPaintQueue::Remove() || name == "gProp" // only owned (VclPtr) member cleared again || name == "g_pColumnCacheLastTabFrame" // not owning diff --git a/sw/README b/sw/README index 027e4eb6ffed..dc1e02d99639 100644 --- a/sw/README +++ b/sw/README @@ -114,7 +114,7 @@ There are multiple model classes involved for fields: There are many subclasses of SwFieldType, one for each different type of field. For most types of fields there is one shared instance of this per type, - which is created in DocumentFieldsManager::_InitFieldTypes() + which is created in DocumentFieldsManager::InitFieldTypes() but for some there are more than one, and they are dynamically created, see DocumentFieldsManager::InsertFieldType(). An example for the latter are variable fields (RES_GETEXPFLD/RES_SETEXPFLD), with one SwFieldType per diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx index 857b9cfecf3a..e4a220ecd631 100644 --- a/sw/inc/IDocumentDrawModelAccess.hxx +++ b/sw/inc/IDocumentDrawModelAccess.hxx @@ -35,7 +35,7 @@ public: */ virtual const SwDrawModel* GetDrawModel() const = 0; virtual SwDrawModel* GetDrawModel() = 0; - virtual SwDrawModel* _MakeDrawModel() = 0; + virtual SwDrawModel* MakeDrawModel_() = 0; virtual SwDrawModel* GetOrCreateDrawModel() = 0; virtual SdrLayerID GetHeavenId() const = 0; virtual SdrLayerID GetHellId() const = 0; diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index 4eb6b1088573..f9b116b716c2 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -33,7 +33,7 @@ class SwTextField; class SwField; class SwMsgPoolItem; class DateTime; -class _SetGetExpField; +class SetGetExpField; struct SwHash; class SwNode; @@ -120,9 +120,9 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } // (if the address != 0 and the pointer == 0 a new list will be returned). virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0; - virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) = 0; + virtual void FieldsToCalc(SwCalc& rCalc, const SetGetExpField& rToThisField) = 0; - virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) = 0; + virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const SetGetExpField& rToThisField) = 0; virtual bool IsNewFieldLst() const = 0; diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx index ec1682c04b7b..f597529f28a6 100644 --- a/sw/inc/SwNodeNum.hxx +++ b/sw/inc/SwNodeNum.hxx @@ -85,7 +85,7 @@ private: SwTextNode * mpTextNode; SwNumRule * mpNumRule; - static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ); + static void UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ); SwNodeNum( const SwNodeNum& ) = delete; SwNodeNum& operator=( const SwNodeNum& ) = delete; diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 4b9bdae378f4..dc78b6c60e29 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -439,13 +439,13 @@ protected: SwNumberTreeNode& operator=( const SwNumberTreeNode& ); /** - Calls _GetNumberVector on parent and adds number of this node + Calls GetNumberVector_ on parent and adds number of this node at the end. @param rVector return value @param bValidate validate the number? */ - void _GetNumberVector( SwNumberTree::tNumberVector& rVector, + void GetNumberVector_( SwNumberTree::tNumberVector& rVector, bool bValidate = true ) const; /** diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 14852be59cbb..89011caa5a98 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -77,8 +77,8 @@ typedef std::unordered_map<OUString, sal_uInt16, OUStringHash> NameToIdHash; class SwStyleNameMapper { - friend void _InitCore(); - friend void _FinitCore(); + friend void InitCore(); + friend void FinitCore(); protected: // UI Name tables diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 885892d35797..2178a7223498 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -110,10 +110,10 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, //IvalidateShapeInParaSelection() method is responsible for the updating the selected states of the objects. void InvalidateShapeInParaSelection(); - void _InvalidateRelationSet( const SwFrame* pFrame, bool bFrom ); + void InvalidateRelationSet_( const SwFrame* pFrame, bool bFrom ); css::uno::Reference<css::accessibility::XAccessible> - _GetDocumentView( bool bPagePreview ); + GetDocumentView_( bool bPagePreview ); /** method to build up a new data structure of the accessible paragraphs, which have a selection @@ -122,7 +122,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, @author OD */ - SwAccessibleSelectedParas_Impl* _BuildSelectedParas(); + SwAccessibleSelectedParas_Impl* BuildSelectedParas(); public: diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 7b097a2fb606..5336f2a9d36d 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject @author OD */ - void _MakeObjPosAnchoredAtPara(); + void MakeObjPosAnchoredAtPara(); /** method for the intrinsic positioning of a at-page|at-frame anchored drawing object @@ -69,7 +69,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject @author OD */ - void _MakeObjPosAnchoredAtLayout(); + void MakeObjPosAnchoredAtLayout(); /** method to set positioning attributes (not for as-character anchored) @@ -81,7 +81,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject @author OD */ - void _SetPositioningAttr(); + void SetPositioningAttr(); /** method to set internal anchor position of <SdrObject> instance of the drawing object @@ -97,13 +97,13 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject @author OD */ - void _SetDrawObjAnchor(); + void SetDrawObjAnchor(); /** method to invalidate the given page frame @author OD */ - void _InvalidatePage( SwPageFrame* _pPageFrame ); + void InvalidatePage_( SwPageFrame* _pPageFrame ); protected: virtual void ObjectAttachedToAnchorFrame() override; @@ -115,8 +115,8 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject */ virtual void RegisterAtCorrectPage() override; - virtual bool _SetObjTop( const SwTwips _nTop) override; - virtual bool _SetObjLeft( const SwTwips _nLeft) override; + virtual bool SetObjTop_( const SwTwips _nTop) override; + virtual bool SetObjLeft_( const SwTwips _nLeft) override; virtual const SwRect GetObjBoundRect() const override; diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index e82d9ffb7788..024b55550034 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -104,7 +104,7 @@ class SW_DLLPUBLIC SwAnchoredObject // This boolean is used, if compatibility option 'Consider wrapping style // influence on object positioning' is OFF and a positioning loop is // detected in method <SwFlyAtContentFrame::MakeAll()> or method - // <SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()>. + // <SwAnchoredDrawObject::MakeObjPosAnchoredAtPara()>. // The boolean is reset to <false>, when the layout process for a // page frame starts. bool mbTmpConsiderWrapInfluence; @@ -142,7 +142,7 @@ class SW_DLLPUBLIC SwAnchoredObject input parameter - reference to the text frame containing the anchor character. */ - void _CheckCharRect( const SwFormatAnchor& _rAnch, + void CheckCharRect( const SwFormatAnchor& _rAnch, const SwTextFrame& _rAnchorCharFrame ); /** check top of line @@ -161,7 +161,7 @@ class SW_DLLPUBLIC SwAnchoredObject input parameter - reference to the text frame containing the anchor character. */ - void _CheckTopOfLine( const SwFormatAnchor& _rAnch, + void CheckTopOfLine( const SwFormatAnchor& _rAnch, const SwTextFrame& _rAnchorCharFrame ); // method <sw_HideObj(..)> sets needed data structure values for the @@ -202,8 +202,8 @@ class SW_DLLPUBLIC SwAnchoredObject */ void SetTmpConsiderWrapInfluenceOfOtherObjs(); - virtual bool _SetObjTop( const SwTwips _nTop) = 0; - virtual bool _SetObjLeft( const SwTwips _nLeft) = 0; + virtual bool SetObjTop_( const SwTwips _nTop) = 0; + virtual bool SetObjLeft_( const SwTwips _nLeft) = 0; virtual const SwRect GetObjBoundRect() const = 0; public: diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 9145517ead40..47615f45bc0f 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -40,25 +40,25 @@ class SW_DLLPUBLIC SwBreakIt LanguageType aForbiddenLang; ///< language of the current forbiddenChar struct - void _GetLocale( const LanguageType aLang ); - void _GetLocale( const LanguageTag& rLanguageTag ); - void _GetForbidden( const LanguageType aLang ); + void GetLocale_( const LanguageType aLang ); + void GetLocale_( const LanguageTag& rLanguageTag ); + void GetForbidden_( const LanguageType aLang ); void createBreakIterator() const; SwBreakIt(SwBreakIt const&) = delete; SwBreakIt& operator=(SwBreakIt const&) = delete; - // private (see @ _Create, _Delete). + // private (see @ Create_, Delete_). explicit SwBreakIt( const css::uno::Reference< css::uno::XComponentContext > & rxContext); ~SwBreakIt(); public: // private (see @ source/core/bastyp/init.cxx). - static void _Create( + static void Create_( const css::uno::Reference< css::uno::XComponentContext > & rxContext); - static void _Delete(); + static void Delete_(); public: static SwBreakIt * Get(); @@ -72,7 +72,7 @@ public: const css::lang::Locale& GetLocale( const LanguageType aLang ) { if( !m_pLanguageTag || m_pLanguageTag->getLanguageType() != aLang ) - _GetLocale( aLang ); + GetLocale_( aLang ); return m_pLanguageTag->getLocale(); } @@ -83,14 +83,14 @@ public: // assigned, so LanguageTag does not need to convert to BCP47 for // comparison. if( !m_pLanguageTag || m_pLanguageTag->getLanguageType() != rLanguageTag.getLanguageType() ) - _GetLocale( rLanguageTag ); + GetLocale_( rLanguageTag ); return m_pLanguageTag->getLocale(); } const LanguageTag& GetLanguageTag( const LanguageType aLang ) { if( !m_pLanguageTag || m_pLanguageTag->getLanguageType() != aLang ) - _GetLocale( aLang ); + GetLocale_( aLang ); return *m_pLanguageTag; } @@ -101,14 +101,14 @@ public: // assigned, so LanguageTag does not need to convert to BCP47 for // comparison. if( !m_pLanguageTag || m_pLanguageTag->getLanguageType() != rLanguageTag.getLanguageType() ) - _GetLocale( rLanguageTag ); + GetLocale_( rLanguageTag ); return *m_pLanguageTag; } const css::i18n::ForbiddenCharacters& GetForbidden( const LanguageType aLang ) { if( !m_pForbidden || aForbiddenLang != aLang ) - _GetForbidden( aLang ); + GetForbidden_( aLang ); return *m_pForbidden; } diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 5c76e0b50b18..6b85dbdf0968 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -145,9 +145,9 @@ SwHash* Find( const OUString& rSrch, SwHash* const * ppTable, void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTableSize ); -// if _CalcOp != 0, this is a valid operator -struct _CalcOp; -_CalcOp* FindOperator( const OUString& rSearch ); +// if CalcOp != 0, this is a valid operator +struct CalcOp; +CalcOp* FindOperator( const OUString& rSearch ); class SwCalc { diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index f00f80bed351..4e7b591de4f2 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -66,13 +66,13 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&, void* pPara = nullptr ) const; void BoxNmsToRelNm( const SwTable&, OUString&, OUString&, OUString* = nullptr, void* pPara = nullptr ) const; - void _MakeFormula( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void MakeFormula_( const SwTable&, OUString&, OUString&, OUString* = nullptr, void* pPara = nullptr ) const; - void _GetFormulaBoxes( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void GetFormulaBoxes( const SwTable&, OUString&, OUString&, OUString* = nullptr, void* pPara = nullptr ) const; - void _HasValidBoxes( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void HasValidBoxes_( const SwTable&, OUString&, OUString&, OUString* = nullptr, void* pPara = nullptr ) const; - void _SplitMergeBoxNm( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void SplitMergeBoxNm_( const SwTable&, OUString&, OUString&, OUString* = nullptr, void* pPara = nullptr ) const; static void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd, @@ -99,7 +99,7 @@ protected: OUString MakeFormula( SwTableCalcPara& rCalcPara ) const { - return ScanString( &SwTableFormula::_MakeFormula, + return ScanString( &SwTableFormula::MakeFormula_, *rCalcPara.pTable, &rCalcPara ); } diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 2a1af0a0d57f..89c90a965cfd 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -236,7 +236,7 @@ private: SAL_DLLPRIVATE void MoveCursorToNum(); - SAL_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing ); + SAL_DLLPRIVATE void ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing ); /** Mark a certain list level of a certain list @@ -263,7 +263,7 @@ private: typedef bool (SwCursor:: *FNCursor)(); SAL_DLLPRIVATE bool CallCursorFN( FNCursor ); - SAL_DLLPRIVATE const SwRangeRedline* _GotoRedline( sal_uInt16 nArrPos, bool bSelect ); + SAL_DLLPRIVATE const SwRangeRedline* GotoRedline_( sal_uInt16 nArrPos, bool bSelect ); protected: @@ -284,7 +284,7 @@ protected: }; int CompareCursor( CursorCompareType eType ) const; - bool _SelTableRowOrCol( bool bRow, bool bRowSimple = false ); + bool SelTableRowOrCol( bool bRow, bool bRowSimple = false ); bool SetInFrontOfLabel( bool bNew ); @@ -329,8 +329,8 @@ public: SwPaM* GetCursor( bool bMakeTableCursor = true ) const; inline SwCursor* GetSwCursor() const; // return only the current cursor - SwShellCursor* _GetCursor() { return m_pCurrentCursor; } - const SwShellCursor* _GetCursor() const { return m_pCurrentCursor; } + SwShellCursor* GetCursor_() { return m_pCurrentCursor; } + const SwShellCursor* GetCursor_() const { return m_pCurrentCursor; } // show passed cursor - for UNO void SetSelection(const SwPaM& rCursor); @@ -591,8 +591,8 @@ public: bool GotoTable( const OUString& rName ); // select a table row, column or box (based on the current cursor) - bool SelTableRow() { return _SelTableRowOrCol( true ); } - bool SelTableCol() { return _SelTableRowOrCol( false ); } + bool SelTableRow() { return SelTableRowOrCol( true ); } + bool SelTableCol() { return SelTableRowOrCol( false ); } bool SelTableBox(); bool SelTable(); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index e50f999db180..7e6a79c3c34c 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -95,7 +95,7 @@ class SwContact : public SdrObjUserCall, public SwClient input parameter, which will be changed - drawing object, which will change its layer. */ - void _MoveObjToLayer( const bool _bToVisible, + void MoveObjToLayer( const bool _bToVisible, SdrObject* _pDrawObj ); protected: @@ -122,7 +122,7 @@ public: /** method to move drawing object to corresponding visible layer - uses method <_MoveObjToLayer(..)> + uses method <MoveObjToLayer(..)> @author OD @@ -133,7 +133,7 @@ public: /** method to move drawing object to corresponding invisible layer - uses method <_MoveObjToLayer(..)> + uses method <MoveObjToLayer(..)> @author OD @@ -334,7 +334,7 @@ class SwDrawContact : public SwContact bool mbDisconnectInProgress : 1; /** Needed data for handling of nested <SdrObjUserCall> events in - method <_Changed(..)> */ + method <Changed_(..)> */ bool mbUserCallActive : 1; /** event type, which is handled for <mpSdrObjHandledByCurrentUserCall>. Note: value only valid, if <mbUserCallActive> is true. */ @@ -375,7 +375,7 @@ class SwDrawContact : public SwContact static void DestroyVirtObj( SwDrawVirtObj* pVirtObj ); void RemoveAllVirtObjs(); - void _InvalidateObjs( const bool _bUpdateSortedObjsList = false ); + void InvalidateObjs_( const bool _bUpdateSortedObjsList = false ); SwDrawContact( const SwDrawContact& ) = delete; SwDrawContact& operator=( const SwDrawContact& ) = delete; @@ -443,7 +443,7 @@ class SwDrawContact : public SwContact /** Used by Changed() and by UndoDraw. Notifies paragraphs that have to get out of the way. */ - void _Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle* pOldBoundRect); + void Changed_(const SdrObject& rObj, SdrUserCallType eType, const Rectangle* pOldBoundRect); /// Moves all SW-connections to new Master) void ChangeMasterObject( SdrObject *pNewMaster ); diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 953f0ee6af06..7f26d2dd836c 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType bool bCRLFFlag : 1; bool bDeleted : 1; - SAL_DLLPRIVATE void _RefCntChgd(); + SAL_DLLPRIVATE void RefCntChgd(); public: SwDDEFieldType( const OUString& rName, const OUString& rCmd, @@ -74,8 +74,8 @@ public: SwDoc* GetDoc() { return pDoc; } void SetDoc( SwDoc* pDoc ); - void IncRefCnt() { if( !nRefCnt++ && pDoc ) _RefCntChgd(); } - void DecRefCnt() { if( !--nRefCnt && pDoc ) _RefCntChgd(); } + void IncRefCnt() { if( !nRefCnt++ && pDoc ) RefCntChgd(); } + void DecRefCnt() { if( !--nRefCnt && pDoc ) RefCntChgd(); } void SetCRLFDelFlag( bool bFlag = true ) { bCRLFFlag = bFlag; } }; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 7b64365e679c..4d84134ed084 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -144,7 +144,7 @@ class SwTextFormatColls; class SwURLStateChanged; class SwUnoCursor; class SwViewShell; -class _SetGetExpField; +class SetGetExpField; class SwDrawContact; class SwLayouter; class SdrView; @@ -188,7 +188,7 @@ class IDocumentState; class IDocumentLayoutAccess; class IDocumentStylePoolAccess; class IDocumentExternalData; -class _SetGetExpFields; +class SetGetExpFields; namespace sw { namespace mark { class MarkManager; @@ -247,8 +247,8 @@ class SW_DLLPUBLIC SwDoc : { friend class ::sw::DocumentContentOperationsManager; - friend void _InitCore(); - friend void _FinitCore(); + friend void InitCore(); + friend void FinitCore(); // private Member std::unique_ptr<SwNodes> m_pNodes; //< document content (Nodes Array) @@ -388,7 +388,7 @@ private: static SwAutoCompleteWord *mpACmpltWords; //< List of all words for AutoComplete // private methods - SwFlyFrameFormat* _MakeFlySection( const SwPosition& rAnchPos, + SwFlyFrameFormat* MakeFlySection_( const SwPosition& rAnchPos, const SwContentNode& rNode, RndStdIds eRequestId, const SfxItemSet* pFlyAttrSet, SwFrameFormat* = nullptr ); @@ -417,9 +417,9 @@ private: const OUString& rFormula, std::vector<OUString>& rUsedDBNames ); - void _CreateNumberFormatter(); + void CreateNumberFormatter(); - bool _UnProtectTableCells( SwTable& rTable ); + bool UnProtectTableCells( SwTable& rTable ); /** Create sub-documents according to the given collection. If no collection is given, take chapter style of the 1st level. */ @@ -427,9 +427,9 @@ private: const SwTextFormatColl* pSplitColl, int nOutlineLevel = 0 ); // Update charts of given table. - void _UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const; + void UpdateCharts_( const SwTable& rTable, SwViewShell const & rVSh ) const; - static bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, + static bool SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, sal_uInt16 nMode ); // CharTimer calls this method. @@ -437,11 +437,11 @@ private: DECL_LINK_TYPED( DoUpdateModifiedOLE, Idle *, void ); public: - SwFormat *_MakeCharFormat(const OUString &, SwFormat *, bool, bool ); - SwFormat *_MakeFrameFormat(const OUString &, SwFormat *, bool, bool ); + SwFormat *MakeCharFormat_(const OUString &, SwFormat *, bool, bool ); + SwFormat *MakeFrameFormat_(const OUString &, SwFormat *, bool, bool ); private: - SwFormat *_MakeTextFormatColl(const OUString &, SwFormat *, bool, bool ); + SwFormat *MakeTextFormatColl_(const OUString &, SwFormat *, bool, bool ); private: bool mbReadOnly; @@ -1666,7 +1666,7 @@ inline const SwTableNode* SwDoc::IsIdxInTable( const SwNodeIndex& rIdx ) const inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) { if( bCreate && !mpNumberFormatter ) - _CreateNumberFormatter(); + CreateNumberFormatter(); return mpNumberFormatter; } @@ -1682,7 +1682,7 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet ) mbAllOLENotify = false; } -bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFields * pSrtLst ); +bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, SetGetExpFields * pSrtLst ); #endif //_DOC_HXX diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 3a73b9ed7886..0b564e02004c 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -249,7 +249,7 @@ public: virtual void LoadStyles( SfxObjectShell& rSource ) override; - void _LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocument ); + void LoadStyles_( SfxObjectShell& rSource, bool bPreserveCurrentDocument ); /// Show page style format dialog /// @param nSlot diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 32eb94b39139..4a0b91bd5224 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -27,7 +27,7 @@ #include "fldbas.hxx" #include "numrule.hxx" -class _SetGetExpFields; +class SetGetExpFields; class SwTextField; class SwFrame; class OutlinerParaObject; @@ -596,14 +596,14 @@ class SwRefPageGetFieldType : public SwFieldType SwDoc* pDoc; sal_Int16 nNumberingType; - void UpdateField( SwTextField* pTextField, _SetGetExpFields& rSetList ); + void UpdateField( SwTextField* pTextField, SetGetExpFields& rSetList ); protected: /// overwritten to update all RefPageGet fields virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) override; public: SwRefPageGetFieldType( SwDoc* pDoc ); virtual SwFieldType* Copy() const override; - bool MakeSetList( _SetGetExpFields& rTmpLst ); + bool MakeSetList( SetGetExpFields& rTmpLst ); SwDoc* GetDoc() const { return pDoc; } }; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index cf86fa05669b..ccc323105681 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -147,18 +147,18 @@ class SW_DLLPUBLIC SwEditShell : public SwCursorShell /// For the private methods DelRange and those of AutoCorrect. friend class SwAutoFormat; - friend void _InitCore(); - friend void _FinitCore(); + friend void InitCore(); + friend void FinitCore(); /// For the PamCorrAbs/-Rel methods. friend class SwUndo; /** Returns pointer to a SwGrfNode that will be used by GetGraphic() and GetGraphicSize(). */ - SAL_DLLPRIVATE SwGrfNode *_GetGrfNode() const ; + SAL_DLLPRIVATE SwGrfNode *GetGrfNode_() const ; SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, bool* pUndo = nullptr ); - SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFormat& rSectFormat, const SfxItemSet& rSet ); + SAL_DLLPRIVATE void SetSectionAttr_( SwSectionFormat& rSectFormat, const SfxItemSet& rSet ); using SwViewShell::UpdateFields; using SwModify::GetInfo; @@ -206,7 +206,7 @@ public: If table is copied into table, move all cursors away from it. Copy and Paste must be in FEShell because of FlyFrames! Copy all selections to the document. */ - bool _CopySelToDoc( SwDoc* pInsDoc ); + bool CopySelToDoc( SwDoc* pInsDoc ); long SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true ); bool AppendTextNode(); diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 99c9c6e612a3..8e84d2814fb3 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -32,7 +32,7 @@ struct SwPosition; class SwTextField; class SwDoc; class SwFormatField; -class _SetGetExpFields; +class SetGetExpFields; class SwEditShell; /// Forward declaration: get "BodyTextNode" for exp.fld in Fly's headers/footers/footnotes. @@ -41,32 +41,32 @@ const SwTextNode* GetBodyTextNode( const SwDoc& pDoc, SwPosition& rPos, OUString ReplacePoint(const OUString& sTmpName, bool bWithCommandType = false); -struct _SeqFieldLstElem +struct SeqFieldLstElem { OUString sDlgEntry; sal_uInt16 nSeqNo; - _SeqFieldLstElem( const OUString& rStr, sal_uInt16 nNo ) + SeqFieldLstElem( const OUString& rStr, sal_uInt16 nNo ) : sDlgEntry( rStr ), nSeqNo( nNo ) {} }; class SW_DLLPUBLIC SwSeqFieldList { - std::vector<_SeqFieldLstElem*> maData; + std::vector<SeqFieldLstElem*> maData; public: ~SwSeqFieldList() { - for( std::vector<_SeqFieldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it ) + for( std::vector<SeqFieldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it ) delete *it; } - bool InsertSort(_SeqFieldLstElem* pNew); - bool SeekEntry(const _SeqFieldLstElem& rNew, size_t* pPos) const; + bool InsertSort(SeqFieldLstElem* pNew); + bool SeekEntry(const SeqFieldLstElem& rNew, size_t* pPos) const; size_t Count() { return maData.size(); } - _SeqFieldLstElem* operator[](size_t nIndex) { return maData[nIndex]; } - const _SeqFieldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; } + SeqFieldLstElem* operator[](size_t nIndex) { return maData[nIndex]; } + const SeqFieldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; } void Clear() { maData.clear(); } }; @@ -373,7 +373,7 @@ public: private: SwEditShell* pSh; - _SetGetExpFields* pSrtLst; + SetGetExpFields* pSrtLst; std::set<const SwTextField*> aTmpLst; }; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 8e73562cebd7..52e77192384e 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -223,11 +223,11 @@ private: SAL_DLLPRIVATE const SwFrame *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const; // 0 == not in any column. - SAL_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrame *pFrame, + SAL_DLLPRIVATE sal_uInt16 GetCurColNum_( const SwFrame *pFrame, SwGetCurColNumPara* pPara ) const; - SAL_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrame *pBox ) const; - SAL_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrame *pBox ) const; + SAL_DLLPRIVATE void GetTabCols_( SwTabCols &rToFill, const SwFrame *pBox ) const; + SAL_DLLPRIVATE void GetTabRows_( SwTabCols &rToFill, const SwFrame *pBox ) const; SAL_DLLPRIVATE bool ImpEndCreate(); @@ -240,7 +240,7 @@ private: /// Get list of marked SdrObjects; /// helper method for GetSelFrameType, IsSelContainsControl. - SAL_DLLPRIVATE const SdrMarkList* _GetMarkList() const; + SAL_DLLPRIVATE const SdrMarkList* GetMarkList_() const; SAL_DLLPRIVATE bool CheckHeadline( bool bRepeat ) const; @@ -508,7 +508,7 @@ public: size_t IsObjSelected() const; ///< @return object count, but doesn't count the objects in groups. bool IsObjSelected( const SdrObject& rObj ) const; bool IsObjSameLevelWithMarked(const SdrObject* pObj) const; - const SdrMarkList* GetMarkList() const{ return _GetMarkList(); }; + const SdrMarkList* GetMarkList() const{ return GetMarkList_(); }; void EndTextEdit(); ///< Deletes object if required. diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 2023f8c691ee..45b5e05d03e4 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -236,10 +236,10 @@ class SW_DLLPUBLIC SwFieldType : public SwModify sal_uInt16 m_nWhich; - friend void _FinitUI(); ///< In order to delete pointer! + friend void FinitUI(); ///< In order to delete pointer! static std::vector<OUString>* s_pFieldNames; - static void _GetFieldName(); ///< Sets up FieldNames; fldmgr.cxx! + static void GetFieldName_(); ///< Sets up FieldNames; fldmgr.cxx! protected: /// Single argument ctors shall be explicit. diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index ab3532b901ed..2b7fb7f484b9 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -151,7 +151,7 @@ public: void SetOrtho( bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct ); /// For the reader - void _SetOrtho( bool bNew ) { m_bOrtho = bNew; } + void SetOrtho_( bool bNew ) { m_bOrtho = bNew; } /** Calculates current width of column nCol. The ratio of desired width of this column to return value is diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 1db9bbb6f749..65d658889fac 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwFormatField , public SwModify , public SfxBroadcaster { - friend void _InitCore(); + friend void InitCore(); SwFormatField( sal_uInt16 nWhich ); // for default-Attibute css::uno::WeakReference<css::text::XTextField> m_wXTextField; diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 1bc85cb52a16..fa444f9b3dcb 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -244,7 +244,7 @@ class SwHTMLTableLayout void ClearPass1Info() { m_nMin = m_nMax = 0; } - void _Resize( sal_uInt16 nAbsAvail, bool bRecalc=false ); + void Resize_( sal_uInt16 nAbsAvail, bool bRecalc=false ); DECL_LINK_TYPED( DelayedResize_Impl, Timer*, void ); diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx index 8730c9de1716..dcbbe5cffd9c 100644 --- a/sw/inc/init.hxx +++ b/sw/inc/init.hxx @@ -26,8 +26,8 @@ class SwViewShell; -void _InitCore(); // bastyp/init.cxx -void _FinitCore(); +void InitCore(); // bastyp/init.cxx +void FinitCore(); namespace sw { @@ -53,13 +53,13 @@ private: } // layout/newfrm.cxx -void _FrameInit(); -void _FrameFinit(); +void FrameInit(); +void FrameFinit(); void SetShell( SwViewShell *pSh ); // text/txtfrm.cxx -void _TextInit(); -void _TextFinit(); +void TextInit_(); +void TextFinit(); #endif diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index f2b2d12ccdd4..39078e7f627f 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -122,9 +122,9 @@ class SW_DLLPUBLIC SwNodes void UpdateOutlineIdx( const SwNode& ); ///< Update all OutlineNodes starting from Node. - void _CopyNodes( const SwNodeRange&, const SwNodeIndex&, + void CopyNodes( const SwNodeRange&, const SwNodeIndex&, bool bNewFrames = true, bool bTableInsDummyNode = false ) const; - void _DelDummyNodes( const SwNodeRange& rRg ); + void DelDummyNodes( const SwNodeRange& rRg ); SwNodes(SwNodes const&) = delete; SwNodes& operator=(SwNodes const&) = delete; @@ -170,13 +170,13 @@ public: static sal_uInt16 GetSectionLevel(const SwNodeIndex &rIndex); void Delete(const SwNodeIndex &rPos, sal_uLong nNodes = 1); - bool _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, + bool MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, bool bNewFrames = true ); void MoveRange( SwPaM&, SwPosition&, SwNodes& rNodes ); - void _Copy( const SwNodeRange& rRg, const SwNodeIndex& rInsPos, + void Copy_( const SwNodeRange& rRg, const SwNodeIndex& rInsPos, bool bNewFrames = true ) const - { _CopyNodes( rRg, rInsPos, bNewFrames ); } + { CopyNodes( rRg, rInsPos, bNewFrames ); } void SectionUp( SwNodeRange *); void SectionDown( SwNodeRange *pRange, SwStartNodeType = SwNormalStartNode ); diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 776cdf7aedcf..8034c09bb674 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -93,7 +93,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode new created stream of the embedded graphic, which has to be destroyed after its usage. Could be NULL, if the stream isn't found. */ - SvStream* _GetStreamForEmbedGrf( + SvStream* GetStreamForEmbedGrf( const css::uno::Reference< css::embed::XStorage >& _refPics, const OUString& rStreamName ) const; @@ -108,7 +108,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode @return XStorage reference to substorage or the root storage */ - css::uno::Reference< css::embed::XStorage > _GetDocSubstorageOrRoot( + css::uno::Reference< css::embed::XStorage > GetDocSubstorageOrRoot( const OUString& aStgName ) const; /// allow reaction on change of content of GraphicObject, so always call diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 97cdfb53d2a0..7affc6eb1412 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -68,7 +68,7 @@ public: void SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic = false ); const tools::PolyPolygon *HasContour() const; - bool _HasContour() const { return pContour!=nullptr; }; + bool HasContour_() const { return pContour!=nullptr; }; void GetContour( tools::PolyPolygon &rPoly ) const; void CreateContour(); diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 94c8003b87b6..14d189e39d42 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -123,7 +123,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable /// Copies the attributes at nStart to pDest. SAL_DLLPRIVATE void CopyAttr( SwTextNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos); - SAL_DLLPRIVATE SwTextNode* _MakeNewTextNode( const SwNodeIndex&, bool bNext = true, + SAL_DLLPRIVATE SwTextNode* MakeNewTextNode( const SwNodeIndex&, bool bNext = true, bool bChgFollow = true ); SAL_DLLPRIVATE void CutImpl( @@ -150,7 +150,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable SAL_DLLPRIVATE void CalcHiddenCharFlags() const; - SAL_DLLPRIVATE SwNumRule * _GetNumRule(bool bInParent = true) const; + SAL_DLLPRIVATE SwNumRule * GetNumRule_(bool bInParent = true) const; SAL_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM, LanguageType nLang, sal_uInt16 nLangWhichId, @@ -410,7 +410,7 @@ public: inline SwTextFormatColl *GetTextColl() const; virtual SwFormatColl *ChgFormatColl( SwFormatColl* ) override; - void _ChgTextCollUpdateNum( const SwTextFormatColl* pOld, + void ChgTextCollUpdateNum( const SwTextFormatColl* pOld, const SwTextFormatColl* pNew ); /** Copy collection with all auto formats to dest-node. diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 1d7f8b7d1e60..c9c012ab3104 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -108,7 +108,7 @@ public: }; private: - friend void _FinitCore(); + friend void FinitCore(); static SwNumFormat* maBaseFormats [ RULE_END ][ MAXLEVEL ]; static const sal_uInt16 maDefNumIndents[ MAXLEVEL ]; diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index 30601771276b..46ca66d1759f 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -106,25 +106,25 @@ private: @author OD */ - void _Clear(); + void Clear_(); /** helper method to clear preview page layout sizes @author OD */ - void _ClearPreviewLayoutSizes(); + void ClearPreviewLayoutSizes(); /** helper method to clear data in preview page vectors @author OD */ - void _ClearPreviewPageData(); + void ClearPreviewPageData(); /** calculate page preview layout sizes @author OD */ - void _CalcPreviewLayoutSizes(); + void CalcPreviewLayoutSizes(); /** apply new zoom at given view shell @@ -133,7 +133,7 @@ private: @param _aNewZoom input parameter - new zoom percentage */ - void _ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ); + void ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ); /** calculate additional paint offset @@ -149,7 +149,7 @@ private: @author OD */ - void _CalcAdditionalPaintOffset(); + void CalcAdditionalPaintOffset(); /** calculate painted preview document rectangle @@ -159,11 +159,11 @@ private: preconditions: (1) paint offset of document preview is calculated. (2) size of document preview is calculated. - (3) additional paint offset is calculated - see <_CalcAdditionalPaintOffset>. + (3) additional paint offset is calculated - see <CalcAdditionalPaintOffset>. @author OD */ - void _CalcDocPreviewPaintRect(); + void CalcDocPreviewPaintRect(); /** determines preview data for a given page and a given preview offset @@ -183,7 +183,7 @@ private: @return boolean, indicating, if calculation was successful. */ - bool _CalcPreviewDataForPage( const SwPageFrame& _rPage, + bool CalcPreviewDataForPage( const SwPageFrame& _rPage, const Point& _rPreviewOffset, PreviewPage* _opPreviewPage ); @@ -196,7 +196,7 @@ private: @author OD */ - void _CalcPreviewPages(); + void CalcPreviewPages(); /** get preview page by physical page number @@ -209,13 +209,13 @@ private: @return pointer to preview page of current preview pages. If page doesn't belongs to current preview pages, <0> is returned. */ - const PreviewPage* _GetPreviewPageByPageNum( const sal_uInt16 _nPageNum ) const; + const PreviewPage* GetPreviewPageByPageNum( const sal_uInt16 _nPageNum ) const; /** paint selection mark at page @author OD */ - void _PaintSelectMarkAtPage(vcl::RenderContext& rRenderContext, const PreviewPage* _aSelectedPreviewPage) const; + void PaintSelectMarkAtPage(vcl::RenderContext& rRenderContext, const PreviewPage* _aSelectedPreviewPage) const; public: /** constructor of <SwPagePreviewLayout> @@ -244,7 +244,7 @@ public: */ inline ~SwPagePreviewLayout() { - _ClearPreviewPageData(); + ClearPreviewPageData(); } /** init page preview layout diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 4e1d9f76d5ee..2b23457eb442 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -214,7 +214,7 @@ public: sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen, SwNode* pNode, SwPaM* pPam); inline bool IsInFrontOfLabel() const { return m_bIsInFrontOfLabel; } - inline void _SetInFrontOfLabel( bool bNew ) { m_bIsInFrontOfLabel = bNew; } + inline void SetInFrontOfLabel_( bool bNew ) { m_bIsInFrontOfLabel = bNew; } /// Unless this is called, the getter method of Mark will return Point. virtual void SetMark(); diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index f51bf9fa4edb..4f401fb9c7ed 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -32,7 +32,7 @@ class SwDoc; class SwDocShell; -class _SetGetExpFields; +class SetGetExpFields; class SwViewOption; class OutputDevice; class SwViewOptionAdjust_Impl; @@ -242,8 +242,8 @@ class SwRenderData public: // PostIt relevant data - /// an array of "_SetGetExpField *" sorted by page and line numbers - std::unique_ptr<_SetGetExpFields> m_pPostItFields; + /// an array of "SetGetExpField *" sorted by page and line numbers + std::unique_ptr<SetGetExpFields> m_pPostItFields; /// this contains a SwDoc with the post-it content std::unique_ptr<SwViewShell> m_pPostItShell; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index d3b7f200733b..4f8ba19b6830 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -358,8 +358,8 @@ class SW_DLLPUBLIC Writer SwAsciiOptions aAscOpts; OUString sBaseURL; - void _AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ); - void _AddFontItems( SfxItemPool& rPool, sal_uInt16 nWhichId ); + void AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ); + void AddFontItems_( SfxItemPool& rPool, sal_uInt16 nWhichId ); ::std::unique_ptr<Writer_Impl> m_pImpl; diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 15661f64931c..80b9c61cdf14 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -83,7 +83,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource ~ShellResource(); private: - void _GetAutoFormatNameLst() const; + void GetAutoFormatNameLst_() const; mutable std::vector<OUString> *pAutoFormatNameLst; OUString sPageDescFirstName; OUString sPageDescFollowName; @@ -93,7 +93,7 @@ private: inline const std::vector<OUString>& ShellResource::GetAutoFormatNameLst() const { if( !pAutoFormatNameLst ) - _GetAutoFormatNameLst(); + GetAutoFormatNameLst_(); return *pAutoFormatNameLst; } diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 5d6763ed98b0..af96f2d2ba8b 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -145,8 +145,8 @@ private: void createAndAddSecondaryPools(); void removeAndDeleteSecondaryPools(); - friend void _InitCore(); // For creating/deleting of version maps. - friend void _FinitCore(); + friend void InitCore(); // For creating/deleting of version maps. + friend void FinitCore(); static sal_uInt16* pVersionMap1; static sal_uInt16* pVersionMap2; static sal_uInt16* pVersionMap3; diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 742821dbdd4a..a7d07829dc62 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -25,7 +25,7 @@ #include <tblsel.hxx> #include <cshtyp.hxx> -struct _SwCursor_SavePos; +struct SwCursor_SavePos; namespace com { namespace sun { namespace star { namespace util { struct SearchOptions2; @@ -69,7 +69,7 @@ class SW_DLLPUBLIC SwCursor : public SwPaM { friend class SwCursorSaveState; - _SwCursor_SavePos* m_pSavePos; + SwCursor_SavePos* m_pSavePos; long m_nRowSpanOffset; // required for travelling in tabs with rowspans sal_uInt8 m_nCursorBidiLevel; // bidi level of the cursor bool m_bColumnSelection; // true: cursor is aprt of a column selection @@ -81,11 +81,11 @@ class SW_DLLPUBLIC SwCursor : public SwPaM SwCursor(SwCursor const& rPaM) = delete; protected: - _SwCursor_SavePos* CreateNewSavePos() const; + SwCursor_SavePos* CreateNewSavePos() const; void SaveState(); void RestoreState(); - const _SwCursor_SavePos* GetSavePos() const { return m_pSavePos; } + const SwCursor_SavePos* GetSavePos() const { return m_pSavePos; } virtual const SwContentFrame* DoSetBidiLevelLeftRight( bool & io_rbLeft, bool bVisualAllowed, bool bInsertCursor); @@ -240,20 +240,20 @@ public: }; // internal, used by SwCursor::SaveState() etc. -struct _SwCursor_SavePos +struct SwCursor_SavePos { sal_uLong nNode; sal_Int32 nContent; - _SwCursor_SavePos* pNext; + SwCursor_SavePos* pNext; - _SwCursor_SavePos( const SwCursor& rCursor ) + SwCursor_SavePos( const SwCursor& rCursor ) : nNode( rCursor.GetPoint()->nNode.GetIndex() ), nContent( rCursor.GetPoint()->nContent.GetIndex() ), pNext( nullptr ) {} - virtual ~_SwCursor_SavePos() {} + virtual ~SwCursor_SavePos() {} - DECL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos ) + DECL_FIXEDMEMPOOL_NEWDEL( SwCursor_SavePos ) }; class SwTableCursor : public virtual SwCursor diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index c2f245df71fa..99b6bfd4fd06 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -76,7 +76,7 @@ public: SwRect &Intersection( const SwRect& rRect ); // Same as Intersection, only assume that Rects are overlapping! - SwRect &_Intersection( const SwRect &rRect ); + SwRect &Intersection_( const SwRect &rRect ); bool IsInside( const Point& rPOINT ) const; bool IsNear(const Point& rPoint, long nTolerance ) const; @@ -101,18 +101,18 @@ public: friend SvStream& WriteSwRect( SvStream &rStream, const SwRect &rRect ); - void _Top( const long nTop ); - void _Bottom( const long nBottom ); - void _Left( const long nLeft ); - void _Right( const long nRight ); - void _Width( const long nNew ); - void _Height( const long nNew ); - long _Top() const; - long _Bottom() const; - long _Left() const; - long _Right() const; - long _Width() const; - long _Height() const; + void Top_( const long nTop ); + void Bottom_( const long nBottom ); + void Left_( const long nLeft ); + void Rigth_( const long nRight ); + void Width_( const long nNew ); + void Height_( const long nNew ); + long Top_() const; + long Bottom_() const; + long Left_() const; + long Rigth_() const; + long Width_() const; + long Height_() const; void SubTop( const long nSub ); void AddBottom( const long nAdd ); void SubLeft( const long nSub ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 143086233ffe..37d488cc5b55 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -154,9 +154,9 @@ private: bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool ); SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const; void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt ); - bool _InsertRow( SwDoc*, const SwSelBoxes&, sal_uInt16 nCnt, bool bBehind ); + bool InsertRow_( SwDoc*, const SwSelBoxes&, sal_uInt16 nCnt, bool bBehind ); bool NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool ); - void _FindSuperfluousRows( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* ); + void FindSuperfluousRows_( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* ); void AdjustWidths( const long nOld, const long nNew ); void NewSetTabCols( Parm &rP, const SwTabCols &rNew, const SwTabCols &rOld, const SwTableBox *pStart, bool bCurRowOnly ); @@ -183,7 +183,7 @@ public: void SetTableStyleName(const OUString& rName) { maTableStyleName = rName; } sal_uInt16 GetRowsToRepeat() const { return std::min( (sal_uInt16)GetTabLines().size(), m_nRowsToRepeat ); } - sal_uInt16 _GetRowsToRepeat() const { return m_nRowsToRepeat; } + sal_uInt16 GetRowsToRepeat_() const { return m_nRowsToRepeat; } void SetRowsToRepeat( sal_uInt16 nNumOfRows ) { m_nRowsToRepeat = nNumOfRows; } bool IsHeadline( const SwTableLine& rLine ) const; @@ -252,7 +252,7 @@ public: bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) - { _FindSuperfluousRows( rBoxes, nullptr, nullptr ); } + { FindSuperfluousRows_( rBoxes, nullptr, nullptr ); } void CheckRowSpan( SwTableLine* &rpLine, bool bUp ) const; SwTableSortBoxes& GetTabSortBoxes() { return m_TabSortContentBoxes; } @@ -262,7 +262,7 @@ public: // #i80314# // add 3rd parameter in order to control validation check on <rStr> - static sal_uInt16 _GetBoxNum( OUString& rStr, + static sal_uInt16 GetBoxNum( OUString& rStr, bool bFirst = false, const bool bPerformValidCheck = false ); @@ -270,7 +270,7 @@ public: // #i80314# // add 2nd parameter in order to control validation check in called method - // <_GetBoxNum(..)> + // <GetBoxNum(..)> const SwTableBox* GetTableBox( const OUString& rName, const bool bPerformValidCheck = false ) const; // Copy selected boxes to another document. diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 016fdfc041ab..f98067a19a30 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -227,7 +227,7 @@ properties are stored per-table, and are lossless. */ class SW_DLLPUBLIC SwTableAutoFormat { - friend void _FinitCore(); // To destroy default pointer. + friend void FinitCore(); // To destroy default pointer. static SwBoxAutoFormat* pDfltBoxAutoFormat; OUString m_aName; diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 17ef7f42d79a..4e50bb39e674 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -149,34 +149,34 @@ void MakeSelUnions( SwSelUnions&, const SwLayoutFrame *pStart, // These classes copy the current table selections (rBoxes) into a // separate structure while keeping the table structure. -class _FndBox; -class _FndLine; +class FndBox_; +class FndLine_; -typedef std::vector<std::unique_ptr<_FndBox>> FndBoxes_t; -typedef std::vector<std::unique_ptr<_FndLine>> FndLines_t; +typedef std::vector<std::unique_ptr<FndBox_>> FndBoxes_t; +typedef std::vector<std::unique_ptr<FndLine_>> FndLines_t; -class _FndBox +class FndBox_ { SwTableBox* pBox; FndLines_t m_Lines; - _FndLine* pUpper; + FndLine_* pUpper; SwTableLine *pLineBefore; // For deleting/restoring the layout. SwTableLine *pLineBehind; - _FndBox(_FndBox const&) = delete; - _FndBox& operator=(_FndBox const&) = delete; + FndBox_(FndBox_ const&) = delete; + FndBox_& operator=(FndBox_ const&) = delete; public: - _FndBox( SwTableBox* pB, _FndLine* pFL ) : + FndBox_( SwTableBox* pB, FndLine_* pFL ) : pBox(pB), pUpper(pFL), pLineBefore( nullptr ), pLineBehind( nullptr ) {} const FndLines_t& GetLines() const { return m_Lines; } FndLines_t& GetLines() { return m_Lines; } const SwTableBox* GetBox() const { return pBox; } SwTableBox* GetBox() { return pBox; } - const _FndLine* GetUpper() const { return pUpper; } - _FndLine* GetUpper() { return pUpper; } + const FndLine_* GetUpper() const { return pUpper; } + FndLine_* GetUpper() { return pUpper; } void SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable ); void SetTableLines( const SwTable &rTable ); @@ -190,42 +190,42 @@ public: void ClearLineBehind() { pLineBehind = nullptr; } }; -class _FndLine +class FndLine_ { SwTableLine* pLine; FndBoxes_t m_Boxes; - _FndBox* pUpper; + FndBox_* pUpper; - _FndLine(_FndLine const&) = delete; - _FndLine& operator=(_FndLine const&) = delete; + FndLine_(FndLine_ const&) = delete; + FndLine_& operator=(FndLine_ const&) = delete; public: - _FndLine(SwTableLine* pL, _FndBox* pFB=nullptr) : pLine(pL), pUpper(pFB) {} + FndLine_(SwTableLine* pL, FndBox_* pFB=nullptr) : pLine(pL), pUpper(pFB) {} const FndBoxes_t& GetBoxes() const { return m_Boxes; } FndBoxes_t& GetBoxes() { return m_Boxes; } const SwTableLine* GetLine() const { return pLine; } SwTableLine* GetLine() { return pLine; } - const _FndBox* GetUpper() const { return pUpper; } - _FndBox* GetUpper() { return pUpper; } + const FndBox_* GetUpper() const { return pUpper; } + FndBox_* GetUpper() { return pUpper; } - void SetUpper( _FndBox* pUp ) { pUpper = pUp; } + void SetUpper( FndBox_* pUp ) { pUpper = pUp; } }; -struct _FndPara +struct FndPara { const SwSelBoxes& rBoxes; - _FndLine* pFndLine; - _FndBox* pFndBox; + FndLine_* pFndLine; + FndBox_* pFndBox; - _FndPara( const SwSelBoxes& rBxs, _FndBox* pFB ) + FndPara( const SwSelBoxes& rBxs, FndBox_* pFB ) : rBoxes(rBxs), pFndLine(nullptr), pFndBox(pFB) {} - _FndPara( const _FndPara& rPara, _FndBox* pFB ) + FndPara( const FndPara& rPara, FndBox_* pFB ) : rBoxes(rPara.rBoxes), pFndLine(rPara.pFndLine), pFndBox(pFB) {} - _FndPara( const _FndPara& rPara, _FndLine* pFL ) + FndPara( const FndPara& rPara, FndLine_* pFL ) : rBoxes(rPara.rBoxes), pFndLine(pFL), pFndBox(rPara.pFndBox) {} }; -SW_DLLPUBLIC void ForEach_FndLineCopyCol(SwTableLines& rLines, _FndPara* pFndPara ); +SW_DLLPUBLIC void ForEach_FndLineCopyCol(SwTableLines& rLines, FndPara* pFndPara ); #endif // INCLUDED_SW_INC_TBLSEL_HXX diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index 012869f533fe..cce179607181 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -29,7 +29,7 @@ class SwFrameFormats; class SwFormatContent; class SwDoc; class Rectangle; -class _ZSortFly; +class ZSortFly; class SwNode; /** @@ -95,7 +95,7 @@ public: /// Reset the shape -> textbox link on the shape, and save it to the map, so it can be restored later. static void resetLink(SwFrameFormat* pShape, std::map<const SwFrameFormat*, SwFormatContent>& rOldContent); /// Undo the effect of saveLinks() + individual resetLink() calls. - static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent); + static void restoreLinks(std::set<ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent); }; #endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index a025b7d699df..e9f0765573e2 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwTOXMark : public SfxPoolItem , public SwModify { - friend void _InitCore(); + friend void InitCore(); friend class SwTextTOXMark; OUString m_aAltText; // Text of caption is different. @@ -76,7 +76,7 @@ class SW_DLLPUBLIC SwTOXMark css::uno::WeakReference<css::text::XDocumentIndexMark> m_wXDocumentIndexMark; - SwTOXMark(); // to create the default attribute in _InitCore + SwTOXMark(); // to create the default attribute in InitCore protected: // SwClient diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx index b4530d630124..e7177fda7d1f 100644 --- a/sw/inc/txtflcnt.hxx +++ b/sw/inc/txtflcnt.hxx @@ -29,7 +29,7 @@ class SwDoc; // Attribute for line-bound frames (without end index). class SwTextFlyCnt : public SwTextAttr { - SwFlyInContentFrame *_GetFlyFrame( const SwFrame *pCurrFrame ); + SwFlyInContentFrame *GetFlyFrame_( const SwFrame *pCurrFrame ); public: SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStart ); @@ -45,12 +45,12 @@ public: inline SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame( const SwFrame *pCurrFrame ) { - return _GetFlyFrame( pCurrFrame ); + return GetFlyFrame_( pCurrFrame ); } inline const SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame( const SwFrame *pCurrFrame ) const { - return (const_cast<SwTextFlyCnt*>(this))->_GetFlyFrame( pCurrFrame ); + return (const_cast<SwTextFlyCnt*>(this))->GetFlyFrame_( pCurrFrame ); } #endif diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index fc79a53ea05e..5acb95c351d7 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -158,20 +158,20 @@ class SwXShape : public SwXShapeBaseClass, @author OD */ - SdrObject* _GetTopGroupObj( SvxShape* _pSvxShape = nullptr ); + SdrObject* GetTopGroupObj( SvxShape* _pSvxShape = nullptr ); /** method to determine position according to the positioning attributes @author OD */ - css::awt::Point _GetAttrPosition(); + css::awt::Point GetAttrPosition(); /** method to convert the position (translation) of the drawing object to the layout direction horizontal left-to-right. @author OD */ - css::awt::Point _ConvertPositionToHoriL2R( + css::awt::Point ConvertPositionToHoriL2R( const css::awt::Point& rObjPos, const css::awt::Size& rObjSize ); @@ -180,7 +180,7 @@ class SwXShape : public SwXShapeBaseClass, @author OD */ - css::drawing::HomogenMatrix3 _ConvertTransformationToLayoutDir( + css::drawing::HomogenMatrix3 ConvertTransformationToLayoutDir( const css::drawing::HomogenMatrix3& rMatrixInHoriL2R ); /** method to adjust the positioning properties @@ -192,14 +192,14 @@ class SwXShape : public SwXShapeBaseClass, has to be given in the layout direction the shape is in and relative to its position alignment areas. */ - void _AdjustPositionProperties(const css::awt::Point& rPosition); + void AdjustPositionProperties(const css::awt::Point& rPosition); /** method to convert start or end position of the drawing object to the Writer specific position, which is the attribute position in layout direction @author OD */ - css::awt::Point _ConvertStartOrEndPosToLayoutDir( + css::awt::Point ConvertStartOrEndPosToLayoutDir( const css::awt::Point& aStartOrEndPos ); /** method to convert PolyPolygonBezier of the drawing object to the @@ -207,7 +207,7 @@ class SwXShape : public SwXShapeBaseClass, @author OD */ - css::drawing::PolyPolygonBezierCoords _ConvertPolyPolygonBezierToLayoutDir( + css::drawing::PolyPolygonBezierCoords ConvertPolyPolygonBezierToLayoutDir( const css::drawing::PolyPolygonBezierCoords& aPath ); /** method to get property from aggregation object diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index ae253f977ac1..5fcf51b90f29 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -292,7 +292,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE long PhyPageUp(); SAL_DLLPRIVATE long PhyPageDown(); - SAL_DLLPRIVATE void _CreateScrollbar( bool bHori ); + SAL_DLLPRIVATE void CreateScrollbar( bool bHori ); DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar*, void ); SAL_DLLPRIVATE bool UpdateScrollbars(); @@ -319,13 +319,13 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // for readonly switching SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - SAL_DLLPRIVATE void _CheckReadonlyState(); - SAL_DLLPRIVATE void _CheckReadonlySelection(); + SAL_DLLPRIVATE void CheckReadonlyState(); + SAL_DLLPRIVATE void CheckReadonlySelection(); // method for rotating PageDesc SAL_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR); - SAL_DLLPRIVATE void _SetZoom( const Size &rEditSz, + SAL_DLLPRIVATE void SetZoom_( const Size &rEditSz, SvxZoomType eZoomType, short nFactor = 100, bool bViewOnly = false); diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 3df2cd89ee93..498e9633e5a6 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -170,7 +170,7 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell> SAL_DLLPRIVATE void PaintDesktop(vcl::RenderContext& rRenderContext, const SwRect&); // Collect values for painting of desktop // and calling. // PaintDesktop split. This pars is also used by PreviewPage. - SAL_DLLPRIVATE void _PaintDesktop(vcl::RenderContext& rRenderContext, const SwRegionRects &rRegion); + SAL_DLLPRIVATE void PaintDesktop_(vcl::RenderContext& rRenderContext, const SwRegionRects &rRegion); SAL_DLLPRIVATE bool CheckInvalidForPaint( const SwRect & ); // Direct Paint or rather // trigger an action. diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 701e9cd486ed..dcf1237e511a 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -34,8 +34,8 @@ class SwTextInputField; class SwVisibleCursor { - friend void _InitCore(); - friend void _FinitCore(); + friend void InitCore(); + friend void FinitCore(); bool m_bIsVisible; bool m_bIsDragCursor; @@ -46,7 +46,7 @@ class SwVisibleCursor /// For LibreOfficeKit only - remember what page we were at the last time. sal_uInt16 m_nPageLastTime; - void _SetPosAndShow(); + void SetPosAndShow(); public: SwVisibleCursor( const SwCursorShell * pCShell ); @@ -66,8 +66,8 @@ namespace sw { namespace overlay { class OverlayRangesOutline; }} class SwSelPaintRects : public SwRects { - friend void _InitCore(); - friend void _FinitCore(); + friend void InitCore(); + friend void FinitCore(); static long s_nPixPtX, s_nPixPtY; static MapMode *s_pMapMode; diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index c36ae2a52c73..7472c05b7bd2 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -310,10 +310,10 @@ void SwNodeNum::HandleNumberTreeRootNodeDelete( SwNodeNum& rNodeNum ) // unregister all number tree node entries, which correspond to a text node, // about the deletion of the number tree root node. - _UnregisterMeAndChildrenDueToRootDelete( *pRootNode ); + UnregisterMeAndChildrenDueToRootDelete( *pRootNode ); } -void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ) +void SwNodeNum::UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ) { const bool bIsPhantom( rNodeNum.IsPhantom() ); tSwNumberTreeChildren::size_type nAllowedChildCount( 0 ); @@ -324,7 +324,7 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ) SwNodeNum* pChildNode( dynamic_cast<SwNodeNum*>((*rNodeNum.mChildren.begin())) ); if ( !pChildNode ) { - OSL_FAIL( "<SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete(..)> - unknown number tree node child" ); + OSL_FAIL( "<SwNodeNum::UnregisterMeAndChildrenDueToRootDelete(..)> - unknown number tree node child" ); ++nAllowedChildCount; continue; } @@ -337,7 +337,7 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ) bDone = true; } - _UnregisterMeAndChildrenDueToRootDelete( *pChildNode ); + UnregisterMeAndChildrenDueToRootDelete( *pChildNode ); } if ( !bIsPhantom ) diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index 6824c4420daf..789d512cf4a3 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -320,12 +320,12 @@ void SwNumberTreeNode::ValidateTree() } } -void SwNumberTreeNode::_GetNumberVector(vector<SwNumberTree::tSwNumTreeNumber> & rVector, +void SwNumberTreeNode::GetNumberVector_(vector<SwNumberTree::tSwNumTreeNumber> & rVector, bool bValidate) const { if (mpParent) { - mpParent->_GetNumberVector(rVector, bValidate); + mpParent->GetNumberVector_(rVector, bValidate); rVector.push_back(GetNumber(bValidate)); } } @@ -704,7 +704,7 @@ vector<SwNumberTree::tSwNumTreeNumber> SwNumberTreeNode::GetNumberVector() const { vector<SwNumberTree::tSwNumTreeNumber> aResult; - _GetNumberVector(aResult); + GetNumberVector_(aResult); return aResult; } diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 31296fd6ecc9..bf2a6fd3a2ab 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -122,7 +122,7 @@ SwAccessibleCell::SwAccessibleCell( SwAccessibleMap *pInitMap, m_pAccTable = static_cast<SwAccessibleTable *>(xTableReference.get()); } -bool SwAccessibleCell::_InvalidateMyCursorPos() +bool SwAccessibleCell::InvalidateMyCursorPos() { bool bNew = IsSelected(); bool bOld; @@ -151,7 +151,7 @@ bool SwAccessibleCell::_InvalidateMyCursorPos() return bChanged; } -bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrame *pFrame ) +bool SwAccessibleCell::InvalidateChildrenCursorPos( const SwFrame *pFrame ) { bool bChanged = false; @@ -171,7 +171,7 @@ bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrame *pFrame ) { assert(xAccImpl->GetFrame()->IsCellFrame()); bChanged = static_cast< SwAccessibleCell *>( - xAccImpl.get() )->_InvalidateMyCursorPos(); + xAccImpl.get() )->InvalidateMyCursorPos(); } else bChanged = true; // If the context is not know we @@ -181,7 +181,7 @@ bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrame *pFrame ) else { // This is a box with sub rows. - bChanged |= _InvalidateChildrenCursorPos( pLower ); + bChanged |= InvalidateChildrenCursorPos( pLower ); } } ++aIter; @@ -190,7 +190,7 @@ bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrame *pFrame ) return bChanged; } -void SwAccessibleCell::_InvalidateCursorPos() +void SwAccessibleCell::InvalidateCursorPos_() { if (IsSelected()) { @@ -216,7 +216,7 @@ void SwAccessibleCell::_InvalidateCursorPos() while( pTabFrame ) { - _InvalidateChildrenCursorPos( pTabFrame ); + InvalidateChildrenCursorPos( pTabFrame ); pTabFrame = pTabFrame->GetFollow(); } if (m_pAccTable.is()) diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 62585a3faa22..594dc73126d7 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -39,8 +39,8 @@ class SwAccessibleCell : public SwAccessibleContext, bool IsSelected(); - bool _InvalidateMyCursorPos(); - bool _InvalidateChildrenCursorPos( const SwFrame *pFrame ); + bool InvalidateMyCursorPos(); + bool InvalidateChildrenCursorPos( const SwFrame *pFrame ); rtl::Reference<SwAccessibleTable> m_pAccTable; @@ -49,7 +49,7 @@ protected: // This derived class additionally sets SELECTABLE(1) and SELECTED(+) virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override; - virtual void _InvalidateCursorPos() override; + virtual void InvalidateCursorPos_() override; virtual ~SwAccessibleCell(); diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 86d34cdb9347..b74ed7006a6b 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -428,15 +428,15 @@ void SwAccessibleContext::DisposeChildren( const SwFrame *pFrame, } } -void SwAccessibleContext::_InvalidateContent( bool ) +void SwAccessibleContext::InvalidateContent_( bool ) { } -void SwAccessibleContext::_InvalidateCursorPos() +void SwAccessibleContext::InvalidateCursorPos_() { } -void SwAccessibleContext::_InvalidateFocus() +void SwAccessibleContext::InvalidateFocus_() { } @@ -1147,7 +1147,7 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& ) FireVisibleDataEvent(); } - // note: InvalidatePosOrSize must call _InvalidateContent so that + // note: InvalidatePosOrSize must call InvalidateContent_ so that // SwAccessibleParagraph updates its portions, or dispose it // (see accmap.cxx: INVALID_CONTENT is contained in POS_CHANGED) if( !bIsNewShowingState && @@ -1160,7 +1160,7 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& ) } else { - _InvalidateContent( true ); + InvalidateContent_( true ); } } @@ -1260,21 +1260,21 @@ void SwAccessibleContext::InvalidateContent() { SolarMutexGuard aGuard; - _InvalidateContent( false ); + InvalidateContent_( false ); } void SwAccessibleContext::InvalidateCursorPos() { SolarMutexGuard aGuard; - _InvalidateCursorPos(); + InvalidateCursorPos_(); } void SwAccessibleContext::InvalidateFocus() { SolarMutexGuard aGuard; - _InvalidateFocus(); + InvalidateFocus_(); } // #i27301# - use new type definition for <_nStates> diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index cecb010c53f8..3adcbbd05900 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -155,10 +155,10 @@ protected: void ScrolledInShape( const SdrObject *pObj, ::accessibility::AccessibleShape *pAccImpl ); - virtual void _InvalidateContent( bool bVisibleDataFired ); + virtual void InvalidateContent_( bool bVisibleDataFired ); - virtual void _InvalidateCursorPos(); - virtual void _InvalidateFocus(); + virtual void InvalidateCursorPos_(); + virtual void InvalidateFocus_(); public: void SetMap(SwAccessibleMap *const pMap) { m_pMap = pMap; } diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 2cb759a11876..bed5158177c9 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -666,7 +666,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() else//graphic, form, shape, etc. { SwPosition* pPoint = pCaret->GetPoint(); - Point aPt = pCursorShell->_GetCursor()->GetPtPos(); + Point aPt = pCursorShell->GetCursor_()->GetPtPos(); if( pCursorShell->GetLayout()->GetCursorOfst( pPoint, aPt/*,* &eTmpState*/ ) ) { const sal_Int32 nActPos = pPoint->nContent.GetIndex(); @@ -861,7 +861,7 @@ css::uno::Sequence< css::uno::Any > SwCursorShell* pCursorShell = GetCursorShell(); if ( pCursorShell ) { - SwPaM *_pStartCursor = pCursorShell->GetCursor(), *__pStartCursor = _pStartCursor; + SwPaM *_pStartCursor = pCursorShell->GetCursor(), *_pStartCursor2 = _pStartCursor; SwContentNode* pPrevNode = nullptr; std::vector<SwFrame*> vFrameList; do @@ -883,7 +883,7 @@ css::uno::Sequence< css::uno::Any > } } - while( _pStartCursor && ( (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor) ); + while( _pStartCursor && ( (_pStartCursor = _pStartCursor->GetNext()) != _pStartCursor2) ); if ( vFrameList.size() ) { diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index 541ac25caba2..0dd08e34ea56 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -140,7 +140,7 @@ SwAccessibleFrameBase::SwAccessibleFrameBase( bIsSelected = IsSelected(); } -void SwAccessibleFrameBase::_InvalidateCursorPos() +void SwAccessibleFrameBase::InvalidateCursorPos_() { bool bNewSelected = IsSelected(); bool bOldSelected; @@ -184,7 +184,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos() } } -void SwAccessibleFrameBase::_InvalidateFocus() +void SwAccessibleFrameBase::InvalidateFocus_() { vcl::Window *pWin = GetWindow(); if( pWin ) diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx index 45335a43ad31..7d1ac0cf9897 100644 --- a/sw/source/core/access/accframebase.hxx +++ b/sw/source/core/access/accframebase.hxx @@ -41,8 +41,8 @@ protected: bool GetSelectedState( ); SwPaM* GetCursor(); - virtual void _InvalidateCursorPos() override; - virtual void _InvalidateFocus() override; + virtual void InvalidateCursorPos_() override; + virtual void InvalidateFocus_() override; virtual ~SwAccessibleFrameBase(); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index fb8f434808a0..0f1f9d255fdc 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1778,7 +1778,7 @@ SwAccessibleMap::~SwAccessibleMap() delete mpSeletedFrameMap; } -uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView( +uno::Reference< XAccessible > SwAccessibleMap::GetDocumentView_( bool bPagePreview ) { uno::Reference < XAccessible > xAcc; @@ -1843,7 +1843,7 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView( uno::Reference< XAccessible > SwAccessibleMap::GetDocumentView( ) { - return _GetDocumentView( false ); + return GetDocumentView_( false ); } uno::Reference<XAccessible> SwAccessibleMap::GetDocumentPreview( @@ -1857,7 +1857,7 @@ uno::Reference<XAccessible> SwAccessibleMap::GetDocumentPreview( mpPreview = new SwAccPreviewData(); mpPreview->Update( *this, _rPreviewPages, _rScale, _pSelectedPageFrame, _rPreviewWinSize ); - uno::Reference<XAccessible> xAcc = _GetDocumentView( true ); + uno::Reference<XAccessible> xAcc = GetDocumentView_( true ); return xAcc; } @@ -2796,7 +2796,7 @@ void SwAccessibleMap::InvalidateFocus() { if(GetShell()->IsPreview()) { - uno::Reference<XAccessible> xAcc = _GetDocumentView( true ); + uno::Reference<XAccessible> xAcc = GetDocumentView_( true ); if (xAcc.get()) { SwAccessiblePreview *pAccPreview = static_cast<SwAccessiblePreview *>(xAcc.get()); @@ -2860,7 +2860,7 @@ void SwAccessibleMap::InvalidateEditableStates( const SwFrame* _pFrame ) } } -void SwAccessibleMap::_InvalidateRelationSet( const SwFrame* pFrame, +void SwAccessibleMap::InvalidateRelationSet_( const SwFrame* pFrame, bool bFrom ) { // first, see if this frame is accessible, and if so, get the respective @@ -2910,15 +2910,15 @@ void SwAccessibleMap::_InvalidateRelationSet( const SwFrame* pFrame, void SwAccessibleMap::InvalidateRelationSet( const SwFrame* pMaster, const SwFrame* pFollow ) { - _InvalidateRelationSet( pMaster, false ); - _InvalidateRelationSet( pFollow, true ); + InvalidateRelationSet_( pMaster, false ); + InvalidateRelationSet_( pFollow, true ); } // invalidation of CONTENT_FLOW_FROM/_TO relation of a paragraph void SwAccessibleMap::InvalidateParaFlowRelation( const SwTextFrame& _rTextFrame, const bool _bFrom ) { - _InvalidateRelationSet( &_rTextFrame, _bFrom ); + InvalidateRelationSet_( &_rTextFrame, _bFrom ); } // invalidation of text selection of a paragraph @@ -3358,7 +3358,7 @@ Size SwAccessibleMap::GetPreviewPageSize( sal_uInt16 _nPreviewPageNum ) const which have a selection Important note: method has to be used inside a mutual exclusive section */ -SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas() +SwAccessibleSelectedParas_Impl* SwAccessibleMap::BuildSelectedParas() { // no accessible contexts, no selection if ( !mpFrameMap ) @@ -3455,7 +3455,7 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas() SwAccessibleSelectedParas_Impl* pPrevSelectedParas( mpSelectedParas ); // determine currently selected paragraphs - mpSelectedParas = _BuildSelectedParas(); + mpSelectedParas = BuildSelectedParas(); // compare currently selected paragraphs with the previously selected // paragraphs and submit corresponding TEXT_SELECTION_CHANGED events. diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 47ab98ba12e2..342aac8b6fe1 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -64,7 +64,7 @@ void SwAccessiblePage::GetStates( } } -void SwAccessiblePage::_InvalidateCursorPos() +void SwAccessiblePage::InvalidateCursorPos_() { bool bNewSelected = IsSelected(); bool bOldSelected; @@ -91,7 +91,7 @@ void SwAccessiblePage::_InvalidateCursorPos() } } -void SwAccessiblePage::_InvalidateFocus() +void SwAccessiblePage::InvalidateFocus_() { vcl::Window *pWin = GetWindow(); if( pWin ) diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 784bcc161196..f9176f5d9c32 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -43,8 +43,8 @@ protected: // FOCUSABLE(1) and FOCUSED(+) virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override; - virtual void _InvalidateCursorPos() override; - virtual void _InvalidateFocus() override; + virtual void InvalidateCursorPos_() override; + virtual void InvalidateFocus_() override; virtual ~SwAccessiblePage(); diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 7a5962071215..825876c812fb 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -381,7 +381,7 @@ void SwAccessibleParagraph::GetStates( } } -void SwAccessibleParagraph::_InvalidateContent( bool bVisibleDataFired ) +void SwAccessibleParagraph::InvalidateContent_( bool bVisibleDataFired ) { OUString sOldText( GetString() ); @@ -463,7 +463,7 @@ void SwAccessibleParagraph::_InvalidateContent( bool bVisibleDataFired ) } } -void SwAccessibleParagraph::_InvalidateCursorPos() +void SwAccessibleParagraph::InvalidateCursorPos_() { // The text is changed sal_Int32 nNew = GetCaretPos(); @@ -512,7 +512,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos() } } -void SwAccessibleParagraph::_InvalidateFocus() +void SwAccessibleParagraph::InvalidateFocus_() { vcl::Window *pWin = GetWindow(); if( pWin ) diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index bceb0b186df5..979a5a595074 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -171,10 +171,10 @@ protected: // FOCUSABLE(+) and FOCUSED(+) virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override; - virtual void _InvalidateContent( bool bVisibleDataFired ) override; + virtual void InvalidateContent_( bool bVisibleDataFired ) override; - virtual void _InvalidateCursorPos() override; - virtual void _InvalidateFocus() override; + virtual void InvalidateCursorPos_() override; + virtual void InvalidateFocus_() override; virtual ~SwAccessibleParagraph(); diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 343199cdf435..e3b922b59073 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -79,7 +79,7 @@ OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (css::uno::Runt return sLclName; } -void SwAccessiblePreview::_InvalidateFocus() +void SwAccessiblePreview::InvalidateFocus_() { FireStateChangedEvent( css::accessibility::AccessibleStateType::FOCUSED, true ); } diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index 7387a2e0820b..400a3e839be6 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -63,7 +63,7 @@ public: OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; - virtual void _InvalidateFocus() override; + virtual void InvalidateFocus_() override; }; #endif diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 80b61a416191..c626b097ecc1 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -241,7 +241,7 @@ void SwAccessibleTableData_Impl::CollectColumnHeaderData( const SwFrame *pFrame //if the current line is now header line, then return ; sal_Int16 iCurrentRowIndex = mpTabFrame->GetTable()->GetTabLines().GetPos( pLine); - if(iCurrentRowIndex >= mpTabFrame->GetTable()->_GetRowsToRepeat()) + if(iCurrentRowIndex >= mpTabFrame->GetTable()->GetRowsToRepeat_()) return ; maRows.insert( pLower->Frame().Top() - maTabFramePos.Y() ); diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index 3819d1b8e881..678d5f13df9b 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -36,13 +36,13 @@ using namespace com::sun::star; SwBreakIt* g_pBreakIt = nullptr; -void SwBreakIt::_Create( const uno::Reference<uno::XComponentContext> & rxContext ) +void SwBreakIt::Create_( const uno::Reference<uno::XComponentContext> & rxContext ) { delete g_pBreakIt; g_pBreakIt = new SwBreakIt( rxContext ); } -void SwBreakIt::_Delete() +void SwBreakIt::Delete_() { delete g_pBreakIt; g_pBreakIt = nullptr; @@ -74,7 +74,7 @@ void SwBreakIt::createBreakIterator() const xBreak.set( i18n::BreakIterator::create(m_xContext) ); } -void SwBreakIt::_GetLocale( const LanguageType aLang ) +void SwBreakIt::GetLocale_( const LanguageType aLang ) { if (m_pLanguageTag) m_pLanguageTag->reset( aLang ); @@ -82,7 +82,7 @@ void SwBreakIt::_GetLocale( const LanguageType aLang ) m_pLanguageTag = new LanguageTag( aLang ); } -void SwBreakIt::_GetLocale( const LanguageTag& rLanguageTag ) +void SwBreakIt::GetLocale_( const LanguageTag& rLanguageTag ) { if (m_pLanguageTag) *m_pLanguageTag = rLanguageTag; @@ -90,7 +90,7 @@ void SwBreakIt::_GetLocale( const LanguageTag& rLanguageTag ) m_pLanguageTag = new LanguageTag( rLanguageTag ); } -void SwBreakIt::_GetForbidden( const LanguageType aLang ) +void SwBreakIt::GetForbidden_( const LanguageType aLang ) { LocaleDataWrapper aWrap( m_xContext, GetLanguageTag( aLang ) ); diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index bf03a07ae852..cb9e98583152 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -88,7 +88,7 @@ const sal_Char sCalc_Round[]= "round"; const sal_Char sCalc_Date[] = "date"; // ATTENTION: sorted list of all operators -struct _CalcOp +struct CalcOp { union{ const sal_Char* pName; @@ -97,7 +97,7 @@ struct _CalcOp SwCalcOper eOp; }; -_CalcOp const aOpTable[] = { +CalcOp const aOpTable[] = { /* ACOS */ {{sCalc_Acos}, CALC_ACOS}, // Arc cosine /* ADD */ {{sCalc_Add}, CALC_PLUS}, // Addition /* AND */ {{sCalc_And}, CALC_AND}, // log. AND @@ -150,38 +150,38 @@ extern "C" { static int SAL_CALL OperatorCompare( const void *pFirst, const void *pSecond) { int nRet = 0; - if( CALC_NAME == static_cast<const _CalcOp*>(pFirst)->eOp ) + if( CALC_NAME == static_cast<const CalcOp*>(pFirst)->eOp ) { - if( CALC_NAME == static_cast<const _CalcOp*>(pSecond)->eOp ) - nRet = static_cast<const _CalcOp*>(pFirst)->pUName->compareTo( - *static_cast<const _CalcOp*>(pSecond)->pUName ); + if( CALC_NAME == static_cast<const CalcOp*>(pSecond)->eOp ) + nRet = static_cast<const CalcOp*>(pFirst)->pUName->compareTo( + *static_cast<const CalcOp*>(pSecond)->pUName ); else - nRet = static_cast<const _CalcOp*>(pFirst)->pUName->compareToAscii( - static_cast<const _CalcOp*>(pSecond)->pName ); + nRet = static_cast<const CalcOp*>(pFirst)->pUName->compareToAscii( + static_cast<const CalcOp*>(pSecond)->pName ); } else { - if( CALC_NAME == static_cast<const _CalcOp*>(pSecond)->eOp ) - nRet = -1 * static_cast<const _CalcOp*>(pSecond)->pUName->compareToAscii( - static_cast<const _CalcOp*>(pFirst)->pName ); + if( CALC_NAME == static_cast<const CalcOp*>(pSecond)->eOp ) + nRet = -1 * static_cast<const CalcOp*>(pSecond)->pUName->compareToAscii( + static_cast<const CalcOp*>(pFirst)->pName ); else - nRet = strcmp( static_cast<const _CalcOp*>(pFirst)->pName, - static_cast<const _CalcOp*>(pSecond)->pName ); + nRet = strcmp( static_cast<const CalcOp*>(pFirst)->pName, + static_cast<const CalcOp*>(pSecond)->pName ); } return nRet; } }// extern "C" -_CalcOp* FindOperator( const OUString& rSrch ) +CalcOp* FindOperator( const OUString& rSrch ) { - _CalcOp aSrch; + CalcOp aSrch; aSrch.pUName = &rSrch; aSrch.eOp = CALC_NAME; - return static_cast<_CalcOp*>(bsearch( static_cast<void*>(&aSrch), + return static_cast<CalcOp*>(bsearch( static_cast<void*>(&aSrch), static_cast<void const *>(aOpTable), - sizeof( aOpTable ) / sizeof( _CalcOp ), - sizeof( _CalcOp ), + sizeof( aOpTable ) / sizeof( CalcOp ), + sizeof( CalcOp ), OperatorCompare )); } @@ -677,10 +677,10 @@ SwCalcOper SwCalc::GetToken() } // catch operators - _CalcOp* pFnd = ::FindOperator( sLowerCaseName ); + CalcOp* pFnd = ::FindOperator( sLowerCaseName ); if( pFnd ) { - switch( ( eCurrOper = static_cast<_CalcOp*>(pFnd)->eOp ) ) + switch( ( eCurrOper = static_cast<CalcOp*>(pFnd)->eOp ) ) { case CALC_SUM: case CALC_MEAN: @@ -1034,10 +1034,10 @@ SwCalcOper SwCalc::GetToken() return GetToken(); // call again // catch operators - _CalcOp* pFnd = ::FindOperator( aStr ); + CalcOp* pFnd = ::FindOperator( aStr ); if( pFnd ) { - switch( ( eCurrOper = static_cast<_CalcOp*>(pFnd)->eOp ) ) + switch( ( eCurrOper = static_cast<CalcOp*>(pFnd)->eOp ) ) { case CALC_SUM : case CALC_MEAN : diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index d3775b142a1c..0d4f06a01ccb 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -458,7 +458,7 @@ salhelper::SingletonRef<SwCalendarWrapper>* s_getCalendarWrapper() return &aCalendarWrapper; } -void _InitCore() +void InitCore() { SfxPoolItem* pItem; @@ -730,11 +730,11 @@ void _InitCore() for ( i = 41; i <= 144; ++i ) SwAttrPool::pVersionMap7[ i-1 ] = i + 4; - SwBreakIt::_Create( ::comphelper::getProcessComponentContext() ); + SwBreakIt::Create_( ::comphelper::getProcessComponentContext() ); pCheckIt = nullptr; - _FrameInit(); - _TextInit(); + FrameInit(); + TextInit_(); SwSelPaintRects::s_pMapMode = new MapMode; SwFntObj::pPixMap = new MapMode; @@ -753,13 +753,13 @@ void _InitCore() } } -void _FinitCore() +void FinitCore() { - _FrameFinit(); - _TextFinit(); + FrameFinit(); + TextFinit(); sw::proofreadingiterator::dispose(); - SwBreakIt::_Delete(); + SwBreakIt::Delete_(); delete pCheckIt; delete pAppCharClass; delete pCollator; diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index baf8e33b2c32..9eef25f2a85d 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -454,7 +454,7 @@ SwCacheAccess::~SwCacheAccess() pObj->Unlock(); } -void SwCacheAccess::_Get() +void SwCacheAccess::Get_() { OSL_ENSURE( !pObj, "SwCacheAcces Obj already available." ); diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx index ed0a7d83df1d..175c73beb74c 100644 --- a/sw/source/core/bastyp/swrect.cxx +++ b/sw/source/core/bastyp/swrect.cxx @@ -80,7 +80,7 @@ SwRect& SwRect::Intersection( const SwRect& rRect ) return *this; } -SwRect& SwRect::_Intersection( const SwRect& rRect ) +SwRect& SwRect::Intersection_( const SwRect& rRect ) { // get smaller right and lower, and greater left and upper edge if ( Left() < rRect.Left() ) @@ -150,19 +150,19 @@ void SwRect::Justify() } // Similar to the inline methods, but we need the function pointers -void SwRect::_Width( const long nNew ) { m_Size.setWidth(nNew); } -void SwRect::_Height( const long nNew ) { m_Size.setHeight(nNew); } -void SwRect::_Left( const long nLeft ){ m_Size.Width() += m_Point.getX() - nLeft; m_Point.setX(nLeft); } -void SwRect::_Right( const long nRight ){ m_Size.setWidth(nRight - m_Point.getX()); } -void SwRect::_Top( const long nTop ){ m_Size.Height() += m_Point.getY() - nTop; m_Point.setY(nTop); } -void SwRect::_Bottom( const long nBottom ){ m_Size.setHeight(nBottom - m_Point.getY()); } - -long SwRect::_Width() const{ return m_Size.getWidth(); } -long SwRect::_Height() const{ return m_Size.getHeight(); } -long SwRect::_Left() const{ return m_Point.getX(); } -long SwRect::_Right() const{ return m_Point.getX() + m_Size.getWidth(); } -long SwRect::_Top() const{ return m_Point.getY(); } -long SwRect::_Bottom() const{ return m_Point.getY() + m_Size.getHeight(); } +void SwRect::Width_( const long nNew ) { m_Size.setWidth(nNew); } +void SwRect::Height_( const long nNew ) { m_Size.setHeight(nNew); } +void SwRect::Left_( const long nLeft ){ m_Size.Width() += m_Point.getX() - nLeft; m_Point.setX(nLeft); } +void SwRect::Rigth_( const long nRight ){ m_Size.setWidth(nRight - m_Point.getX()); } +void SwRect::Top_( const long nTop ){ m_Size.Height() += m_Point.getY() - nTop; m_Point.setY(nTop); } +void SwRect::Bottom_( const long nBottom ){ m_Size.setHeight(nBottom - m_Point.getY()); } + +long SwRect::Width_() const{ return m_Size.getWidth(); } +long SwRect::Height_() const{ return m_Size.getHeight(); } +long SwRect::Left_() const{ return m_Point.getX(); } +long SwRect::Rigth_() const{ return m_Point.getX() + m_Size.getWidth(); } +long SwRect::Top_() const{ return m_Point.getY(); } +long SwRect::Bottom_() const{ return m_Point.getY() + m_Size.getHeight(); } void SwRect::AddWidth( const long nAdd ) { m_Size.Width() += nAdd; } void SwRect::AddHeight( const long nAdd ) { m_Size.Height() += nAdd; } diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx index 551df2580331..bd17f8e2dd5f 100644 --- a/sw/source/core/bastyp/swregion.cxx +++ b/sw/source/core/bastyp/swregion.cxx @@ -66,7 +66,7 @@ void SwRegionRects::operator-=( const SwRect &rRect ) { SwRect aTmp( (*this)[i] ); SwRect aInter( aTmp ); - aInter._Intersection( rRect ); + aInter.Intersection_( rRect ); // The first Rect that should be inserted takes position of i. // This avoids one Delete() call. diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx index 8446e63ddb42..97bbfb343f6b 100644 --- a/sw/source/core/bastyp/swtypes.cxx +++ b/sw/source/core/bastyp/swtypes.cxx @@ -76,7 +76,7 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwTextFrame ) IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFormat ) IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFormat ) IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFormat ) -IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor_SavePos ) Size GetGraphicSizeTwip(const Graphic& rGraphic, vcl::RenderContext* pOutDev) { diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 24f5c67881f7..47415ca3bc14 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -414,13 +414,13 @@ void SwCursorShell::MarkListLevel( const OUString& sListId, void SwCursorShell::UpdateMarkedListLevel() { - SwTextNode * pTextNd = _GetCursor()->GetNode().GetTextNode(); + SwTextNode * pTextNd = GetCursor_()->GetNode().GetTextNode(); if ( pTextNd ) { if ( !pTextNd->IsNumbered() ) { - m_pCurrentCursor->_SetInFrontOfLabel( false ); + m_pCurrentCursor->SetInFrontOfLabel_( false ); MarkListLevel( OUString(), 0 ); } else if ( m_pCurrentCursor->IsInFrontOfLabel() ) @@ -550,13 +550,13 @@ bool SwCursorShell::LRMargin( bool bLeft, bool bAPI) m_pBlockCursor->clearPoints(); const bool bWasAtLM = - ( 0 == _GetCursor()->GetPoint()->nContent.GetIndex() ); + ( 0 == GetCursor_()->GetPoint()->nContent.GetIndex() ); bool bRet = pTmpCursor->LeftRightMargin( bLeft, bAPI ); - if ( bLeft && !bTableMode && bRet && bWasAtLM && !_GetCursor()->HasMark() ) + if ( bLeft && !bTableMode && bRet && bWasAtLM && !GetCursor_()->HasMark() ) { - const SwTextNode * pTextNd = _GetCursor()->GetNode().GetTextNode(); + const SwTextNode * pTextNd = GetCursor_()->GetNode().GetTextNode(); if ( pTextNd && pTextNd->HasVisibleNumberingOrBullet() ) SetInFrontOfLabel( true ); } @@ -827,7 +827,7 @@ int SwCursorShell::SetCursor( const Point &rLPt, bool bOnlyText, bool bBlock ) // #i41424# Only update the marked number levels if necessary // Force update of marked number levels if necessary. if ( bNewInFrontOfLabel || bOldInFrontOfLabel ) - m_pCurrentCursor->_SetInFrontOfLabel( !bNewInFrontOfLabel ); + m_pCurrentCursor->SetInFrontOfLabel_( !bNewInFrontOfLabel ); SetInFrontOfLabel( bNewInFrontOfLabel ); if( !pCursor->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) ) @@ -1105,7 +1105,7 @@ bool SwCursorShell::SetInFrontOfLabel( bool bNew ) { if ( bNew != IsInFrontOfLabel() ) { - m_pCurrentCursor->_SetInFrontOfLabel( bNew ); + m_pCurrentCursor->SetInFrontOfLabel_( bNew ); UpdateMarkedListLevel(); return true; } @@ -2493,7 +2493,7 @@ bool SwCursorShell::ParkTableCursor() return true; } -void SwCursorShell::_ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing ) +void SwCursorShell::ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing ) { const SwPosition *pStt = pDelRg->Start(), *pEnd = pDelRg->GetPoint() == pStt ? pDelRg->GetMark() : pDelRg->GetPoint(); @@ -2597,9 +2597,9 @@ void SwCursorShell::ParkCursor( const SwNodeIndex &rIdx ) { SwCursorShell* pSh = static_cast<SwCursorShell*>(&rTmp); if( pSh->m_pCursorStack ) - pSh->_ParkPams( pNew, &pSh->m_pCursorStack ); + pSh->ParkPams( pNew, &pSh->m_pCursorStack ); - pSh->_ParkPams( pNew, &pSh->m_pCurrentCursor ); + pSh->ParkPams( pNew, &pSh->m_pCurrentCursor ); if( pSh->m_pTableCursor ) { // set table cursor always to 0 and the current one always to diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index d36818faf860..634d8bb72dfb 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -421,7 +421,7 @@ bool SwCursorShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors ) SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() ); if( !bNext ) aFndPos.nNode = 0; - _SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos ); + SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos ); { const SwNode* pSttNd = rPos.nNode.GetNode().FindTableBoxStartNode(); @@ -430,7 +430,7 @@ bool SwCursorShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors ) const SwTableBox* pTBox = pSttNd->FindTableNode()->GetTable(). GetTableBox( pSttNd->GetIndex() ); if( pTBox ) - aCurGEF = _SetGetExpField( *pTBox ); + aCurGEF = SetGetExpField( *pTBox ); } } @@ -459,7 +459,7 @@ bool SwCursorShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors ) if( pCNd && nullptr != ( pCFrame = pCNd->getLayoutFrame( GetLayout(), &aPt, nullptr, false ) ) && (IsReadOnlyAvailable() || !pCFrame->IsProtected() )) { - _SetGetExpField aCmp( *pTBox ); + SetGetExpField aCmp( *pTBox ); aCmp.SetBodyPos( *pCFrame ); if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF ) @@ -503,7 +503,7 @@ bool SwCursorShell::GotoNxtPrvTOXMark( bool bNext ) SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() ); if( !bNext ) aFndPos.nNode = 0; - _SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos ); + SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos ); if( rPos.nNode.GetIndex() < GetDoc()->GetNodes().GetEndOfExtras().GetIndex() ) // also at collection use only the first frame @@ -528,7 +528,7 @@ bool SwCursorShell::GotoNxtPrvTOXMark( bool bNext ) ( IsReadOnlyAvailable() || !pCFrame->IsProtected() )) { SwNodeIndex aNdIndex( *pTextNd ); // UNIX needs this object - _SetGetExpField aCmp( aNdIndex, *pTextTOX, nullptr ); + SetGetExpField aCmp( aNdIndex, *pTextTOX, nullptr ); aCmp.SetBodyPos( *pCFrame ); if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF ) @@ -582,7 +582,7 @@ const SwTOXMark& SwCursorShell::GotoTOXMark( const SwTOXMark& rStart, /// jump to next/previous field type void lcl_MakeFieldLst( - _SetGetExpFields& rLst, + SetGetExpFields& rLst, const SwFieldType& rFieldType, const bool bInReadOnly, const bool bChkInpFlag = false ) @@ -604,7 +604,7 @@ void lcl_MakeFieldLst( if ( pCFrame != nullptr && ( bInReadOnly || !pCFrame->IsProtected() ) ) { - _SetGetExpField* pNew = new _SetGetExpField( SwNodeIndex( rTextNode ), pTextField ); + SetGetExpField* pNew = new SetGetExpField( SwNodeIndex( rTextNode ), pTextField ); pNew->SetBodyPos( *pCFrame ); rLst.insert( pNew ); } @@ -612,22 +612,22 @@ void lcl_MakeFieldLst( } } -static _SetGetExpFields::const_iterator -lcl_FindField(bool & o_rFound, _SetGetExpFields const& rSrtLst, +static SetGetExpFields::const_iterator +lcl_FindField(bool & o_rFound, SetGetExpFields const& rSrtLst, SwRootFrame *const pLayout, SwTextNode *const pTextNode, SwTextField *const pTextField, SwPosition const& rPos, sal_Int32 const nContentOffset) { - std::unique_ptr<_SetGetExpField> pSrch; + std::unique_ptr<SetGetExpField> pSrch; std::unique_ptr<SwIndex> pIndex; if (-1 == nContentOffset) { - pSrch.reset(new _SetGetExpField(rPos.nNode, pTextField, &rPos.nContent)); + pSrch.reset(new SetGetExpField(rPos.nNode, pTextField, &rPos.nContent)); } else { pIndex.reset(new SwIndex(rPos.nNode.GetNode().GetContentNode(), nContentOffset)); - pSrch.reset(new _SetGetExpField(rPos.nNode, pTextField, pIndex.get())); + pSrch.reset(new SetGetExpField(rPos.nNode, pTextField, pIndex.get())); } if (rPos.nNode.GetIndex() < pTextNode->GetNodes().GetEndOfExtras().GetIndex()) @@ -637,7 +637,7 @@ lcl_FindField(bool & o_rFound, _SetGetExpFields const& rSrtLst, pSrch->SetBodyPos(*pTextNode->getLayoutFrame(pLayout, &aPt, &rPos, false)); } - _SetGetExpFields::const_iterator it = rSrtLst.lower_bound(pSrch.get()); + SetGetExpFields::const_iterator it = rSrtLst.lower_bound(pSrch.get()); o_rFound = (it != rSrtLst.end()) && (**it == *pSrch); return it; @@ -650,7 +650,7 @@ bool SwCursorShell::MoveFieldType( const bool bAddSetExpressionFieldsToInputFields ) { // sorted list of all fields - _SetGetExpFields aSrtLst; + SetGetExpFields aSrtLst; if ( pFieldType ) { @@ -695,7 +695,7 @@ bool SwCursorShell::MoveFieldType( if( aSrtLst.empty() ) return false; - _SetGetExpFields::const_iterator it; + SetGetExpFields::const_iterator it; SwCursor* pCursor = getShellCursor( true ); { // (1998): Always use field for search so that the right one is found as @@ -767,7 +767,7 @@ bool SwCursorShell::MoveFieldType( } } } - const _SetGetExpField& rFnd = **it; + const SetGetExpField& rFnd = **it; SET_CURR_SHELL( this ); SwCallLink aLk( *this ); // watch Cursor-Moves @@ -1639,7 +1639,7 @@ const SwPostItField* SwCursorShell::GetPostItFieldAtCursor() const if ( !IsTableMode() ) { - const SwPosition* pCursorPos = _GetCursor()->GetPoint(); + const SwPosition* pCursorPos = GetCursor_()->GetPoint(); const SwTextNode* pTextNd = pCursorPos->nNode.GetNode().GetTextNode(); if ( pTextNd ) { @@ -2000,7 +2000,7 @@ const SwRangeRedline* SwCursorShell::SelPrevRedline() return pFnd; } -const SwRangeRedline* SwCursorShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelect ) +const SwRangeRedline* SwCursorShell::GotoRedline_( sal_uInt16 nArrPos, bool bSelect ) { const SwRangeRedline* pFnd = nullptr; SwCallLink aLk( *this ); // watch Cursor-Moves @@ -2085,7 +2085,7 @@ const SwRangeRedline* SwCursorShell::GotoRedline( sal_uInt16 nArrPos, bool bSele sal_uInt16 nArrSavPos = nArrPos; do { - pTmp = _GotoRedline( nArrPos, true ); + pTmp = GotoRedline_( nArrPos, true ); if( !pFnd ) pFnd = pTmp; @@ -2172,7 +2172,7 @@ const SwRangeRedline* SwCursorShell::GotoRedline( sal_uInt16 nArrPos, bool bSele } while( nLoopCnt ); } else - pFnd = _GotoRedline( nArrPos, bSelect ); + pFnd = GotoRedline_( nArrPos, bSelect ); } return pFnd; } @@ -2185,8 +2185,8 @@ bool SwCursorShell::SelectNxtPrvHyperlink( bool bNext ) sal_uLong nBodySttNdIdx = pBodySttNd->GetIndex(); Point aPt; - _SetGetExpField aCmpPos( SwPosition( bNext ? *pBodyEndNd : *pBodySttNd ) ); - _SetGetExpField aCurPos( bNext ? *m_pCurrentCursor->End() : *m_pCurrentCursor->Start() ); + SetGetExpField aCmpPos( SwPosition( bNext ? *pBodyEndNd : *pBodySttNd ) ); + SetGetExpField aCurPos( bNext ? *m_pCurrentCursor->End() : *m_pCurrentCursor->Start() ); if( aCurPos.GetNode() < nBodySttNdIdx ) { const SwContentNode* pCNd = aCurPos.GetNodeFromContent()->GetContentNode(); @@ -2209,7 +2209,7 @@ bool SwCursorShell::SelectNxtPrvHyperlink( bool bNext ) { SwTextINetFormat& rAttr = *pFnd; SwPosition aTmpPos( *pTextNd ); - _SetGetExpField aPos( aTmpPos.nNode, rAttr ); + SetGetExpField aPos( aTmpPos.nNode, rAttr ); SwContentFrame* pFrame; if( pTextNd->GetIndex() < nBodySttNdIdx && nullptr != ( pFrame = pTextNd->getLayoutFrame( GetLayout(), &aPt )) ) @@ -2246,7 +2246,7 @@ bool SwCursorShell::SelectNxtPrvHyperlink( bool bNext ) if( pFly && GetBodyTextNode( *GetDoc(), aTmpPos, *pFly->GetLower() ) ) { - _SetGetExpField aPos( *pFormat, &aTmpPos ); + SetGetExpField aPos( *pFormat, &aTmpPos ); if( bNext ? ( aPos < aCmpPos && aCurPos < aPos ) diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 1534e2e86cc3..b97fa08b6d1d 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -177,13 +177,13 @@ static bool lcl_Search( const SwTextNode& rTextNd, SwPaM& rPam, } /// search for multiple text attributes -struct _SwSrchChrAttr +struct SwSrchChrAttr { sal_uInt16 nWhich; sal_Int32 nStt; sal_Int32 nEnd; - _SwSrchChrAttr( const SfxPoolItem& rItem, + SwSrchChrAttr( const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nAnyEnd ) : nWhich( rItem.Which() ), nStt( nStart ), nEnd( nAnyEnd ) {} @@ -191,7 +191,7 @@ struct _SwSrchChrAttr class SwAttrCheckArr { - _SwSrchChrAttr *pFndArr, *pStackArr; + SwSrchChrAttr *pFndArr, *pStackArr; sal_Int32 nNdStt; sal_Int32 nNdEnd; sal_uInt16 nArrStart, nArrLen; @@ -238,11 +238,11 @@ SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, bool bFwd, nArrStart = aCmpSet.GetWhichByPos( aIter.GetFirstPos() ); nArrLen = aCmpSet.GetWhichByPos( aIter.GetLastPos() ) - nArrStart+1; - char* pFndChar = new char[ nArrLen * sizeof(_SwSrchChrAttr) ]; - char* pStackChar = new char[ nArrLen * sizeof(_SwSrchChrAttr) ]; + char* pFndChar = new char[ nArrLen * sizeof(SwSrchChrAttr) ]; + char* pStackChar = new char[ nArrLen * sizeof(SwSrchChrAttr) ]; - pFndArr = reinterpret_cast<_SwSrchChrAttr*>(pFndChar); - pStackArr = reinterpret_cast<_SwSrchChrAttr*>(pStackChar); + pFndArr = reinterpret_cast<SwSrchChrAttr*>(pFndChar); + pStackArr = reinterpret_cast<SwSrchChrAttr*>(pStackChar); } SwAttrCheckArr::~SwAttrCheckArr() @@ -253,8 +253,8 @@ SwAttrCheckArr::~SwAttrCheckArr() void SwAttrCheckArr::SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam ) { - memset( pFndArr, 0, nArrLen * sizeof(_SwSrchChrAttr) ); - memset( pStackArr, 0, nArrLen * sizeof(_SwSrchChrAttr) ); + memset( pFndArr, 0, nArrLen * sizeof(SwSrchChrAttr) ); + memset( pStackArr, 0, nArrLen * sizeof(SwSrchChrAttr) ); nFound = 0; nStackCnt = 0; @@ -295,7 +295,7 @@ void SwAttrCheckArr::SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam ) && !CmpAttr( *pFndItem, rSet.GetPool()->GetDefaultItem( nWhich ) )) { pFndArr[ nWhich - nArrStart ] = - _SwSrchChrAttr( *pFndItem, nNdStt, nNdEnd ); + SwSrchChrAttr( *pFndItem, nNdStt, nNdEnd ); nFound++; } } @@ -307,7 +307,7 @@ void SwAttrCheckArr::SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam ) if( CmpAttr( rSet.Get( nWhich, !bNoColls ), *pItem ) ) { pFndArr[ nWhich - nArrStart ] = - _SwSrchChrAttr( *pItem, nNdStt, nNdEnd ); + SwSrchChrAttr( *pItem, nNdStt, nNdEnd ); nFound++; } } @@ -320,7 +320,7 @@ void SwAttrCheckArr::SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam ) static bool lcl_IsAttributeIgnorable(sal_Int32 const nNdStart, sal_Int32 const nNdEnd, - _SwSrchChrAttr const& rTmp) + SwSrchChrAttr const& rTmp) { // #i115528#: if there is a paragraph attribute, it has been added by the // SwAttrCheckArr ctor, and nFound is 1. @@ -335,7 +335,7 @@ lcl_IsAttributeIgnorable(sal_Int32 const nNdStart, sal_Int32 const nNdEnd, bool SwAttrCheckArr::SetAttrFwd( const SwTextAttr& rAttr ) { - _SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() ); + SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() ); // ignore all attributes not in search range if (lcl_IsAttributeIgnorable(nNdStt, nNdEnd, aTmp)) @@ -375,10 +375,10 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTextAttr& rAttr ) if( SfxItemState::DONTCARE == eState || SfxItemState::SET == eState ) { sal_uInt16 n; - _SwSrchChrAttr* pCmp; + SwSrchChrAttr* pCmp; // first delete all up to start position that are already invalid - _SwSrchChrAttr* pArrPtr; + SwSrchChrAttr* pArrPtr; if( nFound ) for( pArrPtr = pFndArr, n = 0; n < nArrLen; ++n, ++pArrPtr ) @@ -488,7 +488,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTextAttr& rAttr ) bool SwAttrCheckArr::SetAttrBwd( const SwTextAttr& rAttr ) { - _SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() ); + SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() ); // ignore all attributes not in search range if (lcl_IsAttributeIgnorable(nNdStt, nNdEnd, aTmp)) @@ -528,10 +528,10 @@ bool SwAttrCheckArr::SetAttrBwd( const SwTextAttr& rAttr ) if( SfxItemState::DONTCARE == eState || SfxItemState::SET == eState ) { sal_uInt16 n; - _SwSrchChrAttr* pCmp; + SwSrchChrAttr* pCmp; // first delete all up to start position that are already invalid - _SwSrchChrAttr* pArrPtr; + SwSrchChrAttr* pArrPtr; if( nFound ) for( pArrPtr = pFndArr, n = 0; n < nArrLen; ++n, ++pArrPtr ) if( pArrPtr->nWhich && pArrPtr->nStt >= aTmp.nEnd ) @@ -640,7 +640,7 @@ bool SwAttrCheckArr::SetAttrBwd( const SwTextAttr& rAttr ) sal_Int32 SwAttrCheckArr::Start() const { sal_Int32 nStart = nNdStt; - _SwSrchChrAttr* pArrPtr = pFndArr; + SwSrchChrAttr* pArrPtr = pFndArr; for( sal_uInt16 n = 0; n < nArrLen; ++n, ++pArrPtr ) if( pArrPtr->nWhich && pArrPtr->nStt > nStart ) nStart = pArrPtr->nStt; @@ -650,7 +650,7 @@ sal_Int32 SwAttrCheckArr::Start() const sal_Int32 SwAttrCheckArr::End() const { - _SwSrchChrAttr* pArrPtr = pFndArr; + SwSrchChrAttr* pArrPtr = pFndArr; sal_Int32 nEnd = nNdEnd; for( sal_uInt16 n = 0; n < nArrLen; ++n, ++pArrPtr ) if( pArrPtr->nWhich && pArrPtr->nEnd < nEnd ) @@ -667,7 +667,7 @@ bool SwAttrCheckArr::CheckStack() sal_uInt16 n; const sal_Int32 nSttPos = Start(); const sal_Int32 nEndPos = End(); - _SwSrchChrAttr* pArrPtr; + SwSrchChrAttr* pArrPtr; for( pArrPtr = pStackArr, n = 0; n < nArrLen; ++n, ++pArrPtr ) { if( !pArrPtr->nWhich ) diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 23d60e6e8ee9..dab51af2e685 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -57,13 +57,13 @@ using namespace ::com::sun::star::i18n; static const sal_uInt16 coSrchRplcThreshold = 60000; -struct _PercentHdl +struct PercentHdl { SwDocShell* pDSh; sal_uLong nActPos; bool bBack, bNodeIdx; - _PercentHdl( sal_uLong nStt, sal_uLong nEnd, SwDocShell* pSh ) + PercentHdl( sal_uLong nStt, sal_uLong nEnd, SwDocShell* pSh ) : pDSh(pSh), bBack(false), bNodeIdx(false) { nActPos = nStt; @@ -74,7 +74,7 @@ struct _PercentHdl ::StartProgress( STR_STATSTR_SEARCH, nStt, nEnd ); } - explicit _PercentHdl( const SwPaM& rPam ) + explicit PercentHdl( const SwPaM& rPam ) : pDSh( rPam.GetDoc()->GetDocShell() ) { sal_uLong nStt, nEnd; @@ -98,7 +98,7 @@ struct _PercentHdl ::StartProgress( STR_STATSTR_SEARCH, nStt, nEnd, pDSh ); } - ~_PercentHdl() { ::EndProgress( pDSh ); } + ~PercentHdl() { ::EndProgress( pDSh ); } void NextPos( sal_uLong nPos ) const { ::SetProgressState( bBack ? nActPos - nPos : nPos, pDSh ); } @@ -137,7 +137,7 @@ SwCursor::~SwCursor() { while( m_pSavePos ) { - _SwCursor_SavePos* pNxt = m_pSavePos->pNext; + SwCursor_SavePos* pNxt = m_pSavePos->pNext; delete m_pSavePos; m_pSavePos = pNxt; } @@ -167,7 +167,7 @@ bool SwCursor::IsSkipOverProtectSections() const // own SaveObjects if needed and validate them in the virtual check routines. void SwCursor::SaveState() { - _SwCursor_SavePos* pNew = CreateNewSavePos(); + SwCursor_SavePos* pNew = CreateNewSavePos(); pNew->pNext = m_pSavePos; m_pSavePos = pNew; } @@ -176,15 +176,15 @@ void SwCursor::RestoreState() { if (m_pSavePos) // Robust { - _SwCursor_SavePos* pDel = m_pSavePos; + SwCursor_SavePos* pDel = m_pSavePos; m_pSavePos = m_pSavePos->pNext; delete pDel; } } -_SwCursor_SavePos* SwCursor::CreateNewSavePos() const +SwCursor_SavePos* SwCursor::CreateNewSavePos() const { - return new _SwCursor_SavePos( *this ); + return new SwCursor_SavePos( *this ); } /// determine if point is outside of the node-array's content area @@ -749,14 +749,14 @@ static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurrentCurso // only create progress bar for ShellCursor bool bIsUnoCursor = dynamic_cast<SwUnoCursor*>(pCurrentCursor) != nullptr; - std::unique_ptr<_PercentHdl> pPHdl; + std::unique_ptr<PercentHdl> pPHdl; sal_uInt16 nCursorCnt = 0; if( FND_IN_SEL & eFndRngs ) { while( pCurrentCursor != ( pTmpCursor = pTmpCursor->GetNext() )) ++nCursorCnt; if( nCursorCnt && !bIsUnoCursor ) - pPHdl.reset(new _PercentHdl( 0, nCursorCnt, pDoc->GetDocShell() )); + pPHdl.reset(new PercentHdl( 0, nCursorCnt, pDoc->GetDocShell() )); } else pSaveCursor = static_cast<SwPaM*>(pSaveCursor->GetPrev()); @@ -774,7 +774,7 @@ static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurrentCurso aRegion.Exchange(); if( !nCursorCnt && !pPHdl && !bIsUnoCursor ) - pPHdl.reset(new _PercentHdl( aRegion )); + pPHdl.reset(new PercentHdl( aRegion )); // as long as found and not at same position while( *pSttPos <= *pEndPos && diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx index d1d78b85939b..dc27eb37885e 100644 --- a/sw/source/core/crsr/trvlfnfl.cxx +++ b/sw/source/core/crsr/trvlfnfl.cxx @@ -79,12 +79,12 @@ bool SwCursorShell::GotoFootnoteText() bool bRet = CallCursorFN( &SwCursor::GotoFootnoteText ); if( !bRet ) { - SwTextNode* pTextNd = _GetCursor() ? - _GetCursor()->GetPoint()->nNode.GetNode().GetTextNode() : nullptr; + SwTextNode* pTextNd = GetCursor_() ? + GetCursor_()->GetPoint()->nNode.GetNode().GetTextNode() : nullptr; if( pTextNd ) { - const SwFrame *pFrame = pTextNd->getLayoutFrame( GetLayout(), &_GetCursor()->GetSttPos(), - _GetCursor()->Start() ); + const SwFrame *pFrame = pTextNd->getLayoutFrame( GetLayout(), &GetCursor_()->GetSttPos(), + GetCursor_()->Start() ); const SwFootnoteBossFrame* pFootnoteBoss; bool bSkip = pFrame && pFrame->IsInFootnote(); while( pFrame && nullptr != ( pFootnoteBoss = pFrame->FindFootnoteBossFrame() ) ) @@ -100,8 +100,8 @@ bool SwCursorShell::GotoFootnoteText() if( pCnt ) { const SwContentNode* pNode = pCnt->GetNode(); - _GetCursor()->GetPoint()->nNode = *pNode; - _GetCursor()->GetPoint()->nContent.Assign( + GetCursor_()->GetPoint()->nNode = *pNode; + GetCursor_()->GetPoint()->nContent.Assign( const_cast<SwContentNode*>(pNode), static_cast<const SwTextFrame*>(pCnt)->GetOfst() ); UpdateCursor( SwCursorShell::SCROLLWIN | diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index 896893fe1c46..c6d515c9d305 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -128,7 +128,7 @@ static const SwFrame* lcl_FindMostUpperCellFrame( const SwFrame* pFrame ) return pFrame; } -bool SwCursorShell::_SelTableRowOrCol( bool bRow, bool bRowSimple ) +bool SwCursorShell::SelTableRowOrCol( bool bRow, bool bRowSimple ) { // check if the current cursor's SPoint/Mark are in a table SwFrame *pFrame = GetCurrFrame(); @@ -165,7 +165,7 @@ bool SwCursorShell::_SelTableRowOrCol( bool bRow, bool bRowSimple ) // #i32329# Enhanced table selection else if ( pTable->IsNewModel() ) { - const SwShellCursor *pCursor = _GetCursor(); + const SwShellCursor *pCursor = GetCursor_(); SwTable::SearchType eSearchType = bRow ? SwTable::SEARCH_ROW : SwTable::SEARCH_COL; pTable->CreateSelection( *pCursor, aBoxes, eSearchType, bCheckProtected ); if( aBoxes.empty() ) @@ -176,7 +176,7 @@ bool SwCursorShell::_SelTableRowOrCol( bool bRow, bool bRowSimple ) } else { - const SwShellCursor *pCursor = _GetCursor(); + const SwShellCursor *pCursor = GetCursor_(); const SwFrame* pStartFrame = pFrame; const SwContentNode *pCNd = pCursor->GetContentNode( false ); const SwFrame* pEndFrame = pCNd ? pCNd->getLayoutFrame( GetLayout(), &pCursor->GetMkPos() ) : nullptr; diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 2ce2f00813cc..9d8ad587bf06 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -93,7 +93,7 @@ void SwVisibleCursor::Show() // display at all? if( m_pCursorShell->VisArea().IsOver( m_pCursorShell->m_aCharRect ) || comphelper::LibreOfficeKit::isActive() ) - _SetPosAndShow(); + SetPosAndShow(); } } @@ -108,7 +108,7 @@ void SwVisibleCursor::Hide() } } -void SwVisibleCursor::_SetPosAndShow() +void SwVisibleCursor::SetPosAndShow() { SwRect aRect; long nTmpY = m_pCursorShell->m_aCursorHeight.getY(); @@ -132,7 +132,7 @@ void SwVisibleCursor::_SetPosAndShow() // check if cursor should show the current cursor bidi level m_aTextCursor.SetDirection(); - const SwCursor* pTmpCursor = m_pCursorShell->_GetCursor(); + const SwCursor* pTmpCursor = m_pCursorShell->GetCursor_(); if ( pTmpCursor && !m_pCursorShell->IsOverwriteCursor() ) { diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 1aee7002a4ef..bd827289f405 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -423,7 +423,7 @@ void ContentIdxStoreImpl::SaveShellCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int } while ( (_pStackCursor != nullptr ) && ((_pStackCursor = _pStackCursor->GetNext()) != static_cast<SwCursorShell*>(&rCurShell)->GetStackCursor()) ); - for(SwPaM& rPaM : (static_cast<SwCursorShell*>(&rCurShell)->_GetCursor())->GetRingContainer()) + for(SwPaM& rPaM : (static_cast<SwCursorShell*>(&rCurShell)->GetCursor_())->GetRingContainer()) { lcl_ChkPaMBoth( m_aShellCursorEntries, nNode, nContent, rPaM); } diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index e2b8af4894d1..4e9177ca6899 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -124,7 +124,7 @@ namespace /* The lcl_CopyBookmarks function has to copy bookmarks from the source to the destination nodes - array. It is called after a call of the _CopyNodes(..) function. But this function does not copy + array. It is called after a call of the CopyNodes(..) function. But this function does not copy every node (at least at the moment: 2/08/2006 ), section start and end nodes will not be copied if the corresponding end/start node is outside the copied pam. The lcl_NonCopyCount function counts the number of these nodes, given the copied pam and a node @@ -196,7 +196,7 @@ namespace rChgPos.nContent.Assign( rChgPos.nNode.GetNode().GetContentNode(), nContentPos ); } - // TODO: use SaveBookmark (from _DelBookmarks) + // TODO: use SaveBookmark (from DelBookmarks) void lcl_CopyBookmarks( const SwPaM& rPam, SwPaM& rCpyPam ) @@ -550,14 +550,14 @@ namespace return false; } - struct _SaveRedline + struct SaveRedline { SwRangeRedline* pRedl; sal_uInt32 nStt, nEnd; sal_Int32 nSttCnt; sal_Int32 nEndCnt; - _SaveRedline( SwRangeRedline* pR, const SwNodeIndex& rSttIdx ) + SaveRedline( SwRangeRedline* pR, const SwNodeIndex& rSttIdx ) : pRedl(pR) , nEnd(0) , nEndCnt(0) @@ -579,7 +579,7 @@ namespace pRedl->GetMark()->nContent.Assign( nullptr, 0 ); } - _SaveRedline( SwRangeRedline* pR, const SwPosition& rPos ) + SaveRedline( SwRangeRedline* pR, const SwPosition& rPos ) : pRedl(pR) , nEnd(0) , nEndCnt(0) @@ -628,7 +628,7 @@ namespace } }; - typedef std::vector< _SaveRedline > SaveRedlines_t; + typedef std::vector< SaveRedline > SaveRedlines_t; void lcl_SaveRedlines(const SwPaM& aPam, SaveRedlines_t& rArr) { @@ -688,7 +688,7 @@ namespace } // save the current redline - rArr.push_back(_SaveRedline( pCurrent, *pStart )); + rArr.push_back(SaveRedline( pCurrent, *pStart )); } } @@ -744,7 +744,7 @@ namespace pTmpPos->nContent.Assign( pTmpPos->nNode.GetNode().GetContentNode(), 0 ); - rArr.push_back(_SaveRedline(pNewRedl, rRg.aStart)); + rArr.push_back(SaveRedline(pNewRedl, rRg.aStart)); pTmpPos = pTmp->End(); pTmpPos->nNode = rRg.aEnd; @@ -766,7 +766,7 @@ namespace ( pREnd->nNode == rRg.aEnd && !pREnd->nContent.GetIndex()) ) { // move everything - rArr.push_back(_SaveRedline( pTmp, rRg.aStart )); + rArr.push_back(SaveRedline( pTmp, rRg.aStart )); } else { @@ -777,7 +777,7 @@ namespace pTmpPos->nContent.Assign( pTmpPos->nNode.GetNode().GetContentNode(), 0 ); - rArr.push_back(_SaveRedline( pNewRedl, rRg.aStart )); + rArr.push_back(SaveRedline( pNewRedl, rRg.aStart )); pTmpPos = pTmp->Start(); pTmpPos->nNode = rRg.aEnd; @@ -1733,7 +1733,7 @@ void DocumentContentOperationsManager::DeleteSection( SwNode *pNode ) // delete all Flys, Bookmarks, ... DelFlyInRange( aSttIdx, aEndIdx ); m_rDoc.getIDocumentRedlineAccess().DeleteRedline( *pSttNd, true, USHRT_MAX ); - _DelBookmarks(aSttIdx, aEndIdx); + DelBookmarks(aSttIdx, aEndIdx); { // move all Cursor/StackCursor/UnoCursor out of the to-be-deleted area @@ -1910,8 +1910,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, return false; // Save the paragraph anchored Flys, so that they can be moved. - _SaveFlyArr aSaveFlyArr; - _SaveFlyInRange( rPaM, rPos.nNode, aSaveFlyArr, bool( SwMoveFlags::ALLFLYS & eMvFlags ) ); + SaveFlyArr aSaveFlyArr; + SaveFlyInRange( rPaM, rPos.nNode, aSaveFlyArr, bool( SwMoveFlags::ALLFLYS & eMvFlags ) ); // save redlines (if DOC_MOVEREDLINES is used) SaveRedlines_t aSaveRedl; @@ -1924,7 +1924,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, // will change this order. Hence, we delete bookmarks // here without undo. ::sw::UndoGuard const undoGuard(m_rDoc.GetIDocumentUndoRedo()); - _DelBookmarks( + DelBookmarks( pStt->nNode, pEnd->nNode, nullptr, @@ -2024,7 +2024,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, // Copy all Bookmarks that are within the Move range into an array, // that saves the position as an offset. ::std::vector< ::sw::mark::SaveBookmark> aSaveBkmks; - _DelBookmarks( + DelBookmarks( pStt->nNode, pEnd->nNode, &aSaveBkmks, @@ -2141,7 +2141,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, *rPaM.GetPoint() = *aSavePam.End(); // Move the Flys to the new position. - _RestFlyInRange( aSaveFlyArr, rPaM.Start()->nNode, &(rPos.nNode) ); + RestFlyInRange( aSaveFlyArr, rPaM.Start()->nNode, &(rPos.nNode) ); // restore redlines (if DOC_MOVEREDLINES is used) if( !aSaveRedl.empty() ) @@ -2217,12 +2217,12 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod // that stores all references to positions as an offset. // The final mapping happens after the Move. ::std::vector< ::sw::mark::SaveBookmark> aSaveBkmks; - _DelBookmarks(rRange.aStart, rRange.aEnd, &aSaveBkmks); + DelBookmarks(rRange.aStart, rRange.aEnd, &aSaveBkmks); // Save the paragraph-bound Flys, so that they can be moved. - _SaveFlyArr aSaveFlyArr; + SaveFlyArr aSaveFlyArr; if( !m_rDoc.GetSpzFrameFormats()->empty() ) - _SaveFlyInRange( rRange, aSaveFlyArr ); + SaveFlyInRange( rRange, aSaveFlyArr ); // Set it to before the Position, so that it cannot be moved further. SwNodeIndex aIdx( rPos, -1 ); @@ -2233,7 +2233,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod // move the Nodes bool bNoDelFrames = bool(SwMoveFlags::NO_DELFRMS & eMvFlags); - if( m_rDoc.GetNodes()._MoveNodes( rRange, m_rDoc.GetNodes(), rPos, !bNoDelFrames ) ) + if( m_rDoc.GetNodes().MoveNodes( rRange, m_rDoc.GetNodes(), rPos, !bNoDelFrames ) ) { ++aIdx; // again back to old position if( pSaveInsPos ) @@ -2248,7 +2248,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod // move the Flys to the new position if( !aSaveFlyArr.empty() ) - _RestFlyInRange( aSaveFlyArr, aIdx, nullptr ); + RestFlyInRange( aSaveFlyArr, aIdx, nullptr ); // Add the Bookmarks back to the Document for( @@ -2612,7 +2612,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg, SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ), rGrfName, rFltName, pGraphic, m_rDoc.GetDfltGrfFormatColl() ); - SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode, + SwFlyFrameFormat* pSwFlyFrameFormat = InsNoTextNode( *rRg.GetPoint(), pSwGrfNode, pFlyAttrSet, pGrfAttrSet, pFrameFormat ); return pSwFlyFrameFormat; } @@ -2627,7 +2627,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg, co SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode( SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ), rGrfObj, m_rDoc.GetDfltGrfFormatColl() ); - SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode, + SwFlyFrameFormat* pSwFlyFrameFormat = InsNoTextNode( *rRg.GetPoint(), pSwGrfNode, pFlyAttrSet, pGrfAttrSet, pFrameFormat ); return pSwFlyFrameFormat; } @@ -2649,7 +2649,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::Insert(const SwPaM &rRg, con pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( nId ); } - return _InsNoTextNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode( + return InsNoTextNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode( SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ), xObj, m_rDoc.GetDfltGrfFormatColl() ), @@ -2666,7 +2666,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::InsertOLE(const SwPaM &rRg, if( !pFrameFormat ) pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_OLE ); - return _InsNoTextNode( *rRg.GetPoint(), + return InsNoTextNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode( SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ), rObjName, @@ -3155,11 +3155,11 @@ void DocumentContentOperationsManager::CopyWithFlyInFly( SwDoc* pDest = rInsPos.GetNode().GetDoc(); - _SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 ); + SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 ); SwNodeIndex aSavePos( rInsPos, -1 ); bool bEndIsEqualEndPos = rInsPos == rRg.aEnd; - m_rDoc.GetNodes()._CopyNodes( rRg, rInsPos, bMakeNewFrames, true ); + m_rDoc.GetNodes().CopyNodes( rRg, rInsPos, bMakeNewFrames, true ); ++aSavePos; if( bEndIsEqualEndPos ) const_cast<SwNodeIndex&>(rRg.aEnd) = aSavePos; @@ -3195,7 +3195,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly( SwNodeRange aCpyRange( aSavePos, rInsPos ); // Also copy all bookmarks - // guess this must be done before the _DelDummyNodes below as that + // guess this must be done before the DelDummyNodes below as that // deletes nodes so would mess up the index arithmetic if( m_rDoc.getIDocumentMarkAccess()->getAllMarksCount() ) { @@ -3218,7 +3218,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly( if( bDelRedlines && ( nsRedlineMode_t::REDLINE_DELETE_REDLINES & pDest->getIDocumentRedlineAccess().GetRedlineMode() )) lcl_DeleteRedlines( rRg, aCpyRange ); - pDest->GetNodes()._DelDummyNodes( aCpyRange ); + pDest->GetNodes().DelDummyNodes( aCpyRange ); } // TODO: there is a limitation here in that it's not possible to pass a start @@ -3237,7 +3237,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( // and then only copy them. This maintains the ordering numbers (which are only // managed in the DrawModel). SwDoc *const pDest = rStartIdx.GetNode().GetDoc(); - ::std::set< _ZSortFly > aSet; + ::std::set< ZSortFly > aSet; const size_t nArrLen = m_rDoc.GetSpzFrameFormats()->size(); SwTextBoxHelper::SavedLink aOldTextBoxes; @@ -3322,7 +3322,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( // Make sure draw formats don't refer to content, so that such // content can be removed without problems. SwTextBoxHelper::resetLink(pFormat, aOldContent); - aSet.insert( _ZSortFly( pFormat, pAnchor, nArrLen + aSet.size() )); + aSet.insert( ZSortFly( pFormat, pAnchor, nArrLen + aSet.size() )); } } @@ -3330,7 +3330,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( // They are stored as matching the originals, so that we will be later // able to build the chains accordingly. ::std::vector< SwFrameFormat* > aVecSwFrameFormat; - ::std::set< _ZSortFly >::const_iterator it=aSet.begin(); + ::std::set< ZSortFly >::const_iterator it=aSet.begin(); while (it != aSet.end()) { @@ -3343,7 +3343,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( // position can *not* be determined by the difference of the current // anchor position to the start of the copied range, because not // complete selected sections in the copied range aren't copied - see - // method <SwNodes::_CopyNodes(..)>. + // method <SwNodes::CopyNodes(..)>. // Thus, the new anchor position in the destination document is found // by counting the text nodes. if ((aAnchor.GetAnchorId() == FLY_AT_PARA) || @@ -3448,14 +3448,14 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( if ( aSet.size() == aVecSwFrameFormat.size() ) { size_t n = 0; - for (::std::set< _ZSortFly >::const_iterator nIt=aSet.begin() ; nIt != aSet.end(); ++nIt, ++n ) + for (::std::set< ZSortFly >::const_iterator nIt=aSet.begin() ; nIt != aSet.end(); ++nIt, ++n ) { const SwFrameFormat *pFormatN = (*nIt).GetFormat(); const SwFormatChain &rChain = pFormatN->GetChain(); int nCnt = int(nullptr != rChain.GetPrev()); nCnt += rChain.GetNext() ? 1: 0; size_t k = 0; - for (::std::set< _ZSortFly >::const_iterator kIt=aSet.begin() ; kIt != aSet.end(); ++kIt, ++k ) + for (::std::set< ZSortFly >::const_iterator kIt=aSet.begin() ; kIt != aSet.end(); ++kIt, ++k ) { const SwFrameFormat *pFormatK = (*kIt).GetFormat(); if ( rChain.GetPrev() == pFormatK ) @@ -3696,7 +3696,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam) // Delete and move all "Flys at the paragraph", which are within the Selection DelFlyInRange(rPam.GetMark()->nNode, rPam.GetPoint()->nNode); - _DelBookmarks( + DelBookmarks( pStt->nNode, pEnd->nNode, nullptr, @@ -4042,7 +4042,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt return bRet; } -SwFlyFrameFormat* DocumentContentOperationsManager::_InsNoTextNode( const SwPosition& rPos, SwNoTextNode* pNode, +SwFlyFrameFormat* DocumentContentOperationsManager::InsNoTextNode( const SwPosition& rPos, SwNoTextNode* pNode, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat* pFrameFormat) @@ -4050,7 +4050,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::_InsNoTextNode( const SwPosi SwFlyFrameFormat *pFormat = nullptr; if( pNode ) { - pFormat = m_rDoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA, + pFormat = m_rDoc.MakeFlySection_( rPos, *pNode, FLY_AT_PARA, pFlyAttrSet, pFrameFormat ); if( pGrfAttrSet ) pNode->SetAttr( *pGrfAttrSet ); diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index dfc542de6667..e45ddf8f4fa4 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -213,9 +213,9 @@ SwDrawModel* DocumentDrawModelManager::GetDrawModel() return mpDrawModel; } -SwDrawModel* DocumentDrawModelManager::_MakeDrawModel() +SwDrawModel* DocumentDrawModelManager::MakeDrawModel_() { - OSL_ENSURE( !mpDrawModel, "_MakeDrawModel: Why?" ); + OSL_ENSURE( !mpDrawModel, "MakeDrawModel_: Why?" ); InitDrawModel(); SwViewShell* const pSh = m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell(); if ( pSh ) @@ -235,7 +235,7 @@ SwDrawModel* DocumentDrawModelManager::_MakeDrawModel() SwDrawModel* DocumentDrawModelManager::GetOrCreateDrawModel() { - return GetDrawModel() ? GetDrawModel() : _MakeDrawModel(); + return GetDrawModel() ? GetDrawModel() : MakeDrawModel_(); } SdrLayerID DocumentDrawModelManager::GetHeavenId() const diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index ea5350fca740..199ccccfde13 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -77,7 +77,7 @@ namespace #endif - void lcl_CalcField( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpField& rSGEField, + void lcl_CalcField( SwDoc& rDoc, SwCalc& rCalc, const SetGetExpField& rSGEField, SwDBManager* pMgr ) { const SwTextField* pTextField = rSGEField.GetTextField(); @@ -708,7 +708,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt ) { SwPosition aPos( *pTableNd ); if( GetBodyTextNode( m_rDoc, aPos, *pFrame ) ) - FieldsToCalc( *pCalc, _SetGetExpField( + FieldsToCalc( *pCalc, SetGetExpField( aPos.nNode, pFormatField->GetTextField(), &aPos.nContent )); else @@ -720,7 +720,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt ) // create index to determine the TextNode SwNodeIndex aIdx( rTextNd ); FieldsToCalc( *pCalc, - _SetGetExpField( aIdx, pFormatField->GetTextField() )); + SetGetExpField( aIdx, pFormatField->GetTextField() )); } SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() ); @@ -777,7 +777,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt ) { SwPosition aPos( *pCNd ); if( GetBodyTextNode( m_rDoc, aPos, *pFrame ) ) - FieldsToCalc( *pCalc, _SetGetExpField( aPos.nNode )); + FieldsToCalc( *pCalc, SetGetExpField( aPos.nNode )); else pFrame = nullptr; } @@ -786,7 +786,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt ) { // create index to determine the TextNode SwNodeIndex aIdx( *pTableNd ); - FieldsToCalc( *pCalc, _SetGetExpField( aIdx )); + FieldsToCalc( *pCalc, SetGetExpField( aIdx )); } SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() ); @@ -852,7 +852,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp const sal_uInt16 nStrFormatCnt = static_cast<sal_uInt16>(nHashSize); OSL_ENSURE( nStrFormatCnt == nHashSize, "Downcasting to sal_uInt16 lost information!" ); SwHash** pHashStrTable = new SwHash*[ nStrFormatCnt ]; - memset( pHashStrTable, 0, sizeof( _HashStr* ) * nStrFormatCnt ); + memset( pHashStrTable, 0, sizeof( HashStr* ) * nStrFormatCnt ); { const SwFieldType* pFieldType; @@ -869,11 +869,11 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp SwHash* pFnd = Find( rNm, pHashStrTable, nStrFormatCnt, &nPos ); if( pFnd ) // modify entry in the hash table - static_cast<_HashStr*>(pFnd)->aSetStr = sExpand; + static_cast<HashStr*>(pFnd)->aSetStr = sExpand; else // insert the new entry - *(pHashStrTable + nPos ) = new _HashStr( rNm, sExpand, - static_cast<_HashStr*>(*(pHashStrTable + nPos)) ); + *(pHashStrTable + nPos ) = new HashStr( rNm, sExpand, + static_cast<HashStr*>(*(pHashStrTable + nPos)) ); } break; case RES_SETEXPFLD: @@ -900,7 +900,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp // Make sure we don't hide all sections, which would lead to a crash. First, count how many of them do we have. int nShownSections = 0; - for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it ) + for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it ) { SwSection* pSect = const_cast<SwSection*>((*it)->GetSection()); if ( pSect && !pSect->IsCondHidden()) @@ -908,7 +908,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp } OUString aNew; - for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it ) + for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it ) { SwSection* pSect = const_cast<SwSection*>((*it)->GetSection()); if( pSect ) @@ -1017,13 +1017,13 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp if( pFnd ) { // Modify entry in the hash table - static_cast<_HashStr*>(pFnd)->aSetStr = value; + static_cast<HashStr*>(pFnd)->aSetStr = value; } else { // insert new entry - *(pHashStrTable + nPos ) = new _HashStr( rName, - value, static_cast<_HashStr *>(*(pHashStrTable + nPos))); + *(pHashStrTable + nPos ) = new HashStr( rName, + value, static_cast<HashStr *>(*(pHashStrTable + nPos))); } #endif } @@ -1066,16 +1066,16 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp SwHash* pFnd = Find( aNew, pHashStrTable, nStrFormatCnt, &nPos ); if( pFnd ) // Modify entry in the hash table - static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr(); + static_cast<HashStr*>(pFnd)->aSetStr = pSField->GetExpStr(); else // insert new entry - *(pHashStrTable + nPos ) = pFnd = new _HashStr( aNew, + *(pHashStrTable + nPos ) = pFnd = new HashStr( aNew, pSField->GetExpStr(), - static_cast<_HashStr*>(*(pHashStrTable + nPos) )); + static_cast<HashStr*>(*(pHashStrTable + nPos) )); // Extension for calculation with Strings SwSbxValue aValue; - aValue.PutString( static_cast<_HashStr*>(pFnd)->aSetStr ); + aValue.PutString( static_cast<HashStr*>(pFnd)->aSetStr ); aCalc.VarChange( aNew, aValue ); } } @@ -1377,7 +1377,7 @@ void DocumentFieldsManager::SetFixFields( const DateTime* pNewDateTime ) m_rDoc.getIDocumentState().ResetModified(); } -void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const _SetGetExpField& rToThisField ) +void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const SetGetExpField& rToThisField ) { // create the sorted list of all SetFields mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_CALC ); @@ -1392,10 +1392,10 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const _SetGetExpField& if( !mpUpdateFields->GetSortLst()->empty() ) { - _SetGetExpFields::const_iterator const itLast = + SetGetExpFields::const_iterator const itLast = mpUpdateFields->GetSortLst()->upper_bound( - const_cast<_SetGetExpField*>(&rToThisField)); - for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it ) + const_cast<SetGetExpField*>(&rToThisField)); + for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it ) lcl_CalcField( m_rDoc, rCalc, **it, pMgr ); } #if HAVE_FEATURE_DBCONNECTIVITY @@ -1416,7 +1416,7 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_ pMgr->CloseAll(false); #endif - for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); + for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end() && ( (*it)->GetNode() < nLastNd || ( (*it)->GetNode() == nLastNd && (*it)->GetContent() <= nLastCnt ) @@ -1432,7 +1432,7 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_ } void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& rTableSize, - const _SetGetExpField& rToThisField ) + const SetGetExpField& rToThisField ) { // create the sorted list of all SetFields mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_EXPAND ); @@ -1442,13 +1442,13 @@ void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& r // Try to fabricate an uneven number. rTableSize = (( mpUpdateFields->GetSortLst()->size() / 7 ) + 1 ) * 7; ppHashTable = new SwHash*[ rTableSize ]; - memset( ppHashTable, 0, sizeof( _HashStr* ) * rTableSize ); + memset( ppHashTable, 0, sizeof( HashStr* ) * rTableSize ); - _SetGetExpFields::const_iterator const itLast = + SetGetExpFields::const_iterator const itLast = mpUpdateFields->GetSortLst()->upper_bound( - const_cast<_SetGetExpField*>(&rToThisField)); + const_cast<SetGetExpField*>(&rToThisField)); - for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it ) + for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it ) { const SwTextField* pTextField = (*it)->GetTextField(); if( !pTextField ) @@ -1479,11 +1479,11 @@ void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& r SwHash* pFnd = Find( aNew, ppHashTable, rTableSize, &nPos ); if( pFnd ) // modify entry in the hash table - static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr(); + static_cast<HashStr*>(pFnd)->aSetStr = pSField->GetExpStr(); else // insert the new entry - *(ppHashTable + nPos ) = new _HashStr( aNew, - pSField->GetExpStr(), static_cast<_HashStr*>(*(ppHashTable + nPos)) ); + *(ppHashTable + nPos ) = new HashStr( aNew, + pSField->GetExpStr(), static_cast<HashStr*>(*(ppHashTable + nPos)) ); } break; case RES_DBFLD: @@ -1498,13 +1498,13 @@ void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& r if( pFnd ) { // modify entry in the hash table - static_cast<_HashStr*>(pFnd)->aSetStr = value; + static_cast<HashStr*>(pFnd)->aSetStr = value; } else { // insert the new entry - *(ppHashTable + nPos ) = new _HashStr( rName, - value, static_cast<_HashStr *>(*(ppHashTable + nPos))); + *(ppHashTable + nPos ) = new HashStr( rName, + value, static_cast<HashStr *>(*(ppHashTable + nPos))); } } break; @@ -1566,7 +1566,7 @@ void DocumentFieldsManager::GCFieldTypes() RemoveFieldType( n ); } -void DocumentFieldsManager::_InitFieldTypes() // is being called by the CTOR +void DocumentFieldsManager::InitFieldTypes() // is being called by the CTOR { // Field types mpFieldTypes->push_back( new SwDateTimeFieldType(&m_rDoc) ); diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index cd75d2416342..73b891425b30 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -51,13 +51,13 @@ using namespace ::com::sun::star; //Helper functions for this file namespace { - struct _FindItem + struct FindItem { const OUString m_Item; SwTableNode* pTableNd; SwSectionNode* pSectNd; - explicit _FindItem(const OUString& rS) + explicit FindItem(const OUString& rS) : m_Item(rS), pTableNd(nullptr), pSectNd(nullptr) {} }; @@ -110,7 +110,7 @@ namespace } - bool lcl_FindSection( const SwSectionFormat* pSectFormat, _FindItem * const pItem, bool bCaseSensitive ) + bool lcl_FindSection( const SwSectionFormat* pSectFormat, FindItem * const pItem, bool bCaseSensitive ) { SwSection* pSect = pSectFormat->GetSection(); if( pSect ) @@ -139,7 +139,7 @@ namespace return true; } - bool lcl_FindTable( const SwFrameFormat* pTableFormat, _FindItem * const pItem ) + bool lcl_FindTable( const SwFrameFormat* pTableFormat, FindItem * const pItem ) { OUString sNm( GetAppCharClass().lowercase( pTableFormat->GetName() )); if ( sNm == pItem->m_Item ) @@ -253,7 +253,7 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O // Do we already have the Item? OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem)); - _FindItem aPara( sItem ); + FindItem aPara( sItem ); for( const SwSectionFormat* pFormat : m_rDoc.GetSections() ) { if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive))) @@ -269,7 +269,7 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O bCaseSensitive = false; } - _FindItem aPara( GetAppCharClass().lowercase( rItem )); + FindItem aPara( GetAppCharClass().lowercase( rItem )); for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() ) { if (!(lcl_FindTable(pFormat, &aPara))) @@ -298,7 +298,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O // Do we already have the Item? OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem)); - _FindItem aPara( sItem ); + FindItem aPara( sItem ); for( const SwSectionFormat* pFormat : m_rDoc.GetSections() ) { if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive))) @@ -315,7 +315,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O } OUString sItem(GetAppCharClass().lowercase(rItem)); - _FindItem aPara( sItem ); + FindItem aPara( sItem ); for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() ) { if (!(lcl_FindTable(pFormat, &aPara))) @@ -346,7 +346,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O if(pObj) return pObj; - _FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem)); + FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem)); // sections for( const SwSectionFormat* pFormat : m_rDoc.GetSections() ) { @@ -369,7 +369,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O bCaseSensitive = false; } - _FindItem aPara( GetAppCharClass().lowercase(rItem) ); + FindItem aPara( GetAppCharClass().lowercase(rItem) ); // tables for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() ) { @@ -454,7 +454,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, OUString sCmp( sItem.copy( nPos + 1 )); sItem = rCC.lowercase( sItem ); - _FindItem aPara( sName ); + FindItem aPara( sName ); if( sCmp == "table" ) { @@ -536,7 +536,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, return static_cast<bool>(rpPam); } - _FindItem aPara( bCaseSensitive ? sItem : rCC.lowercase( sItem ) ); + FindItem aPara( bCaseSensitive ? sItem : rCC.lowercase( sItem ) ); if( !m_rDoc.GetSections().empty() ) { diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index a4a31be608fd..9c1cd3368e8b 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -1163,10 +1163,10 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId ) switch (nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) ) { case POOLGRP_CHARFMT: - pNewFormat = m_rDoc._MakeCharFormat(aNm, pDeriveFormat, false, true); + pNewFormat = m_rDoc.MakeCharFormat_(aNm, pDeriveFormat, false, true); break; case POOLGRP_FRAMEFMT: - pNewFormat = m_rDoc._MakeFrameFormat(aNm, pDeriveFormat, false, true); + pNewFormat = m_rDoc.MakeFrameFormat_(aNm, pDeriveFormat, false, true); break; default: break; diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 1e15fe7a9c38..3462e97f08f2 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -500,10 +500,10 @@ void SwDoc::ChgDBData(const SwDBData& rNewData) getIDocumentFieldsAccess().GetSysFieldType(RES_DBNAMEFLD)->UpdateFields(); } -struct _PostItField : public _SetGetExpField +struct PostItField_ : public SetGetExpField { - _PostItField( const SwNodeIndex& rNdIdx, const SwTextField* pField, const SwIndex* pIdx = nullptr ) - : _SetGetExpField( rNdIdx, pField, pIdx ) {} + PostItField_( const SwNodeIndex& rNdIdx, const SwTextField* pField, const SwIndex* pIdx = nullptr ) + : SetGetExpField( rNdIdx, pField, pIdx ) {} sal_uInt16 GetPageNo( const StringRangeEnumerator &rRangeEnum, const std::set< sal_Int32 > &rPossiblePages, @@ -515,7 +515,7 @@ struct _PostItField : public _SetGetExpField } }; -sal_uInt16 _PostItField::GetPageNo( +sal_uInt16 PostItField_::GetPageNo( const StringRangeEnumerator &rRangeEnum, const std::set< sal_Int32 > &rPossiblePages, /* out */ sal_uInt16& rVirtPgNo, /* out */ sal_uInt16& rLineNo ) @@ -547,7 +547,7 @@ sal_uInt16 _PostItField::GetPageNo( bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, - _SetGetExpFields * pSrtLst ) + SetGetExpFields * pSrtLst ) { bool bHasPostIts = false; @@ -568,7 +568,7 @@ bool sw_GetPostIts( if (pSrtLst) { SwNodeIndex aIdx( pTextField->GetTextNode() ); - _PostItField* pNew = new _PostItField( aIdx, pTextField ); + PostItField_* pNew = new PostItField_( aIdx, pTextField ); pSrtLst->insert( pNew ); } else @@ -784,7 +784,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData( SwPostItMode nPostItMode = static_cast<SwPostItMode>( rOptions.getIntValue( "PrintAnnotationMode", 0 ) ); OSL_ENSURE(nPostItMode == SwPostItMode::NONE || rData.HasPostItData(), "print post-its without post-it data?" ); - const _SetGetExpFields::size_type nPostItCount = + const SetGetExpFields::size_type nPostItCount = rData.HasPostItData() ? rData.m_pPostItFields->size() : 0; if (nPostItMode != SwPostItMode::NONE && nPostItCount > 0) { @@ -812,9 +812,9 @@ void SwDoc::UpdatePagesForPrintingWithPostItData( // already get them in the correct order sal_uInt16 nVirtPg = 0, nLineNo = 0, nLastPageNum = 0, nPhyPageNum = 0; bool bIsFirstPostIt = true; - for (_SetGetExpFields::size_type i = 0; i < nPostItCount; ++i) + for (SetGetExpFields::size_type i = 0; i < nPostItCount; ++i) { - _PostItField& rPostIt = static_cast<_PostItField&>(*(*rData.m_pPostItFields)[ i ]); + PostItField_& rPostIt = static_cast<PostItField_&>(*(*rData.m_pPostItFields)[ i ]); nLastPageNum = nPhyPageNum; nPhyPageNum = rPostIt.GetPageNo( aRangeEnum, rData.GetValidPagesSet(), nVirtPg, nLineNo ); @@ -1275,7 +1275,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm } SwNodeRange aRange( *rOutNds[ i ], 0, *rOutNds[ i ], nEndOfs ); - GetNodes()._Copy( aRange, aEndOfDoc ); + GetNodes().Copy_( aRange, aEndOfDoc ); } const SwTextFormatColls *pColl = pExtDoc->GetTextFormatColls(); for( SwTextFormatColls::size_type i = 0; i < pColl->size(); ++i ) diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index e8fff02eeac1..d87b9d567081 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -1309,9 +1309,9 @@ void SaveBookmark::SetInDoc( } } -// _DelBookmarks +// DelBookmarks -void _DelBookmarks( +void DelBookmarks( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector<SaveBookmark> * pSaveBkmk, diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx index e0797bd849cc..5c1e6c603167 100644 --- a/sw/source/core/doc/docchart.cxx +++ b/sw/source/core/doc/docchart.cxx @@ -101,13 +101,13 @@ void SwDoc::DoUpdateAllCharts() nullptr != ( pTableNd = pTmpTable->GetTableNode() ) && pTableNd->GetNodes().IsDocNodes() ) { - _UpdateCharts( *pTmpTable, *pVSh ); + UpdateCharts_( *pTmpTable, *pVSh ); } } } } -void SwDoc::_UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const +void SwDoc::UpdateCharts_( const SwTable& rTable, SwViewShell const & rVSh ) const { OUString aName( rTable.GetFrameFormat()->GetName() ); SwStartNode *pStNd; @@ -138,7 +138,7 @@ void SwDoc::UpdateCharts( const OUString &rName ) const SwViewShell const * pVSh = getIDocumentLayoutAccess().GetCurrentViewShell(); if( pVSh ) - _UpdateCharts( *pTmpTable, *pVSh ); + UpdateCharts_( *pTmpTable, *pVSh ); } } diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 0e2ee5e37e1e..d7cab28d9280 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -180,17 +180,17 @@ public: class Hash { - struct _HashData + struct HashData { sal_uLong nNext, nHash; const SwCompareLine* pLine; - _HashData() + HashData() : nNext( 0 ), nHash( 0 ), pLine(nullptr) {} }; sal_uLong* pHashArr; - _HashData* pDataArr; + HashData* pDataArr; sal_uLong nCount, nPrime; public: @@ -528,7 +528,7 @@ static const sal_uLong primes[] = }; int i; - pDataArr = new _HashData[ nSize ]; + pDataArr = new HashData[ nSize ]; pDataArr[0].nNext = 0; pDataArr[0].nHash = 0; pDataArr[0].pLine = nullptr; diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx index a93cc46acb04..9496e968cfd9 100644 --- a/sw/source/core/doc/doccorr.cxx +++ b/sw/source/core/doc/doccorr.cxx @@ -111,7 +111,7 @@ void PaMCorrAbs( const SwPaM& rRange, } while ( (_pStackCursor != nullptr ) && ((_pStackCursor = static_cast<SwPaM *>(_pStackCursor->GetNext())) != pCursorShell->GetStackCursor()) ); - for(SwPaM& rPaM : const_cast<SwShellCursor*>(pCursorShell->_GetCursor())->GetRingContainer()) + for(SwPaM& rPaM : const_cast<SwShellCursor*>(pCursorShell->GetCursor_())->GetRingContainer()) { lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos ); } @@ -214,7 +214,7 @@ void SwDoc::CorrAbs( SwPosition aStart(*rRange.Start()); SwPosition aEnd(*rRange.End()); - _DelBookmarks( aStart.nNode, aEnd.nNode, nullptr, &aStart.nContent, &aEnd.nContent ); + DelBookmarks( aStart.nNode, aEnd.nNode, nullptr, &aStart.nContent, &aEnd.nContent ); if(bMoveCursor) ::PaMCorrAbs(rRange, rNewPos); @@ -226,7 +226,7 @@ void SwDoc::CorrAbs( const SwPosition& rNewPos, bool bMoveCursor ) { - _DelBookmarks( rStartNode, rEndNode ); + DelBookmarks( rStartNode, rEndNode ); if(bMoveCursor) { @@ -262,7 +262,7 @@ void PaMCorrRel( const SwNodeIndex &rOldNode, } while ( (_pStackCursor != nullptr ) && ((_pStackCursor = static_cast<SwPaM *>(_pStackCursor->GetNext())) != pCursorShell->GetStackCursor()) ); - SwPaM* pStartPaM = pCursorShell->_GetCursor(); + SwPaM* pStartPaM = pCursorShell->GetCursor_(); for(SwPaM& rPaM : pStartPaM->GetRingContainer()) { lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx); diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index ebd8cc312f99..43cb12145782 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -290,7 +290,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader &rHe SwNodeRange aRange( aRCnt.GetContentIdx()->GetNode(), 0, *aRCnt.GetContentIdx()->GetNode().EndOfSectionNode() ); aTmp = *pSttNd->EndOfSectionNode(); - GetNodes()._Copy( aRange, aTmp, false ); + GetNodes().Copy_( aRange, aTmp, false ); aTmp = *pSttNd; GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 0, aTmp); @@ -362,7 +362,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFo SwNodeRange aRange( aRCnt.GetContentIdx()->GetNode(), 0, *aRCnt.GetContentIdx()->GetNode().EndOfSectionNode() ); aTmp = *pSttNd->EndOfSectionNode(); - GetNodes()._Copy( aRange, aTmp, false ); + GetNodes().Copy_( aRange, aTmp, false ); aTmp = *pSttNd; GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 0, aTmp); diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index ff1f0bae3740..3edbe8b22429 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -178,7 +178,7 @@ static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* _pFrameFormat, _pFrameFormat->PosAttrSet(); // #i34750# - keep current object rectangle for drawing // objects. The object rectangle is used on events from the drawing layer - // to adjust the positioning attributes - see <SwDrawContact::_Changed(..)>. + // to adjust the positioning attributes - see <SwDrawContact::Changed_(..)>. { const SwAnchoredObject* pAnchoredObj = pContact->GetAnchoredObj( &_rSdrObj ); if ( dynamic_cast<const SwAnchoredDrawObject*>( pAnchoredObj) != nullptr ) @@ -478,7 +478,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView ) return bCallBase; } -_ZSortFly::_ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAn, +ZSortFly::ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAn, sal_uInt32 nArrOrdNum ) : pFormat( pFrameFormat ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum ) { diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 02df0f3e5605..ad4c8dbdccf7 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -53,14 +53,14 @@ using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::i18n; -void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx, +void RestFlyInRange( SaveFlyArr & rArr, const SwNodeIndex& rSttIdx, const SwNodeIndex* pInsertPos ) { SwPosition aPos( rSttIdx ); for( size_t n = 0; n < rArr.size(); ++n ) { // create new anchor - _SaveFly& rSave = rArr[n]; + SaveFly& rSave = rArr[n]; SwFrameFormat* pFormat = rSave.pFrameFormat; if( rSave.bInsertPosition ) @@ -86,7 +86,7 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx, sw::CheckAnchoredFlyConsistency(*rSttIdx.GetNode().GetDoc()); } -void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr ) +void SaveFlyInRange( const SwNodeRange& rRg, SaveFlyArr& rArr ) { SwFrameFormats& rFormats = *rRg.aStart.GetNode().GetDoc()->GetSpzFrameFormats(); for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n ) @@ -99,7 +99,7 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr ) (FLY_AT_CHAR == pAnchor->GetAnchorId())) && rRg.aStart <= pAPos->nNode && pAPos->nNode < rRg.aEnd ) { - _SaveFly aSave( pAPos->nNode.GetIndex() - rRg.aStart.GetIndex(), + SaveFly aSave( pAPos->nNode.GetIndex() - rRg.aStart.GetIndex(), pFormat, false ); rArr.push_back( aSave ); pFormat->DelFrames(); @@ -113,8 +113,8 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr ) sw::CheckAnchoredFlyConsistency(*rRg.aStart.GetNode().GetDoc()); } -void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos, - _SaveFlyArr& rArr, bool bMoveAllFlys ) +void SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos, + SaveFlyArr& rArr, bool bMoveAllFlys ) { SwFrameFormats& rFormats = *rPam.GetPoint()->nNode.GetNode().GetDoc()->GetSpzFrameFormats(); SwFrameFormat* pFormat; @@ -165,7 +165,7 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos, ( bInsPos = (rInsPos == pAPos->nNode) )) { - _SaveFly aSave( pAPos->nNode.GetIndex() - rSttNdIdx.GetIndex(), + SaveFly aSave( pAPos->nNode.GetIndex() - rSttNdIdx.GetIndex(), pFormat, bInsPos ); rArr.push_back( aSave ); pFormat->DelFrames(); @@ -239,7 +239,7 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx, // because of unnecessary expanded redlines // From now on this class saves the redline positions of all redlines which ends exact at the // insert position (node _and_ content index) -_SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nCnt ) +SaveRedlEndPosForRestore::SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nCnt ) : pSavArr( nullptr ), pSavIdx( nullptr ), nSavContent( nCnt ) { SwNode& rNd = rInsIdx.GetNode(); @@ -265,13 +265,13 @@ _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx } } -_SaveRedlEndPosForRestore::~_SaveRedlEndPosForRestore() +SaveRedlEndPosForRestore::~SaveRedlEndPosForRestore() { delete pSavArr; delete pSavIdx; } -void _SaveRedlEndPosForRestore::_Restore() +void SaveRedlEndPosForRestore::Restore_() { ++(*pSavIdx); SwContentNode* pNode = pSavIdx->GetNode().GetContentNode(); diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 8f042a45ebef..0d141d29a06c 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -68,7 +68,7 @@ using namespace ::com::sun::star::uno; // the StartIndex can be supplied optionally (e.g. if it was queried before - is a virtual // method otherwise!) -_SetGetExpField::_SetGetExpField( +SetGetExpField::SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextField* pField, const SwIndex* pIdx ) @@ -84,7 +84,7 @@ _SetGetExpField::_SetGetExpField( nContent = 0; } -_SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx, +SetGetExpField::SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextINetFormat& rINet, const SwIndex* pIdx ) { eSetGetExpFieldType = TEXTINET; @@ -99,7 +99,7 @@ _SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx, // Extension for Sections: // these always have content position 0xffffffff! // There is never a field on this, only up to COMPLETE_STRING possible -_SetGetExpField::_SetGetExpField( const SwSectionNode& rSectNd, +SetGetExpField::SetGetExpField( const SwSectionNode& rSectNd, const SwPosition* pPos ) { eSetGetExpFieldType = SECTIONNODE; @@ -117,7 +117,7 @@ _SetGetExpField::_SetGetExpField( const SwSectionNode& rSectNd, } } -_SetGetExpField::_SetGetExpField( const SwTableBox& rTBox, const SwPosition* pPos ) +SetGetExpField::SetGetExpField( const SwTableBox& rTBox, const SwPosition* pPos ) { eSetGetExpFieldType = TABLEBOX; CNTNT.pTBox = &rTBox; @@ -141,7 +141,7 @@ _SetGetExpField::_SetGetExpField( const SwTableBox& rTBox, const SwPosition* pPo } } -_SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx, +SetGetExpField::SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextTOXMark& rTOX, const SwIndex* pIdx ) { @@ -154,7 +154,7 @@ _SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx, nContent = rTOX.GetStart(); } -_SetGetExpField::_SetGetExpField( const SwPosition& rPos ) +SetGetExpField::SetGetExpField( const SwPosition& rPos ) { eSetGetExpFieldType = CRSRPOS; CNTNT.pPos = &rPos; @@ -162,7 +162,7 @@ _SetGetExpField::_SetGetExpField( const SwPosition& rPos ) nContent = rPos.nContent.GetIndex(); } -_SetGetExpField::_SetGetExpField( const SwFlyFrameFormat& rFlyFormat, +SetGetExpField::SetGetExpField( const SwFlyFrameFormat& rFlyFormat, const SwPosition* pPos ) { eSetGetExpFieldType = FLYFRAME; @@ -180,7 +180,7 @@ _SetGetExpField::_SetGetExpField( const SwFlyFrameFormat& rFlyFormat, } } -void _SetGetExpField::GetPosOfContent( SwPosition& rPos ) const +void SetGetExpField::GetPosOfContent( SwPosition& rPos ) const { const SwNode* pNd = GetNodeFromContent(); if( pNd ) @@ -198,7 +198,7 @@ void _SetGetExpField::GetPosOfContent( SwPosition& rPos ) const } } -void _SetGetExpField::SetBodyPos( const SwContentFrame& rFrame ) +void SetGetExpField::SetBodyPos( const SwContentFrame& rFrame ) { if( !rFrame.IsInDocBody() ) { @@ -213,7 +213,7 @@ void _SetGetExpField::SetBodyPos( const SwContentFrame& rFrame ) } } -bool _SetGetExpField::operator==( const _SetGetExpField& rField ) const +bool SetGetExpField::operator==( const SetGetExpField& rField ) const { return nNode == rField.nNode && nContent == rField.nContent @@ -222,7 +222,7 @@ bool _SetGetExpField::operator==( const _SetGetExpField& rField ) const || CNTNT.pTextField == rField.CNTNT.pTextField ); } -bool _SetGetExpField::operator<( const _SetGetExpField& rField ) const +bool SetGetExpField::operator<( const SetGetExpField& rField ) const { if( nNode < rField.nNode || ( nNode == rField.nNode && nContent < rField.nContent )) return true; @@ -271,7 +271,7 @@ bool _SetGetExpField::operator<( const _SetGetExpField& rField ) const return GetCntPosFromContent() < rField.GetCntPosFromContent(); } -const SwNode* _SetGetExpField::GetNodeFromContent() const +const SwNode* SetGetExpField::GetNodeFromContent() const { const SwNode* pRet = nullptr; if( CNTNT.pTextField ) @@ -315,7 +315,7 @@ const SwNode* _SetGetExpField::GetNodeFromContent() const return pRet; } -sal_Int32 _SetGetExpField::GetCntPosFromContent() const +sal_Int32 SetGetExpField::GetCntPosFromContent() const { sal_Int32 nRet = 0; if( CNTNT.pTextField ) @@ -337,8 +337,8 @@ sal_Int32 _SetGetExpField::GetCntPosFromContent() const return nRet; } -_HashStr::_HashStr( const OUString& rName, const OUString& rText, - _HashStr* pNxt ) +HashStr::HashStr( const OUString& rName, const OUString& rText, + HashStr* pNxt ) : SwHash( rName ), aSetStr( rText ) { pNext = pNxt; @@ -349,7 +349,7 @@ OUString LookString( SwHash** ppTable, sal_uInt16 nSize, const OUString& rName ) { SwHash* pFnd = Find( comphelper::string::strip(rName, ' '), ppTable, nSize ); if( pFnd ) - return static_cast<_HashStr*>(pFnd)->aSetStr; + return static_cast<HashStr*>(pFnd)->aSetStr; return OUString(); } @@ -787,7 +787,7 @@ void SwDocUpdateField::InsDelFieldInFieldLst( bool bIns, const SwTextField& rFie { if( !bIns ) // if list is present and deleted return; // don't do a thing - pFieldSortLst = new _SetGetExpFields; + pFieldSortLst = new SetGetExpFields; } if( bIns ) // insert anew: @@ -796,7 +796,7 @@ void SwDocUpdateField::InsDelFieldInFieldLst( bool bIns, const SwTextField& rFie { // look up via the pTextField pointer. It is a sorted list, but it's sorted by node // position. Until this is found, the search for the pointer is already done. - for( _SetGetExpFields::size_type n = 0; n < pFieldSortLst->size(); ++n ) + for( SetGetExpFields::size_type n = 0; n < pFieldSortLst->size(); ++n ) if( &rField == (*pFieldSortLst)[ n ]->GetPointer() ) { delete (*pFieldSortLst)[n]; @@ -810,14 +810,14 @@ void SwDocUpdateField::MakeFieldList( SwDoc& rDoc, bool bAll, int eGetMode ) { if( !pFieldSortLst || bAll || !( eGetMode & nFieldLstGetMode ) || rDoc.GetNodes().Count() != nNodes ) - _MakeFieldList( rDoc, eGetMode ); + MakeFieldList_( rDoc, eGetMode ); } -void SwDocUpdateField::_MakeFieldList( SwDoc& rDoc, int eGetMode ) +void SwDocUpdateField::MakeFieldList_( SwDoc& rDoc, int eGetMode ) { // new version: walk all fields of the attribute pool delete pFieldSortLst; - pFieldSortLst = new _SetGetExpFields; + pFieldSortLst = new SetGetExpFields; // consider and unhide sections // with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>) @@ -1007,7 +1007,7 @@ void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFiel Point aPt; const SwContentFrame* pFrame = rTextNd.getLayoutFrame( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false ); - _SetGetExpField* pNew = nullptr; + SetGetExpField* pNew = nullptr; bool bIsInBody = false; if( !pFrame || pFrame->IsInDocBody() ) @@ -1021,7 +1021,7 @@ void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFiel // fields in hidden sections. So: In order to be updated, a field 1) // must have a frame, or 2) it must be in the document body. if( (pFrame != nullptr) || bIsInBody ) - pNew = new _SetGetExpField( aIdx, &rTField ); + pNew = new SetGetExpField( aIdx, &rTField ); } else { @@ -1030,7 +1030,7 @@ void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFiel bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrame ); OSL_ENSURE(bResult, "where is the Field"); (void) bResult; // unused in non-debug - pNew = new _SetGetExpField( aPos.nNode, &rTField, &aPos.nContent ); + pNew = new SetGetExpField( aPos.nNode, &rTField, &aPos.nContent ); } // always set the BodyTextFlag in GetExp or DB fields @@ -1054,7 +1054,7 @@ void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFiel void SwDocUpdateField::GetBodyNode( const SwSectionNode& rSectNd ) { const SwDoc& rDoc = *rSectNd.GetDoc(); - _SetGetExpField* pNew = nullptr; + SetGetExpField* pNew = nullptr; if( rSectNd.GetIndex() < rDoc.GetNodes().GetEndOfExtras().GetIndex() ) { @@ -1077,13 +1077,13 @@ void SwDocUpdateField::GetBodyNode( const SwSectionNode& rSectNd ) bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrame ); OSL_ENSURE(bResult, "where is the Field"); (void) bResult; // unused in non-debug - pNew = new _SetGetExpField( rSectNd, &aPos ); + pNew = new SetGetExpField( rSectNd, &aPos ); } while( false ); } if( !pNew ) - pNew = new _SetGetExpField( rSectNd ); + pNew = new SetGetExpField( rSectNd ); if( !pFieldSortLst->insert( pNew ).second ) delete pNew; diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 08c3fcbce6e8..88518874a544 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -839,7 +839,7 @@ SwFrameFormat *SwDoc::MakeFrameFormat(const OUString &rFormatName, return pFormat; } -SwFormat *SwDoc::_MakeFrameFormat(const OUString &rFormatName, +SwFormat *SwDoc::MakeFrameFormat_(const OUString &rFormatName, SwFormat *pDerivedFrom, bool bBroadcast, bool bAuto) { @@ -875,7 +875,7 @@ SwCharFormat *SwDoc::MakeCharFormat( const OUString &rFormatName, return pFormat; } -SwFormat *SwDoc::_MakeCharFormat(const OUString &rFormatName, +SwFormat *SwDoc::MakeCharFormat_(const OUString &rFormatName, SwFormat *pDerivedFrom, bool bBroadcast, bool bAuto) { @@ -910,7 +910,7 @@ SwTextFormatColl* SwDoc::MakeTextFormatColl( const OUString &rFormatName, return pFormatColl; } -SwFormat *SwDoc::_MakeTextFormatColl(const OUString &rFormatName, +SwFormat *SwDoc::MakeTextFormatColl_(const OUString &rFormatName, SwFormat *pDerivedFrom, bool bBroadcast, bool bAuto) { @@ -1147,7 +1147,7 @@ SwFormat* SwDoc::CopyFormat( const SwFormat& rFormat, /// copy the frame format SwFrameFormat* SwDoc::CopyFrameFormat( const SwFrameFormat& rFormat ) { - return static_cast<SwFrameFormat*>(CopyFormat( rFormat, *GetFrameFormats(), &SwDoc::_MakeFrameFormat, + return static_cast<SwFrameFormat*>(CopyFormat( rFormat, *GetFrameFormats(), &SwDoc::MakeFrameFormat_, *GetDfltFrameFormat() )); } @@ -1155,7 +1155,7 @@ SwFrameFormat* SwDoc::CopyFrameFormat( const SwFrameFormat& rFormat ) SwCharFormat* SwDoc::CopyCharFormat( const SwCharFormat& rFormat ) { return static_cast<SwCharFormat*>(CopyFormat( rFormat, *GetCharFormats(), - &SwDoc::_MakeCharFormat, + &SwDoc::MakeCharFormat_, *GetDfltCharFormat() )); } @@ -1383,7 +1383,7 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader, const SwNode& rCSttNd = pContent->GetContentIdx()->GetNode(); SwNodeRange aRg( rCSttNd, 0, *rCSttNd.EndOfSectionNode() ); aTmpIdx = *pSttNd->EndOfSectionNode(); - rSrcNds._Copy( aRg, aTmpIdx ); + rSrcNds.Copy_( aRg, aTmpIdx ); aTmpIdx = *pSttNd; rSrcFormat.GetDoc()->GetDocumentContentOperationsManager().CopyFlyInFlyImpl( aRg, 0, aTmpIdx ); pNewFormat->SetFormatAttr( SwFormatContent( pSttNd )); @@ -1526,11 +1526,11 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles ) ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo()); CopyFormatArr( *rSource.mpCharFormatTable, *mpCharFormatTable, - &SwDoc::_MakeCharFormat, *mpDfltCharFormat ); + &SwDoc::MakeCharFormat_, *mpDfltCharFormat ); CopyFormatArr( *rSource.mpFrameFormatTable, *mpFrameFormatTable, - &SwDoc::_MakeFrameFormat, *mpDfltFrameFormat ); + &SwDoc::MakeFrameFormat_, *mpDfltFrameFormat ); CopyFormatArr( *rSource.mpTextFormatCollTable, *mpTextFormatCollTable, - &SwDoc::_MakeTextFormatColl, *mpDfltTextFormatColl ); + &SwDoc::MakeTextFormatColl_, *mpDfltTextFormatColl ); //To-Do: // a) in rtf export don't export our hideous pgdsctbl @@ -1710,7 +1710,7 @@ SwTableLineFormat* SwDoc::MakeTableLineFormat() return pFormat; } -void SwDoc::_CreateNumberFormatter() +void SwDoc::CreateNumberFormatter() { OSL_ENSURE( !mpNumberFormatter, "is already there" ); diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index 6e3c911e0742..edc1aaf8e300 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -302,7 +302,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, SwNodeRange aRg( *pStartNd, 0, aEndIdx.GetNode() ); SwNodeIndex aTmpIdx( pDoc->GetNodes().GetEndOfContent() ); - GetNodes()._Copy( aRg, aTmpIdx, false ); + GetNodes().Copy_( aRg, aTmpIdx, false ); // Delete the initial TextNode SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 2 ); @@ -437,7 +437,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, { SwNodeRange aRg( *pStartNd, *pSectEnd ); SwNodeIndex aIdx( *pSectEnd, 1 ); - GetNodes()._MoveNodes( aRg, GetNodes(), aIdx ); + GetNodes().MoveNodes( aRg, GetNodes(), aIdx ); } pSectNd = pStartNd->FindSectionNode(); } @@ -452,7 +452,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, { SwNodeRange aRg( *pSectNd, 1, aEndIdx, 1 ); SwNodeIndex aIdx( *pSectNd ); - GetNodes()._MoveNodes( aRg, GetNodes(), aIdx ); + GetNodes().MoveNodes( aRg, GetNodes(), aIdx ); } pSectNd = pStartNd->FindSectionNode(); diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx index 6a870069d1fa..d22aa01a2b7b 100644 --- a/sw/source/core/doc/docglos.cxx +++ b/sw/source/core/doc/docglos.cxx @@ -168,7 +168,7 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry, pContentNd, (pContentNd) ? pContentNd->Len() : 0 ); GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, nullptr ); - SwPaM *_pStartCursor = &rPaM, *__pStartCursor = _pStartCursor; + SwPaM *_pStartCursor = &rPaM, *_pStartCursor2 = _pStartCursor; do { SwPosition& rInsPos = *_pStartCursor->GetPoint(); @@ -193,7 +193,7 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry, if( pShell ) pShell->SaveTableBoxContent( &rInsPos ); } while( (_pStartCursor = static_cast<SwPaM *>(_pStartCursor->GetNext())) != - __pStartCursor ); + _pStartCursor2 ); GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, nullptr ); getIDocumentFieldsAccess().UnlockExpFields(); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index cad5f2c2cc45..e1109c52e042 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -161,7 +161,7 @@ SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, bool bMoveWithinDoc, return pObj; } -SwFlyFrameFormat* SwDoc::_MakeFlySection( const SwPosition& rAnchPos, +SwFlyFrameFormat* SwDoc::MakeFlySection_( const SwPosition& rAnchPos, const SwContentNode& rNode, RndStdIds eRequestId, const SfxItemSet* pFlySet, @@ -341,7 +341,7 @@ SwFlyFrameFormat* SwDoc::MakeFlySection( RndStdIds eAnchorType, static_cast<SwContentNode *>(pNewTextNd)->SetAttr(*pItem); } - pFormat = _MakeFlySection( *pAnchorPos, *pNewTextNd, + pFormat = MakeFlySection_( *pAnchorPos, *pNewTextNd, eAnchorType, pFlySet, pFrameFormat ); } return pFormat; diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index aca03fb1f769..a136c3576b4a 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -322,7 +322,7 @@ SwDoc::SwDoc() // Set BodyFormat for columns mpColumnContFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ) ); - GetDocumentFieldsManager()._InitFieldTypes(); + GetDocumentFieldsManager().InitFieldTypes(); // Create a default OutlineNumRule (for Filters) mpOutlineRule = new SwNumRule( SwNumRule::GetOutlineRuleName(), diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 5d6550450586..eb955f673b14 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -1197,7 +1197,7 @@ void SwRangeRedline::CopyToSection() // The IsRedlineMove() flag causes the behaviour of the // SwDoc::_CopyFlyInFly method to change, which will eventually be - // called by the pDoc->Copy line below (through SwDoc::_Copy, + // called by the pDoc->Copy line below (through SwDoc::Copy_, // SwDoc::CopyWithFlyInFly). This rather obscure bugfix // apparently never really worked. pDoc->getIDocumentRedlineAccess().SetRedlineMove( pStt->nContent == 0 ); diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 1fc9a2a80309..d92ee5c36149 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -49,7 +49,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList, sal_uInt16 nMode ) { const SwPaM *_pStartCursor = rPam.GetNext(), - *__pStartCursor = _pStartCursor; + *_pStartCursor2 = _pStartCursor; bool bCheckEmpty = &rPam != _pStartCursor; do { const SwPosition* pStt = _pStartCursor->Start(), @@ -66,7 +66,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList, aPam.SetMark(); *aPam.GetMark() = *pEnd; } - if( _SelectNextRubyChars( aPam, *pNew, nMode )) + if( SelectNextRubyChars( aPam, *pNew, nMode )) { rList.push_back(std::move(pNew)); aPam.DeleteMark(); @@ -85,7 +85,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList, } while( 30 > rList.size() && *aPam.GetPoint() < *pEnd ); } } while( 30 > rList.size() && - (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor ); + (_pStartCursor = _pStartCursor->GetNext()) != _pStartCursor2 ); return rList.size(); } @@ -100,7 +100,7 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, sal_uInt16 nListEntry = 0; const SwPaM *_pStartCursor = rPam.GetNext(), - *__pStartCursor = _pStartCursor; + *_pStartCursor2 = _pStartCursor; bool bCheckEmpty = &rPam != _pStartCursor; do { const SwPosition* pStt = _pStartCursor->Start(), @@ -118,7 +118,7 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, aPam.SetMark(); *aPam.GetMark() = *pEnd; } - if( _SelectNextRubyChars( aPam, aCheckEntry, nMode )) + if( SelectNextRubyChars( aPam, aCheckEntry, nMode )) { const SwRubyListEntry* pEntry = rList[ nListEntry++ ].get(); if( aCheckEntry.GetRubyAttr() != pEntry->GetRubyAttr() ) @@ -172,12 +172,12 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, } while( nListEntry < rList.size() && *aPam.GetPoint() < *pEnd ); } } while( 30 > rList.size() && - (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor ); + (_pStartCursor = _pStartCursor->GetNext()) != _pStartCursor2 ); GetIDocumentUndoRedo().EndUndo( UNDO_SETRUBYATTR, nullptr ); } -bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 ) +bool SwDoc::SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 ) { // Point must be the startposition, Mark is optional the end position SwPosition* pPos = rPam.GetPoint(); diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 9a2f762361bf..220e3cb90b18 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -242,7 +242,7 @@ SwSortBoxElement::~SwSortBoxElement() /// Get Key for a cell OUString SwSortBoxElement::GetKey(sal_uInt16 nKey) const { - const _FndBox* pFndBox; + const FndBox_* pFndBox; sal_uInt16 nCol = pOptions->aKeys[nKey]->nColumnId-1; if( SRT_ROWS == pOptions->eDirection ) @@ -271,7 +271,7 @@ OUString SwSortBoxElement::GetKey(sal_uInt16 nKey) const double SwSortBoxElement::GetValue( sal_uInt16 nKey ) const { - const _FndBox* pFndBox; + const FndBox_* pFndBox; sal_uInt16 nCol = pOptions->aKeys[nKey]->nColumnId-1; if( SRT_ROWS == pOptions->eDirection ) @@ -349,7 +349,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt) // First copy the range SwNodeIndex aEndIdx( pEnd->nNode, 1 ); SwNodeRange aRg( pStart->nNode, aEndIdx ); - GetNodes()._Copy( aRg, aEndIdx ); + GetNodes().Copy_( aRg, aEndIdx ); // range is new from pEnd->nNode+1 to aEndIdx getIDocumentRedlineAccess().DeleteRedline( *pRedlPam, true, USHRT_MAX ); @@ -490,9 +490,9 @@ bool SwDoc::SortTable(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt) // We begin sorting // Find all Boxes/Lines - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( rBoxes, &aFndBox ); + FndPara aPara( rBoxes, &aFndBox ); ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara ); } @@ -611,10 +611,10 @@ void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT, { for( sal_uInt16 i=0; i < rBox.GetCols(); ++i ) { // Get old cell position and remember it - const _FndBox* pSource = rBox.GetBox(i, nS); + const FndBox_* pSource = rBox.GetBox(i, nS); // new cell position - const _FndBox* pTarget = rBox.GetBox(i, nT); + const FndBox_* pTarget = rBox.GetBox(i, nT); const SwTableBox* pT = pTarget->GetBox(); const SwTableBox* pS = pSource->GetBox(); @@ -655,10 +655,10 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT, { for(sal_uInt16 i=0; i < rBox.GetRows(); ++i) { // Get old cell position and remember it - const _FndBox* pSource = rBox.GetBox(nS, i); + const FndBox_* pSource = rBox.GetBox(nS, i); // new cell position - const _FndBox* pTarget = rBox.GetBox(nT, i); + const FndBox_* pTarget = rBox.GetBox(nT, i); // and move it const SwTableBox* pT = pTarget->GetBox(); @@ -747,7 +747,7 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar, } /// Generate two-dimensional array of FndBoxes -FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) : +FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const FndBox_& rBox) : pDoc(pDocPtr), rBoxRef(rBox), pArr(nullptr), @@ -763,9 +763,9 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) : // Create linear array size_t nCount = static_cast<size_t>(nRows) * nCols; - pArr = new const _FndBox*[nCount]; - _FndBox** ppTmp = const_cast<_FndBox**>(pArr); - memset(ppTmp, 0, sizeof(const _FndBox*) * nCount); + pArr = new const FndBox_*[nCount]; + FndBox_** ppTmp = const_cast<FndBox_**>(pArr); + memset(ppTmp, 0, sizeof(const FndBox_*) * nCount); FillFlat( rBoxRef ); } @@ -773,7 +773,7 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) : FlatFndBox::~FlatFndBox() { - _FndBox** ppTmp = const_cast<_FndBox**>(pArr); + FndBox_** ppTmp = const_cast<FndBox_**>(pArr); delete [] ppTmp; if( ppItemSets ) @@ -781,14 +781,14 @@ FlatFndBox::~FlatFndBox() } /// All Lines of a Box need to have same number of Boxes -bool FlatFndBox::CheckLineSymmetry(const _FndBox& rBox) +bool FlatFndBox::CheckLineSymmetry(const FndBox_& rBox) { const FndLines_t &rLines = rBox.GetLines(); FndBoxes_t::size_type nBoxes {0}; for (FndLines_t::size_type i=0; i < rLines.size(); ++i) { - const _FndLine* pLn = rLines[i].get(); + const FndLine_* pLn = rLines[i].get(); const FndBoxes_t& rBoxes = pLn->GetBoxes(); // Number of Boxes of all Lines is unequal -> no symmetry @@ -803,14 +803,14 @@ bool FlatFndBox::CheckLineSymmetry(const _FndBox& rBox) } /// Check Box for symmetry (All Boxes of a Line need to have same number of Lines) -bool FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn) +bool FlatFndBox::CheckBoxSymmetry(const FndLine_& rLn) { const FndBoxes_t &rBoxes = rLn.GetBoxes(); FndLines_t::size_type nLines {0}; for (FndBoxes_t::size_type i = 0; i < rBoxes.size(); ++i) { - _FndBox const*const pBox = rBoxes[i].get(); + FndBox_ const*const pBox = rBoxes[i].get(); const FndLines_t& rLines = pBox->GetLines(); // Number of Lines of all Boxes is unequal -> no symmetry @@ -825,7 +825,7 @@ bool FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn) } /// Maximum count of Columns (Boxes) -sal_uInt16 FlatFndBox::GetColCount(const _FndBox& rBox) +sal_uInt16 FlatFndBox::GetColCount(const FndBox_& rBox) { const FndLines_t& rLines = rBox.GetLines(); // Iterate over Lines @@ -850,7 +850,7 @@ sal_uInt16 FlatFndBox::GetColCount(const _FndBox& rBox) } /// Maximum count of Rows (Lines) -sal_uInt16 FlatFndBox::GetRowCount(const _FndBox& rBox) +sal_uInt16 FlatFndBox::GetRowCount(const FndBox_& rBox) { const FndLines_t& rLines = rBox.GetLines(); if( rLines.empty() ) @@ -875,7 +875,7 @@ sal_uInt16 FlatFndBox::GetRowCount(const _FndBox& rBox) } /// Create a linear array of atomic FndBoxes -void FlatFndBox::FillFlat(const _FndBox& rBox, bool bLastBox) +void FlatFndBox::FillFlat(const FndBox_& rBox, bool bLastBox) { bool bModRow = false; const FndLines_t& rLines = rBox.GetLines(); @@ -890,7 +890,7 @@ void FlatFndBox::FillFlat(const _FndBox& rBox, bool bLastBox) for( FndBoxes_t::size_type j = 0; j < rBoxes.size(); ++j ) { // Check the Box if it's an atomic one - const _FndBox *const pBox = rBoxes[j].get(); + const FndBox_ *const pBox = rBoxes[j].get(); if( pBox->GetLines().empty() ) { @@ -935,10 +935,10 @@ void FlatFndBox::FillFlat(const _FndBox& rBox, bool bLastBox) } /// Access a specific Cell -const _FndBox* FlatFndBox::GetBox(sal_uInt16 n_Col, sal_uInt16 n_Row) const +const FndBox_* FlatFndBox::GetBox(sal_uInt16 n_Col, sal_uInt16 n_Row) const { sal_uInt16 nOff = n_Row * nCols + n_Col; - const _FndBox* pTmp = *(pArr + nOff); + const FndBox_* pTmp = *(pArr + nOff); OSL_ENSURE(n_Col < nCols && n_Row < nRows && pTmp, "invalid array access"); return pTmp; diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index ae2fda623a03..0cc41d437305 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1330,10 +1330,10 @@ void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl ) static long lcl_IsSOObject( const SvGlobalName& rFactoryNm ) { - static struct _SoObjType { + static struct SoObjType { long nFlag; // GlobalNameId - struct _GlobalNameIds { + struct GlobalNameIds { sal_uInt32 n1; sal_uInt16 n2, n3; sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15; @@ -1358,10 +1358,10 @@ static long lcl_IsSOObject( const SvGlobalName& rFactoryNm ) }; long nRet = 0; - for( const _SoObjType* pArr = aArr; !nRet && pArr->nFlag; ++pArr ) + for( const SoObjType* pArr = aArr; !nRet && pArr->nFlag; ++pArr ) for ( int n = 0; n < 4; ++n ) { - const _SoObjType::_GlobalNameIds& rId = pArr->aGlNmIds[ n ]; + const SoObjType::GlobalNameIds& rId = pArr->aGlNmIds[ n ]; if( !rId.n1 ) break; SvGlobalName aGlbNm( rId.n1, rId.n2, rId.n3, @@ -1625,7 +1625,7 @@ void SwTOXBaseSection::UpdatePageNum() const SwTextNode* pTextNd = pBase->pTOXNd->GetTextNode(); OSL_ENSURE( pTextNd, "no TextNode, wrong TOC" ); - _UpdatePageNum( const_cast<SwTextNode*>(pTextNd), aNums, aDescs, pMainNums, + UpdatePageNum_( const_cast<SwTextNode*>(pTextNd), aNums, aDescs, pMainNums, aIntl ); } DELETEZ(pMainNums); @@ -1651,7 +1651,7 @@ static bool lcl_HasMainEntry( const std::vector<sal_uInt16>* pMainEntryNums, sal return false; } -void SwTOXBaseSection::_UpdatePageNum( SwTextNode* pNd, +void SwTOXBaseSection::UpdatePageNum_( SwTextNode* pNd, const std::vector<sal_uInt16>& rNums, const std::vector<SwPageDesc*>& rDescs, const std::vector<sal_uInt16>* pMainEntryNums, diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx index 3e73206b0099..aeab4b21521a 100644 --- a/sw/source/core/doc/gctable.cxx +++ b/sw/source/core/doc/gctable.cxx @@ -30,7 +30,7 @@ inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, bool bTop ) return bTop ? pBox->GetTop() : pBox->GetBottom(); } -bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrameFormat& rFormat ) +bool SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrameFormat& rFormat ) { const SvxBorderLine* pBrd; const SfxPoolItem* pItem; @@ -44,15 +44,15 @@ bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrameFormat& rFormat ) return false; } -static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, _SwGCBorder_BoxBrd* pPara ); +static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, SwGCBorder_BoxBrd* pPara ); -static bool lcl_GCBorder_ChkBoxBrd_L( const SwTableLine* pLine, _SwGCBorder_BoxBrd* pPara ) +static bool lcl_GCBorder_ChkBoxBrd_L( const SwTableLine* pLine, SwGCBorder_BoxBrd* pPara ) { const SwTableBox* pBox = pLine->GetTabBoxes().front(); return lcl_GCBorder_ChkBoxBrd_B( pBox, pPara ); } -static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, _SwGCBorder_BoxBrd* pPara ) +static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, SwGCBorder_BoxBrd* pPara ) { if( !pBox->GetTabLines().empty() ) { @@ -157,13 +157,13 @@ static void lcl_GCBorder_DelBorder( const SwCollectTableLineBoxes& rCollTLB, } while( true ); } -static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara ); +static void lcl_GC_Box_Border( const SwTableBox* pBox, SwGCLineBorder* pPara ); -void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ) +void sw_GC_Line_Border( const SwTableLine* pLine, SwGCLineBorder* pGCPara ) { // First the right edge with the left edge of the succeeding Box within this Line { - _SwGCBorder_BoxBrd aBPara; + SwGCBorder_BoxBrd aBPara; const SvxBorderLine* pBrd; const SfxPoolItem* pItem; const SwTableBoxes& rBoxes = pLine->GetTabBoxes(); @@ -308,35 +308,35 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ) ++pGCPara->nLinePos; } -static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara ) +static void lcl_GC_Box_Border( const SwTableBox* pBox, SwGCLineBorder* pPara ) { if( !pBox->GetTabLines().empty() ) { - _SwGCLineBorder aPara( *pBox ); + SwGCLineBorder aPara( *pBox ); aPara.pShareFormats = pPara->pShareFormats; for( const SwTableLine* pLine : pBox->GetTabLines() ) sw_GC_Line_Border( pLine, &aPara ); } } -struct _GCLinePara +struct GCLinePara { SwTableLines* pLns; SwShareBoxFormats* pShareFormats; - _GCLinePara( SwTableLines& rLns, _GCLinePara* pPara = nullptr ) + GCLinePara( SwTableLines& rLns, GCLinePara* pPara = nullptr ) : pLns( &rLns ), pShareFormats( pPara ? pPara->pShareFormats : nullptr ) {} }; -static bool lcl_MergeGCLine(SwTableLine* pLine, _GCLinePara* pPara); +static bool lcl_MergeGCLine(SwTableLine* pLine, GCLinePara* pPara); -static bool lcl_MergeGCBox(SwTableBox* pTableBox, _GCLinePara* pPara) +static bool lcl_MergeGCBox(SwTableBox* pTableBox, GCLinePara* pPara) { if( !pTableBox->GetTabLines().empty() ) { // ATTENTION: The Line count can change! - _GCLinePara aPara( pTableBox->GetTabLines(), pPara ); + GCLinePara aPara( pTableBox->GetTabLines(), pPara ); for( SwTableLines::size_type n = 0; n < pTableBox->GetTabLines().size() && lcl_MergeGCLine( pTableBox->GetTabLines()[n], &aPara ); ++n ) @@ -365,7 +365,7 @@ static bool lcl_MergeGCBox(SwTableBox* pTableBox, _GCLinePara* pPara) return true; } -static bool lcl_MergeGCLine(SwTableLine* pLn, _GCLinePara* pGCPara) +static bool lcl_MergeGCLine(SwTableLine* pLn, GCLinePara* pGCPara) { SwTableBoxes::size_type nBoxes = pLn->GetTabBoxes().size(); if( nBoxes ) @@ -430,7 +430,7 @@ static bool lcl_MergeGCLine(SwTableLine* pLn, _GCLinePara* pGCPara) void SwTable::GCLines() { // ATTENTION: The Line count can change! - _GCLinePara aPara( GetTabLines() ); + GCLinePara aPara( GetTabLines() ); SwShareBoxFormats aShareFormats; aPara.pShareFormats = &aShareFormats; for( SwTableLines::size_type n = 0; n < GetTabLines().size() && diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 89e618e802a0..3fce21e7d42d 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -1100,7 +1100,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv // Remember the available width for which the table was calculated. // This is a good place as we pass by here for the initial calculation - // of the table in the parser and for each _Resize call. + // of the table in the parser and for each Resize_ call. m_nLastResizeAbsAvail = nAbsAvail; // Step 1: The available space is readjusted for the left/right border, @@ -1702,7 +1702,7 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail, const SwTableLines& rLines = m_pSwTable->GetTabLines(); for (size_t n = 0; n < rLines.size(); ++n) { - _CheckBoxWidth( *rLines[ n ], nSize ); + CheckBoxWidth( *rLines[ n ], nSize ); } } #endif @@ -1723,7 +1723,7 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail, } } -void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, bool bRecalc ) +void SwHTMLTableLayout::Resize_( sal_uInt16 nAbsAvail, bool bRecalc ) { // If bRecalc is set, the table's content changed. // We need to execute pass 1 again. @@ -1744,7 +1744,7 @@ void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, bool bRecalc ) IMPL_LINK_NOARG_TYPED( SwHTMLTableLayout, DelayedResize_Impl, Timer*, void ) { m_aResizeTimer.Stop(); - _Resize( m_nDelayedResizeAbsAvail, m_bDelayedResizeRecalc ); + Resize_( m_nDelayedResizeAbsAvail, m_bDelayedResizeRecalc ); } bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc, @@ -1800,7 +1800,7 @@ bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc, { if( m_aResizeTimer.IsActive() ) m_aResizeTimer.Stop(); - _Resize( nAbsAvail, bRecalc ); + Resize_( nAbsAvail, bRecalc ); } else if( nDelay > 0 ) { @@ -1811,7 +1811,7 @@ bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc, } else { - _Resize( nAbsAvail, bRecalc ); + Resize_( nAbsAvail, bRecalc ); } return true; diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 86a555eeac2b..3aa513caeddf 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -284,7 +284,7 @@ void SwNoTextFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec aGrfArea = SwRect( Frame().Pos( ), pFly->GetUnclippedFrame( ).SSize( ) ); } - aPaintArea._Intersection( aOrigPaint ); + aPaintArea.Intersection_( aOrigPaint ); SwRect aNormal( Frame().Pos() + Prt().Pos(), Prt().SSize() ); aNormal.Justify(); // Normalized rectangle for the comparisons @@ -296,7 +296,7 @@ void SwNoTextFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec ::lcl_ClearArea( *this, rRenderContext, aPaintArea, aNormal ); // The intersection of the PaintArea and the Bitmap contains the absolutely visible area of the Frame - aPaintArea._Intersection( aNormal ); + aPaintArea.Intersection_( aNormal ); if ( bClip ) rRenderContext.IntersectClipRegion( aPaintArea.SVRect() ); @@ -521,7 +521,7 @@ bool SwNoTextFrame::GetCharRect( SwRect &rRect, const SwPosition& rPos, rRect.Width( 1 ); } else - rRect._Intersection( aFrameRect ); + rRect.Intersection_( aFrameRect ); if ( pCMS ) { diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index 685f2e58861a..41e44f137175 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -93,7 +93,7 @@ namespace BoxStructure::iterator& rpSel, bool &rbSel, bool bCover ); void incColSpan( sal_uInt16 nLine, sal_uInt16 nCol ); explicit TableStructure( const SwTable& rTable ); - TableStructure( const SwTable& rTable, _FndBox &rFndBox, + TableStructure( const SwTable& rTable, FndBox_ &rFndBox, const SwSelBoxes& rSelBoxes, LineStructure::size_type nMinSize ); LineStructure::size_type getLineCount() const @@ -180,7 +180,7 @@ namespace } TableStructure::TableStructure( const SwTable& rTable, - _FndBox &rFndBox, const SwSelBoxes& rSelBoxes, + FndBox_ &rFndBox, const SwSelBoxes& rSelBoxes, LineStructure::size_type nMinSize ) : mnStartCol(USHRT_MAX), mnAddLine(0) { @@ -213,9 +213,9 @@ namespace { SwTableLine *pLine2 = rLines[ ++nEndLn ]; SwTableBox *pTmpBox = pLine2->GetTabBoxes()[0]; - _FndLine *pInsLine = new _FndLine( pLine2, &rFndBox ); - pInsLine->GetBoxes().insert(pInsLine->GetBoxes().begin(), o3tl::make_unique<_FndBox>(pTmpBox, pInsLine)); - rFndLines.push_back(std::unique_ptr<_FndLine>(pInsLine)); + FndLine_ *pInsLine = new FndLine_( pLine2, &rFndBox ); + pInsLine->GetBoxes().insert(pInsLine->GetBoxes().begin(), o3tl::make_unique<FndBox_>(pTmpBox, pInsLine)); + rFndLines.push_back(std::unique_ptr<FndLine_>(pInsLine)); } } maLines.resize( nEndLn - nStartLn + 1 ); @@ -666,9 +666,9 @@ bool SwTable::InsNewTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes TableStructure aCopyStruct( rCpyTable ); // Analyze target structure (from start box) and selected substructure - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { // get all boxes/lines - _FndPara aPara( rSelBoxes, &aFndBox ); + FndPara aPara( rSelBoxes, &aFndBox ); ForEach_FndLineCopyCol( GetTabLines(), &aPara ); } TableStructure aTarget( *this, aFndBox, rSelBoxes, aCopyStruct.getLineCount() ); @@ -735,7 +735,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwNodeIndex& rSttBox, OSL_ENSURE( pMyBox, "Index is not in a Box in this Table" ); // First delete the Table's Frames - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); aFndBox.DelFrames( pTableNd->GetTable() ); SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc(); @@ -815,11 +815,11 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes, SwTableNumFormatMerge aTNFM( *pCpyDoc, *pDoc ); - _FndLine *pFLine, *pInsFLine = nullptr; - _FndBox aFndBox( nullptr, nullptr ); + FndLine_ *pFLine, *pInsFLine = nullptr; + FndBox_ aFndBox( nullptr, nullptr ); // Find all Boxes/Lines { - _FndPara aPara( rSelBoxes, &aFndBox ); + FndPara aPara( rSelBoxes, &aFndBox ); ForEach_FndLineCopyCol( GetTabLines(), &aPara ); } @@ -827,7 +827,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes, // Boxes! if( 1 != rCpyTable.GetTabSortBoxes().size() ) { - _FndBox* pFndBox; + FndBox_* pFndBox; const FndLines_t::size_type nFndCnt = aFndBox.GetLines().size(); if( !nFndCnt ) @@ -905,7 +905,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes, if( nLn >= nFndCnt ) { // We have more rows in the ClipBoard than we have selected - pInsFLine = new _FndLine( GetTabLines()[ nSttLine + nLn ], + pInsFLine = new FndLine_( GetTabLines()[ nSttLine + nLn ], &aFndBox ); pLine = pInsFLine->GetLine(); } @@ -933,11 +933,11 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes, return false; } // if Ok, insert the Box into the FndLine - pFndBox = new _FndBox( pTmpBox, pInsFLine ); + pFndBox = new FndBox_( pTmpBox, pInsFLine ); pInsFLine->GetBoxes().insert( pInsFLine->GetBoxes().begin() + nBx, - std::unique_ptr<_FndBox>(pFndBox)); + std::unique_ptr<FndBox_>(pFndBox)); } - aFndBox.GetLines().insert( aFndBox.GetLines().begin() + nLn, std::unique_ptr<_FndLine>(pInsFLine)); + aFndBox.GetLines().insert( aFndBox.GetLines().begin() + nLn, std::unique_ptr<FndLine_>(pInsFLine)); } else if( pFLine->GetBoxes().size() == 1 ) { @@ -955,9 +955,9 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes, // if Ok, insert the Box into the FndLine if( nBx == pFLine->GetBoxes().size() ) { - pFndBox = new _FndBox( pTmpBox, pFLine ); + pFndBox = new FndBox_( pTmpBox, pFLine ); pFLine->GetBoxes().insert(pFLine->GetBoxes().begin() + nBx, - std::unique_ptr<_FndBox>(pFndBox)); + std::unique_ptr<FndBox_>(pFndBox)); } } } @@ -1022,23 +1022,23 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes, return true; } -static void _FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara ); +static void FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara ); -static void _FndContentBox( const SwTableBox* pBox, SwSelBoxes* pPara ) +static void FndContentBox( const SwTableBox* pBox, SwSelBoxes* pPara ) { if( !pBox->GetTabLines().empty() ) { for( const SwTableLine* pLine : pBox->GetTabLines() ) - _FndContentLine( pLine, pPara ); + FndContentLine( pLine, pPara ); } else pPara->insert( const_cast<SwTableBox*>(pBox) ); } -static void _FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara ) +static void FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara ) { for( const SwTableBox* pBox : pLine->GetTabBoxes() ) - _FndContentBox(pBox, pPara ); + FndContentBox(pBox, pPara ); } // Find all Boxes with content in this Box @@ -1054,7 +1054,7 @@ SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox, rBoxes.clear(); for( SwTableBoxes::iterator it = pLine->GetTabBoxes().begin(); it != pLine->GetTabBoxes().end(); ++it) - _FndContentBox(*it, &rBoxes ); + FndContentBox(*it, &rBoxes ); return rBoxes; } diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 0f578ff25222..ca223b0093c1 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -78,7 +78,7 @@ using namespace ::com::sun::star; // In order to set the Frame Formats for the Boxes, it's enough to look // up the current one in the array. If it's already there return the new one. -struct _CpyTabFrame +struct CpyTabFrame { union { SwTableBoxFormat *pFrameFormat; // for CopyCol @@ -86,14 +86,14 @@ struct _CpyTabFrame } Value; SwTableBoxFormat *pNewFrameFormat; - explicit _CpyTabFrame( SwTableBoxFormat* pAktFrameFormat ) : pNewFrameFormat( nullptr ) + explicit CpyTabFrame( SwTableBoxFormat* pAktFrameFormat ) : pNewFrameFormat( nullptr ) { Value.pFrameFormat = pAktFrameFormat; } - _CpyTabFrame& operator=( const _CpyTabFrame& ); + CpyTabFrame& operator=( const CpyTabFrame& ); - bool operator==( const _CpyTabFrame& rCpyTabFrame ) const + bool operator==( const CpyTabFrame& rCpyTabFrame ) const { return (sal_uLong)Value.nSize == (sal_uLong)rCpyTabFrame.Value.nSize; } - bool operator<( const _CpyTabFrame& rCpyTabFrame ) const + bool operator<( const CpyTabFrame& rCpyTabFrame ) const { return (sal_uLong)Value.nSize < (sal_uLong)rCpyTabFrame.Value.nSize; } }; @@ -167,7 +167,7 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, bool { \ SwTwips nSize = GetFrameFormat()->GetFrameSize().GetWidth(); \ for (size_t nTmp = 0; nTmp < m_aLines.size(); ++nTmp) \ - ::_CheckBoxWidth( *m_aLines[ nTmp ], nSize ); \ + ::CheckBoxWidth( *m_aLines[ nTmp ], nSize ); \ } #define CHECKTABLELAYOUT \ @@ -239,21 +239,21 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam, typedef bool (*FN_lcl_SetLineHeight)(SwTableLine*, CR_SetLineHeight&, SwTwips, bool ); -_CpyTabFrame& _CpyTabFrame::operator=( const _CpyTabFrame& rCpyTabFrame ) +CpyTabFrame& CpyTabFrame::operator=( const CpyTabFrame& rCpyTabFrame ) { pNewFrameFormat = rCpyTabFrame.pNewFrameFormat; Value = rCpyTabFrame.Value; return *this; } -typedef o3tl::sorted_vector<_CpyTabFrame> _CpyTabFrames; +typedef o3tl::sorted_vector<CpyTabFrame> CpyTabFrames; -struct _CpyPara +struct CpyPara { std::shared_ptr< std::vector< std::vector< sal_uLong > > > pWidths; SwDoc* pDoc; SwTableNode* pTableNd; - _CpyTabFrames& rTabFrameArr; + CpyTabFrames& rTabFrameArr; SwTableLine* pInsLine; SwTableBox* pInsBox; sal_uLong nOldSize, nNewSize; // in order to correct the size attributes @@ -263,7 +263,7 @@ struct _CpyPara sal_uInt8 nDelBorderFlag; bool bCpyContent; - _CpyPara( SwTableNode* pNd, sal_uInt16 nCopies, _CpyTabFrames& rFrameArr ) + CpyPara( SwTableNode* pNd, sal_uInt16 nCopies, CpyTabFrames& rFrameArr ) : pDoc( pNd->GetDoc() ), pTableNd( pNd ), rTabFrameArr(rFrameArr), pInsLine(nullptr), pInsBox(nullptr), nOldSize(0), nNewSize(0), nMinLeft(ULONG_MAX), nMaxRight(0), @@ -271,7 +271,7 @@ struct _CpyPara nLnIdx(0), nBoxIdx(0), nDelBorderFlag(0), bCpyContent( true ) {} - _CpyPara( const _CpyPara& rPara, SwTableLine* pLine ) + CpyPara( const CpyPara& rPara, SwTableLine* pLine ) : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTableNd(rPara.pTableNd), rTabFrameArr(rPara.rTabFrameArr), pInsLine(pLine), pInsBox(rPara.pInsBox), nOldSize(0), nNewSize(rPara.nNewSize), nMinLeft( rPara.nMinLeft ), @@ -279,7 +279,7 @@ struct _CpyPara nLnIdx( rPara.nLnIdx), nBoxIdx( rPara.nBoxIdx ), nDelBorderFlag( rPara.nDelBorderFlag ), bCpyContent( rPara.bCpyContent ) {} - _CpyPara( const _CpyPara& rPara, SwTableBox* pBox ) + CpyPara( const CpyPara& rPara, SwTableBox* pBox ) : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTableNd(rPara.pTableNd), rTabFrameArr(rPara.rTabFrameArr), pInsLine(rPara.pInsLine), pInsBox(pBox), nOldSize(rPara.nOldSize), nNewSize(rPara.nNewSize), @@ -289,18 +289,18 @@ struct _CpyPara {} }; -static void lcl_CopyRow(_FndLine & rFndLine, _CpyPara *const pCpyPara); +static void lcl_CopyRow(FndLine_ & rFndLine, CpyPara *const pCpyPara); -static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara) +static void lcl_CopyCol( FndBox_ & rFndBox, CpyPara *const pCpyPara) { // Look up the Frame Format in the Frame Format Array SwTableBox* pBox = rFndBox.GetBox(); - _CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()) ); + CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()) ); sal_uInt16 nFndPos; if( pCpyPara->nCpyCnt ) { - _CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.lower_bound( aFindFrame ); + CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.lower_bound( aFindFrame ); nFndPos = itFind - pCpyPara->rTabFrameArr.begin(); if( itFind == pCpyPara->rTabFrameArr.end() || !(*itFind == aFindFrame) ) { @@ -308,7 +308,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara) SwTableBoxFormat* pNewFormat = static_cast<SwTableBoxFormat*>(pBox->ClaimFrameFormat()); // Find the selected Boxes in the Line: - _FndLine const* pCmpLine = nullptr; + FndLine_ const* pCmpLine = nullptr; SwFormatFrameSize aFrameSz( pNewFormat->GetFrameSize() ); bool bDiffCount = false; @@ -359,7 +359,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara) } else { - _CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.find( aFindFrame ); + CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.find( aFindFrame ); if( pCpyPara->nDelBorderFlag && itFind != pCpyPara->rTabFrameArr.end() ) aFindFrame = *itFind; @@ -372,7 +372,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara) pBox = new SwTableBox( aFindFrame.pNewFrameFormat, rFndBox.GetLines().size(), pCpyPara->pInsLine ); pCpyPara->pInsLine->GetTabBoxes().insert( pCpyPara->pInsLine->GetTabBoxes().begin() + pCpyPara->nInsPos++, pBox ); - _CpyPara aPara( *pCpyPara, pBox ); + CpyPara aPara( *pCpyPara, pBox ); aPara.nDelBorderFlag &= 7; for (auto const& pFndLine : rFndBox.GetLines()) @@ -382,7 +382,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara) } else { - ::_InsTableBox( pCpyPara->pDoc, pCpyPara->pTableNd, pCpyPara->pInsLine, + ::InsTableBox( pCpyPara->pDoc, pCpyPara->pTableNd, pCpyPara->pInsLine, aFindFrame.pNewFrameFormat, pBox, pCpyPara->nInsPos++ ); const FndBoxes_t& rFndBxs = rFndBox.GetUpper()->GetBoxes(); @@ -424,7 +424,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara) } } -static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara) +static void lcl_CopyRow(FndLine_& rFndLine, CpyPara *const pCpyPara) { SwTableLine* pNewLine = new SwTableLine( static_cast<SwTableLineFormat*>(rFndLine.GetLine()->GetFrameFormat()), @@ -440,7 +440,7 @@ static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara) rLines.insert( rLines.begin() + pCpyPara->nInsPos++, pNewLine ); } - _CpyPara aPara( *pCpyPara, pNewLine ); + CpyPara aPara( *pCpyPara, pNewLine ); for (auto const& it : rFndLine.GetBoxes()) { lcl_CopyCol(*it, &aPara); @@ -449,11 +449,11 @@ static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara) pCpyPara->nDelBorderFlag &= 0xf8; } -static void lcl_InsCol( _FndLine* pFndLn, _CpyPara& rCpyPara, sal_uInt16 nCpyCnt, +static void lcl_InsCol( FndLine_* pFndLn, CpyPara& rCpyPara, sal_uInt16 nCpyCnt, bool bBehind ) { // Bug 29124: Not only copy in the BaseLines. If possible, we go down as far as possible - _FndBox* pFBox; + FndBox_* pFBox; if( 1 == pFndLn->GetBoxes().size() && !( pFBox = pFndLn->GetBoxes()[0].get() )->GetBox()->GetSttNd() ) { @@ -508,9 +508,9 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, else { // Find all Boxes/Lines - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( rBoxes, &aFndBox ); + FndPara aPara( rBoxes, &aFndBox ); ForEach_FndLineCopyCol( GetTabLines(), &aPara ); } if( aFndBox.GetLines().empty() ) @@ -525,8 +525,8 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, // TL_CHART2: nothing to be done since chart2 currently does not want to // get notified about new rows/cols. - _CpyTabFrames aTabFrameArr; - _CpyPara aCpyPara( pTableNd, nCnt, aTabFrameArr ); + CpyTabFrames aTabFrameArr; + CpyPara aCpyPara( pTableNd, nCnt, aTabFrameArr ); for (auto & rpLine : aFndBox.GetLines()) { @@ -554,7 +554,7 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, return bRes; } -bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, +bool SwTable::InsertRow_( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind ) { OSL_ENSURE( pDoc && !rBoxes.empty() && nCnt, "No valid Box List" ); @@ -563,9 +563,9 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, return false; // Find all Boxes/Lines - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( rBoxes, &aFndBox ); + FndPara aPara( rBoxes, &aFndBox ); ForEach_FndLineCopyCol( GetTabLines(), &aPara ); } if( aFndBox.GetLines().empty() ) @@ -573,14 +573,14 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, SetHTMLTableLayout( nullptr ); // Delete HTML Layout - _FndBox* pFndBox = &aFndBox; + FndBox_* pFndBox = &aFndBox; { - _FndLine* pFndLine; + FndLine_* pFndLine; while( 1 == pFndBox->GetLines().size() && 1 == (pFndLine = pFndBox->GetLines()[0].get())->GetBoxes().size()) { // Don't go down too far! One Line with Box needs to remain! - _FndBox *const pTmpBox = pFndLine->GetBoxes().front().get(); + FndBox_ *const pTmpBox = pFndLine->GetBoxes().front().get(); if( !pTmpBox->GetLines().empty() ) pFndBox = pTmpBox; else @@ -601,8 +601,8 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, // get notified about new rows/cols. } - _CpyTabFrames aTabFrameArr; - _CpyPara aCpyPara( pTableNd, 0, aTabFrameArr ); + CpyTabFrames aTabFrameArr; + CpyPara aCpyPara( pTableNd, 0, aTabFrameArr ); SwTableLine* pLine = pFndBox->GetLines()[ bBehind ? pFndBox->GetLines().size()-1 : 0 ]->GetLine(); @@ -693,7 +693,7 @@ static void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset, } } -void _DeleteBox( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo, +void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo, bool bCalcNewSize, const bool bCorrBorder, SwShareBoxFormats* pShareFormats ) { @@ -993,7 +993,7 @@ bool SwTable::DeleteSel( SetHTMLTableLayout( nullptr ); // Delete HTML Layout // Find Lines for the Layout update - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); if ( bDelMakeFrames ) { if( pMerged && !pMerged->empty() ) @@ -1031,7 +1031,7 @@ bool SwTable::DeleteSel( pPCD->DeleteBox( &pTableNd->GetTable(), *rBoxes[nIdx] ); // ... then delete the boxes - _DeleteBox( *this, rBoxes[nIdx], pUndo, true, bCorrBorder, &aShareFormats ); + DeleteBox_( *this, rBoxes[nIdx], pUndo, true, bCorrBorder, &aShareFormats ); } // then clean up the structure of all Lines @@ -1081,7 +1081,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn } // Find Lines for the Layout update - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); aFndBox.SetTableLines( rBoxes, *this ); aFndBox.DelFrames( *this ); @@ -1148,7 +1148,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn } else { - ::_InsTableBox( pDoc, pTableNd, pNewLine, pCpyBoxFrameFormat, + ::InsTableBox( pDoc, pTableNd, pNewLine, pCpyBoxFrameFormat, pLastBox, 0 ); if( bChkBorder ) @@ -1169,7 +1169,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn SwNodeRange aRg( *pLastBox->GetSttNd(), +2, *pEndNd ); pLastBox = pNewLine->GetTabBoxes()[0]; // reset SwNodeIndex aInsPos( *pLastBox->GetSttNd(), 1 ); - pDoc->GetNodes()._MoveNodes(aRg, pDoc->GetNodes(), aInsPos, false); + pDoc->GetNodes().MoveNodes(aRg, pDoc->GetNodes(), aInsPos, false); pDoc->GetNodes().Delete( aInsPos ); // delete the empty one } } @@ -1209,11 +1209,11 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) ExpandSelection( aSelBoxes ); // Find Lines for the Layout update - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); aFndBox.SetTableLines( aSelBoxes, *this ); aFndBox.DelFrames( *this ); - _CpyTabFrames aFrameArr; + CpyTabFrames aFrameArr; std::vector<SwTableBoxFormat*> aLastBoxArr; for (size_t n = 0; n < aSelBoxes.size(); ++n) { @@ -1230,8 +1230,8 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) // Find the Frame Format in the Frame Format Array SwTableBoxFormat* pLastBoxFormat; - _CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat()) ); - _CpyTabFrames::const_iterator itFind = aFrameArr.lower_bound( aFindFrame ); + CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat()) ); + CpyTabFrames::const_iterator itFind = aFrameArr.lower_bound( aFindFrame ); const size_t nFndPos = itFind - aFrameArr.begin(); if( itFind == aFrameArr.end() || !(*itFind == aFindFrame) ) { @@ -1263,10 +1263,10 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) // Insert the Boxes at the Position for( sal_uInt16 i = 1; i < nCnt; ++i ) - ::_InsTableBox( pDoc, pTableNd, pInsLine, aFindFrame.pNewFrameFormat, + ::InsTableBox( pDoc, pTableNd, pInsLine, aFindFrame.pNewFrameFormat, pSelBox, nBoxPos + i ); // insert after - ::_InsTableBox( pDoc, pTableNd, pInsLine, pLastBoxFormat, + ::InsTableBox( pDoc, pTableNd, pInsLine, pLastBoxFormat, pSelBox, nBoxPos + nCnt ); // insert after // Special treatment for the Border: @@ -1282,7 +1282,7 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) // Remove the Format from the "cache" for( auto i = aFrameArr.size(); i; ) { - const _CpyTabFrame& rCTF = aFrameArr[ --i ]; + const CpyTabFrame& rCTF = aFrameArr[ --i ]; if( rCTF.pNewFrameFormat == aFindFrame.pNewFrameFormat || rCTF.Value.pFrameFormat == aFindFrame.pNewFrameFormat ) { @@ -1304,7 +1304,7 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) /* * >> MERGE << * Algorithm: - * If we only have one Line in the _FndBox, take this Line and test + * If we only have one Line in the FndBox_, take this Line and test * the Box count: * If we have more than one Box, we merge on Box level, meaning * the new Box will be as wide as the old ones. @@ -1361,7 +1361,7 @@ static void lcl_CalcWidth( SwTableBox* pBox ) pFormat->ResetFormatAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 ); } -struct _InsULPara +struct InsULPara { SwTableNode* pTableNd; SwTableLine* pInsLine; @@ -1371,7 +1371,7 @@ struct _InsULPara SwTableBox* pLeftBox; - _InsULPara( SwTableNode* pTNd, + InsULPara( SwTableNode* pTNd, SwTableBox* pLeft, SwTableLine* pLine=nullptr, SwTableBox* pBox=nullptr ) : pTableNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ), @@ -1386,9 +1386,9 @@ struct _InsULPara { bUL_LR = true; bUL = false; if( pLine ) pInsLine = pLine; } }; -static void lcl_Merge_MoveLine(_FndLine & rFndLine, _InsULPara *const pULPara); +static void lcl_Merge_MoveLine(FndLine_ & rFndLine, InsULPara *const pULPara); -static void lcl_Merge_MoveBox(_FndBox & rFndBox, _InsULPara *const pULPara) +static void lcl_Merge_MoveBox(FndBox_ & rFndBox, InsULPara *const pULPara) { SwTableBoxes* pBoxes; @@ -1430,7 +1430,7 @@ static void lcl_Merge_MoveBox(_FndBox & rFndBox, _InsULPara *const pULPara) SwTableBox* pBox = new SwTableBox( static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat()), 0, pULPara->pInsLine ); - _InsULPara aPara( *pULPara ); + InsULPara aPara( *pULPara ); aPara.pInsBox = pBox; for (FndLines_t::iterator it = rFndBox.GetLines().begin() + nStt; it != rFndBox.GetLines().begin() + nEnd; ++it ) @@ -1449,7 +1449,7 @@ static void lcl_Merge_MoveBox(_FndBox & rFndBox, _InsULPara *const pULPara) } } -static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara) +static void lcl_Merge_MoveLine(FndLine_& rFndLine, InsULPara *const pULPara) { SwTableLines* pLines; @@ -1529,7 +1529,7 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara) SwTableLine* pNewLine = new SwTableLine( static_cast<SwTableLineFormat*>(rFndLine.GetLine()->GetFrameFormat()), 0, pULPara->pInsBox ); - _InsULPara aPara( *pULPara ); // copying + InsULPara aPara( *pULPara ); // copying aPara.pInsLine = pNewLine; FndBoxes_t & rLineBoxes = rFndLine.GetBoxes(); for (FndBoxes_t::iterator it = rLineBoxes.begin() + nStt; @@ -1559,9 +1559,9 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes, return false; // Find all Boxes/Lines - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( rBoxes, &aFndBox ); + FndPara aPara( rBoxes, &aFndBox ); ForEach_FndLineCopyCol( GetTabLines(), &aPara ); } if( aFndBox.GetLines().empty() ) @@ -1581,7 +1581,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes, aFndBox.SetTableLines( *this ); aFndBox.DelFrames( *this ); - _FndBox* pFndBox = &aFndBox; + FndBox_* pFndBox = &aFndBox; while( 1 == pFndBox->GetLines().size() && 1 == pFndBox->GetLines().front()->GetBoxes().size() ) { @@ -1612,7 +1612,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes, // This contains all Lines that are above the selected Area, // thus they form a Upper/Lower Line - _InsULPara aPara( pTableNd, pLeftBox, pInsLine ); + InsULPara aPara( pTableNd, pLeftBox, pInsLine ); // Move the overlapping upper/lower Lines of the selected Area for (auto & it : pFndBox->GetLines().front()->GetBoxes()) @@ -1640,7 +1640,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes, } if( pLeftBox->GetTabLines().empty() ) - _DeleteBox( *this, pLeftBox, nullptr, false, false ); + DeleteBox_( *this, pLeftBox, nullptr, false, false ); else { lcl_CalcWidth( pLeftBox ); // calculate the Box's width @@ -1648,7 +1648,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes, pUndo->AddNewBox( pLeftBox->GetSttIdx() ); } if( pRightBox->GetTabLines().empty() ) - _DeleteBox( *this, pRightBox, nullptr, false, false ); + DeleteBox_( *this, pRightBox, nullptr, false, false ); else { lcl_CalcWidth( pRightBox ); // calculate the Box's width @@ -1694,10 +1694,10 @@ static void lcl_CheckRowSpan( SwTable &rTable ) } } -static sal_uInt16 lcl_GetBoxOffset( const _FndBox& rBox ) +static sal_uInt16 lcl_GetBoxOffset( const FndBox_& rBox ) { // Find the first Box - const _FndBox* pFirstBox = &rBox; + const FndBox_* pFirstBox = &rBox; while (!pFirstBox->GetLines().empty()) { pFirstBox = pFirstBox->GetLines().front()->GetBoxes().front().get(); @@ -1719,7 +1719,7 @@ static sal_uInt16 lcl_GetBoxOffset( const _FndBox& rBox ) return nRet; } -static sal_uInt16 lcl_GetLineWidth( const _FndLine& rLine ) +static sal_uInt16 lcl_GetLineWidth( const FndLine_& rLine ) { sal_uInt16 nRet = 0; for( auto n = rLine.GetBoxes().size(); n; ) @@ -1730,7 +1730,7 @@ static sal_uInt16 lcl_GetLineWidth( const _FndLine& rLine ) return nRet; } -static void lcl_CalcNewWidths(const FndLines_t& rFndLines, _CpyPara& rPara) +static void lcl_CalcNewWidths(const FndLines_t& rFndLines, CpyPara& rPara) { rPara.pWidths.reset(); const size_t nLineCount = rFndLines.size(); @@ -1743,7 +1743,7 @@ static void lcl_CalcNewWidths(const FndLines_t& rFndLines, _CpyPara& rPara) for( size_t nLine = 0; nLine < nLineCount; ++nLine ) { std::vector< sal_uLong > &rWidth = (*rPara.pWidths.get())[ nLine ]; - const _FndLine *pFndLine = rFndLines[ nLine ].get(); + const FndLine_ *pFndLine = rFndLines[ nLine ].get(); if( pFndLine && pFndLine->GetBoxes().size() ) { const SwTableLine *pLine = pFndLine->GetLine(); @@ -1814,9 +1814,9 @@ static void lcl_CalcNewWidths(const FndLines_t& rFndLines, _CpyPara& rPara) } static void -lcl_CopyLineToDoc(_FndLine const& rpFndLn, _CpyPara *const pCpyPara); +lcl_CopyLineToDoc(FndLine_ const& rpFndLn, CpyPara *const pCpyPara); -static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara) +static void lcl_CopyBoxToDoc(FndBox_ const& rFndBox, CpyPara *const pCpyPara) { // Calculation of new size sal_uLong nRealSize; @@ -1851,11 +1851,11 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara) do { // Find the Frame Format in the list of all Frame Formats - _CpyTabFrame aFindFrame(static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat())); + CpyTabFrame aFindFrame(static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat())); SwFormatFrameSize aFrameSz; - _CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.lower_bound( aFindFrame ); - const _CpyTabFrames::size_type nFndPos = itFind - pCpyPara->rTabFrameArr.begin(); + CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.lower_bound( aFindFrame ); + const CpyTabFrames::size_type nFndPos = itFind - pCpyPara->rTabFrameArr.begin(); if( itFind == pCpyPara->rTabFrameArr.end() || !(*itFind == aFindFrame) || ( aFrameSz = ( aFindFrame = pCpyPara->rTabFrameArr[ nFndPos ]).pNewFrameFormat-> GetFrameSize()).GetWidth() != (SwTwips)nSize ) @@ -1876,7 +1876,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara) pBox = new SwTableBox( aFindFrame.pNewFrameFormat, rFndBox.GetLines().size(), pCpyPara->pInsLine ); pCpyPara->pInsLine->GetTabBoxes().insert( pCpyPara->pInsLine->GetTabBoxes().begin() + pCpyPara->nInsPos++, pBox ); - _CpyPara aPara( *pCpyPara, pBox ); + CpyPara aPara( *pCpyPara, pBox ); aPara.nNewSize = nSize; // get the size for (auto const& rpFndLine : rFndBox.GetLines()) { @@ -1946,11 +1946,11 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara) } static void -lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara) +lcl_CopyLineToDoc(const FndLine_& rFndLine, CpyPara *const pCpyPara) { // Find the Frame Format in the list of all Frame Formats - _CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(rFndLine.GetLine()->GetFrameFormat()) ); - _CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.find( aFindFrame ); + CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(rFndLine.GetLine()->GetFrameFormat()) ); + CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.find( aFindFrame ); if( itFind == pCpyPara->rTabFrameArr.end() ) { // It doesn't exist yet, so copy it @@ -1974,7 +1974,7 @@ lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara) rLines.insert( rLines.begin() + pCpyPara->nInsPos++, pNewLine); } - _CpyPara aPara( *pCpyPara, pNewLine ); + CpyPara aPara( *pCpyPara, pNewLine ); if( pCpyPara->pTableNd->GetTable().IsNewModel() ) { @@ -2017,9 +2017,9 @@ bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTableNd ) pBox = GetTableBox( pBox->GetSttNd()->StartOfSectionNode()->GetIndex() + 1 ); SelLineFromBox( pBox, aSelBoxes ); - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( aSelBoxes, &aFndBox ); + FndPara aPara( aSelBoxes, &aFndBox ); ForEach_FndLineCopyCol( GetTabLines(), &aPara ); } if( aFndBox.GetLines().empty() ) @@ -2032,8 +2032,8 @@ bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTableNd ) GetFrameFormat()->GetDoc()->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint ); } - _CpyTabFrames aCpyFormat; - _CpyPara aPara( &rTableNd, 1, aCpyFormat ); + CpyTabFrames aCpyFormat; + CpyPara aPara( &rTableNd, 1, aCpyFormat ); aPara.nNewSize = aPara.nOldSize = rTableNd.GetTable().GetFrameFormat()->GetFrameSize().GetWidth(); // Copy if( IsNewModel() ) @@ -2061,9 +2061,9 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, bool bCpyName ) const { // Find all Boxes/Lines - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( rSelBoxes, &aFndBox ); + FndPara aPara( rSelBoxes, &aFndBox ); ForEach_FndLineCopyCol( (SwTableLines&)GetTabLines(), &aPara ); } if( aFndBox.GetLines().empty() ) @@ -2127,8 +2127,8 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, if( bCpyName ) pNewTable->GetFrameFormat()->SetName( GetFrameFormat()->GetName() ); - _CpyTabFrames aCpyFormat; - _CpyPara aPara( pTableNd, 1, aCpyFormat ); + CpyTabFrames aCpyFormat; + CpyPara aPara( pTableNd, 1, aCpyFormat ); aPara.nNewSize = aPara.nOldSize = GetFrameFormat()->GetFrameSize().GetWidth(); if( IsNewModel() ) @@ -2141,7 +2141,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, // Set the "right" margin above/below { - _FndLine* pFndLn = aFndBox.GetLines().front().get(); + FndLine_* pFndLn = aFndBox.GetLines().front().get(); SwTableLine* pLn = pFndLn->GetLine(); const SwTableLine* pTmp = pLn; sal_uInt16 nLnPos = GetTabLines().GetPos( pTmp ); @@ -2193,7 +2193,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, } // We need to delete the initial Box - _DeleteBox( *pNewTable, pNewTable->GetTabLines().back()->GetTabBoxes()[0], + DeleteBox_( *pNewTable, pNewTable->GetTabLines().back()->GetTabBoxes()[0], nullptr, false, false ); if( pNewTable->IsNewModel() ) @@ -2644,7 +2644,7 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam, if( !rParam.bLeft && 3 != nCmp ) ++n; - ::_InsTableBox( pFormat->GetDoc(), rParam.pTableNd, + ::InsTableBox( pFormat->GetDoc(), rParam.pTableNd, pLine, pFormat, pBox, n ); SwTableBox* pNewBox = rBoxes[ n ]; @@ -2840,7 +2840,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam, // POS_EQUAL, // Box and start/end are the same // POS_OVERLAP_BEFORE, // Box overlapps the start // POS_OVERLAP_BEHIND // Box overlapps the end -SwComparePosition _CheckBoxInRange( sal_uInt16 nStt, sal_uInt16 nEnd, +SwComparePosition CheckBoxInRange( sal_uInt16 nStt, sal_uInt16 nEnd, sal_uInt16 nBoxStt, sal_uInt16 nBoxEnd ) { // Still treat COLFUZZY! @@ -2988,7 +2988,7 @@ static bool lcl_DeleteBox_Recursive( CR_SetBoxWidth& rParam, SwTableBox& rBox, } } else - ::_DeleteBox( rParam.pTableNd->GetTable(), &rBox, + ::DeleteBox_( rParam.pTableNd->GetTable(), &rBox, rParam.pUndo, false, true, &rParam.aShareFormats ); } else @@ -3047,7 +3047,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam, bool bDelBox = false, bChgLowers = false; // Test the Box width and react accordingly - SwComparePosition ePosType = ::_CheckBoxInRange( + SwComparePosition ePosType = ::CheckBoxInRange( nBoxChkStt, nBoxChkEnd, sal_uInt16(rParam.bLeft ? nDist - nWidth : nDist), sal_uInt16(rParam.bLeft ? nDist : nDist + nWidth)); @@ -3312,7 +3312,7 @@ static void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam ) } #ifdef DBG_UTIL -void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ) +void CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ) { const SwTableBoxes& rBoxes = rLine.GetTabBoxes(); @@ -3325,7 +3325,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ) nAktSize += nBoxW; for( auto pLn : pBox->GetTabLines() ) - _CheckBoxWidth( *pLn, nBoxW ); + CheckBoxWidth( *pLn, nBoxW ); } if (sal::static_int_cast< unsigned long >(std::abs(nAktSize - nSize)) > @@ -3336,7 +3336,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ) } #endif -static _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo, +static FndBox_* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo, SwTableSortBoxes& rTmpLst, SwTwips nDistStt ) { // Find all Boxes/Lines @@ -3360,12 +3360,12 @@ static _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo, return nullptr; } - _FndBox* pFndBox = new _FndBox( nullptr, nullptr ); + FndBox_* pFndBox = new FndBox_( nullptr, nullptr ); if( rParam.bBigger ) pFndBox->SetTableLines( rParam.m_Boxes, rTable ); else { - _FndPara aPara(rParam.m_Boxes, pFndBox); + FndPara aPara(rParam.m_Boxes, pFndBox); ForEach_FndLineCopyCol( rTable.GetTabLines(), &aPara ); OSL_ENSURE( pFndBox->GetLines().size(), "Where are the Boxes" ); pFndBox->SetTableLines( rTable ); @@ -3392,7 +3392,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType, const SwFormatFrameSize& rSz = GetFrameFormat()->GetFrameSize(); const SvxLRSpaceItem& rLR = GetFrameFormat()->GetLRSpace(); - std::unique_ptr<_FndBox> xFndBox; // for insertion/deletion + std::unique_ptr<FndBox_> xFndBox; // for insertion/deletion SwTableSortBoxes aTmpLst; // for Undo bool bBigger, bRet = false, @@ -3874,7 +3874,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType, return bRet; } -static _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo, +static FndBox_* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo, SwTableSortBoxes& rTmpLst ) { // Find all Boxes/Lines @@ -3889,12 +3889,12 @@ static _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo, return nullptr; } - _FndBox* pFndBox = new _FndBox( nullptr, nullptr ); + FndBox_* pFndBox = new FndBox_( nullptr, nullptr ); if( !rParam.bBigger ) pFndBox->SetTableLines( rParam.m_Boxes, rTable ); else { - _FndPara aPara(rParam.m_Boxes, pFndBox); + FndPara aPara(rParam.m_Boxes, pFndBox); ForEach_FndLineCopyCol( rTable.GetTabLines(), &aPara ); OSL_ENSURE( pFndBox->GetLines().size(), "Where are the Boxes?" ); pFndBox->SetTableLines( rTable ); @@ -4036,7 +4036,7 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam, } for (size_t n = rBoxes.size(); n; ) { - ::_DeleteBox( rParam.pTableNd->GetTable(), + ::DeleteBox_( rParam.pTableNd->GetTable(), rBoxes[ --n ], rParam.pUndo, false, false, &rParam.aShareFormats ); } @@ -4072,7 +4072,7 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam, while( !pOld->GetSttNd() ) pOld = pOld->GetTabLines()[ 0 ]->GetTabBoxes()[ 0 ]; } - ::_InsTableBox( pDoc, rParam.pTableNd, pNewLine, + ::InsTableBox( pDoc, rParam.pTableNd, pNewLine, static_cast<SwTableBoxFormat*>(pOld->GetFrameFormat()), pOld, n ); // Special treatment for the border: @@ -4127,7 +4127,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType, while( pBaseLine->GetUpper() ) pBaseLine = pBaseLine->GetUpper()->GetUpper(); - std::unique_ptr<_FndBox> xFndBox; // for insertion/deletion + std::unique_ptr<FndBox_> xFndBox; // for insertion/deletion SwTableSortBoxes aTmpLst; // for Undo bool bBigger, bRet = false, diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 0a66017f86f2..43908dab32da 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -610,16 +610,16 @@ void SwTextBoxHelper::resetLink(SwFrameFormat* pShape, std::map<const SwFrameFor } } -void SwTextBoxHelper::restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rOldContent) +void SwTextBoxHelper::restoreLinks(std::set<ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rOldContent) { std::size_t i = 0; - for (std::set<_ZSortFly>::iterator aSetIt = rOld.begin(); aSetIt != rOld.end(); ++aSetIt, ++i) + for (std::set<ZSortFly>::iterator aSetIt = rOld.begin(); aSetIt != rOld.end(); ++aSetIt, ++i) { SavedLink::iterator aTextBoxIt = rSavedLinks.find(aSetIt->GetFormat()); if (aTextBoxIt != rSavedLinks.end()) { std::size_t j = 0; - for (std::set<_ZSortFly>::iterator aSetJt = rOld.begin(); aSetJt != rOld.end(); ++aSetJt, ++j) + for (std::set<ZSortFly>::iterator aSetJt = rOld.begin(); aSetJt != rOld.end(); ++aSetJt, ++j) { if (aSetJt->GetFormat() == aTextBoxIt->second) rNew[i]->SetFormatAttr(rNew[j]->GetContent()); diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 82b9f6c82e7c..64e87f5529be 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -40,16 +40,16 @@ // Structure for the mapping from old and new frame formats to the // boxes and lines of a table -struct _MapTableFrameFormat +struct MapTableFrameFormat { const SwFrameFormat *pOld; SwFrameFormat *pNew; - _MapTableFrameFormat( const SwFrameFormat *pOldFormat, SwFrameFormat*pNewFormat ) + MapTableFrameFormat( const SwFrameFormat *pOldFormat, SwFrameFormat*pNewFormat ) : pOld( pOldFormat ), pNew( pNewFormat ) {} }; -typedef std::vector<_MapTableFrameFormat> _MapTableFrameFormats; +typedef std::vector<MapTableFrameFormat> MapTableFrameFormats; SwContentNode* SwTextNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const { @@ -109,7 +109,7 @@ SwContentNode* SwTextNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) cons return pTextNd; } -static bool lcl_SrchNew( const _MapTableFrameFormat& rMap, SwFrameFormat** pPara ) +static bool lcl_SrchNew( const MapTableFrameFormat& rMap, SwFrameFormat** pPara ) { if( rMap.pOld != *pPara ) return true; @@ -117,29 +117,29 @@ static bool lcl_SrchNew( const _MapTableFrameFormat& rMap, SwFrameFormat** pPara return false; } -struct _CopyTable +struct CopyTable { SwDoc* m_pDoc; sal_uLong m_nOldTableSttIdx; - _MapTableFrameFormats& m_rMapArr; + MapTableFrameFormats& m_rMapArr; SwTableLine* m_pInsLine; SwTableBox* m_pInsBox; SwTableNode *m_pTableNd; const SwTable *m_pOldTable; - _CopyTable(SwDoc* pDc, _MapTableFrameFormats& rArr, sal_uLong nOldStt, + CopyTable(SwDoc* pDc, MapTableFrameFormats& rArr, sal_uLong nOldStt, SwTableNode& rTableNd, const SwTable* pOldTable) : m_pDoc(pDc), m_nOldTableSttIdx(nOldStt), m_rMapArr(rArr), m_pInsLine(nullptr), m_pInsBox(nullptr), m_pTableNd(&rTableNd), m_pOldTable(pOldTable) {} }; -static void lcl_CopyTableLine( const SwTableLine* pLine, _CopyTable* pCT ); +static void lcl_CopyTableLine( const SwTableLine* pLine, CopyTable* pCT ); -static void lcl_CopyTableBox( SwTableBox* pBox, _CopyTable* pCT ) +static void lcl_CopyTableBox( SwTableBox* pBox, CopyTable* pCT ) { SwTableBoxFormat * pBoxFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()); - for (_MapTableFrameFormats::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it) + for (MapTableFrameFormats::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it) if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrameFormat**>(&pBoxFormat) ) ) break; @@ -169,7 +169,7 @@ static void lcl_CopyTableBox( SwTableBox* pBox, _CopyTable* pCT ) } } - pCT->m_rMapArr.push_back(_MapTableFrameFormat(pBox->GetFrameFormat(), pBoxFormat)); + pCT->m_rMapArr.push_back(MapTableFrameFormat(pBox->GetFrameFormat(), pBoxFormat)); } sal_uInt16 nLines = pBox->GetTabLines().size(); @@ -189,7 +189,7 @@ static void lcl_CopyTableBox( SwTableBox* pBox, _CopyTable* pCT ) if (nLines) { - _CopyTable aPara(*pCT); + CopyTable aPara(*pCT); aPara.m_pInsBox = pNewBox; for( const SwTableLine* pLine : pBox->GetTabLines() ) lcl_CopyTableLine( pLine, &aPara ); @@ -201,10 +201,10 @@ static void lcl_CopyTableBox( SwTableBox* pBox, _CopyTable* pCT ) } } -static void lcl_CopyTableLine( const SwTableLine* pLine, _CopyTable* pCT ) +static void lcl_CopyTableLine( const SwTableLine* pLine, CopyTable* pCT ) { SwTableLineFormat * pLineFormat = static_cast<SwTableLineFormat*>(pLine->GetFrameFormat()); - for (_MapTableFrameFormats::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it) + for (MapTableFrameFormats::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it) if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrameFormat**>(&pLineFormat) ) ) break; @@ -212,7 +212,7 @@ static void lcl_CopyTableLine( const SwTableLine* pLine, _CopyTable* pCT ) { pLineFormat = pCT->m_pDoc->MakeTableLineFormat(); pLineFormat->CopyAttrs( *pLine->GetFrameFormat() ); - pCT->m_rMapArr.push_back(_MapTableFrameFormat(pLine->GetFrameFormat(), pLineFormat)); + pCT->m_rMapArr.push_back(MapTableFrameFormat(pLine->GetFrameFormat(), pLineFormat)); } SwTableLine* pNewLine = new SwTableLine(pLineFormat, pLine->GetTabBoxes().size(), pCT->m_pInsBox); @@ -295,7 +295,7 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const // We have to make sure that the table node of the SwTable is accessible, even // without any content in m_TabSortContentBoxes. #i26629# pTableNd->GetTable().SetTableNode( pTableNd ); - rNds._Copy( aRg, aInsPos, false ); + rNds.Copy_( aRg, aInsPos, false ); pTableNd->GetTable().SetTableNode( nullptr ); // Special case for a single box @@ -310,8 +310,8 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const // during the generation of the table frame pTableNd->DelFrames(); - _MapTableFrameFormats aMapArr; - _CopyTable aPara( pDoc, aMapArr, GetIndex(), *pTableNd, &GetTable() ); + MapTableFrameFormats aMapArr; + CopyTable aPara( pDoc, aMapArr, GetIndex(), *pTableNd, &GetTable() ); for( const SwTableLine* pLine : GetTable().GetTabLines() ) lcl_CopyTableLine( pLine, &aPara ); diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 8ad3ab124328..32e2f0260a4c 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -1241,7 +1241,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c pNewSect->SetEditInReadonly(); SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // Where am I? - rNds._Copy( aRg, aInsPos, false ); + rNds.Copy_( aRg, aInsPos, false ); // Delete all Frames from the copied Area. They are created when creating // the SectionFrames. diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 2d9c24d906cb..43a18ad7a154 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1484,27 +1484,27 @@ bool SwDoc::TableToText( const SwTableNode* pTableNd, sal_Unicode cCh ) * Use the ForEach method from PtrArray to recreate Text from a Table. * The Boxes can also contain Lines! */ -struct _DelTabPara +struct DelTabPara { SwTextNode* pLastNd; SwNodes& rNds; SwUndoTableToText* pUndo; sal_Unicode cCh; - _DelTabPara( SwNodes& rNodes, sal_Unicode cChar, SwUndoTableToText* pU ) : + DelTabPara( SwNodes& rNodes, sal_Unicode cChar, SwUndoTableToText* pU ) : pLastNd(nullptr), rNds( rNodes ), pUndo( pU ), cCh( cChar ) {} - _DelTabPara( const _DelTabPara& rPara ) : + DelTabPara( const DelTabPara& rPara ) : pLastNd(rPara.pLastNd), rNds( rPara.rNds ), pUndo( rPara.pUndo ), cCh( rPara.cCh ) {} }; // Forward declare so that the Lines and Boxes can use recursion -static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara ); +static void lcl_DelBox( SwTableBox* pBox, DelTabPara* pDelPara ); -static void lcl_DelLine( SwTableLine* pLine, _DelTabPara* pPara ) +static void lcl_DelLine( SwTableLine* pLine, DelTabPara* pPara ) { assert(pPara && "The parameters are missing!"); - _DelTabPara aPara( *pPara ); + DelTabPara aPara( *pPara ); for( SwTableBoxes::iterator it = pLine->GetTabBoxes().begin(); it != pLine->GetTabBoxes().end(); ++it) lcl_DelBox(*it, &aPara ); @@ -1513,7 +1513,7 @@ static void lcl_DelLine( SwTableLine* pLine, _DelTabPara* pPara ) pPara->pLastNd = aPara.pLastNd; } -static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara ) +static void lcl_DelBox( SwTableBox* pBox, DelTabPara* pDelPara ) { assert(pDelPara && "The parameters are missing"); @@ -1596,7 +1596,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh, pTableNd->DelFrames(); // "Delete" the Table and merge all Lines/Boxes - _DelTabPara aDelPara( *this, cCh, pUndo ); + DelTabPara aDelPara( *this, cCh, pUndo ); for( SwTableLine *pLine : pTableNd->m_pTable->GetTabLines() ) lcl_DelLine( pLine, &aDelPara ); @@ -1840,9 +1840,9 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor ) return false; // Find all Boxes/Lines - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( aBoxes, &aFndBox ); + FndPara aPara( aBoxes, &aFndBox ); ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara ); } @@ -1856,11 +1856,11 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor ) // FIXME: Actually we should be interating over all Shells! } - _FndBox* pFndBox = &aFndBox; + FndBox_* pFndBox = &aFndBox; while( 1 == pFndBox->GetLines().size() && 1 == pFndBox->GetLines().front()->GetBoxes().size() ) { - _FndBox *const pTmp = pFndBox->GetLines().front()->GetBoxes()[0].get(); + FndBox_ *const pTmp = pFndBox->GetLines().front()->GetBoxes()[0].get(); if( pTmp->GetBox()->GetSttNd() ) break; // Else it gets too far pFndBox = pTmp; @@ -3173,7 +3173,7 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode, } // Find Lines for the Layout update - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); aFndBox.SetTableLines( rTable ); aFndBox.DelFrames( rTable ); @@ -3309,14 +3309,14 @@ static bool lcl_ChgTableSize( SwTable& rTable ) return true; } -class _SplitTable_Para +class SplitTable_Para { std::map<SwFrameFormat*, SwFrameFormat*> aSrcDestMap; SwTableNode* pNewTableNd; SwTable& rOldTable; public: - _SplitTable_Para( SwTableNode* pNew, SwTable& rOld ) + SplitTable_Para( SwTableNode* pNew, SwTable& rOld ) : aSrcDestMap(), pNewTableNd( pNew ), rOldTable( rOld ) {} SwFrameFormat* GetDestFormat( SwFrameFormat* pSrcFormat ) const @@ -3335,9 +3335,9 @@ public: } }; -static void lcl_SplitTable_CpyBox( SwTableBox* pBox, _SplitTable_Para* pPara ); +static void lcl_SplitTable_CpyBox( SwTableBox* pBox, SplitTable_Para* pPara ); -static void lcl_SplitTable_CpyLine( SwTableLine* pLn, _SplitTable_Para* pPara ) +static void lcl_SplitTable_CpyLine( SwTableLine* pLn, SplitTable_Para* pPara ) { SwFrameFormat *pSrcFormat = pLn->GetFrameFormat(); SwTableLineFormat* pDestFormat = static_cast<SwTableLineFormat*>( pPara->GetDestFormat( pSrcFormat ) ); @@ -3353,7 +3353,7 @@ static void lcl_SplitTable_CpyLine( SwTableLine* pLn, _SplitTable_Para* pPara ) lcl_SplitTable_CpyBox(*it, pPara ); } -static void lcl_SplitTable_CpyBox( SwTableBox* pBox, _SplitTable_Para* pPara ) +static void lcl_SplitTable_CpyBox( SwTableBox* pBox, SplitTable_Para* pPara ) { SwFrameFormat *pSrcFormat = pBox->GetFrameFormat(); SwTableBoxFormat* pDestFormat = static_cast<SwTableBoxFormat*>(pPara->GetDestFormat( pSrcFormat )); @@ -3454,7 +3454,7 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter, rTable.GetTabLines().erase( rTable.GetTabLines().begin() + nLinePos, rTable.GetTabLines().end() ); // Move the affected Boxes. Make the Formats unique and correct the StartNodes - _SplitTable_Para aPara( pNewTableNd, rTable ); + SplitTable_Para aPara( pNewTableNd, rTable ); for( SwTableLine* pNewLine : rNewTable.GetTabLines() ) lcl_SplitTable_CpyLine( pNewLine, &aPara ); rTable.CleanUpBottomRowSpan( nDeleted ); @@ -3568,7 +3568,7 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev, SwTable& rTable = pTableNd->GetTable(); // Find Lines for the Layout update - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); aFndBox.SetTableLines( rTable ); aFndBox.DelFrames( rTable ); @@ -3642,7 +3642,7 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev, // Clean up the Borders if( nOldSize ) { - _SwGCLineBorder aPara( rTable ); + SwGCLineBorder aPara( rTable ); aPara.nLinePos = --nOldSize; pFirstLn = rTable.GetTabLines()[ nOldSize ]; sw_GC_Line_Border( pFirstLn, &aPara ); @@ -3655,24 +3655,24 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev, } // Use the PtrArray's ForEach method -struct _SetAFormatTabPara +struct SetAFormatTabPara { SwTableAutoFormat& rTableFormat; SwUndoTableAutoFormat* pUndo; sal_uInt16 nEndBox, nCurBox; sal_uInt8 nAFormatLine, nAFormatBox; - explicit _SetAFormatTabPara( const SwTableAutoFormat& rNew ) + explicit SetAFormatTabPara( const SwTableAutoFormat& rNew ) : rTableFormat( (SwTableAutoFormat&)rNew ), pUndo( nullptr ), nEndBox( 0 ), nCurBox( 0 ), nAFormatLine( 0 ), nAFormatBox( 0 ) {} }; // Forward declare so that the Lines and Boxes can use recursion -static bool lcl_SetAFormatBox(_FndBox &, _SetAFormatTabPara *pSetPara, bool bResetDirect); -static bool lcl_SetAFormatLine(_FndLine &, _SetAFormatTabPara *pPara, bool bResetDirect); +static bool lcl_SetAFormatBox(FndBox_ &, SetAFormatTabPara *pSetPara, bool bResetDirect); +static bool lcl_SetAFormatLine(FndLine_ &, SetAFormatTabPara *pPara, bool bResetDirect); -static bool lcl_SetAFormatLine(_FndLine & rLine, _SetAFormatTabPara *pPara, bool bResetDirect) +static bool lcl_SetAFormatLine(FndLine_ & rLine, SetAFormatTabPara *pPara, bool bResetDirect) { for (auto const& it : rLine.GetBoxes()) { @@ -3681,7 +3681,7 @@ static bool lcl_SetAFormatLine(_FndLine & rLine, _SetAFormatTabPara *pPara, bool return true; } -static bool lcl_SetAFormatBox(_FndBox & rBox, _SetAFormatTabPara *pSetPara, bool bResetDirect) +static bool lcl_SetAFormatBox(FndBox_ & rBox, SetAFormatTabPara *pSetPara, bool bResetDirect) { if (!rBox.GetUpper()->GetUpper()) // Box on first level? { @@ -3750,9 +3750,9 @@ bool SwDoc::SetTableAutoFormat(const SwSelBoxes& rBoxes, const SwTableAutoFormat return false; // Find all Boxes/Lines - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( rBoxes, &aFndBox ); + FndPara aPara( rBoxes, &aFndBox ); ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara ); } if( aFndBox.GetLines().empty() ) @@ -3761,7 +3761,7 @@ bool SwDoc::SetTableAutoFormat(const SwSelBoxes& rBoxes, const SwTableAutoFormat SwTable &table = pTableNd->GetTable(); table.SetHTMLTableLayout( nullptr ); - _FndBox* pFndBox = &aFndBox; + FndBox_* pFndBox = &aFndBox; while( 1 == pFndBox->GetLines().size() && 1 == pFndBox->GetLines().front()->GetBoxes().size()) { @@ -3783,15 +3783,15 @@ bool SwDoc::SetTableAutoFormat(const SwSelBoxes& rBoxes, const SwTableAutoFormat rNew.RestoreTableProperties(table); - _SetAFormatTabPara aPara( rNew ); + SetAFormatTabPara aPara( rNew ); FndLines_t& rFLns = pFndBox->GetLines(); for (FndLines_t::size_type n = 0; n < rFLns.size(); ++n) { - _FndLine* pLine = rFLns[n].get(); + FndLine_* pLine = rFLns[n].get(); // Set Upper to 0 (thus simulate BaseLine) - _FndBox* pSaveBox = pLine->GetUpper(); + FndBox_* pSaveBox = pLine->GetUpper(); pLine->SetUpper( nullptr ); if( !n ) @@ -3835,9 +3835,9 @@ bool SwDoc::GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGe return false; // Find all Boxes/Lines - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( rBoxes, &aFndBox ); + FndPara aPara( rBoxes, &aFndBox ); ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara ); } if( aFndBox.GetLines().empty() ) @@ -3847,7 +3847,7 @@ bool SwDoc::GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGe SwTable &table = pTableNd->GetTable(); rGet.StoreTableProperties(table); - _FndBox* pFndBox = &aFndBox; + FndBox_* pFndBox = &aFndBox; while( 1 == pFndBox->GetLines().size() && 1 == pFndBox->GetLines().front()->GetBoxes().size()) { @@ -3867,7 +3867,7 @@ bool SwDoc::GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGe for( sal_uInt8 nLine = 0; nLine < 4; ++nLine ) { - _FndLine& rLine = *rFLns[ aLnArr[ nLine ] ]; + FndLine_& rLine = *rFLns[ aLnArr[ nLine ] ]; sal_uInt16 aBoxArr[4]; aBoxArr[0] = 0; @@ -4436,7 +4436,7 @@ bool SwDoc::InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes, return bRet; } -bool SwDoc::_UnProtectTableCells( SwTable& rTable ) +bool SwDoc::UnProtectTableCells( SwTable& rTable ) { bool bChgd = false; SwUndoAttrTable *const pUndo = (GetIDocumentUndoRedo().DoesUndo()) @@ -4472,7 +4472,7 @@ bool SwDoc::UnProtectCells( const OUString& rName ) SwTableFormat* pFormat = FindTableFormatByName( rName ); if( pFormat ) { - bChgd = _UnProtectTableCells( *SwTable::FindTable( pFormat ) ); + bChgd = UnProtectTableCells( *SwTable::FindTable( pFormat ) ); if( bChgd ) getIDocumentState().SetModified(); } @@ -4557,7 +4557,7 @@ bool SwDoc::UnProtectTables( const SwPaM& rPam ) } // Lift the protection - bChgd |= _UnProtectTableCells( *pTable ); + bChgd |= UnProtectTableCells( *pTable ); } GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, nullptr); diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index f48472133f61..1a2026a70e7d 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -172,16 +172,16 @@ struct LinesAndTable m_rLines(rL), m_rTable(rTable), m_bInsertLines(true) {} }; -bool _FindLine( _FndLine & rLine, LinesAndTable* pPara ); +bool FindLine_( FndLine_ & rLine, LinesAndTable* pPara ); -bool _FindBox( _FndBox & rBox, LinesAndTable* pPara ) +bool FindBox_( FndBox_ & rBox, LinesAndTable* pPara ) { if (!rBox.GetLines().empty()) { pPara->m_bInsertLines = true; for (auto const& rpFndLine : rBox.GetLines()) { - _FindLine(*rpFndLine, pPara); + FindLine_(*rpFndLine, pPara); } if (pPara->m_bInsertLines) @@ -205,11 +205,11 @@ bool _FindBox( _FndBox & rBox, LinesAndTable* pPara ) return true; } -bool _FindLine( _FndLine& rLine, LinesAndTable* pPara ) +bool FindLine_( FndLine_& rLine, LinesAndTable* pPara ) { for (auto const& it : rLine.GetBoxes()) { - _FindBox(*it, pPara); + FindBox_(*it, pPara); } return true; } @@ -224,14 +224,14 @@ static void lcl_CollectLines( std::vector<SwTableLine*> &rArr, const SwCursor& r // Copy the selected structure const SwTable &rTable = aBoxes[0]->GetSttNd()->FindTableNode()->GetTable(); LinesAndTable aPara( rArr, rTable ); - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aTmpPara( aBoxes, &aFndBox ); + FndPara aTmpPara( aBoxes, &aFndBox ); ForEach_FndLineCopyCol( (SwTableLines&)rTable.GetTabLines(), &aTmpPara ); } // Collect the Lines which only contain selected Boxes - ::_FindBox(aFndBox, &aPara); + ::FindBox_(aFndBox, &aPara); // Remove lines, that have a common superordinate row. // (Not for row split) diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index d330f25a5292..ae1a3fcb47a7 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -387,7 +387,7 @@ void SwNode2LayImpl::RestoreUpperFrames( SwNodes& rNds, sal_uLong nStt, sal_uLon static_cast<SwSectionFrame*>(pNxt)->UnlockJoin(); pUp = static_cast<SwLayoutFrame*>((*pUpperFrames)[x++]); OSL_ENSURE( pUp->GetUpper() || pUp->IsFlyFrame(), "Lost Upper" ); - ::_InsertCnt( pUp, pDoc, pNd->GetIndex(), false, nStt+1, pNxt ); + ::InsertCnt_( pUp, pDoc, pNd->GetIndex(), false, nStt+1, pNxt ); pNxt = pUp->GetLastLower(); (*pUpperFrames)[x-2] = pNxt; } @@ -406,7 +406,7 @@ void SwNode2LayImpl::RestoreUpperFrames( SwNodes& rNds, sal_uLong nStt, sal_uLon // #i18103# - invalidate size of section in order to // assure, that the section is formatted, unless it was 'Collocked' // from its 'collection' until its 'restoration'. - pSctFrame->_InvalidateSize(); + pSctFrame->InvalidateSize_(); } } } diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 479fcfd722f4..d3196bfc0c91 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -403,7 +403,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz, * @param bNewFrames * @return */ -bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, +bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, const SwNodeIndex& aIndex, bool bNewFrames ) { SwNode * pAktNode; @@ -1647,7 +1647,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes ) // move the nodes into the NodesArary const sal_uLong nSttDiff = aSttIdx.GetIndex() - pStt->nNode.GetIndex(); SwNodeRange aRg( aSttIdx, aEndIdx ); - _MoveNodes( aRg, rNodes, rPos.nNode ); + MoveNodes( aRg, rNodes, rPos.nNode ); // if in the same node array, all indices are now at new positions (so correct them) if( &rNodes == this ) @@ -1675,8 +1675,8 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes ) rNodes.IsDocNodes() ? SwFormatFieldHintWhich::INSERTED : SwFormatFieldHintWhich::REMOVED ) ); } -///@see SwNodes::_MoveNodes (TODO: seems to be C&P programming here) -void SwNodes::_CopyNodes( const SwNodeRange& rRange, +///@see SwNodes::MoveNodes (TODO: seems to be C&P programming here) +void SwNodes::CopyNodes( const SwNodeRange& rRange, const SwNodeIndex& rIndex, bool bNewFrames, bool bTableInsDummyNode ) const { SwDoc* pDoc = rIndex.GetNode().GetDoc(); @@ -1764,7 +1764,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange, new SwPlaceholderNode(aInsPos); SwStartNode* pSttNd = aRg.aStart.GetNode().GetStartNode(); - _CopyNodes( SwNodeRange( *pSttNd, + 1, + CopyNodes( SwNodeRange( *pSttNd, + 1, *pSttNd->EndOfSectionNode() ), aInsPos, bNewFrames ); @@ -1883,7 +1883,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange, } } -void SwNodes::_DelDummyNodes( const SwNodeRange& rRg ) +void SwNodes::DelDummyNodes( const SwNodeRange& rRg ) { SwNodeIndex aIdx( rRg.aStart ); while( aIdx.GetIndex() < rRg.aEnd.GetIndex() ) diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index af416ba49060..5390d3e9e305 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -1229,7 +1229,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) // Delete everything succeeding it --aIdx; DelFlyInRange( aIdx, aEndIdx ); - _DelBookmarks(aIdx, aEndIdx); + DelBookmarks(aIdx, aEndIdx); ++aIdx; pDoc->GetNodes().Delete( aIdx, aEndIdx.GetIndex() - aIdx.GetIndex() ); diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 95c75a16047d..c93ca939e506 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -189,7 +189,7 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj ) // the object and invalidate its position. const bool bNotify( !GetFormat()->getIDocumentDrawModelAccess().IsVisibleLayerId( _pDrawObj->GetLayer() ) ); - _MoveObjToLayer( true, _pDrawObj ); + MoveObjToLayer( true, _pDrawObj ); // #i46297# if ( bNotify ) @@ -219,7 +219,7 @@ void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) // #i46297# - notify background about the leaving of the object. const bool bNotify( GetFormat()->getIDocumentDrawModelAccess().IsVisibleLayerId( _pDrawObj->GetLayer() ) ); - _MoveObjToLayer( false, _pDrawObj ); + MoveObjToLayer( false, _pDrawObj ); // #i46297# if ( bNotify ) @@ -242,18 +242,18 @@ void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) implementation for the public method <MoveObjToVisibleLayer(..)> and <MoveObjToInvisibleLayer(..)> */ -void SwContact::_MoveObjToLayer( const bool _bToVisible, +void SwContact::MoveObjToLayer( const bool _bToVisible, SdrObject* _pDrawObj ) { if ( !_pDrawObj ) { - OSL_FAIL( "SwDrawContact::_MoveObjToLayer(..) - no drawing object!" ); + OSL_FAIL( "SwDrawContact::MoveObjToLayer(..) - no drawing object!" ); return; } if ( !GetRegisteredIn() ) { - OSL_FAIL( "SwDrawContact::_MoveObjToLayer(..) - no drawing frame format!" ); + OSL_FAIL( "SwDrawContact::MoveObjToLayer(..) - no drawing frame format!" ); return; } @@ -304,7 +304,7 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible, { for ( size_t i = 0; i < pLst->GetObjCount(); ++i ) { - _MoveObjToLayer( _bToVisible, pLst->GetObj( i ) ); + MoveObjToLayer( _bToVisible, pLst->GetObj( i ) ); } } } @@ -1071,13 +1071,13 @@ void SwDrawContact::Changed( const SdrObject& rObj, pTmpRoot->StartAllAction(); } SdrObjUserCall::Changed( rObj, eType, rOldBoundRect ); - _Changed( rObj, eType, &rOldBoundRect ); //Attention, possibly suicidal! + Changed_( rObj, eType, &rOldBoundRect ); //Attention, possibly suicidal! if(!bHasActions) pTmpRoot->EndAllAction(); } -/// helper class for method <SwDrawContact::_Changed(..)> for handling nested +/// helper class for method <SwDrawContact::Changed_(..)> for handling nested /// <SdrObjUserCall> events class NestedUserCallHdl { @@ -1142,7 +1142,7 @@ class NestedUserCallHdl if ( bTmpAssert ) { - OSL_FAIL( "<SwDrawContact::_Changed(..)> - unknown nested <UserCall> event. This is serious." ); + OSL_FAIL( "<SwDrawContact::Changed_(..)> - unknown nested <UserCall> event. This is serious." ); } } } @@ -1163,7 +1163,7 @@ void lcl_textBoxSizeNotify(SwFrameFormat* pFormat) // !!!ATTENTION!!! The object may commit suicide!!! -void SwDrawContact::_Changed( const SdrObject& rObj, +void SwDrawContact::Changed_( const SdrObject& rObj, SdrUserCallType eType, const Rectangle* pOldBoundRect ) { @@ -1205,7 +1205,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj, { if ( mbDisconnectInProgress ) { - OSL_FAIL( "<SwDrawContact::_Changed(..)> - Insert event during disconnection from layout is invalid." ); + OSL_FAIL( "<SwDrawContact::Changed_(..)> - Insert event during disconnection from layout is invalid." ); } else { @@ -1341,7 +1341,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj, break; default: { - OSL_FAIL( "<SwDrawContact::_Changed(..)> - unsupported layout direction" ); + OSL_FAIL( "<SwDrawContact::Changed_(..)> - unsupported layout direction" ); } } SfxItemSet aSet( GetFormat()->GetDoc()->GetAttrPool(), @@ -1382,7 +1382,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj, } else if ( aObjRect.SSize() != aOldObjRect.GetSize() ) { - _InvalidateObjs(); + InvalidateObjs_(); // #i35007# - notify anchor frame // of as-character anchored object if ( bAnchoredAsChar ) @@ -1491,7 +1491,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) // --> #i28701# - on change of wrapping style, hell|heaven layer, // or wrapping style influence an update of the <SwSortedObjs> list, // the drawing object is registered in, has to be performed. This is triggered - // by the 1st parameter of method call <_InvalidateObjs(..)>. + // by the 1st parameter of method call <InvalidateObjs_(..)>. if ( RES_SURROUND == nWhich || RES_OPAQUE == nWhich || RES_WRAP_INFLUENCE_ON_OBJPOS == nWhich || @@ -1505,7 +1505,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { lcl_NotifyBackgroundOfObj( *this, *GetMaster(), nullptr ); NotifyBackgrdOfAllVirtObjs( nullptr ); - _InvalidateObjs( true ); + InvalidateObjs_( true ); } else if ( RES_UL_SPACE == nWhich || RES_LR_SPACE == nWhich || RES_HORI_ORIENT == nWhich || RES_VERT_ORIENT == nWhich || @@ -1525,14 +1525,14 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { lcl_NotifyBackgroundOfObj( *this, *GetMaster(), nullptr ); NotifyBackgrdOfAllVirtObjs( nullptr ); - _InvalidateObjs(); + InvalidateObjs_(); } // #i35443# else if ( RES_ATTRSET_CHG == nWhich ) { lcl_NotifyBackgroundOfObj( *this, *GetMaster(), nullptr ); NotifyBackgrdOfAllVirtObjs( nullptr ); - _InvalidateObjs(); + InvalidateObjs_(); } else if ( RES_REMOVE_UNO_OBJECT == nWhich ) { @@ -1552,7 +1552,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) // #i26791# // #i28701# - added parameter <_bUpdateSortedObjsList> -void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList ) +void SwDrawContact::InvalidateObjs_( const bool _bUpdateSortedObjsList ) { // invalidate position of existing 'virtual' drawing objects for ( std::list<SwDrawVirtObj*>::iterator aDisconnectIter = maDrawVirtObjs.begin(); @@ -1885,7 +1885,7 @@ void SwDrawContact::ConnectToLayout( const SwFormatAnchor* pAnch ) { ::setContextWritingMode( maAnchoredDrawObj.DrawObj(), GetAnchorFrame() ); // #i26791# - invalidate objects instead of direct positioning - _InvalidateObjs(); + InvalidateObjs_(); } } @@ -1959,7 +1959,7 @@ void SwDrawContact::ChangeMasterObject( SdrObject *pNewMaster ) SetMaster( pNewMaster ); GetMaster()->SetUserCall( this ); - _InvalidateObjs(); + InvalidateObjs_(); } /// get data collection of anchored objects, handled by with contact diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index eb05f95adb54..ba896341f825 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -308,14 +308,14 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const } /// determine maximal order number for a 'child' object of given 'parent' object -sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrame& _rParentObj, +sal_uInt32 SwDrawView::GetMaxChildOrdNum( const SwFlyFrame& _rParentObj, const SdrObject* _pExclChildObj ) { sal_uInt32 nMaxChildOrdNum = _rParentObj.GetDrawObj()->GetOrdNum(); const SdrPage* pDrawPage = _rParentObj.GetDrawObj()->GetPage(); OSL_ENSURE( pDrawPage, - "<SwDrawView::_GetMaxChildOrdNum(..) - missing drawing page at parent object - crash!" ); + "<SwDrawView::GetMaxChildOrdNum(..) - missing drawing page at parent object - crash!" ); const size_t nObjCount = pDrawPage->GetObjCount(); for ( size_t i = nObjCount-1; i > _rParentObj.GetDrawObj()->GetOrdNum() ; --i ) @@ -340,14 +340,14 @@ sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrame& _rParentObj, } /// method to move 'repeated' objects of the given moved object to the according level -void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj, +void SwDrawView::MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj, const std::vector<SdrObject*>& _rMovedChildObjs ) const { // determine 'repeated' objects of already moved object <_rMovedAnchoredObj> std::list<SwAnchoredObject*> aAnchoredObjs; { const SwContact* pContact = ::GetUserCall( _rMovedAnchoredObj.GetDrawObj() ); - assert(pContact && "SwDrawView::_MoveRepeatedObjs(..) - missing contact object -> crash."); + assert(pContact && "SwDrawView::MoveRepeatedObjs(..) - missing contact object -> crash."); pContact->GetAnchoredObjs( aAnchoredObjs ); } @@ -389,7 +389,7 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj, SdrObject* pChildObj = (*aObjIter); { const SwContact* pContact = ::GetUserCall( pChildObj ); - assert(pContact && "SwDrawView::_MoveRepeatedObjs(..) - missing contact object -> crash."); + assert(pContact && "SwDrawView::MoveRepeatedObjs(..) - missing contact object -> crash."); pContact->GetAnchoredObjs( aAnchoredObjs ); } // move 'repeated' ones to the same order number as the already moved one. @@ -450,7 +450,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, if ( bMovedForward ) { const size_t nMaxChildOrdNumWithoutMoved = - _GetMaxChildOrdNum( *pParentAnchoredObj, pMovedAnchoredObj->GetDrawObj() ); + GetMaxChildOrdNum( *pParentAnchoredObj, pMovedAnchoredObj->GetDrawObj() ); if ( nNewPos > nMaxChildOrdNumWithoutMoved+1 ) { // set position to the top of the 'child' object group @@ -512,7 +512,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, bMovedForward && nNewPos < nObjCount - 1 ) { sal_uInt32 nMaxChildOrdNum = - _GetMaxChildOrdNum( *(static_cast<const SwFlyFrame*>(pMovedAnchoredObj)) ); + GetMaxChildOrdNum( *(static_cast<const SwFlyFrame*>(pMovedAnchoredObj)) ); if ( nNewPos < nMaxChildOrdNum ) { // determine position before the object before its top 'child' object @@ -644,7 +644,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, rImp.AddAccessibleObj( pObj ); } - _MoveRepeatedObjs( *pMovedAnchoredObj, aMovedChildObjs ); + MoveRepeatedObjs( *pMovedAnchoredObj, aMovedChildObjs ); } bool SwDrawView::TakeDragLimit( SdrDragMode eMode, diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 998bbb9f4479..afc4d1832b45 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; -class _PaMIntoCursorShellRing +class PaMIntoCursorShellRing { SwCursorShell& rSh; SwPaM &rDelPam, &rCursor; @@ -46,15 +46,15 @@ class _PaMIntoCursorShellRing static void RemoveFromRing( SwPaM& rPam, SwPaM* pPrev ); public: - _PaMIntoCursorShellRing( SwCursorShell& rSh, SwPaM& rCursor, SwPaM& rPam ); - ~_PaMIntoCursorShellRing(); + PaMIntoCursorShellRing( SwCursorShell& rSh, SwPaM& rCursor, SwPaM& rPam ); + ~PaMIntoCursorShellRing(); }; -_PaMIntoCursorShellRing::_PaMIntoCursorShellRing( SwCursorShell& rCSh, +PaMIntoCursorShellRing::PaMIntoCursorShellRing( SwCursorShell& rCSh, SwPaM& rShCursor, SwPaM& rPam ) : rSh( rCSh ), rDelPam( rPam ), rCursor( rShCursor ) { - SwPaM* pShCursor = rSh._GetCursor(); + SwPaM* pShCursor = rSh.GetCursor_(); pPrevDelPam = rDelPam.GetPrev(); pPrevCursor = rCursor.GetPrev(); @@ -63,14 +63,14 @@ _PaMIntoCursorShellRing::_PaMIntoCursorShellRing( SwCursorShell& rCSh, rCursor.GetRingContainer().merge( pShCursor->GetRingContainer() ); } -_PaMIntoCursorShellRing::~_PaMIntoCursorShellRing() +PaMIntoCursorShellRing::~PaMIntoCursorShellRing() { // and take out the Pam again: RemoveFromRing( rDelPam, pPrevDelPam ); RemoveFromRing( rCursor, pPrevCursor ); } -void _PaMIntoCursorShellRing::RemoveFromRing( SwPaM& rPam, SwPaM* pPrev ) +void PaMIntoCursorShellRing::RemoveFromRing( SwPaM& rPam, SwPaM* pPrev ) { SwPaM* p; SwPaM* pNext = &rPam; @@ -105,7 +105,7 @@ void SwAutoCorrDoc::DeleteSel( SwPaM& rDelPam ) { // so that also the DelPam be moved, include it in the // Shell-Cursr-Ring !! - _PaMIntoCursorShellRing aTmp( rEditSh, rCursor, rDelPam ); + PaMIntoCursorShellRing aTmp( rEditSh, rCursor, rDelPam ); pDoc->getIDocumentContentOperations().DeleteAndJoin( rDelPam ); } else @@ -187,7 +187,7 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const } else { - _PaMIntoCursorShellRing aTmp( rEditSh, rCursor, *pPam ); + PaMIntoCursorShellRing aTmp( rEditSh, rCursor, *pPam ); pPam->SetMark(); pPam->GetPoint()->nContent = std::min<sal_Int32>( diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 8b3786d78bf7..aab512412ac1 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -220,10 +220,10 @@ class SwAutoFormat bool DoUnderline(); bool DoTable(); - void _SetRedlineText( sal_uInt16 nId ); + void SetRedlineText_( sal_uInt16 nId ); bool SetRedlineText( sal_uInt16 nId ) { if( m_aFlags.bWithRedlining ) - _SetRedlineText( nId ); + SetRedlineText_( nId ); return true; } bool ClearRedlineText() { @@ -261,7 +261,7 @@ SwTextFrame* SwAutoFormat::GetFrame( const SwTextNode& rTextNd ) const return const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pFrame))->GetFormatted(); } -void SwAutoFormat::_SetRedlineText( sal_uInt16 nActionId ) +void SwAutoFormat::SetRedlineText_( sal_uInt16 nActionId ) { OUString sText; sal_uInt16 nSeqNo = 0; @@ -1112,7 +1112,7 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam ) if( m_aFlags.bWithRedlining ) { // Add to Shell-Cursor-Ring so that DelPam will be moved as well! - SwPaM* pShCursor = m_pEditShell->_GetCursor(); + SwPaM* pShCursor = m_pEditShell->GetCursor_(); SwPaM aTmp( *m_pCurTextNd, 0, pShCursor ); SwPaM* pPrev = rDelPam.GetPrev(); diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 7f7d3739548a..a4e27a098eb1 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -457,7 +457,7 @@ size_t SwEditShell::GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes ) sText += " "; sText += pTextNd->GetExpandText(); - _SeqFieldLstElem* pNew = new _SeqFieldLstElem( sText, + SeqFieldLstElem* pNew = new SeqFieldLstElem( sText, pTextFootnote->GetSeqRefNo() ); while( rList.InsertSort( pNew ) ) pNew->sDlgEntry += " "; diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 34f2eb90c4c4..52bd464c3f25 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -64,7 +64,7 @@ sal_uInt16 SwEditShell::MakeGlossary( SwTextBlocks& rBlks, const OUString& rName if( rBlks.BeginPutDoc( rShortName, rName ) ) { rBlks.GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_DELETE_REDLINES ); - _CopySelToDoc( pGDoc ); + CopySelToDoc( pGDoc ); rBlks.GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)0 ); return rBlks.PutDoc(); } @@ -150,7 +150,7 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock, } /// copy all selections to the doc -bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc ) +bool SwEditShell::CopySelToDoc( SwDoc* pInsDoc ) { OSL_ENSURE( pInsDoc, "no Ins.Document" ); @@ -198,7 +198,7 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc ) } else { - bool bColSel = _GetCursor()->IsColumnSelection(); + bool bColSel = GetCursor_()->IsColumnSelection(); if( bColSel && pInsDoc->IsClipBoard() ) pInsDoc->SetColumnSelection( true ); bool bSelectAll = StartsWithTable() && ExtendedSelectedAll(); diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index a92c6764d911..894614ea5fe7 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -115,7 +115,7 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints ) } // calculate cursor bidi level - SwCursor* pTmpCursor = _GetCursor(); + SwCursor* pTmpCursor = GetCursor_(); const bool bDoNotSetBidiLevel = ! pTmpCursor || ( dynamic_cast<SwUnoCursor*>(pTmpCursor) != nullptr ); @@ -218,7 +218,7 @@ bool SwEditShell::AppendTextNode() } // the returned SwGrfNode pointer is used in GetGraphic() and GetGraphicSize() -SwGrfNode * SwEditShell::_GetGrfNode() const +SwGrfNode * SwEditShell::GetGrfNode_() const { SwGrfNode *pGrfNode = nullptr; SwPaM* pCursor = GetCursor(); @@ -233,7 +233,7 @@ SwGrfNode * SwEditShell::_GetGrfNode() const // GetMark is not set or points to the same Graphic const Graphic* SwEditShell::GetGraphic( bool bWait ) const { - SwGrfNode* pGrfNode = _GetGrfNode(); + SwGrfNode* pGrfNode = GetGrfNode_(); const Graphic* pGrf( nullptr ); if ( pGrfNode ) { @@ -244,7 +244,7 @@ const Graphic* SwEditShell::GetGraphic( bool bWait ) const bool SwEditShell::IsLinkedGrfSwapOut() const { - SwGrfNode *pGrfNode = _GetGrfNode(); + SwGrfNode *pGrfNode = GetGrfNode_(); return pGrfNode && ( pGrfNode->IsLinkedFile() && ( GRAPHIC_DEFAULT == pGrfNode->GetGrfObj().GetType() || @@ -253,13 +253,13 @@ bool SwEditShell::IsLinkedGrfSwapOut() const const GraphicObject* SwEditShell::GetGraphicObj() const { - SwGrfNode* pGrfNode = _GetGrfNode(); + SwGrfNode* pGrfNode = GetGrfNode_(); return pGrfNode ? &(pGrfNode->GetGrfObj()) : nullptr; } sal_uInt16 SwEditShell::GetGraphicType() const { - SwGrfNode *pGrfNode = _GetGrfNode(); + SwGrfNode *pGrfNode = GetGrfNode_(); return static_cast<sal_uInt16>(pGrfNode ? pGrfNode->GetGrfObj().GetType() : GRAPHIC_NONE); } @@ -299,7 +299,7 @@ void SwEditShell::GetGrfNms( OUString* pGrfName, OUString* pFltName, SwDoc::GetGrfNms( *pFormat, pGrfName, pFltName ); else { - SwGrfNode *pGrfNode = _GetGrfNode(); + SwGrfNode *pGrfNode = GetGrfNode_(); if( pGrfNode && pGrfNode->IsLinkedFile() ) pGrfNode->GetFileFilterNms( pGrfName, pFltName ); } diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 85c4283380aa..2ed9f81a5dac 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -91,9 +91,9 @@ public: inline sal_uInt16& GetCursorCnt(){ return nCursorCnt; } // for the UI: - void _Start( SwEditShell *pSh, SwDocPositions eStart, + void Start_( SwEditShell *pSh, SwDocPositions eStart, SwDocPositions eEnd ); - void _End(bool bRestoreSelection = true); + void End_(bool bRestoreSelection = true); }; // #i18881# to be able to identify the positions of the changed words @@ -192,7 +192,7 @@ SwLinguIter::SwLinguIter() // TODO missing: ensurance of re-entrance, OSL_ENSURE( etc. } -void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart, +void SwLinguIter::Start_( SwEditShell *pShell, SwDocPositions eStart, SwDocPositions eEnd ) { // TODO missing: ensurance of re-entrance, locking @@ -205,7 +205,7 @@ void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart, SET_CURR_SHELL( pSh ); - OSL_ENSURE( !pEnd, "SwLinguIter::_Start without End?"); + OSL_ENSURE( !pEnd, "SwLinguIter::Start_ without End?"); SwPaM *pCursor = pSh->GetCursor(); @@ -250,12 +250,12 @@ void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart, pCursor->SetMark(); } -void SwLinguIter::_End(bool bRestoreSelection) +void SwLinguIter::End_(bool bRestoreSelection) { if( !pSh ) return; - OSL_ENSURE( pEnd, "SwLinguIter::_End without end?"); + OSL_ENSURE( pEnd, "SwLinguIter::End_ without end?"); if(bRestoreSelection) { while( nCursorCnt-- ) @@ -280,7 +280,7 @@ void SwSpellIter::Start( SwEditShell *pShell, SwDocPositions eStart, xSpeller = ::GetSpellChecker(); if ( xSpeller.is() ) - _Start( pShell, eStart, eEnd ); + Start_( pShell, eStart, eEnd ); aLastPortions.clear(); aLastPositions.clear(); } @@ -347,7 +347,7 @@ void SwConvIter::Start( SwEditShell *pShell, SwDocPositions eStart, { if( GetSh() ) return; - _Start( pShell, eStart, eEnd ); + Start_( pShell, eStart, eEnd ); } uno::Any SwConvIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) @@ -440,7 +440,7 @@ void SwHyphIter::Start( SwEditShell *pShell, SwDocPositions eStart, SwDocPositio // nothing to do (at least not in the way as in the "else" part) bOldIdle = pShell->GetViewOptions()->IsIdle(); pShell->GetViewOptions()->SetIdle( false ); - _Start( pShell, eStart, eEnd ); + Start_( pShell, eStart, eEnd ); } // restore selections @@ -449,7 +449,7 @@ void SwHyphIter::End() if( !GetSh() ) return; GetSh()->GetViewOptions()->SetIdle( bOldIdle ); - _End(); + End_(); } uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) @@ -665,14 +665,14 @@ void SwEditShell::SpellEnd( SwConversionArgs *pConvArgs, bool bRestoreSelection if (!pConvArgs && g_pSpellIter && g_pSpellIter->GetSh() == this) { OSL_ENSURE( g_pSpellIter, "where is my Iterator?" ); - g_pSpellIter->_End(bRestoreSelection); + g_pSpellIter->End_(bRestoreSelection); delete g_pSpellIter; g_pSpellIter = nullptr; } if (pConvArgs && g_pConvIter && g_pConvIter->GetSh() == this) { OSL_ENSURE( g_pConvIter, "where is my Iterator?" ); - g_pConvIter->_End(); + g_pConvIter->End_(); delete g_pConvIter; g_pConvIter = nullptr; } diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index c0abcf0fa33d..447a57e7ac6d 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -171,7 +171,7 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet, SwSectionFormat* pSectFormat ) { if( pSectFormat ) - _SetSectionAttr( *pSectFormat, rSet ); + SetSectionAttr_( *pSectFormat, rSet ); else { // for all section in the selection @@ -187,10 +187,10 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet, if( pSttSectNd || pEndSectNd ) { if( pSttSectNd ) - _SetSectionAttr( *pSttSectNd->GetSection().GetFormat(), + SetSectionAttr_( *pSttSectNd->GetSection().GetFormat(), rSet ); if( pEndSectNd && pSttSectNd != pEndSectNd ) - _SetSectionAttr( *pEndSectNd->GetSection().GetFormat(), + SetSectionAttr_( *pEndSectNd->GetSection().GetFormat(), rSet ); if( pSttSectNd && pEndSectNd ) @@ -210,7 +210,7 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet, || ( aSIdx.GetNode().IsEndNode() && nullptr != ( pSttSectNd = aSIdx.GetNode(). StartOfSectionNode()->GetSectionNode())) ) - _SetSectionAttr( *pSttSectNd->GetSection().GetFormat(), + SetSectionAttr_( *pSttSectNd->GetSection().GetFormat(), rSet ); ++aSIdx; } @@ -221,7 +221,7 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet, } } -void SwEditShell::_SetSectionAttr( SwSectionFormat& rSectFormat, +void SwEditShell::SetSectionAttr_( SwSectionFormat& rSectFormat, const SfxItemSet& rSet ) { StartAllAction(); diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 7b5ff1a1232b..a2f4d506dcc4 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -310,7 +310,7 @@ SwTableFormula::~SwTableFormula() { } -void SwTableFormula::_MakeFormula( const SwTable& rTable, OUString& rNewStr, +void SwTableFormula::MakeFormula_( const SwTable& rTable, OUString& rNewStr, OUString& rFirstBox, OUString* pLastBox, void* pPara ) const { SwTableCalcPara* pCalcPara = static_cast<SwTableCalcPara*>(pPara); @@ -649,7 +649,7 @@ OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTa // JP 16.02.99: SplitMergeBoxNm take care of the name themself // JP 22.02.99: Linux compiler needs cast // JP 28.06.99: rel. BoxName has no preceding tablename! - if( fnFormula != (FnScanFormula)&SwTableFormula::_SplitMergeBoxNm && + if( fnFormula != (FnScanFormula)&SwTableFormula::SplitMergeBoxNm_ && m_sFormula.getLength()>(nStt+1) && cRelIdentifier != m_sFormula[nStt+1] && (nSeparator = m_sFormula.indexOf( '.', nStt ))>=0 && nSeparator < nEnd ) @@ -662,7 +662,7 @@ OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTa sTableNm = sTableNm.copy( 0, nSeparator - nStt ); // when creating a formula the table name is unwanted - if( fnFormula != (FnScanFormula)&SwTableFormula::_MakeFormula ) + if( fnFormula != (FnScanFormula)&SwTableFormula::MakeFormula_ ) aStr += sTableNm; nStt = nSeparator; @@ -799,12 +799,12 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTable, while (!sGetName.isEmpty()) { - nSttBox = SwTable::_GetBoxNum( sGetName ); + nSttBox = SwTable::GetBoxNum( sGetName ); pLines = &pBox->GetTabLines(); if( nSttBox ) --nSttBox; - nSttLine = SwTable::_GetBoxNum( sGetName ); + nSttLine = SwTable::GetBoxNum( sGetName ); // determine line if( !nSttLine || nSttLine > pLines->size() ) @@ -851,10 +851,10 @@ static OUString lcl_BoxNmToRel( const SwTable& rTable, const SwTableNode& rTable // If the formula is spanning over a table then keep external presentation if( &rTable == &rTableNd.GetTable() ) { - long nBox = SwTable::_GetBoxNum( sTmp, true ); - nBox -= SwTable::_GetBoxNum( sRefBoxNm, true ); - long nLine = SwTable::_GetBoxNum( sTmp ); - nLine -= SwTable::_GetBoxNum( sRefBoxNm ); + long nBox = SwTable::GetBoxNum( sTmp, true ); + nBox -= SwTable::GetBoxNum( sRefBoxNm, true ); + long nLine = SwTable::GetBoxNum( sTmp ); + nLine -= SwTable::GetBoxNum( sRefBoxNm ); const OUString sCpy = sTmp; //JP 01.11.95: add rest from box name @@ -879,10 +879,10 @@ void SwTableFormula::GetBoxesOfFormula( const SwTable& rTable, rBoxes.clear(); BoxNmToPtr( &rTable ); - ScanString( &SwTableFormula::_GetFormulaBoxes, rTable, &rBoxes ); + ScanString( &SwTableFormula::GetFormulaBoxes, rTable, &rBoxes ); } -void SwTableFormula::_GetFormulaBoxes( const SwTable& rTable, OUString& , +void SwTableFormula::GetFormulaBoxes( const SwTable& rTable, OUString& , OUString& rFirstBox, OUString* pLastBox, void* pPara ) const { SwSelBoxes* pBoxes = static_cast<SwSelBoxes*>(pPara); @@ -972,7 +972,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox, } /// Are all boxes valid that are referenced by the formula? -void SwTableFormula::_HasValidBoxes( const SwTable& rTable, OUString& , +void SwTableFormula::HasValidBoxes_( const SwTable& rTable, OUString& , OUString& rFirstBox, OUString* pLastBox, void* pPara ) const { bool* pBValid = static_cast<bool*>(pPara); @@ -1025,7 +1025,7 @@ bool SwTableFormula::HasValidBoxes() const bool bRet = true; const SwNode* pNd = GetNodeOfFormula(); if( pNd && nullptr != ( pNd = pNd->FindTableNode() ) ) - ScanString( &SwTableFormula::_HasValidBoxes, + ScanString( &SwTableFormula::HasValidBoxes_, static_cast<const SwTableNode*>(pNd)->GetTable(), &bRet ); return bRet; } @@ -1043,7 +1043,7 @@ sal_uInt16 SwTableFormula::GetLnPosInTable( const SwTable& rTable, const SwTable return nRet; } -void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTable, OUString& rNewStr, +void SwTableFormula::SplitMergeBoxNm_( const SwTable& rTable, OUString& rNewStr, OUString& rFirstBox, OUString* pLastBox, void* pPara ) const { SwTableFormulaUpdate& rTableUpd = *static_cast<SwTableFormulaUpdate*>(pPara); @@ -1198,7 +1198,7 @@ void SwTableFormula::ToSplitMergeBoxNm( SwTableFormulaUpdate& rTableUpd ) else pTable = rTableUpd.m_pTable; - m_sFormula = ScanString( &SwTableFormula::_SplitMergeBoxNm, *pTable, static_cast<void*>(&rTableUpd) ); + m_sFormula = ScanString( &SwTableFormula::SplitMergeBoxNm_, *pTable, static_cast<void*>(&rTableUpd) ); m_eNmType = INTRNL_NAME; } diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index a9da13be41c1..88f7d9fb6d5c 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -294,7 +294,7 @@ void SwDDEFieldType::SetDoc( SwDoc* pNewDoc ) } } -void SwDDEFieldType::_RefCntChgd() +void SwDDEFieldType::RefCntChgd() { if( nRefCnt ) { diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index cd3f5674c200..f20e418784b7 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -2075,7 +2075,7 @@ void SwRefPageGetFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* if( !pNew && !pOld && HasWriterListeners() ) { // first collect all SetPageRefFields - _SetGetExpFields aTmpLst; + SetGetExpFields aTmpLst; if( MakeSetList( aTmpLst ) ) { SwIterator<SwFormatField,SwFieldType> aIter( *this ); @@ -2090,7 +2090,7 @@ void SwRefPageGetFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* NotifyClients( pOld, pNew ); } -bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFields& rTmpLst ) +bool SwRefPageGetFieldType::MakeSetList( SetGetExpFields& rTmpLst ) { SwIterator<SwFormatField,SwFieldType> aIter(*pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_REFPAGESETFLD)); for ( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() ) @@ -2105,7 +2105,7 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFields& rTmpLst ) Point aPt; const SwContentFrame* pFrame = rTextNd.getLayoutFrame( rTextNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false ); - _SetGetExpField* pNew; + SetGetExpField* pNew; if( !pFrame || pFrame->IsInDocBody() || @@ -2115,7 +2115,7 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFields& rTmpLst ) { // create index for determination of the TextNode SwNodeIndex aIdx( rTextNd ); - pNew = new _SetGetExpField( aIdx, pTField ); + pNew = new SetGetExpField( aIdx, pTField ); } else { @@ -2124,7 +2124,7 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFields& rTmpLst ) bool const bResult = GetBodyTextNode( *pDoc, aPos, *pFrame ); OSL_ENSURE(bResult, "where is the Field?"); (void) bResult; // unused in non-debug - pNew = new _SetGetExpField( aPos.nNode, pTField, + pNew = new SetGetExpField( aPos.nNode, pTField, &aPos.nContent ); } @@ -2137,7 +2137,7 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFields& rTmpLst ) } void SwRefPageGetFieldType::UpdateField( SwTextField* pTextField, - _SetGetExpFields& rSetList ) + SetGetExpFields& rSetList ) { SwRefPageGetField* pGetField = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pTextField->GetFormatField().GetField())); pGetField->SetText( OUString() ); @@ -2148,9 +2148,9 @@ void SwRefPageGetFieldType::UpdateField( SwTextField* pTextField, pDoc->GetNodes().GetEndOfExtras().GetIndex() ) { SwNodeIndex aIdx( *pTextNode ); - _SetGetExpField aEndField( aIdx, pTextField ); + SetGetExpField aEndField( aIdx, pTextField ); - _SetGetExpFields::const_iterator itLast = rSetList.lower_bound( &aEndField ); + SetGetExpFields::const_iterator itLast = rSetList.lower_bound( &aEndField ); if( itLast != rSetList.begin() ) { @@ -2220,7 +2220,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrame* pFrame, OSL_ENSURE( !pFrame->IsInDocBody(), "Flag incorrect, frame is in DocBody" ); // collect all SetPageRefFields - _SetGetExpFields aTmpLst; + SetGetExpFields aTmpLst; if( !pGetType->MakeSetList( aTmpLst ) ) return ; @@ -2233,9 +2233,9 @@ void SwRefPageGetField::ChangeExpansion( const SwFrame* pFrame, if(!pTextNode) return; - _SetGetExpField aEndField( aPos.nNode, pField, &aPos.nContent ); + SetGetExpField aEndField( aPos.nNode, pField, &aPos.nContent ); - _SetGetExpFields::const_iterator itLast = aTmpLst.lower_bound( &aEndField ); + SetGetExpFields::const_iterator itLast = aTmpLst.lower_bound( &aEndField ); if( itLast == aTmpLst.begin() ) return; // there is no corresponding set-field in front diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 64c9948da397..0bf81dd1439e 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -351,7 +351,7 @@ void SwGetExpField::ChangeExpansion( const SwFrame& rFrame, const SwTextField& r } } - _SetGetExpField aEndField( aPos.nNode, &rField, &aPos.nContent ); + SetGetExpField aEndField( aPos.nNode, &rField, &aPos.nContent ); if(GetSubType() & nsSwGetSetExpType::GSE_STRING) { SwHash** ppHashTable; @@ -592,7 +592,7 @@ size_t SwSetExpFieldType::GetSeqFieldList( SwSeqFieldList& rList ) nullptr != ( pNd = pF->GetTextField()->GetpTextNode() ) && pNd->GetNodes().IsDocNodes() ) { - _SeqFieldLstElem* pNew = new _SeqFieldLstElem( + SeqFieldLstElem* pNew = new SeqFieldLstElem( pNd->GetExpandText(), static_cast<SwSetExpField*>(pF->GetField())->GetSeqNumber() ); rList.InsertSort( pNew ); @@ -692,7 +692,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } -bool SwSeqFieldList::InsertSort( _SeqFieldLstElem* pNew ) +bool SwSeqFieldList::InsertSort( SeqFieldLstElem* pNew ) { OUStringBuffer aBuf(pNew->sDlgEntry); const sal_Int32 nLen = aBuf.getLength(); @@ -712,7 +712,7 @@ bool SwSeqFieldList::InsertSort( _SeqFieldLstElem* pNew ) return bRet; } -bool SwSeqFieldList::SeekEntry( const _SeqFieldLstElem& rNew, size_t* pP ) const +bool SwSeqFieldList::SeekEntry( const SeqFieldLstElem& rNew, size_t* pP ) const { size_t nO = maData.size(); size_t nU = 0; diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 9069fa608dc9..cb606c1b6777 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -126,7 +126,7 @@ namespace OUString SwFieldType::GetTypeStr(sal_uInt16 nTypeId) { if (!s_pFieldNames) - _GetFieldName(); + GetFieldName_(); if (nTypeId < SwFieldType::s_pFieldNames->size()) return (*SwFieldType::s_pFieldNames)[nTypeId]; diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx index e20d7453b05d..e075d3db0f13 100644 --- a/sw/source/core/fields/fldlst.cxx +++ b/sw/source/core/fields/fldlst.cxx @@ -36,7 +36,7 @@ SwInputFieldList::SwInputFieldList( SwEditShell* pShell, bool bBuildTmpLst ) : pSh(pShell) { // create sorted list of all input fields - pSrtLst = new _SetGetExpFields(); + pSrtLst = new SetGetExpFields(); const SwFieldTypes& rFieldTypes = *pSh->GetDoc()->getIDocumentFieldsAccess().GetFieldTypes(); const size_t nSize = rFieldTypes.size(); @@ -69,7 +69,7 @@ SwInputFieldList::SwInputFieldList( SwEditShell* pShell, bool bBuildTmpLst ) else { SwNodeIndex aIdx( rTextNode ); - _SetGetExpField* pNew = new _SetGetExpField(aIdx, pTextField ); + SetGetExpField* pNew = new SetGetExpField(aIdx, pTextField ); pSrtLst->insert( pNew ); } } @@ -155,7 +155,7 @@ bool SwInputFieldList::BuildSortLst() if( aTmpLst.end() == it ) { SwNodeIndex aIdx( rTextNode ); - _SetGetExpField* pNew = new _SetGetExpField(aIdx, pTextField ); + SetGetExpField* pNew = new SetGetExpField(aIdx, pTextField ); pSrtLst->insert( pNew ); } else diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index dbd1d94cba8e..2d669f33834c 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -921,7 +921,7 @@ SwTextNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark return pTextNd; } -struct _RefIdsMap +struct RefIdsMap { private: OUString aName; @@ -937,7 +937,7 @@ private: static sal_uInt16 GetFirstUnusedId( std::set<sal_uInt16> &rIds ); public: - explicit _RefIdsMap( const OUString& rName ) : aName( rName ), bInit( false ) {} + explicit RefIdsMap( const OUString& rName ) : aName( rName ), bInit( false ) {} void Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField, bool bField ); @@ -947,7 +947,7 @@ public: /// Get a sorted list of the field IDs from a document. /// @param[in] rDoc The document to search. /// @param[in,out] rIds The list of IDs found in the document. -void _RefIdsMap::GetFieldIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds) +void RefIdsMap::GetFieldIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds) { SwFieldType *const pType = rDoc.getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, aName, false); @@ -972,7 +972,7 @@ void _RefIdsMap::GetFieldIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds) /// Get a sorted list of the footnote/endnote IDs from a document. /// @param[in] rDoc The document to search. /// @param[in,out] rIds The list of IDs found in the document. -void _RefIdsMap::GetNoteIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds) +void RefIdsMap::GetNoteIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds) { for( auto n = rDoc.GetFootnoteIdxs().size(); n; ) rIds.insert( rDoc.GetFootnoteIdxs()[ --n ]->GetSeqRefNo() ); @@ -982,7 +982,7 @@ void _RefIdsMap::GetNoteIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds) /// @param[in] rDoc The source document. /// @param[in] rDestDoc The destination document. /// @param[in] bField True if we're interested in all fields, false for footnotes. -void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField ) +void RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField ) { if( bInit ) return; @@ -1032,7 +1032,7 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField ) /// Get the lowest number unused in the passed set. /// @param[in] rIds The set of used ID numbers. /// @returns The lowest number unused by the passed set -sal_uInt16 _RefIdsMap::GetFirstUnusedId( std::set<sal_uInt16> &rIds ) +sal_uInt16 RefIdsMap::GetFirstUnusedId( std::set<sal_uInt16> &rIds ) { sal_uInt16 num(0); std::set<sal_uInt16>::iterator it; @@ -1051,13 +1051,13 @@ sal_uInt16 _RefIdsMap::GetFirstUnusedId( std::set<sal_uInt16> &rIds ) /// Add a new ID and sequence number to the "occupied" collection. /// @param[in] id The ID number. /// @param[in] seqNum The sequence number. -void _RefIdsMap::AddId( sal_uInt16 id, sal_uInt16 seqNum ) +void RefIdsMap::AddId( sal_uInt16 id, sal_uInt16 seqNum ) { aIds.insert( id ); sequencedIds[ seqNum ] = id; } -void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField, +void RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField, bool bField ) { Init( rDoc, rDestDoc, bField); @@ -1096,8 +1096,8 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc ) // then there are RefFields in the DescDox - so all RefFields in the SourceDoc // need to be converted to have unique IDs for both documents - _RefIdsMap aFntMap( aEmptyOUStr ); - std::vector<std::unique_ptr<_RefIdsMap>> aFieldMap; + RefIdsMap aFntMap( aEmptyOUStr ); + std::vector<std::unique_ptr<RefIdsMap>> aFieldMap; SwIterator<SwFormatField,SwFieldType> aIter( *this ); for( SwFormatField* pField = aIter.First(); pField; pField = aIter.Next() ) @@ -1107,7 +1107,7 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc ) { case REF_SEQUENCEFLD: { - _RefIdsMap* pMap = nullptr; + RefIdsMap* pMap = nullptr; for( auto n = aFieldMap.size(); n; ) { if (aFieldMap[ --n ]->GetName() == rRefField.GetSetRefName()) @@ -1118,8 +1118,8 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc ) } if( !pMap ) { - pMap = new _RefIdsMap( rRefField.GetSetRefName() ); - aFieldMap.push_back(std::unique_ptr<_RefIdsMap>(pMap)); + pMap = new RefIdsMap( rRefField.GetSetRefName() ); + aFieldMap.push_back(std::unique_ptr<RefIdsMap>(pMap)); } pMap->Check( *pDoc, rDestDoc, rRefField, true ); diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 6040898f875f..cf9aa55a9a44 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -225,7 +225,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText ) bRet = true; } else - bRet = _CopySelToDoc( pClpDoc ); // copy the selections + bRet = CopySelToDoc( pClpDoc ); // copy the selections pClpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)0 ); pClpDoc->getIDocumentFieldsAccess().UnlockExpFields(); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 4583b3d8f011..9759ede9c7d3 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -536,7 +536,7 @@ bool SwFEShell::MoveAnchor( SwMove nDir ) return bRet; } -const SdrMarkList* SwFEShell::_GetMarkList() const +const SdrMarkList* SwFEShell::GetMarkList_() const { const SdrMarkList* pMarkList = nullptr; if( Imp()->GetDrawView() != nullptr ) @@ -549,7 +549,7 @@ FrameTypeFlags SwFEShell::GetSelFrameType() const FrameTypeFlags eType; // get marked frame list, and check if anything is selected - const SdrMarkList* pMarkList = _GetMarkList(); + const SdrMarkList* pMarkList = GetMarkList_(); if( pMarkList == nullptr || pMarkList->GetMarkCount() == 0 ) eType = FrameTypeFlags::NONE; else @@ -583,7 +583,7 @@ bool SwFEShell::IsSelContainsControl() const // basically, copy the mechanism from GetSelFrameType(), but call // CheckControl... if you get a drawing object - const SdrMarkList* pMarkList = _GetMarkList(); + const SdrMarkList* pMarkList = GetMarkList_(); if( pMarkList != nullptr && pMarkList->GetMarkCount() == 1 ) { // if we have one marked object, get the SdrObject and check diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index a6e4b8db2b36..de56b8c6c606 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -359,9 +359,9 @@ bool SwFEShell::DeleteRow(bool bCompleteTable) SwTableNode* pTableNd = static_cast<SwContentFrame*>(pFrame)->GetNode()->FindTableNode(); // search all boxes / lines - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); { - _FndPara aPara( aBoxes, &aFndBox ); + FndPara aPara( aBoxes, &aFndBox ); ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara ); } @@ -373,11 +373,11 @@ bool SwFEShell::DeleteRow(bool bCompleteTable) KillPams(); - _FndBox* pFndBox = &aFndBox; + FndBox_* pFndBox = &aFndBox; while( 1 == pFndBox->GetLines().size() && 1 == pFndBox->GetLines().front()->GetBoxes().size()) { - _FndBox *const pTmp = pFndBox->GetLines().front()->GetBoxes()[0].get(); + FndBox_ *const pTmp = pFndBox->GetLines().front()->GetBoxes()[0].get(); if( pTmp->GetBox()->GetSttNd() ) break; // otherwise too far pFndBox = pTmp; @@ -517,7 +517,7 @@ bool SwFEShell::SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight ) return bRet; } -void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrame *pBox ) const +void SwFEShell::GetTabCols_( SwTabCols &rToFill, const SwFrame *pBox ) const { const SwTabFrame *pTab = pBox->FindTabFrame(); if ( pLastCols ) @@ -590,7 +590,7 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrame *pBox ) const #endif } -void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrame *pBox ) const +void SwFEShell::GetTabRows_( SwTabCols &rToFill, const SwFrame *pBox ) const { const SwTabFrame *pTab = pBox->FindTabFrame(); if ( pLastRows ) @@ -662,7 +662,7 @@ void SwFEShell::GetTabCols( SwTabCols &rToFill ) const { pFrame = pFrame->GetUpper(); } while ( !pFrame->IsCellFrame() ); - _GetTabCols( rToFill, pFrame ); + GetTabCols_( rToFill, pFrame ); } void SwFEShell::GetTabRows( SwTabCols &rToFill ) const @@ -674,7 +674,7 @@ void SwFEShell::GetTabRows( SwTabCols &rToFill ) const { pFrame = pFrame->GetUpper(); } while ( !pFrame->IsCellFrame() ); - _GetTabRows( rToFill, pFrame ); + GetTabRows_( rToFill, pFrame ); } void SwFEShell::SetTabRows( const SwTabCols &rNew, bool bCurColOnly ) @@ -698,7 +698,7 @@ void SwFEShell::GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const { const SwFrame *pBox = GetBox( rPt ); if ( pBox ) - _GetTabRows( rToFill, pBox ); + GetTabRows_( rToFill, pBox ); } void SwFEShell::SetMouseTabRows( const SwTabCols &rNew, bool bCurColOnly, const Point &rPt ) @@ -1056,7 +1056,7 @@ static sal_uInt16 lcl_GetRowNumber( const SwPosition& rPos ) sal_uInt16 SwFEShell::GetRowSelectionFromTop() const { sal_uInt16 nRet = 0; - const SwPaM* pPaM = IsTableMode() ? GetTableCursor() : _GetCursor(); + const SwPaM* pPaM = IsTableMode() ? GetTableCursor() : GetCursor_(); const sal_uInt16 nPtLine = lcl_GetRowNumber( *pPaM->GetPoint() ); if ( !IsTableMode() ) @@ -1816,7 +1816,7 @@ bool SwFEShell::SelTableRowCol( const Point& rPt, const Point* pEnd, bool bRowDr if ( ppPos[0] ) { - SwShellCursor* pCursor = _GetCursor(); + SwShellCursor* pCursor = GetCursor_(); SwCursorSaveState aSaveState( *pCursor ); SwPosition aOldPos( *pCursor->GetPoint() ); @@ -1861,9 +1861,9 @@ bool SwFEShell::SelTableRowCol( const Point& rPt, const Point* pEnd, bool bRowDr if ( pbRow[0] && pbCol[0] ) bRet = SwCursorShell::SelTable(); else if ( pbRow[0] ) - bRet = SwCursorShell::_SelTableRowOrCol( true, true ); + bRet = SwCursorShell::SelTableRowOrCol( true, true ); else if ( pbCol[0] ) - bRet = SwCursorShell::_SelTableRowOrCol( false, true ); + bRet = SwCursorShell::SelTableRowOrCol( false, true ); } else bRet = true; @@ -2018,7 +2018,7 @@ void SwFEShell::GetMouseTabCols( SwTabCols &rToFill, const Point &rPt ) const { const SwFrame *pBox = GetBox( rPt ); if ( pBox ) - _GetTabCols( rToFill, pBox ); + GetTabCols_( rToFill, pBox ); } void SwFEShell::SetMouseTabCols( const SwTabCols &rNew, bool bCurRowOnly, @@ -2036,7 +2036,7 @@ void SwFEShell::SetMouseTabCols( const SwTabCols &rNew, bool bCurRowOnly, sal_uInt16 SwFEShell::GetCurMouseColNum( const Point &rPt ) const { - return _GetCurColNum( GetBox( rPt ), nullptr ); + return GetCurColNum_( GetBox( rPt ), nullptr ); } size_t SwFEShell::GetCurMouseTabColNum( const Point &rPt ) const diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 32b4f8e0a1ce..ed30212c2177 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -592,7 +592,7 @@ bool SwFEShell::IsColRightToLeft() const return false; } -sal_uInt16 SwFEShell::_GetCurColNum( const SwFrame *pFrame, +sal_uInt16 SwFEShell::GetCurColNum_( const SwFrame *pFrame, SwGetCurColNumPara* pPara ) const { sal_uInt16 nRet = 0; @@ -638,7 +638,7 @@ sal_uInt16 SwFEShell::_GetCurColNum( const SwFrame *pFrame, sal_uInt16 SwFEShell::GetCurColNum( SwGetCurColNumPara* pPara ) const { OSL_ENSURE( GetCurrFrame(), "Cursor parked?" ); - return _GetCurColNum( GetCurrFrame(), pPara ); + return GetCurColNum_( GetCurrFrame(), pPara ); } sal_uInt16 SwFEShell::GetCurOutColNum() const @@ -652,7 +652,7 @@ sal_uInt16 SwFEShell::GetCurOutColNum() const : static_cast<SwFrame*>(pFrame->FindSctFrame()); OSL_ENSURE( pFrame, "No Tab, no Sect" ); if( pFrame ) - nRet = _GetCurColNum( pFrame, nullptr ); + nRet = GetCurColNum_( pFrame, nullptr ); } return nRet; } diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 7d55fc04b6cc..16a9531b115a 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -65,15 +65,15 @@ #undef DEL_ONLY_EMPTY_LINES #undef DEL_EMPTY_BOXES_AT_START_AND_END -struct _CmpLPt +struct CmpLPt { Point aPos; const SwTableBox* pSelBox; bool bVert; - _CmpLPt( const Point& rPt, const SwTableBox* pBox, bool bVertical ); + CmpLPt( const Point& rPt, const SwTableBox* pBox, bool bVertical ); - bool operator<( const _CmpLPt& rCmp ) const + bool operator<( const CmpLPt& rCmp ) const { if ( bVert ) return X() > rCmp.X() || ( X() == rCmp.X() && Y() < rCmp.Y() ); @@ -85,14 +85,14 @@ struct _CmpLPt long Y() const { return aPos.Y(); } }; -typedef o3tl::sorted_vector<_CmpLPt> _MergePos; +typedef o3tl::sorted_vector<CmpLPt> MergePos; -struct _Sort_CellFrame +struct Sort_CellFrame { const SwCellFrame* pFrame; - explicit _Sort_CellFrame( const SwCellFrame& rCFrame ) + explicit Sort_CellFrame( const SwCellFrame& rCFrame ) : pFrame( &rCFrame ) {} }; @@ -483,7 +483,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) break; } - std::deque< _Sort_CellFrame > aCellFrames; + std::deque< Sort_CellFrame > aCellFrames; // Skip any repeated headlines in the follow: const SwLayoutFrame* pRow = pTable->IsFollow() ? @@ -544,7 +544,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) nFrameBottom <= nUnionBottom+ nYFuzzy ) aCellFrames.push_back( - _Sort_CellFrame( *static_cast<const SwCellFrame*>(pCell)) ); + Sort_CellFrame( *static_cast<const SwCellFrame*>(pCell)) ); else { bValidChartSel = false; @@ -577,7 +577,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) for( n = 0 ; n < aCellFrames.size(); ++n ) { - const _Sort_CellFrame& rCF = aCellFrames[ n ]; + const Sort_CellFrame& rCF = aCellFrames[ n ]; if( (rCF.pFrame->Frame().*fnRect->fnGetTop)() != nYPos ) { // new row @@ -840,7 +840,7 @@ bool HasProtectedCells( const SwSelBoxes& rBoxes ) return bRet; } -_CmpLPt::_CmpLPt( const Point& rPt, const SwTableBox* pBox, bool bVertical ) +CmpLPt::CmpLPt( const Point& rPt, const SwTableBox* pBox, bool bVertical ) : aPos( rPt ), pSelBox( pBox ), bVert( bVertical ) {} @@ -930,7 +930,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, SwTableNode* pTableNd = const_cast<SwTableNode*>(pTable->GetTabSortBoxes()[ 0 ]-> GetSttNd()->FindTableNode()); - _MergePos aPosArr; // Sort-Array with the frame positions + MergePos aPosArr; // Sort-Array with the frame positions long nWidth; SwTableBox* pLastBox = nullptr; @@ -984,7 +984,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, pLastBox = pBox; rBoxes.insert( pBox ); aPosArr.insert( - _CmpLPt( (pCell->Frame().*fnRect->fnGetPos)(), + CmpLPt( (pCell->Frame().*fnRect->fnGetPos)(), pBox, bVert ) ); pBox = pBox->GetUpper()->GetTabBoxes()[ nInsPos ]; @@ -1001,7 +1001,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, pLastBox = pBox; rBoxes.insert( pBox ); aPosArr.insert( - _CmpLPt( (pCell->Frame().*fnRect->fnGetPos)(), + CmpLPt( (pCell->Frame().*fnRect->fnGetPos)(), pBox, bVert ) ); } } @@ -1049,7 +1049,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, pLastBox = pBox; rBoxes.insert( pBox ); aPosArr.insert( - _CmpLPt( (pCell->Frame().*fnRect->fnGetPos)(), + CmpLPt( (pCell->Frame().*fnRect->fnGetPos)(), pBox, bVert ) ); pBox = pBox->GetUpper()->GetTabBoxes()[ nInsPos+1 ]; @@ -1090,7 +1090,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, pLastBox = pBox; rBoxes.insert( pBox ); - aPosArr.insert( _CmpLPt( Point( rUnion.Left(), + aPosArr.insert( CmpLPt( Point( rUnion.Left(), pCell->Frame().Top()), pBox, bVert )); if( pUndo ) @@ -1139,7 +1139,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, for( n = 0; n < aPosArr.Count(); ++n ) { - const _CmpLPt& rPt = aPosArr[ n ]; + const CmpLPt& rPt = aPosArr[ n ]; if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // same Y level? { if( bEmptyLine && !IsEmptyBox( *rPt.pSelBox, aPam )) @@ -1183,7 +1183,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, for( n = 0; n < aPosArr.Count(); ++n ) { - const _CmpLPt& rPt = aPosArr[ n ]; + const CmpLPt& rPt = aPosArr[ n ]; if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // same Y level? { bool bEmptyBox = IsEmptyBox( *rPt.pSelBox, aPam ); @@ -1274,9 +1274,9 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, aPosArr[ 0 ].Y() ) : 0; - for( _MergePos::size_type n = 0; n < aPosArr.size(); ++n ) + for( MergePos::size_type n = 0; n < aPosArr.size(); ++n ) { - const _CmpLPt& rPt = aPosArr[ n ]; + const CmpLPt& rPt = aPosArr[ n ]; if( bCalcWidth ) { if( nY == ( bVert ? rPt.X() : rPt.Y() ) ) // same Y level? @@ -1388,9 +1388,9 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, pUndo->AddNewBox( (*ppMergeBox)->GetSttIdx() ); } -static bool lcl_CheckCol(_FndBox const&, bool* pPara); +static bool lcl_CheckCol(FndBox_ const&, bool* pPara); -static bool lcl_CheckRow( const _FndLine& rFndLine, bool* pPara ) +static bool lcl_CheckRow( const FndLine_& rFndLine, bool* pPara ) { for (auto const& it : rFndLine.GetBoxes()) { @@ -1399,7 +1399,7 @@ static bool lcl_CheckRow( const _FndLine& rFndLine, bool* pPara ) return *pPara; } -static bool lcl_CheckCol( _FndBox const& rFndBox, bool* pPara ) +static bool lcl_CheckCol( FndBox_ const& rFndBox, bool* pPara ) { if (!rFndBox.GetBox()->GetSttNd()) { @@ -1447,15 +1447,15 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes ) { eRet = TBLMERGE_OK; - _FndBox aFndBox( nullptr, nullptr ); - _FndPara aPara( rBoxes, &aFndBox ); + FndBox_ aFndBox( nullptr, nullptr ); + FndPara aPara( rBoxes, &aFndBox ); const SwTableNode* pTableNd = aPara.rBoxes[0]->GetSttNd()->FindTableNode(); ForEach_FndLineCopyCol( (SwTableLines&)pTableNd->GetTable().GetTabLines(), &aPara ); if( !aFndBox.GetLines().empty() ) { bool bMergeSelOk = true; - _FndBox* pFndBox = &aFndBox; - _FndLine* pFndLine = nullptr; + FndBox_* pFndBox = &aFndBox; + FndLine_* pFndLine = nullptr; while( pFndBox && 1 == pFndBox->GetLines().size() ) { pFndLine = pFndBox->GetLines().front().get(); @@ -2035,12 +2035,12 @@ static void lcl_InsertRow( SwTableLine &rLine, SwLayoutFrame *pUpper, SwFrame *p pRow->RegistFlys(); } -static void _FndBoxCopyCol( SwTableBox* pBox, _FndPara* pFndPara ) +static void FndBoxCopyCol( SwTableBox* pBox, FndPara* pFndPara ) { - std::unique_ptr<_FndBox> pFndBox(new _FndBox( pBox, pFndPara->pFndLine )); + std::unique_ptr<FndBox_> pFndBox(new FndBox_( pBox, pFndPara->pFndLine )); if( pBox->GetTabLines().size() ) { - _FndPara aPara( *pFndPara, pFndBox.get() ); + FndPara aPara( *pFndPara, pFndBox.get() ); ForEach_FndLineCopyCol( pFndBox->GetBox()->GetTabLines(), &aPara ); if( pFndBox->GetLines().empty() ) { @@ -2057,26 +2057,26 @@ static void _FndBoxCopyCol( SwTableBox* pBox, _FndPara* pFndPara ) pFndPara->pFndLine->GetBoxes().push_back( std::move(pFndBox) ); } -static void _FndLineCopyCol( SwTableLine* pLine, _FndPara* pFndPara ) +static void FndLineCopyCol( SwTableLine* pLine, FndPara* pFndPara ) { - std::unique_ptr<_FndLine> pFndLine(new _FndLine(pLine, pFndPara->pFndBox)); - _FndPara aPara(*pFndPara, pFndLine.get()); + std::unique_ptr<FndLine_> pFndLine(new FndLine_(pLine, pFndPara->pFndBox)); + FndPara aPara(*pFndPara, pFndLine.get()); for( SwTableBoxes::iterator it = pFndLine->GetLine()->GetTabBoxes().begin(); it != pFndLine->GetLine()->GetTabBoxes().end(); ++it) - _FndBoxCopyCol(*it, &aPara ); + FndBoxCopyCol(*it, &aPara ); if( pFndLine->GetBoxes().size() ) { pFndPara->pFndBox->GetLines().push_back( std::move(pFndLine) ); } } -void ForEach_FndLineCopyCol(SwTableLines& rLines, _FndPara* pFndPara ) +void ForEach_FndLineCopyCol(SwTableLines& rLines, FndPara* pFndPara ) { for( SwTableLines::iterator it = rLines.begin(); it != rLines.end(); ++it ) - _FndLineCopyCol( *it, pFndPara ); + FndLineCopyCol( *it, pFndPara ); } -void _FndBox::SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable ) +void FndBox_::SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable ) { // Set pointers to lines before and after the area to process. // If the first/last lines are contained in the area, then the pointers @@ -2109,7 +2109,7 @@ void _FndBox::SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable ) pLineBehind = rTable.GetTabLines()[nEndPos]; } -void _FndBox::SetTableLines( const SwTable &rTable ) +void FndBox_::SetTableLines( const SwTable &rTable ) { // Set pointers to lines before and after the area to process. // If the first/last lines are contained in the area, then the pointers @@ -2138,7 +2138,7 @@ inline void UnsetFollow( SwFlowFrame *pTab ) pTab->m_pPrecede = nullptr; } -void _FndBox::DelFrames( SwTable &rTable ) +void FndBox_::DelFrames( SwTable &rTable ) { // All lines between pLineBefore and pLineBehind should be cut // from the layout and erased. @@ -2303,7 +2303,7 @@ static void lcl_UpdateRepeatedHeadlines( SwTabFrame& rTabFrame, bool bCalcLowers rTabFrame.SetCalcLowers(); } -void _FndBox::MakeFrames( SwTable &rTable ) +void FndBox_::MakeFrames( SwTable &rTable ) { // All lines between pLineBefore and pLineBehind should be re-generated in layout. // And this for all instances of a table (for example in header/footer). @@ -2376,7 +2376,7 @@ void _FndBox::MakeFrames( SwTable &rTable ) } } -void _FndBox::MakeNewFrames( SwTable &rTable, const sal_uInt16 nNumber, +void FndBox_::MakeNewFrames( SwTable &rTable, const sal_uInt16 nNumber, const bool bBehind ) { // Create Frames for newly inserted lines @@ -2516,7 +2516,7 @@ void _FndBox::MakeNewFrames( SwTable &rTable, const sal_uInt16 nNumber, } } -bool _FndBox::AreLinesToRestore( const SwTable &rTable ) const +bool FndBox_::AreLinesToRestore( const SwTable &rTable ) const { // Should we call MakeFrames here? diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index cf6df9a4453f..eabdb9f21bd6 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -563,8 +563,8 @@ bool SwGrfNode::SwapIn( bool bWaitForData ) try { const StreamAndStorageNames aNames = lcl_GetStreamStorageNames( maGrfObj.GetUserData() ); - uno::Reference < embed::XStorage > refPics = _GetDocSubstorageOrRoot( aNames.sStorage ); - SvStream* pStrm = _GetStreamForEmbedGrf( refPics, aNames.sStream ); + uno::Reference < embed::XStorage > refPics = GetDocSubstorageOrRoot( aNames.sStorage ); + SvStream* pStrm = GetStreamForEmbedGrf( refPics, aNames.sStream ); if ( pStrm ) { bRet = ImportGraphic( *pStrm ); @@ -857,7 +857,7 @@ void SwGrfNode::ScaleImageMap() A substorage with the specified name will be opened readonly. If the provided name is empty the root storage will be returned. */ -uno::Reference< embed::XStorage > SwGrfNode::_GetDocSubstorageOrRoot( const OUString& aStgName ) const +uno::Reference< embed::XStorage > SwGrfNode::GetDocSubstorageOrRoot( const OUString& aStgName ) const { uno::Reference < embed::XStorage > refStor = const_cast<SwGrfNode*>(this)->GetDoc()->GetDocStorage(); @@ -882,7 +882,7 @@ uno::Reference< embed::XStorage > SwGrfNode::_GetDocSubstorageOrRoot( const OUSt after the method returns, because its parent stream is closed and deleted. Proposed name of embedded graphic stream is also provided by parameter. */ -SvStream* SwGrfNode::_GetStreamForEmbedGrf( +SvStream* SwGrfNode::GetStreamForEmbedGrf( const uno::Reference< embed::XStorage >& _refPics, const OUString& rStreamName ) const { @@ -918,7 +918,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf( } else { - OSL_FAIL( "<SwGrfNode::_GetStreamForEmbedGrf(..)> - embedded graphic file not found!" ); + OSL_FAIL( "<SwGrfNode::GetStreamForEmbedGrf(..)> - embedded graphic file not found!" ); } } diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx index 71c40d94fe9c..24d4f83a9488 100644 --- a/sw/source/core/inc/DocumentContentOperationsManager.hxx +++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx @@ -155,7 +155,7 @@ private: bool DeleteRangeImpl(SwPaM&, const bool unused = false); bool DeleteRangeImplImpl(SwPaM &); bool ReplaceRangeImpl(SwPaM&, OUString const&, const bool); - SwFlyFrameFormat* _InsNoTextNode( const SwPosition&rPos, SwNoTextNode*, + SwFlyFrameFormat* InsNoTextNode( const SwPosition&rPos, SwNoTextNode*, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat* = nullptr ); diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx index 5584a24f67ba..096d855eac25 100644 --- a/sw/source/core/inc/DocumentDrawModelManager.hxx +++ b/sw/source/core/inc/DocumentDrawModelManager.hxx @@ -44,7 +44,7 @@ public: //IDocumentDrawModelAccess virtual const SwDrawModel* GetDrawModel() const override; virtual SwDrawModel* GetDrawModel() override; - virtual SwDrawModel* _MakeDrawModel() override; + virtual SwDrawModel* MakeDrawModel_() override; virtual SwDrawModel* GetOrCreateDrawModel() override; virtual SdrLayerID GetHeavenId() const override; virtual SdrLayerID GetHellId() const override; diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx index f1200104955f..a5facc69392d 100644 --- a/sw/source/core/inc/DocumentFieldsManager.hxx +++ b/sw/source/core/inc/DocumentFieldsManager.hxx @@ -55,8 +55,8 @@ public: virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) override; virtual void SetFixFields(const DateTime* pNewDateTime) override; virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) override; - virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) override; - virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) override; + virtual void FieldsToCalc(SwCalc& rCalc, const SetGetExpField& rToThisField) override; + virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const SetGetExpField& rToThisField) override; virtual bool IsNewFieldLst() const override; virtual void SetNewFieldLst( bool bFlag) override; virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) override; @@ -80,7 +80,7 @@ public: // Delete all unreferenced field types. void GCFieldTypes(); - void _InitFieldTypes(); + void InitFieldTypes(); void ClearFieldTypes(); diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx index 5bf395c15c91..13f45216b877 100644 --- a/sw/source/core/inc/UndoOverwrite.hxx +++ b/sw/source/core/inc/UndoOverwrite.hxx @@ -65,10 +65,10 @@ public: bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns ); }; -struct _UndoTransliterate_Data; +struct UndoTransliterate_Data; class SwUndoTransliterate : public SwUndo, public SwUndRng { - std::vector< _UndoTransliterate_Data * > aChanges; + std::vector< UndoTransliterate_Data * > aChanges; sal_uInt32 nType; void DoTransliterate(SwDoc & rDoc, SwPaM & rPam); diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index dd7bad3406fd..427e4896dafd 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -30,7 +30,7 @@ class SfxItemSet; struct SwSaveRowSpan; -class _SaveTable; +class SaveTable; class SwDDEFieldType; class SwUndoSaveSections; class SwUndoMoves; @@ -101,7 +101,7 @@ class SwUndoTableToText : public SwUndo { OUString sTableNm; SwDDEFieldType* pDDEFieldType; - _SaveTable* pTableSave; + SaveTable* pTableSave; SwTableToTextSaves* m_pBoxSaves; SwHistory* pHistory; sal_uLong nSttNd, nEndNd; @@ -126,7 +126,7 @@ public: class SwUndoAttrTable : public SwUndo { sal_uLong nSttNode; - _SaveTable* pSaveTable; + SaveTable* pSaveTable; bool bClearTabCol : 1; public: @@ -143,7 +143,7 @@ class SwUndoTableNumFormat; class SwUndoTableAutoFormat : public SwUndo { sal_uLong nSttNode; - _SaveTable* pSaveTable; + SaveTable* pSaveTable; std::vector< std::shared_ptr<SwUndoTableNumFormat> > m_Undos; bool bSaveContentAttr; sal_uInt16 m_nRepeatHeading; @@ -163,16 +163,16 @@ public: class SwUndoTableNdsChg : public SwUndo { - _SaveTable* pSaveTable; + SaveTable* pSaveTable; std::set<sal_uLong> m_Boxes; - struct _BoxMove + struct BoxMove { sal_uLong index; ///< Index of this box. bool hasMoved; ///< Has this box been moved already. - _BoxMove(sal_uLong idx, bool moved=false) : index(idx), hasMoved(moved) {}; - bool operator<(const _BoxMove& other) const { return index < other.index; }; + BoxMove(sal_uLong idx, bool moved=false) : index(idx), hasMoved(moved) {}; + bool operator<(const BoxMove& other) const { return index < other.index; }; }; - std::unique_ptr< std::set<_BoxMove> > pNewSttNds; + std::unique_ptr< std::set<BoxMove> > pNewSttNds; std::unique_ptr<SwUndoSaveSections> m_pDelSects; long nMin, nMax; // for redo of delete column sal_uLong nSttNode, nCurrBox; @@ -219,7 +219,7 @@ public: class SwUndoTableMerge : public SwUndo, private SwUndRng { sal_uLong nTableNode; - _SaveTable* pSaveTable; + SaveTable* pSaveTable; std::set<sal_uLong> m_Boxes; std::vector<sal_uLong> aNewSttNds; SwUndoMoves* m_pMoves; @@ -319,7 +319,7 @@ class SwUndoSplitTable : public SwUndo { sal_uLong nTableNode, nOffset; SwSaveRowSpan* mpSaveRowSpan; // stores row span values at the splitting row - _SaveTable* pSavTable; + SaveTable* pSavTable; SwHistory* pHistory; sal_uInt16 nMode, nFormulaEnd; bool bCalcNewSize; @@ -343,7 +343,7 @@ class SwUndoMergeTable : public SwUndo { OUString aName; sal_uLong nTableNode; - _SaveTable* pSavTable, *pSavHdl; + SaveTable* pSavTable, *pSavHdl; SwHistory* pHistory; sal_uInt16 nMode; bool bWithPrev; diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index d50c0a57d7e6..100ab48abb02 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -65,18 +65,18 @@ namespace objectpositioning member <mbIsObjFly>, <mpAnchoredObj>, <mpAnchorFrame>, <mpContact> and <mpFrameFormat> are set */ - void _GetInfoAboutObj(); + void GetInfoAboutObj(); // #i62875# // --> OD 2009-09-01 #mongolianlayout# - add parameter <bVertL2R> - SwTwips _ImplAdjustVertRelPos( const SwTwips nTopOfAnch, + SwTwips ImplAdjustVertRelPos( const SwTwips nTopOfAnch, const bool bVert, const bool bVertL2R, const SwFrame& rPageAlignLayFrame, const SwTwips nProposedRelPosY, const bool bFollowTextFlow, const bool bCheckBottom = true ) const; - SwTwips _ImplAdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, + SwTwips ImplAdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, const SwTwips _nProposedRelPosX ) const; protected: @@ -126,18 +126,18 @@ namespace objectpositioning #i11860# */ - SwTwips _GetTopForObjPos( const SwFrame& _rFrame, + SwTwips GetTopForObjPos( const SwFrame& _rFrame, const SwRectFn& _fnRect, const bool _bVert ) const; - void _GetVertAlignmentValues( const SwFrame& _rVertOrientFrame, + void GetVertAlignmentValues( const SwFrame& _rVertOrientFrame, const SwFrame& _rPageAlignLayFrame, const sal_Int16 _eRelOrient, SwTwips& _orAlignAreaHeight, SwTwips& _orAlignAreaOffset ) const; // #i26791# - add output parameter <_roVertOffsetToFrameAnchorPos> - SwTwips _GetVertRelPos( const SwFrame& _rVertOrientFrame, + SwTwips GetVertRelPos( const SwFrame& _rVertOrientFrame, const SwFrame& _rPageAlignLayFrame, const sal_Int16 _eVertOrient, const sal_Int16 _eRelOrient, @@ -152,7 +152,7 @@ namespace objectpositioning #i31805# - add parameter <_bCheckBottom> #i26945# - add parameter <_bFollowTextFlow> #i62875# - made inline, intrinsic actions moved - to private method <_ImplAdjustVertRelPos>, which is only + to private method <ImplAdjustVertRelPos>, which is only called, if <mbDoNotCaptureAnchoredObj> not set. OD 2009-09-01 #mongolianlayout# - add parameter <bVertL2R> @@ -185,7 +185,7 @@ namespace objectpositioning object has to be checked and thus, (if needed) the proposed relative position has to be adjusted. default value <true> */ - inline SwTwips _AdjustVertRelPos( const SwTwips nTopOfAnch, + inline SwTwips AdjustVertRelPos( const SwTwips nTopOfAnch, const bool bVert, const bool bVertL2R, const SwFrame& rPageAlignLayFrame, @@ -194,7 +194,7 @@ namespace objectpositioning const bool bCheckBottom = true ) const { return !mbDoNotCaptureAnchoredObj - ? _ImplAdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, + ? ImplAdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, rPageAlignLayFrame, nProposedRelPosY, bFollowTextFlow, @@ -238,7 +238,7 @@ namespace objectpositioning @return relative horizontal position in SwTwips */ - SwTwips _CalcRelPosX( const SwFrame& _rHoriOrientFrame, + SwTwips CalcRelPosX( const SwFrame& _rHoriOrientFrame, const SwEnvironmentOfAnchoredObject& _rEnvOfObj, const SwFormatHoriOrient& _rHoriOrient, const SvxLRSpaceItem& _rLRSpacing, @@ -252,7 +252,7 @@ namespace objectpositioning 'page' alignment layout frame for object type position TO_CNTNT #i62875# - made inline, intrinsic actions moved - to private method <_ImplAdjustHoriRelPos>, which is only + to private method <ImplAdjustHoriRelPos>, which is only called, if <mbDoNotCaptureAnchoredObj> not set. @param _rPageAlignLayFrame @@ -265,11 +265,11 @@ namespace objectpositioning @return adjusted relative horizontal position in SwTwips. */ - inline SwTwips _AdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, + inline SwTwips AdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, const SwTwips _nProposedRelPosX ) const { return !mbDoNotCaptureAnchoredObj - ? _ImplAdjustHoriRelPos( _rPageAlignLayFrame, _nProposedRelPosX ) + ? ImplAdjustHoriRelPos( _rPageAlignLayFrame, _nProposedRelPosX ) : _nProposedRelPosX; } @@ -287,7 +287,7 @@ namespace objectpositioning optional input/output parameter (default value NULL) - if set, relative alignment, that is toggled, if needed. */ - static void _ToggleHoriOrientAndAlign( const bool _bToggleLeftRight, + static void ToggleHoriOrientAndAlign( const bool _bToggleLeftRight, sal_Int16& _ioeHoriOrient, sal_Int16& _iopeRelOrient ); @@ -329,7 +329,7 @@ namespace objectpositioning output parameter - boolean indicating, that object is aligned to 'page area'. */ - void _GetHoriAlignmentValues( const SwFrame& _rHoriOrientFrame, + void GetHoriAlignmentValues( const SwFrame& _rHoriOrientFrame, const SwFrame& _rPageAlignLayFrame, const sal_Int16 _eRelOrient, const bool _bObjWrapThrough, @@ -368,7 +368,7 @@ namespace objectpositioning @return adjusted relative horizontal position in SwTwips */ - SwTwips _AdjustHoriRelPosForDrawAside( const SwFrame& _rHoriOrientFrame, + SwTwips AdjustHoriRelPosForDrawAside( const SwFrame& _rHoriOrientFrame, const SwTwips _nProposedRelPosX, const SwTwips _nRelPosY, const sal_Int16 _eHoriOrient, @@ -380,7 +380,7 @@ namespace objectpositioning /** detemine, if object has to draw aside given fly frame - method used by <_AdjustHoriRelPosForDrawAside(..)> + method used by <AdjustHoriRelPosForDrawAside(..)> @param _pFly input parameter - fly frame the draw aside check is done for. @@ -406,7 +406,7 @@ namespace objectpositioning @return boolean indicating, if object has to be drawn aside given fly frame. */ - bool _DrawAsideFly( const SwFlyFrame* _pFly, + bool DrawAsideFly( const SwFlyFrame* _pFly, const SwRect& _rObjRect, const SwFrame* _pObjContext, const sal_uLong _nObjIndex, @@ -422,7 +422,7 @@ namespace objectpositioning against each other, which one has to be drawn aside the other one. depending on parameter _bLeft check is done for left or right positioning. - method used by <_DrawAsideFly(..)> + method used by <DrawAsideFly(..)> @param _eRelOrient1 input parameter - alignment 1 @@ -438,7 +438,7 @@ namespace objectpositioning <_eRelOrient1> has to be drawn aside an object with an alignment <_eRelOrient2> */ - static bool _Minor( sal_Int16 _eRelOrient1, + static bool Minor_( sal_Int16 _eRelOrient1, sal_Int16 _eRelOrient2, bool _bLeft ); diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index 2f802e632ee0..8923e2594d9c 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -88,7 +88,7 @@ namespace objectpositioning @return relative position to the base line */ - SwTwips _GetRelPosToBase( const SwTwips _nObjBoundHeight, + SwTwips GetRelPosToBase( const SwTwips _nObjBoundHeight, const SwFormatVertOrient& _rVert ); public: diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 3f9af9402362..4ef2bd6d7bb7 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -40,14 +40,14 @@ class SwContentFrame: public SwFrame, public SwFlowFrame // parameter <bObjsInNewUpper> indicates that objects exist in remaining // area of new upper - bool _WouldFit( SwTwips nSpace, + bool WouldFit_( SwTwips nSpace, SwLayoutFrame *pNewUpper, bool bTstMove, const bool bObjsInNewUpper ); virtual void MakeAll(vcl::RenderContext* pRenderContext) override; - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, + void UpdateAttr_( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool& ) override; diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index c3df4d1b7288..bed8e0a82e94 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -40,7 +40,7 @@ class SwNode; struct SwPosition; // Update expression fields -class _SetGetExpField +class SetGetExpField { sal_uLong nNode; sal_Int32 nContent; @@ -53,34 +53,34 @@ class _SetGetExpField const SwTextINetFormat* pTextINet; const SwFlyFrameFormat* pFlyFormat; } CNTNT; - enum _SetGetExpFieldType + enum SetGetExpFieldType { TEXTFIELD, TEXTTOXMARK, SECTIONNODE, CRSRPOS, TABLEBOX, TEXTINET, FLYFRAME } eSetGetExpFieldType; public: - _SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextField* pField = nullptr, + SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextField* pField = nullptr, const SwIndex* pIdx = nullptr ); - _SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextINetFormat& rINet, + SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextINetFormat& rINet, const SwIndex* pIdx = nullptr ); - _SetGetExpField( const SwSectionNode& rSectNode, + SetGetExpField( const SwSectionNode& rSectNode, const SwPosition* pPos = nullptr ); - _SetGetExpField( const SwTableBox& rTableBox, + SetGetExpField( const SwTableBox& rTableBox, const SwPosition* pPos = nullptr ); - _SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextTOXMark& rTOX, + SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextTOXMark& rTOX, const SwIndex* pIdx ); - _SetGetExpField( const SwPosition& rPos ); + SetGetExpField( const SwPosition& rPos ); - _SetGetExpField( const SwFlyFrameFormat& rFlyFormat, const SwPosition* pPos = nullptr ); + SetGetExpField( const SwFlyFrameFormat& rFlyFormat, const SwPosition* pPos = nullptr ); - bool operator==( const _SetGetExpField& rField ) const; - bool operator<( const _SetGetExpField& rField ) const; + bool operator==( const SetGetExpField& rField ) const; + bool operator<( const SetGetExpField& rField ) const; const SwTextField* GetTextField() const { return TEXTFIELD == eSetGetExpFieldType ? CNTNT.pTextField : nullptr; } @@ -103,17 +103,17 @@ public: void SetBodyPos( const SwContentFrame& rFrame ); }; -class _SetGetExpFields : public o3tl::sorted_vector<_SetGetExpField*, o3tl::less_ptr_to<_SetGetExpField> > +class SetGetExpFields : public o3tl::sorted_vector<SetGetExpField*, o3tl::less_ptr_to<SetGetExpField> > { public: - ~_SetGetExpFields() { DeleteAndDestroyAll(); } + ~SetGetExpFields() { DeleteAndDestroyAll(); } }; // struct for saving strings from the SetExp's string fields -struct _HashStr : public SwHash +struct HashStr : public SwHash { OUString aSetStr; - _HashStr( const OUString& rName, const OUString& rText, _HashStr* = nullptr ); + HashStr( const OUString& rName, const OUString& rText, HashStr* = nullptr ); }; struct SwCalcFieldType : public SwHash @@ -134,7 +134,7 @@ const int GETFLD_EXPAND = 2; class SwDocUpdateField { - _SetGetExpFields* pFieldSortLst; // current field list for calculation + SetGetExpFields* pFieldSortLst; // current field list for calculation SwCalcFieldType* aFieldTypeTable[ TBLSZ ]; sal_uLong nNodes; // if the node count is different @@ -144,7 +144,7 @@ class SwDocUpdateField bool bInUpdateFields : 1; // currently there is an UpdateFields bool bFieldsDirty : 1; // some fields are invalid - void _MakeFieldList( SwDoc& pDoc, int eGetMode ); + void MakeFieldList_( SwDoc& pDoc, int eGetMode ); void GetBodyNode( const SwTextField& , sal_uInt16 nFieldWhich ); void GetBodyNode( const SwSectionNode&); @@ -152,7 +152,7 @@ public: SwDocUpdateField(SwDoc* pDocument); ~SwDocUpdateField(); - const _SetGetExpFields* GetSortLst() const { return pFieldSortLst; } + const SetGetExpFields* GetSortLst() const { return pFieldSortLst; } void MakeFieldList( SwDoc& rDoc, bool bAll, int eGetMode ); diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index a7a01911c0e4..3f2cfc90501a 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -29,8 +29,8 @@ class SwUndoSort; class FlatFndBox; struct SwSortOptions; struct SwSortElement; -class _FndBox; -class _FndLine; +class FndBox_; +class FndLine_; class CollatorWrapper; class LocaleDataWrapper; @@ -117,28 +117,28 @@ struct SwSortBoxElement : public SwSortElement class FlatFndBox { public: - FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox); + FlatFndBox(SwDoc* pDocPtr, const FndBox_& rBox); ~FlatFndBox(); bool IsSymmetric() const { return bSym; } sal_uInt16 GetRows() const { return nRows; } sal_uInt16 GetCols() const { return nCols; } - const _FndBox* GetBox(sal_uInt16 nCol, sal_uInt16 nRow) const; + const FndBox_* GetBox(sal_uInt16 nCol, sal_uInt16 nRow) const; inline bool HasItemSets() const; const SfxItemSet* GetItemSet(sal_uInt16 nCol, sal_uInt16 nRow) const; private: - bool CheckLineSymmetry(const _FndBox& rBox); - bool CheckBoxSymmetry(const _FndLine& rLn); - sal_uInt16 GetColCount(const _FndBox& rBox); - sal_uInt16 GetRowCount(const _FndBox& rBox); - void FillFlat(const _FndBox&, bool bLastBox=false); + bool CheckLineSymmetry(const FndBox_& rBox); + bool CheckBoxSymmetry(const FndLine_& rLn); + sal_uInt16 GetColCount(const FndBox_& rBox); + sal_uInt16 GetRowCount(const FndBox_& rBox); + void FillFlat(const FndBox_&, bool bLastBox=false); SwDoc* pDoc; - const _FndBox& rBoxRef; - const _FndBox** pArr; + const FndBox_& rBoxRef; + const FndBox_** pArr; SfxItemSet** ppItemSets; sal_uInt16 nRows; diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx index 937691ce1e40..cf7b52da7f11 100644 --- a/sw/source/core/inc/doctxm.hxx +++ b/sw/source/core/inc/doctxm.hxx @@ -54,7 +54,7 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection void InsertAlphaDelimitter( const SwTOXInternational& rIntl ); // replace page num placeholder with actual page number - void _UpdatePageNum( SwTextNode* pNd, + void UpdatePageNum_( SwTextNode* pNd, const std::vector<sal_uInt16>& rNums, const std::vector<SwPageDesc*>& rDescs, const std::vector<sal_uInt16>* pMainEntryNums, diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 9bf76c1ede5e..0242d9db3e3e 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -50,7 +50,7 @@ class SwDrawView : public FmFormView optional input parameter - 'child' object, which will not be considered on the calculation of the maximal order number */ - static sal_uInt32 _GetMaxChildOrdNum( const SwFlyFrame& _rParentObj, + static sal_uInt32 GetMaxChildOrdNum( const SwFlyFrame& _rParentObj, const SdrObject* _pExclChildObj = nullptr ); /** method to move 'repeated' objects of the given moved object to the @@ -64,7 +64,7 @@ class SwDrawView : public FmFormView input parameter - data collection of moved 'child' objects - the 'repeated' ones of these 'children' will also been moved. */ - void _MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj, + void MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj, const std::vector<SdrObject*>& _rMovedChildObjs ) const; protected: diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx index e2aeb4577b07..cbeaf53c6413 100644 --- a/sw/source/core/inc/flowfrm.hxx +++ b/sw/source/core/inc/flowfrm.hxx @@ -94,21 +94,21 @@ class SwFlowFrame optional input parameter - pointer to frame, which should be used instead of the direct previous frame. */ - const SwFrame* _GetPrevFrameForUpperSpaceCalc( const SwFrame* _pProposedPrevFrame = nullptr ) const; + const SwFrame* GetPrevFrameForUpperSpaceCalc_( const SwFrame* _pProposedPrevFrame = nullptr ) const; /** method to detemine the upper space amount, which is considered for the previous frame #i11860# */ - SwTwips _GetUpperSpaceAmountConsideredForPrevFrame() const; + SwTwips GetUpperSpaceAmountConsideredForPrevFrame() const; /** method to detemine the upper space amount, which is considered for the page grid #i11860# */ - SwTwips _GetUpperSpaceAmountConsideredForPageGrid( + SwTwips GetUpperSpaceAmountConsideredForPageGrid_( const SwTwips _nUpperSpaceWithoutGrid ) const; protected: diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 4b77327b2a7f..d43e220c63f2 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -64,12 +64,12 @@ class SwFlyFrame : public SwLayoutFrame, public SwAnchoredObject void InitDrawObj(); // these to methods are called in the void FinitDrawObj(); // constructors - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, + void UpdateAttr_( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); using SwLayoutFrame::CalcRel; - sal_uInt32 _GetOrdNumForNewRef( const SwFlyDrawContact* ); + sal_uInt32 GetOrdNumForNewRef( const SwFlyDrawContact* ); SwVirtFlyDrawObj* CreateNewRef( SwFlyDrawContact* ); protected: @@ -141,8 +141,8 @@ protected: */ virtual void RegisterAtCorrectPage() override; - virtual bool _SetObjTop( const SwTwips _nTop ) override; - virtual bool _SetObjLeft( const SwTwips _nLeft ) override; + virtual bool SetObjTop_( const SwTwips _nTop ) override; + virtual bool SetObjLeft_( const SwTwips _nLeft ) override; virtual const SwRect GetObjBoundRect() const override; virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; @@ -168,9 +168,9 @@ public: virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; #endif - SwTwips _Shrink( SwTwips, bool bTst ); - SwTwips _Grow ( SwTwips, bool bTst ); - void _Invalidate( SwPageFrame *pPage = nullptr ); + SwTwips Shrink_( SwTwips, bool bTst ); + SwTwips Grow_ ( SwTwips, bool bTst ); + void Invalidate_( SwPageFrame *pPage = nullptr ); bool FrameSizeChg( const SwFormatFrameSize & ); diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index a887f46af6b8..ee9ef4950d78 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -137,7 +137,7 @@ protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; // #i28701# - virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const override; + virtual bool InvalidationAllowed( const InvalidationType _nInvalid ) const override; /** method to assure that anchored object is registered at the correct page frame @@ -215,7 +215,7 @@ public: // invalidate anchor frame on invalidation of the position, because the // position is calculated during the format of the anchor frame - virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ) override; + virtual void ActionOnInvalidation( const InvalidationType _nInvalid ) override; }; inline void SwFlyInContentFrame::InvalidateLayout() const diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index b0117a000fae..053456bb930e 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -58,8 +58,8 @@ extern Color *pWaveCol; class SwFntObj : public SwCacheObj { friend class SwFntAccess; - friend void _InitCore(); - friend void _FinitCore(); + friend void InitCore(); + friend void FinitCore(); vcl::Font aFont; vcl::Font *pScrFont; diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 57a48b9f57bd..df85c55ae326 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -161,8 +161,8 @@ class SW_DLLPUBLIC SwFrame: public SwClient, public SfxBroadcaster SwFrame *mpNext; SwFrame *mpPrev; - SwFrame *_FindNext(); - SwFrame *_FindPrev(); + SwFrame *FindNext_(); + SwFrame *FindPrev_(); /** method to determine next content frame in the same environment for a flow frame (content frame, table frame, section frame) @@ -191,7 +191,7 @@ class SW_DLLPUBLIC SwFrame: public SwClient, public SfxBroadcaster @return SwContentFrame* pointer to the found next content frame. It's NULL, if none exists. */ - SwContentFrame* _FindNextCnt( const bool _bInSameFootnote = false ); + SwContentFrame* FindNextCnt_( const bool _bInSameFootnote = false ); /** method to determine previous content frame in the same environment for a flow frame (content frame, table frame, section frame) @@ -218,10 +218,10 @@ class SW_DLLPUBLIC SwFrame: public SwClient, public SfxBroadcaster @return SwContentFrame* pointer to the found previous content frame. It's NULL, if none exists. */ - SwContentFrame* _FindPrevCnt(); + SwContentFrame* FindPrevCnt_(); - void _UpdateAttrFrame( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 & ); - SwFrame* _GetIndNext(); + void UpdateAttrFrame( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 & ); + SwFrame* GetIndNext_(); void SetDirFlags( bool bVert ); const SwLayoutFrame* ImplGetNextLayoutLeaf( bool bFwd ) const; @@ -313,7 +313,7 @@ protected: /** method to determine, if an invalidation is allowed. #i28701 */ - virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const; + virtual bool InvalidationAllowed( const InvalidationType _nInvalid ) const; /** method to perform additional actions on an invalidation @@ -321,7 +321,7 @@ protected: Method has *only* to contain actions, which has to be performed on *every* assignment of the corresponding flag to <false>. */ - virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ); + virtual void ActionOnInvalidation( const InvalidationType _nInvalid ); // draw shadow and borders void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const; @@ -359,7 +359,7 @@ public: // For internal use only - who ignores this will be put in a sack and has // to stay there for two days - // Does special treatment for _Get[Next|Prev]Leaf() (for tables). + // Does special treatment for Get_[Next|Prev]Leaf() (for tables). SwLayoutFrame *GetLeaf( MakePageType eMakePage, bool bFwd ); SwLayoutFrame *GetNextLeaf ( MakePageType eMakePage ); SwLayoutFrame *GetNextFootnoteLeaf( MakePageType eMakePage ); @@ -534,12 +534,12 @@ public: const SwContentFrame* FindPrevCnt() const; // #i79774# - SwFrame* _GetIndPrev() const; + SwFrame* GetIndPrev_() const; SwFrame* GetIndPrev() const - { return ( mpPrev || !IsInSct() ) ? mpPrev : _GetIndPrev(); } + { return ( mpPrev || !IsInSct() ) ? mpPrev : GetIndPrev_(); } SwFrame* GetIndNext() - { return ( mpNext || !IsInSct() ) ? mpNext : _GetIndNext(); } + { return ( mpNext || !IsInSct() ) ? mpNext : GetIndNext_(); } const SwFrame* GetIndNext() const { return const_cast<SwFrame*>(this)->GetIndNext(); } sal_uInt16 GetPhyPageNum() const; // page number without offset @@ -591,51 +591,51 @@ public: bool IsValid() const { return mbValidPos && mbValidSize && mbValidPrtArea; } // Only invalidate Frame - // #i28701# - add call to method <_ActionOnInvalidation(..)> + // #i28701# - add call to method <ActionOnInvalidation(..)> // for all invalidation methods. - // #i28701# - use method <_InvalidationAllowed(..)> to + // #i28701# - use method <InvalidationAllowed(..)> to // decide, if invalidation will to be performed or not. // #i26945# - no additional invalidation, if it's already // invalidate. - void _InvalidateSize() + void InvalidateSize_() { - if ( mbValidSize && _InvalidationAllowed( INVALID_SIZE ) ) + if ( mbValidSize && InvalidationAllowed( INVALID_SIZE ) ) { mbValidSize = false; - _ActionOnInvalidation( INVALID_SIZE ); + ActionOnInvalidation( INVALID_SIZE ); } } - void _InvalidatePrt() + void InvalidatePrt_() { - if ( mbValidPrtArea && _InvalidationAllowed( INVALID_PRTAREA ) ) + if ( mbValidPrtArea && InvalidationAllowed( INVALID_PRTAREA ) ) { mbValidPrtArea = false; - _ActionOnInvalidation( INVALID_PRTAREA ); + ActionOnInvalidation( INVALID_PRTAREA ); } } - void _InvalidatePos() + void InvalidatePos_() { - if ( mbValidPos && _InvalidationAllowed( INVALID_POS ) ) + if ( mbValidPos && InvalidationAllowed( INVALID_POS ) ) { mbValidPos = false; - _ActionOnInvalidation( INVALID_POS ); + ActionOnInvalidation( INVALID_POS ); } } - void _InvalidateLineNum() + void InvalidateLineNum_() { - if ( mbValidLineNum && _InvalidationAllowed( INVALID_LINENUM ) ) + if ( mbValidLineNum && InvalidationAllowed( INVALID_LINENUM ) ) { mbValidLineNum = false; - _ActionOnInvalidation( INVALID_LINENUM ); + ActionOnInvalidation( INVALID_LINENUM ); } } - void _InvalidateAll() + void InvalidateAll_() { if ( ( mbValidSize || mbValidPrtArea || mbValidPos ) && - _InvalidationAllowed( INVALID_ALL ) ) + InvalidationAllowed( INVALID_ALL ) ) { mbValidSize = mbValidPrtArea = mbValidPos = false; - _ActionOnInvalidation( INVALID_ALL ); + ActionOnInvalidation( INVALID_ALL ); } } // also notify page at the same time @@ -876,14 +876,14 @@ inline void SwFrame::InvalidateLineNum() } inline void SwFrame::InvalidateAll() { - if ( _InvalidationAllowed( INVALID_ALL ) ) + if ( InvalidationAllowed( INVALID_ALL ) ) { if ( mbValidPrtArea && mbValidSize && mbValidPos ) ImplInvalidatePos(); mbValidPrtArea = mbValidSize = mbValidPos = false; // #i28701# - _ActionOnInvalidation( INVALID_ALL ); + ActionOnInvalidation( INVALID_ALL ); } } inline void SwFrame::InvalidateNextPos( bool bNoFootnote ) @@ -953,28 +953,28 @@ inline SwFrame *SwFrame::FindNext() if ( mpNext ) return mpNext; else - return _FindNext(); + return FindNext_(); } inline const SwFrame *SwFrame::FindNext() const { if ( mpNext ) return mpNext; else - return const_cast<SwFrame*>(this)->_FindNext(); + return const_cast<SwFrame*>(this)->FindNext_(); } inline SwFrame *SwFrame::FindPrev() { if ( mpPrev && !mpPrev->IsSctFrame() ) return mpPrev; else - return _FindPrev(); + return FindPrev_(); } inline const SwFrame *SwFrame::FindPrev() const { if ( mpPrev && !mpPrev->IsSctFrame() ) return mpPrev; else - return const_cast<SwFrame*>(this)->_FindPrev(); + return const_cast<SwFrame*>(this)->FindPrev_(); } inline bool SwFrame::IsLayoutFrame() const diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index b4fb47e84e06..aa278cf6494c 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -106,15 +106,15 @@ SwFrame *SaveContent( SwLayoutFrame *pLay, SwFrame *pStart = nullptr ); void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling, bool bGrow ); // Get ContentNodes, create ContentFrames, and add them to LayFrame. -void _InsertCnt( SwLayoutFrame *pLay, SwDoc *pDoc, sal_uLong nIndex, +void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc, sal_uLong nIndex, bool bPages = false, sal_uLong nEndIndex = 0, SwFrame *pPrv = nullptr ); -// Creation of frames for a specific section (uses _InsertCnt) +// Creation of frames for a specific section (uses InsertCnt_) void MakeFrames( SwDoc *pDoc, const SwNodeIndex &rSttIdx, const SwNodeIndex &rEndIdx ); -// prevent creation of Flys in _InsertCnt, e.g. for table headlines +// prevent creation of Flys in InsertCnt_, e.g. for table headlines extern bool bDontCreateObjects; // for FlyCnts, see SwFlyAtContentFrame::MakeAll() @@ -299,32 +299,32 @@ class SwBorderAttrs : public SwCacheObj m_nGetBottomLine; // only calculate lines and shadow - void _CalcTopLine(); - void _CalcBottomLine(); - void _CalcLeftLine(); - void _CalcRightLine(); + void CalcTopLine_(); + void CalcBottomLine_(); + void CalcLeftLine_(); + void CalcRightLine_(); // lines + shadow + margin - void _CalcTop(); - void _CalcBottom(); + void CalcTop_(); + void CalcBottom_(); - void _IsLine(); + void IsLine_(); // #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if // borders/shadow have to be joined with previous frame. - void _GetTopLine ( const SwFrame& _rFrame, + void GetTopLine_ ( const SwFrame& _rFrame, const SwFrame* _pPrevFrame = nullptr ); - void _GetBottomLine( const SwFrame& _rFrame ); + void GetBottomLine_( const SwFrame& _rFrame ); // calculate cached values <m_bJoinedWithPrev> and <m_bJoinedWithNext> // #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if // borders/shadow have to be joined with previous frame. - void _CalcJoinedWithPrev( const SwFrame& _rFrame, + void CalcJoinedWithPrev( const SwFrame& _rFrame, const SwFrame* _pPrevFrame = nullptr ); - void _CalcJoinedWithNext( const SwFrame& _rFrame ); + void CalcJoinedWithNext( const SwFrame& _rFrame ); - // internal helper method for _CalcJoinedWithPrev and _CalcJoinedWithNext - bool _JoinWithCmp( const SwFrame& _rCallerFrame, + // internal helper method for CalcJoinedWithPrev and CalcJoinedWithNext + bool JoinWithCmp( const SwFrame& _rCallerFrame, const SwFrame& _rCmpFrame ) const; // Are the left and right line and the LRSpace equal? @@ -436,14 +436,14 @@ inline sal_uInt16 SwBorderAttrs::GetTopLine ( const SwFrame& _rFrame, { if ( !m_bCachedGetTopLine || _pPrevFrame ) { - const_cast<SwBorderAttrs*>(this)->_GetTopLine( _rFrame, _pPrevFrame ); + const_cast<SwBorderAttrs*>(this)->GetTopLine_( _rFrame, _pPrevFrame ); } return m_nGetTopLine; } inline sal_uInt16 SwBorderAttrs::GetBottomLine( const SwFrame& _rFrame ) const { if ( !m_bCachedGetBottomLine ) - const_cast<SwBorderAttrs*>(this)->_GetBottomLine( _rFrame ); + const_cast<SwBorderAttrs*>(this)->GetBottomLine_( _rFrame ); return m_nGetBottomLine; } inline void SwBorderAttrs::SetGetCacheLine( bool bNew ) const @@ -459,43 +459,43 @@ inline void SwBorderAttrs::SetGetCacheLine( bool bNew ) const inline sal_uInt16 SwBorderAttrs::CalcTopLine() const { if ( m_bTopLine ) - const_cast<SwBorderAttrs*>(this)->_CalcTopLine(); + const_cast<SwBorderAttrs*>(this)->CalcTopLine_(); return m_nTopLine; } inline sal_uInt16 SwBorderAttrs::CalcBottomLine() const { if ( m_bBottomLine ) - const_cast<SwBorderAttrs*>(this)->_CalcBottomLine(); + const_cast<SwBorderAttrs*>(this)->CalcBottomLine_(); return m_nBottomLine; } inline sal_uInt16 SwBorderAttrs::CalcLeftLine() const { if ( m_bLeftLine ) - const_cast<SwBorderAttrs*>(this)->_CalcLeftLine(); + const_cast<SwBorderAttrs*>(this)->CalcLeftLine_(); return m_nLeftLine; } inline sal_uInt16 SwBorderAttrs::CalcRightLine() const { if ( m_bRightLine ) - const_cast<SwBorderAttrs*>(this)->_CalcRightLine(); + const_cast<SwBorderAttrs*>(this)->CalcRightLine_(); return m_nRightLine; } inline sal_uInt16 SwBorderAttrs::CalcTop() const { if ( m_bTop ) - const_cast<SwBorderAttrs*>(this)->_CalcTop(); + const_cast<SwBorderAttrs*>(this)->CalcTop_(); return m_nTop; } inline sal_uInt16 SwBorderAttrs::CalcBottom() const { if ( m_bBottom ) - const_cast<SwBorderAttrs*>(this)->_CalcBottom(); + const_cast<SwBorderAttrs*>(this)->CalcBottom_(); return m_nBottom; } inline bool SwBorderAttrs::IsLine() const { if ( m_bLine ) - const_cast<SwBorderAttrs*>(this)->_IsLine(); + const_cast<SwBorderAttrs*>(this)->IsLine_(); return m_bIsLine; } diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx index 9afe1a69aa1f..5117fe7ffa2a 100644 --- a/sw/source/core/inc/ftnboss.hxx +++ b/sw/source/core/inc/ftnboss.hxx @@ -57,7 +57,7 @@ class SwFootnoteBossFrame: public SwLayoutFrame SwFootnoteContFrame *MakeFootnoteCont(); SwFootnoteFrame *FindFirstFootnote(); - SwNeighbourAdjust _NeighbourhoodAdjustment( const SwFrame* pFrame ) const; + SwNeighbourAdjust NeighbourhoodAdjustment_( const SwFrame* pFrame ) const; protected: void InsertFootnote( SwFootnoteFrame * ); @@ -101,7 +101,7 @@ public: // footnote boss-frame have to be collected. // Note: if parameter <_bCollectOnlyPreviousFootnotes> is true, then parameter // <_pRefFootnoteBossFrame> has to be referenced by an object. - static void _CollectFootnotes( const SwContentFrame* _pRef, + static void CollectFootnotes_( const SwContentFrame* _pRef, SwFootnoteFrame* _pFootnote, SwFootnoteFrames& _rFootnoteArr, const bool _bCollectOnlyPreviousFootnotes = false, @@ -113,13 +113,13 @@ public: SwFootnoteBossFrame* _pOld, SwFootnoteFrames& _rFootnoteArr, const bool _bCollectOnlyPreviousFootnotes = false ); - void _MoveFootnotes( SwFootnoteFrames &rFootnoteArr, bool bCalc = false ); + void MoveFootnotes_( SwFootnoteFrames &rFootnoteArr, bool bCalc = false ); void MoveFootnotes( const SwContentFrame *pSrc, SwContentFrame *pDest, SwTextFootnote *pAttr ); // should AdjustNeighbourhood be called (or Grow/Shrink)? SwNeighbourAdjust NeighbourhoodAdjustment( const SwFrame* pFrame ) const - { return IsPageFrame() ? SwNeighbourAdjust::OnlyAdjust : _NeighbourhoodAdjustment( pFrame ); } + { return IsPageFrame() ? SwNeighbourAdjust::OnlyAdjust : NeighbourhoodAdjustment_( pFrame ); } }; inline const SwLayoutFrame *SwFootnoteBossFrame::FindBodyCont() const diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index bcb1a0f7cfb2..d216486958e7 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -97,18 +97,18 @@ class SwLayAction const SwRect &rOldRect, long nOldBottom ); bool PaintWithoutFlys( const SwRect &, const SwContentFrame *, const SwPageFrame * ); - inline bool _PaintContent( const SwContentFrame *, const SwPageFrame *, + inline bool PaintContent_( const SwContentFrame *, const SwPageFrame *, const SwRect & ); bool FormatLayout( OutputDevice* pRenderContext, SwLayoutFrame *, bool bAddRect = true ); bool FormatLayoutTab( SwTabFrame *, bool bAddRect = true ); bool FormatContent( const SwPageFrame* pPage ); - void _FormatContent( const SwContentFrame* pContent, + void FormatContent_( const SwContentFrame* pContent, const SwPageFrame* pPage ); bool IsShortCut( SwPageFrame *& ); bool TurboAction(); - bool _TurboAction( const SwContentFrame * ); + bool TurboAction_( const SwContentFrame * ); void InternalAction(OutputDevice* pRenderContext); static SwPageFrame *CheckFirstVisPage( SwPageFrame *pPage ); @@ -174,7 +174,7 @@ public: // delete 2nd parameter, because its not used; bool FormatLayoutFly( SwFlyFrame * ); // #i28701# - method is now public - bool _FormatFlyContent( const SwFlyFrame * ); + bool FormatFlyContent( const SwFlyFrame * ); }; @@ -197,7 +197,7 @@ class SwLayIdle #endif enum IdleJobType{ ONLINE_SPELLING, AUTOCOMPLETE_WORDS, WORD_COUNT, SMART_TAGS }; - bool _DoIdleJob( const SwContentFrame*, IdleJobType ); + bool DoIdleJob_( const SwContentFrame*, IdleJobType ); bool DoIdleJob( IdleJobType, bool bVisAreaOnly ); public: diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index bb4b8ed4e656..862aafef5da5 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -43,7 +43,7 @@ class SwLayouter { SwEndnoter* mpEndnoter; SwLooping* mpLooping; - void _CollectEndnotes( SwSectionFrame* pSect ); + void CollectEndnotes_( SwSectionFrame* pSect ); bool StartLooping( SwPageFrame* pPage ); // --> #i28701# diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index 63227421d649..fe926d339973 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -82,7 +82,7 @@ namespace sw { namespace mark }; }} -void _DelBookmarks(const SwNodeIndex& rStt, +void DelBookmarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark> * SaveBkmk =nullptr, const SwIndex* pSttIdx =nullptr, @@ -90,24 +90,24 @@ void _DelBookmarks(const SwNodeIndex& rStt, /** data structure to temporarily hold fly anchor positions relative to some * location. */ -struct _SaveFly +struct SaveFly { sal_uLong nNdDiff; /// relative node difference SwFrameFormat* pFrameFormat; /// the fly's frame format bool bInsertPosition; /// if true, anchor _at_ insert position - _SaveFly( sal_uLong nNodeDiff, SwFrameFormat* pFormat, bool bInsert ) + SaveFly( sal_uLong nNodeDiff, SwFrameFormat* pFormat, bool bInsert ) : nNdDiff( nNodeDiff ), pFrameFormat( pFormat ), bInsertPosition( bInsert ) { } }; -typedef ::std::deque< _SaveFly > _SaveFlyArr; +typedef ::std::deque< SaveFly > SaveFlyArr; -void _RestFlyInRange( _SaveFlyArr& rArr, const SwNodeIndex& rSttIdx, +void RestFlyInRange( SaveFlyArr& rArr, const SwNodeIndex& rSttIdx, const SwNodeIndex* pInsPos ); -void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr ); -void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos, - _SaveFlyArr& rArr, bool bMoveAllFlys ); +void SaveFlyInRange( const SwNodeRange& rRg, SaveFlyArr& rArr ); +void SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos, + SaveFlyArr& rArr, bool bMoveAllFlys ); void DelFlyInRange( const SwNodeIndex& rMkNdIdx, const SwNodeIndex& rPtNdIdx ); @@ -145,16 +145,16 @@ void PaMCorrRel( const SwNodeIndex &rOldNode, * Helper to copy paragraph-bound Flys. * By sorting by order number, we try to retain the layout. */ -class _ZSortFly +class ZSortFly { const SwFrameFormat* pFormat; const SwFormatAnchor* pAnchor; sal_uInt32 nOrdNum; public: - _ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAnchor, + ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAnchor, sal_uInt32 nArrOrdNum ); - _ZSortFly& operator=( const _ZSortFly& rCpy ) + ZSortFly& operator=( const ZSortFly& rCpy ) { pFormat = rCpy.pFormat; pAnchor = rCpy.pAnchor; @@ -162,8 +162,8 @@ public: return *this; } - bool operator==( const _ZSortFly& ) const { return false; } - bool operator<( const _ZSortFly& rCmp ) const + bool operator==( const ZSortFly& ) const { return false; } + bool operator<( const ZSortFly& rCmp ) const { return nOrdNum < rCmp.nOrdNum; } const SwFrameFormat* GetFormat() const { return pFormat; } @@ -178,17 +178,17 @@ public: ~SwTableNumFormatMerge(); }; -class _SaveRedlEndPosForRestore +class SaveRedlEndPosForRestore { std::vector<SwPosition*>* pSavArr; SwNodeIndex* pSavIdx; sal_Int32 nSavContent; - void _Restore(); + void Restore_(); public: - _SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nContent ); - ~_SaveRedlEndPosForRestore(); - void Restore() { if( pSavArr ) _Restore(); } + SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nContent ); + ~SaveRedlEndPosForRestore(); + void Restore() { if( pSavArr ) Restore_(); } }; #endif // INCLUDED_SW_SOURCE_CORE_INC_MVSAVE_HXX diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index 6ed54dbeb716..0e2ab5756837 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -28,7 +28,7 @@ struct SwCursorMoveState; class SwNoTextFrame: public SwContentFrame { - friend void _FrameFinit(); + friend void FrameFinit(); const Size& GetSize() const; diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx index b309ca1a195d..e6636215a447 100644 --- a/sw/source/core/inc/objectformatter.hxx +++ b/sw/source/core/inc/objectformatter.hxx @@ -56,7 +56,7 @@ class SwObjectFormatter // #i26945# SwPageNumAndTypeOfAnchors* mpPgNumAndTypeOfAnchors; - /** helper method for method <_FormatObj(..)> - performs the intrinsic + /** helper method for method <FormatObj_(..)> - performs the intrinsic format of the layout of the given layout frame and all its lower layout frames. @@ -66,14 +66,14 @@ class SwObjectFormatter <SwLayAction::FormatLayout(..)>. Thus, its code for the formatting have to be synchronised. */ - void _FormatLayout( SwLayoutFrame& _rLayoutFrame ); + void FormatLayout_( SwLayoutFrame& _rLayoutFrame ); - /** helper method for method <_FormatObj(..)> - performs the intrinsic + /** helper method for method <FormatObj_(..)> - performs the intrinsic format of the content of the given floating screen object. #i28701# */ - void _FormatObjContent( SwAnchoredObject& _rAnchoredObj ); + void FormatObjContent( SwAnchoredObject& _rAnchoredObj ); protected: SwObjectFormatter( const SwPageFrame& _rPageFrame, @@ -108,7 +108,7 @@ class SwObjectFormatter /** performs the intrinsic format of a given floating screen object and its content. */ - void _FormatObj( SwAnchoredObject& _rAnchoredObj ); + void FormatObj_( SwAnchoredObject& _rAnchoredObj ); /** invokes the intrinsic format method for all floating screen objects, anchored at anchor frame on the given page frame @@ -121,7 +121,7 @@ class SwObjectFormatter @param _pMasterTextFrame input parameter - pointer to 'master' text frame. default value: NULL */ - bool _FormatObjsAtFrame( SwTextFrame* _pMasterTextFrame = nullptr ); + bool FormatObjsAtFrame_( SwTextFrame* _pMasterTextFrame = nullptr ); /** accessor to collected anchored object */ diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 3fae2a30bbc8..dcd3b7ec01c7 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -70,7 +70,7 @@ class SwPageFrame: public SwFootnoteBossFrame static const sal_Int8 mnShadowPxWidth; - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, + void UpdateAttr_( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); /// Adapt the max. footnote height in each single column diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 1b5a0087a168..7f660c19a0ce 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -395,7 +395,7 @@ private: SwHistory * const m_pHistory; sal_uLong m_nNodeIndex; - void _MakeSetWhichIds(); + void MakeSetWhichIds(); protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override; diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 1da4f8a93902..66dc0ecf0601 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -68,8 +68,8 @@ class SwRootFrame: public SwLayoutFrame friend inline void SetLastPage( SwPageFrame* ); // For creating and destroying of the virtual output device manager - friend void _FrameInit(); // Creates s_pVout - friend void _FrameFinit(); // Destroys s_pVout + friend void FrameInit(); // Creates s_pVout + friend void FrameFinit(); // Destroys s_pVout std::vector<SwRect> maPageRects;// returns the current rectangle for each page frame // the rectangle is extended to the top/bottom/left/right @@ -150,8 +150,8 @@ class SwRootFrame: public SwLayoutFrame void ImplCalcBrowseWidth(); void ImplInvalidateBrowseWidth(); - void _DeleteEmptySct(); // Destroys the registered SectionFrames - void _RemoveFromList( SwSectionFrame* pSct ); // Removes SectionFrames from the Delete List + void DeleteEmptySct_(); // Destroys the registered SectionFrames + void RemoveFromList_( SwSectionFrame* pSct ); // Removes SectionFrames from the Delete List virtual void DestroyImpl() override; virtual ~SwRootFrame(); @@ -351,8 +351,8 @@ public: * destroyed later on or deregistered. */ void InsertEmptySct( SwSectionFrame* pDel ); - void DeleteEmptySct() { if( mpDestroy ) _DeleteEmptySct(); } - void RemoveFromList( SwSectionFrame* pSct ) { if( mpDestroy ) _RemoveFromList( pSct ); } + void DeleteEmptySct() { if( mpDestroy ) DeleteEmptySct_(); } + void RemoveFromList( SwSectionFrame* pSct ) { if( mpDestroy ) RemoveFromList_( pSct ); } #ifdef DBG_UTIL bool IsInDelList( SwSectionFrame* pSct ) const; #endif diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index f8a84e74063a..7f73abe803d3 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -44,15 +44,15 @@ class SwSectionFrame: public SwLayoutFrame, public SwFlowFrame bool m_bOwnFootnoteNum; // special numbering of footnotes bool m_bFootnoteLock; // ftn, don't leave this section bwd - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, + void UpdateAttr_( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); - void _Cut( bool bRemove ); + void Cut_( bool bRemove ); // Is there a FootnoteContainer? // An empty sectionfrm without FootnoteCont is superfluous bool IsSuperfluous() const { return !ContainsAny() && !ContainsFootnoteCont(); } void CalcFootnoteAtEndFlag(); void CalcEndAtEndFlag(); - const SwSectionFormat* _GetEndSectFormat() const; + const SwSectionFormat* GetEndSectFormat_() const; bool IsEndnoteAtMyEnd() const; virtual void DestroyImpl() override; @@ -102,8 +102,8 @@ public: void DelEmpty( bool bRemove ); // Like Cut(), except for that Follow chaining is maintained SwFootnoteContFrame* ContainsFootnoteCont( const SwFootnoteContFrame* pCont = nullptr ) const; bool Growable() const; - SwTwips _Shrink( SwTwips, bool bTst ); - SwTwips _Grow ( SwTwips, bool bTst ); + SwTwips Shrink_( SwTwips, bool bTst ); + SwTwips Grow_ ( SwTwips, bool bTst ); /** * A sectionfrm has to maximize, if he has a follow or a ftncontainer at @@ -111,7 +111,7 @@ public: * if bCheckFollow is set. */ bool ToMaximize( bool bCheckFollow ) const; - inline bool _ToMaximize() const { + inline bool ToMaximize_() const { if( !m_pSection ) return false; return ToMaximize( false ); } @@ -131,12 +131,12 @@ public: SwTwips CalcUndersize() const; /// Adapt size to surroundings - void _CheckClipping( bool bGrow, bool bMaximize ); + void CheckClipping( bool bGrow, bool bMaximize ); void InvalidateFootnotePos(); void CollectEndnotes( SwLayouter* pLayouter ); const SwSectionFormat* GetEndSectFormat() const { - if( IsEndnAtEnd() ) return _GetEndSectFormat(); + if( IsEndnAtEnd() ) return GetEndSectFormat_(); return nullptr; } diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 7d22b7cdbded..c2f1941403c3 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -189,7 +189,7 @@ class SwCacheAccess { SwCache &rCache; - void _Get(); + void Get_(); protected: SwCacheObj *pObj; @@ -263,7 +263,7 @@ inline SwCacheAccess::SwCacheAccess( SwCache &rC, const void *pOwn, inline SwCacheObj *SwCacheAccess::Get() { if ( !pObj ) - _Get(); + Get_(); return pObj; } diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index c684a9643ee2..3c83bcdd40b7 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -32,8 +32,8 @@ class SfxItemSet; class SwAttrSet; class SwDoCapitals; // DoCapitals -class SwDrawTextInfo; // _DrawText -class SwScriptInfo; // _GetTextSize +class SwDrawTextInfo; // DrawText_ +class SwScriptInfo; // GetTextSize_ class SwViewShell; class IDocumentSettingAccess; typedef struct _xmlTextWriter *xmlTextWriterPtr; @@ -65,20 +65,20 @@ class SwSubFont : public SvxFont SwSubFont& operator=( const SwSubFont &rFont ); - short _CheckKerning( ); + short CheckKerning_( ); bool ChgFnt( SwViewShell const *pSh, OutputDevice& rOut ); bool IsSymbol( SwViewShell *pSh ); sal_uInt16 GetAscent( SwViewShell *pSh, const OutputDevice& rOut ); sal_uInt16 GetHeight( SwViewShell *pSh, const OutputDevice& rOut ); - Size _GetTextSize( SwDrawTextInfo& rInf ); + Size GetTextSize_( SwDrawTextInfo& rInf ); Size GetCapitalSize( SwDrawTextInfo& rInf ); - void _DrawText( SwDrawTextInfo &rInf, const bool bGrey ); + void DrawText_( SwDrawTextInfo &rInf, const bool bGrey ); void DrawCapital( SwDrawTextInfo &rInf ); void DrawStretchCapital( SwDrawTextInfo &rInf ); void DoOnCapitals( SwDoCapitals &rDo ); - void _DrawStretchText( SwDrawTextInfo &rInf ); - sal_Int32 _GetCursorOfst( SwDrawTextInfo& rInf ); + void DrawStretchText_( SwDrawTextInfo &rInf ); + sal_Int32 GetCursorOfst_( SwDrawTextInfo& rInf ); sal_Int32 GetCapitalCursorOfst( SwDrawTextInfo& rInf ); inline void SetColor( const Color& rColor ); @@ -109,7 +109,7 @@ class SwSubFont : public SvxFont inline void SetWeight( const FontWeight eWeight ); inline void SetLanguage( LanguageType eNewLang ); inline short CheckKerning() - { return GetFixKerning() >= 0 ? GetFixKerning() : _CheckKerning( ); } + { return GetFixKerning() >= 0 ? GetFixKerning() : CheckKerning_( ); } inline void SetPropWidth( const sal_uInt16 nNew ) { m_pMagic = nullptr; m_nProportionalWidth = nNew; } public: @@ -310,19 +310,19 @@ public: void DoOnCapitals( SwDoCapitals &rDo ) { m_aSub[m_nActual].DoOnCapitals( rDo ); } - Size _GetTextSize( SwDrawTextInfo& rInf ) - { rInf.SetFont( this ); return m_aSub[m_nActual]._GetTextSize( rInf ); } + Size GetTextSize_( SwDrawTextInfo& rInf ) + { rInf.SetFont( this ); return m_aSub[m_nActual].GetTextSize_( rInf ); } sal_Int32 GetTextBreak( SwDrawTextInfo& rInf, long nTextWidth ); - sal_Int32 _GetCursorOfst( SwDrawTextInfo& rInf ) - { return m_aSub[m_nActual]._GetCursorOfst( rInf ); } + sal_Int32 GetCursorOfst_( SwDrawTextInfo& rInf ) + { return m_aSub[m_nActual].GetCursorOfst_( rInf ); } - inline void _DrawText( SwDrawTextInfo &rInf ) - { m_aSub[m_nActual]._DrawText( rInf, IsGreyWave() ); } + inline void DrawText_( SwDrawTextInfo &rInf ) + { m_aSub[m_nActual].DrawText_( rInf, IsGreyWave() ); } - inline void _DrawStretchText( SwDrawTextInfo &rInf ) - { m_aSub[m_nActual]._DrawStretchText( rInf ); } + inline void DrawStretchText_( SwDrawTextInfo &rInf ) + { m_aSub[m_nActual].DrawStretchText_( rInf ); } inline short CheckKerning() { return m_aSub[m_nActual].CheckKerning(); } diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 0422e8f62b22..bd4245757bbe 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -32,7 +32,7 @@ class SwTabFrame: public SwLayoutFrame, public SwFlowFrame { friend void CalcContent( SwLayoutFrame *pLay, bool bNoColl, bool bNoCalcFollow ); - // does the special treatment for _Get[Next|Prev]Leaf() + // does the special treatment for Get_[Next|Prev]Leaf() using SwFrame::GetLeaf; SwTable * m_pTable; @@ -93,7 +93,7 @@ class SwTabFrame: public SwLayoutFrame, public SwFlowFrame bool Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep ); bool Join(); - void _UpdateAttr( + void UpdateAttr_( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 31f16b0ad30f..7ca7679e1ccd 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -39,20 +39,20 @@ class SwContentNode; class SfxPoolItem; class SwShareBoxFormats; class SwFormatFrameSize; -struct _CpyPara; -struct _InsULPara; +struct CpyPara; +struct InsULPara; void sw_LineSetHeadCondColl( const SwTableLine* pLine ); #ifdef DBG_UTIL -void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ); +void CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ); #endif -void _InsTableBox( SwDoc* pDoc, SwTableNode* pTableNd, +void InsTableBox( SwDoc* pDoc, SwTableNode* pTableNd, SwTableLine* pLine, SwTableBoxFormat* pBoxFrameFormat, SwTableBox* pBox, sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 ); -SW_DLLPUBLIC void _DeleteBox( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo = nullptr, +SW_DLLPUBLIC void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo = nullptr, bool bCalcNewSize = true, const bool bCorrBorder = true, SwShareBoxFormats* pShareFormats = nullptr ); @@ -119,26 +119,26 @@ struct SwSaveRowSpan SwSaveRowSpan( SwTableBoxes& rBoxes, sal_uInt16 nSplitLn ); }; -struct _SwGCLineBorder +struct SwGCLineBorder { const SwTableLines* pLines; SwShareBoxFormats* pShareFormats; sal_uInt16 nLinePos; - _SwGCLineBorder( const SwTable& rTable ) + SwGCLineBorder( const SwTable& rTable ) : pLines( &rTable.GetTabLines() ), pShareFormats(nullptr), nLinePos( 0 ) {} - _SwGCLineBorder( const SwTableBox& rBox ) + SwGCLineBorder( const SwTableBox& rBox ) : pLines( &rBox.GetTabLines() ), pShareFormats(nullptr), nLinePos( 0 ) {} bool IsLastLine() const { return nLinePos + 1 >= (sal_uInt16)pLines->size(); } }; -class _SwGCBorder_BoxBrd +class SwGCBorder_BoxBrd { const editeng::SvxBorderLine* pBrdLn; bool bAnyBorderFnd; public: - _SwGCBorder_BoxBrd() : pBrdLn( nullptr ), bAnyBorderFnd( false ) {} + SwGCBorder_BoxBrd() : pBrdLn( nullptr ), bAnyBorderFnd( false ) {} void SetBorder( const editeng::SvxBorderLine& rBorderLine ) { pBrdLn = &rBorderLine; bAnyBorderFnd = false; } @@ -152,7 +152,7 @@ public: bool IsAnyBorderFound() const { return bAnyBorderFnd; } }; -void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ); +void sw_GC_Line_Border( const SwTableLine* pLine, SwGCLineBorder* pGCPara ); class SwShareBoxFormat { diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 6521e94e8a34..85d0d617461e 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -68,7 +68,7 @@ namespace objectpositioning @return constant reference to <SwFrame> object, at which the horizontal position is determined. */ - const SwFrame& _GetHoriVirtualAnchor( const SwLayoutFrame& _pProposedFrame ) const; + const SwFrame& GetHoriVirtualAnchor( const SwLayoutFrame& _pProposedFrame ) const; public: SwToContentAnchoredObjectPosition( SdrObject& _rDrawObj ); diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx index f269e04a7a45..c6a967ef73c4 100644 --- a/sw/source/core/inc/txtfly.hxx +++ b/sw/source/core/inc/txtfly.hxx @@ -146,7 +146,7 @@ class SwTextFly \param[in] rPortion Scope: document global. */ - SwRect _GetFrame( const SwRect &rPortion ) const; + SwRect GetFrame_( const SwRect &rPortion ) const; SwAnchoredObjList* InitAnchoredObjList(); @@ -172,7 +172,7 @@ class SwTextFly \li There is more than 2cm space on both sides and the object width is less than 1.5cm: both sides surround (SURROUND_PARALLEL) */ - SwSurround _GetSurroundForTextWrap( const SwAnchoredObject* pAnchoredObj ) const; + SwSurround GetSurroundForTextWrap( const SwAnchoredObject* pAnchoredObj ) const; /** The right margin is the right margin or it is determined by the @@ -201,7 +201,7 @@ class SwTextFly SwTwips CalcMinBottom() const; - const SwContentFrame* _GetMaster(); + const SwContentFrame* GetMaster_(); public: @@ -340,7 +340,7 @@ inline SwTwips SwTextFly::GetMinBottom() const inline const SwContentFrame* SwTextFly::GetMaster() const { - return pMaster ? pMaster : const_cast<SwTextFly*>(this)->_GetMaster(); + return pMaster ? pMaster : const_cast<SwTextFly*>(this)->GetMaster_(); } inline long SwTextFly::GetNextTop() const @@ -355,7 +355,7 @@ inline void SwTextFly::SetNextTop( long nNew ) const inline SwRect SwTextFly::GetFrame( const SwRect &rRect ) const { - return bOn ? _GetFrame( rRect ) : SwRect(); + return bOn ? GetFrame_( rRect ) : SwRect(); } inline void SwTextFly::SetIgnoreCurrentFrame( bool bNew ) diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 7c021eab4ce1..bd32500c708e 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -85,7 +85,7 @@ class SwTextFrame: public SwContentFrame sal_uInt16 mnCacheIndex; // Index into the cache, USHRT_MAX if there's definitely no fitting object in the cache // Separates the Master and creates a Follow or adjusts the data in the Follow - void _AdjustFollow( SwTextFormatter &rLine, const sal_Int32 nOffset, + void AdjustFollow_( SwTextFormatter &rLine, const sal_Int32 nOffset, const sal_Int32 nStrEnd, const sal_uInt8 nMode ); // Iterates all Lines and sets the line spacing using the attribute @@ -97,7 +97,7 @@ class SwTextFrame: public SwContentFrame // Evaluates the Preps in Format() bool CalcPreps(); void PrepWidows( const sal_uInt16 nNeed, bool bNotify = true ); - void _InvalidateRange( const SwCharRange &, const long = 0); + void InvalidateRange_( const SwCharRange &, const long = 0); inline void InvalidateRange( const SwCharRange &, const long = 0); // WidowsAndOrphans, AdjustFrame, AdjustFollow @@ -133,7 +133,7 @@ class SwTextFrame: public SwContentFrame bool IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const; // Changes the Frame or not (cf. FlyCnt) - bool _GetCursorOfst(SwPosition *pPos, const Point &rPoint, + bool GetCursorOfst_(SwPosition *pPos, const Point &rPoint, const bool bChgFrame, SwCursorMoveState* = nullptr ) const; void FillCursorPos( SwFillData &rFill ) const; @@ -141,9 +141,9 @@ class SwTextFrame: public SwContentFrame bool FormatLine( SwTextFormatter &rLine, const bool bPrev ); // In order to safe stack space, we split this method: - // _Format calls _Format with parameters - void _Format( vcl::RenderContext* pRenderContext, SwParaPortion *pPara ); - void _Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf, + // Format_ calls Format_ with parameters + void Format_( vcl::RenderContext* pRenderContext, SwParaPortion *pPara ); + void Format_( SwTextFormatter &rLine, SwTextFormatInfo &rInf, const bool bAdjust = false ); void FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf ); @@ -155,7 +155,7 @@ class SwTextFrame: public SwContentFrame const sal_Int32 nEnd); // inline branch - SwTwips _GetFootnoteFrameHeight() const; + SwTwips GetFootnoteFrameHeight_() const; // Outsourced to CalcPreps bool CalcPrepFootnoteAdjust(); @@ -164,11 +164,11 @@ class SwTextFrame: public SwContentFrame void ValidateFrame(); void ValidateBodyFrame(); - bool _GetDropRect( SwRect &rRect ) const; + bool GetDropRect_( SwRect &rRect ) const; void SetPara( SwParaPortion *pNew, bool bDelete = true ); - bool _IsFootnoteNumFrame() const; + bool IsFootnoteNumFrame_() const; // Refresh formatting information bool FormatQuick( bool bForceQuickFormat ); @@ -196,7 +196,7 @@ class SwTextFrame: public SwContentFrame optional input parameter - boolean indicating, if the font has to be used to determine the height of the last line. default value: false */ - void _CalcHeightOfLastLine( const bool _bUseFont = false ); + void CalcHeightOfLastLine( const bool _bUseFont = false ); virtual void DestroyImpl() override; virtual ~SwTextFrame(); @@ -215,7 +215,7 @@ public: void Init(); /// Is called by FormatSpelling() - SwRect _AutoSpell( const SwContentNode*, sal_Int32 ); + SwRect AutoSpell_( const SwContentNode*, sal_Int32 ); /// Is called by FormatSpelling() SwRect SmartTagScan( SwContentNode* , sal_Int32 ); @@ -276,7 +276,7 @@ public: * character-bound Frame) */ inline bool GetKeyCursorOfst(SwPosition *pPos, const Point &rPoint ) const - { return _GetCursorOfst( pPos, rPoint, false ); } + { return GetCursorOfst_( pPos, rPoint, false ); } void PaintExtraData( const SwRect & rRect ) const; /// Page number etc. SwRect Paint(); @@ -296,9 +296,9 @@ public: bool bSetInReadOnly = false ) const override; virtual bool UnitDown(SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const override; - bool _UnitUp(SwPaM *, const SwTwips nOffset = 0, + bool UnitUp_(SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const; - bool _UnitDown(SwPaM *, const SwTwips nOffset = 0, + bool UnitDown_(SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const; /** @@ -312,7 +312,7 @@ public: void SplitFrame( const sal_Int32 nTextPos ); SwContentFrame *JoinFrame(); inline sal_Int32 GetOfst() const { return mnOffset; } - void _SetOfst( const sal_Int32 nNewOfst ); + void SetOfst_( const sal_Int32 nNewOfst ); inline void SetOfst ( const sal_Int32 nNewOfst ); inline void ManipOfst ( const sal_Int32 nNewOfst ){ mnOffset = nNewOfst; } SwTextFrame *GetFrameAtPos ( const SwPosition &rPos); @@ -369,7 +369,7 @@ public: SwParaPortion *GetPara(); inline const SwParaPortion *GetPara() const; inline bool HasPara() const; - bool _HasPara() const; + bool HasPara_() const; // If there are any hanging punctuation portions in the margin // the offset will be returned. @@ -466,7 +466,7 @@ public: /// DropCaps and selections inline bool GetDropRect( SwRect &rRect ) const - { return HasPara() && _GetDropRect( rRect ); } + { return HasPara() && GetDropRect_( rRect ); } static SwCache *GetTextCache() { return pTextCache; } static void SetTextCache( SwCache *pNew ) { pTextCache = pNew; } @@ -481,7 +481,7 @@ public: /// Am I a FootnoteFrame, with a number at the start of the paragraph? inline bool IsFootnoteNumFrame() const - { return IsInFootnote() && !GetIndPrev() && _IsFootnoteNumFrame(); } + { return IsInFootnote() && !GetIndPrev() && IsFootnoteNumFrame_(); } /** * Simulates a formatting as if there were not right margin or Flys or other @@ -644,7 +644,7 @@ private: bool m_bOldLocked; public: //Lock pFrame for the lifetime of the Cut/Paste call, etc. to avoid - //SwTextFrame::_AdjustFollow removing the pFrame we're trying to Make + //SwTextFrame::AdjustFollow_ removing the pFrame we're trying to Make TextFrameLockGuard(SwFrame* pFrame) { m_pTextFrame = pFrame->IsTextFrame() ? static_cast<SwTextFrame*>(pFrame) : nullptr; @@ -673,7 +673,7 @@ inline const SwParaPortion *SwTextFrame::GetPara() const inline bool SwTextFrame::HasPara() const { - return mnCacheIndex!=USHRT_MAX && _HasPara(); + return mnCacheIndex!=USHRT_MAX && HasPara_(); } inline SwTwips SwTextFrame::GrowTst( const SwTwips nGrow ) @@ -698,7 +698,7 @@ inline bool SwTextFrame::IsInside( const sal_Int32 nPos ) const inline SwTwips SwTextFrame::GetFootnoteFrameHeight() const { if( !IsFollow() && IsInFootnote() && HasPara() ) - return _GetFootnoteFrameHeight(); + return GetFootnoteFrameHeight_(); else return 0; } @@ -720,7 +720,7 @@ inline const SwTextFrame *SwTextFrame::GetFrameAtPos( const SwPosition &rPos) co inline void SwTextFrame::SetOfst( const sal_Int32 nNewOfst ) { if ( mnOffset != nNewOfst ) - _SetOfst( nNewOfst ); + SetOfst_( nNewOfst ); } inline void SwTextFrame::SetRepaint() const diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 3bde62fcaef9..4ebe4897c7fb 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -113,7 +113,7 @@ private: has to be invalidated. If NULL, no CONTENT_FLOWS_TO relation has to be invalidated */ - void _InvalidateAccessibleParaFlowRelation( const SwTextFrame* _pFromTextFrame, + void InvalidateAccessibleParaFlowRelation_( const SwTextFrame* _pFromTextFrame, const SwTextFrame* _pToTextFrame ); /** invalidate text selection for paragraphs @@ -122,7 +122,7 @@ private: implementation for wrapper method <SwViewShell::InvalidateAccessibleParaTextSelection(..)> */ - void _InvalidateAccessibleParaTextSelection(); + void InvalidateAccessibleParaTextSelection_(); /** invalidate attributes for paragraphs and paragraph's characters @@ -130,7 +130,7 @@ private: implementation for wrapper method <SwViewShell::InvalidateAccessibleParaAttrs(..)> */ - void _InvalidateAccessibleParaAttrs( const SwTextFrame& rTextFrame ); + void InvalidateAccessibleParaAttrs_( const SwTextFrame& rTextFrame ); public: SwViewShellImp( SwViewShell * ); diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 455ccd6fb33e..ce4dfbe18191 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -187,7 +187,7 @@ class SwWrongList static void ShiftLeft( sal_Int32 &rPos, sal_Int32 nStart, sal_Int32 nEnd ) { if( rPos > nStart ) rPos = rPos > nEnd ? rPos - nEnd + nStart : nStart; } - void _Invalidate( sal_Int32 nBegin, sal_Int32 nEnd ); + void Invalidate_( sal_Int32 nBegin, sal_Int32 nEnd ); void Insert(sal_uInt16 nWhere, std::vector<SwWrongArea>::iterator startPos, std::vector<SwWrongArea>::iterator endPos); void Remove( sal_uInt16 nIdx, sal_uInt16 nLen ); diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index da6c2fff6ee4..9b2a7e123dc2 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -285,7 +285,7 @@ void SwAnchoredDrawObject::MakeObjPos() if ( dynamic_cast< const SwDrawVirtObj* >(GetDrawObj()) == nullptr && !static_cast<SwDrawFrameFormat&>(GetFrameFormat()).IsPosAttrSet() ) { - _SetPositioningAttr(); + SetPositioningAttr(); } // --> // - reset internal flag after all needed actions are performed to @@ -312,16 +312,16 @@ void SwAnchoredDrawObject::MakeObjPos() case FLY_AT_CHAR: { // --> #i32795# - move intrinsic positioning to - // helper method <_MakeObjPosAnchoredAtPara()> - _MakeObjPosAnchoredAtPara(); + // helper method <MakeObjPosAnchoredAtPara()> + MakeObjPosAnchoredAtPara(); } break; case FLY_AT_PAGE: case FLY_AT_FLY: { // --> #i32795# - move intrinsic positioning to - // helper method <_MakeObjPosAnchoredAtLayout()> - _MakeObjPosAnchoredAtLayout(); + // helper method <MakeObjPosAnchoredAtLayout()> + MakeObjPosAnchoredAtLayout(); } break; default: @@ -373,7 +373,7 @@ void SwAnchoredDrawObject::MakeObjPos() #i32795# - helper method for method <MakeObjPos> */ -void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() +void SwAnchoredDrawObject::MakeObjPosAnchoredAtPara() { // --> #i32795# - adopt positioning algorithm from Writer // fly frames, which are anchored at paragraph|at character @@ -420,7 +420,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() // get further needed results of the positioning algorithm SetVertPosOrientFrame ( aObjPositioning.GetVertPosOrientFrame() ); - _SetDrawObjAnchor(); + SetDrawObjAnchor(); // check for object position oscillation, if position has changed. if ( GetObjRect().Pos() != aPosNotify.LastObjPos() ) @@ -461,7 +461,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() #i32795# - helper method for method <MakeObjPos> */ -void SwAnchoredDrawObject::_MakeObjPosAnchoredAtLayout() +void SwAnchoredDrawObject::MakeObjPosAnchoredAtLayout() { // indicate that position will be valid after positioning is performed mbValidPos = true; @@ -494,7 +494,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtLayout() SetObjTop( aAnchPos.Y() + GetCurrRelPos().Y() ); } -void SwAnchoredDrawObject::_SetDrawObjAnchor() +void SwAnchoredDrawObject::SetDrawObjAnchor() { // new anchor position // --> #i31698# - @@ -519,7 +519,7 @@ void SwAnchoredDrawObject::_SetDrawObjAnchor() #i28701# */ -void SwAnchoredDrawObject::_InvalidatePage( SwPageFrame* _pPageFrame ) +void SwAnchoredDrawObject::InvalidatePage_( SwPageFrame* _pPageFrame ) { if ( _pPageFrame && !_pPageFrame->GetFormat()->GetDoc()->IsInDtor() ) { @@ -578,7 +578,7 @@ void SwAnchoredDrawObject::InvalidateObjPos() } SwPageFrame* pPageFrame = AnchorFrame()->FindPageFrame(); - _InvalidatePage( pPageFrame ); + InvalidatePage_( pPageFrame ); // --> #i32270# - also invalidate page frame, at which the // drawing object is registered at. @@ -586,7 +586,7 @@ void SwAnchoredDrawObject::InvalidateObjPos() if ( pPageFrameRegisteredAt && pPageFrameRegisteredAt != pPageFrame ) { - _InvalidatePage( pPageFrameRegisteredAt ); + InvalidatePage_( pPageFrameRegisteredAt ); } // #i33751#, #i34060# - method <GetPageFrameOfAnchor()> // is replaced by method <FindPageFrameOfAnchor()>. It's return value @@ -596,7 +596,7 @@ void SwAnchoredDrawObject::InvalidateObjPos() pPageFrameOfAnchor != pPageFrame && pPageFrameOfAnchor != pPageFrameRegisteredAt ) { - _InvalidatePage( pPageFrameOfAnchor ); + InvalidatePage_( pPageFrameOfAnchor ); } } } @@ -670,14 +670,14 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const } // --> #i68520# -bool SwAnchoredDrawObject::_SetObjTop( const SwTwips _nTop ) +bool SwAnchoredDrawObject::SetObjTop_( const SwTwips _nTop ) { SwTwips nDiff = _nTop - GetObjRect().Top(); DrawObj()->Move( Size( 0, nDiff ) ); return nDiff != 0; } -bool SwAnchoredDrawObject::_SetObjLeft( const SwTwips _nLeft ) +bool SwAnchoredDrawObject::SetObjLeft_( const SwTwips _nLeft ) { SwTwips nDiff = _nLeft - GetObjRect().Left(); DrawObj()->Move( Size( nDiff, 0 ) ); @@ -750,7 +750,7 @@ void SwAnchoredDrawObject::ObjectAttachedToAnchorFrame() (not anchored as-character) imported from OpenOffice.org file format once and directly before the first positioning. */ -void SwAnchoredDrawObject::_SetPositioningAttr() +void SwAnchoredDrawObject::SetPositioningAttr() { SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(GetUserCall( GetDrawObj() )); @@ -787,7 +787,7 @@ void SwAnchoredDrawObject::_SetPositioningAttr() break; default: { - OSL_FAIL( "<SwAnchoredDrawObject::_SetPositioningAttr()> - unsupported layout direction" ); + OSL_FAIL( "<SwAnchoredDrawObject::SetPositioningAttr()> - unsupported layout direction" ); } } } diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 77aec53a61e0..0e6c46a2846a 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -231,8 +231,8 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine( const SwTextFrame& aAnchorCharFrame = *(FindAnchorCharFrame()); if ( !_bCheckForParaPorInf || aAnchorCharFrame.HasPara() ) { - _CheckCharRect( rAnch, aAnchorCharFrame ); - _CheckTopOfLine( rAnch, aAnchorCharFrame ); + CheckCharRect( rAnch, aAnchorCharFrame ); + CheckTopOfLine( rAnch, aAnchorCharFrame ); } } } @@ -248,7 +248,7 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine( improvement - add second parameter <_rAnchorCharFrame> */ -void SwAnchoredObject::_CheckCharRect( const SwFormatAnchor& _rAnch, +void SwAnchoredObject::CheckCharRect( const SwFormatAnchor& _rAnch, const SwTextFrame& _rAnchorCharFrame ) { // determine rectangle of anchor character. If not exist, abort operation @@ -312,7 +312,7 @@ void SwAnchoredObject::_CheckCharRect( const SwFormatAnchor& _rAnch, improvement - add second parameter <_rAnchorCharFrame> */ -void SwAnchoredObject::_CheckTopOfLine( const SwFormatAnchor& _rAnch, +void SwAnchoredObject::CheckTopOfLine( const SwFormatAnchor& _rAnch, const SwTextFrame& _rAnchorCharFrame ) { SwTwips nTopOfLine = 0L; @@ -595,7 +595,7 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const // --> #i68520# void SwAnchoredObject::SetObjTop( const SwTwips _nTop) { - const bool bTopChanged( _SetObjTop( _nTop ) ); + const bool bTopChanged( SetObjTop_( _nTop ) ); if ( bTopChanged ) { mbObjRectWithSpacesValid = false; @@ -604,7 +604,7 @@ void SwAnchoredObject::SetObjTop( const SwTwips _nTop) void SwAnchoredObject::SetObjLeft( const SwTwips _nLeft) { - const bool bLeftChanged( _SetObjLeft( _nLeft ) ); + const bool bLeftChanged( SetObjLeft_( _nLeft ) ); if ( bLeftChanged ) { mbObjRectWithSpacesValid = false; diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index d8ad7ffd018f..fc9f0f6a0716 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -95,7 +95,7 @@ bool SwContentFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool & ) SWRECTFNX( pNewUpper ) if( std::abs( (pNewUpper->Prt().*fnRectX->fnGetWidth)() - (GetUpper()->Prt().*fnRect->fnGetWidth)() ) > 1 ) { - // In this case, only a _WouldFit with test move is possible + // In this case, only a WouldFit_ with test move is possible nMoveAnyway = 2; } @@ -167,10 +167,10 @@ bool SwContentFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool & ) // account the widths // and Flys, that in turn influence the footnotes, ... - // _WouldFit can only be used if the width is the same and + // WouldFit_ can only be used if the width is the same and // ONLY self-anchored Flys are present. - // _WouldFit can also be used if ONLY Flys anchored + // WouldFit_ can also be used if ONLY Flys anchored // somewhere else are present. // In this case, the width doesn't even matter, // because we're running a TestFormat in the new upper. @@ -179,10 +179,10 @@ bool SwContentFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool & ) const bool bObjsInNewUpper( nBwdMoveNecessaryResult == 2 || nBwdMoveNecessaryResult == 3 ); - return _WouldFit( nSpace, pNewUpper, nMoveAnyway == 2, + return WouldFit_( nSpace, pNewUpper, nMoveAnyway == 2, bObjsInNewUpper ); } - // It's impossible for _WouldFit to return a usable result if + // It's impossible for WouldFit_ to return a usable result if // we have a fresh multi-column section - so we really have to // float back unless there is no space. return pNewUpper->IsInSct() && pNewUpper->IsColBodyFrame() && @@ -1367,7 +1367,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) if( (Frame().*fnRect->fnGetPos)() != aOldFramePos || (Prt().*fnRect->fnGetPos)() != aOldPrtPos ) { - // In this Prepare, an _InvalidateSize() might happen. + // In this Prepare, an InvalidateSize_() might happen. // mbValidSize becomes false and Format() gets called. Prepare( PREP_POS_CHGD, static_cast<const void*>(&bFormatted), false ); if ( bWidow && GetFollow() ) @@ -1819,7 +1819,7 @@ static bool lcl_IsNextFootnoteBoss( const SwFrame *pFrame, const SwFrame* pNxt ) return pFrame && pNxt && pFrame->GetNext() == pNxt; } -bool SwContentFrame::_WouldFit( SwTwips nSpace, +bool SwContentFrame::WouldFit_( SwTwips nSpace, SwLayoutFrame *pNewUpper, bool bTstMove, const bool bObjsInNewUpper ) @@ -1993,7 +1993,7 @@ bool SwContentFrame::_WouldFit( SwTwips nSpace, // doesn't makes sense. Thus, return true. if ( IsAnFollow( pFrame ) && !pFrame->IsValid() ) { - OSL_FAIL( "Only a warning for task 108824:/n<SwContentFrame::_WouldFit(..) - follow not valid!" ); + OSL_FAIL( "Only a warning for task 108824:/n<SwContentFrame::WouldFit_(..) - follow not valid!" ); return true; } } diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 7b5250103e43..08eeee43ad9a 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -91,7 +91,7 @@ * [frmtype] !0x3FFF 0x4 * * As soon as the logging is in process, one can manipulate many things in - * SwImplProtocol::_Record(...) using a debugger, especially concerning + * SwImplProtocol::Record_(...) using a debugger, especially concerning * frame types and FrameIds. */ @@ -129,7 +129,7 @@ class SwImplProtocol sal_uInt16 nMaxLines; // max lines to be printed sal_uInt8 nInitFile; // range (FrameId,FrameType,Record) during reading of the INI file sal_uInt8 nTestMode; // special for test formatting, logging may only be done in test formatting. - void _Record( const SwFrame* pFrame, sal_uLong nFunction, sal_uLong nAct, void* pParam ); + void Record_( const SwFrame* pFrame, sal_uLong nFunction, sal_uLong nAct, void* pParam ); bool NewStream(); void CheckLine( OString& rLine ); static void SectFunc( OStringBuffer& rOut, const SwFrame* pFrame, sal_uLong nAct, void* pParam ); @@ -138,7 +138,7 @@ public: ~SwImplProtocol(); // logging void Record( const SwFrame* pFrame, sal_uLong nFunction, sal_uLong nAct, void* pParam ) - { if( pStream ) _Record( pFrame, nFunction, nAct, pParam ); } + { if( pStream ) Record_( pFrame, nFunction, nAct, pParam ); } bool InsertFrame( sal_uInt16 nFrameId ); // take FrameId for logging bool DeleteFrame( sal_uInt16 nFrameId ); // remove FrameId; don't log him anymore void FileInit(); // read the INI file @@ -498,7 +498,7 @@ static void lcl_FrameType( OStringBuffer& rOut, const SwFrame* pFrame ) * * In this method we also check if FrameId and frame type should be logged. */ -void SwImplProtocol::_Record( const SwFrame* pFrame, sal_uLong nFunction, sal_uLong nAct, void* pParam ) +void SwImplProtocol::Record_( const SwFrame* pFrame, sal_uLong nFunction, sal_uLong nAct, void* pParam ) { sal_uInt16 nSpecial = 0; if( nSpecial ) // the possible debugger manipulations diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 316d97498a2d..89cf31663e2c 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -171,7 +171,7 @@ SwContentFrame* SwFrame::FindPrevCnt( ) if ( GetPrev() && GetPrev()->IsContentFrame() ) return static_cast<SwContentFrame*>(GetPrev()); else - return _FindPrevCnt(); + return FindPrevCnt_(); } const SwContentFrame* SwFrame::FindPrevCnt() const @@ -179,7 +179,7 @@ const SwContentFrame* SwFrame::FindPrevCnt() const if ( GetPrev() && GetPrev()->IsContentFrame() ) return static_cast<const SwContentFrame*>(GetPrev()); else - return const_cast<SwFrame*>(this)->_FindPrevCnt(); + return const_cast<SwFrame*>(this)->FindPrevCnt_(); } SwContentFrame *SwFrame::FindNextCnt( const bool _bInSameFootnote ) @@ -187,7 +187,7 @@ SwContentFrame *SwFrame::FindNextCnt( const bool _bInSameFootnote ) if ( mpNext && mpNext->IsContentFrame() ) return static_cast<SwContentFrame*>(mpNext); else - return _FindNextCnt( _bInSameFootnote ); + return FindNextCnt_( _bInSameFootnote ); } const SwContentFrame *SwFrame::FindNextCnt( const bool _bInSameFootnote ) const @@ -195,7 +195,7 @@ const SwContentFrame *SwFrame::FindNextCnt( const bool _bInSameFootnote ) const if ( mpNext && mpNext->IsContentFrame() ) return static_cast<SwContentFrame*>(mpNext); else - return const_cast<SwFrame*>(this)->_FindNextCnt( _bInSameFootnote ); + return const_cast<SwFrame*>(this)->FindNextCnt_( _bInSameFootnote ); } bool SwLayoutFrame::IsAnLower( const SwFrame *pAssumed ) const @@ -655,8 +655,8 @@ bool SwFrame::supportsFullDrawingLayerFillAttributeSet() const } /* - * SwFrame::_FindNext(), _FindPrev(), InvalidateNextPos() - * _FindNextCnt() visits tables and sections and only returns SwContentFrames. + * SwFrame::FindNext_(), FindPrev_(), InvalidateNextPos() + * FindNextCnt_() visits tables and sections and only returns SwContentFrames. * * Description Invalidates the position of the next frame. * This is the direct successor or in case of ContentFrames the next @@ -701,7 +701,7 @@ static SwFrame* lcl_NextFrame( SwFrame* pFrame ) return pRet; } -SwFrame *SwFrame::_FindNext() +SwFrame *SwFrame::FindNext_() { bool bIgnoreTab = false; SwFrame *pThis = this; @@ -832,7 +832,7 @@ SwFrame *SwFrame::_FindNext() } // #i27138# - add parameter <_bInSameFootnote> -SwContentFrame *SwFrame::_FindNextCnt( const bool _bInSameFootnote ) +SwContentFrame *SwFrame::FindNextCnt_( const bool _bInSameFootnote ) { SwFrame *pThis = this; @@ -890,7 +890,7 @@ SwContentFrame *SwFrame::_FindNextCnt( const bool _bInSameFootnote ) const SwFootnoteFrame* pFootnoteFrameOfNext( pNxtCnt->FindFootnoteFrame() ); const SwFootnoteFrame* pFootnoteFrameOfCurr( pThis->FindFootnoteFrame() ); OSL_ENSURE( pFootnoteFrameOfCurr, - "<SwFrame::_FindNextCnt() - unknown layout situation: current frame has to have an upper footnote frame." ); + "<SwFrame::FindNextCnt_() - unknown layout situation: current frame has to have an upper footnote frame." ); if ( pFootnoteFrameOfNext == pFootnoteFrameOfCurr ) { return pNxtCnt; @@ -943,7 +943,7 @@ SwContentFrame *SwFrame::_FindNextCnt( const bool _bInSameFootnote ) OD 2005-11-30 #i27138# */ -SwContentFrame* SwFrame::_FindPrevCnt() +SwContentFrame* SwFrame::FindPrevCnt_() { if ( !IsFlowFrame() ) { @@ -1066,9 +1066,9 @@ SwContentFrame* SwFrame::_FindPrevCnt() // inside a fly frame. // Thus, method <FindFooterOrHeader()> can be used. OSL_ENSURE( pCurrContentFrame->FindFooterOrHeader(), - "<SwFrame::_FindPrevCnt()> - unknown layout situation: current frame should be in page header or page footer" ); + "<SwFrame::FindPrevCnt_()> - unknown layout situation: current frame should be in page header or page footer" ); OSL_ENSURE( !pPrevContentFrame->IsInFly(), - "<SwFrame::_FindPrevCnt()> - unknown layout situation: found previous frame should *not* be inside a fly frame." ); + "<SwFrame::FindPrevCnt_()> - unknown layout situation: found previous frame should *not* be inside a fly frame." ); if ( pPrevContentFrame->FindFooterOrHeader() != pCurrContentFrame->FindFooterOrHeader() ) { @@ -1082,7 +1082,7 @@ SwContentFrame* SwFrame::_FindPrevCnt() return pPrevContentFrame; } -SwFrame *SwFrame::_FindPrev() +SwFrame *SwFrame::FindPrev_() { bool bIgnoreTab = false; SwFrame *pThis = this; @@ -1162,7 +1162,7 @@ SwFrame *SwFrame::_FindPrev() void SwFrame::ImplInvalidateNextPos( bool bNoFootnote ) { SwFrame *pFrame; - if ( nullptr != (pFrame = _FindNext()) ) + if ( nullptr != (pFrame = FindNext_()) ) { if( pFrame->IsSctFrame() ) { diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 78186e1fa9bc..146454223359 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -449,8 +449,8 @@ bool SwFlowFrame::PasteTree( SwFrame *pStart, SwLayoutFrame *pParent, SwFrame *p pStart->GetPrev()->mpNext = pStart; else pParent->m_pLower = pStart; - pSibling->_InvalidatePos(); - pSibling->_InvalidatePrt(); + pSibling->InvalidatePos_(); + pSibling->InvalidatePrt_(); } else { @@ -497,7 +497,7 @@ bool SwFlowFrame::PasteTree( SwFrame *pStart, SwLayoutFrame *pParent, SwFrame *p SwTwips nGrowVal = 0; do { pFloat->mpUpper = pParent; - pFloat->_InvalidateAll(); + pFloat->InvalidateAll_(); pFloat->CheckDirChange(); // I'm a friend of the TextFrame and thus am allowed to do many things. @@ -564,7 +564,7 @@ void SwFlowFrame::MoveSubTree( SwLayoutFrame* pParent, SwFrame* pSibling ) // invalidate printing area of previous frame, if it's in a table if ( pPre->GetUpper()->IsInTab() ) { - pPre->_InvalidatePrt(); + pPre->InvalidatePrt_(); } pPre->InvalidatePage(); } @@ -629,7 +629,7 @@ void SwFlowFrame::MoveSubTree( SwLayoutFrame* pParent, SwFrame* pSibling ) else if ( pSh && pSh->GetDoc()->GetLineNumberInfo().IsRestartEachPage() && pPage->FindFirstBodyContent() == &m_rThis ) { - m_rThis._InvalidateLineNum(); + m_rThis.InvalidateLineNum_(); } } if ( bInvaLay || (pSibling && pSibling->IsLayoutFrame()) ) @@ -1238,7 +1238,7 @@ bool SwFlowFrame::HasParaSpaceAtPages( bool bSct ) const OD 2004-03-10 #i11860# */ -const SwFrame* SwFlowFrame::_GetPrevFrameForUpperSpaceCalc( const SwFrame* _pProposedPrevFrame ) const +const SwFrame* SwFlowFrame::GetPrevFrameForUpperSpaceCalc_( const SwFrame* _pProposedPrevFrame ) const { const SwFrame* pPrevFrame = _pProposedPrevFrame ? _pProposedPrevFrame @@ -1347,7 +1347,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs *pAttrs, const bool _bConsiderGrid ) const { // OD 2004-03-10 #i11860# - use new method <GetPrevFrameForUpperSpaceCalc(..)> - const SwFrame* pPrevFrame = _GetPrevFrameForUpperSpaceCalc( pPr ); + const SwFrame* pPrevFrame = GetPrevFrameForUpperSpaceCalc_( pPr ); std::unique_ptr<SwBorderAttrAccess> pAccess; SwFrame* pOwn; @@ -1495,7 +1495,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs *pAttrs, //consider grid in square page mode if ( _bConsiderGrid && m_rThis.GetUpper()->GetFormat()->GetDoc()->IsSquaredPageMode() ) { - nUpper += _GetUpperSpaceAmountConsideredForPageGrid( nUpper ); + nUpper += GetUpperSpaceAmountConsideredForPageGrid_( nUpper ); } const bool bContextualSpacing = pAttrs->GetULSpace().GetContext(); @@ -1515,7 +1515,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs *pAttrs, OD 2004-03-12 #i11860# Precondition: Position of frame is valid. */ -SwTwips SwFlowFrame::_GetUpperSpaceAmountConsideredForPageGrid( +SwTwips SwFlowFrame::GetUpperSpaceAmountConsideredForPageGrid_( const SwTwips _nUpperSpaceWithoutGrid ) const { SwTwips nUpperSpaceAmountConsideredForPageGrid = 0; @@ -1569,11 +1569,11 @@ SwTwips SwFlowFrame::_GetUpperSpaceAmountConsideredForPageGrid( OD 2004-03-11 #i11860# */ -SwTwips SwFlowFrame::_GetUpperSpaceAmountConsideredForPrevFrame() const +SwTwips SwFlowFrame::GetUpperSpaceAmountConsideredForPrevFrame() const { SwTwips nUpperSpaceAmountOfPrevFrame = 0; - const SwFrame* pPrevFrame = _GetPrevFrameForUpperSpaceCalc(); + const SwFrame* pPrevFrame = GetPrevFrameForUpperSpaceCalc_(); if ( pPrevFrame ) { SwTwips nPrevLowerSpace = 0; @@ -1612,9 +1612,9 @@ SwTwips SwFlowFrame::GetUpperSpaceAmountConsideredForPrevFrameAndPageGrid() cons if ( !m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess().get(DocumentSettingId::USE_FORMER_OBJECT_POS) ) { nUpperSpaceAmountConsideredForPrevFrameAndPageGrid = - _GetUpperSpaceAmountConsideredForPrevFrame() + + GetUpperSpaceAmountConsideredForPrevFrame() + ( m_rThis.GetUpper()->GetFormat()->GetDoc()->IsSquaredPageMode() - ? _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( nullptr, nullptr, false ) ) + ? GetUpperSpaceAmountConsideredForPageGrid_( CalcUpperSpace( nullptr, nullptr, false ) ) : 0 ); } diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index beaec42ac102..e42eefd94f31 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -196,7 +196,7 @@ void SwFlyFrame::InsertCnt() OSL_ENSURE( rContent.GetContentIdx(), ":-( no content prepared." ); sal_uLong nIndex = rContent.GetContentIdx()->GetIndex(); // Lower() means SwColumnFrame; the Content then needs to be inserted into the (Column)BodyFrame - ::_InsertCnt( Lower() ? static_cast<SwLayoutFrame*>(static_cast<SwLayoutFrame*>(Lower())->Lower()) : static_cast<SwLayoutFrame*>(this), + ::InsertCnt_( Lower() ? static_cast<SwLayoutFrame*>(static_cast<SwLayoutFrame*>(Lower())->Lower()) : static_cast<SwLayoutFrame*>(this), GetFormat()->GetDoc(), nIndex ); // NoText always have a fixed height. @@ -336,7 +336,7 @@ void SwFlyFrame::DeleteCnt() InvalidatePage(); } -sal_uInt32 SwFlyFrame::_GetOrdNumForNewRef( const SwFlyDrawContact* pContact ) +sal_uInt32 SwFlyFrame::GetOrdNumForNewRef( const SwFlyDrawContact* pContact ) { sal_uInt32 nOrdNum( 0L ); @@ -389,7 +389,7 @@ SwVirtFlyDrawObj* SwFlyFrame::CreateNewRef( SwFlyDrawContact *pContact ) else { pContact->GetFormat()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage( 0 )-> - InsertObject( pDrawObj, _GetOrdNumForNewRef( pContact ) ); + InsertObject( pDrawObj, GetOrdNumForNewRef( pContact ) ); } // #i38889# - assure, that new <SwVirtFlyDrawObj> instance // is in a visible layer. @@ -557,7 +557,7 @@ void SwFlyFrame::UnchainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow ) OSL_ENSURE( rContent.GetContentIdx(), ":-( No content prepared." ); sal_uLong nIndex = rContent.GetContentIdx()->GetIndex(); // Lower() means SwColumnFrame: this one contains another SwBodyFrame - ::_InsertCnt( pFollow->Lower() ? const_cast<SwLayoutFrame*>(static_cast<const SwLayoutFrame*>(static_cast<const SwLayoutFrame*>(pFollow->Lower())->Lower())) + ::InsertCnt_( pFollow->Lower() ? const_cast<SwLayoutFrame*>(static_cast<const SwLayoutFrame*>(static_cast<const SwLayoutFrame*>(pFollow->Lower())->Lower())) : static_cast<SwLayoutFrame*>(pFollow), pFollow->GetFormat()->GetDoc(), ++nIndex ); @@ -691,7 +691,7 @@ void SwFlyFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwAttrSetChg aNewSet( *static_cast<const SwAttrSetChg*>(pNew) ); while( true ) { - _UpdateAttr( aOIter.GetCurItem(), + UpdateAttr_( aOIter.GetCurItem(), aNIter.GetCurItem(), nInvFlags, &aOldSet, &aNewSet ); if( aNIter.IsAtEnd() ) @@ -703,25 +703,25 @@ void SwFlyFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwLayoutFrame::Modify( &aOldSet, &aNewSet ); } else - _UpdateAttr( pOld, pNew, nInvFlags ); + UpdateAttr_( pOld, pNew, nInvFlags ); if ( nInvFlags != 0 ) { - _Invalidate(); + Invalidate_(); if ( nInvFlags & 0x01 ) { - _InvalidatePos(); + InvalidatePos_(); // #i68520# InvalidateObjRectWithSpaces(); } if ( nInvFlags & 0x02 ) { - _InvalidateSize(); + InvalidateSize_(); // #i68520# InvalidateObjRectWithSpaces(); } if ( nInvFlags & 0x04 ) - _InvalidatePrt(); + InvalidatePrt_(); if ( nInvFlags & 0x08 ) SetNotifyBack(); if ( nInvFlags & 0x10 ) @@ -743,7 +743,7 @@ void SwFlyFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } -void SwFlyFrame::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, +void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { @@ -1081,7 +1081,7 @@ bool SwFlyFrame::GetInfo( SfxPoolItem & rInfo ) const return true; // Continue searching } -void SwFlyFrame::_Invalidate( SwPageFrame *pPage ) +void SwFlyFrame::Invalidate_( SwPageFrame *pPage ) { InvalidatePage( pPage ); m_bNotifyBack = m_bInvalid = true; @@ -1369,7 +1369,7 @@ void SwFlyFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA // OD 11.04.2003 #108824# - new parameter <bNoCalcFollow> was used by method // <FormatWidthCols(..)> to avoid follow formatting // for text frames. But, unformatted follows causes -// problems in method <SwContentFrame::_WouldFit(..)>, +// problems in method <SwContentFrame::WouldFit_(..)>, // which assumes that the follows are formatted. // Thus, <bNoCalcFollow> no longer used by <FormatWidthCols(..)>. void CalcContent( SwLayoutFrame *pLay, @@ -1413,7 +1413,7 @@ void CalcContent( SwLayoutFrame *pLay, } return; } - pFrame->_InvalidatePos(); + pFrame->InvalidatePos_(); } else return; @@ -1440,7 +1440,7 @@ void CalcContent( SwLayoutFrame *pLay, : ( pFrame->GetUpper()->Prt().Width() != pFrame->Frame().Width() ) ) { pFrame->Prepare( PREP_FIXSIZE_CHG ); - pFrame->_InvalidateSize(); + pFrame->InvalidateSize_(); } if ( pFrame->IsTabFrame() ) @@ -1639,7 +1639,7 @@ void CalcContent( SwLayoutFrame *pLay, { pFrame = static_cast<SwSectionFrame*>(pFrame)->ContainsAny(); if( pFrame ) - pFrame->_InvalidatePos(); + pFrame->InvalidatePos_(); } } // Stay in the pLay @@ -1787,10 +1787,10 @@ void SwFlyFrame::MakeContentPos( const SwBorderAttrs &rAttrs ) void SwFlyFrame::InvalidateContentPos() { m_bValidContentPos = false; - _Invalidate(); + Invalidate_(); } -SwTwips SwFlyFrame::_Grow( SwTwips nDist, bool bTst ) +SwTwips SwFlyFrame::Grow_( SwTwips nDist, bool bTst ) { SWRECTFN( this ) if ( Lower() && !IsColLocked() && !HasFixSize() ) @@ -1809,7 +1809,7 @@ SwTwips SwFlyFrame::_Grow( SwTwips nDist, bool bTst ) { // #i28701# - unlock position of Writer fly frame UnlockPosition(); - _InvalidatePos(); + InvalidatePos_(); InvalidateSize(); } return 0L; @@ -1818,7 +1818,7 @@ SwTwips SwFlyFrame::_Grow( SwTwips nDist, bool bTst ) if ( !bTst ) { const SwRect aOld( GetObjRectWithSpaces() ); - _InvalidateSize(); + InvalidateSize_(); const bool bOldLock = m_bLocked; Unlock(); if ( IsFlyFreeFrame() ) @@ -1851,7 +1851,7 @@ SwTwips SwFlyFrame::_Grow( SwTwips nDist, bool bTst ) } else MakeAll(getRootFrame()->GetCurrShell()->GetOut()); - _InvalidateSize(); + InvalidateSize_(); InvalidatePos(); if ( bOldLock ) Lock(); @@ -1865,7 +1865,7 @@ SwTwips SwFlyFrame::_Grow( SwTwips nDist, bool bTst ) return 0L; } -SwTwips SwFlyFrame::_Shrink( SwTwips nDist, bool bTst ) +SwTwips SwFlyFrame::Shrink_( SwTwips nDist, bool bTst ) { if( Lower() && !IsColLocked() && !HasFixSize() && !IsNoShrink() ) { @@ -1900,7 +1900,7 @@ SwTwips SwFlyFrame::_Shrink( SwTwips nDist, bool bTst ) } nHeight = (Prt().*fnRect->fnGetHeight)(); (Prt().*fnRect->fnSetHeight)( nHeight - nVal ); - _InvalidatePos(); + InvalidatePos_(); InvalidateSize(); ::Notify( this, FindPageFrame(), aOld ); NotifyDrawObj(); @@ -1913,7 +1913,7 @@ SwTwips SwFlyFrame::_Shrink( SwTwips nDist, bool bTst ) if ( !bTst ) { const SwRect aOld( GetObjRectWithSpaces() ); - _InvalidateSize(); + InvalidateSize_(); const bool bOldLocked = m_bLocked; Unlock(); if ( IsFlyFreeFrame() ) @@ -1946,7 +1946,7 @@ SwTwips SwFlyFrame::_Shrink( SwTwips nDist, bool bTst ) } else MakeAll(getRootFrame()->GetCurrShell()->GetOut()); - _InvalidateSize(); + InvalidateSize_(); InvalidatePos(); if ( bOldLocked ) Lock(); @@ -2231,8 +2231,8 @@ void SwFrame::InvalidateObjs( const bool _bNoInvaOfAsCharAnchoredObjs ) if ( dynamic_cast<const SwFlyFrame*>( pAnchoredObj) != nullptr ) { SwFlyFrame* pFly = static_cast<SwFlyFrame*>(pAnchoredObj); - pFly->_Invalidate(); - pFly->_InvalidatePos(); + pFly->Invalidate_(); + pFly->InvalidatePos_(); } else { @@ -2280,7 +2280,7 @@ void SwLayoutFrame::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) const bool bLow = IsAnLower( pAnchorFrame ); if ( bLow || pAnchorFrame->FindPageFrame() != pPageFrame ) { - pFly->_Invalidate( pPageFrame ); + pFly->Invalidate_( pPageFrame ); if ( !bLow || pFly->IsFlyAtContentFrame() ) { // #i44016# @@ -2288,10 +2288,10 @@ void SwLayoutFrame::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) { pFly->UnlockPosition(); } - pFly->_InvalidatePos(); + pFly->InvalidatePos_(); } else - pFly->_InvalidatePrt(); + pFly->InvalidatePrt_(); } } else @@ -2600,7 +2600,7 @@ const SwRect SwFlyFrame::GetObjBoundRect() const } // #i68520# -bool SwFlyFrame::_SetObjTop( const SwTwips _nTop ) +bool SwFlyFrame::SetObjTop_( const SwTwips _nTop ) { const bool bChanged( Frame().Pos().getY() != _nTop ); @@ -2608,7 +2608,7 @@ bool SwFlyFrame::_SetObjTop( const SwTwips _nTop ) return bChanged; } -bool SwFlyFrame::_SetObjLeft( const SwTwips _nLeft ) +bool SwFlyFrame::SetObjLeft_( const SwTwips _nLeft ) { const bool bChanged( Frame().Pos().getX() != _nLeft ); diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 398c17a884c6..12232ccba490 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -176,7 +176,7 @@ void SwFlyAtContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pN NotifyBackground( pOldPage, aOld, PREP_FLY_LEAVE ); //Fix(3495) - _InvalidatePos(); + InvalidatePos_(); InvalidatePage(); SetNotifyBack(); // #i28701# - reset member <maLastCharRect> and @@ -485,7 +485,7 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext) // If a multi column frame leaves invalid columns because of // a position change, we loop once more and format // our content using FormatWidthCols again. - _InvalidateSize(); + InvalidateSize_(); bExtra = false; // Ensure only one additional loop run } } while ( !IsValid() && !bOsz && @@ -1438,9 +1438,9 @@ void SwFlyAtContentFrame::MakeObjPos() } // #i28701# -bool SwFlyAtContentFrame::_InvalidationAllowed( const InvalidationType _nInvalid ) const +bool SwFlyAtContentFrame::InvalidationAllowed( const InvalidationType _nInvalid ) const { - bool bAllowed( SwFlyFreeFrame::_InvalidationAllowed( _nInvalid ) ); + bool bAllowed( SwFlyFreeFrame::InvalidationAllowed( _nInvalid ) ); // forbiddance of base instance can't be over ruled. if ( bAllowed ) diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index b900bd08c9f6..5fcd3a269c95 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -174,7 +174,7 @@ void SwFlyInContentFrame::MakeObjPos() } } -void SwFlyInContentFrame::_ActionOnInvalidation( const InvalidationType _nInvalid ) +void SwFlyInContentFrame::ActionOnInvalidation( const InvalidationType _nInvalid ) { if ( INVALID_POS == _nInvalid || INVALID_ALL == _nInvalid ) AnchorFrame()->Prepare( PREP_FLY_ATTR_CHG, &GetFrameFormat() ); diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index c88e49cf205f..fd7b5c3e656d 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -273,7 +273,7 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize &rSz ) SwRect aClip, aTmpStretch; ::CalcClipRect( pObj, aClip ); ::CalcClipRect( pObj, aTmpStretch, false ); - aClip._Intersection( aTmpStretch ); + aClip.Intersection_( aTmpStretch ); const long nBot = Frame().Top() + Frame().Height(); const long nRig = Frame().Left() + Frame().Width(); diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 1a76edebd8fe..78bac369b68b 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -344,14 +344,14 @@ SwFrameNotify::~SwFrameNotify() { SwFlyFrame* pFlyFrame = static_cast<SwFlyFrame*>(pObj); if ( bNotifySize ) - pFlyFrame->_InvalidateSize(); + pFlyFrame->InvalidateSize_(); // #115759# - no invalidation of // position for as-character anchored objects. if ( !bAnchoredAsChar ) { - pFlyFrame->_InvalidatePos(); + pFlyFrame->InvalidatePos_(); } - pFlyFrame->_Invalidate(); + pFlyFrame->Invalidate_(); } else if ( dynamic_cast<const SwAnchoredDrawObject*>( pObj) != nullptr ) { @@ -572,7 +572,7 @@ SwLayNotify::~SwLayNotify() if( pLay->GetNext() ) { if ( pLay->GetNext()->IsLayoutFrame() ) - pLay->GetNext()->_InvalidatePos(); + pLay->GetNext()->InvalidatePos_(); else pLay->GetNext()->InvalidatePos(); } @@ -1219,7 +1219,7 @@ static void lcl_SetPos( SwFrame& _rNewFrame, _rNewFrame.Frame().Pos().Y() += 1; } -void _InsertCnt( SwLayoutFrame *pLay, SwDoc *pDoc, +void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc, sal_uLong nIndex, bool bPages, sal_uLong nEndIndex, SwFrame *pPrv ) { @@ -1289,7 +1289,7 @@ void _InsertCnt( SwLayoutFrame *pLay, SwDoc *pDoc, { pActualSection = new SwActualSection( nullptr, pSct, nullptr ); OSL_ENSURE( !pLay->Lower() || !pLay->Lower()->IsColumnFrame(), - "_InsertCnt: Wrong Call" ); + "InsertCnt_: Wrong Call" ); } } @@ -1752,7 +1752,7 @@ void MakeFrames( SwDoc *pDoc, const SwNodeIndex &rSttIdx, if( !bTmpOldLock ) pTmp->UnlockJoin(); } - ::_InsertCnt( pUpper, pDoc, rSttIdx.GetIndex(), + ::InsertCnt_( pUpper, pDoc, rSttIdx.GetIndex(), pFrame->IsInDocBody(), nEndIdx, pPrev ); } else @@ -1772,7 +1772,7 @@ void MakeFrames( SwDoc *pDoc, const SwNodeIndex &rSttIdx, else bSplit = false; - ::_InsertCnt( pUpper, pDoc, rSttIdx.GetIndex(), false, + ::InsertCnt_( pUpper, pDoc, rSttIdx.GetIndex(), false, nEndIdx, pPrv ); // OD 23.06.2003 #108784# - correction: append objects doesn't // depend on value of <bAllowMove> @@ -1788,7 +1788,7 @@ void MakeFrames( SwDoc *pDoc, const SwNodeIndex &rSttIdx, && pSct->GetNext()->IsSctFrame() ) pSct->MergeNext( static_cast<SwSectionFrame*>(pSct->GetNext()) ); if( pFrame->IsInFly() ) - pFrame->FindFlyFrame()->_Invalidate(); + pFrame->FindFlyFrame()->Invalidate_(); if( pFrame->IsInTab() ) pFrame->InvalidateSize(); } @@ -1875,13 +1875,13 @@ SwBorderAttrs::~SwBorderAttrs() * e.g. borders are painted over. */ -void SwBorderAttrs::_CalcTop() +void SwBorderAttrs::CalcTop_() { m_nTop = CalcTopLine() + m_rUL.GetUpper(); m_bTop = false; } -void SwBorderAttrs::_CalcBottom() +void SwBorderAttrs::CalcBottom_() { m_nBottom = CalcBottomLine() + m_rUL.GetLower(); m_bBottom = false; @@ -1985,7 +1985,7 @@ long SwBorderAttrs::CalcLeft( const SwFrame *pCaller ) const * considered here and not by the attribute (e.g. bBorderDist for cells). */ -void SwBorderAttrs::_CalcTopLine() +void SwBorderAttrs::CalcTopLine_() { m_nTopLine = (m_bBorderDist && !m_rBox.GetTop()) ? m_rBox.GetDistance (SvxBoxItemLine::TOP) @@ -1994,7 +1994,7 @@ void SwBorderAttrs::_CalcTopLine() m_bTopLine = false; } -void SwBorderAttrs::_CalcBottomLine() +void SwBorderAttrs::CalcBottomLine_() { m_nBottomLine = (m_bBorderDist && !m_rBox.GetBottom()) ? m_rBox.GetDistance (SvxBoxItemLine::BOTTOM) @@ -2003,7 +2003,7 @@ void SwBorderAttrs::_CalcBottomLine() m_bBottomLine = false; } -void SwBorderAttrs::_CalcLeftLine() +void SwBorderAttrs::CalcLeftLine_() { m_nLeftLine = (m_bBorderDist && !m_rBox.GetLeft()) ? m_rBox.GetDistance (SvxBoxItemLine::LEFT) @@ -2012,7 +2012,7 @@ void SwBorderAttrs::_CalcLeftLine() m_bLeftLine = false; } -void SwBorderAttrs::_CalcRightLine() +void SwBorderAttrs::CalcRightLine_() { m_nRightLine = (m_bBorderDist && !m_rBox.GetRight()) ? m_rBox.GetDistance (SvxBoxItemLine::RIGHT) @@ -2021,7 +2021,7 @@ void SwBorderAttrs::_CalcRightLine() m_bRightLine = false; } -void SwBorderAttrs::_IsLine() +void SwBorderAttrs::IsLine_() { m_bIsLine = m_rBox.GetTop() || m_rBox.GetBottom() || m_rBox.GetLeft()|| m_rBox.GetRight(); @@ -2058,7 +2058,7 @@ bool SwBorderAttrs::CmpLeftRight( const SwBorderAttrs &rCmpAttrs, CalcRight( pCaller ) == rCmpAttrs.CalcRight( pCmp ) ); } -bool SwBorderAttrs::_JoinWithCmp( const SwFrame& _rCallerFrame, +bool SwBorderAttrs::JoinWithCmp( const SwFrame& _rCallerFrame, const SwFrame& _rCmpFrame ) const { bool bReturnVal = false; @@ -2080,7 +2080,7 @@ bool SwBorderAttrs::_JoinWithCmp( const SwFrame& _rCallerFrame, // OD 21.05.2003 #108789# - method to determine, if borders are joined with // previous frame. Calculated value saved in cached value <m_bJoinedWithPrev> // OD 2004-02-26 #i25029# - add 2nd parameter <_pPrevFrame> -void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrame& _rFrame, +void SwBorderAttrs::CalcJoinedWithPrev( const SwFrame& _rFrame, const SwFrame* _pPrevFrame ) { // set default @@ -2103,7 +2103,7 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrame& _rFrame, pPrevFrame->GetAttrSet()->GetParaConnectBorder().GetValue() ) { - m_bJoinedWithPrev = _JoinWithCmp( _rFrame, *(pPrevFrame) ); + m_bJoinedWithPrev = JoinWithCmp( _rFrame, *(pPrevFrame) ); } } @@ -2115,7 +2115,7 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrame& _rFrame, // OD 21.05.2003 #108789# - method to determine, if borders are joined with // next frame. Calculated value saved in cached value <m_bJoinedWithNext> -void SwBorderAttrs::_CalcJoinedWithNext( const SwFrame& _rFrame ) +void SwBorderAttrs::CalcJoinedWithNext( const SwFrame& _rFrame ) { // set default m_bJoinedWithNext = false; @@ -2135,7 +2135,7 @@ void SwBorderAttrs::_CalcJoinedWithNext( const SwFrame& _rFrame ) _rFrame.GetAttrSet()->GetParaConnectBorder().GetValue() ) { - m_bJoinedWithNext = _JoinWithCmp( _rFrame, *(pNextFrame) ); + m_bJoinedWithNext = JoinWithCmp( _rFrame, *(pNextFrame) ); } } @@ -2152,7 +2152,7 @@ bool SwBorderAttrs::JoinedWithPrev( const SwFrame& _rFrame, if ( !m_bCachedJoinedWithPrev || _pPrevFrame ) { // OD 2004-02-26 #i25029# - pass <_pPrevFrame> as 2nd parameter - const_cast<SwBorderAttrs*>(this)->_CalcJoinedWithPrev( _rFrame, _pPrevFrame ); + const_cast<SwBorderAttrs*>(this)->CalcJoinedWithPrev( _rFrame, _pPrevFrame ); } return m_bJoinedWithPrev; @@ -2162,7 +2162,7 @@ bool SwBorderAttrs::JoinedWithNext( const SwFrame& _rFrame ) const { if ( !m_bCachedJoinedWithNext ) { - const_cast<SwBorderAttrs*>(this)->_CalcJoinedWithNext( _rFrame ); + const_cast<SwBorderAttrs*>(this)->CalcJoinedWithNext( _rFrame ); } return m_bJoinedWithNext; @@ -2170,7 +2170,7 @@ bool SwBorderAttrs::JoinedWithNext( const SwFrame& _rFrame ) const // OD 2004-02-26 #i25029# - added 2nd parameter <_pPrevFrame>, which is passed to // method <JoinedWithPrev> -void SwBorderAttrs::_GetTopLine( const SwFrame& _rFrame, +void SwBorderAttrs::GetTopLine_( const SwFrame& _rFrame, const SwFrame* _pPrevFrame ) { sal_uInt16 nRet = CalcTopLine(); @@ -2187,7 +2187,7 @@ void SwBorderAttrs::_GetTopLine( const SwFrame& _rFrame, m_nGetTopLine = nRet; } -void SwBorderAttrs::_GetBottomLine( const SwFrame& _rFrame ) +void SwBorderAttrs::GetBottomLine_( const SwFrame& _rFrame ) { sal_uInt16 nRet = CalcBottomLine(); @@ -2533,8 +2533,8 @@ static void lcl_AddObjsToPage( SwFrame* _pFrame, SwPageFrame* _pPage ) { _pPage->AppendFlyToPage( pFlyFrame ); } - pFlyFrame->_InvalidatePos(); - pFlyFrame->_InvalidateSize(); + pFlyFrame->InvalidatePos_(); + pFlyFrame->InvalidateSize_(); pFlyFrame->InvalidatePage( _pPage ); // #115759# - add also at-fly anchored objects @@ -2586,7 +2586,7 @@ void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling, b { pNxt = pSibling->mpNext; pSibling->mpNext = pSav; - pSibling->_InvalidatePrt(); + pSibling->InvalidatePrt_(); pSibling->InvalidatePage( pPage ); SwFlowFrame *pFlowFrame = dynamic_cast<SwFlowFrame*>(pSibling); if (pFlowFrame && pFlowFrame->GetFollow()) @@ -2613,7 +2613,7 @@ void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling, b do { pSav->mpUpper = pParent; nGrowVal += (pSav->Frame().*fnRect->fnGetHeight)(); - pSav->_InvalidateAll(); + pSav->InvalidateAll_(); // register Flys, if TextFrames than also invalidate appropriately if ( pSav->IsContentFrame() ) @@ -2882,7 +2882,7 @@ static void lcl_NotifyContent( const SdrObject *pThis, SwContentFrame *pCnt, // #i23129# - only invalidate, if the text frame // printing area overlaps with the given rectangle. else if ( aCntPrt.IsOver( rRect ) ) - pCnt->Prepare( eHint, static_cast<void*>(&aCntPrt._Intersection( rRect )) ); + pCnt->Prepare( eHint, static_cast<void*>(&aCntPrt.Intersection_( rRect )) ); if ( pCnt->GetDrawObjs() ) { const SwSortedObjs &rObjs = *pCnt->GetDrawObjs(); diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 05b993bd6141..698dff853ba6 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -379,8 +379,8 @@ SwTwips SwFootnoteContFrame::GrowFrame( SwTwips nDist, bool bTst, bool ) // growing happens upwards, so successors to not need to be invalidated if( nReal ) { - _InvalidateSize(); - _InvalidatePos(); + InvalidateSize_(); + InvalidatePos_(); InvalidatePage( pPage ); } } @@ -409,7 +409,7 @@ SwTwips SwFootnoteContFrame::ShrinkFrame( SwTwips nDiff, bool bTst, bool bInfo ) FindSctFrame()->InvalidateNextPos(); if ( !bTst && nRet ) { - _InvalidatePos(); + InvalidatePos_(); InvalidatePage( pPage ); } return nRet; @@ -438,16 +438,16 @@ void SwFootnoteFrame::InvalidateNxtFootnoteCnts( SwPageFrame *pPage ) if( pCnt ) { pCnt->InvalidatePage( pPage ); - pCnt->_InvalidatePrt(); + pCnt->InvalidatePrt_(); do - { pCnt->_InvalidatePos(); + { pCnt->InvalidatePos_(); if( pCnt->IsSctFrame() ) { SwFrame* pTmp = static_cast<SwSectionFrame*>(pCnt)->ContainsAny(); if( pTmp ) - pTmp->_InvalidatePos(); + pTmp->InvalidatePos_(); } - pCnt->GetUpper()->_InvalidateSize(); + pCnt->GetUpper()->InvalidateSize_(); pCnt = pCnt->FindNext(); } while ( pCnt && GetUpper()->IsAnLower( pCnt ) ); } @@ -524,7 +524,7 @@ void SwFootnoteFrame::Cut() // If the last footnote container was removed from a column // section without a Follow, then this section can be shrunk. if( pSect && !pSect->ToMaximize( false ) && !pSect->IsColLocked() ) - pSect->_InvalidateSize(); + pSect->InvalidateSize_(); } else { if ( Frame().Height() ) @@ -549,12 +549,12 @@ void SwFootnoteFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) SWRECTFN( this ) if( (Frame().*fnRect->fnGetWidth)()!=(pParent->Prt().*fnRect->fnGetWidth)() ) - _InvalidateSize(); - _InvalidatePos(); + InvalidateSize_(); + InvalidatePos_(); SwPageFrame *pPage = FindPageFrame(); InvalidatePage( pPage ); if ( GetNext() ) - GetNext()->_InvalidatePos(); + GetNext()->InvalidatePos_(); if( (Frame().*fnRect->fnGetHeight)() ) pParent->Grow( (Frame().*fnRect->fnGetHeight)() ); @@ -1540,7 +1540,7 @@ void SwFootnoteBossFrame::AppendFootnote( SwContentFrame *pRef, SwTextFootnote * SwFootnoteFrame *pNew = new SwFootnoteFrame( pDoc->GetDfltFrameFormat(), this, pRef, pAttr ); { SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 ); - ::_InsertCnt( pNew, pDoc, aIdx.GetIndex() ); + ::InsertCnt_( pNew, pDoc, aIdx.GetIndex() ); } // If the page was changed or newly created, // we need to place ourselves in the first column @@ -1739,7 +1739,7 @@ void SwFootnoteBossFrame::CollectFootnotes( const SwContentFrame* _pRef, { pRefBossFrame = this; } - _CollectFootnotes( _pRef, pFootnote, _rFootnoteArr, _bCollectOnlyPreviousFootnotes, pRefBossFrame ); + CollectFootnotes_( _pRef, pFootnote, _rFootnoteArr, _bCollectOnlyPreviousFootnotes, pRefBossFrame ); } inline void FootnoteInArr( SwFootnoteFrames& rFootnoteArr, SwFootnoteFrame* pFootnote ) @@ -1754,7 +1754,7 @@ inline void FootnoteInArr( SwFootnoteFrames& rFootnoteArr, SwFootnoteFrame* pFoo /// Note: if parameter <_bCollectOnlyPreviousFootnotes> is true, then parameter /// <_pRefFootnoteBossFrame> have to be referenced to an object. /// Adjust parameter names. -void SwFootnoteBossFrame::_CollectFootnotes( const SwContentFrame* _pRef, +void SwFootnoteBossFrame::CollectFootnotes_( const SwContentFrame* _pRef, SwFootnoteFrame* _pFootnote, SwFootnoteFrames& _rFootnoteArr, bool _bCollectOnlyPreviousFootnotes, @@ -1764,7 +1764,7 @@ void SwFootnoteBossFrame::_CollectFootnotes( const SwContentFrame* _pRef, // is set, in spite of the order, that only previous footnotes has to be // collected. OSL_ENSURE( !_bCollectOnlyPreviousFootnotes || _pRefFootnoteBossFrame, - "<SwFootnoteBossFrame::_CollectFootnotes(..)> - No reference footnote boss frame for collecting only previous footnotes set.\nCrash will be caused!" ); + "<SwFootnoteBossFrame::CollectFootnotes_(..)> - No reference footnote boss frame for collecting only previous footnotes set.\nCrash will be caused!" ); // Collect all footnotes referenced by pRef (attribute by attribute), combine them // (the content might be divided over multiple pages) and cut them. @@ -1833,7 +1833,7 @@ void SwFootnoteBossFrame::_CollectFootnotes( const SwContentFrame* _pRef, { SwFootnoteBossFrame* pBossOfFoundFootnote = _pFootnote->FindFootnoteBossFrame( true ); OSL_ENSURE( pBossOfFoundFootnote, - "<SwFootnoteBossFrame::_CollectFootnotes(..)> - footnote boss frame of found footnote frame missing.\nWrong layout!" ); + "<SwFootnoteBossFrame::CollectFootnotes_(..)> - footnote boss frame of found footnote frame missing.\nWrong layout!" ); if ( !pBossOfFoundFootnote || // don't crash, if no footnote boss is found. pBossOfFoundFootnote->IsBefore( _pRefFootnoteBossFrame ) ) @@ -1892,7 +1892,7 @@ void SwFootnoteBossFrame::_CollectFootnotes( const SwContentFrame* _pRef, while ( _pFootnote ); } -void SwFootnoteBossFrame::_MoveFootnotes( SwFootnoteFrames &rFootnoteArr, bool bCalc ) +void SwFootnoteBossFrame::MoveFootnotes_( SwFootnoteFrames &rFootnoteArr, bool bCalc ) { // All footnotes referenced by pRef need to be moved // to a new position (based on the new column/page) @@ -1961,7 +1961,7 @@ void SwFootnoteBossFrame::_MoveFootnotes( SwFootnoteFrames &rFootnoteArr, bool b while ( pCnt && pCnt->FindFootnoteFrame()->GetAttr() == pAttr ) { - pCnt->_InvalidatePos(); + pCnt->InvalidatePos_(); pCnt->Calc(getRootFrame()->GetCurrShell()->GetOut()); // #i49383# - format anchored objects if ( pCnt->IsTextFrame() && pCnt->IsValid() ) @@ -2041,7 +2041,7 @@ void SwFootnoteBossFrame::_MoveFootnotes( SwFootnoteFrames &rFootnoteArr, bool b while ( pCnt && pCnt->FindFootnoteFrame()->GetAttr() == pAttr ) { - pCnt->_InvalidatePos(); + pCnt->InvalidatePos_(); pCnt->Calc(getRootFrame()->GetCurrShell()->GetOut()); // #i49383# - format anchored objects if ( pCnt->IsTextFrame() && pCnt->IsValid() ) @@ -2099,10 +2099,10 @@ void SwFootnoteBossFrame::MoveFootnotes( const SwContentFrame *pSrc, SwContentFr if( pDestBoss ) // robust { SwFootnoteFrames aFootnoteArr; - SwFootnoteBossFrame::_CollectFootnotes( pDest, pFootnote, aFootnoteArr ); + SwFootnoteBossFrame::CollectFootnotes_( pDest, pFootnote, aFootnoteArr ); if ( !aFootnoteArr.empty() ) { - pDestBoss->_MoveFootnotes( aFootnoteArr, true ); + pDestBoss->MoveFootnotes_( aFootnoteArr, true ); SwPageFrame* pSrcPage = FindPageFrame(); SwPageFrame* pDestPage = pDestBoss->FindPageFrame(); // update FootnoteNum only at page change @@ -2164,8 +2164,8 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const SwTwips nDeadLine, const boo == nFootnotePos; if( bStart ) { - pCnt->_InvalidatePos(); - pCnt->_InvalidateSize(); + pCnt->InvalidatePos_(); + pCnt->InvalidateSize_(); pCnt->Prepare( PREP_ADJUST_FRM ); SwFootnoteFrame* pFootnoteFrame = pCnt->FindFootnoteFrame(); // #i49383# @@ -2208,7 +2208,7 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const SwTwips nDeadLine, const boo SwFrame* aFootnoteContFrame = pFootnoteFrame->GetUpper(); if ( (pFootnoteFrame->Frame().*fnRect->fnTopDist)((aFootnoteContFrame->*fnRect->fnGetPrtBottom)()) > 0 ) { - pFootnoteFrame->_InvalidatePos(); + pFootnoteFrame->InvalidatePos_(); } } if ( bLock ) @@ -2495,7 +2495,7 @@ SwTwips SwFootnoteBossFrame::GetVarSpace() const * @see Grow() * @see Shrink() */ -SwNeighbourAdjust SwFootnoteBossFrame::_NeighbourhoodAdjustment( const SwFrame* ) const +SwNeighbourAdjust SwFootnoteBossFrame::NeighbourhoodAdjustment_( const SwFrame* ) const { SwNeighbourAdjust nRet = SwNeighbourAdjust::OnlyAdjust; if( GetUpper() && !GetUpper()->IsPageBodyFrame() ) @@ -2611,10 +2611,10 @@ bool SwLayoutFrame::MoveLowerFootnotes( SwContentFrame *pStart, SwFootnoteBossFr if ( !aFootnoteArr.empty() || pFootnoteArr ) { if( !aFootnoteArr.empty() ) - pNewBoss->_MoveFootnotes( aFootnoteArr, true ); + pNewBoss->MoveFootnotes_( aFootnoteArr, true ); if( pFootnoteArr ) { - static_cast<SwFootnoteBossFrame*>(pNewChief)->_MoveFootnotes( *pFootnoteArr, true ); + static_cast<SwFootnoteBossFrame*>(pNewChief)->MoveFootnotes_( *pFootnoteArr, true ); delete pFootnoteArr; } bMoved = true; diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 0caa0f3242d1..f443036a77fe 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -108,7 +108,7 @@ SwHeadFootFrame::SwHeadFootFrame( SwFrameFormat * pFormat, SwFrame* pSib, SwFram bool bOld = bObjsDirect; bObjsDirect = true; sal_uLong nIndex = rCnt.GetContentIdx()->GetIndex(); - ::_InsertCnt( this, pFormat->GetDoc(), ++nIndex ); + ::InsertCnt_( this, pFormat->GetDoc(), ++nIndex ); bObjsDirect = bOld; } @@ -244,7 +244,7 @@ void SwHeadFootFrame::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) if ( pFrame && aOldFooterPrtPos != ( Frame().Pos() + Prt().Pos() ) ) { - pFrame->_InvalidatePos(); + pFrame->InvalidatePos_(); aOldFooterPrtPos = Frame().Pos() + Prt().Pos(); } int nLoopControl = 0; diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index ca16387f4202..9ead11e003bb 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -190,7 +190,7 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwContentFrame *p return bRetPaint; } -inline bool SwLayAction::_PaintContent( const SwContentFrame *pContent, +inline bool SwLayAction::PaintContent_( const SwContentFrame *pContent, const SwPageFrame *pPage, const SwRect &rRect ) { @@ -218,7 +218,7 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt, if ( pCnt->IsCompletePaint() || !pCnt->IsTextFrame() ) { SwRect aPaint( pCnt->PaintArea() ); - if ( !_PaintContent( pCnt, pPage, aPaint ) ) + if ( !PaintContent_( pCnt, pPage, aPaint ) ) pCnt->ResetCompletePaint(); } else @@ -235,11 +235,11 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt, if( nOldHeight > nNewHeight ) nOldBottom = (pCnt->*fnRect->fnGetPrtBottom)(); (aDrawRect.*fnRect->fnSetTop)( nOldBottom ); - _PaintContent( pCnt, pPage, aDrawRect ); + PaintContent_( pCnt, pPage, aDrawRect ); } // paint content area SwRect aPaintRect = static_cast<SwTextFrame*>(const_cast<SwContentFrame*>(pCnt))->Paint(); - _PaintContent( pCnt, pPage, aPaintRect ); + PaintContent_( pCnt, pPage, aPaintRect ); } if ( pCnt->IsRetouche() && !pCnt->GetNext() ) @@ -253,7 +253,7 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt, } SwRect aRect( pTmp->GetUpper()->PaintArea() ); (aRect.*fnRect->fnSetTop)( (pTmp->*fnRect->fnGetPrtBottom)() ); - if ( !_PaintContent( pCnt, pPage, aRect ) ) + if ( !PaintContent_( pCnt, pPage, aRect ) ) pCnt->ResetRetouche(); } } @@ -790,7 +790,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext) rLayoutAccess.GetLayouter()->EndLoopControl(); } -bool SwLayAction::_TurboAction( const SwContentFrame *pCnt ) +bool SwLayAction::TurboAction_( const SwContentFrame *pCnt ) { const SwPageFrame *pPage = nullptr; @@ -852,7 +852,7 @@ bool SwLayAction::TurboAction() if ( m_pRoot->GetTurbo() ) { - if ( !_TurboAction( m_pRoot->GetTurbo() ) ) + if ( !TurboAction_( m_pRoot->GetTurbo() ) ) { CheckIdleEnd(); bRet = false; @@ -1637,7 +1637,7 @@ bool SwLayAction::FormatContent( const SwPageFrame *pPage ) const bool bInValid = !pContent->IsValid() || pContent->IsCompletePaint(); const bool bOldPaint = IsPaint(); m_bPaint = bOldPaint && !(pTab && pTab == m_pOptTab); - _FormatContent( pContent, pPage ); + FormatContent_( pContent, pPage ); // #i26945# - reset <bPaint> before format objects m_bPaint = bOldPaint; @@ -1795,7 +1795,7 @@ bool SwLayAction::FormatContent( const SwPageFrame *pPage ) return !IsInterrupt() || mbFormatContentOnInterrupt; } -void SwLayAction::_FormatContent( const SwContentFrame *pContent, +void SwLayAction::FormatContent_( const SwContentFrame *pContent, const SwPageFrame *pPage ) { // We probably only ended up here because the Content holds DrawObjects. @@ -1827,14 +1827,14 @@ void SwLayAction::_FormatContent( const SwContentFrame *pContent, /// Returns true if all Contents of the Fly have been processed completely. /// Returns false if processing has been interrupted prematurely. -bool SwLayAction::_FormatFlyContent( const SwFlyFrame *pFly ) +bool SwLayAction::FormatFlyContent( const SwFlyFrame *pFly ) { const SwContentFrame *pContent = pFly->ContainsContent(); while ( pContent ) { // OD 2004-05-10 #i28701# - _FormatContent( pContent, pContent->FindPageFrame() ); + FormatContent_( pContent, pContent->FindPageFrame() ); // #i28701# - format floating screen objects // at content text frame @@ -1877,7 +1877,7 @@ bool SwLayAction::_FormatFlyContent( const SwFlyFrame *pFly ) return !(IsInterrupt() && !mbFormatContentOnInterrupt); } -bool SwLayIdle::_DoIdleJob( const SwContentFrame *pCnt, IdleJobType eJob ) +bool SwLayIdle::DoIdleJob_( const SwContentFrame *pCnt, IdleJobType eJob ) { OSL_ENSURE( pCnt->IsTextFrame(), "NoText neighbour of Text" ); // robust against misuse by e.g. #i52542# @@ -1920,7 +1920,7 @@ bool SwLayIdle::_DoIdleJob( const SwContentFrame *pCnt, IdleJobType eJob ) { case ONLINE_SPELLING : { - SwRect aRepaint( const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pCnt))->_AutoSpell( pContentNode, nTextPos ) ); + SwRect aRepaint( const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pCnt))->AutoSpell_( pContentNode, nTextPos ) ); // tdf#92036 PENDING should stop idle spell checking bPageValid = bPageValid && (SwTextNode::WrongState::TODO != pTextNode->GetWrongDirty()); if( !bPageValid ) @@ -1984,7 +1984,7 @@ bool SwLayIdle::_DoIdleJob( const SwContentFrame *pCnt, IdleJobType eJob ) { if ( pC->IsTextFrame() ) { - if ( _DoIdleJob( pC, eJob ) ) + if ( DoIdleJob_( pC, eJob ) ) return true; } pC = pC->GetNextContentFrame(); @@ -2043,7 +2043,7 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly ) const SwContentFrame *pCnt = pPage->ContainsContent(); while( pCnt && pPage->IsAnLower( pCnt ) ) { - if ( _DoIdleJob( pCnt, eJob ) ) + if ( DoIdleJob_( pCnt, eJob ) ) return true; pCnt = pCnt->GetNextContentFrame(); } @@ -2061,7 +2061,7 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly ) { if ( pC->IsTextFrame() ) { - if ( _DoIdleJob( pC, eJob ) ) + if ( DoIdleJob_( pC, eJob ) ) return true; } pC = pC->GetNextContentFrame(); diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index b5fa19ef6668..f7867dcc8141 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -457,7 +457,7 @@ SwActualSection::SwActualSection( SwActualSection *pUp, /** helper class, which utilizes the layout cache information * to distribute the document content to the right pages. - * It's used by the _InsertCnt(..)-function. + * It's used by the InsertCnt_(..)-function. * If there's no layout cache, the distibution to the pages is more * a guess, but a guess with statistical background. */ @@ -650,7 +650,7 @@ bool SwLayHelper::CheckInsertPage() return false; } -/** entry point for the _InsertCnt-function. +/** entry point for the InsertCnt_-function. * The document content index is checked either it is * in the layout cache either it's time to insert a page * cause the maximal estimation of content per page is reached. @@ -840,7 +840,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) SwPageFrame* pLastPage = rpPage; if( CheckInsertPage() ) { - _CheckFlyCache( pLastPage ); + CheckFlyCache_( pLastPage ); if( rpPrv && rpPrv->IsTextFrame() && !rpPrv->GetValidSizeFlag() ) rpPrv->Frame().Height( rpPrv->GetUpper()->Prt().Height() ); @@ -906,7 +906,7 @@ struct FlyCacheCompare * If there are text frames with default position, the fly cache * is checked, if these frames are stored in the cache. */ -void SwLayHelper::_CheckFlyCache( SwPageFrame* pPage ) +void SwLayHelper::CheckFlyCache_( SwPageFrame* pPage ) { if( !pImpl || !pPage ) return; diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index f3a56cef2ae1..546d49f62915 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -76,7 +76,7 @@ public: bool IsUseFlyCache() const { return bUseFlyCache; } }; -// Helps to create the sectionframes during the _InsertCnt-function +// Helps to create the sectionframes during the InsertCnt_-function // by controlling nested sections. class SwActualSection { @@ -94,7 +94,7 @@ public: SwActualSection *GetUpper() { return pUpper; } }; -// Helps during the _InsertCnt-function to create new pages. +// Helps during the InsertCnt_-function to create new pages. // If there's a layoutcache available, this information is used. class SwLayHelper { @@ -112,7 +112,7 @@ class SwLayHelper sal_uInt16 nIndex; // the index in the page break array size_t nFlyIdx; // the index in the fly cache array bool bFirst : 1; - void _CheckFlyCache( SwPageFrame* pPage ); + void CheckFlyCache_( SwPageFrame* pPage ); public: SwLayHelper( SwDoc *pD, SwFrame* &rpF, SwFrame* &rpP, SwPageFrame* &rpPg, SwLayoutFrame* &rpL, SwActualSection* &rpA, bool &rBrk, @@ -126,7 +126,7 @@ public: /// Look for fresh text frames at this (new) page and set them to the right /// position, if they are in the fly cache. void CheckFlyCache( SwPageFrame* pPage ) - { if( pImpl && nFlyIdx < pImpl->GetFlyCount() ) _CheckFlyCache( pPage ); } + { if( pImpl && nFlyIdx < pImpl->GetFlyCount() ) CheckFlyCache_( pPage ); } }; // Contains the data structures that are required to read and write a layout cache. diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 5e25c8840d8d..288496cafb62 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -133,7 +133,7 @@ void SwEndnoter::InsertEndnotes() SwFrame* pRef = pSect->FindLastContent( SwFindMode::MyLast ); SwFootnoteBossFrame *pBoss = pRef ? pRef->FindFootnoteBossFrame() : static_cast<SwFootnoteBossFrame*>(pSect->Lower()); - pBoss->_MoveFootnotes( *pEndArr ); + pBoss->MoveFootnotes_( *pEndArr ); delete pEndArr; pEndArr = nullptr; pSect = nullptr; @@ -224,7 +224,7 @@ SwLayouter::~SwLayouter() mpObjsTmpConsiderWrapInfl = nullptr; } -void SwLayouter::_CollectEndnotes( SwSectionFrame* pSect ) +void SwLayouter::CollectEndnotes_( SwSectionFrame* pSect ) { if( !mpEndnoter ) mpEndnoter = new SwEndnoter( this ); @@ -284,7 +284,7 @@ void SwLayouter::CollectEndnotes( SwDoc* pDoc, SwSectionFrame* pSect ) assert(pDoc && "No doc, no fun"); if( !pDoc->getIDocumentLayoutAccess().GetLayouter() ) pDoc->getIDocumentLayoutAccess().SetLayouter( new SwLayouter() ); - pDoc->getIDocumentLayoutAccess().GetLayouter()->_CollectEndnotes( pSect ); + pDoc->getIDocumentLayoutAccess().GetLayouter()->CollectEndnotes_( pSect ); } bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrame* pSect, SwFootnoteFrame* pFootnote ) diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index ce1fccbf3239..14708228e867 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -56,20 +56,20 @@ long SwDecrement( long nA, long nSub ) static SwRectFnCollection aHorizontal = { /* fnRectGet */ - &SwRect::_Top, - &SwRect::_Bottom, - &SwRect::_Left, - &SwRect::_Right, - &SwRect::_Width, - &SwRect::_Height, + &SwRect::Top_, + &SwRect::Bottom_, + &SwRect::Left_, + &SwRect::Rigth_, + &SwRect::Width_, + &SwRect::Height_, &SwRect::TopLeft, /* fnRectSet */ - &SwRect::_Top, - &SwRect::_Bottom, - &SwRect::_Left, - &SwRect::_Right, - &SwRect::_Width, - &SwRect::_Height, + &SwRect::Top_, + &SwRect::Bottom_, + &SwRect::Left_, + &SwRect::Rigth_, + &SwRect::Width_, + &SwRect::Height_, &SwRect::SubTop, &SwRect::AddBottom, @@ -107,20 +107,20 @@ static SwRectFnCollection aHorizontal = { static SwRectFnCollection aVertical = { /* fnRectGet */ - &SwRect::_Right, - &SwRect::_Left, - &SwRect::_Top, - &SwRect::_Bottom, - &SwRect::_Height, - &SwRect::_Width, + &SwRect::Rigth_, + &SwRect::Left_, + &SwRect::Top_, + &SwRect::Bottom_, + &SwRect::Height_, + &SwRect::Width_, &SwRect::TopRight, /* fnRectSet */ - &SwRect::_Right, - &SwRect::_Left, - &SwRect::_Top, - &SwRect::_Bottom, - &SwRect::_Height, - &SwRect::_Width, + &SwRect::Rigth_, + &SwRect::Left_, + &SwRect::Top_, + &SwRect::Bottom_, + &SwRect::Height_, + &SwRect::Width_, &SwRect::AddRight, &SwRect::SubLeft, @@ -158,20 +158,20 @@ static SwRectFnCollection aVertical = { static SwRectFnCollection aBottomToTop = { /* fnRectGet */ - &SwRect::_Bottom, - &SwRect::_Top, - &SwRect::_Left, - &SwRect::_Right, - &SwRect::_Width, - &SwRect::_Height, + &SwRect::Bottom_, + &SwRect::Top_, + &SwRect::Left_, + &SwRect::Rigth_, + &SwRect::Width_, + &SwRect::Height_, &SwRect::BottomLeft, /* fnRectSet */ - &SwRect::_Bottom, - &SwRect::_Top, - &SwRect::_Left, - &SwRect::_Right, - &SwRect::_Width, - &SwRect::_Height, + &SwRect::Bottom_, + &SwRect::Top_, + &SwRect::Left_, + &SwRect::Rigth_, + &SwRect::Width_, + &SwRect::Height_, &SwRect::AddBottom, &SwRect::SubTop, @@ -209,20 +209,20 @@ static SwRectFnCollection aBottomToTop = { static SwRectFnCollection aVerticalRightToLeft = { /* fnRectGet */ - &SwRect::_Left, - &SwRect::_Right, - &SwRect::_Top, - &SwRect::_Bottom, - &SwRect::_Height, - &SwRect::_Width, + &SwRect::Left_, + &SwRect::Rigth_, + &SwRect::Top_, + &SwRect::Bottom_, + &SwRect::Height_, + &SwRect::Width_, &SwRect::BottomRight, /* fnRectSet */ - &SwRect::_Left, - &SwRect::_Right, - &SwRect::_Top, - &SwRect::_Bottom, - &SwRect::_Height, - &SwRect::_Width, + &SwRect::Left_, + &SwRect::Rigth_, + &SwRect::Top_, + &SwRect::Bottom_, + &SwRect::Height_, + &SwRect::Width_, &SwRect::SubLeft, &SwRect::AddRight, @@ -260,20 +260,20 @@ static SwRectFnCollection aVerticalRightToLeft = { static SwRectFnCollection aVerticalLeftToRight = { /* fnRectGet */ - &SwRect::_Left, - &SwRect::_Right, - &SwRect::_Top, - &SwRect::_Bottom, - &SwRect::_Height, - &SwRect::_Width, + &SwRect::Left_, + &SwRect::Rigth_, + &SwRect::Top_, + &SwRect::Bottom_, + &SwRect::Height_, + &SwRect::Width_, &SwRect::TopLeft, /* fnRectSet */ - &SwRect::_Left, - &SwRect::_Right, - &SwRect::_Top, - &SwRect::_Bottom, - &SwRect::_Height, - &SwRect::_Width, + &SwRect::Left_, + &SwRect::Rigth_, + &SwRect::Top_, + &SwRect::Bottom_, + &SwRect::Height_, + &SwRect::Width_, &SwRect::SubLeft, &SwRect::AddRight, @@ -321,7 +321,7 @@ SwRectFn fnRectVL2R = &aVerticalRightToLeft; sal_uInt32 SwFrame::mnLastFrameId=0; -void _FrameInit() +void FrameInit() { SwRootFrame::s_pVout = new SwLayVout(); SwCache *pNew = new SwCache( 100 @@ -332,7 +332,7 @@ void _FrameInit() SwFrame::SetCache( pNew ); } -void _FrameFinit() +void FrameFinit() { #if OSL_DEBUG_LEVEL > 0 // The cache may only contain null pointers at this time. @@ -531,7 +531,7 @@ void SwRootFrame::Init( SwFrameFormat* pFormat ) pLay = static_cast<SwLayoutFrame*>(pLay->Lower()); SwNodeIndex aTmp( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode(), 1 ); - ::_InsertCnt( pLay, pDoc, aTmp.GetIndex(), true ); + ::InsertCnt_( pLay, pDoc, aTmp.GetIndex(), true ); //Remove masters that haven't been replaced yet from the list. RemoveMasterObjs( mpDrawPage ); if( rSettingAccess.get(DocumentSettingId::GLOBAL_DOCUMENT) ) diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index 8a202d600625..b434889070bc 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -229,7 +229,7 @@ bool SwObjectFormatter::FormatObj( SwAnchoredObject& _rAnchoredObj, return bSuccess; } -/** helper method for method <_FormatObj(..)> - performs the intrinsic format +/** helper method for method <FormatObj_(..)> - performs the intrinsic format of the layout of the given layout frame and all its lower layout frames. #i28701# @@ -238,7 +238,7 @@ bool SwObjectFormatter::FormatObj( SwAnchoredObject& _rAnchoredObj, <SwLayAction::FormatLayout(..)>. Thus, its code for the formatting have to be synchronised. */ -void SwObjectFormatter::_FormatLayout( SwLayoutFrame& _rLayoutFrame ) +void SwObjectFormatter::FormatLayout_( SwLayoutFrame& _rLayoutFrame ) { _rLayoutFrame.Calc(_rLayoutFrame.getRootFrame()->GetCurrShell()->GetOut()); @@ -247,18 +247,18 @@ void SwObjectFormatter::_FormatLayout( SwLayoutFrame& _rLayoutFrame ) { if ( pLowerFrame->IsLayoutFrame() ) { - _FormatLayout( *(static_cast<SwLayoutFrame*>(pLowerFrame)) ); + FormatLayout_( *(static_cast<SwLayoutFrame*>(pLowerFrame)) ); } pLowerFrame = pLowerFrame->GetNext(); } } -/** helper method for method <_FormatObj(..)> - performs the intrinsic +/** helper method for method <FormatObj_(..)> - performs the intrinsic format of the content of the given floating screen object. #i28701# */ -void SwObjectFormatter::_FormatObjContent( SwAnchoredObject& _rAnchoredObj ) +void SwObjectFormatter::FormatObjContent( SwAnchoredObject& _rAnchoredObj ) { if ( dynamic_cast<const SwFlyFrame*>( &_rAnchoredObj) == nullptr ) { @@ -296,7 +296,7 @@ void SwObjectFormatter::_FormatObjContent( SwAnchoredObject& _rAnchoredObj ) #i28701# */ -void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) +void SwObjectFormatter::FormatObj_( SwAnchoredObject& _rAnchoredObj ) { // check, if only as-character anchored object have to be formatted, and // check the anchor type @@ -338,7 +338,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) } else { - _FormatLayout( rFlyFrame ); + FormatLayout_( rFlyFrame ); } // --> #i34753# - prevent further positioning, if // to-page|to-fly anchored Writer fly frame is already clipped. @@ -353,7 +353,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) mpLayAction ); if ( mpLayAction ) { - mpLayAction->_FormatFlyContent( &rFlyFrame ); + mpLayAction->FormatFlyContent( &rFlyFrame ); // --> consider, if the layout action // has to be restarted due to a delete of a page frame. if ( mpLayAction->IsAgain() ) @@ -363,12 +363,12 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) } else { - _FormatObjContent( rFlyFrame ); + FormatObjContent( rFlyFrame ); } if ( ++nLoopControlRuns >= nLoopControlMax ) { - OSL_FAIL( "LoopControl in SwObjectFormatter::_FormatObj: Stage 3!!!" ); + OSL_FAIL( "LoopControl in SwObjectFormatter::FormatObj_: Stage 3!!!" ); rFlyFrame.ValidateThisAndAllLowers( 2 ); nLoopControlRuns = 0; } @@ -394,7 +394,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) Thus, the objects, whose anchor character is inside the follow text frame can be formatted. */ -bool SwObjectFormatter::_FormatObjsAtFrame( SwTextFrame* _pMasterTextFrame ) +bool SwObjectFormatter::FormatObjsAtFrame_( SwTextFrame* _pMasterTextFrame ) { // --> #i26945# SwFrame* pAnchorFrame( nullptr ); @@ -444,7 +444,7 @@ bool SwObjectFormatter::_FormatObjsAtFrame( SwTextFrame* _pMasterTextFrame ) // have to be checked. SwPageFrame* pPageFrameOfAnchor = pAnchoredObj->FindPageFrameOfAnchor(); OSL_ENSURE( pPageFrameOfAnchor, - "<SwObjectFormatter::_FormatObjsAtFrame()> - missing page frame." ); + "<SwObjectFormatter::FormatObjsAtFrame_()> - missing page frame." ); // --> #i26945# if ( pPageFrameOfAnchor && pPageFrameOfAnchor == &mrPageFrame ) { diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx index 76e6d1d9c64b..60507497a1f1 100644 --- a/sw/source/core/layout/objectformatterlayfrm.cxx +++ b/sw/source/core/layout/objectformatterlayfrm.cxx @@ -73,7 +73,7 @@ SwFrame& SwObjectFormatterLayFrame::GetAnchorFrame() bool SwObjectFormatterLayFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, const bool ) { - _FormatObj( _rAnchoredObj ); + FormatObj_( _rAnchoredObj ); // #124218# - consider that the layout action has to be // restarted due to a deleted page frame. @@ -84,7 +84,7 @@ bool SwObjectFormatterLayFrame::DoFormatObjs() { bool bSuccess( true ); - bSuccess = _FormatObjsAtFrame(); + bSuccess = FormatObjsAtFrame_(); if ( bSuccess && GetAnchorFrame().IsPageFrame() ) { @@ -92,7 +92,7 @@ bool SwObjectFormatterLayFrame::DoFormatObjs() // Thus, format also all anchored objects, which are registered at // this page frame, whose 'anchor' isn't on this page frame and whose // anchor frame is valid. - bSuccess = _AdditionalFormatObjsOnPage(); + bSuccess = AdditionalFormatObjsOnPage(); } return bSuccess; @@ -104,11 +104,11 @@ bool SwObjectFormatterLayFrame::DoFormatObjs() OD 2004-07-02 #i28701# */ -bool SwObjectFormatterLayFrame::_AdditionalFormatObjsOnPage() +bool SwObjectFormatterLayFrame::AdditionalFormatObjsOnPage() { if ( !GetAnchorFrame().IsPageFrame() ) { - OSL_FAIL( "<SwObjectFormatterLayFrame::_AdditionalFormatObjsOnPage()> - mis-usage of method, call only for anchor frames of type page frame" ); + OSL_FAIL( "<SwObjectFormatterLayFrame::AdditionalFormatObjsOnPage()> - mis-usage of method, call only for anchor frames of type page frame" ); return true; } @@ -146,7 +146,7 @@ bool SwObjectFormatterLayFrame::_AdditionalFormatObjsOnPage() // #i26945# - check, if the page frame of the // object's anchor frame isn't the given page frame OSL_ENSURE( pPageFrameOfAnchor, - "<SwObjectFormatterLayFrame::_AdditionalFormatObjsOnPage()> - missing page frame" ); + "<SwObjectFormatterLayFrame::AdditionalFormatObjsOnPage()> - missing page frame" ); if ( pPageFrameOfAnchor && // #i35911# pPageFrameOfAnchor->GetPhyPageNum() < rPageFrame.GetPhyPageNum() ) diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx index 4f0b54cb5a83..2a21278e65a4 100644 --- a/sw/source/core/layout/objectformatterlayfrm.hxx +++ b/sw/source/core/layout/objectformatterlayfrm.hxx @@ -44,7 +44,7 @@ class SwObjectFormatterLayFrame : public SwObjectFormatter @return boolean indicates, if format was successful */ - bool _AdditionalFormatObjsOnPage(); + bool AdditionalFormatObjsOnPage(); protected: diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 71b642d415ad..e49d700bf9f2 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -131,7 +131,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, { _rAnchoredObj.SetRestartLayoutProcess( false ); - _FormatObj( _rAnchoredObj ); + FormatObj_( _rAnchoredObj ); // consider, if the layout action has to be // restarted due to a delete of a page frame. if ( GetLayAction() && GetLayAction()->IsAgain() ) @@ -153,8 +153,8 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, if ( bRestart ) { bSuccess = false; - _InvalidatePrevObjs( _rAnchoredObj ); - _InvalidateFollowObjs( _rAnchoredObj ); + InvalidatePrevObjs( _rAnchoredObj ); + InvalidateFollowObjs( _rAnchoredObj ); } // format anchor text frame, if wrapping style influence of the object @@ -182,7 +182,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, // #i40141# - use new method - it also formats the // section the anchor frame is in. - _FormatAnchorFrameForCheckMoveFwd(); + FormatAnchorFrameForCheckMoveFwd(); // #i35911# if ( _rAnchoredObj.HasClearedEnvironment() ) @@ -210,8 +210,8 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, pAnchorPageFrame->GetPhyPageNum() ); mrAnchorTextFrame.InvalidatePos(); bSuccess = false; - _InvalidatePrevObjs( _rAnchoredObj ); - _InvalidateFollowObjs( _rAnchoredObj ); + InvalidatePrevObjs( _rAnchoredObj ); + InvalidateFollowObjs( _rAnchoredObj ); } else { @@ -263,11 +263,11 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, // If needed, invalidate previous objects anchored at same anchor // text frame. - _InvalidatePrevObjs( _rAnchoredObj ); + InvalidatePrevObjs( _rAnchoredObj ); // Invalidate object and following objects for the restart of the // layout process - _InvalidateFollowObjs( _rAnchoredObj ); + InvalidateFollowObjs( _rAnchoredObj ); } else { @@ -322,18 +322,18 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() // anchor text frame OSL_ENSURE( mpMasterAnchorTextFrame, "SwObjectFormatterTextFrame::DoFormatObjs() - missing 'master' anchor text frame" ); - bSuccess = _FormatObjsAtFrame( mpMasterAnchorTextFrame ); + bSuccess = FormatObjsAtFrame_( mpMasterAnchorTextFrame ); if ( bSuccess ) { // format of as-character anchored floating screen objects - no failure // excepted on the format of these objects. - bSuccess = _FormatObjsAtFrame(); + bSuccess = FormatObjsAtFrame_(); } } else { - bSuccess = _FormatObjsAtFrame(); + bSuccess = FormatObjsAtFrame_(); } // consider anchored objects, whose wrapping style influence are temporarly @@ -341,7 +341,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() if ( bSuccess && ( ConsiderWrapOnObjPos() || ( !mrAnchorTextFrame.IsFollow() && - _AtLeastOneObjIsTmpConsiderWrapInfluence() ) ) ) + AtLeastOneObjIsTmpConsiderWrapInfluence() ) ) ) { const bool bDoesAnchorHadPrev = ( mrAnchorTextFrame.GetIndPrev() != nullptr ); @@ -352,7 +352,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() // anchor frame for the following check for moved forward anchors // #i40141# - use new method - it also formats the // section the anchor frame is in. - _FormatAnchorFrameForCheckMoveFwd(); + FormatAnchorFrameForCheckMoveFwd(); sal_uInt32 nToPageNum( 0L ); // #i43913# @@ -360,7 +360,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() SwAnchoredObject* pObj = nullptr; if ( !mrAnchorTextFrame.IsFollow() ) { - pObj = _GetFirstObjWithMovedFwdAnchor( + pObj = GetFirstObjWithMovedFwdAnchor( // #i35017# - constant name has changed text::WrapInfluenceOnPosition::ONCE_CONCURRENT, nToPageNum, bInFollow ); @@ -394,8 +394,8 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() pAnchorPageFrame->GetPhyPageNum() ); mrAnchorTextFrame.InvalidatePos(); bSuccess = false; - _InvalidatePrevObjs( *pObj ); - _InvalidateFollowObjs( *pObj ); + InvalidatePrevObjs( *pObj ); + InvalidateFollowObjs( *pObj ); } else { @@ -432,11 +432,11 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() // If needed, invalidate previous objects anchored at same anchor // text frame. - _InvalidatePrevObjs( *pObj ); + InvalidatePrevObjs( *pObj ); // Invalidate object and following objects for the restart of the // layout process - _InvalidateFollowObjs( *pObj ); + InvalidateFollowObjs( *pObj ); } else { @@ -458,7 +458,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() return bSuccess; } -void SwObjectFormatterTextFrame::_InvalidatePrevObjs( SwAnchoredObject& _rAnchoredObj ) +void SwObjectFormatterTextFrame::InvalidatePrevObjs( SwAnchoredObject& _rAnchoredObj ) { // invalidate all previous objects, whose wrapping influence on the object // positioning is <NONE_CONCURRENT_POSITIONED>. @@ -491,7 +491,7 @@ void SwObjectFormatterTextFrame::_InvalidatePrevObjs( SwAnchoredObject& _rAnchor } } -void SwObjectFormatterTextFrame::_InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj ) +void SwObjectFormatterTextFrame::InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj ) { _rAnchoredObj.InvalidateObjPosForConsiderWrapInfluence(); @@ -507,7 +507,7 @@ void SwObjectFormatterTextFrame::_InvalidateFollowObjs( SwAnchoredObject& _rAnch } } -SwAnchoredObject* SwObjectFormatterTextFrame::_GetFirstObjWithMovedFwdAnchor( +SwAnchoredObject* SwObjectFormatterTextFrame::GetFirstObjWithMovedFwdAnchor( const sal_Int16 _nWrapInfluenceOnPosition, sal_uInt32& _noToPageNum, bool& _boInFollow ) @@ -515,7 +515,7 @@ SwAnchoredObject* SwObjectFormatterTextFrame::_GetFirstObjWithMovedFwdAnchor( // #i35017# - constant names have changed OSL_ENSURE( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE || _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_CONCURRENT, - "<SwObjectFormatterTextFrame::_GetFirstObjWithMovedFwdAnchor(..)> - invalid value for parameter <_nWrapInfluenceOnPosition>" ); + "<SwObjectFormatterTextFrame::GetFirstObjWithMovedFwdAnchor(..)> - invalid value for parameter <_nWrapInfluenceOnPosition>" ); SwAnchoredObject* pRetAnchoredObj = nullptr; @@ -632,7 +632,7 @@ bool SwObjectFormatterTextFrame::CheckMovedFwdCondition( } // #i40140# - helper method to format layout frames used by -// method <SwObjectFormatterTextFrame::_FormatAnchorFrameForCheckMoveFwd()> +// method <SwObjectFormatterTextFrame::FormatAnchorFrameForCheckMoveFwd()> // #i44049# - format till a certain lower frame, if provided. static void lcl_FormatContentOfLayoutFrame( SwLayoutFrame* pLayFrame, SwFrame* pLastLowerFrame = nullptr ) @@ -754,7 +754,7 @@ void SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs( SwTextFrame& _rAn #i40141# */ -void SwObjectFormatterTextFrame::_FormatAnchorFrameForCheckMoveFwd() +void SwObjectFormatterTextFrame::FormatAnchorFrameForCheckMoveFwd() { SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs( mrAnchorTextFrame ); } @@ -762,7 +762,7 @@ void SwObjectFormatterTextFrame::_FormatAnchorFrameForCheckMoveFwd() /** method to determine if at least one anchored object has state <temporarly consider wrapping style influence> set. */ -bool SwObjectFormatterTextFrame::_AtLeastOneObjIsTmpConsiderWrapInfluence() +bool SwObjectFormatterTextFrame::AtLeastOneObjIsTmpConsiderWrapInfluence() { bool bRet( false ); diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx index 6932457f286e..fd9d8a7fa042 100644 --- a/sw/source/core/layout/objectformattertxtfrm.hxx +++ b/sw/source/core/layout/objectformattertxtfrm.hxx @@ -48,7 +48,7 @@ class SwObjectFormatterTextFrame : public SwObjectFormatter reference to anchored object - objects, anchored previous to this one will be invalidated. */ - void _InvalidatePrevObjs( SwAnchoredObject& _rAnchoredObj ); + void InvalidatePrevObjs( SwAnchoredObject& _rAnchoredObj ); /** method to invalidate objects, anchored after the given object at the page frame @@ -57,7 +57,7 @@ class SwObjectFormatterTextFrame : public SwObjectFormatter reference to anchored object - objects, anchored after this one will be invalidated. */ - void _InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj ); + void InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj ); /** method to determine first anchored object, whose 'anchor is moved forward'. @@ -93,7 +93,7 @@ class SwObjectFormatterTextFrame : public SwObjectFormatter anchored object with a 'moved forward anchor'. If NULL, no such anchored object is found. */ - SwAnchoredObject* _GetFirstObjWithMovedFwdAnchor( + SwAnchoredObject* GetFirstObjWithMovedFwdAnchor( const sal_Int16 _nWrapInfluenceOnPosition, sal_uInt32& _noToPageNum, bool& _boInFollow ); @@ -102,12 +102,12 @@ class SwObjectFormatterTextFrame : public SwObjectFormatter #i40141# */ - void _FormatAnchorFrameForCheckMoveFwd(); + void FormatAnchorFrameForCheckMoveFwd(); /** method to determine if at least one anchored object has state <temporarly consider wrapping style influence> set. */ - bool _AtLeastOneObjIsTmpConsiderWrapInfluence(); + bool AtLeastOneObjIsTmpConsiderWrapInfluence(); protected: diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index eedaf7c78453..2ef76fc9a4a4 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -203,7 +203,7 @@ SwPageFrame::SwPageFrame( SwFrameFormat *pFormat, SwFrame* pSib, SwPageDesc *pPg pBodyFrame->InvalidatePos(); if ( bBrowseMode ) - _InvalidateSize(); + InvalidateSize_(); // insert header/footer,, but only if active. if ( pFormat->GetHeader().IsActive() ) @@ -502,7 +502,7 @@ void SwPageFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwAttrSetChg aNewSet( *static_cast<const SwAttrSetChg*>(pNew) ); while( true ) { - _UpdateAttr( aOIter.GetCurItem(), + UpdateAttr_( aOIter.GetCurItem(), aNIter.GetCurItem(), nInvFlags, &aOldSet, &aNewSet ); if( aNIter.IsAtEnd() ) @@ -514,13 +514,13 @@ void SwPageFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwLayoutFrame::Modify( &aOldSet, &aNewSet ); } else - _UpdateAttr( pOld, pNew, nInvFlags ); + UpdateAttr_( pOld, pNew, nInvFlags ); if ( nInvFlags != 0 ) { InvalidatePage( this ); if ( nInvFlags & 0x01 ) - _InvalidatePrt(); + InvalidatePrt_(); if ( nInvFlags & 0x02 ) SetCompletePaint(); if ( nInvFlags & 0x04 && GetNext() ) @@ -552,7 +552,7 @@ void SwPageFrame::SwClientNotify(const SwModify& rModify, const SfxHint& rHint) SwClient::SwClientNotify(rModify, rHint); } -void SwPageFrame::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, +void SwPageFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { @@ -824,7 +824,7 @@ void SwPageFrame::Cut() { MoveFly( pFly, pAnchPage ); pFly->InvalidateSize(); - pFly->_InvalidatePos(); + pFly->InvalidatePos_(); // Do not increment index, in this case continue; } @@ -884,7 +884,7 @@ void SwPageFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) while ( pPg ) { pPg->IncrPhyPageNum(); //inline ++nPhyPageNum - pPg->_InvalidatePos(); + pPg->InvalidatePos_(); pPg->InvalidateLayout(); pPg = static_cast<SwPageFrame*>(pPg->GetNext()); } @@ -893,7 +893,7 @@ void SwPageFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) ::SetLastPage( this ); if( Frame().Width() != pParent->Prt().Width() ) - _InvalidateSize(); + InvalidateSize_(); InvalidatePos(); @@ -1074,7 +1074,7 @@ void SwFrame::CheckPageDescs( SwPageFrame *pStart, bool bNotifyFields, SwPageFra // Let's hope that invalidation is enough. SwFootnoteContFrame *pCont = pPage->FindFootnoteCont(); if ( pCont && !(pOld->GetFootnoteInfo() == pDesc->GetFootnoteInfo()) ) - pCont->_InvalidateAll(); + pCont->InvalidateAll_(); } } else if ( pFormatWish && pPage->GetFormat() != pFormatWish ) //5. @@ -1514,7 +1514,7 @@ void SwRootFrame::AssertPageFlys( SwPageFrame *pPage ) Size SwRootFrame::ChgSize( const Size& aNewSize ) { Frame().SSize() = aNewSize; - _InvalidatePrt(); + InvalidatePrt_(); mbFixSize = false; return Frame().SSize(); } @@ -2201,7 +2201,7 @@ void SwRootFrame::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* p maPagesArea.Pos( Frame().Pos() ); maPagesArea.SSize( aNewSize ); if ( TWIPS_MAX != nMinPageLeft ) - maPagesArea._Left( nMinPageLeft ); + maPagesArea.Left_( nMinPageLeft ); SetCallbackActionEnabled( bOldCallbackActionEnabled ); } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 4f856fb11545..b7e89b472ea5 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2703,21 +2703,21 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons // borders match the subsidiary lines of the upper: if (aStart.X() == aUpper.Left()) aPaintStart.X() = aUpperAligned.Left(); - else if (aStart.X() == aUpper._Right()) - aPaintStart.X() = aUpperAligned._Right(); + else if (aStart.X() == aUpper.Rigth_()) + aPaintStart.X() = aUpperAligned.Rigth_(); if (aStart.Y() == aUpper.Top()) aPaintStart.Y() = aUpperAligned.Top(); - else if (aStart.Y() == aUpper._Bottom()) - aPaintStart.Y() = aUpperAligned._Bottom(); + else if (aStart.Y() == aUpper.Bottom_()) + aPaintStart.Y() = aUpperAligned.Bottom_(); if (aEnd.X() == aUpper.Left()) aPaintEnd.X() = aUpperAligned.Left(); - else if (aEnd.X() == aUpper._Right()) - aPaintEnd.X() = aUpperAligned._Right(); + else if (aEnd.X() == aUpper.Rigth_()) + aPaintEnd.X() = aUpperAligned.Rigth_(); if (aEnd.Y() == aUpper.Top()) aPaintEnd.Y() = aUpperAligned.Top(); - else if (aEnd.Y() == aUpper._Bottom()) - aPaintEnd.Y() = aUpperAligned._Bottom(); + else if (aEnd.Y() == aUpper.Bottom_()) + aPaintEnd.Y() = aUpperAligned.Bottom_(); } // logically vertical lines are painted centered on the line, @@ -3007,10 +3007,10 @@ void SwTabFramePainter::Insert( const SwFrame& rFrame, const SvxBoxItem& rBoxIte aR.MirrorSelf(); aB.MirrorSelf(); - const SwTwips nLeft = aBorderRect._Left(); - const SwTwips nRight = aBorderRect._Right(); - const SwTwips nTop = aBorderRect._Top(); - const SwTwips nBottom = aBorderRect._Bottom(); + const SwTwips nLeft = aBorderRect.Left_(); + const SwTwips nRight = aBorderRect.Rigth_(); + const SwTwips nTop = aBorderRect.Top_(); + const SwTwips nBottom = aBorderRect.Bottom_(); aL.SetRefMode( svx::frame::REFMODE_CENTERED ); aR.SetRefMode( svx::frame::REFMODE_CENTERED ); @@ -3315,7 +3315,7 @@ void SwRootFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, } gProp.pBLines = new BorderLines; - aPaintRect._Intersection( aRect ); + aPaintRect.Intersection_( aRect ); if ( bExtraData && pSh->GetWin() && pSh->IsInEndAction() ) @@ -3327,7 +3327,7 @@ void SwRootFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, (aPageRectTemp.*fnRect->fnSetLeftAndWidth)( (pPage->Frame().*fnRect->fnGetLeft)(), (pPage->Frame().*fnRect->fnGetWidth)() ); - aPageRectTemp._Intersection( pSh->VisArea() ); + aPageRectTemp.Intersection_( pSh->VisArea() ); vcl::Region aPageRectRegion( aPageRectTemp.SVRect() ); aPageRectRegion.Exclude( aPaintRect.SVRect() ); pSh->GetWin()->Invalidate( aPageRectRegion, InvalidateFlags::Children ); @@ -3469,7 +3469,7 @@ void SwRootFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPageFrame::GetBorderAndShadowBoundRect( aEmptyPageRect, pSh, &rRenderContext, aPaintRect, bPaintLeftShadow, bPaintRightShadow, bRightSidebar ); - aPaintRect._Intersection( aRect ); + aPaintRect.Intersection_( aRect ); if ( aRect.IsOver( aEmptyPageRect ) ) { @@ -3676,7 +3676,7 @@ void SwLayoutFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec } } pFrame->ResetCompletePaint(); - aPaintRect._Intersection( rRect ); + aPaintRect.Intersection_( rRect ); pFrame->Paint( rRenderContext, aPaintRect ); @@ -4143,7 +4143,7 @@ void SwFlyFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, BorderLinesGuard blg; // this should not paint borders added from PaintBaBo SwRect aRect( rRect ); - aRect._Intersection( Frame() ); + aRect.Intersection_( Frame() ); rRenderContext.Push( PushFlags::CLIPREGION ); rRenderContext.SetClipRegion(); @@ -4235,7 +4235,7 @@ void SwFlyFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwBorderAttrAccess aAccess( SwFrame::GetCache(), pParentFlyFrame ); const SwBorderAttrs &rAttrs = *aAccess.Get(); SwRect aPaintRect( aRect ); - aPaintRect._Intersection( pParentFlyFrame->Frame() ); + aPaintRect.Intersection_( pParentFlyFrame->Frame() ); pParentFlyFrame->PaintBackground( aPaintRect, pPage, rAttrs ); gProp.pSRetoucheFly2 = pOldRet; @@ -4619,7 +4619,7 @@ static void lcl_PaintShadow( const SwRect& rRect, SwRect& rOutRect, aOut = rOut; if ( rRect.IsOver( aOut ) && aOut.Height() > 0 && aOut.Width() > 0 ) { - aOut._Intersection( rRect ); + aOut.Intersection_( rRect ); pOut->DrawRect( aOut.SVRect() ); } } @@ -4682,7 +4682,7 @@ void SwFrame::PaintBorderLine( const SwRect& rRect, return; SwRect aOut( rOutRect ); - aOut._Intersection( rRect ); + aOut.Intersection_( rRect ); const SwTabFrame *pTab = IsCellFrame() ? FindTabFrame() : nullptr; sal_uInt8 nSubCol = ( IsCellFrame() || IsRowFrame() ) ? SUBCOL_TAB : @@ -5987,7 +5987,7 @@ void SwPageFrame::PaintMarginArea( const SwRect& _rOutputRect, { //UUUU Simplified paint with DrawingLayer FillStyle SwRect aPgRect = Frame(); - aPgRect._Intersection( _rOutputRect ); + aPgRect.Intersection_( _rOutputRect ); if(!aPgRect.IsEmpty()) { @@ -6687,7 +6687,7 @@ void SwFrame::PaintBackground( const SwRect &rRect, const SwPageFrame *pPage, { SwRect aFrameRect; SwRect aRect( PaintArea() ); - aRect._Intersection( rRect ); + aRect.Intersection_( rRect ); SwRect aBorderRect( aRect ); SwShortCut aShortCut( *pFrame, aBorderRect ); do @@ -7146,7 +7146,7 @@ void SwLayoutFrame::PaintSubsidiaryLines( const SwPageFrame *pPage, return; SwRect aOut( aOriginal ); - aOut._Intersection( rRect ); + aOut.Intersection_( rRect ); const SwTwips nRight = aOut.Right(); const SwTwips nBottom= aOut.Bottom(); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 26f76bee4892..c24282ca5706 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -177,7 +177,7 @@ void SwSectionFrame::DelEmpty( bool bRemove ) dynamic_cast<SwTextFrame*>(FindPrevCnt()) ); } } - _Cut( bRemove ); + Cut_( bRemove ); } SwSectionFrame *pMaster = IsFollow() ? FindMaster() : nullptr; if (pMaster) @@ -211,10 +211,10 @@ void SwSectionFrame::DelEmpty( bool bRemove ) void SwSectionFrame::Cut() { - _Cut( true ); + Cut_( true ); } -void SwSectionFrame::_Cut( bool bRemove ) +void SwSectionFrame::Cut_( bool bRemove ) { OSL_ENSURE( GetUpper(), "Cut ohne Upper()." ); @@ -229,8 +229,8 @@ void SwSectionFrame::_Cut( bool bRemove ) if( pFrame ) { // The former successor might have calculated a gap to the predecessor // which is now obsolete since he becomes the first - pFrame->_InvalidatePrt(); - pFrame->_InvalidatePos(); + pFrame->InvalidatePrt_(); + pFrame->InvalidatePos_(); if( pFrame->IsSctFrame() ) pFrame = static_cast<SwSectionFrame*>(pFrame)->ContainsAny(); if ( pFrame && pFrame->IsContentFrame() ) @@ -349,7 +349,7 @@ void SwSectionFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) pSect->SetFollow( static_cast<SwSectionFrame*>(pParent)->GetFollow() ); static_cast<SwSectionFrame*>(pParent)->SetFollow( nullptr ); if( pSect->GetFollow() ) - pParent->_InvalidateSize(); + pParent->InvalidateSize_(); const bool bInserted = InsertGroupBefore( pParent, pSibling, pSect ); if (bInserted) @@ -366,14 +366,14 @@ void SwSectionFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) else InsertGroupBefore( pParent, pSibling, nullptr ); - _InvalidateAll(); + InvalidateAll_(); SwPageFrame *pPage = FindPageFrame(); InvalidatePage( pPage ); if ( pSibling ) { - pSibling->_InvalidatePos(); - pSibling->_InvalidatePrt(); + pSibling->InvalidatePos_(); + pSibling->InvalidatePrt_(); if ( pSibling->IsContentFrame() ) pSibling->InvalidatePage( pPage ); } @@ -495,7 +495,7 @@ bool SwSectionFrame::SplitSect( SwFrame* pFrame, bool bApres ) pLay = static_cast<SwLayoutFrame*>(pLay->Lower()); ::RestoreContent( pSav, pLay, nullptr, true ); } - _InvalidateSize(); + InvalidateSize_(); if( HasFollow() ) { pNew->SetFollow( GetFollow() ); @@ -522,9 +522,9 @@ static void lcl_InvalidateInfFlags( SwFrame* pFrame, bool bInva ) pFrame->InvalidateInfFlags(); if( bInva ) { - pFrame->_InvalidatePos(); - pFrame->_InvalidateSize(); - pFrame->_InvalidatePrt(); + pFrame->InvalidatePos_(); + pFrame->InvalidateSize_(); + pFrame->InvalidatePrt_(); } if( pFrame->IsLayoutFrame() ) lcl_InvalidateInfFlags( static_cast<SwLayoutFrame*>(pFrame)->GetLower(), false ); @@ -760,7 +760,7 @@ bool SwSectionFrame::ShouldBwdMoved( SwLayoutFrame *, bool , bool & ) return false; } -const SwSectionFormat* SwSectionFrame::_GetEndSectFormat() const +const SwSectionFormat* SwSectionFrame::GetEndSectFormat_() const { const SwSectionFormat *pFormat = m_pSection->GetFormat(); while( !pFormat->GetEndAtTextEnd().IsAtEnd() ) @@ -920,9 +920,9 @@ static void lcl_ColumnRefresh( SwSectionFrame* pSect, bool bFollow ) { SwColumnFrame *pCol = static_cast<SwColumnFrame*>(pSect->Lower()); do - { pCol->_InvalidateSize(); - pCol->_InvalidatePos(); - static_cast<SwLayoutFrame*>(pCol)->Lower()->_InvalidateSize(); + { pCol->InvalidateSize_(); + pCol->InvalidatePos_(); + static_cast<SwLayoutFrame*>(pCol)->Lower()->InvalidateSize_(); pCol->Calc(pRenderContext); // calculation of column and static_cast<SwLayoutFrame*>(pCol)->Lower()->Calc(pRenderContext); // body pCol = static_cast<SwColumnFrame*>(pCol->GetNext()); @@ -965,7 +965,7 @@ void SwSectionFrame::CollectEndnotes( SwLayouter* pLayouter ) |* |* @note: perform calculation of content, only if height has changed (OD 18.09.2002 #100522#) |*/ -void SwSectionFrame::_CheckClipping( bool bGrow, bool bMaximize ) +void SwSectionFrame::CheckClipping( bool bGrow, bool bMaximize ) { SWRECTFN( this ) long nDiff; @@ -1242,7 +1242,7 @@ void SwSectionFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderA mbValidSize = false; SwFrame* pOwn = ContainsAny(); if( pOwn ) - pOwn->_InvalidatePos(); + pOwn->InvalidatePos_(); } (this->*fnRect->fnSetYMargins)( nUpper, 0 ); } @@ -1276,8 +1276,8 @@ void SwSectionFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderA aExtraFormatToPosObjs.FormatSectionToPositionObjs(); } - // Column widths have to be adjusted before calling _CheckClipping. - // _CheckClipping can cause the formatting of the lower frames + // Column widths have to be adjusted before calling CheckClipping. + // CheckClipping can cause the formatting of the lower frames // which still have a width of 0. const bool bHasColumns = Lower() && Lower()->IsColumnFrame(); if ( bHasColumns && Lower()->GetNext() ) @@ -1295,9 +1295,9 @@ void SwSectionFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderA // OD 15.10.2002 #103517# - allow grow in online layout // Thus, set <..IsBrowseMode()> as parameter <bGrow> on calling - // method <_CheckClipping(..)>. + // method <CheckClipping(..)>. const SwViewShell *pSh = getRootFrame()->GetCurrShell(); - _CheckClipping( pSh && pSh->GetViewOptions()->getBrowseMode(), bMaximize ); + CheckClipping( pSh && pSh->GetViewOptions()->getBrowseMode(), bMaximize ); bMaximize = ToMaximize( false ); mbValidSize = true; } @@ -1388,8 +1388,8 @@ void SwSectionFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderA pFrame = m_pLower; if( pFrame->IsColumnFrame() ) { - pFrame->_InvalidateSize(); - pFrame->_InvalidatePos(); + pFrame->InvalidateSize_(); + pFrame->InvalidatePos_(); pFrame->Calc(pRenderContext); pFrame = static_cast<SwColumnFrame*>(pFrame)->Lower(); pFrame->Calc(pRenderContext); @@ -1415,7 +1415,7 @@ void SwSectionFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderA // Do not exceed the lower edge of the Upper. // Do not extend below the lower edge with Sections with Follows if ( GetUpper() ) - _CheckClipping( true, bMaximize ); + CheckClipping( true, bMaximize ); if( !bOldLock ) ColUnlock(); long nDiff = nOldHeight - (Frame().*fnRect->fnGetHeight)(); @@ -1871,7 +1871,7 @@ bool SwSectionFrame::Growable() const return ( GetUpper() && const_cast<SwFrame*>(static_cast<SwFrame const *>(GetUpper()))->Grow( LONG_MAX, true ) ); } -SwTwips SwSectionFrame::_Grow( SwTwips nDist, bool bTst ) +SwTwips SwSectionFrame::Grow_( SwTwips nDist, bool bTst ) { if ( !IsColLocked() && !HasFixSize() ) { @@ -1915,7 +1915,7 @@ SwTwips SwSectionFrame::_Grow( SwTwips nDist, bool bTst ) if( nDist && !bTst ) { if( bInCalcContent ) - _InvalidateSize(); + InvalidateSize_(); else InvalidateSize(); } @@ -1923,7 +1923,7 @@ SwTwips SwSectionFrame::_Grow( SwTwips nDist, bool bTst ) else if( !bTst ) { if( bInCalcContent ) - _InvalidateSize(); + InvalidateSize_(); else if( nSpace < nGrow && nDist != nSpace + GetUpper()-> Grow( nGrow - nSpace ) ) InvalidateSize(); @@ -1948,10 +1948,10 @@ SwTwips SwSectionFrame::_Grow( SwTwips nDist, bool bTst ) SwFrame* pTmp = Lower(); do { - pTmp->_InvalidateSize(); + pTmp->InvalidateSize_(); pTmp = pTmp->GetNext(); } while ( pTmp ); - _InvalidateSize(); + InvalidateSize_(); } if( GetNext() ) { @@ -1961,7 +1961,7 @@ SwTwips SwSectionFrame::_Grow( SwTwips nDist, bool bTst ) if( pFrame ) { if( bInCalcContent ) - pFrame->_InvalidatePos(); + pFrame->InvalidatePos_(); else pFrame->InvalidatePos(); } @@ -1981,7 +1981,7 @@ SwTwips SwSectionFrame::_Grow( SwTwips nDist, bool bTst ) if ( !bTst ) { if( bInCalcContent ) - _InvalidateSize(); + InvalidateSize_(); else InvalidateSize(); } @@ -1989,7 +1989,7 @@ SwTwips SwSectionFrame::_Grow( SwTwips nDist, bool bTst ) return 0L; } -SwTwips SwSectionFrame::_Shrink( SwTwips nDist, bool bTst ) +SwTwips SwSectionFrame::Shrink_( SwTwips nDist, bool bTst ) { if ( Lower() && !IsColLocked() && !HasFixSize() ) { @@ -2048,7 +2048,7 @@ SwTwips SwSectionFrame::_Shrink( SwTwips nDist, bool bTst ) SwFrame* pTmp = Lower(); do { - pTmp->_InvalidateSize(); + pTmp->InvalidateSize_(); pTmp = pTmp->GetNext(); } while ( pTmp ); } @@ -2144,7 +2144,7 @@ bool SwSectionFrame::MoveAllowed( const SwFrame* pFrame) const Note: For a frame inside a table frame, which is inside a section frame, NULL is returned. */ -SwFrame* SwFrame::_GetIndPrev() const +SwFrame* SwFrame::GetIndPrev_() const { SwFrame *pRet = nullptr; // #i79774# @@ -2181,7 +2181,7 @@ SwFrame* SwFrame::_GetIndPrev() const return pRet; } -SwFrame* SwFrame::_GetIndNext() +SwFrame* SwFrame::GetIndNext_() { OSL_ENSURE( !mpNext && IsInSct(), "Why?" ); SwFrame* pSct = GetUpper(); @@ -2276,7 +2276,7 @@ void SwSectionFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwAttrSetChg aNewSet( *static_cast<const SwAttrSetChg*>(pNew) ); while( true ) { - _UpdateAttr( aOIter.GetCurItem(), + UpdateAttr_( aOIter.GetCurItem(), aNIter.GetCurItem(), nInvFlags, &aOldSet, &aNewSet ); if( aNIter.IsAtEnd() ) @@ -2288,7 +2288,7 @@ void SwSectionFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwLayoutFrame::Modify( &aOldSet, &aNewSet ); } else - _UpdateAttr( pOld, pNew, nInvFlags ); + UpdateAttr_( pOld, pNew, nInvFlags ); if ( nInvFlags != 0 ) { @@ -2311,7 +2311,7 @@ void SwSectionFrame::SwClientNotify( const SwModify& rMod, const SfxHint& rHint } } -void SwSectionFrame::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, +void SwSectionFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { @@ -2494,7 +2494,7 @@ void SwSectionFrame::InvalidateFootnotePos() { SwFrame *pTmp = pCont->ContainsContent(); if( pTmp ) - pTmp->_InvalidatePos(); + pTmp->InvalidatePos_(); } } @@ -2559,7 +2559,7 @@ void SwRootFrame::InsertEmptySct( SwSectionFrame* pDel ) mpDestroy->insert( pDel ); } -void SwRootFrame::_DeleteEmptySct() +void SwRootFrame::DeleteEmptySct_() { assert(mpDestroy && "Keine Liste, keine Kekse"); while( !mpDestroy->empty() ) @@ -2591,7 +2591,7 @@ void SwRootFrame::_DeleteEmptySct() } } -void SwRootFrame::_RemoveFromList( SwSectionFrame* pSct ) +void SwRootFrame::RemoveFromList_( SwSectionFrame* pSct ) { assert(mpDestroy && "Where's my list?"); mpDestroy->erase( pSct ); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index adf1feeda314..9e57affa15fe 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -883,7 +883,7 @@ bool SwTabFrame::RemoveFollowFlowLine() pRow->RemoveFromLayout(); pRow->InsertBehind( this, pInsertBehind ); - pRow->_InvalidateAll(); + pRow->InvalidateAll_(); pRow->CheckDirChange(); pInsertBehind = pRow; pRow = pNxt; @@ -948,7 +948,7 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowK // #i26745# - format row and cell frames of table { - this->Lower()->_InvalidatePos(); + this->Lower()->InvalidatePos_(); // #i43913# - correction // call method <lcl_InnerCalcLayout> with first lower. lcl_InnerCalcLayout( this->Lower(), LONG_MAX, true ); @@ -1216,7 +1216,7 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowK // MoveFwd of the follow table!!! pRow->RemoveFromLayout(); pRow->InsertBehind( pFoll, pInsertBehind ); - pRow->_InvalidateAll(); + pRow->InvalidateAll_(); pInsertBehind = pRow; pRow = static_cast<SwRowFrame*>(pNxt); } @@ -1289,7 +1289,7 @@ bool SwTabFrame::Join() pNxt = pRow->GetNext(); nHeight += (pRow->Frame().*fnRect->fnGetHeight)(); pRow->RemoveFromLayout(); - pRow->_InvalidateAll(); + pRow->InvalidateAll_(); pRow->InsertBehind( this, pPrv ); pRow->CheckDirChange(); pPrv = pRow; @@ -1312,8 +1312,8 @@ void SwInvalidatePositions( SwFrame *pFrame, long nBottom ) bool bAll = LONG_MAX == nBottom; SWRECTFN( pFrame ) do - { pFrame->_InvalidatePos(); - pFrame->_InvalidateSize(); + { pFrame->InvalidatePos_(); + pFrame->InvalidateSize_(); if( pFrame->IsLayoutFrame() ) { if ( static_cast<SwLayoutFrame*>(pFrame)->Lower() ) @@ -1338,9 +1338,9 @@ void SwInvalidateAll( SwFrame *pFrame, long nBottom ) SWRECTFN( pFrame ) do { - pFrame->_InvalidatePos(); - pFrame->_InvalidateSize(); - pFrame->_InvalidatePrt(); + pFrame->InvalidatePos_(); + pFrame->InvalidateSize_(); + pFrame->InvalidatePrt_(); if( pFrame->IsLayoutFrame() ) { // NEW TABLES @@ -1349,9 +1349,9 @@ void SwInvalidateAll( SwFrame *pFrame, long nBottom ) if ( pThisCell && pThisCell->GetTabBox()->getRowSpan() < 1 ) { pToInvalidate = & const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( true )); - pToInvalidate->_InvalidatePos(); - pToInvalidate->_InvalidateSize(); - pToInvalidate->_InvalidatePrt(); + pToInvalidate->InvalidatePos_(); + pToInvalidate->InvalidateSize_(); + pToInvalidate->InvalidatePrt_(); } if ( pToInvalidate->Lower() ) @@ -1369,8 +1369,8 @@ void SwInvalidateAll( SwFrame *pFrame, long nBottom ) // #i29550# static void lcl_InvalidateAllLowersPrt( SwLayoutFrame* pLayFrame ) { - pLayFrame->_InvalidatePrt(); - pLayFrame->_InvalidateSize(); + pLayFrame->InvalidatePrt_(); + pLayFrame->InvalidateSize_(); pLayFrame->SetCompletePaint(); SwFrame* pFrame = pLayFrame->Lower(); @@ -1381,8 +1381,8 @@ static void lcl_InvalidateAllLowersPrt( SwLayoutFrame* pLayFrame ) lcl_InvalidateAllLowersPrt( static_cast<SwLayoutFrame*>(pFrame) ); else { - pFrame->_InvalidatePrt(); - pFrame->_InvalidateSize(); + pFrame->InvalidatePrt_(); + pFrame->InvalidateSize_(); pFrame->SetCompletePaint(); } @@ -1653,7 +1653,7 @@ static bool lcl_NoPrev( const SwFrame& rFrame ) if ( ( !bSkippedDirectPrevEmptySection && !rFrame.GetIndPrev() ) || ( bSkippedDirectPrevEmptySection && - ( !rFrame.IsInSct() || !rFrame._GetIndPrev() ) ) ) + ( !rFrame.IsInSct() || !rFrame.GetIndPrev_() ) ) ) { return true; } @@ -3018,7 +3018,7 @@ SwTwips SwTabFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo ) SwPageFrame *pPage = FindPageFrame(); if ( GetNext() ) { - GetNext()->_InvalidatePos(); + GetNext()->InvalidatePos_(); if ( GetNext()->IsContentFrame() ) GetNext()->InvalidatePage( pPage ); } @@ -3031,7 +3031,7 @@ SwTwips SwTabFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo ) { InvalidateNextPos(); } - _InvalidateAll(); + InvalidateAll_(); InvalidatePage( pPage ); SetComplete(); @@ -3057,7 +3057,7 @@ void SwTabFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwAttrSetChg aNewSet( *static_cast<const SwAttrSetChg*>(pNew) ); while( true ) { - _UpdateAttr( aOIter.GetCurItem(), + UpdateAttr_( aOIter.GetCurItem(), aNIter.GetCurItem(), nInvFlags, &aOldSet, &aNewSet ); if( aNIter.IsAtEnd() ) @@ -3069,22 +3069,22 @@ void SwTabFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwLayoutFrame::Modify( &aOldSet, &aNewSet ); } else - _UpdateAttr( pOld, pNew, nInvFlags ); + UpdateAttr_( pOld, pNew, nInvFlags ); if ( nInvFlags != 0 ) { SwPageFrame *pPage = FindPageFrame(); InvalidatePage( pPage ); if ( nInvFlags & 0x02 ) - _InvalidatePrt(); + InvalidatePrt_(); if ( nInvFlags & 0x40 ) - _InvalidatePos(); + InvalidatePos_(); SwFrame *pTmp; if ( nullptr != (pTmp = GetIndNext()) ) { if ( nInvFlags & 0x04 ) { - pTmp->_InvalidatePrt(); + pTmp->InvalidatePrt_(); if ( pTmp->IsContentFrame() ) pTmp->InvalidatePage( pPage ); } @@ -3093,7 +3093,7 @@ void SwTabFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } if ( nInvFlags & 0x08 && nullptr != (pTmp = GetPrev()) ) { - pTmp->_InvalidatePrt(); + pTmp->InvalidatePrt_(); if ( pTmp->IsContentFrame() ) pTmp->InvalidatePage( pPage ); } @@ -3107,7 +3107,7 @@ void SwTabFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } -void SwTabFrame::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, +void SwTabFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { @@ -3404,8 +3404,8 @@ void SwTabFrame::Cut() { //The old follower eventually calculated a margin to the predecessor //which is obsolete now as it became the first one - pFrame->_InvalidatePrt(); - pFrame->_InvalidatePos(); + pFrame->InvalidatePrt_(); + pFrame->InvalidatePos_(); if ( pFrame->IsContentFrame() ) pFrame->InvalidatePage( pPage ); if( IsInSct() && !GetPrev() ) @@ -3413,7 +3413,7 @@ void SwTabFrame::Cut() SwSectionFrame* pSct = FindSctFrame(); if( !pSct->IsFollow() ) { - pSct->_InvalidatePrt(); + pSct->InvalidatePrt_(); pSct->InvalidatePage( pPage ); } } @@ -3425,7 +3425,7 @@ void SwTabFrame::Cut() if ( nullptr != (pFrame = GetPrev()) ) { pFrame->SetRetouche(); pFrame->Prepare( PREP_WIDOWS_ORPHANS ); - pFrame->_InvalidatePos(); + pFrame->InvalidatePos_(); if ( pFrame->IsContentFrame() ) pFrame->InvalidatePage( pPage ); } @@ -3440,7 +3440,7 @@ void SwTabFrame::Cut() SwSectionFrame* pSct = FindSctFrame(); if( !pSct->IsFollow() ) { - pSct->_InvalidatePrt(); + pSct->InvalidatePrt_(); pSct->InvalidatePage( pPage ); } } @@ -3464,7 +3464,7 @@ void SwTabFrame::Cut() if ( pUp->GetUpper() ) { pSct->DelEmpty( false ); - pSct->_InvalidateSize(); + pSct->InvalidateSize_(); } } else if( (Frame().*fnRect->fnGetHeight)() ) @@ -3491,14 +3491,14 @@ void SwTabFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) //Insert in the tree. InsertBefore( static_cast<SwLayoutFrame*>(pParent), pSibling ); - _InvalidateAll(); + InvalidateAll_(); SwPageFrame *pPage = FindPageFrame(); InvalidatePage( pPage ); if ( GetNext() ) { - GetNext()->_InvalidatePos(); - GetNext()->_InvalidatePrt(); + GetNext()->InvalidatePos_(); + GetNext()->InvalidatePrt_(); if ( GetNext()->IsContentFrame() ) GetNext()->InvalidatePage( pPage ); } @@ -3523,7 +3523,7 @@ void SwTabFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) //two situations (both always happen at once): //a) The Content becomes the first in a chain //b) The new follower was the first in a chain before - GetNext()->_InvalidatePrt(); + GetNext()->InvalidatePrt_(); if ( pPage && !IsFollow() ) { @@ -4072,7 +4072,7 @@ void SwRowFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA // table has to be notified if it has to change its lower // margin due to changes of nBottomLineSize: if ( !GetNext() && nBottomLineSize != GetBottomLineSize() ) - pTabFrame->_InvalidatePrt(); + pTabFrame->InvalidatePrt_(); // If there are rows nested inside this row, the nested rows // may not have been calculated yet. Therefore the @@ -4086,7 +4086,7 @@ void SwRowFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA if ( GetUpper()->GetUpper()->IsRowFrame() && ( nBottomLineDist != GetBottomMarginForLowers() || nTopPrtMargin != GetTopMarginForLowers() ) ) - GetUpper()->GetUpper()->_InvalidateSize(); + GetUpper()->GetUpper()->InvalidateSize_(); SetBottomMarginForLowers( nBottomLineDist ); // 3. SetBottomLineSize( nBottomLineSize ); // 4. @@ -4171,7 +4171,7 @@ void SwRowFrame::AdjustCells( const SwTwips nHeight, const bool bHeight ) if ( nDiff ) { (pCellFrame->Frame().*fnRect->fnAddBottom)( nDiff ); - pCellFrame->_InvalidatePrt(); + pCellFrame->InvalidatePrt_(); } } @@ -4208,7 +4208,7 @@ void SwRowFrame::AdjustCells( const SwTwips nHeight, const bool bHeight ) } if ( pToAdjustRow && pToAdjustRow != this ) - pToAdjustRow->_InvalidateSize(); + pToAdjustRow->InvalidateSize_(); const long nDiff = nSumRowHeight - (pToAdjust->Frame().*fnRect->fnGetHeight)(); if ( nDiff ) @@ -4223,7 +4223,7 @@ void SwRowFrame::AdjustCells( const SwTwips nHeight, const bool bHeight ) if( pRootFrame && pRootFrame->IsAnyShellAccessible() && pRootFrame->GetCurrShell() ) pRootFrame->GetCurrShell()->Imp()->MoveAccessibleFrame( pNotify, aOldFrame ); - pNotify->_InvalidatePrt(); + pNotify->InvalidatePrt_(); } pFrame = pFrame->GetNext(); @@ -4232,7 +4232,7 @@ void SwRowFrame::AdjustCells( const SwTwips nHeight, const bool bHeight ) else { while ( pFrame ) { - pFrame->_InvalidateAll(); + pFrame->InvalidateAll_(); pFrame = pFrame->GetNext(); } } @@ -4388,8 +4388,8 @@ SwTwips SwRowFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) if ( nReal ) { if ( GetNext() ) - GetNext()->_InvalidatePos(); - _InvalidateAll(); + GetNext()->InvalidatePos_(); + InvalidateAll_(); SetCompletePaint(); SwTabFrame *pTab = FindTabFrame(); @@ -4454,7 +4454,7 @@ SwCellFrame::SwCellFrame(const SwTableBox &rBox, SwFrame* pSib, bool bInsertCont if ( rBox.GetSttIdx() ) { sal_uLong nIndex = rBox.GetSttIdx(); - ::_InsertCnt( this, rBox.GetFrameFormat()->GetDoc(), ++nIndex ); + ::InsertCnt_( this, rBox.GetFrameFormat()->GetDoc(), ++nIndex ); } else { diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx index 6097773116d6..f10e1b4527b3 100644 --- a/sw/source/core/layout/virtoutp.cxx +++ b/sw/source/core/layout/virtoutp.cxx @@ -48,15 +48,15 @@ inline DbgRect::DbgRect( OutputDevice *pOutDev, const Rectangle &rRect, #endif /* The SWLayVout class manages the virtual output devices. - * RootFrame has a static member of this class which is created in _FrameInit - * and destroyed in _FrameFinit. + * RootFrame has a static member of this class which is created in FrameInit + * and destroyed in FrameFinit. * */ bool SwRootFrame::FlushVout() { if (SwRootFrame::s_pVout->IsFlushable()) { - SwRootFrame::s_pVout->_Flush(); + SwRootFrame::s_pVout->Flush_(); return true; } return false; @@ -206,7 +206,7 @@ void SwLayVout::Enter( SwViewShell *pShell, SwRect &rRect, bool bOn ) } } -void SwLayVout::_Flush() +void SwLayVout::Flush_() { OSL_ENSURE( pVirDev, "SwLayVout::DrawOut: nothing left Toulouse" ); pOut->DrawOutDev( aRect.Pos(), aRect.SSize(), diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx index 93821891ccee..d53d38aee29e 100644 --- a/sw/source/core/layout/virtoutp.hxx +++ b/sw/source/core/layout/virtoutp.hxx @@ -29,7 +29,7 @@ class SwViewShell; class SwLayVout { - friend void _FrameFinit(); //deletes Vout + friend void FrameFinit(); //deletes Vout private: SwViewShell* pSh; VclPtr<OutputDevice> pOut; @@ -53,8 +53,8 @@ public: const SwRect& GetOrgRect() const { return aOrgRect; } bool IsFlushable() const { return bool(pOut); } - void _Flush(); - void Flush() { if( pOut ) _Flush(); } + void Flush_(); + void Flush() { if( pOut ) Flush_(); } }; #endif diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index f65fe5b46f86..f5dd429a0d80 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -228,7 +228,7 @@ void SwFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SfxItemIter aOIter( *static_cast<const SwAttrSetChg*>(pOld)->GetChgSet() ); while( true ) { - _UpdateAttrFrame( aOIter.GetCurItem(), + UpdateAttrFrame( aOIter.GetCurItem(), aNIter.GetCurItem(), nInvFlags ); if( aNIter.IsAtEnd() ) break; @@ -237,7 +237,7 @@ void SwFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } else - _UpdateAttrFrame( pOld, pNew, nInvFlags ); + UpdateAttrFrame( pOld, pNew, nInvFlags ); if ( nInvFlags != 0 ) { @@ -245,14 +245,14 @@ void SwFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) InvalidatePage( pPage ); if ( nInvFlags & 0x01 ) { - _InvalidatePrt(); + InvalidatePrt_(); if( !GetPrev() && IsTabFrame() && IsInSct() ) - FindSctFrame()->_InvalidatePrt(); + FindSctFrame()->InvalidatePrt_(); } if ( nInvFlags & 0x02 ) - _InvalidateSize(); + InvalidateSize_(); if ( nInvFlags & 0x04 ) - _InvalidatePos(); + InvalidatePos_(); if ( nInvFlags & 0x08 ) SetCompletePaint(); SwFrame *pNxt; @@ -260,14 +260,14 @@ void SwFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) { pNxt->InvalidatePage( pPage ); if ( nInvFlags & 0x10 ) - pNxt->_InvalidatePos(); + pNxt->InvalidatePos_(); if ( nInvFlags & 0x20 ) pNxt->SetCompletePaint(); } } } -void SwFrame::_UpdateAttrFrame( const SfxPoolItem *pOld, const SfxPoolItem *pNew, +void SwFrame::UpdateAttrFrame( const SfxPoolItem *pOld, const SfxPoolItem *pNew, sal_uInt8 &rInvFlags ) { sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; @@ -484,7 +484,7 @@ Size SwFrame::ChgSize( const Size& aNewSize ) Shrink( -nDiff ); if ( GetUpper() && (maFrame.*fnRect->fnGetHeight)() != nNew ) - GetUpper()->_InvalidateSize(); + GetUpper()->InvalidateSize_(); } // Even if grow/shrink did not yet set the desired width, for @@ -502,18 +502,18 @@ Size SwFrame::ChgSize( const Size& aNewSize ) SwPageFrame *pPage = FindPageFrame(); if ( GetNext() ) { - GetNext()->_InvalidatePos(); + GetNext()->InvalidatePos_(); GetNext()->InvalidatePage( pPage ); } if( IsLayoutFrame() ) { if( IsRightToLeft() ) - _InvalidatePos(); + InvalidatePos_(); if( static_cast<SwLayoutFrame*>(this)->Lower() ) - static_cast<SwLayoutFrame*>(this)->Lower()->_InvalidateSize(); + static_cast<SwLayoutFrame*>(this)->Lower()->InvalidateSize_(); } - _InvalidatePrt(); - _InvalidateSize(); + InvalidatePrt_(); + InvalidateSize_(); InvalidatePage( pPage ); } @@ -734,7 +734,7 @@ void SwContentFrame::Paste( SwFrame* pParent, SwFrame* pSibling) InsertBefore( static_cast<SwLayoutFrame*>(pParent), pSibling ); SwPageFrame *pPage = FindPageFrame(); - _InvalidateAll(); + InvalidateAll_(); InvalidatePage( pPage ); if( pPage ) @@ -748,8 +748,8 @@ void SwContentFrame::Paste( SwFrame* pParent, SwFrame* pSibling) if ( GetNext() ) { SwFrame* pNxt = GetNext(); - pNxt->_InvalidatePrt(); - pNxt->_InvalidatePos(); + pNxt->InvalidatePrt_(); + pNxt->InvalidatePos_(); pNxt->InvalidatePage( pPage ); if( pNxt->IsSctFrame() ) pNxt = static_cast<SwSectionFrame*>(pNxt)->ContainsContent(); @@ -774,7 +774,7 @@ void SwContentFrame::Paste( SwFrame* pParent, SwFrame* pSibling) GetPrev()->Prt().Height() + GetPrev()->Prt().Top() ) { // Take the border into account? - GetPrev()->_InvalidatePrt(); + GetPrev()->InvalidatePrt_(); } // OD 18.02.2003 #104989# - force complete paint of previous frame, // if frame is inserted at the end of a section frame, in order to @@ -799,11 +799,11 @@ void SwContentFrame::Paste( SwFrame* pParent, SwFrame* pSibling) { pFrame = FindFootnoteFrame()->GetNext(); if( pFrame && nullptr != (pFrame=static_cast<SwLayoutFrame*>(pFrame)->ContainsAny()) ) - pFrame->_InvalidatePrt(); + pFrame->InvalidatePrt_(); } } - _InvalidateLineNum(); + InvalidateLineNum_(); SwFrame *pNxt = FindNextCnt(); if ( pNxt ) { @@ -814,7 +814,7 @@ void SwContentFrame::Paste( SwFrame* pParent, SwFrame* pSibling) } if ( pNxt ) { - pNxt->_InvalidateLineNum(); + pNxt->InvalidateLineNum_(); if ( pNxt != GetNext() ) pNxt->InvalidatePage(); } @@ -834,7 +834,7 @@ void SwContentFrame::Cut() pFrame = static_cast<SwSectionFrame*>(pFrame)->ContainsAny(); if ( pFrame && pFrame->IsContentFrame() ) { - pFrame->_InvalidatePrt(); + pFrame->InvalidatePrt_(); if( IsInFootnote() ) pFrame->Prepare( PREP_QUOVADIS, nullptr, false ); } @@ -856,7 +856,7 @@ void SwContentFrame::Cut() } if ( pNxt ) { - pNxt->_InvalidateLineNum(); + pNxt->InvalidateLineNum_(); if ( pNxt != GetNext() ) pNxt->InvalidatePage(); } @@ -866,16 +866,16 @@ void SwContentFrame::Cut() { // The old follow may have calculated a gap to the predecessor which // now becomes obsolete or different as it becomes the first one itself - pFrame->_InvalidatePrt(); - pFrame->_InvalidatePos(); + pFrame->InvalidatePrt_(); + pFrame->InvalidatePos_(); pFrame->InvalidatePage( pPage ); if( pFrame->IsSctFrame() ) { pFrame = static_cast<SwSectionFrame*>(pFrame)->ContainsAny(); if( pFrame ) { - pFrame->_InvalidatePrt(); - pFrame->_InvalidatePos(); + pFrame->InvalidatePrt_(); + pFrame->InvalidatePos_(); pFrame->InvalidatePage( pPage ); } } @@ -886,7 +886,7 @@ void SwContentFrame::Cut() SwSectionFrame* pSct = FindSctFrame(); if( !pSct->IsFollow() ) { - pSct->_InvalidatePrt(); + pSct->InvalidatePrt_(); pSct->InvalidatePage( pPage ); } } @@ -898,7 +898,7 @@ void SwContentFrame::Cut() if ( nullptr != (pFrame = GetPrev()) ) { pFrame->SetRetouche(); pFrame->Prepare( PREP_WIDOWS_ORPHANS ); - pFrame->_InvalidatePos(); + pFrame->InvalidatePos_(); pFrame->InvalidatePage( pPage ); } // If I'm (was) the only ContentFrame in my upper, it has to do the @@ -916,7 +916,7 @@ void SwContentFrame::Cut() SwSectionFrame* pSct = FindSctFrame(); if( !pSct->IsFollow() ) { - pSct->_InvalidatePrt(); + pSct->InvalidatePrt_(); pSct->InvalidatePage( pPage ); } } @@ -928,7 +928,7 @@ void SwContentFrame::Cut() SwTabFrame* pMasterTab = pThisTab && pThisTab->IsFollow() ? pThisTab->FindMaster() : nullptr; if ( pMasterTab ) { - pMasterTab->_InvalidatePos(); + pMasterTab->InvalidatePos_(); pMasterTab->SetRemoveFollowFlowLinePending( true ); } } @@ -963,7 +963,7 @@ void SwContentFrame::Cut() { SwFrame* pTmp = static_cast<SwLayoutFrame*>(pUp->GetNext())->ContainsAny(); if( pTmp ) - pTmp->_InvalidatePrt(); + pTmp->InvalidatePrt_(); } pUp->Cut(); SwFrame::DestroyFrame(pUp); @@ -978,7 +978,7 @@ void SwContentFrame::Cut() // If a locked section may not be deleted then at least // its size became invalid after removing its last // content. - pSct->_InvalidateSize(); + pSct->InvalidateSize_(); } else { @@ -1045,8 +1045,8 @@ void SwLayoutFrame::Paste( SwFrame* pParent, SwFrame* pSibling) fnRect = GetUpper()->IsVertical() ? ( GetUpper()->IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori; if( (Frame().*fnRect->fnGetWidth)() != (pParent->Prt().*fnRect->fnGetWidth)()) - _InvalidateSize(); - _InvalidatePos(); + InvalidateSize_(); + InvalidatePos_(); const SwPageFrame *pPage = FindPageFrame(); InvalidatePage( pPage ); if( !IsColumnFrame() ) @@ -1054,7 +1054,7 @@ void SwLayoutFrame::Paste( SwFrame* pParent, SwFrame* pSibling) SwFrame *pFrame = GetIndNext(); if( nullptr != pFrame ) { - pFrame->_InvalidatePos(); + pFrame->InvalidatePos_(); if( IsInFootnote() ) { if( pFrame->IsSctFrame() ) @@ -1098,7 +1098,7 @@ void SwLayoutFrame::Paste( SwFrame* pParent, SwFrame* pSibling) void SwLayoutFrame::Cut() { if ( GetNext() ) - GetNext()->_InvalidatePos(); + GetNext()->InvalidatePos_(); SWRECTFN( this ) SwTwips nShrink = (Frame().*fnRect->fnGetHeight)(); @@ -1167,9 +1167,9 @@ SwTwips SwFrame::Grow( SwTwips nDist, bool bTst, bool bInfo ) nDist = LONG_MAX - nPrtHeight; if ( IsFlyFrame() ) - return static_cast<SwFlyFrame*>(this)->_Grow( nDist, bTst ); + return static_cast<SwFlyFrame*>(this)->Grow_( nDist, bTst ); else if( IsSctFrame() ) - return static_cast<SwSectionFrame*>(this)->_Grow( nDist, bTst ); + return static_cast<SwSectionFrame*>(this)->Grow_( nDist, bTst ); else { const SwCellFrame* pThisCell = dynamic_cast<const SwCellFrame*>(this); @@ -1205,9 +1205,9 @@ SwTwips SwFrame::Shrink( SwTwips nDist, bool bTst, bool bInfo ) if ( nDist ) { if ( IsFlyFrame() ) - return static_cast<SwFlyFrame*>(this)->_Shrink( nDist, bTst ); + return static_cast<SwFlyFrame*>(this)->Shrink_( nDist, bTst ); else if( IsSctFrame() ) - return static_cast<SwSectionFrame*>(this)->_Shrink( nDist, bTst ); + return static_cast<SwSectionFrame*>(this)->Shrink_( nDist, bTst ); else { const SwCellFrame* pThisCell = dynamic_cast<const SwCellFrame*>(this); @@ -1305,10 +1305,10 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) if ( !bTst ) { pBody->Frame().Height(std::max( 0L, pBody->Frame().Height() - nChg )); - pBody->_InvalidatePrt(); - pBody->_InvalidateSize(); + pBody->InvalidatePrt_(); + pBody->InvalidateSize_(); if ( pBody->GetNext() ) - pBody->GetNext()->_InvalidatePos(); + pBody->GetNext()->InvalidatePos_(); if ( !IsHeaderFrame() ) pBody->SetCompletePaint(); } @@ -1363,7 +1363,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) pViewShell->Imp()->SetFirstVisPageInvalid(); if ( GetNext() ) - GetNext()->_InvalidatePos(); + GetNext()->InvalidatePos_(); //Trigger a repaint if necessary. SvxBrushItem aBack(pUp->GetFormat()->makeBackgroundBrushItem()); @@ -1395,7 +1395,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) mbCompletePaint = bOldComplete; } if ( !IsBodyFrame() ) - pUp->_InvalidateSize(); + pUp->InvalidateSize_(); InvalidatePage( static_cast<SwPageFrame*>(pUp) ); } nDiff -= nChg; @@ -1492,7 +1492,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) pFrame->GetNext()->Frame().Pos().X() += nAdd; pFrame->GetNext()->InvalidatePrt(); if ( pFrame->GetNext()->GetNext() ) - pFrame->GetNext()->GetNext()->_InvalidatePos(); + pFrame->GetNext()->GetNext()->InvalidatePos_(); } } } @@ -1506,7 +1506,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) pFrame->Frame().Pos().X() += nReal; pFrame->InvalidatePrt(); if ( pFrame->GetNext() ) - pFrame->GetNext()->_InvalidatePos(); + pFrame->GetNext()->InvalidatePos_(); if( nReal < 0 && pFrame->IsInSct() ) { SwLayoutFrame* pUp = pFrame->GetUpper(); @@ -1539,8 +1539,8 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) (IsFooterFrame() && rVert.GetVertOrient()!=text::VertOrientation::NONE && rVert.GetVertOrient() != text::VertOrientation::TOP)) ) { - pFly->_InvalidatePos(); - pFly->_Invalidate(); + pFly->InvalidatePos_(); + pFly->Invalidate_(); } } } @@ -1550,13 +1550,13 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) } /** method to perform additional actions on an invalidation (2004-05-19 #i28701#) */ -void SwFrame::_ActionOnInvalidation( const InvalidationType ) +void SwFrame::ActionOnInvalidation( const InvalidationType ) { // default behaviour is to perform no additional action } /** method to determine, if an invalidation is allowed (2004-05-19 #i28701#) */ -bool SwFrame::_InvalidationAllowed( const InvalidationType ) const +bool SwFrame::InvalidationAllowed( const InvalidationType ) const { // default behaviour is to allow invalidation return true; @@ -1564,42 +1564,42 @@ bool SwFrame::_InvalidationAllowed( const InvalidationType ) const void SwFrame::ImplInvalidateSize() { - if ( _InvalidationAllowed( INVALID_SIZE ) ) + if ( InvalidationAllowed( INVALID_SIZE ) ) { mbValidSize = false; if ( IsFlyFrame() ) - static_cast<SwFlyFrame*>(this)->_Invalidate(); + static_cast<SwFlyFrame*>(this)->Invalidate_(); else InvalidatePage(); // OD 2004-05-19 #i28701# - _ActionOnInvalidation( INVALID_SIZE ); + ActionOnInvalidation( INVALID_SIZE ); } } void SwFrame::ImplInvalidatePrt() { - if ( _InvalidationAllowed( INVALID_PRTAREA ) ) + if ( InvalidationAllowed( INVALID_PRTAREA ) ) { mbValidPrtArea = false; if ( IsFlyFrame() ) - static_cast<SwFlyFrame*>(this)->_Invalidate(); + static_cast<SwFlyFrame*>(this)->Invalidate_(); else InvalidatePage(); // OD 2004-05-19 #i28701# - _ActionOnInvalidation( INVALID_PRTAREA ); + ActionOnInvalidation( INVALID_PRTAREA ); } } void SwFrame::ImplInvalidatePos() { - if ( _InvalidationAllowed( INVALID_POS ) ) + if ( InvalidationAllowed( INVALID_POS ) ) { mbValidPos = false; if ( IsFlyFrame() ) { - static_cast<SwFlyFrame*>(this)->_Invalidate(); + static_cast<SwFlyFrame*>(this)->Invalidate_(); } else { @@ -1607,20 +1607,20 @@ void SwFrame::ImplInvalidatePos() } // OD 2004-05-19 #i28701# - _ActionOnInvalidation( INVALID_POS ); + ActionOnInvalidation( INVALID_POS ); } } void SwFrame::ImplInvalidateLineNum() { - if ( _InvalidationAllowed( INVALID_LINENUM ) ) + if ( InvalidationAllowed( INVALID_LINENUM ) ) { mbValidLineNum = false; OSL_ENSURE( IsTextFrame(), "line numbers are implemented for text only" ); InvalidatePage(); // OD 2004-05-19 #i28701# - _ActionOnInvalidation( INVALID_LINENUM ); + ActionOnInvalidation( INVALID_LINENUM ); } } @@ -1635,8 +1635,8 @@ void SwFrame::ReinitializeFrameSizeAttrFlags() { SwFrame *pFrame = static_cast<SwLayoutFrame*>(this)->Lower(); while ( pFrame ) - { pFrame->_InvalidateSize(); - pFrame->_InvalidatePrt(); + { pFrame->InvalidateSize_(); + pFrame->InvalidatePrt_(); pFrame = pFrame->GetNext(); } SwContentFrame *pCnt = static_cast<SwLayoutFrame*>(this)->ContainsContent(); @@ -1648,7 +1648,7 @@ void SwFrame::ReinitializeFrameSizeAttrFlags() do { pCnt->Prepare( PREP_ADJUST_FRM ); - pCnt->_InvalidateSize(); + pCnt->InvalidateSize_(); pCnt = pCnt->GetNextContentFrame(); } while ( static_cast<SwLayoutFrame*>(this)->IsAnLower( pCnt ) ); } @@ -1937,7 +1937,7 @@ void SwContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwAttrSetChg aNewSet( *static_cast<const SwAttrSetChg*>(pNew) ); while( true ) { - _UpdateAttr( aOIter.GetCurItem(), + UpdateAttr_( aOIter.GetCurItem(), aNIter.GetCurItem(), nInvFlags, &aOldSet, &aNewSet ); if( aNIter.IsAtEnd() ) @@ -1949,7 +1949,7 @@ void SwContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwFrame::Modify( &aOldSet, &aNewSet ); } else - _UpdateAttr( pOld, pNew, nInvFlags ); + UpdateAttr_( pOld, pNew, nInvFlags ); if ( nInvFlags != 0 ) { @@ -1958,9 +1958,9 @@ void SwContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) if ( nInvFlags & 0x01 ) SetCompletePaint(); if ( nInvFlags & 0x02 ) - _InvalidatePos(); + InvalidatePos_(); if ( nInvFlags & 0x04 ) - _InvalidateSize(); + InvalidateSize_(); if ( nInvFlags & 0x88 ) { if( IsInSct() && !GetPrev() ) @@ -1968,16 +1968,16 @@ void SwContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwSectionFrame *pSect = FindSctFrame(); if( pSect->ContainsAny() == this ) { - pSect->_InvalidatePrt(); + pSect->InvalidatePrt_(); pSect->InvalidatePage( pPage ); } } - _InvalidatePrt(); + InvalidatePrt_(); } SwFrame* pNextFrame = GetIndNext(); if ( pNextFrame && nInvFlags & 0x10) { - pNextFrame->_InvalidatePrt(); + pNextFrame->InvalidatePrt_(); pNextFrame->InvalidatePage( pPage ); } if ( pNextFrame && nInvFlags & 0x80 ) @@ -1989,7 +1989,7 @@ void SwContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwFrame* pPrevFrame = GetPrev(); if ( pPrevFrame ) { - pPrevFrame->_InvalidatePrt(); + pPrevFrame->InvalidatePrt_(); pPrevFrame->InvalidatePage( pPage ); } } @@ -1998,7 +1998,7 @@ void SwContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } -void SwContentFrame::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew, +void SwContentFrame::UpdateAttr_( const SfxPoolItem* pOld, const SfxPoolItem* pNew, sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { @@ -2036,13 +2036,13 @@ void SwContentFrame::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pN { SwPageFrame* pPg = pNxt->FindPageFrame(); pNxt->InvalidatePage( pPg ); - pNxt->_InvalidatePrt(); + pNxt->InvalidatePrt_(); if( pNxt->IsSctFrame() ) { SwFrame* pCnt = static_cast<SwSectionFrame*>(pNxt)->ContainsAny(); if( pCnt ) { - pCnt->_InvalidatePrt(); + pCnt->InvalidatePrt_(); pCnt->InvalidatePage( pPg ); } } @@ -2081,13 +2081,13 @@ void SwContentFrame::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pN { SwPageFrame* pPg = pNxt->FindPageFrame(); pNxt->InvalidatePage( pPg ); - pNxt->_InvalidatePrt(); + pNxt->InvalidatePrt_(); if( pNxt->IsSctFrame() ) { SwFrame* pCnt = static_cast<SwSectionFrame*>(pNxt)->ContainsAny(); if( pCnt ) { - pCnt->_InvalidatePrt(); + pCnt->InvalidatePrt_(); pCnt->InvalidatePage( pPg ); } } @@ -2326,13 +2326,13 @@ SwTwips SwLayoutFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo ) SwPageFrame *pPage = FindPageFrame(); if ( GetNext() ) { - GetNext()->_InvalidatePos(); + GetNext()->InvalidatePos_(); if ( GetNext()->IsContentFrame() ) GetNext()->InvalidatePage( pPage ); } if ( !IsPageBodyFrame() ) { - _InvalidateAll(); + InvalidateAll_(); InvalidatePage( pPage ); } if (!(GetType() & (SwFrameType::Row|SwFrameType::Tab|SwFrameType::FtnCont|SwFrameType::Page|SwFrameType::Root))) @@ -2490,7 +2490,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) SwPageFrame *pPage = FindPageFrame(); if ( GetNext() ) { - GetNext()->_InvalidatePos(); + GetNext()->InvalidatePos_(); if ( GetNext()->IsContentFrame() ) GetNext()->InvalidatePage( pPage ); if ( IsTabFrame() ) @@ -2509,7 +2509,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) } if ( !IsBodyFrame() ) { - _InvalidateAll(); + InvalidateAll_(); InvalidatePage( pPage ); bool bCompletePaint = true; const SwFrameFormat* pFormat = GetFormat(); @@ -2591,9 +2591,9 @@ void SwLayoutFrame::ChgLowersProp( const Size& rOldSize ) // corresponding flags at the page. do { - if( pLowerFrame->IsSctFrame() && static_cast<SwSectionFrame*>(pLowerFrame)->_ToMaximize() ) + if( pLowerFrame->IsSctFrame() && static_cast<SwSectionFrame*>(pLowerFrame)->ToMaximize_() ) { - pLowerFrame->_InvalidateSize(); + pLowerFrame->InvalidateSize_(); pLowerFrame->InvalidatePage( pPage ); } if( pLowerFrame->GetNext() ) @@ -2640,7 +2640,7 @@ void SwLayoutFrame::ChgLowersProp( const Size& rOldSize ) { // If variable size of body|section frame has grown, only found // last lower and the position of the its next have to be invalidated. - pLowerFrame->_InvalidateAll(); + pLowerFrame->InvalidateAll_(); pLowerFrame->InvalidatePage( pPage ); if( !pLowerFrame->IsFlowFrame() || !SwFlowFrame::CastFlowFrame( pLowerFrame )->HasFollow() ) @@ -2658,7 +2658,7 @@ void SwLayoutFrame::ChgLowersProp( const Size& rOldSize ) SwTwips nBot = Frame().Left() + Prt().Left(); while ( pLowerFrame && pLowerFrame->GetPrev() && pLowerFrame->Frame().Left() < nBot ) { - pLowerFrame->_InvalidateAll(); + pLowerFrame->InvalidateAll_(); pLowerFrame->InvalidatePage( pPage ); pLowerFrame = pLowerFrame->GetPrev(); } @@ -2668,14 +2668,14 @@ void SwLayoutFrame::ChgLowersProp( const Size& rOldSize ) SwTwips nBot = Frame().Top() + Prt().Bottom(); while ( pLowerFrame && pLowerFrame->GetPrev() && pLowerFrame->Frame().Top() > nBot ) { - pLowerFrame->_InvalidateAll(); + pLowerFrame->InvalidateAll_(); pLowerFrame->InvalidatePage( pPage ); pLowerFrame = pLowerFrame->GetPrev(); } } if ( pLowerFrame ) { - pLowerFrame->_InvalidateSize(); + pLowerFrame->InvalidateSize_(); pLowerFrame->InvalidatePage( pPage ); if ( pLowerFrame->IsTextFrame() ) static_cast<SwContentFrame*>(pLowerFrame)->Prepare( PREP_ADJUST_FRM ); @@ -2691,7 +2691,7 @@ void SwLayoutFrame::ChgLowersProp( const Size& rOldSize ) SwFrame* pSectFrame = pLowerFrame->FindSctFrame(); if( pSectFrame != this && IsAnLower( pSectFrame ) ) { - pSectFrame->_InvalidateSize(); + pSectFrame->InvalidateSize_(); pSectFrame->InvalidatePage( pPage ); } } @@ -2903,7 +2903,7 @@ void SwLayoutFrame::ChgLowersProp( const Size& rOldSize ) } } // end of else { NOT text frame } - pLowerFrame->_InvalidateAll(); + pLowerFrame->InvalidateAll_(); if ( bInvaPageForContent && pLowerFrame->IsContentFrame() ) { pLowerFrame->InvalidatePage(); @@ -3529,7 +3529,7 @@ void SwLayoutFrame::FormatWidthCols( const SwBorderAttrs &rAttrs, { SwFrame *pLow = pCol->Lower(); if ( pLow ) - pLow->_InvalidatePos(); + pLow->InvalidatePos_(); pCol = static_cast<SwLayoutFrame*>(pCol->GetNext()); } if( IsSctFrame() && static_cast<SwSectionFrame*>(this)->HasFollow() ) @@ -3539,7 +3539,7 @@ void SwLayoutFrame::FormatWidthCols( const SwBorderAttrs &rAttrs, SwContentFrame* pTmpContent = static_cast<SwSectionFrame*>(this)->GetFollow()->ContainsContent(); if( pTmpContent ) - pTmpContent->_InvalidatePos(); + pTmpContent->InvalidatePos_(); } } else @@ -3572,11 +3572,11 @@ static SwContentFrame* lcl_InvalidateSection( SwFrame *pCnt, SwInvalidateFlags n ( pCnt->IsInFootnote() && !pSect->IsInFootnote() ) ) && !pCnt->IsTabFrame() ) return nullptr; if( nInv & SwInvalidateFlags::Size ) - pSect->_InvalidateSize(); + pSect->InvalidateSize_(); if( nInv & SwInvalidateFlags::Pos ) - pSect->_InvalidatePos(); + pSect->InvalidatePos_(); if( nInv & SwInvalidateFlags::PrtArea ) - pSect->_InvalidatePrt(); + pSect->InvalidatePrt_(); SwFlowFrame *pFoll = pSect->GetFollow(); // Temporary separation from follow pSect->SetFollow( nullptr ); @@ -3590,11 +3590,11 @@ static SwContentFrame* lcl_InvalidateTable( SwTabFrame *pTable, SwInvalidateFlag if( ( nInv & SwInvalidateFlags::Section ) && pTable->IsInSct() ) lcl_InvalidateSection( pTable, nInv ); if( nInv & SwInvalidateFlags::Size ) - pTable->_InvalidateSize(); + pTable->InvalidateSize_(); if( nInv & SwInvalidateFlags::Pos ) - pTable->_InvalidatePos(); + pTable->InvalidatePos_(); if( nInv & SwInvalidateFlags::PrtArea ) - pTable->_InvalidatePrt(); + pTable->InvalidatePrt_(); return pTable->FindLastContent(); } @@ -3652,9 +3652,9 @@ static void lcl_InvalidateContent( SwContentFrame *pCnt, SwInvalidateFlags nInv if( nInv & SwInvalidateFlags::Size ) pCnt->Prepare( PREP_CLEAR, nullptr, false ); if( nInv & SwInvalidateFlags::Pos ) - pCnt->_InvalidatePos(); + pCnt->InvalidatePos_(); if( nInv & SwInvalidateFlags::PrtArea ) - pCnt->_InvalidatePrt(); + pCnt->InvalidatePrt_(); if ( nInv & SwInvalidateFlags::LineNum ) pCnt->InvalidateLineNum(); if ( pCnt->GetDrawObjs() ) diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index f47c720f7b88..d3bcf7f003c8 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -64,7 +64,7 @@ SwAnchoredObjectPosition::SwAnchoredObjectPosition( SdrObject& _rDrawObj ) "SwAnchoredObjectPosition(..) - object of unexpected type!" ); #endif - _GetInfoAboutObj(); + GetInfoAboutObj(); } /** determine information about object @@ -72,7 +72,7 @@ SwAnchoredObjectPosition::SwAnchoredObjectPosition( SdrObject& _rDrawObj ) members <mbIsObjFly>, <mpFrameOfObj>, <mpAnchorFrame>, <mpContact>, <mbFollowTextFlow> and <mbDoNotCaptureAnchoredObj> are set */ -void SwAnchoredObjectPosition::_GetInfoAboutObj() +void SwAnchoredObjectPosition::GetInfoAboutObj() { // determine, if object represents a fly frame { @@ -83,7 +83,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj() { mpContact = static_cast<SwContact*>(GetUserCall( &mrDrawObj )); assert(mpContact && - "SwAnchoredObjectPosition::_GetInfoAboutObj() - missing SwContact-object."); + "SwAnchoredObjectPosition::GetInfoAboutObj() - missing SwContact-object."); } // determine anchored object, the object belongs to @@ -91,7 +91,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj() // #i26791# mpAnchoredObj = mpContact->GetAnchoredObj( &mrDrawObj ); assert(mpAnchoredObj && - "SwAnchoredObjectPosition::_GetInfoAboutObj() - missing anchored object."); + "SwAnchoredObjectPosition::GetInfoAboutObj() - missing anchored object."); } // determine frame, the object is anchored at @@ -99,7 +99,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj() // #i26791# mpAnchorFrame = mpAnchoredObj->AnchorFrame(); OSL_ENSURE( mpAnchorFrame, - "SwAnchoredObjectPosition::_GetInfoAboutObj() - missing anchor frame." ); + "SwAnchoredObjectPosition::GetInfoAboutObj() - missing anchor frame." ); } // determine format the object belongs to @@ -107,7 +107,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj() // #i28701# mpFrameFormat = &mpAnchoredObj->GetFrameFormat(); assert(mpFrameFormat && - "<SwAnchoredObjectPosition::_GetInfoAboutObj() - missing frame format."); + "<SwAnchoredObjectPosition::GetInfoAboutObj() - missing frame format."); } // #i62875# - determine attribute value of <Follow-Text-Flow> @@ -155,7 +155,7 @@ SwTwips SwAnchoredObjectPosition::ToCharTopOfLine() const #i11860# */ -SwTwips SwAnchoredObjectPosition::_GetTopForObjPos( const SwFrame& _rFrame, +SwTwips SwAnchoredObjectPosition::GetTopForObjPos( const SwFrame& _rFrame, const SwRectFn& _fnRect, const bool _bVert ) const { @@ -190,7 +190,7 @@ SwTwips SwAnchoredObjectPosition::_GetTopForObjPos( const SwFrame& _rFrame, return nTopOfFrameForObjPos; } -void SwAnchoredObjectPosition::_GetVertAlignmentValues( +void SwAnchoredObjectPosition::GetVertAlignmentValues( const SwFrame& _rVertOrientFrame, const SwFrame& _rPageAlignLayFrame, const sal_Int16 _eRelOrient, @@ -201,7 +201,7 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues( SwTwips nOffset = 0; SWRECTFN( (&_rVertOrientFrame) ) // #i11860# - top of <_rVertOrientFrame> for object positioning - const SwTwips nVertOrientTop = _GetTopForObjPos( _rVertOrientFrame, fnRect, bVert ); + const SwTwips nVertOrientTop = GetTopForObjPos( _rVertOrientFrame, fnRect, bVert ); // #i11860# - upper space amount of <_rVertOrientFrame> considered // for previous frame const SwTwips nVertOrientUpperSpaceForPrevFrameAndPageGrid = @@ -294,7 +294,7 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues( } else { - OSL_FAIL( "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" ); + OSL_FAIL( "<SwAnchoredObjectPosition::GetVertAlignmentValues(..)> - invalid relative alignment" ); } } break; @@ -308,14 +308,14 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues( } else { - OSL_FAIL( "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" ); + OSL_FAIL( "<SwAnchoredObjectPosition::GetVertAlignmentValues(..)> - invalid relative alignment" ); } } break; // no break here, because text::RelOrientation::CHAR is invalid, if !mbAnchorToChar default: { - OSL_FAIL( "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" ); + OSL_FAIL( "<SwAnchoredObjectPosition::GetVertAlignmentValues(..)> - invalid relative alignment" ); } } @@ -324,7 +324,7 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues( } // #i26791# - add output parameter <_roVertOffsetToFrameAnchorPos> -SwTwips SwAnchoredObjectPosition::_GetVertRelPos( +SwTwips SwAnchoredObjectPosition::GetVertRelPos( const SwFrame& _rVertOrientFrame, const SwFrame& _rPageAlignLayFrame, const sal_Int16 _eVertOrient, @@ -339,7 +339,7 @@ SwTwips SwAnchoredObjectPosition::_GetVertRelPos( SwTwips nAlignAreaHeight; SwTwips nAlignAreaOffset; - _GetVertAlignmentValues( _rVertOrientFrame, _rPageAlignLayFrame, + GetVertAlignmentValues( _rVertOrientFrame, _rPageAlignLayFrame, _eRelOrient, nAlignAreaHeight, nAlignAreaOffset ); nRelPosY = nAlignAreaOffset; @@ -380,7 +380,7 @@ SwTwips SwAnchoredObjectPosition::_GetVertRelPos( break; default: { - OSL_FAIL( "<SwAnchoredObjectPosition::_GetVertRelPos(..) - invalid vertical positioning" ); + OSL_FAIL( "<SwAnchoredObjectPosition::GetVertRelPos(..) - invalid vertical positioning" ); } } @@ -399,7 +399,7 @@ SwTwips SwAnchoredObjectPosition::_GetVertRelPos( #i62875# - method now private and renamed. OD 2009-09-01 #mongolianlayout# - add parameter <bVertL2R> */ -SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnch, +SwTwips SwAnchoredObjectPosition::ImplAdjustVertRelPos( const SwTwips nTopOfAnch, const bool bVert, const bool bVertL2R, const SwFrame& rPageAlignLayFrame, @@ -514,7 +514,7 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc #i62875# - method now private and renamed. */ -SwTwips SwAnchoredObjectPosition::_ImplAdjustHoriRelPos( +SwTwips SwAnchoredObjectPosition::ImplAdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, const SwTwips _nProposedRelPosX ) const { @@ -562,7 +562,7 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustHoriRelPos( } /** determine alignment value for horizontal position of object */ -void SwAnchoredObjectPosition::_GetHoriAlignmentValues( const SwFrame& _rHoriOrientFrame, +void SwAnchoredObjectPosition::GetHoriAlignmentValues( const SwFrame& _rHoriOrientFrame, const SwFrame& _rPageAlignLayFrame, const sal_Int16 _eRelOrient, const bool _bObjWrapThrough, @@ -715,7 +715,7 @@ void SwAnchoredObjectPosition::_GetHoriAlignmentValues( const SwFrame& _rHoriOr } /** toggle given horizontal orientation and relative alignment */ -void SwAnchoredObjectPosition::_ToggleHoriOrientAndAlign( +void SwAnchoredObjectPosition::ToggleHoriOrientAndAlign( const bool _bToggleLeftRight, sal_Int16& _ioeHoriOrient, sal_Int16& _iopeRelOrient @@ -770,7 +770,7 @@ void SwAnchoredObjectPosition::_ToggleHoriOrientAndAlign( } /** calculate relative horizontal position */ -SwTwips SwAnchoredObjectPosition::_CalcRelPosX( +SwTwips SwAnchoredObjectPosition::CalcRelPosX( const SwFrame& _rHoriOrientFrame, const SwEnvironmentOfAnchoredObject& _rEnvOfObj, const SwFormatHoriOrient& _rHoriOrient, @@ -792,7 +792,7 @@ SwTwips SwAnchoredObjectPosition::_CalcRelPosX( sal_Int16 eHoriOrient = _rHoriOrient.GetHoriOrient(); sal_Int16 eRelOrient = _rHoriOrient.GetRelationOrient(); // toggle orientation and relative alignment - _ToggleHoriOrientAndAlign( bToggle, eHoriOrient, eRelOrient ); + ToggleHoriOrientAndAlign( bToggle, eHoriOrient, eRelOrient ); // determine alignment parameter // <nWidth>: 'width' of alignment area @@ -800,7 +800,7 @@ SwTwips SwAnchoredObjectPosition::_CalcRelPosX( SwTwips nWidth = 0; SwTwips nOffset = 0; bool bAlignedRelToPage = false; - _GetHoriAlignmentValues( _rHoriOrientFrame, rPageAlignLayFrame, + GetHoriAlignmentValues( _rHoriOrientFrame, rPageAlignLayFrame, eRelOrient, _bObjWrapThrough, nWidth, nOffset, bAlignedRelToPage ); @@ -852,7 +852,7 @@ SwTwips SwAnchoredObjectPosition::_CalcRelPosX( // keep object inside 'page' alignment layout frame const SwFrame& rEnvironmentLayFrame = _rEnvOfObj.GetHoriEnvironmentLayoutFrame( _rHoriOrientFrame ); - nRelPosX = _AdjustHoriRelPos( rEnvironmentLayFrame, nRelPosX ); + nRelPosX = AdjustHoriRelPos( rEnvironmentLayFrame, nRelPosX ); // if object is a Writer fly frame and it's anchored to a content and // it is horizontal positioned left or right, but not relative to character, @@ -863,7 +863,7 @@ SwTwips SwAnchoredObjectPosition::_CalcRelPosX( ( eHoriOrient == text::HoriOrientation::LEFT || eHoriOrient == text::HoriOrientation::RIGHT ) && eRelOrient != text::RelOrientation::CHAR ) { - nRelPosX = _AdjustHoriRelPosForDrawAside( _rHoriOrientFrame, + nRelPosX = AdjustHoriRelPosForDrawAside( _rHoriOrientFrame, nRelPosX, _nRelPosY, eHoriOrient, eRelOrient, _rLRSpacing, _rULSpacing, @@ -881,7 +881,7 @@ SwTwips SwAnchoredObjectPosition::_CalcRelPosX( /** adjust calculated horizontal position in order to draw object aside other objects with same positioning */ -SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside( +SwTwips SwAnchoredObjectPosition::AdjustHoriRelPosForDrawAside( const SwFrame& _rHoriOrientFrame, const SwTwips _nProposedRelPosX, const SwTwips _nRelPosY, @@ -896,7 +896,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside( if ( dynamic_cast<const SwTextFrame*>( &GetAnchorFrame() ) == nullptr || dynamic_cast<const SwFlyAtContentFrame*>( &GetAnchoredObj() ) == nullptr ) { - OSL_FAIL( "<SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(..) - usage for wrong anchor type" ); + OSL_FAIL( "<SwAnchoredObjectPosition::AdjustHoriRelPosForDrawAside(..) - usage for wrong anchor type" ); return _nProposedRelPosX; } @@ -931,7 +931,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside( const SwFlyFrame* pFly = static_cast<const SwVirtFlyDrawObj*>(aIter.Bottom())->GetFlyFrame(); while ( pFly && nObjOrdNum > pFly->GetVirtDrawObj()->GetOrdNumDirect() ) { - if ( _DrawAsideFly( pFly, aTmpObjRect, pObjContext, nObjIndex, + if ( DrawAsideFly( pFly, aTmpObjRect, pObjContext, nObjIndex, _bEvenPage, _eHoriOrient, _eRelOrient ) ) { if( bVert ) @@ -1006,7 +1006,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside( nAdjustedRelPosX; } } // end of <if (bVert)> - } // end of <if _DrawAsideFly(..)> + } // end of <if DrawAsideFly(..)> pFly = static_cast<const SwVirtFlyDrawObj*>(aIter.Next())->GetFlyFrame(); } // end of <loop on fly frames @@ -1016,9 +1016,9 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside( /** detemine, if object has to draw aside given fly frame - method used by <_AdjustHoriRelPosForDrawAside(..)> + method used by <AdjustHoriRelPosForDrawAside(..)> */ -bool SwAnchoredObjectPosition::_DrawAsideFly( const SwFlyFrame* _pFly, +bool SwAnchoredObjectPosition::DrawAsideFly( const SwFlyFrame* _pFly, const SwRect& _rObjRect, const SwFrame* _pObjContext, const sal_uLong _nObjIndex, @@ -1045,11 +1045,11 @@ bool SwAnchoredObjectPosition::_DrawAsideFly( const SwFlyFrame* _pFly, if( text::RelOrientation::CHAR != eOtherRelOrient ) { sal_Int16 eOtherHoriOrient = rHori.GetHoriOrient(); - _ToggleHoriOrientAndAlign( _bEvenPage && rHori.IsPosToggle(), + ToggleHoriOrientAndAlign( _bEvenPage && rHori.IsPosToggle(), eOtherHoriOrient, eOtherRelOrient ); if ( eOtherHoriOrient == _eHoriOrient && - _Minor( _eRelOrient, eOtherRelOrient, text::HoriOrientation::LEFT == _eHoriOrient ) ) + Minor_( _eRelOrient, eOtherRelOrient, text::HoriOrientation::LEFT == _eHoriOrient ) ) { bRetVal = true; } @@ -1067,9 +1067,9 @@ bool SwAnchoredObjectPosition::_DrawAsideFly( const SwFlyFrame* _pFly, against each other, which one has to be drawn aside the other one. depending on parameter _bLeft check is done for left or right positioning. - method used by <_DrawAsideFly(..)> + method used by <DrawAsideFly(..)> */ -bool SwAnchoredObjectPosition::_Minor( sal_Int16 _eRelOrient1, +bool SwAnchoredObjectPosition::Minor_( sal_Int16 _eRelOrient1, sal_Int16 _eRelOrient2, bool _bLeft ) { diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index 412b46014c45..fe27c7d6cd31 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -164,7 +164,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition() const SwTwips nObjBoundHeight = ( mnFlags & AsCharFlags::Rotate ) ? aObjBoundRect.Width() : aObjBoundRect.Height(); - const SwTwips nRelPos = _GetRelPosToBase( nObjBoundHeight, rVert ); + const SwTwips nRelPos = GetRelPosToBase( nObjBoundHeight, rVert ); // for initial positioning: // adjust the proposed anchor position by difference between @@ -207,7 +207,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition() { // save calculated Y-position value for 'automatic' vertical positioning, // in order to avoid a switch to 'manual' vertical positioning in - // <SwDrawContact::_Changed(..)>. + // <SwDrawContact::Changed_(..)>. const sal_Int16 eVertOrient = rVert.GetVertOrient(); if( rVert.GetPos() != nRelPos && eVertOrient != text::VertOrientation::NONE ) { @@ -332,7 +332,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition() 0 - no feedback; 1|2|3 - proposed formatting of characters at top|at center|at bottom of line. */ -SwTwips SwAsCharAnchoredObjectPosition::_GetRelPosToBase( +SwTwips SwAsCharAnchoredObjectPosition::GetRelPosToBase( const SwTwips _nObjBoundHeight, const SwFormatVertOrient& _rVert ) { diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index f51d0612dad6..0d9a088ae755 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -246,7 +246,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // AND vertical alignment at 'page areas'. SwTwips nAlignAreaHeight; SwTwips nAlignAreaOffset; - _GetVertAlignmentValues( *pOrientFrame, rPageAlignLayFrame, + GetVertAlignmentValues( *pOrientFrame, rPageAlignLayFrame, aVert.GetRelationOrient(), nAlignAreaHeight, nAlignAreaOffset ); @@ -378,23 +378,23 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // only if the floating screen object has to follow the text flow. if ( DoesObjFollowsTextFlow() && pOrientFrame != &rAnchorTextFrame ) { - // #i11860# - use new method <_GetTopForObjPos> + // #i11860# - use new method <GetTopForObjPos> // to get top of frame for object positioning. - const SwTwips nTopOfOrient = _GetTopForObjPos( *pOrientFrame, fnRect, bVert ); + const SwTwips nTopOfOrient = GetTopForObjPos( *pOrientFrame, fnRect, bVert ); nRelPosY += (*fnRect->fnYDiff)( nTopOfOrient, - _GetTopForObjPos( rAnchorTextFrame, fnRect, bVert ) ); + GetTopForObjPos( rAnchorTextFrame, fnRect, bVert ) ); } // #i42124# - capture object inside vertical // layout environment. { const SwTwips nTopOfAnch = - _GetTopForObjPos( *pOrientFrame, fnRect, bVert ); + GetTopForObjPos( *pOrientFrame, fnRect, bVert ); const SwLayoutFrame& rVertEnvironLayFrame = aEnvOfObj.GetVertEnvironmentLayoutFrame( *(pOrientFrame->GetUpper()) ); const bool bCheckBottom = !DoesObjFollowsTextFlow(); - nRelPosY = _AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, + nRelPosY = AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, rVertEnvironLayFrame, nRelPosY, DoesObjFollowsTextFlow(), bCheckBottom ); @@ -484,9 +484,9 @@ void SwToContentAnchoredObjectPosition::CalcPosition() ( aVert.GetRelationOrient() == text::RelOrientation::CHAR || aVert.GetRelationOrient() == text::RelOrientation::TEXT_LINE ) ) { - // #i11860# - use new method <_GetTopForObjPos> + // #i11860# - use new method <GetTopForObjPos> // to get top of frame for object positioning. - SwTwips nTopOfOrient = _GetTopForObjPos( *pOrientFrame, fnRect, bVert ); + SwTwips nTopOfOrient = GetTopForObjPos( *pOrientFrame, fnRect, bVert ); if ( aVert.GetRelationOrient() == text::RelOrientation::CHAR ) { nVertOffsetToFrameAnchorPos = (*fnRect->fnYDiff)( @@ -506,10 +506,10 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // instead of <pOrientFrame> and do not adjust relative position // to get correct vertical position. nVertOffsetToFrameAnchorPos = 0L; - // #i11860# - use new method <_GetTopForObjPos> + // #i11860# - use new method <GetTopForObjPos> // to get top of frame for object positioning. const SwTwips nTopOfOrient = - _GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); + GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); // Increase <nRelPosY> by margin height, // if position is vertical aligned to "paragraph text area" if ( aVert.GetRelationOrient() == text::RelOrientation::PRINT_AREA ) @@ -560,9 +560,9 @@ void SwToContentAnchoredObjectPosition::CalcPosition() maOffsetToFrameAnchorPos.X() = nVertOffsetToFrameAnchorPos; else maOffsetToFrameAnchorPos.Y() = nVertOffsetToFrameAnchorPos; - // #i11860# - use new method <_GetTopForObjPos> + // #i11860# - use new method <GetTopForObjPos> // to get top of frame for object positioning. - const SwTwips nTopOfAnch = _GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); + const SwTwips nTopOfAnch = GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); if( nRelPosY <= 0 ) { // Allow negative position, but keep it @@ -573,7 +573,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // anchored object would fit into environment layout frame, if // anchored object has to follow the text flow. const bool bCheckBottom = !DoesObjFollowsTextFlow(); - nRelPosY = _AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, + nRelPosY = AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, rVertEnvironLayFrame, nRelPosY, DoesObjFollowsTextFlow(), bCheckBottom ); @@ -613,7 +613,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // anchored object would fit into environment layout // frame, if anchored object has to follow the text flow. const bool bCheckBottom = !DoesObjFollowsTextFlow(); - nTmpRelPosY = _AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, + nTmpRelPosY = AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, rVertEnvironLayFrame, nTmpRelPosY, DoesObjFollowsTextFlow(), @@ -699,7 +699,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // align at 'page areas', but stay inside given environment const SwFrame& rVertEnvironLayFrame = aEnvOfObj.GetVertEnvironmentLayoutFrame( *pUpperOfOrientFrame ); - nRelPosY = _AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, + nRelPosY = AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, rVertEnvironLayFrame, nRelPosY, DoesObjFollowsTextFlow() ); @@ -717,7 +717,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // We need to calculate the part's absolute position, in order for // it to be put onto the right page and to be pulled into the // LayLeaf's PrtArea - const SwTwips nTopOfAnch = _GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); + const SwTwips nTopOfAnch = GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); if( bVert ) { // --> OD 2009-08-31 #monglianlayout# @@ -821,7 +821,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() nTmpRelPosY = aRelPos.Y() + nDist; const SwLayoutFrame& rVertEnvironLayFrame = aEnvOfObj.GetVertEnvironmentLayoutFrame( *pUpperOfOrientFrame ); - nTmpRelPosY = _AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, + nTmpRelPosY = AdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, rVertEnvironLayFrame, nTmpRelPosY, DoesObjFollowsTextFlow(), @@ -979,7 +979,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // set calculated vertical position in order to determine correct // frame, the horizontal position is oriented at. - const SwTwips nTopOfAnch = _GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); + const SwTwips nTopOfAnch = GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); if( bVert ) { // --> OD 2009-08-31 #mongolianlayout# @@ -1000,12 +1000,12 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // #i28701# - If floating screen object doesn't follow // the text flow, its horizontal position is oriented at <pOrientFrame>. const SwFrame* pHoriOrientFrame = DoesObjFollowsTextFlow() - ? &_GetHoriVirtualAnchor( *mpVertPosOrientFrame ) + ? &GetHoriVirtualAnchor( *mpVertPosOrientFrame ) : pOrientFrame; // #i26791# - get 'horizontal' offset to frame anchor position. SwTwips nHoriOffsetToFrameAnchorPos( 0L ); - SwTwips nRelPosX = _CalcRelPosX( *pHoriOrientFrame, aEnvOfObj, + SwTwips nRelPosX = CalcRelPosX( *pHoriOrientFrame, aEnvOfObj, aHori, rLR, rUL, bWrapThrough, ( bVert ? aRelPos.X() : aRelPos.Y() ), nHoriOffsetToFrameAnchorPos ); @@ -1039,7 +1039,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() } // set absolute position at object - const SwTwips nTopOfAnch = _GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); + const SwTwips nTopOfAnch = GetTopForObjPos( *pAnchorFrameForVertPos, fnRect, bVert ); if( bVert ) { // --> OD 2009-08-31 #mongolianlayout# @@ -1069,7 +1069,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() /** * Determine frame for horizontal position */ -const SwFrame& SwToContentAnchoredObjectPosition::_GetHoriVirtualAnchor( +const SwFrame& SwToContentAnchoredObjectPosition::GetHoriVirtualAnchor( const SwLayoutFrame& _rProposedFrame ) const { const SwFrame* pHoriVirtAnchFrame = &_rProposedFrame; diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 45d8f09762d6..992dae77da8f 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -82,7 +82,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() // #i26791# - get vertical offset to frame anchor position. SwTwips nVertOffsetToFrameAnchorPos( 0L ); SwTwips nRelPosY = - _GetVertRelPos( GetAnchorFrame(), GetAnchorFrame(), eVertOrient, + GetVertRelPos( GetAnchorFrame(), GetAnchorFrame(), eVertOrient, aVert.GetRelationOrient(), aVert.GetPos(), rLR, rUL, nVertOffsetToFrameAnchorPos ); @@ -145,7 +145,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() sal_Int16 eHoriOrient = aHori.GetHoriOrient(); sal_Int16 eRelOrient = aHori.GetRelationOrient(); // toggle orientation - _ToggleHoriOrientAndAlign( bToggle, eHoriOrient, eRelOrient ); + ToggleHoriOrientAndAlign( bToggle, eHoriOrient, eRelOrient ); // determine alignment values: // <nWidth>: 'width' of the alignment area @@ -154,7 +154,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() SwTwips nWidth, nOffset; { bool bDummy; // in this context irrelevant output parameter - _GetHoriAlignmentValues( GetAnchorFrame(), GetAnchorFrame(), + GetHoriAlignmentValues( GetAnchorFrame(), GetAnchorFrame(), eRelOrient, false, nWidth, nOffset, bDummy ); } diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx index 68867f5c47f9..831f70bd4729 100644 --- a/sw/source/core/sw3io/swacorr.cxx +++ b/sw/source/core/sw3io/swacorr.cxx @@ -80,7 +80,7 @@ bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >& rStg, nRet = aBlk.BeginPutDoc( rShort, rShort ); if( !IsError( nRet ) ) { - rDShell.GetEditShell()->_CopySelToDoc( pDoc ); + rDShell.GetEditShell()->CopySelToDoc( pDoc ); nRet = aBlk.PutDoc(); aBlk.AddName ( rShort, rShort ); if( !IsError( nRet ) ) diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index 1103e651f73b..2f4038e4a4e3 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -596,7 +596,7 @@ static void lcl_InvalidateCellFrame( const SwTableBox& rBox ) pCell->InvalidateSize(); SwFrame* pLower = pCell->GetLower(); if( pLower ) - pLower->_InvalidateSize(); + pLower->InvalidateSize_(); } } } @@ -685,7 +685,7 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, AdjustWidths( static_cast< long >(nTableWidth), static_cast< long >(nTableWidth - nAddWidth) ); } - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); aFndBox.SetTableLines( rBoxes, *this ); aFndBox.DelFrames( *this ); @@ -703,7 +703,7 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, if( bBehind ) ++nInsPos; SwTableBoxFormat* pBoxFrameFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()); - ::_InsTableBox( pDoc, pTableNd, pLine, pBoxFrameFormat, pBox, nInsPos, nCnt ); + ::InsTableBox( pDoc, pTableNd, pLine, pBoxFrameFormat, pBox, nInsPos, nCnt ); long nRowSpan = pBox->getRowSpan(); long nDiff = i - nLastLine; bool bNewSpan = false; @@ -921,7 +921,7 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes, { // A row containing overlapped cells is superfluous, // these cells can be put into rBoxes for deletion - _FindSuperfluousRows( rBoxes, pFirstLn, pLastLn ); + FindSuperfluousRows_( rBoxes, pFirstLn, pLastLn ); // pNewFormat will be set to the new master box and the overlapped cells SwFrameFormat* pNewFormat = pMergeBox->ClaimFrameFormat(); pNewFormat->SetFormatAttr( SwFormatFrameSize( ATT_VAR_SIZE, pSel->mnMergeWidth, 0 ) ); @@ -961,11 +961,11 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes, return bMerge; } -/** SwTable::_FindSuperfluousRows(..) is looking for superfluous rows, i.e. rows +/** SwTable::FindSuperfluousRows_(..) is looking for superfluous rows, i.e. rows containing overlapped cells only. */ -void SwTable::_FindSuperfluousRows( SwSelBoxes& rBoxes, +void SwTable::FindSuperfluousRows_( SwSelBoxes& rBoxes, SwTableLine* pFirstLn, SwTableLine* pLastLn ) { if( !pFirstLn || !pLastLn ) @@ -1166,7 +1166,7 @@ void SwTable::InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nRowIdx, sal_uInt16 nCnt aFSz.SetHeight( nNewHeight ); pFrameFormat->SetFormatAttr( aFSz ); } - _InsertRow( pDoc, aBoxes, nCnt, true ); + InsertRow_( pDoc, aBoxes, nCnt, true ); const size_t nBoxCount = rLine.GetTabBoxes().size(); for( sal_uInt16 n = 0; n < nCnt; ++n ) { @@ -1399,7 +1399,7 @@ bool SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn { CHECK_TABLE( *this ) ++nCnt; - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); aFndBox.SetTableLines( rBoxes, *this ); if( bSameHeight && pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ) @@ -1490,7 +1490,7 @@ bool SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nRowIdx = lcl_LineIndex( *this, rBoxes, bBehind ); if( nRowIdx < USHRT_MAX ) { - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); aFndBox.SetTableLines( rBoxes, *this ); aFndBox.DelFrames( *this ); @@ -1498,7 +1498,7 @@ bool SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, SwTableLine *pLine = GetTabLines()[ nRowIdx ]; SwSelBoxes aLineBoxes; lcl_FillSelBoxes( aLineBoxes, *pLine ); - _InsertRow( pDoc, aLineBoxes, nCnt, bBehind ); + InsertRow_( pDoc, aLineBoxes, nCnt, bBehind ); const size_t nBoxCount = pLine->GetTabBoxes().size(); sal_uInt16 nOfs = bBehind ? 0 : 1; for( sal_uInt16 n = 0; n < nCnt; ++n ) @@ -1534,7 +1534,7 @@ bool SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, CHECK_TABLE( *this ) } else - bRet = _InsertRow( pDoc, rBoxes, nCnt, bBehind ); + bRet = InsertRow_( pDoc, rBoxes, nCnt, bBehind ); return bRet; } diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index bfd91b614bd9..ef3f73825753 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -156,7 +156,7 @@ static OUString& lcl_DelTabsAtSttEnd( OUString& rText ) return rText; } -void _InsTableBox( SwDoc* pDoc, SwTableNode* pTableNd, +void InsTableBox( SwDoc* pDoc, SwTableNode* pTableNd, SwTableLine* pLine, SwTableBoxFormat* pBoxFrameFormat, SwTableBox* pBox, sal_uInt16 nInsPos, sal_uInt16 nCnt ) @@ -987,7 +987,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld, SwTwips nSize = GetFrameFormat()->GetFrameSize().GetWidth(); for (size_t n = 0; n < m_aLines.size(); ++n) { - _CheckBoxWidth( *m_aLines[ n ], nSize ); + CheckBoxWidth( *m_aLines[ n ], nSize ); } } #endif @@ -1298,7 +1298,7 @@ static bool lcl_IsValidRowName( const OUString& rStr ) // #i80314# // add 3rd parameter and its handling -sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, bool bFirstPart, +sal_uInt16 SwTable::GetBoxNum( OUString& rStr, bool bFirstPart, const bool bPerformValidCheck ) { sal_uInt16 nRet = 0; @@ -1362,7 +1362,7 @@ const SwTableBox* SwTable::GetTableBox( const OUString& rName, OUString aNm( rName ); while( !aNm.isEmpty() ) { - nBox = SwTable::_GetBoxNum( aNm, nullptr == pBox, bPerformValidCheck ); + nBox = SwTable::GetBoxNum( aNm, nullptr == pBox, bPerformValidCheck ); // first box ? if( !pBox ) pLines = &GetTabLines(); @@ -1373,7 +1373,7 @@ const SwTableBox* SwTable::GetTableBox( const OUString& rName, --nBox; } - nLine = SwTable::_GetBoxNum( aNm, false, bPerformValidCheck ); + nLine = SwTable::GetBoxNum( aNm, false, bPerformValidCheck ); // determine line if( !nLine || nLine > pLines->size() ) @@ -1535,7 +1535,7 @@ void SwTableLine::ChgFrameFormat( SwTableLineFormat *pNewFormat ) pRow->RegisterToFormat( *pNewFormat ); pRow->InvalidateSize(); - pRow->_InvalidatePrt(); + pRow->InvalidatePrt_(); pRow->SetCompletePaint(); pRow->ReinitializeFrameSizeAttrFlags(); @@ -1770,7 +1770,7 @@ void SwTableBox::ChgFrameFormat( SwTableBoxFormat* pNewFormat ) { pCell->RegisterToFormat( *pNewFormat ); pCell->InvalidateSize(); - pCell->_InvalidatePrt(); + pCell->InvalidatePrt_(); pCell->SetCompletePaint(); pCell->SetDerivedVert( false ); pCell->CheckDirChange(); @@ -1783,8 +1783,8 @@ void SwTableBox::ChgFrameFormat( SwTableBoxFormat* pNewFormat ) if ( pTab && pTab->IsCollapsingBorders() ) { SwFrame* pRow = pCell->GetUpper(); - pRow->_InvalidateSize(); - pRow->_InvalidatePrt(); + pRow->InvalidateSize_(); + pRow->InvalidatePrt_(); } } } diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 48f574b562e7..450d0e9b599d 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1653,13 +1653,13 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // We have to distinguish between intern and real URLs const bool bIntern = '#' == aURL[0]; - // _GetCursor() is a SwShellCursor, which is derived from + // GetCursor_() is a SwShellCursor, which is derived from // SwSelPaintRects, therefore the rectangles of the current // selection can be easily obtained: // Note: We make a copy of the rectangles, because they may // be deleted again in JumpToSwMark. SwRects aTmp; - aTmp.insert( aTmp.begin(), mrSh.SwCursorShell::_GetCursor()->begin(), mrSh.SwCursorShell::_GetCursor()->end() ); + aTmp.insert( aTmp.begin(), mrSh.SwCursorShell::GetCursor_()->begin(), mrSh.SwCursorShell::GetCursor_()->end() ); OSL_ENSURE( !aTmp.empty(), "Enhanced pdf export - rectangles are missing" ); const SwPageFrame* pSelectionPage = @@ -1838,7 +1838,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // Link Rectangles SwRects aTmp; - aTmp.insert( aTmp.begin(), mrSh.SwCursorShell::_GetCursor()->begin(), mrSh.SwCursorShell::_GetCursor()->end() ); + aTmp.insert( aTmp.begin(), mrSh.SwCursorShell::GetCursor_()->begin(), mrSh.SwCursorShell::GetCursor_()->end() ); OSL_ENSURE( !aTmp.empty(), "Enhanced pdf export - rectangles are missing" ); mrSh.SwCursorShell::ClearMark(); @@ -1913,15 +1913,15 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() const SwTextFootnote* pTextFootnote = pDoc->GetFootnoteIdxs()[ nIdx ]; SwTextNode& rTNd = const_cast<SwTextNode&>(pTextFootnote->GetTextNode()); - mrSh._GetCursor()->GetPoint()->nNode = rTNd; - mrSh._GetCursor()->GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() ); + mrSh.GetCursor_()->GetPoint()->nNode = rTNd; + mrSh.GetCursor_()->GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() ); // 1. Check if the whole paragraph is hidden // 2. Check for hidden text attribute if ( rTNd.GetTextNode()->IsHidden() || mrSh.SelectHiddenRange() ) continue; - SwCursorSaveState aSaveState( *mrSh._GetCursor() ); + SwCursorSaveState aSaveState( *mrSh.GetCursor_() ); // Select the footnote: mrSh.SwCursorShell::SetMark(); @@ -1929,10 +1929,10 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // Link Rectangle SwRects aTmp; - aTmp.insert( aTmp.begin(), mrSh.SwCursorShell::_GetCursor()->begin(), mrSh.SwCursorShell::_GetCursor()->end() ); + aTmp.insert( aTmp.begin(), mrSh.SwCursorShell::GetCursor_()->begin(), mrSh.SwCursorShell::GetCursor_()->end() ); OSL_ENSURE( !aTmp.empty(), "Enhanced pdf export - rectangles are missing" ); - mrSh._GetCursor()->RestoreSavePos(); + mrSh.GetCursor_()->RestoreSavePos(); mrSh.SwCursorShell::ClearMark(); if (aTmp.empty()) diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 346aed608ac4..00599a1d7476 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -538,10 +538,10 @@ struct SwFillData void SetOrient( const sal_Int16 eNew ){ pCMS->m_pFill->eOrient = eNew; } }; -bool SwTextFrame::_GetCursorOfst(SwPosition* pPos, const Point& rPoint, +bool SwTextFrame::GetCursorOfst_(SwPosition* pPos, const Point& rPoint, const bool bChgFrame, SwCursorMoveState* pCMS ) const { - // _GetCursorOfst is called by GetCursorOfst and GetKeyCursorOfst. + // GetCursorOfst_ is called by GetCursorOfst and GetKeyCursorOfst. // Never just a return false. if( IsLocked() || IsHiddenNow() ) @@ -658,7 +658,7 @@ bool SwTextFrame::GetCursorOfst(SwPosition* pPos, Point& rPoint, SwCursorMoveState* pCMS, bool ) const { const bool bChgFrame = !(pCMS && MV_UPDOWN == pCMS->m_eState); - return _GetCursorOfst( pPos, rPoint, bChgFrame, pCMS ); + return GetCursorOfst_( pPos, rPoint, bChgFrame, pCMS ); } /* @@ -749,7 +749,7 @@ public: inline void SetRight( const bool bNew ) { bRight = bNew; } }; -bool SwTextFrame::_UnitUp( SwPaM *pPam, const SwTwips nOffset, +bool SwTextFrame::UnitUp_( SwPaM *pPam, const SwTwips nOffset, bool bSetInReadOnly ) const { // Set the RightMargin if needed @@ -1138,7 +1138,7 @@ void SwTextFrame::PrepareVisualMove( sal_Int32& nPos, sal_uInt8& nCursorLevel, ubidi_close( pBidi ); } -bool SwTextFrame::_UnitDown(SwPaM *pPam, const SwTwips nOffset, +bool SwTextFrame::UnitDown_(SwPaM *pPam, const SwTwips nOffset, bool bSetInReadOnly ) const { @@ -1275,10 +1275,10 @@ bool SwTextFrame::UnitUp(SwPaM *pPam, const SwTwips nOffset, */ const SwTextFrame *pFrame = GetAdjFrameAtPos( const_cast<SwTextFrame*>(this), *(pPam->GetPoint()), SwTextCursor::IsRightMargin() ); - const bool bRet = pFrame->_UnitUp( pPam, nOffset, bSetInReadOnly ); + const bool bRet = pFrame->UnitUp_( pPam, nOffset, bSetInReadOnly ); // No SwTextCursor::SetRightMargin( false ); - // Instead we have a SwSetToRightMargin in _UnitUp + // Instead we have a SwSetToRightMargin in UnitUp_ return bRet; } @@ -1287,7 +1287,7 @@ bool SwTextFrame::UnitDown(SwPaM *pPam, const SwTwips nOffset, { const SwTextFrame *pFrame = GetAdjFrameAtPos(const_cast<SwTextFrame*>(this), *(pPam->GetPoint()), SwTextCursor::IsRightMargin() ); - const bool bRet = pFrame->_UnitDown( pPam, nOffset, bSetInReadOnly ); + const bool bRet = pFrame->UnitDown_( pPam, nOffset, bSetInReadOnly ); SwTextCursor::SetRightMargin( false ); return bRet; } @@ -1467,7 +1467,7 @@ void SwTextFrame::FillCursorPos( SwFillData& rFill ) const { const OUString aTmp(" "); SwDrawTextInfo aDrawInf( pSh, *pOut, nullptr, aTmp, 0, 2 ); - nSpace = pFnt->_GetTextSize( aDrawInf ).Width()/2; + nSpace = pFnt->GetTextSize_( aDrawInf ).Width()/2; } if( rFill.X() >= nRight ) { diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index d5965357a435..5ad56099dbaf 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -112,13 +112,13 @@ void SwTextFrame::ValidateFrame() // After a RemoveFootnote the BodyFrame and all Frames contained within it, need to be // recalculated, so that the DeadLine is right. // First we search outwards, on the way back we calculate everything. -void _ValidateBodyFrame( SwFrame *pFrame ) +void ValidateBodyFrame_( SwFrame *pFrame ) { vcl::RenderContext* pRenderContext = pFrame ? pFrame->getRootFrame()->GetCurrShell()->GetOut() : nullptr; if( pFrame && !pFrame->IsCellFrame() ) { if( !pFrame->IsBodyFrame() && pFrame->GetUpper() ) - _ValidateBodyFrame( pFrame->GetUpper() ); + ValidateBodyFrame_( pFrame->GetUpper() ); if( !pFrame->IsSctFrame() ) pFrame->Calc(pRenderContext); else @@ -139,14 +139,14 @@ void SwTextFrame::ValidateBodyFrame() // See comment in ValidateFrame() if ( !IsInFly() && !IsInTab() && !( IsInSct() && FindSctFrame()->Lower()->IsColumnFrame() ) ) - _ValidateBodyFrame( GetUpper() ); + ValidateBodyFrame_( GetUpper() ); } -bool SwTextFrame::_GetDropRect( SwRect &rRect ) const +bool SwTextFrame::GetDropRect_( SwRect &rRect ) const { SwSwapIfNotSwapped swap(const_cast<SwTextFrame *>(this)); - OSL_ENSURE( HasPara(), "SwTextFrame::_GetDropRect: try again next year." ); + OSL_ENSURE( HasPara(), "SwTextFrame::GetDropRect_: try again next year." ); SwTextSizeInfo aInf( const_cast<SwTextFrame*>(this) ); SwTextMargin aLine( const_cast<SwTextFrame*>(this), &aInf ); if( aLine.GetDropLines() ) @@ -213,7 +213,7 @@ bool SwTextFrame::CalcFollow( const sal_Int32 nTextOfst ) bOldInvaContent = pPage->IsInvalidContent(); } - pMyFollow->_SetOfst( nTextOfst ); + pMyFollow->SetOfst_( nTextOfst ); pMyFollow->SetFieldFollow( bFollowField ); if( HasFootnote() || pMyFollow->HasFootnote() ) { @@ -532,7 +532,7 @@ css::uno::Sequence< css::style::TabStop > SwTextFrame::GetTabStopInfo( SwTwips C // nOffset holds the Offset in the text string, from which the Master closes // and the Follow starts. // If it's 0, the FollowFrame is deleted. -void SwTextFrame::_AdjustFollow( SwTextFormatter &rLine, +void SwTextFrame::AdjustFollow_( SwTextFormatter &rLine, const sal_Int32 nOffset, const sal_Int32 nEnd, const sal_uInt8 nMode ) { @@ -737,7 +737,7 @@ void SwTextFrame::SplitFrame( const sal_Int32 nTextPos ) pNew->ManipOfst( nTextPos ); } -void SwTextFrame::_SetOfst( const sal_Int32 nNewOfst ) +void SwTextFrame::SetOfst_( const sal_Int32 nNewOfst ) { // We do not need to invalidate out Follow. // We are a Follow, get formatted right away and call @@ -1103,7 +1103,7 @@ void SwTextFrame::FormatAdjust( SwTextFormatter &rLine, AdjustFrame( nChg, bHasToFit ); if( HasFollow() || IsInFootnote() ) - _AdjustFollow( rLine, nEnd, nStrLen, nNew ); + AdjustFollow_( rLine, nEnd, nStrLen, nNew ); pPara->SetPrepMustFit( false ); } @@ -1246,10 +1246,10 @@ bool SwTextFrame::FormatLine( SwTextFormatter &rLine, const bool bPrev ) return 0 != pPara->GetDelta(); } -void SwTextFrame::_Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf, +void SwTextFrame::Format_( SwTextFormatter &rLine, SwTextFormatInfo &rInf, const bool bAdjust ) { - OSL_ENSURE( ! IsVertical() || IsSwapped(),"SwTextFrame::_Format with unswapped frame" ); + OSL_ENSURE( ! IsVertical() || IsSwapped(),"SwTextFrame::Format_ with unswapped frame" ); SwParaPortion *pPara = rLine.GetInfo().GetParaPortion(); rLine.SetUnclipped( false ); @@ -1556,7 +1556,7 @@ void SwTextFrame::_Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf, rLine.Bottom(); SwTwips nNewBottom = rLine.Y(); if( nNewBottom < nOldBottom ) - _SetOfst( 0 ); + SetOfst_( 0 ); } } } @@ -1585,7 +1585,7 @@ void SwTextFrame::FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf rLine.SetOnceMore( false ); SwCharRange aRange( 0, rInf.GetText().getLength() ); pPara->GetReformat() = aRange; - _Format( rLine, rInf ); + Format_( rLine, rInf ); bGoOn = rLine.IsOnceMore(); if( bGoOn ) @@ -1615,7 +1615,7 @@ void SwTextFrame::FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf rLine.CalcDropHeight( 1 ); SwCharRange aTmpRange( 0, rInf.GetText().getLength() ); pPara->GetReformat() = aTmpRange; - _Format( rLine, rInf, true ); + Format_( rLine, rInf, true ); // We paint everything ... SetCompletePaint(); } @@ -1623,7 +1623,7 @@ void SwTextFrame::FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf } } -void SwTextFrame::_Format( vcl::RenderContext* pRenderContext, SwParaPortion *pPara ) +void SwTextFrame::Format_( vcl::RenderContext* pRenderContext, SwParaPortion *pPara ) { const bool bIsEmpty = GetText().isEmpty(); @@ -1645,7 +1645,7 @@ void SwTextFrame::_Format( vcl::RenderContext* pRenderContext, SwParaPortion *pP pPara->SetPrepMustFit( bMustFit ); } - OSL_ENSURE( ! IsSwapped(), "A frame is swapped before _Format" ); + OSL_ENSURE( ! IsSwapped(), "A frame is swapped before Format_" ); if ( IsVertical() ) SwapWidthAndHeight(); @@ -1655,7 +1655,7 @@ void SwTextFrame::_Format( vcl::RenderContext* pRenderContext, SwParaPortion *pP HideAndShowObjects(); - _Format( aLine, aInf ); + Format_( aLine, aInf ); if( aLine.IsOnceMore() ) FormatOnceMore( aLine, aInf ); @@ -1663,7 +1663,7 @@ void SwTextFrame::_Format( vcl::RenderContext* pRenderContext, SwParaPortion *pP if ( IsVertical() ) SwapWidthAndHeight(); - OSL_ENSURE( ! IsSwapped(), "A frame is swapped after _Format" ); + OSL_ENSURE( ! IsSwapped(), "A frame is swapped after Format_" ); if( 1 < aLine.GetDropLines() ) { @@ -1790,7 +1790,7 @@ void SwTextFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderAttr { // bSetOfst here means that we have the "red arrow situation" if ( bSetOfst ) - _SetOfst( 0 ); + SetOfst_( 0 ); const bool bOrphan = IsWidow(); const SwFootnoteBossFrame* pFootnoteBoss = HasFootnote() ? FindFootnoteBossFrame() : nullptr; @@ -1802,7 +1802,7 @@ void SwTextFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderAttr } do { - _Format( pRenderContext, aAccess.GetPara() ); + Format_( pRenderContext, aAccess.GetPara() ); if( pFootnoteBoss && nFootnoteHeight ) { const SwFootnoteContFrame* pCont = pFootnoteBoss->FindFootnoteCont(); @@ -1844,7 +1844,7 @@ void SwTextFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderAttr pPara->SetPrepMustFit( false ); CalcBaseOfstForFly(); - _CalcHeightOfLastLine(); // i#11860 - Adjust spacing implementation for + CalcHeightOfLastLine(); // i#11860 - Adjust spacing implementation for // object positioning - Compatibility to MS Word } @@ -1919,7 +1919,7 @@ bool SwTextFrame::FormatQuick( bool bForceQuickFormat ) { // Attention: This situation can occur due to FormatLevel==12. Don't panic! const sal_Int32 nStrt = GetOfst(); - _InvalidateRange( SwCharRange( nStrt, nEnd - nStrt) ); + InvalidateRange_( SwCharRange( nStrt, nEnd - nStrt) ); return false; } diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 842bd4073123..d22d5af964d4 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -220,7 +220,7 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed ) bool bPaint = true; if( !IsClipChg() ) { - Size aSize = pTmpFnt->_GetTextSize( aDrawInf ); + Size aSize = pTmpFnt->GetTextSize_( aDrawInf ); if( bGoLeft ) aTmpPos.X() -= aSize.Width(); // calculate rectangle containing the line number @@ -236,10 +236,10 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed ) } } else if( bGoLeft ) - aTmpPos.X() -= pTmpFnt->_GetTextSize( aDrawInf ).Width(); + aTmpPos.X() -= pTmpFnt->GetTextSize_( aDrawInf ).Width(); aDrawInf.SetPos( aTmpPos ); if( bPaint ) - pTmpFnt->_DrawText( aDrawInf ); + pTmpFnt->DrawText_( aDrawInf ); if( bTooBig ) delete pTmpFnt; @@ -560,7 +560,7 @@ bool SwTextFrame::PaintEmpty( const SwRect &rRect, bool bCheck ) const aDrawInf.SetSnapToGrid( false ); pFnt->SetColor(NON_PRINTING_CHARACTER_COLOR); - pFnt->_DrawText( aDrawInf ); + pFnt->DrawText_( aDrawInf ); } delete pClip; } diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 95dadc18f664..156591407742 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -395,7 +395,7 @@ SwPosSize SwTextSizeInfo::GetTextSize( OutputDevice* pOutDev, aDrawInf.SetFont( m_pFnt ); aDrawInf.SetSnapToGrid( SnapToGrid() ); aDrawInf.SetKanaComp( 0 ); - return SwPosSize(m_pFnt->_GetTextSize( aDrawInf )); + return SwPosSize(m_pFnt->GetTextSize_( aDrawInf )); } SwPosSize SwTextSizeInfo::GetTextSize() const @@ -416,7 +416,7 @@ SwPosSize SwTextSizeInfo::GetTextSize() const aDrawInf.SetFont( m_pFnt ); aDrawInf.SetSnapToGrid( SnapToGrid() ); aDrawInf.SetKanaComp( nComp ); - return SwPosSize(m_pFnt->_GetTextSize( aDrawInf )); + return SwPosSize(m_pFnt->GetTextSize_( aDrawInf )); } void SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nIndex, @@ -430,7 +430,7 @@ void SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nInde aDrawInf.SetFont( m_pFnt ); aDrawInf.SetSnapToGrid( SnapToGrid() ); aDrawInf.SetKanaComp( nComp ); - SwPosSize aSize( m_pFnt->_GetTextSize( aDrawInf ) ); + SwPosSize aSize( m_pFnt->GetTextSize_( aDrawInf ) ); nMaxSizeDiff = (sal_uInt16)aDrawInf.GetKanaDiff(); nMinSize = aSize.Width(); } @@ -476,7 +476,7 @@ sal_Int32 SwTextSizeInfo::GetTextBreak( const long nLineWidth, return m_pFnt->GetTextBreak( aDrawInf, nLineWidth ); } -bool SwTextSizeInfo::_HasHint( const SwTextNode* pTextNode, sal_Int32 nPos ) +bool SwTextSizeInfo::HasHint_( const SwTextNode* pTextNode, sal_Int32 nPos ) { return pTextNode->GetTextAttrForCharAt(nPos); } @@ -567,7 +567,7 @@ static bool lcl_IsDarkBackground( const SwTextPaintInfo& rInf ) return pCol->IsDark(); } -void SwTextPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor, +void SwTextPaintInfo::DrawText_( const OUString &rText, const SwLinePortion &rPor, const sal_Int32 nStart, const sal_Int32 nLength, const bool bKern, const bool bWrong, const bool bSmartTag, @@ -715,13 +715,13 @@ void SwTextPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPo { aDrawInf.SetPos( aFontPos ); if( bKern ) - m_pFnt->_DrawStretchText( aDrawInf ); + m_pFnt->DrawStretchText_( aDrawInf ); else { aDrawInf.SetWrong( bTmpWrong ? pWrongList : nullptr ); aDrawInf.SetGrammarCheck( bTmpGrammarCheck ? pGrammarCheckList : nullptr ); aDrawInf.SetSmartTags( bTmpSmart ? pSmartTags : nullptr ); - m_pFnt->_DrawText( aDrawInf ); + m_pFnt->DrawText_( aDrawInf ); } } } @@ -1264,7 +1264,7 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion &rPor, } } -void SwTextPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const +void SwTextPaintInfo::NotifyURL_( const SwLinePortion &rPor ) const { OSL_ENSURE( pNoteURL, "NotifyURL: pNoteURL gone with the wind!" ); @@ -1522,7 +1522,7 @@ SwTextFormatInfo::SwTextFormatInfo( const SwTextFormatInfo& rInf, SetFirstMulti( rInf.IsFirstMulti() ); } -bool SwTextFormatInfo::_CheckFootnotePortion( SwLineLayout* pCurr ) +bool SwTextFormatInfo::CheckFootnotePortion_( SwLineLayout* pCurr ) { const sal_uInt16 nHeight = pCurr->GetRealHeight(); for( SwLinePortion *pPor = pCurr->GetPortion(); pPor; pPor = pPor->GetPortion() ) diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index d62e1725e7d7..f518c85ac3ca 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -302,8 +302,8 @@ public: inline const SwTextFrame *GetTextFrame() const { return m_pFrame; } inline bool HasHint( sal_Int32 nPos ) const - { return _HasHint( m_pFrame->GetTextNode(), nPos ); } - static bool _HasHint( const SwTextNode* pTextNode, sal_Int32 nPos ); + { return HasHint_( m_pFrame->GetTextNode(), nPos ); } + static bool HasHint_( const SwTextNode* pTextNode, sal_Int32 nPos ); // If Kana Compression is enabled, a minimum and maximum portion width // is calculated. We format lines with minimal size and share remaining @@ -367,14 +367,14 @@ class SwTextPaintInfo : public SwTextSizeInfo SwRect aPaintRect; // Original paint rect (from Layout paint) sal_uInt16 nSpaceIdx; - void _DrawText( const OUString &rText, const SwLinePortion &rPor, + void DrawText_( const OUString &rText, const SwLinePortion &rPor, const sal_Int32 nIdx, const sal_Int32 nLen, const bool bKern, const bool bWrong = false, const bool bSmartTag = false, const bool bGrammarCheck = false ); SwTextPaintInfo &operator=(const SwTextPaintInfo&) = delete; - void _NotifyURL( const SwLinePortion &rPor ) const; + void NotifyURL_( const SwLinePortion &rPor ) const; protected: SwTextPaintInfo() @@ -439,7 +439,7 @@ public: void DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool bChecked) const; inline void NotifyURL( const SwLinePortion &rPor ) const - { if( URLNotify() ) _NotifyURL( rPor ); } + { if( URLNotify() ) NotifyURL_( rPor ); } /** * Calculate the rectangular area where the portion takes place. @@ -542,7 +542,7 @@ class SwTextFormatInfo : public SwTextPaintInfo // Hyphenating ... bool InitHyph( const bool bAuto = false ); - bool _CheckFootnotePortion( SwLineLayout* pCurr ); + bool CheckFootnotePortion_( SwLineLayout* pCurr ); public: void CtorInitTextFormatInfo( OutputDevice* pRenderContext, SwTextFrame *pFrame, const bool bInterHyph = false, @@ -668,7 +668,7 @@ public: const css::beans::PropertyValues & GetHyphValues() const; bool CheckFootnotePortion( SwLineLayout* pCurr ) - { return IsFootnoteInside() && _CheckFootnotePortion( pCurr ); } + { return IsFootnoteInside() && CheckFootnotePortion_( pCurr ); } // Dropcaps called by SwTextFormatter::CTOR const SwFormatDrop *GetDropFormat() const; @@ -765,13 +765,13 @@ inline void SwTextPaintInfo::DrawText( const OUString &rText, const sal_Int32 nStart, const sal_Int32 nLength, const bool bKern ) const { - const_cast<SwTextPaintInfo*>(this)->_DrawText( rText, rPor, nStart, nLength, bKern ); + const_cast<SwTextPaintInfo*>(this)->DrawText_( rText, rPor, nStart, nLength, bKern ); } inline void SwTextPaintInfo::DrawText( const SwLinePortion &rPor, const sal_Int32 nLength, const bool bKern ) const { - const_cast<SwTextPaintInfo*>(this)->_DrawText( *m_pText, rPor, m_nIdx, nLength, bKern ); + const_cast<SwTextPaintInfo*>(this)->DrawText_( *m_pText, rPor, m_nIdx, nLength, bKern ); } inline void SwTextPaintInfo::DrawMarkedText( const SwLinePortion &rPor, @@ -780,7 +780,7 @@ inline void SwTextPaintInfo::DrawMarkedText( const SwLinePortion &rPor, const bool bSmartTags, const bool bGrammarCheck ) const { - const_cast<SwTextPaintInfo*>(this)->_DrawText( *m_pText, rPor, m_nIdx, nLength, false/*bKern*/, bWrong, bSmartTags, bGrammarCheck ); + const_cast<SwTextPaintInfo*>(this)->DrawText_( *m_pText, rPor, m_nIdx, nLength, false/*bKern*/, bWrong, bSmartTags, bGrammarCheck ); } inline sal_Int32 SwTextFormatInfo::GetReformatStart() const diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 38d970204278..3a47265d7441 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -390,7 +390,7 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString & } SwDrawTextInfo aDrawInf( rArg.pSh, *rArg.pOut, nullptr, rText, nIdx, nStop - nIdx ); - long nAktWidth = pFnt->_GetTextSize( aDrawInf ).Width(); + long nAktWidth = pFnt->GetTextSize_( aDrawInf ).Width(); rArg.nRowWidth += nAktWidth; if( bClear ) rArg.NewWord(); @@ -666,7 +666,7 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM OUString sTmp( cChar ); SwDrawTextInfo aDrawInf( getIDocumentLayoutAccess().GetCurrentViewShell(), *pOut, nullptr, sTmp, 0, 1, 0, false ); - nAktWidth = aIter.GetFnt()->_GetTextSize( aDrawInf ).Width(); + nAktWidth = aIter.GetFnt()->GetTextSize_( aDrawInf ).Width(); aArg.nWordWidth += nAktWidth; aArg.nRowWidth += nAktWidth; if( (long)rAbsMin < aArg.nWordWidth ) @@ -891,7 +891,7 @@ sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd if ( nStop > nIdx ) { SwDrawTextInfo aDrawInf( pSh, *pOut, nullptr, GetText(), nIdx, nStop - nIdx ); - nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width(); + nProWidth += aIter.GetFnt()->GetTextSize_( aDrawInf ).Width(); } nIdx = nStop; @@ -908,7 +908,7 @@ sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd // tab receives width of one space OUString sTmp( CH_BLANK ); SwDrawTextInfo aDrawInf( pSh, *pOut, nullptr, sTmp, 0, 1 ); - nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width(); + nProWidth += aIter.GetFnt()->GetTextSize_( aDrawInf ).Width(); nIdx++; } else if ( cChar == CHAR_SOFTHYPHEN ) @@ -917,7 +917,7 @@ sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd { OUString sTmp( cChar ); SwDrawTextInfo aDrawInf( pSh, *pOut, nullptr, sTmp, 0, 1 ); - nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width(); + nProWidth += aIter.GetFnt()->GetTextSize_( aDrawInf ).Width(); nIdx++; } else if ( pHint && ( cChar == CH_TXTATR_BREAKWORD || cChar == CH_TXTATR_INWORD ) ) @@ -929,7 +929,7 @@ sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd const OUString aText = pHint->GetFootnote().GetNumStr(); SwDrawTextInfo aDrawInf( pSh, *pOut, nullptr, aText, 0, aText.getLength() ); - nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width(); + nProWidth += aIter.GetFnt()->GetTextSize_( aDrawInf ).Width(); break; } @@ -940,7 +940,7 @@ sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd OUString const aText = pField->ExpandField(true); SwDrawTextInfo aDrawInf( pSh, *pOut, nullptr, aText, 0, aText.getLength() ); - nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width(); + nProWidth += aIter.GetFnt()->GetTextSize_( aDrawInf ).Width(); break; } @@ -987,7 +987,7 @@ sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd SwDrawTextInfo aDrawInf( pSh, *pOut, nullptr, GetText(), nStt, 1 ); return (sal_uInt16) - ( nWidth ? ((100 * aIter.GetFnt()->_GetTextSize( aDrawInf ).Height()) / nWidth ) : 0 ); + ( nWidth ? ((100 * aIter.GetFnt()->GetTextSize_( aDrawInf ).Height()) / nWidth ) : 0 ); } SwTwips SwTextNode::GetWidthOfLeadingTabs() const diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 62abb301f07f..6be01454772d 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -471,7 +471,7 @@ bool SwTextCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst, // pCMS is used for restricting the cursor, if there are different font // heights in one line ( first value = offset to y of pOrig, second // value = real height of (shortened) cursor -void SwTextCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, +void SwTextCursor::GetCharRect_( SwRect* pOrig, const sal_Int32 nOfst, SwCursorMoveState* pCMS ) { const OUString aText = GetInfo().GetText(); @@ -769,7 +769,7 @@ void SwTextCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, static_cast<SwBidiPortion*>(pPor)->GetLevel() % 2 ); } - _GetCharRect( pOrig, nOfst, pCMS ); + GetCharRect_( pOrig, nOfst, pCMS ); if ( bChgHeight ) { @@ -1199,7 +1199,7 @@ bool SwTextCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, const Point aCharPos( GetTopLeft() ); bool bRet = true; - _GetCharRect( pOrig, nFindOfst, pCMS ); + GetCharRect_( pOrig, nFindOfst, pCMS ); // This actually would have to be "-1 LogicToPixel", but that seems too // expensive, so it's a value (-12), that should hopefully be OK. @@ -1668,7 +1668,7 @@ sal_Int32 SwTextCursor::GetCursorOfst( SwPosition *pPos, const Point &rPoint, ! pPor->InFieldGrp() ) aDrawInf.SetKanaComp( nKanaComp ); - nLength = aSizeInf.GetFont()->_GetCursorOfst( aDrawInf ); + nLength = aSizeInf.GetFont()->GetCursorOfst_( aDrawInf ); // get position inside field portion? if ( pPor->InFieldGrp() && pCMS && pCMS->m_pSpecialPos ) diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 4e72cd4fdba0..eb4d9839ac1c 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1926,7 +1926,7 @@ SwTwips SwTextFormatter::CalcBottomLine() const } // FME/OD: This routine does a limited text formatting. -SwTwips SwTextFormatter::_CalcFitToContent() +SwTwips SwTextFormatter::CalcFitToContent_() { FormatReset( GetInfo() ); BuildPortions( GetInfo() ); @@ -2210,7 +2210,7 @@ bool SwTextFormatter::ChkFlyUnderflow( SwTextFormatInfo &rInf ) const { if( aInter.IsOver( aLine ) ) { - aInter._Intersection( aLine ); + aInter.Intersection_( aLine ); if( aInter.HasArea() ) { // To be evaluated during reformat of this line: @@ -2233,7 +2233,7 @@ bool SwTextFormatter::ChkFlyUnderflow( SwTextFormatInfo &rInf ) const } else { - aInter._Intersection( aLine ); + aInter.Intersection_( aLine ); // No area means a fly has become invalid because of // lowering the line => reformat the line diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx index cc28091f087f..9a335fe64484 100644 --- a/sw/source/core/text/itrform2.hxx +++ b/sw/source/core/text/itrform2.hxx @@ -191,7 +191,7 @@ public: sal_uInt16 GetFrameRstHeight() const; // How wide would you be without any bounds (Flys etc.)? - SwTwips _CalcFitToContent( ); + SwTwips CalcFitToContent_( ); SwLinePortion* MakeRestPortion(const SwLineLayout* pLine, sal_Int32 nPos); diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx index c36f3860d723..4c4c9c4b1ccb 100644 --- a/sw/source/core/text/itrtxt.cxx +++ b/sw/source/core/text/itrtxt.cxx @@ -68,7 +68,7 @@ void SwTextIter::CalcAscentAndHeight( sal_uInt16 &rAscent, sal_uInt16 &rHeight ) rAscent = m_pCurr->GetAscent() + rHeight - m_pCurr->Height(); } -SwLineLayout *SwTextIter::_GetPrev() +SwLineLayout *SwTextIter::GetPrev_() { m_pPrev = nullptr; m_bPrev = true; @@ -83,14 +83,14 @@ SwLineLayout *SwTextIter::_GetPrev() const SwLineLayout *SwTextIter::GetPrev() { if(! m_bPrev) - _GetPrev(); + GetPrev_(); return m_pPrev; } const SwLineLayout *SwTextIter::Prev() { if( !m_bPrev ) - _GetPrev(); + GetPrev_(); if( m_pPrev ) { m_bPrev = false; @@ -352,7 +352,7 @@ void SwTextIter::TruncLines( bool bNoteFollow ) // check, if hint is in our range const sal_uInt16 nTmpPos = pHt->GetStart(); if ( nEnd <= nTmpPos && nTmpPos < nRangeEnd ) - pFollow->_InvalidateRange( + pFollow->InvalidateRange_( SwCharRange( nTmpPos, nTmpPos ) ); } } diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx index dce06ef80d78..eeb402c4bcd2 100644 --- a/sw/source/core/text/itrtxt.hxx +++ b/sw/source/core/text/itrtxt.hxx @@ -48,7 +48,7 @@ protected: bool m_bLastBlock : 1; // Justified text: Also the last line bool m_bLastCenter : 1; // Justified text: Center last line - SwLineLayout *_GetPrev(); + SwLineLayout *GetPrev_(); // Reset in the first line void Init(); @@ -269,7 +269,7 @@ class SwTextCursor : public SwTextAdjuster // Ambiguities static bool bRightMargin; - void _GetCharRect(SwRect *, const sal_Int32, SwCursorMoveState* ); + void GetCharRect_(SwRect *, const sal_Int32, SwCursorMoveState* ); protected: void CtorInitTextCursor( SwTextFrame *pFrame, SwTextSizeInfo *pInf ); explicit SwTextCursor(SwTextNode* pTextNode) : SwTextAdjuster(pTextNode) { } diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 6aedf5426e28..fb891a39e4ee 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -1218,7 +1218,7 @@ bool SwCombinedPortion::Format( SwTextFormatInfo &rInf ) } SwDrawTextInfo aDrawInf( pSh, *rInf.GetOut(), nullptr, aExpand, i, 1 ); - Size aSize = aTmpFont._GetTextSize( aDrawInf ); + Size aSize = aTmpFont.GetTextSize_( aDrawInf ); const sal_uInt16 nAsc = aTmpFont.GetAscent( pSh, *rInf.GetOut() ); aPos[ i ] = (sal_uInt16)aSize.Width(); if( i == nTop ) // enter the second line diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index 0e2788e51b16..ca374158e84f 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -233,7 +233,7 @@ void SwFlyCntPortion::Paint( const SwTextPaintInfo &rInf ) const { SwRect aRect( GetFlyFrame()->Frame() ); if( !GetFlyFrame()->IsCompletePaint() ) - aRect._Intersection( aRepaintRect ); + aRect.Intersection_( aRepaintRect ); // GetFlyFrame() may change the layout mode at the output device. { diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index fb9ee3f72954..062ac275801c 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -2006,7 +2006,7 @@ void SwLineLayout::Init( SwLinePortion* pNextPortion ) // looks for hanging punctuation portions in the paragraph // and return the maximum right offset of them. // If no such portion is found, the Margin/Hanging-flags will be updated. -SwTwips SwLineLayout::_GetHangingMargin() const +SwTwips SwLineLayout::GetHangingMargin_() const { SwLinePortion* pPor = GetPortion(); bool bFound = false; diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index 19e58a309923..89b9dd768849 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -97,7 +97,7 @@ private: bool m_bHanging : 1; // Contains a hanging portion in the margin bool m_bUnderscore : 1; - SwTwips _GetHangingMargin() const; + SwTwips GetHangingMargin_() const; public: // From SwLinePortion @@ -155,7 +155,7 @@ public: SwMarginPortion *CalcLeftMargin(); inline SwTwips GetHangingMargin() const - { return _GetHangingMargin(); } + { return GetHangingMargin_(); } // For special treatment for empty lines virtual bool Format( SwTextFormatInfo &rInf ) override; @@ -332,7 +332,7 @@ inline void SwParaPortion::FormatReset() { m_nDelta = 0; m_aReformat = SwCharRange(0, COMPLETE_STRING); - // bFlys needs to be retained in SwTextFrame::_Format() so that empty + // bFlys needs to be retained in SwTextFrame::Format_() so that empty // paragraphs that needed to avoid Frames with no flow, reformat // when the Frame disappears from the Area // bFlys = false; diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index bf138cd3665a..6294a618512f 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -152,7 +152,7 @@ void SwLinePortion::CalcTextSize( const SwTextSizeInfo &rInf ) } // Es werden alle nachfolgenden Portions geloescht. -void SwLinePortion::_Truncate() +void SwLinePortion::Truncate_() { SwLinePortion *pPos = pPortion; do diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 4332bb0c2a77..008b5c0dcb92 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -71,7 +71,7 @@ private: bool m_bJoinBorderWithPrev; bool m_bJoinBorderWithNext; - void _Truncate(); + void Truncate_(); public: explicit inline SwLinePortion(const SwLinePortion &rPortion); @@ -206,7 +206,7 @@ inline SwLinePortion::SwLinePortion(const SwLinePortion &rPortion) : inline void SwLinePortion::Truncate() { if ( pPortion ) - _Truncate(); + Truncate_(); } #endif diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 0b87e2c7b991..14d904ecbe2d 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -615,7 +615,7 @@ SwRubyPortion::SwRubyPortion( const SwMultiCreator& rCreate, const SwFont& rFnt, // Notice: the smaller line will be manipulated, normally it's the ruby line, // but it could be the main text, too. // If there is a tabulator in smaller line, no adjustment is possible. -void SwRubyPortion::_Adjust( SwTextFormatInfo &rInf ) +void SwRubyPortion::Adjust_( SwTextFormatInfo &rInf ) { SwTwips nLineDiff = GetRoot().Width() - GetRoot().GetNext()->Width(); sal_Int32 nOldIdx = rInf.GetIdx(); @@ -1620,7 +1620,7 @@ static void lcl_TruncateMultiPortion( SwMultiPortion& rMulti, SwTextFormatInfo& // Manages the formatting of a SwMultiPortion. External, for the calling // function, it seems to be a normal Format-function, internal it is like a -// SwTextFrame::_Format with multiple BuildPortions +// SwTextFrame::Format_ with multiple BuildPortions bool SwTextFormatter::BuildMultiPortion( SwTextFormatInfo &rInf, SwMultiPortion& rMulti ) { @@ -1867,7 +1867,7 @@ bool SwTextFormatter::BuildMultiPortion( SwTextFormatInfo &rInf, nActWidth = ( 3 * nMaxWidth + nMinWidth + 3 ) / 4; if ( nActWidth == nMaxWidth && rInf.GetLineStart() == rInf.GetIdx() ) // we have too less space, we must allow break cuts - // ( the first multi flag is considered during TextPortion::_Format() ) + // ( the first multi flag is considered during TextPortion::Format_() ) bFirstMulti = false; if( nActWidth <= nMinWidth ) break; diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx index dc1177808d22..f2e15b429986 100644 --- a/sw/source/core/text/pormulti.hxx +++ b/sw/source/core/text/pormulti.hxx @@ -181,7 +181,7 @@ class SwRubyPortion : public SwMultiPortion { sal_Int32 nRubyOffset; sal_uInt16 nAdjustment; - void _Adjust( SwTextFormatInfo &rInf); + void Adjust_( SwTextFormatInfo &rInf); public: SwRubyPortion( const SwRubyPortion& rRuby, sal_Int32 nEnd ); @@ -192,7 +192,7 @@ public: void CalcRubyOffset(); inline void Adjust( SwTextFormatInfo &rInf ) - { if(nAdjustment && GetRoot().GetNext()) _Adjust(rInf); } + { if(nAdjustment && GetRoot().GetNext()) Adjust_(rInf); } inline sal_uInt16 GetAdjustment() const { return nAdjustment; } inline sal_Int32 GetRubyOffset() const { return nRubyOffset; } }; diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 0f02b033f06b..de304c413fab 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -277,7 +277,7 @@ static bool lcl_HasContent( const SwFieldPortion& rField, SwTextFormatInfo &rInf return rField.GetExpText( rInf, aText ) && !aText.isEmpty(); } -bool SwTextPortion::_Format( SwTextFormatInfo &rInf ) +bool SwTextPortion::Format_( SwTextFormatInfo &rInf ) { // 5744: If only the hyphen does not fit anymore, we still need to wrap // the word, or else return true! @@ -450,7 +450,7 @@ bool SwTextPortion::Format( SwTextFormatInfo &rInf ) "SwTextPortion::Format: missing real width" ); OSL_ENSURE( Height(), "SwTextPortion::Format: missing height" ); - return _Format( rInf ); + return Format_( rInf ); } // Format end of line diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx index 5c04df451c28..488b2e4033ac 100644 --- a/sw/source/core/text/portxt.hxx +++ b/sw/source/core/text/portxt.hxx @@ -30,7 +30,7 @@ class SwTextPortion : public SwLinePortion { void BreakCut( SwTextFormatInfo &rInf, const SwTextGuess &rGuess ); void BreakUnderflow( SwTextFormatInfo &rInf ); - bool _Format( SwTextFormatInfo &rInf ); + bool Format_( SwTextFormatInfo &rInf ); public: inline SwTextPortion(){ SetWhichPor( POR_TXT ); } diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 9aff17f5049a..cb4df81ba1b5 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -191,7 +191,7 @@ SwRedlineItr::~SwRedlineItr() // The return value of SwRedlineItr::Seek tells you if the current font // has been manipulated by leaving (-1) or accessing (+1) of a section -short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld) +short SwRedlineItr::Seek_(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld) { short nRet = 0; if( ExtOn() ) @@ -204,13 +204,13 @@ short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld) if( nNew >= nEnd ) { --nRet; - _Clear( &rFnt ); // We go behind the current section + Clear_( &rFnt ); // We go behind the current section ++nAct; // and check the next one } else if( nNew < nStart ) { --nRet; - _Clear( &rFnt ); // We go in front of the current section + Clear_( &rFnt ); // We go in front of the current section if( nAct > nFirst ) nAct = nFirst; // the test has to run from the beginning else @@ -320,7 +320,7 @@ void SwRedlineItr::ChangeTextAttr( SwFont* pFnt, SwTextAttr &rHt, bool bChg ) } } -void SwRedlineItr::_Clear( SwFont* pFnt ) +void SwRedlineItr::Clear_( SwFont* pFnt ) { OSL_ENSURE( bOn, "SwRedlineItr::Clear: Off?" ); bOn = false; @@ -338,7 +338,7 @@ void SwRedlineItr::_Clear( SwFont* pFnt ) pFnt->SetNoCol( false ); } -sal_Int32 SwRedlineItr::_GetNextRedln( sal_Int32 nNext ) +sal_Int32 SwRedlineItr::GetNextRedln_( sal_Int32 nNext ) { nNext = NextExtend( nNext ); if( !bShow || COMPLETE_STRING == nFirst ) @@ -358,7 +358,7 @@ sal_Int32 SwRedlineItr::_GetNextRedln( sal_Int32 nNext ) return nNext; } -bool SwRedlineItr::_ChkSpecialUnderline() const +bool SwRedlineItr::ChkSpecialUnderline_() const { // If the underlining or the escapement is caused by redlining, // we always apply the SpecialUnderlining, i.e. the underlining @@ -440,7 +440,7 @@ short SwExtend::Enter(SwFont& rFnt, sal_Int32 nNew) return 0; } -bool SwExtend::_Leave(SwFont& rFnt, sal_Int32 nNew) +bool SwExtend::Leave_(SwFont& rFnt, sal_Int32 nNew) { OSL_ENSURE( Inside(), "SwExtend: Leave without Enter" ); const sal_uInt16 nOldAttr = rArr[ nPos - nStart ]; diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx index a179a362dd54..f9eddf10c1c6 100644 --- a/sw/source/core/text/redlnitr.hxx +++ b/sw/source/core/text/redlnitr.hxx @@ -38,7 +38,7 @@ class SwExtend sal_Int32 nStart; sal_Int32 nPos; sal_Int32 nEnd; - bool _Leave( SwFont& rFnt, sal_Int32 nNew ); + bool Leave_( SwFont& rFnt, sal_Int32 nNew ); bool Inside() const { return ( nPos >= nStart && nPos < nEnd ); } static void ActualizeFont( SwFont &rFnt, sal_uInt16 nAttr ); public: @@ -48,7 +48,7 @@ public: bool IsOn() const { return pFnt != nullptr; } void Reset() { if( pFnt ) { delete pFnt; pFnt = nullptr; } nPos = COMPLETE_STRING; } bool Leave( SwFont& rFnt, sal_Int32 nNew ) - { return pFnt && _Leave( rFnt, nNew ); } + { return pFnt && Leave_( rFnt, nNew ); } short Enter( SwFont& rFnt, sal_Int32 nNew ); sal_Int32 Next( sal_Int32 nNext ); SwFont* GetFont() { return pFnt; } @@ -70,11 +70,11 @@ class SwRedlineItr bool bOn; bool bShow; - void _Clear( SwFont* pFnt ); - bool _ChkSpecialUnderline() const; + void Clear_( SwFont* pFnt ); + bool ChkSpecialUnderline_() const; void FillHints( sal_uInt16 nAuthor, RedlineType_t eType ); - short _Seek( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ); - sal_Int32 _GetNextRedln( sal_Int32 nNext ); + short Seek_( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ); + sal_Int32 GetNextRedln_( sal_Int32 nNext ); short EnterExtend( SwFont& rFnt, sal_Int32 nNew ) { if( pExt ) return pExt->Enter( rFnt, nNew ); return 0; @@ -89,20 +89,20 @@ public: sal_Int32 nExtStart = COMPLETE_STRING ); ~SwRedlineItr(); inline bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); } - inline void Clear( SwFont* pFnt ) { if( bOn ) _Clear( pFnt ); } + inline void Clear( SwFont* pFnt ) { if( bOn ) Clear_( pFnt ); } void ChangeTextAttr( SwFont* pFnt, SwTextAttr &rHt, bool bChg ); inline short Seek( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ) { - if( bShow || pExt ) return _Seek( rFnt, nNew, nOld ); + if( bShow || pExt ) return Seek_( rFnt, nNew, nOld ); return 0; } inline void Reset() { if( nAct != nFirst ) nAct = COMPLETE_STRING; if( pExt ) pExt->Reset(); } inline sal_Int32 GetNextRedln( sal_Int32 nNext ) { - if( bShow || pExt ) return _GetNextRedln( nNext ); + if( bShow || pExt ) return GetNextRedln_( nNext ); return nNext; } inline bool ChkSpecialUnderline() const - { return IsOn() && _ChkSpecialUnderline(); } + { return IsOn() && ChkSpecialUnderline_(); } bool CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd ); inline bool LeaveExtend( SwFont& rFnt, sal_Int32 nNew ) { return pExt->Leave(rFnt, nNew ); } diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx index 826c253547d7..9f3a3dfef6d6 100644 --- a/sw/source/core/text/txtcache.cxx +++ b/sw/source/core/text/txtcache.cxx @@ -62,7 +62,7 @@ bool SwTextLineAccess::IsAvailable() const return pObj && static_cast<SwTextLine*>(pObj)->GetPara(); } -bool SwTextFrame::_HasPara() const +bool SwTextFrame::HasPara_() const { SwTextLine *pTextLine = static_cast<SwTextLine*>(SwTextFrame::GetTextCache()-> Get( this, GetCacheIdx(), false )); diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 8be41458531d..7dd7452c6217 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -162,7 +162,7 @@ sal_Int32 SwTextNode::GetDropLen( sal_Int32 nWishLen ) const sal_Unicode const cChar = GetText()[i]; if( CH_TAB == cChar || CH_BREAK == cChar || (( CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar ) - && SwTextSizeInfo::_HasHint( this, i ) ) ) + && SwTextSizeInfo::HasHint_( this, i ) ) ) break; } return i; diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index ff280299bc0a..8fadd0982e19 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -388,7 +388,7 @@ void SwTextFly::CtorInitTextFly( const SwTextFrame *pFrame ) nIndex = ULONG_MAX; } -SwRect SwTextFly::_GetFrame( const SwRect &rRect ) const +SwRect SwTextFly::GetFrame_( const SwRect &rRect ) const { SwRect aRet; if( ForEach( rRect, &aRet, true ) ) @@ -448,7 +448,7 @@ bool SwTextFly::IsAnyObj( const SwRect &rRect ) const return false; } -const SwContentFrame* SwTextFly::_GetMaster() +const SwContentFrame* SwTextFly::GetMaster_() { pMaster = pCurrFrame; while( pMaster && pMaster->IsFollow() ) @@ -553,9 +553,9 @@ bool SwTextFly::DrawTextOpaque( SwDrawTextInfo &rInf ) if( !bOpaque ) { if( rInf.GetKern() ) - rInf.GetFont()->_DrawStretchText( rInf ); + rInf.GetFont()->DrawStretchText_( rInf ); else - rInf.GetFont()->_DrawText( rInf ); + rInf.GetFont()->DrawText_( rInf ); rInf.SetPos(aOldPos); return false; } @@ -569,9 +569,9 @@ bool SwTextFly::DrawTextOpaque( SwDrawTextInfo &rInf ) if( rRect != aRegion.GetOrigin() ) aClipVout.ChgClip( rRect ); if( rInf.GetKern() ) - rInf.GetFont()->_DrawStretchText( rInf ); + rInf.GetFont()->DrawStretchText_( rInf ); else - rInf.GetFont()->_DrawText( rInf ); + rInf.GetFont()->DrawText_( rInf ); } } rInf.SetPos(aOldPos); @@ -1135,7 +1135,7 @@ void SwTextFly::CalcRightMargin( SwRect &rFly, const SwAnchoredObject* pNext = (*mpAnchoredObjList)[ nPos++ ]; if ( pNext == mpCurrAnchoredObj ) continue; - eSurroundForTextWrap = _GetSurroundForTextWrap( pNext ); + eSurroundForTextWrap = GetSurroundForTextWrap( pNext ); if( SURROUND_THROUGHT == eSurroundForTextWrap ) continue; @@ -1227,7 +1227,7 @@ void SwTextFly::CalcLeftMargin( SwRect &rFly, const SwAnchoredObject* pNext = (*mpAnchoredObjList)[ nFlyPos ]; if( pNext == mpCurrAnchoredObj ) continue; - SwSurround eSurroundForTextWrap = _GetSurroundForTextWrap( pNext ); + SwSurround eSurroundForTextWrap = GetSurroundForTextWrap( pNext ); if( SURROUND_THROUGHT == eSurroundForTextWrap ) continue; @@ -1279,7 +1279,7 @@ SwRect SwTextFly::AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj, // + RIGHT is the opposite. // Otherwise the set distance between text and frame is always // added up. - switch( _GetSurroundForTextWrap( pAnchoredObj ) ) + switch( GetSurroundForTextWrap( pAnchoredObj ) ) { case SURROUND_LEFT : { @@ -1314,7 +1314,7 @@ SwRect SwTextFly::AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj, // Wrap on both sides up to a frame width of 1.5cm #define FRAME_MAX 850 -SwSurround SwTextFly::_GetSurroundForTextWrap( const SwAnchoredObject* pAnchoredObj ) const +SwSurround SwTextFly::GetSurroundForTextWrap( const SwAnchoredObject* pAnchoredObj ) const { const SwFrameFormat* pFormat = &(pAnchoredObj->GetFrameFormat()); const SwFormatSurround &rFlyFormat = pFormat->GetSurround(); diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 155004acf4b6..9b1a55af3c59 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -566,7 +566,7 @@ bool sw_HideObj( const SwTextFrame& _rFrame, * paragraph portion visibility. * * - is called from HideHidden() - should hide objects in hidden paragraphs and - * - from _Format() - should hide/show objects in partly visible paragraphs + * - from Format_() - should hide/show objects in partly visible paragraphs */ void SwTextFrame::HideAndShowObjects() { @@ -705,10 +705,10 @@ bool SwTextFrame::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) cons inline void SwTextFrame::InvalidateRange(const SwCharRange &aRange, const long nD) { if ( IsIdxInside( aRange.Start(), aRange.Len() ) ) - _InvalidateRange( aRange, nD ); + InvalidateRange_( aRange, nD ); } -void SwTextFrame::_InvalidateRange( const SwCharRange &aRange, const long nD) +void SwTextFrame::InvalidateRange_( const SwCharRange &aRange, const long nD) { if ( !HasPara() ) { InvalidateSize(); @@ -922,7 +922,7 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { // collection has changed Prepare(); - _InvalidatePrt(); + InvalidatePrt_(); lcl_SetWrong( *this, 0, COMPLETE_STRING, false ); SetDerivedR2L( false ); CheckDirChange(); @@ -966,7 +966,7 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) Prepare(); } else - _InvalidateRange( SwCharRange( nPos, nLen ), nLen ); + InvalidateRange_( SwCharRange( nPos, nLen ), nLen ); } lcl_SetWrong( *this, nPos, nLen, true ); lcl_SetScriptInval( *this, nPos ); @@ -1020,7 +1020,7 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if( !nLen ) nLen = 1; - _InvalidateRange( SwCharRange( nPos, nLen) ); + InvalidateRange_( SwCharRange( nPos, nLen) ); const sal_uInt16 nTmp = static_cast<const SwUpdateAttr*>(pNew)->getWhichAttr(); if( ! nTmp || RES_TXTATR_CHARFMT == nTmp || RES_TXTATR_AUTOFMT == nTmp || @@ -1049,7 +1049,7 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { CalcLineSpace(); InvalidateSize(); - _InvalidatePrt(); + InvalidatePrt_(); if( IsInSct() && !GetPrev() ) { SwSectionFrame *pSect = FindSctFrame(); @@ -1081,7 +1081,7 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SetCompletePaint(); } else - _InvalidateRange( SwCharRange( nPos, 1 ) ); + InvalidateRange_( SwCharRange( nPos, 1 ) ); } bSetFieldsDirty = true; // ST2 @@ -1129,7 +1129,7 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SetCompletePaint(); } else - _InvalidateRange( SwCharRange( nPos, 1 ) ); + InvalidateRange_( SwCharRange( nPos, 1 ) ); } nClear |= 0x02; --nCount; @@ -1143,7 +1143,7 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) Prepare( bRegister ? PREP_REGISTER : PREP_ADJUST_FRM ); CalcLineSpace(); InvalidateSize(); - _InvalidatePrt(); + InvalidatePrt_(); // i#11859 // (1) Also invalidate next frame on next page/column. @@ -1244,7 +1244,7 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if( getRootFrame()->GetCurrShell() ) { Prepare(); - _InvalidatePrt(); + InvalidatePrt_(); } if( nClear ) @@ -1325,7 +1325,7 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) default: { Prepare(); - _InvalidatePrt(); + InvalidatePrt_(); if ( !nWhich ) { // is called by e. g. HiddenPara with 0 @@ -1416,7 +1416,7 @@ void SwTextFrame::PrepWidows( const sal_uInt16 nNeed, bool bNotify ) } if ( bNotify ) { - _InvalidateSize(); + InvalidateSize_(); InvalidatePage(); } } @@ -1510,7 +1510,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, if ( bNotify ) InvalidateSize(); else - _InvalidateSize(); + InvalidateSize_(); return bParaPossiblyInvalid; } @@ -1522,8 +1522,8 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, { case PREP_MOVEFTN : Frame().Height(0); Prt().Height(0); - _InvalidatePrt(); - _InvalidateSize(); + InvalidatePrt_(); + InvalidateSize_(); /* no break here */ case PREP_ADJUST_FRM : pPara->SetPrepAdjust(); if( IsFootnoteNumFrame() != pPara->IsFootnoteNum() || @@ -1531,7 +1531,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, { InvalidateRange( SwCharRange( 0, 1 ), 1); if( GetOfst() && !IsFollow() ) - _SetOfst( 0 ); + SetOfst_( 0 ); } break; case PREP_MUST_FIT : pPara->SetPrepMustFit(); @@ -1636,7 +1636,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, // A new boss, a new chance for growing if( IsUndersized() ) { - _InvalidateSize(); + InvalidateSize_(); InvalidateRange( SwCharRange( GetOfst(), 1 ), 1); } break; @@ -1702,7 +1702,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, SetCompletePaint(); Init(); pPara = nullptr; - _InvalidateSize(); + InvalidateSize_(); } } else @@ -1714,7 +1714,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, else if( HasFootnote() ) { bParaPossiblyInvalid = Prepare( PREP_ADJUST_FRM, nullptr, bNotify ); - _InvalidateSize(); + InvalidateSize_(); } else return bParaPossiblyInvalid; // So that there's no SetPrep() @@ -1739,11 +1739,11 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, pPara = aAccess.GetPara(); InvalidateSize(); - _InvalidatePrt(); + InvalidatePrt_(); SwFrame* pNxt; if ( nullptr != ( pNxt = GetIndNext() ) ) { - pNxt->_InvalidatePrt(); + pNxt->InvalidatePrt_(); if ( pNxt->IsLayoutFrame() ) pNxt->InvalidatePage(); } @@ -1803,11 +1803,11 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, Init(); pPara = nullptr; if( GetOfst() && !IsFollow() ) - _SetOfst( 0 ); + SetOfst_( 0 ); if ( bNotify ) InvalidateSize(); else - _InvalidateSize(); + InvalidateSize_(); } return bParaPossiblyInvalid; // no SetPrep() happened } @@ -1874,7 +1874,7 @@ SwTestFormat::SwTestFormat( SwTextFrame* pTextFrame, const SwFrame* pPre, SwTwip pOldPara = pFrame->HasPara() ? pFrame->GetPara() : nullptr; pFrame->SetPara( new SwParaPortion(), false ); - OSL_ENSURE( ! pFrame->IsSwapped(), "A frame is swapped before _Format" ); + OSL_ENSURE( ! pFrame->IsSwapped(), "A frame is swapped before Format_" ); if ( pFrame->IsVertical() ) pFrame->SwapWidthAndHeight(); @@ -1882,12 +1882,12 @@ SwTestFormat::SwTestFormat( SwTextFrame* pTextFrame, const SwFrame* pPre, SwTwip SwTextFormatInfo aInf( pFrame->getRootFrame()->GetCurrShell()->GetOut(), pFrame, false, true, true ); SwTextFormatter aLine( pFrame, &aInf ); - pFrame->_Format( aLine, aInf ); + pFrame->Format_( aLine, aInf ); if ( pFrame->IsVertical() ) pFrame->SwapWidthAndHeight(); - OSL_ENSURE( ! pFrame->IsSwapped(), "A frame is swapped after _Format" ); + OSL_ENSURE( ! pFrame->IsSwapped(), "A frame is swapped after Format_" ); } SwTestFormat::~SwTestFormat() @@ -1936,7 +1936,7 @@ bool SwTextFrame::WouldFit( SwTwips &rMaxHeight, bool &bSplit, bool bTst ) // i#27801 - correction: 'short cut' for empty paragraph // can *not* be applied, if test format is in progress. The test format doesn't - // adjust the frame and the printing area - see method <SwTextFrame::_Format(..)>, + // adjust the frame and the printing area - see method <SwTextFrame::Format_(..)>, // which is called in <SwTextFrame::TestFormat(..)> if ( IsEmpty() && !bTst ) { @@ -2119,7 +2119,7 @@ SwTwips SwTextFrame::CalcFitToContent() // i#54031 - assure mininum of MINLAY twips. const SwTwips nMax = std::max( (SwTwips)MINLAY, - aLine._CalcFitToContent() + 1 ); + aLine.CalcFitToContent_() + 1 ); Frame().Width( nOldFrameWidth ); Prt().Width( nOldPrtWidth ); @@ -2176,7 +2176,7 @@ void SwTextFrame::CalcAdditionalFirstLineOffset() aInf.SetIgnoreFly( true ); SwTextFormatter aLine( this, &aInf ); SwHookOut aHook( aInf ); - aLine._CalcFitToContent(); + aLine.CalcFitToContent_(); // determine additional first line offset const SwLinePortion* pFirstPortion = aLine.GetCurr()->GetFirstPortion(); @@ -2223,7 +2223,7 @@ void SwTextFrame::CalcAdditionalFirstLineOffset() * determine the height of the last line, which * uses the font */ -void SwTextFrame::_CalcHeightOfLastLine( const bool _bUseFont ) +void SwTextFrame::CalcHeightOfLastLine( const bool _bUseFont ) { // i#71281 // Invalidate printing area, if height of last line changes @@ -2308,7 +2308,7 @@ void SwTextFrame::_CalcHeightOfLastLine( const bool _bUseFont ) if ( bCalcHeightOfLastLine ) { OSL_ENSURE( HasPara(), - "<SwTextFrame::_CalcHeightOfLastLine()> - missing paragraph portions." ); + "<SwTextFrame::CalcHeightOfLastLine()> - missing paragraph portions." ); const SwLineLayout* pLineLayout = GetPara(); while ( pLineLayout && pLineLayout->GetNext() ) { @@ -2334,7 +2334,7 @@ void SwTextFrame::_CalcHeightOfLastLine( const bool _bUseFont ) // In this case determine height of last line by the font if ( nNewHeightOfLastLine == 0 ) { - _CalcHeightOfLastLine( true ); + CalcHeightOfLastLine( true ); } else { @@ -2544,7 +2544,7 @@ void SwTextFrame::RecalcAllLines() if ( pNxt->GetUpper() != GetUpper() ) pNxt->InvalidateLineNum(); else - pNxt->_InvalidateLineNum(); + pNxt->InvalidateLineNum_(); } } } diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index bf7ece20bed6..81cfb1470b4e 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star; -bool SwTextFrame::_IsFootnoteNumFrame() const +bool SwTextFrame::IsFootnoteNumFrame_() const { const SwFootnoteFrame* pFootnote = FindFootnoteFrame()->GetMaster(); while( pFootnote && !pFootnote->ContainsContent() ) @@ -292,7 +292,7 @@ SwTwips SwTextFrame::GetFootnoteLine( const SwTextFootnote *pFootnote ) const * Calculates the maximum reachable height for the TextFrame in the Footnote Area. * The cell's bottom margin with the Footnote Reference limit's this height. */ -SwTwips SwTextFrame::_GetFootnoteFrameHeight() const +SwTwips SwTextFrame::GetFootnoteFrameHeight_() const { OSL_ENSURE( !IsFollow() && IsInFootnote(), "SwTextFrame::SetFootnoteLine: moon walk" ); @@ -642,7 +642,7 @@ void SwTextFrame::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDea { SwFootnoteFrame *pNew = new SwFootnoteFrame(pDoc->GetDfltFrameFormat(),this,this,pFootnote); SwNodeIndex aIdx( *pFootnote->GetStartNode(), 1 ); - ::_InsertCnt( pNew, pDoc, aIdx.GetIndex() ); + ::InsertCnt_( pNew, pDoc, aIdx.GetIndex() ); GetNode()->getIDocumentLayoutAccess().GetLayouter()->CollectEndnote( pNew ); } else if( pSrcFrame != this ) diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx index c8ac851fa7e3..7437de2ea6b6 100644 --- a/sw/source/core/text/txtinit.cxx +++ b/sw/source/core/text/txtinit.cxx @@ -50,10 +50,10 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion ) // e.g. Blanks at the line end IMPL_FIXEDMEMPOOL_NEWDEL( SwTextPortion ) // Attribute change // Are ONLY used in init.cxx. -// There we have extern void _TextFinit() -// and extern void _TextInit(...) +// There we have extern void TextFinit() +// and extern void TextInit_(...) -void _TextInit() +void TextInit_() { pFntCache = new SwFntCache; // Cache for SwSubFont -> SwFntObj = { Font aFont, Font* pScrFont, Font* pPrtFont, OutputDevice* pPrinter, ... } pSwFontCache = new SwFontCache; // Cache for SwTextFormatColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray } @@ -67,7 +67,7 @@ void _TextInit() PROTOCOL_INIT } -void _TextFinit() +void TextFinit() { PROTOCOL_STOP delete SwTextFrame::GetTextCache(); diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx index 5db3d2e63d6b..1d84ca5ebd10 100644 --- a/sw/source/core/text/txtpaint.cxx +++ b/sw/source/core/text/txtpaint.cxx @@ -39,7 +39,7 @@ void SwSaveClip::Reset() } } -void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTextFrame* pFrame, +void SwSaveClip::ChgClip_( const SwRect &rRect, const SwTextFrame* pFrame, bool bEnlargeRect ) { SwRect aOldRect( rRect ); diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx index 3a791b720224..8ef9a58ec83c 100644 --- a/sw/source/core/text/txtpaint.hxx +++ b/sw/source/core/text/txtpaint.hxx @@ -30,7 +30,7 @@ class SwSaveClip bool bChg; protected: VclPtr<OutputDevice> pOut; - void _ChgClip( const SwRect &rRect, const SwTextFrame* pFrame, + void ChgClip_( const SwRect &rRect, const SwTextFrame* pFrame, bool bEnlargeRect ); public: explicit SwSaveClip(OutputDevice* pOutDev) @@ -43,7 +43,7 @@ public: inline ~SwSaveClip(); inline void ChgClip( const SwRect &rRect, const SwTextFrame* pFrame = nullptr, bool bEnlargeRect = false) - { if( pOut ) _ChgClip( rRect, pFrame, bEnlargeRect ); } + { if( pOut ) ChgClip_( rRect, pFrame, bEnlargeRect ); } void Reset(); inline bool IsOn() const { return bOn; } inline bool IsChg() const { return bChg; } diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx index 14bf14364a2c..83a4b805098c 100644 --- a/sw/source/core/text/widorp.cxx +++ b/sw/source/core/text/widorp.cxx @@ -410,7 +410,7 @@ bool WidowsAndOrphans::FindWidows( SwTextFrame *pFrame, SwTextMargin &rLine ) SwTwips(rLine.GetInfo().GetParaPortion()->Height() ) ) { pMaster->Prepare( PREP_ADJUST_FRM ); - pMaster->_InvalidateSize(); + pMaster->InvalidateSize_(); pMaster->InvalidatePage(); } } @@ -432,7 +432,7 @@ bool WidowsAndOrphans::FindWidows( SwTextFrame *pFrame, SwTextMargin &rLine ) if( nTmpRstHeight >= SwTwips(rLine.GetInfo().GetParaPortion()->Height() ) ) { pMaster->Prepare( PREP_ADJUST_FRM ); - pMaster->_InvalidateSize(); + pMaster->InvalidateSize_(); pMaster->InvalidatePage(); pFrame->SetJustWidow( false ); return false; diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx index 458b5d6aca67..e0a14d168f10 100644 --- a/sw/source/core/text/wrong.cxx +++ b/sw/source/core/text/wrong.cxx @@ -246,7 +246,7 @@ sal_uInt16 SwWrongList::GetWrongPos( sal_Int32 nValue ) const return nMin; } -void SwWrongList::_Invalidate( sal_Int32 nBegin, sal_Int32 nEnd ) +void SwWrongList::Invalidate_( sal_Int32 nBegin, sal_Int32 nEnd ) { if ( nBegin < GetBeginInv() ) nBeginInvalid = nBegin; @@ -305,7 +305,7 @@ void SwWrongList::Move( sal_Int32 nPos, sal_Int32 nDiff ) ShiftLeft( nBeginInvalid, nPos, nEnd ); if( nEndInvalid != COMPLETE_STRING ) ShiftLeft( nEndInvalid, nPos, nEnd ); - _Invalidate( nPos ? nPos - 1 : nPos, nPos + 1 ); + Invalidate_( nPos ? nPos - 1 : nPos, nPos + 1 ); } } else @@ -431,7 +431,7 @@ void SwWrongList::Invalidate( sal_Int32 nBegin, sal_Int32 nEnd ) if (COMPLETE_STRING == GetBeginInv()) SetInvalid( nBegin, nEnd ); else - _Invalidate( nBegin, nEnd ); + Invalidate_( nBegin, nEnd ); } bool SwWrongList::InvalidateWrong( ) @@ -471,7 +471,7 @@ SwWrongList* SwWrongList::SplitList( sal_Int32 nSplitPos ) pRet = new SwWrongList( GetWrongListType() ); pRet->Insert(0, maList.begin(), ( nLst >= maList.size() ? maList.end() : maList.begin() + nLst ) ); pRet->SetInvalid( GetBeginInv(), GetEndInv() ); - pRet->_Invalidate( nSplitPos ? nSplitPos - 1 : nSplitPos, nSplitPos ); + pRet->Invalidate_( nSplitPos ? nSplitPos - 1 : nSplitPos, nSplitPos ); Remove( 0, nLst ); } if( COMPLETE_STRING == GetBeginInv() ) @@ -481,7 +481,7 @@ SwWrongList* SwWrongList::SplitList( sal_Int32 nSplitPos ) ShiftLeft( nBeginInvalid, 0, nSplitPos ); if( nEndInvalid != COMPLETE_STRING ) ShiftLeft( nEndInvalid, 0, nSplitPos ); - _Invalidate( 0, 1 ); + Invalidate_( 0, 1 ); } for (nLst = 0; nLst < Count(); ++nLst ) { diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index fb768e7538eb..cec358730c63 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -81,7 +81,7 @@ SwTextFlyCnt::SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStartPos ) * setzen des Ankers (die SwPosition des Dummy-Zeichens wird dem FlyFrameFormat * per SetAttr bekannt gegeben). Dies kann nicht im MakeTextHint erledigt * werden, da der Zielnode unbestimmt ist. - * ad 3) _GetFlyFrame() wird im Formatierungsprozess vom LineIter gerufen + * ad 3) GetFlyFrame_() wird im Formatierungsprozess vom LineIter gerufen * und sucht den FlyFrame zum Dummyzeichen des aktuellen ContentFrame. Wird keiner * gefunden, so wird ein neuer FlyFrame angelegt. * Kritisch an diesem Vorgehen ist, dass das pContent->AppendFly() eine @@ -208,21 +208,21 @@ void SwTextFlyCnt::SetAnchor( const SwTextNode *pNode ) // Fuer jeden ContentFrame wird ein SwFlyInContentFrame angelegt. } -// _GetFlyFrame() wird im Formatierungsprozess vom LineIter gerufen +// GetFlyFrame_() wird im Formatierungsprozess vom LineIter gerufen // und sucht den FlyFrame zum Dummyzeichen des aktuellen ContentFrame. Wird keiner // gefunden, so wird ein neuer FlyFrame angelegt. // (siehe Kommentar ind SwTextFlyCnt::MakeTextHint) -SwFlyInContentFrame *SwTextFlyCnt::_GetFlyFrame( const SwFrame *pCurrFrame ) +SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame_( const SwFrame *pCurrFrame ) { SwFrameFormat* pFrameFormat = GetFlyCnt().GetFrameFormat(); if( RES_DRAWFRMFMT == pFrameFormat->Which() ) { - OSL_ENSURE( false, "SwTextFlyCnt::_GetFlyFrame: DrawInCnt-Baustelle!" ); + OSL_ENSURE( false, "SwTextFlyCnt::GetFlyFrame_: DrawInCnt-Baustelle!" ); return nullptr; } SwIterator<SwFlyFrame,SwFormat> aIter( *GetFlyCnt().pFormat ); - OSL_ENSURE( pCurrFrame->IsTextFrame(), "SwTextFlyCnt::_GetFlyFrame for TextFrames only." ); + OSL_ENSURE( pCurrFrame->IsTextFrame(), "SwTextFlyCnt::GetFlyFrame_ for TextFrames only." ); SwFrame* pFrame = aIter.First(); if ( pFrame ) { diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 989d6d69c46b..57d3dafbae5a 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star; // global variables declared in fntcache.hxx -// FontCache is created in txtinit.cxx _TextInit and deleted in _TextFinit +// FontCache is created in txtinit.cxx TextInit_ and deleted in TextFinit SwFntCache *pFntCache = nullptr; // last Font set by ChgFntCache SwFntObj *pLastFont = nullptr; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 7693a832e838..009d5660fe3e 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -364,7 +364,7 @@ static void lcl_ChangeFootnoteRef( SwTextNode &rNode ) SwContentFrame* pContent = pFirstFootnoteOfNode->ContainsContent(); if ( pContent ) { - pContent->_InvalidatePos(); + pContent->InvalidatePos_(); } } } @@ -378,7 +378,7 @@ SwContentNode *SwTextNode::SplitContentNode( const SwPosition &rPos ) const sal_Int32 nSplitPos = rPos.nContent.GetIndex(); const sal_Int32 nTextLen = m_Text.getLength(); SwTextNode* const pNode = - _MakeNewTextNode( rPos.nNode, false, nSplitPos==nTextLen ); + MakeNewTextNode( rPos.nNode, false, nSplitPos==nTextLen ); // the first paragraph gets the XmlId, // _except_ if it is empty and the second is not empty @@ -1185,7 +1185,7 @@ void SwTextNode::Update( pSortedObjs->UpdateAll(); } -void SwTextNode::_ChgTextCollUpdateNum( const SwTextFormatColl *pOldColl, +void SwTextNode::ChgTextCollUpdateNum( const SwTextFormatColl *pOldColl, const SwTextFormatColl *pNewColl) { SwDoc* pDoc = GetDoc(); @@ -2391,7 +2391,7 @@ void SwTextNode::GCAttr() } // #i23726# -SwNumRule* SwTextNode::_GetNumRule(bool bInParent) const +SwNumRule* SwTextNode::GetNumRule_(bool bInParent) const { SwNumRule* pRet = nullptr; @@ -2433,7 +2433,7 @@ SwNumRule* SwTextNode::_GetNumRule(bool bInParent) const SwNumRule* SwTextNode::GetNumRule(bool bInParent) const { - return _GetNumRule(bInParent); + return GetNumRule_(bInParent); } void SwTextNode::NumRuleChgd() @@ -2487,7 +2487,7 @@ bool SwTextNode::HasMarkedLabel() const } // <- #i27615# -SwTextNode* SwTextNode::_MakeNewTextNode( const SwNodeIndex& rPos, bool bNext, +SwTextNode* SwTextNode::MakeNewTextNode( const SwNodeIndex& rPos, bool bNext, bool bChgFollow ) { /* hartes PageBreak/PageDesc/ColumnBreak aus AUTO-Set ignorieren */ @@ -2587,7 +2587,7 @@ SwTextNode* SwTextNode::_MakeNewTextNode( const SwNodeIndex& rPos, bool bNext, ( bChgFollow && pColl != GetTextColl() )) return pNode; // mehr duerfte nicht gemacht werden oder ???? - pNode->_ChgTextCollUpdateNum( nullptr, pColl ); // fuer Nummerierung/Gliederung + pNode->ChgTextCollUpdateNum( nullptr, pColl ); // fuer Nummerierung/Gliederung if( bNext || !bChgFollow ) return pNode; @@ -2617,7 +2617,7 @@ SwContentNode* SwTextNode::AppendNode( const SwPosition & rPos ) { // Position hinter dem eingefuegt wird SwNodeIndex aIdx( rPos.nNode, 1 ); - SwTextNode* pNew = _MakeNewTextNode( aIdx ); + SwTextNode* pNew = MakeNewTextNode( aIdx ); // reset list attributes at appended text node pNew->ResetAttr( RES_PARATR_LIST_ISRESTART ); @@ -3534,12 +3534,12 @@ void SwTextNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVa // Override Modify so that deleting styles works properly (outline // numbering!). - // Never call _ChgTextCollUpdateNum for Nodes in Undo. + // Never call ChgTextCollUpdateNum for Nodes in Undo. if( pOldValue && pNewValue && RES_FMT_CHG == pOldValue->Which() && GetRegisteredIn() == static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat && GetNodes().IsDocNodes() ) { - _ChgTextCollUpdateNum( + ChgTextCollUpdateNum( static_cast<const SwTextFormatColl*>(static_cast<const SwFormatChg*>(pOldValue)->pChangedFormat), static_cast<const SwTextFormatColl*>(static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat) ); } @@ -3618,7 +3618,7 @@ SwFormatColl* SwTextNode::ChgFormatColl( SwFormatColl *pNewColl ) // nur wenn im normalen Nodes-Array if( GetNodes().IsDocNodes() ) { - _ChgTextCollUpdateNum( pOldColl, static_cast<SwTextFormatColl *>(pNewColl) ); + ChgTextCollUpdateNum( pOldColl, static_cast<SwTextFormatColl *>(pNewColl) ); } GetNodes().UpdateOutlineNode(*this); diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 7d7268917b05..0dd7670ad872 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1032,7 +1032,7 @@ sal_uInt16 SwSubFont::CalcEscHeight( const sal_uInt16 nOldHeight, return m_nOrgHeight; } -short SwSubFont::_CheckKerning( ) +short SwSubFont::CheckKerning_( ) { short nKernx = - short( Font::GetFontSize().Height() / 6 ); @@ -1061,7 +1061,7 @@ sal_uInt16 SwSubFont::GetHeight( SwViewShell *pSh, const OutputDevice& rOut ) return nHeight; // + nLeading; } -Size SwSubFont::_GetTextSize( SwDrawTextInfo& rInf ) +Size SwSubFont::GetTextSize_( SwDrawTextInfo& rInf ) { // Robust: Eigentlich sollte der Font bereits eingestellt sein, aber // sicher ist sicher ... @@ -1159,7 +1159,7 @@ Size SwSubFont::_GetTextSize( SwDrawTextInfo& rInf ) return aTextSize; } -void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey ) +void SwSubFont::DrawText_( SwDrawTextInfo &rInf, const bool bGrey ) { rInf.SetGreyWave( bGrey ); sal_Int32 nLn = rInf.GetText().getLength(); @@ -1236,7 +1236,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey ) if( pUnderFnt && nOldUnder != LINESTYLE_NONE ) { - Size aFontSize = _GetTextSize( rInf ); + Size aFontSize = GetTextSize_( rInf ); const OUString oldStr = rInf.GetText(); OUString aStr(" "); @@ -1279,7 +1279,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey ) // set position for underline font rInf.SetPos( pUnderFnt->GetPos() ); - pUnderFnt->GetFont()._DrawStretchText( rInf ); + pUnderFnt->GetFont().DrawStretchText_( rInf ); rInf.SetUnderFnt( pUnderFnt ); rInf.SetText(oldStr); @@ -1290,7 +1290,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey ) rInf.SetPos(aOldPos); } -void SwSubFont::_DrawStretchText( SwDrawTextInfo &rInf ) +void SwSubFont::DrawStretchText_( SwDrawTextInfo &rInf ) { if( !rInf.GetLen() || !rInf.GetText().getLength() ) return; @@ -1361,7 +1361,7 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo &rInf ) // set position for underline font rInf.SetPos( pUnderFnt->GetPos() ); - pUnderFnt->GetFont()._DrawStretchText( rInf ); + pUnderFnt->GetFont().DrawStretchText_( rInf ); rInf.SetUnderFnt( pUnderFnt ); rInf.SetText(oldStr); @@ -1372,7 +1372,7 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo &rInf ) rInf.SetPos(aOldPos); } -sal_Int32 SwSubFont::_GetCursorOfst( SwDrawTextInfo& rInf ) +sal_Int32 SwSubFont::GetCursorOfst_( SwDrawTextInfo& rInf ) { if ( !pLastFont || pLastFont->GetOwner()!=m_pMagic ) ChgFnt( rInf.GetShell(), rInf.GetOut() ); diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 8ce9787f4495..5d19885997b6 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -940,7 +940,7 @@ bool SwScanner::NextWord() bool SwTextNode::Spell(SwSpellArgs* pArgs) { - // Die Aehnlichkeiten zu SwTextFrame::_AutoSpell sind beabsichtigt ... + // Die Aehnlichkeiten zu SwTextFrame::AutoSpell_ sind beabsichtigt ... // ACHTUNG: Ev. Bugs in beiden Routinen fixen! // modify string according to redline information and hidden text @@ -1237,7 +1237,7 @@ bool SwTextNode::Convert( SwConversionArgs &rArgs ) // Die Aehnlichkeiten zu SwTextNode::Spell sind beabsichtigt ... // ACHTUNG: Ev. Bugs in beiden Routinen fixen! -SwRect SwTextFrame::_AutoSpell( const SwContentNode* pActNode, sal_Int32 nActPos ) +SwRect SwTextFrame::AutoSpell_( const SwContentNode* pActNode, sal_Int32 nActPos ) { SwRect aRect; #if OSL_DEBUG_LEVEL > 1 @@ -1633,7 +1633,7 @@ bool SwTextNode::Hyphenate( SwInterHyphInfo &rHyphInf ) { // Das Layout ist nicht robust gegen "Direktformatierung" // (7821, 7662, 7408); vgl. layact.cxx, - // SwLayAction::_TurboAction(), if( !pCnt->IsValid() ... + // SwLayAction::TurboAction_(), if( !pCnt->IsValid() ... pFrame->SetCompletePaint(); return true; } diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index effa11a12853..e990009652b9 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -1289,7 +1289,7 @@ SwRegHistory::SwRegHistory( SwHistory* pHst ) , m_pHistory( pHst ) , m_nNodeIndex( ULONG_MAX ) { - _MakeSetWhichIds(); + MakeSetWhichIds(); } SwRegHistory::SwRegHistory( SwModify* pRegIn, const SwNode& rNd, @@ -1298,7 +1298,7 @@ SwRegHistory::SwRegHistory( SwModify* pRegIn, const SwNode& rNd, , m_pHistory( pHst ) , m_nNodeIndex( rNd.GetIndex() ) { - _MakeSetWhichIds(); + MakeSetWhichIds(); } SwRegHistory::SwRegHistory( const SwNode& rNd, SwHistory* pHst ) @@ -1306,7 +1306,7 @@ SwRegHistory::SwRegHistory( const SwNode& rNd, SwHistory* pHst ) , m_pHistory( pHst ) , m_nNodeIndex( rNd.GetIndex() ) { - _MakeSetWhichIds(); + MakeSetWhichIds(); } void SwRegHistory::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) @@ -1410,7 +1410,7 @@ void SwRegHistory::RegisterInModify( SwModify* pRegIn, const SwNode& rNd ) { pRegIn->Add( this ); m_nNodeIndex = rNd.GetIndex(); - _MakeSetWhichIds(); + MakeSetWhichIds(); } else { @@ -1418,7 +1418,7 @@ void SwRegHistory::RegisterInModify( SwModify* pRegIn, const SwNode& rNd ) } } -void SwRegHistory::_MakeSetWhichIds() +void SwRegHistory::MakeSetWhichIds() { if (!m_pHistory) return; diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 837a81a8b7ef..cfc19beb9c73 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -47,7 +47,7 @@ // DELETE /* lcl_MakeAutoFrames has to call MakeFrames for objects bounded "AtChar" - ( == AUTO ), if the anchor frame has be moved via _MoveNodes(..) and + ( == AUTO ), if the anchor frame has be moved via MoveNodes(..) and DelFrames(..) */ static void lcl_MakeAutoFrames( const SwFrameFormats& rSpzArr, sal_uLong nMovedIndex ) @@ -150,7 +150,7 @@ SwUndoDelete::SwUndoDelete( DelContentType(nsDelContentType::DELCNT_ALL | nsDelContentType::DELCNT_CHKNOCNTNT) ); ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); - _DelBookmarks(pStt->nNode, pEnd->nNode); + DelBookmarks(pStt->nNode, pEnd->nNode); } else { @@ -159,7 +159,7 @@ SwUndoDelete::SwUndoDelete( if (nEndNode - nSttNode > 1) // check for fully selected nodes { SwNodeIndex const start(pStt->nNode, +1); - _DelBookmarks(start, pEnd->nNode); + DelBookmarks(start, pEnd->nNode); } } @@ -252,14 +252,14 @@ SwUndoDelete::SwUndoDelete( if( pEndTextNd ) { // The end text node has to leave the (expanded) selection - // The dummy is needed because _MoveNodes deletes empty + // The dummy is needed because MoveNodes deletes empty // sections ++m_nReplaceDummy; SwNodeRange aMvRg( *pEndTextNd, 0, *pEndTextNd, 1 ); SwPosition aSplitPos( *pEndTextNd ); ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo()); pDoc->getIDocumentContentOperations().SplitNode( aSplitPos, false ); - rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd ); + rDocNds.MoveNodes( aMvRg, rDocNds, aRg.aEnd ); --aRg.aEnd; } else @@ -283,7 +283,7 @@ SwUndoDelete::SwUndoDelete( SwPosition aSplitPos( *pSttTextNd ); ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo()); pDoc->getIDocumentContentOperations().SplitNode( aSplitPos, false ); - rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart ); + rDocNds.MoveNodes( aMvRg, rDocNds, aRg.aStart ); --aRg.aStart; } } @@ -304,7 +304,7 @@ SwUndoDelete::SwUndoDelete( // Step 3: Moving into UndoArray... m_nNode = rNds.GetEndOfContent().GetIndex(); - rDocNds._MoveNodes( aRg, rNds, SwNodeIndex( rNds.GetEndOfContent() )); + rDocNds.MoveNodes( aRg, rNds, SwNodeIndex( rNds.GetEndOfContent() )); m_pMvStt = new SwNodeIndex( rNds, m_nNode ); // remember difference! m_nNode = rNds.GetEndOfContent().GetIndex() - m_nNode; @@ -321,12 +321,12 @@ SwUndoDelete::SwUndoDelete( if( m_bJoinNext ) { SwNodeRange aMvRg( *pEndTextNd, 0, *pEndTextNd, 1 ); - rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart ); + rDocNds.MoveNodes( aMvRg, rDocNds, aRg.aStart ); } else { SwNodeRange aMvRg( *pSttTextNd, 0, *pSttTextNd, 1 ); - rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd ); + rDocNds.MoveNodes( aMvRg, rDocNds, aRg.aEnd ); } } } @@ -850,7 +850,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext) --aPos.nNode; if( !m_bJoinNext ) pMovedNode = &aPos.nNode.GetNode(); - rDoc.GetNodes()._MoveNodes(aRg, rDoc.GetNodes(), aMvIdx); + rDoc.GetNodes().MoveNodes(aRg, rDoc.GetNodes(), aMvIdx); ++aPos.nNode; } @@ -858,7 +858,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext) { SwNodeRange aRange( *m_pMvStt, 0, *m_pMvStt, m_nNode ); SwNodeIndex aCopyIndex( aPos.nNode, -1 ); - rDoc.GetUndoManager().GetUndoNodes()._Copy( aRange, aPos.nNode ); + rDoc.GetUndoManager().GetUndoNodes().Copy_( aRange, aPos.nNode ); if( m_nReplaceDummy ) { @@ -876,7 +876,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext) SwNodeIndex aMvIdx(rDoc.GetNodes(), nMoveIndex); SwNodeRange aRg( aPos.nNode, 0, aPos.nNode, 1 ); pMovedNode = &aPos.nNode.GetNode(); - rDoc.GetNodes()._MoveNodes(aRg, rDoc.GetNodes(), aMvIdx); + rDoc.GetNodes().MoveNodes(aRg, rDoc.GetNodes(), aMvIdx); rDoc.GetNodes().Delete( aMvIdx); } } @@ -992,7 +992,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext) DelContentIndex( *rPam.GetMark(), *rPam.GetPoint(), DelContentType(nsDelContentType::DELCNT_ALL | nsDelContentType::DELCNT_CHKNOCNTNT) ); - _DelBookmarks(rPam.GetMark()->nNode, rPam.GetPoint()->nNode); + DelBookmarks(rPam.GetMark()->nNode, rPam.GetPoint()->nNode); } else DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() ); @@ -1008,7 +1008,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext) DelContentIndex( *rPam.GetMark(), *rPam.GetPoint(), DelContentType(nsDelContentType::DELCNT_ALL | nsDelContentType::DELCNT_CHKNOCNTNT) ); - _DelBookmarks( rPam.GetMark()->nNode, rPam.GetPoint()->nNode ); + DelBookmarks( rPam.GetMark()->nNode, rPam.GetPoint()->nNode ); } else DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() ); diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 843ad7dd5b45..03e439e740a4 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -325,7 +325,7 @@ void SwUndoSaveContent::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx, if( pCpyNd || pEndNdIdx ) { SwNodeRange aRg( pStt->nNode, 0, pEnd->nNode, 1 ); - rDoc.GetNodes()._MoveNodes( aRg, rNds, aPos.nNode, false ); + rDoc.GetNodes().MoveNodes( aRg, rNds, aPos.nNode, false ); aPos.nContent = 0; --aPos.nNode; } @@ -374,7 +374,7 @@ void SwUndoSaveContent::MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx, aPaM.GetPoint()->nNode = nNodeIdx; aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 0); - _SaveRedlEndPosForRestore aRedlRest( rInsPos.nNode, rInsPos.nContent.GetIndex() ); + SaveRedlEndPosForRestore aRedlRest( rInsPos.nNode, rInsPos.nContent.GetIndex() ); rNds.MoveRange( aPaM, rInsPos, rDoc.GetNodes() ); @@ -397,7 +397,7 @@ void SwUndoSaveContent::MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx, SwNodeRange aRg( rNds, nNodeIdx, rNds, (pEndNdIdx ? ((*pEndNdIdx) + 1) : rNds.GetEndOfExtras().GetIndex() ) ); - rNds._MoveNodes( aRg, rDoc.GetNodes(), rInsPos.nNode, nullptr == pEndNdIdx ); + rNds.MoveNodes( aRg, rDoc.GetNodes(), rInsPos.nNode, nullptr == pEndNdIdx ); } else { diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index e8ee22047b28..56d5331b2f46 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -525,7 +525,7 @@ void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext) rFlyFormats.push_back( rSave.pFormat ); SdrObject *pObj = rSave.pObj; SwDrawContact *pContact = new SwDrawContact( rSave.pFormat, pObj ); - pContact->_Changed( *pObj, SDRUSERCALL_INSERTED, nullptr ); + pContact->Changed_( *pObj, SDRUSERCALL_INSERTED, nullptr ); // #i45718# - follow-up of #i35635# move object to visible layer pContact->MoveObjToVisibleLayer( pObj ); diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index 4de509e38a61..1fe602192674 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -323,7 +323,7 @@ SwRewriter SwUndoOverwrite::GetRewriter() const return aResult; } -struct _UndoTransliterate_Data +struct UndoTransliterate_Data { OUString sText; SwHistory* pHistory; @@ -331,11 +331,11 @@ struct _UndoTransliterate_Data sal_uLong nNdIdx; sal_Int32 nStart, nLen; - _UndoTransliterate_Data( sal_uLong nNd, sal_Int32 nStt, sal_Int32 nStrLen, const OUString& rText ) + UndoTransliterate_Data( sal_uLong nNd, sal_Int32 nStt, sal_Int32 nStrLen, const OUString& rText ) : sText( rText ), pHistory( nullptr ), pOffsets( nullptr ), nNdIdx( nNd ), nStart( nStt ), nLen( nStrLen ) {} - ~_UndoTransliterate_Data() { delete pOffsets; delete pHistory; } + ~UndoTransliterate_Data() { delete pOffsets; delete pHistory; } void SetChangeAtNode( SwDoc& rDoc ); }; @@ -389,7 +389,7 @@ void SwUndoTransliterate::AddChanges( SwTextNode& rTNd, uno::Sequence <sal_Int32>& rOffsets ) { long nOffsLen = rOffsets.getLength(); - _UndoTransliterate_Data* pNew = new _UndoTransliterate_Data( + UndoTransliterate_Data* pNew = new UndoTransliterate_Data( rTNd.GetIndex(), nStart, (sal_Int32)nOffsLen, rTNd.GetText().copy(nStart, nLen)); @@ -430,7 +430,7 @@ void SwUndoTransliterate::AddChanges( SwTextNode& rTNd, // but this data must moved every time to the last in the chain! for (size_t i = 0; i + 1 < aChanges.size(); ++i) // check all changes but not the current one { - _UndoTransliterate_Data* pD = aChanges[i]; + UndoTransliterate_Data* pD = aChanges[i]; if( pD->nNdIdx == pNew->nNdIdx && pD->pHistory ) { // same node and have a history? @@ -451,7 +451,7 @@ void SwUndoTransliterate::AddChanges( SwTextNode& rTNd, } } -void _UndoTransliterate_Data::SetChangeAtNode( SwDoc& rDoc ) +void UndoTransliterate_Data::SetChangeAtNode( SwDoc& rDoc ) { SwTextNode* pTNd = rDoc.GetNodes()[ nNdIdx ]->GetTextNode(); if( pTNd ) diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 7f3785b93d1d..ba2f3268d17a 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -88,7 +88,7 @@ class SwUndoMoves : public std::vector<std::unique_ptr<SwUndoMove>> {}; struct SwTableToTextSave; class SwTableToTextSaves : public std::vector<std::unique_ptr<SwTableToTextSave>> {}; -struct _UndoTableCpyTable_Entry +struct UndoTableCpyTable_Entry { sal_uLong nBoxIdx, nOffset; SfxItemSet* pBoxNumAttr; @@ -97,20 +97,20 @@ struct _UndoTableCpyTable_Entry // Was the last paragraph of the new and the first paragraph of the old content joined? bool bJoin; // For redlining only - explicit _UndoTableCpyTable_Entry( const SwTableBox& rBox ); - ~_UndoTableCpyTable_Entry(); + explicit UndoTableCpyTable_Entry( const SwTableBox& rBox ); + ~UndoTableCpyTable_Entry(); }; -class SwUndoTableCpyTable_Entries : public std::vector<std::unique_ptr<_UndoTableCpyTable_Entry>> {}; +class SwUndoTableCpyTable_Entries : public std::vector<std::unique_ptr<UndoTableCpyTable_Entry>> {}; -class _SaveBox; -class _SaveLine; +class SaveBox; +class SaveLine; -class _SaveTable +class SaveTable { - friend class _SaveBox; - friend class _SaveLine; + friend class SaveBox; + friend class SaveLine; SfxItemSet m_aTableSet; - _SaveLine* m_pLine; + SaveLine* m_pLine; const SwTable* m_pSwTable; SfxItemSets m_aSets; SwFrameFormats m_aFrameFormats; @@ -120,9 +120,9 @@ class _SaveTable bool m_bNewModel : 1; public: - _SaveTable( const SwTable& rTable, sal_uInt16 nLnCnt = USHRT_MAX, + SaveTable( const SwTable& rTable, sal_uInt16 nLnCnt = USHRT_MAX, bool bSaveFormula = true ); - ~_SaveTable(); + ~SaveTable(); sal_uInt16 AddFormat( SwFrameFormat* pFormat, bool bIsLine ); void NewFrameFormat( const SwTableLine* , const SwTableBox*, sal_uInt16 nFormatPos, @@ -135,47 +135,47 @@ public: bool IsNewModel() const { return m_bNewModel; } }; -class _SaveLine +class SaveLine { - friend class _SaveTable; - friend class _SaveBox; + friend class SaveTable; + friend class SaveBox; - _SaveLine* pNext; - _SaveBox* pBox; + SaveLine* pNext; + SaveBox* pBox; sal_uInt16 nItemSet; public: - _SaveLine( _SaveLine* pPrev, const SwTableLine& rLine, _SaveTable& rSTable ); - ~_SaveLine(); + SaveLine( SaveLine* pPrev, const SwTableLine& rLine, SaveTable& rSTable ); + ~SaveLine(); - void RestoreAttr( SwTableLine& rLine, _SaveTable& rSTable ); + void RestoreAttr( SwTableLine& rLine, SaveTable& rSTable ); void SaveContentAttrs( SwDoc* pDoc ); - void CreateNew( SwTable& rTable, SwTableBox& rParent, _SaveTable& rSTable ); + void CreateNew( SwTable& rTable, SwTableBox& rParent, SaveTable& rSTable ); }; -class _SaveBox +class SaveBox { - friend class _SaveLine; + friend class SaveLine; - _SaveBox* pNext; + SaveBox* pNext; sal_uLong nSttNode; long nRowSpan; sal_uInt16 nItemSet; union { SfxItemSets* pContentAttrs; - _SaveLine* pLine; + SaveLine* pLine; } Ptrs; public: - _SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTable ); - ~_SaveBox(); + SaveBox( SaveBox* pPrev, const SwTableBox& rBox, SaveTable& rSTable ); + ~SaveBox(); - void RestoreAttr( SwTableBox& rBox, _SaveTable& rSTable ); + void RestoreAttr( SwTableBox& rBox, SaveTable& rSTable ); void SaveContentAttrs( SwDoc* pDoc ); - void CreateNew( SwTable& rTable, SwTableLine& rParent, _SaveTable& rSTable ); + void CreateNew( SwTable& rTable, SwTableLine& rParent, SaveTable& rSTable ); }; #if OSL_DEBUG_LEVEL > 0 @@ -401,7 +401,7 @@ SwUndoTableToText::SwUndoTableToText( const SwTable& rTable, sal_Unicode cCh ) nSttNd( 0 ), nEndNd( 0 ), cTrenner( cCh ), nHdlnRpt( rTable.GetRowsToRepeat() ) { - pTableSave = new _SaveTable( rTable ); + pTableSave = new SaveTable( rTable ); m_pBoxSaves = new SwTableToTextSaves; m_pBoxSaves->reserve(rTable.GetTabSortBoxes().size()); @@ -739,7 +739,7 @@ void SwUndoTextToTable::UndoImpl(::sw::UndoRedoContext & rContext) { SwTableBox* pBox = rTable.GetTableBox( (*pDelBoxes)[ --n ] ); if( pBox ) - ::_DeleteBox( rTable, pBox, nullptr, false, false ); + ::DeleteBox_( rTable, pBox, nullptr, false, false ); else { OSL_ENSURE( false, "Where is my box?" ); } @@ -867,31 +867,31 @@ void SwUndoTableHeadline::RepeatImpl(::sw::RepeatContext & rContext) } } -_SaveTable::_SaveTable( const SwTable& rTable, sal_uInt16 nLnCnt, bool bSaveFormula ) +SaveTable::SaveTable( const SwTable& rTable, sal_uInt16 nLnCnt, bool bSaveFormula ) : m_aTableSet(*rTable.GetFrameFormat()->GetAttrSet().GetPool(), aTableSetRange), m_pSwTable(&rTable), m_nLineCount(nLnCnt), m_bSaveFormula(bSaveFormula) { m_bModifyBox = false; m_bNewModel = rTable.IsNewModel(); m_aTableSet.Put(rTable.GetFrameFormat()->GetAttrSet()); - m_pLine = new _SaveLine( nullptr, *rTable.GetTabLines()[ 0 ], *this ); + m_pLine = new SaveLine( nullptr, *rTable.GetTabLines()[ 0 ], *this ); - _SaveLine* pLn = m_pLine; + SaveLine* pLn = m_pLine; if( USHRT_MAX == nLnCnt ) nLnCnt = rTable.GetTabLines().size(); for( sal_uInt16 n = 1; n < nLnCnt; ++n ) - pLn = new _SaveLine( pLn, *rTable.GetTabLines()[ n ], *this ); + pLn = new SaveLine( pLn, *rTable.GetTabLines()[ n ], *this ); m_aFrameFormats.clear(); m_pSwTable = nullptr; } -_SaveTable::~_SaveTable() +SaveTable::~SaveTable() { delete m_pLine; } -sal_uInt16 _SaveTable::AddFormat( SwFrameFormat* pFormat, bool bIsLine ) +sal_uInt16 SaveTable::AddFormat( SwFrameFormat* pFormat, bool bIsLine ) { size_t nRet = m_aFrameFormats.GetPos(pFormat); if( SIZE_MAX == nRet ) @@ -924,7 +924,7 @@ sal_uInt16 _SaveTable::AddFormat( SwFrameFormat* pFormat, bool bIsLine ) return static_cast<sal_uInt16>(nRet); } -void _SaveTable::RestoreAttr( SwTable& rTable, bool bMdfyBox ) +void SaveTable::RestoreAttr( SwTable& rTable, bool bMdfyBox ) { m_bModifyBox = bMdfyBox; @@ -958,7 +958,7 @@ void _SaveTable::RestoreAttr( SwTable& rTable, bool bMdfyBox ) ? rTable.GetTabLines().size() : m_nLineCount; - _SaveLine* pLn = m_pLine; + SaveLine* pLn = m_pLine; for( size_t n = 0; n < nLnCnt; ++n, pLn = pLn->pNext ) { if( !pLn ) @@ -974,15 +974,15 @@ void _SaveTable::RestoreAttr( SwTable& rTable, bool bMdfyBox ) m_bModifyBox = false; } -void _SaveTable::SaveContentAttrs( SwDoc* pDoc ) +void SaveTable::SaveContentAttrs( SwDoc* pDoc ) { m_pLine->SaveContentAttrs(pDoc); } -void _SaveTable::CreateNew( SwTable& rTable, bool bCreateFrames, +void SaveTable::CreateNew( SwTable& rTable, bool bCreateFrames, bool bRestoreChart ) { - _FndBox aTmpBox( nullptr, nullptr ); + FndBox_ aTmpBox( nullptr, nullptr ); aTmpBox.DelFrames( rTable ); // first, get back attributes of TableFrameFormat @@ -1084,7 +1084,7 @@ void _SaveTable::CreateNew( SwTable& rTable, bool bCreateFrames, } } -void _SaveTable::NewFrameFormat( const SwTableLine* pTableLn, const SwTableBox* pTableBx, +void SaveTable::NewFrameFormat( const SwTableLine* pTableLn, const SwTableBox* pTableBx, sal_uInt16 nFormatPos, SwFrameFormat* pOldFormat ) { SwDoc* pDoc = pOldFormat->GetDoc(); @@ -1136,7 +1136,7 @@ void _SaveTable::NewFrameFormat( const SwTableLine* pTableLn, const SwTableBox* delete pOldFormat; } -_SaveLine::_SaveLine( _SaveLine* pPrev, const SwTableLine& rLine, _SaveTable& rSTable ) +SaveLine::SaveLine( SaveLine* pPrev, const SwTableLine& rLine, SaveTable& rSTable ) : pNext( nullptr ) { if( pPrev ) @@ -1144,23 +1144,23 @@ _SaveLine::_SaveLine( _SaveLine* pPrev, const SwTableLine& rLine, _SaveTable& rS nItemSet = rSTable.AddFormat( rLine.GetFrameFormat(), true ); - pBox = new _SaveBox( nullptr, *rLine.GetTabBoxes()[ 0 ], rSTable ); - _SaveBox* pBx = pBox; + pBox = new SaveBox( nullptr, *rLine.GetTabBoxes()[ 0 ], rSTable ); + SaveBox* pBx = pBox; for( size_t n = 1; n < rLine.GetTabBoxes().size(); ++n ) - pBx = new _SaveBox( pBx, *rLine.GetTabBoxes()[ n ], rSTable ); + pBx = new SaveBox( pBx, *rLine.GetTabBoxes()[ n ], rSTable ); } -_SaveLine::~_SaveLine() +SaveLine::~SaveLine() { delete pBox; delete pNext; } -void _SaveLine::RestoreAttr( SwTableLine& rLine, _SaveTable& rSTable ) +void SaveLine::RestoreAttr( SwTableLine& rLine, SaveTable& rSTable ) { rSTable.NewFrameFormat( &rLine, nullptr, nItemSet, rLine.GetFrameFormat() ); - _SaveBox* pBx = pBox; + SaveBox* pBx = pBox; for( size_t n = 0; n < rLine.GetTabBoxes().size(); ++n, pBx = pBx->pNext ) { if( !pBx ) @@ -1172,14 +1172,14 @@ void _SaveLine::RestoreAttr( SwTableLine& rLine, _SaveTable& rSTable ) } } -void _SaveLine::SaveContentAttrs( SwDoc* pDoc ) +void SaveLine::SaveContentAttrs( SwDoc* pDoc ) { pBox->SaveContentAttrs( pDoc ); if( pNext ) pNext->SaveContentAttrs( pDoc ); } -void _SaveLine::CreateNew( SwTable& rTable, SwTableBox& rParent, _SaveTable& rSTable ) +void SaveLine::CreateNew( SwTable& rTable, SwTableBox& rParent, SaveTable& rSTable ) { SwTableLineFormat* pFormat = static_cast<SwTableLineFormat*>(rSTable.m_aFrameFormats[ nItemSet ]); if( !pFormat ) @@ -1199,7 +1199,7 @@ void _SaveLine::CreateNew( SwTable& rTable, SwTableBox& rParent, _SaveTable& rST pNext->CreateNew( rTable, rParent, rSTable ); } -_SaveBox::_SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTable ) +SaveBox::SaveBox( SaveBox* pPrev, const SwTableBox& rBox, SaveTable& rSTable ) : pNext( nullptr ), nSttNode( ULONG_MAX ), nRowSpan(0) { Ptrs.pLine = nullptr; @@ -1216,15 +1216,15 @@ _SaveBox::_SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTable } else { - Ptrs.pLine = new _SaveLine( nullptr, *rBox.GetTabLines()[ 0 ], rSTable ); + Ptrs.pLine = new SaveLine( nullptr, *rBox.GetTabLines()[ 0 ], rSTable ); - _SaveLine* pLn = Ptrs.pLine; + SaveLine* pLn = Ptrs.pLine; for( size_t n = 1; n < rBox.GetTabLines().size(); ++n ) - pLn = new _SaveLine( pLn, *rBox.GetTabLines()[ n ], rSTable ); + pLn = new SaveLine( pLn, *rBox.GetTabLines()[ n ], rSTable ); } } -_SaveBox::~_SaveBox() +SaveBox::~SaveBox() { if( ULONG_MAX == nSttNode ) // no EndBox delete Ptrs.pLine; @@ -1233,7 +1233,7 @@ _SaveBox::~_SaveBox() delete pNext; } -void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTable ) +void SaveBox::RestoreAttr( SwTableBox& rBox, SaveTable& rSTable ) { rSTable.NewFrameFormat( nullptr, &rBox, nItemSet, rBox.GetFrameFormat() ); @@ -1245,7 +1245,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTable ) } else { - _SaveLine* pLn = Ptrs.pLine; + SaveLine* pLn = Ptrs.pLine; for( size_t n = 0; n < rBox.GetTabLines().size(); ++n, pLn = pLn->pNext ) { if( !pLn ) @@ -1293,7 +1293,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTable ) } } -void _SaveBox::SaveContentAttrs( SwDoc* pDoc ) +void SaveBox::SaveContentAttrs( SwDoc* pDoc ) { if( ULONG_MAX == nSttNode ) // no EndBox { @@ -1325,7 +1325,7 @@ void _SaveBox::SaveContentAttrs( SwDoc* pDoc ) pNext->SaveContentAttrs( pDoc ); } -void _SaveBox::CreateNew( SwTable& rTable, SwTableLine& rParent, _SaveTable& rSTable ) +void SaveBox::CreateNew( SwTable& rTable, SwTableLine& rParent, SaveTable& rSTable ) { SwTableBoxFormat* pFormat = static_cast<SwTableBoxFormat*>(rSTable.m_aFrameFormats[ nItemSet ]); if( !pFormat ) @@ -1375,7 +1375,7 @@ SwUndoAttrTable::SwUndoAttrTable( const SwTableNode& rTableNd, bool bClearTabCol nSttNode( rTableNd.GetIndex() ) { bClearTabCol = bClearTabCols; - pSaveTable = new _SaveTable( rTableNd.GetTable() ); + pSaveTable = new SaveTable( rTableNd.GetTable() ); } SwUndoAttrTable::~SwUndoAttrTable() @@ -1391,7 +1391,7 @@ void SwUndoAttrTable::UndoImpl(::sw::UndoRedoContext & rContext) if (pTableNd) { - _SaveTable* pOrig = new _SaveTable( pTableNd->GetTable() ); + SaveTable* pOrig = new SaveTable( pTableNd->GetTable() ); pSaveTable->RestoreAttr( pTableNd->GetTable() ); delete pSaveTable; pSaveTable = pOrig; @@ -1414,7 +1414,7 @@ SwUndoTableAutoFormat::SwUndoTableAutoFormat( const SwTableNode& rTableNd, bSaveContentAttr( false ) , m_nRepeatHeading(rTableNd.GetTable().GetRowsToRepeat()) { - pSaveTable = new _SaveTable( rTableNd.GetTable() ); + pSaveTable = new SaveTable( rTableNd.GetTable() ); if( rAFormat.IsFont() || rAFormat.IsJustify() ) { @@ -1444,7 +1444,7 @@ SwUndoTableAutoFormat::UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rConte OSL_ENSURE( pTableNd, "no TableNode" ); SwTable& table = pTableNd->GetTable(); - _SaveTable* pOrig = new _SaveTable( table ); + SaveTable* pOrig = new SaveTable( table ); // than go also over the ContentNodes of the EndBoxes and collect // all paragraph attributes if( bSaveContentAttr ) @@ -1489,7 +1489,7 @@ SwUndoTableNdsChg::SwUndoTableNdsChg( SwUndoId nAction, bSameHeight( bSmHght ) { const SwTable& rTable = rTableNd.GetTable(); - pSaveTable = new _SaveTable( rTable ); + pSaveTable = new SaveTable( rTable ); // and remember selection ReNewBoxes( rBoxes ); @@ -1507,7 +1507,7 @@ SwUndoTableNdsChg::SwUndoTableNdsChg( SwUndoId nAction, bSameHeight( false ) { const SwTable& rTable = rTableNd.GetTable(); - pSaveTable = new _SaveTable( rTable ); + pSaveTable = new SaveTable( rTable ); // and remember selection ReNewBoxes( rBoxes ); @@ -1537,7 +1537,7 @@ void SwUndoTableNdsChg::SaveNewBoxes( const SwTableNode& rTableNd, const SwTableSortBoxes& rTableBoxes = rTable.GetTabSortBoxes(); OSL_ENSURE( ! IsDelBox(), "wrong Action" ); - pNewSttNds.reset( new std::set<_BoxMove> ); + pNewSttNds.reset( new std::set<BoxMove> ); size_t i = 0; for (size_t n = 0; n < rOld.size(); ++i) @@ -1546,12 +1546,12 @@ void SwUndoTableNdsChg::SaveNewBoxes( const SwTableNode& rTableNd, ++n; else // new box: insert sorted - pNewSttNds->insert( _BoxMove(rTableBoxes[ i ]->GetSttIdx()) ); + pNewSttNds->insert( BoxMove(rTableBoxes[ i ]->GetSttIdx()) ); } for( ; i < rTableBoxes.size(); ++i ) // new box: insert sorted - pNewSttNds->insert( _BoxMove(rTableBoxes[ i ]->GetSttIdx()) ); + pNewSttNds->insert( BoxMove(rTableBoxes[ i ]->GetSttIdx()) ); } static SwTableLine* lcl_FindTableLine( const SwTable& rTable, @@ -1589,7 +1589,7 @@ void SwUndoTableNdsChg::SaveNewBoxes( const SwTableNode& rTableNd, const SwTableSortBoxes& rTableBoxes = rTable.GetTabSortBoxes(); OSL_ENSURE( ! IsDelBox(), "wrong Action" ); - pNewSttNds.reset( new std::set<_BoxMove> ); + pNewSttNds.reset( new std::set<BoxMove> ); OSL_ENSURE( rTable.IsNewModel() || rOld.size() + nCount * rBoxes.size() == rTableBoxes.size(), "unexpected boxes" ); @@ -1656,7 +1656,7 @@ void SwUndoTableNdsChg::SaveNewBoxes( const SwTableNode& rTableNd, ( nNodes != ( pSourceBox->GetSttNd()->EndOfSectionIndex() - pSourceBox->GetSttIdx() ) ) && ( nNodes - 1 > nLineDiff ); - pNewSttNds->insert( _BoxMove(pBox->GetSttIdx(), bNodesMoved) ); + pNewSttNds->insert( BoxMove(pBox->GetSttIdx(), bNodesMoved) ); } } } @@ -1689,7 +1689,7 @@ void SwUndoTableNdsChg::UndoImpl(::sw::UndoRedoContext & rContext) CHECK_TABLE( pTableNd->GetTable() ) - _FndBox aTmpBox( nullptr, nullptr ); + FndBox_ aTmpBox( nullptr, nullptr ); // ? TL_CHART2: notification or locking of controller required ? SwChartDataProvider *pPCD = rDoc.getIDocumentChartDataProviderAccess().GetChartDataProvider(); @@ -1719,7 +1719,7 @@ void SwUndoTableNdsChg::UndoImpl(::sw::UndoRedoContext & rContext) { // Then the nodes have be moved and not deleted! // But for that we need a temp array. - std::vector<_BoxMove> aTmp( pNewSttNds->begin(), pNewSttNds->end() ); + std::vector<BoxMove> aTmp( pNewSttNds->begin(), pNewSttNds->end() ); // backwards for (size_t n = aTmp.size(); n > 0 ; ) @@ -1756,7 +1756,7 @@ void SwUndoTableNdsChg::UndoImpl(::sw::UndoRedoContext & rContext) // first delete box delete pBox; // than move nodes - rDoc.GetNodes()._MoveNodes( aRg, rDoc.GetNodes(), aInsPos, false ); + rDoc.GetNodes().MoveNodes( aRg, rDoc.GetNodes(), aInsPos, false ); } else { @@ -1767,7 +1767,7 @@ void SwUndoTableNdsChg::UndoImpl(::sw::UndoRedoContext & rContext) else { // Remove nodes from nodes array (backwards!) - std::set<_BoxMove>::reverse_iterator it; + std::set<BoxMove>::reverse_iterator it; for( it = pNewSttNds->rbegin(); it != pNewSttNds->rend(); ++it ) { sal_uLong nIdx = (*it).index; @@ -1939,7 +1939,7 @@ SwUndoTableMerge::SwUndoTableMerge( const SwPaM& rTableSel ) { const SwTableNode* pTableNd = rTableSel.GetNode().FindTableNode(); OSL_ENSURE( pTableNd, "Where is the TableNode?" ); - pSaveTable = new _SaveTable( pTableNd->GetTable() ); + pSaveTable = new SaveTable( pTableNd->GetTable() ); nTableNode = pTableNd->GetIndex(); } @@ -1962,7 +1962,7 @@ void SwUndoTableMerge::UndoImpl(::sw::UndoRedoContext & rContext) aMsgHint.m_eFlags = TBL_BOXPTR; rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint ); - _FndBox aTmpBox( nullptr, nullptr ); + FndBox_ aTmpBox( nullptr, nullptr ); // ? TL_CHART2: notification or locking of controller required ? // 1. restore deleted boxes: @@ -2410,13 +2410,13 @@ void SwUndoTableNumFormat::SetBox( const SwTableBox& rBox ) nNode = rBox.GetSttIdx(); } -_UndoTableCpyTable_Entry::_UndoTableCpyTable_Entry( const SwTableBox& rBox ) +UndoTableCpyTable_Entry::UndoTableCpyTable_Entry( const SwTableBox& rBox ) : nBoxIdx( rBox.GetSttIdx() ), nOffset( 0 ), pBoxNumAttr( nullptr ), pUndo( nullptr ), bJoin( false ) { } -_UndoTableCpyTable_Entry::~_UndoTableCpyTable_Entry() +UndoTableCpyTable_Entry::~UndoTableCpyTable_Entry() { delete pUndo; delete pBoxNumAttr; @@ -2443,7 +2443,7 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext) SwTableNode* pTableNd = nullptr; for (size_t n = m_pArr->size(); n; ) { - _UndoTableCpyTable_Entry *const pEntry = (*m_pArr)[ --n ].get(); + UndoTableCpyTable_Entry *const pEntry = (*m_pArr)[ --n ].get(); sal_uLong nSttPos = pEntry->nBoxIdx + pEntry->nOffset; SwStartNode* pSNd = rDoc.GetNodes()[ nSttPos ]->StartOfSectionNode(); if( !pTableNd ) @@ -2595,7 +2595,7 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext) SwTableNode* pTableNd = nullptr; for (size_t n = 0; n < m_pArr->size(); ++n) { - _UndoTableCpyTable_Entry *const pEntry = (*m_pArr)[ n ].get(); + UndoTableCpyTable_Entry *const pEntry = (*m_pArr)[ n ].get(); sal_uLong nSttPos = pEntry->nBoxIdx + pEntry->nOffset; SwStartNode* pSNd = rDoc.GetNodes()[ nSttPos ]->StartOfSectionNode(); if( !pTableNd ) @@ -2674,8 +2674,8 @@ void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent if (!m_pArr->empty() && !bDelContent) return; - _UndoTableCpyTable_Entry* pEntry = new _UndoTableCpyTable_Entry( rBox ); - m_pArr->push_back(std::unique_ptr<_UndoTableCpyTable_Entry>(pEntry)); + UndoTableCpyTable_Entry* pEntry = new UndoTableCpyTable_Entry( rBox ); + m_pArr->push_back(std::unique_ptr<UndoTableCpyTable_Entry>(pEntry)); SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc(); DEBUG_REDLINE( pDoc ) @@ -2703,7 +2703,7 @@ void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, bool bDelContent ) { - _UndoTableCpyTable_Entry *const pEntry = (*m_pArr).back().get(); + UndoTableCpyTable_Entry *const pEntry = (*m_pArr).back().get(); // If the content was deleted than remove also the temporarily created node if( bDelContent ) @@ -2883,7 +2883,7 @@ SwUndoSplitTable::SwUndoSplitTable( const SwTableNode& rTableNd, // no break case HEADLINE_BORDERCOPY: case HEADLINE_BOXATTRCOPY: - pSavTable = new _SaveTable( rTableNd.GetTable(), 1, false ); + pSavTable = new SaveTable( rTableNd.GetTable(), 1, false ); break; } } @@ -2946,7 +2946,7 @@ void SwUndoSplitTable::UndoImpl(::sw::UndoRedoContext & rContext) SwSelBoxes aSelBoxes; SwTableBox* pBox = rTable.GetTableBox( nTableNode + nOffset + 1 ); SwTable::SelLineFromBox( pBox, aSelBoxes ); - _FndBox aTmpBox( nullptr, nullptr ); + FndBox_ aTmpBox( nullptr, nullptr ); aTmpBox.SetTableLines( aSelBoxes, rTable ); aTmpBox.DelFrames( rTable ); rTable.DeleteSel( pDoc, aSelBoxes, nullptr, nullptr, false, false ); @@ -3013,9 +3013,9 @@ SwUndoMergeTable::SwUndoMergeTable( const SwTableNode& rTableNd, nTableNode = rTableNd.EndOfSectionIndex() - 1; aName = rDelTableNd.GetTable().GetFrameFormat()->GetName(); - pSavTable = new _SaveTable( rDelTableNd.GetTable() ); + pSavTable = new SaveTable( rDelTableNd.GetTable() ); - pSavHdl = bWithPrev ? new _SaveTable( rTableNd.GetTable(), 1 ) : nullptr; + pSavHdl = bWithPrev ? new SaveTable( rTableNd.GetTable(), 1 ) : nullptr; } SwUndoMergeTable::~SwUndoMergeTable() @@ -3042,7 +3042,7 @@ void SwUndoMergeTable::UndoImpl(::sw::UndoRedoContext & rContext) pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint ); // get lines for layout update - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); aFndBox.SetTableLines( *pTable ); aFndBox.DelFrames( *pTable ); // ? TL_CHART2: notification or locking of controller required ? diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 6589a4a8fa07..10024027c658 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1730,7 +1730,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) { drawing::HomogenMatrix3 aMatrix; aRet >>= aMatrix; - aRet <<= _ConvertTransformationToLayoutDir( aMatrix ); + aRet <<= ConvertTransformationToLayoutDir( aMatrix ); } // #i36248# else if ( rPropertyName == "StartPosition" ) @@ -1738,21 +1738,21 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) awt::Point aStartPos; aRet >>= aStartPos; // #i59051# - aRet <<= _ConvertStartOrEndPosToLayoutDir( aStartPos ); + aRet <<= ConvertStartOrEndPosToLayoutDir( aStartPos ); } else if ( rPropertyName == "EndPosition" ) { awt::Point aEndPos; aRet >>= aEndPos; // #i59051# - aRet <<= _ConvertStartOrEndPosToLayoutDir( aEndPos ); + aRet <<= ConvertStartOrEndPosToLayoutDir( aEndPos ); } // #i59051# else if ( rPropertyName == "PolyPolygonBezier" ) { drawing::PolyPolygonBezierCoords aPath; aRet >>= aPath; - aRet <<= _ConvertPolyPolygonBezierToLayoutDir( aPath ); + aRet <<= ConvertPolyPolygonBezierToLayoutDir( aPath ); } else if (rPropertyName == "ZOrder") { @@ -2277,13 +2277,13 @@ SvxShape* SwXShape::GetSvxShape() // implementation of virtual methods from drawing::XShape awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException, std::exception ) { - awt::Point aPos( _GetAttrPosition() ); + awt::Point aPos( GetAttrPosition() ); // handle group members SvxShape* pSvxShape = GetSvxShape(); if ( pSvxShape ) { - SdrObject* pTopGroupObj = _GetTopGroupObj( pSvxShape ); + SdrObject* pTopGroupObj = GetTopGroupObj( pSvxShape ); if ( pTopGroupObj ) { // #i34750# - get attribute position of top group @@ -2318,7 +2318,7 @@ awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException, std:: void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition ) throw ( uno::RuntimeException, std::exception ) { - SdrObject* pTopGroupObj = _GetTopGroupObj(); + SdrObject* pTopGroupObj = GetTopGroupObj(); if ( !pTopGroupObj ) { // #i37877# - no adjustment of position attributes, @@ -2350,7 +2350,7 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition ) // shape isn't a group member. Thus, set positioning attributes if ( !bNoAdjustOfPosProp ) { - _AdjustPositionProperties( aPosition ); + AdjustPositionProperties( aPosition ); } if ( bApplyPosAtDrawObj ) { @@ -2367,7 +2367,7 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition ) // convert given absolute attribute position in layout direction into // position in horizontal left-to-right layout. { - aNewPos = _ConvertPositionToHoriL2R( aNewPos, getSize() ); + aNewPos = ConvertPositionToHoriL2R( aNewPos, getSize() ); } // Convert given absolute position in horizontal left-to-right // layout into relative position in horizontal left-to-right layout. @@ -2379,7 +2379,7 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition ) // use method <xGroupShape->getPosition()> to get the correct // position of the top group object. awt::Point aAttrPosInHoriL2R( - _ConvertPositionToHoriL2R( xGroupShape->getPosition(), + ConvertPositionToHoriL2R( xGroupShape->getPosition(), xGroupShape->getSize() ) ); aNewPos.X -= aAttrPosInHoriL2R.X; aNewPos.Y -= aAttrPosInHoriL2R.Y; @@ -2437,7 +2437,7 @@ OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException, std::e /** method to determine top group object #i31698# */ -SdrObject* SwXShape::_GetTopGroupObj( SvxShape* _pSvxShape ) +SdrObject* SwXShape::GetTopGroupObj( SvxShape* _pSvxShape ) { SdrObject* pTopGroupObj( nullptr ); @@ -2461,7 +2461,7 @@ SdrObject* SwXShape::_GetTopGroupObj( SvxShape* _pSvxShape ) /** method to determine position according to the positioning attributes #i31698# */ -awt::Point SwXShape::_GetAttrPosition() +awt::Point SwXShape::GetAttrPosition() { awt::Point aAttrPos; @@ -2505,7 +2505,7 @@ awt::Point SwXShape::_GetAttrPosition() the layout direction horizontal left-to-right. #i31698# */ -awt::Point SwXShape::_ConvertPositionToHoriL2R( const awt::Point& rObjPos, +awt::Point SwXShape::ConvertPositionToHoriL2R( const awt::Point& rObjPos, const awt::Size& rObjSize ) { awt::Point aObjPosInHoriL2R( rObjPos ); @@ -2534,7 +2534,7 @@ awt::Point SwXShape::_ConvertPositionToHoriL2R( const awt::Point& rObjPos, break; default: { - OSL_FAIL( "<SwXShape::_ConvertPositionToHoriL2R(..)> - unsupported layout direction" ); + OSL_FAIL( "<SwXShape::ConvertPositionToHoriL2R(..)> - unsupported layout direction" ); } } } @@ -2546,7 +2546,7 @@ awt::Point SwXShape::_ConvertPositionToHoriL2R( const awt::Point& rObjPos, direction, the drawing object is in #i31698# */ -drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir( +drawing::HomogenMatrix3 SwXShape::ConvertTransformationToLayoutDir( const drawing::HomogenMatrix3& rMatrixInHoriL2R ) { drawing::HomogenMatrix3 aMatrix(rMatrixInHoriL2R); @@ -2555,12 +2555,12 @@ drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir( // tranformation structure isn't valid, if it contains rotation. SvxShape* pSvxShape = GetSvxShape(); OSL_ENSURE( pSvxShape, - "<SwXShape::_ConvertTransformationToLayoutDir(..)> - no SvxShape found!"); + "<SwXShape::ConvertTransformationToLayoutDir(..)> - no SvxShape found!"); if ( pSvxShape ) { const SdrObject* pObj = pSvxShape->GetSdrObject(); OSL_ENSURE( pObj, - "<SwXShape::_ConvertTransformationToLayoutDir(..)> - no SdrObject found!"); + "<SwXShape::ConvertTransformationToLayoutDir(..)> - no SdrObject found!"); if ( pObj ) { // get position of object in Writer coordinate system. @@ -2610,7 +2610,7 @@ drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir( /** method to adjust the positioning properties #i31698# */ -void SwXShape::_AdjustPositionProperties( const awt::Point& rPosition ) +void SwXShape::AdjustPositionProperties( const awt::Point& rPosition ) { // handle x-position // #i35007# - no handling of x-position, if drawing @@ -2686,19 +2686,19 @@ void SwXShape::_AdjustPositionProperties( const awt::Point& rPosition ) Writer specific position, which is the attribute position in layout direction #i59051# */ -css::awt::Point SwXShape::_ConvertStartOrEndPosToLayoutDir( +css::awt::Point SwXShape::ConvertStartOrEndPosToLayoutDir( const css::awt::Point& aStartOrEndPos ) { awt::Point aConvertedPos( aStartOrEndPos ); SvxShape* pSvxShape = GetSvxShape(); OSL_ENSURE( pSvxShape, - "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SvxShape found!"); + "<SwXShape::ConvertStartOrEndPosToLayoutDir(..)> - no SvxShape found!"); if ( pSvxShape ) { const SdrObject* pObj = pSvxShape->GetSdrObject(); OSL_ENSURE( pObj, - "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SdrObject found!"); + "<SwXShape::ConvertStartOrEndPosToLayoutDir(..)> - no SdrObject found!"); if ( pObj ) { // get position of object in Writer coordinate system. @@ -2724,19 +2724,19 @@ css::awt::Point SwXShape::_ConvertStartOrEndPosToLayoutDir( return aConvertedPos; } -css::drawing::PolyPolygonBezierCoords SwXShape::_ConvertPolyPolygonBezierToLayoutDir( +css::drawing::PolyPolygonBezierCoords SwXShape::ConvertPolyPolygonBezierToLayoutDir( const css::drawing::PolyPolygonBezierCoords& aPath ) { drawing::PolyPolygonBezierCoords aConvertedPath( aPath ); SvxShape* pSvxShape = GetSvxShape(); OSL_ENSURE( pSvxShape, - "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SvxShape found!"); + "<SwXShape::ConvertStartOrEndPosToLayoutDir(..)> - no SvxShape found!"); if ( pSvxShape ) { const SdrObject* pObj = pSvxShape->GetSdrObject(); OSL_ENSURE( pObj, - "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SdrObject found!"); + "<SwXShape::ConvertStartOrEndPosToLayoutDir(..)> - no SdrObject found!"); if ( pObj ) { // get position of object in Writer coordinate system. diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index c4c5ed21d0ef..b0dd93277ee8 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1503,7 +1503,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& // is no contour, or if the contour has been set by the // API itself (or in other words, if the contour isn't // used already). - if( !pNoText->_HasContour() || + if( !pNoText->HasContour_() || !pNoText->IsContourMapModeValid() ) pNoText->SetPixelContour( *static_cast<sal_Bool const *>(aValue.getValue()) ); else diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index c0cd23d7308f..4c9a42176bb7 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -172,7 +172,7 @@ namespace sw SfxStyleSheetBasePool* m_pBasePool; SwDocShell* m_pDocShell; - SwXStyle* _FindStyle(const OUString& rStyleName) const; + SwXStyle* FindStyle(const OUString& rStyleName) const; sal_Int32 GetCountOrName(OUString* pString, sal_Int32 nIndex = SAL_MAX_INT32) { return m_rEntry.m_fGetCountOrName(*m_pDocShell->GetDoc(), pString, nIndex); }; static const StyleFamilyEntry& InitEntry(SfxStyleFamily eFamily) @@ -798,7 +798,7 @@ uno::Any XStyleFamily::getByName(const OUString& rName) SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName); if(!pBase) throw container::NoSuchElementException(); - uno::Reference<style::XStyle> xStyle = _FindStyle(sStyleName); + uno::Reference<style::XStyle> xStyle = FindStyle(sStyleName); if(!xStyle.is()) xStyle = m_rEntry.m_fCreateStyle(m_pBasePool, m_pDocShell, m_rEntry.m_eFamily == SFX_STYLE_FAMILY_FRAME ? pBase->GetName() : sStyleName); return uno::makeAny(xStyle); @@ -892,7 +892,7 @@ void XStyleFamily::replaceByName(const OUString& rName, const uno::Any& rElement if(!pBase->IsUserDefined()) throw lang::IllegalArgumentException(); //if theres an object available to this style then it must be invalidated - uno::Reference<style::XStyle> xStyle = _FindStyle(pBase->GetName()); + uno::Reference<style::XStyle> xStyle = FindStyle(pBase->GetName()); if(xStyle.is()) { uno::Reference<lang::XUnoTunnel> xTunnel( xStyle, uno::UNO_QUERY); @@ -930,7 +930,7 @@ uno::Any SAL_CALL XStyleFamily::getPropertyValue( const OUString& sPropertyName } -SwXStyle* XStyleFamily::_FindStyle(const OUString& rStyleName) const +SwXStyle* XStyleFamily::FindStyle(const OUString& rStyleName) const { const size_t nLCount = m_pBasePool->GetSizeOfVector(); for(size_t i = 0; i < nLCount; ++i) diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index d2f21e58e680..9e2d90b7a061 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -50,7 +50,7 @@ SwPagePreviewLayout::SwPagePreviewLayout( SwViewShell& _rParentViewShell, mrParentViewShell( _rParentViewShell ), mrLayoutRootFrame ( _rLayoutRootFrame ) { - _Clear(); + Clear_(); // OD 2004-03-05 #i18143# mbBookPreview = false; @@ -59,7 +59,7 @@ SwPagePreviewLayout::SwPagePreviewLayout( SwViewShell& _rParentViewShell, mbPrintEmptyPages = mrParentViewShell.getIDocumentDeviceAccess().getPrintData().IsPrintEmptyPages(); } -void SwPagePreviewLayout::_Clear() +void SwPagePreviewLayout::Clear_() { mbLayoutInfoValid = mbLayoutSizesValid = mbPaintInfoValid = false; @@ -67,7 +67,7 @@ void SwPagePreviewLayout::_Clear() maWinSize.Height() = 0; mnCols = mnRows = 0; - _ClearPreviewLayoutSizes(); + ClearPreviewLayoutSizes(); mbDoesLayoutRowsFitIntoWindow = false; mbDoesLayoutColsFitIntoWindow = false; @@ -86,14 +86,14 @@ void SwPagePreviewLayout::_Clear() maPaintedPreviewDocRect.Right() = 0; maPaintedPreviewDocRect.Bottom() = 0; mnSelectedPageNum = 0; - _ClearPreviewPageData(); + ClearPreviewPageData(); // OD 07.11.2003 #i22014# mbInPaint = false; mbNewLayoutDuringPaint = false; } -void SwPagePreviewLayout::_ClearPreviewLayoutSizes() +void SwPagePreviewLayout::ClearPreviewLayoutSizes() { mnPages = 0; @@ -105,7 +105,7 @@ void SwPagePreviewLayout::_ClearPreviewLayoutSizes() mnPreviewLayoutWidth = mnPreviewLayoutHeight = 0; } -void SwPagePreviewLayout::_ClearPreviewPageData() +void SwPagePreviewLayout::ClearPreviewPageData() { for ( std::vector<PreviewPage*>::iterator aPageDelIter = maPreviewPages.begin(); aPageDelIter != maPreviewPages.end(); @@ -120,7 +120,7 @@ void SwPagePreviewLayout::_ClearPreviewPageData() OD 18.12.2002 #103492# */ -void SwPagePreviewLayout::_CalcPreviewLayoutSizes() +void SwPagePreviewLayout::CalcPreviewLayoutSizes() { vcl::RenderContext* pRenderContext = mrParentViewShell.GetOut(); // calculate maximal page size; calculate also number of pages @@ -200,13 +200,13 @@ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, // environment and parameters ok // clear existing preview settings - _Clear(); + Clear_(); // set layout information columns and rows mnCols = _nCols; mnRows = _nRows; - _CalcPreviewLayoutSizes(); + CalcPreviewLayoutSizes(); // validate layout information mbLayoutInfoValid = true; @@ -226,7 +226,7 @@ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, nNewNuminator = 1; aYScale = Fraction( nNewNuminator, 1000 ); // propagate scaling as zoom percentage to view options for font cache - _ApplyNewZoomAtViewShell( static_cast<sal_uInt8>(nNewNuminator/10) ); + ApplyNewZoomAtViewShell( static_cast<sal_uInt8>(nNewNuminator/10) ); aMapMode.SetScaleY( aYScale ); aMapMode.SetScaleX( aYScale ); @@ -245,7 +245,7 @@ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, } /** apply new zoom at given view shell */ -void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ) +void SwPagePreviewLayout::ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ) { SwViewOption aNewViewOptions = *(mrParentViewShell.GetViewOptions()); if ( aNewViewOptions.GetZoom() != _aNewZoom ) @@ -273,8 +273,8 @@ bool SwPagePreviewLayout::ReInit() return false; } - _ClearPreviewLayoutSizes(); - _CalcPreviewLayoutSizes(); + ClearPreviewLayoutSizes(); + CalcPreviewLayoutSizes(); return true; } @@ -419,10 +419,10 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum, } // determine additional paint offset, if preview layout fits into window. - _CalcAdditionalPaintOffset(); + CalcAdditionalPaintOffset(); // determine rectangle to be painted from document preview - _CalcDocPreviewPaintRect(); + CalcDocPreviewPaintRect(); _orDocPreviewPaintRect = maPaintedPreviewDocRect; // OD 20.01.2003 #103492# - shift visible preview document area to the left, @@ -466,7 +466,7 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum, // determine preview pages - visible pages with needed data for paint and // accessible pages with needed data. - _CalcPreviewPages(); + CalcPreviewPages(); // OD 07.11.2003 #i22014# - indicate new layout, if print preview is in paint if ( mbInPaint ) @@ -487,7 +487,7 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum, OD 12.12.2002 #103492# */ -void SwPagePreviewLayout::_CalcAdditionalPaintOffset() +void SwPagePreviewLayout::CalcAdditionalPaintOffset() { if ( mnPreviewLayoutWidth <= maWinSize.Width() && maPaintStartPageOffset.X() <= 0 ) @@ -518,7 +518,7 @@ void SwPagePreviewLayout::_CalcAdditionalPaintOffset() OD 12.12.2002 #103492# */ -void SwPagePreviewLayout::_CalcDocPreviewPaintRect() +void SwPagePreviewLayout::CalcDocPreviewPaintRect() { Point aTopLeftPos = maPaintPreviewDocOffset; maPaintedPreviewDocRect.SetPos( aTopLeftPos ); @@ -543,10 +543,10 @@ void SwPagePreviewLayout::_CalcDocPreviewPaintRect() OD 12.12.2002 #103492# */ -void SwPagePreviewLayout::_CalcPreviewPages() +void SwPagePreviewLayout::CalcPreviewPages() { vcl::RenderContext* pRenderContext = mrParentViewShell.GetOut(); - _ClearPreviewPageData(); + ClearPreviewPageData(); if ( mbNoPageVisible ) return; @@ -597,7 +597,7 @@ void SwPagePreviewLayout::_CalcPreviewPages() PreviewPage* pPreviewPage = new PreviewPage; Point aCurrAccOffset = aCurrPaintOffset - Point( (mnPaintStartCol-nCurrCol) * mnColWidth, 0 ); - _CalcPreviewDataForPage( *(pPage), aCurrAccOffset, pPreviewPage ); + CalcPreviewDataForPage( *(pPage), aCurrAccOffset, pPreviewPage ); pPreviewPage->bVisible = false; maPreviewPages.push_back( pPreviewPage ); // continue with next page and next column @@ -624,7 +624,7 @@ void SwPagePreviewLayout::_CalcPreviewPages() // calculate data of visible page PreviewPage* pPreviewPage = new PreviewPage; - _CalcPreviewDataForPage( *(pPage), aCurrPaintOffset, pPreviewPage ); + CalcPreviewDataForPage( *(pPage), aCurrPaintOffset, pPreviewPage ); pPreviewPage->bVisible = true; maPreviewPages.push_back( pPreviewPage ); } @@ -632,7 +632,7 @@ void SwPagePreviewLayout::_CalcPreviewPages() { // calculate data of unvisible page needed for accessibility PreviewPage* pPreviewPage = new PreviewPage; - _CalcPreviewDataForPage( *(pPage), aCurrPaintOffset, pPreviewPage ); + CalcPreviewDataForPage( *(pPage), aCurrPaintOffset, pPreviewPage ); pPreviewPage->bVisible = false; maPreviewPages.push_back( pPreviewPage ); } @@ -659,7 +659,7 @@ void SwPagePreviewLayout::_CalcPreviewPages() OD 13.12.2002 #103492# */ -bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrame& _rPage, +bool SwPagePreviewLayout::CalcPreviewDataForPage( const SwPageFrame& _rPage, const Point& _rPreviewOffset, PreviewPage* _opPreviewPage ) { @@ -802,7 +802,7 @@ Point SwPagePreviewLayout::GetPreviewStartPosForNewScale( */ bool SwPagePreviewLayout::IsPageVisible( const sal_uInt16 _nPageNum ) const { - const PreviewPage* pPreviewPage = _GetPreviewPageByPageNum( _nPageNum ); + const PreviewPage* pPreviewPage = GetPreviewPageByPageNum( _nPageNum ); return pPreviewPage && pPreviewPage->bVisible; } @@ -1065,7 +1065,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan } } // paint preview background rectangles - mrParentViewShell._PaintDesktop(rRenderContext, aPreviewBackgrdRegion); + mrParentViewShell.PaintDesktop_(rRenderContext, aPreviewBackgrdRegion); } // prepare data for paint of pages @@ -1149,7 +1149,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan if (pPage->GetPhyPageNum() == mnSelectedPageNum) { - _PaintSelectMarkAtPage(rRenderContext, *aPageIter); + PaintSelectMarkAtPage(rRenderContext, *aPageIter); } } } @@ -1229,7 +1229,7 @@ void SwPagePreviewLayout::Repaint( const Rectangle& rInvalidCoreRect ) const OD 17.12.2002 #103492# */ -void SwPagePreviewLayout::_PaintSelectMarkAtPage(vcl::RenderContext& rRenderContext, +void SwPagePreviewLayout::PaintSelectMarkAtPage(vcl::RenderContext& rRenderContext, const PreviewPage* _aSelectedPreviewPage ) const { OutputDevice* pOutputDev = &rRenderContext; @@ -1295,7 +1295,7 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) mnSelectedPageNum = _nSelectedPage; // re-paint for current selected page in order to unmark it. - const PreviewPage* pOldSelectedPreviewPage = _GetPreviewPageByPageNum( nOldSelectedPageNum ); + const PreviewPage* pOldSelectedPreviewPage = GetPreviewPageByPageNum( nOldSelectedPageNum ); OutputDevice* pOutputDev = mrParentViewShell.GetOut(); if ( pOldSelectedPreviewPage && pOldSelectedPreviewPage->bVisible ) { @@ -1323,10 +1323,10 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) } // re-paint for new selected page in order to mark it. - const PreviewPage* pNewSelectedPreviewPage = _GetPreviewPageByPageNum( _nSelectedPage ); + const PreviewPage* pNewSelectedPreviewPage = GetPreviewPageByPageNum( _nSelectedPage ); if ( pNewSelectedPreviewPage && pNewSelectedPreviewPage->bVisible ) { - const PreviewPage* pSelectedPreviewPage = _GetPreviewPageByPageNum(mnSelectedPageNum); + const PreviewPage* pSelectedPreviewPage = GetPreviewPageByPageNum(mnSelectedPageNum); SwRect aPageRect(pSelectedPreviewPage->aPreviewWinPos, pSelectedPreviewPage->aPageSize); ::SwAlignRect(aPageRect, &mrParentViewShell, pOutputDev); mrParentViewShell.GetWin()->Invalidate(aPageRect.SVRect()); @@ -1351,7 +1351,7 @@ struct EqualsPageNumPred } }; -const PreviewPage* SwPagePreviewLayout::_GetPreviewPageByPageNum( const sal_uInt16 _nPageNum ) const +const PreviewPage* SwPagePreviewLayout::GetPreviewPageByPageNum( const sal_uInt16 _nPageNum ) const { std::vector<PreviewPage*>::const_iterator aFoundPreviewPageIter = std::find_if( maPreviewPages.begin(), maPreviewPages.end(), @@ -1416,7 +1416,7 @@ Size SwPagePreviewLayout::GetPreviewDocSize() const */ Size SwPagePreviewLayout::GetPreviewPageSizeByPageNum( sal_uInt16 _nPageNum ) const { - const PreviewPage* pPreviewPage = _GetPreviewPageByPageNum( _nPageNum ); + const PreviewPage* pPreviewPage = GetPreviewPageByPageNum( _nPageNum ); if ( pPreviewPage ) { return pPreviewPage->aPageSize; @@ -1430,7 +1430,7 @@ Size SwPagePreviewLayout::GetPreviewPageSizeByPageNum( sal_uInt16 _nPageNum ) co */ sal_uInt16 SwPagePreviewLayout::GetVirtPageNumByPageNum( sal_uInt16 _nPageNum ) const { - const PreviewPage* pPreviewPage = _GetPreviewPageByPageNum( _nPageNum ); + const PreviewPage* pPreviewPage = GetPreviewPageByPageNum( _nPageNum ); if ( pPreviewPage ) { return pPreviewPage->pPage->GetVirtPageNum(); diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index db73f19c8437..ddbcaf7fcbf9 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -48,7 +48,7 @@ SwRenderData::~SwRenderData() void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev ) { DeletePostItData(); - m_pPostItFields.reset(new _SetGetExpFields); + m_pPostItFields.reset(new SetGetExpFields); sw_GetPostIts( &pDoc->getIDocumentFieldsAccess(), m_pPostItFields.get() ); //!! Disable spell and grammar checking in the temporary document. diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 88079ec67447..254a5b7a355b 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -206,11 +206,11 @@ void SwViewShellImp::MakeDrawView() { IDocumentDrawModelAccess& rIDDMA = GetShell()->getIDocumentDrawModelAccess(); - // the else here is not an error, _MakeDrawModel() calls this method again + // the else here is not an error, MakeDrawModel_() calls this method again // after the DrawModel is created to create DrawViews for all shells... if( !rIDDMA.GetDrawModel() ) { - rIDDMA._MakeDrawModel(); + rIDDMA.MakeDrawModel_(); } else { @@ -369,7 +369,7 @@ void SwViewShellImp::InvalidateAccessibleRelationSet( const SwFlyFrame *pMaster, } /// invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs -void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTextFrame* _pFromTextFrame, +void SwViewShellImp::InvalidateAccessibleParaFlowRelation_( const SwTextFrame* _pFromTextFrame, const SwTextFrame* _pToTextFrame ) { if ( !_pFromTextFrame && !_pToTextFrame ) @@ -397,7 +397,7 @@ void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTextFrame* _ } /// invalidate text selection for paragraphs -void SwViewShellImp::_InvalidateAccessibleParaTextSelection() +void SwViewShellImp::InvalidateAccessibleParaTextSelection_() { for(SwViewShell& rTmp : GetShell()->GetRingContainer()) { @@ -409,7 +409,7 @@ void SwViewShellImp::_InvalidateAccessibleParaTextSelection() } /// invalidate attributes for paragraphs -void SwViewShellImp::_InvalidateAccessibleParaAttrs( const SwTextFrame& rTextFrame ) +void SwViewShellImp::InvalidateAccessibleParaAttrs_( const SwTextFrame& rTextFrame ) { for(SwViewShell& rTmp : GetShell()->GetRingContainer()) { diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 769cd930c369..db4128d98943 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1514,11 +1514,11 @@ void SwViewShell::PaintDesktop(vcl::RenderContext& rRenderContext, const SwRect } } if ( !aRegion.empty() ) - _PaintDesktop(rRenderContext, aRegion); + PaintDesktop_(rRenderContext, aRegion); } // PaintDesktop is split in two, this part is also used by PreviewPage -void SwViewShell::_PaintDesktop(vcl::RenderContext& /*rRenderContext*/, const SwRegionRects &rRegion) +void SwViewShell::PaintDesktop_(vcl::RenderContext& /*rRenderContext*/, const SwRegionRects &rRegion) { // OD 2004-04-23 #116347# GetOut()->Push( PushFlags::FILLCOLOR|PushFlags::LINECOLOR ); @@ -1955,7 +1955,7 @@ void SwViewShell::InvalidateLayout( bool bSizeChanged ) SwFrame* pPage = GetLayout()->Lower(); while( pPage ) { - pPage->_InvalidateSize(); + pPage->InvalidateSize_(); pPage = pPage->GetNext(); } return; @@ -1967,7 +1967,7 @@ void SwViewShell::InvalidateLayout( bool bSizeChanged ) SwPageFrame *pPg = static_cast<SwPageFrame*>(GetLayout()->Lower()); do { pPg->InvalidateSize(); - pPg->_InvalidatePrt(); + pPg->InvalidatePrt_(); pPg->InvaPercentLowers(); if ( bSizeChanged ) { @@ -2355,7 +2355,7 @@ void SwViewShell::InvalidateAccessibleParaFlowRelation( const SwTextFrame* _pFro { if ( GetLayout() && GetLayout()->IsAnyShellAccessible() ) { - Imp()->_InvalidateAccessibleParaFlowRelation( _pFromTextFrame, _pToTextFrame ); + Imp()->InvalidateAccessibleParaFlowRelation_( _pFromTextFrame, _pToTextFrame ); } } @@ -2366,7 +2366,7 @@ void SwViewShell::InvalidateAccessibleParaTextSelection() { if ( GetLayout() && GetLayout()->IsAnyShellAccessible() ) { - Imp()->_InvalidateAccessibleParaTextSelection(); + Imp()->InvalidateAccessibleParaTextSelection_(); } } @@ -2377,7 +2377,7 @@ void SwViewShell::InvalidateAccessibleParaAttrs( const SwTextFrame& rTextFrame ) { if ( GetLayout() && GetLayout()->IsAnyShellAccessible() ) { - Imp()->_InvalidateAccessibleParaAttrs( rTextFrame ); + Imp()->InvalidateAccessibleParaAttrs_( rTextFrame ); } } diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 870e4298687d..7fe0801418e4 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -344,7 +344,7 @@ void SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt) // the PrintDoc - will be replaced! pPrtDoc->ReplaceStyles( *GetDoc() ); - SwShellCursor *pActCursor = pFESh->_GetCursor(); + SwShellCursor *pActCursor = pFESh->GetCursor_(); SwShellCursor *pFirstCursor = dynamic_cast<SwShellCursor*>(pActCursor->GetNext()); if( !pActCursor->HasMark() ) // with a multi-selection the current cursor might be empty { diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 76a729fef2b4..8075b89bec5a 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -107,7 +107,7 @@ SwRead SwGetReaderXML() // SW_DLLPUBLIC return ReadXML; } -inline void _SetFltPtr( sal_uInt16 rPos, SwRead pReader ) +inline void SetFltPtr( sal_uInt16 rPos, SwRead pReader ) { aReaderWriter[ rPos ].pReader = pReader; } @@ -116,11 +116,11 @@ namespace sw { Filters::Filters() { - _SetFltPtr( READER_WRITER_BAS, (ReadAscii = new AsciiReader) ); - _SetFltPtr( READER_WRITER_HTML, (ReadHTML = new HTMLReader) ); - _SetFltPtr( READER_WRITER_XML, (ReadXML = new XMLReader) ); - _SetFltPtr( READER_WRITER_TEXT_DLG, ReadAscii ); - _SetFltPtr( READER_WRITER_TEXT, ReadAscii ); + SetFltPtr( READER_WRITER_BAS, (ReadAscii = new AsciiReader) ); + SetFltPtr( READER_WRITER_HTML, (ReadHTML = new HTMLReader) ); + SetFltPtr( READER_WRITER_XML, (ReadXML = new XMLReader) ); + SetFltPtr( READER_WRITER_TEXT_DLG, ReadAscii ); + SetFltPtr( READER_WRITER_TEXT, ReadAscii ); } Filters::~Filters() diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 884bd34b24af..a53a59dd6079 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1095,8 +1095,8 @@ class HTMLEndPosLst // Eine SttEndPos in die Start- und Ende-Listen eintragen bzw. aus // ihnen loeschen, wobei die Ende-Position bekannt ist - void _InsertItem( HTMLStartEndPos *pPos, HTMLStartEndPositions::size_type nEndPos ); - void _RemoveItem( HTMLStartEndPositions::size_type nEndPos ); + void InsertItem_( HTMLStartEndPos *pPos, HTMLStartEndPositions::size_type nEndPos ); + void RemoveItem_( HTMLStartEndPositions::size_type nEndPos ); // die "Art" es Attributs ermitteln HTMLOnOffState GetHTMLItemState( const SfxPoolItem& rItem ); @@ -1156,7 +1156,7 @@ public: bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; } }; -void HTMLEndPosLst::_InsertItem( HTMLStartEndPos *pPos, HTMLStartEndPositions::size_type nEndPos ) +void HTMLEndPosLst::InsertItem_( HTMLStartEndPos *pPos, HTMLStartEndPositions::size_type nEndPos ) { // In der Start-Liste das Attribut hinter allen vorher und an // der gleichen Position gestarteten Attributen einfuegen @@ -1171,7 +1171,7 @@ void HTMLEndPosLst::_InsertItem( HTMLStartEndPos *pPos, HTMLStartEndPositions::s aEndLst.insert( aEndLst.begin() + nEndPos, pPos ); } -void HTMLEndPosLst::_RemoveItem( HTMLStartEndPositions::size_type nEndPos ) +void HTMLEndPosLst::RemoveItem_( HTMLStartEndPositions::size_type nEndPos ) { HTMLStartEndPos *pPos = aEndLst[nEndPos]; @@ -1476,7 +1476,7 @@ void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart, { // das Test-Attribut endet, bevor das neue endet. Das // neue Attribut muss deshalb aufgesplittet werden - _InsertItem( new HTMLStartEndPos( rItem, nStart, nTestEnd ), i ); + InsertItem_( new HTMLStartEndPos( rItem, nStart, nTestEnd ), i ); nStart = nTestEnd; } } @@ -1489,7 +1489,7 @@ void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart, } // ein Attribut muss noch eingefuegt werden - _InsertItem( new HTMLStartEndPos( rItem, nStart, nEnd ), i ); + InsertItem_( new HTMLStartEndPos( rItem, nStart, nEnd ), i ); } void HTMLEndPosLst::SplitItem( const SfxPoolItem& rItem, sal_Int32 nStart, @@ -1994,7 +1994,7 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, { Out( aHTMLAttrFnTab, *pPos->GetItem(), rHWrt ); } - _RemoveItem( i ); + RemoveItem_( i ); } else if( nEnd > nPos ) { diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index f05c2ed6c594..392845f4f57d 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1537,10 +1537,10 @@ void SwCSS1Parser::FillDropCap( SwFormatDrop& rDrop, // CSS1-sezifisches des SwHTMLParsers -_HTMLAttr **SwHTMLParser::GetAttrTabEntry( sal_uInt16 nWhich ) +HTMLAttr **SwHTMLParser::GetAttrTabEntry( sal_uInt16 nWhich ) { // den zu dem Item gehoehrenden Tabellen-Eintrag ermitteln ... - _HTMLAttr **ppAttr = nullptr; + HTMLAttr **ppAttr = nullptr; switch( nWhich ) { case RES_CHRATR_BLINK: @@ -2121,9 +2121,9 @@ void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet, } } -_HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken ) +HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken ) { - _HTMLAttrContexts::size_type nPos = m_aContexts.size(); + HTMLAttrContexts::size_type nPos = m_aContexts.size(); if( nPos <= m_nContextStMin ) return nullptr; @@ -2150,7 +2150,7 @@ _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken ) nPos--; } - _HTMLAttrContext *pCntxt = nullptr; + HTMLAttrContext *pCntxt = nullptr; if( bFound ) { pCntxt = m_aContexts[nPos]; @@ -2165,7 +2165,7 @@ bool SwHTMLParser::GetMarginsFromContext( sal_uInt16& nLeft, short& nIndent, bool bIgnoreTopContext ) const { - _HTMLAttrContexts::size_type nPos = m_aContexts.size(); + HTMLAttrContexts::size_type nPos = m_aContexts.size(); if( bIgnoreTopContext ) { if( !nPos ) @@ -2176,7 +2176,7 @@ bool SwHTMLParser::GetMarginsFromContext( sal_uInt16& nLeft, while( nPos > m_nContextStAttrMin ) { - const _HTMLAttrContext *pCntxt = m_aContexts[--nPos]; + const HTMLAttrContext *pCntxt = m_aContexts[--nPos]; if( pCntxt->IsLRSpaceChanged() ) { pCntxt->GetMargins( nLeft, nRight, nIndent ); @@ -2209,10 +2209,10 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper, sal_uInt16 nDfltColl = 0; OUString aDfltClass; - _HTMLAttrContexts::size_type nPos = m_aContexts.size(); + HTMLAttrContexts::size_type nPos = m_aContexts.size(); while( nPos > m_nContextStAttrMin ) { - const _HTMLAttrContext *pCntxt = m_aContexts[--nPos]; + const HTMLAttrContext *pCntxt = m_aContexts[--nPos]; if( pCntxt->IsULSpaceChanged() ) { pCntxt->GetULSpace( nUpper, nLower ); @@ -2236,16 +2236,16 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper, nLower = rULSpace.GetLower(); } -void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext ) +void SwHTMLParser::EndContextAttrs( HTMLAttrContext *pContext ) { - _HTMLAttrs &rAttrs = pContext->GetAttrs(); + HTMLAttrs &rAttrs = pContext->GetAttrs(); for( auto pAttr : rAttrs ) { if( RES_PARATR_DROP==pAttr->GetItem().Which() ) { // Fuer DropCaps noch die Anzahl der Zeichen anpassen. Wenn // es am Ende 0 sind, wird das Attribut invalidiert und dann - // von _SetAttr gar nicht erst gesetzt. + // von SetAttr_ gar nicht erst gesetzt. sal_Int32 nChars = m_pPam->GetPoint()->nContent.GetIndex(); if( nChars < 1 ) pAttr->Invalidate(); @@ -2267,7 +2267,7 @@ void SwHTMLParser::InsertParaAttrs( const SfxItemSet& rItemSet ) { // den zu dem Item gehoehrenden Tabellen-Eintrag ermitteln ... sal_uInt16 nWhich = pItem->Which(); - _HTMLAttr **ppAttr = GetAttrTabEntry( nWhich ); + HTMLAttr **ppAttr = GetAttrTabEntry( nWhich ); if( ppAttr ) { diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 01aa9ea1f838..73176ecc265a 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -38,12 +38,12 @@ using namespace ::com::sun::star; -class _HTMLAttrContext_SaveDoc +class HTMLAttrContext_SaveDoc { SwHTMLNumRuleInfo aNumRuleInfo; // In Umgebung gueltige Numerierung SwPosition *pPos; // hierhin beim verlassen den // Kontexts zurueckgesprungen - _HTMLAttrTable *pAttrTab; // In Umgebung gueltige Attribute, + HTMLAttrTable *pAttrTab; // In Umgebung gueltige Attribute, // wenn Attributierung nicht // beibehalten werden soll. @@ -61,14 +61,14 @@ class _HTMLAttrContext_SaveDoc public: - _HTMLAttrContext_SaveDoc() : + HTMLAttrContext_SaveDoc() : pPos( nullptr ), pAttrTab( nullptr ), nContextStMin( SIZE_MAX ), nContextStAttrMin( SIZE_MAX ), bStripTrailingPara( false ), bKeepNumRules( false ), bFixHeaderDist( false ), bFixFooterDist( false ) {} - ~_HTMLAttrContext_SaveDoc() { delete pPos; delete pAttrTab; } + ~HTMLAttrContext_SaveDoc() { delete pPos; delete pAttrTab; } // Die Position gehoert uns, muss also angelegt und zerstoert werden void SetPos( const SwPosition& rPos ) { pPos = new SwPosition(rPos); } @@ -78,7 +78,7 @@ public: void SetNumInfo( const SwHTMLNumRuleInfo& rInf ) { aNumRuleInfo.Set(rInf); } const SwHTMLNumRuleInfo& GetNumInfo() const { return aNumRuleInfo; } - _HTMLAttrTable *GetAttrTab( bool bCreate= false ); + HTMLAttrTable *GetAttrTab( bool bCreate= false ); void SetContextStMin( size_t nMin ) { nContextStMin = nMin; } size_t GetContextStMin() const { return nContextStMin; } @@ -99,25 +99,25 @@ public: bool GetFixFooterDist() const { return bFixFooterDist; } }; -_HTMLAttrTable *_HTMLAttrContext_SaveDoc::GetAttrTab( bool bCreate ) +HTMLAttrTable *HTMLAttrContext_SaveDoc::GetAttrTab( bool bCreate ) { if( !pAttrTab && bCreate ) { - pAttrTab = new _HTMLAttrTable; - memset( pAttrTab, 0, sizeof( _HTMLAttrTable )); + pAttrTab = new HTMLAttrTable; + memset( pAttrTab, 0, sizeof( HTMLAttrTable )); } return pAttrTab; } -_HTMLAttrContext_SaveDoc *_HTMLAttrContext::GetSaveDocContext( bool bCreate ) +HTMLAttrContext_SaveDoc *HTMLAttrContext::GetSaveDocContext( bool bCreate ) { if( !pSaveDocContext && bCreate ) - pSaveDocContext = new _HTMLAttrContext_SaveDoc; + pSaveDocContext = new HTMLAttrContext_SaveDoc; return pSaveDocContext; } -void _HTMLAttrContext::ClearSaveDocContext() +void HTMLAttrContext::ClearSaveDocContext() { delete pSaveDocContext; pSaveDocContext = nullptr; @@ -142,14 +142,14 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos ) // alle noch offenen Attribute beenden und hinter der Tabelle // neu aufspannen - _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab); - for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes) + HTMLAttr** pHTMLAttributes = reinterpret_cast<HTMLAttr**>(&m_aAttrTab); + for (auto nCnt = sizeof(HTMLAttrTable) / sizeof(HTMLAttr*); nCnt--; ++pHTMLAttributes) { - _HTMLAttr *pAttr = *pHTMLAttributes; + HTMLAttr *pAttr = *pHTMLAttributes; while( pAttr ) { - _HTMLAttr *pNext = pAttr->GetNext(); - _HTMLAttr *pPrev = pAttr->GetPrev(); + HTMLAttr *pNext = pAttr->GetNext(); + HTMLAttr *pPrev = pAttr->GetPrev(); sal_uInt16 nWhich = pAttr->pItem->Which(); if( !nOldEndCnt && RES_PARATR_BEGIN <= nWhich && @@ -179,7 +179,7 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos ) // noch in den Kontexten existieren, muessen wir es clonen. // Die Next-Liste geht dabei verloren, aber die // Previous-Liste bleibt erhalten - _HTMLAttr *pSetAttr = pAttr->Clone( *pOldEndPara, nOldEndCnt ); + HTMLAttr *pSetAttr = pAttr->Clone( *pOldEndPara, nOldEndCnt ); if( pNext ) pNext->InsertPrev( pSetAttr ); @@ -223,11 +223,11 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos ) } -void SwHTMLParser::SaveDocContext( _HTMLAttrContext *pCntxt, +void SwHTMLParser::SaveDocContext( HTMLAttrContext *pCntxt, sal_uInt16 nFlags, const SwPosition *pNewPos ) { - _HTMLAttrContext_SaveDoc *pSave = pCntxt->GetSaveDocContext( true ); + HTMLAttrContext_SaveDoc *pSave = pCntxt->GetSaveDocContext( true ); pSave->SetStripTrailingPara( (HTML_CNTXT_STRIP_PARA & nFlags) != 0 ); pSave->SetKeepNumRules( (HTML_CNTXT_KEEP_NUMRULE & nFlags) != 0 ); pSave->SetFixHeaderDist( (HTML_CNTXT_HEADER_DIST & nFlags) != 0 ); @@ -253,7 +253,7 @@ void SwHTMLParser::SaveDocContext( _HTMLAttrContext *pCntxt, } else { - _HTMLAttrTable *pSaveAttrTab = pSave->GetAttrTab( true ); + HTMLAttrTable *pSaveAttrTab = pSave->GetAttrTab( true ); SaveAttrTab( *pSaveAttrTab ); } @@ -276,9 +276,9 @@ void SwHTMLParser::SaveDocContext( _HTMLAttrContext *pCntxt, } } -void SwHTMLParser::RestoreDocContext( _HTMLAttrContext *pCntxt ) +void SwHTMLParser::RestoreDocContext( HTMLAttrContext *pCntxt ) { - _HTMLAttrContext_SaveDoc *pSave = pCntxt->GetSaveDocContext(); + HTMLAttrContext_SaveDoc *pSave = pCntxt->GetSaveDocContext(); if( !pSave ) return; @@ -291,7 +291,7 @@ void SwHTMLParser::RestoreDocContext( _HTMLAttrContext *pCntxt ) FixHeaderFooterDistance( pSave->GetFixHeaderDist(), pSave->GetPos() ); - _HTMLAttrTable *pSaveAttrTab = pSave->GetAttrTab(); + HTMLAttrTable *pSaveAttrTab = pSave->GetAttrTab(); if( !pSaveAttrTab ) { // Attribute an aktueller Position beenden und an alter neu @@ -325,7 +325,7 @@ void SwHTMLParser::RestoreDocContext( _HTMLAttrContext *pCntxt ) pCntxt->ClearSaveDocContext(); } -void SwHTMLParser::EndContext( _HTMLAttrContext *pContext ) +void SwHTMLParser::EndContext( HTMLAttrContext *pContext ) { if( pContext->GetPopStack() ) { @@ -333,7 +333,7 @@ void SwHTMLParser::EndContext( _HTMLAttrContext *pContext ) // Kontext muss bereits geloscht sein! while( m_aContexts.size() > m_nContextStMin ) { - _HTMLAttrContext *pCntxt = PopContext(); + HTMLAttrContext *pCntxt = PopContext(); OSL_ENSURE( pCntxt != pContext, "Kontext noch im Stack" ); if( pCntxt == pContext ) @@ -377,9 +377,9 @@ void SwHTMLParser::EndContext( _HTMLAttrContext *pContext ) StartListing(); } -void SwHTMLParser::ClearContext( _HTMLAttrContext *pContext ) +void SwHTMLParser::ClearContext( HTMLAttrContext *pContext ) { - _HTMLAttrs &rAttrs = pContext->GetAttrs(); + HTMLAttrs &rAttrs = pContext->GetAttrs(); for( auto pAttr : rAttrs ) { // einfaches Loeschen reicht hier nicht, weil das @@ -412,7 +412,7 @@ void SwHTMLParser::ClearContext( _HTMLAttrContext *pContext ) bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo, - _HTMLAttrContext *pContext ) + HTMLAttrContext *pContext ) { bool bRet = false; @@ -456,7 +456,7 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet, bool SwHTMLParser::CreateContainer( const OUString& rClass, SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo, - _HTMLAttrContext *pContext ) + HTMLAttrContext *pContext ) { bool bRet = false; if( rClass.equalsIgnoreAsciiCase( "sd-abs-pos" ) && @@ -484,7 +484,7 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass, void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo, - _HTMLAttrContext *pContext, + HTMLAttrContext *pContext, bool bCharLvl ) { // Ein DropCap-Attribut basteln, wenn auf Zeichen-Ebene vor dem @@ -503,7 +503,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, { NewAttr( &m_aAttrTab.pDropCap, aDrop ); - _HTMLAttrs &rAttrs = pContext->GetAttrs(); + HTMLAttrs &rAttrs = pContext->GetAttrs(); rAttrs.push_back( m_aAttrTab.pDropCap ); return; @@ -522,7 +522,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, const SfxPoolItem *pItem = aIter.FirstItem(); while( pItem ) { - _HTMLAttr **ppAttr = nullptr; + HTMLAttr **ppAttr = nullptr; switch( pItem->Which() ) { @@ -607,7 +607,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, NewAttr( &m_aAttrTab.pULSpace, aULSpace ); // ... und noch die Kontext-Information speichern - _HTMLAttrs &rAttrs = pContext->GetAttrs(); + HTMLAttrs &rAttrs = pContext->GetAttrs(); rAttrs.push_back( m_aAttrTab.pULSpace ); pContext->SetULSpace( aULSpace.GetUpper(), aULSpace.GetLower() ); @@ -644,7 +644,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, NewAttr( &m_aAttrTab.pCharBrush, aBrushItem ); // ... und noch die Kontext-Information speichern - _HTMLAttrs &rAttrs = pContext->GetAttrs(); + HTMLAttrs &rAttrs = pContext->GetAttrs(); rAttrs.push_back( m_aAttrTab.pCharBrush ); } else if( pContext->GetToken() != HTML_TABLEHEADER_ON && @@ -662,7 +662,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, NewAttr( &m_aAttrTab.pCharBox, aBoxItem ); - _HTMLAttrs &rAttrs = pContext->GetAttrs(); + HTMLAttrs &rAttrs = pContext->GetAttrs(); rAttrs.push_back( m_aAttrTab.pCharBox ); } else @@ -683,7 +683,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, NewAttr( ppAttr, *pItem ); // ... und noch die Kontext-Information speichern - _HTMLAttrs &rAttrs = pContext->GetAttrs(); + HTMLAttrs &rAttrs = pContext->GetAttrs(); rAttrs.push_back( *ppAttr ); } @@ -695,8 +695,8 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, InsertBookmark( rPropInfo.aId ); } -void SwHTMLParser::InsertAttr( _HTMLAttr **ppAttr, const SfxPoolItem & rItem, - _HTMLAttrContext *pCntxt ) +void SwHTMLParser::InsertAttr( HTMLAttr **ppAttr, const SfxPoolItem & rItem, + HTMLAttrContext *pCntxt ) { if( !ppAttr ) { @@ -709,11 +709,11 @@ void SwHTMLParser::InsertAttr( _HTMLAttr **ppAttr, const SfxPoolItem & rItem, NewAttr( ppAttr, rItem ); // und im Kontext merken - _HTMLAttrs &rAttrs = pCntxt->GetAttrs(); + HTMLAttrs &rAttrs = pCntxt->GetAttrs(); rAttrs.push_back( *ppAttr ); } -void SwHTMLParser::SplitPREListingXMP( _HTMLAttrContext *pCntxt ) +void SwHTMLParser::SplitPREListingXMP( HTMLAttrContext *pCntxt ) { // PRE/Listing/XMP soll beim beenden des Kontexts beendet werden. pCntxt->SetFinishPREListingXMP( true ); @@ -730,7 +730,7 @@ void SwHTMLParser::SplitPREListingXMP( _HTMLAttrContext *pCntxt ) FinishPREListingXMP(); } -SfxItemSet *_HTMLAttrContext::GetFrameItemSet( SwDoc *pCreateDoc ) +SfxItemSet *HTMLAttrContext::GetFrameItemSet( SwDoc *pCreateDoc ) { if( !pFrameItemSet && pCreateDoc ) pFrameItemSet = new SfxItemSet( pCreateDoc->GetAttrPool(), diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index b1191a31cd86..1c52d6bd593a 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -429,10 +429,10 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) } // die Attribute der Umgebung am Draw-Objekt setzen - _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab); - for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes) + HTMLAttr** pHTMLAttributes = reinterpret_cast<HTMLAttr**>(&m_aAttrTab); + for (auto nCnt = sizeof(HTMLAttrTable) / sizeof(HTMLAttr*); nCnt--; ++pHTMLAttributes) { - _HTMLAttr *pAttr = *pHTMLAttributes; + HTMLAttr *pAttr = *pHTMLAttributes; if( pAttr ) PutEEPoolItem( aItemSet, pAttr->GetItem() ); } diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 267772fe32ed..282a1d6c7535 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -618,7 +618,7 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag const sal_Int32 nIdx = m_pPam->GetPoint()->nContent.GetIndex(); for( auto i = m_aSetAttrTab.size(); i > 0; ) { - _HTMLAttr *pAttr = m_aSetAttrTab[--i]; + HTMLAttr *pAttr = m_aSetAttrTab[--i]; if( pAttr->GetSttParaIdx() != nNodeIdx || pAttr->GetSttCnt() != nIdx ) break; diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index b09fcfd250aa..2672ac248a3a 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -2090,7 +2090,7 @@ void SwHTMLParser::NewTextArea() SetControlSize( xShape, aTextSz, false, false ); // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_TEXTAREA_ON ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( HTML_TEXTAREA_ON ); // und PRE/Listing/XMP voruebergehend aussetzen SplitPREListingXMP( pCntxt ); @@ -2117,7 +2117,7 @@ void SwHTMLParser::EndTextArea() m_pFormImpl->ReleaseFCompPropSet(); // den Kontext holen - _HTMLAttrContext *pCntxt = PopContext( HTML_TEXTAREA_ON ); + HTMLAttrContext *pCntxt = PopContext( HTML_TEXTAREA_ON ); if( pCntxt ) { // und ggf. die Attribute beenden @@ -2363,7 +2363,7 @@ void SwHTMLParser::NewSelect() SetControlSize( xShape, aTextSz, bMinWidth, bMinHeight ); // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_SELECT_ON ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( HTML_SELECT_ON ); // und PRE/Listing/XMP voruebergehend aussetzen SplitPREListingXMP( pCntxt ); @@ -2447,7 +2447,7 @@ void SwHTMLParser::EndSelect() m_pFormImpl->ReleaseFCompPropSet(); // den Kontext holen - _HTMLAttrContext *pCntxt = PopContext( HTML_SELECT_ON ); + HTMLAttrContext *pCntxt = PopContext( HTML_SELECT_ON ); if( pCntxt ) { // und ggf. die Attribute beenden diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 591a4b159d17..7a1607974ec9 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -1060,7 +1060,7 @@ void SwHTMLParser::InsertBodyOptions() void SwHTMLParser::NewAnchor() { // den voherigen Link beenden, falls es einen gab - _HTMLAttrContext *pOldCntxt = PopContext( HTML_ANCHOR_ON ); + HTMLAttrContext *pOldCntxt = PopContext( HTML_ANCHOR_ON ); if( pOldCntxt ) { // und ggf. die Attribute beenden @@ -1181,7 +1181,7 @@ ANCHOR_SETEVENT: } // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_ANCHOR_ON ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( HTML_ANCHOR_ON ); bool bEnAnchor = false, bFootnoteAnchor = false, bFootnoteEnSymbol = false; OUString aFootnoteName; @@ -1280,7 +1280,7 @@ void SwHTMLParser::EndAnchor() void SwHTMLParser::InsertBookmark( const OUString& rName ) { - _HTMLAttr* pTmp = new _HTMLAttr( *m_pPam->GetPoint(), + HTMLAttr* pTmp = new HTMLAttr( *m_pPam->GetPoint(), SfxStringItem( RES_FLTR_BOOKMARK, rName )); m_aSetAttrTab.push_back( pTmp ); } @@ -1297,7 +1297,7 @@ bool SwHTMLParser::HasCurrentParaBookmarks( bool bIgnoreStack ) const { for( auto i = m_aSetAttrTab.size(); i; ) { - _HTMLAttr* pAttr = m_aSetAttrTab[ --i ]; + HTMLAttr* pAttr = m_aSetAttrTab[ --i ]; if( RES_FLTR_BOOKMARK == pAttr->pItem->Which() ) { if( pAttr->GetSttParaIdx() == nNodeIdx ) diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index b729c2a9260b..5d0988613579 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -256,7 +256,7 @@ void SwHTMLParser::NewNumBulList( int nToken ) } // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); // Styles parsen if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) ) @@ -352,7 +352,7 @@ void SwHTMLParser::EndNumBulList( int nToken ) AddParSpace(); // den aktuellen Kontext vom Stack holen - _HTMLAttrContext *pCntxt = nToken!=0 ? PopContext( static_cast< sal_uInt16 >(nToken & ~1) ) : nullptr; + HTMLAttrContext *pCntxt = nToken!=0 ? PopContext( static_cast< sal_uInt16 >(nToken & ~1) ) : nullptr; // Keine Liste aufgrund eines Tokens beenden, wenn der Kontext // nie angelgt wurde oder nicht beendet werden darf. @@ -471,7 +471,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken ) const bool bCountedInList = nToken != HTML_LISTHEADER_ON; - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); OUString aNumRuleName; if( GetNumInfo().GetNumRule() ) @@ -558,7 +558,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl, AppendTextNode( AM_NOSPACE ); // Kontext zu dem Token suchen und vom Stack holen - _HTMLAttrContext *pCntxt = nullptr; + HTMLAttrContext *pCntxt = nullptr; auto nPos = m_aContexts.size(); nToken &= ~1; while( !pCntxt && nPos>m_nContextStMin ) diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 509c2e1be634..03f333377096 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -117,7 +117,7 @@ void SwHTMLParser::NewDivision( int nToken ) bAppended = true; } - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); bool bStyleParsed = false, bPositioned = false; SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() ); @@ -259,7 +259,7 @@ void SwHTMLParser::NewDivision( int nToken ) bAppended = true; } } - _HTMLAttrs *pPostIts = bAppended ? nullptr : new _HTMLAttrs; + HTMLAttrs *pPostIts = bAppended ? nullptr : new HTMLAttrs; SetAttr( true, true, pPostIts ); // Namen der Section eindeutig machen @@ -388,7 +388,7 @@ void SwHTMLParser::EndDivision( int /*nToken*/ ) { // Stack-Eintrag zu dem Token suchen (weil wir noch den Div-Stack // haben unterscheiden wir erst einmal nicht zwischen DIV und CENTER - _HTMLAttrContext *pCntxt = nullptr; + HTMLAttrContext *pCntxt = nullptr; auto nPos = m_aContexts.size(); while( !pCntxt && nPos>m_nContextStMin ) { @@ -527,7 +527,7 @@ bool SwHTMLParser::EndSections( bool bLFStripped ) auto nPos = m_aContexts.size(); while( nPos>m_nContextStMin ) { - _HTMLAttrContext *pCntxt = m_aContexts[--nPos]; + HTMLAttrContext *pCntxt = m_aContexts[--nPos]; if( pCntxt->GetSpansSection() && EndSection( bLFStripped ) ) { bSectionClosed = true; @@ -584,7 +584,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) } } - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_MULTICOL_ON ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( HTML_MULTICOL_ON ); //.is the multicol element contained in a container? That may be the // case for 5.0 documents. @@ -683,7 +683,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) bAppended = true; } } - _HTMLAttrs *pPostIts = bAppended ? nullptr : new _HTMLAttrs; + HTMLAttrs *pPostIts = bAppended ? nullptr : new HTMLAttrs; SetAttr( true, true, pPostIts ); // Make section name unique. @@ -763,7 +763,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) } void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet, - _HTMLAttrContext *pCntxt, + HTMLAttrContext *pCntxt, const OUString& rName, sal_uInt16 nFlags ) { diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 6cdca0372e8a..068cba4a6267 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -101,7 +101,7 @@ struct HTMLTableOptions HTMLTableOptions( const HTMLOptions& rOptions, SvxAdjust eParentAdjust ); }; -class _HTMLTableContext +class HTMLTableContext { SwHTMLNumRuleInfo aNumRuleInfo; // Numbering valid before the table @@ -118,9 +118,9 @@ class _HTMLTableContext public: - _HTMLAttrTable aAttrTab; // attributes + HTMLAttrTable aAttrTab; // attributes - _HTMLTableContext( SwPosition *pPs, size_t nCntxtStMin, + HTMLTableContext( SwPosition *pPs, size_t nCntxtStMin, size_t nCntxtStAttrMin ) : pTableNd( nullptr ), pFrameFormat( nullptr ), @@ -131,10 +131,10 @@ public: bRestartXMP( false ), bRestartListing( false ) { - memset( &aAttrTab, 0, sizeof( _HTMLAttrTable )); + memset( &aAttrTab, 0, sizeof( HTMLAttrTable )); } - ~_HTMLTableContext(); + ~HTMLTableContext(); void SetNumInfo( const SwHTMLNumRuleInfo& rInf ) { aNumRuleInfo.Set(rInf); } const SwHTMLNumRuleInfo& GetNumInfo() const { return aNumRuleInfo; }; @@ -434,7 +434,7 @@ class HTMLTable HTMLTable *pTopTable; // the table on the Top-Level HTMLTableCnts *pParentContents; - _HTMLTableContext *pContext; // the context of the table + HTMLTableContext *pContext; // the context of the table SwHTMLTableLayout *pLayoutInfo; @@ -470,7 +470,7 @@ class HTMLTable void FixFillerFrameFormat( SwTableBox *pBox, bool bRight ) const; // Create a table with the content (lines/boxes) - void _MakeTable( SwTableBox *pUpper=nullptr ); + void MakeTable_( SwTableBox *pUpper=nullptr ); // Gernerate a new SwTableBox, which contains a SwStartNode SwTableBox *NewTableBox( const SwStartNode *pStNd, @@ -589,11 +589,11 @@ public: bool HasToFly() const { return bHasToFly; } - void SetTable( const SwStartNode *pStNd, _HTMLTableContext *pCntxt, + void SetTable( const SwStartNode *pStNd, HTMLTableContext *pCntxt, sal_uInt16 nLeft, sal_uInt16 nRight, const SwTable *pSwTab=nullptr, bool bFrcFrame=false ); - _HTMLTableContext *GetContext() const { return pContext; } + HTMLTableContext *GetContext() const { return pContext; } SwHTMLTableLayout *CreateLayoutInfo(); @@ -2313,7 +2313,7 @@ void HTMLTable::CloseTable() } } -void HTMLTable::_MakeTable( SwTableBox *pBox ) +void HTMLTable::MakeTable_( SwTableBox *pBox ) { SwTableLines& rLines = (pBox ? pBox->GetTabLines() : const_cast<SwTable *>(pSwTable)->GetTabLines() ); @@ -2550,7 +2550,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT ); pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT ); - _MakeTable( pNewBox ); + MakeTable_( pNewBox ); // und noch ggf. rechts eine Zelle einfuegen if( pLayoutInfo->GetRelRightFill() > 0 ) @@ -2568,7 +2568,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, } else { - _MakeTable( pBox ); + MakeTable_( pBox ); } // zum Schluss fuehren wir noch eine Garbage-Collection fuer die @@ -2672,7 +2672,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, } } -void HTMLTable::SetTable( const SwStartNode *pStNd, _HTMLTableContext *pCntxt, +void HTMLTable::SetTable( const SwStartNode *pStNd, HTMLTableContext *pCntxt, sal_uInt16 nLeft, sal_uInt16 nRight, const SwTable *pSwTab, bool bFrcFrame ) { @@ -2710,12 +2710,12 @@ void HTMLTable::MakeParentContents() } } -_HTMLTableContext::~_HTMLTableContext() +HTMLTableContext::~HTMLTableContext() { delete pPos; } -void _HTMLTableContext::SavePREListingXMP( SwHTMLParser& rParser ) +void HTMLTableContext::SavePREListingXMP( SwHTMLParser& rParser ) { bRestartPRE = rParser.IsReadPRE(); bRestartXMP = rParser.IsReadXMP(); @@ -2723,7 +2723,7 @@ void _HTMLTableContext::SavePREListingXMP( SwHTMLParser& rParser ) rParser.FinishPREListingXMP(); } -void _HTMLTableContext::RestorePREListingXMP( SwHTMLParser& rParser ) +void HTMLTableContext::RestorePREListingXMP( SwHTMLParser& rParser ) { rParser.FinishPREListingXMP(); @@ -2938,7 +2938,7 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor, return pBrushItem; } -class _SectionSaveStruct : public SwPendingStackData +class SectionSaveStruct : public SwPendingStackData { sal_uInt16 m_nBaseFontStMinSave, m_nFontStMinSave, m_nFontStHeadStartSave; sal_uInt16 m_nDefListDeepSave; @@ -2949,8 +2949,8 @@ public: HTMLTable *m_pTable; - explicit _SectionSaveStruct( SwHTMLParser& rParser ); - virtual ~_SectionSaveStruct(); + explicit SectionSaveStruct( SwHTMLParser& rParser ); + virtual ~SectionSaveStruct(); #if OSL_DEBUG_LEVEL > 0 size_t GetContextStAttrMin() const { return m_nContextStAttrMinSave; } @@ -2958,7 +2958,7 @@ public: void Restore( SwHTMLParser& rParser ); }; -_SectionSaveStruct::_SectionSaveStruct( SwHTMLParser& rParser ) : +SectionSaveStruct::SectionSaveStruct( SwHTMLParser& rParser ) : m_nBaseFontStMinSave(0), m_nFontStMinSave(0), m_nFontStHeadStartSave(0), m_nDefListDeepSave(0), m_nContextStMinSave(0), m_nContextStAttrMinSave(0), m_pTable( nullptr ) @@ -2982,10 +2982,10 @@ _SectionSaveStruct::_SectionSaveStruct( SwHTMLParser& rParser ) : rParser.m_nDefListDeep = 0; } -_SectionSaveStruct::~_SectionSaveStruct() +SectionSaveStruct::~SectionSaveStruct() {} -void _SectionSaveStruct::Restore( SwHTMLParser& rParser ) +void SectionSaveStruct::Restore( SwHTMLParser& rParser ) { // Font-Stacks wieder auftauen sal_uInt16 nMin = rParser.m_nBaseFontStMin; @@ -3018,7 +3018,7 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser ) rParser.m_aParaAttrs.clear(); } -class _CellSaveStruct : public _SectionSaveStruct +class CellSaveStruct : public SectionSaveStruct { OUString aStyle, aId, aClass, aLang, aDir; OUString aBGImage; @@ -3049,10 +3049,10 @@ class _CellSaveStruct : public _SectionSaveStruct public: - _CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, bool bHd, + CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, bool bHd, bool bReadOpt ); - virtual ~_CellSaveStruct(); + virtual ~CellSaveStruct(); void AddContents( HTMLTableCnts *pNewCnts ); HTMLTableCnts *GetFirstContents() { return pCnts; } @@ -3069,9 +3069,9 @@ public: void CheckNoBreak( const SwPosition& rPos, SwDoc *pDoc ); }; -_CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, +CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, bool bHd, bool bReadOpt ) : - _SectionSaveStruct( rParser ), + SectionSaveStruct( rParser ), pCnts( nullptr ), pCurrCnts( nullptr ), pNoBreakEndParaIdx( nullptr ), @@ -3194,7 +3194,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, nToken = HTML_TABLEDATA_ON; nColl = RES_POOLCOLL_TABLE; } - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( nToken, nColl, aEmptyOUStr, true ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( nToken, nColl, aEmptyOUStr, true ); if( SVX_ADJUST_END != eAdjust ) rParser.InsertAttr( &rParser.m_aAttrTab.pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST), pCntxt ); @@ -3223,12 +3223,12 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, rParser.PushContext( pCntxt ); } -_CellSaveStruct::~_CellSaveStruct() +CellSaveStruct::~CellSaveStruct() { delete pNoBreakEndParaIdx; } -void _CellSaveStruct::AddContents( HTMLTableCnts *pNewCnts ) +void CellSaveStruct::AddContents( HTMLTableCnts *pNewCnts ) { if( pCnts ) pCnts->Add( pNewCnts ); @@ -3238,7 +3238,7 @@ void _CellSaveStruct::AddContents( HTMLTableCnts *pNewCnts ) pCurrCnts = pNewCnts; } -void _CellSaveStruct::InsertCell( SwHTMLParser& rParser, +void CellSaveStruct::InsertCell( SwHTMLParser& rParser, HTMLTable *pCurTable ) { #if OSL_DEBUG_LEVEL > 0 @@ -3259,9 +3259,9 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser, if( rParser.m_nContextStAttrMin == GetContextStAttrMin() ) { - _HTMLAttr** pTable = reinterpret_cast<_HTMLAttr**>(&rParser.m_aAttrTab); + HTMLAttr** pTable = reinterpret_cast<HTMLAttr**>(&rParser.m_aAttrTab); - for( auto nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* ); + for( auto nCnt = sizeof( HTMLAttrTable ) / sizeof( HTMLAttr* ); nCnt--; ++pTable ) { OSL_ENSURE( !*pTable, "Die Attribut-Tabelle ist nicht leer" ); @@ -3280,7 +3280,7 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser, Restore( rParser ); } -void _CellSaveStruct::StartNoBreak( const SwPosition& rPos ) +void CellSaveStruct::StartNoBreak( const SwPosition& rPos ) { if( !pCnts || (!rPos.nContent.GetIndex() && pCurrCnts==pCnts && @@ -3292,7 +3292,7 @@ void _CellSaveStruct::StartNoBreak( const SwPosition& rPos ) } } -void _CellSaveStruct::EndNoBreak( const SwPosition& rPos ) +void CellSaveStruct::EndNoBreak( const SwPosition& rPos ) { if( bNoBreak ) { @@ -3303,7 +3303,7 @@ void _CellSaveStruct::EndNoBreak( const SwPosition& rPos ) } } -void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ ) +void CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ ) { if( pCnts && pCurrCnts==pCnts ) { @@ -3359,10 +3359,10 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents( const SwNodeIndex& rSttPara = m_pPam->GetPoint()->nNode; sal_Int32 nSttCnt = m_pPam->GetPoint()->nContent.GetIndex(); - _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab); - for (sal_uInt16 nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes) + HTMLAttr** pHTMLAttributes = reinterpret_cast<HTMLAttr**>(&m_aAttrTab); + for (sal_uInt16 nCnt = sizeof(HTMLAttrTable) / sizeof(HTMLAttr*); nCnt--; ++pHTMLAttributes) { - _HTMLAttr *pAttr = *pHTMLAttributes; + HTMLAttr *pAttr = *pHTMLAttributes; while( pAttr ) { OSL_ENSURE( !pAttr->GetPrev(), "Attribut hat Previous-Liste" ); @@ -3395,13 +3395,13 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, if( !IsParserWorking() && !m_pPendStack ) return; - _CellSaveStruct* pSaveStruct; + CellSaveStruct* pSaveStruct; int nToken = 0; bool bPending = false; if( m_pPendStack ) { - pSaveStruct = static_cast<_CellSaveStruct*>(m_pPendStack->pData); + pSaveStruct = static_cast<CellSaveStruct*>(m_pPendStack->pData); SwPendingStack* pTmp = m_pPendStack->pNext; delete m_pPendStack; @@ -3521,21 +3521,21 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, m_pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_STANDARD) ); SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE ); - _HTMLAttr* pTmp = - new _HTMLAttr( *m_pPam->GetPoint(), aFontHeight ); + HTMLAttr* pTmp = + new HTMLAttr( *m_pPam->GetPoint(), aFontHeight ); m_aSetAttrTab.push_back( pTmp ); SvxFontHeightItem aFontHeightCJK( 40, 100, RES_CHRATR_CJK_FONTSIZE ); pTmp = - new _HTMLAttr( *m_pPam->GetPoint(), aFontHeightCJK ); + new HTMLAttr( *m_pPam->GetPoint(), aFontHeightCJK ); m_aSetAttrTab.push_back( pTmp ); SvxFontHeightItem aFontHeightCTL( 40, 100, RES_CHRATR_CTL_FONTSIZE ); pTmp = - new _HTMLAttr( *m_pPam->GetPoint(), aFontHeightCTL ); + new HTMLAttr( *m_pPam->GetPoint(), aFontHeightCTL ); m_aSetAttrTab.push_back( pTmp ); - pTmp = new _HTMLAttr( *m_pPam->GetPoint(), + pTmp = new HTMLAttr( *m_pPam->GetPoint(), SvxULSpaceItem( 0, 0, RES_UL_SPACE ) ); m_aSetAttrTab.push_front( pTmp ); // ja, 0, weil schon // vom Tabellenende vorher @@ -3575,13 +3575,13 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, } // einen Tabellen Kontext anlegen - _HTMLTableContext *pTCntxt = - new _HTMLTableContext( pSavePos, m_nContextStMin, + HTMLTableContext *pTCntxt = + new HTMLTableContext( pSavePos, m_nContextStMin, m_nContextStAttrMin ); // alle noch offenen Attribute beenden und hinter der Tabelle // neu aufspannen - _HTMLAttrs *pPostIts = nullptr; + HTMLAttrs *pPostIts = nullptr; if( !bForceFrame && (bTopTable || pCurTable->HasParentSection()) ) { SplitAttrTab( pTCntxt->aAttrTab, bTopTable ); @@ -3595,7 +3595,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, if( (bTopTable && !bAppended) || (!bTopTable && !bParentLFStripped && !m_pPam->GetPoint()->nContent.GetIndex()) ) - pPostIts = new _HTMLAttrs; + pPostIts = new HTMLAttrs; SetAttr( bTopTable, bTopTable, pPostIts ); } else @@ -3603,7 +3603,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, SaveAttrTab( pTCntxt->aAttrTab ); if( bTopTable && !bAppended ) { - pPostIts = new _HTMLAttrs; + pPostIts = new HTMLAttrs; SetAttr( true, true, pPostIts ); } } @@ -3788,7 +3788,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, m_nContextStAttrMin = m_nContextStMin; } - pSaveStruct = new _CellSaveStruct( *this, pCurTable, bHead, + pSaveStruct = new CellSaveStruct( *this, pCurTable, bHead, bReadOptions ); // ist beim ersten GetNextToken schon pending, muss bei @@ -4056,7 +4056,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, // Da es durch EndContext wieder restauriert wird, geht das. while( m_aContexts.size() > m_nContextStAttrMin+1 ) { - _HTMLAttrContext *pCntxt = PopContext(); + HTMLAttrContext *pCntxt = PopContext(); EndContext( pCntxt ); delete pCntxt; } @@ -4067,7 +4067,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, // falls fuer die Zelle eine Ausrichtung gesetzt wurde, muessen // wir die beenden - _HTMLAttrContext *pCntxt = PopContext(); + HTMLAttrContext *pCntxt = PopContext(); EndContext( pCntxt ); delete pCntxt; } @@ -4076,7 +4076,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, // Alle noch offenen Kontexte beenden while( m_aContexts.size() > m_nContextStAttrMin ) { - _HTMLAttrContext *pCntxt = PopContext(); + HTMLAttrContext *pCntxt = PopContext(); ClearContext( pCntxt ); delete pCntxt; } @@ -4093,14 +4093,14 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, delete pSaveStruct; } -class _RowSaveStruct : public SwPendingStackData +class RowSaveStruct : public SwPendingStackData { public: SvxAdjust eAdjust; sal_Int16 eVertOri; bool bHasCells; - _RowSaveStruct() : + RowSaveStruct() : eAdjust( SVX_ADJUST_END ), eVertOri( text::VertOrientation::TOP ), bHasCells( false ) {} }; @@ -4115,12 +4115,12 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions, return; int nToken = 0; - _RowSaveStruct* pSaveStruct; + RowSaveStruct* pSaveStruct; bool bPending = false; if( m_pPendStack ) { - pSaveStruct = static_cast<_RowSaveStruct*>(m_pPendStack->pData); + pSaveStruct = static_cast<RowSaveStruct*>(m_pPendStack->pData); SwPendingStack* pTmp = m_pPendStack->pNext; delete m_pPendStack; @@ -4137,7 +4137,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions, Color aBGColor; OUString aBGImage, aStyle, aId, aClass; bool bBGColor = false; - pSaveStruct = new _RowSaveStruct; + pSaveStruct = new RowSaveStruct; if( bReadOptions ) { @@ -4321,11 +4321,11 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, int nToken = 0; bool bPending = false; - _RowSaveStruct* pSaveStruct; + RowSaveStruct* pSaveStruct; if( m_pPendStack ) { - pSaveStruct = static_cast<_RowSaveStruct*>(m_pPendStack->pData); + pSaveStruct = static_cast<RowSaveStruct*>(m_pPendStack->pData); SwPendingStack* pTmp = m_pPendStack->pNext; delete m_pPendStack; @@ -4337,7 +4337,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, } else { - pSaveStruct = new _RowSaveStruct; + pSaveStruct = new RowSaveStruct; if( bReadOptions ) { @@ -4473,7 +4473,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, // now we stand (perhaps) in front of <TBODY>,... or </TABLE> } -struct _TableColGrpSaveStruct : public SwPendingStackData +struct TableColGrpSaveStruct : public SwPendingStackData { sal_uInt16 nColGrpSpan; sal_uInt16 nColGrpWidth; @@ -4481,18 +4481,18 @@ struct _TableColGrpSaveStruct : public SwPendingStackData SvxAdjust eColGrpAdjust; sal_Int16 eColGrpVertOri; - inline _TableColGrpSaveStruct(); + inline TableColGrpSaveStruct(); inline void CloseColGroup( HTMLTable *pTable ); }; -inline _TableColGrpSaveStruct::_TableColGrpSaveStruct() : +inline TableColGrpSaveStruct::TableColGrpSaveStruct() : nColGrpSpan( 1 ), nColGrpWidth( 0 ), bRelColGrpWidth( false ), eColGrpAdjust( SVX_ADJUST_END ), eColGrpVertOri( text::VertOrientation::TOP ) {} -inline void _TableColGrpSaveStruct::CloseColGroup( HTMLTable *pTable ) +inline void TableColGrpSaveStruct::CloseColGroup( HTMLTable *pTable ) { pTable->CloseColGroup( nColGrpSpan, nColGrpWidth, bRelColGrpWidth, eColGrpAdjust, eColGrpVertOri ); @@ -4508,11 +4508,11 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, int nToken = 0; bool bPending = false; - _TableColGrpSaveStruct* pSaveStruct; + TableColGrpSaveStruct* pSaveStruct; if( m_pPendStack ) { - pSaveStruct = static_cast<_TableColGrpSaveStruct*>(m_pPendStack->pData); + pSaveStruct = static_cast<TableColGrpSaveStruct*>(m_pPendStack->pData); SwPendingStack* pTmp = m_pPendStack->pNext; delete m_pPendStack; @@ -4525,7 +4525,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, else { - pSaveStruct = new _TableColGrpSaveStruct; + pSaveStruct = new TableColGrpSaveStruct; if( bReadOptions ) { const HTMLOptions& rColGrpOptions = GetOptions(); @@ -4686,17 +4686,17 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, } } -class _CaptionSaveStruct : public _SectionSaveStruct +class CaptionSaveStruct : public SectionSaveStruct { SwPosition aSavePos; SwHTMLNumRuleInfo aNumRuleInfo; // gueltige Numerierung public: - _HTMLAttrTable aAttrTab; // und die Attribute + HTMLAttrTable aAttrTab; // und die Attribute - _CaptionSaveStruct( SwHTMLParser& rParser, const SwPosition& rPos ) : - _SectionSaveStruct( rParser ), aSavePos( rPos ) + CaptionSaveStruct( SwHTMLParser& rParser, const SwPosition& rPos ) : + SectionSaveStruct( rParser ), aSavePos( rPos ) { rParser.SaveAttrTab( aAttrTab ); @@ -4720,10 +4720,10 @@ public: rParser.GetNumInfo().Set( aNumRuleInfo ); } - virtual ~_CaptionSaveStruct(); + virtual ~CaptionSaveStruct(); }; -_CaptionSaveStruct::~_CaptionSaveStruct() +CaptionSaveStruct::~CaptionSaveStruct() {} void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) @@ -4734,11 +4734,11 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) return; int nToken = 0; - _CaptionSaveStruct* pSaveStruct; + CaptionSaveStruct* pSaveStruct; if( m_pPendStack ) { - pSaveStruct = static_cast<_CaptionSaveStruct*>(m_pPendStack->pData); + pSaveStruct = static_cast<CaptionSaveStruct*>(m_pPendStack->pData); SwPendingStack* pTmp = m_pPendStack->pNext; delete m_pPendStack; @@ -4772,7 +4772,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) } // Alte PaM-Position retten. - pSaveStruct = new _CaptionSaveStruct( *this, *m_pPam->GetPoint() ); + pSaveStruct = new CaptionSaveStruct( *this, *m_pPam->GetPoint() ); // Eine Text-Section im Icons-Bereich als Container fuer die // Ueberschrift anlegen und PaM dort reinstellen. @@ -4782,12 +4782,12 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) else pStNd = InsertTableSection( RES_POOLCOLL_TEXT ); - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_CAPTION_ON ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( HTML_CAPTION_ON ); // Tabellen-Ueberschriften sind immer zentriert. NewAttr( &m_aAttrTab.pAdjust, SvxAdjustItem(SVX_ADJUST_CENTER, RES_PARATR_ADJUST) ); - _HTMLAttrs &rAttrs = pCntxt->GetAttrs(); + HTMLAttrs &rAttrs = pCntxt->GetAttrs(); rAttrs.push_back( m_aAttrTab.pAdjust ); PushContext( pCntxt ); @@ -4875,7 +4875,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) // Alle noch offenen Kontexte beenden while( m_aContexts.size() > m_nContextStAttrMin+1 ) { - _HTMLAttrContext *pCntxt = PopContext(); + HTMLAttrContext *pCntxt = PopContext(); EndContext( pCntxt ); delete pCntxt; } @@ -4901,7 +4901,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) // falls fuer die Zelle eine Ausrichtung gesetzt wurde, muessen // wir die beenden - _HTMLAttrContext *pCntxt = PopContext(); + HTMLAttrContext *pCntxt = PopContext(); EndContext( pCntxt ); delete pCntxt; @@ -4916,16 +4916,16 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) delete pSaveStruct; } -class _TableSaveStruct : public SwPendingStackData +class TableSaveStruct : public SwPendingStackData { public: HTMLTable *m_pCurrentTable; - explicit _TableSaveStruct( HTMLTable *pCurTable ) : + explicit TableSaveStruct( HTMLTable *pCurTable ) : m_pCurrentTable( pCurTable ) {} - virtual ~_TableSaveStruct(); + virtual ~TableSaveStruct(); // Aufbau der Tabelle anstossen und die Tabelle ggf. in einen // Rahmen packen. Wenn true zurueckgegeben wird muss noch ein @@ -4933,14 +4933,14 @@ public: void MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ); }; -_TableSaveStruct::~_TableSaveStruct() +TableSaveStruct::~TableSaveStruct() {} -void _TableSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ) +void TableSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ) { m_pCurrentTable->MakeTable(nullptr, nWidth); - _HTMLTableContext *pTCntxt = m_pCurrentTable->GetContext(); + HTMLTableContext *pTCntxt = m_pCurrentTable->GetContext(); OSL_ENSURE( pTCntxt, "Wo ist der Tabellen-Kontext" ); SwTableNode *pTableNd = pTCntxt->GetTableNode(); @@ -5115,11 +5115,11 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, int nToken = 0; bool bPending = false; - _TableSaveStruct* pSaveStruct; + TableSaveStruct* pSaveStruct; if( m_pPendStack ) { - pSaveStruct = static_cast<_TableSaveStruct*>(m_pPendStack->pData); + pSaveStruct = static_cast<TableSaveStruct*>(m_pPendStack->pData); SwPendingStack* pTmp = m_pPendStack->pNext; delete m_pPendStack; @@ -5146,7 +5146,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, if( !m_pTable ) m_pTable = pCurTable; - pSaveStruct = new _TableSaveStruct( pCurTable ); + pSaveStruct = new TableSaveStruct( pCurTable ); delete pTableOptions; @@ -5255,7 +5255,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, return nullptr; } - _HTMLTableContext *pTCntxt = pCurTable->GetContext(); + HTMLTableContext *pTCntxt = pCurTable->GetContext(); if( pTCntxt ) { // Die Tabelle wurde auch angelegt @@ -5268,7 +5268,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, // weil die aktuelle danach nicht mehr existiert while( m_aContexts.size() > m_nContextStAttrMin ) { - _HTMLAttrContext *pCntxt = PopContext(); + HTMLAttrContext *pCntxt = PopContext(); ClearContext( pCntxt ); delete pCntxt; } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 6be1b44d8ee2..0c540768acfb 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -308,7 +308,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn, rCursor.DeleteMark(); m_pPam = &rCursor; // re-use existing cursor: avoids spurious ~SwIndexReg assert - memset( &m_aAttrTab, 0, sizeof( _HTMLAttrTable )); + memset( &m_aAttrTab, 0, sizeof( HTMLAttrTable )); // Die Font-Groessen 1-7 aus der INI-Datei lesen SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get(); @@ -447,7 +447,7 @@ SwHTMLParser::~SwHTMLParser() if( !m_aSetAttrTab.empty() ) { OSL_ENSURE( m_aSetAttrTab.empty(),"Es stehen noch Attribute auf dem Stack" ); - for ( _HTMLAttrs::const_iterator it = m_aSetAttrTab.begin(); + for ( HTMLAttrs::const_iterator it = m_aSetAttrTab.begin(); it != m_aSetAttrTab.end(); ++it ) delete *it; m_aSetAttrTab.clear(); @@ -667,7 +667,7 @@ void SwHTMLParser::Continue( int nToken ) m_nContextStMin = 0; while( m_aContexts.size() ) { - _HTMLAttrContext *pCntxt = PopContext(); + HTMLAttrContext *pCntxt = PopContext(); if( pCntxt ) { EndContext( pCntxt ); @@ -2043,7 +2043,7 @@ void SwHTMLParser::NextToken( int nToken ) m_aParaAttrs.clear(); } -static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr, +static void lcl_swhtml_getItemInfo( const HTMLAttr& rAttr, bool& rScriptDependent, bool& rFont, sal_uInt16& rScriptType ) { @@ -2142,17 +2142,17 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum ) const sal_Int32 nEndCnt = aOldPos.nContent.GetIndex(); const SwPosition& rPos = *m_pPam->GetPoint(); - _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab); - for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes) + HTMLAttr** pHTMLAttributes = reinterpret_cast<HTMLAttr**>(&m_aAttrTab); + for (auto nCnt = sizeof(HTMLAttrTable) / sizeof(HTMLAttr*); nCnt--; ++pHTMLAttributes) { - _HTMLAttr *pAttr = *pHTMLAttributes; + HTMLAttr *pAttr = *pHTMLAttributes; if( pAttr && pAttr->GetItem().Which() < RES_PARATR_BEGIN ) { bool bWholePara = false; while( pAttr ) { - _HTMLAttr *pNext = pAttr->GetNext(); + HTMLAttr *pNext = pAttr->GetNext(); if( pAttr->GetSttParaIdx() < rEndIdx.GetIndex() || (!bWholePara && pAttr->GetSttPara() == rEndIdx && @@ -2186,7 +2186,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum ) { if( nScriptItem == nScriptText ) { - _HTMLAttr *pSetAttr = + HTMLAttr *pSetAttr = pAttr->Clone( rEndIdx, nScriptEnd ); pSetAttr->nSttContent = nStt; pSetAttr->ClearPrev(); @@ -2211,7 +2211,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum ) } if( bInsert ) { - _HTMLAttr *pSetAttr = + HTMLAttr *pSetAttr = pAttr->Clone( rEndIdx, nEndCnt ); pSetAttr->nSttContent = nStt; @@ -2233,7 +2233,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum ) } else { - _HTMLAttr *pPrev = pAttr->GetPrev(); + HTMLAttr *pPrev = pAttr->GetPrev(); if( pPrev ) { // Die Previous-Attribute muessen trotzdem gesetzt werden. @@ -2646,16 +2646,16 @@ SwViewShell *SwHTMLParser::CheckActionViewShell() return m_pActionViewShell; } -void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable, - _HTMLAttrs *pPostIts ) +void SwHTMLParser::SetAttr_( bool bChkEnd, bool bBeforeTable, + HTMLAttrs *pPostIts ) { SwPaM* pAttrPam = new SwPaM( *m_pPam->GetPoint() ); const SwNodeIndex& rEndIdx = m_pPam->GetPoint()->nNode; const sal_Int32 nEndCnt = m_pPam->GetPoint()->nContent.GetIndex(); - _HTMLAttr* pAttr; + HTMLAttr* pAttr; SwContentNode* pCNd; - _HTMLAttrs aFields; + HTMLAttrs aFields; for( auto n = m_aSetAttrTab.size(); n; ) { @@ -2711,7 +2711,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable, while( pAttr ) { - _HTMLAttr *pPrev = pAttr->GetPrev(); + HTMLAttr *pPrev = pAttr->GetPrev(); if( !pAttr->bValid ) { // ungueltige Attribute koennen gloescht werden @@ -2990,7 +2990,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable, delete pAttrPam; } -void SwHTMLParser::NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem ) +void SwHTMLParser::NewAttr( HTMLAttr **ppAttr, const SfxPoolItem& rItem ) { // Font-Hoehen und -Farben- sowie Escapement-Attribute duerfen nicht // zusammengefasst werden. Sie werden deshalb in einer Liste gespeichert, @@ -2999,23 +2999,23 @@ void SwHTMLParser::NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem ) // hochgezaehlt. if( *ppAttr ) { - _HTMLAttr *pAttr = new _HTMLAttr( *m_pPam->GetPoint(), rItem, + HTMLAttr *pAttr = new HTMLAttr( *m_pPam->GetPoint(), rItem, ppAttr ); pAttr->InsertNext( *ppAttr ); (*ppAttr) = pAttr; } else - (*ppAttr) = new _HTMLAttr( *m_pPam->GetPoint(), rItem, ppAttr ); + (*ppAttr) = new HTMLAttr( *m_pPam->GetPoint(), rItem, ppAttr ); } -bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, +bool SwHTMLParser::EndAttr( HTMLAttr* pAttr, HTMLAttr **ppDepAttr, bool bChkEmpty ) { bool bRet = true; OSL_ENSURE( !ppDepAttr, "SwHTMLParser::EndAttr: ppDepAttr-Feature ungetestet?" ); // Der Listenkopf ist im Attribut gespeichert - _HTMLAttr **ppHead = pAttr->ppHead; + HTMLAttr **ppHead = pAttr->ppHead; OSL_ENSURE( ppHead, "keinen Attributs-Listenkopf gefunden!" ); @@ -3025,7 +3025,7 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, // WIrd das zueltzt gestartete oder ein frueher gestartetes Attribut // beendet? - _HTMLAttr *pLast = nullptr; + HTMLAttr *pLast = nullptr; if( ppHead && pAttr != *ppHead ) { // Es wird nicht das zuletzt gestartete Attribut beendet @@ -3051,7 +3051,7 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, } // nun das Attrubut beenden - _HTMLAttr *pNext = pAttr->GetNext(); + HTMLAttr *pNext = pAttr->GetNext(); bool bInsert; sal_uInt16 nScriptItem = 0; @@ -3089,7 +3089,7 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, { if( nScriptItem == nScriptText ) { - _HTMLAttr *pSetAttr = pAttr->Clone( *pEndIdx, nScriptEnd ); + HTMLAttr *pSetAttr = pAttr->Clone( *pEndIdx, nScriptEnd ); pSetAttr->ClearPrev(); if( pNext ) pNext->InsertPrev( pSetAttr ); @@ -3147,7 +3147,7 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, // Vorlagen durch harte Attributierung koennen sich auch mal andere // leere Attribute in der Prev-Liste befinden, die dann trotzdem // gesetzt werden muessen - _HTMLAttr *pPrev = pAttr->GetPrev(); + HTMLAttr *pPrev = pAttr->GetPrev(); bRet = false; delete pAttr; @@ -3180,7 +3180,7 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, return bRet; } -void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr ) +void SwHTMLParser::DeleteAttr( HTMLAttr* pAttr ) { // preliminary paragraph attributes are not allowed here, they could // be set here and then the pointers become invalid! @@ -3190,13 +3190,13 @@ void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr ) m_aParaAttrs.clear(); // Der Listenkopf ist im Attribut gespeichert - _HTMLAttr **ppHead = pAttr->ppHead; + HTMLAttr **ppHead = pAttr->ppHead; OSL_ENSURE( ppHead, "keinen Attributs-Listenkopf gefunden!" ); // Wird das zueltzt gestartete oder ein frueher gestartetes Attribut // entfernt? - _HTMLAttr *pLast = nullptr; + HTMLAttr *pLast = nullptr; if( ppHead && pAttr != *ppHead ) { // Es wird nicht das zuletzt gestartete Attribut beendet @@ -3212,8 +3212,8 @@ void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr ) } // nun das Attrubut entfernen - _HTMLAttr *pNext = pAttr->GetNext(); - _HTMLAttr *pPrev = pAttr->GetPrev(); + HTMLAttr *pNext = pAttr->GetNext(); + HTMLAttr *pPrev = pAttr->GetPrev(); delete pAttr; if( pPrev ) @@ -3238,7 +3238,7 @@ void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr ) *ppHead = pNext; } -void SwHTMLParser::SaveAttrTab( _HTMLAttrTable& rNewAttrTab ) +void SwHTMLParser::SaveAttrTab( HTMLAttrTable& rNewAttrTab ) { // preliminary paragraph attributes are not allowed here, they could // be set here and then the pointers become invalid! @@ -3247,14 +3247,14 @@ void SwHTMLParser::SaveAttrTab( _HTMLAttrTable& rNewAttrTab ) if( !m_aParaAttrs.empty() ) m_aParaAttrs.clear(); - _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab); - _HTMLAttr** pSaveAttributes = reinterpret_cast<_HTMLAttr**>(&rNewAttrTab); + HTMLAttr** pHTMLAttributes = reinterpret_cast<HTMLAttr**>(&m_aAttrTab); + HTMLAttr** pSaveAttributes = reinterpret_cast<HTMLAttr**>(&rNewAttrTab); - for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes, ++pSaveAttributes) + for (auto nCnt = sizeof(HTMLAttrTable) / sizeof(HTMLAttr*); nCnt--; ++pHTMLAttributes, ++pSaveAttributes) { *pSaveAttributes = *pHTMLAttributes; - _HTMLAttr *pAttr = *pSaveAttributes; + HTMLAttr *pAttr = *pSaveAttributes; while (pAttr) { pAttr->SetHead(pSaveAttributes); @@ -3265,7 +3265,7 @@ void SwHTMLParser::SaveAttrTab( _HTMLAttrTable& rNewAttrTab ) } } -void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, +void SwHTMLParser::SplitAttrTab( HTMLAttrTable& rNewAttrTab, bool bMoveEndBack ) { // preliminary paragraph attributes are not allowed here, they could @@ -3280,8 +3280,8 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, // alle noch offenen Attribute beenden und hinter der Tabelle // neu aufspannen - _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab); - _HTMLAttr** pSaveAttributes = reinterpret_cast<_HTMLAttr**>(&rNewAttrTab); + HTMLAttr** pHTMLAttributes = reinterpret_cast<HTMLAttr**>(&m_aAttrTab); + HTMLAttr** pSaveAttributes = reinterpret_cast<HTMLAttr**>(&rNewAttrTab); bool bSetAttr = true; const sal_Int32 nSttCnt = m_pPam->GetPoint()->nContent.GetIndex(); sal_Int32 nEndCnt = nSttCnt; @@ -3303,14 +3303,14 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, nEndCnt = (bSetAttr ? pCNd->Len() : 0); } - for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; (++pHTMLAttributes, ++pSaveAttributes)) + for (auto nCnt = sizeof(HTMLAttrTable) / sizeof(HTMLAttr*); nCnt--; (++pHTMLAttributes, ++pSaveAttributes)) { - _HTMLAttr *pAttr = *pHTMLAttributes; + HTMLAttr *pAttr = *pHTMLAttributes; *pSaveAttributes = nullptr; while( pAttr ) { - _HTMLAttr *pNext = pAttr->GetNext(); - _HTMLAttr *pPrev = pAttr->GetPrev(); + HTMLAttr *pNext = pAttr->GetNext(); + HTMLAttr *pPrev = pAttr->GetPrev(); if( bSetAttr && ( pAttr->GetSttParaIdx() < nEndIdx.GetIndex() || @@ -3322,7 +3322,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, // noch in den Kontexten existieren, muessen wir es clonen. // Die Next-Liste geht dabei verloren, aber die // Previous-Liste bleibt erhalten - _HTMLAttr *pSetAttr = pAttr->Clone( nEndIdx, nEndCnt ); + HTMLAttr *pSetAttr = pAttr->Clone( nEndIdx, nEndCnt ); if( pNext ) pNext->InsertPrev( pSetAttr ); @@ -3356,7 +3356,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, if (*pSaveAttributes) { - _HTMLAttr *pSAttr = *pSaveAttributes; + HTMLAttr *pSAttr = *pSaveAttributes; while( pSAttr->GetNext() ) pSAttr = pSAttr->GetNext(); pSAttr->InsertNext( pAttr ); @@ -3371,7 +3371,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, } } -void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab ) +void SwHTMLParser::RestoreAttrTab( HTMLAttrTable& rNewAttrTab ) { // preliminary paragraph attributes are not allowed here, they could // be set here and then the pointers become invalid! @@ -3380,16 +3380,16 @@ void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab ) if( !m_aParaAttrs.empty() ) m_aParaAttrs.clear(); - _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab); - _HTMLAttr** pSaveAttributes = reinterpret_cast<_HTMLAttr**>(&rNewAttrTab); + HTMLAttr** pHTMLAttributes = reinterpret_cast<HTMLAttr**>(&m_aAttrTab); + HTMLAttr** pSaveAttributes = reinterpret_cast<HTMLAttr**>(&rNewAttrTab); - for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes, ++pSaveAttributes) + for (auto nCnt = sizeof(HTMLAttrTable) / sizeof(HTMLAttr*); nCnt--; ++pHTMLAttributes, ++pSaveAttributes) { OSL_ENSURE(!*pHTMLAttributes, "Die Attribut-Tabelle ist nicht leer!"); *pHTMLAttributes = *pSaveAttributes; - _HTMLAttr *pAttr = *pHTMLAttributes; + HTMLAttr *pAttr = *pHTMLAttributes; while (pAttr) { OSL_ENSURE( !pAttr->GetPrev() || !pAttr->GetPrev()->ppHead, @@ -3404,7 +3404,7 @@ void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab ) void SwHTMLParser::InsertAttr( const SfxPoolItem& rItem, bool bInsAtStart ) { - _HTMLAttr* pTmp = new _HTMLAttr( *m_pPam->GetPoint(), + HTMLAttr* pTmp = new HTMLAttr( *m_pPam->GetPoint(), rItem ); if (bInsAtStart) m_aSetAttrTab.push_front( pTmp ); @@ -3412,11 +3412,11 @@ void SwHTMLParser::InsertAttr( const SfxPoolItem& rItem, bool bInsAtStart ) m_aSetAttrTab.push_back( pTmp ); } -void SwHTMLParser::InsertAttrs( _HTMLAttrs& rAttrs ) +void SwHTMLParser::InsertAttrs( HTMLAttrs& rAttrs ) { while( !rAttrs.empty() ) { - _HTMLAttr *pAttr = rAttrs.front(); + HTMLAttr *pAttr = rAttrs.front(); InsertAttr( pAttr->GetItem(), false ); rAttrs.pop_front(); delete pAttr; @@ -3453,7 +3453,7 @@ void SwHTMLParser::NewStdAttr( int nToken ) } // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); // Styles parsen if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) ) @@ -3475,9 +3475,9 @@ void SwHTMLParser::NewStdAttr( int nToken ) } void SwHTMLParser::NewStdAttr( int nToken, - _HTMLAttr **ppAttr, const SfxPoolItem & rItem, - _HTMLAttr **ppAttr2, const SfxPoolItem *pItem2, - _HTMLAttr **ppAttr3, const SfxPoolItem *pItem3 ) + HTMLAttr **ppAttr, const SfxPoolItem & rItem, + HTMLAttr **ppAttr2, const SfxPoolItem *pItem2, + HTMLAttr **ppAttr3, const SfxPoolItem *pItem3 ) { OUString aId, aStyle, aClass, aLang, aDir; @@ -3506,7 +3506,7 @@ void SwHTMLParser::NewStdAttr( int nToken, } // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); // Styles parsen if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) ) @@ -3547,7 +3547,7 @@ void SwHTMLParser::NewStdAttr( int nToken, void SwHTMLParser::EndTag( int nToken ) { // den Kontext holen - _HTMLAttrContext *pCntxt = PopContext( static_cast< sal_uInt16 >(nToken & ~1) ); + HTMLAttrContext *pCntxt = PopContext( static_cast< sal_uInt16 >(nToken & ~1) ); if( pCntxt ) { // und ggf. die Attribute beenden @@ -3595,7 +3595,7 @@ void SwHTMLParser::NewBasefontAttr() nSize = 7; // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_BASEFONT_ON ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( HTML_BASEFONT_ON ); // Styles parsen if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) ) @@ -3798,7 +3798,7 @@ void SwHTMLParser::NewFontAttr( int nToken ) } // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); // Styles parsen if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) ) @@ -3909,10 +3909,10 @@ void SwHTMLParser::NewPara() } // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = - !aClass.isEmpty() ? new _HTMLAttrContext( HTML_PARABREAK_ON, + HTMLAttrContext *pCntxt = + !aClass.isEmpty() ? new HTMLAttrContext( HTML_PARABREAK_ON, RES_POOLCOLL_TEXT, aClass ) - : new _HTMLAttrContext( HTML_PARABREAK_ON ); + : new HTMLAttrContext( HTML_PARABREAK_ON ); // Styles parsen (Class nicht beruecksichtigen. Das geht nur, solange // keine der CSS1-Properties der Klasse hart formatiert werden muss!!!) @@ -3975,7 +3975,7 @@ void SwHTMLParser::EndPara( bool bReal ) // den Kontext vom Stack holen. Er kann auch von einer implizit // geoeffneten Definitionsliste kommen - _HTMLAttrContext *pCntxt = + HTMLAttrContext *pCntxt = PopContext( static_cast< sal_uInt16 >(m_nOpenParaToken ? (m_nOpenParaToken & ~1) : HTML_PARABREAK_ON) ); @@ -4047,7 +4047,7 @@ void SwHTMLParser::NewHeading( int nToken ) } // den Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nTextColl, aClass ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nTextColl, aClass ); // Styles parsen (zu Class siehe auch NewPara) if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) ) @@ -4088,7 +4088,7 @@ void SwHTMLParser::EndHeading() AddParSpace(); // Kontext zu dem Token suchen und vom Stack holen - _HTMLAttrContext *pCntxt = nullptr; + HTMLAttrContext *pCntxt = nullptr; auto nPos = m_aContexts.size(); while( !pCntxt && nPos>m_nContextStMin ) { @@ -4181,7 +4181,7 @@ void SwHTMLParser::NewTextFormatColl( int nToken, sal_uInt16 nColl ) AddParSpace(); // ... und in einem Kontext merken - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nColl, aClass ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nColl, aClass ); // Styles parsen (zu Class siehe auch NewPara) if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) ) @@ -4234,7 +4234,7 @@ void SwHTMLParser::EndTextFormatColl( int nToken ) AddParSpace(); // den aktuellen Kontext vom Stack holen - _HTMLAttrContext *pCntxt = PopContext( static_cast< sal_uInt16 >(nToken & ~1) ); + HTMLAttrContext *pCntxt = PopContext( static_cast< sal_uInt16 >(nToken & ~1) ); // und noch Attribute beenden if( pCntxt ) @@ -4307,7 +4307,7 @@ void SwHTMLParser::NewDefList() } // ... und in einem Kontext merken - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_DEFLIST_ON ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( HTML_DEFLIST_ON ); // darin auch die Raender merken sal_uInt16 nLeft=0, nRight=0; @@ -4363,7 +4363,7 @@ void SwHTMLParser::EndDefList() m_nDefListDeep--; // den aktuellen Kontext vom Stack holen - _HTMLAttrContext *pCntxt = PopContext( HTML_DEFLIST_ON ); + HTMLAttrContext *pCntxt = PopContext( HTML_DEFLIST_ON ); // und noch Attribute beenden if( pCntxt ) @@ -4420,7 +4420,7 @@ void SwHTMLParser::EndDefListItem( int nToken, bool /*bLastPara*/ ) // Kontext zu dem Token suchen und vom Stack holen nToken &= ~1; - _HTMLAttrContext *pCntxt = nullptr; + HTMLAttrContext *pCntxt = nullptr; auto nPos = m_aContexts.size(); while( !pCntxt && nPos>m_nContextStMin ) { @@ -4534,7 +4534,7 @@ const SwFormatColl *SwHTMLParser::GetCurrFormatColl() const return &pCNd->GetAnyFormatColl(); } -void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext ) +void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext ) { SwTextFormatColl *pCollToSet = nullptr; // die zu setzende Vorlage SfxItemSet *pItemSet = nullptr; // der Set fuer harte Attrs @@ -4549,7 +4549,7 @@ void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext ) for( auto i = m_nContextStAttrMin; i < m_aContexts.size(); ++i ) { - const _HTMLAttrContext *pCntxt = m_aContexts[i]; + const HTMLAttrContext *pCntxt = m_aContexts[i]; sal_uInt16 nColl = pCntxt->GetTextFormatColl(); if( nColl ) @@ -4786,7 +4786,7 @@ void SwHTMLParser::NewCharFormat( int nToken ) } // einen neuen Kontext anlegen - _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); + HTMLAttrContext *pCntxt = new HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); // die Vorlage setzen und im Kontext merken SwCharFormat* pCFormat = m_pCSS1Parser->GetChrFormat( static_cast< sal_uInt16 >(nToken), aClass ); @@ -5260,8 +5260,8 @@ void SwHTMLParser::InsertHorzRule() m_pPam->Move( fnMoveBackward ); // ... und in einem Kontext merken - _HTMLAttrContext *pCntxt = - new _HTMLAttrContext( HTML_HORZRULE, RES_POOLCOLL_HTML_HR, aEmptyOUStr ); + HTMLAttrContext *pCntxt = + new HTMLAttrContext( HTML_HORZRULE, RES_POOLCOLL_HTML_HR, aEmptyOUStr ); PushContext( pCntxt ); @@ -5302,7 +5302,7 @@ void SwHTMLParser::InsertHorzRule() SvxBoxItem aBoxItem(RES_BOX); aBoxItem.SetLine( &aBorderLine, SvxBoxItemLine::BOTTOM ); - _HTMLAttr* pTmp = new _HTMLAttr( *m_pPam->GetPoint(), aBoxItem ); + HTMLAttr* pTmp = new HTMLAttr( *m_pPam->GetPoint(), aBoxItem ); m_aSetAttrTab.push_back( pTmp ); } if( nWidth ) @@ -5343,7 +5343,7 @@ void SwHTMLParser::InsertHorzRule() break; } - _HTMLAttr* pTmp = new _HTMLAttr( *m_pPam->GetPoint(), aLRItem ); + HTMLAttr* pTmp = new HTMLAttr( *m_pPam->GetPoint(), aLRItem ); m_aSetAttrTab.push_back( pTmp ); } } @@ -5354,7 +5354,7 @@ void SwHTMLParser::InsertHorzRule() InsertBookmark( aId ); // den aktuellen Kontext vom Stack holen - _HTMLAttrContext *pPoppedContext = PopContext( HTML_HORZRULE ); + HTMLAttrContext *pPoppedContext = PopContext( HTML_HORZRULE ); OSL_ENSURE( pPoppedContext==pCntxt, "wo kommt denn da ein HR-Kontext her?" ); delete pPoppedContext; @@ -5437,8 +5437,8 @@ void SwHTMLParser::ParseMoreMetaOptions() InsertAttr( aFormatField, false ); } -_HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, - _HTMLAttr **ppHd ) : +HTMLAttr::HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, + HTMLAttr **ppHd ) : nSttPara( rPos.nNode ), nEndPara( rPos.nNode ), nSttContent( rPos.nContent.GetIndex() ), @@ -5453,8 +5453,8 @@ _HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, pItem = rItem.Clone(); } -_HTMLAttr::_HTMLAttr( const _HTMLAttr &rAttr, const SwNodeIndex &rEndPara, - sal_Int32 nEndCnt, _HTMLAttr **ppHd ) : +HTMLAttr::HTMLAttr( const HTMLAttr &rAttr, const SwNodeIndex &rEndPara, + sal_Int32 nEndCnt, HTMLAttr **ppHd ) : nSttPara( rAttr.nSttPara ), nEndPara( rEndPara ), nSttContent( rAttr.nSttContent ), @@ -5469,15 +5469,15 @@ _HTMLAttr::_HTMLAttr( const _HTMLAttr &rAttr, const SwNodeIndex &rEndPara, pItem = rAttr.pItem->Clone(); } -_HTMLAttr::~_HTMLAttr() +HTMLAttr::~HTMLAttr() { delete pItem; } -_HTMLAttr *_HTMLAttr::Clone(const SwNodeIndex& rEndPara, sal_Int32 nEndCnt) const +HTMLAttr *HTMLAttr::Clone(const SwNodeIndex& rEndPara, sal_Int32 nEndCnt) const { // das Attribut mit der alten Start-Position neu anlegen - _HTMLAttr *pNew = new _HTMLAttr( *this, rEndPara, nEndCnt, ppHead ); + HTMLAttr *pNew = new HTMLAttr( *this, rEndPara, nEndCnt, ppHead ); // die Previous-Liste muss uebernommen werden, die Next-Liste nicht! pNew->pPrev = pPrev; @@ -5485,8 +5485,8 @@ _HTMLAttr *_HTMLAttr::Clone(const SwNodeIndex& rEndPara, sal_Int32 nEndCnt) cons return pNew; } -void _HTMLAttr::Reset(const SwNodeIndex& rSttPara, sal_Int32 nSttCnt, - _HTMLAttr **ppHd) +void HTMLAttr::Reset(const SwNodeIndex& rSttPara, sal_Int32 nSttCnt, + HTMLAttr **ppHd) { // den Anfang (und das Ende) neu setzen nSttPara = rSttPara; @@ -5500,17 +5500,17 @@ void _HTMLAttr::Reset(const SwNodeIndex& rSttPara, sal_Int32 nSttCnt, ppHead = ppHd; } -void _HTMLAttr::InsertPrev( _HTMLAttr *pPrv ) +void HTMLAttr::InsertPrev( HTMLAttr *pPrv ) { OSL_ENSURE( !pPrv->pNext || pPrv->pNext == this, - "_HTMLAttr::InsertPrev: pNext falsch" ); + "HTMLAttr::InsertPrev: pNext falsch" ); pPrv->pNext = nullptr; OSL_ENSURE( nullptr == pPrv->ppHead || ppHead == pPrv->ppHead, - "_HTMLAttr::InsertPrev: ppHead falsch" ); + "HTMLAttr::InsertPrev: ppHead falsch" ); pPrv->ppHead = nullptr; - _HTMLAttr *pAttr = this; + HTMLAttr *pAttr = this; while( pAttr->GetPrev() ) pAttr = pAttr->GetPrev(); diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 483f357db7d4..92071fec7d24 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -67,13 +67,13 @@ extern HTMLOptionEnum aHTMLImgVAlignTable[]; // der Attribut Stack: -class _HTMLAttr; -typedef std::deque<_HTMLAttr *> _HTMLAttrs; +class HTMLAttr; +typedef std::deque<HTMLAttr *> HTMLAttrs; -class _HTMLAttr +class HTMLAttr { friend class SwHTMLParser; - friend class _CellSaveStruct; + friend class CellSaveStruct; SwNodeIndex nSttPara, nEndPara; sal_Int32 nSttContent, nEndContent; @@ -82,23 +82,23 @@ class _HTMLAttr bool bValid : 1; // ist das Attribut gueltig? SfxPoolItem* pItem; - _HTMLAttr *pNext; // noch zu schliessene Attrs mit unterschiedl. Werten - _HTMLAttr *pPrev; // bereits geschlossene aber noch nicht gesetze Attrs - _HTMLAttr **ppHead; // der Listenkopf + HTMLAttr *pNext; // noch zu schliessene Attrs mit unterschiedl. Werten + HTMLAttr *pPrev; // bereits geschlossene aber noch nicht gesetze Attrs + HTMLAttr **ppHead; // der Listenkopf - _HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, - _HTMLAttr **pHd=nullptr ); + HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, + HTMLAttr **pHd=nullptr ); - _HTMLAttr( const _HTMLAttr &rAttr, const SwNodeIndex &rEndPara, - sal_Int32 nEndCnt, _HTMLAttr **pHd ); + HTMLAttr( const HTMLAttr &rAttr, const SwNodeIndex &rEndPara, + sal_Int32 nEndCnt, HTMLAttr **pHd ); public: - ~_HTMLAttr(); + ~HTMLAttr(); - _HTMLAttr *Clone( const SwNodeIndex& rEndPara, sal_Int32 nEndCnt ) const; + HTMLAttr *Clone( const SwNodeIndex& rEndPara, sal_Int32 nEndCnt ) const; void Reset( const SwNodeIndex& rSttPara, sal_Int32 nSttCnt, - _HTMLAttr **pHd ); + HTMLAttr **pHd ); inline void SetStart( const SwPosition& rPos ); sal_uInt32 GetSttParaIdx() const { return nSttPara.GetIndex(); } @@ -116,28 +116,28 @@ public: SfxPoolItem& GetItem() { return *pItem; } const SfxPoolItem& GetItem() const { return *pItem; } - _HTMLAttr *GetNext() const { return pNext; } - void InsertNext( _HTMLAttr *pNxt ) { pNext = pNxt; } + HTMLAttr *GetNext() const { return pNext; } + void InsertNext( HTMLAttr *pNxt ) { pNext = pNxt; } - _HTMLAttr *GetPrev() const { return pPrev; } - void InsertPrev( _HTMLAttr *pPrv ); + HTMLAttr *GetPrev() const { return pPrev; } + void InsertPrev( HTMLAttr *pPrv ); void ClearPrev() { pPrev = nullptr; } - void SetHead( _HTMLAttr **ppHd ) { ppHead = ppHd; } + void SetHead( HTMLAttr **ppHd ) { ppHead = ppHd; } // Beim Setzen von Attributen aus Vorlagen kann es passieren, // dass Attribute doch nicht mehr gesetzt werden sollen. Die zu loeschen // waere sehr aufwendig, da man nicht so genau weiss, wo sie eingekettet // sind. Sie werden deshalb einfach invalidiert und erst beim naechsten - // _SetAttr() geloescht. + // SetAttr_() geloescht. void Invalidate() { bValid = false; } }; // Tabelle der Attribute: Hier ist die Reihenfolge wichtig: Die Attribute // vorne in der Tabelle werden in EndAllAttrs auch zuerst gesetzt. -struct _HTMLAttrTable +struct HTMLAttrTable { - _HTMLAttr + HTMLAttr *pKeep, // Frame-Attribute *pBox, *pBrush, @@ -184,7 +184,7 @@ struct _HTMLAttrTable ; }; -class _HTMLAttrContext_SaveDoc; +class HTMLAttrContext_SaveDoc; enum SwHTMLAppendMode { AM_NORMAL, // keine Absatz-Abstand-Behandlung @@ -194,13 +194,13 @@ enum SwHTMLAppendMode { AM_NONE // gar kein Append }; -class _HTMLAttrContext +class HTMLAttrContext { - _HTMLAttrs aAttrs; // die in dem Kontext gestarteten Attribute + HTMLAttrs aAttrs; // die in dem Kontext gestarteten Attribute OUString aClass; // die Klasse des Kontexts - _HTMLAttrContext_SaveDoc *pSaveDocContext; + HTMLAttrContext_SaveDoc *pSaveDocContext; SfxItemSet *pFrameItemSet; sal_uInt16 nToken; // das Token, zu dem der Kontext gehoehrt @@ -229,7 +229,7 @@ class _HTMLAttrContext public: void ClearSaveDocContext(); - _HTMLAttrContext( sal_uInt16 nTokn, sal_uInt16 nPoolId, const OUString& rClass, + HTMLAttrContext( sal_uInt16 nTokn, sal_uInt16 nPoolId, const OUString& rClass, bool bDfltColl=false ) : aClass( rClass ), pSaveDocContext( nullptr ), @@ -253,7 +253,7 @@ public: bRestartListing( false ) {} - explicit _HTMLAttrContext( sal_uInt16 nTokn ) : + explicit HTMLAttrContext( sal_uInt16 nTokn ) : pSaveDocContext( nullptr ), pFrameItemSet( nullptr ), nToken( nTokn ), @@ -275,7 +275,7 @@ public: bRestartListing( false ) {} - ~_HTMLAttrContext() { ClearSaveDocContext(); delete pFrameItemSet; } + ~HTMLAttrContext() { ClearSaveDocContext(); delete pFrameItemSet; } sal_uInt16 GetToken() const { return nToken; } @@ -295,8 +295,8 @@ public: inline void GetULSpace( sal_uInt16& rUpper, sal_uInt16& rLower ) const; bool HasAttrs() const { return !aAttrs.empty(); } - const _HTMLAttrs& GetAttrs() const { return aAttrs; } - _HTMLAttrs& GetAttrs() { return aAttrs; } + const HTMLAttrs& GetAttrs() const { return aAttrs; } + HTMLAttrs& GetAttrs() { return aAttrs; } void SetSpansSection( bool bSet ) { bSpansSection = bSet; } bool GetSpansSection() const { return bSpansSection; } @@ -305,7 +305,7 @@ public: bool GetPopStack() const { return bPopStack; } bool HasSaveDocContext() const { return pSaveDocContext!=nullptr; } - _HTMLAttrContext_SaveDoc *GetSaveDocContext( bool bCreate=false ); + HTMLAttrContext_SaveDoc *GetSaveDocContext( bool bCreate=false ); const SfxItemSet *GetFrameItemSet() const { return pFrameItemSet; } SfxItemSet *GetFrameItemSet( SwDoc *pCreateDoc ); @@ -326,7 +326,7 @@ public: SwHTMLAppendMode GetAppendMode() const { return eAppend; } }; -typedef std::vector<_HTMLAttrContext *> _HTMLAttrContexts; +typedef std::vector<HTMLAttrContext *> HTMLAttrContexts; class HTMLTable; class SwCSS1Parser; @@ -352,9 +352,9 @@ typedef ::std::vector<std::unique_ptr<ImageMap>> ImageMaps; class SwHTMLParser : public SfxHTMLParser, public SwClient { - friend class _SectionSaveStruct; - friend class _CellSaveStruct; - friend class _CaptionSaveStruct; + friend class SectionSaveStruct; + friend class CellSaveStruct; + friend class CaptionSaveStruct; OUString m_aPathToFile; OUString m_sBaseURL; @@ -376,10 +376,10 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient // Bit 0-2: Fontgroesse (1-7) // Bit 15: Fontfarbe wurde gesetzt - _HTMLAttrs m_aSetAttrTab;// "geschlossene", noch nicht gesetzte Attr. - _HTMLAttrs m_aParaAttrs; // vorlauefige Absatz-Attribute - _HTMLAttrTable m_aAttrTab; // "offene" Attribute - _HTMLAttrContexts m_aContexts;// der aktuelle Attribut/Token-Kontext + HTMLAttrs m_aSetAttrTab;// "geschlossene", noch nicht gesetzte Attr. + HTMLAttrs m_aParaAttrs; // vorlauefige Absatz-Attribute + HTMLAttrTable m_aAttrTab; // "offene" Attribute + HTMLAttrContexts m_aContexts;// der aktuelle Attribut/Token-Kontext std::vector<SwFrameFormat *> m_aMoveFlyFrames;// Fly-Frames, the anchor is moved std::deque<sal_Int32> m_aMoveFlyCnts;// and the Content-Positions @@ -488,15 +488,15 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient DECL_LINK_TYPED( AsyncCallback, void*, void ); // Attribute am Dok setzen - void _SetAttr( bool bChkEnd, bool bBeforeTable, _HTMLAttrs *pPostIts ); + void SetAttr_( bool bChkEnd, bool bBeforeTable, HTMLAttrs *pPostIts ); inline void SetAttr( bool bChkEnd = true, bool bBeforeTable = false, - _HTMLAttrs *pPostIts = nullptr ) + HTMLAttrs *pPostIts = nullptr ) { if( !m_aSetAttrTab.empty() || !m_aMoveFlyFrames.empty() ) - _SetAttr( bChkEnd, bBeforeTable, pPostIts ); + SetAttr_( bChkEnd, bBeforeTable, pPostIts ); } - _HTMLAttr **GetAttrTabEntry( sal_uInt16 nWhich ); + HTMLAttr **GetAttrTabEntry( sal_uInt16 nWhich ); // Einen neuen Textknoten an PaM-Position anlegen bool AppendTextNode( SwHTMLAppendMode eMode=AM_NORMAL, bool bUpdateNum=true ); @@ -505,36 +505,36 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient // Ein Attribut beginnen/beenden // ppDepAttr gibt einen Attribut-Tabellen-Eintrag an, dessen Attribute // gesetzt sein muessen, bevor das Attribut beendet werden darf - void NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem ); - bool EndAttr( _HTMLAttr *pAttr, _HTMLAttr **ppDepAttr=nullptr, + void NewAttr( HTMLAttr **ppAttr, const SfxPoolItem& rItem ); + bool EndAttr( HTMLAttr *pAttr, HTMLAttr **ppDepAttr=nullptr, bool bChkEmpty=true ); - void DeleteAttr( _HTMLAttr* pAttr ); + void DeleteAttr( HTMLAttr* pAttr ); - void EndContextAttrs( _HTMLAttrContext *pContext ); - void SaveAttrTab( _HTMLAttrTable& rNewAttrTab ); + void EndContextAttrs( HTMLAttrContext *pContext ); + void SaveAttrTab( HTMLAttrTable& rNewAttrTab ); void SplitAttrTab( const SwPosition& rNewPos ); - void SplitAttrTab( _HTMLAttrTable& rNewAttrTab, bool bMoveEndBack = true ); - void RestoreAttrTab( _HTMLAttrTable& rNewAttrTab ); + void SplitAttrTab( HTMLAttrTable& rNewAttrTab, bool bMoveEndBack = true ); + void RestoreAttrTab( HTMLAttrTable& rNewAttrTab ); void InsertAttr( const SfxPoolItem& rItem, bool bInsAtStart ); - void InsertAttrs( _HTMLAttrs& rAttrs ); + void InsertAttrs( HTMLAttrs& rAttrs ); bool DoPositioning( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo, - _HTMLAttrContext *pContext ); + HTMLAttrContext *pContext ); bool CreateContainer( const OUString& rClass, SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo, - _HTMLAttrContext *pContext ); + HTMLAttrContext *pContext ); bool EndSection( bool bLFStripped=false ); void InsertAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo, - _HTMLAttrContext *pContext, bool bCharLvl=false ); - void InsertAttr( _HTMLAttr **ppAttr, const SfxPoolItem & rItem, - _HTMLAttrContext *pCntxt ); - void SplitPREListingXMP( _HTMLAttrContext *pCntxt ); + HTMLAttrContext *pContext, bool bCharLvl=false ); + void InsertAttr( HTMLAttr **ppAttr, const SfxPoolItem & rItem, + HTMLAttrContext *pCntxt ); + void SplitPREListingXMP( HTMLAttrContext *pCntxt ); void FixHeaderFooterDistance( bool bHeader, const SwPosition *pOldPos ); - void EndContext( _HTMLAttrContext *pContext ); - void ClearContext( _HTMLAttrContext *pContext ); + void EndContext( HTMLAttrContext *pContext ); + void ClearContext( HTMLAttrContext *pContext ); const SwFormatColl *GetCurrFormatColl() const; @@ -547,19 +547,19 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient // Verwalten von Absatz-Vorlagen // die Vorlagen auf dem Stack bzw. deren Attribute setzen - void SetTextCollAttrs( _HTMLAttrContext *pContext = nullptr ); + void SetTextCollAttrs( HTMLAttrContext *pContext = nullptr ); void InsertParaAttrs( const SfxItemSet& rItemSet ); // Verwalten des Attribut-Kontexts // aktuellen Kontext merken - inline void PushContext( _HTMLAttrContext *pCntxt ); + inline void PushContext( HTMLAttrContext *pCntxt ); // den obersten/spezifizierten Kontext holen, aber nicht ausserhalb // des Kontexts mit Token nLimit suchen. Wenn bRemove gesetzt ist, // wird er entfernt - _HTMLAttrContext *PopContext( sal_uInt16 nToken=0 ); + HTMLAttrContext *PopContext( sal_uInt16 nToken=0 ); bool GetMarginsFromContext( sal_uInt16 &nLeft, sal_uInt16 &nRight, short& nIndent, bool bIgnoreCurrent=false ) const; @@ -586,12 +586,12 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient void EndDivision( int nToken ); // Fly-Frames einfuegen/verlassen - void InsertFlyFrame( const SfxItemSet& rItemSet, _HTMLAttrContext *pCntxt, + void InsertFlyFrame( const SfxItemSet& rItemSet, HTMLAttrContext *pCntxt, const OUString& rId, sal_uInt16 nFlags ); - void SaveDocContext( _HTMLAttrContext *pCntxt, sal_uInt16 nFlags, + void SaveDocContext( HTMLAttrContext *pCntxt, sal_uInt16 nFlags, const SwPosition *pNewPos ); - void RestoreDocContext( _HTMLAttrContext *pCntxt ); + void RestoreDocContext( HTMLAttrContext *pCntxt ); // alle durch <DIV> aufgespannten Bereiche verlassen bool EndSections( bool bLFStripped ); @@ -625,9 +625,9 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient // an und ausschalten, oder die wie SPAN nur Attribute aus Styles holen void NewStdAttr( int nToken ); void NewStdAttr( int nToken, - _HTMLAttr **ppAttr, const SfxPoolItem & rItem, - _HTMLAttr **ppAttr2=nullptr, const SfxPoolItem *pItem2=nullptr, - _HTMLAttr **ppAttr3=nullptr, const SfxPoolItem *pItem3=nullptr ); + HTMLAttr **ppAttr, const SfxPoolItem & rItem, + HTMLAttr **ppAttr2=nullptr, const SfxPoolItem *pItem2=nullptr, + HTMLAttr **ppAttr3=nullptr, const SfxPoolItem *pItem3=nullptr ); void EndTag( int nToken ); // Font-Attribute behandeln @@ -912,7 +912,7 @@ struct SwPendingStack {} }; -inline void _HTMLAttr::SetStart( const SwPosition& rPos ) +inline void HTMLAttr::SetStart( const SwPosition& rPos ) { nSttPara = rPos.nNode; nSttContent = rPos.nContent.GetIndex(); @@ -920,7 +920,7 @@ inline void _HTMLAttr::SetStart( const SwPosition& rPos ) nEndContent = nSttContent; } -inline void _HTMLAttrContext::SetMargins( sal_uInt16 nLeft, sal_uInt16 nRight, +inline void HTMLAttrContext::SetMargins( sal_uInt16 nLeft, sal_uInt16 nRight, short nIndent ) { nLeftMargin = nLeft; @@ -929,7 +929,7 @@ inline void _HTMLAttrContext::SetMargins( sal_uInt16 nLeft, sal_uInt16 nRight, bLRSpaceChanged = true; } -inline void _HTMLAttrContext::GetMargins( sal_uInt16& nLeft, +inline void HTMLAttrContext::GetMargins( sal_uInt16& nLeft, sal_uInt16& nRight, short& nIndent ) const { @@ -941,14 +941,14 @@ inline void _HTMLAttrContext::GetMargins( sal_uInt16& nLeft, } } -inline void _HTMLAttrContext::SetULSpace( sal_uInt16 nUpper, sal_uInt16 nLower ) +inline void HTMLAttrContext::SetULSpace( sal_uInt16 nUpper, sal_uInt16 nLower ) { nUpperSpace = nUpper; nLowerSpace = nLower; bULSpaceChanged = true; } -inline void _HTMLAttrContext::GetULSpace( sal_uInt16& rUpper, +inline void HTMLAttrContext::GetULSpace( sal_uInt16& rUpper, sal_uInt16& rLower ) const { if( bULSpaceChanged ) @@ -968,7 +968,7 @@ inline bool SwHTMLParser::HasStyleOptions( const OUString &rStyle, (pLang && !pLang->isEmpty()) || (pDir && !pDir->isEmpty()); } -inline void SwHTMLParser::PushContext( _HTMLAttrContext *pCntxt ) +inline void SwHTMLParser::PushContext( HTMLAttrContext *pCntxt ) { m_aContexts.push_back( pCntxt ); } diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 6c7c6dd25ba4..4b089d9f3725 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -385,7 +385,7 @@ void Writer::PutNumFormatFontsInAttrPool() else if( *pFont == *pDefFont ) bCheck = true; - _AddFontItem( rPool, SvxFontItem( pFont->GetFamilyType(), + AddFontItem( rPool, SvxFontItem( pFont->GetFamilyType(), pFont->GetFamilyName(), pFont->GetStyleName(), pFont->GetPitch(), pFont->GetCharSet(), RES_CHRATR_FONT )); } @@ -396,30 +396,30 @@ void Writer::PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL ) SfxItemPool& rPool = pDoc->GetAttrPool(); if( rPool.GetSecondaryPool() ) { - _AddFontItems( rPool, EE_CHAR_FONTINFO ); + AddFontItems_( rPool, EE_CHAR_FONTINFO ); if( bIncl_CJK_CTL ) { - _AddFontItems( rPool, EE_CHAR_FONTINFO_CJK ); - _AddFontItems( rPool, EE_CHAR_FONTINFO_CTL ); + AddFontItems_( rPool, EE_CHAR_FONTINFO_CJK ); + AddFontItems_( rPool, EE_CHAR_FONTINFO_CTL ); } } } -void Writer::_AddFontItems( SfxItemPool& rPool, sal_uInt16 nW ) +void Writer::AddFontItems_( SfxItemPool& rPool, sal_uInt16 nW ) { const SvxFontItem* pFont = static_cast<const SvxFontItem*>(&rPool.GetDefaultItem( nW )); - _AddFontItem( rPool, *pFont ); + AddFontItem( rPool, *pFont ); if( nullptr != ( pFont = static_cast<const SvxFontItem*>(rPool.GetPoolDefaultItem( nW ))) ) - _AddFontItem( rPool, *pFont ); + AddFontItem( rPool, *pFont ); sal_uInt32 nMaxItem = rPool.GetItemCount2( nW ); for( sal_uInt32 nGet = 0; nGet < nMaxItem; ++nGet ) if( nullptr != (pFont = static_cast<const SvxFontItem*>(rPool.GetItem2( nW, nGet ))) ) - _AddFontItem( rPool, *pFont ); + AddFontItem( rPool, *pFont ); } -void Writer::_AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ) +void Writer::AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ) { const SvxFontItem* pItem; if( RES_CHRATR_FONT != rFont.Which() ) diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index b0b970e1c7b7..4ef50ebe182a 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1656,22 +1656,22 @@ private: // interfaces for the toggle attributes void SetToggleAttr(sal_uInt8 nAttrId, bool bOn); void SetToggleBiDiAttr(sal_uInt8 nAttrId, bool bOn); - void _ChkToggleAttr( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask ); + void ChkToggleAttr_( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask ); void ChkToggleAttr( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask ) { if( nOldStyle81Mask != nNewStyle81Mask && m_pCtrlStck->GetToggleAttrFlags() ) - _ChkToggleAttr( nOldStyle81Mask, nNewStyle81Mask ); + ChkToggleAttr_( nOldStyle81Mask, nNewStyle81Mask ); } - void _ChkToggleBiDiAttr( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask ); + void ChkToggleBiDiAttr_( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask ); void ChkToggleBiDiAttr( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask ) { if( nOldStyle81Mask != nNewStyle81Mask && m_pCtrlStck->GetToggleBiDiAttrFlags() ) - _ChkToggleBiDiAttr( nOldStyle81Mask, nNewStyle81Mask ); + ChkToggleBiDiAttr_( nOldStyle81Mask, nNewStyle81Mask ); } void PopTableDesc(); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index e6438b48122e..c271da497b7f 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -352,7 +352,7 @@ bool wwSectionManager::SetCols(SwFrameFormat &rFormat, const wwSection &rSection // sprmSFEvenlySpaced if (!rSep.fEvenlySpaced) { - aCol._SetOrtho(false); + aCol.SetOrtho_(false); const sal_uInt16 maxIdx = SAL_N_ELEMENTS(rSep.rgdxaColumnWidthSpacing); for (sal_uInt16 i = 0, nIdx = 1; i < nCols && nIdx < maxIdx; i++, nIdx+=2 ) { @@ -1224,7 +1224,7 @@ void SwWW8ImplReader::CopyPageDescHdFt(const SwPageDesc* pOrgPageDesc, // Read BoRder Control structure // nBrcVer should be set to the version of the BRC record being read (6, 8 or 9) // This will be converted to the latest format (9). -static bool _SetWW8_BRC(int nBrcVer, WW8_BRCVer9& rVar, const sal_uInt8* pS) +static bool SetWW8_BRC(int nBrcVer, WW8_BRCVer9& rVar, const sal_uInt8* pS) { if( pS ) @@ -1260,7 +1260,7 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc, WW8PLCFx_Cp_FKP* pSprm[0], pSprm[1], pSprm[2], pSprm[3] ) ) { for( int i = 0; i < 4; ++i ) - nBorder |= int(_SetWW8_BRC( 8, brc[ i ], pSprm[ i ] ))<<i; + nBorder |= int(SetWW8_BRC( 8, brc[ i ], pSprm[ i ] ))<<i; } // Version 9 BRCs if present will override version 8 if( pSep->Find4Sprms( @@ -1269,7 +1269,7 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc, WW8PLCFx_Cp_FKP* pSprm[0], pSprm[1], pSprm[2], pSprm[3] ) ) { for( int i = 0; i < 4; ++i ) - nBorder |= int(_SetWW8_BRC( 9, brc[ i ], pSprm[ i ] ))<<i; + nBorder |= int(SetWW8_BRC( 9, brc[ i ], pSprm[ i ] ))<<i; } } } @@ -1289,15 +1289,15 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc, WW8PLCFx_Cp_FKP* if (bVer67) { for( int i = 0; i < 5; ++i ) - nBorder |= int(_SetWW8_BRC( 6 , brc[ i ], pPap->HasSprm( aVer67Ids[ i ] )))<<i; + nBorder |= int(SetWW8_BRC( 6 , brc[ i ], pPap->HasSprm( aVer67Ids[ i ] )))<<i; } else { for( int i = 0; i < 5; ++i ) - nBorder |= int(_SetWW8_BRC( 8 , brc[ i ], pPap->HasSprm( aVer8Ids[ i ] )))<<i; + nBorder |= int(SetWW8_BRC( 8 , brc[ i ], pPap->HasSprm( aVer8Ids[ i ] )))<<i; // Version 9 BRCs if present will override version 8 for( int i = 0; i < 5; ++i ) - nBorder |= int(_SetWW8_BRC( 9 , brc[ i ], pPap->HasSprm( aVer9Ids[ i ] )))<<i; + nBorder |= int(SetWW8_BRC( 9 , brc[ i ], pPap->HasSprm( aVer9Ids[ i ] )))<<i; } } else if( pSty ) @@ -1305,15 +1305,15 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc, WW8PLCFx_Cp_FKP* if (bVer67) { for( int i = 0; i < 5; ++i ) - nBorder |= int(_SetWW8_BRC( 6 , brc[ i ], pSty->HasParaSprm( aVer67Ids[ i ] )))<<i; + nBorder |= int(SetWW8_BRC( 6 , brc[ i ], pSty->HasParaSprm( aVer67Ids[ i ] )))<<i; } else { for( int i = 0; i < 5; ++i ) - nBorder |= int(_SetWW8_BRC( 8 , brc[ i ], pSty->HasParaSprm( aVer8Ids[ i ] )))<<i; + nBorder |= int(SetWW8_BRC( 8 , brc[ i ], pSty->HasParaSprm( aVer8Ids[ i ] )))<<i; // Version 9 BRCs if present will override version 8 for( int i = 0; i < 5; ++i ) - nBorder |= int(_SetWW8_BRC( 9 , brc[ i ], pSty->HasParaSprm( aVer9Ids[ i ] )))<<i; + nBorder |= int(SetWW8_BRC( 9 , brc[ i ], pSty->HasParaSprm( aVer9Ids[ i ] )))<<i; } } else { @@ -3107,7 +3107,7 @@ void SwWW8ImplReader::SetToggleAttr(sal_uInt8 nAttrId, bool bOn) } } -void SwWW8ImplReader::_ChkToggleAttr( sal_uInt16 nOldStyle81Mask, +void SwWW8ImplReader::ChkToggleAttr_( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask ) { sal_uInt16 i = 1, nToggleAttrFlags = m_pCtrlStck->GetToggleAttrFlags(); @@ -3123,7 +3123,7 @@ void SwWW8ImplReader::_ChkToggleAttr( sal_uInt16 nOldStyle81Mask, } } -void SwWW8ImplReader::_ChkToggleBiDiAttr( sal_uInt16 nOldStyle81Mask, +void SwWW8ImplReader::ChkToggleBiDiAttr_( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask ) { sal_uInt16 i = 1, nToggleAttrFlags = m_pCtrlStck->GetToggleBiDiAttrFlags(); @@ -4836,7 +4836,7 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, sh WW8_BRCVer9 aBrc; int nBrcVer = (nId == NS_sprm::LN_CBrc) ? 9 : (m_bVer67 ? 6 : 8); - _SetWW8_BRC(nBrcVer, aBrc, pData); + SetWW8_BRC(nBrcVer, aBrc, pData); // Border style is none -> no border, no shadow if( editeng::ConvertBorderStyleFromWord(aBrc.brcType()) != table::BorderLineStyle::NONE ) diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 0f5392f39b0c..6967c98860a6 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -69,7 +69,7 @@ SwXMLWriter::~SwXMLWriter() { } -sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& xStatusIndicator, +sal_uInt32 SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xStatusIndicator, const OUString& aDocHierarchicalName ) { // Get service factory @@ -433,7 +433,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& sal_uLong SwXMLWriter::WriteStorage() { - return _Write( uno::Reference < task::XStatusIndicator >(), OUString() ); + return Write_( uno::Reference < task::XStatusIndicator >(), OUString() ); } sal_uLong SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium ) @@ -449,7 +449,7 @@ sal_uLong SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium ) if ( pDocHierarchItem ) aName = pDocHierarchItem->GetValue(); - return _Write( xStatusIndicator, aName ); + return Write_( xStatusIndicator, aName ); } sal_uLong SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed, diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index a9a45bcfec15..6d2719f7decf 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { class SwXMLWriter : public StgWriter { - sal_uInt32 _Write( const css::uno::Reference < css::task::XStatusIndicator>&, const OUString& ); + sal_uInt32 Write_( const css::uno::Reference < css::task::XStatusIndicator>&, const OUString& ); using StgWriter::Write; diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index cf4413f0910f..58656627fa26 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -94,7 +94,7 @@ SwXMLExport::SwXMLExport( bSavedShowChanges( false ), doc( nullptr ) { - _InitItemExport(); + InitItemExport(); } void SwXMLExport::setBlockMode() @@ -330,7 +330,7 @@ XMLShapeExport* SwXMLExport::CreateShapeExport() SwXMLExport::~SwXMLExport() { DeleteTableLines(); - _FinitItemExport(); + FinitItemExport(); } void SwXMLExport::ExportFontDecls_() diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index baed84b5a28b..b1bd141b27d0 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -61,8 +61,8 @@ class SwXMLExport : public SvXMLExport SwDoc* doc; // cached for getDoc() - void _InitItemExport(); - void _FinitItemExport(); + void InitItemExport(); + void FinitItemExport(); void ExportTableLinesAutoStyles( const SwTableLines& rLines, sal_uInt32 nAbsWidth, sal_uInt32 nBaseWidth, diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 748021074ee2..12c1e246b4d5 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -414,7 +414,7 @@ SwXMLImport::SwXMLImport( m_bPreserveRedlineMode( true ), m_pDoc( nullptr ) { - _InitItemImport(); + InitItemImport(); } @@ -423,7 +423,7 @@ SwXMLImport::~SwXMLImport() throw () delete m_pDocElemTokenMap; delete m_pTableElemTokenMap; delete m_pTableCellAttrTokenMap; - _FinitItemImport(); + FinitItemImport(); } void SwXMLImport::setTextInsertMode( diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index c64af05879d5..1f5cf7e41218 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -84,8 +84,8 @@ class SwXMLImport: public SvXMLImport SwDoc* m_pDoc; // cached for getDoc() - void _InitItemImport(); - void _FinitItemImport(); + void InitItemImport(); + void FinitItemImport(); void UpdateTextCollConditions( SwDoc *pDoc ); void setTextInsertMode( diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 538e720388cb..b3b9c34196ab 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -214,7 +214,7 @@ inline void SwXMLTableItemMapper_Impl::SetAbsWidth( sal_uInt32 nAbs ) nAbsWidth = nAbs; } -void SwXMLExport::_InitItemExport() +void SwXMLExport::InitItemExport() { pTwipUnitConv = new SvXMLUnitConverter(getComponentContext(), util::MeasureUnit::TWIP, GetMM100UnitConverter().GetXMLMeasureUnit()); @@ -226,7 +226,7 @@ void SwXMLExport::_InitItemExport() pTableItemMapper = new SwXMLTableItemMapper_Impl( xTableItemMap, *this ); } -void SwXMLExport::_FinitItemExport() +void SwXMLExport::FinitItemExport() { delete pTableItemMapper; delete pTwipUnitConv; diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 20a5dc8a03d0..9160dd24ad1a 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -327,7 +327,7 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext( return pContext; } -void SwXMLImport::_InitItemImport() +void SwXMLImport::InitItemImport() { m_pTwipUnitConv = new SvXMLUnitConverter( GetComponentContext(), util::MeasureUnit::TWIP, util::MeasureUnit::TWIP ); @@ -340,7 +340,7 @@ void SwXMLImport::_InitItemImport() m_pTableItemMapper = new SwXMLImportTableItemMapper_Impl( m_xTableItemMap ); } -void SwXMLImport::_FinitItemImport() +void SwXMLImport::FinitItemImport() { delete m_pTableItemMapper; delete m_pTwipUnitConv; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 130422ac674a..59631382f96c 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -414,7 +414,7 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(&xMyTable); } bool HasContent() const { return bHasTextContent || bHasTableContent; } - inline void _InsertContent(); + inline void InsertContent_(); inline void InsertContent(); inline void InsertContentIfNotThere(); inline void InsertContent( SwXMLTableContext *pTable ); @@ -574,7 +574,7 @@ SwXMLTableCellContext_Impl::~SwXMLTableCellContext_Impl() { } -inline void SwXMLTableCellContext_Impl::_InsertContent() +inline void SwXMLTableCellContext_Impl::InsertContent_() { SwStartNode const*const pStartNode( GetTable()->InsertTableSection(nullptr, (m_bHasStringValue && m_bValueTypeIsString && @@ -590,7 +590,7 @@ inline void SwXMLTableCellContext_Impl::InsertContent() { OSL_ENSURE( !HasContent(), "content already there" ); bHasTextContent = true; - _InsertContent(); + InsertContent_(); } inline void SwXMLTableCellContext_Impl::InsertContentIfNotThere() @@ -701,7 +701,7 @@ void SwXMLTableCellContext_Impl::EndElement() while( nColRepeat > 1 && GetTable()->IsInsertCellPossible() ) { - _InsertContent(); + InsertContent_(); Reference<XUnoTunnel> xDstCursorTunnel( GetImport().GetTextImport()->GetCursor(), UNO_QUERY); @@ -724,7 +724,7 @@ void SwXMLTableCellContext_Impl::EndElement() { while( nColRepeat > 1 && GetTable()->IsInsertCellPossible() ) { - _InsertContent(); + InsertContent_(); nColRepeat--; } } @@ -2373,7 +2373,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, return pLine; } -void SwXMLTableContext::_MakeTable( SwTableBox *pBox ) +void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) { // fix column widths std::vector<ColumnWidthInfo>::iterator colIter; @@ -2724,7 +2724,7 @@ void SwXMLTableContext::MakeTable() { if( pSize->GetWidthPercent() ) { - // The width will be set in _MakeTable + // The width will be set in MakeTable_ nPrcWidth = pSize->GetWidthPercent(); } else @@ -2768,12 +2768,12 @@ void SwXMLTableContext::MakeTable() m_pLineFormat = static_cast<SwTableLineFormat*>(pLine1->GetFrameFormat()); m_pBoxFormat = static_cast<SwTableBoxFormat*>(m_pBox1->GetFrameFormat()); - _MakeTable(); + MakeTable_(); if( bSetHoriOrient ) pFrameFormat->SetFormatAttr( SwFormatHoriOrient( 0, eHoriOrient ) ); - // This must be after the call to _MakeTable, because nWidth might be + // This must be after the call to MakeTable_, because nWidth might be // changed there. pFrameFormat->LockModify(); SwFormatFrameSize aSize( ATT_VAR_SIZE, m_nWidth ); @@ -2820,7 +2820,7 @@ void SwXMLTableContext::MakeTable( SwTableBox *pBox, sal_Int32 nW ) m_nWidth = nW; m_bRelWidth = GetParentTable()->m_bRelWidth; - _MakeTable( pBox ); + MakeTable_( pBox ); for (size_t i = 0; i < m_pRows->size(); ++i) { diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 41f5d9e643ca..9acb2fde0833 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -103,7 +103,7 @@ class SwXMLTableContext : public XMLTextTableContext sal_uInt32 nTopRow, sal_uInt32 nLeftCol, sal_uInt32 nBottomRow, sal_uInt32 nRightCol ); - void _MakeTable( SwTableBox *pBox=nullptr ); + void MakeTable_( SwTableBox *pBox=nullptr ); void MakeTable( SwTableBox *pBox, sal_Int32 nWidth ); void MakeTable(); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 9a1a94086dc7..31fc121f6ebd 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -75,17 +75,17 @@ class SwDropCapsPict : public Control sal_uInt16 mnDistance; VclPtr<Printer> mpPrinter; bool mbDelPrinter; - /// The _ScriptInfo structure holds information on where we change from one + /// The ScriptInfo structure holds information on where we change from one /// script to another. - struct _ScriptInfo + struct ScriptInfo { sal_uLong textWidth; ///< Physical width of this segment. sal_uInt16 scriptType; ///< Script type (e.g. Latin, Asian, Complex) sal_Int32 changePos; ///< Character position where the script changes. - _ScriptInfo(sal_uLong txtWidth, sal_uInt16 scrptType, sal_Int32 position) + ScriptInfo(sal_uLong txtWidth, sal_uInt16 scrptType, sal_Int32 position) : textWidth(txtWidth), scriptType(scrptType), changePos(position) {} }; - std::vector<_ScriptInfo> maScriptChanges; + std::vector<ScriptInfo> maScriptChanges; SvxFont maFont; SvxFont maCJKFont; SvxFont maCTLFont; @@ -96,7 +96,7 @@ class SwDropCapsPict : public Control void CheckScript(); Size CalcTextSize(); inline void InitPrinter(); - void _InitPrinter(); + void InitPrinter_(); static void GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _rFont, sal_uInt16 _nWhich ); void GetFirstScriptSegment(sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType); bool GetNextScriptSegment(size_t &nIdx, sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType); @@ -176,7 +176,7 @@ void SwDropCapsPict::SetValues( const OUString& rText, sal_uInt8 nLines, sal_uIn void SwDropCapsPict::InitPrinter() { if( !mpPrinter ) - _InitPrinter(); + InitPrinter_(); } // Create Default-String from character-count (A, AB, ABC, ...) @@ -446,7 +446,7 @@ void SwDropCapsPict::CheckScript() for(;;) { nChg = xBreak->endOfScript( maText, nChg, nScript ); - maScriptChanges.push_back( _ScriptInfo(0, nScript, nChg) ); + maScriptChanges.push_back( ScriptInfo(0, nScript, nChg) ); if( nChg >= maText.getLength() || nChg < 0 ) break; nScript = xBreak->getScriptType( maText, nChg ); @@ -516,7 +516,7 @@ Size SwDropCapsPict::CalcTextSize() return aTextSize; } -void SwDropCapsPict::_InitPrinter() +void SwDropCapsPict::InitPrinter_() { SfxViewShell* pSh = SfxViewShell::Current(); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 9280d67e368e..ec3db5868a60 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -65,7 +65,7 @@ void SwLabRec::FillItem( SwLabItem& rItem ) const rItem.m_nRows = nRows; } -void SwLabDlg::_ReplaceGroup( const OUString &rMake ) +void SwLabDlg::ReplaceGroup_( const OUString &rMake ) { // Remove old entries m_pRecs->erase(m_pRecs->begin() + 1, m_pRecs->end()); @@ -160,7 +160,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, } if ( !aMakes.empty() ) - _ReplaceGroup( aMakes[nLstGroup] ); + ReplaceGroup_( aMakes[nLstGroup] ); if (m_pExampleSet) m_pExampleSet->Put(aItem); diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index b9b0fa67471c..903cba9f332d 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -175,7 +175,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, uno::Reference< text::XTextFieldsSupplier > xFields(xModel, uno::UNO_QUERY); uno::Reference< container::XNameAccess > xFieldMasters = xFields->getTextFieldMasters(); - static const struct _SwLabItemMap { + static const struct SwLabItemMap { const char* pName; OUString SwLabItem:: *pValue; } aArr[] = { @@ -216,7 +216,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, try { - for( const _SwLabItemMap* p = aArr; p->pName; ++p ) + for( const SwLabItemMap* p = aArr; p->pName; ++p ) { OUString uFieldName( "com.sun.star.text.FieldMaster.User." diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index df326f0166b1..670c50eee336 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -897,7 +897,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* ) else if (REFFLDFLAG_FOOTNOTE == nTypeId) // footnotes { SwSeqFieldList aArr; - _SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 ); + SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 ); size_t nPos = 0; @@ -918,7 +918,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* ) else if (REFFLDFLAG_ENDNOTE == nTypeId) // endnotes { SwSeqFieldList aArr; - _SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 ); + SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 ); size_t nPos = 0; @@ -987,7 +987,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* ) if( pType ) { SwSeqFieldList aArr; - _SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 ); + SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 ); size_t nPos = 0; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 4d06a158b1c4..1944ca989be5 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2163,7 +2163,7 @@ void SwFramePage::Init(const SfxItemSet& rSet, bool bReset) // disable width and height for math objects const SvGlobalName& rFactNm( pSh->GetOLEObject()->getClassID() ); - struct _GlobalNameId { + struct GlobalNameId { sal_uInt32 n1; sal_uInt16 n2, n3; sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15; @@ -2171,7 +2171,7 @@ void SwFramePage::Init(const SfxItemSet& rSet, bool bReset) { SO3_SM_CLASSID_40 }, { SO3_SM_CLASSID_30 } }; for ( int i = 0; i < 4; ++i ) { - const _GlobalNameId& rId = aGlbNmIds[ i ]; + const GlobalNameId& rId = aGlbNmIds[ i ]; SvGlobalName aGlbNm( rId.n1, rId.n2, rId.n3, rId.b8, rId.b9, rId.b10, rId.b11, diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 4609298b7258..df833c066b8f 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -105,7 +105,7 @@ IMPL_LINK_NOARG_TYPED(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame& SwXTextDocument* pDoc = reinterpret_cast<SwXTextDocument*>(xDocTunnel->getSomething(SwXTextDocument::getUnoTunnelId())); if( pDoc ) - pDoc->GetDocShell()->_LoadStyles( *rSh.GetView().GetDocShell(), true ); + pDoc->GetDocShell()->LoadStyles_( *rSh.GetView().GetDocShell(), true ); uno::Reference< lang::XMultiServiceFactory > xFact( xModel, uno::UNO_QUERY); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index ee2ff2812f40..d6adf602324f 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -87,13 +87,13 @@ static bool lcl_GetSelTable( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) if( !pTableNd ) return false; - _FndBox aFndBox( nullptr, nullptr ); + FndBox_ aFndBox( nullptr, nullptr ); // look for all boxes / lines { SwSelBoxes aSelBoxes; ::GetTableSel( rSh, aSelBoxes ); - _FndPara aPara( aSelBoxes, &aFndBox ); + FndPara aPara( aSelBoxes, &aFndBox ); const SwTable& rTable = pTableNd->GetTable(); ForEach_FndLineCopyCol( (SwTableLines&)rTable.GetTabLines(), &aPara ); } diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index eaa068809910..6922ccee9867 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -149,9 +149,9 @@ void SAL_CALL SwVbaApplication::setEnableCancelKey( sal_Int32/* _enableCancelKey // seems not supported in Writer } -float SAL_CALL SwVbaApplication::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaApplication::CentimetersToPoints( float Centimeters ) throw (uno::RuntimeException, std::exception) { - return VbaApplicationBase::CentimetersToPoints( _Centimeters ); + return VbaApplicationBase::CentimetersToPoints( Centimeters ); } uno::Reference< frame::XModel > diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index afbdea1a714f..16b9b40b0c3f 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -55,7 +55,7 @@ public: virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL CentimetersToPoints( float Centimeters ) throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index bb2859f7d259..d60115d42564 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -125,9 +125,9 @@ SwVbaGlobals::getSelection() throw (uno::RuntimeException, std::exception) return getApplication()->getSelection(); } -float SAL_CALL SwVbaGlobals::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaGlobals::CentimetersToPoints( float Centimeters ) throw (uno::RuntimeException, std::exception) { - return getApplication()->CentimetersToPoints( _Centimeters ); + return getApplication()->CentimetersToPoints( Centimeters ); } OUString diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 95abcf3d570a..47a029e6c4b3 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -57,7 +57,7 @@ public: virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL CentimetersToPoints( float Centimeters ) throw (css::uno::RuntimeException, std::exception) override; // XMultiServiceFactory virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index e46823f6e92b..db70a137a086 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -1258,7 +1258,7 @@ std::set<Color> SwDocShell::GetDocColors() void SwDocShell::LoadStyles( SfxObjectShell& rSource ) { - _LoadStyles(rSource, false); + LoadStyles_(rSource, false); } // bPreserveCurrentDocument determines whether SetFixFields() is called @@ -1266,7 +1266,7 @@ void SwDocShell::LoadStyles( SfxObjectShell& rSource ) // is a document the user is working on. // Calls of ::LoadStyles() normally use files especially loaded for the purpose // of importing styles. -void SwDocShell::_LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocument ) +void SwDocShell::LoadStyles_( SfxObjectShell& rSource, bool bPreserveCurrentDocument ) { /* [Description] diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index 6fcda50c66d9..803c2b8cc376 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -123,9 +123,9 @@ SwDLL::SwDLL() SAL_INFO( "sw.ui", "Init Core/UI/Filter" ); // Initialisation of Statics - ::_InitCore(); + ::InitCore(); filters_.reset(new sw::Filters); - ::_InitUI(); + ::InitUI(); pModule->InitAttrPool(); // now SWModule can create its Pool @@ -154,7 +154,7 @@ SwDLL::~SwDLL() { if (!utl::ConfigManager::IsAvoidConfig()) { - // fdo#86494 SwAutoCorrect must be deleted before _FinitCore + // fdo#86494 SwAutoCorrect must be deleted before FinitCore SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get(); rACfg.SetAutoCorrect(nullptr); // delete SwAutoCorrect before exit handlers } @@ -162,9 +162,9 @@ SwDLL::~SwDLL() // Pool has to be deleted before statics are SW_MOD()->RemoveAttrPool(); - ::_FinitUI(); + ::FinitUI(); filters_.reset(); - ::_FinitCore(); + ::FinitCore(); // sign out Objekt-Factory SdrObjFactory::RemoveMakeObjectHdl(LINK(&aSwObjectFactory, SwObjectFactory, MakeObject )); #if 0 diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index 4c5f874a34a6..01805bca5bd1 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -117,7 +117,7 @@ SwNumRulesWithName::SwNumRulesWithName( const SwNumRule &rCopy, { const SwNumFormat* pFormat = rCopy.GetNumFormat( n ); if( pFormat ) - aFormats[ n ] = new _SwNumFormatGlobal( *pFormat ); + aFormats[ n ] = new SwNumFormatGlobal( *pFormat ); else aFormats[ n ] = nullptr; } @@ -149,9 +149,9 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName { delete aFormats[ n ]; - _SwNumFormatGlobal* pFormat = rCopy.aFormats[ n ]; + SwNumFormatGlobal* pFormat = rCopy.aFormats[ n ]; if( pFormat ) - aFormats[ n ] = new _SwNumFormatGlobal( *pFormat ); + aFormats[ n ] = new SwNumFormatGlobal( *pFormat ); else aFormats[ n ] = nullptr; } @@ -166,7 +166,7 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const rChg.SetAutoRule( false ); for( sal_uInt16 n = 0; n < MAXLEVEL; ++n ) { - _SwNumFormatGlobal* pFormat = aFormats[ n ]; + SwNumFormatGlobal* pFormat = aFormats[ n ]; if( nullptr != pFormat) { SwNumFormat aNew; @@ -187,13 +187,13 @@ void SwNumRulesWithName::SetNumFormat( size_t const nIndex, SwNumFormat const& rNumFormat, OUString const& rName) { delete aFormats[nIndex]; - aFormats[nIndex] = new _SwNumFormatGlobal(rNumFormat); + aFormats[nIndex] = new SwNumFormatGlobal(rNumFormat); aFormats[nIndex]->sCharFormatName = rName; aFormats[nIndex]->nCharPoolId = USHRT_MAX; aFormats[nIndex]->m_Items.clear(); } -SwNumRulesWithName::_SwNumFormatGlobal::_SwNumFormatGlobal( const SwNumFormat& rFormat ) +SwNumRulesWithName::SwNumFormatGlobal::SwNumFormatGlobal( const SwNumFormat& rFormat ) : aFormat( rFormat ), nCharPoolId( USHRT_MAX ) { // relative gaps????? @@ -220,7 +220,7 @@ SwNumRulesWithName::_SwNumFormatGlobal::_SwNumFormatGlobal( const SwNumFormat& r } } -SwNumRulesWithName::_SwNumFormatGlobal::_SwNumFormatGlobal( const _SwNumFormatGlobal& rFormat ) +SwNumRulesWithName::SwNumFormatGlobal::SwNumFormatGlobal( const SwNumFormatGlobal& rFormat ) : aFormat( rFormat.aFormat ), sCharFormatName( rFormat.sCharFormatName ), @@ -232,11 +232,11 @@ SwNumRulesWithName::_SwNumFormatGlobal::_SwNumFormatGlobal( const _SwNumFormatGl } } -SwNumRulesWithName::_SwNumFormatGlobal::~_SwNumFormatGlobal() +SwNumRulesWithName::SwNumFormatGlobal::~SwNumFormatGlobal() { } -void SwNumRulesWithName::_SwNumFormatGlobal::ChgNumFormat( SwWrtShell& rSh, +void SwNumRulesWithName::SwNumFormatGlobal::ChgNumFormat( SwWrtShell& rSh, SwNumFormat& rNew ) const { SwCharFormat* pFormat = nullptr; diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index d664004075d4..8242f70d956a 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -1322,7 +1322,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, switch( nFormat ) { case SotClipboardFormatId::DRAWING: - bRet = SwTransferable::_PasteSdrFormat( rData, rSh, + bRet = SwTransferable::PasteSdrFormat( rData, rSh, SwPasteSdr::Insert, pPt, nActionFlags, bNeedToSelectBeforePaste); break; @@ -1332,7 +1332,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case SotClipboardFormatId::HTML_NO_COMMENT: case SotClipboardFormatId::RTF: case SotClipboardFormatId::STRING: - bRet = SwTransferable::_PasteFileContent( rData, rSh, + bRet = SwTransferable::PasteFileContent( rData, rSh, nFormat, bMsg ); break; @@ -1349,19 +1349,19 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, break; case SotClipboardFormatId::SD_OLE: - bRet = SwTransferable::_PasteOLE( rData, rSh, nFormat, + bRet = SwTransferable::PasteOLE( rData, rSh, nFormat, nActionFlags, bMsg ); break; case SotClipboardFormatId::SVIM: - bRet = SwTransferable::_PasteImageMap( rData, rSh ); + bRet = SwTransferable::PasteImageMap( rData, rSh ); break; case SotClipboardFormatId::SVXB: case SotClipboardFormatId::BITMAP: case SotClipboardFormatId::PNG: case SotClipboardFormatId::GDIMETAFILE: - bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, + bRet = SwTransferable::PasteGrf( rData, rSh, nFormat, SwPasteSdr::Insert,pPt, nActionFlags, nDropAction, bNeedToSelectBeforePaste); break; @@ -1370,13 +1370,13 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case SotClipboardFormatId::SBA_FIELDDATAEXCHANGE: case SotClipboardFormatId::SBA_DATAEXCHANGE: case SotClipboardFormatId::SBA_CTRLDATAEXCHANGE: - bRet = SwTransferable::_PasteDBData( rData, rSh, nFormat, + bRet = SwTransferable::PasteDBData( rData, rSh, nFormat, EXCHG_IN_ACTION_LINK == nClearedAction, pPt, bMsg ); break; case SotClipboardFormatId::SIMPLE_FILE: - bRet = SwTransferable::_PasteFileName( rData, rSh, nFormat, + bRet = SwTransferable::PasteFileName( rData, rSh, nFormat, ( EXCHG_IN_ACTION_MOVE == nClearedAction ? SwPasteSdr::Replace : EXCHG_IN_ACTION_LINK == nClearedAction @@ -1387,7 +1387,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case SotClipboardFormatId::FILE_LIST: // then insert as graphics only - bRet = SwTransferable::_PasteFileList( rData, rSh, + bRet = SwTransferable::PasteFileList( rData, rSh, EXCHG_IN_ACTION_LINK == nClearedAction, pPt, bMsg ); break; @@ -1415,7 +1415,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case SotClipboardFormatId::INET_IMAGE: case SotClipboardFormatId::NETSCAPE_IMAGE: - bRet = SwTransferable::_PasteTargetURL( rData, rSh, + bRet = SwTransferable::PasteTargetURL( rData, rSh, SwPasteSdr::Insert, pPt, true ); break; @@ -1428,7 +1428,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case EXCHG_OUT_ACTION_INSERT_FILE: { bool graphicInserted; - bRet = SwTransferable::_PasteFileName( rData, rSh, nFormat, + bRet = SwTransferable::PasteFileName( rData, rSh, nFormat, SwPasteSdr::Insert, pPt, nActionFlags, bMsg, &graphicInserted ); @@ -1438,14 +1438,14 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, break; case EXCHG_OUT_ACTION_INSERT_OLE: - bRet = SwTransferable::_PasteOLE( rData, rSh, nFormat, + bRet = SwTransferable::PasteOLE( rData, rSh, nFormat, nActionFlags,bMsg ); break; case EXCHG_OUT_ACTION_INSERT_DDE: { bool bReRead = 0 != CNT_HasGrf( rSh.GetCntType() ); - bRet = SwTransferable::_PasteDDE( rData, rSh, bReRead, bMsg ); + bRet = SwTransferable::PasteDDE( rData, rSh, bReRead, bMsg ); } break; @@ -1456,7 +1456,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, { if( rData.GetString( nFormat, sURL ) && !sURL.isEmpty() ) { - SwTransferable::_CheckForURLOrLNKFile( rData, sURL, &sDesc ); + SwTransferable::CheckForURLOrLNKFile( rData, sURL, &sDesc ); if( sDesc.isEmpty() ) sDesc = sURL; bRet = true; @@ -1485,7 +1485,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, switch( nFormat ) { case SotClipboardFormatId::DRAWING: - bRet = SwTransferable::_PasteSdrFormat( rData, rSh, + bRet = SwTransferable::PasteSdrFormat( rData, rSh, SwPasteSdr::SetAttr, pPt, nActionFlags, bNeedToSelectBeforePaste); break; @@ -1497,7 +1497,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case SotClipboardFormatId::SIMPLE_FILE: case SotClipboardFormatId::FILEGRPDESCRIPTOR: case SotClipboardFormatId::UNIFORMRESOURCELOCATOR: - bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, + bRet = SwTransferable::PasteGrf( rData, rSh, nFormat, SwPasteSdr::SetAttr, pPt, nActionFlags, nDropAction, bNeedToSelectBeforePaste); break; @@ -1508,7 +1508,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, break; case EXCHG_OUT_ACTION_INSERT_DRAWOBJ: - bRet = SwTransferable::_PasteSdrFormat( rData, rSh, + bRet = SwTransferable::PasteSdrFormat( rData, rSh, SwPasteSdr::Insert, pPt, nActionFlags, bNeedToSelectBeforePaste); break; @@ -1516,13 +1516,13 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case EXCHG_OUT_ACTION_INSERT_GDIMETAFILE: case EXCHG_OUT_ACTION_INSERT_BITMAP: case EXCHG_OUT_ACTION_INSERT_GRAPH: - bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, + bRet = SwTransferable::PasteGrf( rData, rSh, nFormat, SwPasteSdr::Insert, pPt, nActionFlags, nDropAction, bNeedToSelectBeforePaste, nAnchorType ); break; case EXCHG_OUT_ACTION_REPLACE_DRAWOBJ: - bRet = SwTransferable::_PasteSdrFormat( rData, rSh, + bRet = SwTransferable::PasteSdrFormat( rData, rSh, SwPasteSdr::Replace, pPt, nActionFlags, bNeedToSelectBeforePaste); break; @@ -1531,13 +1531,13 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case EXCHG_OUT_ACTION_REPLACE_GDIMETAFILE: case EXCHG_OUT_ACTION_REPLACE_BITMAP: case EXCHG_OUT_ACTION_REPLACE_GRAPH: - bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, + bRet = SwTransferable::PasteGrf( rData, rSh, nFormat, SwPasteSdr::Replace,pPt, nActionFlags, nDropAction, bNeedToSelectBeforePaste); break; case EXCHG_OUT_ACTION_INSERT_INTERACTIVE: - bRet = SwTransferable::_PasteAsHyperlink( rData, rSh, nFormat ); + bRet = SwTransferable::PasteAsHyperlink( rData, rSh, nFormat ); break; default: @@ -1612,7 +1612,7 @@ SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh ) return nRet; } -bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData, +bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg ) { sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR; @@ -1711,7 +1711,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData, return bRet; } -bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, +bool SwTransferable::PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg ) { bool bRet = false; @@ -1923,7 +1923,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, if( bRet && ( nActionFlags & ( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) )) - SwTransferable::_PasteTargetURL( rData, rSh, SwPasteSdr::NONE, nullptr, false ); + SwTransferable::PasteTargetURL( rData, rSh, SwPasteSdr::NONE, nullptr, false ); // let the object be unloaded if possible SwOLEObj::UnloadObject( xObj, rSh.GetDoc(), embed::Aspects::MSOLE_CONTENT ); @@ -1932,7 +1932,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, return bRet; } -bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData, +bool SwTransferable::PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh, SwPasteSdr nAction, const Point* pPt, bool bInsertGRF ) { @@ -1946,7 +1946,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData, if( !aINetImg.GetImageURL().isEmpty() && bInsertGRF ) { OUString sURL( aINetImg.GetImageURL() ); - SwTransferable::_CheckForURLOrLNKFile( rData, sURL ); + SwTransferable::CheckForURLOrLNKFile( rData, sURL ); //!!! check at FileSystem - only then it make sense to test graphics !!! Graphic aGraphic; @@ -2049,7 +2049,7 @@ void SwTransferable::SetSelInShell( SwWrtShell& rSh, bool bSelectFrame, } } -bool SwTransferable::_PasteDDE( TransferableDataHelper& rData, +bool SwTransferable::PasteDDE( TransferableDataHelper& rData, SwWrtShell& rWrtShell, bool bReReadGrf, bool bMsg ) { @@ -2216,7 +2216,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData, return true; } -bool SwTransferable::_PasteSdrFormat( TransferableDataHelper& rData, +bool SwTransferable::PasteSdrFormat( TransferableDataHelper& rData, SwWrtShell& rSh, SwPasteSdr nAction, const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste) { @@ -2238,12 +2238,12 @@ bool SwTransferable::_PasteSdrFormat( TransferableDataHelper& rData, if( bRet && ( nActionFlags & ( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) )) - SwTransferable::_PasteTargetURL( rData, rSh, SwPasteSdr::NONE, nullptr, false ); + SwTransferable::PasteTargetURL( rData, rSh, SwPasteSdr::NONE, nullptr, false ); } return bRet; } -bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, +bool SwTransferable::PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, SwPasteSdr nAction, const Point* pPt, sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste, sal_uInt16 nAnchorType ) { @@ -2292,7 +2292,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, if( ( bRet = rData.GetString( nFormat, sText ) ) ) { OUString sDesc; - SwTransferable::_CheckForURLOrLNKFile( rData, sText, &sDesc ); + SwTransferable::CheckForURLOrLNKFile( rData, sText, &sDesc ); aBkmk = INetBookmark( URIHelper::SmartRel2Abs(INetURLObject(), sText, Link<OUString *, bool>(), false ), @@ -2425,11 +2425,11 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, if( nActionFlags & (( EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_REPLACE_IMAGEMAP ) >> 8) ) - SwTransferable::_PasteImageMap( rData, rSh ); + SwTransferable::PasteImageMap( rData, rSh ); if( nActionFlags & ( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) ) - SwTransferable::_PasteTargetURL( rData, rSh, SwPasteSdr::NONE, nullptr, false ); + SwTransferable::PasteTargetURL( rData, rSh, SwPasteSdr::NONE, nullptr, false ); } else if( bCheckForImageMap ) { @@ -2457,7 +2457,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, return bRet; } -bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData, +bool SwTransferable::PasteImageMap( TransferableDataHelper& rData, SwWrtShell& rSh ) { bool bRet = false; @@ -2482,7 +2482,7 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData, return bRet; } -bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData, +bool SwTransferable::PasteAsHyperlink( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat ) { bool bRet = false; @@ -2490,7 +2490,7 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData, if( rData.GetString( nFormat, sFile ) && !sFile.isEmpty() ) { OUString sDesc; - SwTransferable::_CheckForURLOrLNKFile( rData, sFile, &sDesc ); + SwTransferable::CheckForURLOrLNKFile( rData, sFile, &sDesc ); // first, make the URL absolute INetURLObject aURL; @@ -2526,13 +2526,13 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData, return bRet; } -bool SwTransferable::_PasteFileName( TransferableDataHelper& rData, +bool SwTransferable::PasteFileName( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, SwPasteSdr nAction, const Point* pPt, sal_uInt8 nActionFlags, bool /* bMsg */, bool * graphicInserted) { - bool bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, nAction, + bool bRet = SwTransferable::PasteGrf( rData, rSh, nFormat, nAction, pPt, nActionFlags, 0, false); if (graphicInserted != nullptr) { *graphicInserted = bRet; @@ -2562,7 +2562,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData, #endif else { - bool bIsURLFile = SwTransferable::_CheckForURLOrLNKFile( rData, sFile, &sDesc ); + bool bIsURLFile = SwTransferable::CheckForURLOrLNKFile( rData, sFile, &sDesc ); //Own FileFormat? --> insert, not for StarWriter/Web OUString sFileURL = URIHelper::SmartRel2Abs(INetURLObject(), sFile, Link<OUString *, bool>(), false ); @@ -2623,7 +2623,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData, return bRet; } -bool SwTransferable::_PasteDBData( TransferableDataHelper& rData, +bool SwTransferable::PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bLink, const Point* pDragPt, bool bMsg ) { @@ -2719,7 +2719,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData, return bRet; } -bool SwTransferable::_PasteFileList( TransferableDataHelper& rData, +bool SwTransferable::PasteFileList( TransferableDataHelper& rData, SwWrtShell& rSh, bool bLink, const Point* pPt, bool bMsg ) { @@ -2737,7 +2737,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData, pHlp->CopyString( SotClipboardFormatId::SIMPLE_FILE, aFileList.GetFile( n )); TransferableDataHelper aData( pHlp ); - if( SwTransferable::_PasteFileName( aData, rSh, SotClipboardFormatId::SIMPLE_FILE, nAct, + if( SwTransferable::PasteFileName( aData, rSh, SotClipboardFormatId::SIMPLE_FILE, nAct, pPt, 0, bMsg, nullptr )) { if( bLink ) @@ -2758,7 +2758,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData, return bRet; } -bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData, +bool SwTransferable::CheckForURLOrLNKFile( TransferableDataHelper& rData, OUString& rFileName, OUString* pTitle ) { bool bIsURLFile = false; @@ -2836,7 +2836,7 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh, return bRet; } -bool SwTransferable::_TestAllowedFormat( const TransferableDataHelper& rData, +bool SwTransferable::TestAllowedFormat( const TransferableDataHelper& rData, SotClipboardFormatId nFormat, SotExchangeDest nDestination ) { sal_uInt16 nAction = EXCHG_INOUT_ACTION_NONE, nEventAction; @@ -2928,17 +2928,17 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat SotClipboardFormatId::OBJECTDESCRIPTOR, aDesc ); } - if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::EMBED_SOURCE, nDest )) + if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::EMBED_SOURCE, nDest )) pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, aEmptyOUStr ); - if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::LINK_SOURCE, nDest )) + if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::LINK_SOURCE, nDest )) pDlg->Insert( SotClipboardFormatId::LINK_SOURCE, aEmptyOUStr ); } - if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::LINK, nDest )) + if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::LINK, nDest )) pDlg->Insert( SotClipboardFormatId::LINK, SW_RES(STR_DDEFORMAT) ); for( SotClipboardFormatId* pIds = aPasteSpecialIds; *pIds != SotClipboardFormatId::NONE; ++pIds ) - if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest )) + if( SwTransferable::TestAllowedFormat( rData, *pIds, nDest )) pDlg->Insert( *pIds, aEmptyOUStr ); SotClipboardFormatId nFormat = pDlg->GetFormat( rData.GetTransferable() ); @@ -2984,10 +2984,10 @@ void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh, SotClipboardFormatId::OBJECTDESCRIPTOR, aDesc); } - if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::EMBED_SOURCE, nDest )) + if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::EMBED_SOURCE, nDest )) rToFill.AddClipbrdFormat( SotClipboardFormatId::EMBED_SOURCE, aDesc.maTypeName ); - if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::LINK_SOURCE, nDest )) + if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::LINK_SOURCE, nDest )) rToFill.AddClipbrdFormat( SotClipboardFormatId::LINK_SOURCE ); SotClipboardFormatId nFormat; @@ -2999,11 +2999,11 @@ void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh, } } - if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::LINK, nDest )) + if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::LINK, nDest )) rToFill.AddClipbrdFormat( SotClipboardFormatId::LINK, SW_RESSTR(STR_DDEFORMAT) ); for( SotClipboardFormatId* pIds = aPasteSpecialIds; *pIds != SotClipboardFormatId::NONE; ++pIds ) - if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest )) + if( SwTransferable::TestAllowedFormat( rData, *pIds, nDest )) rToFill.AddClipbrdFormat( *pIds, aEmptyOUStr ); } diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index d323058fccff..eaa30c6554c3 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5889,12 +5889,12 @@ IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputTimerHandler, Timer *, void) m_bTableInsDelMode = false; } -void SwEditWin::_InitStaticData() +void SwEditWin::InitStaticData() { m_pQuickHlpData = new QuickHelpData(); } -void SwEditWin::_FinitStaticData() +void SwEditWin::FinitStaticData() { delete m_pQuickHlpData; } diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx index dee11c51efc0..a664362e0abe 100644 --- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx +++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx @@ -73,12 +73,12 @@ namespace { } }; - typedef ::std::map < FrameKey, SidebarWinContainer, FrameOrder > _FrameSidebarWinContainer; + typedef ::std::map < FrameKey, SidebarWinContainer, FrameOrder > FrameSidebarWinContainer_; } namespace sw { namespace sidebarwindows { -class FrameSidebarWinContainer : public _FrameSidebarWinContainer +class FrameSidebarWinContainer : public FrameSidebarWinContainer_ { }; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 5d0571f4b054..4e239ca49222 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -1547,7 +1547,7 @@ sal_uInt16 SwFieldMgr::GetCurrLanguage() const return SvtSysLocale().GetLanguageTag().getLanguageType(); } -void SwFieldType::_GetFieldName() +void SwFieldType::GetFieldName_() { static const sal_uInt16 coFieldNms[] = { FLD_DATE_STD, diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx index ba0c9add56c1..bb7bad68a414 100644 --- a/sw/source/uibase/frmdlg/frmmgr.cxx +++ b/sw/source/uibase/frmdlg/frmmgr.cxx @@ -112,7 +112,7 @@ void SwFlyFrameAttrMgr::UpdateAttrMgr() ::PrepareBoxInfo( m_aSet, *m_pOwnSh ); } -void SwFlyFrameAttrMgr::_UpdateFlyFrame() +void SwFlyFrameAttrMgr::UpdateFlyFrame_() { const SfxPoolItem* pItem = nullptr; @@ -153,7 +153,7 @@ void SwFlyFrameAttrMgr::UpdateFlyFrame() { m_pOwnSh->StartAllAction(); m_pOwnSh->SetFlyFrameAttr( m_aSet ); - _UpdateFlyFrame(); + UpdateFlyFrame_(); m_pOwnSh->EndAllAction(); } } @@ -169,7 +169,7 @@ void SwFlyFrameAttrMgr::InsertFlyFrame() // turn on the right mode at the shell, frame got selected automatically. if ( bRet ) { - _UpdateFlyFrame(); + UpdateFlyFrame_(); m_pOwnSh->EnterSelFrameMode(); FrameNotify(m_pOwnSh, FLY_DRAG_START); } diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx index d24a57b5568d..4332be182da8 100644 --- a/sw/source/uibase/inc/basesh.hxx +++ b/sw/source/uibase/inc/basesh.hxx @@ -110,7 +110,7 @@ public: void ExecField(SfxRequest& rReq); static void SetFrameMode( FlyMode eMode, SwWrtShell *pShell ); // with update! - static void _SetFrameMode( FlyMode eMode ) { eFrameMode = eMode; } + static void SetFrameMode_( FlyMode eMode ) { eFrameMode = eMode; } static FlyMode GetFrameMode() { return eFrameMode; } }; diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 936bbbe301a8..0e2860a9ec6b 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -266,8 +266,8 @@ public: static inline long GetDDStartPosX() { return m_nDDStartPosX; } static inline long GetDDStartPosY() { return m_nDDStartPosY; } - static void _InitStaticData(); - static void _FinitStaticData(); + static void InitStaticData(); + static void FinitStaticData(); //#i3370# remove quick help to prevent saving of autocorrection suggestions void StopQuickHelp(); diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx index 676449fe4c77..6e4a27a00620 100644 --- a/sw/source/uibase/inc/frmmgr.hxx +++ b/sw/source/uibase/inc/frmmgr.hxx @@ -65,7 +65,7 @@ class SW_DLLPUBLIC SwFlyFrameAttrMgr SAL_DLLPRIVATE SwTwips CalcLeftSpace(); SAL_DLLPRIVATE SwTwips CalcRightSpace(); - SAL_DLLPRIVATE void _UpdateFlyFrame(); // post-treatment after insert or update + SAL_DLLPRIVATE void UpdateFlyFrame_(); // post-treatment after insert or update public: SwFlyFrameAttrMgr( bool bNew, SwWrtShell* pSh, Frmmgr_Type nType ); diff --git a/sw/source/uibase/inc/initui.hxx b/sw/source/uibase/inc/initui.hxx index b98220511877..70bcb6a4e60d 100644 --- a/sw/source/uibase/inc/initui.hxx +++ b/sw/source/uibase/inc/initui.hxx @@ -56,8 +56,8 @@ class SwGlossaryList; bool HasGlossaryList(); SwGlossaryList* GetGlossaryList(); -extern void _InitUI(); -extern void _FinitUI(); +extern void InitUI(); +extern void FinitUI(); #endif diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index 193b8c89a077..e99c0c775d3f 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -48,7 +48,7 @@ class SwLabDlg : public SfxTabDialog sal_uInt16 m_nCardsId; sal_uInt16 m_nBusinessId; sal_uInt16 m_nPrivateId; - void _ReplaceGroup( const OUString &rMake ); + void ReplaceGroup_( const OUString &rMake ); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: @@ -72,7 +72,7 @@ public: Printer *GetPrt(); inline void ReplaceGroup( const OUString &rMake ); - void UpdateGroup( const OUString &rMake ) {_ReplaceGroup( rMake );} + void UpdateGroup( const OUString &rMake ) {ReplaceGroup_( rMake );} static void UpdateFieldInformation(css::uno::Reference< css::frame::XModel>& xModel, const SwLabItem& rItem); const OUString& GetBusinessCardStr() const {return m_sBusinessCardDlg;} @@ -84,7 +84,7 @@ public: inline void SwLabDlg::ReplaceGroup( const OUString &rMake ) { if ( rMake != aLstGroup ) - _ReplaceGroup( rMake ); + ReplaceGroup_( rMake ); } #endif diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 83f3aad737f7..1424ff91c2b4 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -93,9 +93,9 @@ class SwNavigationPI : public vcl::Window, bool m_bPageCtrlsVisible : 1; bool m_bGlobalMode : 1; - bool _IsZoomedIn() const {return m_bIsZoomedIn;} - void _ZoomOut(); - void _ZoomIn(); + bool IsZoomedIn() const {return m_bIsZoomedIn;} + void ZoomOut(); + void ZoomIn(); void FillBox(); void MakeMark(); diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 8c541e9beda6..f7e61f210169 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -193,7 +193,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE void Init(); SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; - SAL_DLLPRIVATE void _CreateScrollbar( bool bHori); + SAL_DLLPRIVATE void CreateScrollbar( bool bHori); DECL_DLLPRIVATE_LINK_TYPED(ScrollHdl, ScrollBar*, void); DECL_DLLPRIVATE_LINK_TYPED(EndScrollHdl, ScrollBar*, void); SAL_DLLPRIVATE bool ChgPage( int eMvMode, bool bUpdateScrollbar = true ); @@ -214,7 +214,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell @param _pReq optional input parameter - pointer to the <SfxRequest> instance, if existing. */ - SAL_DLLPRIVATE void _ExecPgUpAndPgDown( const bool _bPgUp, + SAL_DLLPRIVATE void ExecPgUpAndPgDown( const bool _bPgUp, SfxRequest* _pReq = nullptr ); protected: diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index 804311f52570..35887c5f3d92 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -83,44 +83,44 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper // helper methods for the paste static SwTransferable* GetSwTransferable( const TransferableDataHelper& rData ); static void SetSelInShell( SwWrtShell& , bool , const Point* ); - static bool _CheckForURLOrLNKFile( TransferableDataHelper& rData, + static bool CheckForURLOrLNKFile( TransferableDataHelper& rData, OUString& rFileName, OUString* pTitle = nullptr ); - static bool _TestAllowedFormat( const TransferableDataHelper& rData, + static bool TestAllowedFormat( const TransferableDataHelper& rData, SotClipboardFormatId nFormat, SotExchangeDest nDestination ); - static bool _PasteFileContent( TransferableDataHelper&, + static bool PasteFileContent( TransferableDataHelper&, SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg ); - static bool _PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, + static bool PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg ); - static bool _PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh, + static bool PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh, SwPasteSdr nAction, const Point* pPt, bool bInsertGRF ); - static bool _PasteDDE( TransferableDataHelper& rData, SwWrtShell& rWrtShell, + static bool PasteDDE( TransferableDataHelper& rData, SwWrtShell& rWrtShell, bool bReReadGrf, bool bMsg ); - static bool _PasteSdrFormat( TransferableDataHelper& rData, + static bool PasteSdrFormat( TransferableDataHelper& rData, SwWrtShell& rSh, SwPasteSdr nAction, const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste); - static bool _PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, + static bool PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, SwPasteSdr nAction, const Point* pPt, sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste, sal_uInt16 nAnchorType = 0 ); - static bool _PasteImageMap( TransferableDataHelper& rData, + static bool PasteImageMap( TransferableDataHelper& rData, SwWrtShell& rSh ); - static bool _PasteAsHyperlink( TransferableDataHelper& rData, + static bool PasteAsHyperlink( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat ); - static bool _PasteFileName( TransferableDataHelper& rData, + static bool PasteFileName( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, SwPasteSdr nAction, const Point* pPt, sal_uInt8 nActionFlags, bool bMsg, bool * graphicInserted ); - static bool _PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh, + static bool PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bLink, const Point* pDragPt, bool bMsg ); - static bool _PasteFileList( TransferableDataHelper& rData, + static bool PasteFileList( TransferableDataHelper& rData, SwWrtShell& rSh, bool bLink, const Point* pPt, bool bMsg ); diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index 6276d8094159..4439e54c3636 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwNumRulesWithName OUString maName; // the NumRule's formats _have_ to be independent of a document // (They should always be there!) - class SAL_DLLPRIVATE _SwNumFormatGlobal + class SAL_DLLPRIVATE SwNumFormatGlobal { friend class SwNumRulesWithName; SwNumFormat aFormat; @@ -46,17 +46,17 @@ class SW_DLLPUBLIC SwNumRulesWithName sal_uInt16 nCharPoolId; std::vector<std::unique_ptr<SfxPoolItem>> m_Items; - _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) = delete; + SwNumFormatGlobal& operator=( const SwNumFormatGlobal& ) = delete; public: - _SwNumFormatGlobal( const SwNumFormat& rFormat ); - _SwNumFormatGlobal( const _SwNumFormatGlobal& ); - ~_SwNumFormatGlobal(); + SwNumFormatGlobal( const SwNumFormat& rFormat ); + SwNumFormatGlobal( const SwNumFormatGlobal& ); + ~SwNumFormatGlobal(); void ChgNumFormat( SwWrtShell& rSh, SwNumFormat& rChg ) const; }; - _SwNumFormatGlobal* aFormats[ MAXLEVEL ]; + SwNumFormatGlobal* aFormats[ MAXLEVEL ]; protected: friend class sw::StoredChapterNumberingRules; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 63de844cf9f5..5a36e7e963b3 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -193,8 +193,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); sal_uInt16 nCount, bool bBasicCall, bool bVisual = false ); bool Up ( bool bSelect, bool bBasicCall = false ); bool Down ( bool bSelect, bool bBasicCall = false ); - void NxtWrd ( bool bSelect = false ) { SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); } - bool PrvWrd ( bool bSelect = false ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); } + void NxtWrd ( bool bSelect = false ) { SimpleMove( &SwWrtShell::NxtWrd_, bSelect ); } + bool PrvWrd ( bool bSelect = false ) { return SimpleMove( &SwWrtShell::PrvWrd_, bSelect ); } bool LeftMargin ( bool bSelect, bool bBasicCall ); bool RightMargin( bool bSelect, bool bBasicCall ); @@ -211,13 +211,13 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool SttPara ( bool bSelect = false ); void EndPara ( bool bSelect = false ); bool FwdPara () - { return SimpleMove( &SwWrtShell::_FwdPara, false/*bSelect*/ ); } + { return SimpleMove( &SwWrtShell::FwdPara_, false/*bSelect*/ ); } void BwdPara () - { SimpleMove( &SwWrtShell::_BwdPara, false/*bSelect*/ ); } + { SimpleMove( &SwWrtShell::BwdPara_, false/*bSelect*/ ); } void FwdSentence( bool bSelect = false ) - { SimpleMove( &SwWrtShell::_FwdSentence, bSelect ); } + { SimpleMove( &SwWrtShell::FwdSentence_, bSelect ); } void BwdSentence( bool bSelect = false ) - { SimpleMove( &SwWrtShell::_BwdSentence, bSelect ); } + { SimpleMove( &SwWrtShell::BwdSentence_, bSelect ); } // #i20126# Enhanced table selection bool SelectTableRowCol( const Point& rPt, const Point* pEnd = nullptr, bool bRowDrag = false ); @@ -530,17 +530,17 @@ private: SAL_DLLPRIVATE bool PopCursor(bool bUpdate, bool bSelect = false); // take END cursor along when PageUp / -Down - SAL_DLLPRIVATE bool _SttWrd(); - SAL_DLLPRIVATE bool _EndWrd(); - SAL_DLLPRIVATE bool _NxtWrd(); - SAL_DLLPRIVATE bool _PrvWrd(); + SAL_DLLPRIVATE bool SttWrd(); + SAL_DLLPRIVATE bool EndWrd(); + SAL_DLLPRIVATE bool NxtWrd_(); + SAL_DLLPRIVATE bool PrvWrd_(); // #i92468# - SAL_DLLPRIVATE bool _NxtWrdForDelete(); - SAL_DLLPRIVATE bool _PrvWrdForDelete(); - SAL_DLLPRIVATE bool _FwdSentence(); - SAL_DLLPRIVATE bool _BwdSentence(); - bool _FwdPara(); - SAL_DLLPRIVATE bool _BwdPara(); + SAL_DLLPRIVATE bool NxtWrdForDelete(); + SAL_DLLPRIVATE bool PrvWrdForDelete(); + SAL_DLLPRIVATE bool FwdSentence_(); + SAL_DLLPRIVATE bool BwdSentence_(); + bool FwdPara_(); + SAL_DLLPRIVATE bool BwdPara_(); // selections bool m_bIns :1; @@ -560,7 +560,7 @@ private: Link<SwWrtShell&,void> m_aSelTableLink; // resets the cursor stack after movement by PageUp/-Down - SAL_DLLPRIVATE void _ResetCursorStack(); + SAL_DLLPRIVATE void ResetCursorStack_(); using SwCursorShell::SetCursor; SAL_DLLPRIVATE long SetCursor(const Point *, bool bProp=false ); @@ -603,7 +603,7 @@ private: inline void SwWrtShell::ResetCursorStack() { if ( HasCursorStack() ) - _ResetCursorStack(); + ResetCursorStack_(); } inline void SwWrtShell::SelTableCells(const Link<SwWrtShell&,void> &rLink ) diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 20fff299cf5e..3b48f81cc222 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -612,7 +612,7 @@ void SwPagePreviewWin::DataChanged( const DataChangedEvent& rDCEvt ) @author OD */ -void SwPagePreview::_ExecPgUpAndPgDown( const bool _bPgUp, +void SwPagePreview::ExecPgUpAndPgDown( const bool _bPgUp, SfxRequest* _pReq ) { SwPagePreviewLayout* pPagePreviewLay = GetViewShell()->PagePreviewLayout(); @@ -876,7 +876,7 @@ void SwPagePreview::Execute( SfxRequest &rReq ) case FN_PAGEUP: case FN_PAGEDOWN: { - _ExecPgUpAndPgDown( rReq.GetSlot() == FN_PAGEUP, &rReq ); + ExecPgUpAndPgDown( rReq.GetSlot() == FN_PAGEUP, &rReq ); break; } case SID_JUMP_TO_SPECIFIC_PAGE: @@ -1192,8 +1192,8 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): SetName("PageView"); SetWindow( pViewWin ); SetHelpId(SW_PAGEPREVIEW); - _CreateScrollbar( true ); - _CreateScrollbar( false ); + CreateScrollbar( true ); + CreateScrollbar( false ); SfxObjectShell* pObjShell = pViewFrame->GetObjectShell(); if ( !pOldSh ) @@ -1270,7 +1270,7 @@ SwDocShell* SwPagePreview::GetDocShell() return dynamic_cast<SwDocShell*>( GetViewFrame()->GetObjectShell() ); } -void SwPagePreview::_CreateScrollbar( bool bHori ) +void SwPagePreview::CreateScrollbar( bool bHori ) { vcl::Window *pMDI = &GetViewFrame()->GetWindow(); VclPtr<SwScrollbar>& ppScrollbar = bHori ? pHScrollbar : pVScrollbar; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 624a13934810..f59e70ac8b43 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -471,10 +471,10 @@ IMPL_LINK_NOARG_TYPED(SwView, AttrChangedNotify, SwCursorShell*, void) //Opt: Not if PaintLocked. During unlock a notify will be once more triggered. if( !m_pWrtShell->IsPaintLocked() && !g_bNoInterrupt && GetDocShell()->IsReadOnly() ) - _CheckReadonlyState(); + CheckReadonlyState(); if( !m_pWrtShell->IsPaintLocked() && !g_bNoInterrupt ) - _CheckReadonlySelection(); + CheckReadonlySelection(); if( !m_bAttrChgNotified ) { @@ -523,8 +523,8 @@ IMPL_LINK_NOARG_TYPED(SwView, TimeoutHdl, Timer *, void) m_bAttrChgNotifiedWithRegistrations = false; } - _CheckReadonlyState(); - _CheckReadonlySelection(); + CheckReadonlyState(); + CheckReadonlySelection(); bool bOldUndo = m_pWrtShell->DoesUndo(); m_pWrtShell->DoUndo( false ); @@ -534,7 +534,7 @@ IMPL_LINK_NOARG_TYPED(SwView, TimeoutHdl, Timer *, void) GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged(); } -void SwView::_CheckReadonlyState() +void SwView::CheckReadonlyState() { SfxDispatcher &rDis = GetDispatcher(); // To be able to recognize if it is already disabled! @@ -622,7 +622,7 @@ void SwView::_CheckReadonlyState() GetViewFrame()->GetBindings().InvalidateAll(true); } -void SwView::_CheckReadonlySelection() +void SwView::CheckReadonlySelection() { sal_uInt32 nDisableFlags = 0; SfxDispatcher &rDis = GetDispatcher(); @@ -734,8 +734,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) m_bShowAtResize = m_bDrawSelMode = bDocSzUpdated = true; - _CreateScrollbar( true ); - _CreateScrollbar( false ); + CreateScrollbar( true ); + CreateScrollbar( false ); m_pViewImpl = new SwView_Impl(this); SetName("View"); diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 0de348f988dd..efb3bee30b5f 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1467,7 +1467,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) case SID_ATTR_SIZE: { if( !rShell.IsFrameSelected() && !rShell.IsObjSelected() ) - SwBaseShell::_SetFrameMode( FLY_DRAG_END ); + SwBaseShell::SetFrameMode_( FLY_DRAG_END ); else { FlyMode eFrameMode = SwBaseShell::GetFrameMode(); diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 973f987c2b00..30094b7edd2c 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -660,7 +660,7 @@ bool SwView::ExecSpellPopup(const Point& rPt) &rPt, &aPoint, false); if (pContentFrame) { - SwRect aRepaint(static_cast<SwTextFrame*>(pContentFrame)->_AutoSpell(nullptr, 0)); + SwRect aRepaint(static_cast<SwTextFrame*>(pContentFrame)->AutoSpell_(nullptr, 0)); if (aRepaint.HasArea()) m_pWrtShell->InvalidateWindows(aRepaint); } diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index d7b652425263..18023fd3e1df 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -62,13 +62,13 @@ using namespace ::com::sun::star::frame; void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, bool bViewOnly ) { bool const bCursorIsVisible(m_pWrtShell->IsCursorVisible()); - _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly ); + SetZoom_( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly ); // fdo#40465 force the cursor to stay in view whilst zooming if (bCursorIsVisible) m_pWrtShell->ShowCursor(); } -void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, +void SwView::SetZoom_( const Size &rEditSize, SvxZoomType eZoomType, short nFactor, bool bViewOnly ) { bool bUnLockView = !m_pWrtShell->IsViewLocked(); @@ -280,7 +280,7 @@ IMPL_LINK_TYPED( SwView, WindowChildEventListener, VclWindowEvent&, rEvent, void } } -void SwView::_CreateScrollbar( bool bHori ) +void SwView::CreateScrollbar( bool bHori ) { vcl::Window *pMDI = &GetViewFrame()->GetWindow(); VclPtr<SwScrollbar>& ppScrollbar = bHori ? m_pHScrollbar : m_pVScrollbar; diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index b33e775961e1..9b7af74a4804 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -1117,7 +1117,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) pDocSh->SfxInPlaceObject::GetVisArea() );*/ if ( m_pWrtShell->GetViewOptions()->GetZoomType() != SvxZoomType::PERCENT && !m_pWrtShell->GetViewOptions()->getBrowseMode() ) - _SetZoom( aEditSz, (SvxZoomType)m_pWrtShell->GetViewOptions()->GetZoomType(), 100, true ); + SetZoom_( aEditSz, (SvxZoomType)m_pWrtShell->GetViewOptions()->GetZoomType(), 100, true ); m_pWrtShell->EndAction(); bRepeat = bScroll1 != m_pVScrollbar->IsVisible(true); diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 5b5a7e4aca97..da3dffb4537a 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -458,7 +458,7 @@ uno::Reference< awt::XControl > SwXTextView::getControl(const uno::Reference< a return xRet; } -uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormController( const uno::Reference< form::XForm >& _Form ) throw (RuntimeException, std::exception) +uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormController( const uno::Reference< form::XForm >& Form ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -470,7 +470,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormCo uno::Reference< form::runtime::XFormController > xController; if ( pFormShell && pDrawView && pWindow ) - xController = FmFormShell::GetFormController( _Form, *pDrawView, *pWindow ); + xController = FmFormShell::GetFormController( Form, *pDrawView, *pWindow ); return xController; } @@ -482,13 +482,13 @@ sal_Bool SAL_CALL SwXTextView::isFormDesignMode( ) throw (uno::RuntimeException return !pFormShell || pFormShell->IsDesignMode(); } -void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool _DesignMode ) throw (RuntimeException, std::exception) +void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool DesignMode ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; SwView* pView2 = GetView(); FmFormShell* pFormShell = pView2 ? pView2->GetFormShell() : nullptr; if ( pFormShell ) - pFormShell->SetDesignMode( _DesignMode ); + pFormShell->SetDesignMode( DesignMode ); } uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor() throw( uno::RuntimeException, std::exception ) diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx index e6fa0642ccd2..cd2880950653 100644 --- a/sw/source/uibase/utlui/initui.cxx +++ b/sw/source/uibase/utlui/initui.cxx @@ -146,12 +146,12 @@ std::vector<OUString>* pAuthFieldTypeList = nullptr; // Finish UI -void _FinitUI() +void FinitUI() { delete SwViewShell::GetShellRes(); SwViewShell::SetShellRes( nullptr ); - SwEditWin::_FinitStaticData(); + SwEditWin::FinitStaticData(); DELETEZ(pGlossaries); @@ -166,11 +166,11 @@ void _FinitUI() // Initialise -void _InitUI() +void InitUI() { // ShellResource gives the CORE the possibility to work with resources. SwViewShell::SetShellRes( new ShellResource ); - SwEditWin::_InitStaticData(); + SwEditWin::InitStaticData(); } ShellResource::ShellResource() @@ -275,7 +275,7 @@ struct ImpAutoFormatNameListLoader : public Resource explicit ImpAutoFormatNameListLoader( std::vector<OUString>& rLst ); }; -void ShellResource::_GetAutoFormatNameLst() const +void ShellResource::GetAutoFormatNameLst_() const { assert(!pAutoFormatNameLst); pAutoFormatNameLst = new std::vector<OUString>; diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 29fc8735e818..5c70544e3121 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -242,13 +242,13 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void ) case FN_SELECT_CONTENT: if(m_pContextWin!=nullptr && m_pContextWin->GetFloatingWindow()!=nullptr) { - if(_IsZoomedIn() ) + if(IsZoomedIn() ) { - _ZoomOut(); + ZoomOut(); } else { - _ZoomIn(); + ZoomIn(); } } return; @@ -528,16 +528,16 @@ void SwNavigationPI::MakeMark() void SwNavigationPI::GotoPage() { if (m_pContextWin && m_pContextWin->GetFloatingWindow() && m_pContextWin->GetFloatingWindow()->IsRollUp()) - _ZoomIn(); + ZoomIn(); if(IsGlobalMode()) ToggleTree(); UsePage(); GetPageEdit().GrabFocus(); } -void SwNavigationPI::_ZoomOut() +void SwNavigationPI::ZoomOut() { - if (_IsZoomedIn()) + if (IsZoomedIn()) { FloatingWindow* pFloat = m_pContextWin!=nullptr ? m_pContextWin->GetFloatingWindow() : nullptr; m_bIsZoomedIn = false; @@ -566,13 +566,13 @@ void SwNavigationPI::_ZoomOut() } } -void SwNavigationPI::_ZoomIn() +void SwNavigationPI::ZoomIn() { if (m_pContextWin != nullptr) { FloatingWindow* pFloat = m_pContextWin->GetFloatingWindow(); if (pFloat && - (!_IsZoomedIn() || ( m_pContextWin->GetFloatingWindow()->IsRollUp()))) + (!IsZoomedIn() || ( m_pContextWin->GetFloatingWindow()->IsRollUp()))) { m_aContentTree->HideTree(); m_aDocListBox->Hide(); @@ -599,7 +599,7 @@ void SwNavigationPI::_ZoomIn() void SwNavigationPI::Resize() { vcl::Window* pParent = GetParent(); - if( !_IsZoomedIn() ) + if( !IsZoomedIn() ) { Size aNewSize (pParent->GetOutputSizePixel()); @@ -613,7 +613,7 @@ void SwNavigationPI::Resize() { aNewSize = pFloat->GetOutputSizePixel(); aMinOutSizePixel.Width() = m_nWishWidth; - aMinOutSizePixel.Height() = _IsZoomedIn() ? m_nZoomIn : m_nZoomOutInit; + aMinOutSizePixel.Height() = IsZoomedIn() ? m_nZoomIn : m_nZoomOutInit; } else { @@ -1224,8 +1224,8 @@ bool SwNavigationPI::ToggleTree() if(!IsGlobalMode() && bGlobalDoc) { SetUpdateMode(false); - if(_IsZoomedIn()) - _ZoomOut(); + if(IsZoomedIn()) + ZoomOut(); m_aGlobalTree->ShowTree(); m_aGlobalToolBox->Show(); m_aContentTree->HideTree(); @@ -1238,7 +1238,7 @@ bool SwNavigationPI::ToggleTree() { m_aGlobalTree->HideTree(); m_aGlobalToolBox->Hide(); - if(!_IsZoomedIn()) + if(!IsZoomedIn()) { m_aContentTree->ShowTree(); m_aContentToolBox->Show(); @@ -1320,7 +1320,7 @@ SwNavigationChild::SwNavigationChild( vcl::Window* pParent, if(GetFloatingWindow() && pNaviConfig->IsSmall()) { - pNavi->_ZoomIn(); + pNavi->ZoomIn(); } } diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 3375cbb2f33f..8ce3d4222ff2 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -431,7 +431,7 @@ void SwWrtShell::DelToStartOfSentence() if(IsStartOfDoc()) return; OpenMark(); - long nRet = _BwdSentence() ? Delete() : 0; + long nRet = BwdSentence_() ? Delete() : 0; CloseMark( 0 != nRet ); } @@ -463,7 +463,7 @@ long SwWrtShell::DelToEndOfSentence() } else { - nRet = _FwdSentence() ? Delete() : 0; + nRet = FwdSentence_() ? Delete() : 0; } CloseMark( 0 != nRet ); return nRet; @@ -478,11 +478,11 @@ void SwWrtShell::DelNxtWord() EnterStdMode(); SetMark(); if(IsEndWrd() && !IsStartWord()) - _NxtWrdForDelete(); // #i92468# + NxtWrdForDelete(); // #i92468# if(IsStartWord() || IsEndPara()) - _NxtWrdForDelete(); // #i92468# + NxtWrdForDelete(); // #i92468# else - _EndWrd(); + EndWrd(); long nRet = Delete(); if( nRet ) @@ -501,12 +501,12 @@ void SwWrtShell::DelPrvWord() EnterStdMode(); SetMark(); if ( !IsStartWord() || - !_PrvWrdForDelete() ) // #i92468# + !PrvWrdForDelete() ) // #i92468# { if (IsEndWrd() || IsSttPara()) - _PrvWrdForDelete(); // #i92468# + PrvWrdForDelete(); // #i92468# else - _SttWrd(); + SttWrd(); } long nRet = Delete(); if( nRet ) diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx index 02cbb152fc2a..81b9c7a2d400 100644 --- a/sw/source/uibase/wrtsh/move.cxx +++ b/sw/source/uibase/wrtsh/move.cxx @@ -499,7 +499,7 @@ bool SwWrtShell::PopCursor(bool bUpdate, bool bSelect) // positions are thrown away. else { - _ResetCursorStack(); + ResetCursorStack_(); return false; } } @@ -517,7 +517,7 @@ bool SwWrtShell::PopCursor(bool bUpdate, bool bSelect) // Reset of all pushed cursor positions; these will // not be displayed ( --> No Start-/EndAction!!) -void SwWrtShell::_ResetCursorStack() +void SwWrtShell::ResetCursorStack_() { while(m_pCursorStack) { diff --git a/sw/source/uibase/wrtsh/wrtsh4.cxx b/sw/source/uibase/wrtsh/wrtsh4.cxx index 60db3754d6a2..4b4d4783d53a 100644 --- a/sw/source/uibase/wrtsh/wrtsh4.cxx +++ b/sw/source/uibase/wrtsh/wrtsh4.cxx @@ -27,7 +27,7 @@ // non-sentence separators on sentence separator. // The begin of paragraph is also the word beginning. -bool SwWrtShell::_SttWrd() +bool SwWrtShell::SttWrd() { if ( IsSttPara() ) return true; @@ -48,7 +48,7 @@ bool SwWrtShell::_SttWrd() // punctuation marks. // The end of a paragraph is also the end of a word. -bool SwWrtShell::_EndWrd() +bool SwWrtShell::EndWrd() { if ( IsEndWrd() ) return true; @@ -64,7 +64,7 @@ bool SwWrtShell::_EndWrd() return true; } -bool SwWrtShell::_NxtWrd() +bool SwWrtShell::NxtWrd_() { bool bRet = false; while( IsEndPara() ) // If already at the end, then the next??? @@ -95,7 +95,7 @@ bool SwWrtShell::_NxtWrd() return bRet; } -bool SwWrtShell::_PrvWrd() +bool SwWrtShell::PrvWrd_() { bool bRet = false; while( IsSttPara() ) @@ -127,8 +127,8 @@ bool SwWrtShell::_PrvWrd() } // #i92468# -// method code of <SwWrtShell::_NxtWrd()> before fix for issue i72162 -bool SwWrtShell::_NxtWrdForDelete() +// method code of <SwWrtShell::NxtWrd_()> before fix for issue i72162 +bool SwWrtShell::NxtWrdForDelete() { if ( IsEndPara() ) { @@ -150,8 +150,8 @@ bool SwWrtShell::_NxtWrdForDelete() return true; } -// method code of <SwWrtShell::_PrvWrd()> before fix for issue i72162 -bool SwWrtShell::_PrvWrdForDelete() +// method code of <SwWrtShell::PrvWrd_()> before fix for issue i72162 +bool SwWrtShell::PrvWrdForDelete() { if ( IsSttPara() ) { @@ -173,7 +173,7 @@ bool SwWrtShell::_PrvWrdForDelete() return true; } -bool SwWrtShell::_FwdSentence() +bool SwWrtShell::FwdSentence_() { Push(); ClearMark(); @@ -190,7 +190,7 @@ bool SwWrtShell::_FwdSentence() return true; } -bool SwWrtShell::_BwdSentence() +bool SwWrtShell::BwdSentence_() { Push(); ClearMark(); @@ -207,7 +207,7 @@ bool SwWrtShell::_BwdSentence() return true; } -bool SwWrtShell::_FwdPara() +bool SwWrtShell::FwdPara_() { Push(); ClearMark(); @@ -218,7 +218,7 @@ bool SwWrtShell::_FwdPara() return bRet; } -bool SwWrtShell::_BwdPara() +bool SwWrtShell::BwdPara_() { Push(); ClearMark(); |