summaryrefslogtreecommitdiff
path: root/sfx2/source/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-13 10:10:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-04-13 14:21:13 +0200
commit1670f6aaf28907403e5305b78ebcf93de4ebc19b (patch)
tree399dc7d5a0da061e640259d206724cefdc9d207b /sfx2/source/inc
parent9baf9a80ac267a2382aac2b6fe7e7a61528231c5 (diff)
Resolves: tdf#116865 trigger pending sizing timers before arranging
trigger pending sizing timers now so we arrange with the final size of the client area Otherwise calling GetSizePixel in the Arranging loop will trigger the timers anyway, causing reentry into Arrange_Impl again where the inner Arrange_Impl arranges with the final size, and then returns to this outer Arrange_Impl which would rearrange with the old client area size. Change-Id: Ibc2b97f679ceaa0a825cee015576f403703a5f9e Reviewed-on: https://gerrit.libreoffice.org/52815 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/inc')
-rw-r--r--sfx2/source/inc/workwin.hxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 5f5f19228d27..c3286960a568 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -224,6 +224,8 @@ class SfxWorkWindow final
void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&);
static bool IsPluginMode( SfxObjectShell const * pObjShell );
+ void FlushPendingChildSizes();
+
public:
SfxWorkWindow( vcl::Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster );
~SfxWorkWindow();