diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-05-13 14:25:00 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-05-15 19:51:07 +0200 |
| commit | 6a94e8fbcbb43512b657c5b5a5d3d6ff5bd0fe7a (patch) | |
| tree | e986885c5391ea9c35d20daf03ff44790e5eab0e | |
| parent | 599328b0a9f50f65d8ad1efea8b72ac604153c56 (diff) | |
wmf: put WMFReader constructor out of the header file
Change-Id: I8bf15c9990745759dd1414296257558adf5a42c0
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.hxx | 18 | ||||
| -rw-r--r-- | vcl/source/filter/wmf/winwmf.cxx | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index bfa7a909dad6..ede414153635 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -842,22 +842,8 @@ private: public: WMFReader(SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, - FilterConfigItem* pConfigItem = NULL, - WMF_EXTERNALHEADER* pExtHeader = NULL) - : WinMtf(new WinMtfOutput(rGDIMetaFile) , rStreamWMF, pConfigItem) - , nUnitsPerInch(96) - , nRecSize(0) - , pEMFStream(NULL) - , nEMFRecCount(0) - , nEMFRec(0) - , nEMFSize(0) - , nSkipActions(0) - , nCurrentAction(0) - , nUnicodeEscapeAction(0) - , pExternalHeader(pExtHeader) - { - } - + FilterConfigItem* pConfigItem = NULL, + WMF_EXTERNALHEADER* pExtHeader = NULL); ~WMFReader(); // read WMF file from stream and fill the GDIMetaFile diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 2f5d3aaaf0bf..d98e02489fb5 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -1600,10 +1600,24 @@ bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm ) return bRet; } +WMFReader::WMFReader(SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, + FilterConfigItem* pConfigItem, WMF_EXTERNALHEADER* pExtHeader) + : WinMtf(new WinMtfOutput(rGDIMetaFile) , rStreamWMF, pConfigItem) + , nUnitsPerInch(96) + , nRecSize(0) + , pEMFStream(NULL) + , nEMFRecCount(0) + , nEMFRec(0) + , nEMFSize(0) + , nSkipActions(0) + , nCurrentAction(0) + , nUnicodeEscapeAction(0) + , pExternalHeader(pExtHeader) +{} + WMFReader::~WMFReader() { - if( pEMFStream ) - delete pEMFStream; + delete pEMFStream; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |