[Libreoffice-commits] core.git: filter/source include/filter

[Stephan Bergmann]

 filter/source/msfilter/escherex.cxx  |   39 +++++++++++++++--------------------
 include/filter/msfilter/escherex.hxx |    9 +++++---
 2 files changed, 23 insertions(+), 25 deletions(-)

New commits:
commit b8f4b28cf6fa6c16d714179913be8c1198a11844
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 20 17:13:45 2015 +0200

    Use delegating constructor
    
    Change-Id: I793130bda833f4eb6ba5f2901adb2362ce666fe9
    Reviewed-on: https://gerrit.libreoffice.org/15829
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index d6bed05..3faaecd 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -140,35 +140,30 @@ EscherExClientAnchor_Base::~EscherExClientAnchor_Base()
 {
 }
 
-void EscherPropertyContainer::ImplInit()
-{
-    nSortCount = 0;
-    nCountCount = 0;
-    nCountSize = 0;
-    nSortBufSize = 64;
-    bHasComplexData = false;
-    pSortStruct = new EscherPropSortStruct[ nSortBufSize ];
-}
+EscherPropertyContainer::EscherPropertyContainer(
+    EscherGraphicProvider * pGraphProv, SvStream * pPiOutStrm,
+    Rectangle * pBoundRect):
+    pGraphicProvider(pGraphProv),
+    pPicOutStrm(pPiOutStrm),
+    pShapeBoundRect(pBoundRect),
+    nSortCount(0),
+    nSortBufSize(64),
+    nCountCount(0),
+    nCountSize(0),
+    pSortStruct(new EscherPropSortStruct[nSortBufSize]),
+    bHasComplexData(false)
+{}
 
 EscherPropertyContainer::EscherPropertyContainer()
-    : pGraphicProvider(NULL)
-    , pPicOutStrm(NULL)
-    , pShapeBoundRect(NULL)
-{
-    ImplInit();
-}
+    : EscherPropertyContainer(nullptr, nullptr, nullptr)
+{}
 
 EscherPropertyContainer::EscherPropertyContainer(
     EscherGraphicProvider& rGraphProv,
             SvStream* pPiOutStrm,
                 Rectangle& rBoundRect ) :
-
-    pGraphicProvider    ( &rGraphProv ),
-    pPicOutStrm         ( pPiOutStrm ),
-    pShapeBoundRect     ( &rBoundRect )
-{
-    ImplInit();
-}
+    EscherPropertyContainer(&rGraphProv, pPiOutStrm, &rBoundRect)
+{}
 
 EscherPropertyContainer::~EscherPropertyContainer()
 {
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 4e3f8d7..8c1fbbe 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -772,13 +772,13 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
     SvStream*               pPicOutStrm;
     Rectangle*              pShapeBoundRect;
 
-    EscherPropSortStruct*   pSortStruct;
-
     sal_uInt32              nSortCount;
     sal_uInt32              nSortBufSize;
     sal_uInt32              nCountCount;
     sal_uInt32              nCountSize;
 
+    EscherPropSortStruct*   pSortStruct;
+
     bool                    bHasComplexData;
 
 
@@ -789,7 +789,10 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
                     bool bCreateCroppingAttributes
                 );
     bool        ImplCreateEmbeddedBmp( const OString& rUniqueId );
-    void        ImplInit();
+
+    SAL_DLLPRIVATE explicit EscherPropertyContainer(
+        EscherGraphicProvider * pGraphProv, SvStream * pPiOutStrm,
+        Rectangle * pBoundRect);
 
 public: