summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-01-11 17:09:10 +0000
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2020-01-16 01:51:22 +0100
commit4e72c46536fac18f3b22102b5815651bb6938de7 (patch)
tree7b5b595463c97ad2d3924efb82827a9500dc59b7 /include
parentdo not ignore return value of a (confusing) function (tdf#126248) (diff)
downloadcore-4e72c46536fac18f3b22102b5815651bb6938de7.tar.gz
core-4e72c46536fac18f3b22102b5815651bb6938de7.zip
Resolves: tdf#129763 resize to request happening on every activate
even though the state remains the same, so only do the resize if the EnableClearFormatButton[All] state changes. also change the default to off, which is what writer typically set it to, and make calc the one that enables it explicitly. Its easier to grow a dialog than shrink a dialog. Change-Id: I449df7b7dcf0204b5143b8ad88e528668b84d0a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86615 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'include')
-rw-r--r--include/svx/ctredlin.hxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index cc63771d2af6..b8d57718a8f4 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -286,6 +286,9 @@ private:
bool bEnableRejectAll;
bool bEnableUndo;
+ bool bEnableClearFormat;
+ bool bEnableClearFormatAll;
+
weld::Window* m_pDialog;
std::unique_ptr<weld::Button> m_xAccept;
std::unique_ptr<weld::Button> m_xReject;
@@ -296,6 +299,7 @@ private:
DECL_LINK( PbClickHdl, weld::Button&, void );
+ void EnableClearFormatButton(weld::Button&, bool bFlag);
public:
SvxTPView(weld::Container* pParent, weld::Window* pDialog, weld::Builder* pTopLevel);
virtual ~SvxTPView() override;
@@ -306,7 +310,6 @@ public:
void EnableAcceptAll(bool bFlag);
void EnableReject(bool bFlag);
void EnableRejectAll(bool bFlag);
- void EnableClearFormatButton(weld::Button&, bool bFlag);
void EnableClearFormat(bool bFlag);
void EnableClearFormatAll(bool bFlag);
void EnableUndo(bool bFlag=true);