diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-03-29 11:13:57 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-03-30 11:01:30 +0200 |
| commit | d039c4812db5ba4beed72deb44fe6b04137af6e5 (patch) | |
| tree | 4369ed1e5984bbfa7fd7d41ee103624782c79834 /vcl/source/window/brdwin.cxx | |
| parent | 1fb314832ebd14cde6457feb2bf4f19e1bfcaa82 (diff) | |
notebookbar: Rename NotebookBarWindow to NotebookBar, and move accordingly.
Change-Id: If04a8f62aba0bcb712ae6405db318a4bd073fc54
Diffstat (limited to 'vcl/source/window/brdwin.cxx')
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 31b968fa9f4c..6dee935bc2f5 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -37,8 +37,6 @@ #include <vcl/metric.hxx> #include <vcl/settings.hxx> -#include "notebookbarwindow.hxx" - using namespace ::com::sun::star::uno; // useful caption height for title bar buttons @@ -1834,7 +1832,7 @@ void ImplBorderWindow::dispose() delete mpBorderView; mpBorderView = nullptr; mpMenuBarWindow.clear(); - mpNotebookBarWindow.disposeAndClear(); + mpNotebookBar.disposeAndClear(); vcl::Window::dispose(); } @@ -1944,10 +1942,10 @@ void ImplBorderWindow::Resize() nTopBorder += nMenuHeight; } - if (mpNotebookBarWindow) + if (mpNotebookBar) { - long nNotebookBarHeight = mpNotebookBarWindow->GetSizePixel().Height(); - mpNotebookBarWindow->setPosSizePixel( + long nNotebookBarHeight = mpNotebookBar->GetSizePixel().Height(); + mpNotebookBar->setPosSizePixel( nLeftBorder, nTopBorder, aSize.Width() - nLeftBorder - nRightBorder, nNotebookBarHeight); @@ -2177,12 +2175,10 @@ void ImplBorderWindow::SetMenuBarMode( bool bHide ) UpdateMenuHeight(); } -VclPtr<vcl::Window> ImplBorderWindow::CreateNotebookBarWindow(const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame>& rFrame) +void ImplBorderWindow::SetNotebookBar(const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame>& rFrame) { - mpNotebookBarWindow = VclPtr<NotebookBarWindow>::Create(this, "NotebookBar", rUIXMLDescription, rFrame); + mpNotebookBar = VclPtr<NotebookBar>::Create(this, "NotebookBar", rUIXMLDescription, rFrame); Resize(); - - return mpNotebookBarWindow; } void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, @@ -2193,8 +2189,8 @@ void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, if (mpMenuBarWindow && !mbMenuHide) rTopBorder += mpMenuBarWindow->GetSizePixel().Height(); - if (mpNotebookBarWindow && mpNotebookBarWindow->IsVisible()) - rTopBorder += mpNotebookBarWindow->GetSizePixel().Height(); + if (mpNotebookBar && mpNotebookBar->IsVisible()) + rTopBorder += mpNotebookBar->GetSizePixel().Height(); } long ImplBorderWindow::CalcTitleWidth() const |