diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-23 14:09:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-23 22:38:20 +0200 |
| commit | ec266879c7d3764372d093f6e7d5024c5e0cc298 (patch) | |
| tree | 5e14a8fdda6e39159dc62d3f525f2a2b68ca71d8 | |
| parent | dfc75c367ccdd0af866e1ca87c62e6c8db11ecd4 (diff) | |
tdf#125447 get rid of ~ in STR_UNDO string
Change-Id: Ifdd3df50b98641785a4b1d258092efe531e98e7d
Reviewed-on: https://gerrit.libreoffice.org/72870
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/svtools/strings.hrc | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/wrtundo.cxx | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc index 76176fd8b30a..398129a1d77f 100644 --- a/include/svtools/strings.hrc +++ b/include/svtools/strings.hrc @@ -22,8 +22,10 @@ #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) +// To translators: tdf#125447 use no mnemonic in this string #define STR_UNDO NC_("STR_UNDO", "Undo: ") -#define STR_REDO NC_("STR_REDO", "Re~do: ") +// To translators: tdf#125447 use no mnemonic in this string +#define STR_REDO NC_("STR_REDO", "Redo: ") #define STR_REPEAT NC_("STR_REPEAT", "~Repeat: ") #define STR_FORMAT_STRING NC_("STR_FORMAT_STRING", "Unformatted text") diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 46b4f3df1146..c09b539a34cf 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -79,7 +79,6 @@ #include <basic/sbstar.hxx> #include <basic/sberrors.hxx> #include <xmloff/autolayout.hxx> -#include <vcl/mnemonic.hxx> using namespace ::com::sun::star; @@ -172,7 +171,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { // Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff. - OUString aTmp(MnemonicGenerator::EraseAllMnemonicChars(SvtResId(STR_REDO))); + OUString aTmp(SvtResId(STR_REDO)); aTmp += pUndoManager->GetRedoActionComment(); rSet.Put(SfxStringItem(SID_REDO, aTmp)); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 4741a519d903..5620f4396e8f 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -35,7 +35,6 @@ #include <officecfg/Office/Common.hxx> #include <officecfg/Setup.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/splitwin.hxx> #include <unotools/moduleoptions.hxx> #include <svl/intitem.hxx> @@ -998,7 +997,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) } else { - rSet.Put( SfxStringItem( SID_REDO, MnemonicGenerator::EraseAllMnemonicChars(SvtResId(STR_REDO))+pShUndoMgr->GetRedoActionComment() ) ); + rSet.Put(SfxStringItem(SID_REDO, SvtResId(STR_REDO) + pShUndoMgr->GetRedoActionComment())); } } else diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx index ee9c315c96f0..2cc9e54ba232 100644 --- a/sw/source/uibase/wrtsh/wrtundo.cxx +++ b/sw/source/uibase/wrtsh/wrtundo.cxx @@ -25,7 +25,6 @@ #include <swdtflvr.hxx> #include <svtools/svtresid.hxx> #include <svtools/strings.hrc> -#include <vcl/mnemonic.hxx> // Undo ends all modes. If a selection is emerged by the Undo, // this must be considered for further action. @@ -109,7 +108,7 @@ OUString SwWrtShell::GetDoString( DoType eDoType ) const default:;//prevent warning } - return MnemonicGenerator::EraseAllMnemonicChars(SvtResId(pResStr)) + aUndoStr; + return SvtResId(pResStr) + aUndoStr; } void SwWrtShell::GetDoStrings( DoType eDoType, SfxStringListItem& rStrs ) const |