convert sfx2/source/appl/newhelp.hxx from String to OUString

Change-Id: I6991c168b5732dc228c113c5a834a43f691c0eed

sfx2/source/appl/newhelp.cxx

@@ -405,7 +405,7 @@ long ContentListBox_Impl::Notify( NotifyEvent& rNEvt )
 
 // -----------------------------------------------------------------------
 
-String ContentListBox_Impl::GetSelectEntry() const
+OUString ContentListBox_Impl::GetSelectEntry() const
 {
     String aRet;
     SvTreeListEntry* pEntry = FirstSelected();
@@ -716,7 +716,7 @@ void IndexTabPage_Impl::InitializeIndex()
 
     aIndexCB.SetUpdateMode( sal_True );
 
-    if ( sKeyword.Len() > 0 )
+    if ( !sKeyword.isEmpty() )
         aKeywordLink.Call( this );
 }
 
@@ -747,7 +747,7 @@ IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer )
 {
     if ( &aFactoryTimer == pTimer )
         InitializeIndex();
-    else if ( &aKeywordTimer == pTimer && sKeyword.Len() > 0 )
+    else if ( &aKeywordTimer == pTimer && !sKeyword.isEmpty() )
         aKeywordLink.Call( this );
     return 0;
 }
@@ -812,13 +812,13 @@ void IndexTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 
 // -----------------------------------------------------------------------
 
-void IndexTabPage_Impl::SetFactory( const String& rFactory )
+void IndexTabPage_Impl::SetFactory( const OUString& rFactory )
 {
-    String sNewFactory( rFactory );
-    DBG_ASSERT( sNewFactory.Len() > 0, "empty factory" );
+    OUString sNewFactory( rFactory );
+    DBG_ASSERT( !sNewFactory.isEmpty(), "empty factory" );
     bool bValid = m_pIdxWin->IsValidFactory( rFactory );
 
-    if ( sFactory.Len() == 0 && !bValid )
+    if ( sFactory.isEmpty() && !bValid )
     {
         sNewFactory = SfxHelp::GetDefaultHelpModule();
         bValid = true;
@@ -835,7 +835,7 @@ void IndexTabPage_Impl::SetFactory( const String& rFactory )
 
 // -----------------------------------------------------------------------
 
-String IndexTabPage_Impl::GetSelectEntry() const
+OUString IndexTabPage_Impl::GetSelectEntry() const
 {
     String aRet;
     IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(sal_uIntPtr)aIndexCB.GetEntryData( aIndexCB.GetEntryPos( aIndexCB.GetText() ) );
@@ -846,7 +846,7 @@ String IndexTabPage_Impl::GetSelectEntry() const
 
 // -----------------------------------------------------------------------
 
-void IndexTabPage_Impl::SetKeyword( const String& rKeyword )
+void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword )
 {
     sKeyword = rKeyword;
 
@@ -861,7 +861,7 @@ void IndexTabPage_Impl::SetKeyword( const String& rKeyword )
 sal_Bool IndexTabPage_Impl::HasKeyword() const
 {
     sal_Bool bRet = sal_False;
-    if ( sKeyword.Len() > 0 )
+    if ( !sKeyword.isEmpty() )
     {
         sal_uInt16 nPos = aIndexCB.GetEntryPos( sKeyword );
         bRet = ( nPos != LISTBOX_ENTRY_NOTFOUND );
@@ -875,7 +875,7 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const
 sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
 {
     sal_Bool bRet = sal_False;
-    if ( sKeyword.Len() > 0 )
+    if ( !sKeyword.isEmpty() )
     {
         sal_uInt16 nEntries = aIndexCB.GetEntryCount();
         String sIndexItem;
@@ -898,11 +898,11 @@ sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
 
 void IndexTabPage_Impl::OpenKeyword()
 {
-    if ( sKeyword.Len() > 0 )
+    if ( !sKeyword.isEmpty() )
     {
         aIndexCB.SetText( sKeyword );
         aIndexCB.GetDoubleClickHdl().Call( NULL );
-        sKeyword.Erase();
+        sKeyword = "";
     }
 }
 
@@ -1037,7 +1037,7 @@ void SearchTabPage_Impl::ClearSearchResults()
 
 // -----------------------------------------------------------------------
 
-void SearchTabPage_Impl::RememberSearchText( const String& rSearchText )
+void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText )
 {
     for ( sal_uInt16 i = 0; i < aSearchED.GetEntryCount(); ++i )
     {
@@ -1177,7 +1177,7 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 
 // -----------------------------------------------------------------------
 
-String SearchTabPage_Impl::GetSelectEntry() const
+OUString SearchTabPage_Impl::GetSelectEntry() const
 {
     String aRet;
     String* pData = (String*)(sal_uIntPtr)aResultsLB.GetEntryData( aResultsLB.GetSelectEntryPos() );
@@ -1196,7 +1196,7 @@ void SearchTabPage_Impl::ClearPage()
 
 // -----------------------------------------------------------------------
 
-sal_Bool SearchTabPage_Impl::OpenKeyword( const String& rKeyword )
+sal_Bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword )
 {
     sal_Bool bRet = sal_False;
     aSearchED.SetText( rKeyword );
@@ -1439,18 +1439,18 @@ void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 
 // -----------------------------------------------------------------------
 
-String BookmarksTabPage_Impl::GetSelectEntry() const
+OUString BookmarksTabPage_Impl::GetSelectEntry() const
 {
-    String aRet;
+    OUString aRet;
     String* pData = (String*)(sal_uIntPtr)aBookmarksBox.GetEntryData( aBookmarksBox.GetSelectEntryPos() );
     if ( pData )
-        aRet = String( *pData );
+        aRet = *pData;
     return aRet;
 }
 
 // -----------------------------------------------------------------------
 
-void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rURL )
+void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString& rURL )
 {
     OUString aImageURL = IMAGE_URL;
     aImageURL += INetURLObject( rURL ).GetHost();
@@ -1848,9 +1848,9 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link& rLink )
 
 // -----------------------------------------------------------------------
 
-void SfxHelpIndexWindow_Impl::SetFactory( const String& rFactory, sal_Bool bActive )
+void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, sal_Bool bActive )
 {
-    if ( rFactory.Len() > 0 )
+    if ( !rFactory.isEmpty() )
     {
         GetIndexPage()->SetFactory( rFactory );
         // the index page did a check if rFactory is valid,
@@ -1863,9 +1863,9 @@ void SfxHelpIndexWindow_Impl::SetFactory( const String& rFactory, sal_Bool bActi
 
 // -----------------------------------------------------------------------
 
-String SfxHelpIndexWindow_Impl::GetSelectEntry() const
+OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const
 {
-    String sRet;
+    OUString sRet;
 
     switch ( aTabCtrl.GetCurPageId() )
     {
@@ -1891,14 +1891,14 @@ String SfxHelpIndexWindow_Impl::GetSelectEntry() const
 
 // -----------------------------------------------------------------------
 
-void SfxHelpIndexWindow_Impl::AddBookmarks( const String& rTitle, const String& rURL )
+void SfxHelpIndexWindow_Impl::AddBookmarks( const OUString& rTitle, const OUString& rURL )
 {
     GetBookmarksPage()->AddBookmarks( rTitle, rURL );
 }
 
 // -----------------------------------------------------------------------
 
-bool SfxHelpIndexWindow_Impl::IsValidFactory( const String& _rFactory )
+bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory )
 {
     bool bValid = false;
     for ( sal_uInt16 i = 0; i < aActiveLB.GetEntryCount(); ++i )
@@ -1949,7 +1949,7 @@ sal_Bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const
 
 // -----------------------------------------------------------------------
 
-String SfxHelpIndexWindow_Impl::GetSearchText() const
+OUString SfxHelpIndexWindow_Impl::GetSearchText() const
 {
     String sRet;
     if ( aTabCtrl.GetCurPageId() == HELP_INDEX_PAGE_SEARCH && pSPage )
@@ -1969,7 +1969,7 @@ sal_Bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const
 
 // -----------------------------------------------------------------------
 
-void SfxHelpIndexWindow_Impl::OpenKeyword( const String& rKeyword )
+void SfxHelpIndexWindow_Impl::OpenKeyword( const OUString& rKeyword )
 {
     sKeyword = rKeyword;
     DBG_ASSERT( pIPage, "invalid index page" );
@@ -2683,7 +2683,7 @@ void SfxHelpTextWindow_Impl::ToggleIndex( sal_Bool bOn )
 
 // -----------------------------------------------------------------------
 
-void SfxHelpTextWindow_Impl::SelectSearchText( const String& rSearchText, sal_Bool _bIsFullWordSearch )
+void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, sal_Bool _bIsFullWordSearch )
 {
     aSearchText = rSearchText;
     bIsFullWordSearch = _bIsFullWordSearch;
@@ -3227,14 +3227,14 @@ void SfxHelpWindow_Impl::setContainerWindow( Reference < ::com::sun::star::awt::
 
 // -----------------------------------------------------------------------
 
-void SfxHelpWindow_Impl::SetFactory( const String& rFactory )
+void SfxHelpWindow_Impl::SetFactory( const OUString& rFactory )
 {
     pIndexWin->SetFactory( rFactory, sal_True );
 }
 
 // -----------------------------------------------------------------------
 
-void SfxHelpWindow_Impl::SetHelpURL( const String& rURL )
+void SfxHelpWindow_Impl::SetHelpURL( const OUString& rURL )
 {
     INetURLObject aObj( rURL );
     if ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP )
@@ -3418,10 +3418,10 @@ SfxAddHelpBookmarkDialog_Impl::~SfxAddHelpBookmarkDialog_Impl()
 
 // -----------------------------------------------------------------------
 
-void SfxAddHelpBookmarkDialog_Impl::SetTitle( const String& rTitle )
+void SfxAddHelpBookmarkDialog_Impl::SetTitle( const OUString& rTitle )
 {
     aTitleED.SetText( rTitle );
-    aTitleED.SetSelection( Selection( 0, rTitle.Len() ) );
+    aTitleED.SetSelection( Selection( 0, rTitle.getLength() ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sfx2/source/appl/newhelp.hxx

@@ -52,7 +52,7 @@ private:
     sal_Bool    m_bFinished;
     sal_Bool    m_bSuccess;
     Link        m_aOpenLink;
-    String      m_sURL;
+    OUString    m_sURL;
 
 public:
     OpenStatusListener_Impl() : m_bFinished( sal_False ), m_bSuccess( sal_False ) {}
@@ -62,8 +62,8 @@ public:
 
     inline sal_Bool         IsFinished() const { return m_bFinished; }
     inline sal_Bool         IsSuccessful() const { return m_bSuccess; }
-    inline void             SetURL( const String& rURL ) { m_sURL = rURL; }
-    inline String           GetURL() const  { return m_sURL; }
+    inline void             SetURL( const OUString& rURL ) { m_sURL = rURL; }
+    inline OUString         GetURL() const  { return m_sURL; }
     inline void             SetOpenHdl( const Link& rLink ) { m_aOpenLink = rLink; }
 };
 
@@ -88,7 +88,7 @@ public:
     virtual long    Notify( NotifyEvent& rNEvt );
 
     inline void     SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); }
-    String          GetSelectEntry() const;
+    OUString        GetSelectEntry() const;
 };
 
 // class HelpTabPage_Impl ------------------------------------------------
@@ -121,7 +121,7 @@ public:
     virtual Control*    GetLastFocusControl();
 
     inline void     SetOpenHdl( const Link& rLink ) { aContentBox.SetOpenHdl( rLink ); }
-    inline String   GetSelectEntry() const { return aContentBox.GetSelectEntry(); }
+    inline OUString GetSelectEntry() const { return aContentBox.GetSelectEntry(); }
     inline void     SetFocusOnBox() { aContentBox.GrabFocus(); }
 };
 
@@ -149,8 +149,8 @@ private:
     Timer               aKeywordTimer;
     Link                aKeywordLink;
 
-    String              sFactory;
-    String              sKeyword;
+    OUString            sFactory;
+    OUString            sKeyword;
 
     long                nMinWidth;
     sal_Bool            bIsActivated;
@@ -170,14 +170,14 @@ public:
     virtual Control*    GetLastFocusControl();
 
     void                SetDoubleClickHdl( const Link& rLink );
-    void                SetFactory( const String& rFactory );
-    inline String       GetFactory() const { return sFactory; }
-    String              GetSelectEntry() const;
+    void                SetFactory( const OUString& rFactory );
+    inline OUString     GetFactory() const { return sFactory; }
+    OUString            GetSelectEntry() const;
     inline void         SetFocusOnBox() { aIndexCB.GrabFocus(); }
     inline sal_Bool     HasFocusOnEdit() const { return aIndexCB.HasChildPathFocus(); }
 
     inline void         SetKeywordHdl( const Link& rLink ) { aKeywordLink = rLink; }
-    void                SetKeyword( const String& rKeyword );
+    void                SetKeyword( const OUString& rKeyword );
     sal_Bool            HasKeyword() const;
     sal_Bool            HasKeywordIgnoreCase();
     void                OpenKeyword();
@@ -222,13 +222,13 @@ private:
     PushButton              aOpenBtn;
 
     Size                    aMinSize;
-    String                  aFactory;
+    OUString                aFactory;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
                             xBreakIterator;
 
     void                ClearSearchResults();
-    void                RememberSearchText( const String& rSearchText );
+    void                RememberSearchText( const OUString& rSearchText );
 
     DECL_LINK(SearchHdl, void *);
     DECL_LINK(OpenHdl, void *);
@@ -243,14 +243,14 @@ public:
     virtual Control*    GetLastFocusControl();
 
     void                SetDoubleClickHdl( const Link& rLink );
-    inline void         SetFactory( const String& rFactory ) { aFactory = rFactory; }
-    String              GetSelectEntry() const;
+    inline void         SetFactory( const OUString& rFactory ) { aFactory = rFactory; }
+    OUString            GetSelectEntry() const;
     void                ClearPage();
     inline void         SetFocusOnBox() { aResultsLB.GrabFocus(); }
     inline sal_Bool     HasFocusOnEdit() const { return aSearchED.HasChildPathFocus(); }
-    inline String       GetSearchText() const { return aSearchED.GetText(); }
+    inline OUString     GetSearchText() const { return aSearchED.GetText(); }
     inline sal_Bool     IsFullWordSearch() const { return aFullWordsCB.IsChecked(); }
-    sal_Bool            OpenKeyword( const String& rKeyword );
+    sal_Bool            OpenKeyword( const OUString& rKeyword );
 };
 
 // class BookmarksTabPage_Impl -------------------------------------------
@@ -286,8 +286,8 @@ public:
     virtual Control*    GetLastFocusControl();
 
     void                SetDoubleClickHdl( const Link& rLink );
-    String              GetSelectEntry() const;
-    void                AddBookmarks( const String& rTitle, const String& rURL );
+    OUString            GetSelectEntry() const;
+    void                AddBookmarks( const OUString& rTitle, const OUString& rURL );
     inline void         SetFocusOnBox() { aBookmarksBox.GrabFocus(); }
 };
 
@@ -307,7 +307,7 @@ private:
     Link                aSelectFactoryLink;
     Link                aPageDoubleClickLink;
     Link                aIndexKeywordLink;
-    String              sKeyword;
+    OUString            sKeyword;
 
     SfxHelpWindow_Impl*     pParentWin;
 
@@ -345,19 +345,19 @@ public:
 
     void                SetDoubleClickHdl( const Link& rLink );
     inline void         SetSelectFactoryHdl( const Link& rLink ) { aSelectFactoryLink = rLink; }
-    void                SetFactory( const String& rFactory, sal_Bool bActive );
-    inline String       GetFactory() const { return pIPage->GetFactory(); }
-    String              GetSelectEntry() const;
-    void                AddBookmarks( const String& rTitle, const String& rURL );
-    bool                IsValidFactory( const String& _rFactory );
-    inline String       GetActiveFactoryTitle() const { return aActiveLB.GetSelectEntry(); }
+    void                SetFactory( const OUString& rFactory, sal_Bool bActive );
+    inline OUString     GetFactory() const { return pIPage->GetFactory(); }
+    OUString            GetSelectEntry() const;
+    void                AddBookmarks( const OUString& rTitle, const OUString& rURL );
+    bool                IsValidFactory( const OUString& _rFactory );
+    inline OUString     GetActiveFactoryTitle() const { return aActiveLB.GetSelectEntry(); }
     inline void         UpdateTabControl() { aTabCtrl.Invalidate(); }
     void                ClearSearchPage();
     void                GrabFocusBack();
     sal_Bool            HasFocusOnEdit() const;
-    String              GetSearchText() const;
+    OUString            GetSearchText() const;
     sal_Bool            IsFullWordSearch() const;
-    void                OpenKeyword( const String& rKeyword );
+    void                OpenKeyword( const OUString& rKeyword );
     void                SelectExecutableEntry();
     inline bool         WasCursorLeftOrRight();
 };
@@ -435,11 +435,11 @@ private:
     Timer                   aSelectTimer;
     Image                   aIndexOnImage;
     Image                   aIndexOffImage;
-    String                  aIndexOnText;
-    String                  aIndexOffText;
-    String                  aSearchText;
-    String                  aOnStartupText;
-    OUString         sCurrentFactory;
+    OUString                aIndexOnText;
+    OUString                aIndexOffText;
+    OUString                aSearchText;
+    OUString                aOnStartupText;
+    OUString                sCurrentFactory;
 
     SfxHelpWindow_Impl*     pHelpWin;
     Window*                 pTextWin;
@@ -487,7 +487,7 @@ public:
 
     inline void             SetSelectHdl( const Link& rLink ) { aToolBox.SetSelectHdl( rLink ); }
     void                    ToggleIndex( sal_Bool bOn );
-    void                    SelectSearchText( const String& rSearchText, sal_Bool _bIsFullWordSearch );
+    void                    SelectSearchText( const OUString& rSearchText, sal_Bool _bIsFullWordSearch );
     void                    SetPageStyleHeaderOff() const;
     inline ToolBox&         GetToolBox() { return aToolBox; }
      void                   CloseFrame();
@@ -524,7 +524,7 @@ friend class SfxHelpIndexWindow_Impl;
     sal_Bool            bGrabFocusToToolBox;
     Point               aWinPos;
     OUString            sTitle;
-    String              sKeyword;
+    OUString            sKeyword;
 
     virtual void        Resize();
     virtual void        Split();
@@ -555,14 +555,14 @@ public:
     inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchResultListener >
                         getOpenListener() const { return xOpenListener; }
 
-    void                SetFactory( const String& rFactory );
-    void                SetHelpURL( const String& rURL );
+    void                SetFactory( const OUString& rFactory );
+    void                SetHelpURL( const OUString& rURL );
     void                DoAction( sal_uInt16 nActionId );
     void                CloseWindow();
 
     void                UpdateToolbox();
-    inline void         OpenKeyword( const String& rKeyword ) { pIndexWin->OpenKeyword( rKeyword ); }
-    inline String       GetFactory() const { return pIndexWin->GetFactory(); }
+    inline void         OpenKeyword( const OUString& rKeyword ) { pIndexWin->OpenKeyword( rKeyword ); }
+    inline OUString     GetFactory() const { return pIndexWin->GetFactory(); }
 
     sal_Bool            HasHistoryPredecessor() const;      // forward to interceptor
     sal_Bool            HasHistorySuccessor() const;        // forward to interceptor
@@ -592,8 +592,8 @@ public:
     SfxAddHelpBookmarkDialog_Impl( Window* pParent, sal_Bool bRename = sal_True );
     ~SfxAddHelpBookmarkDialog_Impl();
 
-    void            SetTitle( const String& rTitle );
-    inline String   GetTitle() const { return aTitleED.GetText(); }
+    void            SetTitle( const OUString& rTitle );
+    inline OUString GetTitle() const { return aTitleED.GetText(); }
 };
 
 /// Appends ?Language=xy&System=abc to the help URL in rURL