summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-29 16:52:41 +0200
committerNoel Grandin <noel@peralex.com>2013-09-05 08:54:11 +0200
commit79850f25987d12c8ee91dfd0f699a562f341bf67 (patch)
treed496aa227b51eedb9dd76688906445f20c7b0b02
parentc8375ca155fca6d8c0cfd75058954bff9a48d5f2 (diff)
convert include/svx/xf*.hxx from String to OUString
Change-Id: Ifd11e8efc2c6dae7dd08fe61acb949b6238682a7
-rw-r--r--include/svx/xflclit.hxx2
-rw-r--r--include/svx/xflftrit.hxx2
-rw-r--r--include/svx/xflhtit.hxx2
-rw-r--r--include/svx/xftshcit.hxx2
-rw-r--r--svx/source/xoutdev/xattr.cxx8
5 files changed, 8 insertions, 8 deletions
diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx
index 7c0320ffe2f7..ebe3e6f718f3 100644
--- a/include/svx/xflclit.hxx
+++ b/include/svx/xflclit.hxx
@@ -36,7 +36,7 @@ public:
TYPEINFO();
XFillColorItem() {}
XFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
- XFillColorItem(const String& rName, const Color& rTheColor);
+ XFillColorItem(const OUString& rName, const Color& rTheColor);
XFillColorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index 494cc99f21fe..4f95d51ee788 100644
--- a/include/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
@@ -37,7 +37,7 @@ public:
TYPEINFO();
XFillFloatTransparenceItem();
- XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True );
+ XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True );
XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True );
XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem );
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index 3b95e97c6a3c..6c104aac8907 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -36,7 +36,7 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex
public:
TYPEINFO();
XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
- XFillHatchItem(const String& rName, const XHatch& rTheHatch);
+ XFillHatchItem(const OUString& rName, const XHatch& rTheHatch);
XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
XFillHatchItem(const XFillHatchItem& rItem);
XFillHatchItem(SvStream& rIn);
diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx
index 8a84b2c1c84b..4246c6e5c212 100644
--- a/include/svx/xftshcit.hxx
+++ b/include/svx/xftshcit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem
public:
TYPEINFO();
XFormTextShadowColorItem() {}
- XFormTextShadowColorItem(const String& rName, const Color& rTheColor);
+ XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor);
XFormTextShadowColorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 2e1ceb18be95..f846e328da58 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2352,7 +2352,7 @@ XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
{
}
-XFillColorItem::XFillColorItem(const XubString& rName, const Color& rTheColor) :
+XFillColorItem::XFillColorItem(const OUString& rName, const Color& rTheColor) :
XColorItem(XATTR_FILLCOLOR, rName, rTheColor)
{
}
@@ -2936,7 +2936,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
XFillGradientItem ( rName, rGradient ),
bEnabled ( bEnable )
{
@@ -3057,7 +3057,7 @@ bool XHatch::operator==(const XHatch& rHatch) const
TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
-XFillHatchItem::XFillHatchItem(const XubString& rName,
+XFillHatchItem::XFillHatchItem(const OUString& rName,
const XHatch& rTheHatch) :
NameOrIndex(XATTR_FILLHATCH, rName),
aHatch(rTheHatch)
@@ -3588,7 +3588,7 @@ bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*
TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem);
-XFormTextShadowColorItem::XFormTextShadowColorItem(const XubString& rName,
+XFormTextShadowColorItem::XFormTextShadowColorItem(const OUString& rName,
const Color& rTheColor) :
XColorItem(XATTR_FORMTXTSHDWCOLOR, rName, rTheColor)
{