From 1e49e40c3694cd5750b65fc726b9684ae4185d4f Mon Sep 17 00:00:00 2001
From: Joren De Cuyper <jorendc@libreoffice.org>
Date: Fri, 15 May 2015 13:27:47 +0200
Subject: tdf#91064: Revert "tdf#89790 DOCX: saving LO version number in
 app.xml"

This reverts commit 480ca7434a330b2678f9ef287cffd6d9cf27bed5.

Change-Id: I69a16425fc36979d49f409bbd7921495a22a35dc
Reviewed-on: https://gerrit.libreoffice.org/15737
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org>
---
 unotools/source/config/docinfohelper.cxx | 50 +++++++++++---------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

(limited to 'unotools')

diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx
index 0ea143cf89ec..b5d0cf9aa7b4 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -41,44 +41,29 @@ OUString DocInfoHelper::GetGeneratorString()
     {
         aResult.append( aValue.replace( ' ', '_' ) );
         aResult.append( '/' );
-    }
-
-    aValue = GetVersionString();
-    if ( !aValue.isEmpty() )
-    {
-        aResult.append( aValue );
-    }
-
-    return aResult.makeStringAndClear();
-}
-
-
-OUString DocInfoHelper::GetVersionString()
-{
-    OUStringBuffer aResult;
 
-    // version is <product_versions>_<product_extension>$<platform>
-    OUString aValue( utl::ConfigManager::getProductVersion() );
-    if ( !aValue.isEmpty() )
-    {
-        aResult.append( aValue.replace( ' ', '_' ) );
-
-        aValue = utl::ConfigManager::getProductExtension();
+        aValue = utl::ConfigManager::getProductVersion();
         if ( !aValue.isEmpty() )
         {
             aResult.append( aValue.replace( ' ', '_' ) );
+
+            aValue = utl::ConfigManager::getProductExtension();
+            if ( !aValue.isEmpty() )
+            {
+                aResult.append( aValue.replace( ' ', '_' ) );
+            }
         }
-    }
 
-    OUString os( "$_OS" );
-    OUString arch( "$_ARCH" );
-    ::rtl::Bootstrap::expandMacros(os);
-    ::rtl::Bootstrap::expandMacros(arch);
-    aResult.append( '$' );
-    aResult.append( os );
-    aResult.append( '_' );
-    aResult.append( arch );
-    aResult.append( ' ' );
+        OUString os( "$_OS" );
+        OUString arch( "$_ARCH" );
+        ::rtl::Bootstrap::expandMacros(os);
+        ::rtl::Bootstrap::expandMacros(arch);
+        aResult.append( '$' );
+        aResult.append( os );
+        aResult.append( '_' );
+        aResult.append( arch );
+        aResult.append( ' ' );
+    }
 
     // second product: LibreOffice_project/<build_information>
     // build_information has '(' and '[' encoded as '$', ')' and ']' ignored
@@ -112,7 +97,6 @@ OUString DocInfoHelper::GetVersionString()
     return aResult.makeStringAndClear();
 }
 
-
 } // end of namespace utl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit