wrap GraphicObject in a rtl::Referencefeature/go2

Change-Id: I07842c2920202f39cae054cba866f0d02d767e61

2 files changed, 14 insertions, 14 deletions

diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index f347bf204ddb..3ae7a57633ac 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -147,14 +147,14 @@ private:
 
 public:
 
-    static String       GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags );
+    static OUString     GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags );
 
 public:
 
                         GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery* pGallery );
                         ~GalleryBrowser2();
 
-    void                SelectTheme( const String& rThemeName );
+    void                SelectTheme( const OUString& rThemeName );
 
     GalleryBrowserMode  GetMode() const { return meMode; }
     void                SetMode( GalleryBrowserMode eMode );
@@ -164,7 +164,7 @@ public:
     void                Travel( GalleryBrowserTravel eTravel );
 
     INetURLObject       GetURL() const;
-    String              GetFilterName() const;
+    OUString            GetFilterName() const;
     Graphic             GetGraphic() const;
 
     sal_Int8            AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt );
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 8712b718cd54..cacf7be3e47d 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -60,12 +60,12 @@ protected:
     BitmapEx                aThumbBmp; // Allow transparence to survive
     GDIMetaFile             aThumbMtf;
     INetURLObject           aURL;
-    String                  aUserName;
-    String                  aTitle;
+    OUString                aUserName;
+    OUString                aTitle;
     sal_Bool                    bIsValid;
     sal_Bool                    bIsThumbBmp;
 
-    virtual void            WriteData( SvStream& rOut, const String& rDestDir ) const;
+    virtual void            WriteData( SvStream& rOut, const OUString& rDestDir ) const;
     virtual void            ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
     sal_Bool                    CreateThumb( const Graphic& rGraphic );
@@ -83,8 +83,8 @@ public:
     sal_Bool                    IsValid() const { return bIsValid; }
     sal_Bool                    IsThumbBitmap() const { return bIsThumbBmp; }
 
-    const String            GetTitle() const;
-    void                    SetTitle( const String& rTitle );
+    const OUString          GetTitle() const;
+    void                    SetTitle( const OUString& rTitle );
 
     friend SvStream&        operator<<( SvStream& rOut, const SgaObject& rObj );
     friend SvStream&        operator>>( SvStream& rIn, SgaObject& rObj );
@@ -98,7 +98,7 @@ private:
 
     GalSoundType        eSoundType;
 
-    virtual void        WriteData( SvStream& rOut, const String& rDestDir ) const;
+    virtual void        WriteData( SvStream& rOut, const OUString& rDestDir ) const;
     virtual void        ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
     virtual sal_uInt16      GetVersion() const { return 6; }
@@ -124,7 +124,7 @@ private:
 
     sal_Bool                CreateThumb( const FmFormModel& rModel );
 
-    virtual void        WriteData( SvStream& rOut, const String& rDestDir ) const;
+    virtual void        WriteData( SvStream& rOut, const OUString& rDestDir ) const;
     virtual void        ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
     virtual sal_uInt16      GetVersion() const { return 5; }
@@ -145,7 +145,7 @@ private:
 
     void                Init( const Graphic& rGraphic, const INetURLObject& rURL );
 
-    virtual void        WriteData( SvStream& rOut, const String& rDestDir ) const;
+    virtual void        WriteData( SvStream& rOut, const OUString& rDestDir ) const;
     virtual void        ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
     virtual sal_uInt16      GetVersion() const { return 5; }
@@ -154,7 +154,7 @@ public:
 
                         SgaObjectBmp();
                         SgaObjectBmp( const INetURLObject& rURL );
-                        SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const String& rFormat );
+                        SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormat );
     virtual             ~SgaObjectBmp() {};
 
     virtual SgaObjKind  GetObjKind() const { return SGA_OBJ_BMP; }
@@ -169,7 +169,7 @@ private:
 public:
 
                         SgaObjectAnim();
-                        SgaObjectAnim( const Graphic& rGraphic, const INetURLObject& rURL, const String& rFormatName );
+                        SgaObjectAnim( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormatName );
 
     virtual            ~SgaObjectAnim() {};
 
@@ -185,7 +185,7 @@ private:
 public:
 
                         SgaObjectINet();
-                        SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL, const String& rFormatName );
+                        SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormatName );
 
     virtual            ~SgaObjectINet() {};