summaryrefslogtreecommitdiff
path: root/include/svx/svdmark.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-12 20:13:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-13 09:22:29 +0100
commit6b2cc1eb6c7404d6934aad2d2c78555a45c9b4a8 (patch)
treef27113c8129692c06dc03602411a8f880b94bddb /include/svx/svdmark.hxx
parent89253a0c258c1107f598e5a37470ecb09055a895 (diff)
XubString->OUString
Change-Id: I1db6254b23c5203c20c168989656d320f86a3bb9
Diffstat (limited to 'include/svx/svdmark.hxx')
-rw-r--r--include/svx/svdmark.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index 09b4bfa06d4c..faeae356b0e7 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -168,9 +168,9 @@ class SVX_DLLPUBLIC SdrMarkList
protected:
std::vector<SdrMark*> maList;
- String maMarkName;
- String maPointName;
- String maGluePointName;
+ OUString maMarkName;
+ OUString maPointName;
+ OUString maGluePointName;
sal_Bool mbPointNameOk;
sal_Bool mbGluePointNameOk;
@@ -182,7 +182,7 @@ private:
SVX_DLLPRIVATE void ImpForceSort();
private:
- SVX_DLLPRIVATE const XubString& GetPointMarkDescription(sal_Bool bGlue) const;
+ SVX_DLLPRIVATE const OUString& GetPointMarkDescription(sal_Bool bGlue) const;
public:
SdrMarkList()
@@ -235,13 +235,13 @@ public:
// A verbal description of selected objects e.g.:
// "27 Lines", "12 Objects", "Polygon" or even "Not an object"
- const String& GetMarkDescription() const;
- const String& GetPointMarkDescription() const
+ const OUString& GetMarkDescription() const;
+ const OUString& GetPointMarkDescription() const
{
return GetPointMarkDescription(sal_False);
}
- const String& GetGluePointMarkDescription() const
+ const OUString& GetGluePointMarkDescription() const
{
return GetPointMarkDescription(sal_True);
}