XubString->OUString

Change-Id: I1db6254b23c5203c20c168989656d320f86a3bb9

2 files changed, 14 insertions, 14 deletions

diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index d0e524ca4e70..fe8a7aa41424 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -78,8 +78,8 @@ public:
     void AddItem(
         const Image& rItemImage,
         const Image* pSelectedItemImage,
-        const XubString& rItemText,
-        const XubString* pItemHelpText );
+        const OUString& rItemText,
+        const OUString* pItemHelpText );
 
     // replace item images for control type IMAGE_TEXT
     void ReplaceItemImages(
@@ -92,9 +92,9 @@ public:
     // @param pItemHelpText
     // help text is optional. if not provided, it is the same as the item text
     void AddItem(
-        const XubString& rItemText,
-        const XubString& rItemText2,
-        const XubString* pItemHelpText );
+        const OUString& rItemText,
+        const OUString& rItemText2,
+        const OUString* pItemHelpText );
 
     virtual void UserDraw( const UserDrawEvent& rUDEvt );
 
@@ -103,8 +103,8 @@ private:
     {
         Image maItemImage;
         Image maSelectedItemImage;
-        XubString maItemText;
-        XubString maItemText2;
+        OUString maItemText;
+        OUString maItemText2;
     };
 
     typedef ::std::vector< ValueSetWithTextItem > tItemList;
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);
     }