can drop CUI_RESSTR now

Change-Id: I2e2319e661614dc8ba464479324b4719bcfa120e

4 files changed, 4 insertions, 36 deletions

diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index f6896bdc5e16..b09975f0a9b9 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -153,7 +153,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
     if ( bFound )
     {
         // duplicate names?
-        ScopedVclPtrInstance<MessageDialog>(this, CUI_RESSTR(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute();
+        ScopedVclPtrInstance<MessageDialog>(this, CUI_RES(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute();
         pNameEdit->GrabFocus();
         return;
     }
@@ -177,13 +177,11 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
     catch(...)
     {
         xNewDic = nullptr;
-
         // error: couldn't create new dictionary
         SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, OUString(),
             this, RID_SVXERRCTX, &DIALOG_MGR() );
         ErrorHandler::HandleError( *new StringErrorInfo(
                 ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
-
         EndDialog();
     }
 
@@ -219,7 +217,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
 
     ModalDialog( pParent, "EditDictionaryDialog" ,"cui/ui/editdictionarydialog.ui" ),
 
-    sModify         (CUI_RESSTR(STR_MODIFY)),
+    sModify         (CUI_RES(STR_MODIFY)),
     nOld            ( NOACTDICT ),
     bFirstSelect    (true),
     bDoNothing      (false),
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index bc261500f6fe..1213b3d10a69 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -810,7 +810,7 @@ void SvxJavaParameterDlg::EditParameter()
 
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        ScopedVclPtrInstance< InputDialog > pParamEditDlg( CUI_RES( RID_SVXSTR_JAVA_START_PARAM ).toString(), this);
+        ScopedVclPtrInstance< InputDialog > pParamEditDlg(CUI_RES(RID_SVXSTR_JAVA_START_PARAM), this);
         OUString editableClassPath = m_pAssignedList->GetSelectEntry();
         pParamEditDlg->SetEntryText( editableClassPath );
         pParamEditDlg->HideHelpBtn();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 34ac217eb4f9..af910b355f37 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -344,37 +344,9 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
     aTabs[3] = aTabs[2] + nWidth2 + 12;
     pPathBox->SetTabs(aTabs, MapUnit::MapPixel);
 
-#if 0
-    String aUserData = GetUserData();
-    if ( aUserData.Len() )
-    {
-        fprintf(stderr, "FOO\n");
-
-        // restore column width
-        rBar.SetItemSize( ITEMID_TYPE, aUserData.GetToken(0).ToInt32() );
-        HeaderEndDrag_Impl( &rBar );
-        // restore sort direction
-        sal_Bool bUp = (sal_Bool)(sal_uInt16)aUserData.GetToken(1).ToInt32();
-        HeaderBarItemBits nBits = rBar.GetItemBits(ITEMID_TYPE);
-
-        if ( bUp )
-        {
-            nBits &= ~HeaderBarItemBits::UPARROW;
-            nBits |= HeaderBarItemBits::DOWNARROW;
-        }
-        else
-        {
-            nBits &= ~HeaderBarItemBits::DOWNARROW;
-            nBits |= HeaderBarItemBits::UPARROW;
-        }
-        rBar.SetItemBits( ITEMID_TYPE, nBits );
-        HeaderSelect_Impl( &rBar );
-    }
-#endif
     PathSelect_Impl( nullptr );
 }
 
-
 void SvxPathTabPage::FillUserData()
 {
     HeaderBar &rBar = pPathBox->GetTheHeaderBar();
@@ -386,7 +358,6 @@ void SvxPathTabPage::FillUserData()
     SetUserData( aUserData );
 }
 
-
 IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void)
 {
     sal_uInt16 nSelCount = 0;
@@ -407,7 +378,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void)
     m_pStandardBtn->Enable( nSelCount > 0 && bEnable);
 }
 
-
 IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl, Button*, void)
 {
     SvTreeListEntry* pEntry = pPathBox->FirstSelected();
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 13087f5e352a..b07433d5985c 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -209,7 +209,7 @@ IMPL_LINK( SelectPersonaDialog, SelectPersona, Button*, pButton, void )
                 // get the persona name from the setting variable to show in the progress.
                 sal_Int32 nNameIndex = m_aSelectedPersona.indexOf( ';' );
                 OUString aName = m_aSelectedPersona.copy( 0, nNameIndex );
-                OUString aProgress = CUI_RESSTR( RID_SVXSTR_SELECTEDPERSONA ) + aName;
+                OUString aProgress = OUString(CUI_RES(RID_SVXSTR_SELECTEDPERSONA)) + aName;
                 SetProgress( aProgress );
             }
             break;