From 2a80a284b35d7f61eb819bfa37d01c70bc9ef7e8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 30 Aug 2013 09:22:30 +0200 Subject: [PATCH] convert include/svx/xbtmpit.hxx from String to OUString Change-Id: I6b45f343febef1ca1e90a9194bd298681ed134ea --- include/svx/xbtmpit.hxx | 2 +- svx/source/xoutdev/xattrbmp.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index d30e2fd5001f..7422714decdf 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -44,7 +44,7 @@ private: public: TYPEINFO(); XFillBitmapItem() : NameOrIndex(XATTR_FILLBITMAP, -1 ) {} - XFillBitmapItem(const String& rName, const GraphicObject& rGraphicObject); + XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject); XFillBitmapItem(SfxItemPool* pPool, const GraphicObject& rGraphicObject); XFillBitmapItem( const XFillBitmapItem& rItem ); XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 ); diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 5af0223eaada..cbc231189292 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -201,7 +201,7 @@ void XOBitmap::Array2Bitmap() TYPEINIT1_AUTOFACTORY(XFillBitmapItem, NameOrIndex); -XFillBitmapItem::XFillBitmapItem(const XubString& rName, const GraphicObject& rGraphicObject) +XFillBitmapItem::XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject) : NameOrIndex(XATTR_FILLBITMAP, rName), maGraphicObject(rGraphicObject) {