Kaydet (Commit) 0728cc90 authored tarafından Noel Grandin's avatar Noel Grandin

convert include/svx/pageitem.hxx from String to OUString

Change-Id: I441c6b46ace2ad1b23357bea83501a67b63e8637
üst d4a5d638
...@@ -62,8 +62,8 @@ portait or landscape, layout) ...@@ -62,8 +62,8 @@ portait or landscape, layout)
class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem
{ {
private: private:
String aDescName; // name of the template OUString aDescName; // name of the template
SvxNumType eNumType; // enumeration SvxNumType eNumType; // enumeration
sal_Bool bLandscape; // Portrait / Landscape sal_Bool bLandscape; // Portrait / Landscape
sal_uInt16 eUse; // Layout sal_uInt16 eUse; // Layout
...@@ -98,8 +98,8 @@ public: ...@@ -98,8 +98,8 @@ public:
void SetNumType(SvxNumType eNum) { eNumType = eNum; } void SetNumType(SvxNumType eNum) { eNumType = eNum; }
// name of the descriptor // name of the descriptor
const String& GetDescName() const { return aDescName; } const OUString& GetDescName() const { return aDescName; }
void SetDescName(const String& rStr) { aDescName = rStr; } void SetDescName(const OUString& rStr) { aDescName = rStr; }
}; };
......
...@@ -113,7 +113,7 @@ SfxItemPresentation SvxPageItem::GetPresentation ...@@ -113,7 +113,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
return SFX_ITEM_PRESENTATION_NONE; return SFX_ITEM_PRESENTATION_NONE;
case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_NAMELESS:
{ {
if ( aDescName.Len() ) if ( !aDescName.isEmpty() )
{ {
rText = aDescName + cpDelimTmp; rText = aDescName + cpDelimTmp;
} }
...@@ -133,7 +133,7 @@ SfxItemPresentation SvxPageItem::GetPresentation ...@@ -133,7 +133,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_COMPLETE:
{ {
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_COMPLETE); rText += SVX_RESSTR(RID_SVXITEMS_PAGE_COMPLETE);
if ( aDescName.Len() ) if ( !aDescName.isEmpty() )
{ {
rText += aDescName + cpDelimTmp; rText += aDescName + cpDelimTmp;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment