diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2013-03-08 17:30:40 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2013-03-08 17:32:21 +0530 |
| commit | 2f3e1c77b2e2304f9a718d35f6b12daef261e2c1 (patch) | |
| tree | f564ba1c66b2f63d39c3d66441b631b64b69e0d3 /filter/inc | |
| parent | WaE: avoid mis-detection of uninitialized pixmap. (diff) | |
| download | core-2f3e1c77b2e2304f9a718d35f6b12daef261e2c1.tar.gz core-2f3e1c77b2e2304f9a718d35f6b12daef261e2c1.zip | |
n#699334: Legacy diagram import (PPTX).
Minimalistic implementation.
Had to rework on some parts because of the rebasing.
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index 8e625d474ecd..6359277f49f4 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -67,6 +67,7 @@ struct SvxMSDffShapeOrder; class SvxMSDffManager; class SfxItemSet; class SdrObject; +class SdrTextObj; struct DffObjData; class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet @@ -503,7 +504,7 @@ protected : // Fontwork objects use a new implementation of ReadObjText because the old // one does not properly import multiple paragraphs. - void ReadObjText( const OUString& rText, SdrObject* pObj ) const; + static void ReadObjText( const OUString& rText, SdrObject* pObj ); // the following method needs to be overridden for the import of OLE objects virtual sal_Bool GetOLEStorageName( long nOLEId, @@ -600,6 +601,7 @@ public: void SetSvxMSDffSettings( sal_uInt32 nSettings ) { nSvxMSDffSettings = nSettings; }; static sal_Bool MakeContentStream( SotStorage * pStor, const GDIMetaFile & ); + static void ReadObjText( SvStream& rStream, SdrObject* pObj ); static sal_Bool ConvertToOle2( SvStream& rStm, sal_uInt32 nLen, const GDIMetaFile*, |