core.git: include/vcl vcl/source

[Michael Weghorn (via logerrit)]

 include/vcl/builder.hxx       |    2 +-
 vcl/source/window/builder.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 798df0ff16c1cedb1c3f68eddb6c82640ae16d00
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Aug 12 13:36:11 2024 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Aug 13 07:26:10 2024 +0200

    tdf#130857 VclBuilder: Move collectProperty to base class
    
    With the translation/localization moved to the base class
    in
    
        Change-Id: I2cefddae0a7e2e2dd4487cc9b9796afb215e2616
        Author: Michael Weghorn <m.wegh...@posteo.de>
        Date:   Mon Aug 12 12:52:16 2024 +0200
    
            tdf#130857 VclBuilder: Move locale handling to base class
    
    , `VclBuilder::collectProperty` can now be moved there
    for reuse as well.
    
    Change-Id: I159aac8b59dd429b3c7d991c0d2546ae6739bcca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171790
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 4682e0951756..e26aaeb7974b 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -77,6 +77,7 @@ protected:
     static void collectAtkRelationAttribute(xmlreader::XmlReader& reader, 
stringmap& rMap);
     static void collectAtkRoleAttribute(xmlreader::XmlReader& reader, 
stringmap& rMap);
     static void collectAccelerator(xmlreader::XmlReader& reader, accelmap& 
rMap);
+    void collectProperty(xmlreader::XmlReader& rReader, stringmap& rMap) const;
     void handleInterfaceDomain(xmlreader::XmlReader& rReader);
     static bool isToolbarItemClass(std::u16string_view sClass);
     static std::vector<vcl::EnumContext::Context> 
handleStyle(xmlreader::XmlReader &reader, int &nPriority);
@@ -368,7 +369,6 @@ private:
 
     void        handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, 
xmlreader::XmlReader &reader);
     void        applyPackingProperty(vcl::Window *pCurrent, vcl::Window 
*pParent, xmlreader::XmlReader &reader);
-    void        collectProperty(xmlreader::XmlReader &reader, stringmap &rVec) 
const;
 
     void        insertMenuObject(
                    Menu *pParent,
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d25eb5efc954..ec870da2c9c5 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3983,7 +3983,7 @@ OUString BuilderBase::getStyleClass(xmlreader::XmlReader 
&reader)
     return aRet;
 }
 
-void VclBuilder::collectProperty(xmlreader::XmlReader &reader, stringmap 
&rMap) const
+void BuilderBase::collectProperty(xmlreader::XmlReader& reader, stringmap& 
rMap) const
 {
     xmlreader::Span name;
     int nsId;