diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-09 11:08:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-09 11:09:39 +0100 |
| commit | 95942b16f44bc6eac57ad7b579b4158565446884 (patch) | |
| tree | 799da704fbbdcae6f72c458aa588a23cb31b81e9 /include | |
| parent | 04443db44edfa389eddef5667053f2fa5d7d5978 (diff) | |
Resolves: tdf#90481 fix cropped buttons
this reverts
commit f0ee8ed43528b17e9ea6d83388fbaab0a645b677
Author: Caolán McNamara <caolanm@redhat.com>
see if we can merge floating window and dialog child size/pos setting
seeing as we apparently can't merge them the way that tried to do
Change-Id: I25fb741c9ae73375124b469f98bf1eecd76ff3c1
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/floatwin.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/syswin.hxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 60bc992479e8..b000fb7940e5 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -93,6 +93,7 @@ private: SAL_DLLPRIVATE void ImplCallPopupModeEnd(); DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* ); + virtual void setPosSizeOnContainee(Size aSize, Window &rBox) SAL_OVERRIDE; FloatingWindow (const FloatingWindow &) SAL_DELETED_FUNCTION; FloatingWindow & operator= (const FloatingWindow &) SAL_DELETED_FUNCTION; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 7694eae46346..c313e2ff2c34 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -158,7 +158,7 @@ public: private: SAL_DLLPRIVATE void Init(); SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin ); - SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox); + virtual void setPosSizeOnContainee(Size aSize, Window &rBox); DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* ); protected: |