summaryrefslogtreecommitdiff
path: root/starmath/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-06-11 20:56:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-21 08:20:50 +0100
commit00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
treefd1a9bb264fe15dcc129498e62060ecd256b1ee7 /starmath/source
parentfa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'starmath/source')
-rw-r--r--starmath/source/ElementsDockingWindow.cxx249
-rw-r--r--starmath/source/accessibility.cxx2
-rw-r--r--starmath/source/action.cxx2
-rw-r--r--starmath/source/cfgitem.cxx1
-rw-r--r--starmath/source/commands.src1062
-rw-r--r--starmath/source/dialog.cxx12
-rw-r--r--starmath/source/document.cxx1
-rw-r--r--starmath/source/edit.cxx3
-rw-r--r--starmath/source/mathmlexport.cxx1
-rw-r--r--starmath/source/mathmlimport.cxx1
-rw-r--r--starmath/source/parse.cxx34
-rw-r--r--starmath/source/smdll.cxx1
-rw-r--r--starmath/source/smmod.cxx59
-rw-r--r--starmath/source/smres.src267
-rw-r--r--starmath/source/symbol.cxx2
-rw-r--r--starmath/source/symbol.src187
-rw-r--r--starmath/source/uiobject.cxx2
-rw-r--r--starmath/source/unomodel.cxx1
-rw-r--r--starmath/source/utility.cxx2
-rw-r--r--starmath/source/view.cxx1
20 files changed, 178 insertions, 1712 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 95fe2e4f12ca..4d09089449e2 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -21,6 +21,7 @@
#include <ElementsDockingWindow.hxx>
#include <starmath.hrc>
+#include <strings.hrc>
#include <smmod.hxx>
#include <view.hxx>
#include <visitors.hxx>
@@ -54,11 +55,11 @@ SmElementSeparator::SmElementSeparator() :
SmElement(std::unique_ptr<SmNode>(), OUString(), OUString())
{}
-const std::pair<const char*, sal_uInt16> SmElementsControl::aUnaryBinaryOperatorsList[] =
+const std::pair<const char*, const char*> SmElementsControl::aUnaryBinaryOperatorsList[] =
{
{RID_PLUSX, RID_PLUSX_HELP}, {RID_MINUSX, RID_MINUSX_HELP},
{RID_PLUSMINUSX, RID_PLUSMINUSX_HELP}, {RID_MINUSPLUSX, RID_MINUSPLUSX_HELP},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
@@ -67,113 +68,113 @@ const std::pair<const char*, sal_uInt16> SmElementsControl::aUnaryBinaryOperator
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{RID_NEGX, RID_NEGX_HELP}, {RID_XANDY, RID_XANDY_HELP}, {RID_XORY, RID_XORY_HELP},
};
-const std::pair<const char*, sal_uInt16> SmElementsControl::aRelationsList[] =
+const std::pair<const char*, const char*> 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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{RID_DLARROW, RID_DLARROW_HELP}, {RID_DLRARROW, RID_DLRARROW_HELP}, {RID_DRARROW, RID_DRARROW_HELP},
- {nullptr, 0},
+ {nullptr, nullptr},
{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 std::pair<const char*, sal_uInt16> SmElementsControl::aSetOperations[] =
+const std::pair<const char*, const char*> SmElementsControl::aSetOperations[] =
{
{RID_XINY, RID_XINY_HELP}, {RID_XNOTINY, RID_XNOTINY_HELP}, {RID_XOWNSY, RID_XOWNSY_HELP},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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 std::pair<const char*, sal_uInt16> SmElementsControl::aFunctions[] =
+const std::pair<const char*, const char*> 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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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 std::pair<const char*, sal_uInt16> SmElementsControl::aOperators[] =
+const std::pair<const char*, const char*> 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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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 std::pair<const char*, sal_uInt16> SmElementsControl::aAttributes[] =
+const std::pair<const char*, const char*> 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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
@@ -184,49 +185,49 @@ const std::pair<const char*, sal_uInt16> SmElementsControl::aAttributes[] =
{RID_COLORX_TEAL, RID_COLORX_TEAL_HELP}
};
-const std::pair<const char*, sal_uInt16> SmElementsControl::aBrackets[] =
+const std::pair<const char*, const char*> SmElementsControl::aBrackets[] =
{
{RID_LRGROUPX, RID_LRGROUPX_HELP},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{RID_XOVERBRACEY, RID_XOVERBRACEY_HELP}, {RID_XUNDERBRACEY, RID_XUNDERBRACEY_HELP},
};
-const std::pair<const char*, sal_uInt16> SmElementsControl::aFormats[] =
+const std::pair<const char*, const char*> 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},
- {nullptr, 0},
+ {nullptr, nullptr},
{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},
- {nullptr, 0},
+ {nullptr, nullptr},
{RID_BINOMXY, RID_BINOMXY_HELP}, {RID_STACK, RID_STACK_HELP},
{RID_MATRIX, RID_MATRIX_HELP},
};
-const std::pair<const char*, sal_uInt16> SmElementsControl::aOthers[] =
+const std::pair<const char*, const char*> 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},
- {nullptr, 0},
+ {nullptr, nullptr},
{RID_LEFTARROW, RID_LEFTARROW_HELP}, {RID_RIGHTARROW, RID_RIGHTARROW_HELP}, {RID_UPARROW, RID_UPARROW_HELP},
{RID_DOWNARROW, RID_DOWNARROW_HELP},
- {nullptr, 0},
+ {nullptr, nullptr},
{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}
};
@@ -234,7 +235,6 @@ const std::pair<const char*, sal_uInt16> SmElementsControl::aOthers[] =
SmElementsControl::SmElementsControl(vcl::Window *pParent)
: Control(pParent, WB_TABSTOP)
, mpDocShell(new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT))
- , maCurrentSetId(0)
, mpCurrentElement(nullptr)
, mbVerticalMode(true)
, mxScroll(VclPtr<ScrollBar>::Create(this, WB_VERT))
@@ -541,104 +541,104 @@ void SmElementsControl::addElement(const OUString& aElementVisual, const OUStrin
maElementList.push_back(o3tl::make_unique<SmElement>(std::move(pNode), aElementSource, aHelpText));
}
-void SmElementsControl::setElementSetId(sal_uInt16 aSetId)
+void SmElementsControl::setElementSetId(const char* pSetId)
{
- maCurrentSetId = aSetId;
+ msCurrentSetId = pSetId;
maMaxElementDimensions = Size();
build();
}
-void SmElementsControl::addElements(const std::pair<const char*, sal_uInt16> aElementsArray[], sal_uInt16 aElementsArraySize)
+void SmElementsControl::addElements(const std::pair<const char*, const char*> aElementsArray[], sal_uInt16 aElementsArraySize)
{
for (sal_uInt16 i = 0; i < aElementsArraySize ; i++)
{
const char* pElement = aElementsArray[i].first;
- sal_uInt16 aElementHelp = aElementsArray[i].second;
+ const char* pElementHelp = aElementsArray[i].second;
if (!pElement) {
maElementList.push_back(o3tl::make_unique<SmElementSeparator>());
} else {
OUString aElement(OUString::createFromAscii(pElement));
if (aElement == RID_NEWLINE)
- addElement(OUString( "\xe2\x86\xb5", 3, RTL_TEXTENCODING_UTF8 ), aElement, SmResId(aElementHelp));
+ addElement(OUString( "\xe2\x86\xb5", 3, RTL_TEXTENCODING_UTF8 ), aElement, SmResId(pElementHelp));
else if (aElement == RID_SBLANK)
- addElement("\"`\"", aElement, SmResId(aElementHelp));
+ addElement("\"`\"", aElement, SmResId(pElementHelp));
else if (aElement == RID_BLANK)
- addElement("\"~\"", aElement, SmResId(aElementHelp));
+ addElement("\"~\"", aElement, SmResId(pElementHelp));
else if (aElement == RID_PHANTOMX)
- addElement("\"" + SmResId(STR_HIDE) +"\"", aElement, SmResId(aElementHelp));
+ addElement("\"" + SmResId(STR_HIDE) +"\"", aElement, SmResId(pElementHelp));
else if (aElement == RID_BOLDX)
- addElement("bold B", aElement, SmResId(aElementHelp));
+ addElement("bold B", aElement, SmResId(pElementHelp));
else if (aElement == RID_ITALX)
- addElement("ital I", aElement, SmResId(aElementHelp));
+ addElement("ital I", aElement, SmResId(pElementHelp));
else if (aElement == RID_SIZEXY)
- addElement("\"" + SmResId(STR_SIZE) + "\"", aElement, SmResId(aElementHelp));
+ addElement("\"" + SmResId(STR_SIZE) + "\"", aElement, SmResId(pElementHelp));
else if (aElement == RID_FONTXY)
- addElement("\"" + SmResId(STR_FONT) + "\"", aElement, SmResId(aElementHelp));
+ addElement("\"" + SmResId(STR_FONT) + "\"", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_BLACK)
- addElement("color black { \"" + SmResId(STR_BLACK) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color black { \"" + SmResId(STR_BLACK) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_BLUE)
- addElement("color blue { \"" + SmResId(STR_BLUE) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color blue { \"" + SmResId(STR_BLUE) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_GREEN)
- addElement("color green { \"" + SmResId(STR_GREEN) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color green { \"" + SmResId(STR_GREEN) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_RED)
- addElement("color red { \"" + SmResId(STR_RED) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color red { \"" + SmResId(STR_RED) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_CYAN)
- addElement("color cyan { \"" + SmResId(STR_CYAN) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color cyan { \"" + SmResId(STR_CYAN) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_MAGENTA)
- addElement("color magenta { \"" + SmResId(STR_MAGENTA) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color magenta { \"" + SmResId(STR_MAGENTA) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_YELLOW)
- addElement("color yellow { \"" + SmResId(STR_YELLOW) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color yellow { \"" + SmResId(STR_YELLOW) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_GRAY)
- addElement("color gray { \"" + SmResId(STR_GRAY) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color gray { \"" + SmResId(STR_GRAY) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_LIME)
- addElement("color lime { \"" + SmResId(STR_LIME) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color lime { \"" + SmResId(STR_LIME) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_MAROON)
- addElement("color maroon { \"" + SmResId(STR_MAROON) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color maroon { \"" + SmResId(STR_MAROON) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_NAVY)
- addElement("color navy { \"" + SmResId(STR_NAVY) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color navy { \"" + SmResId(STR_NAVY) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_OLIVE)
- addElement("color olive { \"" + SmResId(STR_OLIVE) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color olive { \"" + SmResId(STR_OLIVE) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_PURPLE)
- addElement("color purple { \"" + SmResId(STR_PURPLE) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color purple { \"" + SmResId(STR_PURPLE) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_SILVER)
- addElement("color silver { \"" + SmResId(STR_SILVER) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color silver { \"" + SmResId(STR_SILVER) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_COLORX_TEAL)
- addElement("color teal { \"" + SmResId(STR_TEAL) + "\" }", aElement, SmResId(aElementHelp));
+ addElement("color teal { \"" + SmResId(STR_TEAL) + "\" }", aElement, SmResId(pElementHelp));
else if (aElement == RID_ALIGNLX)
- addElement("\"" + SmResId(STR_ALIGN_LEFT) + "\"", aElement, SmResId(aElementHelp));
+ addElement("\"" + SmResId(STR_ALIGN_LEFT) + "\"", aElement, SmResId(pElementHelp));
else if (aElement == RID_ALIGNCX)
- addElement("\"" + SmResId(STR_ALIGN_CENTER) + "\"", aElement, SmResId(aElementHelp));
+ addElement("\"" + SmResId(STR_ALIGN_CENTER) + "\"", aElement, SmResId(pElementHelp));
else if (aElement == RID_ALIGNRX)
- addElement("\"" + SmResId(STR_ALIGN_RIGHT) + "\"", aElement, SmResId(aElementHelp));
+ addElement("\"" + SmResId(STR_ALIGN_RIGHT) + "\"", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLRPARENTX)
- addElement("left ( binom{<?>}{<?>} right ) ", aElement, SmResId(aElementHelp));
+ addElement("left ( binom{<?>}{<?>} right ) ", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLRBRACKETX)
- addElement("left [ binom{<?>}{<?>} right ] ", aElement, SmResId(aElementHelp));
+ addElement("left [ binom{<?>}{<?>} right ] ", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLRDBRACKETX)
- addElement("left ldbracket binom{<?>}{<?>} right rdbracket ", aElement, SmResId(aElementHelp));
+ addElement("left ldbracket binom{<?>}{<?>} right rdbracket ", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLRBRACEX)
- addElement("left lbrace binom{<?>}{<?>} right rbrace ", aElement, SmResId(aElementHelp));
+ addElement("left lbrace binom{<?>}{<?>} right rbrace ", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLRANGLEX)
- addElement("left langle binom{<?>}{<?>} right rangle ", aElement, SmResId(aElementHelp));
+ addElement("left langle binom{<?>}{<?>} right rangle ", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLRCEILX)
- addElement("left lceil binom{<?>}{<?>} right rceil ", aElement, SmResId(aElementHelp));
+ addElement("left lceil binom{<?>}{<?>} right rceil ", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLRFLOORX)
- addElement("left lfloor binom{<?>}{<?>} right rfloor ", aElement, SmResId(aElementHelp));
+ addElement("left lfloor binom{<?>}{<?>} right rfloor ", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLRLINEX)
- addElement("left lline binom{<?>}{<?>} right rline ", aElement, SmResId(aElementHelp));
+ addElement("left lline binom{<?>}{<?>} right rline ", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLRDLINEX)
- addElement("left ldline binom{<?>}{<?>} right rdline ", aElement, SmResId(aElementHelp));
+ addElement("left ldline binom{<?>}{<?>} right rdline ", aElement, SmResId(pElementHelp));
else if (aElement == RID_SLMRANGLEXY)
- addElement("left langle binom{<?>}{<?>} mline binom{<?>}{<?>} right rangle ", aElement, SmResId(aElementHelp));
+ addElement("left langle binom{<?>}{<?>} mline binom{<?>}{<?>} right rangle ", aElement, SmResId(pElementHelp));
else if (aElement == RID_XOVERBRACEY)
- addElement("{<?><?><?>} overbrace {<?>} ", aElement, SmResId(aElementHelp));
+ addElement("{<?><?><?>} overbrace {<?>} ", aElement, SmResId(pElementHelp));
else if (aElement == RID_XUNDERBRACEY)
- addElement("{<?><?><?>} underbrace {<?>} ", aElement, SmResId(aElementHelp));
+ addElement("{<?><?><?>} underbrace {<?>} ", aElement, SmResId(pElementHelp));
else
- addElement(aElement, aElement, SmResId(aElementHelp));
+ addElement(aElement, aElement, SmResId(pElementHelp));
}
}
}
@@ -647,49 +647,36 @@ void SmElementsControl::build()
{
maElementList.clear();
- switch(maCurrentSetId)
+ if (msCurrentSetId == RID_CATEGORY_UNARY_BINARY_OPERATORS)
+ addElements(aUnaryBinaryOperatorsList, SAL_N_ELEMENTS(aUnaryBinaryOperatorsList));
+ else if (msCurrentSetId == RID_CATEGORY_RELATIONS)
+ addElements(aRelationsList, SAL_N_ELEMENTS(aRelationsList));
+ else if (msCurrentSetId == RID_CATEGORY_SET_OPERATIONS)
+ addElements(aSetOperations, SAL_N_ELEMENTS(aSetOperations));
+ else if (msCurrentSetId == RID_CATEGORY_FUNCTIONS)
+ addElements(aFunctions, SAL_N_ELEMENTS(aFunctions));
+ else if (msCurrentSetId == RID_CATEGORY_OPERATORS)
+ addElements(aOperators, SAL_N_ELEMENTS(aOperators));
+ else if (msCurrentSetId == RID_CATEGORY_ATTRIBUTES)
+ addElements(aAttributes, SAL_N_ELEMENTS(aAttributes));
+ else if (msCurrentSetId == RID_CATEGORY_BRACKETS)
+ addElements(aBrackets, SAL_N_ELEMENTS(aBrackets));
+ else if (msCurrentSetId == RID_CATEGORY_FORMATS)
+ addElements(aFormats, SAL_N_ELEMENTS(aFormats));
+ else if (msCurrentSetId == RID_CATEGORY_OTHERS)
+ addElements(aOthers, SAL_N_ELEMENTS(aOthers));
+ else if (msCurrentSetId == RID_CATEGORY_EXAMPLES)
{
- case RID_CATEGORY_UNARY_BINARY_OPERATORS:
- addElements(aUnaryBinaryOperatorsList, SAL_N_ELEMENTS(aUnaryBinaryOperatorsList));
- break;
- case RID_CATEGORY_RELATIONS:
- addElements(aRelationsList, SAL_N_ELEMENTS(aRelationsList));
- break;
- case RID_CATEGORY_SET_OPERATIONS:
- addElements(aSetOperations, SAL_N_ELEMENTS(aSetOperations));
- break;
- case RID_CATEGORY_FUNCTIONS:
- addElements(aFunctions, SAL_N_ELEMENTS(aFunctions));
- break;
- case RID_CATEGORY_OPERATORS:
- addElements(aOperators, SAL_N_ELEMENTS(aOperators));
- break;
- case RID_CATEGORY_ATTRIBUTES:
- addElements(aAttributes, SAL_N_ELEMENTS(aAttributes));
- break;
- case RID_CATEGORY_BRACKETS:
- addElements(aBrackets, SAL_N_ELEMENTS(aBrackets));
- break;
- case RID_CATEGORY_FORMATS:
- addElements(aFormats, SAL_N_ELEMENTS(aFormats));
- break;
- case RID_CATEGORY_OTHERS:
- addElements(aOthers, SAL_N_ELEMENTS(aOthers));
- break;
- case RID_CATEGORY_EXAMPLES:
- {
- OUString aEquation = "C=%pi cdot d = 2 cdot %pi cdot r";
- addElement(aEquation, aEquation, "");
- aEquation = "E=mc^2";
- addElement(aEquation, aEquation, "");
- aEquation = "a^2 + b^2 = c^2";
- addElement(aEquation, aEquation, "");
- aEquation = "f ( x ) = sum from { { i = 0 } } to { infinity } { {f^{(i)}(0)} over {i!} x^i}";
- addElement(aEquation, aEquation, "");
- aEquation = "f ( x ) = {1} over {%sigma sqrt{2%pi} }func e^-{{(x-%mu)^2} over {2%sigma^2}}";
- addElement(aEquation, aEquation, "");
- }
- break;
+ OUString aEquation = "C=%pi cdot d = 2 cdot %pi cdot r";
+ addElement(aEquation, aEquation, "");
+ aEquation = "E=mc^2";
+ addElement(aEquation, aEquation, "");
+ aEquation = "a^2 + b^2 = c^2";
+ addElement(aEquation, aEquation, "");
+ aEquation = "f ( x ) = sum from { { i = 0 } } to { infinity } { {f^{(i)}(0)} over {i!} x^i}";
+ addElement(aEquation, aEquation, "");
+ aEquation = "f ( x ) = {1} over {%sigma sqrt{2%pi} }func e^-{{(x-%mu)^2} over {2%sigma^2}}";
+ addElement(aEquation, aEquation, "");
}
LayoutOrPaintContents();
Invalidate();
@@ -705,7 +692,7 @@ FactoryFunction SmElementsControl::GetUITestFactory() const
return ElementSelectorUIObject::create;
}
-const sal_uInt16 SmElementsDockingWindow::aCategories[] = {
+const char* SmElementsDockingWindow::aCategories[] = {
RID_CATEGORY_UNARY_BINARY_OPERATORS,
RID_CATEGORY_RELATIONS,
RID_CATEGORY_SET_OPERATIONS,
@@ -732,9 +719,9 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
mpElementListBox->SetDropDownLineCount( SAL_N_ELEMENTS(aCategories) );
- for (sal_uInt16 nCategory : aCategories)
+ for (const char* pCategory : aCategories)
{
- mpElementListBox->InsertEntry(SmResId(nCategory));
+ mpElementListBox->InsertEntry(SmResId(pCategory));
}
mpElementListBox->SetSelectHdl(LINK(this, SmElementsDockingWindow, ElementSelectedHandle));
@@ -789,12 +776,12 @@ IMPL_LINK(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, voi
IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void)
{
- for (sal_uInt16 aCurrentCategory : aCategories)
+ for (const char* pCurrentCategory : aCategories)
{
- OUString aCurrentCategoryString = SmResId(aCurrentCategory);
+ OUString aCurrentCategoryString = SmResId(pCurrentCategory);
if (aCurrentCategoryString == rList.GetSelectEntry())
{
- mpElementsControl->setElementSetId(aCurrentCategory);
+ mpElementsControl->setElementSetId(pCurrentCategory);
return;
}
}
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index c335be846891..a43638123405 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -60,6 +60,8 @@
#include <document.hxx>
#include <view.hxx>
#include <o3tl/make_unique.hxx>
+#include "strings.hrc"
+
using namespace com::sun::star;
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx
index a0d47e9c74fd..05467dcfad3d 100644
--- a/starmath/source/action.cxx
+++ b/starmath/source/action.cxx
@@ -20,7 +20,7 @@
#include "action.hxx"
#include "smdll.hxx"
#include "document.hxx"
-#include "starmath.hrc"
+#include "strings.hrc"
#include "strings.hxx"
SmFormatAction::SmFormatAction(SmDocShell *pDocSh,
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 84be03edc1a7..70a649dedfa0 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -33,6 +33,7 @@
#include "cfgitem.hxx"
#include "starmath.hrc"
+#include "strings.hrc"
#include "smdll.hxx"
#include "smmod.hxx"
#include "format.hxx"
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
deleted file mode 100644
index cfa5ecef566f..000000000000
--- a/starmath/source/commands.src
+++ /dev/null
@@ -1,1062 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/sfx.hrc>
-#include "starmath.hrc"
-
-String RID_PLUSX_HELP
-{
- Text [ en-US ] = "+ Sign" ;
-};
-String RID_MINUSX_HELP
-{
- Text [ en-US ] = "- Sign" ;
-};
-String RID_PLUSMINUSX_HELP
-{
- Text [ en-US ] = "+- Sign" ;
-};
-String RID_MINUSPLUSX_HELP
-{
- Text [ en-US ] = "-+ Sign" ;
-};
-String RID_NEGX_HELP
-{
- Text [ en-US ] = "Boolean NOT" ;
-};
-String RID_XPLUSY_HELP
-{
- Text [ en-US ] = "Addition +" ;
-};
-String RID_XMINUSY_HELP
-{
- Text [ en-US ] = "Subtraction -" ;
-};
-String RID_XCDOTY_HELP
-{
- Text [ en-US ] = "Multiplication (Dot)" ;
-};
-String RID_XTIMESY_HELP
-{
- Text [ en-US ] = "Multiplication (x)" ;
-};
-String RID_XSYMTIMESY_HELP
-{
- Text [ en-US ] = "Multiplication (*)" ;
-};
-String RID_XSYMDIVIDEY_HELP
-{
- Text [ en-US ] = "Division (Slash)" ;
-};
-String RID_XDIVY_HELP
-{
- Text [ en-US ] = "Division (÷)" ;
-};
-String RID_XOVERY_HELP
-{
- Text [ en-US ] = "Division (Fraction)" ;
-};
-String RID_XODIVIDEY_HELP
-{
- Text [ en-US ] = "Circled Slash" ;
-};
-String RID_XODOTY_HELP
-{
- Text [ en-US ] = "Circled Dot" ;
-};
-String RID_XOMINUSY_HELP
-{
- Text [ en-US ] = "Circled Minus" ;
-};
-String RID_XOPLUSY_HELP
-{
- Text [ en-US ] = "Circled Plus" ;
-};
-String RID_XOTIMESY_HELP
-{
- Text [ en-US ] = "Tensor Product" ;
-};
-String RID_XANDY_HELP
-{
- Text [ en-US ] = "Boolean AND" ;
-};
-String RID_XORY_HELP
-{
- Text [ en-US ] = "Boolean OR" ;
-};
-String RID_XEQY_HELP
-{
- Text [ en-US ] = "Is Equal" ;
-};
-String RID_XNEQY_HELP
-{
- Text [ en-US ] = "Is Not Equal" ;
-};
-String RID_XLTY_HELP
-{
- Text [ en-US ] = "Is Less Than" ;
-};
-String RID_XGTY_HELP
-{
- Text [ en-US ] = "Is Greater Than" ;
-};
-String RID_XLEY_HELP
-{
- Text [ en-US ] = "Is Less Than Or Equal To" ;
-};
-String RID_XGEY_HELP
-{
- Text [ en-US ] = "Is Greater Than Or Equal To" ;
-};
-String RID_XLESLANTY_HELP
-{
- Text [ en-US ] = "Is Less Than Or Equal To" ;
-};
-String RID_XGESLANTY_HELP
-{
- Text [ en-US ] = "Is Greater Than Or Equal To" ;
-};
-String RID_XLLY_HELP
-{
- Text [ en-US ] = "Is Much Less Than" ;
-};
-String RID_XGGY_HELP
-{
- Text [ en-US ] = "Is Much Greater Than" ;
-};
-String RID_XDEFY_HELP
-{
- Text [ en-US ] = "Is Defined As" ;
-};
-String RID_XEQUIVY_HELP
-{
- Text [ en-US ] = "Is Congruent To" ;
-};
-String RID_XAPPROXY_HELP
-{
- Text [ en-US ] = "Is Approximately Equal" ;
-};
-String RID_XSIMY_HELP
-{
- Text [ en-US ] = "Is Similar To" ;
-};
-String RID_XSIMEQY_HELP
-{
- Text [ en-US ] = "Is Similar Or Equal" ;
-};
-String RID_XPROPY_HELP
-{
- Text [ en-US ] = "Is Proportional To" ;
-};
-String RID_XORTHOY_HELP
-{
- Text [ en-US ] = "Is Orthogonal To" ;
-};
-String RID_XPARALLELY_HELP
-{
- Text [ en-US ] = "Is Parallel To" ;
-};
-String RID_XTOWARDY_HELP
-{
- Text [ en-US ] = "Toward" ;
-};
-String RID_XTRANSLY_HELP
-{
- Text [ en-US ] = "Corresponds To (Left)" ;
-};
-String RID_XTRANSRY_HELP
-{
- Text [ en-US ] = "Corresponds To (Right)" ;
-};
-String RID_XINY_HELP
-{
- Text [ en-US ] = "Is In" ;
-};
-String RID_XNOTINY_HELP
-{
- Text [ en-US ] = "Is Not In" ;
-};
-String RID_XOWNSY_HELP
-{
- Text [ en-US ] = "Owns" ;
-};
-String RID_XUNIONY_HELP
-{
- Text [ en-US ] = "Union" ;
-};
-String RID_XINTERSECTIONY_HELP
-{
- Text [ en-US ] = "Intersection" ;
-};
-String RID_XSETMINUSY_HELP
-{
- Text [ en-US ] = "Difference" ;
-};
-String RID_XSLASHY_HELP
-{
- Text [ en-US ] = "Quotient Set" ;
-};
-String RID_XSUBSETY_HELP
-{
- Text [ en-US ] = "Subset" ;
-};
-String RID_XSUBSETEQY_HELP
-{
- Text [ en-US ] = "Subset Or Equal To" ;
-};
-String RID_XSUPSETY_HELP
-{
- Text [ en-US ] = "Superset" ;
-};
-String RID_XSUPSETEQY_HELP
-{
- Text [ en-US ] = "Superset Or Equal To" ;
-};
-String RID_XNSUBSETY_HELP
-{
- Text [ en-US ] = "Not Subset" ;
-};
-String RID_XNSUBSETEQY_HELP
-{
- Text [ en-US ] = "Not Subset Or Equal" ;
-};
-String RID_XNSUPSETY_HELP
-{
- Text [ en-US ] = "Not Superset" ;
-};
-String RID_XNSUPSETEQY_HELP
-{
- Text [ en-US ] = "Not Superset Or Equal" ;
-};
-String RID_ABSX_HELP
-{
- Text [ en-US ] = "Absolute Value" ;
-};
-String RID_FACTX_HELP
-{
- Text [ en-US ] = "Factorial" ;
-};
-String RID_SQRTX_HELP
-{
- Text [ en-US ] = "Square Root" ;
-};
-String RID_NROOTXY_HELP
-{
- Text [ en-US ] = "N-th Root" ;
-};
-String RID_EX_HELP
-{
- Text [ en-US ] = "Exponential Function" ;
-};
-String RID_EXPX_HELP
-{
- Text [ en-US ] = "Exponential Function" ;
-};
-String RID_LNX_HELP
-{
- Text [ en-US ] = "Natural Logarithm" ;
-};
-String RID_LOGX_HELP
-{
- Text [ en-US ] = "Logarithm" ;
-};
-String RID_SINX_HELP
-{
- Text [ en-US ] = "Sine" ;
-};
-String RID_COSX_HELP
-{
- Text [ en-US ] = "Cosine" ;
-};
-String RID_TANX_HELP
-{
- Text [ en-US ] = "Tangent" ;
-};
-String RID_COTX_HELP
-{
- Text [ en-US ] = "Cotangent" ;
-};
-String RID_ARCSINX_HELP
-{
- Text [ en-US ] = "Arcsine" ;
-};
-String RID_ARCCOSX_HELP
-{
- Text [ en-US ] = "Arccosine" ;
-};
-String RID_ARCTANX_HELP
-{
- Text [ en-US ] = "Arctangent" ;
-};
-String RID_ARCCOTX_HELP
-{
- Text [ en-US ] = "Arccotangent" ;
-};
-String RID_SINHX_HELP
-{
- Text [ en-US ] = "Hyperbolic Sine" ;
-};
-String RID_COSHX_HELP
-{
- Text [ en-US ] = "Hyperbolic Cosine" ;
-};
-String RID_TANHX_HELP
-{
- Text [ en-US ] = "Hyperbolic Tangent" ;
-};
-String RID_COTHX_HELP
-{
- Text [ en-US ] = "Hyperbolic Cotangent" ;
-};
-String RID_ARSINHX_HELP
-{
- Text [ en-US ] = "Area Hyperbolic Sine" ;
-};
-String RID_ARCOSHX_HELP
-{
- Text [ en-US ] = "Area Hyperbolic Cosine" ;
-};
-String RID_ARTANHX_HELP
-{
- Text [ en-US ] = "Area Hyperbolic Tangent" ;
-};
-String RID_ARCOTHX_HELP
-{
- Text [ en-US ] = "Area Hyperbolic Cotangent" ;
-};
-String RID_SUMX_HELP
-{
- Text [ en-US ] = "Sum" ;
-};
-String RID_SUM_FROMX_HELP
-{
- Text [ en-US ] = "Sum Subscript Bottom" ;
-};
-String RID_SUM_TOX_HELP
-{
- Text [ en-US ] = "Sum Superscript Top" ;
-};
-String RID_SUM_FROMTOX_HELP
-{
- Text [ en-US ] = "Sum Sup/Sub script" ;
-};
-String RID_PRODX_HELP
-{
- Text [ en-US ] = "Product" ;
-};
-String RID_PROD_FROMX_HELP
-{
- Text [ en-US ] = "Product Subscript Bottom" ;
-};
-String RID_PROD_TOX_HELP
-{
- Text [ en-US ] = "Product Superscript Top" ;
-};
-String RID_PROD_FROMTOX_HELP
-{
- Text [ en-US ] = "Product Sup/Sub script" ;
-};
-String RID_COPRODX_HELP
-{
- Text [ en-US ] = "Coproduct" ;
-};
-String RID_COPROD_FROMX_HELP
-{
- Text [ en-US ] = "Coproduct Subscript Bottom" ;
-};
-String RID_COPROD_TOX_HELP
-{
- Text [ en-US ] = "Coproduct Superscript Top" ;
-};
-String RID_COPROD_FROMTOX_HELP
-{
- Text [ en-US ] = "Coproduct Sup/Sub script" ;
-};
-String RID_LIMX_HELP
-{
- Text [ en-US ] = "Limes" ;
-};
-String RID_LIM_FROMX_HELP
-{
- Text [ en-US ] = "Limes Subscript Bottom" ;
-};
-String RID_LIM_TOX_HELP
-{
- Text [ en-US ] = "Limes Superscript Top" ;
-};
-String RID_LIM_FROMTOX_HELP
-{
- Text [ en-US ] = "Limes Sup/Sub script" ;
-};
-String RID_LIMINFX_HELP
-{
- Text [ en-US ] = "Limit Inferior" ;
-};
-String RID_LIMINF_FROMX_HELP
-{
- Text [ en-US ] = "Limit Inferior Subscript Bottom" ;
-};
-String RID_LIMINF_TOX_HELP
-{
- Text [ en-US ] = "Limit Inferior Superscript Top" ;
-};
-String RID_LIMINF_FROMTOX_HELP
-{
- Text [ en-US ] = "Limit Inferior Sup/Sub script" ;
-};
-String RID_LIMSUPX_HELP
-{
- Text [ en-US ] = "Limit Superior" ;
-};
-String RID_LIMSUP_FROMX_HELP
-{
- Text [ en-US ] = "Limit Superior Subscript Bottom" ;
-};
-String RID_LIMSUP_TOX_HELP
-{
- Text [ en-US ] = "Limit Superior Superscript Top" ;
-};
-String RID_LIMSUP_FROMTOX_HELP
-{
- Text [ en-US ] = "Limit Superior Sup/Sub script" ;
-};
-String RID_EXISTS_HELP
-{
- Text [ en-US ] = "There Exists" ;
-};
-String RID_NOTEXISTS_HELP
-{
- Text [ en-US ] = "There Not Exists" ;
-};
-String RID_FORALL_HELP
-{
- Text [ en-US ] = "For all" ;
-};
-String RID_INTX_HELP
-{
- Text [ en-US ] = "Integral" ;
-};
-String RID_INT_FROMX_HELP
-{
- Text [ en-US ] = "Integral Subscript Bottom" ;
-};
-String RID_INT_TOX_HELP
-{
- Text [ en-US ] = "Integral Superscript Top" ;
-};
-String RID_INT_FROMTOX_HELP
-{
- Text [ en-US ] = "Integral Sup/Sub script" ;
-};
-String RID_IINTX_HELP
-{
- Text [ en-US ] = "Double Integral" ;
-};
-String RID_IINT_FROMX_HELP
-{
- Text [ en-US ] = "Double Integral Subscript Bottom" ;
-};
-String RID_IINT_TOX_HELP
-{
- Text [ en-US ] = "Double Integral Superscript Top" ;
-};
-String RID_IINT_FROMTOX_HELP
-{
- Text [ en-US ] = "Double Integral Sup/Sub script" ;
-};
-String RID_IIINTX_HELP
-{
- Text [ en-US ] = "Triple Integral" ;
-};
-String RID_IIINT_FROMX_HELP
-{
- Text [ en-US ] = "Triple Integral Subscript Bottom" ;
-};
-String RID_IIINT_TOX_HELP
-{
- Text [ en-US ] = "Triple Integral Superscript Top" ;
-};
-String RID_IIINT_FROMTOX_HELP
-{
- Text [ en-US ] = "Triple Integral Sup/Sub script" ;
-};
-String RID_LINTX_HELP
-{
- Text [ en-US ] = "Curve Integral" ;
-};
-String RID_LINT_FROMX_HELP
-{
- Text [ en-US ] = "Curve Integral Subscript Bottom" ;
-};
-String RID_LINT_TOX_HELP
-{
- Text [ en-US ] = "Curve Integral Superscript Top" ;
-};
-String RID_LINT_FROMTOX_HELP
-{
- Text [ en-US ] = "Curve Integral Sup/Sub script" ;
-};
-String RID_LLINTX_HELP
-{
- Text [ en-US ] = "Double Curve Integral" ;
-};
-String RID_LLINT_FROMX_HELP
-{
- Text [ en-US ] = "Double Curve Integral Subscript Bottom" ;
-};
-String RID_LLINT_TOX_HELP
-{
- Text [ en-US ] = "Double Curve Integral Superscript Top" ;
-};
-String RID_LLINT_FROMTOX_HELP
-{
- Text [ en-US ] = "Double Curve Integral Sup/Sub script" ;
-};
-String RID_LLLINTX_HELP
-{
- Text [ en-US ] = "Triple Curve Integral" ;
-};
-String RID_LLLINT_FROMX_HELP
-{
- Text [ en-US ] = "Triple Curve Integral Subscript Bottom" ;
-};
-String RID_LLLINT_TOX_HELP
-{
- Text [ en-US ] = "Triple Curve Integral Superscript Top" ;
-};
-String RID_LLLINT_FROMTOX_HELP
-{
- Text [ en-US ] = "Triple Curve Integral Sup/Sub script" ;
-};
-String RID_ACUTEX_HELP
-{
- Text [ en-US ] = "Acute Accent" ;
-};
-String RID_BARX_HELP
-{
- Text [ en-US ] = "Line Above" ;
-};
-String RID_BREVEX_HELP
-{
- Text [ en-US ] = "Breve" ;
-};
-String RID_CHECKX_HELP
-{
- Text [ en-US ] = "Reverse Circumflex" ;
-};
-String RID_CIRCLEX_HELP
-{
- Text [ en-US ] = "Circle" ;
-};
-String RID_DOTX_HELP
-{
- Text [ en-US ] = "Dot" ;
-};
-String RID_DDOTX_HELP
-{
- Text [ en-US ] = "Double Dot" ;
-};
-String RID_DDDOTX_HELP
-{
- Text [ en-US ] = "Triple Dot" ;
-};
-String RID_GRAVEX_HELP
-{
- Text [ en-US ] = "Grave Accent" ;
-};
-String RID_HATX_HELP
-{
- Text [ en-US ] = "Circumflex" ;
-};
-String RID_TILDEX_HELP
-{
- Text [ en-US ] = "Tilde" ;
-};
-String RID_VECX_HELP
-{
- Text [ en-US ] = "Vector Arrow" ;
-};
-String RID_UNDERLINEX_HELP
-{
- Text [ en-US ] = "Line Below" ;
-};
-String RID_OVERLINEX_HELP
-{
- Text [ en-US ] = "Line Over" ;
-};
-String RID_OVERSTRIKEX_HELP
-{
- Text [ en-US ] = "Line Through" ;
-};
-String RID_PHANTOMX_HELP
-{
- Text [ en-US ] = "Transparent" ;
-};
-String RID_BOLDX_HELP
-{
- Text [ en-US ] = "Bold Font" ;
-};
-String RID_ITALX_HELP
-{
- Text [ en-US ] = "Italic Font" ;
-};
-String RID_SIZEXY_HELP
-{
- Text [ en-US ] = "Resize" ;
-};
-String RID_FONTXY_HELP
-{
- Text [ en-US ] = "Change Font" ;
-};
-String RID_COLORX_BLACK_HELP
-{
- Text [ en-US ] = "Color Black" ;
-};
-String RID_COLORX_BLUE_HELP
-{
- Text [ en-US ] = "Color Blue" ;
-};
-String RID_COLORX_GREEN_HELP
-{
- Text [ en-US ] = "Color Green" ;
-};
-String RID_COLORX_RED_HELP
-{
- Text [ en-US ] = "Color Red" ;
-};
-String RID_COLORX_CYAN_HELP
-{
- Text [ en-US ] = "Color Cyan" ;
-};
-String RID_COLORX_MAGENTA_HELP
-{
- Text [ en-US ] = "Color Magenta" ;
-};
-String RID_COLORX_GRAY_HELP
-{
- Text [ en-US ] = "Color Gray" ;
-};
-String RID_COLORX_LIME_HELP
-{
- Text [ en-US ] = "Color Lime" ;
-};
-String RID_COLORX_MAROON_HELP
-{
- Text [ en-US ] = "Color Maroon" ;
-};
-String RID_COLORX_NAVY_HELP
-{
- Text [ en-US ] = "Color Navy" ;
-};
-String RID_COLORX_OLIVE_HELP
-{
- Text [ en-US ] = "Color Olive" ;
-};
-String RID_COLORX_PURPLE_HELP
-{
- Text [ en-US ] = "Color Purple" ;
-};
-String RID_COLORX_SILVER_HELP
-{
- Text [ en-US ] = "Color Silver" ;
-};
-String RID_COLORX_TEAL_HELP
-{
- Text [ en-US ] = "Color Teal" ;
-};
-String RID_COLORX_YELLOW_HELP
-{
- Text [ en-US ] = "Color Yellow" ;
-};
-
-String RID_LRGROUPX_HELP
-{
- Text [ en-US ] = "Group Brackets" ;
-};
-String RID_LRPARENTX_HELP
-{
- Text [ en-US ] = "Round Brackets" ;
-};
-String RID_LRBRACKETX_HELP
-{
- Text [ en-US ] = "Square Brackets" ;
-};
-String RID_LRDBRACKETX_HELP
-{
- Text [ en-US ] = "Double Square Brackets" ;
-};
-String RID_LRBRACEX_HELP
-{
- Text [ en-US ] = "Braces" ;
-};
-String RID_LRANGLEX_HELP
-{
- Text [ en-US ] = "Angle Brackets" ;
-};
-String RID_LRCEILX_HELP
-{
- Text [ en-US ] = "Upper Ceil" ;
-};
-String RID_LRFLOORX_HELP
-{
- Text [ en-US ] = "Floor" ;
-};
-String RID_LRLINEX_HELP
-{
- Text [ en-US ] = "Single Lines" ;
-};
-String RID_LRDLINEX_HELP
-{
- Text [ en-US ] = "Double Lines" ;
-};
-String RID_LMRANGLEXY_HELP
-{
- Text [ en-US ] = "Operator Brackets" ;
-};
-String RID_SLRPARENTX_HELP
-{
- Text [ en-US ] = "Round Brackets (Scalable)" ;
-};
-String RID_SLRBRACKETX_HELP
-{
- Text [ en-US ] = "Square Brackets (Scalable)" ;
-};
-String RID_SLRDBRACKETX_HELP
-{
- Text [ en-US ] = "Double Square Brackets (Scalable)" ;
-};
-String RID_SLRBRACEX_HELP
-{
- Text [ en-US ] = "Braces (Scalable)" ;
-};
-String RID_SLRANGLEX_HELP
-{
- Text [ en-US ] = "Angle Brackets (Scalable)" ;
-};
-String RID_SLRCEILX_HELP
-{
- Text [ en-US ] = "Ceiling (Scalable)" ;
-};
-String RID_SLRFLOORX_HELP
-{
- Text [ en-US ] = "Floor (Scalable)" ;
-};
-String RID_SLRLINEX_HELP
-{
- Text [ en-US ] = "Single Lines (Scalable)" ;
-};
-String RID_SLRDLINEX_HELP
-{
- Text [ en-US ] = "Double Lines (Scalable)" ;
-};
-String RID_SLMRANGLEXY_HELP
-{
- Text [ en-US ] = "Operator Brackets (Scalable)" ;
-};
-String RID_XEVALUATEDATY_HELP
-{
- Text [ en-US ] = "Evaluated At" ;
-};
-String RID_XOVERBRACEY_HELP
-{
- Text [ en-US ] = "Braces Top (Scalable)" ;
-};
-String RID_XUNDERBRACEY_HELP
-{
- Text [ en-US ] = "Braces Bottom (Scalable)" ;
-};
-String RID_RSUBX_HELP
-{
- Text [ en-US ] = "Subscript Right" ;
-};
-String RID_RSUPX_HELP
-{
- Text [ en-US ] = "Power" ;
-};
-String RID_LSUBX_HELP
-{
- Text [ en-US ] = "Subscript Left" ;
-};
-String RID_LSUPX_HELP
-{
- Text [ en-US ] = "Superscript Left" ;
-};
-String RID_CSUBX_HELP
-{
- Text [ en-US ] = "Subscript Bottom" ;
-};
-String RID_CSUPX_HELP
-{
- Text [ en-US ] = "Superscript Top" ;
-};
-String RID_SBLANK_HELP
-{
- Text [ en-US ] = "Small Gap" ;
-};
-String RID_BLANK_HELP
-{
- Text [ en-US ] = "Blank" ;
-};
-String RID_NEWLINE_HELP
-{
- Text [ en-US ] = "New Line" ;
-};
-String RID_BINOMXY_HELP
-{
- Text [ en-US ] = "Vertical Stack (2 Elements)";
-};
-String RID_STACK_HELP
-{
- Text [ en-US ] = "Vertical Stack" ;
-};
-String RID_MATRIX_HELP
-{
- Text [ en-US ] = "Matrix Stack" ;
-};
-String RID_ALIGNLX_HELP
-{
- Text [ en-US ] = "Align Left" ;
-};
-String RID_ALIGNCX_HELP
-{
- Text [ en-US ] = "Align Center" ;
-};
-String RID_ALIGNRX_HELP
-{
- Text [ en-US ] = "Align Right" ;
-};
-String RID_ALEPH_HELP
-{
- Text [ en-US ] = "Aleph" ;
-};
-String RID_EMPTYSET_HELP
-{
- Text [ en-US ] = "Empty Set" ;
-};
-String RID_RE_HELP
-{
- Text [ en-US ] = "Real Part" ;
-};
-String RID_IM_HELP
-{
- Text [ en-US ] = "Imaginary Part" ;
-};
-String RID_INFINITY_HELP
-{
- Text [ en-US ] = "Infinity" ;
-};
-String RID_PARTIAL_HELP
-{
- Text [ en-US ] = "Partial" ;
-};
-String RID_NABLA_HELP
-{
- Text [ en-US ] = "Nabla" ;
-};
-String RID_WP_HELP
-{
- Text [ en-US ] = "Weierstrass p" ;
-};
-String RID_DOTSAXIS_HELP
-{
- Text [ en-US ] = "Dots In Middle" ;
-};
-String RID_DOTSUP_HELP
-{
- Text [ en-US ] = "Dots To Top" ;
-};
-String RID_DOTSDOWN_HELP
-{
- Text [ en-US ] = "Dots To Bottom" ;
-};
-String RID_DOTSLOW_HELP
-{
- Text [ en-US ] = "Dots At Bottom" ;
-};
-String RID_DOTSVERT_HELP
-{
- Text [ en-US ] = "Dots Vertically" ;
-};
-String RID_XCIRCY_HELP
-{
- Text [ en-US ] = "Concatenate" ;
-};
-String RID_XWIDESLASHY_HELP
-{
- Text [ en-US ] = "Division (wideslash)" ;
-};
-String RID_XWIDEBSLASHY_HELP
-{
- Text [ en-US ] = "Division (counter wideslash)" ;
-};
-String RID_XDIVIDESY_HELP
-{
- Text [ en-US ] = "Divides" ;
-};
-String RID_XNDIVIDESY_HELP
-{
- Text [ en-US ] = "Does Not Divide" ;
-};
-String RID_DLARROW_HELP
-{
- Text [ en-US ] = "Double Arrow Left" ;
-};
-String RID_DLRARROW_HELP
-{
- Text [ en-US ] = "Double Arrow Left And Right" ;
-};
-String RID_DRARROW_HELP
-{
- Text [ en-US ] = "Double Arrow Right" ;
-};
-String RID_SETN_HELP
-{
- Text [ en-US ] = "Natural Numbers Set" ;
-};
-String RID_SETZ_HELP
-{
- Text [ en-US ] = "Integers Set" ;
-};
-String RID_SETQ_HELP
-{
- Text [ en-US ] = "Set of Rational Numbers" ;
-};
-String RID_SETR_HELP
-{
- Text [ en-US ] = "Real Numbers Set" ;
-};
-String RID_SETC_HELP
-{
- Text [ en-US ] = "Complex Numbers Set" ;
-};
-String RID_WIDEHATX_HELP
-{
- Text [ en-US ] = "Large Circumflex" ;
-};
-String RID_WIDETILDEX_HELP
-{
- Text [ en-US ] = "Large Tilde" ;
-};
-String RID_WIDEVECX_HELP
-{
- Text [ en-US ] = "Large Vector Arrow" ;
-};
-String RID_HBAR_HELP
-{
- Text [ en-US ] = "h Bar" ;
-};
-String RID_LAMBDABAR_HELP
-{
- Text [ en-US ] = "Lambda Bar" ;
-};
-String RID_LEFTARROW_HELP
-{
- Text [ en-US ] = "Left Arrow" ;
-};
-String RID_RIGHTARROW_HELP
-{
- Text [ en-US ] = "Right Arrow" ;
-};
-String RID_UPARROW_HELP
-{
- Text [ en-US ] = "Up Arrow" ;
-};
-String RID_DOWNARROW_HELP
-{
- Text [ en-US ] = "Down Arrow" ;
-};
-String RID_NOSPACE_HELP
-{
- Text [ en-US ] = "No space" ;
-};
-String RID_XPRECEDESY_HELP
-{
- Text [ en-US ] = "Precedes" ;
-};
-String RID_XPRECEDESEQUALY_HELP
-{
- Text [ en-US ] = "Precedes or equal to" ;
-};
-String RID_XPRECEDESEQUIVY_HELP
-{
- Text [ en-US ] = "Precedes or equivalent to" ;
-};
-String RID_XSUCCEEDSY_HELP
-{
- Text [ en-US ] = "Succeeds" ;
-};
-String RID_XSUCCEEDSEQUALY_HELP
-{
- Text [ en-US ] = "Succeeds or equal to" ;
-};
-String RID_XSUCCEEDSEQUIVY_HELP
-{
- Text [ en-US ] = "Succeeds or equivalent to" ;
-};
-String RID_XNOTPRECEDESY_HELP
-{
- Text [ en-US ] = "Not precedes" ;
-};
-String RID_XNOTSUCCEEDSY_HELP
-{
- Text [ en-US ] = "Not succeeds" ;
-};
-
-String RID_CATEGORY_UNARY_BINARY_OPERATORS
-{
- Text [ en-US ] = "Unary/Binary Operators" ;
-};
-String RID_CATEGORY_RELATIONS
-{
- Text [ en-US ] = "Relations" ;
-};
-String RID_CATEGORY_SET_OPERATIONS
-{
- Text [ en-US ] = "Set Operations" ;
-};
-String RID_CATEGORY_FUNCTIONS
-{
- Text [ en-US ] = "Functions" ;
-};
-String RID_CATEGORY_OPERATORS
-{
- Text [ en-US ] = "Operators" ;
-};
-String RID_CATEGORY_ATTRIBUTES
-{
- Text [ en-US ] = "Attributes" ;
-};
-String RID_CATEGORY_BRACKETS
-{
- Text [ en-US ] = "Brackets" ;
-};
-String RID_CATEGORY_FORMATS
-{
- Text [ en-US ] = "Formats" ;
-};
-String RID_CATEGORY_OTHERS
-{
- Text [ en-US ] = "Others" ;
-};
-String RID_CATEGORY_EXAMPLES
-{
- Text [ en-US ] = "Examples" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index ec8d8a2d5560..16d237dcb4b2 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -21,7 +21,6 @@
#include <cassert>
-#include "tools/rcid.h"
#include <comphelper/string.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
@@ -44,6 +43,8 @@
#include "dialog.hxx"
#include "starmath.hrc"
+#include "strings.hrc"
+#include "helpids.h"
#include "cfgitem.hxx"
#include "smmod.hxx"
#include "symbol.hxx"
@@ -92,12 +93,11 @@ public:
const OUString& GetStyleName(sal_uInt16 nIdx) const;
};
-SmFontStyles::SmFontStyles() :
- aNormal (ResId(RID_FONTREGULAR, *SM_MOD()->GetResMgr())),
- aBold (ResId(RID_FONTBOLD, *SM_MOD()->GetResMgr())),
- aItalic (ResId(RID_FONTITALIC, *SM_MOD()->GetResMgr()))
+SmFontStyles::SmFontStyles()
+ : aNormal(SmResId(RID_FONTREGULAR))
+ , aBold(SmResId(RID_FONTBOLD))
+ , aItalic(SmResId(RID_FONTITALIC))
{
-
aBoldItalic = aBold;
aBoldItalic += ", ";
aBoldItalic += aItalic;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 998a648e05eb..b335e6ee81dc 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -77,6 +77,7 @@
#include <format.hxx>
#include <smdll.hxx>
#include <starmath.hrc>
+#include <strings.hrc>
#include <symbol.hxx>
#include <unomodel.hxx>
#include <utility.hxx>
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index b2e41cd36d3d..a499763b10ba 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -23,8 +23,9 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <toolkit/helper/vclunohelper.hxx>
-
#include "starmath.hrc"
+#include "strings.hrc"
+#include "helpids.h"
#include <vcl/menu.hxx>
#include <vcl/settings.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index e737b848c08e..68ba77331b7d 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -67,6 +67,7 @@
#include "mathmlexport.hxx"
#include "register.hxx"
#include <starmath.hrc>
+#include <strings.hrc>
#include <unomodel.hxx>
#include <document.hxx>
#include <utility.hxx>
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 2b12163f5697..eac8b6e758e6 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -68,6 +68,7 @@ one go*/
#include "mathmlimport.hxx"
#include "register.hxx"
#include <starmath.hrc>
+#include <strings.hrc>
#include <unomodel.hxx>
#include <document.hxx>
#include <utility.hxx>
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 2d45f0bc5445..d5e891f155d8 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -26,7 +26,7 @@
#include <o3tl/make_unique.hxx>
#include <vcl/settings.hxx>
#include "parse.hxx"
-#include "starmath.hrc"
+#include "strings.hrc"
#include "smdll.hxx"
#include "smmod.hxx"
#include "cfgitem.hxx"
@@ -2221,28 +2221,28 @@ void SmParser::AddError(SmParseError Type, SmNode *pNode)
pErrDesc->m_pNode = pNode;
pErrDesc->m_aText = SmResId(RID_ERR_IDENT);
- sal_uInt16 nRID;
+ const char* pRID;
switch (Type)
{
- case SmParseError::UnexpectedChar: nRID = RID_ERR_UNEXPECTEDCHARACTER; break;
- case SmParseError::UnexpectedToken: nRID = RID_ERR_UNEXPECTEDTOKEN; break;
- case SmParseError::PoundExpected: nRID = RID_ERR_POUNDEXPECTED; break;
- case SmParseError::ColorExpected: nRID = RID_ERR_COLOREXPECTED; break;
- case SmParseError::LgroupExpected: nRID = RID_ERR_LGROUPEXPECTED; break;
- case SmParseError::RgroupExpected: nRID = RID_ERR_RGROUPEXPECTED; break;
- case SmParseError::LbraceExpected: nRID = RID_ERR_LBRACEEXPECTED; break;
- case SmParseError::RbraceExpected: nRID = RID_ERR_RBRACEEXPECTED; break;
- case SmParseError::ParentMismatch: nRID = RID_ERR_PARENTMISMATCH; break;
- case SmParseError::RightExpected: nRID = RID_ERR_RIGHTEXPECTED; break;
- case SmParseError::FontExpected: nRID = RID_ERR_FONTEXPECTED; break;
- case SmParseError::SizeExpected: nRID = RID_ERR_SIZEEXPECTED; break;
- case SmParseError::DoubleAlign: nRID = RID_ERR_DOUBLEALIGN; break;
- case SmParseError::DoubleSubsupscript: nRID = RID_ERR_DOUBLESUBSUPSCRIPT; break;
+ case SmParseError::UnexpectedChar: pRID = RID_ERR_UNEXPECTEDCHARACTER; break;
+ case SmParseError::UnexpectedToken: pRID = RID_ERR_UNEXPECTEDTOKEN; break;
+ case SmParseError::PoundExpected: pRID = RID_ERR_POUNDEXPECTED; break;
+ case SmParseError::ColorExpected: pRID = RID_ERR_COLOREXPECTED; break;
+ case SmParseError::LgroupExpected: pRID = RID_ERR_LGROUPEXPECTED; break;
+ case SmParseError::RgroupExpected: pRID = RID_ERR_RGROUPEXPECTED; break;
+ case SmParseError::LbraceExpected: pRID = RID_ERR_LBRACEEXPECTED; break;
+ case SmParseError::RbraceExpected: pRID = RID_ERR_RBRACEEXPECTED; break;
+ case SmParseError::ParentMismatch: pRID = RID_ERR_PARENTMISMATCH; break;
+ case SmParseError::RightExpected: pRID = RID_ERR_RIGHTEXPECTED; break;
+ case SmParseError::FontExpected: pRID = RID_ERR_FONTEXPECTED; break;
+ case SmParseError::SizeExpected: pRID = RID_ERR_SIZEEXPECTED; break;
+ case SmParseError::DoubleAlign: pRID = RID_ERR_DOUBLEALIGN; break;
+ case SmParseError::DoubleSubsupscript: pRID = RID_ERR_DOUBLESUBSUPSCRIPT; break;
default:
assert(false);
return;
}
- pErrDesc->m_aText += SmResId(nRID);
+ pErrDesc->m_aText += SmResId(pRID);
m_aErrDescList.push_back(std::move(pErrDesc));
}
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index 162d26e915fd..2373e1e5d4ec 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -36,6 +36,7 @@
#include <ElementsDockingWindow.hxx>
#include <starmath.hrc>
+#include <strings.hrc>
#include <svx/xmlsecctrl.hxx>
#include <o3tl/make_unique.hxx>
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index b257e9308b8d..0e821d5b9d01 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -25,6 +25,7 @@
#include <sfx2/sfx.hrc>
#include <sfx2/viewsh.hxx>
#include <svx/svxids.hrc>
+#include <tools/resmgr.hxx>
#include <vcl/virdev.hxx>
#include <unotools/syslocale.hxx>
#include "smmod.hxx"
@@ -33,6 +34,8 @@
#include "dialog.hxx"
#include "edit.hxx"
#include "view.hxx"
+#include "strings.hrc"
+#include "smmod.hrc"
#include "starmath.hrc"
#include "svx/modctrl.hxx"
@@ -40,16 +43,12 @@
#define SmModule
#include "smslots.hxx"
-OUString SmResId(sal_uInt16 nId)
+OUString SmResId(const char* pId)
{
- return ResId(nId, *SM_MOD()->GetResMgr());
+ return Translate::get(pId, SM_MOD()->GetResLocale());
}
-SmLocalizedSymbolData::SmLocalizedSymbolData() :
- aUiSymbolNamesAry (ResId(RID_UI_SYMBOL_NAMES, *SM_MOD()->GetResMgr())),
- aExportSymbolNamesAry (ResId(RID_EXPORT_SYMBOL_NAMES, *SM_MOD()->GetResMgr())),
- aUiSymbolSetNamesAry (ResId(RID_UI_SYMBOLSET_NAMES, *SM_MOD()->GetResMgr())),
- aExportSymbolSetNamesAry(ResId(RID_EXPORT_SYMBOLSET_NAMES, *SM_MOD()->GetResMgr()))
+SmLocalizedSymbolData::SmLocalizedSymbolData()
{
}
@@ -61,15 +60,11 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa
{
OUString aRes;
- const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
- const ResStringArray &rUiNames = rData.GetUiSymbolNamesArray();
- const ResStringArray &rExportNames = rData.GetExportSymbolNamesArray();
- sal_uInt32 nCount = rExportNames.Count();
- for (sal_uInt32 i = 0; i < nCount; ++i)
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOL_NAMES); ++i)
{
- if (rExportNames.GetString(i) == rExportName)
+ if (rExportName.equalsAscii(strchr(RID_UI_SYMBOL_NAMES[i], '\004') + 1))
{
- aRes = rUiNames.GetString(i);
+ aRes = SmResId(RID_UI_SYMBOL_NAMES[i]);
break;
}
}
@@ -81,15 +76,12 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa
{
OUString aRes;
- const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
- const ResStringArray &rUiNames = rData.GetUiSymbolNamesArray();
- const ResStringArray &rExportNames = rData.GetExportSymbolNamesArray();
- sal_uInt32 nCount = rUiNames.Count();
- for (sal_uInt32 i = 0; i < nCount; ++i)
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOL_NAMES); ++i)
{
- if (rUiNames.GetString(i) == rUiName)
+ if (rUiName == SmResId(RID_UI_SYMBOL_NAMES[i]))
{
- aRes = rExportNames.GetString(i);
+ const char *pKey = strchr(RID_UI_SYMBOL_NAMES[i], '\004') + 1;
+ aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
break;
}
}
@@ -101,15 +93,11 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor
{
OUString aRes;
- const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
- const ResStringArray &rUiNames = rData.GetUiSymbolSetNamesArray();
- const ResStringArray &rExportNames = rData.GetExportSymbolSetNamesArray();
- sal_uInt32 nCount = rExportNames.Count();
- for (sal_uInt32 i = 0; i < nCount; ++i)
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOLSET_NAMES); ++i)
{
- if (rExportNames.GetString(i) == rExportName)
+ if (rExportName.equalsAscii(strchr(RID_UI_SYMBOLSET_NAMES[i], '\004') + 1))
{
- aRes = rUiNames.GetString(i);
+ aRes = SmResId(RID_UI_SYMBOLSET_NAMES[i]);
break;
}
}
@@ -121,15 +109,12 @@ const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rU
{
OUString aRes;
- const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
- const ResStringArray &rUiNames = rData.GetUiSymbolSetNamesArray();
- const ResStringArray &rExportNames = rData.GetExportSymbolSetNamesArray();
- sal_uInt32 nCount = rUiNames.Count();
- for (sal_uInt32 i = 0; i < nCount; ++i)
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOLSET_NAMES); ++i)
{
- if (rUiNames.GetString(i) == rUiName)
+ if (rUiName == SmResId(RID_UI_SYMBOLSET_NAMES[i]))
{
- aRes = rExportNames.GetString(i);
+ const char *pKey = strchr(RID_UI_SYMBOLSET_NAMES[i], '\004') + 1;
+ aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
break;
}
}
@@ -144,8 +129,8 @@ void SmModule::InitInterface_Impl()
GetStaticInterface()->RegisterStatusBar(RID_STATUSBAR);
}
-SmModule::SmModule(SfxObjectFactory* pObjFact) :
- SfxModule(ResMgr::CreateResMgr("sm"), {pObjFact})
+SmModule::SmModule(SfxObjectFactory* pObjFact)
+ : SfxModule(Translate::Create("sm", Application::GetSettings().GetUILanguageTag()), {pObjFact})
{
SetName("StarMath");
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
deleted file mode 100644
index 7941085d9b3f..000000000000
--- a/starmath/source/smres.src
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/sfx.hrc>
-#include "starmath.hrc"
-
-String RID_FONTREGULAR
-{
- Text [ en-US ] = "Standard" ;
-};
-String RID_FONTITALIC
-{
- Text [ en-US ] = "Italic" ;
-};
-String RID_FONTBOLD
-{
- Text [ en-US ] = "Bold" ;
-};
-String STR_BLACK
-{
- Text [ en-US ] = "black" ;
-};
-String STR_BLUE
-{
- Text [ en-US ] = "blue" ;
-};
-String STR_GREEN
-{
- Text [ en-US ] = "green" ;
-};
-String STR_RED
-{
- Text [ en-US ] = "red" ;
-};
-String STR_CYAN
-{
- Text [ en-US ] = "cyan" ;
-};
-String STR_MAGENTA
-{
- Text [ en-US ] = "magenta" ;
-};
-String STR_GRAY
-{
- Text [ en-US ] = "gray" ;
-};
-String STR_LIME
-{
- Text [ en-US ] = "lime" ;
-};
-String STR_MAROON
-{
- Text [ en-US ] = "maroon" ;
-};
-String STR_NAVY
-{
- Text [ en-US ] = "navy" ;
-};
-String STR_OLIVE
-{
- Text [ en-US ] = "olive" ;
-};
-String STR_PURPLE
-{
- Text [ en-US ] = "purple" ;
-};
-String STR_SILVER
-{
- Text [ en-US ] = "silver" ;
-};
-String STR_TEAL
-{
- Text [ en-US ] = "teal" ;
-};
-
-String STR_YELLOW
-{
- Text [ en-US ] = "yellow" ;
-};
-String STR_HIDE
-{
- Text [ en-US ] = "hide" ;
-};
-String STR_SIZE
-{
- Text [ en-US ] = "size" ;
-};
-String STR_FONT
-{
- Text [ en-US ] = "font" ;
-};
-
-String STR_ALIGN_LEFT
-{
- Text [ en-US ] = "left" ;
-};
-String STR_ALIGN_CENTER
-{
- Text [ en-US ] = "center" ;
-};
-String STR_ALIGN_RIGHT
-{
- Text [ en-US ] = "right" ;
-};
-
-String STR_CMDBOXWINDOW
-{
- Text [ en-US ] = "Commands" ;
-};
-
-String RID_DOCUMENTSTR
-{
- Text [ en-US ] = "Formula" ;
-};
-
-String STR_STATSTR_READING
-{
- Text [ en-US ] = "Loading document..." ;
-};
-
-String STR_STATSTR_WRITING
-{
- Text [ en-US ] = "Saving document..." ;
-};
-
-String STR_MATH_DOCUMENT_FULLTYPE_CURRENT
-{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Formula";
-};
-
-String RID_ERR_IDENT
-{
- Text [ en-US ] = "ERROR : " ;
-};
-
-String RID_ERR_UNEXPECTEDCHARACTER
-{
- Text [ en-US ] = "Unexpected character" ;
-};
-
-String RID_ERR_UNEXPECTEDTOKEN
-{
- Text [ en-US ] = "Unexpected token" ;
-};
-
-String RID_ERR_LGROUPEXPECTED
-{
- Text [ en-US ] = "'{' expected" ;
-};
-
-String RID_ERR_RGROUPEXPECTED
-{
- Text [ en-US ] = "'}' expected" ;
-};
-
-String RID_ERR_LBRACEEXPECTED
-{
- Text [ en-US ] = "'(' expected" ;
-};
-
-String RID_ERR_RBRACEEXPECTED
-{
- Text [ en-US ] = "')' expected" ;
-};
-
-String RID_ERR_PARENTMISMATCH
-{
- Text [ en-US ] = "Left and right symbols mismatched" ;
-};
-
-String RID_ERR_FONTEXPECTED
-{
- Text [ en-US ] = "'fixed', 'sans', or 'serif' expected" ;
-};
-
-String RID_ERR_SIZEEXPECTED
-{
- Text [ en-US ] = "'size' followed by an unexpected token" ;
-};
-
-String RID_ERR_DOUBLEALIGN
-{
- Text [ en-US ] = "Double aligning is not allowed" ;
-};
-
-String RID_ERR_DOUBLESUBSUPSCRIPT
-{
- Text [ en-US ] = "Double sub/superscripts is not allowed" ;
-};
-
-String RID_ERR_POUNDEXPECTED
-{
- Text [ en-US ] = "'#' expected" ;
-};
-
-String RID_ERR_COLOREXPECTED
-{
- Text [ en-US ] = "Color required" ;
-};
-
-String RID_ERR_RIGHTEXPECTED
-{
- Text [ en-US ] = "'RIGHT' expected" ;
-};
-
-String RID_PRINTUIOPT_PRODNAME
-{
- Text [ en-US ] = "%PRODUCTNAME %s" ;
-};
-
-String RID_PRINTUIOPT_CONTENTS
-{
- Text [ en-US ] = "Contents" ;
-};
-
-String RID_PRINTUIOPT_TITLE
-{
- Text [ en-US ] = "~Title" ;
-};
-
-String RID_PRINTUIOPT_FRMLTXT
-{
- Text [ en-US ] = "~Formula text" ;
-};
-
-String RID_PRINTUIOPT_BORDERS
-{
- Text [ en-US ] = "B~orders" ;
-};
-
-String RID_PRINTUIOPT_SIZE
-{
- Text [ en-US ] = "Size" ;
-};
-
-String RID_PRINTUIOPT_ORIGSIZE
-{
- Text [ en-US ] = "O~riginal size" ;
-};
-
-String RID_PRINTUIOPT_FITTOPAGE
-{
- Text [ en-US ] = "Fit to ~page" ;
-};
-
-String RID_PRINTUIOPT_SCALING
-{
- Text [ en-US ] = "~Scaling" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 2f7143bb34b6..1b127bef4454 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -26,7 +26,7 @@
#include "dialog.hxx"
#include "cfgitem.hxx"
#include "smmod.hxx"
-#include "starmath.hrc"
+#include "strings.hrc"
SmSym::SmSym() :
diff --git a/starmath/source/symbol.src b/starmath/source/symbol.src
deleted file mode 100644
index 6f41a45ab616..000000000000
--- a/starmath/source/symbol.src
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <starmath.hrc>
-
-// Both list types Ui and Export have to be identical. The Ui version
-// is the localized version of all symbols that is show in the Ui,
-// for Export they have to be in English. The transition between
-// both lists is done with GetExportSymbolName() and GetUiSymbolName().
-StringArray RID_EXPORT_SYMBOLSET_NAMES
-{
- ItemList =
- {
- < "Greek" ; > ;
- < "Special" ; > ;
- };
-};
-StringArray RID_UI_SYMBOLSET_NAMES
-{
- ItemList [ en-US ] =
- {
- < "Greek" ; > ;
- < "Special" ; > ;
- };
-};
-StringArray RID_EXPORT_SYMBOL_NAMES
-{
- ItemList =
- {
- < "alpha" ; > ;
- < "ALPHA" ; > ;
- < "beta" ; > ;
- < "BETA" ; > ;
- < "gamma" ; > ;
- < "GAMMA" ; > ;
- < "delta" ; > ;
- < "DELTA" ; > ;
- < "epsilon" ; > ;
- < "EPSILON" ; > ;
- < "zeta" ; > ;
- < "ZETA" ; > ;
- < "eta" ; > ;
- < "ETA" ; > ;
- < "theta" ; > ;
- < "THETA" ; > ;
- < "iota" ; > ;
- < "IOTA" ; > ;
- < "kappa" ; > ;
- < "KAPPA" ; > ;
- < "lambda" ; > ;
- < "LAMBDA" ; > ;
- < "mu" ; > ;
- < "MU" ; > ;
- < "nu" ; > ;
- < "NU" ; > ;
- < "xi" ; > ;
- < "XI" ; > ;
- < "omicron" ; > ;
- < "OMICRON" ; > ;
- < "pi" ; > ;
- < "PI" ; > ;
- < "rho" ; > ;
- < "RHO" ; > ;
- < "sigma" ; > ;
- < "SIGMA" ; > ;
- < "tau" ; > ;
- < "TAU" ; > ;
- < "upsilon" ; > ;
- < "UPSILON" ; > ;
- < "phi" ; > ;
- < "PHI" ; > ;
- < "chi" ; > ;
- < "CHI" ; > ;
- < "psi" ; > ;
- < "PSI" ; > ;
- < "omega" ; > ;
- < "OMEGA" ; > ;
- < "varepsilon" ; > ;
- < "vartheta" ; > ;
- < "varpi" ; > ;
- < "varrho" ; > ;
- < "varsigma" ; > ;
- < "varphi" ; > ;
- < "element" ; > ;
- < "noelement" ; > ;
- < "strictlylessthan" ; > ;
- < "strictlygreaterthan" ; > ;
- < "notequal" ; > ;
- < "identical" ; > ;
- < "tendto" ; > ;
- < "infinite" ; > ;
- < "angle" ; > ;
- < "perthousand" ; > ;
- < "and" ; > ;
- < "or" ; > ;
- };
-};
-StringArray RID_UI_SYMBOL_NAMES
-{
- ItemList [ en-US ] =
- {
- < "alpha" ; > ;
- < "ALPHA" ; > ;
- < "beta" ; > ;
- < "BETA" ; > ;
- < "gamma" ; > ;
- < "GAMMA" ; > ;
- < "delta" ; > ;
- < "DELTA" ; > ;
- < "epsilon" ; > ;
- < "EPSILON" ; > ;
- < "zeta" ; > ;
- < "ZETA" ; > ;
- < "eta" ; > ;
- < "ETA" ; > ;
- < "theta" ; > ;
- < "THETA" ; > ;
- < "iota" ; > ;
- < "IOTA" ; > ;
- < "kappa" ; > ;
- < "KAPPA" ; > ;
- < "lambda" ; > ;
- < "LAMBDA" ; > ;
- < "mu" ; > ;
- < "MU" ; > ;
- < "nu" ; > ;
- < "NU" ; > ;
- < "xi" ; > ;
- < "XI" ; > ;
- < "omicron" ; > ;
- < "OMICRON" ; > ;
- < "pi" ; > ;
- < "PI" ; > ;
- < "rho" ; > ;
- < "RHO" ; > ;
- < "sigma" ; > ;
- < "SIGMA" ; > ;
- < "tau" ; > ;
- < "TAU" ; > ;
- < "upsilon" ; > ;
- < "UPSILON" ; > ;
- < "phi" ; > ;
- < "PHI" ; > ;
- < "chi" ; > ;
- < "CHI" ; > ;
- < "psi" ; > ;
- < "PSI" ; > ;
- < "omega" ; > ;
- < "OMEGA" ; > ;
- < "varepsilon" ; > ;
- < "vartheta" ; > ;
- < "varpi" ; > ;
- < "varrho" ; > ;
- < "varsigma" ; > ;
- < "varphi" ; > ;
- < "element" ; > ;
- < "noelement" ; > ;
- < "strictlylessthan" ; > ;
- < "strictlygreaterthan" ; > ;
- < "notequal" ; > ;
- < "identical" ; > ;
- < "tendto" ; > ;
- < "infinite" ; > ;
- < "angle" ; > ;
- < "perthousand" ; > ;
- < "and" ; > ;
- < "or" ; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/uiobject.cxx b/starmath/source/uiobject.cxx
index 51b0733ff545..a34f10c28341 100644
--- a/starmath/source/uiobject.cxx
+++ b/starmath/source/uiobject.cxx
@@ -66,7 +66,7 @@ StringMap ElementSelectorUIObject::get_state()
if (pElement)
aMap["CurrentEntry"] = pElement->getText();
- aMap["CurrentSelection"] = OUString::number(mxElementsSelector->maCurrentSetId);
+ aMap["CurrentSelection"] = OUString::fromUtf8(mxElementsSelector->msCurrentSetId);
return aMap;
}
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 489a8ba1cabd..7f9dd45fdc4b 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -49,6 +49,7 @@
#include <view.hxx>
#include <symbol.hxx>
#include <starmath.hrc>
+#include <strings.hrc>
#include <smdll.hxx>
#include "cfgitem.hxx"
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 9dd1fe3f6d2c..21018ad7eccf 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -19,7 +19,7 @@
#include <vcl/builderfactory.hxx>
-#include "starmath.hrc"
+#include "strings.hrc"
#include "utility.hxx"
#include "dialog.hxx"
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a9652672e16f..56e79c66d330 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -70,6 +70,7 @@
#include "dialog.hxx"
#include "document.hxx"
#include "starmath.hrc"
+#include "strings.hrc"
#include "mathmlimport.hxx"
#include "cursor.hxx"
#include "accessibility.hxx"