diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-09 15:19:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-11 09:45:34 +0200 |
| commit | cfb4463d2afd36ca6d0fbb9e374bf5387fee84df (patch) | |
| tree | 4411584498dcf21eff5e71c284e7af1ed6b5489a /include | |
| parent | b044a9535e0fb573fe5d28b0d44c96a3b5db66c2 (diff) | |
convert include/editeng/brushitem.hxx from String to OUString
and convert String* to OUString, no need to hold a pointer
to a ref-counted value type.
Change-Id: I79c62979ee8ec0d5e6d2efc50609ad5595571a7d
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/brushitem.hxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index d05ee3bf56a8..cf30544d6d7d 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -29,7 +29,6 @@ class Graphic; class GraphicObject; class CntWallpaperItem; -class String; #define BRUSH_GRAPHIC_VERSION ((sal_uInt16)0x0001) @@ -51,10 +50,10 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem Color aColor; sal_Int32 nShadingValue; SvxBrushItem_Impl* pImpl; - String* pStrLink; - String* pStrFilter; + OUString maStrLink; + OUString maStrFilter; SvxGraphicPosition eGraphicPos; - sal_Bool bLoadAgain; + sal_Bool bLoadAgain; void ApplyGraphicTransparency_Impl(); DECL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void *); @@ -72,7 +71,7 @@ public: SvxGraphicPosition ePos, sal_uInt16 nWhich ); SvxBrushItem( const GraphicObject& rGraphicObj, SvxGraphicPosition ePos, sal_uInt16 nWhich ); - SvxBrushItem( const String& rLink, const String& rFilter, + SvxBrushItem( const OUString& rLink, const OUString& rFilter, SvxGraphicPosition ePos, sal_uInt16 nWhich ); SvxBrushItem( const SvxBrushItem& ); SvxBrushItem( const CntWallpaperItem&, sal_uInt16 nWhich ); @@ -108,15 +107,15 @@ public: sal_uInt32 GetShadingValue() const { return nShadingValue; } const Graphic* GetGraphic() const; const GraphicObject* GetGraphicObject() const; - const String* GetGraphicLink() const { return pStrLink; } - const String* GetGraphicFilter() const { return pStrFilter; } + OUString GetGraphicLink() const { return maStrLink; } + OUString GetGraphicFilter() const { return maStrFilter; } void SetShadingValue( const sal_uInt32 nNew ); void SetGraphicPos( SvxGraphicPosition eNew ); void SetGraphic( const Graphic& rNew ); void SetGraphicObject( const GraphicObject& rNewObj ); - void SetGraphicLink( const String& rNew ); - void SetGraphicFilter( const String& rNew ); + void SetGraphicLink( const OUString& rNew ); + void SetGraphicFilter( const OUString& rNew ); SvxBrushItem& operator=( const SvxBrushItem& rItem); |