diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-02 12:02:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-02 15:26:54 +0100 |
| commit | dc5e8921530e811d0154af39504e4c149a6eae13 (patch) | |
| tree | 78be59ebfed6a3f2b6ca71681d67f5dd677df447 /vcl | |
| parent | b6cc10ecf28d2e0ae25383f2dc82b66e67971b08 (diff) | |
convert SID_RECORDING_FLOATWINDOW to .ui
Change-Id: Iae3f0269e5e7f830465580dc4a520ba01ef87a79
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/syswin.cxx | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 37e7a222ee1d..caedcbcaaef3 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -164,10 +164,10 @@ FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) : Show(); } -FloatingWindow::FloatingWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +FloatingWindow::FloatingWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) : SystemWindow(WINDOW_FLOATINGWINDOW) { - loadUI(pParent, rID, rUIXMLDescription); + loadUI(pParent, rID, rUIXMLDescription, rFrame); } //Find the real parent stashed in mpDialogParent. diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 1cf207c46ab7..127709324926 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -95,11 +95,12 @@ SystemWindow::SystemWindow(WindowType nType) Init(); } -void SystemWindow::loadUI(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +void SystemWindow::loadUI(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + const css::uno::Reference<css::frame::XFrame> &rFrame) { mbIsDefferedInit = true; mpDialogParent = pParent; //should be unset in doDeferredInit - m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); + m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID, rFrame); } SystemWindow::~SystemWindow() |