vcl/unx/gtk3/gtk3gtkinst.cxx | 70 +++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 39 deletions(-)
New commits:
commit 3dc0f1b77dd10b5b844bdab4cc089e82eeb9afa8
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jul 29 09:38:16 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jul 29 11:12:21 2019 +0200
revert part of "add some error checking to the UI file loading"
revert part of
commit cba5cd06c8ffd8628ae3d39efe715a5d8b3ac7e7
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Fri Jul 26 12:49:10 2019 +0200
add some error checking to the UI file loading
because some places eg. "writer format->bullets and numbering" expect a
silent return of nullptr for a missing button
Change-Id: I5cf8fa64d703636a65dc96987688c283016c87e8
Reviewed-on: https://gerrit.libreoffice.org/76522
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 5e5feb493c86..881be69fb2a2 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -10511,17 +10511,9 @@ public:
gtk_container_add(GTK_CONTAINER(m_pParentWidget), pWidget);
}
- static GObject* builder_get_object(GtkBuilder* pBuilder, const OString &id)
- {
- auto pObject = gtk_builder_get_object(pBuilder, id.getStr());
- SAL_WARN_IF(!pObject, "vcl.gtk", "could not load object '" << id << "'
from UI file");
- assert(pObject && "could not load GTK object");
- return pObject;
- }
-
virtual std::unique_ptr<weld::MessageDialog> weld_message_dialog(const
OString &id, bool bTakeOwnership) override
{
- GtkMessageDialog* pMessageDialog =
GTK_MESSAGE_DIALOG(builder_get_object(m_pBuilder, id));
+ GtkMessageDialog* pMessageDialog =
GTK_MESSAGE_DIALOG(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pMessageDialog)
return nullptr;
gtk_window_set_transient_for(GTK_WINDOW(pMessageDialog),
GTK_WINDOW(gtk_widget_get_toplevel(m_pParentWidget)));
@@ -10530,7 +10522,7 @@ public:
virtual std::unique_ptr<weld::AboutDialog> weld_about_dialog(const OString
&id, bool bTakeOwnership) override
{
- GtkAboutDialog* pAboutDialog =
GTK_ABOUT_DIALOG(builder_get_object(m_pBuilder, id));
+ GtkAboutDialog* pAboutDialog =
GTK_ABOUT_DIALOG(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pAboutDialog)
return nullptr;
gtk_window_set_transient_for(GTK_WINDOW(pAboutDialog),
GTK_WINDOW(gtk_widget_get_toplevel(m_pParentWidget)));
@@ -10539,7 +10531,7 @@ public:
virtual std::unique_ptr<weld::Dialog> weld_dialog(const OString &id, bool
bTakeOwnership) override
{
- GtkDialog* pDialog = GTK_DIALOG(builder_get_object(m_pBuilder, id));
+ GtkDialog* pDialog = GTK_DIALOG(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pDialog)
return nullptr;
if (m_pParentWidget)
@@ -10549,13 +10541,13 @@ public:
virtual std::unique_ptr<weld::Window> weld_window(const OString &id, bool
bTakeOwnership) override
{
- GtkWindow* pWindow = GTK_WINDOW(builder_get_object(m_pBuilder, id));
+ GtkWindow* pWindow = GTK_WINDOW(gtk_builder_get_object(m_pBuilder,
id.getStr()));
return pWindow ? std::make_unique<GtkInstanceWindow>(pWindow, this,
bTakeOwnership) : nullptr;
}
virtual std::unique_ptr<weld::Widget> weld_widget(const OString &id, bool
bTakeOwnership) override
{
- GtkWidget* pWidget = GTK_WIDGET(builder_get_object(m_pBuilder, id));
+ GtkWidget* pWidget = GTK_WIDGET(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pWidget)
return nullptr;
auto_add_parentless_widgets_to_container(pWidget);
@@ -10564,7 +10556,7 @@ public:
virtual std::unique_ptr<weld::Container> weld_container(const OString &id,
bool bTakeOwnership) override
{
- GtkContainer* pContainer =
GTK_CONTAINER(builder_get_object(m_pBuilder, id));
+ GtkContainer* pContainer =
GTK_CONTAINER(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pContainer)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pContainer));
@@ -10573,7 +10565,7 @@ public:
virtual std::unique_ptr<weld::Frame> weld_frame(const OString &id, bool
bTakeOwnership) override
{
- GtkFrame* pFrame = GTK_FRAME(builder_get_object(m_pBuilder, id));
+ GtkFrame* pFrame = GTK_FRAME(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pFrame)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pFrame));
@@ -10582,7 +10574,7 @@ public:
virtual std::unique_ptr<weld::ScrolledWindow> weld_scrolled_window(const
OString &id, bool bTakeOwnership) override
{
- GtkScrolledWindow* pScrolledWindow =
GTK_SCROLLED_WINDOW(builder_get_object(m_pBuilder, id));
+ GtkScrolledWindow* pScrolledWindow =
GTK_SCROLLED_WINDOW(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pScrolledWindow)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pScrolledWindow));
@@ -10591,7 +10583,7 @@ public:
virtual std::unique_ptr<weld::Notebook> weld_notebook(const OString &id,
bool bTakeOwnership) override
{
- GtkNotebook* pNotebook = GTK_NOTEBOOK(builder_get_object(m_pBuilder,
id));
+ GtkNotebook* pNotebook =
GTK_NOTEBOOK(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pNotebook)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pNotebook));
@@ -10600,7 +10592,7 @@ public:
virtual std::unique_ptr<weld::Button> weld_button(const OString &id, bool
bTakeOwnership) override
{
- GtkButton* pButton = GTK_BUTTON(builder_get_object(m_pBuilder, id));
+ GtkButton* pButton = GTK_BUTTON(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pButton)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pButton));
@@ -10609,7 +10601,7 @@ public:
virtual std::unique_ptr<weld::MenuButton> weld_menu_button(const OString
&id, bool bTakeOwnership) override
{
- GtkMenuButton* pButton =
GTK_MENU_BUTTON(builder_get_object(m_pBuilder, id));
+ GtkMenuButton* pButton =
GTK_MENU_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pButton)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pButton));
@@ -10618,7 +10610,7 @@ public:
virtual std::unique_ptr<weld::LinkButton> weld_link_button(const OString
&id, bool bTakeOwnership) override
{
- GtkLinkButton* pButton =
GTK_LINK_BUTTON(builder_get_object(m_pBuilder, id));
+ GtkLinkButton* pButton =
GTK_LINK_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pButton)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pButton));
@@ -10627,7 +10619,7 @@ public:
virtual std::unique_ptr<weld::ToggleButton> weld_toggle_button(const
OString &id, bool bTakeOwnership) override
{
- GtkToggleButton* pToggleButton =
GTK_TOGGLE_BUTTON(builder_get_object(m_pBuilder, id));
+ GtkToggleButton* pToggleButton =
GTK_TOGGLE_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pToggleButton)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pToggleButton));
@@ -10636,7 +10628,7 @@ public:
virtual std::unique_ptr<weld::RadioButton> weld_radio_button(const OString
&id, bool bTakeOwnership) override
{
- GtkRadioButton* pRadioButton =
GTK_RADIO_BUTTON(builder_get_object(m_pBuilder, id));
+ GtkRadioButton* pRadioButton =
GTK_RADIO_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pRadioButton)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pRadioButton));
@@ -10645,7 +10637,7 @@ public:
virtual std::unique_ptr<weld::CheckButton> weld_check_button(const OString
&id, bool bTakeOwnership) override
{
- GtkCheckButton* pCheckButton =
GTK_CHECK_BUTTON(builder_get_object(m_pBuilder, id));
+ GtkCheckButton* pCheckButton =
GTK_CHECK_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pCheckButton)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pCheckButton));
@@ -10654,7 +10646,7 @@ public:
virtual std::unique_ptr<weld::Scale> weld_scale(const OString &id, bool
bTakeOwnership) override
{
- GtkScale* pScale = GTK_SCALE(builder_get_object(m_pBuilder, id));
+ GtkScale* pScale = GTK_SCALE(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pScale)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pScale));
@@ -10663,7 +10655,7 @@ public:
virtual std::unique_ptr<weld::ProgressBar> weld_progress_bar(const OString
&id, bool bTakeOwnership) override
{
- GtkProgressBar* pProgressBar =
GTK_PROGRESS_BAR(builder_get_object(m_pBuilder, id));
+ GtkProgressBar* pProgressBar =
GTK_PROGRESS_BAR(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pProgressBar)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pProgressBar));
@@ -10672,7 +10664,7 @@ public:
virtual std::unique_ptr<weld::Spinner> weld_spinner(const OString &id,
bool bTakeOwnership) override
{
- GtkSpinner* pSpinner = GTK_SPINNER(builder_get_object(m_pBuilder, id));
+ GtkSpinner* pSpinner = GTK_SPINNER(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pSpinner)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pSpinner));
@@ -10681,7 +10673,7 @@ public:
virtual std::unique_ptr<weld::Image> weld_image(const OString &id, bool
bTakeOwnership) override
{
- GtkImage* pImage = GTK_IMAGE(builder_get_object(m_pBuilder, id));
+ GtkImage* pImage = GTK_IMAGE(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pImage)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pImage));
@@ -10690,7 +10682,7 @@ public:
virtual std::unique_ptr<weld::Calendar> weld_calendar(const OString &id,
bool bTakeOwnership) override
{
- GtkCalendar* pCalendar = GTK_CALENDAR(builder_get_object(m_pBuilder,
id));
+ GtkCalendar* pCalendar =
GTK_CALENDAR(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pCalendar)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pCalendar));
@@ -10699,7 +10691,7 @@ public:
virtual std::unique_ptr<weld::Entry> weld_entry(const OString &id, bool
bTakeOwnership) override
{
- GtkEntry* pEntry = GTK_ENTRY(builder_get_object(m_pBuilder, id));
+ GtkEntry* pEntry = GTK_ENTRY(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pEntry)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pEntry));
@@ -10708,7 +10700,7 @@ public:
virtual std::unique_ptr<weld::SpinButton> weld_spin_button(const OString
&id, bool bTakeOwnership) override
{
- GtkSpinButton* pSpinButton =
GTK_SPIN_BUTTON(builder_get_object(m_pBuilder, id));
+ GtkSpinButton* pSpinButton =
GTK_SPIN_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pSpinButton)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pSpinButton));
@@ -10723,7 +10715,7 @@ public:
virtual std::unique_ptr<weld::FormattedSpinButton>
weld_formatted_spin_button(const OString &id, bool bTakeOwnership) override
{
- GtkSpinButton* pSpinButton =
GTK_SPIN_BUTTON(builder_get_object(m_pBuilder, id));
+ GtkSpinButton* pSpinButton =
GTK_SPIN_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pSpinButton)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pSpinButton));
@@ -10738,7 +10730,7 @@ public:
virtual std::unique_ptr<weld::ComboBox> weld_combo_box(const OString &id,
bool bTakeOwnership) override
{
- GtkComboBox* pComboBox = GTK_COMBO_BOX(builder_get_object(m_pBuilder,
id));
+ GtkComboBox* pComboBox =
GTK_COMBO_BOX(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pComboBox)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pComboBox));
@@ -10747,7 +10739,7 @@ public:
virtual std::unique_ptr<weld::TreeView> weld_tree_view(const OString &id,
bool bTakeOwnership) override
{
- GtkTreeView* pTreeView = GTK_TREE_VIEW(builder_get_object(m_pBuilder,
id));
+ GtkTreeView* pTreeView =
GTK_TREE_VIEW(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pTreeView)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pTreeView));
@@ -10767,7 +10759,7 @@ public:
virtual std::unique_ptr<weld::Label> weld_label(const OString &id, bool
bTakeOwnership) override
{
- GtkLabel* pLabel = GTK_LABEL(builder_get_object(m_pBuilder, id));
+ GtkLabel* pLabel = GTK_LABEL(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pLabel)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pLabel));
@@ -10776,7 +10768,7 @@ public:
virtual std::unique_ptr<weld::TextView> weld_text_view(const OString &id,
bool bTakeOwnership) override
{
- GtkTextView* pTextView = GTK_TEXT_VIEW(builder_get_object(m_pBuilder,
id));
+ GtkTextView* pTextView =
GTK_TEXT_VIEW(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pTextView)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pTextView));
@@ -10785,7 +10777,7 @@ public:
virtual std::unique_ptr<weld::Expander> weld_expander(const OString &id,
bool bTakeOwnership) override
{
- GtkExpander* pExpander = GTK_EXPANDER(builder_get_object(m_pBuilder,
id));
+ GtkExpander* pExpander =
GTK_EXPANDER(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pExpander)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pExpander));
@@ -10795,7 +10787,7 @@ public:
virtual std::unique_ptr<weld::DrawingArea> weld_drawing_area(const OString
&id, const a11yref& rA11y,
FactoryFunction /*pUITestFactoryFunction*/, void* /*pUserData*/,
bool bTakeOwnership) override
{
- GtkDrawingArea* pDrawingArea =
GTK_DRAWING_AREA(builder_get_object(m_pBuilder, id));
+ GtkDrawingArea* pDrawingArea =
GTK_DRAWING_AREA(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pDrawingArea)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pDrawingArea));
@@ -10804,7 +10796,7 @@ public:
virtual std::unique_ptr<weld::Menu> weld_menu(const OString &id, bool
bTakeOwnership) override
{
- GtkMenu* pMenu = GTK_MENU(builder_get_object(m_pBuilder, id));
+ GtkMenu* pMenu = GTK_MENU(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pMenu)
return nullptr;
return std::make_unique<GtkInstanceMenu>(pMenu, bTakeOwnership);
@@ -10812,7 +10804,7 @@ public:
virtual std::unique_ptr<weld::Toolbar> weld_toolbar(const OString &id,
bool bTakeOwnership) override
{
- GtkToolbar* pToolbar = GTK_TOOLBAR(builder_get_object(m_pBuilder, id));
+ GtkToolbar* pToolbar = GTK_TOOLBAR(gtk_builder_get_object(m_pBuilder,
id.getStr()));
if (!pToolbar)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pToolbar));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
