[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

[Caolán McNamara]

 vcl/source/window/builder.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 4a5d7af326d85d7cf24193a18c2df9575c9241b2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 4 11:02:34 2013 +0100

    fix %VARIABLE replacements in item lists
    
    Change-Id: I94f129e26afdac9dc2e0d712c79d73142ced5eee
    (cherry picked from commit c104e2b661ec840951d39b5889495e2c42ff3d36)
    Reviewed-on: https://gerrit.libreoffice.org/4715
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 3824497..d652578 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1919,6 +1919,12 @@ std::vector<OString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const
                 if (!bTranslated)
                     sValue = OString(name.begin, name.length);
 
+                if (m_pStringReplace)
+                {
+                    OUString sTmp = (*m_pStringReplace)(OStringToOUString(sValue, RTL_TEXTENCODING_UTF8));
+                    sValue = OUStringToOString(sTmp, RTL_TEXTENCODING_UTF8);
+                }
+
                 aItems.push_back(sValue);
                 ++nItemIndex;
             }