include/vcl/builder.hxx | 3 +--
vcl/source/window/builder.cxx | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit cd72aca086ff84467d51f6864c58648c3322c53f
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Aug 13 13:40:52 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Aug 13 19:31:22 2024 +0200
tdf#130857 VclBuilder: Move handleAtkObject to base class
Change-Id: I0f29b53b58f2d65d3409f6416406ba21c2411b98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171821
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 0e2426149b07..e6f20884ee80 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -104,6 +104,7 @@ protected:
const bool bTranslate) const;
+ stringmap handleAtkObject(xmlreader::XmlReader& reader) const;
std::vector<ComboBoxTextItem> handleItems(xmlreader::XmlReader& reader)
const;
void handleListStore(xmlreader::XmlReader& reader, const OUString& rID,
std::u16string_view rClass);
void handleRow(xmlreader::XmlReader& reader, const OUString& rID);
@@ -396,8 +397,6 @@ private:
void handleMenu(xmlreader::XmlReader& reader, vcl::Window* pParent, const
OUString& rID,
bool bMenuBar);
- stringmap handleAtkObject(xmlreader::XmlReader &reader) const;
-
// if bToolbarItem=true, pParent is the ToolBox that the item belongs to,
since there's no widget for the item itself
void applyAtkProperties(vcl::Window *pWindow, const stringmap&
rProperties, bool bToolbarItem);
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a68b4b6a0bf6..51df1bac77fd 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3110,7 +3110,7 @@ void BuilderBase::handleListStore(xmlreader::XmlReader&
reader, const OUString&
}
}
-VclBuilder::stringmap VclBuilder::handleAtkObject(xmlreader::XmlReader
&reader) const
+BuilderBase::stringmap BuilderBase::handleAtkObject(xmlreader::XmlReader&
reader) const
{
int nLevel = 1;
