convert sfx2/source/dialog/* from String to OUString

Change-Id: Ifa4c7ac957ea0c329cbe867c116465bcfb4f314e

sfx2/source/appl/childwin.cxx

@@ -99,16 +99,16 @@ class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::
 
 // -----------------------------------------------------------------------
 
-sal_Bool GetPosSizeFromString( const String& rStr, Point& rPos, Size& rSize )
+sal_Bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize )
 {
     if ( comphelper::string::getTokenCount(rStr, '/') != 4 )
         return sal_False;
 
     sal_Int32 nIdx = 0;
-    rPos.X() = rStr.GetToken(0, '/', nIdx).ToInt32();
-    rPos.Y() = rStr.GetToken(0, '/', nIdx).ToInt32();
-    rSize.Width() = rStr.GetToken(0, '/', nIdx).ToInt32();
-    rSize.Height() = rStr.GetToken(0, '/', nIdx).ToInt32();
+    rPos.X() = rStr.getToken(0, '/', nIdx).toInt32();
+    rPos.Y() = rStr.getToken(0, '/', nIdx).toInt32();
+    rSize.Width() = rStr.getToken(0, '/', nIdx).toInt32();
+    rSize.Height() = rStr.getToken(0, '/', nIdx).toInt32();
 
     // negative sizes are invalid
     if ( rSize.Width() < 0 || rSize.Height() < 0 )
@@ -117,19 +117,19 @@ sal_Bool GetPosSizeFromString( const String& rStr, Point& rPos, Size& rSize )
     return sal_True;
 }
 
-sal_Bool GetSplitSizeFromString( const String& rStr, Size& rSize )
+sal_Bool GetSplitSizeFromString( const OUString& rStr, Size& rSize )
 {
-    xub_StrLen nIndex = rStr.Search( ',' );
-    if ( nIndex != STRING_NOTFOUND )
+    sal_Int32 nIndex = rStr.indexOf( ',' );
+    if ( nIndex != -1 )
     {
-        String aStr = rStr.Copy( nIndex+1 );
+        OUString aStr = rStr.copy( nIndex+1 );
 
         sal_Int32 nCount = comphelper::string::getTokenCount(aStr, ';');
         if ( nCount != 2 )
             return sal_False;
 
-        rSize.Width() = aStr.GetToken(0, ';' ).ToInt32();
-        rSize.Height() = aStr.GetToken(1, ';' ).ToInt32();
+        rSize.Width() = aStr.getToken(0, ';' ).toInt32();
+        rSize.Height() = aStr.getToken(1, ';' ).toInt32();
 
         // negative sizes are invalid
         if ( rSize.Width() < 0 || rSize.Height() < 0 )

sfx2/source/dialog/basedlgs.cxx

@@ -124,7 +124,7 @@ void SfxModalDialog::GetDialogData_Impl()
         Any aUserItem = aDlgOpt.GetUserItem( USERITEM_NAME );
         OUString aTemp;
         if ( aUserItem >>= aTemp )
-            aExtraData = String( aTemp );
+            aExtraData = aTemp;
     }
 }
 
@@ -686,7 +686,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialogBase, OKHdl_Impl)
     {
         // Save user data in IniManager.
         pImpl->m_pSfxPage->FillUserData();
-        String sData( pImpl->m_pSfxPage->GetUserData() );
+        OUString sData( pImpl->m_pSfxPage->GetUserData() );
         SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( GetUniqId() ) );
         aPageOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( sData ) ) );
         EndDialog( RET_OK );
@@ -855,11 +855,11 @@ void SfxNoLayoutSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
     {
         // First obtain the user data, only then Reset()
         SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( GetUniqId() ) );
-        String sUserData;
+        OUString sUserData;
         Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
         OUString aTemp;
         if ( aUserItem >>= aTemp )
-            sUserData = String( aTemp );
+            sUserData = aTemp;
         pImpl->m_pSfxPage->SetUserData( sUserData );
         pImpl->m_pSfxPage->Reset( *GetInputItemSet() );
         pImpl->m_pSfxPage->Show();

sfx2/source/dialog/dockwin.cxx

@@ -54,8 +54,8 @@
 using namespace ::com::sun::star;
 
 // implemented in 'sfx2/source/appl/childwin.cxx'
-extern sal_Bool GetPosSizeFromString( const String& rStr, Point& rPos, Size& rSize );
-extern sal_Bool GetSplitSizeFromString( const String& rStr, Size& rSize );
+extern sal_Bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize );
+extern sal_Bool GetSplitSizeFromString( const OUString& rStr, Size& rSize );
 
 // If you want to change the number you also have to:
 // - Add new slot ids to sfxsids.hrc

sfx2/source/dialog/filtergrouping.cxx

@@ -454,7 +454,7 @@ namespace sfx2
         ::std::vector< OUString > aWildCards;
 
     public:
-        AppendWildcardToDescriptor( const String& _rWildCard );
+        AppendWildcardToDescriptor( const OUString& _rWildCard );
 
         // operate on a single class entry
         void operator() ( const FilterGroupEntryReferrer::value_type& _rClassReference )
@@ -469,17 +469,17 @@ namespace sfx2
     };
 
     //====================================================================
-    AppendWildcardToDescriptor::AppendWildcardToDescriptor( const String& _rWildCard )
+    AppendWildcardToDescriptor::AppendWildcardToDescriptor( const OUString& _rWildCard )
     {
-        DBG_ASSERT( _rWildCard.Len(),
+        DBG_ASSERT( !_rWildCard.isEmpty(),
             "AppendWildcardToDescriptor::AppendWildcardToDescriptor: invalid wildcard!" );
-        DBG_ASSERT( _rWildCard.GetBuffer()[0] != s_cWildcardSeparator,
+        DBG_ASSERT( _rWildCard[0] != s_cWildcardSeparator,
             "AppendWildcardToDescriptor::AppendWildcardToDescriptor: wildcard already separated!" );
 
         aWildCards.reserve( comphelper::string::getTokenCount(_rWildCard, s_cWildcardSeparator) );
 
-        const sal_Unicode* pTokenLoop = _rWildCard.GetBuffer();
-        const sal_Unicode* pTokenLoopEnd = pTokenLoop + _rWildCard.Len();
+        const sal_Unicode* pTokenLoop = _rWildCard.getStr();
+        const sal_Unicode* pTokenLoopEnd = pTokenLoop + _rWildCard.getLength();
         const sal_Unicode* pTokenStart = pTokenLoop;
         for ( ; pTokenLoop != pTokenLoopEnd; ++pTokenLoop )
         {
@@ -610,9 +610,9 @@ namespace sfx2
         // the group which we currently work with
         GroupedFilterList::iterator aCurrentGroup = _rAllFilters.end(); // no current group
         // the filter container of the current group - if this changes between two filters, a new group is reached
-        String aCurrentServiceName;
+        OUString aCurrentServiceName;
 
-        String sFilterWildcard;
+        OUString sFilterWildcard;
         OUString sFilterName;
         // loop through all the filters
         for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter; pFilter = _rFilterMatcher.Next() )
@@ -621,11 +621,11 @@ namespace sfx2
             sFilterWildcard = pFilter->GetWildcard().getGlob();
             AppendWildcardToDescriptor aExtendWildcard( sFilterWildcard );
 
-            DBG_ASSERT( sFilterWildcard.Len(), "sfx2::lcl_GroupAndClassify: invalid wildcard of this filter!" );
+            DBG_ASSERT( !sFilterWildcard.isEmpty(), "sfx2::lcl_GroupAndClassify: invalid wildcard of this filter!" );
 
             // ===========================================================
             // check for a change in the group
-            String aServiceName = pFilter->GetServiceName();
+            OUString aServiceName = pFilter->GetServiceName();
             if ( aServiceName != aCurrentServiceName )
             {   // we reached a new group
 
@@ -692,7 +692,7 @@ namespace sfx2
                     // within the "real" group (aCollectedLocals is only temporary)
                     // -> do this now (as we just encountered the first filter belonging to this local class
                     // add a new entry which is the "real" group entry
-                    aCurrentGroup->push_back( FilterDescriptor( aBelongsToLocal->second->First, String() ) );
+                    aCurrentGroup->push_back( FilterDescriptor( aBelongsToLocal->second->First, OUString() ) );
                     // the position where we inserted the entry
                     FilterGroup::iterator aInsertPos = aCurrentGroup->end();
                     --aInsertPos;
@@ -750,7 +750,7 @@ namespace sfx2
             // operate on a single filter
             void operator() ( const FilterDescriptor& _rFilterEntry )
             {
-                String sDisplayText = m_bAddExtension
+                OUString sDisplayText = m_bAddExtension
                     ? addExtension( _rFilterEntry.First, _rFilterEntry.Second, sal_True, *m_pFileDlgImpl )
                     : _rFilterEntry.First;
                 m_xFilterManager->appendFilter( sDisplayText, _rFilterEntry.Second );
@@ -762,7 +762,7 @@ namespace sfx2
 // =======================================================================
 
     //--------------------------------------------------------------------
-    sal_Bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, String& /* [out] */ _rAllFilterName )
+    sal_Bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName )
     {
         sal_Bool        bHasAll = sal_False;
         _rAllFilterName = SfxResId( STR_SFX_FILTERNAME_ALL ).toString();
@@ -781,7 +781,7 @@ namespace sfx2
     void lcl_EnsureAllFilesEntry( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rFilters )
     {
         // ===============================================================
-        String sAllFilterName;
+        OUString sAllFilterName;
         if ( !lcl_hasAllFilesFilter( _rFilterMatcher, sAllFilterName ) )
         {
             // get the first group of filters (by definition, this group contains the global classes)
@@ -1182,7 +1182,7 @@ namespace sfx2
 
         if ( sRet.indexOf( sAllFilter ) == -1 )
         {
-            String sExt = _rExtension;
+            OUString sExt = _rExtension;
             if ( !_bForOpen )
             {
                 // show '*' in extensions only when opening a document

sfx2/source/dialog/mailmodel.cxx

@@ -930,15 +930,15 @@ sal_Bool CreateFromAddress_Impl( OUString& rFrom )
 
 {
     SvtUserOptions aUserCFG;
-    String aName        = aUserCFG.GetLastName  ();
-    String aFirstName   = aUserCFG.GetFirstName ();
-    if ( aFirstName.Len() || aName.Len() )
+    OUString aName        = aUserCFG.GetLastName  ();
+    OUString aFirstName   = aUserCFG.GetFirstName ();
+    if ( !aFirstName.isEmpty() || !aName.isEmpty() )
     {
-        if ( aFirstName.Len() )
+        if ( !aFirstName.isEmpty() )
         {
             rFrom = comphelper::string::strip(aFirstName, ' ');
 
-            if ( aName.Len() )
+            if ( !aName.isEmpty() )
                 rFrom += " ";
         }
         rFrom += comphelper::string::strip(aName, ' ');
@@ -947,13 +947,13 @@ sal_Bool CreateFromAddress_Impl( OUString& rFrom )
         rFrom = comphelper::string::remove(rFrom, '>');
         rFrom = comphelper::string::remove(rFrom, '@');
     }
-    String aEmailName = aUserCFG.GetEmail();
+    OUString aEmailName = aUserCFG.GetEmail();
 
     // remove illegal characters
     aEmailName = comphelper::string::remove(aEmailName, '<');
     aEmailName = comphelper::string::remove(aEmailName, '>');
 
-    if ( aEmailName.Len() )
+    if ( !aEmailName.isEmpty() )
     {
         if ( !rFrom.isEmpty() )
             rFrom += " ";

sfx2/source/dialog/mgetempl.cxx

@@ -89,9 +89,9 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemS
     if ( pStyle->GetName().isEmpty() && pPool )
     {
         // NullString as Name -> generate Name
-        String aNoName( SfxResId(STR_NONAME).toString() );
+        OUString aNoName( SfxResId(STR_NONAME).toString() );
         sal_uInt16 nNo = 1;
-        String aNo( aNoName );
+        OUString aNo( aNoName );
         aNoName += OUString::number( nNo );
         while ( pPool->Find( aNoName ) )
         {
@@ -147,7 +147,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemS
 
         while ( pPoolStyle )
         {
-            const String aStr( pPoolStyle->GetName() );
+            const OUString aStr( pPoolStyle->GetName() );
             // own name as base template
             if ( aStr != aName )
                 m_pBaseLb->InsertEntry( aStr );
@@ -336,7 +336,7 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
 */
 
 {
-    const String aStr(comphelper::string::stripStart(pEdit->GetText(), ' '));
+    const OUString aStr(comphelper::string::stripStart(pEdit->GetText(), ' '));
     pEdit->SetText( aStr );
     // Update the Listbox of the base template if possible
     if ( aStr != aBuf )
@@ -411,7 +411,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
 
 {
     bModified = sal_False;
-    String sCmp( pStyle->GetName() );
+    OUString sCmp( pStyle->GetName() );
 
     if ( sCmp != aName )
         pStyle->SetName( aName );

sfx2/source/dialog/newstyle.cxx

@@ -31,7 +31,7 @@
 IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
 {
     (void)pControl; //unused
-    const String aName( aColBox.GetText() );
+    const OUString aName( aColBox.GetText() );
     SfxStyleSheetBase* pStyle = rPool.Find( aName, rPool.GetSearchFamily(), SFXSTYLEBIT_ALL );
     if ( pStyle )
     {

sfx2/source/dialog/securitypage.cxx

@@ -96,7 +96,7 @@ namespace
 static short lcl_GetPassword(
     Window *pParent,
     bool bProtect,
-    /*out*/String &rPassword )
+    /*out*/OUString &rPassword )
 {
     bool bRes = false;
     SfxPasswordDialog aPasswdDlg( pParent );
@@ -112,7 +112,7 @@ static short lcl_GetPassword(
 }
 
 
-static bool lcl_IsPasswordCorrect( const String &rPassword )
+static bool lcl_IsPasswordCorrect( const OUString &rPassword )
 {
     bool bRes = false;
 
@@ -144,9 +144,9 @@ struct SfxSecurityPage_Impl
 
     bool                m_bOrigPasswordIsConfirmed;
     bool                m_bNewPasswordIsValid;
-    String              m_aNewPassword;
+    OUString            m_aNewPassword;
 
-    String              m_aEndRedliningWarning;
+    OUString            m_aEndRedliningWarning;
     bool                m_bEndRedliningWarningDone;
 
     DECL_LINK( RecordChangesCBToggleHdl, void* );
@@ -203,8 +203,8 @@ sal_Bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
             // sanity checks
             DBG_ASSERT( bDoRecordChanges || !bDoChangeProtection, "no change recording should imply no change protection" );
             DBG_ASSERT( bDoChangeProtection || !bDoRecordChanges, "no change protection should imply no change recording" );
-            DBG_ASSERT( !bDoChangeProtection || m_aNewPassword.Len() > 0, "change protection should imply password length is > 0" );
-            DBG_ASSERT( bDoChangeProtection || m_aNewPassword.Len() == 0, "no change protection should imply password length is 0" );
+            DBG_ASSERT( !bDoChangeProtection || !m_aNewPassword.isEmpty(), "change protection should imply password length is > 0" );
+            DBG_ASSERT( bDoChangeProtection || m_aNewPassword.isEmpty(), "no change protection should imply password length is 0" );
 
             // change recording
             if (bDoRecordChanges != pCurDocShell->IsChangeRecording())
@@ -348,7 +348,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl)
                 && m_pProtectPB->IsVisible();
         if (!bAlreadyDone && bNeedPasssword)
         {
-            String aPasswordText;
+            OUString aPasswordText;
 
             // dialog canceled or no password provided
             if (!lcl_GetPassword( m_rMyTabPage.GetParent(), false, aPasswordText ))
@@ -368,7 +368,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl)
             // remember required values to change protection and change recording in
             // FillItemSet_Impl later on if password was correct.
             m_bNewPasswordIsValid = true;
-            m_aNewPassword = String();
+            m_aNewPassword = "";
             m_pProtectPB->Show();
             m_pUnProtectPB->Hide();
         }
@@ -387,7 +387,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl)
     const bool bCurrentProtection = m_pUnProtectPB->IsVisible();
 
     // ask user for password (if still necessary)
-    String aPasswordText;
+    OUString aPasswordText;
     bool bNewProtection = !bCurrentProtection;
     const bool bNeedPassword = bNewProtection || !m_bOrigPasswordIsConfirmed;
     if (bNeedPassword)
@@ -410,7 +410,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl)
     // remember required values to change protection and change recording in
     // FillItemSet_Impl later on if password was correct.
     m_bNewPasswordIsValid = true;
-    m_aNewPassword = bNewProtection? aPasswordText : String();
+    m_aNewPassword = bNewProtection? aPasswordText : OUString();
 
     m_pRecordChangesCB->Check( bNewProtection );
 

sfx2/source/dialog/splitwin.cxx

@@ -264,34 +264,34 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     if ( bWithButtons )
     {
         //  Read Configuration
-        String aWindowId = OUString("SplitWindow");
+        OUString aWindowId("SplitWindow");
         aWindowId += OUString::number( (sal_Int32) eTbxAlign );
         SvtViewOptions aWinOpt( E_WINDOW, aWindowId );
-        String aWinData;
+        OUString aWinData;
         Any aUserItem = aWinOpt.GetUserItem( USERITEM_NAME );
         OUString aTemp;
         if ( aUserItem >>= aTemp )
-            aWinData = String( aTemp );
-        if ( aWinData.Len() && aWinData.GetChar( (sal_uInt16) 0 ) == 'V' )
+            aWinData = aTemp;
+        if ( !aWinData.isEmpty() && aWinData[0] == 'V' )
         {
-            pEmptyWin->nState = (sal_uInt16) aWinData.GetToken( 1, ',' ).ToInt32();
+            pEmptyWin->nState = (sal_uInt16) aWinData.getToken( 1, ',' ).toInt32();
             if ( pEmptyWin->nState & 2 )
                 pEmptyWin->bFadeIn = sal_True;
             bPinned = sal_True; // always assume pinned - floating mode not used anymore
 
             sal_uInt16 i=2;
-            sal_uInt16 nCount = (sal_uInt16) aWinData.GetToken(i++, ',').ToInt32();
+            sal_uInt16 nCount = (sal_uInt16) aWinData.getToken(i++, ',').toInt32();
             for ( sal_uInt16 n=0; n<nCount; n++ )
             {
                 SfxDock_Impl *pDock = new SfxDock_Impl;
                 pDock->pWin = 0;
                 pDock->bNewLine = sal_False;
                 pDock->bHide = sal_True;
-                pDock->nType = (sal_uInt16) aWinData.GetToken(i++, ',').ToInt32();
+                pDock->nType = (sal_uInt16) aWinData.getToken(i++, ',').toInt32();
                 if ( !pDock->nType )
                 {
                     // could mean NewLine
-                    pDock->nType = (sal_uInt16) aWinData.GetToken(i++, ',').ToInt32();
+                    pDock->nType = (sal_uInt16) aWinData.getToken(i++, ',').toInt32();
                     if ( !pDock->nType )
                     {
                         // Read error
@@ -367,7 +367,7 @@ void SfxSplitWindow::SaveConfig_Impl()
         aWinData.append(static_cast<sal_Int32>(pDock->nType));
     }
 
-    String aWindowId = OUString("SplitWindow");
+    OUString aWindowId("SplitWindow");
     aWindowId += OUString::number( (sal_Int32) GetAlign() );
     SvtViewOptions aWinOpt( E_WINDOW, aWindowId );
     aWinOpt.SetUserItem( USERITEM_NAME, makeAny( aWinData.makeStringAndClear() ) );

sfx2/source/dialog/srchdlg.cxx

@@ -87,18 +87,18 @@ void SearchDialog::LoadConfig()
         OUString aTemp;
         if ( aUserItem >>= aTemp )
         {
-            String sUserData( aTemp );
+            OUString sUserData( aTemp );
             DBG_ASSERT( comphelper::string::getTokenCount(sUserData, ';') == 5, "invalid config data" );
             sal_Int32 nIdx = 0;
-            String sSearchText = sUserData.GetToken( 0, ';', nIdx );
-            m_aWholeWordsBox.Check( sUserData.GetToken( 0, ';', nIdx ).ToInt32() == 1 );
-            m_aMatchCaseBox.Check( sUserData.GetToken( 0, ';', nIdx ).ToInt32() == 1 );
-            m_aWrapAroundBox.Check( sUserData.GetToken( 0, ';', nIdx ).ToInt32() == 1 );
-            m_aBackwardsBox.Check( sUserData.GetToken( 0, ';', nIdx ).ToInt32() == 1 );
+            OUString sSearchText = sUserData.getToken( 0, ';', nIdx );
+            m_aWholeWordsBox.Check( sUserData.getToken( 0, ';', nIdx ).toInt32() == 1 );
+            m_aMatchCaseBox.Check( sUserData.getToken( 0, ';', nIdx ).toInt32() == 1 );
+            m_aWrapAroundBox.Check( sUserData.getToken( 0, ';', nIdx ).toInt32() == 1 );
+            m_aBackwardsBox.Check( sUserData.getToken( 0, ';', nIdx ).toInt32() == 1 );
 
             nIdx = 0;
             while ( nIdx != -1 )
-                m_aSearchEdit.InsertEntry( sSearchText.GetToken( 0, '\t', nIdx ) );
+                m_aSearchEdit.InsertEntry( sSearchText.getToken( 0, '\t', nIdx ) );
             m_aSearchEdit.SelectEntryPos(0);
         }
     }
@@ -110,21 +110,21 @@ void SearchDialog::SaveConfig()
 {
     SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName );
     aViewOpt.SetWindowState(OStringToOUString(m_sWinState, RTL_TEXTENCODING_ASCII_US));
-    String sUserData;
+    OUString sUserData;
     sal_uInt16 i = 0, nCount = std::min( m_aSearchEdit.GetEntryCount(), MAX_SAVE_COUNT );
     for ( ; i < nCount; ++i )
     {
         sUserData += m_aSearchEdit.GetEntry(i);
-        sUserData += '\t';
+        sUserData += "\t";
     }
     sUserData = comphelper::string::stripStart(sUserData, '\t');
-    sUserData += ';';
+    sUserData += ";";
     sUserData += OUString::number( m_aWholeWordsBox.IsChecked() ? 1 : 0 );
-    sUserData += ';';
+    sUserData += ";";
     sUserData += OUString::number( m_aMatchCaseBox.IsChecked() ? 1 : 0 );
-    sUserData += ';';
+    sUserData += ";";
     sUserData += OUString::number( m_aWrapAroundBox.IsChecked() ? 1 : 0 );
-    sUserData += ';';
+    sUserData += ";";
     sUserData += OUString::number( m_aBackwardsBox.IsChecked() ? 1 : 0 );
 
     Any aUserItem = makeAny( OUString( sUserData ) );
@@ -133,7 +133,7 @@ void SearchDialog::SaveConfig()
 
 IMPL_LINK_NOARG(SearchDialog, FindHdl)
 {
-    String sSrchTxt = m_aSearchEdit.GetText();
+    OUString sSrchTxt = m_aSearchEdit.GetText();
     sal_uInt16 nPos = m_aSearchEdit.GetEntryPos( sSrchTxt );
     if ( nPos > 0 && nPos != COMBOBOX_ENTRY_NOTFOUND )
         m_aSearchEdit.RemoveEntryAt(nPos);
@@ -145,7 +145,7 @@ IMPL_LINK_NOARG(SearchDialog, FindHdl)
 
 IMPL_LINK_NOARG(SearchDialog, ToggleHdl)
 {
-    String sTemp = m_aWrapAroundBox.GetText();
+    OUString sTemp = m_aWrapAroundBox.GetText();
     m_aWrapAroundBox.SetText( m_sToggleText );
     m_sToggleText = sTemp;
     return 0;

sfx2/source/dialog/tabdlg.cxx

@@ -495,8 +495,8 @@ SfxTabDialog::~SfxTabDialog()
         {
             // save settings of all pages (user data)
             pDataObject->pTabPage->FillUserData();
-            String aPageData( pDataObject->pTabPage->GetUserData() );
-            if ( aPageData.Len() )
+            OUString aPageData( pDataObject->pTabPage->GetUserData() );
+            if ( !aPageData.isEmpty() )
             {
                 // save settings of all pages (user data)
                 SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( pDataObject->nId ) );
@@ -864,8 +864,8 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
         if ( pDataObject->pTabPage )
         {
             pDataObject->pTabPage->FillUserData();
-            String aPageData( pDataObject->pTabPage->GetUserData() );
-            if ( aPageData.Len() )
+            OUString aPageData( pDataObject->pTabPage->GetUserData() );
+            if ( !aPageData.isEmpty() )
             {
                 // save settings of this page (user data)
                 SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( pDataObject->nId ) );
@@ -1302,11 +1302,11 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
         pDataObject->pTabPage = pTabPage;
 
         SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( pDataObject->nId ) );
-        String sUserData;
+        OUString sUserData;
         Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
         OUString aTemp;
         if ( aUserItem >>= aTemp )
-            sUserData = String( aTemp );
+            sUserData = aTemp;
         pTabPage->SetUserData( sUserData );
         Size aSiz = pTabPage->GetSizePixel();
 

sfx2/source/dialog/taskpane.cxx

@@ -869,7 +869,7 @@ namespace sfx2
         );
         virtual ~TaskPaneController_Impl();
 
-        void    SetDefaultTitle( const String& i_rTitle );
+        void    SetDefaultTitle( const OUString& i_rTitle );
         void    ActivateToolPanel( const OUString& i_rPanelURL );
 
     protected:
@@ -971,7 +971,7 @@ namespace sfx2
     }
 
     // -----------------------------------------------------------------------------------------------------------------
-    void TaskPaneController_Impl::SetDefaultTitle( const String& i_rTitle )
+    void TaskPaneController_Impl::SetDefaultTitle( const OUString& i_rTitle )
     {
         m_sDefaultTitle = i_rTitle;
         impl_updateDockingWindowTitle();

sfx2/source/dialog/versdlg.cxx

@@ -50,9 +50,9 @@ using ::std::vector;
 // **************************************************************************
 struct SfxVersionInfo
 {
-    String                  aName;
-    String                  aComment;
-    String                  aAuthor;
+    OUString                aName;
+    OUString                aComment;
+    OUString                aAuthor;
     DateTime                aCreationDate;
 
                             SfxVersionInfo();
@@ -265,8 +265,8 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, sal_Bool bIsSaveVer
 
 
     // set dialog title (filename or docinfo title)
-    String sText = GetText();
-    ( sText += ' ' ) += pViewFrame->GetObjectShell()->GetTitle();
+    OUString sText = GetText();
+    sText = sText + " " + pViewFrame->GetObjectShell()->GetTitle();
     SetText( sText );
 
     Init_Impl();
@@ -274,28 +274,28 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, sal_Bool bIsSaveVer
     m_pVersionBox->setColSizes();
 }
 
-String ConvertWhiteSpaces_Impl( const String& rText )
+String ConvertWhiteSpaces_Impl( const OUString& rText )
 {
     // converted linebreaks and tabs to blanks; it's necessary for the display
-    String sConverted;
-    const sal_Unicode* pChars = rText.GetBuffer();
+    OUStringBuffer sConverted;
+    const sal_Unicode* pChars = rText.getStr();
     while ( *pChars )
     {
         switch ( *pChars )
         {
             case '\n' :
             case '\t' :
-                sConverted += ' ';
+                sConverted.append(' ');
                 break;
 
             default:
-                sConverted += *pChars;
+                sConverted.append(*pChars);
         }
 
         ++pChars;
     }
 
-    return sConverted;
+    return sConverted.makeStringAndClear();
 }
 
 void SfxVersionDialog::Init_Impl()
@@ -309,10 +309,10 @@ void SfxVersionDialog::Init_Impl()
         for ( size_t n = 0; n < m_pTable->size(); ++n )
         {
             SfxVersionInfo *pInfo = m_pTable->at( n );
-            String aEntry = formatTime(pInfo->aCreationDate, Application::GetSettings().GetLocaleDataWrapper());
-            aEntry += '\t';
+            OUString aEntry = formatTime(pInfo->aCreationDate, Application::GetSettings().GetLocaleDataWrapper());
+            aEntry += "\t";
             aEntry += pInfo->aAuthor;
-            aEntry += '\t';
+            aEntry += "\t";
             aEntry += ConvertWhiteSpaces_Impl( pInfo->aComment );
             SvTreeListEntry *pEntry = m_pVersionBox->InsertEntry( aEntry );
             pEntry->SetUserData( pInfo );