summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-13 16:54:13 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-14 21:31:19 +0000
commitf0ee8ed43528b17e9ea6d83388fbaab0a645b677 (patch)
tree7f4e60f164b29ea2e44f7baa168790260f78aaf4 /include
parenta541aab2e7fdedcc84fff213069d7e521ff827a4 (diff)
see if we can merge floating window and dialog child size/pos setting
Change-Id: Idda1a5fbfec7d10fab4fcef47ee0d10945510d50
Diffstat (limited to 'include')
-rw-r--r--include/vcl/floatwin.hxx1
-rw-r--r--include/vcl/syswin.hxx2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index d5271455c4cd..d017b218901e 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -94,7 +94,6 @@ 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 2773fa66ff7e..1f29d45f0613 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 );
- virtual void setPosSizeOnContainee(Size aSize, Window &rBox);
+ SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* );
protected: