From bf6a14e0ba4eb2a47da0146379ec905089ab3a6c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 14 May 2015 10:32:26 +0200 Subject: make hardcoded string localizable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie0bc8e8bd5e0770b85130496359e64358e34c836 Reviewed-on: https://gerrit.libreoffice.org/15727 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- uui/source/secmacrowarnings.cxx | 5 ++++- uui/source/secmacrowarnings.hxx | 1 + uui/uiconfig/ui/macrowarnmedium.ui | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) (limited to 'uui') diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index cb32f762299b..8af1a4ea3ff9 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -73,6 +73,7 @@ MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr get(mpSymbolImg, "symbolImage"); get(mpDocNameFI, "docNameLabel"); get(mpDescr1FI, "descr1Label"); + get(mpDescr1aFI, "descr1aLabel"); get(mpSignsFI, "signsLabel"); get(mpViewSignsBtn, "viewSignsButton"); get(mpDescr2FI, "descr2Label"); @@ -96,6 +97,7 @@ void MacroWarning::dispose() { mpSymbolImg.clear(); mpDocNameFI.clear(); + mpDescr1aFI.clear(); mpDescr1FI.clear(); mpSignsFI.clear(); mpViewSignsBtn.clear(); @@ -191,7 +193,8 @@ void MacroWarning::InitControls() } else { - mpDescr1FI->SetText("The document contains document macros."); + mpDescr1FI->Hide(); + mpDescr1aFI->Show(); mpSignsFI->Hide(); mpViewSignsBtn->Hide(); mpAlwaysTrustCB->Hide(); diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index 076916fc10cc..f51bb9078dff 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -47,6 +47,7 @@ private: VclPtr mpSymbolImg; VclPtr mpDocNameFI; VclPtr mpDescr1FI; + VclPtr mpDescr1aFI; VclPtr mpSignsFI; VclPtr mpViewSignsBtn; VclPtr mpDescr2FI; diff --git a/uui/uiconfig/ui/macrowarnmedium.ui b/uui/uiconfig/ui/macrowarnmedium.ui index 5519a4b2035b..a9c49c3f5804 100644 --- a/uui/uiconfig/ui/macrowarnmedium.ui +++ b/uui/uiconfig/ui/macrowarnmedium.ui @@ -132,6 +132,20 @@ 1 + + + False + False + start + True + The document contains document macros. + + + False + True + 1 + + True -- cgit