diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 18175764cdbb..b61456a2ebc7 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -104,7 +104,7 @@ public:
     // Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und
     // SDRINSERT_ADDMARK (siehe svdedtv.hxx).
     virtual sal_Bool    Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
-    sal_Bool            Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+    sal_Bool            Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
     sal_Bool            Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
 
     sal_Bool            Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 194547acbdd9..e3aff134197f 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -222,7 +222,7 @@ public:
     XPropertyEntry* Remove(long nIndex);
 
     XPropertyEntry* Get(long nIndex) const;
-    long GetIndex(const String& rName) const;
+    long GetIndex(const OUString& rName) const;
     Bitmap GetUiBitmap(long nIndex) const;
 
     const String& GetName() const { return maName; }
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 42a01e6ea6d2..733173929e00 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -417,9 +417,8 @@ Reference< XForm >  FmFormPageImpl::getDefaultForm()
         if( pModel->IsUndoEnabled() )
         {
             OUString aStr(SVX_RESSTR(RID_STR_FORM));
-            XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
-            aUndoStr.SearchAndReplace(OUString('#'), aStr);
-            pModel->BegUndo(aUndoStr);
+            OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
+            pModel->BegUndo(aUndoStr.replaceFirst("'#'", aStr));
         }
 
         try
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index c3c1b0bdc133..36763c1931e1 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -407,11 +407,11 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
     if (GetSlotId() != SID_FM_RECORD_TOTAL)
         return;
 
-    XubString aText;
+    OUString aText;
     if (pState)
         aText = ((SfxStringItem*)pState)->GetValue();
     else
-        aText = '?';
+        aText = "?";
 
     pFixedText->SetText( aText );
     pFixedText->Update();
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 5359d57a2959..e690c2038530 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -125,9 +125,9 @@ sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerI
     return bRet;
 }
 
-sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
+sal_Bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
-    if(!rStr.Len())
+    if (rStr.isEmpty())
         return sal_False;
 
     Point aPos(rPos);
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index d0204104ace7..eca37ed2950d 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -161,7 +161,7 @@ XPropertyEntry* XPropertyList::Get( long nIndex ) const
     return ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : NULL;
 }
 
-long XPropertyList::GetIndex(const XubString& rName) const
+long XPropertyList::GetIndex(const OUString& rName) const
 {
     if( mbListDirty )
     {
@@ -170,7 +170,7 @@ long XPropertyList::GetIndex(const XubString& rName) const
     }
 
     for( long i = 0, n = maList.size(); i < n; ++i ) {
-        if ( maList[ i ]->GetName() == rName ) {
+        if (rName.equals(maList[ i ]->GetName())) {
             return i;
         }
     }