diff options
| author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2013-01-25 13:42:11 -0200 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2013-01-25 16:37:38 +0000 |
| commit | 68ae1313fa9d0b42407107bb2ad930c836519301 (patch) | |
| tree | 51b5156bf33e3e597ccc9cfea138367bfe46ddef /filter/inc | |
| parent | 0699e938fe3ba517cd32dc38b8669161bf30aa4a (diff) | |
String to OUString conversions in filter
Change-Id: I944f4d57aba935e513a3d158a46322874fe0df15
Reviewed-on: https://gerrit.libreoffice.org/1865
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index 020655ee82e5..8e625d474ecd 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -413,7 +413,7 @@ class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader protected : typedef std::map<sal_uInt32, sal_uInt32> OffsetMap; - String maBaseURL; + OUString maBaseURL; sal_uInt32 mnCurMaxShapeId; // we need this information to sal_uInt32 mnDrawingsSaved; // access the right drawing sal_uInt32 mnIdClusters; // while only knowing the shapeid @@ -503,11 +503,11 @@ protected : // Fontwork objects use a new implementation of ReadObjText because the old // one does not properly import multiple paragraphs. - void ReadObjText( const String& rText, SdrObject* pObj ) const; + void ReadObjText( const OUString& rText, SdrObject* pObj ) const; // the following method needs to be overridden for the import of OLE objects virtual sal_Bool GetOLEStorageName( long nOLEId, - String& rStorageName, + OUString& rStorageName, SotStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg ) const; @@ -521,7 +521,7 @@ protected : public: DffPropertyReader* pSecPropSet; - std::map<sal_uInt32,rtl::OString> aEscherBlipCache; + std::map<sal_uInt32,OString> aEscherBlipCache; DffRecordManager maShapeRecords; ColorData mnDefaultColor; @@ -545,7 +545,7 @@ public: DffRecordHeader* pRecHd = NULL, sal_uLong nSkipCount = 0 ) const; - static rtl::OUString MSDFFReadZString( SvStream& rIn, + static OUString MSDFFReadZString( SvStream& rIn, sal_uInt32 nMaxLen, bool bUniCode = sal_False); @@ -577,7 +577,7 @@ public: @param pStData2_ ??? */ SvxMSDffManager( SvStream& rStCtrl, - const String& rBaseURL, + const OUString& rBaseURL, sal_uInt32 nOffsDgg, SvStream* pStData, SdrModel* pSdrModel_ = 0, @@ -588,7 +588,7 @@ public: // in PPT the parameters DGGContainerOffset and PicStream are provided by an // init method - SvxMSDffManager( SvStream& rStCtrl, const String& rBaseURL ); + SvxMSDffManager( SvStream& rStCtrl, const OUString& rBaseURL ); void InitSvxMSDffManager( sal_uInt32 nOffsDgg_, SvStream* pStData_, sal_uInt32 nSvxMSDffOLEConvFlags); @@ -701,7 +701,7 @@ public: sal_uInt32 GetConvertFlags() const { return nSvxMSDffOLEConvFlags; } - static SdrOle2Obj* CreateSdrOLEFromStorage( const String& rStorageName, + static SdrOle2Obj* CreateSdrOLEFromStorage( const OUString& rStorageName, SotStorageRef& rSrcStorage, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg, const Graphic& rGraf, @@ -723,7 +723,7 @@ public: static sal_Bool SetPropValue( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, - const String& rPropertyName, + const OUString& rPropertyName, sal_Bool bTestPropertyAvailability = sal_False ); |