UniString->rtl::OUString

cui/source/options/optlingu.cxx

@@ -491,7 +491,7 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16,
         if(aData.HasNumericValue())
         {
             rtl::OUStringBuffer sTxt;
-            aTxt.append(' ').append(static_cast<sal_Int32>(aData.GetNumericValue()));
+            sTxt.append(' ').append(static_cast<sal_Int32>(aData.GetNumericValue()));
             rDev.SetFont( aFont );
             rDev.DrawText( aNewPos, sTxt.makeStringAndClear() );
         }

svl/inc/svl/style.hxx

@@ -173,7 +173,7 @@ public:
     virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx);
     virtual SfxStyleSheetBase* First();
     virtual SfxStyleSheetBase* Next();
-    virtual SfxStyleSheetBase* Find(const UniString& rStr);
+    virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr);
     virtual ~SfxStyleSheetIterator();
 
 protected:

svl/source/items/style.cxx

@@ -497,9 +497,9 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next()
 }
 
 
-SfxStyleSheetBase* SfxStyleSheetIterator::Find(const XubString& rStr)
+SfxStyleSheetBase* SfxStyleSheetIterator::Find(const rtl::OUString& rStr)
 {
-    for ( sal_uInt16 n = 0; n < pBasePool->aStyles.size(); n++ )
+    for ( sal_uInt16 n = 0; n < pBasePool->aStyles.size(); ++n )
     {
         SfxStyleSheetBase* pStyle = pBasePool->aStyles[n].get();
 

sw/inc/docstyle.hxx

@@ -177,7 +177,7 @@ public:
     virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx);
     virtual SfxStyleSheetBase* First();
     virtual SfxStyleSheetBase* Next();
-    virtual SfxStyleSheetBase* Find(const UniString& rStr);
+    virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr);
 
     virtual void Notify( SfxBroadcaster&, const SfxHint& );
 };

sw/source/ui/app/docstyle.cxx

@@ -311,8 +311,8 @@ const SwNumRule* lcl_FindNumRule(   SwDoc&  rDoc,
 }
 
 
-sal_uInt16 lcl_FindName( const SwPoolFmtList& rLst, SfxStyleFamily eFam,
-                        const String& rName )
+sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam,
+    const rtl::OUString& rName)
 {
     if(!rLst.empty())
     {
@@ -2762,7 +2762,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::Next()
     return 0;
 }
 
-SfxStyleSheetBase*  SwStyleSheetIterator::Find( const UniString& rName )
+SfxStyleSheetBase*  SwStyleSheetIterator::Find(const rtl::OUString& rName)
 {
     // searching
     if( !bFirstCalled )