summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-09-26 15:47:38 +0100
committerMichael Stahl <michael.stahl@cib.de>2019-09-27 11:08:49 +0200
commita1e102bc4f0f36f19b76c34971470faa45e3aaf8 (patch)
tree14bbd0a697077f0394250929242dcfc86cddefe9 /include
parentc932203b1f46b52ae1fa4e56de9fe1a6b6cb49a1 (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/79635 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'include')
-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 16147e60bd08..238207c72723 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -269,6 +269,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;
@@ -279,7 +280,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(); }
@@ -288,7 +289,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);
@@ -323,7 +324,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();