summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-06-11 20:56:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-21 08:20:50 +0100
commit00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
treefd1a9bb264fe15dcc129498e62060ecd256b1ee7 /cui/source
parentfa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/SvxMenuConfigPage.cxx1
-rw-r--r--cui/source/customize/acccfg.cxx3
-rw-r--r--cui/source/customize/cfg.cxx1
-rw-r--r--cui/source/customize/cfg.src145
-rw-r--r--cui/source/customize/cfgutil.cxx1
-rw-r--r--cui/source/customize/macropg.cxx3
-rw-r--r--cui/source/customize/macropg.src336
-rw-r--r--cui/source/dialogs/cuicharmap.cxx1
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx12
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx3
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx1
-rw-r--r--cui/source/dialogs/cuires.src133
-rw-r--r--cui/source/dialogs/fmsearch.hrc38
-rw-r--r--cui/source/dialogs/fmsearch.src77
-rw-r--r--cui/source/dialogs/gallery.src46
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx1
-rw-r--r--cui/source/dialogs/hldocntp.cxx1
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx1
-rw-r--r--cui/source/dialogs/hltpbase.cxx1
-rw-r--r--cui/source/dialogs/hyperdlg.src97
-rw-r--r--cui/source/dialogs/insdlg.cxx23
-rw-r--r--cui/source/dialogs/insrc.cxx1
-rw-r--r--cui/source/dialogs/linkdlg.cxx2
-rw-r--r--cui/source/dialogs/multipat.cxx1
-rw-r--r--cui/source/dialogs/multipat.src47
-rw-r--r--cui/source/dialogs/passwdomdlg.cxx1
-rw-r--r--cui/source/dialogs/passwdomdlg.src42
-rw-r--r--cui/source/dialogs/pastedlg.cxx7
-rw-r--r--cui/source/dialogs/screenshotannotationdlg.cxx1
-rw-r--r--cui/source/dialogs/screenshotannotationdlg.src27
-rw-r--r--cui/source/dialogs/scriptdlg.cxx1
-rw-r--r--cui/source/dialogs/scriptdlg.src104
-rw-r--r--cui/source/dialogs/showcols.cxx2
-rw-r--r--cui/source/dialogs/srchxtra.cxx7
-rw-r--r--cui/source/dialogs/svuidlg.hrc30
-rw-r--r--cui/source/dialogs/svuidlg.src55
-rw-r--r--cui/source/dialogs/thesdlg.cxx1
-rw-r--r--cui/source/factory/cuiresmgr.cxx16
-rw-r--r--cui/source/factory/dlgfact.cxx1
-rw-r--r--cui/source/inc/border.hxx4
-rw-r--r--cui/source/inc/cuires.hrc340
-rw-r--r--cui/source/inc/dialmgr.hxx16
-rw-r--r--cui/source/inc/gallery.hrc28
-rw-r--r--cui/source/inc/macropg.hxx8
-rw-r--r--cui/source/inc/swpossizetabpage.hxx5
-rw-r--r--cui/source/inc/treeopt.hxx35
-rw-r--r--cui/source/options/cfgchart.cxx1
-rw-r--r--cui/source/options/connpooloptions.cxx1
-rw-r--r--cui/source/options/connpooloptions.src43
-rw-r--r--cui/source/options/dbregister.cxx2
-rw-r--r--cui/source/options/dbregister.src32
-rw-r--r--cui/source/options/doclinkdialog.cxx1
-rw-r--r--cui/source/options/doclinkdialog.src42
-rw-r--r--cui/source/options/optchart.src32
-rw-r--r--cui/source/options/optcolor.cxx2
-rw-r--r--cui/source/options/optcolor.src41
-rw-r--r--cui/source/options/optdict.cxx3
-rw-r--r--cui/source/options/optdict.src38
-rw-r--r--cui/source/options/optfltr.cxx1
-rw-r--r--cui/source/options/optfltr.src51
-rw-r--r--cui/source/options/optinet2.cxx1
-rw-r--r--cui/source/options/optinet2.src29
-rw-r--r--cui/source/options/optjava.cxx1
-rw-r--r--cui/source/options/optjava.src43
-rw-r--r--cui/source/options/optlingu.cxx1
-rw-r--r--cui/source/options/optlingu.src87
-rw-r--r--cui/source/options/optopencl.cxx1
-rw-r--r--cui/source/options/optpath.cxx79
-rw-r--r--cui/source/options/optpath.src120
-rw-r--r--cui/source/options/personalization.cxx10
-rw-r--r--cui/source/options/personalization.src65
-rw-r--r--cui/source/options/treeopt.cxx207
-rw-r--r--cui/source/options/treeopt.src177
-rw-r--r--cui/source/tabpages/align.cxx1
-rw-r--r--cui/source/tabpages/autocdlg.cxx1
-rw-r--r--cui/source/tabpages/backgrnd.cxx9
-rw-r--r--cui/source/tabpages/border.cxx8
-rw-r--r--cui/source/tabpages/border.src95
-rw-r--r--cui/source/tabpages/chardlg.cxx1
-rw-r--r--cui/source/tabpages/connect.cxx1
-rw-r--r--cui/source/tabpages/frmdirlbox.src61
-rw-r--r--cui/source/tabpages/grfpage.cxx1
-rw-r--r--cui/source/tabpages/measure.cxx10
-rw-r--r--cui/source/tabpages/numfmt.cxx1
-rw-r--r--cui/source/tabpages/numpages.cxx10
-rw-r--r--cui/source/tabpages/page.cxx2
-rw-r--r--cui/source/tabpages/paragrph.cxx1
-rw-r--r--cui/source/tabpages/strings.src195
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx12
-rw-r--r--cui/source/tabpages/tpbitmap.cxx4
-rw-r--r--cui/source/tabpages/tpcolor.cxx2
-rw-r--r--cui/source/tabpages/tpgradnt.cxx2
-rw-r--r--cui/source/tabpages/tphatch.cxx2
-rw-r--r--cui/source/tabpages/tpline.cxx2
-rw-r--r--cui/source/tabpages/tplnedef.cxx17
-rw-r--r--cui/source/tabpages/tplneend.cxx10
-rw-r--r--cui/source/tabpages/tppattern.cxx7
97 files changed, 272 insertions, 3001 deletions
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 48ab816a12aa..b51b319b5ae7 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -54,6 +54,7 @@
#include <algorithm>
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include "acccfg.hxx"
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index c1c2104b26ee..bf83de09a634 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -36,7 +36,8 @@
#include <vcl/builderfactory.hxx>
#include "cuires.hrc"
-
+#include "strings.hrc"
+#include <sfx2/strings.hrc>
#include <svx/svxids.hrc>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 31a56d32941d..41c9cf7b6687 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -55,6 +55,7 @@
#include <algorithm>
#include <cuires.hrc>
#include "helpid.hrc"
+#include "strings.hrc"
#include "acccfg.hxx"
#include "cfg.hxx"
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
deleted file mode 100644
index 08d352625cf8..000000000000
--- a/cui/source/customize/cfg.src
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include <cuires.hrc>
-#include "helpid.hrc"
-
-/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
-String RID_SVXSTR_NEW_MENU
-{
- Text [ en-US ] = "New Menu %n";
-};
-
-/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
-String RID_SVXSTR_NEW_TOOLBAR
-{
- Text [ en-US ] = "New Toolbar %n";
-};
-
-String RID_SVXSTR_MOVE_MENU
-{
- Text [ en-US ] = "Move Menu";
-};
-
-String RID_SVXSTR_ADD_SUBMENU
-{
- Text [ en-US ] = "Add Submenu";
-};
-
-String RID_SVXSTR_SUBMENU_NAME
-{
- Text [ en-US ] = "Submenu name";
-};
-
-String RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION
-{
- Text [ en-US ] = "To add a command to a menu, select the category and then the command. You can also drag the command to the Commands list of the Menus tab page in the Customize dialog.";
-};
-
-// Strings ---------------------------------------------------------------
-
-String RID_SVXSTR_DELETE_ICON_CONFIRM //added for issue73355
-{
- Text [ en-US ] = "Are you sure to delete the image?" ;
-};
-
-String RID_SVXSTR_REPLACE_ICON_WARNING //added for issue73355
-{
- Text [ en-US ] = "The icon %ICONNAME is already contained in the image list.\nWould you like to replace the existing icon?";
-};
-
-String RID_SVXSTR_REPLACE_ICON_CONFIRM //added for issue73355
-{
- Text [ en-US ] = "Confirm Icon Replacement";
-};
-
-String RID_SVXSTR_YESTOALL //added for issue73355
-{
- Text [ en-US ] = "Yes to All";
-};
-
-String RID_SVXSTR_PRODUCTNAME_TOOLBARS
-{
- Text [ en-US ] = "%PRODUCTNAME %MODULENAME Toolbars" ;
-};
-
-String RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS
-{
- Text [ en-US ] = "%PRODUCTNAME %MODULENAME Context Menus" ;
-};
-
-String RID_SVXSTR_TOOLBAR
-{
- Text [ en-US ] = "Toolbar" ;
-};
-
-String RID_SVXSTR_TOOLBAR_CONTENT
-{
- Text [ en-US ] = "Toolbar Content" ;
-};
-
-String RID_SVXSTR_COMMANDS
-{
- Text [ en-US ] = "Commands" ;
-};
-
-String RID_SXVSTR_CONFIRM_DELETE_TOOLBAR
-{
- Text [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
-};
-
-/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
- and will be replaced at runtime by the name of the selected application
- or document.
-*/
-String RID_SVXSTR_CONFIRM_MENU_RESET
-{
- Text [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?";
-};
-
-String RID_SVXSTR_CONFIRM_TOOLBAR_RESET
-{
- Text [ en-US ] = "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?";
-};
-
-String RID_SVXSTR_CONFIRM_RESTORE_DEFAULT
-{
- Text [ en-US ] = "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?";
-};
-
-String RID_SVXSTR_MNUCFG_ALREADY_INCLUDED
-{
- Text [ en-US ] = "Function is already included in this popup." ;
-};
-
-String RID_SVXSTR_LABEL_NEW_NAME
-{
- Text [ en-US ] = "~New name";
-};
-
-String RID_SVXSTR_RENAME_MENU
-{
- Text [ en-US ] = "Rename Menu";
-};
-
-String RID_SVXSTR_RENAME_TOOLBAR
-{
- Text [ en-US ] = "Rename Toolbar";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 399db0ae57de..1c630c16bee1 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -45,6 +45,7 @@
#include <basic/basmgr.hxx>
#include <tools/urlobj.hxx>
#include "cuires.hrc"
+#include "strings.hrc"
#include "bitmaps.hlst"
#include <sfx2/app.hxx>
#include <sfx2/minfitem.hxx>
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index d171411c72d2..2b26eca0a0f1 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -39,6 +39,7 @@
#include "headertablistbox.hxx"
#include "macropg_impl.hxx"
#include <svx/dialogs.hrc>
+#include "strings.hrc"
#include <vcl/builderfactory.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <o3tl/make_unique.hxx>
@@ -529,7 +530,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
}
OUString eventURL = h_it->second.second;
- OUString displayName(CuiResId(displayableEvent->nEventResourceID));
+ OUString displayName(CuiResId(displayableEvent->pEventResourceID));
displayName += "\t";
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
deleted file mode 100644
index a57fa254be32..000000000000
--- a/cui/source/customize/macropg.src
+++ /dev/null
@@ -1,336 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/sfx.hrc>
-#include <cuires.hrc>
-#include "helpid.hrc"
-#include <svx/dialogs.hrc>
-
-//DF
-String RID_SVXSTR_EVENT_STARTAPP
-{
- Text [ en-US ] = "Start Application" ;
-};
-
-String RID_SVXSTR_EVENT_CLOSEAPP
-{
- Text [ en-US ] = "Close Application" ;
-};
-
-String RID_SVXSTR_EVENT_NEWDOC
-{
- Text [ en-US ] = "New Document" ;
-};
-
-String RID_SVXSTR_EVENT_CLOSEDOC
-{
- Text [ en-US ] = "Document closed" ;
-};
-
-String RID_SVXSTR_EVENT_PREPARECLOSEDOC
-{
- Text [ en-US ] = "Document is going to be closed" ;
-};
-
-String RID_SVXSTR_EVENT_OPENDOC
-{
- Text [ en-US ] = "Open Document" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEDOC
-{
- Text [ en-US ] = "Save Document" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEASDOC
-{
- Text [ en-US ] = "Save Document As" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEDOCDONE
-{
- Text [ en-US ] = "Document has been saved" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEASDOCDONE
-{
- Text [ en-US ] = "Document has been saved as" ;
-};
-
-String RID_SVXSTR_EVENT_ACTIVATEDOC
-{
- Text [ en-US ] = "Activate Document" ;
-};
-
-String RID_SVXSTR_EVENT_DEACTIVATEDOC
-{
- Text [ en-US ] = "Deactivate Document" ;
-};
-
-String RID_SVXSTR_EVENT_PRINTDOC
-{
- Text [ en-US ] = "Print Document" ;
-};
-
-String RID_SVXSTR_EVENT_MODIFYCHANGED
-{
- Text [ en-US ] = "'Modified' status was changed" ;
-};
-String RID_SVXSTR_EVENT_MAILMERGE
-{
- Text [ en-US ] = "Printing of form letters started" ;
-};
-String RID_SVXSTR_EVENT_MAILMERGE_END
-{
- Text [ en-US ] = "Printing of form letters finished" ;
-};
-String RID_SVXSTR_EVENT_FIELDMERGE
-{
- Text [ en-US ] = "Merging of form fields started" ;
-};
-String RID_SVXSTR_EVENT_FIELDMERGE_FINISHED
-{
- Text [ en-US ] = "Merging of form fields finished" ;
-};
-String RID_SVXSTR_EVENT_PAGECOUNTCHANGE
-{
- Text [ en-US ] = "Changing the page count" ;
-};
-String RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED
-{
- Text [ en-US ] = "Loaded a sub component" ;
-};
-String RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED
-{
- Text [ en-US ] = "Closed a sub component" ;
-};
-String RID_SVXSTR_EVENT_APPROVEPARAMETER
-{
- Text [ en-US ] = "Fill parameters" ;
-};
-String RID_SVXSTR_EVENT_ACTIONPERFORMED
-{
- Text [ en-US ] = "Execute action" ;
-};
-String RID_SVXSTR_EVENT_AFTERUPDATE
-{
- Text [ en-US ] = "After updating" ;
-};
-String RID_SVXSTR_EVENT_BEFOREUPDATE
-{
- Text [ en-US ] = "Before updating" ;
-};
-String RID_SVXSTR_EVENT_APPROVEROWCHANGE
-{
- Text [ en-US ] = "Before record action" ;
-};
-String RID_SVXSTR_EVENT_ROWCHANGE
-{
- Text [ en-US ] = "After record action" ;
-};
-String RID_SVXSTR_EVENT_CONFIRMDELETE
-{
- Text [ en-US ] = "Confirm deletion" ;
-};
-String RID_SVXSTR_EVENT_ERROROCCURRED
-{
- Text [ en-US ] = "Error occurred" ;
-};
-String RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED
-{
- Text [ en-US ] = "While adjusting";
-};
-String RID_SVXSTR_EVENT_FOCUSGAINED
-{
- Text [ en-US ] = "When receiving focus" ;
-};
-String RID_SVXSTR_EVENT_FOCUSLOST
-{
- Text [ en-US ] = "When losing focus" ;
-};
-String RID_SVXSTR_EVENT_ITEMSTATECHANGED
-{
- Text [ en-US ] = "Item status changed" ;
-};
-String RID_SVXSTR_EVENT_KEYTYPED
-{
- Text [ en-US ] = "Key pressed" ;
-};
-String RID_SVXSTR_EVENT_KEYUP
-{
- Text [ en-US ] = "Key released" ;
-};
-String RID_SVXSTR_EVENT_LOADED
-{
- Text [ en-US ] = "When loading" ;
-};
-String RID_SVXSTR_EVENT_RELOADING
-{
- Text [ en-US ] = "Before reloading" ;
-};
-String RID_SVXSTR_EVENT_RELOADED
-{
- Text [ en-US ] = "When reloading" ;
-};
-String RID_SVXSTR_EVENT_MOUSEDRAGGED
-{
- Text [ en-US ] = "Mouse moved while key pressed" ;
-};
-String RID_SVXSTR_EVENT_MOUSEENTERED
-{
- Text [ en-US ] = "Mouse inside" ;
-};
-String RID_SVXSTR_EVENT_MOUSEEXITED
-{
- Text [ en-US ] = "Mouse outside" ;
-};
-String RID_SVXSTR_EVENT_MOUSEMOVED
-{
- Text [ en-US ] = "Mouse moved" ;
-};
-String RID_SVXSTR_EVENT_MOUSEPRESSED
-{
- Text [ en-US ] = "Mouse button pressed" ;
-};
-String RID_SVXSTR_EVENT_MOUSERELEASED
-{
- Text [ en-US ] = "Mouse button released" ;
-};
-String RID_SVXSTR_EVENT_POSITIONING
-{
- Text [ en-US ] = "Before record change" ;
-};
-String RID_SVXSTR_EVENT_POSITIONED
-{
- Text [ en-US ] = "After record change" ;
-};
-String RID_SVXSTR_EVENT_RESETTED
-{
- Text [ en-US ] = "After resetting" ;
-};
-String RID_SVXSTR_EVENT_APPROVERESETTED
-{
- Text [ en-US ] = "Prior to reset" ;
-};
-String RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED
-{
- Text [ en-US ] = "Approve action" ;
-};
-String RID_SVXSTR_EVENT_SUBMITTED
-{
- Text [ en-US ] = "Before submitting" ;
-};
-String RID_SVXSTR_EVENT_TEXTCHANGED
-{
- Text [ en-US ] = "Text modified" ;
-};
-String RID_SVXSTR_EVENT_UNLOADING
-{
- Text [ en-US ] = "Before unloading" ;
-};
-String RID_SVXSTR_EVENT_UNLOADED
-{
- Text [ en-US ] = "When unloading" ;
-};
-String RID_SVXSTR_EVENT_CHANGED
-{
- Text [ en-US ] = "Changed" ;
-};
-
-String RID_SVXSTR_EVENT_CREATEDOC
-{
- Text [ en-US ] = "Document created" ;
-};
-
-String RID_SVXSTR_EVENT_LOADDOCFINISHED
-{
- Text [ en-US ] = "Document loading finished" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEDOCFAILED
-{
- Text [ en-US ] = "Saving of document failed" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEASDOCFAILED
-{
- Text [ en-US ] = "'Save as' has failed" ;
-};
-
-String RID_SVXSTR_EVENT_COPYTODOC
-{
- Text [ en-US ] = "Storing or exporting copy of document" ;
-};
-
-String RID_SVXSTR_EVENT_COPYTODOCDONE
-{
- Text [ en-US ] = "Document copy has been created" ;
-};
-
-String RID_SVXSTR_EVENT_COPYTODOCFAILED
-{
- Text [ en-US ] = "Creating of document copy failed" ;
-};
-
-String RID_SVXSTR_EVENT_VIEWCREATED
-{
- Text [ en-US ] = "View created" ;
-};
-
-String RID_SVXSTR_EVENT_PREPARECLOSEVIEW
-{
- Text [ en-US ] = "View is going to be closed" ;
-};
-
-String RID_SVXSTR_EVENT_CLOSEVIEW
-{
- Text [ en-US ] = "View closed" ;
-};
-
-String RID_SVXSTR_EVENT_TITLECHANGED
-{
- Text [ en-US ] = "Document title changed" ;
-};
-
-String RID_SVXSTR_EVENT_SELECTIONCHANGED
-{
- Text [ en-US ] = "Selection changed" ;
-};
-
-String RID_SVXSTR_EVENT_DOUBLECLICK
-{
- Text [ en-US ] = "Double click" ;
-};
-
-String RID_SVXSTR_EVENT_RIGHTCLICK
-{
- Text [ en-US ] = "Right click" ;
-};
-
-String RID_SVXSTR_EVENT_CALCULATE
-{
- Text [ en-US ] = "Formulas calculated" ;
-};
-
-String RID_SVXSTR_EVENT_CONTENTCHANGED
-{
- Text [ en-US ] = "Content changed" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 6031af5d85fb..2a0e9053c819 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -45,6 +45,7 @@
#include <sfx2/sfxsids.hrc>
#include <sfx2/app.hxx>
#include <editeng/fontitem.hxx>
+#include "strings.hrc"
#include "macroass.hxx"
using namespace css;
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index fd3d9b3ba8df..b45300ef7bee 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -26,7 +26,7 @@
#include <cuires.hrc>
#include <svx/fmsrccfg.hxx>
#include <svx/fmsrcimp.hxx>
-#include "fmsearch.hrc"
+#include "strings.hrc"
#include "cuifmsearch.hxx"
#include <svx/srchdlg.hxx>
#include <svl/cjkoptions.hxx>
@@ -239,14 +239,14 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
// fill the listboxes
// method of field comparison
- sal_uInt16 nResIds[] = {
+ const char* aResIds[] = {
RID_STR_SEARCH_ANYWHERE,
RID_STR_SEARCH_BEGINNING,
RID_STR_SEARCH_END,
RID_STR_SEARCH_WHOLE
};
- for (unsigned short nResId : nResIds)
- m_plbPosition->InsertEntry( CuiResId( nResId ) );
+ for (auto pResId : aResIds)
+ m_plbPosition->InsertEntry(CuiResId(pResId));
m_plbPosition->SelectEntryPos(MATCHING_ANYWHERE);
// the field listbox
@@ -726,10 +726,10 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
case FmSearchProgress::State::Error:
case FmSearchProgress::State::NothingFound:
{
- sal_uInt16 nErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState)
+ const char* pErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState)
? RID_STR_SEARCH_GENERAL_ERROR
: RID_STR_SEARCH_NORECORD;
- ScopedVclPtrInstance<MessageDialog>(this, CuiResId(nErrorId))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, CuiResId(pErrorId))->Execute();
SAL_FALLTHROUGH;
}
case FmSearchProgress::State::Canceled:
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 196d8acd6c73..ebda6d05cdd8 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -47,9 +47,10 @@
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <sfx2/sfxuno.hxx>
#include "dialmgr.hxx"
-#include "gallery.hrc"
+#include "strings.hrc"
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
using namespace ::ucbhelper;
using namespace ::cppu;
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 04f3d29418f5..374c4b99643d 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -29,6 +29,7 @@
#include "hldocntp.hxx"
#include "bitmaps.hlst"
#include <svx/svxids.hrc>
+#include "strings.hrc"
#include <vector>
using ::com::sun::star::uno::Reference;
diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
deleted file mode 100644
index 6c22063dee6b..000000000000
--- a/cui/source/dialogs/cuires.src
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "cuires.hrc"
-
-String RID_SVXSTR_ERR_TEXTNOTFOUND
-{
- Text [ en-US ] = "No alternatives found." ;
-};
-
-String RID_SVXSTR_SELECT_FILE_IFRAME
-{
- Text [ en-US ] = "Select File for Floating Frame" ;
-};
-
-String RID_SVXSTR_ALLFUNCTIONS
-{
- Text [ en-US ] = "All categories";
-};
-
-String RID_SVXSTR_MYMACROS
-{
- Text [ en-US ] = "My Macros";
-};
-
-String RID_SVXSTR_PRODMACROS
-{
- Text [ en-US ] = "%PRODUCTNAME Macros";
-};
-
-String RID_SVXSTR_SELECTOR_ADD_COMMANDS
-{
- Text [ en-US ] = "Add Commands" ;
-};
-
-String RID_SVXSTR_SELECTOR_RUN
-{
- Text [ en-US ] = "Run" ;
-};
-
-String RID_SVXSTR_ROW
-{
- Text [ en-US ] = "Insert Rows" ;
-};
-
-String RID_SVXSTR_REMOVE_FAVORITES
-{
- Text [ en-US ] = "Remove from Favorites" ;
-};
-
-String RID_SVXSTR_ADD_FAVORITES
-{
- Text [ en-US ] = "Add to Favorites" ;
-};
-
-String RID_SVXSTR_PPI
-{
- Text [ x-comment ] = "PPI is pixel per inch, %1 is a number" ;
- Text [ en-US ] = "(%1 PPI)" ;
-};
-
-String RID_SVXSTR_COL
-{
- Text [ en-US ] = "Insert Columns" ;
-};
-
-String RID_SVXSTR_AUTO_ENTRY
-{
- Text [ en-US ] = "Automatic";
-};
-
-String RID_SVXSTR_EDIT_GRAPHIC
-{
- Text [ en-US ] = "Link" ;
-};
-
-String RID_SVXSTR_LOADACCELCONFIG
-{
- Text [ en-US ] = "Load Keyboard Configuration" ;
-};
-
-String RID_SVXSTR_SAVEACCELCONFIG
-{
- Text [ en-US ] = "Save Keyboard Configuration" ;
-};
-
-String RID_SVXSTR_FILTERNAME_CFG
-{
- Text [ en-US ] = "Configuration (*.cfg)" ;
-};
-
-String RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES
-{
- Text [ en-US ] = "Targets do not exist in the document." ;
-};
-
-String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN
-{
- Text [ en-US ] = "Couldn't open the document." ;
-};
-
-String RID_SVXSTR_EDITHINT
-{
- Text [ en-US ] = "[Enter text here]";
-};
-
-String RID_SVXSTR_HANGUL
-{
- Text [ en-US ] = "Hangul";
-};
-
-String RID_SVXSTR_HANJA
-{
- Text [ en-US ] = "Hanja";
-};
-
-String RID_SVXSTR_BASICMACROS
-{
- Text [ en-US ] = "BASIC Macros" ;
-};
-
-String RID_SVXSTR_GROUP_STYLES
-{
- Text [ en-US ] = "Styles" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
deleted file mode 100644
index 0b4f77a69da8..000000000000
--- a/cui/source/dialogs/fmsearch.hrc
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CUI_SOURCE_DIALOGS_FMSEARCH_HRC
-#define INCLUDED_CUI_SOURCE_DIALOGS_FMSEARCH_HRC
-
-#include "svl/solar.hrc"
-
-#define RID_STR_SEARCH_ANYWHERE (RID_FORMS_START + 85)
-#define RID_STR_SEARCH_BEGINNING (RID_FORMS_START + 86)
-#define RID_STR_SEARCH_END (RID_FORMS_START + 87)
-#define RID_STR_SEARCH_WHOLE (RID_FORMS_START + 88)
-#define RID_STR_FROM_TOP (RID_FORMS_START + 74)
-#define RID_STR_FROM_BOTTOM (RID_FORMS_START + 75)
-#define RID_STR_SEARCH_NORECORD (RID_FORMS_START + 8)
-#define RID_STR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9)
-#define RID_STR_OVERFLOW_FORWARD (RID_FORMS_START + 34)
-#define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35)
-#define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src
deleted file mode 100644
index 0a8cf0024a58..000000000000
--- a/cui/source/dialogs/fmsearch.src
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "fmsearch.hrc"
-#include "helpid.hrc"
-
-String RID_STR_SEARCH_ANYWHERE
-{
- Text [ en-US ] = "anywhere in the field";
-};
-
-String RID_STR_SEARCH_BEGINNING
-{
- Text [ en-US ] = "beginning of field";
-};
-
-String RID_STR_SEARCH_END
-{
- Text [ en-US ] = "end of field";
-};
-
-String RID_STR_SEARCH_WHOLE
-{
- Text [ en-US ] = "entire field";
-};
-
-String RID_STR_FROM_TOP
-{
- Text [ en-US ] = "From top";
-};
-String RID_STR_FROM_BOTTOM
-{
- Text [ en-US ] = "From bottom";
-};
-
-String RID_STR_SEARCH_NORECORD
-{
- Text [ en-US ] = "No records corresponding to your data found.";
-};
-
-String RID_STR_SEARCH_GENERAL_ERROR
-{
- Text [ en-US ] = "An unknown error occurred. The search could not be finished.";
-};
-
-String RID_STR_OVERFLOW_FORWARD
-{
- Text [ en-US ] = "Overflow, search continued at the beginning";
-};
-
-String RID_STR_OVERFLOW_BACKWARD
-{
- Text [ en-US ] = "Overflow, search continued at the end";
-};
-
-String RID_STR_SEARCH_COUNTING
-{
- Text [ en-US ] = "counting records";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
deleted file mode 100644
index 43d94175a970..000000000000
--- a/cui/source/dialogs/gallery.src
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/sfxsids.hrc>
-#include "helpid.hrc"
-#include "gallery.hrc"
-#include <svx/exthelpid.hrc>
-
-String RID_SVXSTR_GALLERY_NOFILES
-{
- Text [ en-US ] = "<No Files>" ;
-};
-String RID_SVXSTR_GALLERYPROPS_OBJECT
-{
- Text [ en-US ] = "Object;Objects" ;
-};
-String RID_SVXSTR_GALLERY_READONLY
-{
- Text [ en-US ] = "(read-only)" ;
-};
-String RID_SVXSTR_GALLERY_ALLFILES
-{
- Text [ en-US ] = "<All Files>" ;
-};
-String RID_SVXSTR_GALLERY_ID_EXISTS
-{
- Text [ en-US ] = "This ID already exists..." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cb610a612807..d5a16bd468aa 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -22,6 +22,7 @@
#include <cuires.hrc>
#include "helpid.hrc"
+#include "strings.hrc"
#include <algorithm>
#include <vcl/controllayout.hxx>
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 269aca763ae1..b2710554399b 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -39,6 +39,7 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include "bitmaps.hlst"
+#include "strings.hrc"
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index a055a0a243ad..34c2d9a5fb73 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -40,6 +40,7 @@
#include "svtools/treelistentry.hxx"
#include <cuires.hrc>
+#include <strings.hrc>
#include "hlmarkwn.hxx"
#include "hltpbase.hxx"
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 2a8fcbbf763b..07277d1fed98 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -32,6 +32,7 @@
#include "macroass.hxx"
#include <svx/svxdlg.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <bitmaps.hlst>
#include <vcl/builderfactory.hxx>
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
deleted file mode 100644
index ff3bd695ada8..000000000000
--- a/cui/source/dialogs/hyperdlg.src
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svtools/controldims.hrc>
-#include <cuires.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_HYPDLG_CLOSEBUT
-{
- Text [ en-US ] = "Close" ;
-};
-String RID_SVXSTR_HYPDLG_MACROACT1
-{
- Text [ en-US ] = "Mouse over object" ;
-};
-String RID_SVXSTR_HYPDLG_MACROACT2
-{
- Text [ en-US ] = "Trigger hyperlink" ;
-};
-String RID_SVXSTR_HYPDLG_MACROACT3
-{
- Text [ en-US ] = "Mouse leaves object" ;
-};
-
-String RID_SVXSTR_HYPDLG_NOVALIDFILENAME
-{
- Text [ en-US ] = "Please type in a valid file name." ;
-};
-
-String RID_SVXSTR_HYPERDLG_HLINETTP
-{
- Text [ en-US ] = "Internet" ;
-};
-String RID_SVXSTR_HYPERDLG_HLINETTP_HELP
-{
- Text [ en-US ] = "This is where you create a hyperlink to a Web page or FTP server connection." ;
-};
-
-String RID_SVXSTR_HYPERDLG_HLMAILTP
-{
- Text [ en-US ] = "Mail" ;
-};
-String RID_SVXSTR_HYPERDLG_HLMAILTP_HELP
-{
- Text [ en-US ] = "This is where you create a hyperlink to an e-mail address." ;
-};
-
-String RID_SVXSTR_HYPERDLG_HLDOCTP
-{
- Text [ en-US ] = "Document" ;
-};
-String RID_SVXSTR_HYPERDLG_HLDOCTP_HELP
-{
- Text [ en-US ] = "This is where you create a hyperlink to an existing document or a target within a document." ;
-};
-
-String RID_SVXSTR_HYPERDLG_HLDOCNTP
-{
- Text [ en-US ] = "New Document" ;
-};
-String RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP
-{
- Text [ en-US ] = "This is where you create a new document to which the new link points." ;
-};
-
-String RID_SVXSTR_HYPERDLG_FORM_BUTTON
-{
- Text [ en-US ] = "Button" ;
-};
-
-String RID_SVXSTR_HYPERDLG_FROM_TEXT
-{
- Text [ en-US ] = "Text" ;
-};
-
-String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE
-{
- Text [ en-US ] = "The file already exists. Overwrite?" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index a5f16c8f6b0d..bc68c29d278f 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -35,7 +35,8 @@
#include "insdlg.hxx"
#include <dialmgr.hxx>
#include <svtools/imagemgr.hxx>
-#include <svtools/sores.hxx>
+#include <svtools/strings.hrc>
+#include <svtools/svtresid.hxx>
#include <tools/urlobj.hxx>
#include <tools/debug.hxx>
@@ -54,6 +55,7 @@
#include <comphelper/seqstream.hxx>
#include "cuires.hrc"
+#include "strings.hrc"
#include <osl/file.hxx>
@@ -67,19 +69,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ui::dialogs;
-
-static OUString impl_getSvtResString( sal_uInt32 nId )
-{
- OUString aRet;
- ResMgr* pMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() );
- if( pMgr )
- {
- aRet = ResId( nId, *pMgr );
- delete pMgr;
- }
- return aRet;
-}
-
bool InsertObjectDialog_Impl::IsCreateNew() const
{
return false;
@@ -278,7 +267,7 @@ short SvInsertOleDlg::Execute()
{
// object couldn't be created from file
// global Resource from svtools (former so3 resource)
- OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
+ OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE_FROM_FILE));
aErr = aErr.replaceFirst( "%", aFileName );
ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute();
}
@@ -286,7 +275,7 @@ short SvInsertOleDlg::Execute()
{
// object couldn't be created
// global Resource from svtools (former so3 resource)
- OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) );
+ OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE));
aErr = aErr.replaceFirst( "%", aServerName );
ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute();
}
@@ -327,7 +316,7 @@ short SvInsertOleDlg::Execute()
{
// object couldn't be created from file
// global Resource from svtools (former so3 resource)
- OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
+ OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE_FROM_FILE));
aErr = aErr.replaceFirst( "%", aFileName );
ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute();
}
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 1f32977a0eb1..d0a36050babb 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -20,6 +20,7 @@
#include <dialmgr.hxx>
#include <svx/svxdlg.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include "insrc.hxx"
bool SvxInsRowColDlg::isInsertBefore() const
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 50d6bd047ca2..961ff4f7ad18 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -34,7 +34,7 @@
#include <svtools/svtabbx.hxx>
#include "svtools/treelistentry.hxx"
-#include <svuidlg.hrc>
+#include <strings.hrc>
#include <sfx2/linkmgr.hxx>
#include <sfx2/linksrc.hxx>
#include <svtools/soerr.hxx>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index c4da4b668a85..7edc03f8b2db 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -28,6 +28,7 @@
#include <dialmgr.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src
deleted file mode 100644
index 0dfc1107d3ec..000000000000
--- a/cui/source/dialogs/multipat.src
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String RID_MULTIPATH_DBL_ERR
-{
- Text [ en-US ] = "The path %1 already exists." ;
-};
-
-String RID_SVXSTR_ARCHIVE_TITLE
-{
- Text [ en-US ] = "Select Archives" ;
-};
-
-String RID_SVXSTR_ARCHIVE_HEADLINE
-{
- Text [ en-US ] = "Archives" ;
-};
-
-String RID_SVXSTR_MULTIFILE_DBL_ERR
-{
- Text [ en-US ] = "The file %1 already exists." ;
-};
-
-String RID_SVXSTR_ADD_IMAGE
-{
- Text [ en-US ] = "Add Image" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 21d058f3f4ff..408613465d23 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -20,6 +20,7 @@
#include "passwdomdlg.hxx"
#include "cuires.hrc"
+#include "strings.hrc"
#include "dialmgr.hxx"
#include <sfx2/tabdlg.hxx>
diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src
deleted file mode 100644
index b041e741646e..000000000000
--- a/cui/source/dialogs/passwdomdlg.src
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String RID_SVXSTR_ONE_PASSWORD_MISMATCH
-{
- Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
-};
-
-String RID_SVXSTR_TWO_PASSWORDS_MISMATCH
-{
- Text [ en-US ] = "The confirmation passwords did not match the original passwords. Set the passwords again." ;
-};
-
-String RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON
-{
- Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ;
-};
-
-String RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2
-{
- Text [ en-US ] = "Set the password by entering the same password in both boxes." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 0b8822247d32..3a312da170ee 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -31,7 +31,8 @@
#include <vcl/msgbox.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
-#include <svtools/sores.hxx>
+#include <svtools/strings.hrc>
+#include <svtools/svtresid.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -176,10 +177,8 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe
if( aTypeName.isEmpty() && aSourceName.isEmpty() )
{
- std::unique_ptr<ResMgr> pMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ));
// global resource from svtools (former so3 resource)
- if( pMgr )
- aSourceName = OUString( ResId( STR_UNKNOWN_SOURCE, *pMgr ) );
+ aSourceName = SvtResId(STR_UNKNOWN_SOURCE);
}
}
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 412ee78fd2ae..6060252b4152 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -20,6 +20,7 @@
#include "screenshotannotationdlg.hxx"
#include "cuires.hrc"
+#include "strings.hrc"
#include "dialmgr.hxx"
#include <basegfx/range/b2irange.hxx>
diff --git a/cui/source/dialogs/screenshotannotationdlg.src b/cui/source/dialogs/screenshotannotationdlg.src
deleted file mode 100644
index 62d0ac2ec89e..000000000000
--- a/cui/source/dialogs/screenshotannotationdlg.src
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String RID_SVXSTR_SAVE_SCREENSHOT_AS
-{
- Text [ en-US ] = "Save Screenshot As...";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index ec0f4e4c1f1e..6dcba4d31f36 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -27,6 +27,7 @@
#include <o3tl/make_unique.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <bitmaps.hlst>
#include "scriptdlg.hxx"
#include <dialmgr.hxx>
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
deleted file mode 100644
index d1ad2824449e..000000000000
--- a/cui/source/dialogs/scriptdlg.src
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_DELQUERY
-{
- Text [ en-US ] = "Do you want to delete the following object?";
-};
-String RID_SVXSTR_DELQUERY_TITLE
-{
- Text [ en-US ] = "Confirm Deletion";
-};
-String RID_SVXSTR_DELFAILED
-{
- Text [ en-US ] = "The selected object could not be deleted.";
-};
-String RID_SVXSTR_DELFAILED_TITLE
-{
- Text [ en-US ] = "Error Deleting Object";
-};
-String RID_SVXSTR_CREATEFAILED
-{
- Text [ en-US ] = "The object could not be created.";
-};
-String RID_SVXSTR_CREATEFAILEDDUP
-{
- Text [ en-US ] = " Object with the same name already exists.";
-};
-String RID_SVXSTR_CREATEFAILED_TITLE
-{
- Text [ en-US ] = "Error Creating Object";
-};
-String RID_SVXSTR_RENAMEFAILED
-{
- Text [ en-US ] = "The object could not be renamed.";
-};
-String RID_SVXSTR_RENAMEFAILED_TITLE
-{
- Text [ en-US ] = "Error Renaming Object";
-};
-
-String RID_SVXSTR_ERROR_TITLE
-{
- Text [ en-US ] = "%PRODUCTNAME Error";
-};
-
-String RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED
-{
- Text [ en-US ] = "The scripting language %LANGUAGENAME is not supported.";
-};
-String RID_SVXSTR_ERROR_RUNNING
-{
- Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME.";
-};
-
-String RID_SVXSTR_EXCEPTION_RUNNING
-{
- Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME.";
-};
-
-String RID_SVXSTR_ERROR_AT_LINE
-{
- Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER.";
-};
-
-String RID_SVXSTR_EXCEPTION_AT_LINE
-{
- Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER.";
-};
-
-String RID_SVXSTR_FRAMEWORK_ERROR_RUNNING
-{
- Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME.";
-};
-
-String RID_SVXSTR_ERROR_TYPE_LABEL
-{
- Text [ en-US ] = "Type:";
-};
-
-String RID_SVXSTR_ERROR_MESSAGE_LABEL
-{
- Text [ en-US ] = "Message:";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 0f2917fab7f5..50b35c157f6c 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -18,7 +18,7 @@
*/
#include "showcols.hxx"
-#include "fmsearch.hrc"
+#include "strings.hrc"
#include <dialmgr.hxx>
#include <vcl/msgbox.hxx>
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index ea01bcb7a1cc..5ccaa5dd1101 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -18,7 +18,6 @@
*/
#include "srchxtra.hxx"
-#include <tools/rcid.h>
#include <vcl/msgbox.hxx>
#include <svl/cjkoptions.hxx>
#include <svl/whiter.hxx>
@@ -26,6 +25,7 @@
#include <cuires.hrc>
#include <svx/svxitems.hrc>
#include <svx/dialmgr.hxx>
+#include <svx/strarray.hxx>
#include <editeng/flstitem.hxx>
#include "chardlg.hxx"
#include "paragrph.hxx"
@@ -137,7 +137,6 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
SfxObjectShell* pSh = SfxObjectShell::Current();
DBG_ASSERT( pSh, "No DocShell" );
- ResStringArray aAttrNames(ResId(RID_ATTR_NAMES, DIALOG_MGR()));
SfxItemPool& rPool = pSh->GetPool();
SfxItemSet aSet( rPool, pWhRanges );
SfxWhichIter aIter( aSet );
@@ -160,10 +159,10 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
}
// item resources are in svx
- sal_uInt32 nId = aAttrNames.FindIndex( nSlot );
+ sal_uInt32 nId = SvxAttrNameTable::FindIndex(nSlot);
SvTreeListEntry* pEntry = nullptr;
if ( RESARRAY_INDEX_NOTFOUND != nId )
- pEntry = m_pAttrLB->SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) );
+ pEntry = m_pAttrLB->SvTreeListBox::InsertEntry(SvxAttrNameTable::GetString(nId));
else
SAL_WARN( "cui.dialogs", "no resource for slot id " << static_cast<sal_Int32>(nSlot) );
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
deleted file mode 100644
index 5322c8b0ac54..000000000000
--- a/cui/source/dialogs/svuidlg.hrc
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svl/solar.hrc>
-#include <helpid.hrc>
-
-#define STR_AUTOLINK 32006
-#define STR_MANUALLINK 32007
-#define STR_BROKENLINK 32008
-#define STR_CLOSELINKMSG 32011
-#define STR_CLOSELINKMSG_MULTI 32024
-#define STR_WAITINGLINK 32028
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
deleted file mode 100644
index 81f89aa27707..000000000000
--- a/cui/source/dialogs/svuidlg.src
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svtools/controldims.hrc>
-#include "svuidlg.hrc"
-
-
-String STR_AUTOLINK
-{
- Text [ en-US ] = "Automatic" ;
-};
-
-String STR_MANUALLINK
-{
- Text [ en-US ] = "Manual" ;
-};
-
-String STR_BROKENLINK
-{
- Text [ en-US ] = "Not available" ;
-};
-
-String STR_CLOSELINKMSG
-{
- Text [ en-US ] = "Are you sure you want to remove the selected link?" ;
-};
-
-String STR_CLOSELINKMSG_MULTI
-{
- Text [ en-US ] = "Are you sure you want to remove the selected link?" ;
-};
-
-String STR_WAITINGLINK
-{
- Text [ en-US ] = "Waiting";
-};
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 0bed6ce6f9a2..0bf69e5329ce 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -20,6 +20,7 @@
#include "thesdlg.hxx"
#include "thesdlg_impl.hxx"
#include "cuires.hrc"
+#include "strings.hrc"
#include "dialmgr.hxx"
#include <svl/lngmisc.hxx>
diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx
index 376d4962483a..c03d3dbbc476 100644
--- a/cui/source/factory/cuiresmgr.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -18,22 +18,22 @@
*/
#include <dialmgr.hxx>
-#include <svl/solar.hrc>
#include <tools/resmgr.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-// struct DialogsResMgr --------------------------------------------------
-ResMgr* CuiResMgr::GetResMgr()
+namespace
{
- static ResMgr* pResMgr=nullptr;
-
- if ( !pResMgr )
+ const std::locale& GetResLocale()
{
- pResMgr = ResMgr::CreateResMgr("cui", Application::GetSettings().GetUILanguageTag());
+ static std::locale loc(Translate::Create("cui", Application::GetSettings().GetUILanguageTag()));
+ return loc;
}
+}
- return pResMgr;
+OUString CuiResId(const char *pKey)
+{
+ return Translate::get(pKey, GetResLocale());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 3c1287180cae..ed48d45f94ed 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -27,7 +27,6 @@
#include <svx/dialogs.hrc>
#include "numfmt.hxx"
#include "splitcelldlg.hxx"
-#include "gallery.hrc"
#include "dstribut.hxx"
#include "cuiimapwnd.hxx"
#include "hlmarkwn.hxx"
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index c784d2917e3d..6502549ac6d7 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -131,8 +131,8 @@ private:
DECL_LINK( SyncHdl_Impl, Button*, void);
DECL_LINK( RemoveAdjacentCellBorderHdl_Impl, Button*, void);
- sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const;
- sal_uInt16 GetPresetStringId( sal_uInt16 nValueSetIdx ) const;
+ sal_uInt16 GetPresetImageId(sal_uInt16 nValueSetIdx) const;
+ const char* GetPresetStringId(sal_uInt16 nValueSetIdx) const;
void FillPresetVS();
void FillShadowVS();
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 16cb33c8d6f2..beec430dcd7a 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -25,72 +25,12 @@
// Resource-Id's ------------------------------------------------------------
-// RID_SVX_START + 0 unused
-#define RID_SVXSTR_OPTIONS_RESTART (RID_SVX_START + 1)
-
// Gallery
#define RID_CUI_GALLERY_START (RID_SVX_START + 360)
// RID_CUI_GALLERY_END (RID_SVX_START + 410)
-// used in "tabpages"
-#define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969)
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970)
-#define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971)
-#define RID_SVXSTR_TABLE_PRESET_OUTERALL (RID_SVX_START + 972)
-#define RID_SVXSTR_TABLE_PRESET_OUTERINNER (RID_SVX_START + 973)
-#define RID_SVXSTR_PARA_PRESET_DIAGONAL (RID_SVX_START + 974)
-#define RID_SVXSTR_PARA_PRESET_ALL (RID_SVX_START + 975)
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT (RID_SVX_START + 976)
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM (RID_SVX_START + 977)
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT (RID_SVX_START + 978)
-#define RID_SVXSTR_SHADOW_STYLE_NONE (RID_SVX_START + 979)
-#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980)
-#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT (RID_SVX_START + 981)
-#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT (RID_SVX_START + 982)
-#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT (RID_SVX_START + 983)
-#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113)
-#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114)
-#define RID_SVXSTR_FRAMEDIR_LTR (RID_SVX_START + 960)
-#define RID_SVXSTR_FRAMEDIR_RTL (RID_SVX_START + 961)
-#define RID_SVXSTR_FRAMEDIR_SUPER (RID_SVX_START + 962)
-#define RID_SVXSTR_PAGEDIR_LTR_HORI (RID_SVX_START + 965)
-#define RID_SVXSTR_PAGEDIR_RTL_HORI (RID_SVX_START + 966)
-#define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967)
-#define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968)
-#define RID_SVXSTR_EDIT_GRAPHIC (RID_SVX_START + 509)
-
-#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163)
-#define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168)
-#define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169)
-#define RID_SVXSTR_DESC_NEW_PATTERN (RID_SVX_START + 170)
-#define RID_SVXSTR_REMOVE_FAVORITES (RID_SVX_START + 171)
-#define RID_SVXSTR_ADD_FAVORITES (RID_SVX_START + 172)
-#define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174)
-
-#define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177)
-#define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232)
-#define RID_SVXSTR_CHANGE (RID_SVX_START + 181)
-#define RID_SVXSTR_ADD (RID_SVX_START + 182)
-#define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215)
-#define RID_SVXSTR_TABLE (RID_SVX_START + 220)
-#define RID_SVXSTR_CONNECTOR (RID_SVX_START + 221)
-#define RID_SVXSTR_DIMENSION_LINE (RID_SVX_START + 222)
-
-#define RID_SVXSTR_DESC_LINEEND (RID_SVX_START + 238)
-#define RID_SVXSTR_CHARNAME_NOSTYLE (RID_SVX_START + 239)
-#define RID_SVXSTR_CHARNAME_FAMILY (RID_SVX_START + 240)
-#define RID_SVXSTR_CHARNAME_FONT (RID_SVX_START + 241)
-#define RID_SVXSTR_CHARNAME_STYLE (RID_SVX_START + 242)
-#define RID_SVXSTR_CHARNAME_TYPEFACE (RID_SVX_START + 243)
-#define RID_SVXSTR_CHARNAME_HIGHLIGHTING (RID_SVX_START + 244)
-
// options
-#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162)
-#define RID_SVXSTR_QUERY_DELETE_CONFIRM (RID_SVX_START + 1110)
#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840)
-#define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111)
-#define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169)
-#define STR_NAME_CONFLICT (RID_SVX_START + 1112)
#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18)
// treeopt
@@ -115,293 +55,13 @@
#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
#define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247)
#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
-#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 324)
-#define RID_SVXSTR_COLOR_CONFIG_SAVE1 (RID_SVX_START + 853)
-#define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854)
-#define RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE (RID_SVX_START + 855)
-#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320)
-#define RID_SVXSTR_OPT_PROXYPORTS (RID_SVX_START + 224)
-#define RID_SVXSTR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
-#define RID_SVXSTR_JRE_FAILED_VERSION (RID_SVX_START + 257)
-#define RID_SVXSTR_JAVA_START_PARAM (RID_SVX_START + 258)
-#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
#define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209)
-#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //?
-#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//?
-#define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016)//?
-#define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023)//?
-#define RID_SVXSTR_KEY_FILTER_PATH (RID_SVX_START + 1012)//?
-#define RID_SVXSTR_KEY_ADDINS_PATH (RID_SVX_START + 1003)//?
-#define RID_SVXSTR_KEY_FAVORITES_DIR (RID_SVX_START + 1011)//?
-#define RID_SVXSTR_KEY_PLUGINS_PATH (RID_SVX_START + 1019)//?
-#define RID_SVXSTR_KEY_TEMP_PATH (RID_SVX_START + 1021)//?
-#define RID_SVXSTR_KEY_STORAGE_DIR (RID_SVX_START + 1020)//?
-#define RID_SVXSTR_KEY_GALLERY_DIR (RID_SVX_START + 1013)//?
-#define RID_SVXSTR_KEY_HELP_DIR (RID_SVX_START + 1015)//?
-#define RID_SVXSTR_KEY_GLOSSARY_PATH (RID_SVX_START + 1005)//?
-#define RID_SVXSTR_KEY_TEMPLATE_PATH (RID_SVX_START + 1022)//?
-#define RID_SVXSTR_KEY_MODULES_PATH (RID_SVX_START + 1017)//?
-#define RID_SVXSTR_KEY_BACKUP_PATH (RID_SVX_START + 1006)//?
-#define RID_SVXSTR_KEY_PALETTE_PATH (RID_SVX_START + 1018)//?
-#define RID_SVXSTR_KEY_CONFIG_DIR (RID_SVX_START + 1009)//?
-#define RID_SVXSTR_KEY_WORK_PATH (RID_SVX_START + 1024)//?
-#define RID_SVXSTR_KEY_GRAPHICS_PATH (RID_SVX_START + 1014)//?
-#define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007)//?
-#define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008)//?
-#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//?
-#define RID_SVXSTR_KEY_CLASSIFICATION_PATH (RID_SVX_START + 1118)
-
-// dialogs
-#define STR_MODIFY (RID_SVX_START + 336)//from optdict.src
// hyperlink dialog
#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228)
#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229)
#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230)
#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231)
-#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581)
-#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588)
-#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549)
-#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME (RID_SVX_START + 553)
-#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815)
-#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800)
-#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801)
-#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550)
-#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551)
-#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552)
-#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813)
-#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814)
-#define RID_SVXSTR_MNUCFG_ALREADY_INCLUDED (RID_SVX_START + 816)
-
-// multi path dialog
-#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207)
-#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484)
-#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485)
-#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486)
-#define RID_SVXSTR_ADD_IMAGE (RID_SVX_START + 487)
-
-// script organizer
-#define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027)
-#define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028)
-#define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029)
-#define RID_SVXSTR_DELFAILED_TITLE (RID_SVX_START + 1031)
-#define RID_SVXSTR_CREATEFAILED (RID_SVX_START + 1032)
-#define RID_SVXSTR_CREATEFAILEDDUP (RID_SVX_START + 1034)
-#define RID_SVXSTR_CREATEFAILED_TITLE (RID_SVX_START + 1035)
-#define RID_SVXSTR_RENAMEFAILED (RID_SVX_START + 1036)
-#define RID_SVXSTR_RENAMEFAILED_TITLE (RID_SVX_START + 1038)
-#define RID_SVXSTR_ERROR_TITLE (RID_SVX_START + 1100)
-#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED (RID_SVX_START + 1101)
-#define RID_SVXSTR_ERROR_RUNNING (RID_SVX_START + 1102)
-#define RID_SVXSTR_EXCEPTION_RUNNING (RID_SVX_START + 1103)
-#define RID_SVXSTR_ERROR_AT_LINE (RID_SVX_START + 1104)
-#define RID_SVXSTR_EXCEPTION_AT_LINE (RID_SVX_START + 1105)
-#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING (RID_SVX_START + 1106)
-#define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108)
-#define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109)
-
-#define RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS (RID_SVX_START + 1167)
-#define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039)
-#define RID_SVXSTR_NEW_TOOLBAR (RID_SVX_START + 1040)
-#define RID_SVXSTR_MOVE_MENU (RID_SVX_START + 1041)
-#define RID_SVXSTR_ADD_SUBMENU (RID_SVX_START + 1048)
-#define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049)
-#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
-#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355
-#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355
-#define RID_SVXSTR_PRODUCTNAME_TOOLBARS (RID_SVX_START + 1042)
-#define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043)
-#define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044)
-#define RID_SVXSTR_COMMANDS (RID_SVX_START + 1045)
-#define RID_SVXSTR_CONFIRM_MENU_RESET (RID_SVX_START + 1115)
-#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET (RID_SVX_START + 1116)
-#define RID_SVXSTR_LABEL_NEW_NAME (RID_SVX_START + 1135)
-#define RID_SVXSTR_RENAME_MENU (RID_SVX_START + 1136)
-#define RID_SVXSTR_RENAME_TOOLBAR (RID_SVX_START + 1137)
-#define RID_SVXSTR_EVENT_STARTAPP (RID_SVX_START + 1051)
-#define RID_SVXSTR_EVENT_CLOSEAPP (RID_SVX_START + 1052)
-#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053)
-#define RID_SVXSTR_EVENT_CLOSEDOC (RID_SVX_START + 1054)
-#define RID_SVXSTR_EVENT_PREPARECLOSEDOC (RID_SVX_START + 1055)
-#define RID_SVXSTR_EVENT_OPENDOC (RID_SVX_START + 1056)
-#define RID_SVXSTR_EVENT_SAVEDOC (RID_SVX_START + 1057)
-#define RID_SVXSTR_EVENT_SAVEASDOC (RID_SVX_START + 1058)
-#define RID_SVXSTR_EVENT_SAVEDOCDONE (RID_SVX_START + 1059)
-#define RID_SVXSTR_EVENT_SAVEASDOCDONE (RID_SVX_START + 1060)
-#define RID_SVXSTR_EVENT_ACTIVATEDOC (RID_SVX_START + 1061)
-#define RID_SVXSTR_EVENT_DEACTIVATEDOC (RID_SVX_START + 1062)
-#define RID_SVXSTR_EVENT_PRINTDOC (RID_SVX_START + 1063)
-#define RID_SVXSTR_EVENT_MODIFYCHANGED (RID_SVX_START + 1064)
-#define RID_SVXSTR_EVENT_MAILMERGE (RID_SVX_START + 1065)
-#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE (RID_SVX_START + 1066)
-#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067)
-#define RID_SVXSTR_EVENT_ACTIONPERFORMED (RID_SVX_START + 1068)
-#define RID_SVXSTR_EVENT_CHANGED (RID_SVX_START + 1069)
-#define RID_SVXSTR_EVENT_TEXTCHANGED (RID_SVX_START + 1070)
-#define RID_SVXSTR_EVENT_ITEMSTATECHANGED (RID_SVX_START + 1071)
-#define RID_SVXSTR_EVENT_FOCUSGAINED (RID_SVX_START + 1072)
-#define RID_SVXSTR_EVENT_FOCUSLOST (RID_SVX_START + 1073)
-#define RID_SVXSTR_EVENT_KEYTYPED (RID_SVX_START + 1074)
-#define RID_SVXSTR_EVENT_KEYUP (RID_SVX_START + 1075)
-#define RID_SVXSTR_EVENT_MOUSEENTERED (RID_SVX_START + 1076)
-#define RID_SVXSTR_EVENT_MOUSEDRAGGED (RID_SVX_START + 1077)
-#define RID_SVXSTR_EVENT_MOUSEMOVED (RID_SVX_START + 1078)
-#define RID_SVXSTR_EVENT_MOUSEPRESSED (RID_SVX_START + 1079)
-#define RID_SVXSTR_EVENT_MOUSERELEASED (RID_SVX_START + 1080)
-#define RID_SVXSTR_EVENT_MOUSEEXITED (RID_SVX_START + 1081)
-#define RID_SVXSTR_EVENT_APPROVERESETTED (RID_SVX_START + 1082)
-#define RID_SVXSTR_EVENT_SUBMITTED (RID_SVX_START + 1083)
-#define RID_SVXSTR_EVENT_BEFOREUPDATE (RID_SVX_START + 1084)
-#define RID_SVXSTR_EVENT_AFTERUPDATE (RID_SVX_START + 1085)
-#define RID_SVXSTR_EVENT_LOADED (RID_SVX_START + 1086)
-#define RID_SVXSTR_EVENT_RELOADING (RID_SVX_START + 1087)
-#define RID_SVXSTR_EVENT_RELOADED (RID_SVX_START + 1088)
-#define RID_SVXSTR_EVENT_UNLOADING (RID_SVX_START + 1089)
-#define RID_SVXSTR_EVENT_UNLOADED (RID_SVX_START + 1090)
-#define RID_SVXSTR_EVENT_CONFIRMDELETE (RID_SVX_START + 1091)
-#define RID_SVXSTR_EVENT_APPROVEROWCHANGE (RID_SVX_START + 1092)
-#define RID_SVXSTR_EVENT_ROWCHANGE (RID_SVX_START + 1093)
-#define RID_SVXSTR_EVENT_POSITIONING (RID_SVX_START + 1094)
-#define RID_SVXSTR_EVENT_POSITIONED (RID_SVX_START + 1095)
-#define RID_SVXSTR_EVENT_APPROVEPARAMETER (RID_SVX_START + 1096)
-#define RID_SVXSTR_EVENT_ERROROCCURRED (RID_SVX_START + 1097)
-#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098)
-#define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099)
-#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170)
-#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED (RID_SVX_START + 1171)
-#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172)
-#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173)
-#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174)
-#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175)
-#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176)
-#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177)
-#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178)
-#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179)
-#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180)
-#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181)
-#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182)
-#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186)
-#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187)
-#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188)
-
-// For now, keep new IDs unique only within cui.
-// Later, cui should perhaps get an own range of IDs.
-#define RID_SVXSTR_EVENT_SELECTIONCHANGED (RID_SVX_START + 1190)
-#define RID_SVXSTR_EVENT_DOUBLECLICK (RID_SVX_START + 1191)
-#define RID_SVXSTR_EVENT_RIGHTCLICK (RID_SVX_START + 1192)
-#define RID_SVXSTR_EVENT_CALCULATE (RID_SVX_START + 1193)
-#define RID_SVXSTR_EVENT_CONTENTCHANGED (RID_SVX_START + 1194)
-
-#define RID_SVXSTR_ERR_TEXTNOTFOUND (RID_SVX_START + 1195)
-#define RID_SVXSTR_SELECT_FILE_IFRAME (RID_SVX_START + 1196)
-#define RID_SVXSTR_MYMACROS (RID_SVX_START + 1197)
-#define RID_SVXSTR_PRODMACROS (RID_SVX_START + 1198)
-#define RID_SVXSTR_SELECTOR_ADD_COMMANDS (RID_SVX_START + 1199)
-#define RID_SVXSTR_SELECTOR_RUN (RID_SVX_START + 1200)
-#define RID_SVXSTR_ROW (RID_SVX_START + 1201)
-#define RID_SVXSTR_COL (RID_SVX_START + 1202)
-#define RID_SVXSTR_AUTO_ENTRY (RID_SVX_START + 1203)
-#define RID_SVXSTR_ALLFUNCTIONS (RID_SVX_START + 1204)
-
-#define RID_SVXSTR_USE_REPLACE (RID_SVX_START + 1205)
-#define RID_SVXSTR_CPTL_STT_WORD (RID_SVX_START + 1206)
-#define RID_SVXSTR_CPTL_STT_SENT (RID_SVX_START + 1207)
-#define RID_SVXSTR_BOLD_UNDER (RID_SVX_START + 1208)
-#define RID_SVXSTR_NO_DBL_SPACES (RID_SVX_START + 1209)
-#define RID_SVXSTR_DETECT_URL (RID_SVX_START + 1210)
-#define RID_SVXSTR_DASH (RID_SVX_START + 1211)
-#define RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK (RID_SVX_START + 1212)
-#define RID_SVXSTR_NON_BREAK_SPACE (RID_SVX_START + 1213)
-#define RID_SVXSTR_ORDINAL (RID_SVX_START + 1214)
-#define RID_SVXSTR_DEL_EMPTY_PARA (RID_SVX_START + 1215)
-#define RID_SVXSTR_USER_STYLE (RID_SVX_START + 1216)
-#define RID_SVXSTR_BULLET (RID_SVX_START + 1217)
-#define RID_SVXSTR_RIGHT_MARGIN (RID_SVX_START + 1218)
-#define RID_SVXSTR_NUM (RID_SVX_START + 1219)
-#define RID_SVXSTR_BORDER (RID_SVX_START + 1220)
-#define RID_SVXSTR_CREATE_TABLE (RID_SVX_START + 1221)
-#define RID_SVXSTR_REPLACE_TEMPLATES (RID_SVX_START + 1222)
-#define RID_SVXSTR_DEL_SPACES_AT_STT_END (RID_SVX_START + 1223)
-#define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES (RID_SVX_START + 1224)
-
-#define RID_SVXSTR_CAPITAL_WORDS (RID_SVX_START + 1225)
-#define RID_SVXSTR_WORDS_WITH_DIGITS (RID_SVX_START + 1226)
-#define RID_SVXSTR_SPELL_SPECIAL (RID_SVX_START + 1227)
-#define RID_SVXSTR_SPELL_AUTO (RID_SVX_START + 1228)
-#define RID_SVXSTR_NUM_PRE_BREAK (RID_SVX_START + 1229)
-#define RID_SVXSTR_NUM_POST_BREAK (RID_SVX_START + 1230)
-#define RID_SVXSTR_HYPH_AUTO (RID_SVX_START + 1231)
-#define RID_SVXSTR_HYPH_SPECIAL (RID_SVX_START + 1232)
-#define RID_SVXSTR_NUM_MIN_WORDLEN (RID_SVX_START + 1233)
-#define RID_SVXSTR_GRAMMAR_AUTO (RID_SVX_START + 1234)
-#define RID_SVXSTR_GROUP_STYLES (RID_SVX_START + 1235)
-#define RID_SVXSTR_BASICMACROS (RID_SVX_START + 1236)
-// There is a gap here because of removed strings
-#define RID_SVXSTR_CHG_MATH (RID_SVX_START + 1238)
-#define RID_SVXSTR_CHG_WRITER (RID_SVX_START + 1239)
-#define RID_SVXSTR_CHG_CALC (RID_SVX_START + 1240)
-#define RID_SVXSTR_CHG_IMPRESS (RID_SVX_START + 1241)
-#define RID_SVXSTR_HEADER1 (RID_SVX_START + 1242)
-#define RID_SVXSTR_HEADER2 (RID_SVX_START + 1243)
-
-#define RID_SVXSTR_TYPE (RID_SVX_START + 1244)
-#define RID_SVXSTR_PATH (RID_SVX_START + 1245)
-
-#define RID_SVXSTR_DRIVER_NAME (RID_SVX_START + 1246)
-#define RID_SVXSTR_POOLED_FLAG (RID_SVX_START + 1247)
-#define RID_SVXSTR_POOL_TIMEOUT (RID_SVX_START + 1248)
-#define RID_SVXSTR_YES (RID_SVX_START + 1249)
-#define RID_SVXSTR_NO (RID_SVX_START + 1250)
-
-#define RID_SVXSTR_CHG_SMARTART (RID_SVX_START + 1251)
-
-#define RID_SVXSTR_PPI (RID_SVX_START + 1252)
-#define RID_SVXSTR_SPELL (RID_SVX_START + 1253)
-#define RID_SVXSTR_HYPH (RID_SVX_START + 1254)
-#define RID_SVXSTR_THES (RID_SVX_START + 1255)
-#define RID_SVXSTR_GRAMMAR (RID_SVX_START + 1256)
-
-#define RID_SVXSTR_ONE_PASSWORD_MISMATCH (RID_SVX_START + 1258)
-#define RID_SVXSTR_TWO_PASSWORDS_MISMATCH (RID_SVX_START + 1259)
-#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON (RID_SVX_START + 1260)
-#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 (RID_SVX_START + 1261)
-
-#define RID_SVXSTR_LOADACCELCONFIG (RID_SVX_START + 1262)
-#define RID_SVXSTR_SAVEACCELCONFIG (RID_SVX_START + 1263)
-#define RID_SVXSTR_FILTERNAME_CFG (RID_SVX_START + 1264)
-#define RID_SVXSTR_LOAD_ERROR (RID_SVX_START + 1265)
-
-#define RID_SVXSTR_EDITHINT (RID_SVX_START + 1266)
-#define RID_SVXSTR_SAVE_SCREENSHOT_AS (RID_SVX_START + 1267)
-
-#define RID_SVXSTR_STARTQUOTE (RID_SVX_START + 1268)
-#define RID_SVXSTR_ENDQUOTE (RID_SVX_START + 1269)
-
-// Hangul/Hanja Dialog
-#define RID_SVXSTR_HANGUL (RID_SVX_START + 1270)
-#define RID_SVXSTR_HANJA (RID_SVX_START + 1271)
-
-// Search Persona Dialog
-#define RID_SVXSTR_SELECTEDPERSONA (RID_SVX_START + 1278)
-#define RID_SVXSTR_SEARCHING (RID_SVX_START + 1279)
-#define RID_SVXSTR_SEARCHERROR (RID_SVX_START + 1280)
-#define RID_SVXSTR_NORESULTS (RID_SVX_START + 1281)
-#define RID_SVXSTR_APPLYPERSONA (RID_SVX_START + 1282)
-
-#define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR (RID_SVX_START + 1283)
-#define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT (RID_SVX_START + 1284)
-#define RID_SVXSTR_CONFIRM_SET_LANGUAGE (RID_SVX_START + 1285)
-
-// String Array for Persona Categories
-#define RID_SVXSTR_PERSONA_CATEGORIES (RID_SVX_START + 1286)
#define RID_SVXPAGE_OPENCL (RID_SVX_START + 254)
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index e323ba987c7e..067591a09bab 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -19,21 +19,9 @@
#ifndef INCLUDED_CUI_SOURCE_INC_DIALMGR_HXX
#define INCLUDED_CUI_SOURCE_INC_DIALMGR_HXX
-#include <tools/resid.hxx>
+#include <rtl/ustring.hxx>
-// forward ---------------------------------------------------------------
-
-#define CUI_MGR() (*CuiResMgr::GetResMgr())
-
-struct CuiResMgr
-{
- static ResMgr* GetResMgr();
-};
-
-inline OUString CuiResId(sal_uInt16 nId)
-{
- return ResId(nId, CUI_MGR());
-}
+OUString CuiResId(const char *pKey);
#endif
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
deleted file mode 100644
index 221aa9bd5f6e..000000000000
--- a/cui/source/inc/gallery.hrc
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include <cuires.hrc>
-
-// Gallery-Strings
-#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12)
-#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39)
-#define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43)
-#define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44)
-#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index b2feb3c6dcdc..736c4de3cbcf 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -41,10 +41,10 @@ typedef std::unordered_map< OUString, std::pair< OUString, OUString >,
struct EventDisplayName
{
const sal_Char* pAsciiEventName;
- sal_uInt16 nEventResourceID;
- EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId )
- : pAsciiEventName( _pAsciiName )
- , nEventResourceID( _nResId )
+ const char* pEventResourceID;
+ EventDisplayName(const sal_Char* pAsciiName, const char* pResId)
+ : pAsciiEventName(pAsciiName)
+ , pEventResourceID(pResId)
{
}
};
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index fdd97c4566d8..ff83afe71892 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -73,9 +73,6 @@ class SvxSwPosSizeTabPage : public SfxTabPage
Link<SvxSwFrameValidation&,void> m_aValidateLink;
- //'string provider'
- SvxSwFramePosString m_aFramePosString;
-
::tools::Rectangle m_aRect; //size of all selected objects
::tools::Rectangle m_aWorkArea;
Point m_aAnchorPos;
@@ -110,7 +107,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
void InitPos(RndStdIds nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel,
sal_uInt16 nV, sal_uInt16 nVRel,
long nX, long nY);
- sal_uInt16 GetMapPos(FrmMap *pMap, ListBox &rAlignLB);
+ static sal_uInt16 GetMapPos(FrmMap *pMap, ListBox &rAlignLB);
static short GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
static short GetRelation(FrmMap *pMap, ListBox &rRelationLB);
RndStdIds GetAnchorType(bool* pbHasChanged = nullptr);
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index a771ef0a206f..d01c1c10e2fe 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -24,7 +24,6 @@
#include <memory>
-#include <tools/resary.hxx>
#include <vcl/fixed.hxx>
class SfxModule;
@@ -196,40 +195,6 @@ public:
static void ApplyLanguageOptions(const SfxItemSet& rSet);
};
-// class OfaPageResource -------------------------------------------------
-
-class OfaPageResource
-{
- ResStringArray aGeneralDlgAry;
- ResStringArray aInetDlgAry;
- ResStringArray aLangDlgAry;
- ResStringArray aTextDlgAry;
- ResStringArray aHTMLDlgAry;
- ResStringArray aCalcDlgAry;
- ResStringArray aStarMathDlgAry;
- ResStringArray aImpressDlgAry;
- ResStringArray aDrawDlgAry;
- ResStringArray aChartDlgAry;
- ResStringArray aFilterDlgAry;
- ResStringArray aDatasourcesDlgAry;
-
-public:
- OfaPageResource();
-
- ResStringArray& GetGeneralArray() {return aGeneralDlgAry;}
- ResStringArray& GetInetArray() {return aInetDlgAry;}
- ResStringArray& GetLangArray() {return aLangDlgAry;}
- ResStringArray& GetTextArray() {return aTextDlgAry;}
- ResStringArray& GetHTMLArray() {return aHTMLDlgAry;}
- ResStringArray& GetCalcArray() {return aCalcDlgAry;}
- ResStringArray& GetStarMathArray() {return aStarMathDlgAry;}
- ResStringArray& GetImpressArray() {return aImpressDlgAry;}
- ResStringArray& GetDrawArray() {return aDrawDlgAry;}
- ResStringArray& GetChartArray() {return aChartDlgAry;}
- ResStringArray& GetFilterArray() {return aFilterDlgAry;}
- ResStringArray& GetDatasourcesArray() {return aDatasourcesDlgAry;}
-};
-
// class ExtensionsTabPage -----------------------------------------------
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 8a2e95793b16..4e8666cdac1a 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -22,6 +22,7 @@
#include "cfgchart.hxx"
#include <dialmgr.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#define ROW_COLOR_COUNT 12
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 850a05d8d2c2..ae3a2538d386 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -25,6 +25,7 @@
#include <svl/eitem.hxx>
#include <cuires.hrc>
#include "helpid.hrc"
+#include <strings.hrc>
#include <dialmgr.hxx>
using ::svt::EditBrowseBox;
diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src
deleted file mode 100644
index 5f441079f37f..000000000000
--- a/cui/source/options/connpooloptions.src
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String RID_SVXSTR_DRIVER_NAME
-{
- Text [ en-US ] = "Driver name";
-};
-String RID_SVXSTR_POOLED_FLAG
-{
- Text [ en-US ] = "Pool";
-};
-String RID_SVXSTR_POOL_TIMEOUT
-{
- Text [ en-US ] = "Timeout";
-};
-String RID_SVXSTR_YES
-{
- Text [ en-US ] = "Yes";
-};
-String RID_SVXSTR_NO
-{
- Text [ en-US ] = "No";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index ce2a4a94dd4b..df307e814396 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -25,6 +25,7 @@
#include <svtools/editbrowsebox.hxx>
#include "svtools/treelistentry.hxx"
#include <cuires.hrc>
+#include <strings.hrc>
#include <bitmaps.hlst>
#include <vcl/field.hxx>
#include <vcl/layout.hxx>
@@ -442,5 +443,4 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, const OUString&, _rName, bo
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
deleted file mode 100644
index 7362be056d51..000000000000
--- a/cui/source/options/dbregister.src
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String RID_SVXSTR_TYPE
-{
- Text [ en-US ] = "Registered name" ;
-};
-
-String RID_SVXSTR_PATH
-{
- Text [ en-US ] = "Database file" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index eacfc0319f80..6bb15f5b3aae 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <comphelper/processfactory.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svl/filenotation.hxx>
#include <vcl/layout.hxx>
#include <ucbhelper/content.hxx>
diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src
deleted file mode 100644
index 6e93f0c373fa..000000000000
--- a/cui/source/options/doclinkdialog.src
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String STR_LINKEDDOC_DOESNOTEXIST
-{
- Text [ en-US ] = "The file\n$file$\ndoes not exist.";
-};
-
-String STR_LINKEDDOC_NO_SYSTEM_FILE
-{
- Text [ en-US ] = "The file\n$file$\ndoes not exist in the local file system.";
-};
-
-String STR_NAME_CONFLICT
-{
- Text [ en-US ] = "The name '$file$' is already used for another database.\nPlease choose a different name.";
-};
-
-String RID_SVXSTR_QUERY_DELETE_CONFIRM
-{
- Text [ en-US ] = "Do you want to delete the entry?" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
deleted file mode 100644
index f5ae78182f52..000000000000
--- a/cui/source/options/optchart.src
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-#include "helpid.hrc"
-
-// tab page for setting the default colors used for new charts
-
-String RID_SVXSTR_DIAGRAM_ROW
-{
- // $(ROW) can be a number or the caption of the row in quotes
-
- Text [ en-US ] = "Data Series $(ROW)" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 33ea45e806c0..1a64c728eddb 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -39,6 +39,7 @@
#include <dialmgr.hxx>
#include "optcolor.hxx"
#include <cuires.hrc>
+#include <strings.hrc>
#include <svx/dlgutil.hxx>
using namespace ::com::sun::star;
@@ -283,7 +284,6 @@ private:
// ctor for default groups
// rParent: parent window (ColorConfigWindow_Impl)
// eGroup: which group is this?
-// rResMgr: resource manager
ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow)
: m_pText(pText)
{
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
deleted file mode 100644
index 2a9af27e71b1..000000000000
--- a/cui/source/options/optcolor.src
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include <cuires.hrc>
-
-String RID_SVXSTR_COLOR_CONFIG_DELETE
-{
- Text [ en-US ] = "Do you really want to delete the color scheme?" ;
-};
-String RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE
-{
- Text [ en-US ] = "Color Scheme Deletion" ;
-};
-String RID_SVXSTR_COLOR_CONFIG_SAVE1
-{
- Text [ en-US ] = "Save scheme" ;
-};
-String RID_SVXSTR_COLOR_CONFIG_SAVE2
-{
- Text [ en-US ] = "Name of color scheme" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index a8beb91cfa46..9f0f8bd434a4 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -34,6 +34,7 @@
#include <linguistic/misc.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include "optdict.hxx"
#include <dialmgr.hxx>
#include <svx/svxerr.hxx>
@@ -177,7 +178,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
xNewDic = nullptr;
// error: couldn't create new dictionary
SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, OUString(),
- this, RID_SVXERRCTX, &DIALOG_MGR() );
+ this, getRID_SVXERRCTX(), &SvxResLocale() );
ErrorHandler::HandleError( *new StringErrorInfo(
ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
EndDialog();
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
deleted file mode 100644
index eeae6311835a..000000000000
--- a/cui/source/options/optdict.src
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "helpid.hrc"
-#include <cuires.hrc>
-
-String RID_SVXSTR_OPT_DOUBLE_DICTS
-{
- Text [ en-US ] = "The specified name already exists.\nPlease enter a new name." ;
-};
-
-String STR_MODIFY
-{
- Text [ en-US ] = "~Replace" ;
-};
-
-String RID_SVXSTR_CONFIRM_SET_LANGUAGE
-{
- Text [ en-US ] = "Do you want to change the '%1' dictionary language?" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 8723c18e77be..6964977d3a39 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -23,6 +23,7 @@
#include "optfltr.hxx"
#include <cuires.hrc>
#include "helpid.hrc"
+#include "strings.hrc"
#include <dialmgr.hxx>
#include "svtools/svlbitm.hxx"
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
deleted file mode 100644
index 41b378c05342..000000000000
--- a/cui/source/options/optfltr.src
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String RID_SVXSTR_HEADER1
-{
- Text [ en-US ] = "[L]";
-};
-String RID_SVXSTR_HEADER2
-{
- Text [ en-US ] = "[S]";
-};
-String RID_SVXSTR_CHG_MATH
-{
- Text [ en-US ] = "MathType to %PRODUCTNAME Math or reverse";
-};
-String RID_SVXSTR_CHG_WRITER
-{
- Text [ en-US ] = "WinWord to %PRODUCTNAME Writer or reverse";
-};
-String RID_SVXSTR_CHG_CALC
-{
- Text [ en-US ] = "Excel to %PRODUCTNAME Calc or reverse";
-};
-String RID_SVXSTR_CHG_IMPRESS
-{
- Text [ en-US ] = "PowerPoint to %PRODUCTNAME Impress or reverse";
-};
-String RID_SVXSTR_CHG_SMARTART
-{
- Text [ en-US ] = "SmartArt to %PRODUCTNAME shapes or reverse";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index c28e7aecc901..db2ff453dbd4 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -54,6 +54,7 @@
#include <svx/ofaitem.hxx>
#include <sfx2/htmlmode.hxx>
#include <svx/svxids.hrc>
+#include <strings.hrc>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
deleted file mode 100644
index e1a9ee0f7800..000000000000
--- a/cui/source/options/optinet2.src
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include <cuires.hrc>
-
-String RID_SVXSTR_OPT_PROXYPORTS
-{
- Text [ en-US ] = "Invalid value!\n\nThe maximum value for a port number is 65535.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 732c616df0c5..8141a5b4ccc0 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -33,6 +33,7 @@
#include <cuires.hrc>
#include "helpid.hrc"
+#include <strings.hrc>
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
#include <tools/urlobj.hxx>
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
deleted file mode 100644
index f4e931a9fbd8..000000000000
--- a/cui/source/options/optjava.src
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_JRE_NOT_RECOGNIZED
-{
- Text [ en-US ] = "The folder you selected does not contain a Java runtime environment.\nPlease select a different folder." ;
-};
-
-String RID_SVXSTR_JRE_FAILED_VERSION
-{
- Text [ en-US ] = "The Java runtime environment you selected is not the required version.\nPlease select a different folder." ;
-};
-
-String RID_SVXSTR_OPTIONS_RESTART
-{
- Text [ en-US ] = "Please restart %PRODUCTNAME now so the new or modified values can take effect." ;
-};
-
-String RID_SVXSTR_JAVA_START_PARAM
-{
- Text [ en-US ] = "Edit Parameter" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index a67c458e43ec..1c85f8469c07 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -58,6 +58,7 @@
#include <dialmgr.hxx>
#include <cuires.hrc>
#include "helpid.hrc"
+#include <strings.hrc>
#include <ucbhelper/content.hxx>
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
deleted file mode 100644
index 084f3a902de6..000000000000
--- a/cui/source/options/optlingu.src
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "helpid.hrc"
-
-#include <svtools/controldims.hrc>
-#include <sfx2/sfx.hrc>
-#include <cuires.hrc>
-
-String RID_SVXSTR_SPELL
-{
- Text [ en-US ] = "Spelling";
-};
-
-String RID_SVXSTR_HYPH
-{
- Text [ en-US ] = "Hyphenation";
-};
-
-String RID_SVXSTR_THES
-{
- Text [ en-US ] = "Thesaurus";
-};
-
-String RID_SVXSTR_GRAMMAR
-{
- Text [ en-US ] = "Grammar";
-};
-
-String RID_SVXSTR_CAPITAL_WORDS
-{
- Text [ en-US ] = "Check uppercase words";
-};
-String RID_SVXSTR_WORDS_WITH_DIGITS
-{
- Text [ en-US ] = "Check words with numbers ";
-};
-String RID_SVXSTR_SPELL_SPECIAL
-{
- Text [ en-US ] = "Check special regions";
-};
-String RID_SVXSTR_SPELL_AUTO
-{
- Text [ en-US ] = "Check spelling as you type";
-};
-String RID_SVXSTR_GRAMMAR_AUTO
-{
- Text [ en-US ] = "Check grammar as you type";
-};
-String RID_SVXSTR_NUM_MIN_WORDLEN
-{
- Text [ en-US ] = "Minimal number of characters for hyphenation: ";
-};
-String RID_SVXSTR_NUM_PRE_BREAK
-{
- Text [ en-US ] = "Characters before line break: ";
-};
-String RID_SVXSTR_NUM_POST_BREAK
-{
- Text [ en-US ] = "Characters after line break: ";
-};
-String RID_SVXSTR_HYPH_AUTO
-{
- Text [ en-US ] = "Hyphenate without inquiry";
-};
-String RID_SVXSTR_HYPH_SPECIAL
-{
- Text [ en-US ] = "Hyphenate special regions";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index b99cd7f04767..0fb1e1a172ee 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -35,6 +35,7 @@
#include <com/sun/star/util/XChangesBatch.hpp>
#include <cuires.hrc>
+#include <strings.hrc>
#include <dialmgr.hxx>
#include "optopencl.hxx"
#include <svtools/treelistentry.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index ab292153757f..08b0243a6f02 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -36,6 +36,7 @@
#include <dialmgr.hxx>
#include <cuires.hrc>
#include "helpid.hrc"
+#include "strings.hrc"
#include <comphelper/configuration.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
@@ -276,7 +277,6 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* )
return true;
}
-
void SvxPathTabPage::Reset( const SfxItemSet* )
{
pPathBox->Clear();
@@ -292,51 +292,74 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
&& !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) )
continue;
+ const char* pId = nullptr;
+
switch (i)
{
case SvtPathOptions::PATH_AUTOCORRECT:
+ pId = RID_SVXSTR_KEY_AUTOCORRECT_DIR;
+ break;
case SvtPathOptions::PATH_AUTOTEXT:
+ pId = RID_SVXSTR_KEY_GLOSSARY_PATH;
+ break;
case SvtPathOptions::PATH_BACKUP:
+ pId = RID_SVXSTR_KEY_BACKUP_PATH;
+ break;
case SvtPathOptions::PATH_GALLERY:
+ pId = RID_SVXSTR_KEY_GALLERY_DIR;
+ break;
case SvtPathOptions::PATH_GRAPHIC:
+ pId = RID_SVXSTR_KEY_GRAPHICS_PATH;
+ break;
case SvtPathOptions::PATH_TEMP:
+ pId = RID_SVXSTR_KEY_TEMP_PATH;
+ break;
case SvtPathOptions::PATH_TEMPLATE:
+ pId = RID_SVXSTR_KEY_TEMPLATE_PATH;
+ break;
case SvtPathOptions::PATH_DICTIONARY:
+ pId = RID_SVXSTR_KEY_DICTIONARY_PATH;
+ break;
case SvtPathOptions::PATH_CLASSIFICATION:
+ pId = RID_SVXSTR_KEY_CLASSIFICATION_PATH;
+ break;
#if OSL_DEBUG_LEVEL > 1
case SvtPathOptions::PATH_LINGUISTIC:
+ pId = RID_SVXSTR_KEY_LINGUISTIC_DIR;
+ break;
#endif
case SvtPathOptions::PATH_WORK:
+ pId = RID_SVXSTR_KEY_WORK_PATH;
+ break;
+ }
+
+ if (pId)
+ {
+ OUString aStr(CuiResId(pId));
+
+ nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr));
+ aStr += "\t";
+ OUString sInternal, sUser, sWritable;
+ bool bReadOnly = false;
+ GetPathList( i, sInternal, sUser, sWritable, bReadOnly );
+ OUString sTmpPath = sUser;
+ if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() )
+ sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sTmpPath += sWritable;
+ const OUString aValue = Convert_Impl( sTmpPath );
+ nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue));
+ aStr += aValue;
+ SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr );
+ if ( bReadOnly )
{
- sal_uInt32 nId = RID_SVXSTR_PATH_NAME_START + i;
- if (i == SvtPathOptions::PATH_CLASSIFICATION)
- // RID_SVXSTR_KEY_USERDICTIONARY_DIR already took our slot, so name the key explicitly.
- nId = RID_SVXSTR_KEY_CLASSIFICATION_PATH;
- OUString aStr(CuiResId(nId));
-
- nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr));
- aStr += "\t";
- OUString sInternal, sUser, sWritable;
- bool bReadOnly = false;
- GetPathList( i, sInternal, sUser, sWritable, bReadOnly );
- OUString sTmpPath = sUser;
- if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() )
- sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER);
- sTmpPath += sWritable;
- const OUString aValue = Convert_Impl( sTmpPath );
- nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue));
- aStr += aValue;
- SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr );
- if ( bReadOnly )
- {
- pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage );
- }
- PathUserData_Impl* pPathImpl = new PathUserData_Impl(i);
- pPathImpl->sUserPath = sUser;
- pPathImpl->sWritablePath = sWritable;
- pEntry->SetUserData( pPathImpl );
+ pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage );
}
+ PathUserData_Impl* pPathImpl = new PathUserData_Impl(i);
+ pPathImpl->sUserPath = sUser;
+ pPathImpl->sWritablePath = sWritable;
+ pEntry->SetUserData( pPathImpl );
}
+
}
long aTabs[] = {3, 0, 0, 0};
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
deleted file mode 100644
index 8eae97173416..000000000000
--- a/cui/source/options/optpath.src
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include <cuires.hrc>
-#include <sfx2/sfx.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_KEY_CONFIG_DIR
-{
- Text [ en-US ] = "Configuration" ;
-};
-String RID_SVXSTR_KEY_WORK_PATH
-{
- Text [ en-US ] = "My Documents" ;
-};
-String RID_SVXSTR_KEY_GRAPHICS_PATH
-{
- Text [ en-US ] = "Images" ;
-};
-String RID_SVXSTR_KEY_BITMAP_PATH
-{
- Text [ en-US ] = "Icons" ;
-};
-String RID_SVXSTR_KEY_BASIC_PATH
-{
- Text = "BASIC" ;
-};
-String RID_SVXSTR_KEY_PALETTE_PATH
-{
- Text [ en-US ] = "Palettes" ;
-};
-String RID_SVXSTR_KEY_BACKUP_PATH
-{
- Text [ en-US ] = "Backups" ;
-};
-String RID_SVXSTR_KEY_MODULES_PATH
-{
- Text [ en-US ] = "Modules" ;
-};
-String RID_SVXSTR_KEY_TEMPLATE_PATH
-{
- Text [ en-US ] = "Templates" ;
-};
-String RID_SVXSTR_KEY_GLOSSARY_PATH
-{
- Text [ en-US ] = "AutoText";
-};
-String RID_SVXSTR_KEY_DICTIONARY_PATH
-{
- Text [ en-US ] = "Dictionaries" ;
-};
-String RID_SVXSTR_KEY_HELP_DIR
-{
- Text [ en-US ] = "Help" ;
-};
-String RID_SVXSTR_KEY_GALLERY_DIR
-{
- Text [ en-US ] = "Gallery" ;
-};
-String RID_SVXSTR_KEY_STORAGE_DIR
-{
- Text [ en-US ] = "Message Storage" ;
-};
-String RID_SVXSTR_KEY_TEMP_PATH
-{
- Text [ en-US ] = "Temporary files";
-};
-String RID_SVXSTR_KEY_PLUGINS_PATH
-{
- Text [ en-US ] = "Plug-ins";
-};
-String RID_SVXSTR_KEY_FAVORITES_DIR
-{
- Text [ en-US ] = "Folder Bookmarks";
-};
-String RID_SVXSTR_KEY_FILTER_PATH
-{
- Text [ en-US ] = "Filters";
-};
-String RID_SVXSTR_KEY_ADDINS_PATH
-{
- Text [ en-US ] = "Add-ins";
-};
-String RID_SVXSTR_KEY_USERCONFIG_PATH
-{
- Text [ en-US ] = "User Configuration";
-};
-String RID_SVXSTR_KEY_USERDICTIONARY_DIR
-{
- Text [ en-US ] = "User-defined dictionaries";
-};
-String RID_SVXSTR_KEY_CLASSIFICATION_PATH
-{
- Text [ en-US ] = "Classification" ;
-};
-String RID_SVXSTR_KEY_AUTOCORRECT_DIR
-{
- Text [ en-US ] = "AutoCorrect";
-};
-String RID_SVXSTR_KEY_LINGUISTIC_DIR
-{
- Text [ en-US ] = "Writing aids";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 66f663d68fb4..9594e6c644c0 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -29,6 +29,8 @@
#include <vcl/mnemonic.hxx>
#include <dialmgr.hxx>
#include "cuires.hrc"
+#include "strings.hrc"
+#include "personalization.hrc"
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
@@ -36,7 +38,6 @@
#include <com/sun/star/xml/sax/Parser.hpp>
#include "ucbhelper/content.hxx"
#include <comphelper/simplefileaccessinteraction.hxx>
-#include <tools/resary.hxx>
#define MAX_RESULTS 9
@@ -58,11 +59,10 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent )
get( m_vSearchSuggestions[4], "suggestion5" );
get( m_vSearchSuggestions[5], "suggestion6" );
- ResStringArray aCategoriesArr(ResId(RID_SVXSTR_PERSONA_CATEGORIES, CUI_MGR()));
- assert(aCategoriesArr.Count() >= CATEGORYCOUNT);
+ assert(SAL_N_ELEMENTS(RID_SVXSTR_PERSONA_CATEGORIES) >= CATEGORYCOUNT);
for(sal_uInt32 i = 0; i < CATEGORYCOUNT; ++i)
{
- m_vSearchSuggestions[i]->SetText( aCategoriesArr.GetString(i) );
+ m_vSearchSuggestions[i]->SetText(CuiResId(RID_SVXSTR_PERSONA_CATEGORIES[i]));
m_vSearchSuggestions[i]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) );
}
@@ -127,7 +127,7 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, Button*, pButton, void )
/*
* English category names should be used for search.
* These strings should be in sync with the strings of
- * RID_SVXSTR_PERSONA_CATEGORIES in personalization.src
+ * RID_SVXSTR_PERSONA_CATEGORIES in personalization.hrc
*/
static const OUStringLiteral vSuggestionCategories[] =
{"LibreOffice", "Abstract", "Color", "Music", "Nature", "Solid"};
diff --git a/cui/source/options/personalization.src b/cui/source/options/personalization.src
deleted file mode 100644
index 5886a61c7464..000000000000
--- a/cui/source/options/personalization.src
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String RID_SVXSTR_SELECTEDPERSONA
-{
- Text [ en-US ] = "Selected Theme: ";
-};
-
-String RID_SVXSTR_SEARCHING
-{
- Text [ en-US ] = "Searching, please wait...";
-};
-
-String RID_SVXSTR_SEARCHERROR
-{
- Text [ en-US ] = "Cannot open %1, please try again later.";
-};
-
-String RID_SVXSTR_NORESULTS
-{
- Text [ en-US ] = "No results found.";
-};
-
-String RID_SVXSTR_APPLYPERSONA
-{
- Text [ en-US ] = "Applying Theme...";
-};
-
-/*
- * This string array must have exactly the same content
- * and the same order as the m_vSuggestionCategories array
- * in personalization.cxx file.
- */
-StringArray RID_SVXSTR_PERSONA_CATEGORIES
-{
- ItemList [en-US]=
- {
- < "LibreOffice" ; > ;
- < "Abstract" ; > ;
- < "Color" ; > ;
- < "Music" ; > ;
- < "Nature" ; > ;
- < "Solid" ; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 97681f0259da..685d2a49e2a0 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -20,11 +20,13 @@
#include <memory>
#include <config_features.h>
+#include <svx/dialogs.hrc>
+
#include "cuires.hrc"
+#include "strings.hrc"
+#include "treeopt.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
-
#include "cfgchart.hxx"
#include "connpoolconfig.hxx"
#include "connpooloptions.hxx"
@@ -145,8 +147,6 @@ struct ModuleToGroupNameMap_Impl
sal_uInt16 m_nNodeId;
};
-static OfaPageResource* pPageRes = nullptr;
-
static ModuleToGroupNameMap_Impl ModuleMap[] =
{
{ "ProductName", OUString(), SID_GENERAL_OPTIONS },
@@ -199,23 +199,20 @@ static OUString getGroupName( const OUString& rModule, bool bForced )
if ( sGroupName.isEmpty() && bForced )
{
- if ( !pPageRes )
- pPageRes = new OfaPageResource;
-
if ( rModule == "Writer" )
- sGroupName = pPageRes->GetTextArray().GetString(0);
+ sGroupName = CuiResId(SID_SW_EDITOPTIONS_RES[0].first);
else if ( rModule == "WriterWeb" )
- sGroupName = pPageRes->GetHTMLArray().GetString(0);
+ sGroupName = CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first);
else if ( rModule == "Calc" )
- sGroupName = pPageRes->GetCalcArray().GetString(0);
+ sGroupName = CuiResId(SID_SC_EDITOPTIONS_RES[0].first);
else if ( rModule == "Impress" )
- sGroupName = pPageRes->GetImpressArray().GetString(0);
+ sGroupName = CuiResId(SID_SD_EDITOPTIONS_RES[0].first);
else if ( rModule == "Draw" )
- sGroupName = pPageRes->GetDrawArray().GetString(0);
+ sGroupName = CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first);
else if ( rModule == "Math" )
- sGroupName = pPageRes->GetStarMathArray().GetString(0);
+ sGroupName = CuiResId(SID_SM_EDITOPTIONS_RES[0].first);
else if ( rModule == "Base" )
- sGroupName = pPageRes->GetDatasourcesArray().GetString(0);
+ sGroupName = CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first);
}
return sGroupName;
}
@@ -337,7 +334,7 @@ struct OptionsMapping_Impl
static OptionsMapping_Impl const OptionsMap_Impl[] =
{
// GROUP PAGE PAGE-ID
- { "ProductName", nullptr, SID_GENERAL_OPTIONS },
+ { "ProductName", nullptr, SID_GENERAL_OPTIONS },
{ "ProductName", "UserData", RID_SFXPAGE_GENERAL },
{ "ProductName", "General", OFA_TP_MISC },
{ "ProductName", "Memory", OFA_TP_MEMORY },
@@ -352,21 +349,21 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "ProductName", "Java", RID_SVXPAGE_OPTIONS_JAVA },
{ "ProductName", "BasicIDEOptions", RID_SVXPAGE_BASICIDE_OPTIONS },
{ "ProductName", "OnlineUpdate", RID_SVXPAGE_ONLINEUPDATE },
- { "LanguageSettings", nullptr, SID_LANGUAGE_OPTIONS },
+ { "LanguageSettings", nullptr, SID_LANGUAGE_OPTIONS },
{ "LanguageSettings", "Languages", OFA_TP_LANGUAGES },
{ "LanguageSettings", "WritingAids", RID_SFXPAGE_LINGU },
{ "LanguageSettings", "SearchingInJapanese", RID_SVXPAGE_JSEARCH_OPTIONS },
{ "LanguageSettings", "AsianLayout", RID_SVXPAGE_ASIAN_LAYOUT },
{ "LanguageSettings", "ComplexTextLayout", RID_SVXPAGE_OPTIONS_CTL },
- { "Internet", nullptr, SID_INET_DLG },
+ { "Internet", nullptr, SID_INET_DLG },
{ "Internet", "Proxy", RID_SVXPAGE_INET_PROXY },
{ "Internet", "Email", RID_SVXPAGE_INET_MAIL },
- { "LoadSave", nullptr, SID_FILTER_DLG },
+ { "LoadSave", nullptr, SID_FILTER_DLG },
{ "LoadSave", "General", RID_SFXPAGE_SAVE },
{ "LoadSave", "VBAProperties", SID_OPTFILTER_MSOFFICE },
{ "LoadSave", "MicrosoftOffice", RID_OFAPAGE_MSFILTEROPT2 },
{ "LoadSave", "HTMLCompatibility", RID_OFAPAGE_HTMLOPT },
- { "Writer", nullptr, SID_SW_EDITOPTIONS },
+ { "Writer", nullptr, SID_SW_EDITOPTIONS },
{ "Writer", "General", RID_SW_TP_OPTLOAD_PAGE },
{ "Writer", "View", RID_SW_TP_CONTENT_OPT },
{ "Writer", "FormattingAids", RID_SW_TP_OPTSHDWCRSR },
@@ -381,16 +378,16 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "Writer", "Compatibility", RID_SW_TP_OPTCOMPATIBILITY_PAGE },
{ "Writer", "AutoCaption", RID_SW_TP_OPTCAPTION_PAGE },
{ "Writer", "MailMerge", RID_SW_TP_MAILCONFIG },
- { "WriterWeb", nullptr, SID_SW_ONLINEOPTIONS },
+ { "WriterWeb", nullptr, SID_SW_ONLINEOPTIONS },
{ "WriterWeb", "View", RID_SW_TP_HTML_CONTENT_OPT },
{ "WriterWeb", "FormattingAids", RID_SW_TP_HTML_OPTSHDWCRSR },
{ "WriterWeb", "Grid", RID_SW_TP_HTML_OPTGRID_PAGE },
{ "WriterWeb", "Print", RID_SW_TP_HTML_OPTPRINT_PAGE },
{ "WriterWeb", "Table", RID_SW_TP_HTML_OPTTABLE_PAGE },
{ "WriterWeb", "Background", RID_SW_TP_BACKGROUND },
- { "Math", nullptr, SID_SM_EDITOPTIONS },
+ { "Math", nullptr, SID_SM_EDITOPTIONS },
{ "Math", "Settings", SID_SM_TP_PRINTOPTIONS },
- { "Calc", nullptr, SID_SC_EDITOPTIONS },
+ { "Calc", nullptr, SID_SC_EDITOPTIONS },
{ "Calc", "General", SID_SC_TP_LAYOUT },
{ "Calc", "View", SID_SC_TP_CONTENT },
{ "Calc", "Calculate", SID_SC_TP_CALC },
@@ -400,22 +397,22 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "Calc", "Compatibility", SID_SC_TP_COMPATIBILITY },
{ "Calc", "Grid", SID_SC_TP_GRID },
{ "Calc", "Print", RID_SC_TP_PRINT },
- { "Impress", nullptr, SID_SD_EDITOPTIONS },
+ { "Impress", nullptr, SID_SD_EDITOPTIONS },
{ "Impress", "General", SID_SI_TP_MISC },
{ "Impress", "View", SID_SI_TP_CONTENTS },
{ "Impress", "Grid", SID_SI_TP_SNAP },
{ "Impress", "Print", SID_SI_TP_PRINT },
- { "Draw", nullptr, SID_SD_GRAPHIC_OPTIONS },
+ { "Draw", nullptr, SID_SD_GRAPHIC_OPTIONS },
{ "Draw", "General", SID_SD_TP_MISC },
{ "Draw", "View", SID_SD_TP_CONTENTS },
{ "Draw", "Grid", SID_SD_TP_SNAP },
{ "Draw", "Print", SID_SD_TP_PRINT },
- { "Charts", nullptr, SID_SCH_EDITOPTIONS },
+ { "Charts", nullptr, SID_SCH_EDITOPTIONS },
{ "Charts", "DefaultColors", RID_OPTPAGE_CHART_DEFCOLORS },
- { "Base", nullptr, SID_SB_STARBASEOPTIONS },
+ { "Base", nullptr, SID_SB_STARBASEOPTIONS },
{ "Base", "Connections", SID_SB_CONNECTIONPOOLING },
{ "Base", "Databases", SID_SB_DBREGISTEROPTIONS },
- { nullptr, nullptr, 0 }
+ { nullptr, nullptr, 0 }
};
static bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUString& _rPageName )
@@ -1098,22 +1095,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
pBox->SetHelpId(sHelpId);
}
-OfaPageResource::OfaPageResource() :
- aGeneralDlgAry(ResId(SID_GENERAL_OPTIONS, CUI_MGR())),
- aInetDlgAry(ResId(SID_INET_DLG, CUI_MGR())),
- aLangDlgAry(ResId(SID_LANGUAGE_OPTIONS, CUI_MGR())),
- aTextDlgAry(ResId(SID_SW_EDITOPTIONS, CUI_MGR())),
- aHTMLDlgAry(ResId(SID_SW_ONLINEOPTIONS, CUI_MGR())),
- aCalcDlgAry(ResId(SID_SC_EDITOPTIONS, CUI_MGR())),
- aStarMathDlgAry(ResId(SID_SM_EDITOPTIONS, CUI_MGR())),
- aImpressDlgAry(ResId(SID_SD_EDITOPTIONS, CUI_MGR())),
- aDrawDlgAry(ResId(SID_SD_GRAPHIC_OPTIONS, CUI_MGR())),
- aChartDlgAry(ResId(SID_SCH_EDITOPTIONS, CUI_MGR())),
- aFilterDlgAry(ResId(SID_FILTER_DLG, CUI_MGR())),
- aDatasourcesDlgAry(ResId(SID_SB_STARBASEOPTIONS, CUI_MGR()))
-{
-}
-
std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
{
Reference< XLinguProperties > xProp( LinguMgr::GetLinguPropertySet() );
@@ -1447,7 +1428,6 @@ OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame )
void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
- OfaPageResource aDlgResource;
sal_uInt16 nGroup = 0;
SvtOptionsDialogOptions aOptionsDlgOpt;
@@ -1456,15 +1436,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// %PRODUCTNAME options
if ( !lcl_isOptionHidden( SID_GENERAL_OPTIONS, aOptionsDlgOpt ) )
{
- ResStringArray& rGeneralArray = aDlgResource.GetGeneralArray();
- setGroupName( "ProductName", rGeneralArray.GetString(0) );
- nGroup = AddGroup( rGeneralArray.GetString(0), nullptr, nullptr, SID_GENERAL_OPTIONS );
- sal_uInt16 nEnd = static_cast< sal_uInt16 >( rGeneralArray.Count() );
+ setGroupName("ProductName", CuiResId(SID_GENERAL_OPTIONS_RES[0].first));
+ nGroup = AddGroup(CuiResId(SID_GENERAL_OPTIONS_RES[0].first), nullptr, nullptr, SID_GENERAL_OPTIONS );
+ const sal_uInt16 nEnd = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_GENERAL_OPTIONS_RES));
- for ( sal_uInt16 i = 1; i < nEnd; ++i )
+ for (sal_uInt16 i = 1; i < nEnd; ++i)
{
- OUString sNewTitle = rGeneralArray.GetString(i);
- nPageId = (sal_uInt16)rGeneralArray.GetValue(i);
+ OUString sNewTitle = CuiResId(SID_GENERAL_OPTIONS_RES[i].first);
+ nPageId = SID_GENERAL_OPTIONS_RES[i].second;
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
@@ -1498,14 +1477,13 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// Load and Save options
if ( !lcl_isOptionHidden( SID_FILTER_DLG, aOptionsDlgOpt ) )
{
- ResStringArray& rFilterArray = aDlgResource.GetFilterArray();
- setGroupName( "LoadSave", rFilterArray.GetString(0) );
- nGroup = AddGroup( rFilterArray.GetString(0), nullptr, nullptr, SID_FILTER_DLG );
- for ( sal_uInt32 i = 1; i < rFilterArray.Count(); ++i )
+ setGroupName( "LoadSave", CuiResId(SID_FILTER_DLG_RES[0].first) );
+ nGroup = AddGroup( CuiResId(SID_FILTER_DLG_RES[0].first), nullptr, nullptr, SID_FILTER_DLG );
+ for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_FILTER_DLG_RES); ++i )
{
- nPageId = (sal_uInt16)rFilterArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_FILTER_DLG_RES[i].second;
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
- AddTabPage( nPageId, rFilterArray.GetString(i), nGroup );
+ AddTabPage( nPageId, CuiResId(SID_FILTER_DLG_RES[i].first), nGroup );
}
}
@@ -1513,22 +1491,20 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
SvtLanguageOptions aLanguageOptions;
if ( !lcl_isOptionHidden( SID_LANGUAGE_OPTIONS, aOptionsDlgOpt ) )
{
- ResStringArray& rLangArray = aDlgResource.GetLangArray();
- setGroupName( "LanguageSettings", rLangArray.GetString(0) );
- nGroup = AddGroup( rLangArray.GetString(0), nullptr, nullptr, SID_LANGUAGE_OPTIONS );
- for ( sal_uInt32 i = 1; i < rLangArray.Count(); ++i )
+ setGroupName("LanguageSettings", CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first));
+ nGroup = AddGroup(CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first), nullptr, nullptr, SID_LANGUAGE_OPTIONS );
+ for (sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_LANGUAGE_OPTIONS_RES); ++i)
{
- nPageId = (sal_uInt16)rLangArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_LANGUAGE_OPTIONS_RES[i].second;
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
if ( ( RID_SVXPAGE_JSEARCH_OPTIONS != nPageId || aLanguageOptions.IsJapaneseFindEnabled() ) &&
( RID_SVXPAGE_ASIAN_LAYOUT != nPageId || aLanguageOptions.IsAsianTypographyEnabled() ) &&
( RID_SVXPAGE_OPTIONS_CTL != nPageId || aLanguageOptions.IsCTLFontEnabled() ) )
- AddTabPage( nPageId, rLangArray.GetString(i), nGroup );
+ AddTabPage(nPageId, CuiResId(SID_LANGUAGE_OPTIONS_RES[i].first), nGroup);
}
}
-
OUString aFactory = getCurrentFactory_Impl( _xFrame );
DBG_ASSERT( GetModuleIdentifier( _xFrame ) == aFactory, "S H I T!!!" );
@@ -1537,7 +1513,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) )
{
// text document
- ResStringArray& rTextArray = aDlgResource.GetTextArray();
if ( aFactory == "com.sun.star.text.TextDocument"
|| aFactory == "com.sun.star.text.WebDocument"
|| aFactory == "com.sun.star.text.GlobalDocument" )
@@ -1546,19 +1521,19 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) )
{
if ( aFactory == "com.sun.star.text.WebDocument" )
- setGroupName( "WriterWeb", rTextArray.GetString(0) );
+ setGroupName( "WriterWeb", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) );
else
- setGroupName( "Writer", rTextArray.GetString(0) );
- nGroup = AddGroup(rTextArray.GetString(0), pSwMod, pSwMod, SID_SW_EDITOPTIONS );
- for ( sal_uInt32 i = 1; i < rTextArray.Count(); ++i )
+ setGroupName( "Writer", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) );
+ nGroup = AddGroup(CuiResId(SID_SW_EDITOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_EDITOPTIONS );
+ for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SW_EDITOPTIONS_RES); ++i )
{
- nPageId = (sal_uInt16)rTextArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_SW_EDITOPTIONS_RES[i].second;
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
if ( ( RID_SW_TP_STD_FONT_CJK != nPageId || aLanguageOptions.IsCJKFontEnabled() ) &&
( RID_SW_TP_STD_FONT_CTL != nPageId || aLanguageOptions.IsCTLFontEnabled() ) &&
( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) )
- AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
+ AddTabPage( nPageId, CuiResId(SID_SW_EDITOPTIONS_RES[i].first), nGroup );
}
#ifdef DBG_UTIL
AddTabPage( RID_SW_TP_OPTTEST_PAGE, "Internal Test", nGroup );
@@ -1568,13 +1543,12 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// HTML documents
if ( !lcl_isOptionHidden( SID_SW_ONLINEOPTIONS, aOptionsDlgOpt ) )
{
- ResStringArray& rHTMLArray = aDlgResource.GetHTMLArray();
- nGroup = AddGroup(rHTMLArray.GetString(0), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS );
- for( sal_uInt32 i = 1; i < rHTMLArray.Count(); ++i )
+ nGroup = AddGroup(CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS );
+ for( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SW_ONLINEOPTIONS_RES); ++i )
{
- nPageId = (sal_uInt16)rHTMLArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_SW_ONLINEOPTIONS_RES[i].second;
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
- AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup );
+ AddTabPage(nPageId, CuiResId(SID_SW_ONLINEOPTIONS_RES[i].first), nGroup);
}
#ifdef DBG_UTIL
AddTabPage( RID_SW_TP_OPTTEST_PAGE, "Internal Test", nGroup );
@@ -1590,18 +1564,17 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) )
{
- ResStringArray& rCalcArray = aDlgResource.GetCalcArray();
SfxModule* pScMod = SfxApplication::GetModule( SfxToolsModule::Calc );
- setGroupName( "Calc", rCalcArray.GetString(0) );
- nGroup = AddGroup( rCalcArray.GetString( 0 ), pScMod, pScMod, SID_SC_EDITOPTIONS );
- const sal_uInt16 nCount = static_cast< sal_uInt16 >( rCalcArray.Count() );
+ setGroupName( "Calc", CuiResId(SID_SC_EDITOPTIONS_RES[0].first) );
+ nGroup = AddGroup( CuiResId(SID_SC_EDITOPTIONS_RES[0].first), pScMod, pScMod, SID_SC_EDITOPTIONS );
+ const sal_uInt16 nCount = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_SC_EDITOPTIONS_RES));
for ( sal_uInt16 i = 1; i < nCount; ++i )
{
- nPageId = (sal_uInt16)rCalcArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_SC_EDITOPTIONS_RES[i].second;
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
- AddTabPage( nPageId, rCalcArray.GetString( i ), nGroup );
+ AddTabPage( nPageId, CuiResId(SID_SC_EDITOPTIONS_RES[i].first), nGroup );
}
}
}
@@ -1615,17 +1588,16 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) )
{
- ResStringArray& rImpressArray = aDlgResource.GetImpressArray();
- setGroupName( "Impress", rImpressArray.GetString(0) );
- nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_EDITOPTIONS );
- const sal_uInt16 nCount = static_cast< sal_uInt16 >( rImpressArray.Count() );
+ setGroupName( "Impress", CuiResId(SID_SD_EDITOPTIONS_RES[0].first) );
+ nGroup = AddGroup( CuiResId(SID_SD_EDITOPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_EDITOPTIONS );
+ const sal_uInt16 nCount = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_SD_EDITOPTIONS_RES));
for ( sal_uInt16 i = 1; i < nCount; ++i )
{
- nPageId = (sal_uInt16)rImpressArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_SD_EDITOPTIONS_RES[0].second;
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
- AddTabPage( nPageId, rImpressArray.GetString(i), nGroup );
+ AddTabPage( nPageId, CuiResId(SID_SD_EDITOPTIONS_RES[i].first), nGroup );
}
}
}
@@ -1638,17 +1610,16 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) )
{
- ResStringArray& rDrawArray = aDlgResource.GetDrawArray();
- setGroupName( "Draw", rDrawArray.GetString(0) );
- nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS );
- const sal_uInt16 nCount = static_cast< sal_uInt16 >( rDrawArray.Count() );
+ setGroupName( "Draw", CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first) );
+ nGroup = AddGroup( CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS );
+ const sal_uInt16 nCount = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_SD_GRAPHIC_OPTIONS_RES));
for ( sal_uInt16 i = 1; i < nCount; ++i )
{
- nPageId = (sal_uInt16)rDrawArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_SD_GRAPHIC_OPTIONS_RES[0].second;
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
- AddTabPage( nPageId, rDrawArray.GetString(i), nGroup );
+ AddTabPage( nPageId, CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[i].first), nGroup );
}
}
}
@@ -1661,15 +1632,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) )
{
- ResStringArray& rStarMathArray = aDlgResource.GetStarMathArray();
SfxModule* pSmMod = SfxApplication::GetModule(SfxToolsModule::Math);
- setGroupName( "Math", rStarMathArray.GetString(0) );
- nGroup = AddGroup(rStarMathArray.GetString(0), pSmMod, pSmMod, SID_SM_EDITOPTIONS );
- for ( sal_uInt32 i = 1; i < rStarMathArray.Count(); ++i )
+ setGroupName( "Math", CuiResId(SID_SM_EDITOPTIONS_RES[0].first) );
+ nGroup = AddGroup(CuiResId(SID_SM_EDITOPTIONS_RES[0].first), pSmMod, pSmMod, SID_SM_EDITOPTIONS );
+ for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SM_EDITOPTIONS_RES); ++i )
{
- nPageId = (sal_uInt16)rStarMathArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_SM_EDITOPTIONS_RES[0].second;
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
- AddTabPage( nPageId, rStarMathArray.GetString(i), nGroup );
+ AddTabPage( nPageId, CuiResId(SID_SM_EDITOPTIONS_RES[i].first), nGroup );
}
}
}
@@ -1682,41 +1652,38 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
|| aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC )
) )
{
- ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray();
- setGroupName( "Base", rDSArray.GetString(0) );
- nGroup = AddGroup( rDSArray.GetString(0), nullptr, nullptr, SID_SB_STARBASEOPTIONS );
- for ( sal_uInt32 i = 1; i < rDSArray.Count(); ++i )
+ setGroupName( "Base", CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first) );
+ nGroup = AddGroup( CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first), nullptr, nullptr, SID_SB_STARBASEOPTIONS );
+ for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SB_STARBASEOPTIONS_RES); ++i )
{
- nPageId = (sal_uInt16)rDSArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_SB_STARBASEOPTIONS_RES[i].second;
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
- AddTabPage( nPageId, rDSArray.GetString(i), nGroup );
+ AddTabPage( nPageId, CuiResId(SID_SB_STARBASEOPTIONS_RES[i].first), nGroup );
}
}
// Chart options (always installed and active)
if ( !lcl_isOptionHidden( SID_SCH_EDITOPTIONS, aOptionsDlgOpt ) )
{
- ResStringArray& rChartArray = aDlgResource.GetChartArray();
- setGroupName( "Charts", rChartArray.GetString(0) );
- nGroup = AddGroup( rChartArray.GetString(0), nullptr, nullptr, SID_SCH_EDITOPTIONS );
- for ( sal_uInt32 i = 1; i < rChartArray.Count(); ++i )
+ setGroupName( "Charts", CuiResId(SID_SCH_EDITOPTIONS_RES[0].first) );
+ nGroup = AddGroup( CuiResId(SID_SCH_EDITOPTIONS_RES[0].first), nullptr, nullptr, SID_SCH_EDITOPTIONS );
+ for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SCH_EDITOPTIONS_RES); ++i )
{
- nPageId = (sal_uInt16)rChartArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_SCH_EDITOPTIONS_RES[i].second;
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
- AddTabPage( nPageId, rChartArray.GetString(i), nGroup );
+ AddTabPage( nPageId, CuiResId(SID_SCH_EDITOPTIONS_RES[i].first), nGroup );
}
}
// Internet options
if ( !lcl_isOptionHidden( SID_INET_DLG, aOptionsDlgOpt ) )
{
- ResStringArray& rInetArray = aDlgResource.GetInetArray();
- setGroupName( "Internet", rInetArray.GetString(0) );
- nGroup = AddGroup(rInetArray.GetString(0), nullptr, nullptr, SID_INET_DLG );
+ setGroupName("Internet", CuiResId(SID_INET_DLG_RES[0].first));
+ nGroup = AddGroup(CuiResId(SID_INET_DLG_RES[0].first), nullptr, nullptr, SID_INET_DLG );
- for ( sal_uInt32 i = 1; i < rInetArray.Count(); ++i )
+ for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_INET_DLG_RES); ++i )
{
- nPageId = (sal_uInt16)rInetArray.GetValue(i);
+ nPageId = (sal_uInt16)SID_INET_DLG_RES[i].second;
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
#if defined(_WIN32)
@@ -1724,13 +1691,9 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
if ( nPageId == RID_SVXPAGE_INET_MAIL )
continue;
#endif
- AddTabPage( nPageId, rInetArray.GetString(i), nGroup );
+ AddTabPage( nPageId, CuiResId(SID_INET_DLG_RES[i].first), nGroup );
}
}
-
-/*!!!
- ActivateLastSelection();
- */
}
bool isNodeActive( OptionsNode* pNode, Module* pModule )
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
deleted file mode 100644
index 4301f793f543..000000000000
--- a/cui/source/options/treeopt.src
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-#include "helpid.hrc"
-#include <svx/dialogs.hrc>
-
-StringArray SID_GENERAL_OPTIONS
-{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME" ; 0; > ;
- < "User Data" ; RID_SFXPAGE_GENERAL; > ;
- < "General" ; OFA_TP_MISC; > ;
- < "Memory" ; OFA_TP_MEMORY; > ;
- < "View" ; OFA_TP_VIEW ; > ;
- < "Print" ; RID_SFXPAGE_PRINTOPTIONS; > ;
- < "Paths" ; RID_SFXPAGE_PATH; > ;
- < "Fonts" ; RID_SVX_FONT_SUBSTITUTION ; > ;
- < "Security" ; RID_SVXPAGE_INET_SECURITY ; > ;
- < "Personalization" ; RID_SVXPAGE_PERSONALIZATION ; > ;
- < "Application Colors" ; RID_SVXPAGE_COLORCONFIG ; > ;
- < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
- < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
- < "Basic IDE Options" ; RID_SVXPAGE_BASICIDE_OPTIONS ; > ;
- < "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
- < "OpenCL" ; RID_SVXPAGE_OPENCL ; > ;
- };
-};
-StringArray SID_LANGUAGE_OPTIONS
-{
- ItemList [ en-US ] =
- {
- < "Language Settings" ; 0; > ;
- < "Languages"; OFA_TP_LANGUAGES; > ;
- < "Writing Aids" ; RID_SFXPAGE_LINGU; > ;
- < "Searching in Japanese" ; RID_SVXPAGE_JSEARCH_OPTIONS; > ;
- < "Asian Layout" ; RID_SVXPAGE_ASIAN_LAYOUT; > ;
- < "Complex Text Layout" ; RID_SVXPAGE_OPTIONS_CTL; >;
- };
-};
-StringArray SID_INET_DLG
-{
- ItemList [ en-US ] =
- {
- < "Internet" ; 0; > ;
- < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ;
- < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ;
- };
-};
-StringArray SID_SW_EDITOPTIONS
-{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Writer" ; 0; > ;
- < "General" ; RID_SW_TP_OPTLOAD_PAGE ; > ;
- < "View" ; RID_SW_TP_CONTENT_OPT ;> ;
- < "Formatting Aids" ; RID_SW_TP_OPTSHDWCRSR ; > ;
- < "Grid" ; RID_SVXPAGE_GRID ; > ;
- < "Basic Fonts (Western)" ;RID_SW_TP_STD_FONT ; > ;
- < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK ; > ;
- < "Basic Fonts (CTL)" ; RID_SW_TP_STD_FONT_CTL ; > ;
- < "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ;
- < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ;
- < "Changes" ; RID_SW_TP_REDLINE_OPT ; > ;
- < "Comparison" ; RID_SW_TP_COMPARISON_OPT ; > ;
- < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ;
- < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
- < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >;
- };
-};
-StringArray SID_SW_ONLINEOPTIONS
-{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Writer/Web" ; 0; > ;
- < "View" ; RID_SW_TP_HTML_CONTENT_OPT ;> ;
- < "Formatting Aids" ; RID_SW_TP_HTML_OPTSHDWCRSR ; > ;
- < "Grid" ; RID_SW_TP_HTML_OPTGRID_PAGE ; > ;
- < "Print" ; RID_SW_TP_HTML_OPTPRINT_PAGE ; > ;
- < "Table" ; RID_SW_TP_HTML_OPTTABLE_PAGE ; > ;
- < "Background" ; RID_SW_TP_BACKGROUND ; > ;
- };
-};
-StringArray SID_SM_EDITOPTIONS
-{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Math" ; 0; > ;
- < "Settings" ; SID_SM_TP_PRINTOPTIONS;> ;
- };
-};
-StringArray SID_SC_EDITOPTIONS
-{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Calc" ; 0; > ;
- < "General" ; SID_SC_TP_LAYOUT ;> ;
- < "Defaults" ; RID_SC_TP_DEFAULTS ;> ;
- < "View" ; SID_SC_TP_CONTENT ;> ;
- < "Calculate" ; SID_SC_TP_CALC ;> ;
- < "Formula" ; SID_SC_TP_FORMULA ;> ;
- < "Sort Lists" ; SID_SC_TP_USERLISTS ;> ;
- < "Changes" ; SID_SC_TP_CHANGES ;> ;
- < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ;
- < "Grid" ; SID_SC_TP_GRID ;> ;
- < "Print" ; RID_SC_TP_PRINT ;> ;
- };
-};
-StringArray SID_SD_EDITOPTIONS
-{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Impress" ; 0; > ;
- < "General"; SID_SI_TP_MISC ; > ;
- < "View" ; SID_SI_TP_CONTENTS ; > ;
- < "Grid" ; SID_SI_TP_SNAP ; > ;
- < "Print" ; SID_SI_TP_PRINT ; > ;
- };
-};
-StringArray SID_SD_GRAPHIC_OPTIONS
-{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Draw" ; 0; > ;
- < "General" ; SID_SD_TP_MISC ; > ;
- < "View" ; SID_SD_TP_CONTENTS ; > ;
- < "Grid" ; SID_SD_TP_SNAP ; > ;
- < "Print" ; SID_SD_TP_PRINT ; > ;
- };
-};
-StringArray SID_SCH_EDITOPTIONS
-{
- ItemList [ en-US ] =
- {
- < "Charts" ; 0; > ;
- < "Default Colors" ; RID_OPTPAGE_CHART_DEFCOLORS ; > ;
- };
-};
-StringArray SID_FILTER_DLG
-{
- ItemList [ en-US ] =
- {
- < "Load/Save" ; 0; > ;
- < "General" ; RID_SFXPAGE_SAVE; > ;
- < "VBA Properties" ; SID_OPTFILTER_MSOFFICE; > ;
- < "Microsoft Office" ; RID_OFAPAGE_MSFILTEROPT2; > ;
- < "HTML Compatibility" ; RID_OFAPAGE_HTMLOPT ; > ;
- };
-};
-StringArray SID_SB_STARBASEOPTIONS
-{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Base" ; 0; > ;
- < "Connections" ; SID_SB_CONNECTIONPOOLING; > ;
- < "Databases" ; SID_SB_DBREGISTEROPTIONS; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 2586a454f71e..dfa4a531870d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -22,6 +22,7 @@
#include <editeng/svxenum.hxx>
#include <svx/dialogs.hrc>
#include <cuires.hrc>
+#include <strings.hrc>
#include <bitmaps.hlst>
#include <svx/rotmodit.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 3b6a24608690..def8d3de5013 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -53,6 +53,7 @@
#include <editeng/svxacorr.hxx>
#include "cuicharmap.hxx"
#include "cuires.hrc"
+#include "strings.hrc"
#include <editeng/unolingu.hxx>
#include <dialmgr.hxx>
#include <svx/svxids.hrc>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index ec1775251187..343e4ff2722f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -29,11 +29,12 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svx/dialmgr.hxx>
#include <editeng/memberids.hrc>
-#include <editeng/editrids.hrc>
#include <editeng/eerdll.hxx>
#include <editeng/brushitem.hxx>
@@ -45,7 +46,7 @@
#include <svx/drawitem.hxx>
#include <dialmgr.hxx>
#include <sfx2/htmlmode.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
#include <svx/flagsdef.hxx>
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
@@ -822,8 +823,8 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
SfxErrorContext aContext( ERRCTX_SVX_BACKGROUND,
OUString(),
this,
- RID_SVXERRCTX,
- &DIALOG_MGR() );
+ getRID_SVXERRCTX(),
+ &SvxResLocale() );
ErrorHandler::HandleError(
*new StringErrorInfo( ERRCODE_SVX_GRAPHIC_NOTREADABLE,
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index e6848ad3bd1a..dbcb814ced3e 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -22,8 +22,10 @@
#include <sfx2/module.hxx>
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
#include <cuires.hrc>
+#include <strings.hrc>
#include <bitmaps.hlst>
#include "helpid.hrc"
@@ -970,10 +972,10 @@ sal_uInt16 SvxBorderTabPage::GetPresetImageId( sal_uInt16 nValueSetIdx ) const
return ppnImgIds[ nLine ][ nValueSetIdx - 1 ];
}
-sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const
+const char* SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const
{
// string resource IDs for each image (in order of the IID_PRE_* image IDs)
- static const sal_uInt16 pnStrIds[] =
+ static const char* pnStrIds[] =
{
RID_SVXSTR_TABLE_PRESET_NONE,
RID_SVXSTR_PARA_PRESET_ALL,
@@ -1029,7 +1031,7 @@ void SvxBorderTabPage::FillShadowVS()
m_pWndShadows->SetColCount( SVX_BORDER_SHADOW_COUNT );
// string resource IDs for each image
- static const sal_uInt16 pnStrIds[ SVX_BORDER_SHADOW_COUNT ] =
+ static const char* pnStrIds[ SVX_BORDER_SHADOW_COUNT ] =
{ RID_SVXSTR_SHADOW_STYLE_NONE, RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT, RID_SVXSTR_SHADOW_STYLE_TOPRIGHT, RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT, RID_SVXSTR_SHADOW_STYLE_TOPLEFT };
// insert images and help texts
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
deleted file mode 100644
index 2dded5a4ded3..000000000000
--- a/cui/source/tabpages/border.src
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "helpid.hrc"
-#include <cuires.hrc>
-#include <svx/dialogs.hrc>
-
-String RID_SVXSTR_TABLE_PRESET_NONE
-{
- Text [ en-US ] = "Set No Borders" ;
-};
-String RID_SVXSTR_TABLE_PRESET_ONLYOUTER
-{
- Text [ en-US ] = "Set Outer Border Only" ;
-};
-String RID_SVXSTR_TABLE_PRESET_OUTERHORI
-{
- Text [ en-US ] = "Set Outer Border and Horizontal Lines" ;
-};
-String RID_SVXSTR_TABLE_PRESET_OUTERALL
-{
- Text [ en-US ] = "Set Outer Border and All Inner Lines" ;
-};
-String RID_SVXSTR_TABLE_PRESET_OUTERINNER
-{
- Text [ en-US ] = "Set Outer Border Without Changing Inner Lines" ;
-};
-String RID_SVXSTR_PARA_PRESET_DIAGONAL
-{
- Text [ en-US ] = "Set Diagonal Lines Only" ;
-};
-String RID_SVXSTR_PARA_PRESET_ALL
-{
- Text [ en-US ] = "Set All Four Borders" ;
-};
-String RID_SVXSTR_PARA_PRESET_LEFTRIGHT
-{
- Text [ en-US ] = "Set Left and Right Borders Only" ;
-};
-String RID_SVXSTR_PARA_PRESET_TOPBOTTOM
-{
- Text [ en-US ] = "Set Top and Bottom Borders Only" ;
-};
-String RID_SVXSTR_PARA_PRESET_ONLYLEFT
-{
- Text [ en-US ] = "Set Left Border Only" ;
-};
-String RID_SVXSTR_HOR_PRESET_ONLYHOR
-{
- Text [ en-US ] = "Set Top and Bottom Borders, and All Inner Lines";
-};
-String RID_SVXSTR_VER_PRESET_ONLYVER
-{
- Text [ en-US ] = "Set Left and Right Borders, and All Inner Lines";
-};
-String RID_SVXSTR_SHADOW_STYLE_NONE
-{
- Text [ en-US ] = "No Shadow" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT
-{
- Text [ en-US ] = "Cast Shadow to Bottom Right" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_TOPRIGHT
-{
- Text [ en-US ] = "Cast Shadow to Top Right" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT
-{
- Text [ en-US ] = "Cast Shadow to Bottom Left" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_TOPLEFT
-{
- Text [ en-US ] = "Cast Shadow to Top Left" ;
-};
-
-// **********************************************************************
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 063a9baac2c5..ef454619a8ad 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -69,6 +69,7 @@
#include <officecfg/Office/Common.hxx>
#include <svx/svxdlg.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
#include "svx/flagsdef.hxx"
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index f4d566875385..d5df97d4c037 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -18,6 +18,7 @@
*/
#include <cuires.hrc>
+#include <strings.hrc>
#include <dialmgr.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src
deleted file mode 100644
index e2470a6a93b0..000000000000
--- a/cui/source/tabpages/frmdirlbox.src
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-// frame direction ------------------------------------------------------------
-
-String RID_SVXSTR_FRAMEDIR_LTR
-{
- Text [ en-US ] = "Left-to-right (LTR)";
-};
-
-String RID_SVXSTR_FRAMEDIR_RTL
-{
- Text [ en-US ] = "Right-to-left (RTL)";
-};
-
-String RID_SVXSTR_FRAMEDIR_SUPER
-{
- Text [ en-US ] = "Use superordinate object settings";
-};
-
-// page direction -------------------------------------------------------------
-
-String RID_SVXSTR_PAGEDIR_LTR_HORI
-{
- Text [ en-US ] = "Left-to-right (horizontal)";
-};
-
-String RID_SVXSTR_PAGEDIR_RTL_HORI
-{
- Text [ en-US ] = "Right-to-left (horizontal)";
-};
-
-String RID_SVXSTR_PAGEDIR_RTL_VERT
-{
- Text [ en-US ] = "Right-to-left (vertical)";
-};
-
-String RID_SVXSTR_PAGEDIR_LTR_VERT
-{
- Text [ en-US ] = "Left-to-right (vertical)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1938f2705b91..85e2c98e8595 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -33,6 +33,7 @@
#include <cuires.hrc>
#include <tools/fract.hxx>
#include <svx/dialogs.hrc>
+#include <strings.hrc>
#include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx>
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index c502e077f08d..c41bf6b52286 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -18,6 +18,7 @@
*/
#include <cuires.hrc>
+#include <strings.hrc>
#include <dialmgr.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
@@ -804,17 +805,16 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
void SvxMeasurePage::FillUnitLB()
{
// fill ListBox with metrics
- SvxStringArray aMetricArr(ResId(RID_SVXSTR_FIELDUNIT_TABLE, DIALOG_MGR()));
- sal_IntPtr nUnit = FUNIT_NONE;
+ FieldUnit nUnit = FUNIT_NONE;
OUString aStrMetric( m_pFtAutomatic->GetText());
sal_Int32 nPos = m_pLbUnit->InsertEntry( aStrMetric );
m_pLbUnit->SetEntryData( nPos, reinterpret_cast<void*>(nUnit) );
- for( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i )
+ for( sal_uInt32 i = 0; i < SvxFieldUnitTable::Count(); ++i )
{
- aStrMetric = aMetricArr.GetStringByPos( i );
- nUnit = aMetricArr.GetValue( i );
+ aStrMetric = SvxFieldUnitTable::GetString(i);
+ nUnit = SvxFieldUnitTable::GetValue(i);
nPos = m_pLbUnit->InsertEntry( aStrMetric );
m_pLbUnit->SetEntryData( nPos, reinterpret_cast<void*>(nUnit) );
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 78cae7475cf6..a4981f5d84cf 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -31,6 +31,7 @@
#include <svtools/colorcfg.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svx/numinf.hxx>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d0bf7386f770..30525c1045c6 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -32,6 +32,7 @@
#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include <svx/colorbox.hxx>
+#include <svx/strarray.hxx>
#include <svx/gallery.hxx>
#include <svl/urihelper.hxx>
#include <editeng/brushitem.hxx>
@@ -62,7 +63,6 @@
#include <com/sun/star/text/XNumberingTypeInfo.hpp>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
-#include <tools/resary.hxx>
#include <algorithm>
#include <memory>
@@ -70,6 +70,7 @@
#include "sfx2/opengrf.hxx"
#include <cuires.hrc>
+#include <strings.hrc>
#include <sfx2/request.hxx>
#include <svl/aeitem.hxx>
#include <svl/stritem.hxx>
@@ -1179,12 +1180,11 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
// Fill ListBox with predefined / translated numbering types.
- ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
- sal_uInt32 nCount = aNames.Count();
+ sal_uInt32 nCount = SvxNumberingTypeTable::Count();
for (sal_uInt32 i = 0; i < nCount; ++i)
{
- sal_Int32 nPos = m_pFmtLB->InsertEntry( aNames.GetString(i));
- m_pFmtLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_uIntPtr>(aNames.GetValue(i))));
+ sal_Int32 nPos = m_pFmtLB->InsertEntry(SvxNumberingTypeTable::GetString(i));
+ m_pFmtLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_uIntPtr>(SvxNumberingTypeTable::GetValue(i))));
}
// Get advanced numbering types from the component.
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 50e83e91714b..98f0d12ee183 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -21,7 +21,6 @@
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/printer.hxx>
-#include <tools/resary.hxx>
#include <vcl/graph.hxx>
#include <sfx2/viewsh.hxx>
#include <svl/itemiter.hxx>
@@ -32,6 +31,7 @@
#include <sal/macros.h>
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include "page.hxx"
#include <svx/pageitem.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 4d608a2e4147..a4f83510ae2c 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -30,6 +30,7 @@
#include <svl/cjkoptions.hxx>
#include <editeng/pgrditem.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include "paragrph.hxx"
#include <editeng/frmdiritem.hxx>
#include <editeng/lspcitem.hxx>
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
deleted file mode 100644
index 744aa6b60d58..000000000000
--- a/cui/source/tabpages/strings.src
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String RID_SVXSTR_DESC_GRADIENT
-{
- Text [ en-US ] = "Please enter a name for the gradient:" ;
-};
-String RID_SVXSTR_DESC_NEW_BITMAP
-{
- Text [ en-US ] = "Please enter a name for the bitmap:" ;
-};
-String RID_SVXSTR_DESC_EXT_BITMAP
-{
- Text [ en-US ] = "Please enter a name for the external bitmap:" ;
-};
-String RID_SVXSTR_DESC_NEW_PATTERN
-{
- Text [ en-US ] = "Please enter a name for the pattern:" ;
-};
-String RID_SVXSTR_DESC_LINESTYLE
-{
- Text [ en-US ] = "Please enter a name for the line style:" ;
-};
-String RID_SVXSTR_ASK_CHANGE_LINESTYLE
-{
- Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ;
-};
-String RID_SVXSTR_DESC_HATCH
-{
- Text [ en-US ] = "Please enter a name for the hatching:" ;
-};
-String RID_SVXSTR_CHANGE
-{
- Text [ en-US ] = "Modify" ;
-};
-String RID_SVXSTR_ADD
-{
- Text [ en-US ] = "Add" ;
-};
-String RID_SVXSTR_DESC_COLOR
-{
- Text [ en-US ] = "Please enter a name for the new color:" ;
-};
-String RID_SVXSTR_TABLE
-{
- Text [ en-US ] = "Table" ;
-};
-String RID_SVXSTR_DESC_LINEEND
-{
- Text [ en-US ] = "Please enter a name for the new arrowhead:" ;
-};
-String RID_SVXSTR_CHARNAME_NOSTYLE
-{
- Text [ en-US ] = "No %1";
-};
-String RID_SVXSTR_CHARNAME_FAMILY
-{
- Text [ en-US ] = "Family";
-};
-String RID_SVXSTR_CHARNAME_FONT
-{
- Text [ en-US ] = "Font";
-};
-String RID_SVXSTR_CHARNAME_STYLE
-{
- Text [ en-US ] = "Style";
-};
-String RID_SVXSTR_CHARNAME_TYPEFACE
-{
- Text [ en-US ] = "Typeface";
-};
-String RID_SVXSTR_CHARNAME_HIGHLIGHTING
-{
- Text [ en-US ] = "Highlight Color";
-};
-String RID_SVXSTR_USE_REPLACE
-{
- Text [ en-US ] = "Use replacement table" ;
-};
-String RID_SVXSTR_CPTL_STT_WORD
-{
- Text [ en-US ] = "Correct TWo INitial CApitals" ;
-};
-String RID_SVXSTR_CPTL_STT_SENT
-{
- Text [ en-US ] = "Capitalize first letter of every sentence" ;
-};
-String RID_SVXSTR_BOLD_UNDER
-{
- Text [ en-US ] = "Automatic *bold*, /italic/, -strikeout- and _underline_" ;
-};
-String RID_SVXSTR_NO_DBL_SPACES
-{
- Text [ en-US ] = "Ignore double spaces" ;
-};
-String RID_SVXSTR_DETECT_URL
-{
- Text [ en-US ] = "URL Recognition" ;
-};
-String RID_SVXSTR_DASH
-{
- Text [ en-US ] = "Replace dashes" ;
-};
-String RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK
-{
- Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ;
-};
-String RID_SVXSTR_NON_BREAK_SPACE
-{
- Text [ en-US ] = "Add non-breaking space before specific punctuation marks in French text" ;
-};
-String RID_SVXSTR_ORDINAL
-{
- Text [ en-US ] = "Format ordinal numbers suffixes (1st -> 1^st)" ;
-};
-String RID_SVXSTR_DEL_EMPTY_PARA
-{
- Text [ en-US ] = "Remove blank paragraphs" ;
-};
-String RID_SVXSTR_USER_STYLE
-{
- Text [ en-US ] = "Replace Custom Styles" ;
-};
-String RID_SVXSTR_BULLET
-{
- Text [ en-US ] = "Replace bullets with: " ;
-};
-String RID_SVXSTR_RIGHT_MARGIN
-{
- Text [ en-US ] = "Combine single line paragraphs if length greater than" ;
-};
-String RID_SVXSTR_NUM
-{
- Text [ en-US ] = "Bulleted and numbered lists. Bullet symbol: " ;
-};
-String RID_SVXSTR_BORDER
-{
- Text [ en-US ] = "Apply border" ;
-};
-String RID_SVXSTR_CREATE_TABLE
-{
- Text [ en-US ] = "Create table" ;
-};
-String RID_SVXSTR_REPLACE_TEMPLATES
-{
- Text [ en-US ] = "Apply Styles" ;
-};
-String RID_SVXSTR_DEL_SPACES_AT_STT_END
-{
- Text [ en-US ] = "Delete spaces and tabs at beginning and end of paragraph";
-};
-String RID_SVXSTR_DEL_SPACES_BETWEEN_LINES
-{
- Text [ en-US ] = "Delete spaces and tabs at end and start of line";
-};
-String RID_SVXSTR_CONNECTOR
-{
- Text [en-US ] = "Connector";
-};
-String RID_SVXSTR_DIMENSION_LINE
-{
- Text [en-US ] = "Dimension line";
-};
-String RID_SVXSTR_LOAD_ERROR
-{
- Text [ en-US ] = "The selected module could not be loaded.";
-};
-String RID_SVXSTR_STARTQUOTE
-{
- Text [ en-US ] = "Start Quote";
-};
-String RID_SVXSTR_ENDQUOTE
-{
- Text [ en-US ] = "End Quote";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 3c92d5a7a8f5..9bcd7c1454e1 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -683,7 +683,7 @@ void SvxSwPosSizeTabPage::setOptimalFrmWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aFrames.begin(), aEnd = aFrames.end();
aI != aEnd; ++aI)
{
- m_pHoriLB->InsertEntry(m_aFramePosString.GetString(*aI));
+ m_pHoriLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
}
Size aBiggest(m_pHoriLB->GetOptimalSize());
@@ -724,7 +724,7 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aRels.begin(), aEnd = aRels.end();
aI != aEnd; ++aI)
{
- m_pHoriLB->InsertEntry(m_aFramePosString.GetString(*aI));
+ m_pHoriLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
}
Size aBiggest(m_pHoriLB->GetOptimalSize());
@@ -1462,7 +1462,7 @@ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB)
{
SvxSwFramePosString::StringId eResId = pMap[i].eStrId;
- OUString sEntry = m_aFramePosString.GetString(eResId);
+ OUString sEntry = SvxSwFramePosString::GetString(eResId);
if (sEntry == sSelEntry)
{
@@ -1688,7 +1688,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16
SvxSwFramePosString::StringId sStrId1 = aAsCharRelationMap[nRelPos].eStrId;
sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft);
- OUString sEntry = m_aFramePosString.GetString(sStrId1);
+ OUString sEntry = SvxSwFramePosString::GetString(sStrId1);
sal_Int32 nPos = rLB.InsertEntry(sEntry);
rLB.SetEntryData(nPos, &aAsCharRelationMap[nRelPos]);
if (pMap[_nMapPos].nAlign == nAlign)
@@ -1745,7 +1745,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16
{
SvxSwFramePosString::StringId sStrId1 = m_pHoriMirrorCB->IsChecked() ? aRelationMap[nRelPos].eMirrorStrId : aRelationMap[nRelPos].eStrId;
sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft);
- OUString sEntry = m_aFramePosString.GetString(sStrId1);
+ OUString sEntry = SvxSwFramePosString::GetString(sStrId1);
sal_Int32 nPos = rLB.InsertEntry(sEntry);
rLB.SetEntryData(nPos, &aRelationMap[nRelPos]);
if (sSelEntry.isEmpty() && aRelationMap[nRelPos].nRelation == nRel)
@@ -1826,7 +1826,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap,
{
SvxSwFramePosString::StringId eStrId = m_pHoriMirrorCB->IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId;
eStrId = lcl_ChangeResIdToVerticalOrRTL(eStrId, m_bIsVerticalFrame, m_bIsInRightToLeft);
- OUString sEntry(m_aFramePosString.GetString(eStrId));
+ OUString sEntry(SvxSwFramePosString::GetString(eStrId));
if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
{
// don't insert duplicate entries at character wrapped borders
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 5ea3afe39b2f..bc87cf191c8c 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -26,6 +26,7 @@
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svx/xflbckit.hxx>
#include <svx/svdattr.hxx>
#include <svx/xtable.hxx>
@@ -758,7 +759,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void)
IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void)
{
- ResMgr& rMgr = CUI_MGR();
SvxOpenGraphicDialog aDlg( "Import" );
aDlg.EnableLink(false);
long nCount = m_pBitmapList->Count();
@@ -773,7 +773,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void)
if( !nError )
{
- OUString aDesc( ResId(RID_SVXSTR_DESC_EXT_BITMAP, rMgr) );
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_EXT_BITMAP));
ScopedVclPtr<MessageDialog> pWarnBox;
// convert file URL to UI name
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index d9b140729036..fb2a1300696b 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -33,6 +33,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
@@ -46,6 +47,7 @@
#include <cuitabline.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <osl/file.hxx>
#include <svx/Palette.hxx>
#include <cppu/unotype.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index f7f2de67e2ae..8de274563d88 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -28,6 +28,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include <svx/colorbox.hxx>
#include "svx/xattr.hxx"
@@ -41,6 +42,7 @@
#include <dialmgr.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <o3tl/make_unique.hxx>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 45b14ec5d2ca..0e78ab78089e 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -29,6 +29,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include <svx/colorbox.hxx>
#include "svx/xattr.hxx"
@@ -43,6 +44,7 @@
#include "svx/dlgutil.hxx"
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <o3tl/make_unique.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 0e6c80f070ce..de1526d4b7dc 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -25,6 +25,7 @@
#include <sfx2/module.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svx/colorbox.hxx>
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
@@ -51,6 +52,7 @@
#include "sfx2/opengrf.hxx"
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <vcl/settings.hxx>
#include <cuitabarea.hxx>
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index f622e18358e7..1cd1b4f61a01 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -27,6 +27,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
@@ -42,6 +43,7 @@
#include "svx/dlgutil.hxx"
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <o3tl/make_unique.hxx>
#include "cuitabarea.hxx"
@@ -240,15 +242,14 @@ void SvxLineDefTabPage::CheckChanges_Impl()
m_pLbType2->IsValueChangedFromSaved() ||
m_pMtrDistance->IsValueChangedFromSaved() )
{
- ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
ScopedVclPtrInstance<SvxMessDialog> aMessDlg( GetParentDialog(),
SvxResId( RID_SVXSTR_LINESTYLE ),
- OUString( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
+ CuiResId(RID_SVXSTR_ASK_CHANGE_LINESTYLE),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialog creation failed!");
- aMessDlg->SetButtonText( SvxMessDialogButton::N1, OUString( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
- aMessDlg->SetButtonText( SvxMessDialogButton::N2, OUString( ResId( RID_SVXSTR_ADD, rMgr ) ) );
+ aMessDlg->SetButtonText( SvxMessDialogButton::N1, CuiResId(RID_SVXSTR_CHANGE) );
+ aMessDlg->SetButtonText( SvxMessDialogButton::N2, CuiResId(RID_SVXSTR_ADD) );
short nRet = aMessDlg->Execute();
@@ -532,9 +533,8 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p)
IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void)
{
- ResMgr& rMgr = CUI_MGR();
- OUString aNewName( SvxResId( RID_SVXSTR_LINESTYLE ) );
- OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
+ OUString aNewName(SvxResId(RID_SVXSTR_LINESTYLE));
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE));
OUString aName;
long nCount = pDashList->Count();
@@ -618,8 +618,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = CUI_MGR();
- OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE));
OUString aName( pDashList->GetDash( nPos )->GetName() );
OUString aOldName = aName;
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index df8309d1054c..a5a0579226b7 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -26,6 +26,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include <svx/dialmgr.hxx>
#include <svx/svdobj.hxx>
@@ -45,6 +46,7 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <o3tl/make_unique.hxx>
@@ -310,8 +312,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = CUI_MGR();
- OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND));
OUString aName( m_pEdtName->GetText() );
long nCount = pLineEndList->Count();
bool bDifferent = true;
@@ -417,9 +418,8 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
SdrObject::Free( pConvPolyObj );
- ResMgr& rMgr = CUI_MGR();
- OUString aNewName( SvxResId( RID_SVXSTR_LINEEND ) );
- OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
+ OUString aNewName(SvxResId(RID_SVXSTR_LINEEND));
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND));
OUString aName;
long nCount = pLineEndList->Count();
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index dba1fc108066..9f57f7e5a0d5 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -33,8 +33,10 @@
#include <vcl/bitmapaccess.hxx>
#include <vcl/settings.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
@@ -468,9 +470,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
if ( nPos != VALUESET_ITEM_NOTFOUND )
{
- ResMgr& rMgr = CUI_MGR();
- OUString aDesc( ResId( RID_SVXSTR_DESC_NEW_PATTERN, rMgr ) );
- OUString aName( m_pPatternList->GetBitmap( nPos )->GetName() );
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_NEW_PATTERN));
+ OUString aName(m_pPatternList->GetBitmap(nPos)->GetName());
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
assert(pFact && "Dialog creation failed!");