4 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 4b8ae9fda488..7027fce1cb06 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -454,8 +454,8 @@ void SwLabPage::InitDatabaseBox()
         const OUString* pDataNames = aDataNames.getConstArray();
         for (long i = 0; i < aDataNames.getLength(); i++)
             m_pDatabaseLB->InsertEntry(pDataNames[i]);
-        String sDBName = sActDBName.GetToken( 0, DB_DELIM );
-        String sTableName = sActDBName.GetToken( 1, DB_DELIM );
+        String sDBName = sActDBName.getToken( 0, DB_DELIM );
+        String sTableName = sActDBName.getToken( 1, DB_DELIM );
         m_pDatabaseLB->SelectEntry(sDBName);
         if( sDBName.Len() && GetNewDBMgr()->GetTableNames(m_pTableLB, sDBName))
         {
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index d13511d82677..4813936a2433 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -30,16 +30,16 @@ class SwLabPreview : public Window
 {
     Color aGrayColor;
 
-    String aHDistStr;
-    String aVDistStr;
-    String aWidthStr;
-    String aHeightStr;
-    String aLeftStr;
-    String aUpperStr;
-    String aColsStr;
-    String aRowsStr;
-    String aPWidthStr;
-    String aPHeightStr;
+    OUString aHDistStr;
+    OUString aVDistStr;
+    OUString aWidthStr;
+    OUString aHeightStr;
+    OUString aLeftStr;
+    OUString aUpperStr;
+    OUString aColsStr;
+    OUString aRowsStr;
+    OUString aPWidthStr;
+    OUString aPHeightStr;
 
     long lHDistWidth;
     long lVDistWidth;
diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx
index b69ecb55942a..3bca6ef4fade 100644
--- a/sw/source/ui/envelp/labimp.hxx
+++ b/sw/source/ui/envelp/labimp.hxx
@@ -86,8 +86,8 @@ public:
     void SetFromItem( const SwLabItem& rItem );
     void FillItem( SwLabItem& rItem ) const;
 
-    String          aMake;
-    String          aType;
+    OUString        aMake;
+    OUString        aType;
     long            lHDist;
     long            lVDist;
     long            lWidth;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 574a3a302952..367e11a42622 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -25,7 +25,7 @@
 class SwLabPage : public SfxTabPage
 {
     SwNewDBMgr*   pNewDBMgr;
-    String        sActDBName;
+    OUString      sActDBName;
     SwLabItem     aItem;
 
     VclContainer* m_pAddressFrame;
@@ -87,7 +87,7 @@ class SwVisitingCardPage : public SfxTabPage
     ListBox*        m_pAutoTextGroupLB;
     Window*         m_pExampleWIN;
 
-    String          sTempURL;
+    OUString        sTempURL;
 
     SwLabItem       aLabItem;