Merge commit 'ooo/DEV300_m103'

Conflicts:
basic/source/runtime/makefile.mk
basic/source/runtime/step2.cxx
desktop/prj/build.lst
desktop/source/app/app.cxx
desktop/source/deployment/registry/dp_backend.cxx
drawinglayer/source/attribute/fontattribute.cxx
editeng/inc/editeng/fontitem.hxx
editeng/source/editeng/edtspell.cxx
editeng/source/misc/svxacorr.cxx
framework/inc/services/substitutepathvars.hxx
framework/source/services/substitutepathvars.cxx
sfx2/qa/cppunit/makefile.mk
sfx2/source/doc/SfxDocumentMetaData.cxx
sfx2/source/doc/objxtor.cxx
svx/source/dialog/svxruler.cxx
sysui/desktop/icons/so9_base_app.ico
sysui/desktop/icons/so9_calc_app.ico
sysui/desktop/icons/so9_draw_app.ico
sysui/desktop/icons/so9_impress_app.ico
sysui/desktop/icons/so9_main_app.ico
sysui/desktop/icons/so9_math_app.ico
sysui/desktop/icons/so9_writer_app.ico
xmlhelp/source/cxxhelp/provider/databases.cxx
xmlhelp/source/cxxhelp/provider/db.cxx
xmlhelp/source/cxxhelp/provider/db.hxx

5 files changed, 60 insertions, 38 deletions

diff --git a/xmlhelp/source/com/sun/star/help/HelpIndexer.java b/xmlhelp/source/com/sun/star/help/HelpIndexer.java
index bd09982daa3e..abb866804b43 100755
--- a/xmlhelp/source/com/sun/star/help/HelpIndexer.java
+++ b/xmlhelp/source/com/sun/star/help/HelpIndexer.java
@@ -40,6 +40,14 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.zip.ZipOutputStream;
 
+/**
+   When this tool is used with long path names on Windows, that is paths which start
+   with \\?\, then the caller must make sure that the path is unique. This is achieved
+   by removing '.' and '..' from the path. Paths which are created by
+   osl_getSystemPathFromFileURL fulfill this requirement. This is necessary because
+   lucene is patched to not use File.getCanonicalPath. See long_path.patch in the lucene
+   module.
+ */
 public class HelpIndexer extends WeakBase
     implements XServiceInfo, XInvocation
 {
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 6ae161656bbc..eb0ca7e6d886 100755
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -419,9 +419,6 @@ rtl::OUString Databases::getInstallPathAsSystemPath()
     return m_aInstallDirectoryAsSystemPath;
 }
 
-
-
-
 rtl::OUString Databases::getInstallPathAsURL()
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -645,28 +642,24 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
     {
         Db* table = new Db();
 
-        rtl::OUString fileNameOU;
+        rtl::OUString fileURL;
         if( pExtensionPath )
-        {
-            rtl::OUString aExpandedURL = expandURL( *pExtensionPath );
-            aExpandedURL += Language + dbFileName;
-            osl::FileBase::getSystemPathFromFileURL( aExpandedURL, fileNameOU );
-        }
+            fileURL = expandURL(*pExtensionPath) + Language + dbFileName;
         else
-            fileNameOU = getInstallPathAsSystemPath() + key;
-
+            fileURL = getInstallPathAsURL() + key;
 
-        rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
-
-        rtl::OUString fileNameDBHelp( fileNameOU );
+        rtl::OUString fileNameDBHelp( fileURL );
+        //Extensions always use the new format
         if( pExtensionPath != NULL )
             fileNameDBHelp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" ));
+        //SimpleFileAccess takes file URLs as arguments!!! Using filenames works accidentally but
+        //fails for example when using long path names on Windows (starting with \\?\)
         if( m_xSFA->exists( fileNameDBHelp ) )
         {
             DBHelp* pDBHelp = new DBHelp( fileNameDBHelp, m_xSFA );
             table->setDBHelp( pDBHelp );
         }
-        else if( table->open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
+        else if( table->open( 0,fileURL, DB_BTREE,DB_RDONLY,0644 ) )
         {
             table->close( 0 );
             delete table;
@@ -944,17 +937,13 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
         std::vector<KeywordInfo::KeywordElement> aVector;
 
         KeyDataBaseFileIterator aDbFileIt( m_xContext, *this, Database, Language );
-        rtl::OUString fileNameOU;
+        rtl::OUString fileURL;
         bool bExtension = false;
-        while( (fileNameOU = aDbFileIt.nextDbFile( bExtension )).getLength() > 0 )
+        while( (fileURL = aDbFileIt.nextDbFile( bExtension )).getLength() > 0 )
         {
-            rtl::OString fileName( fileNameOU.getStr(),
-                                   fileNameOU.getLength(),
-                                   osl_getThreadTextEncoding() );
-
             Db table;
 
-            rtl::OUString fileNameDBHelp( fileNameOU );
+            rtl::OUString fileNameDBHelp( fileURL );
             if( bExtension )
                 fileNameDBHelp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" ));
             if( m_xSFA->exists( fileNameDBHelp ) )
@@ -1001,7 +990,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
                 }
             }
 
-            else if( 0 == table.open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
+            else if( 0 == table.open( 0,fileURL,DB_BTREE,DB_RDONLY,0644 ) )
             {
                 Db* idmap = getBerkeley( Database,Language );
 
@@ -1853,6 +1842,7 @@ Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xP
 //===================================================================
 // class KeyDataBaseFileIterator
 
+//returns a file URL
 rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
 {
     rtl::OUString aRetFile;
@@ -1863,7 +1853,7 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
         {
             case INITIAL_MODULE:
                 aRetFile =
-                    m_rDatabases.getInstallPathAsSystemPath() +
+                    m_rDatabases.getInstallPathAsURL() +
                     m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule +
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".key" ));
 
@@ -1921,16 +1911,14 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
     return aRetFile;
 }
 
+//Returns a file URL, that does not contain macros
 rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage
     ( Reference< deployment::XPackage > xPackage )
 {
     rtl::OUString aExpandedURL =
         implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".key" )), xPackage );
 
-    rtl::OUString aRetFile;
-    osl::FileBase::getSystemPathFromFileURL( aExpandedURL, aRetFile );
-
-    return aRetFile;
+    return aExpandedURL;
 }
 
 
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index c9708fbaca9f..eeb6d006b2f5 100755
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -509,7 +509,7 @@ namespace chelp {
             Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage )
                 : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage )
         {}
-
+        //Returns a file URL
         rtl::OUString nextDbFile( bool& o_rbExtension );
 
     private:
diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx
index 3bb5a68fd75d..1dd3178865e2 100755
--- a/xmlhelp/source/cxxhelp/provider/db.cxx
+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
@@ -36,6 +36,8 @@
 
 #include "com/sun/star/io/XSeekable.hpp"
 
+#include "osl/file.hxx"
+#include "osl/thread.hxx"
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::io;
@@ -100,11 +102,11 @@ void DBHelp::createHashMap( bool bOptimizeForPerformance )
         m_pStringToValPosMap = new StringToValPosMap();
     }
 
-    Reference< XInputStream > xIn = m_xSFA->openFileRead( m_aFileName );
+    Reference< XInputStream > xIn = m_xSFA->openFileRead( m_aFileURL );
     if( xIn.is() )
     {
         Sequence< sal_Int8 > aData;
-        sal_Int32 nSize = m_xSFA->getSize( m_aFileName );
+        sal_Int32 nSize = m_xSFA->getSize( m_aFileURL );
         sal_Int32 nRead = xIn->readBytes( aData, nSize );
 
         const char* pData = (const char*)aData.getConstArray();
@@ -183,7 +185,7 @@ bool DBHelp::getValueForKey( const rtl::OString& rKey, DBData& rValue )
             int iValuePos = rValPair.first;
             int nValueLen = rValPair.second;
 
-            Reference< XInputStream > xIn = m_xSFA->openFileRead( m_aFileName );
+            Reference< XInputStream > xIn = m_xSFA->openFileRead( m_aFileURL );
             if( xIn.is() )
             {
                 Reference< XSeekable > xXSeekable( xIn, UNO_QUERY );
@@ -231,9 +233,9 @@ bool DBHelp::startIteration( void )
 {
     bool bSuccess = false;
 
-    sal_Int32 nSize = m_xSFA->getSize( m_aFileName );
+    sal_Int32 nSize = m_xSFA->getSize( m_aFileURL );
 
-    Reference< XInputStream > xIn = m_xSFA->openFileRead( m_aFileName );
+    Reference< XInputStream > xIn = m_xSFA->openFileRead( m_aFileURL );
     if( xIn.is() )
     {
         m_nItRead = xIn->readBytes( m_aItData, nSize );
@@ -314,6 +316,19 @@ int Db::open(DB_TXN *txnid,
     return db_internal::check_error( err,"Db::open" );
 }
 
+int Db::open(DB_TXN *txnid,
+             ::rtl::OUString const & fileURL,
+             DBTYPE type,
+             u_int32_t flags,
+             int mode)
+{
+    ::rtl::OUString ouPath;
+    ::osl::FileBase::getSystemPathFromFileURL(fileURL, ouPath);
+    const ::rtl::OString sPath = ::rtl::OUStringToOString(ouPath, osl_getThreadTextEncoding());
+    return open(txnid, sPath.getStr(), 0, type, flags, mode);
+}
+
+
 
 int Db::get(DB_TXN *txnid, Dbt *key, Dbt *data, u_int32_t flags)
 {
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index f36b880af27d..b34aa4a34600 100755
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -117,7 +117,7 @@ namespace berkeleydbproxy {
 
     class DBHelp
     {
-        rtl::OUString       m_aFileName;
+        rtl::OUString       m_aFileURL;
         StringToDataMap*    m_pStringToDataMap;
         StringToValPosMap*  m_pStringToValPosMap;
         com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess >
@@ -132,16 +132,21 @@ namespace berkeleydbproxy {
         bool implReadLenAndData( const char* pData, int& riPos, DBData& rValue );
 
     public:
-        DBHelp( const rtl::OUString& rFileName,
+        //DBHelp must get a fileURL which can then directly be used by simple file access.
+        //SimpleFileAccess requires file URLs as arguments. Passing file path may work but fails
+        //for example when using long file paths on Windows, which start with "\\?\"
+        DBHelp( const rtl::OUString& rFileURL,
             com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess > xSFA )
-                : m_aFileName( rFileName )
+                : m_aFileURL( rFileURL )
                 , m_pStringToDataMap( NULL )
                 , m_pStringToValPosMap( NULL )
                 , m_xSFA( xSFA )
                 , m_pItData( NULL )
                 , m_nItRead( -1 )
                 , m_iItPos( -1 )
-        {}
+        {
+            OSL_ASSERT(!rFileURL.compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:")), 5));
+        }
         ~DBHelp()
             { releaseHashMap(); }
 
@@ -179,6 +184,12 @@ namespace berkeleydbproxy {
                  u_int32_t flags,
                  int mode);
 
+        int open(DB_TXN *txnid,
+                 ::rtl::OUString const & fileURL,
+                 DBTYPE type,
+                 u_int32_t flags,
+                 int mode);
+
 
         int get(DB_TXN* txnid, Dbt *key, Dbt *data, u_int32_t flags);