summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-30 17:01:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-02 13:18:57 +0200
commit34f7e618ddd3399d9e7f3998e25545256255d02d (patch)
treefd946f8f2ab8386db89f531d49fae1718a21e943
parentc881756fcfdc1fa63ff534bf4538d551b2139515 (diff)
untranslated strings are just strings
removes starmaths InsertCommand in favour of InsertCommandText Change-Id: I5659adcaa28e5b5861d1a1cc5d2afa84009490f6 Reviewed-on: https://gerrit.libreoffice.org/37113 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--filter/inc/strings.hxx25
-rw-r--r--filter/source/xsltdialog/xmlfiltercommon.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogstrings.hrc10
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogstrings.src45
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx34
-rw-r--r--include/sfx2/doctempl.hxx5
-rw-r--r--include/sfx2/templatelocnames.hrc11
-rw-r--r--include/svtools/svtools.hrc3
-rw-r--r--include/tools/resmgr.hxx1
-rw-r--r--reportdesign/inc/RptResId.hrc5
-rw-r--r--reportdesign/inc/strings.hxx22
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx14
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx4
-rw-r--r--reportdesign/source/ui/report/report.src19
-rw-r--r--sc/inc/scres.hrc26
-rw-r--r--sc/inc/strings.hxx28
-rw-r--r--sc/source/ui/Accessibility/AccessibleCellBase.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx7
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx5
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessibleTableBase.cxx3
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx3
-rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx7
-rw-r--r--sc/source/ui/src/scstring.src69
-rw-r--r--scaddins/source/datefunc/datefunc.cxx22
-rw-r--r--scaddins/source/datefunc/datefunc.hrc11
-rw-r--r--scaddins/source/datefunc/datefunc.hxx4
-rw-r--r--scaddins/source/datefunc/datefunc.src65
-rw-r--r--scaddins/source/datefunc/deffuncname.hxx73
-rw-r--r--sd/inc/glob.hrc7
-rw-r--r--sd/inc/strings.hxx23
-rw-r--r--sd/source/core/drawdoc3.cxx7
-rw-r--r--sd/source/core/drawdoc4.cxx3
-rw-r--r--sd/source/core/glob.src30
-rw-r--r--sd/source/core/sdpage.cxx34
-rw-r--r--sd/source/core/sdpage2.cxx3
-rw-r--r--sd/source/core/stlpool.cxx29
-rw-r--r--sd/source/core/stlsheet.cxx31
-rw-r--r--sd/source/filter/html/htmlex.cxx3
-rw-r--r--sd/source/filter/html/pubdlg.cxx3
-rw-r--r--sd/source/filter/ppt/pptin.cxx3
-rw-r--r--sd/source/ui/app/strings.src4
-rw-r--r--sd/source/ui/dlg/TemplateScanner.cxx3
-rw-r--r--sd/source/ui/dlg/dlgolbul.cxx3
-rw-r--r--sd/source/ui/dlg/unchss.cxx14
-rw-r--r--sd/source/ui/func/fuconstr.cxx3
-rw-r--r--sd/source/ui/func/fuolbull.cxx3
-rw-r--r--sd/source/ui/func/fuprobjs.cxx5
-rw-r--r--sd/source/ui/inc/strings.hrc2
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx3
-rw-r--r--sd/source/ui/unoidl/unopage.cxx5
-rw-r--r--sd/source/ui/view/ViewClipboard.cxx3
-rw-r--r--sd/source/ui/view/unmodpg.cxx5
-rw-r--r--sd/source/ui/view/viewshel.cxx3
-rw-r--r--sfx2/inc/strings.hxx12
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx4
-rw-r--r--sfx2/source/doc/doctempl.cxx36
-rw-r--r--sfx2/source/doc/templatelocnames.src51
-rw-r--r--starmath/inc/ElementsDockingWindow.hxx20
-rw-r--r--starmath/inc/cursor.hxx3
-rw-r--r--starmath/inc/edit.hxx1
-rw-r--r--starmath/inc/starmath.hrc271
-rw-r--r--starmath/inc/strings.hxx272
-rw-r--r--starmath/inc/view.hxx2
-rw-r--r--starmath/sdi/smath.sdi18
-rw-r--r--starmath/sdi/smslots.sdi6
-rw-r--r--starmath/source/ElementsDockingWindow.cxx248
-rw-r--r--starmath/source/action.cxx5
-rw-r--r--starmath/source/commands.src253
-rw-r--r--starmath/source/cursor.cxx22
-rw-r--r--starmath/source/edit.cxx58
-rw-r--r--starmath/source/smres.src9
-rw-r--r--starmath/source/view.cxx14
-rw-r--r--svtools/inc/strings.hxx8
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx7
-rw-r--r--svtools/source/dialogs/addresstemplate.src8
-rw-r--r--svx/inc/galtheme.hrc8
-rw-r--r--svx/inc/strings.hxx21
-rw-r--r--svx/source/gallery2/gallery1.cxx7
-rw-r--r--svx/source/gallery2/galtheme.src36
-rw-r--r--tools/source/rc/resmgr.cxx12
84 files changed, 831 insertions, 1351 deletions
diff --git a/filter/inc/strings.hxx b/filter/inc/strings.hxx
new file mode 100644
index 000000000000..3a25ef921b31
--- /dev/null
+++ b/filter/inc/strings.hxx
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_FILTER_INC_STRINGS_HRC
+#define INCLUDED_FILTER_INC_STRINGS_HRC
+
+#define STR_APPL_NAME_WRITER "%PRODUCTNAME Writer (.sxw)"
+#define STR_APPL_NAME_CALC "%PRODUCTNAME Calc (.sxc)"
+#define STR_APPL_NAME_IMPRESS "%PRODUCTNAME Impress (.sxi)"
+#define STR_APPL_NAME_DRAW "%PRODUCTNAME Draw (.sxd)"
+#define STR_APPL_NAME_OASIS_WRITER "%PRODUCTNAME Writer (.odt)"
+#define STR_APPL_NAME_OASIS_CALC "%PRODUCTNAME Calc (.ods)"
+#define STR_APPL_NAME_OASIS_IMPRESS "%PRODUCTNAME Impress (.odp)"
+#define STR_APPL_NAME_OASIS_DRAW "%PRODUCTNAME Draw (.odg)"
+#define STR_DEFAULT_EXTENSION "xml"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx
index 2f65dde7fc5f..f29111a4912c 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.hxx
@@ -76,7 +76,7 @@ struct application_info_impl
OUString maXMLImporter;
OUString maXMLExporter;
- application_info_impl( const sal_Char * pDocumentService, ResId& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter );
+ application_info_impl(const sal_Char * pDocumentService, const OUString& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter);
};
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
index 66b6b3e3cf12..8db23c2ad6bc 100644
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
+++ b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
@@ -32,7 +32,6 @@
#define STR_WARN_DELETE (RID_XSLT_DIALOG_START + 10)
#define STR_DEFAULT_FILTER_NAME (RID_XSLT_DIALOG_START + 13)
-#define STR_DEFAULT_EXTENSION (RID_XSLT_DIALOG_START + 14)
#define STR_ERROR_FILTER_NAME_EXISTS (RID_XSLT_DIALOG_START + 15)
#define STR_ERROR_TYPE_NAME_EXISTS (RID_XSLT_DIALOG_START + 16)
@@ -49,15 +48,6 @@
#define STR_FILTERS_INSTALLED (RID_XSLT_DIALOG_START + 27)
#define STR_NO_FILTERS_FOUND (RID_XSLT_DIALOG_START + 28)
-#define STR_APPL_NAME_WRITER (RID_XSLT_DIALOG_START + 30)
-#define STR_APPL_NAME_CALC (RID_XSLT_DIALOG_START + 31)
-#define STR_APPL_NAME_IMPRESS (RID_XSLT_DIALOG_START + 32)
-#define STR_APPL_NAME_DRAW (RID_XSLT_DIALOG_START + 33)
-#define STR_APPL_NAME_OASIS_WRITER (RID_XSLT_DIALOG_START + 34)
-#define STR_APPL_NAME_OASIS_CALC (RID_XSLT_DIALOG_START + 35)
-#define STR_APPL_NAME_OASIS_IMPRESS (RID_XSLT_DIALOG_START + 36)
-#define STR_APPL_NAME_OASIS_DRAW (RID_XSLT_DIALOG_START + 37)
-
#define STR_XML_FILTER_LISTBOX (RID_XSLT_DIALOG_START + 38)
#endif
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.src b/filter/source/xsltdialog/xmlfilterdialogstrings.src
index 8e6501cd8a85..ea7a693a2257 100644
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.src
+++ b/filter/source/xsltdialog/xmlfilterdialogstrings.src
@@ -49,46 +49,6 @@ String STR_EXPORT_ONLY
Text [ en-US ] = "export filter";
};
-String STR_APPL_NAME_WRITER
-{
- Text = "%PRODUCTNAME Writer (.sxw)";
-};
-
-String STR_APPL_NAME_CALC
-{
- Text = "%PRODUCTNAME Calc (.sxc)";
-};
-
-String STR_APPL_NAME_IMPRESS
-{
- Text = "%PRODUCTNAME Impress (.sxi)";
-};
-
-String STR_APPL_NAME_DRAW
-{
- Text = "%PRODUCTNAME Draw (.sxd)";
-};
-
-String STR_APPL_NAME_OASIS_WRITER
-{
- Text = "%PRODUCTNAME Writer (.odt)";
-};
-
-String STR_APPL_NAME_OASIS_CALC
-{
- Text = "%PRODUCTNAME Calc (.ods)";
-};
-
-String STR_APPL_NAME_OASIS_IMPRESS
-{
- Text = "%PRODUCTNAME Impress (.odp)";
-};
-
-String STR_APPL_NAME_OASIS_DRAW
-{
- Text = "%PRODUCTNAME Draw (.odg)";
-};
-
String STR_WARN_DELETE
{
Text [ en-US ] = "Do you really want to delete the XML Filter '%s'? This action cannot be undone.";
@@ -129,11 +89,6 @@ String STR_DEFAULT_UI_NAME
Text [ en-US ] = "Untitled";
};
-String STR_DEFAULT_EXTENSION
-{
- Text = "xml";
-};
-
String STR_UNDEFINED_FILTER
{
Text [ en-US ] = "undefined filter";
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 05bf27ca3bda..972877b74a70 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -47,6 +47,7 @@
#include "xmlfiltertabdialog.hxx"
#include "xmlfiltertestdialog.hxx"
#include "xmlfilterjar.hxx"
+#include "strings.hxx"
using namespace osl;
using namespace com::sun::star::lang;
@@ -236,8 +237,7 @@ void XMLFilterSettingsDialog::onNew()
aTempInfo.maFilterName = createUniqueFilterName(RESIDSTR(STR_DEFAULT_FILTER_NAME));
// init default extension
- OUString aDefaultExtension(RESIDSTR(STR_DEFAULT_EXTENSION));
- aTempInfo.maExtension = aDefaultExtension;
+ aTempInfo.maExtension = STR_DEFAULT_EXTENSION;
// set default ui name
aTempInfo.maInterfaceName = createUniqueInterfaceName(RESIDSTR(STR_DEFAULT_UI_NAME));
@@ -1201,9 +1201,9 @@ void XMLFilterSettingsDialog::initFilterList()
m_pFilterListBox->Select( pEntry );
}
-application_info_impl::application_info_impl( const sal_Char * pDocumentService, ResId& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter )
+application_info_impl::application_info_impl( const sal_Char * pDocumentService, const OUString& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter )
: maDocumentService( pDocumentService, strlen( pDocumentService ), RTL_TEXTENCODING_ASCII_US ),
- maDocumentUIName( OUString( rUINameRes ) ),
+ maDocumentUIName(ResMgr::ExpandVariables(rUINameRes)),
maXMLImporter( mpXMLImporter, strlen( mpXMLImporter ), RTL_TEXTENCODING_ASCII_US ),
maXMLExporter( mpXMLExporter, strlen( mpXMLExporter ), RTL_TEXTENCODING_ASCII_US )
{
@@ -1216,63 +1216,55 @@ std::vector< application_info_impl* >& getApplicationInfos()
if( aInfos.empty() )
{
auto resmgr = getXSLTDialogResMgr();
- ResId aResId1( STR_APPL_NAME_WRITER, *resmgr.get() );
aInfos.push_back( new application_info_impl(
"com.sun.star.text.TextDocument",
- aResId1,
+ STR_APPL_NAME_WRITER,
"com.sun.star.comp.Writer.XMLImporter",
"com.sun.star.comp.Writer.XMLExporter" ) );
- ResId aResId2( STR_APPL_NAME_CALC, *resmgr.get() );
aInfos.push_back( new application_info_impl(
"com.sun.star.sheet.SpreadsheetDocument",
- aResId2,
+ STR_APPL_NAME_CALC,
"com.sun.star.comp.Calc.XMLImporter",
"com.sun.star.comp.Calc.XMLExporter" ) );
- ResId aResId3( STR_APPL_NAME_IMPRESS, *resmgr.get() );
aInfos.push_back( new application_info_impl(
"com.sun.star.presentation.PresentationDocument",
- aResId3,
+ STR_APPL_NAME_IMPRESS,
"com.sun.star.comp.Impress.XMLImporter",
"com.sun.star.comp.Impress.XMLExporter" ) );
- ResId aResId4( STR_APPL_NAME_DRAW, *resmgr.get() );
aInfos.push_back( new application_info_impl(
"com.sun.star.drawing.DrawingDocument",
- aResId4,
+ STR_APPL_NAME_DRAW,
"com.sun.star.comp.Draw.XMLImporter",
"com.sun.star.comp.Draw.XMLExporter" ) );
// --- oasis file formats...
- ResId aResId5( STR_APPL_NAME_OASIS_WRITER, *resmgr.get() );
aInfos.push_back( new application_info_impl(
"com.sun.star.text.TextDocument",
- aResId5,
+ STR_APPL_NAME_OASIS_WRITER,
"com.sun.star.comp.Writer.XMLOasisImporter",
"com.sun.star.comp.Writer.XMLOasisExporter" ) );
- ResId aResId6( STR_APPL_NAME_OASIS_CALC, *resmgr.get() );
aInfos.push_back( new application_info_impl(
"com.sun.star.sheet.SpreadsheetDocument",
- aResId6,
+ STR_APPL_NAME_OASIS_CALC,
"com.sun.star.comp.Calc.XMLOasisImporter",
"com.sun.star.comp.Calc.XMLOasisExporter" ) );
- ResId aResId7( STR_APPL_NAME_OASIS_IMPRESS, *resmgr.get() );
aInfos.push_back( new application_info_impl(
"com.sun.star.presentation.PresentationDocument",
- aResId7,
+ STR_APPL_NAME_OASIS_IMPRESS,
"com.sun.star.comp.Impress.XMLOasisImporter",
"com.sun.star.comp.Impress.XMLOasisExporter" ) );
- ResId aResId8( STR_APPL_NAME_OASIS_DRAW, *resmgr.get() );
aInfos.push_back( new application_info_impl(
"com.sun.star.drawing.DrawingDocument",
- aResId8,
+ STR_APPL_NAME_OASIS_DRAW,
"com.sun.star.comp.Draw.XMLOasisImporter",
"com.sun.star.comp.Draw.XMLOasisExporter" ) );
-}
+ }
return aInfos;
}
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index 70b34362f64c..e77fd4c793f0 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -63,10 +63,7 @@ public:
// Convert a resource string - a template name - to its localised pair
// if it exists in templatelocnames.src
- static OUString ConvertResourceString(int nSourceResIds,
- int nDestResIds,
- int nCount,
- const OUString& rString);
+ static OUString ConvertResourceString(const OUString& rString);
bool Copy(sal_uInt16 nTargetRegion,
sal_uInt16 nTargetIdx,
diff --git a/include/sfx2/templatelocnames.hrc b/include/sfx2/templatelocnames.hrc
index df1582fa1127..c4e005a12712 100644
--- a/include/sfx2/templatelocnames.hrc
+++ b/include/sfx2/templatelocnames.hrc
@@ -10,17 +10,6 @@
#define NUM_TEMPLATE_NAMES 10
#define TEMPL_LOC_OFFSET 2210
-#define STR_TEMPLATE_NAME1_DEF (TEMPL_LOC_OFFSET + 1)
-#define STR_TEMPLATE_NAME2_DEF (TEMPL_LOC_OFFSET + 2)
-#define STR_TEMPLATE_NAME3_DEF (TEMPL_LOC_OFFSET + 3)
-#define STR_TEMPLATE_NAME4_DEF (TEMPL_LOC_OFFSET + 4)
-#define STR_TEMPLATE_NAME5_DEF (TEMPL_LOC_OFFSET + 5)
-#define STR_TEMPLATE_NAME6_DEF (TEMPL_LOC_OFFSET + 6)
-#define STR_TEMPLATE_NAME7_DEF (TEMPL_LOC_OFFSET + 7)
-#define STR_TEMPLATE_NAME8_DEF (TEMPL_LOC_OFFSET + 8)
-#define STR_TEMPLATE_NAME9_DEF (TEMPL_LOC_OFFSET + 9)
-#define STR_TEMPLATE_NAME10_DEF (TEMPL_LOC_OFFSET + 10)
-
#define STR_TEMPLATE_NAME1 (TEMPL_LOC_OFFSET + 51)
#define STR_TEMPLATE_NAME2 (TEMPL_LOC_OFFSET + 52)
#define STR_TEMPLATE_NAME3 (TEMPL_LOC_OFFSET + 53)
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
index 7dc331fe91a8..2873c5f026ad 100644
--- a/include/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
@@ -227,8 +227,7 @@
#define STR_FIELD_TELOTHER (STR_SVT_ADDRESSTEMPLATE_START+29)
#define STR_FIELD_CALENDAR (STR_SVT_ADDRESSTEMPLATE_START+30)
#define STR_FIELD_INVITE (STR_SVT_ADDRESSTEMPLATE_START+31)
-#define STR_LOGICAL_FIELD_NAMES (STR_SVT_ADDRESSTEMPLATE_START+32)
-#define STR_SVT_ADDRESSTEMPLATE_END (STR_LOGICAL_FIELD_NAMES)
+#define STR_SVT_ADDRESSTEMPLATE_END (STR_FIELD_INVITE)
#endif
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 6c52d2c7cfd1..68a6a66a911d 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -172,6 +172,7 @@ public:
static void SetReadStringHook( ResHookProc pProc );
static ResHookProc GetReadStringHook();
+ static OUString ExpandVariables(const OUString& rString);
static void SetDefaultLocale( const LanguageTag& rLocale );
};
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index a3c93d89b3e1..e635ad9a9c0b 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -38,9 +38,6 @@
#define RID_MISC_START RID_RPT_START
// strings
-#define RID_STR_CLASS_FORMATTEDFIELD ( RID_STRING_START + 1 )
-#define RID_STR_CLASS_FIXEDTEXT ( RID_STRING_START + 2 )
-#define RID_STR_CLASS_IMAGECONTROL ( RID_STRING_START + 3 )
#define RID_STR_PROPTITLE_FIXEDTEXT ( RID_STRING_START + 4 )
#define RID_STR_PROPTITLE_FORMATTED ( RID_STRING_START + 5 )
#define RID_STR_PROPTITLE_SHAPE ( RID_STRING_START + 6 )
@@ -118,7 +115,7 @@
#define RID_STR_PROPTITLE_GROUP (RID_STRING_START + 84)
#define RID_STR_PROPTITLE_FIXEDLINE (RID_STRING_START + 85)
-#define RID_STR_CLASS_FIXEDLINE (RID_STRING_START + 86)
+// free
#define RID_STR_BACKTRANSPARENT (RID_STRING_START + 87)
#define RID_STR_CONTROLBACKGROUNDTRANSPARENT (RID_STRING_START + 88)
#define RID_STR_OVERLAP_OTHER_CONTROL (RID_STRING_START + 89)
diff --git a/reportdesign/inc/strings.hxx b/reportdesign/inc/strings.hxx
new file mode 100644
index 000000000000..d5fd6ad8385b
--- /dev/null
+++ b/reportdesign/inc/strings.hxx
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_REPORTDESIGN_INC_STRINGS_HRC
+#define INCLUDED_REPORTDESIGN_INC_STRINGS_HRC
+
+// Dialog Controls
+
+#define RID_STR_CLASS_FIXEDTEXT "Label"
+#define RID_STR_CLASS_FIXEDLINE "Line"
+#define RID_STR_CLASS_IMAGECONTROL "Graphic"
+#define RID_STR_CLASS_FORMATTEDFIELD "FormattedField"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 92ee82a45587..45b5dc064d30 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -32,6 +32,7 @@
#include "ModuleHelper.hxx"
#include <RptResId.hrc>
+#include "strings.hxx"
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xlndsit.hxx>
@@ -764,32 +765,27 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
{
- sal_uInt16 nResId = 0;
OUString aDefaultName = "HERE WE HAVE TO INSERT OUR NAME!";
if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) )
{
- nResId = RID_STR_CLASS_FIXEDTEXT;
+ aDefaultName = RID_STR_CLASS_FIXEDTEXT;
}
else if ( _pObj->supportsService( SERVICE_FIXEDLINE ) )
{
- nResId = RID_STR_CLASS_FIXEDLINE;
+ aDefaultName = RID_STR_CLASS_FIXEDLINE;
}
else if ( _pObj->supportsService( SERVICE_IMAGECONTROL ) )
{
- nResId = RID_STR_CLASS_IMAGECONTROL;
+ aDefaultName = RID_STR_CLASS_IMAGECONTROL;
}
else if ( _pObj->supportsService( SERVICE_FORMATTEDFIELD ) )
{
- nResId = RID_STR_CLASS_FORMATTEDFIELD;
+ aDefaultName = RID_STR_CLASS_FORMATTEDFIELD;
}
- if (nResId)
- aDefaultName = ModuleRes(nResId);
-
return aDefaultName;
}
-
void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt )
{
OObjectBase::_propertyChange(evt);
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 8d436f30e291..5e7316b7dcd3 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -54,6 +54,7 @@
#include "ViewsWindow.hxx"
#include "UITools.hxx"
#include <unotools/confignode.hxx>
+#include "strings.hxx"
namespace rptui
{
@@ -381,7 +382,8 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
else
{
OSL_FAIL("Unknown service name!");
- nResId = RID_STR_CLASS_FORMATTEDFIELD;
+ aName += RID_STR_CLASS_FORMATTEDFIELD;
+ return aName;
}
if (nResId)
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index af7f1b0e3876..55472688ab79 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -21,25 +21,6 @@
#include <svx/svxids.hrc>
#include "helpids.hrc"
-// Dialog Controls ---------------------------------------------------------------
-
-String RID_STR_CLASS_FIXEDTEXT
-{
- Text = "Label" ;
-};
-String RID_STR_CLASS_FIXEDLINE
-{
- Text = "Line" ;
-};
-String RID_STR_CLASS_IMAGECONTROL
-{
- Text = "Graphic" ;
-};
-String RID_STR_CLASS_FORMATTEDFIELD
-{
- Text = "FormattedField" ;
-};
-
// Property Browser Headline ----------------------------------------------------------------
String RID_STR_BRWTITLE_PROPERTIES
diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc
index 3f942cbd033c..139e84001023 100644
--- a/sc/inc/scres.hrc
+++ b/sc/inc/scres.hrc
@@ -53,8 +53,8 @@
#define SCSTR_CHARSET_USER (STR_START + 59)
#define SCSTR_COLUMN_USER (STR_START + 60)
-#define SCSTR_FIELDSEP (STR_START + 61)
-#define SCSTR_TEXTSEP (STR_START + 62)
+//free
+//free
#define SCSTR_MULTIPLE (STR_START + 63)
#define SCSTR_TOP10FILTER (STR_START + 66)
@@ -103,27 +103,27 @@
// document
#define STR_ACC_DOC_NAME (STR_START + 154)
-#define STR_ACC_DOC_DESCR (STR_START + 155)
+//free
#define STR_ACC_TABLE_NAME (STR_START + 156)
-#define STR_ACC_TABLE_DESCR (STR_START + 157)
+//free
#define STR_ACC_CELL_NAME (STR_START + 158)
-#define STR_ACC_CELL_DESCR (STR_START + 159)
+//free
// preview
#define STR_ACC_PREVIEWDOC_NAME (STR_START + 160)
-#define STR_ACC_PREVIEWDOC_DESCR (STR_START + 161)
-#define STR_ACC_HEADERCELL_NAME (STR_START + 162)
-#define STR_ACC_HEADERCELL_DESCR (STR_START + 163)
+//free
+//free
+//free
#define STR_ACC_LEFTAREA_NAME (STR_START + 164)
-#define STR_ACC_LEFTAREA_DESCR (STR_START + 165)
+//free
#define STR_ACC_CENTERAREA_NAME (STR_START + 166)
-#define STR_ACC_CENTERAREA_DESCR (STR_START + 167)
+//free
#define STR_ACC_RIGHTAREA_NAME (STR_START + 168)
-#define STR_ACC_RIGHTAREA_DESCR (STR_START + 169)
+//free
#define STR_ACC_HEADER_NAME (STR_START + 170)
-#define STR_ACC_HEADER_DESCR (STR_START + 171)
+//free
#define STR_ACC_FOOTER_NAME (STR_START + 172)
-#define STR_ACC_FOOTER_DESCR (STR_START + 173)
+//free
// Editline
#define STR_ACC_EDITLINE_NAME (STR_START + 174)
diff --git a/sc/inc/strings.hxx b/sc/inc/strings.hxx
new file mode 100644
index 000000000000..dcd76c281aa9
--- /dev/null
+++ b/sc/inc/strings.hxx
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_SC_INC_STRINGS_HXX
+#define INCLUDED_SC_INC_STRINGS_HXX
+
+#define SCSTR_FIELDSEP ",\t44\t;\t59\t:\t58\t{%TAB}\t9\t{%SPACE}\t32 "
+#define SCSTR_TEXTSEP "\"\t34\t'\t39"
+#define STR_ACC_DOC_DESCR ""
+#define STR_ACC_TABLE_DESCR ""
+#define STR_ACC_CELL_DESCR ""
+#define STR_ACC_PREVIEWDOC_DESCR ""
+#define STR_ACC_HEADERCELL_NAME ""
+#define STR_ACC_HEADERCELL_DESCR ""
+#define STR_ACC_LEFTAREA_DESCR ""
+#define STR_ACC_CENTERAREA_DESCR ""
+#define STR_ACC_RIGHTAREA_DESCR ""
+#define STR_ACC_HEADER_DESCR ""
+#define STR_ACC_FOOTER_DESCR ""
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index ef31889dbb29..27440b9dee71 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -27,6 +27,7 @@
#include "formulacell.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include "unonames.hxx"
#include "detfunc.hxx"
#include "chgtrack.hxx"
@@ -206,7 +207,7 @@ sal_Int32
OUString SAL_CALL
ScAccessibleCellBase::createAccessibleDescription()
{
- OUString sDescription = OUString(ScResId(STR_ACC_CELL_DESCR));
+ OUString sDescription = STR_ACC_CELL_DESCR;
return sDescription;
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index a7f379e87eed..45130ebed1c4 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -31,6 +31,7 @@
#include "userdat.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include "table.hxx"
#include "markdata.hxx"
@@ -2110,7 +2111,7 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA
OUString SAL_CALL
ScAccessibleDocument::createAccessibleDescription()
{
- OUString sDescription = OUString(ScResId(STR_ACC_DOC_DESCR));
+ OUString sDescription = STR_ACC_DOC_DESCR;
return sDescription;
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 65a702fc4902..ec81ed09dd42 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -29,6 +29,7 @@
#include "editsrc.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include "DrawModelBroadcaster.hxx"
#include "docsh.hxx"
#include "drawview.hxx"
@@ -1522,7 +1523,7 @@ uno::Sequence<sal_Int8> SAL_CALL
OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription()
{
- OUString sDescription = OUString(ScResId(STR_ACC_PREVIEWDOC_DESCR));
+ OUString sDescription = STR_ACC_PREVIEWDOC_DESCR;
return sDescription;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 9eee1276c5ac..7bc640910bdf 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -29,6 +29,7 @@
#include "attrib.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -297,7 +298,7 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceName
OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription()
{
- OUString sDesc(SC_RESSTR(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR));
+ OUString sDesc(mbHeader ? OUString(STR_ACC_HEADER_DESCR) : OUString(STR_ACC_FOOTER_DESCR));
return sDesc.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN));
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index cbfdc5a57f09..5f05a33da2cb 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -28,6 +28,7 @@
#include "prevloc.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -207,13 +208,13 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription()
switch (meAdjust)
{
case SvxAdjust::Left :
- sDesc = OUString(ScResId(STR_ACC_LEFTAREA_DESCR));
+ sDesc = STR_ACC_LEFTAREA_DESCR;
break;
case SvxAdjust::Right:
- sDesc = OUString(ScResId(STR_ACC_RIGHTAREA_DESCR));
+ sDesc = STR_ACC_RIGHTAREA_DESCR;
break;
case SvxAdjust::Center:
- sDesc = OUString(ScResId(STR_ACC_CENTERAREA_DESCR));
+ sDesc = STR_ACC_CENTERAREA_DESCR;
break;
default:
OSL_FAIL("wrong adjustment found");
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index e8f7a4e3e592..872593d6bb36 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -32,6 +32,7 @@
#include "prevloc.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -347,13 +348,13 @@ tools::Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const
OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription()
{
- OUString sDescription = OUString(ScResId(STR_ACC_HEADERCELL_DESCR));
+ OUString sDescription = STR_ACC_HEADERCELL_DESCR;
return sDescription;
}
OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName()
{
- OUString sName = OUString(ScResId(STR_ACC_HEADERCELL_NAME));
+ OUString sName = STR_ACC_HEADERCELL_NAME;
if ( mbColumnHeader )
{
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 19ea2bd621ee..e4b47a759da7 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -29,6 +29,7 @@
#include "document.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -579,7 +580,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId()
OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription()
{
- OUString sDesc(ScResId(STR_ACC_TABLE_DESCR));
+ OUString sDesc(STR_ACC_TABLE_DESCR);
return sDesc;
}
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index f63da3f62efb..e83a421e542c 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -22,6 +22,7 @@
#include "document.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include "table.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -342,7 +343,7 @@ uno::Reference< XAccessible > SAL_CALL
OUString SAL_CALL
ScAccessibleTableBase::createAccessibleDescription()
{
- OUString sDesc(ScResId(STR_ACC_TABLE_DESCR));
+ OUString sDesc(STR_ACC_TABLE_DESCR);
return sDesc;
}
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index feeed32efb77..a90af8136fb0 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -32,6 +32,7 @@
#include "impex.hxx"
#include "scuiasciiopt.hxx"
#include "asciiopt.hrc"
+#include "strings.hxx"
#include "csvtablebox.hxx"
#include <comphelper/string.hxx>
#include <osl/thread.h>
@@ -249,7 +250,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa
aCharSetUser( ScResId( SCSTR_CHARSET_USER ) ),
aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
- aTextSepList( ScResId( SCSTR_TEXTSEP ) ),
+ aTextSepList(SCSTR_TEXTSEP),
mcTextSep ( ScAsciiOptions::cDefaultTextSep ),
meCall(eCall)
{
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 0f9079e728f1..dbd9132c6a59 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -23,6 +23,7 @@
#include "tabvwsh.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <comphelper/string.hxx>
#include <officecfg/Office/Calc.hxx>
#include <osl/thread.h>
@@ -133,13 +134,13 @@ ScImportOptionsDlg::ScImportOptionsDlg(
get(m_pCbFixed, "fixedwidth");
get(m_pBtnOk, "ok");
- OUString sFieldSep(SC_RESSTR(SCSTR_FIELDSEP));
+ OUString sFieldSep(SCSTR_FIELDSEP);
sFieldSep = sFieldSep.replaceFirst( "%TAB", SC_RESSTR(SCSTR_FIELDSEP_TAB) );
sFieldSep = sFieldSep.replaceFirst( "%SPACE", SC_RESSTR(SCSTR_FIELDSEP_SPACE) );
// not possible in the Ctor initializer (MSC cannot do that):
- pFieldSepTab = new ScDelimiterTable( sFieldSep );
- pTextSepTab = new ScDelimiterTable( OUString(ScResId(SCSTR_TEXTSEP)) );
+ pFieldSepTab = new ScDelimiterTable(sFieldSep);
+ pTextSepTab = new ScDelimiterTable(SCSTR_TEXTSEP);
OUString aStr = pFieldSepTab->FirstDel();
sal_Unicode nCode;
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 57c9f2cccdcd..c853dd7732a4 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -217,11 +217,6 @@ String SCSTR_COLUMN_USER
Text [ en-US ] = "Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Hide" ;
};
-String SCSTR_FIELDSEP
-{
- Text = ",\t44\t;\t59\t:\t58\t{%TAB}\t9\t{%SPACE}\t32 " ;
-};
-
String SCSTR_FIELDSEP_TAB
{
Text [ en-US ] = "Tab" ;
@@ -232,11 +227,6 @@ String SCSTR_FIELDSEP_SPACE
Text [ en-US ] = "space" ;
};
-String SCSTR_TEXTSEP
-{
- Text = "\"\t34\t'\t39" ;
-};
-
String SCSTR_FORMULA_AUTOCORRECTION
{
Text [ en-US ] = "%PRODUCTNAME Calc found an error in the formula entered.\nDo you want to accept the correction proposed below?\n\n" ;
@@ -294,59 +284,24 @@ String STR_ACC_DOC_NAME
Text [ en-US ] = "Document view";
};
-String STR_ACC_DOC_DESCR
-{
- Text = "";
-};
-
String STR_ACC_TABLE_NAME
{
Text [ en-US ] = "Sheet %1";
};
-String STR_ACC_TABLE_DESCR
-{
- Text = "";
-};
-
String STR_ACC_CELL_NAME
{
Text [ en-US ] = "Cell %1";
};
-String STR_ACC_CELL_DESCR
-{
- Text = "";
-};
-
-String STR_ACC_PREVIEWDOC_NAME
-{
- Text [ en-US ] = "Page preview";
-};
-
-String STR_ACC_PREVIEWDOC_DESCR
-{
- Text = "";
-};
-
-String STR_ACC_HEADERCELL_NAME
-{
- Text = "";
-};
-
-String STR_ACC_HEADERCELL_DESCR
-{
- Text = "";
-};
-
String STR_ACC_LEFTAREA_NAME
{
Text [ en-US ] = "Left area";
};
-String STR_ACC_LEFTAREA_DESCR
+String STR_ACC_PREVIEWDOC_NAME
{
- Text = "";
+ Text [ en-US ] = "Page preview";
};
String STR_ACC_CENTERAREA_NAME
@@ -354,41 +309,21 @@ String STR_ACC_CENTERAREA_NAME
Text [ en-US ] = "Center area";
};
-String STR_ACC_CENTERAREA_DESCR
-{
- Text = "";
-};
-
String STR_ACC_RIGHTAREA_NAME
{
Text [ en-US ] = "Right area";
};
-String STR_ACC_RIGHTAREA_DESCR
-{
- Text = "";
-};
-
String STR_ACC_HEADER_NAME
{
Text [ en-US ] = "Header of page %1";
};
-String STR_ACC_HEADER_DESCR
-{
- Text = "";
-};
-
String STR_ACC_FOOTER_NAME
{
Text [ en-US ] = "Footer of page %1";
};
-String STR_ACC_FOOTER_DESCR
-{
- Text = "";
-};
-
String STR_ACC_EDITLINE_NAME
{
Text [ en-US ] = "Input line";
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 5e862a971f48..718fbb675060 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -27,6 +27,7 @@
#include <tools/rcid.h>
#include <tools/resmgr.hxx>
#include <algorithm>
+#include "deffuncname.hxx"
using namespace ::com::sun::star;
@@ -61,7 +62,7 @@ const ScaFuncDataBase pFuncDataArr[] =
#undef FUNCDATA
-ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rResMgr ) :
+ScaFuncData::ScaFuncData(const ScaFuncDataBase& rBaseData) :
aIntName( OUString::createFromAscii( rBaseData.pIntName ) ),
nUINameID( rBaseData.nUINameID ),
nDescrID( rBaseData.nDescrID ),
@@ -70,9 +71,8 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rResMgr ) :
bDouble( rBaseData.bDouble ),
bWithOpt( rBaseData.bWithOpt )
{
- ResStringArray aArr(ScaResId(rBaseData.nCompListID, rResMgr));
- for (sal_uInt32 nIndex = 0; nIndex < aArr.Count(); ++nIndex)
- aCompList.push_back(aArr.GetString(nIndex));
+ aCompList.push_back(OUString::createFromAscii(rBaseData.pCompListID[0]));
+ aCompList.push_back(OUString::createFromAscii(rBaseData.pCompListID[1]));
}
ScaFuncData::~ScaFuncData()
@@ -86,11 +86,10 @@ sal_uInt16 ScaFuncData::GetStrIndex( sal_uInt16 nParam ) const
return (nParam > nParamCount) ? (nParamCount * 2) : (nParam * 2);
}
-
-void InitScaFuncDataList( ScaFuncDataList& rList, ResMgr& rResMgr )
+void InitScaFuncDataList(ScaFuncDataList& rList)
{
- for(const auto & nIndex : pFuncDataArr)
- rList.push_back( ScaFuncData( nIndex, rResMgr ) );
+ for (const auto & nIndex : pFuncDataArr)
+ rList.push_back(ScaFuncData(nIndex));
}
// entry points for service registration / instantiation
@@ -175,11 +174,8 @@ void ScaDateAddIn::InitData()
pResMgr.reset(ResMgr::CreateResMgr("date", LanguageTag(aFuncLoc)));
pFuncDataList.reset();
- if ( pResMgr )
- {
- pFuncDataList.reset(new ScaFuncDataList);
- InitScaFuncDataList( *pFuncDataList, *pResMgr );
- }
+ pFuncDataList.reset(new ScaFuncDataList);
+ InitScaFuncDataList(*pFuncDataList);
if( pDefLocales )
{
diff --git a/scaddins/source/datefunc/datefunc.hrc b/scaddins/source/datefunc/datefunc.hrc
index 3830db4eaec9..44653ef848a2 100644
--- a/scaddins/source/datefunc/datefunc.hrc
+++ b/scaddins/source/datefunc/datefunc.hrc
@@ -44,17 +44,6 @@
#define DATE_FUNCNAME_WeeksInYear (DATE_FUNCNAME_START+6)
#define DATE_FUNCNAME_Rot13 (DATE_FUNCNAME_START+7)
-#define DATE_DEFFUNCNAME_START (DATE_RESOURCE_START+2000)
-
-#define DATE_DEFFUNCNAME_DiffWeeks (DATE_DEFFUNCNAME_START)
-#define DATE_DEFFUNCNAME_DiffMonths (DATE_DEFFUNCNAME_START+1)
-#define DATE_DEFFUNCNAME_DiffYears (DATE_DEFFUNCNAME_START+2)
-#define DATE_DEFFUNCNAME_IsLeapYear (DATE_DEFFUNCNAME_START+3)
-#define DATE_DEFFUNCNAME_DaysInMonth (DATE_DEFFUNCNAME_START+4)
-#define DATE_DEFFUNCNAME_DaysInYear (DATE_DEFFUNCNAME_START+5)
-#define DATE_DEFFUNCNAME_WeeksInYear (DATE_DEFFUNCNAME_START+6)
-#define DATE_DEFFUNCNAME_Rot13 (DATE_DEFFUNCNAME_START+7)
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index f93c1284fc8e..9204709bca1f 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -57,7 +57,7 @@ struct ScaFuncDataBase
const sal_Char* pIntName; // internal name (get***)
sal_uInt16 nUINameID; // resource ID to UI name
sal_uInt16 nDescrID; // resource ID to description, parameter names and ~ description
- sal_uInt16 nCompListID; // resource ID to list of valid names
+ const char** pCompListID; // list of valid names
sal_uInt16 nParamCount; // number of named / described parameters
ScaCategory eCat; // function category
bool bDouble; // name already exist in Calc
@@ -77,7 +77,7 @@ private:
bool bWithOpt; // first parameter is internal
public:
- ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rRscMgr );
+ ScaFuncData(const ScaFuncDataBase& rBaseData);
~ScaFuncData();
sal_uInt16 GetUINameID() const { return nUINameID; }
diff --git a/scaddins/source/datefunc/datefunc.src b/scaddins/source/datefunc/datefunc.src
index 7741792436bf..9e8632995a37 100644
--- a/scaddins/source/datefunc/datefunc.src
+++ b/scaddins/source/datefunc/datefunc.src
@@ -151,69 +151,4 @@ String DATE_FUNCNAME_Rot13
Text [ en-US ] = "ROT13";
};
-StringArray DATE_DEFFUNCNAME_DiffWeeks
-{
- ItemList =
- {
- < "WOCHEN"; >;
- < "WEEKS"; >;
- };
-};
-StringArray DATE_DEFFUNCNAME_DiffMonths
-{
- ItemList =
- {
- < "MONATE"; >;
- < "MONTHS"; >;
- };
-};
-StringArray DATE_DEFFUNCNAME_DiffYears
-{
- ItemList =
- {
- < "JAHRE"; >;
- < "YEARS"; >;
- };
-};
-StringArray DATE_DEFFUNCNAME_IsLeapYear
-{
- ItemList =
- {
- < "ISTSCHALTJAHR"; >;
- < "ISLEAPYEAR"; >;
- };
-};
-StringArray DATE_DEFFUNCNAME_DaysInMonth
-{
- ItemList =
- {
- < "TAGEIMMONAT"; >;
- < "DAYSINMONTH"; >;
- };
-};
-StringArray DATE_DEFFUNCNAME_DaysInYear
-{
- ItemList =
- {
- < "TAGEIMJAHR"; >;
- < "DAYSINYEAR"; >;
- };
-};
-StringArray DATE_DEFFUNCNAME_WeeksInYear
-{
- ItemList =
- {
- < "WOCHENIMJAHR"; >;
- < "WEEKSINYEAR"; >;
- };
-};
-StringArray DATE_DEFFUNCNAME_Rot13
-{
- ItemList =
- {
- < "ROT13"; >;
- < "ROT13"; >;
- };
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/datefunc/deffuncname.hxx b/scaddins/source/datefunc/deffuncname.hxx
new file mode 100644
index 000000000000..15b77bdf4354
--- /dev/null
+++ b/scaddins/source/datefunc/deffuncname.hxx
@@ -0,0 +1,73 @@
+/* -*- 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_SCADDINS_SOURCE_DATEFUNC_DEFFUNCTIONNAME_HXX
+#define INCLUDED_SCADDINS_SOURCE_DATEFUNC_DEFFUNCTIONNAME_HXX
+
+static const char* DATE_DEFFUNCNAME_DiffWeeks[2] =
+{
+ "WOCHEN"
+ "WEEKS"
+};
+
+static const char* DATE_DEFFUNCNAME_DiffMonths[2] =
+{
+ "MONATE"
+ "MONTHS"
+};
+
+static const char* DATE_DEFFUNCNAME_DiffYears[2] =
+{
+ "JAHRE"
+ "YEARS"
+};
+
+static const char* DATE_DEFFUNCNAME_IsLeapYear[2] =
+{
+ "ISTSCHALTJAHR"
+ "ISLEAPYEAR"
+};
+
+static const char* DATE_DEFFUNCNAME_DaysInMonth[2] =
+{
+ "TAGEIMMONAT"
+ "DAYSINMONTH"
+};
+
+static const char* DATE_DEFFUNCNAME_DaysInYear[2] =
+{
+ "TAGEIMJAHR"
+ "DAYSINYEAR"
+};
+
+static const char* DATE_DEFFUNCNAME_WeeksInYear[2] =
+{
+ "WOCHENIMJAHR"
+ "WEEKSINYEAR"
+};
+
+static const char* DATE_DEFFUNCNAME_Rot13[2] =
+{
+ "ROT13"
+ "ROT13"
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 7b89fe57a994..6a89ca2d647b 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -38,11 +38,6 @@
#define STR_PRESOBJ_ORGCHART RID_GLOB_START+11
#define STR_PRESOBJ_TABLE RID_GLOB_START+12
-#define STR_LAYOUT_TITLE RID_GLOB_START+27
-#define STR_LAYOUT_OUTLINE RID_GLOB_START+28
-#define STR_LAYOUT_BACKGROUNDOBJECTS RID_GLOB_START+29
-#define STR_LAYOUT_BACKGROUND RID_GLOB_START+30
-#define STR_LAYOUT_NOTES RID_GLOB_START+31
#define STR_PRESOBJ_MPTITLE RID_GLOB_START+32
#define STR_PRESOBJ_MPOUTLINE RID_GLOB_START+33
#define STR_PRESOBJ_MPOUTLLAYER2 RID_GLOB_START+34
@@ -60,7 +55,7 @@
#define STR_HANDOUT RID_GLOB_START+48
#define STR_UNDO_MOVEPAGES RID_GLOB_START+52
-#define STR_LAYOUT_SUBTITLE RID_GLOB_START+54
+//free
#define STR_POOLSHEET_OBJWITHARROW RID_GLOB_START+55
#define STR_POOLSHEET_OBJWITHSHADOW RID_GLOB_START+56
#define STR_POOLSHEET_OBJWITHOUTFILL RID_GLOB_START+57
diff --git a/sd/inc/strings.hxx b/sd/inc/strings.hxx
new file mode 100644
index 000000000000..3a5a9ef86ce9
--- /dev/null
+++ b/sd/inc/strings.hxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_SD_INC_STRINGS_HRC
+#define INCLUDED_SD_INC_STRINGS_HRC
+
+/* do not translate */
+#define STR_LAYOUT_TITLE "Titel"
+#define STR_LAYOUT_OUTLINE "Gliederung"
+#define STR_LAYOUT_BACKGROUND "Hintergrund"
+#define STR_LAYOUT_BACKGROUNDOBJECTS "Hintergrundobjekte"
+#define STR_LAYOUT_NOTES "Notizen"
+#define STR_LAYOUT_SUBTITLE "Untertitel"
+#define STR_HTMLEXP_DEFAULT_EXTENSION ".html"
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 7c0c32f4dfa1..239db2a88dc1 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -63,6 +63,7 @@
#include "ViewShellBase.hxx"
#include "cfgids.hxx"
#include "strings.hrc"
+#include "strings.hxx"
using namespace ::com::sun::star;
@@ -1448,7 +1449,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
else
{
OUStringBuffer aBuf(rLayoutName);
- aBuf.append(SD_LT_SEPARATOR).append(SdResId(STR_LAYOUT_OUTLINE).toString());
+ aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE);
OUString aSearchFor(aBuf.makeStringAndClear());
for (sal_uInt16 nMP = 0; nMP < pSourceDoc->GetMasterPageCount(); ++nMP)
@@ -1523,7 +1524,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
OUString aTemp(aTargetNewLayoutName);
aTemp += SD_LT_SEPARATOR;
- aTemp += SD_RESSTR(STR_LAYOUT_OUTLINE);
+ aTemp += STR_LAYOUT_OUTLINE;
pMaster->SetName(aTargetNewLayoutName);
pMaster->SetLayoutName(aTemp);
@@ -1801,7 +1802,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
{
// Find a new name for the layout
OUString aName(createNewMasterPageLayoutName(*this));
- OUString aPageLayoutName(aName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE));
+ OUString aPageLayoutName(aName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE);
// Generate new stylesheets
static_cast<SdStyleSheetPool*>( mxStyleSheetPool.get())->CreateLayoutStyleSheets(aName);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index adfaba482e30..7fe0b5b5119f 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -107,6 +107,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <svl/itemset.hxx>
#include "app.hrc"
+#include "strings.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1100,7 +1101,7 @@ void SdDrawDocument::RenameLayoutTemplate(const OUString& rOldLayoutName, const
// Now set the layout name of the drawing and the notes page, as well as
// their master pages.
OUString aPageLayoutName(rNewName);
- aPageLayoutName += aSep + SD_RESSTR(STR_LAYOUT_OUTLINE);
+ aPageLayoutName += aSep + STR_LAYOUT_OUTLINE;
// Inform all text objects on pages that use the renamed layout and set the
// new name.
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index 86aea171dc9c..459e194381e1 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -145,31 +145,6 @@ String STR_PRESOBJ_TABLE
{
Text [ en-US ] = "Double-click to add a Spreadsheet" ;
};
-/* do not translate */
-String STR_LAYOUT_TITLE
-{
- Text = "Titel" ;
-};
-/* do not translate */
-String STR_LAYOUT_OUTLINE
-{
- Text = "Gliederung" ;
-};
-/* do not translate */
-String STR_LAYOUT_BACKGROUND
-{
- Text = "Hintergrund" ;
-};
-/* do not translate */
-String STR_LAYOUT_BACKGROUNDOBJECTS
-{
- Text = "Hintergrundobjekte" ;
-};
-/* do not translate */
-String STR_LAYOUT_NOTES
-{
- Text = "Notizen" ;
-};
String STR_LAYOUT_DEFAULT_NAME
{
Text [ en-US ] = "Default" ;
@@ -186,11 +161,6 @@ String STR_UNDO_MOVEPAGES
{
Text [ en-US ] = "Move slides" ;
};
-/* do not translate */
-String STR_LAYOUT_SUBTITLE
-{
- Text = "Untertitel" ;
-};
String STR_POOLSHEET_MEASURE
{
Text [ en-US ] = "Dimension Line" ;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 907b96ee8963..9852f7a4848b 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -70,6 +70,7 @@
#include "sdresid.hxx"
#include "stlsheet.hxx"
#include "glob.hrc"
+#include "strings.hxx"
#include "bitmaps.hlst"
#include "glob.hxx"
#include "helpids.h"
@@ -127,8 +128,8 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage)
// The name of the layout of the page is used by SVDRAW to determine the
// presentation template of the outline objects. Therefore, it already
// contains the designator for the outline (STR_LAYOUT_OUTLINE).
- OUStringBuffer aBuf(SdResId(STR_LAYOUT_DEFAULT_NAME).toString());
- aBuf.append(SD_LT_SEPARATOR).append(SdResId(STR_LAYOUT_OUTLINE).toString());
+ OUStringBuffer aBuf(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE);
maLayoutName = aBuf.makeStringAndClear();
Size aPageSize(GetSize());
@@ -617,7 +618,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const
aName = aName.copy(0, nPos);
}
- aName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
+ aName += STR_LAYOUT_BACKGROUND;
SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool();
SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
@@ -644,22 +645,22 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const
break;
case PRESOBJ_TITLE:
- aName += SD_RESSTR(STR_LAYOUT_TITLE);
+ aName += STR_LAYOUT_TITLE;
break;
case PRESOBJ_NOTES:
- aName += SD_RESSTR(STR_LAYOUT_NOTES);
+ aName += STR_LAYOUT_NOTES;
break;
case PRESOBJ_TEXT:
- aName += SD_RESSTR(STR_LAYOUT_SUBTITLE);
+ aName += STR_LAYOUT_SUBTITLE;
break;
case PRESOBJ_HEADER:
case PRESOBJ_FOOTER:
case PRESOBJ_DATETIME:
case PRESOBJ_SLIDENUMBER:
- aName += SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS);
+ aName += STR_LAYOUT_BACKGROUNDOBJECTS;
break;
default:
@@ -681,11 +682,12 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const
if( nIndex != -1 )
aStyleName = aStyleName.copy(0, nIndex + aSep.getLength());
- sal_uInt16 nNameId;
+ const char *pNameId;
+ bool bOutline = false;
switch( nHelpId )
{
- case HID_PSEUDOSHEET_TITLE: nNameId = STR_LAYOUT_TITLE; break;
- case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_LAYOUT_SUBTITLE; break;
+ case HID_PSEUDOSHEET_TITLE: pNameId = STR_LAYOUT_TITLE; break;
+ case HID_PSEUDOSHEET_SUBTITLE: pNameId = STR_LAYOUT_SUBTITLE; break;
case HID_PSEUDOSHEET_OUTLINE1:
case HID_PSEUDOSHEET_OUTLINE2:
case HID_PSEUDOSHEET_OUTLINE3:
@@ -694,17 +696,17 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const
case HID_PSEUDOSHEET_OUTLINE6:
case HID_PSEUDOSHEET_OUTLINE7:
case HID_PSEUDOSHEET_OUTLINE8:
- case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_LAYOUT_OUTLINE; break;
- case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_LAYOUT_BACKGROUNDOBJECTS; break;
- case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_LAYOUT_BACKGROUND; break;
- case HID_PSEUDOSHEET_NOTES: nNameId = STR_LAYOUT_NOTES; break;
+ case HID_PSEUDOSHEET_OUTLINE9: pNameId = STR_LAYOUT_OUTLINE; bOutline = true; break;
+ case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: pNameId = STR_LAYOUT_BACKGROUNDOBJECTS; break;
+ case HID_PSEUDOSHEET_BACKGROUND: pNameId = STR_LAYOUT_BACKGROUND; break;
+ case HID_PSEUDOSHEET_NOTES: pNameId = STR_LAYOUT_NOTES; break;
default:
OSL_FAIL( "SdPage::getPresentationStyle(), illegal argument!" );
return nullptr;
}
- aStyleName += SD_RESSTR( nNameId );
- if( nNameId == STR_LAYOUT_OUTLINE )
+ aStyleName += OUString::createFromAscii(pNameId);
+ if (bOutline)
{
aStyleName += " ";
aStyleName += OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE ));
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 33c736b7162e..977038901c9a 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -42,6 +42,7 @@
#include "anminfo.hxx"
#include "strings.hrc"
+#include "strings.hxx"
#include "DrawDocShell.hxx"
#include <tools/tenccvt.hxx>
@@ -84,7 +85,7 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName,
\********************************************************************/
OUString aOldLayoutName(maLayoutName); // merken
OUStringBuffer aBuf(rLayoutName);
- aBuf.append(SD_LT_SEPARATOR).append(SdResId(STR_LAYOUT_OUTLINE).toString());
+ aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE);
maLayoutName = aBuf.makeStringAndClear();
/*********************************************************************
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 9bb4a7bad92f..64e894c97cb5 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -66,6 +66,7 @@
#include "helpids.h"
#include <svl/itemset.hxx>
#include "app.hrc"
+#include "strings.hxx"
#include <com/sun/star/drawing/LineStyle.hpp>
@@ -143,7 +144,7 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName)
{
OUString aName(rLayoutName);
aName += SD_LT_SEPARATOR;
- aName += SD_RESSTR(STR_LAYOUT_TITLE);
+ aName += STR_LAYOUT_TITLE;
SfxStyleSheetBase* pResult = Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
return pResult;
}
@@ -159,7 +160,7 @@ void SdStyleSheetPool::CreateOutlineSheetList (const OUString& rLayoutName, std:
{
OUString aName(rLayoutName);
aName += SD_LT_SEPARATOR;
- aName += SD_RESSTR(STR_LAYOUT_OUTLINE);
+ aName += STR_LAYOUT_OUTLINE;
for (sal_Int32 nSheet = 1; nSheet < 10; nSheet++)
{
@@ -207,7 +208,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
/**************************************************************************
* outline levels
**************************************************************************/
- OUString aName(SD_RESSTR(STR_LAYOUT_OUTLINE));
+ OUString aName(STR_LAYOUT_OUTLINE);
OUString aHelpFile;
SvxLRSpaceItem aSvxLRSpaceItem( EE_PARA_LRSPACE );
@@ -330,7 +331,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
/**************************************************************************
* Title
**************************************************************************/
- aName = aPrefix + SD_RESSTR(STR_LAYOUT_TITLE);
+ aName = aPrefix + STR_LAYOUT_TITLE;
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
{
@@ -376,7 +377,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
/**************************************************************************
* Subtitle
**************************************************************************/
- aName = aPrefix + SD_RESSTR(STR_LAYOUT_SUBTITLE);
+ aName = aPrefix + STR_LAYOUT_SUBTITLE;
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
{
@@ -425,7 +426,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
/**************************************************************************
* Notes
**************************************************************************/
- aName = aPrefix + SD_RESSTR(STR_LAYOUT_NOTES);
+ aName = aPrefix + STR_LAYOUT_NOTES;
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
{
@@ -470,7 +471,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
/**************************************************************************
* Background objects
**************************************************************************/
- aName = aPrefix + SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS);
+ aName = aPrefix + STR_LAYOUT_BACKGROUNDOBJECTS;
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
{
@@ -492,7 +493,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
/**************************************************************************
* Background
**************************************************************************/
- aName = aPrefix + SD_RESSTR(STR_LAYOUT_BACKGROUND);
+ aName = aPrefix + STR_LAYOUT_BACKGROUND;
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
{
@@ -796,16 +797,16 @@ void SdStyleSheetPool::CopyLayoutSheets(const OUString& rLayoutName, SdStyleShee
void SdStyleSheetPool::CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList)
{
OUString aPrefix(rLayoutName + SD_LT_SEPARATOR);
- OUString aName(SD_RESSTR(STR_LAYOUT_OUTLINE));
+ OUString aName(STR_LAYOUT_OUTLINE);
for (sal_Int32 nLevel = 1; nLevel < 10; nLevel++)
aNameList.push_back( aPrefix + aName + " " + OUString::number( nLevel ) );
- aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_TITLE) );
- aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_SUBTITLE) );
- aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_NOTES) );
- aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS) );
- aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_BACKGROUND) );
+ aNameList.push_back(aPrefix + STR_LAYOUT_TITLE);
+ aNameList.push_back(aPrefix + STR_LAYOUT_SUBTITLE);
+ aNameList.push_back(aPrefix + STR_LAYOUT_NOTES);
+ aNameList.push_back(aPrefix + STR_LAYOUT_BACKGROUNDOBJECTS);
+ aNameList.push_back(aPrefix + STR_LAYOUT_BACKGROUND);
}
/*************************************************************************
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 7dd555bf1d7c..576c17805ce9 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -48,6 +48,7 @@
#include "stlpool.hxx"
#include "glob.hrc"
#include "app.hrc"
+#include "strings.hxx"
#include "glob.hxx"
#include "helpids.h"
#include "DrawViewShell.hxx"
@@ -418,23 +419,23 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_TITLE)))
{
- aInternalName = OUString(SdResId(STR_LAYOUT_TITLE));
+ aInternalName = STR_LAYOUT_TITLE;
}
else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_SUBTITLE)))
{
- aInternalName = OUString(SdResId(STR_LAYOUT_SUBTITLE));
+ aInternalName = STR_LAYOUT_SUBTITLE;
}
else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUND)))
{
- aInternalName = OUString(SdResId(STR_LAYOUT_BACKGROUND));
+ aInternalName = STR_LAYOUT_BACKGROUND;
}
- else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS)))
+ else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS)))
{
- aInternalName = OUString(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+ aInternalName = STR_LAYOUT_BACKGROUNDOBJECTS;
}
- else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_NOTES)))
+ else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_NOTES)))
{
- aInternalName = OUString(SdResId(STR_LAYOUT_NOTES));
+ aInternalName = STR_LAYOUT_NOTES;
}
else
{
@@ -443,7 +444,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
if (nPos >= 0)
{
OUString aNumStr(aStyleName.copy(aOutlineStr.getLength()));
- aInternalName = OUString(SdResId(STR_LAYOUT_OUTLINE));
+ aInternalName = OUString(STR_LAYOUT_OUTLINE);
aInternalName += aNumStr;
}
}
@@ -479,29 +480,29 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
aStyleName = aStyleName.copy (aStyleName.indexOf(aSep) + aSep.getLength());
}
- if (aStyleName == OUString(SdResId(STR_LAYOUT_TITLE)))
+ if (aStyleName == STR_LAYOUT_TITLE)
{
aStyleName = OUString(SdResId(STR_PSEUDOSHEET_TITLE));
}
- else if (aStyleName == OUString(SdResId(STR_LAYOUT_SUBTITLE)))
+ else if (aStyleName == STR_LAYOUT_SUBTITLE)
{
aStyleName = OUString(SdResId(STR_PSEUDOSHEET_SUBTITLE));
}
- else if (aStyleName == OUString(SdResId(STR_LAYOUT_BACKGROUND)))
+ else if (aStyleName == STR_LAYOUT_BACKGROUND)
{
aStyleName = OUString(SdResId(STR_PSEUDOSHEET_BACKGROUND));
}
- else if (aStyleName == OUString(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS)))
+ else if (aStyleName == STR_LAYOUT_BACKGROUNDOBJECTS)
{
aStyleName = OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS));
}
- else if (aStyleName == OUString(SdResId(STR_LAYOUT_NOTES)))
+ else if (aStyleName == STR_LAYOUT_NOTES)
{
aStyleName = OUString(SdResId(STR_PSEUDOSHEET_NOTES));
}
else
{
- OUString aOutlineStr((SdResId(STR_LAYOUT_OUTLINE)));
+ OUString aOutlineStr(STR_LAYOUT_OUTLINE);
sal_Int32 nPos = aStyleName.indexOf(aOutlineStr);
if (nPos != -1)
{
@@ -557,7 +558,7 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems)
}
if (eFamily == SD_STYLE_FAMILY_MASTERPAGE &&
- aStyleName.indexOf(OUString(SdResId(STR_LAYOUT_OUTLINE))) != -1 &&
+ aStyleName.indexOf(STR_LAYOUT_OUTLINE) != -1 &&
rSet.GetItemState(EE_CHAR_FONTHEIGHT) == SfxItemState::SET)
{
const SfxItemSet* pCurSet = &GetItemSet();
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index ebbb9c1fc1dc..413c85ac866f 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -79,6 +79,7 @@
#include "sdpage.hxx"
#include "sdattr.hxx"
#include "glob.hrc"
+#include "strings.hxx"
#include "anminfo.hxx"
#include "imapinfo.hxx"
#include "sdresid.hxx"
@@ -363,7 +364,7 @@ HtmlExport::HtmlExport(
maTextColor(COL_BLACK),
maBackColor(COL_WHITE),
mbDocColors(false),
- maHTMLExtension(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION)),
+ maHTMLExtension(STR_HTMLEXP_DEFAULT_EXTENSION),
maIndexUrl("index"),
meScript( SCRIPT_ASP ),
maHTMLHeader(
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 1b33d23c632e..9526ab2bdf4c 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -51,6 +51,7 @@
#include "htmlpublishmode.hxx"
#include "helpids.h"
#include "buttonset.hxx"
+#include "strings.hxx"
using namespace std;
using namespace com::sun::star::uno;
@@ -425,7 +426,7 @@ SdPublishingDlg::SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType)
pPage2_ASP->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl));
pPage2_PERL->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl));
- pPage2_Index->SetText("index" + SD_RESSTR(STR_HTMLEXP_DEFAULT_EXTENSION));
+ pPage2_Index->SetText("index" STR_HTMLEXP_DEFAULT_EXTENSION);
pPage2_CGI->SetText( "/cgi-bin/" );
pPage3_Png->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4e5cb9c7180b..3e1e6c454a1a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -50,6 +50,7 @@
#include <sfx2/docinf.hxx>
#include "glob.hrc"
+#include "strings.hxx"
#include "pptin.hxx"
#include "Outliner.hxx"
#include "drawdoc.hxx"
@@ -638,7 +639,7 @@ bool ImplSdPPTImport::Import()
}
pPage->SetName( aLayoutName );
aLayoutName += SD_LT_SEPARATOR;
- aLayoutName += SD_RESSTR( STR_LAYOUT_OUTLINE );
+ aLayoutName += STR_LAYOUT_OUTLINE;
pPage->SetLayoutName( aLayoutName );
// set stylesheets
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 6545f0b80b92..7dd87b46059e 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -254,10 +254,6 @@ String STR_EXPORT_HTML_NAME
{
Text [ en-US ] = "Web Page";
};
-String STR_HTMLEXP_DEFAULT_EXTENSION
-{
- Text = ".html";
-};
String STR_UNDO_COPYOBJECTS
{
Text [ en-US ] = "Duplicate" ;
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index b81d4708b5c2..b7641aa2ea34 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -243,8 +243,7 @@ TemplateScanner::State TemplateScanner::ScanEntry()
// The following id comes from the bugdoc in #i2764#.
|| (sContentType == "Impress 2.0"))
{
- OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString(
- STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, sTitle );
+ OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString(sTitle);
mpLastAddedEntry = new TemplateEntry(sLocalisedTitle, sTargetURL);
mpTemplateDirectory->InsertEntry(mpLastAddedEntry);
}
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 533ec58df7ad..77c39845a4e4 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -39,6 +39,7 @@
#include "sdresid.hxx"
#include "glob.hrc"
+#include "strings.hxx"
#include "bulmaper.hxx"
#include "DrawDocShell.hxx"
#include <svl/aeitem.hxx>
@@ -96,7 +97,7 @@ OutlineBulletDlg::OutlineBulletDlg(
if(bOutliner)
{
SfxStyleSheetBasePool* pSSPool = pView->GetDocSh()->GetStyleSheetPool();
- OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1");
+ OUString aStyleName(STR_LAYOUT_OUTLINE " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
if( pFirstStyleSheet )
pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 604ddd093209..7b6842539fbe 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -33,7 +33,7 @@
#include "drawdoc.hxx"
#include "stlsheet.hxx"
#include "glob.hrc"
-
+#include "strings.hxx"
StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
SfxStyleSheet* pTheStyleSheet,
@@ -59,23 +59,23 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
if (nPos != -1)
aName = aName.copy(nPos + strlen(SD_LT_SEPARATOR));
- if (aName == SD_RESSTR(STR_LAYOUT_TITLE))
+ if (aName == STR_LAYOUT_TITLE)
{
aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE);
}
- else if (aName == SD_RESSTR(STR_LAYOUT_SUBTITLE))
+ else if (aName == STR_LAYOUT_SUBTITLE)
{
aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE);
}
- else if (aName == SD_RESSTR(STR_LAYOUT_BACKGROUND))
+ else if (aName == STR_LAYOUT_BACKGROUND)
{
aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND);
}
- else if (aName == SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS))
+ else if (aName == STR_LAYOUT_BACKGROUNDOBJECTS)
{
aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
}
- else if (aName == SD_RESSTR(STR_LAYOUT_NOTES))
+ else if (aName == STR_LAYOUT_NOTES)
{
aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES);
}
@@ -86,7 +86,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
if (nPos != -1)
{
OUString aNumStr(aName.copy(aOutlineStr.getLength()));
- aName = SD_RESSTR(STR_LAYOUT_OUTLINE) + aNumStr;
+ aName = STR_LAYOUT_OUTLINE + aNumStr;
}
}
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index e5ec8b91c1be..4366d5a5aa57 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -29,6 +29,7 @@
#include "app.hrc"
#include "glob.hrc"
+#include "strings.hxx"
#include "fudraw.hxx"
#include "View.hxx"
#include "Window.hxx"
@@ -316,7 +317,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
***********************************************/
OUString aName( pPage->GetLayoutName() );
sal_Int32 n = aName.indexOf(SD_LT_SEPARATOR) + strlen(SD_LT_SEPARATOR);
- aName = aName.copy(0, n) + SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS);
+ aName = aName.copy(0, n) + STR_LAYOUT_BACKGROUNDOBJECTS;
SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(pPage->GetModel()->
GetStyleSheetPool()->
Find(aName, SD_STYLE_FAMILY_MASTERPAGE));
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 81c5f6799b6b..c15d2948573b 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -26,6 +26,7 @@
#include <editeng/numitem.hxx>
#include "sdresid.hxx"
#include "glob.hrc"
+#include "strings.hxx"
#include <editeng/editdata.hxx>
#include <svx/svxids.hrc>
@@ -334,7 +335,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u
if(bOutliner)
{
SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
- OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1");
+ OUString aStyleName(STR_LAYOUT_OUTLINE " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
if( pFirstStyleSheet )
pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 683c7e58cab1..7a87b97976e8 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -29,6 +29,7 @@
#include "strings.hrc"
#include "glob.hrc"
#include "prltempl.hrc"
+#include "strings.hxx"
#include "sdresid.hxx"
#include "drawdoc.hxx"
@@ -121,12 +122,12 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
if( bPage )
{
ePO = PO_TITLE;
- aStyleName += SD_RESSTR(STR_LAYOUT_TITLE);
+ aStyleName += STR_LAYOUT_TITLE;
}
else
{
ePO = (PresentationObjects) ( PO_OUTLINE_1 + nDepth - 1 );
- aStyleName += SD_RESSTR(STR_LAYOUT_OUTLINE) + " "
+ aStyleName += STR_LAYOUT_OUTLINE " "
+ OUString::number(nDepth);
}
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 2582ab3625e2..b7efeb248c64 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -328,8 +328,6 @@
#define STR_AL_TITLE_VERT_OUTLINE (RID_APP_START+674)
#define STR_AL_TITLE_VERT_OUTLINE_CLIPART (RID_APP_START+675)
-#define STR_HTMLEXP_DEFAULT_EXTENSION (RID_APP_START+680)
-
#define STR_SET_BACKGROUND_PICTURE (RID_APP_START+681)
#define STR_DESC_RENAMESLIDE (RID_APP_START+682)
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 0bd7d4532a6c..aefeb457483a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -87,6 +87,7 @@
#include <sdpage.hxx>
#include <strings.hrc>
+#include <strings.hxx>
#include <unolayer.hxx>
#include <unoprnms.hxx>
#include <unopage.hxx>
@@ -3135,7 +3136,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
OUString aLayoutName( aPrefix );
aLayoutName += SD_LT_SEPARATOR;
- aLayoutName += SD_RESSTR(STR_LAYOUT_OUTLINE);
+ aLayoutName += STR_LAYOUT_OUTLINE;
// create styles
static_cast<SdStyleSheetPool*>(pDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix );
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 11ec2247db07..18c50b8c608d 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -69,6 +69,7 @@
#include "DrawViewShell.hxx"
#include "unoobj.hxx"
#include "res_bmp.hrc"
+#include "strings.hxx"
#include "bitmaps.hlst"
#include "unokywds.hxx"
#include "unopback.hxx"
@@ -2907,7 +2908,7 @@ void SdMasterPage::setBackground( const Any& rValue )
{
OUString aLayoutName( static_cast< SdPage* >( SvxFmDrawPage::mpPage )->GetLayoutName() );
aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)+4);
- aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
+ aLayoutName += STR_LAYOUT_BACKGROUND;
SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE );
if( pStyleSheet )
@@ -2951,7 +2952,7 @@ void SdMasterPage::getBackground( Any& rValue )
{
OUString aLayoutName( static_cast< SdPage* >(SvxFmDrawPage::mpPage)->GetLayoutName() );
aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)+4);
- aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
+ aLayoutName += STR_LAYOUT_BACKGROUND;
SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE );
if( pStyleSheet )
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index 1fd58ecdc028..380ffc4aad03 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -29,6 +29,7 @@
#include "sdxfer.hxx"
#include "sdresid.hxx"
#include "glob.hrc"
+#include "strings.hxx"
#include <svx/svdpagv.hxx>
#include <osl/mutex.hxx>
@@ -141,7 +142,7 @@ void ViewClipboard::AssignMasterPage (
// We have to remove the layout suffix from the layout name which is
// appended again by SetMasterPage() to the given name. Don't ask.
- OUString sLayoutSuffix = SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE);
+ OUString sLayoutSuffix = SD_LT_SEPARATOR STR_LAYOUT_OUTLINE;
sal_Int32 nLength = sLayoutSuffix.getLength();
OUString sLayoutName = pMasterPage->GetLayoutName();
if (sLayoutName.endsWith(sLayoutSuffix))
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index ac3176c2887f..afbb9c07e917 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -24,6 +24,7 @@
#include <svx/svdview.hxx>
#include "strings.hrc"
+#include "strings.hxx"
#include "glob.hxx"
#include "glob.hrc"
#include "app.hrc"
@@ -179,13 +180,13 @@ RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction(
void RenameLayoutTemplateUndoAction::Undo()
{
- OUString aLayoutName(maNewName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE));
+ OUString aLayoutName(maNewName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE);
mpDoc->RenameLayoutTemplate( aLayoutName, maOldName );
}
void RenameLayoutTemplateUndoAction::Redo()
{
- OUString aLayoutName(maOldName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE));
+ OUString aLayoutName(maOldName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE);
mpDoc->RenameLayoutTemplate( aLayoutName, maNewName );
}
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 2c7f16a1338d..25917474f54c 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -89,6 +89,7 @@
#include <editeng/editeng.hxx>
#include <svl/poolitem.hxx>
#include <glob.hrc>
+#include "strings.hxx"
#include "AccessibleDocumentViewBase.hxx"
using namespace ::com::sun::star;
@@ -908,7 +909,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16&
if(bOutliner)
{
SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
- OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1");
+ OUString aStyleName(STR_LAYOUT_OUTLINE " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
if( pFirstStyleSheet )
pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));
diff --git a/sfx2/inc/strings.hxx b/sfx2/inc/strings.hxx
index aa4c0c662b26..bd024c27ed90 100644
--- a/sfx2/inc/strings.hxx
+++ b/sfx2/inc/strings.hxx
@@ -12,6 +12,18 @@
#define STR_HTML_GENERATOR "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION (%1)"
+// Do not translate STR_TEMPLATE_NAME*_DEF names!!
+#define STR_TEMPLATE_NAME1_DEF "Abstract Green"
+#define STR_TEMPLATE_NAME2_DEF "Abstract Red"
+#define STR_TEMPLATE_NAME3_DEF "Abstract Yellow"
+#define STR_TEMPLATE_NAME4_DEF "Bright Blue"
+#define STR_TEMPLATE_NAME5_DEF "DNA"
+#define STR_TEMPLATE_NAME6_DEF "Inspiration"
+#define STR_TEMPLATE_NAME7_DEF "Lush Green"
+#define STR_TEMPLATE_NAME8_DEF "Metropolis"
+#define STR_TEMPLATE_NAME9_DEF "Sunset"
+#define STR_TEMPLATE_NAME10_DEF "Vintage"
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 79e2820edb80..9d9127762f3d 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -25,6 +25,7 @@
#include <svl/urihelper.hxx>
#include <tools/datetime.hxx>
#include <tools/stream.hxx>
+#include <tools/resmgr.hxx>
#include <sfx2/frmhtmlw.hxx>
#include <sfx2/evntconf.hxx>
@@ -36,6 +37,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/sfx.hrc>
#include "bastyp.hrc"
+#include "strings.hxx"
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
@@ -127,7 +129,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
}
// Who we are
- OUString sGenerator(STR_HTML_GENERATOR);
+ OUString sGenerator(ResMgr::ExpandVariables(STR_HTML_GENERATOR));
OUString os( "$_OS" );
::rtl::Bootstrap::expandMacros(os);
sGenerator = sGenerator.replaceFirst( "%1", os );
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 3e40d2c3ff36..b743ba2ecc76 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -88,6 +88,7 @@ using namespace ::ucbhelper;
#include <sfx2/sfxresid.hxx>
#include <sfx2/templatelocnames.hrc>
#include "doc.hrc"
+#include "strings.hxx"
#include <sfx2/fcontnr.hxx>
#include <svtools/templatefoldercache.hxx>
@@ -468,25 +469,32 @@ OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString
}
-/** Convert a resource string - a template name - to its localised pair if it exists.
- @param nSourceResIds
- Resource ID where the list of original en-US template names begin.
- @param nDestResIds
- Resource ID where the list of localised template names begin.
- @param nCount
- The number of names that have been localised.
+/** Convert a template name to its localised pair if it exists.
@param rString
Name to be translated.
@return
The localised pair of rString or rString if the former does not exist.
*/
-OUString SfxDocumentTemplates::ConvertResourceString (
- int nSourceResIds, int nDestResIds, int nCount, const OUString& rString )
+OUString SfxDocumentTemplates::ConvertResourceString(const OUString& rString)
{
- for( int i = 0; i < nCount; ++i )
+ static const OUStringLiteral aTemplateNames[] =
{
- if( rString == SFX2_RESSTR(nSourceResIds + i))
- return SFX2_RESSTR(nDestResIds + i);
+ STR_TEMPLATE_NAME1_DEF,
+ STR_TEMPLATE_NAME2_DEF,
+ STR_TEMPLATE_NAME3_DEF,
+ STR_TEMPLATE_NAME4_DEF,
+ STR_TEMPLATE_NAME5_DEF,
+ STR_TEMPLATE_NAME6_DEF,
+ STR_TEMPLATE_NAME7_DEF,
+ STR_TEMPLATE_NAME8_DEF,
+ STR_TEMPLATE_NAME9_DEF,
+ STR_TEMPLATE_NAME10_DEF
+ };
+
+ for (int i = 0; i < NUM_TEMPLATE_NAMES; ++i)
+ {
+ if (rString == aTemplateNames[i])
+ return SFX2_RESSTR(STR_TEMPLATE_NAME1 + i);
}
return rString;
}
@@ -1202,13 +1210,11 @@ void SfxDocumentTemplates::ReInitFromComponent()
pImp->ReInitFromComponent();
}
-
DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent,
const OUString& rTitle )
{
mpParent = pParent;
- maTitle = SfxDocumentTemplates::ConvertResourceString(
- STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, rTitle );
+ maTitle = SfxDocumentTemplates::ConvertResourceString(rTitle);
}
diff --git a/sfx2/source/doc/templatelocnames.src b/sfx2/source/doc/templatelocnames.src
index a4a313508a38..06c1ec53b76a 100644
--- a/sfx2/source/doc/templatelocnames.src
+++ b/sfx2/source/doc/templatelocnames.src
@@ -9,57 +9,6 @@
#include <sfx2/templatelocnames.hrc>
-// Do not translate STR_TEMPLATE_NAME*_DEF names!!
-String STR_TEMPLATE_NAME1_DEF
-{
- Text = "Abstract Green" ;
-};
-
-String STR_TEMPLATE_NAME2_DEF
-{
- Text = "Abstract Red" ;
-};
-
-String STR_TEMPLATE_NAME3_DEF
-{
- Text = "Abstract Yellow" ;
-};
-
-String STR_TEMPLATE_NAME4_DEF
-{
- Text = "Bright Blue" ;
-};
-
-String STR_TEMPLATE_NAME5_DEF
-{
- Text = "DNA" ;
-};
-
-String STR_TEMPLATE_NAME6_DEF
-{
- Text = "Inspiration" ;
-};
-
-String STR_TEMPLATE_NAME7_DEF
-{
- Text = "Lush Green" ;
-};
-
-String STR_TEMPLATE_NAME8_DEF
-{
- Text = "Metropolis" ;
-};
-
-String STR_TEMPLATE_NAME9_DEF
-{
- Text = "Sunset" ;
-};
-
-String STR_TEMPLATE_NAME10_DEF
-{
- Text = "Vintage" ;
-};
-
String STR_TEMPLATE_NAME1
{
Text [ en-US ] = "Abstract Green" ;
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index a7a43a1d11f4..5c16ce50f210 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -75,15 +75,15 @@ class SmElementsControl : public Control
friend class ElementSelectorUIObject;
friend class ElementUIObject;
- static const sal_uInt16 aUnaryBinaryOperatorsList[][2];
- static const sal_uInt16 aRelationsList[][2];
- static const sal_uInt16 aSetOperations[][2];
- static const sal_uInt16 aFunctions[][2];
- static const sal_uInt16 aOperators[][2];
- static const sal_uInt16 aAttributes[][2];
- static const sal_uInt16 aBrackets[][2];
- static const sal_uInt16 aFormats[][2];
- static const sal_uInt16 aOthers[][2];
+ static const std::pair<const char*, sal_uInt16> aUnaryBinaryOperatorsList[];
+ static const std::pair<const char*, sal_uInt16> aRelationsList[];
+ static const std::pair<const char*, sal_uInt16> aSetOperations[];
+ static const std::pair<const char*, sal_uInt16> aFunctions[];
+ static const std::pair<const char*, sal_uInt16> aOperators[];
+ static const std::pair<const char*, sal_uInt16> aAttributes[];
+ static const std::pair<const char*, sal_uInt16> aBrackets[];
+ static const std::pair<const char*, sal_uInt16> aFormats[];
+ static const std::pair<const char*, sal_uInt16> aOthers[];
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
@@ -103,7 +103,7 @@ class SmElementsControl : public Control
void addElement(const OUString& aElementVisual, const OUString& aElementSource, const OUString& aHelpText);
- void addElements(const sal_uInt16 aElementsArray[][2], sal_uInt16 size);
+ void addElements(const std::pair<const char*, sal_uInt16> aElementsArray[], sal_uInt16 size);
void build();
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index c499b2a1de7d..f35011a31c42 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -106,9 +106,6 @@ public:
/** Insert an element into the formula */
void InsertElement(SmFormulaElement element);
- /** Insert a command specified in commands.src*/
- void InsertCommand(sal_uInt16 nCommand);
-
/** Insert command text translated into line entries at position
*
* Note: This method uses the parser to translate a command text into a
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 6f1aa1ae7f15..2dea051045ed 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -110,7 +110,6 @@ public:
void Delete();
void SelectAll();
void InsertText(const OUString& rText);
- void InsertCommand(sal_uInt16 nCommand);
void MarkError(const Point &rPos);
void SelNextMark();
void SelPrevMark();
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 7ee87be44222..5ec6852f5ef8 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -47,8 +47,7 @@
#define SID_GAPHIC_SM (SID_SMA_START + 101)
/** Command for inserting a symbol specified by a string (Inserts an SmSpecialNode) */
#define SID_INSERTSYMBOL (SID_SMA_START + 104)
-/** Command for inserting a math construction specified in commands.src */
-#define SID_INSERTCOMMAND (SID_SMA_START + 105)
+/** Command for inserting a math construction */
#define SID_INSERTCOMMANDTEXT (SID_SMA_START + 106)
#define SID_LOADSYMBOLS (SID_SMA_START + 107)
@@ -85,7 +84,6 @@
#define RID_MATH_TOOLBOX (RID_APP_START + 50)
-#define RID_UNDOFORMATNAME (RID_APP_START + 504)
#define RID_FONTREGULAR (RID_APP_START + 804)
#define RID_FONTITALIC (RID_APP_START + 805)
#define RID_FONTBOLD (RID_APP_START + 806)
@@ -135,68 +133,6 @@
// blank: 934 - 935
#define RID_ERR_RIGHTEXPECTED (RID_APP_START + 936)
-// new resource ID's
-#define RID_PLUSX (RID_APP_START + 1201)
-#define RID_MINUSX (RID_APP_START + 1202)
-#define RID_PLUSMINUSX (RID_APP_START + 1203)
-#define RID_MINUSPLUSX (RID_APP_START + 1204)
-#define RID_XPLUSY (RID_APP_START + 1205)
-#define RID_XCDOTY (RID_APP_START + 1206)
-#define RID_XTIMESY (RID_APP_START + 1207)
-#define RID_XSYMTIMESY (RID_APP_START + 1208)
-#define RID_XMINUSY (RID_APP_START + 1209)
-#define RID_XOVERY (RID_APP_START + 1210)
-#define RID_XDIVY (RID_APP_START + 1211)
-#define RID_XSYMDIVIDEY (RID_APP_START + 1212)
-#define RID_NEGX (RID_APP_START + 1213)
-#define RID_XANDY (RID_APP_START + 1214)
-#define RID_XORY (RID_APP_START + 1215)
-#define RID_XODIVIDEY (RID_APP_START + 1216)
-#define RID_XODOTY (RID_APP_START + 1217)
-#define RID_XOMINUSY (RID_APP_START + 1218)
-#define RID_XOPLUSY (RID_APP_START + 1219)
-#define RID_XOTIMESY (RID_APP_START + 1220)
-#define RID_XCIRCY (RID_APP_START + 1221)
-#define RID_XWIDESLASHY (RID_APP_START + 1222)
-#define RID_XWIDEBSLASHY (RID_APP_START + 1223)
-
-#define RID_XEQY (RID_APP_START + 1301)
-#define RID_XNEQY (RID_APP_START + 1302)
-#define RID_XEQUIVY (RID_APP_START + 1303)
-#define RID_XORTHOY (RID_APP_START + 1304)
-#define RID_XLTY (RID_APP_START + 1305)
-#define RID_XGTY (RID_APP_START + 1306)
-#define RID_XAPPROXY (RID_APP_START + 1307)
-#define RID_XPARALLELY (RID_APP_START + 1308)
-#define RID_XLESLANTY (RID_APP_START + 1309)
-#define RID_XGESLANTY (RID_APP_START + 1310)
-#define RID_XSIMEQY (RID_APP_START + 1311)
-#define RID_XPROPY (RID_APP_START + 1312)
-#define RID_XLEY (RID_APP_START + 1313)
-#define RID_XGEY (RID_APP_START + 1314)
-#define RID_XSIMY (RID_APP_START + 1315)
-#define RID_XTOWARDY (RID_APP_START + 1316)
-#define RID_XLLY (RID_APP_START + 1317)
-#define RID_XGGY (RID_APP_START + 1318)
-#define RID_XDEFY (RID_APP_START + 1319)
-#define RID_XTRANSLY (RID_APP_START + 1320)
-#define RID_XTRANSRY (RID_APP_START + 1321)
-#define RID_XDIVIDESY (RID_APP_START + 1322)
-#define RID_XNDIVIDESY (RID_APP_START + 1323)
-#define RID_DLARROW (RID_APP_START + 1324)
-#define RID_DLRARROW (RID_APP_START + 1325)
-#define RID_DRARROW (RID_APP_START + 1326)
-
-// Game theory
-#define RID_XPRECEDESY (RID_APP_START + 1327)
-#define RID_XNOTPRECEDESY (RID_APP_START + 1328)
-#define RID_XSUCCEEDSY (RID_APP_START + 1329)
-#define RID_XNOTSUCCEEDSY (RID_APP_START + 1330)
-#define RID_XPRECEDESEQUALY (RID_APP_START + 1331)
-#define RID_XSUCCEEDSEQUALY (RID_APP_START + 1332)
-#define RID_XPRECEDESEQUIVY (RID_APP_START + 1333)
-#define RID_XSUCCEEDSEQUIVY (RID_APP_START + 1334)
-
// Help text
#define RID_PLUSX_HELP (RID_APP_START + 1335)
#define RID_MINUSX_HELP (RID_APP_START + 1336)
@@ -256,211 +192,6 @@
#define RID_NOTEXISTS_HELP (RID_APP_START + 1399)
#define RID_FORALL_HELP (RID_APP_START + 1400)
-#define RID_XINY (RID_APP_START + 1401)
-#define RID_XNOTINY (RID_APP_START + 1402)
-#define RID_XOWNSY (RID_APP_START + 1403)
-#define RID_XINTERSECTIONY (RID_APP_START + 1405)
-#define RID_XUNIONY (RID_APP_START + 1406)
-#define RID_XSETMINUSY (RID_APP_START + 1407)
-#define RID_XSLASHY (RID_APP_START + 1408)
-#define RID_XSUBSETY (RID_APP_START + 1409)
-#define RID_XSUBSETEQY (RID_APP_START + 1410)
-#define RID_XSUPSETY (RID_APP_START + 1411)
-#define RID_XSUPSETEQY (RID_APP_START + 1412)
-#define RID_XNSUBSETY (RID_APP_START + 1413)
-#define RID_XNSUBSETEQY (RID_APP_START + 1414)
-#define RID_XNSUPSETY (RID_APP_START + 1415)
-#define RID_XNSUPSETEQY (RID_APP_START + 1416)
-#define RID_SETN (RID_APP_START + 1417)
-#define RID_SETZ (RID_APP_START + 1418)
-#define RID_SETQ (RID_APP_START + 1419)
-#define RID_SETR (RID_APP_START + 1420)
-#define RID_SETC (RID_APP_START + 1421)
-
-#define RID_ABSX (RID_APP_START + 1501)
-#define RID_FACTX (RID_APP_START + 1502)
-#define RID_SQRTX (RID_APP_START + 1503)
-#define RID_NROOTXY (RID_APP_START + 1504)
-#define RID_EX (RID_APP_START + 1505)
-#define RID_LNX (RID_APP_START + 1506)
-#define RID_EXPX (RID_APP_START + 1507)
-#define RID_LOGX (RID_APP_START + 1508)
-#define RID_SINX (RID_APP_START + 1509)
-#define RID_COSX (RID_APP_START + 1510)
-#define RID_TANX (RID_APP_START + 1511)
-#define RID_COTX (RID_APP_START + 1512)
-#define RID_SINHX (RID_APP_START + 1513)
-#define RID_COSHX (RID_APP_START + 1514)
-#define RID_TANHX (RID_APP_START + 1515)
-#define RID_COTHX (RID_APP_START + 1516)
-#define RID_ARCSINX (RID_APP_START + 1517)
-#define RID_ARCCOSX (RID_APP_START + 1518)
-#define RID_ARCTANX (RID_APP_START + 1519)
-#define RID_ARCCOTX (RID_APP_START + 1520)
-#define RID_ARSINHX (RID_APP_START + 1521)
-#define RID_ARCOSHX (RID_APP_START + 1522)
-#define RID_ARTANHX (RID_APP_START + 1523)
-#define RID_ARCOTHX (RID_APP_START + 1524)
-
-#define RID_LIMX (RID_APP_START + 1601)
-#define RID_SUMX (RID_APP_START + 1602)
-#define RID_PRODX (RID_APP_START + 1603)
-#define RID_COPRODX (RID_APP_START + 1604)
-#define RID_INTX (RID_APP_START + 1605)
-#define RID_IINTX (RID_APP_START + 1606)
-#define RID_IIINTX (RID_APP_START + 1607)
-#define RID_LINTX (RID_APP_START + 1609)
-#define RID_LLINTX (RID_APP_START + 1610)
-#define RID_LLLINTX (RID_APP_START + 1611)
-#define RID_FROMXTOY (RID_APP_START + 1613)
-#define RID_FROMX (RID_APP_START + 1614)
-#define RID_TOX (RID_APP_START + 1615)
-#define RID_LIMINFX (RID_APP_START + 1616)
-#define RID_LIMSUPX (RID_APP_START + 1617)
-
-#define RID_LIM_FROMX (RID_APP_START + 1621)
-#define RID_SUM_FROMX (RID_APP_START + 1622)
-#define RID_PROD_FROMX (RID_APP_START + 1623)
-#define RID_COPROD_FROMX (RID_APP_START + 1624)
-#define RID_INT_FROMX (RID_APP_START + 1625)
-#define RID_IINT_FROMX (RID_APP_START + 1626)
-#define RID_IIINT_FROMX (RID_APP_START + 1627)
-#define RID_LINT_FROMX (RID_APP_START + 1629)
-#define RID_LLINT_FROMX (RID_APP_START + 1630)
-#define RID_LLLINT_FROMX (RID_APP_START + 1631)
-#define RID_LIMINF_FROMX (RID_APP_START + 1632)
-#define RID_LIMSUP_FROMX (RID_APP_START + 1633)
-
-#define RID_LIM_TOX (RID_APP_START + 1641)
-#define RID_SUM_TOX (RID_APP_START + 1642)
-#define RID_PROD_TOX (RID_APP_START + 1643)
-#define RID_COPROD_TOX (RID_APP_START + 1644)
-#define RID_INT_TOX (RID_APP_START + 1645)
-#define RID_IINT_TOX (RID_APP_START + 1646)
-#define RID_IIINT_TOX (RID_APP_START + 1647)
-#define RID_LINT_TOX (RID_APP_START + 1649)
-#define RID_LLINT_TOX (RID_APP_START + 1650)
-#define RID_LLLINT_TOX (RID_APP_START + 1651)
-#define RID_LIMINF_TOX (RID_APP_START + 1652)
-#define RID_LIMSUP_TOX (RID_APP_START + 1653)
-
-#define RID_LIM_FROMTOX (RID_APP_START + 1661)
-#define RID_SUM_FROMTOX (RID_APP_START + 1662)
-#define RID_PROD_FROMTOX (RID_APP_START + 1663)
-#define RID_COPROD_FROMTOX (RID_APP_START + 1664)
-#define RID_INT_FROMTOX (RID_APP_START + 1665)
-#define RID_IINT_FROMTOX (RID_APP_START + 1666)
-#define RID_IIINT_FROMTOX (RID_APP_START + 1667)
-#define RID_LINT_FROMTOX (RID_APP_START + 1669)
-#define RID_LLINT_FROMTOX (RID_APP_START + 1670)
-#define RID_LLLINT_FROMTOX (RID_APP_START + 1671)
-#define RID_LIMINF_FROMTOX (RID_APP_START + 1672)
-#define RID_LIMSUP_FROMTOX (RID_APP_START + 1673)
-
-#define RID_ACUTEX (RID_APP_START + 1701)
-#define RID_GRAVEX (RID_APP_START + 1702)
-#define RID_CHECKX (RID_APP_START + 1703)
-#define RID_BREVEX (RID_APP_START + 1704)
-#define RID_BARX (RID_APP_START + 1705)
-#define RID_VECX (RID_APP_START + 1706)
-#define RID_HATX (RID_APP_START + 1707)
-#define RID_TILDEX (RID_APP_START + 1708)
-#define RID_CIRCLEX (RID_APP_START + 1709)
-#define RID_DOTX (RID_APP_START + 1710)
-#define RID_DDOTX (RID_APP_START + 1711)
-#define RID_DDDOTX (RID_APP_START + 1712)
-#define RID_OVERLINEX (RID_APP_START + 1713)
-#define RID_UNDERLINEX (RID_APP_START + 1714)
-#define RID_OVERSTRIKEX (RID_APP_START + 1715)
-#define RID_PHANTOMX (RID_APP_START + 1716)
-#define RID_BOLDX (RID_APP_START + 1717)
-#define RID_ITALX (RID_APP_START + 1718)
-#define RID_SIZEXY (RID_APP_START + 1719)
-#define RID_FONTXY (RID_APP_START + 1720)
-#define RID_WIDEHATX (RID_APP_START + 1722)
-#define RID_WIDETILDEX (RID_APP_START + 1723)
-#define RID_WIDEVECX (RID_APP_START + 1724)
-#define RID_COLORX_BLACK (RID_APP_START + 1725)
-#define RID_COLORX_BLUE (RID_APP_START + 1726)
-#define RID_COLORX_GREEN (RID_APP_START + 1727)
-#define RID_COLORX_RED (RID_APP_START + 1728)
-#define RID_COLORX_CYAN (RID_APP_START + 1729)
-#define RID_COLORX_MAGENTA (RID_APP_START + 1730)
-#define RID_COLORX_YELLOW (RID_APP_START + 1731)
-#define RID_COLORX_GRAY (RID_APP_START + 1734)
-#define RID_COLORX_LIME (RID_APP_START + 1735)
-#define RID_COLORX_MAROON (RID_APP_START + 1736)
-#define RID_COLORX_NAVY (RID_APP_START + 1737)
-#define RID_COLORX_OLIVE (RID_APP_START + 1738)
-#define RID_COLORX_PURPLE (RID_APP_START + 1739)
-#define RID_COLORX_SILVER (RID_APP_START + 1740)
-#define RID_COLORX_TEAL (RID_APP_START + 1741)
-
-#define RID_LRPARENTX (RID_APP_START + 1801)
-#define RID_LRBRACKETX (RID_APP_START + 1802)
-#define RID_LRANGLEX (RID_APP_START + 1803)
-#define RID_LRBRACEX (RID_APP_START + 1804)
-#define RID_LRLINEX (RID_APP_START + 1805)
-#define RID_LRDLINEX (RID_APP_START + 1806)
-#define RID_LRGROUPX (RID_APP_START + 1808)
-#define RID_SLRPARENTX (RID_APP_START + 1809)
-#define RID_SLRBRACKETX (RID_APP_START + 1810)
-#define RID_SLRANGLEX (RID_APP_START + 1811)
-#define RID_SLRBRACEX (RID_APP_START + 1812)
-#define RID_SLRLINEX (RID_APP_START + 1813)
-#define RID_SLRDLINEX (RID_APP_START + 1814)
-#define RID_LRCEILX (RID_APP_START + 1817)
-#define RID_LRFLOORX (RID_APP_START + 1818)
-#define RID_SLRCEILX (RID_APP_START + 1819)
-#define RID_SLRFLOORX (RID_APP_START + 1820)
-#define RID_LMRANGLEXY (RID_APP_START + 1821)
-#define RID_SLMRANGLEXY (RID_APP_START + 1822)
-#define RID_LRDBRACKETX (RID_APP_START + 1823)
-#define RID_SLRDBRACKETX (RID_APP_START + 1824)
-#define RID_XOVERBRACEY (RID_APP_START + 1825)
-#define RID_XUNDERBRACEY (RID_APP_START + 1826)
-#define RID_XEVALUATEDATY (RID_APP_START + 1827)
-
-#define RID_NEWLINE (RID_APP_START + 1901)
-#define RID_SBLANK (RID_APP_START + 1902)
-#define RID_BLANK (RID_APP_START + 1903)
-#define RID_RSUBX (RID_APP_START + 1904)
-#define RID_BINOMXY (RID_APP_START + 1905)
-#define RID_STACK (RID_APP_START + 1906)
-#define RID_MATRIX (RID_APP_START + 1907)
-#define RID_RSUPX (RID_APP_START + 1908)
-#define RID_ALIGNLX (RID_APP_START + 1909)
-#define RID_ALIGNCX (RID_APP_START + 1910)
-#define RID_ALIGNRX (RID_APP_START + 1911)
-#define RID_LSUBX (RID_APP_START + 1912)
-#define RID_LSUPX (RID_APP_START + 1916)
-#define RID_CSUBX (RID_APP_START + 1917)
-#define RID_CSUPX (RID_APP_START + 1918)
-#define RID_NOSPACE (RID_APP_START + 1919)
-
-#define RID_ALEPH (RID_APP_START + 2001)
-#define RID_EMPTYSET (RID_APP_START + 2002)
-#define RID_RE (RID_APP_START + 2003)
-#define RID_IM (RID_APP_START + 2004)
-#define RID_INFINITY (RID_APP_START + 2005)
-#define RID_PARTIAL (RID_APP_START + 2006)
-#define RID_WP (RID_APP_START + 2007)
-#define RID_DOTSAXIS (RID_APP_START + 2008)
-#define RID_DOTSUP (RID_APP_START + 2009)
-#define RID_DOTSDOWN (RID_APP_START + 2010)
-#define RID_DOTSLOW (RID_APP_START + 2011)
-#define RID_DOTSVERT (RID_APP_START + 2012)
-#define RID_NABLA (RID_APP_START + 2013)
-#define RID_HBAR (RID_APP_START + 2014)
-#define RID_LAMBDABAR (RID_APP_START + 2015)
-#define RID_LEFTARROW (RID_APP_START + 2016)
-#define RID_RIGHTARROW (RID_APP_START + 2017)
-#define RID_UPARROW (RID_APP_START + 2018)
-#define RID_DOWNARROW (RID_APP_START + 2019)
-#define RID_EXISTS (RID_APP_START + 1608)
-#define RID_NOTEXISTS (RID_APP_START + 1618)
-#define RID_FORALL (RID_APP_START + 1612)
-
#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102)
#define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103)
#define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105)
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
new file mode 100644
index 000000000000..477671bcba6c
--- /dev/null
+++ b/starmath/inc/strings.hxx
@@ -0,0 +1,272 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_STARMATH_INC_STRINGS_HXX
+#define INCLUDED_STARMATH_INC_STRINGS_HXX
+
+#define RID_UNDOFORMATNAME "Format"
+
+#define RID_PLUSX "+<?> "
+#define RID_MINUSX "-<?> "
+#define RID_PLUSMINUSX "+-<?> "
+#define RID_MINUSPLUSX "-+<?> "
+#define RID_NEGX "neg <?> "
+#define RID_XPLUSY "<?> + <?> "
+#define RID_XMINUSY "<?> - <?> "
+#define RID_XCDOTY "<?> cdot <?> "
+#define RID_XTIMESY "<?> times <?> "
+#define RID_XSYMTIMESY "<?> * <?> "
+#define RID_XSYMDIVIDEY "<?> / <?> "
+#define RID_XDIVY "<?> div <?> "
+#define RID_XOVERY "{<?>} over {<?>} "
+#define RID_XODIVIDEY "<?> odivide <?> "
+#define RID_XODOTY "<?> odot <?> "
+#define RID_XOMINUSY "<?> ominus <?> "
+#define RID_XOPLUSY "<?> oplus <?> "
+#define RID_XOTIMESY "<?> otimes <?> "
+#define RID_XANDY "<?> and <?> "
+#define RID_XORY "<?> or <?> "
+#define RID_XEQY "<?> = <?> "
+#define RID_XNEQY "<?> <> <?> "
+#define RID_XLTY "<?> < <?> "
+#define RID_XGTY "<?> > <?> "
+#define RID_XLEY "<?> <= <?> "
+#define RID_XGEY "<?> >= <?> "
+#define RID_XLESLANTY "<?> leslant <?> "
+#define RID_XGESLANTY "<?> geslant <?> "
+#define RID_XLLY "<?> << <?> "
+#define RID_XGGY "<?> >> <?> "
+#define RID_XDEFY "<?> def <?> "
+#define RID_XEQUIVY "<?> equiv <?> "
+#define RID_XAPPROXY "<?> approx <?> "
+#define RID_XSIMY "<?> sim <?> "
+#define RID_XSIMEQY "<?> simeq <?> "
+#define RID_XPROPY "<?> prop <?> "
+#define RID_XORTHOY "<?> ortho <?> "
+#define RID_XPARALLELY "<?> parallel <?> "
+#define RID_XTOWARDY "<?> toward <?> "
+#define RID_XTRANSLY "<?> transl <?> "
+#define RID_XTRANSRY "<?> transr <?> "
+#define RID_XINY "<?> in <?> "
+#define RID_XNOTINY "<?> notin <?> "
+#define RID_XOWNSY "<?> owns <?> "
+#define RID_XUNIONY "<?> union <?> "
+#define RID_XINTERSECTIONY "<?> intersection <?> "
+#define RID_XSETMINUSY "<?> setminus <?> "
+#define RID_XSLASHY "<?> slash <?> "
+#define RID_XSUBSETY "<?> subset <?> "
+#define RID_XSUBSETEQY "<?> subseteq <?> "
+#define RID_XSUPSETY "<?> supset <?> "
+#define RID_XSUPSETEQY "<?> supseteq <?> "
+#define RID_XNSUBSETY "<?> nsubset <?> "
+#define RID_XNSUBSETEQY "<?> nsubseteq <?> "
+#define RID_XNSUPSETY "<?> nsupset <?> "
+#define RID_XNSUPSETEQY "<?> nsupseteq <?> "
+#define RID_ABSX "abs{<?>} "
+#define RID_FACTX "fact{<?>} "
+#define RID_SQRTX "sqrt{<?>} "
+#define RID_NROOTXY "nroot{<?>}{<?>} "
+#define RID_EX "func e^{<?>} "
+#define RID_EXPX "exp(<?>) "
+#define RID_LNX "ln(<?>) "
+#define RID_LOGX "log(<?>) "
+#define RID_SINX "sin(<?>) "
+#define RID_COSX "cos(<?>) "
+#define RID_TANX "tan(<?>) "
+#define RID_COTX "cot(<?>) "
+#define RID_ARCSINX "arcsin(<?>) "
+#define RID_ARCCOSX "arccos(<?>) "
+#define RID_ARCTANX "arctan(<?>) "
+#define RID_ARCCOTX "arccot(<?>) "
+#define RID_SINHX "sinh(<?>) "
+#define RID_COSHX "cosh(<?>) "
+#define RID_TANHX "tanh(<?>) "
+#define RID_COTHX "coth(<?>) "
+#define RID_ARSINHX "arsinh(<?>) "
+#define RID_ARCOSHX "arcosh(<?>) "
+#define RID_ARTANHX "artanh(<?>) "
+#define RID_ARCOTHX "arcoth(<?>) "
+#define RID_SUMX "sum <?> "
+#define RID_SUM_FROMX "sum from{<?>} <?> "
+#define RID_SUM_TOX "sum to{<?>} <?> "
+#define RID_SUM_FROMTOX "sum from{<?>} to{<?>} <?> "
+#define RID_PRODX "prod <?> "
+#define RID_PROD_FROMX "prod from{<?>} <?> "
+#define RID_PROD_TOX "prod to{<?>} <?> "
+#define RID_PROD_FROMTOX "prod from{<?>} to{<?>} <?> "
+#define RID_COPRODX "coprod <?> "
+#define RID_COPROD_FROMX "coprod from{<?>} <?> "
+#define RID_COPROD_TOX "coprod to{<?>} <?> "
+#define RID_COPROD_FROMTOX "coprod from{<?>} to{<?>} <?> "
+#define RID_LIMX "lim <?> "
+#define RID_LIM_FROMX "lim from{<?>} <?> "
+#define RID_LIM_TOX "lim to{<?>} <?> "
+#define RID_LIM_FROMTOX "lim from{<?>} to{<?>} <?> "
+#define RID_LIMINFX "liminf <?> "
+#define RID_LIMINF_FROMX "liminf from{<?>} <?> "
+#define RID_LIMINF_TOX "liminf to{<?>} <?> "
+#define RID_LIMINF_FROMTOX "liminf from{<?>} to{<?>} <?> "
+#define RID_LIMSUPX "limsup <?> "
+#define RID_LIMSUP_FROMX "limsup from{<?>} <?> "
+#define RID_LIMSUP_TOX "limsup to{<?>} <?> "
+#define RID_LIMSUP_FROMTOX "limsup from{<?>} to{<?>} <?> "
+#define RID_EXISTS "exists "
+#define RID_NOTEXISTS "notexists "
+#define RID_FORALL "forall "
+#define RID_INTX "int <?> "
+#define RID_INT_FROMX "int from{<?>} <?> "
+#define RID_INT_TOX "int to{<?>} <?> "
+#define RID_INT_FROMTOX "int from{<?>} to{<?>} <?> "
+#define RID_IINTX "iint <?> "
+#define RID_IINT_FROMX "iint from{<?>} <?> "
+#define RID_IINT_TOX "iint to{<?>} <?> "
+#define RID_IINT_FROMTOX "iint from{<?>} to{<?>} <?> "
+#define RID_IIINTX "iiint <?> "
+#define RID_IIINT_FROMX "iiint from{<?>} <?> "
+#define RID_IIINT_TOX "iiint to{<?>} <?> "
+#define RID_IIINT_FROMTOX "iiint from{<?>} to{<?>} <?> "
+#define RID_LINTX "lint <?> "
+#define RID_LINT_FROMX "lint from{<?>} <?> "
+#define RID_LINT_TOX "lint to{<?>} <?> "
+#define RID_LINT_FROMTOX "lint from{<?>} to{<?>} <?> "
+#define RID_LLINTX "llint <?> "
+#define RID_LLINT_FROMX "llint from{<?>} <?> "
+#define RID_LLINT_TOX "llint to{<?>} <?> "
+#define RID_LLINT_FROMTOX "llint from{<?>} to{<?>} <?> "
+#define RID_LLLINTX "lllint <?> "
+#define RID_LLLINT_FROMX "lllint from{<?>} <?> "
+#define RID_LLLINT_TOX "lllint to{<?>} <?> "
+#define RID_LLLINT_FROMTOX "lllint from{<?>} to{<?>} <?> "
+#define RID_FROMX "from{<?>} <?> "
+#define RID_TOX "to{<?>} <?> "
+#define RID_FROMXTOY "from{<?>} to{<?>} <?> "
+#define RID_ACUTEX "acute <?> "
+#define RID_BARX "bar <?> "
+#define RID_BREVEX "breve <?> "
+#define RID_CHECKX "check <?> "
+#define RID_CIRCLEX "circle <?> "
+#define RID_DOTX "dot <?> "
+#define RID_DDOTX "ddot <?> "
+#define RID_DDDOTX "dddot <?> "
+#define RID_GRAVEX "grave <?> "
+#define RID_HATX "hat <?> "
+#define RID_TILDEX "tilde <?> "
+#define RID_VECX "vec <?> "
+#define RID_UNDERLINEX "underline {<?>} "
+#define RID_OVERLINEX "overline {<?>} "
+#define RID_OVERSTRIKEX "overstrike {<?>} "
+#define RID_PHANTOMX "phantom {<?>} "
+#define RID_BOLDX "bold <?> "
+#define RID_ITALX "ital <?> "
+#define RID_SIZEXY "size <?> {<?>} "
+#define RID_FONTXY "font <?> {<?>} "
+#define RID_COLORX_BLACK "color black {<?>} "
+#define RID_COLORX_BLUE "color blue {<?>} "
+#define RID_COLORX_GREEN "color green {<?>} "
+#define RID_COLORX_RED "color red {<?>} "
+#define RID_COLORX_CYAN "color cyan {<?>} "
+#define RID_COLORX_MAGENTA "color magenta {<?>} "
+#define RID_COLORX_GRAY "color gray {<?>} "
+#define RID_COLORX_LIME "color lime {<?>} "
+#define RID_COLORX_MAROON "color maroon {<?>} "
+#define RID_COLORX_NAVY "color navy {<?>} "
+#define RID_COLORX_OLIVE "color olive {<?>} "
+#define RID_COLORX_PURPLE "color purple {<?>} "
+#define RID_COLORX_SILVER "color silver {<?>} "
+#define RID_COLORX_TEAL "color teal {<?>} "
+#define RID_COLORX_YELLOW "color yellow {<?>} "
+#define RID_LRGROUPX "{<?>} "
+#define RID_LRPARENTX "(<?>) "
+#define RID_LRBRACKETX "[<?>] "
+#define RID_LRDBRACKETX "ldbracket <?> rdbracket "
+#define RID_LRBRACEX "lbrace <?> rbrace "
+#define RID_LRANGLEX "langle <?> rangle "
+#define RID_LRCEILX "lceil <?> rceil "
+#define RID_LRFLOORX "lfloor <?> rfloor "
+#define RID_LRLINEX "lline <?> rline "
+#define RID_LRDLINEX "ldline <?> rdline "
+#define RID_LMRANGLEXY "langle <?> mline <?> rangle "
+#define RID_SLRPARENTX "left ( <?> right ) "
+#define RID_SLRBRACKETX "left [ <?> right ] "
+#define RID_SLRDBRACKETX "left ldbracket <?> right rdbracket "
+#define RID_SLRBRACEX "left lbrace <?> right rbrace "
+#define RID_SLRANGLEX "left langle <?> right rangle "
+#define RID_SLRCEILX "left lceil <?> right rceil "
+#define RID_SLRFLOORX "left lfloor <?> right rfloor "
+#define RID_SLRLINEX "left lline <?> right rline "
+#define RID_SLRDLINEX "left ldline <?> right rdline "
+#define RID_SLMRANGLEXY "left langle <?> mline <?> right rangle "
+#define RID_XEVALUATEDATY "left none {<?>} right rline_{<?>} "
+#define RID_XOVERBRACEY "{<?>} overbrace {<?>} "
+#define RID_XUNDERBRACEY "{<?>} underbrace {<?>} "
+#define RID_RSUBX "<?>_{<?>}"
+#define RID_RSUPX "<?>^{<?>}"
+#define RID_LSUBX "<?> lsub{<?>} "
+#define RID_LSUPX "<?> lsup{<?>} "
+#define RID_CSUBX "<?> csub{<?>} "
+#define RID_CSUPX "<?> csup{<?>} "
+#define RID_SBLANK "`"
+#define RID_BLANK "~"
+#define RID_NEWLINE "newline "
+#define RID_BINOMXY "binom{<?>}{<?>} "
+#define RID_STACK "stack{<?> # <?> # <?>} "
+#define RID_MATRIX "matrix{<?> # <?> ## <?> # <?>} "
+#define RID_ALIGNLX "alignl <?> "
+#define RID_ALIGNCX "alignc <?> "
+#define RID_ALIGNRX "alignr <?> "
+#define RID_ALEPH "aleph "
+#define RID_EMPTYSET "emptyset "
+#define RID_RE "Re "
+#define RID_IM "Im "
+#define RID_INFINITY "infinity "
+#define RID_PARTIAL "partial "
+#define RID_NABLA "nabla "
+#define RID_WP "wp "
+#define RID_DOTSAXIS "dotsaxis "
+#define RID_DOTSUP "dotsup "
+#define RID_DOTSDOWN "dotsdown "
+#define RID_DOTSLOW "dotslow "
+#define RID_DOTSVERT "dotsvert "
+#define RID_XCIRCY "<?> circ <?> "
+#define RID_XWIDESLASHY "{<?>} wideslash {<?>} "
+#define RID_XWIDEBSLASHY "{<?>} widebslash {<?>} "
+#define RID_XDIVIDESY "<?> divides <?> "
+#define RID_XNDIVIDESY "<?> ndivides <?> "
+#define RID_DLARROW "<?> dlarrow <?> "
+#define RID_DLRARROW "<?> dlrarrow <?> "
+#define RID_DRARROW "<?> drarrow <?> "
+#define RID_SETN "setN "
+#define RID_SETZ "setZ "
+#define RID_SETQ "setQ "
+#define RID_SETR "setR "
+#define RID_SETC "setC "
+#define RID_WIDEHATX "widehat {<?>} "
+#define RID_WIDETILDEX "widetilde {<?>} "
+#define RID_WIDEVECX "widevec {<?>} "
+#define RID_HBAR "hbar "
+#define RID_LAMBDABAR "lambdabar "
+#define RID_LEFTARROW "leftarrow "
+#define RID_RIGHTARROW "rightarrow "
+#define RID_UPARROW "uparrow "
+#define RID_DOWNARROW "downarrow "
+#define RID_NOSPACE "nospace {<?>} "
+#define RID_XPRECEDESY "<?> prec <?> "
+#define RID_XPRECEDESEQUALY "<?> preccurlyeq <?> "
+#define RID_XPRECEDESEQUIVY "<?> precsim <?> "
+#define RID_XSUCCEEDSY "<?> succ <?> "
+#define RID_XSUCCEEDSEQUALY "<?> succcurlyeq <?> "
+#define RID_XSUCCEEDSEQUIVY "<?> succsim <?> "
+#define RID_XNOTPRECEDESY "<?> nprec <?> "
+#define RID_XNOTSUCCEEDSY "<?> nsucc <?> "
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index fdbe2526e625..83fcf3db07bc 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -229,7 +229,7 @@ class SmViewShell: public SfxViewShell
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
- /** Used to determine whether insertions using SID_INSERTSYMBOL and SID_INSERTCOMMAND
+ /** Used to determine whether insertions using SID_INSERTSYMBOL and SID_INSERTCOMMANDTEXT
* should be inserted into SmEditWindow or directly into the SmDocShell as done if the
* visual editor was last to have focus.
*/
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index e23ff4d95320..a97a48d96766 100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -216,24 +216,6 @@ SfxInt16Item Graphic SID_GAPHIC_SM
]
-SfxVoidItem InsertCommand SID_INSERTCOMMAND
-()
-[
- AutoUpdate = FALSE,
- FastCall = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
- GroupId = GID_INSERT;
-]
-
SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT
()
[
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 136a96888475..3b0d5cfc6265 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -216,12 +216,6 @@ interface FormulaView
ExecMethod = Execute ;
StateMethod = GetState ;
]
- //idlpp no menu entry, so no texts
- SID_INSERTCOMMAND //idlpp ole : no , status : no
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- ]
SID_INSERTCOMMANDTEXT
[
ExecMethod = Execute ;
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 1c1b99563505..0d070ed2236b 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -27,6 +27,7 @@
#include "document.hxx"
#include "node.hxx"
#include "uiobject.hxx"
+#include "strings.hxx"
#include <o3tl/make_unique.hxx>
#include <svl/stritem.hxx>
@@ -53,11 +54,11 @@ SmElementSeparator::SmElementSeparator() :
SmElement(std::unique_ptr<SmNode>(), OUString(), OUString())
{}
-const sal_uInt16 SmElementsControl::aUnaryBinaryOperatorsList[][2] =
+const std::pair<const char*, sal_uInt16> SmElementsControl::aUnaryBinaryOperatorsList[] =
{
{RID_PLUSX, RID_PLUSX_HELP}, {RID_MINUSX, RID_MINUSX_HELP},
{RID_PLUSMINUSX, RID_PLUSMINUSX_HELP}, {RID_MINUSPLUSX, RID_MINUSPLUSX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_XPLUSY, RID_XPLUSY_HELP}, {RID_XMINUSY, RID_XMINUSY_HELP},
{RID_XCDOTY, RID_XCDOTY_HELP}, {RID_XTIMESY, RID_XTIMESY_HELP},
{RID_XSYMTIMESY, RID_XSYMTIMESY_HELP}, {RID_XOVERY, RID_XOVERY_HELP},
@@ -66,113 +67,113 @@ const sal_uInt16 SmElementsControl::aUnaryBinaryOperatorsList[][2] =
{RID_XODOTY, RID_XODOTY_HELP}, {RID_XOTIMESY, RID_XOTIMESY_HELP},
{RID_XODIVIDEY, RID_XODIVIDEY_HELP}, {RID_XCIRCY, RID_XCIRCY_HELP},
{RID_XWIDESLASHY, RID_XWIDESLASHY_HELP}, {RID_XWIDEBSLASHY, RID_XWIDEBSLASHY_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_NEGX, RID_NEGX_HELP}, {RID_XANDY, RID_XANDY_HELP}, {RID_XORY, RID_XORY_HELP},
};
-const sal_uInt16 SmElementsControl::aRelationsList[][2] =
+const std::pair<const char*, sal_uInt16> SmElementsControl::aRelationsList[] =
{
{RID_XEQY, RID_XEQY_HELP}, {RID_XNEQY, RID_XNEQY_HELP}, {RID_XLTY, RID_XLTY_HELP},
{RID_XLEY, RID_XLEY_HELP}, {RID_XLESLANTY, RID_XLESLANTY_HELP}, {RID_XGTY, RID_XGTY_HELP},
{RID_XGEY, RID_XGEY_HELP}, {RID_XGESLANTY, RID_XGESLANTY_HELP},
{RID_XLLY, RID_XLLY_HELP}, {RID_XGGY, RID_XGGY_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_XAPPROXY, RID_XAPPROXY_HELP}, {RID_XSIMY, RID_XSIMY_HELP}, {RID_XSIMEQY, RID_XSIMEQY_HELP},
{RID_XEQUIVY, RID_XEQUIVY_HELP}, {RID_XPROPY, RID_XPROPY_HELP}, {RID_XPARALLELY, RID_XPARALLELY_HELP},
{RID_XORTHOY, RID_XORTHOY_HELP}, {RID_XDIVIDESY, RID_XDIVIDESY_HELP}, {RID_XNDIVIDESY, RID_XNDIVIDESY_HELP},
{RID_XTOWARDY, RID_XTOWARDY_HELP}, {RID_XTRANSLY, RID_XTRANSLY_HELP}, {RID_XTRANSRY, RID_XTRANSRY_HELP},
{RID_XDEFY, RID_XDEFY_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_DLARROW, RID_DLARROW_HELP}, {RID_DLRARROW, RID_DLRARROW_HELP}, {RID_DRARROW, RID_DRARROW_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_XPRECEDESY, RID_XPRECEDESY_HELP}, {RID_XSUCCEEDSY, RID_XSUCCEEDSY_HELP},
{RID_XPRECEDESEQUALY, RID_XPRECEDESEQUALY_HELP}, {RID_XSUCCEEDSEQUALY, RID_XSUCCEEDSEQUALY_HELP},
{RID_XPRECEDESEQUIVY, RID_XPRECEDESEQUIVY_HELP}, {RID_XSUCCEEDSEQUIVY, RID_XSUCCEEDSEQUIVY_HELP},
{RID_XNOTPRECEDESY, RID_XNOTPRECEDESY_HELP}, {RID_XNOTSUCCEEDSY, RID_XNOTSUCCEEDSY_HELP},
};
-const sal_uInt16 SmElementsControl::aSetOperations[][2] =
+const std::pair<const char*, sal_uInt16> SmElementsControl::aSetOperations[] =
{
{RID_XINY, RID_XINY_HELP}, {RID_XNOTINY, RID_XNOTINY_HELP}, {RID_XOWNSY, RID_XOWNSY_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_XINTERSECTIONY, RID_XINTERSECTIONY_HELP}, {RID_XUNIONY, RID_XUNIONY_HELP},
{RID_XSETMINUSY, RID_XSETMINUSY_HELP}, {RID_XSLASHY, RID_XSLASHY_HELP},
{RID_XSUBSETY, RID_XSUBSETY_HELP}, {RID_XSUBSETEQY, RID_XSUBSETEQY_HELP},
{RID_XSUPSETY, RID_XSUPSETY_HELP}, {RID_XSUPSETEQY, RID_XSUPSETEQY_HELP},
{RID_XNSUBSETY, RID_XNSUBSETY_HELP}, {RID_XNSUBSETEQY, RID_XNSUBSETEQY_HELP},
{RID_XNSUPSETY, RID_XNSUPSETY_HELP}, {RID_XNSUPSETEQY, RID_XNSUPSETEQY_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_EMPTYSET, RID_EMPTYSET_HELP}, {RID_ALEPH, RID_ALEPH_HELP}, {RID_SETN, RID_SETN_HELP},
{RID_SETZ, RID_SETZ_HELP}, {RID_SETQ, RID_SETQ_HELP}, {RID_SETR, RID_SETR_HELP}, {RID_SETC, RID_SETC_HELP}
};
-const sal_uInt16 SmElementsControl::aFunctions[][2] =
+const std::pair<const char*, sal_uInt16> SmElementsControl::aFunctions[] =
{
{RID_ABSX, RID_ABSX_HELP}, {RID_FACTX, RID_FACTX_HELP}, {RID_SQRTX, RID_SQRTX_HELP},
{RID_NROOTXY, RID_NROOTXY_HELP}, {RID_RSUPX, RID_RSUPX_HELP}, {RID_EX, RID_EX_HELP},
{RID_LNX, RID_LNX_HELP}, {RID_EXPX, RID_EXPX_HELP}, {RID_LOGX, RID_LOGX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_SINX, RID_SINX_HELP}, {RID_COSX, RID_COSX_HELP}, {RID_TANX, RID_TANX_HELP}, {RID_COTX, RID_COTX_HELP},
{RID_SINHX, RID_SINHX_HELP}, {RID_COSHX, RID_COSHX_HELP}, {RID_TANHX, RID_TANHX_HELP},
{RID_COTHX, RID_COTHX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_ARCSINX, RID_ARCSINX_HELP}, {RID_ARCCOSX, RID_ARCCOSX_HELP}, {RID_ARCTANX, RID_ARCTANX_HELP},
{RID_ARCCOTX, RID_ARCCOTX_HELP}, {RID_ARSINHX, RID_ARSINHX_HELP}, {RID_ARCOSHX, RID_ARCOSHX_HELP},
{RID_ARTANHX, RID_ARTANHX_HELP}, {RID_ARCOTHX, RID_ARCOTHX_HELP}
};
-const sal_uInt16 SmElementsControl::aOperators[][2] =
+const std::pair<const char*, sal_uInt16> SmElementsControl::aOperators[] =
{
{RID_LIMX, RID_LIMX_HELP}, {RID_LIM_FROMX, RID_LIM_FROMX_HELP},
{RID_LIM_TOX, RID_LIM_TOX_HELP}, {RID_LIM_FROMTOX, RID_LIM_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_LIMINFX, RID_LIMINFX_HELP}, {RID_LIMINF_FROMX, RID_LIMINF_FROMX_HELP},
{RID_LIMINF_TOX, RID_LIMINF_TOX_HELP}, {RID_LIMINF_FROMTOX, RID_LIMINF_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_LIMSUPX, RID_LIMSUPX_HELP}, {RID_LIMSUP_FROMX, RID_LIMSUP_FROMX_HELP},
{RID_LIMSUP_TOX, RID_LIMSUP_TOX_HELP}, {RID_LIMSUP_FROMTOX, RID_LIMSUP_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_SUMX, RID_SUMX_HELP}, {RID_SUM_FROMX, RID_SUM_FROMX_HELP},
{RID_SUM_TOX, RID_SUM_TOX_HELP}, {RID_SUM_FROMTOX, RID_SUM_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_PRODX, RID_PRODX_HELP}, {RID_PROD_FROMX, RID_PROD_FROMX_HELP},
{RID_PROD_TOX, RID_PROD_TOX_HELP}, {RID_PROD_FROMTOX, RID_PROD_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_COPRODX, RID_COPRODX_HELP}, {RID_COPROD_FROMX, RID_COPROD_FROMX_HELP},
{RID_COPROD_TOX, RID_COPROD_TOX_HELP}, {RID_COPROD_FROMTOX, RID_COPROD_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_INTX, RID_INTX_HELP}, {RID_INT_FROMX, RID_INT_FROMX_HELP},
{RID_INT_TOX, RID_INT_TOX_HELP}, {RID_INT_FROMTOX, RID_INT_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_IINTX, RID_IINTX_HELP}, {RID_IINT_FROMX, RID_IINT_FROMX_HELP},
{RID_IINT_TOX, RID_IINT_TOX_HELP}, {RID_IINT_FROMTOX, RID_IINT_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_IIINTX, RID_IIINTX_HELP}, {RID_IIINT_FROMX, RID_IIINT_FROMX_HELP},
{RID_IIINT_TOX, RID_IIINT_TOX_HELP}, {RID_IIINT_FROMTOX, RID_IIINT_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_LINTX, RID_LINTX_HELP}, {RID_LINT_FROMX, RID_LINT_FROMX_HELP},
{RID_LINT_TOX, RID_LINT_TOX_HELP}, {RID_LINT_FROMTOX, RID_LINT_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_LLINTX, RID_LLINTX_HELP}, {RID_LLINT_FROMX, RID_LLINT_FROMX_HELP},
{RID_LLINT_TOX, RID_LLINT_TOX_HELP}, {RID_LLINT_FROMTOX, RID_LLINT_FROMTOX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_LLLINTX, RID_LLLINTX_HELP}, {RID_LLLINT_FROMX, RID_LLLINT_FROMX_HELP},
{RID_LLLINT_TOX, RID_LLLINT_TOX_HELP}, {RID_LLLINT_FROMTOX, RID_LLLINT_FROMTOX_HELP},
};
-const sal_uInt16 SmElementsControl::aAttributes[][2] =
+const std::pair<const char*, sal_uInt16> SmElementsControl::aAttributes[] =
{
{RID_ACUTEX, RID_ACUTEX_HELP}, {RID_GRAVEX, RID_GRAVEX_HELP}, {RID_BREVEX, RID_BREVEX_HELP},
{RID_CIRCLEX, RID_CIRCLEX_HELP}, {RID_DOTX, RID_DOTX_HELP}, {RID_DDOTX, RID_DDOTX_HELP},
{RID_DDDOTX, RID_DDDOTX_HELP}, {RID_BARX, RID_BARX_HELP}, {RID_VECX, RID_VECX_HELP},
{RID_TILDEX, RID_TILDEX_HELP}, {RID_HATX, RID_HATX_HELP}, {RID_CHECKX, RID_CHECKX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_WIDEVECX, RID_WIDEVECX_HELP}, {RID_WIDETILDEX, RID_WIDETILDEX_HELP}, {RID_WIDEHATX, RID_WIDEHATX_HELP},
{RID_OVERLINEX, RID_OVERLINEX_HELP}, {RID_UNDERLINEX, RID_UNDERLINEX_HELP}, {RID_OVERSTRIKEX, RID_OVERSTRIKEX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_PHANTOMX, RID_PHANTOMX_HELP}, {RID_BOLDX, RID_BOLDX_HELP}, {RID_ITALX, RID_ITALX_HELP},
{RID_SIZEXY, RID_SIZEXY_HELP}, {RID_FONTXY, RID_FONTXY_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_COLORX_BLACK, RID_COLORX_BLACK_HELP}, {RID_COLORX_BLUE, RID_COLORX_BLUE_HELP},
{RID_COLORX_GREEN, RID_COLORX_GREEN_HELP}, {RID_COLORX_RED, RID_COLORX_RED_HELP},
{RID_COLORX_CYAN, RID_COLORX_CYAN_HELP}, {RID_COLORX_MAGENTA, RID_COLORX_MAGENTA_HELP},
@@ -183,49 +184,49 @@ const sal_uInt16 SmElementsControl::aAttributes[][2] =
{RID_COLORX_TEAL, RID_COLORX_TEAL_HELP}
};
-const sal_uInt16 SmElementsControl::aBrackets[][2] =
+const std::pair<const char*, sal_uInt16> SmElementsControl::aBrackets[] =
{
{RID_LRGROUPX, RID_LRGROUPX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_LRPARENTX, RID_LRPARENTX_HELP}, {RID_LRBRACKETX, RID_LRBRACKETX_HELP},
{RID_LRDBRACKETX, RID_LRDBRACKETX_HELP}, {RID_LRBRACEX, RID_LRBRACEX_HELP},
{RID_LRANGLEX, RID_LRANGLEX_HELP}, {RID_LMRANGLEXY, RID_LMRANGLEXY_HELP},
{RID_LRCEILX, RID_LRCEILX_HELP}, {RID_LRFLOORX, RID_LRFLOORX_HELP},
{RID_LRLINEX, RID_LRLINEX_HELP}, {RID_LRDLINEX, RID_LRDLINEX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_SLRPARENTX, RID_SLRPARENTX_HELP}, {RID_SLRBRACKETX, RID_SLRBRACKETX_HELP},
{RID_SLRDBRACKETX, RID_SLRDBRACKETX_HELP}, {RID_SLRBRACEX, RID_SLRBRACEX_HELP},
{RID_SLRANGLEX, RID_SLRANGLEX_HELP}, {RID_SLMRANGLEXY, RID_SLMRANGLEXY_HELP},
{RID_SLRCEILX, RID_SLRCEILX_HELP}, {RID_SLRFLOORX, RID_SLRFLOORX_HELP},
{RID_SLRLINEX, RID_SLRLINEX_HELP}, {RID_SLRDLINEX, RID_SLRDLINEX_HELP},
{RID_XEVALUATEDATY, RID_XEVALUATEDATY_HELP},
- {0XFFFF, 0},
+ {nullptr, 0},
{RID_XOVERBRACEY, RID_XOVERBRACEY_HELP}, {RID_XUNDERBRACEY, RID_XUNDERBRACEY_HELP},
};
-const sal_uInt16 SmElementsControl::aFormats[][2] =
+const std::pair<const char*, sal_uInt16> SmElementsControl::aFormats[] =
{
{RID_RSUPX, RID_RSUPX_HELP}, {RID_RSUBX, RID_RSUBX_HELP}, {RID_LSUPX, RID_LSUPX_HELP},
{RID_LSUBX, RID_LSUBX_HELP}, {RID_CSUPX, RID_CSUPX_HELP}, {RID_CSUBX, RID_CSUBX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_NEWLINE, RID_NEWLINE_HELP}, {RID_SBLANK, RID_SBLANK_HELP}, {RID_BLANK, RID_BLANK_HELP},
{RID_NOSPACE, RID_NOSPACE_HELP},
{RID_ALIGNLX, RID_ALIGNLX_HELP}, {RID_ALIGNCX, RID_ALIGNCX_HELP}, {RID_ALIGNRX, RID_ALIGNRX_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_BINOMXY, RID_BINOMXY_HELP}, {RID_STACK, RID_STACK_HELP},
{RID_MATRIX, RID_MATRIX_HELP},
};
-const sal_uInt16 SmElementsControl::aOthers[][2] =
+const std::pair<const char*, sal_uInt16> SmElementsControl::aOthers[] =
{
{RID_INFINITY, RID_INFINITY_HELP}, {RID_PARTIAL, RID_PARTIAL_HELP}, {RID_NABLA, RID_NABLA_HELP},
{RID_EXISTS, RID_EXISTS_HELP}, {RID_NOTEXISTS, RID_NOTEXISTS_HELP}, {RID_FORALL, RID_FORALL_HELP},
{RID_HBAR, RID_HBAR_HELP}, {RID_LAMBDABAR, RID_LAMBDABAR_HELP}, {RID_RE, RID_RE_HELP},
{RID_IM, RID_IM_HELP}, {RID_WP, RID_WP_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_LEFTARROW, RID_LEFTARROW_HELP}, {RID_RIGHTARROW, RID_RIGHTARROW_HELP}, {RID_UPARROW, RID_UPARROW_HELP},
{RID_DOWNARROW, RID_DOWNARROW_HELP},
- {0xFFFF, 0},
+ {nullptr, 0},
{RID_DOTSLOW, RID_DOTSLOW_HELP}, {RID_DOTSAXIS, RID_DOTSAXIS_HELP}, {RID_DOTSVERT, RID_DOTSVERT_HELP},
{RID_DOTSUP, RID_DOTSUP_HELP}, {RID_DOTSDOWN, RID_DOTSDOWN_HELP}
};
@@ -547,96 +548,97 @@ void SmElementsControl::setElementSetId(sal_uInt16 aSetId)
build();
}
-void SmElementsControl::addElements(const sal_uInt16 aElementsArray[][2], sal_uInt16 aElementsArraySize)
+void SmElementsControl::addElements(const std::pair<const char*, sal_uInt16> aElementsArray[], sal_uInt16 aElementsArraySize)
{
for (sal_uInt16 i = 0; i < aElementsArraySize ; i++)
{
- sal_uInt16 aElementId = aElementsArray[i][0];
- sal_uInt16 aElementIdHelp = aElementsArray[i][1];
- if (aElementId == 0xFFFF) {
+ const char* pElement = aElementsArray[i].first;
+ sal_uInt16 aElementHelp = aElementsArray[i].second;
+ if (!pElement) {
maElementList.push_back(o3tl::make_unique<SmElementSeparator>());
} else {
- if (aElementId == RID_NEWLINE)
- addElement(OUString( "\xe2\x86\xb5", 3, RTL_TEXTENCODING_UTF8 ), SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SBLANK)
- addElement("\"`\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_BLANK)
- addElement("\"~\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_PHANTOMX)
- addElement("\"" + SM_RESSTR(STR_HIDE) +"\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_BOLDX)
- addElement("bold B", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_ITALX)
- addElement("ital I", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SIZEXY)
- addElement("\"" + SM_RESSTR(STR_SIZE) + "\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_FONTXY)
- addElement("\"" + SM_RESSTR(STR_FONT) + "\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_BLACK)
- addElement("color black { \"" + SM_RESSTR(STR_BLACK) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_BLUE)
- addElement("color blue { \"" + SM_RESSTR(STR_BLUE) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_GREEN)
- addElement("color green { \"" + SM_RESSTR(STR_GREEN) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_RED)
- addElement("color red { \"" + SM_RESSTR(STR_RED) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_CYAN)
- addElement("color cyan { \"" + SM_RESSTR(STR_CYAN) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_MAGENTA)
- addElement("color magenta { \"" + SM_RESSTR(STR_MAGENTA) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_YELLOW)
- addElement("color yellow { \"" + SM_RESSTR(STR_YELLOW) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_GRAY)
- addElement("color gray { \"" + SM_RESSTR(STR_GRAY) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_LIME)
- addElement("color lime { \"" + SM_RESSTR(STR_LIME) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_MAROON)
- addElement("color maroon { \"" + SM_RESSTR(STR_MAROON) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_NAVY)
- addElement("color navy { \"" + SM_RESSTR(STR_NAVY) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_OLIVE)
- addElement("color olive { \"" + SM_RESSTR(STR_OLIVE) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_PURPLE)
- addElement("color purple { \"" + SM_RESSTR(STR_PURPLE) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_SILVER)
- addElement("color silver { \"" + SM_RESSTR(STR_SILVER) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_TEAL)
- addElement("color teal { \"" + SM_RESSTR(STR_TEAL) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_ALIGNLX)
- addElement("\"" + SM_RESSTR(STR_ALIGN_LEFT) + "\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_ALIGNCX)
- addElement("\"" + SM_RESSTR(STR_ALIGN_CENTER) + "\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_ALIGNRX)
- addElement("\"" + SM_RESSTR(STR_ALIGN_RIGHT) + "\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
-
- else if (aElementId == RID_SLRPARENTX)
- addElement("left ( binom{<?>}{<?>} right ) ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SLRBRACKETX)
- addElement("left [ binom{<?>}{<?>} right ] ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SLRDBRACKETX)
- addElement("left ldbracket binom{<?>}{<?>} right rdbracket ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SLRBRACEX)
- addElement("left lbrace binom{<?>}{<?>} right rbrace ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SLRANGLEX)
- addElement("left langle binom{<?>}{<?>} right rangle ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SLRCEILX)
- addElement("left lceil binom{<?>}{<?>} right rceil ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SLRFLOORX)
- addElement("left lfloor binom{<?>}{<?>} right rfloor ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
-
- else if (aElementId == RID_SLRLINEX)
- addElement("left lline binom{<?>}{<?>} right rline ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SLRDLINEX)
- addElement("left ldline binom{<?>}{<?>} right rdline ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_SLMRANGLEXY)
- addElement("left langle binom{<?>}{<?>} mline binom{<?>}{<?>} right rangle ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
-
- else if (aElementId == RID_XOVERBRACEY)
- addElement("{<?><?><?>} overbrace {<?>} ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_XUNDERBRACEY)
- addElement("{<?><?><?>} underbrace {<?>} ", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+ OUString aElement(OUString::createFromAscii(pElement));
+ if (aElement == RID_NEWLINE)
+ addElement(OUString( "\xe2\x86\xb5", 3, RTL_TEXTENCODING_UTF8 ), aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SBLANK)
+ addElement("\"`\"", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_BLANK)
+ addElement("\"~\"", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_PHANTOMX)
+ addElement("\"" + SM_RESSTR(STR_HIDE) +"\"", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_BOLDX)
+ addElement("bold B", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_ITALX)
+ addElement("ital I", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SIZEXY)
+ addElement("\"" + SM_RESSTR(STR_SIZE) + "\"", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_FONTXY)
+ addElement("\"" + SM_RESSTR(STR_FONT) + "\"", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_BLACK)
+ addElement("color black { \"" + SM_RESSTR(STR_BLACK) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_BLUE)
+ addElement("color blue { \"" + SM_RESSTR(STR_BLUE) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_GREEN)
+ addElement("color green { \"" + SM_RESSTR(STR_GREEN) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_RED)
+ addElement("color red { \"" + SM_RESSTR(STR_RED) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_CYAN)
+ addElement("color cyan { \"" + SM_RESSTR(STR_CYAN) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_MAGENTA)
+ addElement("color magenta { \"" + SM_RESSTR(STR_MAGENTA) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_YELLOW)
+ addElement("color yellow { \"" + SM_RESSTR(STR_YELLOW) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_GRAY)
+ addElement("color gray { \"" + SM_RESSTR(STR_GRAY) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_LIME)
+ addElement("color lime { \"" + SM_RESSTR(STR_LIME) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_MAROON)
+ addElement("color maroon { \"" + SM_RESSTR(STR_MAROON) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_NAVY)
+ addElement("color navy { \"" + SM_RESSTR(STR_NAVY) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_OLIVE)
+ addElement("color olive { \"" + SM_RESSTR(STR_OLIVE) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_PURPLE)
+ addElement("color purple { \"" + SM_RESSTR(STR_PURPLE) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_SILVER)
+ addElement("color silver { \"" + SM_RESSTR(STR_SILVER) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_COLORX_TEAL)
+ addElement("color teal { \"" + SM_RESSTR(STR_TEAL) + "\" }", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_ALIGNLX)
+ addElement("\"" + SM_RESSTR(STR_ALIGN_LEFT) + "\"", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_ALIGNCX)
+ addElement("\"" + SM_RESSTR(STR_ALIGN_CENTER) + "\"", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_ALIGNRX)
+ addElement("\"" + SM_RESSTR(STR_ALIGN_RIGHT) + "\"", aElement, SM_RESSTR(aElementHelp));
+
+ else if (aElement == RID_SLRPARENTX)
+ addElement("left ( binom{<?>}{<?>} right ) ", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SLRBRACKETX)
+ addElement("left [ binom{<?>}{<?>} right ] ", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SLRDBRACKETX)
+ addElement("left ldbracket binom{<?>}{<?>} right rdbracket ", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SLRBRACEX)
+ addElement("left lbrace binom{<?>}{<?>} right rbrace ", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SLRANGLEX)
+ addElement("left langle binom{<?>}{<?>} right rangle ", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SLRCEILX)
+ addElement("left lceil binom{<?>}{<?>} right rceil ", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SLRFLOORX)
+ addElement("left lfloor binom{<?>}{<?>} right rfloor ", aElement, SM_RESSTR(aElementHelp));
+
+ else if (aElement == RID_SLRLINEX)
+ addElement("left lline binom{<?>}{<?>} right rline ", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SLRDLINEX)
+ addElement("left ldline binom{<?>}{<?>} right rdline ", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_SLMRANGLEXY)
+ addElement("left langle binom{<?>}{<?>} mline binom{<?>}{<?>} right rangle ", aElement, SM_RESSTR(aElementHelp));
+
+ else if (aElement == RID_XOVERBRACEY)
+ addElement("{<?><?><?>} overbrace {<?>} ", aElement, SM_RESSTR(aElementHelp));
+ else if (aElement == RID_XUNDERBRACEY)
+ addElement("{<?><?><?>} underbrace {<?>} ", aElement, SM_RESSTR(aElementHelp));
else
- addElement(SM_RESSTR(aElementId), SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+ addElement(aElement, aElement, SM_RESSTR(aElementHelp));
}
}
}
diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx
index 41ac8a23ea21..a0d47e9c74fd 100644
--- a/starmath/source/action.cxx
+++ b/starmath/source/action.cxx
@@ -21,7 +21,7 @@
#include "smdll.hxx"
#include "document.hxx"
#include "starmath.hrc"
-
+#include "strings.hxx"
SmFormatAction::SmFormatAction(SmDocShell *pDocSh,
const SmFormat& rOldFormat,
@@ -49,8 +49,7 @@ void SmFormatAction::Repeat(SfxRepeatTarget& rDocSh)
OUString SmFormatAction::GetComment() const
{
- return SmResId(RID_UNDOFORMATNAME).toString();
+ return OUString(RID_UNDOFORMATNAME);
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index a9def5fab486..cfa5ecef566f 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -20,1252 +20,999 @@
#include <sfx2/sfx.hrc>
#include "starmath.hrc"
-String RID_PLUSX { Text = "+<?> " ; };
String RID_PLUSX_HELP
{
Text [ en-US ] = "+ Sign" ;
};
-String RID_MINUSX { Text = "-<?> " ; };
String RID_MINUSX_HELP
{
Text [ en-US ] = "- Sign" ;
};
-String RID_PLUSMINUSX { Text = "+-<?> " ; };
String RID_PLUSMINUSX_HELP
{
Text [ en-US ] = "+- Sign" ;
};
-String RID_MINUSPLUSX { Text = "-+<?> " ; };
String RID_MINUSPLUSX_HELP
{
Text [ en-US ] = "-+ Sign" ;
};
-String RID_NEGX { Text = "neg <?> " ; };
String RID_NEGX_HELP
{
Text [ en-US ] = "Boolean NOT" ;
};
-String RID_XPLUSY { Text = "<?> + <?> " ; };
String RID_XPLUSY_HELP
{
Text [ en-US ] = "Addition +" ;
};
-String RID_XMINUSY { Text = "<?> - <?> " ; };
String RID_XMINUSY_HELP
{
Text [ en-US ] = "Subtraction -" ;
};
-String RID_XCDOTY { Text = "<?> cdot <?> " ; };
String RID_XCDOTY_HELP
{
Text [ en-US ] = "Multiplication (Dot)" ;
};
-String RID_XTIMESY { Text = "<?> times <?> " ; };
String RID_XTIMESY_HELP
{
Text [ en-US ] = "Multiplication (x)" ;
};
-String RID_XSYMTIMESY { Text = "<?> * <?> " ; };
String RID_XSYMTIMESY_HELP
{
Text [ en-US ] = "Multiplication (*)" ;
};
-String RID_XSYMDIVIDEY { Text = "<?> / <?> " ; };
String RID_XSYMDIVIDEY_HELP
{
Text [ en-US ] = "Division (Slash)" ;
};
-String RID_XDIVY { Text = "<?> div <?> " ; };
String RID_XDIVY_HELP
{
Text [ en-US ] = "Division (÷)" ;
};
-String RID_XOVERY { Text = "{<?>} over {<?>} " ; };
String RID_XOVERY_HELP
{
Text [ en-US ] = "Division (Fraction)" ;
};
-String RID_XODIVIDEY { Text = "<?> odivide <?> " ; };
String RID_XODIVIDEY_HELP
{
Text [ en-US ] = "Circled Slash" ;
};
-String RID_XODOTY { Text = "<?> odot <?> " ; };
String RID_XODOTY_HELP
{
Text [ en-US ] = "Circled Dot" ;
};
-String RID_XOMINUSY { Text = "<?> ominus <?> " ; };
String RID_XOMINUSY_HELP
{
Text [ en-US ] = "Circled Minus" ;
};
-String RID_XOPLUSY { Text = "<?> oplus <?> " ; };
String RID_XOPLUSY_HELP
{
Text [ en-US ] = "Circled Plus" ;
};
-String RID_XOTIMESY { Text = "<?> otimes <?> " ; };
String RID_XOTIMESY_HELP
{
Text [ en-US ] = "Tensor Product" ;
};
-String RID_XANDY { Text = "<?> and <?> " ; };
String RID_XANDY_HELP
{
Text [ en-US ] = "Boolean AND" ;
};
-String RID_XORY { Text = "<?> or <?> " ; };
String RID_XORY_HELP
{
Text [ en-US ] = "Boolean OR" ;
};
-String RID_XEQY { Text = "<?> = <?> " ; };
String RID_XEQY_HELP
{
Text [ en-US ] = "Is Equal" ;
};
-String RID_XNEQY { Text = "<?> <> <?> " ; };
String RID_XNEQY_HELP
{
Text [ en-US ] = "Is Not Equal" ;
};
-String RID_XLTY { Text = "<?> < <?> " ; };
String RID_XLTY_HELP
{
Text [ en-US ] = "Is Less Than" ;
};
-String RID_XGTY { Text = "<?> > <?> " ; };
String RID_XGTY_HELP
{
Text [ en-US ] = "Is Greater Than" ;
};
-String RID_XLEY { Text = "<?> <= <?> " ; };
String RID_XLEY_HELP
{
Text [ en-US ] = "Is Less Than Or Equal To" ;
};
-String RID_XGEY { Text = "<?> >= <?> " ; };
String RID_XGEY_HELP
{
Text [ en-US ] = "Is Greater Than Or Equal To" ;
};
-String RID_XLESLANTY { Text = "<?> leslant <?> " ; };
String RID_XLESLANTY_HELP
{
Text [ en-US ] = "Is Less Than Or Equal To" ;
};
-String RID_XGESLANTY { Text = "<?> geslant <?> " ; };
String RID_XGESLANTY_HELP
{
Text [ en-US ] = "Is Greater Than Or Equal To" ;
};
-String RID_XLLY { Text = "<?> << <?> " ; };
String RID_XLLY_HELP
{
Text [ en-US ] = "Is Much Less Than" ;
};
-String RID_XGGY { Text = "<?> >> <?> " ; };
String RID_XGGY_HELP
{
Text [ en-US ] = "Is Much Greater Than" ;
};
-String RID_XDEFY { Text = "<?> def <?> " ; };
String RID_XDEFY_HELP
{
Text [ en-US ] = "Is Defined As" ;
};
-String RID_XEQUIVY { Text = "<?> equiv <?> " ; };
String RID_XEQUIVY_HELP
{
Text [ en-US ] = "Is Congruent To" ;
};
-String RID_XAPPROXY { Text = "<?> approx <?> " ; };
String RID_XAPPROXY_HELP
{
Text [ en-US ] = "Is Approximately Equal" ;
};
-String RID_XSIMY { Text = "<?> sim <?> " ; };
String RID_XSIMY_HELP
{
Text [ en-US ] = "Is Similar To" ;
};
-String RID_XSIMEQY { Text = "<?> simeq <?> " ; };
String RID_XSIMEQY_HELP
{
Text [ en-US ] = "Is Similar Or Equal" ;
};
-String RID_XPROPY { Text = "<?> prop <?> " ; };
String RID_XPROPY_HELP
{
Text [ en-US ] = "Is Proportional To" ;
};
-String RID_XORTHOY { Text = "<?> ortho <?> " ; };
String RID_XORTHOY_HELP
{
Text [ en-US ] = "Is Orthogonal To" ;
};
-String RID_XPARALLELY { Text = "<?> parallel <?> " ; };
String RID_XPARALLELY_HELP
{
Text [ en-US ] = "Is Parallel To" ;
};
-String RID_XTOWARDY { Text = "<?> toward <?> " ; };
String RID_XTOWARDY_HELP
{
Text [ en-US ] = "Toward" ;
};
-String RID_XTRANSLY { Text = "<?> transl <?> " ; };
String RID_XTRANSLY_HELP
{
Text [ en-US ] = "Corresponds To (Left)" ;
};
-String RID_XTRANSRY { Text = "<?> transr <?> " ; };
String RID_XTRANSRY_HELP
{
Text [ en-US ] = "Corresponds To (Right)" ;
};
-String RID_XINY { Text = "<?> in <?> " ; };
String RID_XINY_HELP
{
Text [ en-US ] = "Is In" ;
};
-String RID_XNOTINY { Text = "<?> notin <?> " ; };
String RID_XNOTINY_HELP
{
Text [ en-US ] = "Is Not In" ;
};
-String RID_XOWNSY { Text = "<?> owns <?> " ; };
String RID_XOWNSY_HELP
{
Text [ en-US ] = "Owns" ;
};
-String RID_XUNIONY { Text = "<?> union <?> " ; };
String RID_XUNIONY_HELP
{
Text [ en-US ] = "Union" ;
};
-String RID_XINTERSECTIONY { Text = "<?> intersection <?> " ; };
String RID_XINTERSECTIONY_HELP
{
Text [ en-US ] = "Intersection" ;
};
-String RID_XSETMINUSY { Text = "<?> setminus <?> " ; };
String RID_XSETMINUSY_HELP
{
Text [ en-US ] = "Difference" ;
};
-String RID_XSLASHY { Text = "<?> slash <?> " ; };
String RID_XSLASHY_HELP
{
Text [ en-US ] = "Quotient Set" ;
};
-String RID_XSUBSETY { Text = "<?> subset <?> " ; };
String RID_XSUBSETY_HELP
{
Text [ en-US ] = "Subset" ;
};
-String RID_XSUBSETEQY { Text = "<?> subseteq <?> " ; };
String RID_XSUBSETEQY_HELP
{
Text [ en-US ] = "Subset Or Equal To" ;
};
-String RID_XSUPSETY { Text = "<?> supset <?> " ; };
String RID_XSUPSETY_HELP
{
Text [ en-US ] = "Superset" ;
};
-String RID_XSUPSETEQY { Text = "<?> supseteq <?> " ; };
String RID_XSUPSETEQY_HELP
{
Text [ en-US ] = "Superset Or Equal To" ;
};
-String RID_XNSUBSETY { Text = "<?> nsubset <?> " ; };
String RID_XNSUBSETY_HELP
{
Text [ en-US ] = "Not Subset" ;
};
-String RID_XNSUBSETEQY { Text = "<?> nsubseteq <?> " ; };
String RID_XNSUBSETEQY_HELP
{
Text [ en-US ] = "Not Subset Or Equal" ;
};
-String RID_XNSUPSETY { Text = "<?> nsupset <?> " ; };
String RID_XNSUPSETY_HELP
{
Text [ en-US ] = "Not Superset" ;
};
-String RID_XNSUPSETEQY { Text = "<?> nsupseteq <?> " ; };
String RID_XNSUPSETEQY_HELP
{
Text [ en-US ] = "Not Superset Or Equal" ;
};
-String RID_ABSX { Text = "abs{<?>} " ; };
String RID_ABSX_HELP
{
Text [ en-US ] = "Absolute Value" ;
};
-String RID_FACTX { Text = "fact{<?>} " ; };
String RID_FACTX_HELP
{
Text [ en-US ] = "Factorial" ;
};
-String RID_SQRTX { Text = "sqrt{<?>} " ; };
String RID_SQRTX_HELP
{
Text [ en-US ] = "Square Root" ;
};
-String RID_NROOTXY { Text = "nroot{<?>}{<?>} " ; };
String RID_NROOTXY_HELP
{
Text [ en-US ] = "N-th Root" ;
};
-String RID_EX { Text = "func e^{<?>} " ; };
String RID_EX_HELP
{
Text [ en-US ] = "Exponential Function" ;
};
-String RID_EXPX { Text = "exp(<?>) " ; };
String RID_EXPX_HELP
{
Text [ en-US ] = "Exponential Function" ;
};
-String RID_LNX { Text = "ln(<?>) " ; };
String RID_LNX_HELP
{
Text [ en-US ] = "Natural Logarithm" ;
};
-String RID_LOGX { Text = "log(<?>) " ; };
String RID_LOGX_HELP
{
Text [ en-US ] = "Logarithm" ;
};
-String RID_SINX { Text = "sin(<?>) " ; };
String RID_SINX_HELP
{
Text [ en-US ] = "Sine" ;
};
-String RID_COSX { Text = "cos(<?>) " ; };
String RID_COSX_HELP
{
Text [ en-US ] = "Cosine" ;
};
-String RID_TANX { Text = "tan(<?>) " ; };
String RID_TANX_HELP
{
Text [ en-US ] = "Tangent" ;
};
-String RID_COTX { Text = "cot(<?>) " ; };
String RID_COTX_HELP
{
Text [ en-US ] = "Cotangent" ;
};
-String RID_ARCSINX { Text = "arcsin(<?>) " ; };
String RID_ARCSINX_HELP
{
Text [ en-US ] = "Arcsine" ;
};
-String RID_ARCCOSX { Text = "arccos(<?>) " ; };
String RID_ARCCOSX_HELP
{
Text [ en-US ] = "Arccosine" ;
};
-String RID_ARCTANX { Text = "arctan(<?>) " ; };
String RID_ARCTANX_HELP
{
Text [ en-US ] = "Arctangent" ;
};
-String RID_ARCCOTX { Text = "arccot(<?>) " ; };
String RID_ARCCOTX_HELP
{
Text [ en-US ] = "Arccotangent" ;
};
-String RID_SINHX { Text = "sinh(<?>) " ; };
String RID_SINHX_HELP
{
Text [ en-US ] = "Hyperbolic Sine" ;
};
-String RID_COSHX { Text = "cosh(<?>) " ; };
String RID_COSHX_HELP
{
Text [ en-US ] = "Hyperbolic Cosine" ;
};
-String RID_TANHX { Text = "tanh(<?>) " ; };
String RID_TANHX_HELP
{
Text [ en-US ] = "Hyperbolic Tangent" ;
};
-String RID_COTHX { Text = "coth(<?>) " ; };
String RID_COTHX_HELP
{
Text [ en-US ] = "Hyperbolic Cotangent" ;
};
-String RID_ARSINHX { Text = "arsinh(<?>) " ; };
String RID_ARSINHX_HELP
{
Text [ en-US ] = "Area Hyperbolic Sine" ;
};
-String RID_ARCOSHX { Text = "arcosh(<?>) " ; };
String RID_ARCOSHX_HELP
{
Text [ en-US ] = "Area Hyperbolic Cosine" ;
};
-String RID_ARTANHX { Text = "artanh(<?>) " ; };
String RID_ARTANHX_HELP
{
Text [ en-US ] = "Area Hyperbolic Tangent" ;
};
-String RID_ARCOTHX { Text = "arcoth(<?>) " ; };
String RID_ARCOTHX_HELP
{
Text [ en-US ] = "Area Hyperbolic Cotangent" ;
};
-String RID_SUMX { Text = "sum <?> " ; };
String RID_SUMX_HELP
{
Text [ en-US ] = "Sum" ;
};
-String RID_SUM_FROMX { Text = "sum from{<?>} <?> " ; };
String RID_SUM_FROMX_HELP
{
Text [ en-US ] = "Sum Subscript Bottom" ;
};
-String RID_SUM_TOX { Text = "sum to{<?>} <?> " ; };
String RID_SUM_TOX_HELP
{
Text [ en-US ] = "Sum Superscript Top" ;
};
-String RID_SUM_FROMTOX { Text = "sum from{<?>} to{<?>} <?> " ; };
String RID_SUM_FROMTOX_HELP
{
Text [ en-US ] = "Sum Sup/Sub script" ;
};
-String RID_PRODX { Text = "prod <?> " ; };
String RID_PRODX_HELP
{
Text [ en-US ] = "Product" ;
};
-String RID_PROD_FROMX { Text = "prod from{<?>} <?> " ; };
String RID_PROD_FROMX_HELP
{
Text [ en-US ] = "Product Subscript Bottom" ;
};
-String RID_PROD_TOX { Text = "prod to{<?>} <?> " ; };
String RID_PROD_TOX_HELP
{
Text [ en-US ] = "Product Superscript Top" ;
};
-String RID_PROD_FROMTOX { Text = "prod from{<?>} to{<?>} <?> " ; };
String RID_PROD_FROMTOX_HELP
{
Text [ en-US ] = "Product Sup/Sub script" ;
};
-String RID_COPRODX { Text = "coprod <?> " ; };
String RID_COPRODX_HELP
{
Text [ en-US ] = "Coproduct" ;
};
-String RID_COPROD_FROMX { Text = "coprod from{<?>} <?> " ; };
String RID_COPROD_FROMX_HELP
{
Text [ en-US ] = "Coproduct Subscript Bottom" ;
};
-String RID_COPROD_TOX { Text = "coprod to{<?>} <?> " ; };
String RID_COPROD_TOX_HELP
{
Text [ en-US ] = "Coproduct Superscript Top" ;
};
-String RID_COPROD_FROMTOX { Text = "coprod from{<?>} to{<?>} <?> " ; };
String RID_COPROD_FROMTOX_HELP
{
Text [ en-US ] = "Coproduct Sup/Sub script" ;
};
-String RID_LIMX { Text = "lim <?> " ; };
String RID_LIMX_HELP
{
Text [ en-US ] = "Limes" ;
};
-String RID_LIM_FROMX { Text = "lim from{<?>} <?> " ; };
String RID_LIM_FROMX_HELP
{
Text [ en-US ] = "Limes Subscript Bottom" ;
};
-String RID_LIM_TOX { Text = "lim to{<?>} <?> " ; };
String RID_LIM_TOX_HELP
{
Text [ en-US ] = "Limes Superscript Top" ;
};
-String RID_LIM_FROMTOX { Text = "lim from{<?>} to{<?>} <?> " ; };
String RID_LIM_FROMTOX_HELP
{
Text [ en-US ] = "Limes Sup/Sub script" ;
};
-String RID_LIMINFX { Text = "liminf <?> " ; };
String RID_LIMINFX_HELP
{
Text [ en-US ] = "Limit Inferior" ;
};
-String RID_LIMINF_FROMX { Text = "liminf from{<?>} <?> " ; };
String RID_LIMINF_FROMX_HELP
{
Text [ en-US ] = "Limit Inferior Subscript Bottom" ;
};
-String RID_LIMINF_TOX { Text = "liminf to{<?>} <?> " ; };
String RID_LIMINF_TOX_HELP
{
Text [ en-US ] = "Limit Inferior Superscript Top" ;
};
-String RID_LIMINF_FROMTOX { Text = "liminf from{<?>} to{<?>} <?> " ; };
String RID_LIMINF_FROMTOX_HELP
{
Text [ en-US ] = "Limit Inferior Sup/Sub script" ;
};
-String RID_LIMSUPX { Text = "limsup <?> " ; };
String RID_LIMSUPX_HELP
{
Text [ en-US ] = "Limit Superior" ;
};
-String RID_LIMSUP_FROMX { Text = "limsup from{<?>} <?> " ; };
String RID_LIMSUP_FROMX_HELP
{
Text [ en-US ] = "Limit Superior Subscript Bottom" ;
};
-String RID_LIMSUP_TOX { Text = "limsup to{<?>} <?> " ; };
String RID_LIMSUP_TOX_HELP
{
Text [ en-US ] = "Limit Superior Superscript Top" ;
};
-String RID_LIMSUP_FROMTOX { Text = "limsup from{<?>} to{<?>} <?> " ; };
String RID_LIMSUP_FROMTOX_HELP
{
Text [ en-US ] = "Limit Superior Sup/Sub script" ;
};
-String RID_EXISTS { Text = "exists " ; };
String RID_EXISTS_HELP
{
Text [ en-US ] = "There Exists" ;
};
-String RID_NOTEXISTS { Text = "notexists " ; };
String RID_NOTEXISTS_HELP
{
Text [ en-US ] = "There Not Exists" ;
};
-String RID_FORALL { Text = "forall " ; };
String RID_FORALL_HELP
{
Text [ en-US ] = "For all" ;
};
-String RID_INTX { Text = "int <?> " ; };
String RID_INTX_HELP
{
Text [ en-US ] = "Integral" ;
};
-String RID_INT_FROMX { Text = "int from{<?>} <?> " ; };
String RID_INT_FROMX_HELP
{
Text [ en-US ] = "Integral Subscript Bottom" ;
};
-String RID_INT_TOX { Text = "int to{<?>} <?> " ; };
String RID_INT_TOX_HELP
{
Text [ en-US ] = "Integral Superscript Top" ;
};
-String RID_INT_FROMTOX { Text = "int from{<?>} to{<?>} <?> " ; };
String RID_INT_FROMTOX_HELP
{
Text [ en-US ] = "Integral Sup/Sub script" ;
};
-String RID_IINTX { Text = "iint <?> " ; };
String RID_IINTX_HELP
{
Text [ en-US ] = "Double Integral" ;
};
-String RID_IINT_FROMX { Text = "iint from{<?>} <?> " ; };
String RID_IINT_FROMX_HELP
{
Text [ en-US ] = "Double Integral Subscript Bottom" ;
};
-String RID_IINT_TOX { Text = "iint to{<?>} <?> " ; };
String RID_IINT_TOX_HELP
{
Text [ en-US ] = "Double Integral Superscript Top" ;
};
-String RID_IINT_FROMTOX { Text = "iint from{<?>} to{<?>} <?> " ; };
String RID_IINT_FROMTOX_HELP
{
Text [ en-US ] = "Double Integral Sup/Sub script" ;
};
-String RID_IIINTX { Text = "iiint <?> " ; };
String RID_IIINTX_HELP
{
Text [ en-US ] = "Triple Integral" ;
};
-String RID_IIINT_FROMX { Text = "iiint from{<?>} <?> " ; };
String RID_IIINT_FROMX_HELP
{
Text [ en-US ] = "Triple Integral Subscript Bottom" ;
};
-String RID_IIINT_TOX { Text = "iiint to{<?>} <?> " ; };
String RID_IIINT_TOX_HELP
{
Text [ en-US ] = "Triple Integral Superscript Top" ;
};
-String RID_IIINT_FROMTOX { Text = "iiint from{<?>} to{<?>} <?> " ; };
String RID_IIINT_FROMTOX_HELP
{
Text [ en-US ] = "Triple Integral Sup/Sub script" ;
};
-String RID_LINTX { Text = "lint <?> " ; };
String RID_LINTX_HELP
{
Text [ en-US ] = "Curve Integral" ;
};
-String RID_LINT_FROMX { Text = "lint from{<?>} <?> " ; };
String RID_LINT_FROMX_HELP
{
Text [ en-US ] = "Curve Integral Subscript Bottom" ;
};
-String RID_LINT_TOX { Text = "lint to{<?>} <?> " ; };
String RID_LINT_TOX_HELP
{
Text [ en-US ] = "Curve Integral Superscript Top" ;
};
-String RID_LINT_FROMTOX { Text = "lint from{<?>} to{<?>} <?> " ; };
String RID_LINT_FROMTOX_HELP
{
Text [ en-US ] = "Curve Integral Sup/Sub script" ;
};
-String RID_LLINTX { Text = "llint <?> " ; };
String RID_LLINTX_HELP
{
Text [ en-US ] = "Double Curve Integral" ;
};
-String RID_LLINT_FROMX { Text = "llint from{<?>} <?> " ; };
String RID_LLINT_FROMX_HELP
{
Text [ en-US ] = "Double Curve Integral Subscript Bottom" ;
};
-String RID_LLINT_TOX { Text = "llint to{<?>} <?> " ; };
String RID_LLINT_TOX_HELP
{
Text [ en-US ] = "Double Curve Integral Superscript Top" ;
};
-String RID_LLINT_FROMTOX { Text = "llint from{<?>} to{<?>} <?> " ; };
String RID_LLINT_FROMTOX_HELP
{
Text [ en-US ] = "Double Curve Integral Sup/Sub script" ;
};
-String RID_LLLINTX { Text = "lllint <?> " ; };
String RID_LLLINTX_HELP
{
Text [ en-US ] = "Triple Curve Integral" ;
};
-String RID_LLLINT_FROMX { Text = "lllint from{<?>} <?> " ; };
String RID_LLLINT_FROMX_HELP
{
Text [ en-US ] = "Triple Curve Integral Subscript Bottom" ;
};
-String RID_LLLINT_TOX { Text = "lllint to{<?>} <?> " ; };
String RID_LLLINT_TOX_HELP
{
Text [ en-US ] = "Triple Curve Integral Superscript Top" ;
};
-String RID_LLLINT_FROMTOX { Text = "lllint from{<?>} to{<?>} <?> " ; };
String RID_LLLINT_FROMTOX_HELP
{
Text [ en-US ] = "Triple Curve Integral Sup/Sub script" ;
};
-String RID_FROMX { Text = "from{<?>} <?> " ; };
-String RID_TOX { Text = "to{<?>} <?> " ; };
-String RID_FROMXTOY { Text = "from{<?>} to{<?>} <?> " ; };
-String RID_ACUTEX { Text = "acute <?> " ; };
String RID_ACUTEX_HELP
{
Text [ en-US ] = "Acute Accent" ;
};
-String RID_BARX { Text = "bar <?> " ; };
String RID_BARX_HELP
{
Text [ en-US ] = "Line Above" ;
};
-String RID_BREVEX { Text = "breve <?> " ; };
String RID_BREVEX_HELP
{
Text [ en-US ] = "Breve" ;
};
-String RID_CHECKX { Text = "check <?> " ; };
String RID_CHECKX_HELP
{
Text [ en-US ] = "Reverse Circumflex" ;
};
-String RID_CIRCLEX { Text = "circle <?> " ; };
String RID_CIRCLEX_HELP
{
Text [ en-US ] = "Circle" ;
};
-String RID_DOTX { Text = "dot <?> " ; };
String RID_DOTX_HELP
{
Text [ en-US ] = "Dot" ;
};
-String RID_DDOTX { Text = "ddot <?> " ; };
String RID_DDOTX_HELP
{
Text [ en-US ] = "Double Dot" ;
};
-String RID_DDDOTX { Text = "dddot <?> " ; };
String RID_DDDOTX_HELP
{
Text [ en-US ] = "Triple Dot" ;
};
-String RID_GRAVEX { Text = "grave <?> " ; };
String RID_GRAVEX_HELP
{
Text [ en-US ] = "Grave Accent" ;
};
-String RID_HATX { Text = "hat <?> " ; };
String RID_HATX_HELP
{
Text [ en-US ] = "Circumflex" ;
};
-String RID_TILDEX { Text = "tilde <?> " ; };
String RID_TILDEX_HELP
{
Text [ en-US ] = "Tilde" ;
};
-String RID_VECX { Text = "vec <?> " ; };
String RID_VECX_HELP
{
Text [ en-US ] = "Vector Arrow" ;
};
-String RID_UNDERLINEX { Text = "underline {<?>} " ; };
String RID_UNDERLINEX_HELP
{
Text [ en-US ] = "Line Below" ;
};
-String RID_OVERLINEX { Text = "overline {<?>} " ; };
String RID_OVERLINEX_HELP
{
Text [ en-US ] = "Line Over" ;
};
-String RID_OVERSTRIKEX { Text = "overstrike {<?>} " ; };
String RID_OVERSTRIKEX_HELP
{
Text [ en-US ] = "Line Through" ;
};
-String RID_PHANTOMX { Text = "phantom {<?>} " ; };
String RID_PHANTOMX_HELP
{
Text [ en-US ] = "Transparent" ;
};
-String RID_BOLDX { Text = "bold <?> " ; };
String RID_BOLDX_HELP
{
Text [ en-US ] = "Bold Font" ;
};
-String RID_ITALX { Text = "ital <?> " ; };
String RID_ITALX_HELP
{
Text [ en-US ] = "Italic Font" ;
};
-String RID_SIZEXY { Text = "size <?> {<?>} " ; };
String RID_SIZEXY_HELP
{
Text [ en-US ] = "Resize" ;
};
-String RID_FONTXY { Text = "font <?> {<?>} " ; };
String RID_FONTXY_HELP
{
Text [ en-US ] = "Change Font" ;
};
-String RID_COLORX_BLACK { Text = "color black {<?>} " ; };
String RID_COLORX_BLACK_HELP
{
Text [ en-US ] = "Color Black" ;
};
-String RID_COLORX_BLUE { Text = "color blue {<?>} " ; };
String RID_COLORX_BLUE_HELP
{
Text [ en-US ] = "Color Blue" ;
};
-String RID_COLORX_GREEN { Text = "color green {<?>} " ; };
String RID_COLORX_GREEN_HELP
{
Text [ en-US ] = "Color Green" ;
};
-String RID_COLORX_RED { Text = "color red {<?>} " ; };
String RID_COLORX_RED_HELP
{
Text [ en-US ] = "Color Red" ;
};
-String RID_COLORX_CYAN { Text = "color cyan {<?>} " ; };
String RID_COLORX_CYAN_HELP
{
Text [ en-US ] = "Color Cyan" ;
};
-String RID_COLORX_MAGENTA { Text = "color magenta {<?>} " ; };
String RID_COLORX_MAGENTA_HELP
{
Text [ en-US ] = "Color Magenta" ;
};
-String RID_COLORX_GRAY { Text = "color gray {<?>} " ; };
String RID_COLORX_GRAY_HELP
{
Text [ en-US ] = "Color Gray" ;
};
-String RID_COLORX_LIME { Text = "color lime {<?>} " ; };
String RID_COLORX_LIME_HELP
{
Text [ en-US ] = "Color Lime" ;
};
-String RID_COLORX_MAROON { Text = "color maroon {<?>} " ; };
String RID_COLORX_MAROON_HELP
{
Text [ en-US ] = "Color Maroon" ;
};
-String RID_COLORX_NAVY { Text = "color navy {<?>} " ; };
String RID_COLORX_NAVY_HELP
{
Text [ en-US ] = "Color Navy" ;
};
-String RID_COLORX_OLIVE { Text = "color olive {<?>} " ; };
String RID_COLORX_OLIVE_HELP
{
Text [ en-US ] = "Color Olive" ;
};
-String RID_COLORX_PURPLE { Text = "color purple {<?>} " ; };
String RID_COLORX_PURPLE_HELP
{
Text [ en-US ] = "Color Purple" ;
};
-String RID_COLORX_SILVER { Text = "color silver {<?>} " ; };
String RID_COLORX_SILVER_HELP
{
Text [ en-US ] = "Color Silver" ;
};
-String RID_COLORX_TEAL { Text = "color teal {<?>} " ; };
String RID_COLORX_TEAL_HELP
{
Text [ en-US ] = "Color Teal" ;
};
-String RID_COLORX_YELLOW { Text = "color yellow {<?>} " ; };
String RID_COLORX_YELLOW_HELP
{
Text [ en-US ] = "Color Yellow" ;
};
-String RID_LRGROUPX { Text = "{<?>} " ; };
String RID_LRGROUPX_HELP
{
Text [ en-US ] = "Group Brackets" ;
};
-String RID_LRPARENTX { Text = "(<?>) " ; };
String RID_LRPARENTX_HELP
{
Text [ en-US ] = "Round Brackets" ;
};
-String RID_LRBRACKETX { Text = "[<?>] " ; };
String RID_LRBRACKETX_HELP
{
Text [ en-US ] = "Square Brackets" ;
};
-String RID_LRDBRACKETX { Text = "ldbracket <?> rdbracket " ; };
String RID_LRDBRACKETX_HELP
{
Text [ en-US ] = "Double Square Brackets" ;
};
-String RID_LRBRACEX { Text = "lbrace <?> rbrace " ; };
String RID_LRBRACEX_HELP
{
Text [ en-US ] = "Braces" ;
};
-String RID_LRANGLEX { Text = "langle <?> rangle " ; };
String RID_LRANGLEX_HELP
{
Text [ en-US ] = "Angle Brackets" ;
};
-String RID_LRCEILX { Text = "lceil <?> rceil " ; };
String RID_LRCEILX_HELP
{
Text [ en-US ] = "Upper Ceil" ;
};
-String RID_LRFLOORX { Text = "lfloor <?> rfloor " ; };
String RID_LRFLOORX_HELP
{
Text [ en-US ] = "Floor" ;
};
-String RID_LRLINEX { Text = "lline <?> rline " ; };
String RID_LRLINEX_HELP
{
Text [ en-US ] = "Single Lines" ;
};
-String RID_LRDLINEX { Text = "ldline <?> rdline " ; };
String RID_LRDLINEX_HELP
{
Text [ en-US ] = "Double Lines" ;
};
-String RID_LMRANGLEXY { Text = "langle <?> mline <?> rangle " ; };
String RID_LMRANGLEXY_HELP
{
Text [ en-US ] = "Operator Brackets" ;
};
-String RID_SLRPARENTX { Text = "left ( <?> right ) " ; };
String RID_SLRPARENTX_HELP
{
Text [ en-US ] = "Round Brackets (Scalable)" ;
};
-String RID_SLRBRACKETX { Text = "left [ <?> right ] " ; };
String RID_SLRBRACKETX_HELP
{
Text [ en-US ] = "Square Brackets (Scalable)" ;
};
-String RID_SLRDBRACKETX { Text = "left ldbracket <?> right rdbracket " ; };
String RID_SLRDBRACKETX_HELP
{
Text [ en-US ] = "Double Square Brackets (Scalable)" ;
};
-String RID_SLRBRACEX { Text = "left lbrace <?> right rbrace " ; };
String RID_SLRBRACEX_HELP
{
Text [ en-US ] = "Braces (Scalable)" ;
};
-String RID_SLRANGLEX { Text = "left langle <?> right rangle " ; };
String RID_SLRANGLEX_HELP
{
Text [ en-US ] = "Angle Brackets (Scalable)" ;
};
-String RID_SLRCEILX { Text = "left lceil <?> right rceil " ; };
String RID_SLRCEILX_HELP
{
Text [ en-US ] = "Ceiling (Scalable)" ;
};
-String RID_SLRFLOORX { Text = "left lfloor <?> right rfloor " ; };
String RID_SLRFLOORX_HELP
{
Text [ en-US ] = "Floor (Scalable)" ;
};
-String RID_SLRLINEX { Text = "left lline <?> right rline " ; };
String RID_SLRLINEX_HELP
{
Text [ en-US ] = "Single Lines (Scalable)" ;
};
-String RID_SLRDLINEX { Text = "left ldline <?> right rdline " ; };
String RID_SLRDLINEX_HELP
{
Text [ en-US ] = "Double Lines (Scalable)" ;
};
-String RID_SLMRANGLEXY { Text = "left langle <?> mline <?> right rangle " ; };
String RID_SLMRANGLEXY_HELP
{
Text [ en-US ] = "Operator Brackets (Scalable)" ;
};
-String RID_XEVALUATEDATY { Text = "left none {<?>} right rline_{<?>} " ; };
String RID_XEVALUATEDATY_HELP
{
Text [ en-US ] = "Evaluated At" ;
};
-String RID_XOVERBRACEY { Text = "{<?>} overbrace {<?>} " ; };
String RID_XOVERBRACEY_HELP
{
Text [ en-US ] = "Braces Top (Scalable)" ;
};
-String RID_XUNDERBRACEY { Text = "{<?>} underbrace {<?>} " ; };
String RID_XUNDERBRACEY_HELP
{
Text [ en-US ] = "Braces Bottom (Scalable)" ;
};
-String RID_RSUBX { Text = "<?>_{<?>}" ; };
String RID_RSUBX_HELP
{
Text [ en-US ] = "Subscript Right" ;
};
-String RID_RSUPX { Text = "<?>^{<?>}" ; };
String RID_RSUPX_HELP
{
Text [ en-US ] = "Power" ;
};
-String RID_LSUBX { Text = "<?> lsub{<?>} " ; };
String RID_LSUBX_HELP
{
Text [ en-US ] = "Subscript Left" ;
};
-String RID_LSUPX { Text = "<?> lsup{<?>} " ; };
String RID_LSUPX_HELP
{
Text [ en-US ] = "Superscript Left" ;
};
-String RID_CSUBX { Text = "<?> csub{<?>} " ; };
String RID_CSUBX_HELP
{
Text [ en-US ] = "Subscript Bottom" ;
};
-String RID_CSUPX { Text = "<?> csup{<?>} " ; };
String RID_CSUPX_HELP
{
Text [ en-US ] = "Superscript Top" ;
};
-String RID_SBLANK { Text = "`" ; };
String RID_SBLANK_HELP
{
Text [ en-US ] = "Small Gap" ;
};
-String RID_BLANK { Text = "~" ; };
String RID_BLANK_HELP
{
Text [ en-US ] = "Blank" ;
};
-String RID_NEWLINE { Text = "newline " ; };
String RID_NEWLINE_HELP
{
Text [ en-US ] = "New Line" ;
};
-String RID_BINOMXY { Text = "binom{<?>}{<?>} " ; };
String RID_BINOMXY_HELP
{
Text [ en-US ] = "Vertical Stack (2 Elements)";
};
-String RID_STACK { Text = "stack{<?> # <?> # <?>} " ; };
String RID_STACK_HELP
{
Text [ en-US ] = "Vertical Stack" ;
};
-String RID_MATRIX { Text = "matrix{<?> # <?> ## <?> # <?>} " ; };
String RID_MATRIX_HELP
{
Text [ en-US ] = "Matrix Stack" ;
};
-String RID_ALIGNLX { Text = "alignl <?> " ; };
String RID_ALIGNLX_HELP
{
Text [ en-US ] = "Align Left" ;
};
-String RID_ALIGNCX { Text = "alignc <?> " ; };
String RID_ALIGNCX_HELP
{
Text [ en-US ] = "Align Center" ;
};
-String RID_ALIGNRX { Text = "alignr <?> " ; };
String RID_ALIGNRX_HELP
{
Text [ en-US ] = "Align Right" ;
};
-String RID_ALEPH { Text = "aleph " ; };
String RID_ALEPH_HELP
{
Text [ en-US ] = "Aleph" ;
};
-String RID_EMPTYSET { Text = "emptyset " ; };
String RID_EMPTYSET_HELP
{
Text [ en-US ] = "Empty Set" ;
};
-String RID_RE { Text = "Re " ; };
String RID_RE_HELP
{
Text [ en-US ] = "Real Part" ;
};
-String RID_IM { Text = "Im " ; };
String RID_IM_HELP
{
Text [ en-US ] = "Imaginary Part" ;
};
-String RID_INFINITY { Text = "infinity " ; };
String RID_INFINITY_HELP
{
Text [ en-US ] = "Infinity" ;
};
-String RID_PARTIAL { Text = "partial " ; };
String RID_PARTIAL_HELP
{
Text [ en-US ] = "Partial" ;
};
-String RID_NABLA { Text = "nabla " ; };
String RID_NABLA_HELP
{
Text [ en-US ] = "Nabla" ;
};
-String RID_WP { Text = "wp " ; };
String RID_WP_HELP
{
Text [ en-US ] = "Weierstrass p" ;
};
-String RID_DOTSAXIS { Text = "dotsaxis " ; };
String RID_DOTSAXIS_HELP
{
Text [ en-US ] = "Dots In Middle" ;
};
-String RID_DOTSUP { Text = "dotsup " ; };
String RID_DOTSUP_HELP
{
Text [ en-US ] = "Dots To Top" ;
};
-String RID_DOTSDOWN { Text = "dotsdown " ; };
String RID_DOTSDOWN_HELP
{
Text [ en-US ] = "Dots To Bottom" ;
};
-String RID_DOTSLOW { Text = "dotslow " ; };
String RID_DOTSLOW_HELP
{
Text [ en-US ] = "Dots At Bottom" ;
};
-String RID_DOTSVERT { Text = "dotsvert " ; };
String RID_DOTSVERT_HELP
{
Text [ en-US ] = "Dots Vertically" ;
};
-String RID_XCIRCY { Text = "<?> circ <?> " ; };
String RID_XCIRCY_HELP
{
Text [ en-US ] = "Concatenate" ;
};
-String RID_XWIDESLASHY { Text = "{<?>} wideslash {<?>} " ; };
String RID_XWIDESLASHY_HELP
{
Text [ en-US ] = "Division (wideslash)" ;
};
-String RID_XWIDEBSLASHY { Text = "{<?>} widebslash {<?>} " ; };
String RID_XWIDEBSLASHY_HELP
{
Text [ en-US ] = "Division (counter wideslash)" ;
};
-String RID_XDIVIDESY { Text = "<?> divides <?> " ; };
String RID_XDIVIDESY_HELP
{
Text [ en-US ] = "Divides" ;
};
-String RID_XNDIVIDESY { Text = "<?> ndivides <?> " ; };
String RID_XNDIVIDESY_HELP
{
Text [ en-US ] = "Does Not Divide" ;
};
-String RID_DLARROW { Text = "<?> dlarrow <?> " ; };
String RID_DLARROW_HELP
{
Text [ en-US ] = "Double Arrow Left" ;
};
-String RID_DLRARROW { Text = "<?> dlrarrow <?> " ; };
String RID_DLRARROW_HELP
{
Text [ en-US ] = "Double Arrow Left And Right" ;
};
-String RID_DRARROW { Text = "<?> drarrow <?> " ; };
String RID_DRARROW_HELP
{
Text [ en-US ] = "Double Arrow Right" ;
};
-String RID_SETN { Text = "setN " ; };
String RID_SETN_HELP
{
Text [ en-US ] = "Natural Numbers Set" ;
};
-String RID_SETZ { Text = "setZ " ; };
String RID_SETZ_HELP
{
Text [ en-US ] = "Integers Set" ;
};
-String RID_SETQ { Text = "setQ " ; };
String RID_SETQ_HELP
{
Text [ en-US ] = "Set of Rational Numbers" ;
};
-String RID_SETR { Text = "setR " ; };
String RID_SETR_HELP
{
Text [ en-US ] = "Real Numbers Set" ;
};
-String RID_SETC { Text = "setC " ; };
String RID_SETC_HELP
{
Text [ en-US ] = "Complex Numbers Set" ;
};
-String RID_WIDEHATX { Text = "widehat {<?>} " ; };
String RID_WIDEHATX_HELP
{
Text [ en-US ] = "Large Circumflex" ;
};
-String RID_WIDETILDEX { Text = "widetilde {<?>} " ; };
String RID_WIDETILDEX_HELP
{
Text [ en-US ] = "Large Tilde" ;
};
-String RID_WIDEVECX { Text = "widevec {<?>} " ; };
String RID_WIDEVECX_HELP
{
Text [ en-US ] = "Large Vector Arrow" ;
};
-String RID_HBAR { Text = "hbar " ; };
String RID_HBAR_HELP
{
Text [ en-US ] = "h Bar" ;
};
-String RID_LAMBDABAR { Text = "lambdabar " ; };
String RID_LAMBDABAR_HELP
{
Text [ en-US ] = "Lambda Bar" ;
};
-String RID_LEFTARROW { Text = "leftarrow " ; };
String RID_LEFTARROW_HELP
{
Text [ en-US ] = "Left Arrow" ;
};
-String RID_RIGHTARROW { Text = "rightarrow " ; };
String RID_RIGHTARROW_HELP
{
Text [ en-US ] = "Right Arrow" ;
};
-String RID_UPARROW { Text = "uparrow " ; };
String RID_UPARROW_HELP
{
Text [ en-US ] = "Up Arrow" ;
};
-String RID_DOWNARROW { Text = "downarrow " ; };
String RID_DOWNARROW_HELP
{
Text [ en-US ] = "Down Arrow" ;
};
-String RID_NOSPACE { Text = "nospace {<?>} " ; };
String RID_NOSPACE_HELP
{
Text [ en-US ] = "No space" ;
};
-
-String RID_XPRECEDESY { Text = "<?> prec <?> " ; };
String RID_XPRECEDESY_HELP
{
Text [ en-US ] = "Precedes" ;
};
-String RID_XPRECEDESEQUALY { Text = "<?> preccurlyeq <?> " ; };
String RID_XPRECEDESEQUALY_HELP
{
Text [ en-US ] = "Precedes or equal to" ;
};
-String RID_XPRECEDESEQUIVY { Text = "<?> precsim <?> " ; };
String RID_XPRECEDESEQUIVY_HELP
{
Text [ en-US ] = "Precedes or equivalent to" ;
};
-String RID_XSUCCEEDSY { Text = "<?> succ <?> " ; };
String RID_XSUCCEEDSY_HELP
{
Text [ en-US ] = "Succeeds" ;
};
-String RID_XSUCCEEDSEQUALY { Text = "<?> succcurlyeq <?> " ; };
String RID_XSUCCEEDSEQUALY_HELP
{
Text [ en-US ] = "Succeeds or equal to" ;
};
-String RID_XSUCCEEDSEQUIVY { Text = "<?> succsim <?> " ; };
String RID_XSUCCEEDSEQUIVY_HELP
{
Text [ en-US ] = "Succeeds or equivalent to" ;
};
-String RID_XNOTPRECEDESY { Text = "<?> nprec <?> " ; };
String RID_XNOTPRECEDESY_HELP
{
Text [ en-US ] = "Not precedes" ;
};
-String RID_XNOTSUCCEEDSY { Text = "<?> nsucc <?> " ; };
String RID_XNOTSUCCEEDSY_HELP
{
Text [ en-US ] = "Not succeeds" ;
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index c4c798452406..78bfb040e39d 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -12,6 +12,7 @@
#include "document.hxx"
#include "view.hxx"
#include "accessibility.hxx"
+#include "strings.hxx"
#include <comphelper/string.hxx>
#include <cassert>
@@ -1073,27 +1074,6 @@ void SmCursor::InsertSpecial(const OUString& _aString)
EndEdit();
}
-void SmCursor::InsertCommand(sal_uInt16 nCommand) {
- switch(nCommand){
- case RID_NEWLINE:
- InsertRow();
- break;
- case RID_FROMX:
- InsertLimit(CSUB);
- break;
- case RID_TOX:
- InsertLimit(CSUP);
- break;
- case RID_FROMXTOY:
- if(InsertLimit(CSUB))
- InsertLimit(CSUP);
- break;
- default:
- InsertCommandText(SM_RESSTR(nCommand));
- break;
- }
-}
-
void SmCursor::InsertCommandText(const OUString& aCommandText) {
//Parse the sub expression
SmNode* pSubExpr = SmParser().ParseExpression(aCommandText);
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 58d927943dee..f66b9599a752 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -763,64 +763,6 @@ void SmEditWindow::SelectAll()
}
}
-void SmEditWindow::InsertCommand(sal_uInt16 nCommand)
-{
- OSL_ENSURE( pEditView, "EditView missing" );
- if (pEditView)
- {
- ESelection aSelection = pEditView->GetSelection();
-
- OSL_ENSURE( pEditView, "NULL pointer" );
- OUString aText = SM_RESSTR(nCommand);
-
- OUString aCurrentFormula = pEditView->GetEditEngine()->GetText();
- sal_Int32 nStartIndex = 0;
- sal_Int32 nEndIndex = 0;
-
- // get the start position (when we get a multi line formula)
- for (sal_Int32 nParaPos = 0; nParaPos < aSelection.nStartPara; nParaPos++)
- nStartIndex = aCurrentFormula.indexOf("\n", nStartIndex) + 1;
-
- nStartIndex += aSelection.nStartPos;
-
- // get the end position (when we get a multi line formula)
- for (sal_Int32 nParaPos = 0; nParaPos < aSelection.nEndPara; nParaPos++)
- nEndIndex = aCurrentFormula.indexOf("\n", nEndIndex) + 1;
-
- nEndIndex += aSelection.nEndPos;
-
- // remove right space of current symbol if there already is one
- if (nEndIndex < aCurrentFormula.getLength() &&
- aCurrentFormula[nEndIndex] == ' ')
- aText = aText.trim();
-
- // put a space before a new command if not in the beginning of a line
- if (aSelection.nStartPos > 0 && aCurrentFormula[nStartIndex - 1] != ' ')
- aText = " " + aText;
-
- pEditView->InsertText(aText);
-
- // Remember start of the selection and move the cursor there afterwards.
- aSelection.nEndPara = aSelection.nStartPara;
- if (HasMark(aText))
- {
- aSelection.nEndPos = aSelection.nStartPos;
- pEditView->SetSelection(aSelection);
- SelNextMark();
- }
- else
- { // set selection after inserted text
- aSelection.nEndPos = aSelection.nStartPos + aText.getLength();
- aSelection.nStartPos = aSelection.nEndPos;
- pEditView->SetSelection(aSelection);
- }
-
- aModifyIdle.Start();
- StartCursorMove();
- GrabFocus();
- }
-}
-
void SmEditWindow::MarkError(const Point &rPos)
{
OSL_ENSURE( pEditView, "EditView missing" );
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 2fc1a436f72a..7941085d9b3f 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -32,15 +32,6 @@ String RID_FONTBOLD
{
Text [ en-US ] = "Bold" ;
};
-String RID_UNDOFORMATNAME
-{
- Text = "Format" ;
-};
-String GID_MATH
-{
- Text = "StarMath" ;
-};
-
String STR_BLACK
{
Text [ en-US ] = "black" ;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a66eacca2c7f..65e0cbbee5bb 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1550,20 +1550,6 @@ void SmViewShell::Execute(SfxRequest& rReq)
pWin->SelectAll();
break;
- case SID_INSERTCOMMAND:
- {
- const SfxInt16Item& rItem =
- static_cast<const SfxInt16Item&>(rReq.GetArgs()->Get(SID_INSERTCOMMAND));
-
- if (pWin && (mbInsertIntoEditWindow || !IsInlineEditEnabled()))
- pWin->InsertCommand(rItem.GetValue());
- if (IsInlineEditEnabled() && (GetDoc() && !mbInsertIntoEditWindow)) {
- GetDoc()->GetCursor().InsertCommand(rItem.GetValue());
- GetGraphicWindow().GrabFocus();
- }
- break;
- }
-
case SID_INSERTCOMMANDTEXT:
{
const SfxStringItem& rItem = static_cast<const SfxStringItem&>(rReq.GetArgs()->Get(SID_INSERTCOMMANDTEXT));
diff --git a/svtools/inc/strings.hxx b/svtools/inc/strings.hxx
index 68fca72f9aa2..32ca8890c444 100644
--- a/svtools/inc/strings.hxx
+++ b/svtools/inc/strings.hxx
@@ -10,8 +10,12 @@
#ifndef INCLUDED_SVTOOLS_INC_STRINGS_HXX
#define INCLUDED_SVTOOLS_INC_STRINGS_HXX
-#define STR_ERR_HDLMESS "$(ACTION)$(ERROR)"
-#define RID_ERRHDL_CLASS "$(CLASS)$(ERROR)"
+#define STR_ERR_HDLMESS "$(ACTION)$(ERROR)"
+#define RID_ERRHDL_CLASS "$(CLASS)$(ERROR)"
+// no need to translate this
+// the items in this string have to be in the same order as the STR_FIELD_* strings are added to the
+// field label list of the dialog
+#define STR_LOGICAL_FIELD_NAMES "FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4"
#endif
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index b2f367d041af..414f3f434715 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -51,12 +51,11 @@
#include <algorithm>
#include <map>
#include <array>
+#include "strings.hxx"
namespace svt
{
-
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
@@ -159,7 +158,7 @@ namespace svt
// first collect all known programmatic names
StringBag aKnownNames;
- OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES));
+ OUString sLogicalFieldNames(STR_LOGICAL_FIELD_NAMES);
sal_Int32 nIndex = 0;
do
{
@@ -621,7 +620,7 @@ void AssignmentPersistentData::ImplCommit()
implScrollFields(0, false, false);
// the logical names
- OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES));
+ OUString sLogicalFieldNames(STR_LOGICAL_FIELD_NAMES);
sal_Int32 nAdjustedTokenCount = comphelper::string::getTokenCount(sLogicalFieldNames, ';') + (m_pImpl->bOddFieldNumber ? 1 : 0);
DBG_ASSERT(nAdjustedTokenCount == (sal_Int32)m_pImpl->aFieldLabels.size(),
"AddressBookSourceDialog::AddressBookSourceDialog: inconsistence between logical and UI field names!");
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index cdefacbd064a..2044f18ff6a4 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -20,14 +20,6 @@
#include <svtools/svtools.hrc>
#include "addresstemplate.hrc"
-String STR_LOGICAL_FIELD_NAMES
-{
- Text = "FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4";
- // no need to translate this
- // the items in this string have to be in the same order as the STR_FIELD_* strings are added to the
- // field label list of the dialog
-};
-
String STR_NO_FIELD_SELECTION
{
Text [ en-US ] = "<none>";
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 68ec1402582f..0b08a9ccb0f0 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -45,12 +45,9 @@
#define RID_GALLERYSTR_THEME_MAPS (RID_GALLERYSTR_THEME_START + 12)
#define RID_GALLERYSTR_THEME_PEOPLE (RID_GALLERYSTR_THEME_START + 13)
#define RID_GALLERYSTR_THEME_SURFACES (RID_GALLERYSTR_THEME_START + 14)
-#define RID_GALLERYSTR_THEME_HTMLBUTTONS (RID_GALLERYSTR_THEME_START + 15)
-#define RID_GALLERYSTR_THEME_POWERPOINT (RID_GALLERYSTR_THEME_START + 16)
#define RID_GALLERYSTR_THEME_SOUNDS (RID_GALLERYSTR_THEME_START + 18)
#define RID_GALLERYSTR_THEME_SYMBOLS (RID_GALLERYSTR_THEME_START + 19)
#define RID_GALLERYSTR_THEME_MYTHEME (RID_GALLERYSTR_THEME_START + 20)
-#define RID_GALLERYSTR_THEME_USERSOUNDS (RID_GALLERYSTR_THEME_START + 21)
#define RID_GALLERYSTR_THEME_ARROWS (RID_GALLERYSTR_THEME_START + 22)
#define RID_GALLERYSTR_THEME_BALLOONS (RID_GALLERYSTR_THEME_START + 23)
@@ -68,11 +65,6 @@
#define RID_GALLERYSTR_THEME_TROUBLE (RID_GALLERYSTR_THEME_START + 34)
#define RID_GALLERYSTR_THEME_SCREENBEANS (RID_GALLERYSTR_THEME_START + 35)
-#define RID_GALLERYSTR_THEME_DUMMY5 (RID_GALLERYSTR_THEME_START + 36)
-
-#define RID_GALLERYSTR_THEME_FONTWORK (RID_GALLERYSTR_THEME_START + 37)
-#define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL (RID_GALLERYSTR_THEME_START + 38)
-
#define RID_GALLERYSTR_THEME_COMPUTERS (RID_GALLERYSTR_THEME_START + 39)
#define RID_GALLERYSTR_THEME_DIAGRAMS (RID_GALLERYSTR_THEME_START + 40)
#define RID_GALLERYSTR_THEME_ENVIRONMENT (RID_GALLERYSTR_THEME_START + 41)
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
new file mode 100644
index 000000000000..e049c98b8b4f
--- /dev/null
+++ b/svx/inc/strings.hxx
@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_SVX_INC_STRINGS_HXX
+#define INCLUDED_SVX_INC_STRINGS_HXX
+
+#define RID_GALLERYSTR_THEME_HTMLBUTTONS "private://gallery/hidden/HtmlExportButtons"
+#define RID_GALLERYSTR_THEME_POWERPOINT "private://gallery/hidden/imgppt"
+#define RID_GALLERYSTR_THEME_USERSOUNDS "private://gallery/hidden/usersounds"
+#define RID_GALLERYSTR_THEME_FONTWORK "private://gallery/hidden/fontwork"
+#define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL "private://gallery/hidden/fontworkvertical"
+#define RID_GALLERYSTR_THEME_DUMMY5 "Dummy 5"
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 24c88101efea..ae03b34f6c1e 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -39,6 +39,7 @@
#include <sfx2/docfile.hxx>
#include "svx/gallery.hxx"
#include "gallery.hrc"
+#include "strings.hxx"
#include "svx/galmisc.hxx"
#include "svx/galtheme.hxx"
#include "svx/gallery1.hxx"
@@ -459,13 +460,13 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_HOMEPAGE);
break;
case GALLERY_THEME_POWERPOINT:
- aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_POWERPOINT);
+ aFallback = RID_GALLERYSTR_THEME_POWERPOINT;
break;
case GALLERY_THEME_FONTWORK:
- aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK);
+ aFallback = RID_GALLERYSTR_THEME_FONTWORK;
break;
case GALLERY_THEME_FONTWORK_VERTICAL:
- aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK_VERTICAL);
+ aFallback = RID_GALLERYSTR_THEME_FONTWORK_VERTICAL;
break;
case GALLERY_THEME_SOUNDS:
aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_SOUNDS);
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 7cc69daa5f6d..8a75bf77f88b 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -89,18 +89,6 @@ String RID_GALLERYSTR_THEME_SURFACES
Text [ en-US ] = "Surfaces";
};
-String RID_GALLERYSTR_THEME_HTMLBUTTONS
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/HtmlExportButtons";
-};
-
-String RID_GALLERYSTR_THEME_POWERPOINT
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/imgppt";
-};
-
String RID_GALLERYSTR_THEME_COMPUTERS
{
Text [ en-US ] = "Computers";
@@ -146,12 +134,6 @@ String RID_GALLERYSTR_THEME_MYTHEME
Text [ en-US ] = "My Theme";
};
-String RID_GALLERYSTR_THEME_USERSOUNDS
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/usersounds";
-};
-
String RID_GALLERYSTR_THEME_ARROWS
{
Text [ en-US ] = "Arrows";
@@ -222,22 +204,4 @@ String RID_GALLERYSTR_THEME_SCREENBEANS
Text [ en-US ] = "Screen Beans";
};
-String RID_GALLERYSTR_THEME_FONTWORK
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/fontwork";
-};
-
-String RID_GALLERYSTR_THEME_FONTWORK_VERTICAL
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/fontworkvertical";
-};
-
-String RID_GALLERYSTR_THEME_DUMMY5
-{
- // !!! Don't translate, please !!!
- Text = "Dummy 5";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index fb14dce8a06d..472b3c251907 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1259,12 +1259,16 @@ OUString ResMgr::ReadStringWithoutHook()
return aRet;
}
+OUString ResMgr::ExpandVariables(const OUString& rString)
+{
+ if (pImplResHookProc)
+ return pImplResHookProc(rString);
+ return rString;
+}
+
OUString ResMgr::ReadString()
{
- OUString aRet = ReadStringWithoutHook();
- if ( pImplResHookProc )
- aRet = pImplResHookProc( aRet );
- return aRet;
+ return ExpandVariables(ReadStringWithoutHook());
}
void ResMgr::SetReadStringHook( ResHookProc pProc )