[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sfx2/source xmlhelp/source

[Jan Holesovsky]

 sfx2/source/appl/sfxhelp.cxx                     |    9 +++++++++
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |    2 ++
 2 files changed, 11 insertions(+)

New commits:
commit 11236c627ce55d41fb5ef2cbb980457e0e84e2a3
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue May 10 21:21:55 2011 +0200

    wikihelp: Pass the LibreOffice version to help.libreoffice.org.

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index da8b027..9099e26 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -188,6 +188,15 @@ void AppendConfigToken( String& rURL, sal_Bool bQuestionMark, const rtl::OUStrin
     rURL += DEFINE_CONST_UNICODE("&System=");
     rURL += SvtHelpOptions().GetSystem();
 
+    static rtl::OUString aVersion;
+    if ( aVersion.isEmpty() )
+        aVersion = utl::Bootstrap::getProductVersion();
+
+    if ( !aVersion.isEmpty() )
+    {
+        rURL += DEFINE_CONST_UNICODE( "&Version=" );
+        rURL += String( aVersion );
+    }
 }
 
 sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 2cbf115..bc8a161 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -697,6 +697,8 @@ bool URLParameter::query()
             m_nHitCount = value.toInt32();
         else if( parameter.compareToAscii( "Active" ) == 0 )
             m_aActive = value;
+        else if( parameter.compareToAscii( "Version" ) == 0 )
+            ; // ignored (but accepted) in the build-in help, useful only for the online help
         else
             ret = false;
     }