diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-12 14:25:34 +0000 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-05-20 13:22:22 +0200 |
| commit | 3c6bf1ba72e62b01b7e7ec9343ff216f8cd2130d (patch) | |
| tree | fe9459f2c088f7760ecef9ce804984518000bd37 /sfx2/source/sidebar/PanelLayout.cxx | |
| parent | enable grabbing focus to an unspecified container child (diff) | |
| download | core-feature/jsdialogs.tar.gz core-feature/jsdialogs.zip | |
weld the sidebar deck
feature/jsdialogs
Change-Id: Idc6710df7e59bcb5f61fca783e0cc0666cb13a1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112404
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/sidebar/PanelLayout.cxx')
| -rw-r--r-- | sfx2/source/sidebar/PanelLayout.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/sidebar/PanelLayout.cxx b/sfx2/source/sidebar/PanelLayout.cxx index 3a47773175ce..271f4d8a6c36 100644 --- a/sfx2/source/sidebar/PanelLayout.cxx +++ b/sfx2/source/sidebar/PanelLayout.cxx @@ -19,6 +19,7 @@ using namespace sfx2::sidebar; PanelLayout::PanelLayout(weld::Widget* pParent, const OString& rID, const OUString& rUIXMLDescription) : m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription)) , m_xContainer(m_xBuilder->weld_container(rID)) + , m_pPanel(nullptr) { m_xContainer->set_background(Theme::GetColor(Theme::Color_PanelBackground)); m_xContainer->connect_get_property_tree(LINK(this, PanelLayout, DumpAsPropertyTreeHdl)); @@ -53,17 +54,17 @@ void PanelLayout::DataChanged(const DataChangedEvent& rEvent) void PanelLayout::SetPanel(sfx2::sidebar::Panel* pPanel) { - m_xPanel = pPanel; + m_pPanel = pPanel; } weld::Window* PanelLayout::GetFrameWeld() const { - if (!m_xPanel) + if (!m_pPanel) { SAL_WARN("sfx.sidebar", "Expected a toplevel Panel to exist"); return nullptr; } - return m_xPanel->GetFrameWeld(); + return m_pPanel->GetFrameWeld(); } PanelLayout::~PanelLayout() |