[Libreoffice-commits] core.git: editeng/source include/editeng

[Caolán McNamara]

 editeng/source/editeng/eertfpar.cxx |    2 +-
 editeng/source/editeng/eertfpar.hxx |    2 +-
 include/editeng/svxrtf.hxx          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7b80e47bb75b911ce8da8db7f39165aa175e5f78
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 23 16:58:59 2013 +0100

    XubString->OUString
    
    Change-Id: If59e9a3956074557842ebc5b178266e9be95a867

diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 9d1220c..e5989b9 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -420,7 +420,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
     }
 }
 
-SvxRTFStyleType* EditRTFParser::FindStyleSheet( const XubString& rName )
+SvxRTFStyleType* EditRTFParser::FindStyleSheet( const OUString& rName )
 {
     SvxRTFStyleTbl& rTable = GetStyleTbl();
     for ( SvxRTFStyleTbl::iterator it = rTable.begin(); it != rTable.end(); ++it )
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index 32d97c0..b96387e 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -90,7 +90,7 @@ protected:
     virtual void        CalcValue();
     void                CreateStyleSheets();
     SfxStyleSheet*      CreateStyleSheet( SvxRTFStyleType* pRTFStyle );
-    SvxRTFStyleType*    FindStyleSheet( const String& rName );
+    SvxRTFStyleType*    FindStyleSheet( const OUString& rName );
     void                AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& rEnd );
     void                ReadField();
     void                SkipGroup();
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 175a750..50bf842 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -89,7 +89,7 @@ typedef std::deque< SvxRTFItemStackType* > SvxRTFItemStack;
 struct SvxRTFStyleType
 {
     SfxItemSet aAttrSet;        // the attributes of Style (+ derivate!)
-    String sName;
+    OUString sName;
     sal_uInt16 nBasedOn, nNext;
     sal_Bool bBasedOnIsSet;
     sal_uInt8 nOutlineNo;