Attachment 57586 Details for Bug 46506 – xmlhelp-git.diff

xmlhelp-git.diff

xmlhelp.diff (text/plain), 50.64 KB, created by Tomáš Chvátal on 2012-02-24 04:43:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomáš Chvátal

Created: 2012-02-24 04:43:32 UTC

Size: 50.64 KB

patch

obsolete

>diff --git a/xmlhelp/inc/makefile.mk b/xmlhelp/inc/makefile.mk
>deleted file mode 100755
>index d75d361..0000000
>--- a/xmlhelp/inc/makefile.mk
>+++ /dev/null
>@@ -1,47 +0,0 @@
>-#*************************************************************************
>-#
>-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>-# 
>-# Copyright 2000, 2010 Oracle and/or its affiliates.
>-#
>-# OpenOffice.org - a multi-platform office productivity suite
>-#
>-# This file is part of OpenOffice.org.
>-#
>-# OpenOffice.org is free software: you can redistribute it and/or modify
>-# it under the terms of the GNU Lesser General Public License version 3
>-# only, as published by the Free Software Foundation.
>-#
>-# OpenOffice.org is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU Lesser General Public License version 3 for more details
>-# (a copy is included in the LICENSE file that accompanied this code).
>-#
>-# You should have received a copy of the GNU Lesser General Public License
>-# version 3 along with OpenOffice.org.  If not, see
>-# <http://www.openoffice.org/license.html>
>-# for a copy of the LGPLv3 License.
>-#
>-#*************************************************************************
>-PRJ=..
>-
>-PRJNAME=xmlhelp
>-TARGET=inc
>-
>-# --- Settings -----------------------------------------------------
>-
>-.INCLUDE :  settings.mk
>-
>-# --- Files --------------------------------------------------------
>-# --- Targets -------------------------------------------------------
>-
>-.INCLUDE :  target.mk
>-
>-.IF "$(ENABLE_PCH)"!=""
>-ALLTAR : \
>-    $(SLO)$/precompiled.pch \
>-    $(SLO)$/precompiled_ex.pch
>-    
>-.ENDIF			# "$(ENABLE_PCH)"!=""
>-
>diff --git a/xmlhelp/inc/pch/precompiled_xmlhelp.cxx b/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
>deleted file mode 100644
>index cdbbfde..0000000
>--- a/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
>+++ /dev/null
>@@ -1,31 +0,0 @@
>-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>-/*************************************************************************
>- *
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- *
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>- ************************************************************************/
>-
>-#include "precompiled_xmlhelp.hxx"
>-
>-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/xmlhelp/inc/pch/precompiled_xmlhelp.hxx b/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
>deleted file mode 100644
>index 0b5e0dd..0000000
>--- a/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
>+++ /dev/null
>@@ -1,34 +0,0 @@
>-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>-/*************************************************************************
>- *
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- *
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>- ************************************************************************/
>-
>-// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:19.701395
>-
>-#ifdef PRECOMPILED_HEADERS
>-#endif
>-
>-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
>index 00e285c..446a9df 100644
>--- a/xmlhelp/prj/build.lst
>+++ b/xmlhelp/prj/build.lst
>@@ -1,9 +1,8 @@
>-xh      xmlhelp :       comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper l10ntools unotools NULL
>+xh      xmlhelp :       comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper DESKTOP:l10ntools unotools NULL
> xh	xmlhelp									usr1	-	all	xh_mkout NULL
>-xh	xmlhelp\inc								nmake	-	all	xh_inc NULL
>-xh	xmlhelp\source\treeview					nmake	-	all	xh_treeview xh_inc NULL
>-xh	xmlhelp\source\com\sun\star\help		nmake	-	all	xh_help xh_inc NULL
>-xh	xmlhelp\source\cxxhelp\util				nmake	-	all	xh_cutil xh_inc NULL
>-xh	xmlhelp\source\cxxhelp\qe				nmake	-	all	xh_qe xh_inc NULL
>-xh	xmlhelp\source\cxxhelp\provider			nmake	-	all	xh_provider xh_inc NULL
>+xh	xmlhelp\source\treeview					nmake	-	all	xh_treeview NULL
>+xh	xmlhelp\source\com\sun\star\help		nmake	-	all	xh_help NULL
>+xh	xmlhelp\source\cxxhelp\util				nmake	-	all	xh_cutil NULL
>+xh	xmlhelp\source\cxxhelp\qe				nmake	-	all	xh_qe NULL
>+xh	xmlhelp\source\cxxhelp\provider			nmake	-	all	xh_provider NULL
> xh	xmlhelp\util            				nmake	-	all	xh_util xh_cutil xh_qe xh_provider NULL
>diff --git a/xmlhelp/prj/d.lst b/xmlhelp/prj/d.lst
>index 740ff55..11b504a 100644
>--- a/xmlhelp/prj/d.lst
>+++ b/xmlhelp/prj/d.lst
>@@ -1,12 +1,12 @@
>-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
>-..\%__SRC%\bin\HelpLinker* %_DEST%\bin%_EXT%
>-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
>-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.*
>-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.*
>-..\util\ucpchelp.xml %_DEST%\xml%_EXT%\ucpchelp.xml
>-..\util\*.xsl %_DEST%\bin%_EXT%\*.*
>-..\%__SRC%\lib\ihelplinker.lib %_DEST%\lib%_EXT%\ihelplinker.lib
>-..\%__SRC%\bin\helpxsl.zip %_DEST%\pck%_EXT%\helpxsl.zip
>-..\%__SRC%\misc\LuceneHelpWrapper.component %_DEST%\xml%_EXT%\LuceneHelpWrapper.component
>-..\%__SRC%\misc\tvhlp1.component %_DEST%\xml%_EXT%\tvhlp1.component
>-..\%__SRC%\misc\ucpchelp1.component %_DEST%\xml%_EXT%\ucpchelp1.component
>+..\%__SRC%\bin\*.dll %_DEST%\bin\*.*
>+..\%__SRC%\bin\HelpLinker* %_DEST%\bin
>+..\%__SRC%\lib\lib*.so %_DEST%\lib
>+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.*
>+..\%__SRC%\class\*.jar %_DEST%\bin\*.*
>+..\util\ucpchelp.xml %_DEST%\xml\ucpchelp.xml
>+..\util\*.xsl %_DEST%\bin\*.*
>+..\%__SRC%\lib\ihelplinker.lib %_DEST%\lib\ihelplinker.lib
>+..\%__SRC%\bin\helpxsl.zip %_DEST%\pck\helpxsl.zip
>+..\%__SRC%\misc\LuceneHelpWrapper.component %_DEST%\xml\LuceneHelpWrapper.component
>+..\%__SRC%\misc\tvhlp1.component %_DEST%\xml\tvhlp1.component
>+..\%__SRC%\misc\ucpchelp1.component %_DEST%\xml\ucpchelp1.component
>diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
>index 85d9a37..15a5c03 100644
>--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
>@@ -27,8 +27,6 @@
>  ************************************************************************/
> 
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <rtl/memory.h>
> #include "bufferedinputstream.hxx"
> 
>diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
>index b0612f0..9661681 100644
>--- a/xmlhelp/source/cxxhelp/provider/content.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> 
> /**************************************************************************
>                                 TODO
>diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
>index e778cbf..0edf721 100644
>--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <com/sun/star/beans/Property.hpp>
> #include <com/sun/star/beans/PropertyAttribute.hpp>
> #include <com/sun/star/beans/PropertyValue.hpp>
>diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
>index eb0ca7e..4a4a756 100644
>--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include "db.hxx"
> #include <osl/diagnose.h>
> #include <osl/thread.h>
>@@ -64,8 +62,8 @@
> #include <com/sun/star/awt/XVclWindowPeer.hpp>
> #include <com/sun/star/awt/XTopWindow.hpp>
> 
>-#include <l10ntools/compilehelp.hxx>
> #include <comphelper/storagehelper.hxx>
>+#include <comphelper/string.hxx>
> 
> #include "databases.hxx"
> #include "urlparameter.hxx"
>@@ -245,7 +243,7 @@ static bool impl_getZipFile(
>     for ( int i = 0; i < rImagesZipPaths.getLength(); ++i )
>     {
>         rtl::OUString aFileName = pPathArray[ i ];
>-        if ( aFileName.getLength() )
>+        if ( !aFileName.isEmpty() )
>         {
>             if ( 1 + aFileName.lastIndexOf( '/' ) != aFileName.getLength() )
>             {
>@@ -294,14 +292,14 @@ rtl::OString Databases::getImagesZipFileURL()
>             bChanged = true;
>         }
> 
>-        if ( !m_aImagesZipFileURL.getLength() || bChanged )
>+        if ( m_aImagesZipFileURL.isEmpty() || bChanged )
>         {
>             rtl::OUString aImageZip, aSymbolsStyleName;
>             aResult = xAccess->getByHierarchicalName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc/SymbolStyle")));
>             aResult >>= aSymbolsStyleName;
> 
>             bool bFound = false;
>-            if ( aSymbolsStyleName.getLength() != 0 )
>+            if ( !aSymbolsStyleName.isEmpty() )
>             {
>                 rtl::OUString aZipName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" ));
>                 aZipName += aSymbolsStyleName;
>@@ -397,45 +395,22 @@ void Databases::replaceName( rtl::OUString& oustring ) const
>     }
> }
> 
>-
>-
>-
>-rtl::OUString Databases::getInstallPathAsSystemPath()
>-{
>-    osl::MutexGuard aGuard( m_aMutex );
>-
>-    if( ! m_aInstallDirectoryAsSystemPath.getLength() )
>-    {
>-#ifdef DBG_UTIL
>-        bool bla =
>-            osl::FileBase::E_None ==
>-            osl::FileBase::getSystemPathFromFileURL( m_aInstallDirectory,m_aInstallDirectoryAsSystemPath );
>-        OSL_ENSURE( bla,"HelpProvider, no installpath" );
>-#else
>-        osl::FileBase::getSystemPathFromFileURL( m_aInstallDirectory,m_aInstallDirectoryAsSystemPath );
>-#endif
>-    }
>-
>-    return m_aInstallDirectoryAsSystemPath;
>-}
>-
> rtl::OUString Databases::getInstallPathAsURL()
> {
>     osl::MutexGuard aGuard( m_aMutex );
> 
>-      return m_aInstallDirectory;
>+    return m_aInstallDirectory;
> }
> 
>-
> const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUString& Language )
> {
>-    if( m_avModules.size() == 0 )
>+    if( m_avModules.empty() )
>     {
>         rtl::OUString  fileName,dirName = getInstallPathAsURL() + processLang( Language );
>         osl::Directory dirFile( dirName );
> 
>         osl::DirectoryItem aDirItem;
>-        osl::FileStatus    aStatus( FileStatusMask_FileName );
>+        osl::FileStatus    aStatus( osl_FileStatus_Mask_FileName );
> 
>         sal_Int32 idx;
> 
>@@ -445,7 +420,7 @@ const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUStrin
>         while( dirFile.getNextItem( aDirItem ) == osl::FileBase::E_None &&
>                aDirItem.getFileStatus( aStatus ) == osl::FileBase::E_None )
>         {
>-            if( ! aStatus.isValid( FileStatusMask_FileName ) )
>+            if( ! aStatus.isValid( osl_FileStatus_Mask_FileName ) )
>                 continue;
> 
>             fileName = aStatus.getFileName();
>@@ -619,7 +594,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
>                             const rtl::OUString& Language, bool helpText,
>                             const rtl::OUString* pExtensionPath )
> {
>-    if( ! Database.getLength() || ! Language.getLength() )
>+    if( Database.isEmpty() || Language.isEmpty() )
>         return 0;
> 
>     osl::MutexGuard aGuard( m_aMutex );
>@@ -693,7 +668,7 @@ Databases::getCollator( const rtl::OUString& Language,
>                 m_xContext ), UNO_QUERY );
>         rtl::OUString langStr = processLang(Language);
>         rtl::OUString countryStr = country(Language);
>-        if( !countryStr.getLength() )
>+        if( countryStr.isEmpty() )
>         {
>             if( langStr.compareToAscii("de") == 0 )
>                 countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"));
>@@ -939,7 +914,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
>         KeyDataBaseFileIterator aDbFileIt( m_xContext, *this, Database, Language );
>         rtl::OUString fileURL;
>         bool bExtension = false;
>-        while( (fileURL = aDbFileIt.nextDbFile( bExtension )).getLength() > 0 )
>+        while( !(fileURL = aDbFileIt.nextDbFile( bExtension )).isEmpty() )
>         {
>             Db table;
> 
>@@ -1049,8 +1024,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
> Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& jar,
>                                                          const rtl::OUString& Language )
> {
>-    if( ! jar.getLength() ||
>-        ! Language.getLength() )
>+    if( jar.isEmpty() || Language.isEmpty() )
>     {
>         return Reference< XHierarchicalNameAccess >( 0 );
>     }
>@@ -1139,8 +1113,7 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath
>       rtl::OUString* o_pExtensionRegistryPath )
> {
>     Reference< XHierarchicalNameAccess > xNA;
>-    if( ! jar.getLength() ||
>-        ! Language.getLength() )
>+    if( jar.isEmpty() || Language.isEmpty() )
>     {
>         return xNA;
>     }
>@@ -1161,7 +1134,7 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath
>                     aIdentifierInPath = path.copy( 0, nFindSlash );
> 
>                 beans::Optional<rtl::OUString> aIdentifierOptional = xParentPackageBundle->getIdentifier();
>-                if( aIdentifierInPath.getLength() && aIdentifierOptional.IsPresent )
>+                if( !aIdentifierInPath.isEmpty() && aIdentifierOptional.IsPresent )
>                 {
>                     rtl::OUString aUnencodedIdentifier = aIdentifierOptional.Value;
>                     rtl::OUString aIdentifier = rtl::Uri::encode( aUnencodedIdentifier,
>@@ -1296,7 +1269,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
> 
>             osl::DirectoryItem aDirItem;
>             osl::File aFile( fileURL );
>-            osl::FileStatus aStatus( FileStatusMask_FileSize );
>+            osl::FileStatus aStatus( osl_FileStatus_Mask_FileSize );
> 
>             if( osl::FileBase::E_None == osl::DirectoryItem::get( fileURL,aDirItem ) &&
>                 osl::FileBase::E_None == aFile.open( osl_File_OpenFlag_Read )        &&
>@@ -1425,10 +1398,6 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir )
> 
>     if( m_aInstallDirectory.lastIndexOf( sal_Unicode( '/' ) ) != m_aInstallDirectory.getLength() - 1 )
>         m_aInstallDirectory += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
>-
>-    m_aInstallDirectoryWithoutEncoding = rtl::Uri::decode( m_aInstallDirectory,
>-                                                           rtl_UriDecodeWithCharset,
>-                                                           RTL_TEXTENCODING_UTF8 );
> }
> 
> 
>@@ -1565,7 +1534,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
>     {
>         Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
>         m_aUserPackagesSeq = xExtensionManager->getDeployedExtensions
>-            ( rtl::OUString::createFromAscii("user"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
>+            ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
>         m_bUserPackagesLoaded = true;
>     }
> 
>@@ -1593,7 +1562,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
>     {
>         Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
>         m_aSharedPackagesSeq = xExtensionManager->getDeployedExtensions
>-            ( rtl::OUString::createFromAscii("shared"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
>+            ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shared")), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
>         m_bSharedPackagesLoaded = true;
>     }
> 
>@@ -1621,7 +1590,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
>     {
>         Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
>         m_aBundledPackagesSeq = xExtensionManager->getDeployedExtensions
>-            ( rtl::OUString::createFromAscii("bundled"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
>+            ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
>         m_bBundledPackagesLoaded = true;
>     }
> 
>@@ -1645,7 +1614,7 @@ rtl::OUString ExtensionIteratorBase::implGetFileFromPackage(
>     const rtl::OUString& rFileExtension, Reference< deployment::XPackage > xPackage )
> {
>     // No extension -> search for pure language folder
>-    bool bLangFolderOnly = (rFileExtension.getLength() == 0);
>+    bool bLangFolderOnly = rFileExtension.isEmpty();
> 
>     rtl::OUString aFile;
>     rtl::OUString aLanguage = m_aLanguage;
>@@ -1686,8 +1655,7 @@ rtl::OUString ExtensionIteratorBase::implGetFileFromPackage(
> 
> inline bool isLetter( sal_Unicode c )
> {
>-    bool bLetter = ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'));
>-    return bLetter;
>+    return comphelper::string::isalphaAscii(c);
> }
> 
> void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
>@@ -1709,7 +1677,7 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r
>             {
>                 rtl::OUString aPureEntry = aEntry.copy( nLastSlash + 1 );
> 
>-                // Check language sceme
>+                // Check language scheme
>                 int nLen = aPureEntry.getLength();
>                 const sal_Unicode* pc = aPureEntry.getStr();
>                 bool bStartCanBeLanguage = ( nLen >= 2 && isLetter( pc[0] ) && isLetter( pc[1] ) );
>@@ -1799,7 +1767,7 @@ Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xP
>     }
> 
>     Db* pRetDb = NULL;
>-    if (optRegData.IsPresent && optRegData.Value.getLength() > 0)
>+    if (optRegData.IsPresent && !optRegData.Value.isEmpty())
>     {
>         rtl::OUString aRegDataUrl(optRegData.Value);
>         aRegDataUrl += aSlash;
>@@ -1847,7 +1815,7 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
> {
>     rtl::OUString aRetFile;
> 
>-    while( !aRetFile.getLength() && m_eState != END_REACHED )
>+    while( aRetFile.isEmpty() && m_eState != END_REACHED )
>     {
>         switch( m_eState )
>         {
>@@ -2051,7 +2019,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
> {
>     rtl::OUString aIndexFolder;
> 
>-    while( !aIndexFolder.getLength() && m_eState != END_REACHED )
>+    while( aIndexFolder.isEmpty() && m_eState != END_REACHED )
>     {
>         switch( m_eState )
>         {
>diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
>index eeb6d00..d9c333f 100644
>--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
>+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
>@@ -197,8 +197,6 @@ namespace chelp {
> 
>         rtl::OString getImagesZipFileURL();
> 
>-        rtl::OUString getInstallPathAsSystemPath();
>-
>         rtl::OUString getInstallPathAsURL();
> 
>         const std::vector< rtl::OUString >& getModuleList( const rtl::OUString& Language );
>@@ -330,8 +328,6 @@ namespace chelp {
>         com::sun::star::uno::Sequence< rtl::OUString > m_aImagesZipPaths;
>         rtl::OString           m_aImagesZipFileURL;
>         sal_Int16              m_nSymbolsStyle;
>-        rtl::OUString          m_aInstallDirectoryWithoutEncoding; // a work around for a Sablot bug.
>-        rtl::OUString          m_aInstallDirectoryAsSystemPath;    // Installation directory
> 
>         std::vector< rtl::OUString >    m_avModules;
> 
>diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx
>index 1dd3178..4cf5bd2 100644
>--- a/xmlhelp/source/cxxhelp/provider/db.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> 
> #include "db.hxx"
> 
>diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
>index b34aa4a..402a734 100644
>--- a/xmlhelp/source/cxxhelp/provider/db.hxx
>+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
>@@ -28,8 +28,8 @@
> #ifndef BERKELEYDBPROXY_DB_HXX_
> #define BERKELEYDBPROXY_DB_HXX_
> 
>-#ifdef SYSTEM_DB
>-#include <db.h>
>+#ifdef SYSTEM_DB_HEADER
>+#include SYSTEM_DB_HEADER
> #else
> #include <berkeleydb/db.h>
> #endif
>diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
>index 8cba751..58ae720 100644
>--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
>@@ -27,8 +27,6 @@
>  ************************************************************************/
> 
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include "inputstream.hxx"
> 
> 
>@@ -137,7 +135,11 @@ XInputStream_impl::skipBytes(
>            io::IOException,
>            uno::RuntimeException)
> {
>-    m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) );
>+    if (m_aFile.setPos(osl_Pos_Current, sal_uInt64(nBytesToSkip)) != osl::FileBase::E_None)
>+    {
>+        throw io::IOException(::rtl::OUString(
>+            RTL_CONSTASCII_USTRINGPARAM("XInputStream_impl::skipBytes failed seek")), uno::Reference< uno::XInterface >());
>+    }
> }
> 
> 
>@@ -178,7 +180,7 @@ XInputStream_impl::seek(
> {
>     if( location < 0 )
>         throw lang::IllegalArgumentException();
>-    if( osl::FileBase::E_None != m_aFile.setPos( Pos_Absolut, sal_uInt64( location ) ) )
>+    if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) )
>         throw io::IOException();
> }
> 
>@@ -208,7 +210,7 @@ XInputStream_impl::getLength(
>     if( err != osl::FileBase::E_None )
>         throw io::IOException();
> 
>-    err = m_aFile.setPos( Pos_End, 0 );
>+    err = m_aFile.setPos( osl_Pos_End, 0 );
>     if( err != osl::FileBase::E_None )
>         throw io::IOException();
> 
>@@ -216,7 +218,7 @@ XInputStream_impl::getLength(
>     if( err != osl::FileBase::E_None )
>         throw io::IOException();
> 
>-    err = m_aFile.setPos( Pos_Absolut, uCurrentPos );
>+    err = m_aFile.setPos( osl_Pos_Absolut, uCurrentPos );
>     if( err != osl::FileBase::E_None )
>         throw io::IOException();
>     else
>diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
>old mode 100755
>new mode 100644
>index 38f57c6..b709797
>--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
>+++ b/xmlhelp/source/cxxhelp/provider/makefile.mk
>@@ -31,7 +31,6 @@ TARGET=chelp
> 
> ENABLE_EXCEPTIONS=TRUE
> USE_DEFFILE=TRUE
>-NO_BSYMBOLIC=TRUE
> 
> 
> # --- Settings ---------------------------------------------------------
>@@ -52,9 +51,7 @@ CFLAGSWERRCXX:=
> 
> CFLAGS +=  -DHAVE_EXPAT_H
> 
>-.IF "$(SYSTEM_DB)" == "YES"
>-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
>-.ENDIF
>+CFLAGS+= $(SYSTEM_DB_CFLAGS)
> 
> .IF "$(SYSTEM_LIBXML)" == "YES"
> CFLAGS+= $(LIBXML_CFLAGS)
>@@ -71,8 +68,10 @@ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
> .ENDIF
> 
> .IF "$(GUI)"=="WNT"
>+.IF "$(COM)"=="MSC"
> CFLAGS+=-GR
> .ENDIF
>+.ENDIF
> 
> # --- General -----------------------------------------------------
> 
>diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
>index 3707903..9ea2570 100644
>--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> 
> /**************************************************************************
>                                 TODO
>@@ -276,7 +274,7 @@ void ContentProvider::init()
>                        "org.openoffice.Office.Common" ) );
> 
>     rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
>-    if( ! instPath.getLength() )
>+    if( instPath.isEmpty() )
>         // try to determine path from default
>         instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" ));
>     // replace anything like $(instpath);
>@@ -301,15 +299,6 @@ void ContentProvider::init()
>     {
>     }
> 
>-    /**
>-     *  now determing
>-     *  productname,
>-     *  productversion,
>-     */
>-
>-    rtl::OUString productname;
>-    ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= productname;
>-
>     xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" );
> 
>     rtl::OUString setupversion(
>@@ -353,7 +342,7 @@ void ContentProvider::init()
>     subst( aPath );
>     aImagesZipPaths[ 0 ] = aPath;
> 
>-    aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/config"));
>+    aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config"));
>     rtl::Bootstrap::expandMacros(aPath);
>     aImagesZipPaths[ 1 ] = aPath;
> 
>@@ -371,7 +360,7 @@ void ContentProvider::init()
>     m_pDatabases = new Databases( showBasic,
>                                   instPath,
>                                   aImagesZipPaths,
>-                                  productname,
>+                                  utl::ConfigManager::getProductName(),
>                                   productversion,
>                                   stylesheet,
>                                   xContext );
>diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx
>index bdc5933..24985c9 100644
>--- a/xmlhelp/source/cxxhelp/provider/resultset.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/resultset.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <com/sun/star/sdbc/XResultSet.hpp>
> 
> #include "resultset.hxx"
>diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
>index 04e2f75..7a7f935 100644
>--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <ucbhelper/contentidentifier.hxx>
> #include <com/sun/star/ucb/OpenMode.hpp>
> #include <com/sun/star/uno/Reference.h>
>@@ -412,7 +410,7 @@ ResultSetBase::queryContentIdentifier(
>     if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
>     {
>         rtl::OUString url = queryContentIdentifierString();
>-        if( ! m_aIdents[m_nRow].is() && url.getLength() )
>+        if( ! m_aIdents[m_nRow].is() && !url.isEmpty() )
>             m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >(
>                 new ::ucbhelper::ContentIdentifier( m_xMSF,url ) );
>         return m_aIdents[m_nRow];
>diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
>index 93fbb63..ec175cc 100644
>--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <com/sun/star/ucb/Command.hpp>
> #include <com/sun/star/ucb/XCommandEnvironment.hpp>
> #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
>@@ -105,7 +103,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
>     {
>         sal_Int32 idx;
>         rtl::OUString query = m_aURLParameter.get_query();
>-        while( query.getLength() )
>+        while( !query.isEmpty() )
>         {
>             idx = query.indexOf( sal_Unicode( ' ' ) );
>             if( idx == -1 )
>@@ -145,7 +143,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
>         vector< vector<HitItem>* > aIndexFolderResultVectorVector;
> 
>         bool bTemporary;
>-        while( (idxDir = aIndexFolderIt.nextIndexFolder( bExtension, bTemporary )).getLength() > 0 )
>+        while( !(idxDir = aIndexFolderIt.nextIndexFolder( bExtension, bTemporary )).isEmpty() )
>         {
>             vector<HitItem> aIndexFolderResultVector;
> 
>diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
>index 3f899b0..1fe0425 100644
>--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <com/sun/star/ucb/Command.hpp>
> #include <com/sun/star/ucb/XCommandEnvironment.hpp>
> #include <com/sun/star/ucb/XCommandProcessor.hpp>
>diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
>index 63c3192..259b44c 100644
>--- a/xmlhelp/source/cxxhelp/provider/services.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
> #include <com/sun/star/lang/XSingleServiceFactory.hpp>
> #include <com/sun/star/registry/XRegistryKey.hpp>
>@@ -37,17 +35,10 @@
> using namespace com::sun::star;
> 
> //=========================================================================
>-extern "C" void SAL_CALL component_getImplementationEnvironment(
>-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
>-{
>-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
>-}
>-
>-//=========================================================================
>-extern "C" void * SAL_CALL component_getFactory(
>+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
>     const sal_Char * pImplName,
>     void * pServiceManager,
>-    void * /*pRegistryKey*/ )
>+    SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
> {
>     void * pRet = 0;
> 
>diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
>index 7f89f12..a7187e7 100644
>--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
>+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> 
> #include "bufferedinputstream.hxx"
> 
>@@ -189,7 +187,7 @@ rtl::OUString URLParameter::get_title()
> 
> rtl::OUString URLParameter::get_language()
> {
>-    if( m_aLanguage.getLength() == 0 )
>+    if( m_aLanguage.isEmpty() )
>         return m_aDefaultLanguage;
> 
>     return m_aLanguage;
>@@ -198,7 +196,7 @@ rtl::OUString URLParameter::get_language()
> 
> rtl::OUString URLParameter::get_program()
> {
>-    if( ! m_aProgram.getLength() )
>+    if( m_aProgram.isEmpty() )
>     {
>         StaticModuleInformation* inf =
>             m_pDatabases->getStaticInformationForModule( get_module(),
>@@ -343,7 +341,7 @@ void URLParameter::readBerkeley()
>         m_pDatabases->replaceName( m_aTitle );
>         m_aPath  = converter.getFile();
>         m_aJar   = converter.getDatabase();
>-        if( aExtensionPath.getLength() > 0 )
>+        if( !aExtensionPath.isEmpty() )
>         {
>             rtl::OUStringBuffer aExtendedJarStrBuf;
>             aExtendedJarStrBuf.append( aQuestionMark );
>@@ -552,8 +550,8 @@ void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierExceptio
>     if( ! scheme() ||
>         ! name( module() ) ||
>         ! query() ||
>-        ! m_aLanguage.getLength() ||
>-        ! m_aSystem.getLength() )
>+        m_aLanguage.isEmpty() ||
>+        m_aSystem.isEmpty() )
>         throw com::sun::star::ucb::IllegalIdentifierException();
> }
> 
>@@ -637,7 +635,7 @@ bool URLParameter::query()
> {
>     rtl::OUString query_;
> 
>-    if( ! m_aExpr.getLength() )
>+    if( m_aExpr.isEmpty() )
>         return true;
>     else if( (m_aExpr.getStr())[0] == sal_Unicode( '?' ) )
>         query_ = m_aExpr.copy( 1 ).trim();
>@@ -649,7 +647,7 @@ bool URLParameter::query()
>     sal_Int32 delimIdx,equalIdx;
>     rtl::OUString parameter,value;
> 
>-    while( query_.getLength() != 0 )
>+    while( !query_.isEmpty() )
>     {
>         delimIdx = query_.indexOf( sal_Unicode( '&' ) );
>         equalIdx = query_.indexOf( sal_Unicode( '=' ) );
>@@ -679,7 +677,7 @@ bool URLParameter::query()
>             m_aDbPar = value;
>         else if( parameter.compareToAscii( "Query" ) == 0 )
>         {
>-            if( ! m_aQuery.getLength() )
>+            if( m_aQuery.isEmpty() )
>                 m_aQuery = value;
>             else
>                 m_aQuery += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) + value );
>@@ -697,6 +695,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;
>     }
>@@ -753,10 +753,10 @@ fileOpen(const char *URI) {
> }
> 
> static void *
>-zipOpen(const char * /*URI*/) {
>+zipOpen(SAL_UNUSED_PARAMETER const char *) {
>     rtl::OUString language,jar,path;
> 
>-    if( ugblData->m_pInitial->get_eid().getLength() )
>+    if( !ugblData->m_pInitial->get_eid().isEmpty() )
>         return (void*)(new Reference< XHierarchicalNameAccess >);
>     else
>     {
>@@ -839,7 +839,7 @@ helpRead(void * context, char * buffer, int len) {
> 
> static int
> zipRead(void * context, char * buffer, int len) {
>-    if( ugblData->m_pInitial->get_eid().getLength() )
>+    if( !ugblData->m_pInitial->get_eid().isEmpty() )
>     {
>         ugblData->m_pDatabases->popupDocument( ugblData->m_pInitial,&buffer,&len);
>         return len;
>@@ -946,7 +946,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
>         parString[last++] = "hp";
>         parString[last++] = rtl::OString('\'') + urlParam->getByName( "HelpPrefix" ) + rtl::OString('\'');
> 
>-        if( parString[last-1].getLength() )
>+        if( !parString[last-1].isEmpty() )
>         {
>             parString[last++] = "sm";
>             parString[last++] = "'vnd.sun.star.help%3A%2F%2F'";
>@@ -992,7 +992,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
>             // Path not yet specified, search directly
>             Reference< XHierarchicalNameAccess > xNA = pDatabases->findJarFileForPath
>                 ( aJar, urlParam->get_language(), urlParam->get_path(), &aExtensionPath, &aExtensionRegistryPath );
>-            if( xNA.is() && aExtensionPath.getLength() )
>+            if( xNA.is() && !aExtensionPath.isEmpty() )
>                 bAddExtensionPath = true;
>         }
> 
>diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
>index 2279378..67efe6e 100644
>--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
>+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
>@@ -127,12 +127,12 @@ namespace chelp {
>             throw( com::sun::star::ucb::IllegalIdentifierException );
> 
>         bool isPicture() const { return m_aModule.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("picture")); }
>-        bool isActive() const { return m_aActive.getLength() > 0 && m_aActive.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); }
>-        bool isQuery() const { return m_aId.getLength() == 0 && m_aQuery.getLength() != 0; }
>+        bool isActive() const { return !m_aActive.isEmpty() && m_aActive.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); }
>+        bool isQuery() const { return m_aId.isEmpty() && !m_aQuery.isEmpty(); }
>         bool isEntryForModule() const { return m_aId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("start")) || m_bStart; }
>-        bool isFile() const { return m_aId.getLength() != 0; }
>-        bool isModule() const { return m_aId.getLength() == 0 && m_aModule.getLength() != 0; }
>-        bool isRoot() const { return m_aModule.getLength() == 0; }
>+        bool isFile() const { return !m_aId.isEmpty(); }
>+        bool isModule() const { return m_aId.isEmpty() && !m_aModule.isEmpty(); }
>+        bool isRoot() const { return m_aModule.isEmpty(); }
>         bool isErrorDocument();
> 
>         rtl::OUString get_url() const { return m_aURL; }
>@@ -157,7 +157,7 @@ namespace chelp {
> 
>         rtl::OUString get_dbpar() const
>         {
>-            if( m_aDbPar.getLength() )
>+            if( !m_aDbPar.isEmpty() )
>                 return m_aDbPar;
>             else
>                 return m_aModule;
>diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
>index 77af756..1d70a45 100644
>--- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
>+++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <qe/DocGenerator.hxx>
> #include <qe/Query.hxx>
> 
>diff --git a/xmlhelp/source/cxxhelp/qe/makefile.mk b/xmlhelp/source/cxxhelp/qe/makefile.mk
>index e55bb9e..db3502d 100755
>--- a/xmlhelp/source/cxxhelp/qe/makefile.mk
>+++ b/xmlhelp/source/cxxhelp/qe/makefile.mk
>@@ -38,8 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
> .INCLUDE :	settings.mk
> 
> .IF "$(GUI)"=="WNT"
>+.IF "$(COM)"=="MSC"
> CFLAGS+=-GR
> .ENDIF
>+.ENDIF
> 
> SLOFILES=$(SLO)$/DocGenerator.obj
> 
>diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
>index 2015673..3abc080 100644
>--- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx
>+++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <rtl/string.hxx>
> #include <osl/file.hxx>
> #include <db/Block.hxx>
>diff --git a/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
>index 15a79ea..af6a2c0 100644
>--- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx
>+++ b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <util/Decompressor.hxx>
> #include <util/CompressorIterator.hxx>
> 
>diff --git a/xmlhelp/source/cxxhelp/util/makefile.mk b/xmlhelp/source/cxxhelp/util/makefile.mk
>index a375e7d..28e625a 100755
>--- a/xmlhelp/source/cxxhelp/util/makefile.mk
>+++ b/xmlhelp/source/cxxhelp/util/makefile.mk
>@@ -38,8 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
> .INCLUDE :	settings.mk
> 
> .IF "$(GUI)"=="WNT"
>+.IF "$(COM)"=="MSC"
> CFLAGS+=-GR
> .ENDIF
>+.ENDIF
> 
> SLOFILES=\
>         $(SLO)$/Decompressor.obj
>diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk
>old mode 100755
>new mode 100644
>index d6334ef..e82846b
>--- a/xmlhelp/source/treeview/makefile.mk
>+++ b/xmlhelp/source/treeview/makefile.mk
>@@ -30,7 +30,6 @@ PRJNAME=xmlhelp
> TARGET=tvhlp
> USE_DEFFILE=TRUE
> ENABLE_EXCEPTIONS=TRUE
>-NO_BSYMBOLIC=TRUE
> 
> # Version
> TVHLP_MAJOR=1
>diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
>index 38574b6..6f8ca21 100644
>--- a/xmlhelp/source/treeview/tvfactory.cxx
>+++ b/xmlhelp/source/treeview/tvfactory.cxx
>@@ -27,8 +27,6 @@
>  ************************************************************************/
> 
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include <com/sun/star/lang/XSingleServiceFactory.hpp>
> #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
> #include <com/sun/star/beans/PropertyValue.hpp>
>@@ -190,7 +188,7 @@ TVFactory::createInstanceWithArguments(
>         break;
>     }
> 
>-    if( hierview.getLength() )
>+    if( !hierview.isEmpty() )
>     {
>         Reference< XHierarchicalNameAccess > xhieraccess( m_xHDS,UNO_QUERY );
>         Any aAny = xhieraccess->getByHierarchicalName( hierview );
>@@ -257,16 +255,7 @@ TVFactory::CreateInstance(
> }
> 
> //=========================================================================
>-extern "C" void SAL_CALL component_getImplementationEnvironment(
>-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
>-{
>-    (void)ppEnv;
>-
>-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
>-}
>-
>-//=========================================================================
>-extern "C" void * SAL_CALL component_getFactory(
>+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
>     const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey )
> {
>     (void)pRegistryKey;
>diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
>index 6b74767..4673651 100644
>--- a/xmlhelp/source/treeview/tvread.cxx
>+++ b/xmlhelp/source/treeview/tvread.cxx
>@@ -27,8 +27,6 @@
>  ************************************************************************/
> 
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> 
> #include <string.h>
> #include <rtl/ustrbuf.hxx>
>@@ -47,6 +45,7 @@
> #include <com/sun/star/uri/XUriReferenceFactory.hpp>
> #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp>
> #include <comphelper/locale.hxx>
>+#include <comphelper/string.hxx>
> 
> namespace treeview {
> 
>@@ -61,21 +60,21 @@ namespace treeview {
>         TVDom( TVDom* arent = 0 )
>             : kind( other ),
>               parent( arent ),
>-              childs( 0 )
>+              children( 0 )
>         {
>         }
> 
>         ~TVDom()
>         {
>-            for( unsigned i = 0; i < childs.size(); ++i )
>-                delete childs[i];
>+            for( unsigned i = 0; i < children.size(); ++i )
>+                delete children[i];
>         }
> 
> 
>         TVDom* newChild()
>         {
>-            childs.push_back( new TVDom( this ) );
>-            return childs.back();
>+            children.push_back( new TVDom( this ) );
>+            return children.back();
>         }
> 
> 
>@@ -136,7 +135,7 @@ namespace treeview {
> 
>         rtl::OUString getTargetURL()
>         {
>-            if( ! targetURL.getLength() )
>+            if( targetURL.isEmpty() )
>             {
>                 sal_Int32 len;
>                 for ( const TVDom* p = this;; p = p->parent )
>@@ -167,7 +166,7 @@ namespace treeview {
>         rtl::OUString  targetURL;
> 
>         TVDom *parent;
>-        std::vector< TVDom* > childs;
>+        std::vector< TVDom* > children;
>     };
> 
> }
>@@ -308,7 +307,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
>     if( tvDom->isLeaf() )
>     {
>         TargetURL = ( tvDom->getTargetURL() + configData.appendix );
>-        if( tvDom->anchor.getLength() )
>+        if( !tvDom->anchor.isEmpty() )
>             TargetURL += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#" )) +
>                            tvDom->anchor );
>     }
>@@ -492,9 +491,9 @@ extern "C" void data_handler( void *userData,
> 
> TVChildTarget::TVChildTarget( const ConfigData& configData,TVDom* tvDom )
> {
>-    Elements.resize( tvDom->childs.size() );
>+    Elements.resize( tvDom->children.size() );
>     for( unsigned i = 0; i < Elements.size(); ++i )
>-        Elements[i] = new TVRead( configData,tvDom->childs[i] );
>+        Elements[i] = new TVRead( configData,tvDom->children[i] );
> }
> 
> 
>@@ -505,8 +504,7 @@ TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF )
> {
>     ConfigData configData = init( xMSF );
> 
>-    if( ! configData.locale.getLength()  ||
>-        ! configData.system.getLength() )
>+    if( configData.locale.isEmpty() || configData.system.isEmpty() )
>         return;
> 
>     sal_uInt64  ret,len = 0;
>@@ -542,9 +540,9 @@ TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF )
> 
>     // now TVDom holds the relevant information
> 
>-    Elements.resize( tvDom.childs.size() );
>+    Elements.resize( tvDom.children.size() );
>     for( unsigned i = 0; i < Elements.size(); ++i )
>-        Elements[i] = new TVRead( configData,tvDom.childs[i] );
>+        Elements[i] = new TVRead( configData,tvDom.children[i] );
> }
> 
> 
>@@ -666,7 +664,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
>     rtl::OUString system( getKey( xHierAccess,"Help/System" ) );
>     sal_Bool showBasic( getBooleanKey(xHierAccess,"Help/ShowBasic") );
>     rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
>-    if( ! instPath.getLength() )
>+    if( instPath.isEmpty() )
>       // try to determine path from default
>       instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" ));
> 
>@@ -677,9 +675,6 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
>     /*                       reading setup                                */
>     /**********************************************************************/
> 
>-    rtl::OUString productName;
>-    ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= productName;
>-
>     xHierAccess = getHierAccess( sProvider,
>                                  "org.openoffice.Setup" );
> 
>@@ -746,22 +741,22 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
>     TreeFileIterator aTreeIt( locale );
>     rtl::OUString aTreeFile;
>     sal_Int32 nFileSize;
>-    while( (aTreeFile = aTreeIt.nextTreeFile( nFileSize ) ).getLength() > 0 )
>+    while( !(aTreeFile = aTreeIt.nextTreeFile( nFileSize ) ).isEmpty() )
>     {
>         configData.vFileLen.push_back( nFileSize );
>         configData.vFileURL.push_back( aTreeFile );
>     }
> 
>     osl::Directory aDirectory( url );
>-    osl::FileStatus aFileStatus( FileStatusMask_FileName | FileStatusMask_FileSize | FileStatusMask_FileURL );
>+    osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_FileSize | osl_FileStatus_Mask_FileURL );
>     if( osl::Directory::E_None == aDirectory.open() )
>     {
>         int idx_ = 0;
>         rtl::OUString aFileUrl, aFileName;
>         while( aDirectory.getNextItem( aDirItem ) == osl::FileBase::E_None &&
>                aDirItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None &&
>-               aFileStatus.isValid( FileStatusMask_FileURL ) &&
>-               aFileStatus.isValid( FileStatusMask_FileName ) )
>+               aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) &&
>+               aFileStatus.isValid( osl_FileStatus_Mask_FileName ) )
>           {
>             aFileUrl = aFileStatus.getFileURL();
>             aFileName = aFileStatus.getFileName();
>@@ -777,7 +772,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
>                 ( str[idx_ + 3] == 'e' || str[idx_ + 3] == 'E' )    &&
>                 ( str[idx_ + 4] == 'e' || str[idx_ + 4] == 'E' ) )
>               {
>-                OSL_ENSURE( aFileStatus.isValid( FileStatusMask_FileSize ),
>+                OSL_ENSURE( aFileStatus.isValid( osl_FileStatus_Mask_FileSize ),
>                             "invalid file size" );
> 
>                 rtl::OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase();
>@@ -802,7 +797,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
>     configData.m_vAdd[2] = 11;
>     configData.m_vAdd[3] = 14;
>     configData.m_vAdd[4] = 12;
>-    configData.m_vReplacement[0] = productName;
>+    configData.m_vReplacement[0] = utl::ConfigManager::getProductName();
>     configData.m_vReplacement[1] = productVersion;
>     // m_vReplacement[2...4] (vendorName/-Version/-Short) are empty strings
> 
>@@ -1144,8 +1139,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
> 
> inline bool isLetter( sal_Unicode c )
> {
>-    bool bLetter = ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'));
>-    return bLetter;
>+    return comphelper::string::isalphaAscii(c);
> }
> 
> void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
>@@ -1188,7 +1182,7 @@ rtl::OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize )
> {
>     rtl::OUString aRetFile;
> 
>-    while( !aRetFile.getLength() && m_eState != END_REACHED )
>+    while( aRetFile.isEmpty() && m_eState != END_REACHED )
>     {
>         switch( m_eState )
>         {
>diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
>old mode 100755
>new mode 100644
>index 5e1a85f..2f0b8f6
>--- a/xmlhelp/util/makefile.mk
>+++ b/xmlhelp/util/makefile.mk
>@@ -35,15 +35,16 @@ UCPHELP_MAJOR=1
> 
> ENABLE_EXCEPTIONS=TRUE
> USE_DEFFILE=TRUE
>-NO_BSYMBOLIC=TRUE
> 
> # --- Settings ---------------------------------------------------------
> 
> .INCLUDE: settings.mk
> 
> .IF "$(GUI)"=="WNT"
>+.IF "$(COM)"=="MSC"
> CFLAGS+=-GR
> .ENDIF
>+.ENDIF
> 
> # --- Shared-Library ---------------------------------------------------
>

Actions: View

Attachments on bug 46506: 57586 | 57587 | 57588