diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-05-14 10:32:26 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-09 10:32:44 +0000 |
| commit | 6c6a32a8d953f55568b2da5585a99b3bcb79c037 (patch) | |
| tree | 4a0936ed22d1c8350dcf1798354215eb9cb02ee9 | |
| parent | 9d816d79cae3526c2da5f038b4b285f7cf00b762 (diff) | |
tdf#91697 make hardcoded string localizable
Reviewed-on: https://gerrit.libreoffice.org/15727
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit bf6a14e0ba4eb2a47da0146379ec905089ab3a6c)
Conflicts:
uui/source/secmacrowarnings.cxx
uui/source/secmacrowarnings.hxx
Change-Id: Ie0bc8e8bd5e0770b85130496359e64358e34c836
Reviewed-on: https://gerrit.libreoffice.org/16130
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | uui/source/secmacrowarnings.cxx | 4 | ||||
| -rw-r--r-- | uui/source/secmacrowarnings.hxx | 1 | ||||
| -rw-r--r-- | uui/uiconfig/ui/macrowarnmedium.ui | 14 |
3 files changed, 18 insertions, 1 deletions
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 935ecf66ecf4..308e3fea67a3 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"); @@ -176,7 +177,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 84daaad9ee3a..679321af0de9 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -47,6 +47,7 @@ private: FixedImage* mpSymbolImg; FixedText* mpDocNameFI; FixedText* mpDescr1FI; + FixedText* mpDescr1aFI; FixedText* mpSignsFI; PushButton* mpViewSignsBtn; FixedText* mpDescr2FI; diff --git a/uui/uiconfig/ui/macrowarnmedium.ui b/uui/uiconfig/ui/macrowarnmedium.ui index 70b2f86ab2b8..08460a0da142 100644 --- a/uui/uiconfig/ui/macrowarnmedium.ui +++ b/uui/uiconfig/ui/macrowarnmedium.ui @@ -129,6 +129,20 @@ </packing> </child> <child> + <object class="GtkLabel" id="descr1aLabel"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes">The document contains document macros.</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> |