make extensions XubString free

Change-Id: I0216d11ade872af889fc805e4c2a9241f7f230c5

5 files changed, 28 insertions, 32 deletions

diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index ea3999fe03f1..0c3c90b1b6f9 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -104,7 +104,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS
             const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray();
 
             sal_uInt32 nCount = pStringSeq->getLength();
-            XubString aEntry;
+            OUString aEntry;
             for( sal_uInt32 i=0; i<nCount; i++ )
             {
                 aEntry = String(pStringArray[i]);
@@ -113,8 +113,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS
             pToolBar->UpdateSourceList(sal_True);
         }
 
-        XubString aStr = String(rEvt.FeatureDescriptor);
-        pToolBar->SelectSourceEntry(aStr);
+        pToolBar->SelectSourceEntry(rEvt.FeatureDescriptor);
     }
 };
 
@@ -219,7 +218,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
     aEdQuery.SetSizePixel(aLBSource.GetSizePixel());
     aEdQuery.Show();
 
-    XubString aStr=GetItemText(TBC_FT_SOURCE);
+    OUString aStr=GetItemText(TBC_FT_SOURCE);
     Rectangle aRect=GetItemRect(TBC_FT_SOURCE);
     aFtSource.SetText(aStr);
     aFtSource.SetSizePixel(aRect.GetSize());
@@ -377,7 +376,7 @@ void BibToolBar::ClearFilterMenu()
     aPopupMenu.Clear();
     nMenuId=0;
 }
-sal_uInt16 BibToolBar::InsertFilterItem(const XubString& aMenuEntry)
+sal_uInt16 BibToolBar::InsertFilterItem(const OUString& aMenuEntry)
 {
     nMenuId++;
     aPopupMenu.InsertItem(nMenuId,aMenuEntry);
@@ -407,12 +406,12 @@ void BibToolBar::UpdateSourceList(sal_Bool bFlag)
     aLBSource.SetUpdateMode(bFlag);
 }
 
-void BibToolBar::InsertSourceEntry(const XubString& aEntry, sal_uInt16 nPos)
+void BibToolBar::InsertSourceEntry(const OUString& aEntry, sal_uInt16 nPos)
 {
     aLBSource.InsertEntry(aEntry, nPos);
 }
 
-void BibToolBar::SelectSourceEntry(const XubString& aStr)
+void BibToolBar::SelectSourceEntry(const OUString& aStr)
 {
     aLBSource.SelectEntry(aStr);
 }
@@ -423,7 +422,7 @@ void BibToolBar::EnableQuery(sal_Bool bFlag)
     aEdQuery.Enable(bFlag);
 }
 
-void BibToolBar::SetQueryString(const XubString& aStr)
+void BibToolBar::SetQueryString(const OUString& aStr)
 {
     aEdQuery.SetText(aStr);
 }
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 877931c8a1a5..b7cc0f5bba26 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -156,15 +156,15 @@ class BibToolBar:   public ToolBox
         void    ClearSourceList();
         void    UpdateSourceList(sal_Bool bFlag=sal_True);
         void    EnableSourceList(sal_Bool bFlag=sal_True);
-        void    InsertSourceEntry(const XubString&,sal_uInt16 nPos=LISTBOX_APPEND );
-        void    SelectSourceEntry(const XubString& );
+        void    InsertSourceEntry(const OUString&,sal_uInt16 nPos=LISTBOX_APPEND );
+        void    SelectSourceEntry(const OUString& );
 
         void    EnableQuery(sal_Bool bFlag=sal_True);
-        void    SetQueryString(const XubString& );
+        void    SetQueryString(const OUString& );
         void    AdjustToolBox();
 
         void    ClearFilterMenu();
-        sal_uInt16  InsertFilterItem(const XubString& );
+        sal_uInt16  InsertFilterItem(const OUString& );
         void    SelectFilterItem(sal_uInt16 nId);
 
         void    statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index d88fdadc632d..3e9d0311dda7 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -256,7 +256,7 @@ namespace pcr
     }
 
     //------------------------------------------------------------------
-    void OBrowserLine::SetTitle(const XubString& _rNewTtile )
+    void OBrowserLine::SetTitle(const OUString& _rNewTtile )
     {
         if ( GetTitle() == _rNewTtile )
             return;
@@ -291,7 +291,7 @@ namespace pcr
     }
 
     //------------------------------------------------------------------
-    XubString OBrowserLine::GetTitle() const
+    OUString OBrowserLine::GetTitle() const
     {
         OUString sDisplayName = m_aFtTitle.GetText();
 
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index c137198e753b..32c34627fe7a 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -85,9 +85,9 @@ namespace pcr
 
         void                SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId );
 
-        void                SetTitle(const String& rString );
+        void                SetTitle(const OUString& rString );
         void                FullFillTitleString();
-        String              GetTitle() const;
+        OUString            GetTitle() const;
         void                SetTitleWidth(sal_uInt16);
 
         void                SetPosSizePixel(Point aPos,Size aSize);
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 57861a76e691..7f1ec03e428f 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -90,8 +90,8 @@ class BubbleWindow : public FloatingWindow
     Region          maBounds;
     Polygon         maRectPoly;
     Polygon         maTriPoly;
-    XubString       maBubbleTitle;
-    XubString       maBubbleText;
+    OUString        maBubbleTitle;
+    OUString        maBubbleText;
     Image           maBubbleImage;
     Size            maMaxTextSize;
     Rectangle       maTitleRect;
@@ -102,8 +102,8 @@ private:
     void            RecalcTextRects();
 
 public:
-                    BubbleWindow( Window* pParent, const XubString& rTitle,
-                                  const XubString& rText, const Image& rImage );
+                    BubbleWindow( Window* pParent, const OUString& rTitle,
+                                  const OUString& rText, const Image& rImage );
                    ~BubbleWindow();
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
@@ -111,7 +111,7 @@ public:
     void            Resize();
     void            Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = SHOW_NOACTIVATE );
     void            SetTipPosPixel( const Point& rTipPos ) { maTipPos = rTipPos; }
-    void            SetTitleAndText( const XubString& rTitle, const XubString& rText,
+    void            SetTitleAndText( const OUString& rTitle, const OUString& rText,
                                      const Image& rImage );
 };
 
@@ -552,15 +552,12 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow()
     BubbleWindow* pBubbleWin = mpBubbleWin;
 
     if ( !pBubbleWin ) {
-        pBubbleWin = new BubbleWindow( mpIconSysWin,
-                                         XubString( maBubbleTitle ),
-                                       XubString( maBubbleText ),
-                                       maBubbleImage );
+        pBubbleWin = new BubbleWindow( mpIconSysWin, maBubbleTitle,
+                                       maBubbleText, maBubbleImage );
         mbBubbleChanged = false;
     }
     else if ( mbBubbleChanged ) {
-        pBubbleWin->SetTitleAndText( XubString( maBubbleTitle ),
-                                     XubString( maBubbleText ),
+        pBubbleWin->SetTitleAndText( maBubbleTitle, maBubbleText,
                                      maBubbleImage );
         mbBubbleChanged = false;
     }
@@ -784,8 +781,8 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent)
 #define TEXT_MAX_HEIGHT       200
 
 //------------------------------------------------------------------------------
-BubbleWindow::BubbleWindow( Window* pParent, const XubString& rTitle,
-                            const XubString& rText, const Image& rImage )
+BubbleWindow::BubbleWindow( Window* pParent, const OUString& rTitle,
+                            const OUString& rText, const Image& rImage )
     : FloatingWindow( pParent, WB_SYSTEMWINDOW
                                | WB_OWNERDRAWDECORATION
                                | WB_NOBORDER
@@ -836,8 +833,8 @@ void BubbleWindow::Resize()
 }
 
 //------------------------------------------------------------------------------
-void BubbleWindow::SetTitleAndText( const XubString& rTitle,
-                                    const XubString& rText,
+void BubbleWindow::SetTitleAndText( const OUString& rTitle,
+                                    const OUString& rText,
                                     const Image& rImage )
 {
     maBubbleTitle = rTitle;
@@ -905,7 +902,7 @@ void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags )
     }
 
     // don't show bubbles without a text
-    if ( ( maBubbleTitle.Len() == 0 ) && ( maBubbleText.Len() == 0 ) )
+    if ( ( maBubbleTitle.isEmpty() ) && ( maBubbleText.isEmpty() ) )
         return;
 
     Size aWindowSize = GetSizePixel();