summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--uui/source/secmacrowarnings.cxx5
-rw-r--r--uui/source/secmacrowarnings.hxx1
-rw-r--r--uui/uiconfig/ui/macrowarnmedium.ui14
3 files changed, 19 insertions, 1 deletions
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<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 5519a4b2035b..a9c49c3f5804 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>