[Libreoffice-commits] core.git: 2 commits - l10ntools/source lotuswordpro/source

[Caolán McNamara]

 l10ntools/source/merge.cxx                 |   17 +++++++++++++----
 lotuswordpro/source/filter/lwpoverride.cxx |    4 +++-
 2 files changed, 16 insertions(+), 5 deletions(-)

New commits:
commit eca17faebdeb1a1dc305ffc9273e533eb880d4da
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 16 10:24:40 2016 +0000

    ubsan: load of value 768, which is not a valid value for type
    
    Change-Id: Ief0b70f19630d8d8cc925145848c7a2c8a2813ad

diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx
index d78de24..5856a4c 100644
--- a/lotuswordpro/source/filter/lwpoverride.cxx
+++ b/lotuswordpro/source/filter/lwpoverride.cxx
@@ -338,7 +338,9 @@ void LwpSpacingCommonOverride::Read(LwpObjectStream* pStrm)
     if (pStrm->QuickReadBool())
     {
         ReadCommon(pStrm);
-        m_nSpacingType = static_cast<SpacingType>(pStrm->QuickReaduInt16());
+        const sal_uInt16 nSpacingType = pStrm->QuickReaduInt16();
+        //only the bottom pair of bits matter
+        m_nSpacingType = static_cast<SpacingType>(nSpacingType & 0x3);
         m_nAmount = pStrm->QuickReadInt32();
         m_nMultiple = pStrm->QuickReadInt32();
     }
commit c9be863a12bc7419a0a1302700f747f0a7e1052b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 16 10:12:30 2016 +0000

    Resolves: tdf#98473 replace || with ‖ to avoid illegal gtk3 action names
    
    again, was reverted by
    
    commit 48c2e04bdb60429823cb8b12a14d954af544a2bf
    Date:   Mon Mar 14 22:10:23 2016 +0100
    
    which I'm assuming was a merge error
    
    Change-Id: Iad3c2149438822d1e8b1406e35372a3e2b50bfa3

diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 3922e89..7789e3b 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -121,13 +121,22 @@ bool MergeEntrys::GetText( OString &rReturn,
     return bReturn;
 }
 
+namespace
+{
+    OString GetDoubleBars()
+    {
+        //DOUBLE VERTICAL LINE instead of || because the translations make their
+        //way into action_names under gtk3 where || is illegal
+        return OUStringToOString(OUString(static_cast<sal_Unicode>(0x2016)), RTL_TEXTENCODING_UTF8);
+    }
+}
 
 OString MergeEntrys::GetQTZText(const ResData& rResData, const OString& rOrigText)
 {
     const OString sFilename = rResData.sFilename.copy(rResData.sFilename.lastIndexOf('/')+1);
     const OString sKey =
         PoEntry::genKeyId(sFilename + rResData.sGId + rResData.sId + rResData.sResTyp + rOrigText);
-    return sKey + "||" + rOrigText;
+    return sKey + GetDoubleBars() + rOrigText;
 }
 
 
@@ -411,9 +420,9 @@ void MergeDataFile::InsertEntry(
         const OString sTemp = rInFilename + rGID + rLID + rTYP;
         pMergeEntrys->InsertEntry(
             nLANG,
-            rTEXT.isEmpty()? rTEXT : PoEntry::genKeyId(sTemp + rTEXT) + "||" + rTEXT,
-            rQHTEXT.isEmpty()? rQHTEXT : PoEntry::genKeyId(sTemp + rQHTEXT) + "||" + rQHTEXT,
-            rTITLE.isEmpty()? rTITLE : PoEntry::genKeyId(sTemp + rTITLE) + "||" + rTITLE );
+            rTEXT.isEmpty()? rTEXT : PoEntry::genKeyId(sTemp + rTEXT) + GetDoubleBars() + rTEXT,
+            rQHTEXT.isEmpty()? rQHTEXT : PoEntry::genKeyId(sTemp + rQHTEXT) + GetDoubleBars() + rQHTEXT,
+            rTITLE.isEmpty()? rTITLE : PoEntry::genKeyId(sTemp + rTITLE) + GetDoubleBars() + rTITLE );
     }
     else
     {