Misc tweaks and cleanups.

Streamlined a couple of hotspots and some
minor cleanups.

Change-Id: I85a9423e03f7e20ce78736a44d668da859a443cd
Reviewed-on: https://gerrit.libreoffice.org/19720
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

8 files changed, 33 insertions, 33 deletions

diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 31b596a9ac72..c02f0a20706c 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -214,12 +214,12 @@ class SW_DLLPUBLIC SwAnchoredObject
 
         // accessors to member <mpDrawObj>
         void SetDrawObj( SdrObject& _rDrawObj );
-        const SdrObject* GetDrawObj() const { return mpDrawObj;}
-        SdrObject* DrawObj() { return mpDrawObj;}
+        const SdrObject* GetDrawObj() const { return mpDrawObj; }
+        SdrObject* DrawObj() { return mpDrawObj; }
 
         // accessors to member <mpAnchorFrm>
-        const SwFrm* GetAnchorFrm() const { return mpAnchorFrm;}
-        SwFrm* AnchorFrm() { return mpAnchorFrm;}
+        const SwFrm* GetAnchorFrm() const { return mpAnchorFrm; }
+        SwFrm* AnchorFrm() { return mpAnchorFrm; }
         void ChgAnchorFrm( SwFrm* _pNewAnchorFrm );
         /** determine anchor frame containing the anchor position
 
@@ -232,8 +232,8 @@ class SW_DLLPUBLIC SwAnchoredObject
         */
         SwFrm* GetAnchorFrmContainingAnchPos();
 
-        SwPageFrm* GetPageFrm() { return mpPageFrm;}
-        const SwPageFrm* GetPageFrm() const { return mpPageFrm;}
+        SwPageFrm* GetPageFrm() { return mpPageFrm; }
+        const SwPageFrm* GetPageFrm() const { return mpPageFrm; }
         void SetPageFrm( SwPageFrm* _pNewPageFrm );
 
         /** method to determine the page frame, on which the 'anchor' of
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index a1150e2ca29e..cdb7df2e1fc2 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -161,9 +161,9 @@ struct SwCrsrMoveState
     int m_nInNumPostionOffset;        ///< distance from number portion's start
 
     SwCrsrMoveState( CrsrMoveState eSt = MV_NONE ) :
-        m_pFill( NULL ),
-        m_p2Lines( NULL ),
-        m_pSpecialPos( NULL ),
+        m_pFill( nullptr ),
+        m_p2Lines( nullptr ),
+        m_pSpecialPos( nullptr ),
         m_eState( eSt ),
         m_nCursorBidiLevel( 0 ),
         m_bStop( false ),
@@ -185,8 +185,8 @@ struct SwCrsrMoveState
     {}
     SwCrsrMoveState( SwFillCrsrPos *pInitFill ) :
         m_pFill( pInitFill ),
-        m_p2Lines( NULL ),
-        m_pSpecialPos( NULL ),
+        m_p2Lines( nullptr ),
+        m_pSpecialPos( nullptr ),
         m_eState( MV_SETONLYTEXT ),
         m_nCursorBidiLevel( 0 ),
         m_bStop( false ),
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 080b7d5647a2..682c950b7031 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -109,7 +109,7 @@ public:
     virtual bool        PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;
 
     static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat,
-                             double &aNumber, sal_Int32 nColumnType, SwDBField *pField = NULL );
+                             double &aNumber, sal_Int32 nColumnType, SwDBField *pField = nullptr );
 };
 
 inline  void SwDBField::SetExpansion(const OUString& rStr)
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index b74140d1a8e4..ca7fc51e3540 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -250,7 +250,7 @@ public:
     inline void     SetMergeSilent( bool bVal )     { bMergeSilent = bVal; }
 
     /// Merging of data records into fields.
-    bool            MergeNew( const SwMergeDescriptor& rMergeDesc, vcl::Window* pParent = NULL );
+    bool            MergeNew( const SwMergeDescriptor& rMergeDesc, vcl::Window* pParent = nullptr );
     static bool     Merge(SwWrtShell* pSh);
     void            MergeCancel();
 
@@ -335,7 +335,7 @@ public:
     static OUString GetDBField(
                     css::uno::Reference< css::beans::XPropertySet > xColumnProp,
                     const SwDBFormatData& rDBFormatData,
-                    double *pNumber = NULL);
+                    double *pNumber = nullptr);
 
     static css::uno::Reference< css::sdbc::XConnection>
             GetConnection(const OUString& rDataSource,
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index d72b46313a1d..46ee9e2aa953 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -920,9 +920,9 @@ public:
     size_t GetPageDescCnt() const { return m_PageDescs.size(); }
     const SwPageDesc& GetPageDesc(const size_t i) const { return *m_PageDescs[i]; }
     SwPageDesc& GetPageDesc(size_t const i) { return *m_PageDescs[i]; }
-    SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = NULL) const;
+    SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = nullptr) const;
     // Just searches the pointer in the m_PageDescs vector!
-    bool        ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos = NULL);
+    bool        ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos = nullptr);
 
     /** Copy the complete PageDesc - beyond document and "deep"!
      Optionally copying of PoolFormatId, -HlpId can be prevented. */
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index de1e9022b1ee..1469997b2b44 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -234,7 +234,7 @@ public:
     bool GetCurAttr( SfxItemSet& ,
                      const bool bMergeIndentValuesOfNumRule = false ) const;
     void SetAttrItem( const SfxPoolItem&, SetAttrMode nFlags = SetAttrMode::DEFAULT );
-    void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT, SwPaM* pCrsr = NULL );
+    void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT, SwPaM* pCrsr = nullptr );
 
     /** Get RES_CHRATR_* items of one type in the current selection.
      * @param nWhich WhichId of the collected items.
@@ -276,7 +276,7 @@ public:
     /// Query default attribute of document.
     const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
 
-    void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCrsr = NULL );
+    void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCrsr = nullptr );
     void GCAttr();
 
     /// @return the scripttpye of the selection.
@@ -525,11 +525,11 @@ public:
     void ChgNumRuleFormats( const SwNumRule& rRule );
 
     /// Set (and query if) a numbering with StartFlag starts at current PointPos.
-    void SetNumRuleStart( bool bFlag = true, SwPaM* pCrsr = NULL );
-    bool IsNumRuleStart( SwPaM* pPaM = NULL ) const;
-    void SetNodeNumStart( sal_uInt16 nStt, SwPaM* = NULL );
+    void SetNumRuleStart( bool bFlag = true, SwPaM* pCrsr = nullptr );
+    bool IsNumRuleStart( SwPaM* pPaM = nullptr ) const;
+    void SetNodeNumStart( sal_uInt16 nStt, SwPaM* = nullptr );
 
-    sal_uInt16 GetNodeNumStart( SwPaM* pPaM = NULL ) const;
+    sal_uInt16 GetNodeNumStart( SwPaM* pPaM = nullptr ) const;
 
     bool ReplaceNumRule( const OUString& rOldRule, const OUString& rNewRule );
 
@@ -793,7 +793,7 @@ public:
     void GetINetAttrs( SwGetINetAttrs& rArr );
 
     OUString GetDropText( const sal_Int32 nChars ) const;
-    void   ReplaceDropText( const OUString &rStr, SwPaM* pPaM = NULL );
+    void   ReplaceDropText( const OUString &rStr, SwPaM* pPaM = nullptr );
 
     /** May an outline be moved or copied?
      Check whether it's in text body, not in table, and not read-only (move). */
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 661c030fa58b..b589480a2312 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -330,11 +330,11 @@ public:
                         const RndStdIds _nAnchorId,
                         const sal_Int16 _eHoriRelOrient = css::text::RelOrientation::FRAME,
                         const sal_Int16 _eVertRelOrient = css::text::RelOrientation::FRAME,
-                        const SwPosition* _pToCharContentPos = NULL,
+                        const SwPosition* _pToCharContentPos = nullptr,
                         const bool _bFollowTextFlow = false,
                         bool _bMirror = false,
-                        Point* _opRef = NULL,
-                        Size* _opPercent = NULL,
+                        Point* _opRef = nullptr,
+                        Size* _opPercent = nullptr,
                         const SwFormatFrmSize* pFormatFrmSize = 0 ) const;
 
     /// Set size of draw objects.
@@ -492,7 +492,7 @@ public:
     bool GetObjAttr( SfxItemSet &rSet ) const;
     bool SetObjAttr( const SfxItemSet &rSet );
 
-    const SdrObject* GetBestObject( bool bNext, GotoObjFlags eType = GotoObjFlags::DrawAny, bool bFlat = true, const svx::ISdrObjectFilter* pFilter = NULL );
+    const SdrObject* GetBestObject( bool bNext, GotoObjFlags eType = GotoObjFlags::DrawAny, bool bFlat = true, const svx::ISdrObjectFilter* pFilter = nullptr );
     bool GotoObj( bool bNext, GotoObjFlags eType = GotoObjFlags::DrawAny);
 
     /// Set DragMode (e.g. Rotate), but do nothing when frame is selected.
@@ -664,7 +664,7 @@ public:
 
     void SetTabBorders( const SfxItemSet& rSet );
     void GetTabBorders(       SfxItemSet& rSet) const;
-    void SetTabLineStyle(const Color* pColor, bool bSetLine = false, const editeng::SvxBorderLine* pBorderLine = NULL);
+    void SetTabLineStyle(const Color* pColor, bool bSetLine = false, const editeng::SvxBorderLine* pBorderLine = nullptr);
 
     void SetTabBackground( const SvxBrushItem &rNew );
     void GetTabBackground( SvxBrushItem &rToFill ) const;
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 352c6d458318..69fa3047d407 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -74,7 +74,7 @@ public:
     /// Creates the views.
     virtual void MakeFrms();
 
-    virtual Graphic MakeGraphic( ImageMap* pMap = NULL );
+    virtual Graphic MakeGraphic( ImageMap* pMap = nullptr );
 
     /**  @return the IMapObject defined at format (Fly)
         in the ImageMap at position Point.
@@ -181,7 +181,7 @@ public:
     SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = 0,
                                       const bool bCalcFrm = false ) const;
 
-    virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) override;
+    virtual Graphic MakeGraphic( ImageMap* pMap = nullptr ) override;
 
     virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
 
@@ -244,7 +244,7 @@ protected:
     SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
                     SwFrameFormat *pDrvdFrm )
         : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
-          m_pSdrObjectCached(NULL),
+          m_pSdrObjectCached(nullptr),
 
           meLayoutDir( SwFrameFormat::HORI_L2R ),
 
@@ -256,7 +256,7 @@ protected:
     SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
                     SwFrameFormat *pDrvdFrm )
         : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
-          m_pSdrObjectCached(NULL),
+          m_pSdrObjectCached(nullptr),
           meLayoutDir( SwFrameFormat::HORI_L2R ),
 
           mnPositionLayoutDir( css::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
@@ -276,7 +276,7 @@ public:
      Reset delete marks. */
     virtual void MakeFrms() override;
 
-    virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) override;
+    virtual Graphic MakeGraphic( ImageMap* pMap = nullptr ) override;
 
     virtual SwFrameFormat::tLayoutDir GetLayoutDir() const override;
     virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir ) override;