diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-08-29 22:08:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:40 +0100 |
| commit | 676659bc050f8a1353ca44fdd2dc19cea2fadd53 (patch) | |
| tree | d0b82fd85574bdb491fd2881e9846a546afc5847 /vcl | |
| parent | 6bf72662ea275d866402d5ac3cdbea8d3e723568 (diff) | |
we need TEXT_RAW to retain leading/trailing label whitespace text
Change-Id: Ic0fe9dba4cb2efcb96830425626a3ae9636ce18c
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/builder.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index c2f987d943dd..8593efa9feaa 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -38,6 +38,8 @@ #include <vcl/svapp.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> +#include <svdata.hxx> +#include <svids.hrc> #include <window.h> VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUIDir, rtl::OUString sUIFile, rtl::OString sID) @@ -158,7 +160,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader) while(1) { xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId); + xmlreader::XmlReader::TEXT_RAW, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_BEGIN) { @@ -810,7 +812,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const rtl::OStrin } reader.nextItem( - xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId); + xmlreader::XmlReader::TEXT_RAW, &name, &nsId); if (!bTranslated) sValue = rtl::OString(name.begin, name.length); @@ -968,7 +970,7 @@ void VclBuilder::applyPackingProperty(Window *pCurrent, rtl::OString sKey(name.begin, name.length); sKey = sKey.replace('_', '-'); reader.nextItem( - xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId); + xmlreader::XmlReader::TEXT_RAW, &name, &nsId); rtl::OString sValue(name.begin, name.length); if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("expand"))) @@ -1054,7 +1056,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const rtl::OStrin } - reader.nextItem(xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId); + reader.nextItem(xmlreader::XmlReader::TEXT_RAW, &name, &nsId); if (!bTranslated) sValue = rtl::OString(name.begin, name.length); |