[PATCH] Change in core[libreoffice-4-0]: fdo#59517: fix detection of ancient OOo ODF generator string...

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1760

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/1760/1

fdo#59517: fix detection of ancient OOo ODF generator strings:

SvXMLMetaDocumentContext::setBuildId: check only the prefix of the
generator string, not all of it.

(regression from 17ff7b41d15ab9928e2e2706faa26234a09802cd)

Change-Id: I0cdd958d67cd13fd2368cc6958893ce3528a9e94
(cherry picked from commit 0669d78ea76ab9bfeff27ea02d785973f3720d6b)
---
M xmloff/source/meta/xmlmetai.cxx
1 file changed, 5 insertions(+), 4 deletions(-)



diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 651d6a5..ba9c58b 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -268,12 +268,13 @@
 
     if ( sBuildId.isEmpty() )
     {
-        if ( i_rBuildId == "StarOffice 7" || i_rBuildId == "StarSuite 7" ||
-             i_rBuildId == "OpenOffice.org 1" )
+        if (    i_rBuildId.startsWith("StarOffice 7")
+            ||  i_rBuildId.startsWith("StarSuite 7")
+            ||  i_rBuildId.startsWith("OpenOffice.org 1"))
         {
             sBuildId = OUString("645$8687");
         }
-        else if ( i_rBuildId == "NeoOffice/2" )
+        else if (i_rBuildId.startsWith("NeoOffice/2"))
         {
             sBuildId = OUString("680$9134"); // fake NeoOffice as OpenOffice.org 2.2 release
         }
@@ -282,7 +283,7 @@
 #ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
     else
     {
-        if ( i_rBuildId == "LibreOffice/3" )
+        if (i_rBuildId.startsWith("LibreOffice/3"))
         {
             // #118558# fake LibreOffice3 as OpenOffice.org 3.3 release
             sBuildId = OUString::createFromAscii( "330$9567" );

-- 
To view, visit https://gerrit.libreoffice.org/1760
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cdd958d67cd13fd2368cc6958893ce3528a9e94
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl <mstahl at redhat.com>