chart2/source/controller/dialogs/DataBrowser.cxx | 10 +++++-----
chart2/source/controller/dialogs/DataBrowser.hxx | 6 +++---
chart2/source/controller/dialogs/dlg_DataEditor.cxx | 4 ++--
chart2/source/controller/inc/dlg_DataEditor.hxx | 4 ++--
extensions/source/propctrlr/browserline.cxx | 2 +-
extensions/source/propctrlr/browserline.hxx | 4 ++--
extensions/source/propctrlr/browserlistbox.cxx | 2 +-
extensions/source/propctrlr/browserlistbox.hxx | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 5a9fcc7347c19adfbd56262b0b44f36b1ce4caed
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Aug 1 09:08:44 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Aug 2 09:14:45 2025 +0200
tdf#130857 extensions: Use more specific weld::Box member
... instead of the more generic weld::Container for
this widget defined as "GtkBox" object in the .ui file
(extensions/uiconfig/spropctrlr/ui/browserpage.ui).
This change is done as part of checking that none
of the widgets on which the weld::Container methods
are called is a weld::ScrolledWindow, which will soon
no longer subclass weld::Container.
Change-Id: Icc9de336b1616f197cdf116deefcdb5635176870
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188756
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/extensions/source/propctrlr/browserline.cxx
b/extensions/source/propctrlr/browserline.cxx
index 00c8c3f6ddb6..ee519ef56ea3 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -51,7 +51,7 @@ namespace pcr
namespace PropertyLineElement =
::com::sun::star::inspection::PropertyLineElement;
- OBrowserLine::OBrowserLine(OUString aEntryName, weld::Container* pParent,
weld::SizeGroup* pLabelGroup,
+ OBrowserLine::OBrowserLine(OUString aEntryName, weld::Box* pParent,
weld::SizeGroup* pLabelGroup,
weld::Container* pInitialControlParent)
: m_sEntryName(std::move(aEntryName))
, m_xBuilder(Application::CreateBuilder(pParent,
u"modules/spropctrlr/ui/browserline.ui"_ustr))
diff --git a/extensions/source/propctrlr/browserline.hxx
b/extensions/source/propctrlr/browserline.hxx
index e468b5003898..81d35c0e35e0 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -57,7 +57,7 @@ namespace pcr
css::uno::Reference< css::inspection::XPropertyControl >
m_xControl;
weld::Container* m_pInitialControlParent;
- weld::Container* m_pParent;
+ weld::Box* m_pParent;
weld::Widget* m_pControlWindow;
weld::Button* m_pBrowseButton;
weld::Button* m_pAdditionalBrowseButton;
@@ -68,7 +68,7 @@ namespace pcr
bool m_bReadOnly;
public:
- OBrowserLine(OUString aEntryName, weld::Container* pParent,
weld::SizeGroup* pLabelGroup,
+ OBrowserLine(OUString aEntryName, weld::Box* pParent, weld::SizeGroup*
pLabelGroup,
weld::Container* pInitialControlParent);
~OBrowserLine();
diff --git a/extensions/source/propctrlr/browserlistbox.cxx
b/extensions/source/propctrlr/browserlistbox.cxx
index 1ae4650a26bb..32b7951c1693 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -298,7 +298,7 @@ namespace pcr
OBrowserListBox::OBrowserListBox(weld::Builder& rBuilder, weld::Container*
pContainer)
:
m_xScrolledWindow(rBuilder.weld_scrolled_window(u"scrolledwindow"_ustr))
- , m_xLinesPlayground(rBuilder.weld_container(u"playground"_ustr))
+ , m_xLinesPlayground(rBuilder.weld_box(u"playground"_ustr))
, m_xSizeGroup(rBuilder.create_size_group())
, m_xHelpWindow(new InspectorHelpWindow(rBuilder))
, m_pInitialControlParent(pContainer)
diff --git a/extensions/source/propctrlr/browserlistbox.hxx
b/extensions/source/propctrlr/browserlistbox.hxx
index fc1f35541208..bbc364584453 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -67,7 +67,7 @@ namespace pcr
class OBrowserListBox final : public IButtonClickListener
{
std::unique_ptr<weld::ScrolledWindow> m_xScrolledWindow;
- std::unique_ptr<weld::Container> m_xLinesPlayground;
+ std::unique_ptr<weld::Box> m_xLinesPlayground;
std::unique_ptr<weld::SizeGroup> m_xSizeGroup;
std::unique_ptr<InspectorHelpWindow> m_xHelpWindow;
weld::Container* m_pInitialControlParent;
commit ff44e0caeffffb5f025bfd560e5f7062bfd5df82
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Aug 1 09:00:29 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Aug 2 09:14:33 2025 +0200
tdf#130857 chart: Use more specific weld::Box members
... instead of the more generic weld::Container for
these widgets defined as "GtkBox" objects in the .ui file
(chart2/uiconfig/ui/chartdatadialog.ui).
This change is done as part of checking that none
of the widgets on which the weld::Container methods
are called is a weld::ScrolledWindow, which will soon
no longer subclass weld::Container.
Change-Id: I97220960531ac61eb2ddeb367c309212c8544d23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188755
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 7cab156b530c..ae07eb5c233d 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -166,7 +166,7 @@ IMPL_LINK_NOARG(SeriesHeaderEdit, MousePressHdl, const
MouseEvent&, bool)
class SeriesHeader
{
public:
- explicit SeriesHeader(weld::Container* pParent, weld::Container*
pColorParent, sal_Int32 nHeader);
+ explicit SeriesHeader(weld::Box* pParent, weld::Box* pColorParent,
sal_Int32 nHeader);
~SeriesHeader();
void SetColor( const Color & rCol );
@@ -207,8 +207,8 @@ private:
std::unique_ptr<weld::Builder> m_xBuilder1;
std::unique_ptr<weld::Builder> m_xBuilder2;
- weld::Container* m_pParent;
- weld::Container* m_pColorParent;
+ weld::Box* m_pParent;
+ weld::Box* m_pColorParent;
std::unique_ptr<weld::Container> m_xContainer1;
std::unique_ptr<weld::Container> m_xContainer2;
@@ -233,7 +233,7 @@ private:
bool m_bSeriesNameChangePending;
};
-SeriesHeader::SeriesHeader(weld::Container* pParent, weld::Container*
pColorParent, sal_Int32 nHeader)
+SeriesHeader::SeriesHeader(weld::Box* pParent, weld::Box* pColorParent,
sal_Int32 nHeader)
: m_aUpdateDataTimer( "SeriesHeader UpdateDataTimer" )
, m_xBuilder1(Application::CreateBuilder(pParent,
u"modules/schart/ui/columnfragment.ui"_ustr))
, m_xBuilder2(Application::CreateBuilder(pColorParent,
u"modules/schart/ui/imagefragment.ui"_ustr))
@@ -473,7 +473,7 @@ sal_Int32 lcl_getColumnInDataOrHeader(
} // anonymous namespace
DataBrowser::DataBrowser(const css::uno::Reference<css::awt::XWindow> &rParent,
- weld::Container* pColumns, weld::Container* pColors) :
+ weld::Box* pColumns, weld::Box* pColors) :
::svt::EditBrowseBox(VCLUnoHelper::GetWindow(rParent),
EditBrowseBoxFlags::SMART_TAB_TRAVEL |
EditBrowseBoxFlags::HANDLE_COLUMN_TEXT,
WB_BORDER | WB_TABSTOP, BrowserStdFlags ),
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx
b/chart2/source/controller/dialogs/DataBrowser.hxx
index 46c62ba63e3c..86acc86ccef7 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -70,7 +70,7 @@ protected:
public:
DataBrowser(const css::uno::Reference<css::awt::XWindow> &rParent,
- weld::Container* pColumns, weld::Container* pColors);
+ weld::Box* pColumns, weld::Box* pColors);
virtual ~DataBrowser() override;
virtual void dispose() override;
@@ -160,8 +160,8 @@ private:
VclPtr<svt::FormattedControl> m_aNumberEditField;
VclPtr<svt::EditControl> m_aTextEditField;
- weld::Container* m_pColumnsWin;
- weld::Container* m_pColorsWin;
+ weld::Box* m_pColumnsWin;
+ weld::Box* m_pColorsWin;
/// note: m_aNumberEditField must precede this member!
::svt::CellControllerRef m_rNumberEditController;
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index a62a9d712693..05cf8e96bff2 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -40,8 +40,8 @@ DataEditor::DataEditor(weld::Window* pParent,
, m_xTbxData(m_xBuilder->weld_toolbar(u"toolbar"_ustr))
, m_xCloseBtn(m_xBuilder->weld_button(u"close"_ustr))
, m_xTable(m_xBuilder->weld_container(u"datawindow"_ustr))
- , m_xColumns(m_xBuilder->weld_container(u"columns"_ustr))
- , m_xColors(m_xBuilder->weld_container(u"colorcolumns"_ustr))
+ , m_xColumns(m_xBuilder->weld_box(u"columns"_ustr))
+ , m_xColors(m_xBuilder->weld_box(u"colorcolumns"_ustr))
, m_xTableCtrlParent(m_xTable->CreateChildFrame())
, m_xBrwData(VclPtr<DataBrowser>::Create(m_xTableCtrlParent,
m_xColumns.get(), m_xColors.get()))
{
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx
b/chart2/source/controller/inc/dlg_DataEditor.hxx
index f7e335ac36fa..98cf938014d1 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -50,8 +50,8 @@ private:
std::unique_ptr<weld::Toolbar> m_xTbxData;
std::unique_ptr<weld::Button> m_xCloseBtn;
std::unique_ptr<weld::Container> m_xTable;
- std::unique_ptr<weld::Container> m_xColumns;
- std::unique_ptr<weld::Container> m_xColors;
+ std::unique_ptr<weld::Box> m_xColumns;
+ std::unique_ptr<weld::Box> m_xColors;
css::uno::Reference<css::awt::XWindow> m_xTableCtrlParent;
VclPtr<DataBrowser> m_xBrwData;
