don't use SVXSTR for translation ids that are in cui.mo

use that just for the ones in svx.mo. This just changes the
programmer-level #define and keeps the translator-level message context
the same to avoid triggering any retranslations.

Change-Id: I3ca90618e27c4d7abbc77de1096e67bafe49e7ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125832
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 31 insertions, 31 deletions

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 28bcbcf9f951..95a75d877271 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -183,14 +183,14 @@ IMPL_LINK_NOARG(OfaAutoCorrDlg, SelectLanguageHdl, weld::ComboBox&, void)
 
 OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
     : SfxTabPage(pPage, pController, "cui/ui/acoroptionspage.ui", "AutocorrectOptionsPage", &rSet)
-    , m_sInput(CuiResId(RID_SVXSTR_USE_REPLACE))
-    , m_sDoubleCaps(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
-    , m_sStartCap(CuiResId(RID_SVXSTR_CPTL_STT_SENT))
-    , m_sBoldUnderline(CuiResId(RID_SVXSTR_BOLD_UNDER))
-    , m_sURL(CuiResId(RID_SVXSTR_DETECT_URL))
-    , m_sNoDblSpaces(CuiResId(RID_SVXSTR_NO_DBL_SPACES))
-    , m_sDash(CuiResId(RID_SVXSTR_DASH))
-    , m_sAccidentalCaps(CuiResId(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
+    , m_sInput(CuiResId(RID_CUISTR_USE_REPLACE))
+    , m_sDoubleCaps(CuiResId(RID_CUISTR_CPTL_STT_WORD))
+    , m_sStartCap(CuiResId(RID_CUISTR_CPTL_STT_SENT))
+    , m_sBoldUnderline(CuiResId(RID_CUISTR_BOLD_UNDER))
+    , m_sURL(CuiResId(RID_CUISTR_DETECT_URL))
+    , m_sNoDblSpaces(CuiResId(RID_CUISTR_NO_DBL_SPACES))
+    , m_sDash(CuiResId(RID_CUISTR_DASH))
+    , m_sAccidentalCaps(CuiResId(RID_CUISTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
     , m_xCheckLB(m_xBuilder->weld_tree_view("checklist"))
 {
     m_xCheckLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
@@ -352,24 +352,24 @@ enum OfaAutoFmtOptions
 OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage(weld::Container* pPage, weld::DialogController* pController,
                                                  const SfxItemSet& rSet )
     : SfxTabPage(pPage, pController, "cui/ui/applyautofmtpage.ui", "ApplyAutoFmtPage", &rSet)
-    , sDeleteEmptyPara(CuiResId(RID_SVXSTR_DEL_EMPTY_PARA))
-    , sUseReplaceTbl(CuiResId(RID_SVXSTR_USE_REPLACE))
-    , sCapitalStartWord(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
-    , sCapitalStartSentence(CuiResId(RID_SVXSTR_CPTL_STT_SENT))
-    , sUserStyle(CuiResId(RID_SVXSTR_USER_STYLE))
-    , sBullet(CuiResId(RID_SVXSTR_BULLET))
-    , sBoldUnder(CuiResId(RID_SVXSTR_BOLD_UNDER))
-    , sNoDblSpaces(CuiResId(RID_SVXSTR_NO_DBL_SPACES))
-    , sCorrectCapsLock(CuiResId(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
-    , sDetectURL(CuiResId(RID_SVXSTR_DETECT_URL))
-    , sDash(CuiResId(RID_SVXSTR_DASH))
-    , sRightMargin(CuiResId(RID_SVXSTR_RIGHT_MARGIN))
-    , sNum(CuiResId(RID_SVXSTR_NUM))
-    , sBorder(CuiResId(RID_SVXSTR_BORDER))
-    , sTable(CuiResId(RID_SVXSTR_CREATE_TABLE))
-    , sReplaceTemplates(CuiResId(RID_SVXSTR_REPLACE_TEMPLATES))
-    , sDelSpaceAtSttEnd(CuiResId(RID_SVXSTR_DEL_SPACES_AT_STT_END))
-    , sDelSpaceBetweenLines(CuiResId(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES))
+    , sDeleteEmptyPara(CuiResId(RID_CUISTR_DEL_EMPTY_PARA))
+    , sUseReplaceTbl(CuiResId(RID_CUISTR_USE_REPLACE))
+    , sCapitalStartWord(CuiResId(RID_CUISTR_CPTL_STT_WORD))
+    , sCapitalStartSentence(CuiResId(RID_CUISTR_CPTL_STT_SENT))
+    , sUserStyle(CuiResId(RID_CUISTR_USER_STYLE))
+    , sBullet(CuiResId(RID_CUISTR_BULLET))
+    , sBoldUnder(CuiResId(RID_CUISTR_BOLD_UNDER))
+    , sNoDblSpaces(CuiResId(RID_CUISTR_NO_DBL_SPACES))
+    , sCorrectCapsLock(CuiResId(RID_CUISTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
+    , sDetectURL(CuiResId(RID_CUISTR_DETECT_URL))
+    , sDash(CuiResId(RID_CUISTR_DASH))
+    , sRightMargin(CuiResId(RID_CUISTR_RIGHT_MARGIN))
+    , sNum(CuiResId(RID_CUISTR_NUM))
+    , sBorder(CuiResId(RID_CUISTR_BORDER))
+    , sTable(CuiResId(RID_CUISTR_CREATE_TABLE))
+    , sReplaceTemplates(CuiResId(RID_CUISTR_REPLACE_TEMPLATES))
+    , sDelSpaceAtSttEnd(CuiResId(RID_CUISTR_DEL_SPACES_AT_STT_END))
+    , sDelSpaceBetweenLines(CuiResId(RID_CUISTR_DEL_SPACES_BETWEEN_LINES))
     , nPercent(50)
     , m_xCheckLB(m_xBuilder->weld_tree_view("list"))
     , m_xEditPB(m_xBuilder->weld_button("edit"))
@@ -1551,10 +1551,10 @@ void OfaQuoteTabPage::CreateEntry(weld::TreeView& rCheckLB, const OUString& rTxt
 
 OfaQuoteTabPage::OfaQuoteTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
     : SfxTabPage(pPage, pController, "cui/ui/applylocalizedpage.ui", "ApplyLocalizedPage", &rSet)
-    , sNonBrkSpace(CuiResId(RID_SVXSTR_NON_BREAK_SPACE))
-    , sOrdinal(CuiResId(RID_SVXSTR_ORDINAL))
-    , sTransliterateRTL(CuiResId(RID_SVXSTR_OLD_HUNGARIAN))
-    , sAngleQuotes(CuiResId(RID_SVXSTR_ANGLE_QUOTES))
+    , sNonBrkSpace(CuiResId(RID_CUISTR_NON_BREAK_SPACE))
+    , sOrdinal(CuiResId(RID_CUISTR_ORDINAL))
+    , sTransliterateRTL(CuiResId(RID_CUISTR_OLD_HUNGARIAN))
+    , sAngleQuotes(CuiResId(RID_CUISTR_ANGLE_QUOTES))
     , cSglStartQuote(0)
     , cSglEndQuote(0)
     , cStartQuote(0)
@@ -1795,7 +1795,7 @@ IMPL_LINK(OfaQuoteTabPage, QuoteHdl, weld::Button&, rBtn, void)
     SvxCharacterMap aMap(GetFrameWeld(), nullptr, nullptr);
     aMap.SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT,
                         LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne ));
-    aMap.set_title(nMode < SGL_END ? CuiResId(RID_SVXSTR_STARTQUOTE)  : CuiResId(RID_SVXSTR_ENDQUOTE));
+    aMap.set_title(nMode < SGL_END ? CuiResId(RID_CUISTR_STARTQUOTE)  : CuiResId(RID_CUISTR_ENDQUOTE));
     sal_UCS4 cDlg;
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
     LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType();