From 480ca7434a330b2678f9ef287cffd6d9cf27bed5 Mon Sep 17 00:00:00 2001
From: Radu Ioan <ioan.radu.g@gmail.com>
Date: Sat, 4 Apr 2015 19:03:35 +0300
Subject: tdf#89790 -  DOCX: saving LO version number in correct tag in app.xml

Converted existing method that provides application name and version in two functions

Change-Id: I93b70da7c78ee5db3d6eb710a2a2a9f4b7b4fb86
Reviewed-on: https://gerrit.libreoffice.org/15151
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 unotools/source/config/docinfohelper.cxx | 50 +++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 17 deletions(-)

(limited to 'unotools')

diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx
index b5d0cf9aa7b4..0ea143cf89ec 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -41,30 +41,45 @@ 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;
 
-        aValue = utl::ConfigManager::getProductVersion();
+    // version is <product_versions>_<product_extension>$<platform>
+    OUString aValue( utl::ConfigManager::getProductVersion() );
+    if ( !aValue.isEmpty() )
+    {
+        aResult.append( aValue.replace( ' ', '_' ) );
+
+        aValue = utl::ConfigManager::getProductExtension();
         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
     // and ':' replaced by '-'
@@ -97,6 +112,7 @@ OUString DocInfoHelper::GetGeneratorString()
     return aResult.makeStringAndClear();
 }
 
+
 } // end of namespace utl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit