Kaydet (Commit) 5a5777f0 authored tarafından Caolán McNamara's avatar Caolán McNamara

need to replace %OOOVENDOR in .ui strings

Change-Id: If44cc1750b8555eab6e3dc2659e60a8fff10b24c
üst 8c4f2093
...@@ -197,6 +197,7 @@ private: ...@@ -197,6 +197,7 @@ private:
OString m_sID; OString m_sID;
OString m_sHelpRoot; OString m_sHelpRoot;
OString m_sProductName; OString m_sProductName;
OString m_sVendor;
Window *m_pParent; Window *m_pParent;
bool m_bToplevelHasDeferredInit; bool m_bToplevelHasDeferredInit;
bool m_bToplevelParentFound; bool m_bToplevelParentFound;
......
...@@ -139,6 +139,7 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri ...@@ -139,6 +139,7 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri
: m_sID(sID) : m_sID(sID)
, m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8)) , m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8))
, m_sProductName(OUStringToOString(utl::ConfigManager::getProductName(), 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_pParent(pParent)
, m_bToplevelParentFound(false) , m_bToplevelParentFound(false)
, m_pParserState(new ParserState) , m_pParserState(new ParserState)
...@@ -2402,7 +2403,9 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI ...@@ -2402,7 +2403,9 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI
if (!sProperty.isEmpty()) if (!sProperty.isEmpty())
{ {
sProperty = sProperty.replace('_', '-'); sProperty = sProperty.replace('_', '-');
rMap[sProperty] = sValue.replaceAll("%PRODUCTNAME", m_sProductName); rMap[sProperty] = sValue.
replaceAll("%PRODUCTNAME", m_sProductName).
replaceAll("%OOOVENDOR", m_sVendor);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment