diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-03-04 13:15:51 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-03-04 18:47:36 +0100 |
| commit | 7520e2b2126c05aadb738256313d2f250b9ded62 (patch) | |
| tree | 1871853085d30f8c17b3116c4ea0a611881e7c49 /vcl/source/app | |
| parent | 24973523ba59087185d434396fd614e73d72107f (diff) | |
We have had C++11 for some time now
Change-Id: I3946aba66a49518fb6c3fe6e1767babecddc956b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89962
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl/source/app')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 55a7d221968b..fb688c2570fe 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -6197,21 +6197,21 @@ std::unique_ptr<weld::Window> SalInstanceBuilder::weld_window(const OString& id, std::unique_ptr<weld::Widget> SalInstanceBuilder::weld_widget(const OString& id, bool bTakeOwnership) { - vcl::Window* pWidget = m_xBuilder->get<vcl::Window>(id); + vcl::Window* pWidget = m_xBuilder->get(id); return pWidget ? std::make_unique<SalInstanceWidget>(pWidget, this, bTakeOwnership) : nullptr; } std::unique_ptr<weld::Container> SalInstanceBuilder::weld_container(const OString& id, bool bTakeOwnership) { - vcl::Window* pContainer = m_xBuilder->get<vcl::Window>(id); + vcl::Window* pContainer = m_xBuilder->get(id); return pContainer ? std::make_unique<SalInstanceContainer>(pContainer, this, bTakeOwnership) : nullptr; } std::unique_ptr<weld::Box> SalInstanceBuilder::weld_box(const OString& id, bool bTakeOwnership) { - vcl::Window* pContainer = m_xBuilder->get<vcl::Window>(id); + vcl::Window* pContainer = m_xBuilder->get(id); return pContainer ? std::make_unique<SalInstanceBox>(pContainer, this, bTakeOwnership) : nullptr; } @@ -6241,7 +6241,7 @@ std::unique_ptr<weld::ScrolledWindow> SalInstanceBuilder::weld_scrolled_window(c std::unique_ptr<weld::Notebook> SalInstanceBuilder::weld_notebook(const OString& id, bool bTakeOwnership) { - vcl::Window* pNotebook = m_xBuilder->get<vcl::Window>(id); + vcl::Window* pNotebook = m_xBuilder->get(id); if (!pNotebook) return nullptr; if (pNotebook->GetType() == WindowType::TABCONTROL) @@ -6388,7 +6388,7 @@ SalInstanceBuilder::weld_time_spin_button(const OString& id, TimeFieldFormat eFo std::unique_ptr<weld::ComboBox> SalInstanceBuilder::weld_combo_box(const OString& id, bool bTakeOwnership) { - vcl::Window* pWidget = m_xBuilder->get<vcl::Window>(id); + vcl::Window* pWidget = m_xBuilder->get(id); ::ComboBox* pComboBox = dynamic_cast<::ComboBox*>(pWidget); if (pComboBox) return std::make_unique<SalInstanceComboBoxWithEdit>(pComboBox, this, bTakeOwnership); @@ -6402,7 +6402,7 @@ std::unique_ptr<weld::EntryTreeView> SalInstanceBuilder::weld_entry_tree_view(const OString& containerid, const OString& entryid, const OString& treeviewid, bool bTakeOwnership) { - vcl::Window* pContainer = m_xBuilder->get<vcl::Window>(containerid); + vcl::Window* pContainer = m_xBuilder->get(containerid); return pContainer ? std::make_unique<SalInstanceEntryTreeView>( pContainer, this, bTakeOwnership, weld_entry(entryid, bTakeOwnership), weld_tree_view(treeviewid, bTakeOwnership)) |