diff --git a/include/vcl/builderbase.hxx b/include/vcl/builderbase.hxx index eb3aa847199f..2632dd6417af 100644 --- a/include/vcl/builderbase.hxx +++ b/include/vcl/builderbase.hxx @@ -45,6 +45,7 @@ public: typedef stringmap Adjustment; typedef stringmap TextBuffer; + static OUString extractActionName(stringmap& rMap); static sal_Int32 extractActive(stringmap& rMap); static bool extractResizable(stringmap& rMap); @@ -88,6 +89,7 @@ protected: static bool extractHeadersVisible(stringmap& rMap); static bool extractEntry(stringmap& rMap); static OUString extractIconName(stringmap& rMap); + static OUString extractLabel(stringmap& rMap); static bool extractShowExpanders(stringmap& rMap); static OUString extractTitle(stringmap& rMap); static OUString extractTooltipText(stringmap& rMap); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index fd604cbe1c94..62469d222d82 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -953,16 +953,6 @@ namespace return nBits; } - OUString extractLabel(VclBuilder::stringmap &rMap) - { - return extractStringEntry(rMap, u"label"_ustr); - } - - OUString extractActionName(VclBuilder::stringmap &rMap) - { - return extractStringEntry(rMap, u"action-name"_ustr); - } - Size extractSizeRequest(VclBuilder::stringmap &rMap) { OUString sWidthRequest(u"0"_ustr); @@ -1009,7 +999,7 @@ namespace if (!rFrame.is()) return; - OUString aCommand(extractActionName(rMap)); + OUString aCommand(BuilderBase::extractActionName(rMap)); if (aCommand.isEmpty()) return; @@ -3355,6 +3345,11 @@ bool BuilderBase::hasOrientationVertical(VclBuilder::stringmap &rMap) return bVertical; } +OUString BuilderBase::extractActionName(stringmap& rMap) +{ + return extractStringEntry(rMap, u"action-name"_ustr); +} + sal_Int32 BuilderBase::extractActive(VclBuilder::stringmap& rMap) { sal_Int32 nActiveId = 0; @@ -3403,6 +3398,11 @@ OUString BuilderBase::extractIconName(VclBuilder::stringmap &rMap) return !sReplace.isEmpty() ? sReplace : sIconName; } +OUString BuilderBase::extractLabel(VclBuilder::stringmap& rMap) +{ + return extractStringEntry(rMap, u"label"_ustr); +} + bool BuilderBase::extractResizable(stringmap& rMap) { return extractBoolEntry(rMap, u"resizable"_ustr, true);