diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-08 10:42:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-10 08:51:13 +0100 |
| commit | 460ed871fa2e9b4ff0ba1c729a49568c2f6ec6f6 (patch) | |
| tree | da90bfdf3b70585d50120f2c2b55a184b56a213c | |
| parent | 085e3605cdb5bcc852de95a14de57106ae66998e (diff) | |
ByteString->rtl::OString
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index 48a9231c9f92..9dabeb0f096d 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -574,7 +574,7 @@ public: void* pSvxMSDffDummy1; void* pSvxMSDffDummy2; void* pSvxMSDffDummy3; - std::map<sal_uInt32,ByteString> aEscherBlipCache; + std::map<sal_uInt32,rtl::OString> aEscherBlipCache; DffRecordManager maShapeRecords; ColorData mnDefaultColor; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 819f95e789f9..a7e977d12f86 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6584,7 +6584,7 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* p // check if a graphic for this blipId is already imported if ( nIdx_) { - std::map<sal_uInt32,ByteString>::iterator iter = aEscherBlipCache.find(nIdx_); + std::map<sal_uInt32,rtl::OString>::iterator iter = aEscherBlipCache.find(nIdx_); if (iter != aEscherBlipCache.end()) { diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 555f4e6232a6..246bd606ae36 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -700,7 +700,7 @@ class SwMSDffManager : public SvxMSDffManager private: SwWW8ImplReader& rReader; SvStream *pFallbackStream; - std::map<sal_uInt32,ByteString> aOldEscherBlipCache; + std::map<sal_uInt32,rtl::OString> aOldEscherBlipCache; virtual sal_Bool GetOLEStorageName( long nOLEId, String& rStorageName, SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const; |