diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-09-24 03:11:51 +0300 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-09-24 15:37:29 +0300 |
commit | 10e5729fb07d6b4c66182596bd86734d0ab386b9 (patch) | |
tree | 3904517c0371e1b75fb6e1681448d344ed2d03ed | |
parent | bf9360e6f5e38c9de3b38d9748a84d4d1c5067f9 (diff) |
tdf#106762 Avoid warning when opening and closing the color picker
... from the Drawing toolbar in Impress. The warning was
"DockingWindow has become non-layout because extra children
have been added directly to it.", but this DockingWindow is
actually a ToolBox which set as the parent of the color picker,
although it isn't really a parent in layout terms.
Change-Id: Id1384653ceda938ca0cc300c35467e562984bca1
-rw-r--r-- | include/vcl/toolbox.hxx | 1 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 09f912ef3ba6..3ee08e7fea24 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -299,6 +299,7 @@ public: virtual void Resizing( Size& rSize ) override; virtual Size GetOptimalSize() const override; virtual void doDeferredInit(WinBits nBits) override; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; /// Insert a command (like '.uno:Save'). virtual void InsertItem( const OUString& rCommand, diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 810c589a8333..70d031d4ee69 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1308,6 +1308,11 @@ void ToolBox::doDeferredInit(WinBits nBits) mbIsDeferredInit = false; } +void ToolBox::queue_resize(StateChangedType eReason) +{ + Window::queue_resize(eReason); +} + ToolBox::ToolBox( vcl::Window* pParent, WinBits nStyle ) : DockingWindow( WindowType::TOOLBOX ) { |