summaryrefslogtreecommitdiff
path: root/cui/source/dialogs
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/dialogs
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/dialogs')
-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
30 files changed, 34 insertions, 730 deletions
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>