diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-18 17:47:20 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-21 13:35:48 +0000 |
| commit | ca4aa39e66ea728f5d6b004ddd678e076d1ffa60 (patch) | |
| tree | 2dedf79bf8fad52d4ddb5b601af00884ec77f6b0 | |
| parent | 23fa3a329688e15b152165710079601c921b79c9 (diff) | |
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)
Reviewed-on: https://gerrit.libreoffice.org/1760
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
| -rw-r--r-- | xmloff/source/meta/xmlmetai.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index 651d6a578e34..ba9c58b22544 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -268,12 +268,13 @@ void SvXMLMetaDocumentContext::setBuildId(::rtl::OUString const& i_rBuildId, con 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 @@ void SvXMLMetaDocumentContext::setBuildId(::rtl::OUString const& i_rBuildId, con #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" ); |