commit 5a5777f0a75e512af35250e90bc2670492ba5c9b
author Caolán McNamara <caolanm@redhat.com> Thu Apr 04 09:58:29 2013 +0100
committer Caolán McNamara <caolanm@redhat.com> Thu Apr 04 10:29:37 2013 +0100
tree 9ab383bbee5fded5eef8553d953aad551506ef3f
parent 8c4f20938bc5d4013126a00a02e8eca80b250284

need to replace %OOOVENDOR in .ui strings

Change-Id: If44cc1750b8555eab6e3dc2659e60a8fff10b24c

vcl/inc/vcl/builder.hxx

diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 11693a3..c606055 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -197,6 +197,7 @@ private:
    OString m_sID;
    OString m_sHelpRoot;
    OString m_sProductName;
    OString m_sVendor;
    Window *m_pParent;
    bool m_bToplevelHasDeferredInit;
    bool m_bToplevelParentFound;

vcl/source/window/builder.cxx

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 3a09dad..75959b6 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -139,6 +139,7 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri
    : m_sID(sID)
    , m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8))
    , m_sProductName(OUStringToOString(utl::ConfigManager::getProductName(), RTL_TEXTENCODING_UTF8))
    , m_sVendor(OUStringToOString(utl::ConfigManager::getVendor(), RTL_TEXTENCODING_UTF8))
    , m_pParent(pParent)
    , m_bToplevelParentFound(false)
    , m_pParserState(new ParserState)
@@ -2402,7 +2403,9 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI
    if (!sProperty.isEmpty())
    {
        sProperty = sProperty.replace('_', '-');
        rMap[sProperty] = sValue.replaceAll("%PRODUCTNAME", m_sProductName);
        rMap[sProperty] = sValue.
            replaceAll("%PRODUCTNAME", m_sProductName).
            replaceAll("%OOOVENDOR", m_sVendor);
    }
}