diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-19 15:29:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-19 19:06:35 +0000 |
| commit | d32f7a6e57d42fa03965f22513848bf7b100ac34 (patch) | |
| tree | 42cd53b6c3a586798677376a52e0ea6b92b30445 /vcl | |
| parent | 695e2938ff954f6dcceac4b6b170e6724294be2f (diff) | |
provide a route to load ToolbarMenu things via .ui
Change-Id: Ic2175faf247d7c05717d397b8afdb9d90087f1d3
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index cc3902b60222..95dd54b0400b 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -440,20 +440,21 @@ void DockingWindow::doDeferredInit(WinBits nBits) mbIsDefferedInit = false; } -void DockingWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +void DockingWindow::loadUI(vcl::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); } -DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& rID, - const OUString& rUIXMLDescription) +DockingWindow::DockingWindow(vcl::Window* pParent, const OString& rID, + const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) : Window(WINDOW_DOCKINGWINDOW) { ImplInitDockingWindowData(); - loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription); + loadUI(pParent, rID, rUIXMLDescription, rFrame); } DockingWindow::~DockingWindow() |