[Libreoffice-commits] core.git: sfx2/source vcl/source

[Caolán McNamara]

 sfx2/source/appl/sfxhelp.cxx  |    5 +++--
 vcl/source/window/builder.cxx |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit dab87ec9ac4ac0e4803790232d8b487e1500f24a
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Apr 13 10:40:34 2018 +0100

    PRODUCTNAME not expanded in help missing dialog
    
    Change-Id: I6fb0e64566eacadc963f1b7ff570e021abe29522
    Reviewed-on: https://gerrit.libreoffice.org/52817
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index d4d55e99ea4b..43606ae0183e 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -827,8 +827,9 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 
         LanguageTag aLangTag = Application::GetSettings().GetUILanguageTag();
         OUString sLocaleString = SvtLanguageTable::GetLanguageString( 
aLangTag.getLanguageType() );
-        OUString sPrimTex = xQueryBox->get_primary_text();
-        xQueryBox->set_primary_text(sPrimTex.replaceAll("$UILOCALE", 
sLocaleString));
+        OUString sPrimText = xQueryBox->get_primary_text();
+        
xQueryBox->set_primary_text(Translate::GetReadStringHook()(sPrimText).replaceAll("$UILOCALE",
 sLocaleString));
+        
xQueryBox->set_title(Translate::GetReadStringHook()(xQueryBox->get_title()));
         short OnlineHelpBox = xQueryBox->run();
 
         if(OnlineHelpBox == RET_OK)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 167094a3abe1..db9bfef526e2 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2604,7 +2604,7 @@ std::vector<OUString> 
VclBuilder::handleItems(xmlreader::XmlReader &reader) cons
                 else
                     sFinalValue = OUString::fromUtf8(sValue);
 
-                if (m_pStringReplace)
+                if (m_bLegacy && m_pStringReplace)
                     sFinalValue = (*m_pStringReplace)(sFinalValue);
 
                 aItems.push_back(sFinalValue);
@@ -3349,7 +3349,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader 
&reader, stringmap &rMap)
     if (!sProperty.isEmpty())
     {
         sProperty = sProperty.replace('_', '-');
-        if (m_pStringReplace)
+        if (m_bLegacy && m_pStringReplace)
             sFinalValue = (*m_pStringReplace)(sFinalValue);
         rMap[sProperty] = sFinalValue;
     }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits