diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-20 17:13:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-21 14:46:23 +0000 |
| commit | b8f4b28cf6fa6c16d714179913be8c1198a11844 (patch) | |
| tree | 3580bd4ca9312c2991c605a448df8aa7acec1141 /filter | |
| parent | For Clang -fsanitize=vptr use -fvisibility-ms-compat, not -fvisibility=hidden (diff) | |
| download | core-b8f4b28cf6fa6c16d714179913be8c1198a11844.tar.gz core-b8f4b28cf6fa6c16d714179913be8c1198a11844.zip | |
Use delegating constructor
Change-Id: I793130bda833f4eb6ba5f2901adb2362ce666fe9
Reviewed-on: https://gerrit.libreoffice.org/15829
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index d6bed0563a46..3faaecd7da1d 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() { |