summaryrefslogtreecommitdiff
path: root/include/filter
diff options
context:
space:
mode:
authorMark Page <aptitude@btconnect.com>2016-06-07 11:59:24 +0100
committerNoel Grandin <noelgrandin@gmail.com>2016-06-08 11:09:44 +0000
commit22fa9289fdc6fd8d82d754adfef39fee3fd3c52f (patch)
tree9adcbeb8394912bd45f6c346d2dac3144c621593 /include/filter
parentf595e70cfee85a423f592190c607231cb00e3180 (diff)
tdf#96099 Remove various smart pointer typedefs
Change-Id: I76843139e43ca1c158a977e24d210d5af93e4d0f Reviewed-on: https://gerrit.libreoffice.org/26014 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/filter')
-rw-r--r--include/filter/msfilter/escherex.hxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index aa4cd5497a2c..5009c8ef7b88 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1124,8 +1124,6 @@ private:
bool mbPicStrmQueried; /// True = ImplQueryPictureStream() has been called.
};
-typedef std::shared_ptr< EscherExGlobal > EscherExGlobalRef;
-
class SdrObject;
class SdrPage;
class ImplEscherExSdr;
@@ -1133,7 +1131,7 @@ class ImplEscherExSdr;
class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable
{
protected:
- EscherExGlobalRef mxGlobal;
+ std::shared_ptr<EscherExGlobal> mxGlobal;
::std::unique_ptr< ImplEscherExSdr > mpImplEscherExSdr;
SvStream* mpOutStrm;
bool mbOwnsStrm;
@@ -1156,7 +1154,7 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable
bool DoSeek( sal_uInt32 nKey );
public:
- explicit EscherEx( const EscherExGlobalRef& rxGlobal, SvStream* pOutStrm, bool bOOXML = false );
+ explicit EscherEx( const std::shared_ptr<EscherExGlobal>& rxGlobal, SvStream* pOutStrm, bool bOOXML = false );
virtual ~EscherEx();
/** Creates and returns a new shape identifier, updates the internal shape