summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-29 15:34:37 +0200
committerNoel Grandin <noel@peralex.com>2013-09-05 08:54:10 +0200
commit447b92760d097eeb658b2302d5ddcdd95e006a1d (patch)
treec695905c4507207162d876a5e34eda14e899e63d /include
parentdfbb4009f895a876041c8848100a3bada1ba44fc (diff)
convert include/svx/xmlgrhlp.hxx from String to OUString
also fix the string comparison in SvXMLGraphicHelper::ImplGetGraphicMimeType which was previously comparing pointers. Change-Id: Icd1e76bcf60ec3af5b10cb48adfc97548a2bf4f1
Diffstat (limited to 'include')
-rw-r--r--include/svx/xmlgrhlp.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index d14c9dc5cd23..29884f6f32fe 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -74,12 +74,14 @@ private:
SVX_DLLPRIVATE sal_Bool ImplGetStreamNames( const OUString& rURLStr,
OUString& rPictureStorageName,
OUString& rPictureStreamName );
- SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const OUString& rPictureStorageName );
- SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const OUString& rPictureStorageName,
+ SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage >
+ ImplGetGraphicStorage( const OUString& rPictureStorageName );
+ SVX_DLLPRIVATE SvxGraphicHelperStream_Impl
+ ImplGetGraphicStream( const OUString& rPictureStorageName,
const OUString& rPictureStreamName,
sal_Bool bTruncate );
- SVX_DLLPRIVATE String ImplGetGraphicMimeType( const String& rFileName ) const;
- SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName,
+ SVX_DLLPRIVATE OUString ImplGetGraphicMimeType( const OUString& rFileName ) const;
+ SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName,
const OUString& rPictureStreamName );
SVX_DLLPRIVATE sal_Bool ImplWriteGraphic( const OUString& rPictureStorageName,
const OUString& rPictureStreamName,