diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/editobj.hxx | 8 | ||||
| -rw-r--r-- | include/editeng/itemtype.hxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index 83f647533b98..570615f5e254 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -106,11 +106,11 @@ public: const SfxItemSet& GetParaAttribs(sal_Int32 nPara) const; - void GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleFamily& eFamily) const; - void SetStyleSheet(sal_Int32 nPara, const String& rName, const SfxStyleFamily& eFamily); + void GetStyleSheet(sal_Int32 nPara, OUString& rName, SfxStyleFamily& eFamily) const; + void SetStyleSheet(sal_Int32 nPara, const OUString& rName, const SfxStyleFamily& eFamily); bool ChangeStyleSheets( - const XubString& rOldName, SfxStyleFamily eOldFamily, const XubString& rNewName, SfxStyleFamily eNewFamily ); - void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName ); + const OUString& rOldName, SfxStyleFamily eOldFamily, const OUString& rNewName, SfxStyleFamily eNewFamily); + void ChangeStyleSheetName(SfxStyleFamily eFamily, const OUString& rOldName, const OUString& rNewName); editeng::FieldUpdater GetFieldUpdater(); diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index 422cb3b9e22e..8a64415484a7 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -36,14 +36,14 @@ class IntlWrapper; static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' }; -EDITENG_DLLPUBLIC String GetSvxString( sal_uInt16 nId ); -EDITENG_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl ); -String GetColorString( const Color& rCol ); +EDITENG_DLLPUBLIC OUString GetSvxString( sal_uInt16 nId ); +EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl ); +OUString GetColorString( const Color& rCol ); EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit ); // ----------------------------------------------------------------------- -inline String GetBoolString( sal_Bool bVal ) +inline OUString GetBoolString(bool bVal) { return EE_RESSTR(bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE); } |