[Libreoffice-commits] core.git: include/vcl

[Caolán McNamara]

 include/vcl/dockwin.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 890ebf1cc6bb58ff21da19d7fd4b9b67eaa32a9c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 29 21:31:59 2016 +0000

    docking windows cannot be directly loaded from .res anymore
    
    Change-Id: Ia291cea549b4a4ced65d16b55330c7da78579b83

diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index aab8013..65b70c7 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -285,10 +285,10 @@ public:
     void                   doDeferredInit(WinBits nBits);
 protected:
                     DockingWindow( WindowType nType );
+    DockingWindow(vcl::Window* pParent, const ResId& rResId);
 
 public:
     DockingWindow(vcl::Window* pParent, WinBits nStyle = WB_STDDOCKWIN);
-    DockingWindow(vcl::Window* pParent, const ResId& rResId);
     DockingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
         const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
     virtual ~DockingWindow();