include/vcl/floatwin.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7aa27237372b6378cf53b1fb4caf12d1b8093045
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Feb 13 18:40:34 2015 +0100
-Werror,-Winconsistent-missing-override
(cherry picked from commit d7e92309239e6da60bd13b984ffaace8b4ef638e)
Conflicts:
include/vcl/floatwin.hxx
Change-Id: Ib1445e9c66c08044434c7e8c828d2fc7b6a0a04c
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 079690e..c5ebb8d 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -94,7 +94,7 @@ private:
SAL_DLLPRIVATE void ImplCallPopupModeEnd();
DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* );
- virtual void setPosSizeOnContainee(Size aSize, VclContainer &rBox);
+ virtual void setPosSizeOnContainee(Size aSize, VclContainer &rBox)
SAL_OVERRIDE;
// Copy assignment is forbidden and not implemented.
SAL_DLLPRIVATE FloatingWindow (const FloatingWindow &);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
