rearrange matters to get FloatingWindows working loaded from .ui

Change-Id: I099c810533c4590ee3182e1edf27e9038ed44f30

3 files changed, 11 insertions, 10 deletions

diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 94ea7d66e680..804de4afd368 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -39,7 +39,6 @@ class VclButtonBox;
 class VCL_DLLPUBLIC Dialog : public SystemWindow
 {
 private:
-    Window*         mpDialogParent;
     Dialog*         mpPrevExecuteDlg;
     DialogImpl*     mpDialogImpl;
     long            mnMousePositioned;
@@ -47,7 +46,6 @@ private:
     bool            mbOldSaveBack;
     bool            mbInClose;
     bool            mbModalMode;
-    bool            mbIsDefferedInit;
 
     VclButtonBox*   mpActionArea;
     VclBox*         mpContentArea;
@@ -67,8 +65,7 @@ protected:
 
 public:
     SAL_DLLPRIVATE bool    IsInClose() const { return mbInClose; }
-    SAL_DLLPRIVATE void doDeferredInit(bool bResizable);
-    SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; }
+    virtual        void    doDeferredInit(bool bResizable) SAL_OVERRIDE;
 
 protected:
     explicit        Dialog( WindowType nType );
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 75dc561920a7..67626273c016 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -117,9 +117,10 @@ public:
     SAL_DLLPRIVATE void             ImplEndPopupMode( sal_uInt16 nFlags = 0, sal_uLong nFocusId = 0 );
     SAL_DLLPRIVATE Rectangle&       ImplGetItemEdgeClipRect();
     SAL_DLLPRIVATE bool             ImplIsInPrivatePopupMode() const { return mbInPopupMode; }
+    virtual        void             doDeferredInit(bool bResizable) SAL_OVERRIDE;
 
 public:
-    explicit        FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN );
+    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();
@@ -131,7 +132,7 @@ public:
     virtual void    PopupModeEnd();
 
     void            SetTitleType( sal_uInt16 nTitle );
-    sal_uInt16          GetTitleType() const { return mnTitle; }
+    sal_uInt16      GetTitleType() const { return mnTitle; }
 
     void            StartPopupMode( const Rectangle& rRect, sal_uLong nFlags = 0 );
     void            StartPopupMode( ToolBox* pBox, sal_uLong nFlags = 0  );
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 033018b19ba2..168a0eb4a116 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -147,17 +147,19 @@ private:
     bool            mbDockBtn;
     bool            mbHideBtn;
     bool            mbSysChild;
-    bool            mbIsDefferedInit;
     bool            mbIsCalculatingInitialLayoutSize;
     bool            mbInitialLayoutDone;
     sal_uInt16      mnMenuBarMode;
     sal_uInt16      mnIcon;
     ImplData*       mpImplData;
     Timer           maLayoutTimer;
-
+protected:
+    bool            mbIsDefferedInit;
+    Window*         mpDialogParent;
 public:
     using Window::ImplIsInTaskPaneList;
     SAL_DLLPRIVATE bool ImplIsInTaskPaneList( Window* pWin );
+    SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; }
 
 private:
     SAL_DLLPRIVATE void Init();
@@ -168,7 +170,7 @@ private:
 protected:
     // Single argument ctors shall be explicit.
     explicit SystemWindow(WindowType nType);
-    explicit SystemWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType);
+    void loadUI(Window* pParent, const OString& rID, const OUString& rUIXMLDescription);
 
     void     SetWindowStateData( const WindowStateData& rData );
 
@@ -187,7 +189,6 @@ public:
     virtual void    Resizing( Size& rSize );
     virtual void    Resize() SAL_OVERRIDE;
     virtual Size    GetOptimalSize() const SAL_OVERRIDE;
-    virtual void    StateChanged(StateChangedType nStateChange) SAL_OVERRIDE;
     virtual void    queue_resize(StateChangedType eReason = STATE_CHANGE_LAYOUT) SAL_OVERRIDE;
     bool            isLayoutEnabled() const;
     void            setOptimalLayoutSize();
@@ -274,6 +275,8 @@ public:
     const Link& GetCloseHdl() const;
 
     SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutTimer.IsActive(); }
+
+    virtual        void    doDeferredInit(bool bResizable);
 };
 
 #endif // INCLUDED_VCL_SYSWIN_HXX