diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-25 16:48:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-25 16:55:56 +0000 |
| commit | 963fb917d777f28190d9674e6943ebb5436f435b (patch) | |
| tree | 6200d9f859964df40f6558a78ae7f9f43e74c904 | |
| parent | 71b78b2b1c76b9a2e0e43c3f5e298b9538fc6282 (diff) | |
fix build, change overridden GetOLEStorageName to OUString
Change-Id: I333090ae95218cd3438a8eb8b67ea9f07174ca8f
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index acfecb2eef4a..6cabcbd54e95 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -303,7 +303,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId, } SdrObject* pRet = 0; - String sStorageName; + OUString sStorageName; SotStorageRef xSrcStg; uno::Reference < embed::XStorage > xDstStg; if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg )) @@ -5654,7 +5654,7 @@ sal_Bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, sal_Bool bSaveRelFiles return bRet ? true : false; } -sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, String& rStorageName, +sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName, SvStorageRef& rSrcStorage, uno::Reference < embed::XStorage >& rDestStorage) const { bool bRet = false; @@ -5726,7 +5726,7 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, String& rStorageName, if( bRet ) { - rStorageName = '_'; + rStorageName = OUString('_'); rStorageName += rtl::OUString::valueOf(nPictureId); rSrcStorage = rReader.pStg->OpenSotStorage(rtl::OUString( SL::aObjectPool)); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 485cc34e3764..8ff035e8a5a2 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -659,7 +659,7 @@ private: SvStream *pFallbackStream; std::map<sal_uInt32,rtl::OString> aOldEscherBlipCache; - virtual sal_Bool GetOLEStorageName( long nOLEId, String& rStorageName, + virtual sal_Bool GetOLEStorageName( long nOLEId, OUString& rStorageName, SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const; virtual sal_Bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const; // #i32596# - new parameter <_nCalledByGroup>, which |