uui/source/secmacrowarnings.cxx | 5 ++++- uui/source/secmacrowarnings.hxx | 1 + uui/uiconfig/ui/macrowarnmedium.ui | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-)
New commits: commit bf6a14e0ba4eb2a47da0146379ec905089ab3a6c Author: Andras Timar <andras.ti...@collabora.com> Date: Thu May 14 10:32:26 2015 +0200 make hardcoded string localizable Change-Id: Ie0bc8e8bd5e0770b85130496359e64358e34c836 Reviewed-on: https://gerrit.libreoffice.org/15727 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index cb32f76..8af1a4e 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 076916f..f51bb90 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -47,6 +47,7 @@ private: VclPtr<FixedImage> mpSymbolImg; VclPtr<FixedText> mpDocNameFI; VclPtr<FixedText> mpDescr1FI; + VclPtr<FixedText> mpDescr1aFI; VclPtr<FixedText> mpSignsFI; VclPtr<PushButton> mpViewSignsBtn; VclPtr<FixedText> mpDescr2FI; diff --git a/uui/uiconfig/ui/macrowarnmedium.ui b/uui/uiconfig/ui/macrowarnmedium.ui index 5519a4b..a9c49c3 100644 --- a/uui/uiconfig/ui/macrowarnmedium.ui +++ b/uui/uiconfig/ui/macrowarnmedium.ui @@ -133,6 +133,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>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits