[Libreoffice-commits] core.git: compilerplugins/clang sw/inc sw/README sw/source
Stephan Bergmann
sbergman at redhat.com
Fri Apr 22 08:08:38 UTC 2016
compilerplugins/clang/badstatics.cxx | 2
sw/README | 2
sw/inc/IDocumentDrawModelAccess.hxx | 2
sw/inc/IDocumentFieldsAccess.hxx | 6
sw/inc/SwNodeNum.hxx | 2
sw/inc/SwNumberTree.hxx | 4
sw/inc/SwStyleNameMapper.hxx | 4
sw/inc/accmap.hxx | 6
sw/inc/anchoreddrawobject.hxx | 14
sw/inc/anchoredobject.hxx | 10
sw/inc/breakit.hxx | 22 -
sw/inc/calc.hxx | 6
sw/inc/cellfml.hxx | 10
sw/inc/crsrsh.hxx | 14
sw/inc/dcontact.hxx | 12
sw/inc/ddefld.hxx | 6
sw/inc/doc.hxx | 28 -
sw/inc/docsh.hxx | 2
sw/inc/docufld.hxx | 6
sw/inc/editsh.hxx | 10
sw/inc/expfld.hxx | 20
sw/inc/fesh.hxx | 10
sw/inc/fldbas.hxx | 4
sw/inc/fmtclds.hxx | 2
sw/inc/fmtfld.hxx | 2
sw/inc/htmltbl.hxx | 2
sw/inc/init.hxx | 12
sw/inc/ndarr.hxx | 10
sw/inc/ndgrf.hxx | 4
sw/inc/ndnotxt.hxx | 2
sw/inc/ndtxt.hxx | 6
sw/inc/numrule.hxx | 2
sw/inc/pagepreviewlayout.hxx | 26 -
sw/inc/pam.hxx | 2
sw/inc/printdata.hxx | 6
sw/inc/shellio.hxx | 4
sw/inc/shellres.hxx | 4
sw/inc/swatrset.hxx | 4
sw/inc/swcrsr.hxx | 18
sw/inc/swrect.hxx | 26 -
sw/inc/swtable.hxx | 12
sw/inc/tblafmt.hxx | 2
sw/inc/tblsel.hxx | 52 +-
sw/inc/textboxhelper.hxx | 4
sw/inc/tox.hxx | 4
sw/inc/txtflcnt.hxx | 6
sw/inc/unodraw.hxx | 14
sw/inc/view.hxx | 8
sw/inc/viewsh.hxx | 2
sw/inc/viscrs.hxx | 10
sw/source/core/SwNumberTree/SwNodeNum.cxx | 8
sw/source/core/SwNumberTree/SwNumberTree.cxx | 6
sw/source/core/access/acccell.cxx | 12
sw/source/core/access/acccell.hxx | 6
sw/source/core/access/acccontext.cxx | 16
sw/source/core/access/acccontext.hxx | 6
sw/source/core/access/accdoc.cxx | 6
sw/source/core/access/accframebase.cxx | 4
sw/source/core/access/accframebase.hxx | 4
sw/source/core/access/accmap.cxx | 20
sw/source/core/access/accpage.cxx | 4
sw/source/core/access/accpage.hxx | 4
sw/source/core/access/accpara.cxx | 6
sw/source/core/access/accpara.hxx | 6
sw/source/core/access/accpreview.cxx | 2
sw/source/core/access/accpreview.hxx | 2
sw/source/core/access/acctable.cxx | 2
sw/source/core/bastyp/breakit.cxx | 10
sw/source/core/bastyp/calc.cxx | 44 +-
sw/source/core/bastyp/init.cxx | 16
sw/source/core/bastyp/swcache.cxx | 2
sw/source/core/bastyp/swrect.cxx | 28 -
sw/source/core/bastyp/swregion.cxx | 2
sw/source/core/bastyp/swtypes.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 20
sw/source/core/crsr/crstrvl.cxx | 48 +-
sw/source/core/crsr/findattr.cxx | 42 +-
sw/source/core/crsr/swcrsr.cxx | 24 -
sw/source/core/crsr/trvlfnfl.cxx | 12
sw/source/core/crsr/trvltbl.cxx | 6
sw/source/core/crsr/viscrs.cxx | 6
sw/source/core/doc/CntntIdxStore.cxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 76 +--
sw/source/core/doc/DocumentDrawModelManager.cxx | 6
sw/source/core/doc/DocumentFieldsManager.cxx | 70 +--
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 24 -
sw/source/core/doc/DocumentStylePoolManager.cxx | 4
sw/source/core/doc/doc.cxx | 20
sw/source/core/doc/docbm.cxx | 4
sw/source/core/doc/docchart.cxx | 6
sw/source/core/doc/doccomp.cxx | 8
sw/source/core/doc/doccorr.cxx | 8
sw/source/core/doc/docdesc.cxx | 4
sw/source/core/doc/docdraw.cxx | 4
sw/source/core/doc/docedt.cxx | 20
sw/source/core/doc/docfld.cxx | 54 +-
sw/source/core/doc/docfmt.cxx | 20
sw/source/core/doc/docglbl.cxx | 6
sw/source/core/doc/docglos.cxx | 4
sw/source/core/doc/doclay.cxx | 4
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/docredln.cxx | 2
sw/source/core/doc/docruby.cxx | 14
sw/source/core/doc/docsort.cxx | 48 +-
sw/source/core/doc/doctxm.cxx | 12
sw/source/core/doc/gctable.cxx | 32 -
sw/source/core/doc/htmltbl.cxx | 12
sw/source/core/doc/notxtfrm.cxx | 6
sw/source/core/doc/tblcpy.cxx | 48 +-
sw/source/core/doc/tblrwcl.cxx | 210 +++++-----
sw/source/core/doc/textboxhelper.cxx | 6
sw/source/core/docnode/ndcopy.cxx | 36 -
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 80 +--
sw/source/core/docnode/ndtbl1.cxx | 16
sw/source/core/docnode/node2lay.cxx | 4
sw/source/core/docnode/nodes.cxx | 12
sw/source/core/docnode/section.cxx | 2
sw/source/core/draw/dcontact.cxx | 40 -
sw/source/core/draw/dview.cxx | 16
sw/source/core/edit/acorrect.cxx | 18
sw/source/core/edit/autofmt.cxx | 8
sw/source/core/edit/edattr.cxx | 2
sw/source/core/edit/edglss.cxx | 6
sw/source/core/edit/editsh.cxx | 14
sw/source/core/edit/edlingu.cxx | 24 -
sw/source/core/edit/edsect.cxx | 10
sw/source/core/fields/cellfml.cxx | 30 -
sw/source/core/fields/ddefld.cxx | 2
sw/source/core/fields/docufld.cxx | 22 -
sw/source/core/fields/expfld.cxx | 8
sw/source/core/fields/fldbas.cxx | 2
sw/source/core/fields/fldlst.cxx | 6
sw/source/core/fields/reffld.cxx | 26 -
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/frmedt/feshview.cxx | 6
sw/source/core/frmedt/fetab.cxx | 30 -
sw/source/core/frmedt/fews.cxx | 6
sw/source/core/frmedt/tblsel.cxx | 82 +--
sw/source/core/graphic/ndgrf.cxx | 10
sw/source/core/inc/DocumentContentOperationsManager.hxx | 2
sw/source/core/inc/DocumentDrawModelManager.hxx | 2
sw/source/core/inc/DocumentFieldsManager.hxx | 6
sw/source/core/inc/UndoOverwrite.hxx | 4
sw/source/core/inc/UndoTable.hxx | 24 -
sw/source/core/inc/anchoredobjectposition.hxx | 40 -
sw/source/core/inc/ascharanchoredobjectposition.hxx | 2
sw/source/core/inc/cntfrm.hxx | 4
sw/source/core/inc/docfld.hxx | 36 -
sw/source/core/inc/docsort.hxx | 22 -
sw/source/core/inc/doctxm.hxx | 2
sw/source/core/inc/dview.hxx | 4
sw/source/core/inc/flowfrm.hxx | 6
sw/source/core/inc/flyfrm.hxx | 14
sw/source/core/inc/flyfrms.hxx | 4
sw/source/core/inc/fntcache.hxx | 4
sw/source/core/inc/frame.hxx | 70 +--
sw/source/core/inc/frmtool.hxx | 50 +-
sw/source/core/inc/ftnboss.hxx | 8
sw/source/core/inc/layact.hxx | 10
sw/source/core/inc/layouter.hxx | 2
sw/source/core/inc/mvsave.hxx | 36 -
sw/source/core/inc/notxtfrm.hxx | 2
sw/source/core/inc/objectformatter.hxx | 12
sw/source/core/inc/pagefrm.hxx | 2
sw/source/core/inc/rolbck.hxx | 2
sw/source/core/inc/rootfrm.hxx | 12
sw/source/core/inc/sectfrm.hxx | 16
sw/source/core/inc/swcache.hxx | 4
sw/source/core/inc/swfont.hxx | 32 -
sw/source/core/inc/tabfrm.hxx | 4
sw/source/core/inc/tblrwcl.hxx | 22 -
sw/source/core/inc/tocntntanchoredobjectposition.hxx | 2
sw/source/core/inc/txtfly.hxx | 10
sw/source/core/inc/txtfrm.hxx | 44 +-
sw/source/core/inc/viewimp.hxx | 6
sw/source/core/inc/wrong.hxx | 2
sw/source/core/layout/anchoreddrawobject.cxx | 34 -
sw/source/core/layout/anchoredobject.cxx | 12
sw/source/core/layout/calcmove.cxx | 16
sw/source/core/layout/dbg_lay.cxx | 8
sw/source/core/layout/findfrm.cxx | 28 -
sw/source/core/layout/flowfrm.cxx | 26 -
sw/source/core/layout/fly.cxx | 64 +--
sw/source/core/layout/flycnt.cxx | 8
sw/source/core/layout/flyincnt.cxx | 2
sw/source/core/layout/flylay.cxx | 2
sw/source/core/layout/frmtool.cxx | 60 +-
sw/source/core/layout/ftnfrm.cxx | 54 +-
sw/source/core/layout/hffrm.cxx | 4
sw/source/core/layout/layact.cxx | 32 -
sw/source/core/layout/laycache.cxx | 8
sw/source/core/layout/layhelp.hxx | 8
sw/source/core/layout/layouter.cxx | 6
sw/source/core/layout/newfrm.cxx | 126 +++---
sw/source/core/layout/objectformatter.cxx | 24 -
sw/source/core/layout/objectformatterlayfrm.cxx | 12
sw/source/core/layout/objectformatterlayfrm.hxx | 2
sw/source/core/layout/objectformattertxtfrm.cxx | 50 +-
sw/source/core/layout/objectformattertxtfrm.hxx | 10
sw/source/core/layout/pagechg.cxx | 22 -
sw/source/core/layout/paintfrm.cxx | 46 +-
sw/source/core/layout/sectfrm.cxx | 86 ++--
sw/source/core/layout/tabfrm.cxx | 90 ++--
sw/source/core/layout/virtoutp.cxx | 8
sw/source/core/layout/virtoutp.hxx | 6
sw/source/core/layout/wsfrm.cxx | 202 ++++-----
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 68 +--
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 6
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 44 +-
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 6
sw/source/core/sw3io/swacorr.cxx | 2
sw/source/core/table/swnewtable.cxx | 22 -
sw/source/core/table/swtable.cxx | 18
sw/source/core/text/EnhancedPDFExportHelper.cxx | 16
sw/source/core/text/frmcrsr.cxx | 18
sw/source/core/text/frmform.cxx | 44 +-
sw/source/core/text/frmpaint.cxx | 8
sw/source/core/text/inftxt.cxx | 18
sw/source/core/text/inftxt.hxx | 20
sw/source/core/text/itratr.cxx | 16
sw/source/core/text/itrcrsr.cxx | 8
sw/source/core/text/itrform2.cxx | 6
sw/source/core/text/itrform2.hxx | 2
sw/source/core/text/itrtxt.cxx | 8
sw/source/core/text/itrtxt.hxx | 4
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porfly.cxx | 2
sw/source/core/text/porlay.cxx | 2
sw/source/core/text/porlay.hxx | 6
sw/source/core/text/porlin.cxx | 2
sw/source/core/text/porlin.hxx | 4
sw/source/core/text/pormulti.cxx | 6
sw/source/core/text/pormulti.hxx | 4
sw/source/core/text/portxt.cxx | 4
sw/source/core/text/portxt.hxx | 2
sw/source/core/text/redlnitr.cxx | 14
sw/source/core/text/redlnitr.hxx | 20
sw/source/core/text/txtcache.cxx | 2
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txtfly.cxx | 20
sw/source/core/text/txtfrm.cxx | 68 +--
sw/source/core/text/txtftn.cxx | 6
sw/source/core/text/txtinit.cxx | 8
sw/source/core/text/txtpaint.cxx | 2
sw/source/core/text/txtpaint.hxx | 4
sw/source/core/text/widorp.cxx | 4
sw/source/core/text/wrong.cxx | 10
sw/source/core/txtnode/atrflyin.cxx | 10
sw/source/core/txtnode/fntcache.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 22 -
sw/source/core/txtnode/swfont.cxx | 16
sw/source/core/txtnode/txtedt.cxx | 6
sw/source/core/undo/rolbck.cxx | 10
sw/source/core/undo/undel.cxx | 28 -
sw/source/core/undo/undobj.cxx | 6
sw/source/core/undo/undraw.cxx | 2
sw/source/core/undo/unovwr.cxx | 12
sw/source/core/undo/untbl.cxx | 180 ++++----
sw/source/core/unocore/unodraw.cxx | 48 +-
sw/source/core/unocore/unoframe.cxx | 2
sw/source/core/unocore/unostyle.cxx | 8
sw/source/core/view/pagepreviewlayout.cxx | 68 +--
sw/source/core/view/printdata.cxx | 2
sw/source/core/view/viewimp.cxx | 10
sw/source/core/view/viewsh.cxx | 14
sw/source/core/view/vprint.cxx | 2
sw/source/filter/basflt/fltini.cxx | 12
sw/source/filter/html/htmlatr.cxx | 14
sw/source/filter/html/htmlcss1.cxx | 26 -
sw/source/filter/html/htmlctxt.cxx | 82 +--
sw/source/filter/html/htmldrawreader.cxx | 6
sw/source/filter/html/htmlfld.cxx | 2
sw/source/filter/html/htmlform.cxx | 8
sw/source/filter/html/htmlgrin.cxx | 8
sw/source/filter/html/htmlnumreader.cxx | 8
sw/source/filter/html/htmlsect.cxx | 14
sw/source/filter/html/htmltab.cxx | 188 ++++----
sw/source/filter/html/swhtml.cxx | 184 ++++----
sw/source/filter/html/swhtml.hxx | 150 +++----
sw/source/filter/writer/writer.cxx | 18
sw/source/filter/ww8/ww8par.hxx | 8
sw/source/filter/ww8/ww8par6.cxx | 26 -
sw/source/filter/xml/wrtxml.cxx | 6
sw/source/filter/xml/wrtxml.hxx | 2
sw/source/filter/xml/xmlexp.cxx | 4
sw/source/filter/xml/xmlexp.hxx | 4
sw/source/filter/xml/xmlimp.cxx | 4
sw/source/filter/xml/xmlimp.hxx | 4
sw/source/filter/xml/xmliteme.cxx | 4
sw/source/filter/xml/xmlitemi.cxx | 4
sw/source/filter/xml/xmltbli.cxx | 20
sw/source/filter/xml/xmltbli.hxx | 2
sw/source/ui/chrdlg/drpcps.cxx | 16
sw/source/ui/envelp/label1.cxx | 4
sw/source/ui/envelp/labelexp.cxx | 4
sw/source/ui/fldui/fldref.cxx | 6
sw/source/ui/frmdlg/frmpage.cxx | 4
sw/source/ui/index/cntex.cxx | 2
sw/source/ui/misc/srtdlg.cxx | 4
sw/source/ui/vba/vbaapplication.cxx | 4
sw/source/ui/vba/vbaapplication.hxx | 2
sw/source/ui/vba/vbaglobals.cxx | 4
sw/source/ui/vba/vbaglobals.hxx | 2
sw/source/uibase/app/docst.cxx | 4
sw/source/uibase/app/swdll.cxx | 10
sw/source/uibase/config/uinums.cxx | 18
sw/source/uibase/dochdl/swdtflvr.cxx | 102 ++--
sw/source/uibase/docvw/edtwin.cxx | 4
sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 4
sw/source/uibase/fldui/fldmgr.cxx | 2
sw/source/uibase/frmdlg/frmmgr.cxx | 6
sw/source/uibase/inc/basesh.hxx | 2
sw/source/uibase/inc/edtwin.hxx | 4
sw/source/uibase/inc/frmmgr.hxx | 2
sw/source/uibase/inc/initui.hxx | 4
sw/source/uibase/inc/label.hxx | 6
sw/source/uibase/inc/navipi.hxx | 6
sw/source/uibase/inc/pview.hxx | 4
sw/source/uibase/inc/swdtflvr.hxx | 26 -
sw/source/uibase/inc/uinums.hxx | 12
sw/source/uibase/inc/wrtsh.hxx | 36 -
sw/source/uibase/uiview/pview.cxx | 10
sw/source/uibase/uiview/view.cxx | 16
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uiview/viewling.cxx | 2
sw/source/uibase/uiview/viewmdi.cxx | 6
sw/source/uibase/uiview/viewport.cxx | 2
sw/source/uibase/uno/unotxvw.cxx | 8
sw/source/uibase/utlui/initui.cxx | 10
sw/source/uibase/utlui/navipi.cxx | 28 -
sw/source/uibase/wrtsh/delete.cxx | 16
sw/source/uibase/wrtsh/move.cxx | 4
sw/source/uibase/wrtsh/wrtsh4.cxx | 24 -
334 files changed, 2939 insertions(+), 2939 deletions(-)
New commits:
commit 85825e0fd54551735ef05b8484f71974734b9135
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 22 10:08:07 2016 +0200
Avoid reserved identifiers
Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4
diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx
index d3fc831..aa50241 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 027e4eb..dc1e02d 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 857b9cf..e4a220e 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 4eb6b10..f9b116b 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 ec1682c..f597529 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 4b9bdae..dc78b6c 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 14852be..89011ca 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 885892d..2178a72 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 7b097a2..5336f2a 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 e82d9ff..024b555 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 9145517..47615f4 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 5c76e0b..6b85dbd 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 f00f80b..4e7b591 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 2a1af0a0..89c90a9 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 e50f999..7e6a79c 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 953f0ee..7f26d2d 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 7b64365..4d84134 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 3a73b9e..0b564e0 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 32eb94b..4a0b91b 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 cf86fa0..ccc3231 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 99c9c6e..8e84d28 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 8e73562..52e7719 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 2023f8c..45b5e05 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 ab3532b..2b7fb7f 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 1db9bbb..65d6588 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 1bc85cb..fa444f9 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 8730c9d..dcbbe5c 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 f2b2d12c..39078e7 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 776cdf7..8034c09 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 97cdfb5..7affc6e 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 94c8003..14d189e 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 1d7f8b7..c9c012a 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 3060177..46ca66d 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 4e1d9f7..2b23457 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 f51bf9f..4f401fb 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 d3b7f20..4f8ba19 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 15661f6..80b9c61 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 5d6763e..af96f2d 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 742821d..a7d0782 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 c2f245d..99b6bfd 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 1430862..37d488c 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 016fdfc..f98067a 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 17ef7f4..4e50bb39 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 012869f..cce1796 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 a025b7d..e9f0765 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 b4530d6..e7177fd 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 fc79a53..5acb95c 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 ae253f9..5fcf51b 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 3df2cd8..498e963 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 701e9cd..dcf1237 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 c36ae2a..7472c05 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 6824c44..789d512 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 31296fd..bf2a6fd 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 62585a3..594dc73 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 86d34cd..b74ed70 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 cecb010..3adcbbd 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 2cb759a..bed5158 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 541ac25..0dd08e3 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 45335a4..7d1ac0c 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 fb8f434..0f1f9d2 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 47ab98b..342aac8 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 784bcc1..f9176f5 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 7a59620..825876c 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 bceb0b1..979a5a5 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 343199c..e3b922b 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 7387a2e..400a3e8 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 80b61a4..c626b09 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 3819d1b..678d5f1 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 bf03a07..cb9e985 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 d3775b1..0d4f06a 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 baf8e33..9eef25f 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 ed0a7d8..175c73b 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 551df25..bd17f8e 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 8446e63..97bbfb3 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 24f5c67..47415ca 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 d36818f..634d8bb 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 );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list