vcl/unx/gtk4/a11y.cxx | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
New commits: commit 37ca398665af12711769f825395376772f9e0f2d Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Wed May 17 09:58:48 2023 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Wed May 17 15:46:42 2023 +0200 loplugin:external "externally available entity '...' is not previously declared in an included file (if it is only used in this translation unit, make it static; otherwise, provide a declaration of it in an included file)" Change-Id: Id53a4fd0b01ea7a91735231750c32200ea1529b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151864 Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/vcl/unx/gtk4/a11y.cxx b/vcl/unx/gtk4/a11y.cxx index 459ed3bc8f78..be0c3904783a 100644 --- a/vcl/unx/gtk4/a11y.cxx +++ b/vcl/unx/gtk4/a11y.cxx @@ -31,7 +31,7 @@ struct OOoFixedClass GtkFixedClass parent_class; }; -GtkAccessibleRole +static GtkAccessibleRole map_accessible_role(const css::uno::Reference<css::accessibility::XAccessible>& rAccessible) { GtkAccessibleRole eRole(GTK_ACCESSIBLE_ROLE_WIDGET); @@ -130,7 +130,7 @@ map_accessible_role(const css::uno::Reference<css::accessibility::XAccessible>& return eRole; } -css::uno::Reference<css::accessibility::XAccessible> get_uno_accessible(GtkWidget* pWidget) +static css::uno::Reference<css::accessibility::XAccessible> get_uno_accessible(GtkWidget* pWidget) { GtkWidget* pTopLevel = widget_get_toplevel(pWidget); if (!pTopLevel) @@ -255,7 +255,7 @@ static GtkAccessible* lo_accessible_get_accessible_parent(GtkAccessible* accessi return GTK_ACCESSIBLE(g_object_ref(lo_accessible->parent)); } -GtkATContext* lo_accessible_get_at_context(GtkAccessible* self) +static GtkATContext* lo_accessible_get_at_context(GtkAccessible* self) { LoAccessible* pAccessible = LO_ACCESSIBLE(self); @@ -295,7 +295,7 @@ static void lo_accessible_accessible_init(GtkAccessibleInterface* iface) G_DEFINE_TYPE_WITH_CODE(LoAccessible, lo_accessible, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE(GTK_TYPE_ACCESSIBLE, lo_accessible_accessible_init)) -LoAccessible* +static LoAccessible* lo_accessible_new(GdkDisplay* pDisplay, GtkAccessible* pParent, const css::uno::Reference<css::accessibility::XAccessible>& rAccessible) { @@ -404,7 +404,7 @@ static gboolean lo_accessible_get_platform_state(GtkAccessible* self, static void lo_accessible_init(LoAccessible* /*iface*/) {} -GtkATContext* get_at_context(GtkAccessible* self) +static GtkATContext* get_at_context(GtkAccessible* self) { OOoFixed* pFixed = OOO_FIXED(self); @@ -433,7 +433,7 @@ gboolean get_platform_state(GtkAccessible* self, GtkAccessiblePlatformState stat } #endif -gboolean get_bounds(GtkAccessible* accessible, int* x, int* y, int* width, int* height) +static gboolean get_bounds(GtkAccessible* accessible, int* x, int* y, int* width, int* height) { OOoFixed* pFixed = OOO_FIXED(accessible); css::uno::Reference<css::accessibility::XAccessible> xAccessible( @@ -451,7 +451,7 @@ gboolean get_bounds(GtkAccessible* accessible, int* x, int* y, int* width, int* return true; } -GtkAccessible* get_first_accessible_child(GtkAccessible* accessible) +static GtkAccessible* get_first_accessible_child(GtkAccessible* accessible) { OOoFixed* pFixed = OOO_FIXED(accessible); css::uno::Reference<css::accessibility::XAccessible> xAccessible( commit d5d40497112e13ca281573b4d7b3b3a350d29ea4 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Wed May 17 09:37:13 2023 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Wed May 17 15:46:34 2023 +0200 loplugin:reservedid Change-Id: Ia24f5214f44a5ef4f5ac4397b8adcd6d46a99676 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151863 Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/vcl/unx/gtk4/a11y.cxx b/vcl/unx/gtk4/a11y.cxx index 307d72624fab..459ed3bc8f78 100644 --- a/vcl/unx/gtk4/a11y.cxx +++ b/vcl/unx/gtk4/a11y.cxx @@ -162,9 +162,7 @@ GType lo_accessible_get_type(); #define LO_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LO_TYPE_ACCESSIBLE, LoAccessible)) // #define LO_IS_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LO_TYPE_ACCESSIBLE)) -typedef struct _LoAccessible LoAccessible; - -struct _LoAccessible +struct LoAccessible { GObject parent_instance; GdkDisplay* display; @@ -173,8 +171,7 @@ struct _LoAccessible css::uno::Reference<css::accessibility::XAccessible> uno_accessible; }; -typedef struct _LoAccessibleClass LoAccessibleClass; -struct _LoAccessibleClass +struct LoAccessibleClass { GObjectClass parent_class; };