diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2017-04-26 21:40:20 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-28 09:58:56 +0200 |
| commit | 264ec6d7914c71f7a56f1892a0765fff8dc54e25 (patch) | |
| tree | 063a3158435277cb07788dcaae02cf20a056e93f /cui | |
| parent | 5503b0b79121fae89303fb00f255e57b05593930 (diff) | |
tdf#107437 Fix display of Start/End Quote window titles
Drop this string surgery nonsense.
We translators can surely handle four more words.
Change-Id: I44be5fae7cc61dcac960cc5c33c60f0b5d354675
Reviewed-on: https://gerrit.libreoffice.org/37003
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/autocdlg.hxx | 3 | ||||
| -rw-r--r-- | cui/source/inc/cuires.hrc | 3 | ||||
| -rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/tabpages/strings.src | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 3a34ca6b097d..7da1f441ab4b 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -381,9 +381,6 @@ private: VclPtr<FixedText> m_pDblEndExFT; VclPtr<PushButton> m_pDblStandardPB; - OUString m_sStartQuoteDlg; - OUString m_sEndQuoteDlg; - OUString m_sStandard; diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 4c75db05aa0f..599063cbca62 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -380,6 +380,9 @@ #define RID_SVXSTR_EDITHINT (RID_SVX_START + 1266) #define RID_SVXSTR_SAVE_SCREENSHOT_AS (RID_SVX_START + 1267) +#define RID_SVXSTR_STARTQUOTE (RID_SVX_START + 1268) +#define RID_SVXSTR_ENDQUOTE (RID_SVX_START + 1269) + // Hangul/Hanja Dialog #define RID_SVXSTR_HANGUL (RID_SVX_START + 1270) #define RID_SVXSTR_HANJA (RID_SVX_START + 1271) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 23f4dfa77834..858a340d7ee7 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1843,10 +1843,6 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pDblEndExFT, "doubleendex"); get(m_pDblStandardPB, "defaultdouble"); - using comphelper::string::strip; - - m_sStartQuoteDlg = strip(get<FixedText>("startquoteft")->GetText(), ':'); - m_sEndQuoteDlg = strip(get<FixedText>("endquoteft")->GetText(), ':'); m_sStandard = get<FixedText>("singlestartex")->GetText(); bool bShowSWOptions = false; @@ -2064,7 +2060,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) ScopedVclPtrInstance< SvxCharacterMap > pMap( this, true ); pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne )); - pMap->SetText(nMode < SGL_END ? m_sStartQuoteDlg : m_sEndQuoteDlg ); + pMap->SetText(nMode < SGL_END ? CUI_RESSTR(RID_SVXSTR_STARTQUOTE) : CUI_RESSTR(RID_SVXSTR_ENDQUOTE) ); sal_UCS4 cDlg; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType(); diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index d83d42c595e5..8b7b4880e7f9 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -183,5 +183,13 @@ String RID_SVXSTR_LOAD_ERROR { Text [ en-US ] = "The selected module could not be loaded."; }; +String RID_SVXSTR_STARTQUOTE +{ + Text [ en-US ] = "Start Quote"; +}; +String RID_SVXSTR_ENDQUOTE +{ + Text [ en-US ] = "End Quote"; +}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |