XubString->OUString

Change-Id: I178f9eb702afb6143c583d5fd54003a427d895fa

13 files changed, 40 insertions, 40 deletions

diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 31b0e4340558..b7bf858ff0ac 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -654,13 +654,13 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel )
     if ( nHLevel == STYLE_PRE )
     {
         Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
-        SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
+        SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
         aItems.Put( aFontItem );
 
-        SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
+        SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
         aItems.Put( aFontItemCJK );
 
-        SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
+        SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
         aItems.Put( aFontItemCTL );
     }
 
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 2918b22d426c..dc9332075d3b 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -222,8 +222,8 @@ SvxFontItem::SvxFontItem( const sal_uInt16 nId ) :
 
 // -----------------------------------------------------------------------
 
-SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
-                  const XubString& aStName, const FontPitch eFontPitch,
+SvxFontItem::SvxFontItem( const FontFamily eFam, const OUString& aName,
+                  const OUString& aStName, const FontPitch eFontPitch,
                   const rtl_TextEncoding eFontTextEncoding, const sal_uInt16 nId ) :
 
     SfxPoolItem( nId ),
@@ -256,19 +256,19 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
         case 0:
         {
             com::sun::star::awt::FontDescriptor aFontDescriptor;
-            aFontDescriptor.Name = aFamilyName.GetBuffer();
-            aFontDescriptor.StyleName = aStyleName.GetBuffer();
+            aFontDescriptor.Name = aFamilyName;
+            aFontDescriptor.StyleName = aStyleName;
             aFontDescriptor.Family = (sal_Int16)(eFamily);
             aFontDescriptor.CharSet = (sal_Int16)(eTextEncoding);
             aFontDescriptor.Pitch = (sal_Int16)(ePitch);
             rVal <<= aFontDescriptor;
         }
         break;
-        case MID_FONT_FAMILY_NAME   :
-            rVal <<= OUString(aFamilyName.GetBuffer());
+        case MID_FONT_FAMILY_NAME:
+            rVal <<= aFamilyName;
         break;
         case MID_FONT_STYLE_NAME:
-            rVal <<= OUString(aStyleName.GetBuffer());
+            rVal <<= aStyleName;
         break;
         case MID_FONT_FAMILY    : rVal <<= (sal_Int16)(eFamily);    break;
         case MID_FONT_CHAR_SET  : rVal <<= (sal_Int16)(eTextEncoding);  break;
@@ -300,7 +300,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
             OUString aStr;
             if(!(rVal >>= aStr))
                 return sal_False;
-            aFamilyName = aStr.getStr();
+            aFamilyName = aStr;
         }
         break;
         case MID_FONT_STYLE_NAME:
@@ -308,7 +308,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
             OUString aStr;
             if(!(rVal >>= aStr))
                 return sal_False;
-            aStyleName = aStr.getStr();
+            aStyleName = aStr;
         }
         break;
         case MID_FONT_FAMILY :
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index a9701fe0880a..5534781f89e1 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1248,11 +1248,11 @@ void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich
 // ======================================================================
 
 
-void OutlinerView::InsertText( const XubString& rNew, sal_Bool bSelect )
+void OutlinerView::InsertText( const OUString& rNew, sal_Bool bSelect )
 {
     DBG_CHKTHIS(OutlinerView,0);
     if( pOwner->bFirstParaIsEmpty )
-        pOwner->Insert( String() );
+        pOwner->Insert( OUString() );
     pEditView->InsertText( rNew, bSelect );
 }
 
@@ -1330,7 +1330,7 @@ Rectangle OutlinerView::GetOutputArea() const
 }
 
 
-XubString OutlinerView::GetSelected() const
+OUString OutlinerView::GetSelected() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSelected();
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index e9d14755906e..e083e86f72e8 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -35,9 +35,9 @@ class SvXMLUnitConverter;
 
 class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem
 {
-    String  aFamilyName;
-    String  aStyleName;
-    FontFamily  eFamily;
+    OUString aFamilyName;
+    OUString aStyleName;
+    FontFamily eFamily;
     FontPitch ePitch;
     rtl_TextEncoding eTextEncoding;
 
@@ -47,8 +47,8 @@ public:
     TYPEINFO();
 
     explicit SvxFontItem( const sal_uInt16 nId  );
-    SvxFontItem( const FontFamily eFam, const String& rFamilyName,
-        const String& rStyleName,
+    SvxFontItem( const FontFamily eFam, const OUString& rFamilyName,
+        const OUString& rStyleName,
         const FontPitch eFontPitch /*= PITCH_DONTKNOW*/,
         const rtl_TextEncoding eFontTextEncoding /*= RTL_TEXTENCODING_DONTKNOW*/,
         const sal_uInt16 nId  );
@@ -67,21 +67,21 @@ public:
                                     OUString &rText, const IntlWrapper * = 0 ) const;
 
     // Access methods:
-    void SetFamilyName( const String& rFamilyName ) { aFamilyName = rFamilyName; }
-    inline const String &GetFamilyName() const { return aFamilyName; }
+    void SetFamilyName( const OUString& rFamilyName ) { aFamilyName = rFamilyName; }
+    const OUString &GetFamilyName() const { return aFamilyName; }
 
-    void SetStyleName(const String &rStyleName ) { aStyleName = rStyleName; }
-    inline const String &GetStyleName() const { return aStyleName; }
+    void SetStyleName(const OUString &rStyleName ) { aStyleName = rStyleName; }
+    const OUString &GetStyleName() const { return aStyleName; }
 
     void SetFamily( FontFamily _eFamily ) { eFamily = _eFamily; }
-    inline FontFamily GetFamily() const { return eFamily; }
+    FontFamily GetFamily() const { return eFamily; }
 
     void SetPitch(FontPitch _ePitch ) { ePitch = _ePitch; }
-    inline FontPitch GetPitch() const { return ePitch; }
+    FontPitch GetPitch() const { return ePitch; }
 
     void SetCharSet(rtl_TextEncoding _eEncoding) { eTextEncoding = _eEncoding; }
 
-    inline rtl_TextEncoding GetCharSet() const { return eTextEncoding; }
+    rtl_TextEncoding GetCharSet() const { return eTextEncoding; }
 
     SvxFontItem& operator=(const SvxFontItem& rFont);
 
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 0f1a540f76a2..7336870b41fc 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -266,7 +266,7 @@ public:
                     sal_Bool bSelect=sal_True,
                     sal_Bool bWChildren=sal_True);
 
-    String      GetSelected() const;
+    OUString    GetSelected() const;
     void        SelectRange( sal_Int32 nFirst, sal_Int32 nCount );
     void        SetAttribs( const SfxItemSet& );
     void        Indent( short nDiff );
@@ -276,7 +276,7 @@ public:
 
     sal_uLong       Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
 
-    void        InsertText( const String& rNew, sal_Bool bSelect = sal_False );
+    void        InsertText( const OUString& rNew, sal_Bool bSelect = sal_False );
     void        InsertText( const OutlinerParaObject& rParaObj );
     void        Expand();
     void        Collapse();
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 18b50613d747..234ec8e10b8b 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -657,7 +657,7 @@ void ScAutoFormatData::FillToItemSet( sal_uInt16 nIndex, SfxItemSet& rItemSet, S
         rItemSet.Put( rField.GetPosture() );
         // do not insert empty CJK font
         const SvxFontItem& rCJKFont = rField.GetCJKFont();
-        if( rCJKFont.GetStyleName().Len() )
+        if (!rCJKFont.GetStyleName().isEmpty())
         {
             rItemSet.Put( rCJKFont );
             rItemSet.Put( rField.GetCJKHeight() );
@@ -672,7 +672,7 @@ void ScAutoFormatData::FillToItemSet( sal_uInt16 nIndex, SfxItemSet& rItemSet, S
         }
         // do not insert empty CTL font
         const SvxFontItem& rCTLFont = rField.GetCTLFont();
-        if( rCTLFont.GetStyleName().Len() )
+        if (rCTLFont.GetStyleName().isEmpty())
         {
             rItemSet.Put( rCTLFont );
             rItemSet.Put( rField.GetCTLHeight() );
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 876853171cc0..ff0ac65c9cdc 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -253,7 +253,7 @@ Selection AnnotationTextWindow::GetSurroundingTextSelection() const
     if( mpOutlinerView )
     {
         if( mpOutlinerView->HasSelection() )
-            return Selection( 0, mpOutlinerView->GetSelected().Len() );
+            return Selection( 0, mpOutlinerView->GetSelected().getLength() );
         else
         {
             ESelection aSelection = mpOutlinerView->GetEditView().GetSelection();
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index fee4ded222e9..f91881d6c64c 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -943,7 +943,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
 
         if (pOlView)
         {
-            if ( pOlView->GetSelected().Len() == 0 )
+            if (pOlView->GetSelected().isEmpty())
             {
                 rSet.DisableItem( SID_CUT );
                 rSet.DisableItem( SID_COPY );
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 5bb62d27e801..f18f17598464 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -779,7 +779,7 @@ sal_Bool DrawViewShell::HasSelection(sal_Bool bText) const
     {
         OutlinerView* pOlView = mpDrawView->GetTextEditOutlinerView();
 
-        if (pOlView && pOlView->GetSelected().Len() != 0)
+        if (pOlView && !pOlView->GetSelected().isEmpty())
         {
             bReturn = sal_True;
         }
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index cf375fad7180..1c5a50d07e1e 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1504,7 +1504,7 @@ sal_Bool OutlineViewShell::HasSelection(sal_Bool bText) const
     {
         OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() );
 
-        if (pOutlinerView && pOutlinerView->GetSelected().Len() != 0)
+        if (pOutlinerView && !pOutlinerView->GetSelected().isEmpty())
         {
             bReturn = sal_True;
         }
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 04cfbfa40cb5..cffdabbdecbf 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -34,7 +34,7 @@ friend class ImpItemEdit;
     std::vector<ImpItemListRow*> aList;
     long nAktPaintRow;
     Edit* pEditControl;
-    XubString aWNamMerk;
+    OUString aWNamMerk;
     Link aEntryChangedHdl;
     Link aSetDirtyHdl;
     ImpItemListRow* pAktChangeEntry;
@@ -87,7 +87,7 @@ public:
     virtual OUString  GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
     const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
-    XubString GetNewEntryValue() const                 { return pEditControl->GetText(); }
+    OUString GetNewEntryValue() const                 { return pEditControl->GetText(); }
     void SetEntryChangedHdl(const Link& rLink)      { aEntryChangedHdl=rLink; }
     const Link& GetEntryChangedHdl() const          { return aEntryChangedHdl; }
     void SetSetDirtyHdl(const Link& rLink)          { aSetDirtyHdl=rLink; }
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 8343b9848702..fa5e659fe27e 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -767,7 +767,7 @@ void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
             rSet.Put( rChg.GetPosture() );
             // do not insert empty CJK font
             const SvxFontItem& rCJKFont = rChg.GetCJKFont();
-            if( rCJKFont.GetStyleName().Len() )
+            if (!rCJKFont.GetStyleName().isEmpty())
             {
                 rSet.Put( rChg.GetCJKFont() );
                 rSet.Put( rChg.GetCJKHeight() );
@@ -782,7 +782,7 @@ void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
             }
             // do not insert empty CTL font
             const SvxFontItem& rCTLFont = rChg.GetCTLFont();
-            if( rCTLFont.GetStyleName().Len() )
+            if (!rCTLFont.GetStyleName().isEmpty())
             {
                 rSet.Put( rChg.GetCTLFont() );
                 rSet.Put( rChg.GetCTLHeight() );
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index dbae13cff3cb..22e1e603c624 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2771,7 +2771,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
             {
                 const SvxFontItem &rF = ItemGet<SvxFontItem>(*(*aIter),
                     GetWhichOfScript(RES_CHRATR_FONT,nScript));
-                if (rF.GetFamilyName().Equals(sFontName))
+                if (rF.GetFamilyName().equals(sFontName))
                 {
                     pCharFmt=*aIter;
                     break;