summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-09-26 15:47:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-09-26 20:51:18 +0200
commitf35825e85f59e0fd155c68d63260169cd3cb38c9 (patch)
tree1ce4e03a7ca22ce4a936e419b0cfa1905721ff5d /include/svx
parent94223ae823a2e3e81da5ab0dc827c33f3a23882c (diff)
Resolves: tdf#127218 allow changes dialog to shrink when button text changes
original the dialog has super wide button contents when the initial size is calculated, and then the buttons are changed afterwards, but the dialog remains at its initial size. Change-Id: Ib29ab9ebdec01a93561a8b304572df60b6ad5ad2 Reviewed-on: https://gerrit.libreoffice.org/79634 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/ctredlin.hxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index a9ee961c2c3b..15d27723121d 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -246,6 +246,7 @@ private:
bool bEnableRejectAll;
bool bEnableUndo;
+ weld::Window* m_pDialog;
std::unique_ptr<weld::Button> m_xAccept;
std::unique_ptr<weld::Button> m_xReject;
std::unique_ptr<weld::Button> m_xAcceptAll;
@@ -256,7 +257,7 @@ private:
DECL_LINK( PbClickHdl, weld::Button&, void );
public:
- SvxTPView(weld::Container* pParent, weld::Builder* pTopLevel);
+ SvxTPView(weld::Container* pParent, weld::Window* pDialog, weld::Builder* pTopLevel);
virtual ~SvxTPView() override;
SvxRedlinTable* GetTableControl() { return m_xViewData.get(); }
@@ -265,7 +266,7 @@ public:
void EnableAcceptAll(bool bFlag);
void EnableReject(bool bFlag);
void EnableRejectAll(bool bFlag);
- static void EnableClearFormatButton(weld::Button&, bool bFlag);
+ void EnableClearFormatButton(weld::Button&, bool bFlag);
void EnableClearFormat(bool bFlag);
void EnableClearFormatAll(bool bFlag);
void EnableUndo(bool bFlag=true);
@@ -300,7 +301,7 @@ private:
DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OString&, bool);
public:
- SvxAcceptChgCtr(weld::Container* pParent, weld::Builder* pTopLevel);
+ SvxAcceptChgCtr(weld::Container* pParent, weld::Window* pDialog, weld::Builder* pTopLevel);
~SvxAcceptChgCtr();
void ShowFilterPage();