summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/options/optlingu.cxx2
-rw-r--r--svl/inc/svl/style.hxx2
-rw-r--r--svl/source/items/style.cxx4
-rw-r--r--sw/inc/docstyle.hxx2
-rw-r--r--sw/source/ui/app/docstyle.cxx6
5 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5c2ad383ffc4..de28f0f913a4 100644
--- a/cui/source/options/optlingu.cxx
+++ b/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() );
}
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 64f28a5db09e..f44b7d144189 100644
--- a/svl/inc/svl/style.hxx
+++ b/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:
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 120a09ae79df..68c3d81649a4 100644
--- a/svl/source/items/style.cxx
+++ b/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();
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 7a32215ee217..192098535506 100644
--- a/sw/inc/docstyle.hxx
+++ b/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& );
};
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 3937a43a672a..e7aea6ce0023 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/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 )