include/vcl/floatwin.hxx | 1 +
vcl/source/window/floatwin.cxx | 5 +++++
2 files changed, 6 insertions(+)
New commits:
commit 835ca0a10d836cb366e940420e5fef2d10229b2b
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Aug 30 20:55:59 2014 +0100
add capability to load FloatingWindows from .ui
in theory anyway
Change-Id: I8230462bdb05e4a71e366c1a92ba388a8ea12c82
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 45aefab..75dc561 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -120,6 +120,7 @@ public:
public:
explicit FloatingWindow( Window* pParent, WinBits nStyle =
WB_STDFLOATWIN );
+ explicit FloatingWindow(Window* pParent, const OString& rID, const
OUString& rUIXMLDescription);
explicit FloatingWindow( Window* pParent, const ResId& );
virtual ~FloatingWindow();
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index cb5cb78..cda5def 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -164,6 +164,11 @@ FloatingWindow::FloatingWindow( Window* pParent, const
ResId& rResId ) :
Show();
}
+FloatingWindow::FloatingWindow(Window* pParent, const OString& rID, const
OUString& rUIXMLDescription)
+ : SystemWindow(pParent, rID, rUIXMLDescription, WINDOW_FLOATINGWINDOW)
+{
+}
+
void FloatingWindow::ImplLoadRes( const ResId& rResId )
{
SystemWindow::ImplLoadRes( rResId );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
