summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2023-07-07 13:32:34 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2023-07-07 16:30:29 +0200
commit89b032b0cafa005729c693d9f2cfab83246697ab (patch)
tree6b3c28d694941e4e244c6ac97f07c36354c9779d /include
parent1e8ec03543a8404543b9226896d36ab6dc72fa8f (diff)
tdf#152484 cui,sw: if decorative is enabled, disable title/description
... in sw Frame Properties dialog and cui SvxObjectTitleDescDialog. Reportedly Word behaves weirdly if decorative is set and a description exists at the same time. Change-Id: I9fa149127bacc3567486334a14f42b05871a629f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154165 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 04e90103b9a031af4073967228c6ccfc59438ec0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154176
Diffstat (limited to 'include')
-rw-r--r--include/cui/dlgname.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/cui/dlgname.hxx b/include/cui/dlgname.hxx
index 04fc5610e937..b402593832b1 100644
--- a/include/cui/dlgname.hxx
+++ b/include/cui/dlgname.hxx
@@ -105,13 +105,17 @@ class SvxObjectTitleDescDialog : public weld::GenericDialogController
{
private:
// title
+ std::unique_ptr<weld::Label> m_xTitleFT;
std::unique_ptr<weld::Entry> m_xEdtTitle;
// description
+ std::unique_ptr<weld::Label> m_xDescriptionFT;
std::unique_ptr<weld::TextView> m_xEdtDescription;
std::unique_ptr<weld::CheckButton> m_xDecorativeCB;
+ DECL_LINK(DecorativeHdl, weld::Toggleable&, void);
+
public:
// constructor
SvxObjectTitleDescDialog(weld::Window* pWindow, const OUString& rTitle, const OUString& rDesc,