Attachment 57587 Details for Bug 46506 – xmlhelp-tarball.diff

xmlhelp-tarball.diff

xmlhelp-tarball.diff (text/plain), 194.81 KB, created by Tomáš Chvátal on 2012-02-24 04:44:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomáš Chvátal

Created: 2012-02-24 04:44:10 UTC

Size: 194.81 KB

patch

obsolete

>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//inc/makefile.mk xmlhelp//inc/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//inc/makefile.mk	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//inc/makefile.mk	2012-02-24 13:39:00.668662388 +0100
>@@ -38,10 +38,3 @@
> 
> .INCLUDE :  target.mk
> 
>-.IF "$(ENABLE_PCH)"!=""
>-ALLTAR : \
>-    $(SLO)$/precompiled.pch \
>-    $(SLO)$/precompiled_ex.pch
>-    
>-.ENDIF			# "$(ENABLE_PCH)"!=""
>-
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//inc/pch/precompiled_xmlhelp.cxx xmlhelp//inc/pch/precompiled_xmlhelp.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//inc/pch/precompiled_xmlhelp.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//inc/pch/precompiled_xmlhelp.cxx	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//inc/pch/precompiled_xmlhelp.hxx xmlhelp//inc/pch/precompiled_xmlhelp.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//inc/pch/precompiled_xmlhelp.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//inc/pch/precompiled_xmlhelp.hxx	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//prj/build.lst xmlhelp//prj/build.lst
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//prj/build.lst	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//prj/build.lst	2012-02-24 13:39:00.668662388 +0100
>@@ -1,4 +1,4 @@
>-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
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//prj/d.lst xmlhelp//prj/d.lst
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//prj/d.lst	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//prj/d.lst	2012-02-24 13:39:00.668662388 +0100
>@@ -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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/com/sun/star/help/HelpComponent.java xmlhelp//source/com/sun/star/help/HelpComponent.java
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/com/sun/star/help/HelpComponent.java	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/com/sun/star/help/HelpComponent.java	2012-02-24 13:39:00.668662388 +0100
>@@ -1,7 +1,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -49,7 +49,7 @@
>     public static XSingleComponentFactory __getComponentFactory(String sImplName)
>     {
>         XSingleComponentFactory xFactory = null;
>-    
>+
>         if ( sImplName.equals( HelpSearch._HelpSearch.class.getName() ) )
>             xFactory = Factory.createComponentFactory(HelpSearch._HelpSearch.class,
>                                              HelpSearch._HelpSearch.getServiceNames());
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/com/sun/star/help/HelpIndexer.java xmlhelp//source/com/sun/star/help/HelpIndexer.java
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/com/sun/star/help/HelpIndexer.java	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/com/sun/star/help/HelpIndexer.java	2012-02-24 13:39:00.668662388 +0100
>@@ -1,7 +1,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -92,15 +92,15 @@
>     public XIntrospectionAccess getIntrospection()
>     {
>         return  null;
>-    }        
>+    }
> 
>     public Object invoke( String aFunctionName, java.lang.Object[] aParams,
>         short[][] aOutParamIndex, java.lang.Object[][] aOutParam )
>-            throws	com.sun.star.lang.IllegalArgumentException,
>+            throws  com.sun.star.lang.IllegalArgumentException,
>                     com.sun.star.script.CannotConvertException,
>                     com.sun.star.reflection.InvocationTargetException
>     {
>-        if( 
>+        if(
>               !aFunctionName.equals( aCreateIndexMethodName  ) )
>             throw new com.sun.star.lang.IllegalArgumentException();
> 
>@@ -128,7 +128,7 @@
>     }
> 
>     public void setValue( String aPropertyName, java.lang.Object aValue )
>-        throws	com.sun.star.beans.UnknownPropertyException,
>+        throws  com.sun.star.beans.UnknownPropertyException,
>                 com.sun.star.script.CannotConvertException,
>                 com.sun.star.reflection.InvocationTargetException
>     {
>@@ -140,7 +140,7 @@
>     {
>         throw new com.sun.star.beans.UnknownPropertyException();
>     }
>-    
>+
>     public boolean hasMethod( String aMethodName )
>     {
>         boolean bRet = (aMethodName.equals( aCreateIndexMethodName ) );
>@@ -188,7 +188,7 @@
>     public String getImplementationName()
>     {
>         return  HelpIndexer.class.getName();
>-    }        
>+    }
> 
> }
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/com/sun/star/help/HelpSearch.java xmlhelp//source/com/sun/star/help/HelpSearch.java
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/com/sun/star/help/HelpSearch.java	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/com/sun/star/help/HelpSearch.java	2012-02-24 13:39:12.729661257 +0100
>@@ -1,7 +1,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -70,7 +70,7 @@
>         static private final String __serviceName =
>             "com.sun.star.help.HelpSearch";
>         static private final String aSearchMethodName = "search";
>-    
>+
>         /** The initial component contextr, that gives access to
>          * the service manager, supported singletons, ...
>          * It's often later used
>@@ -81,7 +81,7 @@
>          * It's often later used
>          */
>         private XMultiComponentFactory m_xMCF;
>-    
>+
>         /** The constructor of the inner class has a XMultiServiceFactory parameter.
>          * @param xmultiservicefactoryInitialization A special service factory
>          * could be introduced while initializing.
>@@ -90,13 +90,13 @@
>         {
>             try {
>                 m_cmpCtx = xCompContext;
>-                m_xMCF = m_cmpCtx.getServiceManager();                
>+                m_xMCF = m_cmpCtx.getServiceManager();
>             }
>             catch( Exception e ) {
>                 e.printStackTrace();
>             }
>         }
>-        
>+
>         /** This method returns an array of all supported service names.
>          * @return Array of supported service names.
>          */
>@@ -114,7 +114,7 @@
>             String[] sSupportedServiceNames = { __serviceName };
>             return sSupportedServiceNames;
>         }
>-      
>+
>         /** This method returns true, if the given service will be
>          * supported by the component.
>          * @param sServiceName Service name.
>@@ -124,25 +124,25 @@
>         {
>             return sServiceName.equals( __serviceName );
>         }
>-    
>+
>         /** Return the class name of the component.
>          * @return Class name of the component.
>          */
>         public String getImplementationName()
>         {
>             return  _HelpSearch.class.getName();
>-        }        
>+        }
> 
>         //===================================================
>         // XInvocation
>         public XIntrospectionAccess getIntrospection()
>         {
>             return  null;
>-        }        
>+        }
> 
>         public Object invoke( String aFunctionName, java.lang.Object[] aParams,
>             short[][] aOutParamIndex, java.lang.Object[][] aOutParam )
>-                throws	com.sun.star.lang.IllegalArgumentException,
>+                throws  com.sun.star.lang.IllegalArgumentException,
>                         com.sun.star.script.CannotConvertException,
>                         com.sun.star.reflection.InvocationTargetException
>         {
>@@ -181,7 +181,7 @@
>         }
> 
>         public void setValue( String aPropertyName, java.lang.Object aValue )
>-            throws	com.sun.star.beans.UnknownPropertyException,
>+            throws  com.sun.star.beans.UnknownPropertyException,
>                     com.sun.star.script.CannotConvertException,
>                     com.sun.star.reflection.InvocationTargetException {
>             throw new com.sun.star.beans.UnknownPropertyException();
>@@ -191,7 +191,7 @@
>             throws com.sun.star.beans.UnknownPropertyException {
>             throw new com.sun.star.beans.UnknownPropertyException();
>         }
>-        
>+
>         public boolean hasMethod( String aMethodName ) {
>             boolean bRet = (aMethodName.equals( aSearchMethodName ) );
>             return bRet;
>@@ -199,7 +199,7 @@
>         public boolean hasProperty( String aName ) {
>             return false;
>         }
>-        
>+
>         // Command line interface for testing
>         private static String[] doQuery( Object[] args, Object[] aScoreOutArray ) throws Exception
>         {
>@@ -250,12 +250,15 @@
>             return aDocs;
>         }
> 
>-        private static String[] queryImpl( String aLanguageStr, String aIndexStr, String aQueryStr, 
>+        private static String[] queryImpl( String aLanguageStr, String aIndexStr, String aQueryStr,
>             boolean bCaptionOnly, Object[] aScoreOutArray ) throws Exception
>         {
>             IndexReader reader = IndexReader.open( aIndexStr );
>             Searcher searcher = new IndexSearcher( reader );
>-            Analyzer analyzer = aLanguageStr.equals("ja") ? (Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
>+            Analyzer analyzer = ( aLanguageStr.equals("ja")
>+                                || aLanguageStr.equals("ko")
>+                                || aLanguageStr.equals("zh-CN")
>+                                || aLanguageStr.equals("zh-TW") ) ? (Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
> 
>             String aField;
>             if( bCaptionOnly )
>@@ -273,7 +276,7 @@
>             Hits aHits = searcher.search( aQuery );
>             int nHitCount = aHits.length();
> 
>-            String aDocs[] = new String[nHitCount];	
>+            String aDocs[] = new String[nHitCount];
>             float aScores[] = null;
>             aScores = new float[nHitCount];
>             for( int iHit = 0 ; iHit < nHitCount ; iHit++ )
>@@ -304,11 +307,11 @@
>     public static XSingleComponentFactory __getComponentFactory(String sImplName)
>     {
>         XSingleComponentFactory xFactory = null;
>-    
>+
>         if ( sImplName.equals( _HelpSearch.class.getName() ) )
>             xFactory = Factory.createComponentFactory(_HelpSearch.class,
>                                              _HelpSearch.getServiceNames());
>-        
>+
>         return xFactory;
>     }
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/db/EntryProcessor.hxx xmlhelp//source/cxxhelp/inc/db/EntryProcessor.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/db/EntryProcessor.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/inc/db/EntryProcessor.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -31,19 +31,19 @@
> #include  <rtl/ustring>
> 
> namespace xmlsearch {
>-    
>+
>     namespace db {
>-        
>-        
>+
>+
>         class EntryProcessor
>         {
>         public:
>-            
>+
>             virtual ~EntryProcessor() = 0;
>             virtual void processEntry( rtl::OUString string,sal_Int32 id ) = 0;
>         };
>-        
>-        
>+
>+
>     }
> }
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/excep/XmlSearchExceptions.hxx xmlhelp//source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/excep/XmlSearchExceptions.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/inc/excep/XmlSearchExceptions.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -32,43 +32,43 @@
> 
> 
> namespace xmlsearch {
>-  
>+
>     namespace excep {
>-    
>-        
>+
>+
>         class XmlSearchException
>         {
>         public:
>-      
>+
>             XmlSearchException( const rtl::OUString& message )
>                 : _message( message )
>             {
>             }
>-      
>+
>             rtl::OUString getMessage() const
>             {
>                 return _message;
>             }
>-      
>-      
>+
>+
>         private:
>-            
>+
>             rtl::OUString _message;
>-        }; 
>-        
>+        };
>+
> 
>         class IOException
>             : public virtual XmlSearchException
>         {
>         public:
>-            
>+
>             IOException( const rtl::OUString& message )
>                 : XmlSearchException( message )
>             {
>             }
>         };
>-        
>-        
>+
>+
>         class NoFactoryException
>             : public virtual XmlSearchException
>         {
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/qe/DocGenerator.hxx xmlhelp//source/cxxhelp/inc/qe/DocGenerator.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/qe/DocGenerator.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/inc/qe/DocGenerator.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -42,42 +42,42 @@
> 
>         class Query;
> 
>-      
>+
>         class NonnegativeIntegerGenerator
>         {
>         public:
>-            
>+
>             static const sal_Int32 END;
>-      
>+
>             virtual ~NonnegativeIntegerGenerator() { };
>             virtual sal_Int32 first() throw( xmlsearch::excep::XmlSearchException ) = 0;
>             virtual sal_Int32 next() throw( xmlsearch::excep::XmlSearchException ) = 0;
>         };
> 
>-        
>+
>         class RoleFiller
>         {
>         public:
> 
>             static RoleFiller* STOP() { return &roleFiller_; }
>-      
>+
>             RoleFiller();
> 
>             ~RoleFiller();
> 
>             void acquire() { ++m_nRefcount; }
>             void release() { if( ! --m_nRefcount ) delete this; }
>-            
>+
>         private:
> 
>             static RoleFiller roleFiller_;
>-            
>+
>             sal_uInt32     m_nRefcount;
>             sal_uInt8      fixedRole_;
>             sal_Int16      filled_;
>             sal_Int32      begin_,end_,parentContext_,limit_;
> 
>-            RoleFiller*    next_;			
>+            RoleFiller*    next_;
>             std::vector< RoleFiller* > fillers_;
>         };
> 
>@@ -85,7 +85,7 @@
>         class GeneratorHeap
>         {
>         public:
>-            
>+
>             GeneratorHeap()
>                 : heapSize_( 0 ),
>                   free_( 0 )
>@@ -94,8 +94,8 @@
> 
>             sal_Int32   heapSize_,free_;
>         };
>-    
>-    
>+
>+
> 
>     }
> }
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/qe/Query.hxx xmlhelp//source/cxxhelp/inc/qe/Query.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/qe/Query.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/inc/qe/Query.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -35,12 +35,12 @@
> 
> 
> namespace xmlsearch {
>-  
>+
>     namespace qe {
>-    
>+
>         class Search;
>         class RoleFiller;
>-    
>+
>         class QueryHit
>         {
>         public:
>@@ -52,22 +52,22 @@
>                     matchesL_( 2*nColumns ),
>                     matches_( new sal_Int32[ 2*nColumns ] ),
>                   penalty_( penalty )
>-            { 
>+            {
>                 rtl_zeroMemory( matches_,sizeof( sal_Int32 ) * matchesL_ );
>             }
>-      
>+
>             ~QueryHit() { delete[] matches_; }
>-            
>+
>             sal_Int32 getDocument() const { return doc_; }
>-      
>+
>             sal_Int32 countOfMatches() const { return matchesL_; }
>-            
>+
>             sal_Int32 getBegin() const { return begin_; }
>-      
>+
>             sal_Int32 getEnd() const { return end_; }
> 
>             double getPenalty() const { return penalty_; }
>-      
>+
>             bool betterThan( const QueryHit* o )
>             {
>                 if( penalty_ != o->penalty_ )
>@@ -79,7 +79,7 @@
>                 else
>                     return false;
>             }
>-      
>+
>             bool worseThan( const QueryHit* o )
>             {
>                 if( penalty_ != o->penalty_ )
>@@ -103,7 +103,7 @@
>                 else
>                     return false;
>             }
>-            
>+
>             bool compareTo( const QueryHit* o ) const
>             {
>                 if( penalty_ != o->penalty_ )
>@@ -115,49 +115,49 @@
>                 else
>                     return false;
>             }
>-            
>-            
>+
>+
>         private:
>-            
>+
>             sal_Int32    doc_,begin_,end_;
>-            
>+
>               sal_Int32    matchesL_;
>               sal_Int32    *matches_;    // ...concept, word number, ...
>-            
>+
>             double penalty_;
> 
>         }; // end class QueryHit
> 
> 
>-        
>+
>         class QueryHitData
>         {
>         public:
>-            
>+
>             QueryHitData( double penalty,const rtl::OUString& document,sal_Int32 termsL, rtl::OUString* terms )
>                 : penalty_( penalty ),
>                   document_( document ),
>                   termsL_( termsL ),
>                   terms_( terms )      { }
>-            
>+
>             ~QueryHitData() { delete[] terms_; }
>-            
>+
>             rtl::OUString getDocument() const { return document_; }
>-            
>+
>             double getPenalty() const { return penalty_; }
>-            
>-            
>+
>+
>         private:
>-            
>+
>             double        penalty_;
>-            
>+
>             const rtl::OUString document_;
>-            
>+
>             sal_Int32      termsL_;
>             rtl::OUString* terms_;
>-            
>+
>         };  // end class QueryHitData
>-    
>+
> 
>         class PrefixTranslator
>         {
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/util/CompressorIterator.hxx xmlhelp//source/cxxhelp/inc/util/CompressorIterator.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/util/CompressorIterator.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/inc/util/CompressorIterator.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -30,13 +30,13 @@
> 
> 
> namespace xmlsearch {
>-  
>+
>     namespace util {
> 
>         class CompressorIterator
>         {
>         public:
>-      
>+
>             virtual void value( sal_Int32 ) = 0;
> 
>         };
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/util/ConceptList.hxx xmlhelp//source/cxxhelp/inc/util/ConceptList.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/util/ConceptList.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/inc/util/ConceptList.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -35,12 +35,12 @@
> 
> 
> namespace xmlsearch {
>-  
>+
>     namespace util {
>-    
>-    
>+
>+
>         class CompressorIterator;
>-    
>+
> 
> 
>         class ConceptList
>@@ -48,21 +48,21 @@
>               public xmlsearch::qe::NonnegativeIntegerGenerator
>         {
>         public:
>-      
>+
>             ConceptList( sal_Int8* array,sal_Int32 arrl,sal_Int32 index )
>                 : k_( array[index] ),
>                   value_( 0 ),
>                   list_( arrl,array,index + 1 )  { }
>-      
>+
>             void value( sal_Int32 val ) { value_ += val; }
>-      
>+
>         private:
> 
>-            sal_Int32             k_,value_;      
>+            sal_Int32             k_,value_;
>             ByteArrayDecompressor list_;
> 
>         };
>-    
>+
>     }
> 
> }
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/util/Decompressor.hxx xmlhelp//source/cxxhelp/inc/util/Decompressor.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/util/Decompressor.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/inc/util/Decompressor.hxx	2012-02-24 13:39:00.669662388 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -37,13 +37,13 @@
> 
> 
> namespace xmlsearch {
>-  
>+
>     namespace util {
> 
>-    
>+
>         class CompressorIterator;
> 
>-    
>+
>         class Decompressor
>         {
>         public:
>@@ -55,53 +55,53 @@
>             }
> 
>             virtual ~Decompressor() { }
>-    
>+
>             virtual sal_Int32 getNextByte() = 0;
>-      
>+
>             virtual void initReading()
>             {
>                 toRead_ = 0;
>             }
>-      
>+
>         private:
> 
>             static const sal_Int32 BitsInByte;
>             static const sal_Int32 NBits;
>-      
>+
>             sal_Int32 readByte_, toRead_, path_;
>         };
> 
> 
> 
>-    
>+
>         class StreamDecompressor
>             : public Decompressor
>         {
>         public:
>-      
>+
>             StreamDecompressor( RandomAccessStream* in )
>                 : in_( in )
>             {
>             }
>-      
>+
>             ~StreamDecompressor() { }
> 
> 
>             virtual sal_Int32 getNextByte();
> 
>         private:
>-      
>+
>             RandomAccessStream* in_;
>-            
>+
>         };
> 
>-    
>-    
>+
>+
>         class ByteArrayDecompressor
>             : public Decompressor
>         {
>         public:
>-            
>+
>             ByteArrayDecompressor( sal_Int32 arrayL,sal_Int8* array,sal_Int32 index )
>             {
>                 initReading(array,arrayL,index);
>@@ -109,12 +109,12 @@
> 
> 
>             ~ByteArrayDecompressor() { }
>-      
>+
>             sal_Int32 bytesRead()
>             {
>                 return index_ - index0_;
>             }
>-      
>+
> 
>             sal_Int32 getNextByte() throw( xmlsearch::excep::XmlSearchException )
>             {
>@@ -124,9 +124,9 @@
>                 return array_[index_++] & 0xFF;
>             }
> 
>-      
>+
>         private:
>-      
>+
>             sal_Int32  arrayL_;
>             sal_Int8   *array_;
> 
>@@ -140,10 +140,10 @@
>                 index_ = index0_ = index;
>                 Decompressor::initReading();
>             }
>-      
>+
>         };
>-    
>-    
>+
>+
>     }
> 
> }
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/util/RandomAccessStream.hxx xmlhelp//source/cxxhelp/inc/util/RandomAccessStream.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/inc/util/RandomAccessStream.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/inc/util/RandomAccessStream.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -31,33 +31,33 @@
> #include <osl/file.hxx>
> 
> namespace xmlsearch {
>-    
>+
>     namespace util {
>-        
>-        
>+
>+
>         class RandomAccessStream
>         {
>         public:
> 
>             virtual ~RandomAccessStream() { };
>-      
>+
>             // The calle is responsible for allocating the buffer
>             virtual void seek( sal_Int32 ) = 0;
>             virtual sal_Int32 readBytes( sal_Int8*,sal_Int32 ) = 0;
>             virtual void writeBytes( sal_Int8*, sal_Int32 ) = 0;
>             virtual sal_Int32 length() = 0;
>             virtual void close() = 0;
>-      
>-      
>+
>+
>         protected:
>-      
>+
>             enum OPENFLAG { Read = osl_File_OpenFlag_Read,
>                             Write = osl_File_OpenFlag_Write,
>                             Create = osl_File_OpenFlag_Create };
>-      
>+
>         };
> 
>-        
>+
>     }
> }
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/bufferedinputstream.cxx xmlhelp//source/cxxhelp/provider/bufferedinputstream.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/bufferedinputstream.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/bufferedinputstream.cxx	2011-11-29 09:56:03.808323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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"
> 
>@@ -44,17 +42,17 @@
> {
>     if( ! xInputStream.is() )
>         return xInputStream;
>-    
>+
>     Reference<XSeekable> xSeekable(xInputStream,UNO_QUERY);
>-    
>+
>     if( xSeekable.is() )
>         return xInputStream;
>-    
>+
>     return new BufferedInputStream(xInputStream);
> }
> 
> 
>-    
>+
> BufferedInputStream::BufferedInputStream(const Reference<XInputStream>& xInputStream)
>     : m_nBufferLocation(0),
>       m_nBufferSize(0),
>@@ -86,7 +84,7 @@
>     {
>     }
>     catch( const BufferSizeExceededException&)
>-    {		
>+    {
>     }
>     catch( const IOException&)
>     {
>@@ -109,7 +107,7 @@
>     Any aRet = ::cppu::queryInterface( rType,
>                                        SAL_STATIC_CAST( XInputStream*,this ),
>                                        SAL_STATIC_CAST( XSeekable*,this ) );
>-    
>+
>     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
> }
> 
>@@ -134,16 +132,16 @@
>            RuntimeException)
> {
>     osl::MutexGuard aGuard( m_aMutex );
>-    
>+
>     if( 0 > nBytesToRead )
>         throw BufferSizeExceededException();
>-    
>+
>     if( m_nBufferLocation + nBytesToRead > m_nBufferSize )
>         nBytesToRead = m_nBufferSize - m_nBufferLocation;
>-    
>+
>     if( aData.getLength() < nBytesToRead )
>         aData.realloc(nBytesToRead);
>-    
>+
>     rtl_copyMemory((void*)(aData.getArray()),
>                    (void*)(m_pBuffer+m_nBufferLocation),
>                    nBytesToRead);
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/bufferedinputstream.hxx xmlhelp//source/cxxhelp/provider/bufferedinputstream.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/bufferedinputstream.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/bufferedinputstream.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -33,84 +33,84 @@
> 
> 
> namespace chelp {
>-    
>+
>     class BufferedInputStream
>         : public cppu::OWeakObject,
>           public com::sun::star::io::XInputStream,
>           public com::sun::star::io::XSeekable
>     {
>     private:
>-        
>+
>         sal_Int32      m_nBufferLocation;
>         sal_Int32      m_nBufferSize;
>         sal_Int8      *m_pBuffer;
>         osl::Mutex     m_aMutex;
>-        
>+
>     public:
>-        
>+
>         BufferedInputStream(
>             const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream);
>-        
>+
>         ~BufferedInputStream();
>-        
>-        virtual com::sun::star::uno::Any SAL_CALL 
>+
>+        virtual com::sun::star::uno::Any SAL_CALL
>         queryInterface( const com::sun::star::uno::Type& rType )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual void SAL_CALL acquire( void ) throw();
>-        
>+
>         virtual void SAL_CALL release( void ) throw();
>-        
>-        
>+
>+
>         virtual sal_Int32 SAL_CALL readBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData,
>-                                              sal_Int32 nBytesToRead ) 
>+                                              sal_Int32 nBytesToRead )
>             throw( com::sun::star::io::NotConnectedException,
>                    com::sun::star::io::BufferSizeExceededException,
>                    com::sun::star::io::IOException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual sal_Int32 SAL_CALL readSomeBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData,
>                                                   sal_Int32 nMaxBytesToRead )
>             throw( com::sun::star::io::NotConnectedException,
>                    com::sun::star::io::BufferSizeExceededException,
>                    com::sun::star::io::IOException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
>             throw( com::sun::star::io::NotConnectedException,
>                    com::sun::star::io::BufferSizeExceededException,
>                    com::sun::star::io::IOException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual sal_Int32 SAL_CALL available( void )
>             throw( com::sun::star::io::NotConnectedException,
>                    com::sun::star::io::IOException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual void SAL_CALL closeInput( void )
>             throw( com::sun::star::io::NotConnectedException,
>                    com::sun::star::io::IOException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual void SAL_CALL seek( sal_Int64 location )
>             throw( com::sun::star::lang::IllegalArgumentException,
>                    com::sun::star::io::IOException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual sal_Int64 SAL_CALL getPosition( void )
>             throw( com::sun::star::io::IOException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual sal_Int64 SAL_CALL getLength( void )
>             throw( com::sun::star::io::IOException,
>                    com::sun::star::uno::RuntimeException );
>     };
>-    
>-    
>+
>+
>     extern com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
>     turnToSeekable(
>         const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream);
>-    
>+
> }
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/contentcaps.cxx xmlhelp//source/cxxhelp/provider/contentcaps.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/contentcaps.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/contentcaps.cxx	2011-11-29 09:56:03.808323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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>
>@@ -43,147 +41,147 @@
> using namespace chelp;
> 
> // virtual
>-uno::Sequence< beans::Property > Content::getProperties( 
>+uno::Sequence< beans::Property > Content::getProperties(
>     const uno::Reference< star::ucb::XCommandEnvironment > & /*xEnv*/ )
> {
>     bool withMediaType = m_aURLParameter.isFile() || m_aURLParameter.isRoot();
>     bool isModule = m_aURLParameter.isModule();
>     bool isFile = m_aURLParameter.isFile();
>-    
>+
>     sal_Int32 num = withMediaType ? 7 : 6;
>     if( isModule ) num+=6;
>     if( isFile )   num++;
>-    
>+
>     uno::Sequence< beans::Property > props(num);
>-    
>+
>     sal_Int32 idx = 0;
>-    props[idx++] = 
>+    props[idx++] =
>         beans::Property(
>             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
>             -1,
>             getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
>-            beans::PropertyAttribute::BOUND 
>+            beans::PropertyAttribute::BOUND
>             | beans::PropertyAttribute::READONLY );
>-    
>-    props[idx++] = 
>+
>+    props[idx++] =
>         beans::Property(
>             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ),
>             -1,
>             getCppuBooleanType(),
>-            beans::PropertyAttribute::BOUND 
>+            beans::PropertyAttribute::BOUND
>             | beans::PropertyAttribute::READONLY );
> 
>-    props[idx++] = 
>+    props[idx++] =
>         beans::Property(
>             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsErrorDocument" ) ),
>             -1,
>             getCppuBooleanType(),
>-            beans::PropertyAttribute::BOUND 
>+            beans::PropertyAttribute::BOUND
>             | beans::PropertyAttribute::READONLY );
> 
>-    props[idx++] = 
>+    props[idx++] =
>         beans::Property(
>             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
>             -1,
>             getCppuBooleanType(),
>-            beans::PropertyAttribute::BOUND 
>+            beans::PropertyAttribute::BOUND
>             | beans::PropertyAttribute::READONLY );
>-    
>+
>     props[idx++] =
>         beans::Property(
>             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
>             -1,
>             getCppuBooleanType(),
>-            beans::PropertyAttribute::BOUND 
>+            beans::PropertyAttribute::BOUND
>             | beans::PropertyAttribute::READONLY );
>-    
>+
>     props[idx++] =
>         beans::Property(
>             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
>             -1,
>             getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
>-            beans::PropertyAttribute::BOUND  
>+            beans::PropertyAttribute::BOUND
>             | beans::PropertyAttribute::READONLY );
>-    
>+
>     if( withMediaType )
>-        props[idx++] = 
>-            beans::Property( 
>+        props[idx++] =
>+            beans::Property(
>                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ),
>                 -1,
>                 getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
>-                beans::PropertyAttribute::BOUND  
>+                beans::PropertyAttribute::BOUND
>                 | beans::PropertyAttribute::READONLY );
>-    
>+
>     if( isModule )
>     {
>-        props[idx++] = 
>-            beans::Property( 
>+        props[idx++] =
>+            beans::Property(
>                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Order" ) ),
>                 -1,
>                 getCppuType( static_cast< sal_Int32* >( 0 ) ),
>-                beans::PropertyAttribute::BOUND  
>+                beans::PropertyAttribute::BOUND
>                 | beans::PropertyAttribute::READONLY );
> 
>-        props[idx++] = 
>-            beans::Property( 
>+        props[idx++] =
>+            beans::Property(
>                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeywordList" ) ),
>                 -1,
>-                getCppuType( 
>-                    static_cast< const uno::Sequence< rtl::OUString >* >( 
>+                getCppuType(
>+                    static_cast< const uno::Sequence< rtl::OUString >* >(
>                         0 ) ),
>-                beans::PropertyAttribute::BOUND  
>+                beans::PropertyAttribute::BOUND
>                 | beans::PropertyAttribute::READONLY );
>-        
>-        props[idx++] = 
>-            beans::Property( 
>+
>+        props[idx++] =
>+            beans::Property(
>                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeywordRef" ) ),
>                 -1,
>-                getCppuType( 
>+                getCppuType(
>                     static_cast< const uno::Sequence< uno::Sequence< rtl::OUString > >* >( 0 ) ),
>-                beans::PropertyAttribute::BOUND  
>+                beans::PropertyAttribute::BOUND
>                 | beans::PropertyAttribute::READONLY );
>-        
>-        props[idx++] = 
>-            beans::Property( 
>-                rtl::OUString( 
>+
>+        props[idx++] =
>+            beans::Property(
>+                rtl::OUString(
>                     RTL_CONSTASCII_USTRINGPARAM( "KeywordTitleForRef" ) ),
>                 -1,
>-                getCppuType( 
>+                getCppuType(
>                     static_cast< const uno::Sequence< uno::Sequence< rtl::OUString > >* >( 0 ) ),
>-                beans::PropertyAttribute::BOUND  
>+                beans::PropertyAttribute::BOUND
>                 | beans::PropertyAttribute::READONLY );
>-        
>-        props[idx++] = 
>-            beans::Property( 
>-                rtl::OUString( 
>+
>+        props[idx++] =
>+            beans::Property(
>+                rtl::OUString(
>                     RTL_CONSTASCII_USTRINGPARAM( "KeywordAnchorForRef" ) ),
>                 -1,
>-                getCppuType( 
>+                getCppuType(
>                     static_cast< const uno::Sequence< uno::Sequence< rtl::OUString > >* >( 0 ) ),
>-                beans::PropertyAttribute::BOUND  
>+                beans::PropertyAttribute::BOUND
>                 | beans::PropertyAttribute::READONLY );
>-        
>-        props[idx++] = 
>-            beans::Property( 
>+
>+        props[idx++] =
>+            beans::Property(
>                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SearchScopes" ) ),
>                 -1,
>-                getCppuType( 
>+                getCppuType(
>                     static_cast< const uno::Sequence< rtl::OUString >* >( 0 ) ),
>-                beans::PropertyAttribute::BOUND  
>+                beans::PropertyAttribute::BOUND
>                 | beans::PropertyAttribute::READONLY );
>     }
> 
>     if( isFile )
>     {
>-        props[idx++] = 
>-            beans::Property( 
>+        props[idx++] =
>+            beans::Property(
>                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AnchorName" ) ),
>                 -1,
>                 getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
>-                beans::PropertyAttribute::BOUND  
>+                beans::PropertyAttribute::BOUND
>                 | beans::PropertyAttribute::READONLY );
>     }
>-    
>+
>     return props;
> }
> 
>@@ -213,34 +211,34 @@
>             getCppuVoidType()
>         ),
>         star::ucb::CommandInfo(
>-            rtl::OUString( 
>+            rtl::OUString(
>                 RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
>             -1,
>             getCppuVoidType()
>         ),
>         star::ucb::CommandInfo(
>-            rtl::OUString( 
>+            rtl::OUString(
>                 RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
>             -1,
>-            getCppuType( 
>+            getCppuType(
>                 static_cast< uno::Sequence< beans::Property > * >( 0 ) )
>         ),
>         star::ucb::CommandInfo(
>-            rtl::OUString( 
>+            rtl::OUString(
>                 RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
>             -1,
>-            getCppuType( 
>+            getCppuType(
>                 static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) )
>         ),
>         star::ucb::CommandInfo(
>             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
>             -1,
>-            getCppuType( 
>+            getCppuType(
>                 static_cast< star::ucb::OpenCommandArgument2 * >( 0 ) )
>         )
>     };
> 
>-    return uno::Sequence< star::ucb::CommandInfo >( 
>+    return uno::Sequence< star::ucb::CommandInfo >(
>         aCommandInfoTable, COMMAND_COUNT );
> }
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/content.cxx xmlhelp//source/cxxhelp/provider/content.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/content.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/content.cxx	2011-11-29 09:56:03.808323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> 
> /**************************************************************************
>                                 TODO
>@@ -72,7 +70,7 @@
> 
> Content::Content( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
>                   ::ucbhelper::ContentProviderImplHelper* pProvider,
>-                  const uno::Reference< ucb::XContentIdentifier >& 
>+                  const uno::Reference< ucb::XContentIdentifier >&
>                       Identifier,
>                   Databases* pDatabases )
>     : ContentImplHelper( rxSMgr, pProvider, Identifier ),
>@@ -210,7 +208,7 @@
>     : public ResultSetFactory
> {
> private:
>-    
>+
>     uno::Reference< lang::XMultiServiceFactory > m_xSMgr;
>     uno::Reference< ucb::XContentProvider >      m_xProvider;
>     sal_Int32                                    m_nOpenMode;
>@@ -218,11 +216,11 @@
>     uno::Sequence< ucb::NumberedSortingInfo >    m_seqSort;
>     URLParameter                                 m_aURLParameter;
>     Databases*                                   m_pDatabases;
>-    
>+
> 
> public:
>-    
>-    ResultSetForRootFactory( 
>+
>+    ResultSetForRootFactory(
>         const uno::Reference< lang::XMultiServiceFactory >& xSMgr,
>         const uno::Reference< ucb::XContentProvider >&  xProvider,
>         sal_Int32 nOpenMode,
>@@ -258,7 +256,7 @@
>     : public ResultSetFactory
> {
> private:
>-    
>+
>     uno::Reference< lang::XMultiServiceFactory > m_xSMgr;
>     uno::Reference< ucb::XContentProvider >      m_xProvider;
>     sal_Int32                                    m_nOpenMode;
>@@ -269,8 +267,8 @@
> 
> 
> public:
>-    
>-    ResultSetForQueryFactory( 
>+
>+    ResultSetForQueryFactory(
>         const uno::Reference< lang::XMultiServiceFactory >& xSMgr,
>         const uno::Reference< ucb::XContentProvider >&  xProvider,
>         sal_Int32 nOpenMode,
>@@ -303,16 +301,16 @@
> 
> 
> // virtual
>-uno::Any SAL_CALL Content::execute( 
>+uno::Any SAL_CALL Content::execute(
>         const ucb::Command& aCommand,
>         sal_Int32 CommandId,
>         const uno::Reference< ucb::XCommandEnvironment >& Environment )
>-    throw( uno::Exception, 
>-           ucb::CommandAbortedException, 
>+    throw( uno::Exception,
>+           ucb::CommandAbortedException,
>            uno::RuntimeException )
> {
>     uno::Any aRet;
>-  
>+
>     if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getPropertyValues")) )
>     {
>         uno::Sequence< beans::Property > Properties;
>@@ -321,18 +319,18 @@
>             aRet <<= lang::IllegalArgumentException();
>             ucbhelper::cancelCommandExecution(aRet,Environment);
>         }
>-      
>+
>         aRet <<= getPropertyValues( Properties );
>     }
>     else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("setPropertyValues")) )
>     {
>         uno::Sequence<beans::PropertyValue> propertyValues;
>-        
>+
>         if( ! ( aCommand.Argument >>= propertyValues ) ) {
>             aRet <<= lang::IllegalArgumentException();
>             ucbhelper::cancelCommandExecution(aRet,Environment);
>         }
>-        
>+
>         uno::Sequence< uno::Any > ret(propertyValues.getLength());
>         uno::Sequence< beans::Property > props(getProperties(Environment));
>         // No properties can be set
>@@ -344,7 +342,7 @@
>                     break;
>                 }
>         }
>-        
>+
>         aRet <<= ret;
>     }
>     else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getPropertySetInfo")) )
>@@ -365,25 +363,25 @@
>             aRet <<= lang::IllegalArgumentException();
>             ucbhelper::cancelCommandExecution(aRet,Environment);
>         }
>-      
>+
>         uno::Reference< io::XActiveDataSink > xActiveDataSink(
>             aOpenCommand.Sink, uno::UNO_QUERY);
>-        
>+
>         if(xActiveDataSink.is())
>             m_aURLParameter.open(m_xSMgr,
>                                  aCommand,
>                                  CommandId,
>                                  Environment,
>                                  xActiveDataSink);
>-        
>+
>         uno::Reference< io::XActiveDataStreamer > xActiveDataStreamer(
>             aOpenCommand.Sink, uno::UNO_QUERY);
>-        
>+
>         if(xActiveDataStreamer.is()) {
>             aRet <<= ucb::UnsupportedDataSinkException();
>             ucbhelper::cancelCommandExecution(aRet,Environment);
>         }
>-        
>+
>         uno::Reference< io::XOutputStream > xOutputStream(
>             aOpenCommand.Sink, uno::UNO_QUERY);
> 
>@@ -393,7 +391,7 @@
>                                  CommandId,
>                                  Environment,
>                                  xOutputStream);
>-        
>+
>         if( m_aURLParameter.isRoot() )
>         {
>             uno::Reference< ucb::XDynamicResultSet > xSet
>@@ -415,7 +413,7 @@
>         else if( m_aURLParameter.isQuery() )
>         {
>             uno::Reference< ucb::XDynamicResultSet > xSet
>-                = new DynamicResultSet(	
>+                = new DynamicResultSet(
>                     m_xSMgr,
>                     this,
>                     aOpenCommand,
>@@ -439,7 +437,7 @@
>         aRet <<= ucb::UnsupportedCommandException();
>         ucbhelper::cancelCommandExecution(aRet,Environment);
>     }
>-    
>+
>     return aRet;
> }
> 
>@@ -447,20 +445,20 @@
> 
> 
> //=========================================================================
>-uno::Reference< sdbc::XRow > Content::getPropertyValues( 
>+uno::Reference< sdbc::XRow > Content::getPropertyValues(
>     const uno::Sequence< beans::Property >& rProperties )
> {
>     osl::MutexGuard aGuard( m_aMutex );
>-    
>-    rtl::Reference< ::ucbhelper::PropertyValueSet > xRow = 
>+
>+    rtl::Reference< ::ucbhelper::PropertyValueSet > xRow =
>         new ::ucbhelper::PropertyValueSet( m_xSMgr );
>-    
>+
>     for ( sal_Int32 n = 0; n < rProperties.getLength(); ++n )
>     {
>         const beans::Property& rProp = rProperties[n];
>-        
>+
>         if ( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ContentType")) )
>-            xRow->appendString( 
>+            xRow->appendString(
>                 rProp,
>                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
>                     "application/vnd.sun.star.help" )) );
>@@ -469,26 +467,26 @@
>         else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsReadOnly")) )
>             xRow->appendBoolean( rProp,true );
>         else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsDocument")) )
>-            xRow->appendBoolean( 
>+            xRow->appendBoolean(
>                 rProp,
>                 m_aURLParameter.isFile() || m_aURLParameter.isRoot() );
>         else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsFolder")) )
>-            xRow->appendBoolean( 
>-                rProp, 
>+            xRow->appendBoolean(
>+                rProp,
>                 ! m_aURLParameter.isFile() || m_aURLParameter.isRoot() );
>         else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsErrorDocument")) )
>             xRow->appendBoolean( rProp, m_aURLParameter.isErrorDocument() );
>         else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")) )
>             if( m_aURLParameter.isPicture() )
>-                xRow->appendString( 
>+                xRow->appendString(
>                     rProp,
>                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "image/gif" )) );
>             else if( m_aURLParameter.isActive() )
>-                xRow->appendString( 
>+                xRow->appendString(
>                     rProp,
>                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) );
>             else if( m_aURLParameter.isFile() )
>-                xRow->appendString( 
>+                xRow->appendString(
>                     rProp,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/html" )) );
>             else if( m_aURLParameter.isRoot() )
>                 xRow->appendString(
>@@ -499,10 +497,10 @@
>         else if( m_aURLParameter.isModule() )
>             if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordList")) )
>             {
>-                KeywordInfo *inf = 
>+                KeywordInfo *inf =
>                     m_pDatabases->getKeyword( m_aURLParameter.get_module(),
>                                               m_aURLParameter.get_language() );
>-                
>+
>                 uno::Any aAny;
>                 if( inf )
>                     aAny <<= inf->getKeywordList();
>@@ -513,7 +511,7 @@
>                 KeywordInfo *inf =
>                     m_pDatabases->getKeyword( m_aURLParameter.get_module(),
>                                               m_aURLParameter.get_language() );
>-                
>+
>                 uno::Any aAny;
>                 if( inf )
>                     aAny <<= inf->getIdList();
>@@ -521,10 +519,10 @@
>             }
>             else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordAnchorForRef")) )
>             {
>-                KeywordInfo *inf = 
>+                KeywordInfo *inf =
>                     m_pDatabases->getKeyword( m_aURLParameter.get_module(),
>                                               m_aURLParameter.get_language() );
>-                
>+
>                 uno::Any aAny;
>                 if( inf )
>                     aAny <<= inf->getAnchorList();
>@@ -532,17 +530,17 @@
>             }
>             else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordTitleForRef")) )
>             {
>-                KeywordInfo *inf = 
>+                KeywordInfo *inf =
>                     m_pDatabases->getKeyword( m_aURLParameter.get_module(),
>                                               m_aURLParameter.get_language() );
>-                
>+
>                 uno::Any aAny;
>                 if( inf )
>                     aAny <<= inf->getTitleList();
>                 xRow->appendObject( rProp,aAny );
>             }
>             else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SearchScopes")) )
>-            {				
>+            {
>                 uno::Sequence< rtl::OUString > seq( 2 );
>                 seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Heading" ));
>                 seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FullText" ));
>@@ -551,12 +549,12 @@
>                 xRow->appendObject( rProp,aAny );
>             }
>             else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Order")) )
>-            {				
>-                StaticModuleInformation *inf = 
>+            {
>+                StaticModuleInformation *inf =
>                     m_pDatabases->getStaticInformationForModule(
>                         m_aURLParameter.get_module(),
>                         m_aURLParameter.get_language() );
>-                
>+
>                 uno::Any aAny;
>                 if( inf )
>                     aAny <<= sal_Int32( inf->get_order() );
>@@ -570,7 +568,7 @@
>         else
>             xRow->appendVoid( rProp );
>     }
>-    
>+
>     return uno::Reference< sdbc::XRow >( xRow.get() );
> }
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/content.hxx xmlhelp//source/cxxhelp/provider/content.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/content.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/content.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -58,11 +58,11 @@
> 
>     struct ContentProperties
>     {
>-        ::rtl::OUString aTitle;    		// Title
>-        ::rtl::OUString aContentType;	// ContentType
>+        ::rtl::OUString aTitle;         // Title
>+        ::rtl::OUString aContentType;   // ContentType
>         sal_Bool        bIsDocument;    // IsDocument
>-        sal_Bool        bIsFolder;    	// IsFolder
>-        
>+        sal_Bool        bIsFolder;      // IsFolder
>+
>         ContentProperties()
>             : bIsDocument( sal_True ), bIsFolder( sal_False ) {}
>     };
>@@ -79,7 +79,7 @@
>                  const ::com::sun::star::uno::Reference<
>                  ::com::sun::star::ucb::XContentIdentifier >& Identifier,
>                  Databases* pDatabases );
>-        
>+
>         virtual ~Content();
> 
>         // XInterface
>@@ -92,7 +92,7 @@
>         virtual ::rtl::OUString SAL_CALL
>         getImplementationName()
>             throw( ::com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
>         getSupportedServiceNames()
>             throw( ::com::sun::star::uno::RuntimeException );
>@@ -111,21 +111,21 @@
>             throw( com::sun::star::uno::Exception,
>                    com::sun::star::ucb::CommandAbortedException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual void SAL_CALL
>         abort( sal_Int32 CommandId )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>-        
>+
>+
>     private:
>-        
>+
>         // private members;
>-        
>+
>         ContentProperties m_aProps;
>         URLParameter      m_aURLParameter;
>         Databases*        m_pDatabases;
>-        
>-        
>+
>+
>         // private methods
> 
>         virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
>@@ -134,7 +134,7 @@
>         virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
>         getCommands( const com::sun::star::uno::Reference<
>                      com::sun::star::ucb::XCommandEnvironment > & xEnv );
>-        
>+
>         virtual ::rtl::OUString getParentURL() { return ::rtl::OUString(); }
> 
>         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
>@@ -143,8 +143,8 @@
>         void setPropertyValues(
>             const ::com::sun::star::uno::Sequence<
>             ::com::sun::star::beans::PropertyValue >& rValues );
>-        
>-        
>+
>+
>     };
> 
> }
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/databases.cxx xmlhelp//source/cxxhelp/provider/databases.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/databases.cxx	2011-05-20 18:06:00.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/databases.cxx	2012-02-24 13:39:00.669662388 +0100
>@@ -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"
>@@ -210,10 +208,10 @@
>             ++it;
>         }
>     }
>-    
>+
>     {
>         //  ModInfoTable
>-    
>+
>         ModInfoTable::iterator it = m_aModInfo.begin();
>         while( it != m_aModInfo.end() )
>         {
>@@ -221,10 +219,10 @@
>             ++it;
>         }
>     }
>-    
>+
>     {
>         // KeywordInfoTable
>-        
>+
>         KeywordInfoTable::iterator it = m_aKeywordInfo.begin();
>         while( it != m_aKeywordInfo.end() )
>         {
>@@ -336,16 +334,16 @@
>     sal_Int32 idx = -1,idx1 = -1,idx2 = -1,k = 0,off;
>     bool cap = false;
>     rtl::OUStringBuffer aStrBuf( 0 );
>-    
>+
>     while( true )
>     {
>         ++idx;
>         idx1 = oustring.indexOf( sal_Unicode('%'),idx);
>         idx2 = oustring.indexOf( sal_Unicode('$'),idx);
>-        
>+
>         if(idx1 == -1 && idx2 == -1)
>             break;
>-        
>+
>         if(idx1 == -1)
>             idx = idx2;
>         else if(idx2 == -1)
>@@ -357,7 +355,7 @@
>             else if(idx2 < idx1 )
>                 idx = idx2;
>         }
>-        
>+
>         if( oustring.indexOf( prodName,idx ) == idx )
>             off = PRODUCTNAME;
>         else if( oustring.indexOf( prodVersion,idx ) == idx )
>@@ -374,7 +372,7 @@
>             off = NEWPRODUCTVERSION;
>         else
>             off = -1;
>-        
>+
>         if( off != -1 )
>         {
>             if( ! cap )
>@@ -382,13 +380,13 @@
>                 cap = true;
>                 aStrBuf.ensureCapacity( 256 );
>             }
>-            
>+
>             aStrBuf.append( &oustring.getStr()[k],idx - k );
>             aStrBuf.append( m_vReplacement[off] );
>             k = idx + m_vAdd[off];
>         }
>     }
>-    
>+
>     if( cap )
>     {
>         if( k < oustring.getLength() )
>@@ -397,45 +395,22 @@
>     }
> }
> 
>-
>-
>-
>-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 @@
>         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();
>@@ -519,7 +494,7 @@
>                     if( pos )
>                     {
>                         current = rtl::OUString( lineBuffer,pos );
>-                        
>+
>                         if( current.compareToAscii( "Title",5 ) == 0 )
>                         {
>                             title = current.copy( current.indexOf(sal_Unicode( '=' ) ) + 1 );
>@@ -576,12 +551,12 @@
> 
>     rtl::OUString ret;
>     LangSetTable::iterator it = m_aLangSet.find( Language );
>-    
>+
>     if( it == m_aLangSet.end() )
>     {
>         sal_Int32 idx;
>         osl::DirectoryItem aDirItem;
>-        
>+
>         if( osl::FileBase::E_None == osl::DirectoryItem::get( getInstallPathAsURL() + Language,aDirItem ) )
>         {
>             ret = Language;
>@@ -609,7 +584,7 @@
>     if( ( idx = Language.indexOf( '-' ) ) != -1 ||
>         ( idx = Language.indexOf( '_' ) ) != -1 )
>         return Language.copy( 1+idx );
>-    
>+
>     return rtl::OUString();
> }
> 
>@@ -621,7 +596,7 @@
> {
>     if( ! Database.getLength() || ! Language.getLength() )
>         return 0;
>-    
>+
>     osl::MutexGuard aGuard( m_aMutex );
> 
> 
>@@ -631,7 +606,7 @@
>     if( pExtensionPath == NULL )
>         key = processLang( Language ) + dbFileName;
>     else
>-        key = *pExtensionPath + Language + dbFileName;		// make unique, don't change language
>+        key = *pExtensionPath + Language + dbFileName;      // make unique, don't change language
> 
>     std::pair< DatabasesTable::iterator,bool > aPair =
>         m_aDatabases.insert( DatabasesTable::value_type( key,0 ) );
>@@ -665,7 +640,7 @@
>             delete table;
>             table = 0;
>         }
>-        
>+
>         it->second = table;
>     }
> 
>@@ -717,38 +692,38 @@
>                                                   rtl::OUString() ),
>                                           0 );
>     }
>-    
>+
>     return it->second;
> }
> 
> 
> 
> namespace chelp {
>-    
>+
>     struct KeywordElementComparator
>     {
>         KeywordElementComparator( const Reference< XCollator >& xCollator )
>             : m_xCollator( xCollator )
>         { }
>-        
>+
>         bool operator()( const KeywordInfo::KeywordElement& la,
>                          const KeywordInfo::KeywordElement& ra ) const
>         {
>             const rtl::OUString& l = la.key;
>             const rtl::OUString& r = ra.key;
>-            
>+
>             bool ret;
>-            
>+
>             if( m_xCollator.is() )
>             {
>                 sal_Int32 l1 = l.indexOf( sal_Unicode( ';' ) );
>                 sal_Int32 l3 = ( l1 == -1 ? l.getLength() : l1 );
>-        
>+
>                 sal_Int32 r1 = r.indexOf( sal_Unicode( ';' ) );
>                 sal_Int32 r3 = ( r1 == -1 ? r.getLength() : r1 );
>-                
>+
>                 sal_Int32 c1 = m_xCollator->compareSubstring( l,0,l3,r,0,r3 );
>-                
>+
>                 if( c1 == +1 )
>                     ret = false;
>                 else if( c1 == 0 )
>@@ -762,13 +737,13 @@
>             }
>             else
>                 ret = bool( l < r );
>-            
>+
>             return ret;
>         }
>-        
>+
>         Reference< XCollator > m_xCollator;
>     }; // end struct KeywordElementComparator
>-    
>+
> }
> 
> 
>@@ -805,7 +780,7 @@
>             anchor.push_back( rtl::OUString() );
>         }
>     }
>-    
>+
>     listId.realloc( id.size() );
>     listAnchor.realloc( id.size() );
>     listTitle.realloc( id.size() );
>@@ -845,9 +820,9 @@
>                 pData = static_cast<sal_Char*>( data.get_data() );
>             }
>         }
>-        
>+
>         DbtToStringConverter converter( pData, nSize );
>-        
>+
>         rtl::OUString title = converter.getTitle();
>         pDatabases->replaceName( title );
>         listTitle[i] = title;
>@@ -977,7 +952,7 @@
> 
>                         if( !bBelongsToDatabase )
>                             continue;
>-                    
>+
>                         aVector.push_back( KeywordInfo::KeywordElement( this,
>                                                                         idmap,
>                                                                         keyword,
>@@ -989,11 +964,11 @@
>                         pDBHelp->releaseHashMap();
>                 }
>             }
>-        
>+
>             else if( 0 == table.open( 0,fileURL,DB_BTREE,DB_RDONLY,0644 ) )
>             {
>                 Db* idmap = getBerkeley( Database,Language );
>-                
>+
>                 bool first = true;
> 
>                 Dbc* cursor = 0;
>@@ -1016,7 +991,7 @@
> 
>                     if( !bBelongsToDatabase )
>                         continue;
>-                
>+
>                     aVector.push_back( KeywordInfo::KeywordElement( this,
>                                                                     idmap,
>                                                                     keyword,
>@@ -1028,7 +1003,7 @@
>                         first = false;
>                     }
>                 }
>-                
>+
>                 if( cursor ) cursor->close();
>             }
>             table.close( 0 );
>@@ -1038,11 +1013,11 @@
>         Reference< XCollator > xCollator = getCollator( Language,rtl::OUString());
>         KeywordElementComparator aComparator( xCollator );
>         std::sort(aVector.begin(),aVector.end(),aComparator);
>-        
>+
>         KeywordInfo* pInfo = it->second = new KeywordInfo( aVector );
>         (void)pInfo;
>     }
>-    
>+
>     return it->second;
> }
> 
>@@ -1057,10 +1032,10 @@
>     rtl::OUString key = processLang(Language) + aSlash + jar;
> 
>     osl::MutexGuard aGuard( m_aMutex );
>-    
>+
>     ZipFileTable::iterator it =
>         m_aZipFileTable.insert( ZipFileTable::value_type( key,Reference< XHierarchicalNameAccess >(0) ) ).first;
>-    
>+
>     if( ! it->second.is() )
>     {
>         rtl::OUString zipFile;
>@@ -1087,7 +1062,7 @@
>             }
> 
>             Sequence< Any > aArguments( 2 );
>-            
>+
>             XInputStream_impl* p = new XInputStream_impl( zipFile );
>             if( p->CtorSuccess() )
>             {
>@@ -1099,7 +1074,7 @@
>                 delete p;
>                 aArguments[ 0 ] <<= zipFile;
>             }
>-            
>+
>             // let ZipPackage be used ( no manifest.xml is required )
>             beans::NamedValue aArg;
>             aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) );
>@@ -1129,7 +1104,7 @@
>         {
>         }
>     }
>-    
>+
>     return it->second;
> }
> 
>@@ -1187,7 +1162,7 @@
>             }
>         }
>     }
>-    
>+
>     return xNA;
> }
> 
>@@ -1219,9 +1194,9 @@
>     val = urlPar->get_eid();
>     rtl::OString pop4O( val.getStr(),l4 = val.getLength(),RTL_TEXTENCODING_UTF8 );
>     const char* pop4 = pop4O.getStr();
>-    
>+
>     (*byteCount) = l1 + l2 + l3 + l4 + l5;
>-        
>+
>     *buffer = new char[ 1+*byteCount ];
> 
>     rtl_copyMemory( *buffer,pop1,l1 );
>@@ -1296,7 +1271,7 @@
> 
>             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 )        &&
>@@ -1322,19 +1297,19 @@
>                 bHighContrastMode = sal_False;
>             }
>         }
>-        
>+
>         if( error )
>         {
>             m_nCustomCSSDocLength = 0;
>             m_pCustomCSSDoc = new char[ 1 ]; // Initialize with 1 to avoid gcc compiler warning
>         }
>     }
>-    
>+
>     *byteCount = m_nCustomCSSDocLength;
>     *buffer = new char[ 1 + *byteCount ];
>     (*buffer)[*byteCount] = 0;
>     rtl_copyMemory( *buffer,m_pCustomCSSDoc,m_nCustomCSSDocLength );
>-    
>+
> }
> 
> 
>@@ -1425,10 +1400,6 @@
> 
>     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,13 +1536,13 @@
>     {
>         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;
>     }
> 
>     if( m_iUserPackage == m_aUserPackagesSeq.getLength() )
>     {
>-        m_eState = SHARED_EXTENSIONS;		// Later: SHARED_MODULE
>+        m_eState = SHARED_EXTENSIONS;       // Later: SHARED_MODULE
>     }
>     else
>     {
>@@ -1593,7 +1564,7 @@
>     {
>         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 +1592,7 @@
>     {
>         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;
>     }
> 
>@@ -1686,8 +1657,7 @@
> 
> 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 +1679,7 @@
>             {
>                 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] ) );
>@@ -1736,7 +1706,7 @@
>         {
>             case INITIAL_MODULE:
>                 pRetDb = m_rDatabases.getBerkeley( m_aInitialModule, m_aLanguage, m_bHelpText );
>-                m_eState = USER_EXTENSIONS;		// Later: SHARED_MODULE
>+                m_eState = USER_EXTENSIONS;     // Later: SHARED_MODULE
>                 break;
> 
>             // Later:
>@@ -1787,7 +1757,7 @@
> Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xPackage,
>             rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath )
> {
>-    
>+
>     beans::Optional< ::rtl::OUString> optRegData;
>     try
>     {
>@@ -1834,7 +1804,7 @@
>         if( o_pExtensionRegistryPath )
>             *o_pExtensionRegistryPath = xPackage->getURL() + aSlash + aUsedLanguage;
>     }
>-    
>+
>     return pRetDb;
> }
> 
>@@ -1859,7 +1829,7 @@
> 
>                 o_rbExtension = false;
> 
>-                m_eState = USER_EXTENSIONS;		// Later: SHARED_MODULE
>+                m_eState = USER_EXTENSIONS;     // Later: SHARED_MODULE
>                 break;
> 
>             // Later:
>@@ -1937,7 +1907,7 @@
>         {
>             case INITIAL_MODULE:
>                 xNA = m_rDatabases.jarFile( m_aInitialModule, m_aLanguage );
>-                m_eState = USER_EXTENSIONS;		// Later: SHARED_MODULE
>+                m_eState = USER_EXTENSIONS;     // Later: SHARED_MODULE
>                 break;
> 
>             // Later:
>@@ -2029,7 +1999,7 @@
>         sal_Int32 nLastSlash = zipFile.lastIndexOf( '/' );
>         if( nLastSlash != -1 )
>             *o_pExtensionPath = zipFile.copy( 0, nLastSlash );
>-        
>+
>         if( o_pExtensionRegistryPath != NULL )
>         {
>             rtl::OUString& rPath = *o_pExtensionPath;
>@@ -2039,7 +2009,7 @@
>             *o_pExtensionRegistryPath += rPath.copy( nLastSlashInPath);
>         }
>     }
>-    
>+
>     return xNA;
> }
> 
>@@ -2064,7 +2034,7 @@
>                 o_rbTemporary = false;
>                 o_rbExtension = false;
> 
>-                m_eState = USER_EXTENSIONS;		// Later: SHARED_MODULE
>+                m_eState = USER_EXTENSIONS;     // Later: SHARED_MODULE
>                 break;
> 
>             // Later:
>@@ -2094,7 +2064,7 @@
>                 o_rbExtension = true;
>                 break;
>             }
>-            
>+
>             case BUNDLED_EXTENSIONS:
>             {
>                 Reference< deployment::XPackage > xParentPackageBundle;
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/databases.hxx xmlhelp//source/cxxhelp/provider/databases.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/databases.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/databases.hxx	2012-02-24 13:39:00.670662388 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -50,36 +50,36 @@
> #include <com/sun/star/uno/XComponentContext.hpp>
> #include <com/sun/star/i18n/XCollator.hpp>
> #include <com/sun/star/deployment/XPackage.hpp>
>-#include "com/sun/star/ucb/XSimpleFileAccess.hpp" 
>+#include "com/sun/star/ucb/XSimpleFileAccess.hpp"
> 
> // Forward declaration
> 
> 
> namespace berkeleydbproxy {
>-    
>+
>     class Db;
>-    
>+
> }
> 
> 
> namespace chelp {
> 
>-    
>+
>     class Databases;
>     class URLParameter;
>-    
>+
>     class StaticModuleInformation
>     {
>     private:
>-        
>+
>         rtl::OUString m_aStartId;
>         rtl::OUString m_aProgramSwitch;
>         rtl::OUString m_aTitle;
>         rtl::OUString m_aHeading;
>         rtl::OUString m_aFulltext;
>         int m_nOrder;
>-        
>-        
>+
>+
>     public:
> 
>         StaticModuleInformation( rtl::OUString aTitle,
>@@ -96,7 +96,7 @@
>               m_nOrder( aOrder.toInt32() )
>         {
>         }
>-        
>+
>         ~StaticModuleInformation() { }
> 
>         rtl::OUString get_title() const { return m_aTitle; }
>@@ -106,27 +106,27 @@
>         rtl::OUString get_fulltext() const { return m_aFulltext; }
>         int get_order() const { return m_nOrder; }
>     };  // end class StaticModuleInformation
>-    
>-    
>+
>+
> 
>     class KeywordInfo
>     {
>     public:
>-        
>+
>         class KeywordElement
>         {
>             friend struct KeywordElementComparator;
>             friend class KeywordInfo;
>-            
>+
>         public:
>-            
>+
>             KeywordElement( Databases* pDatabases,
>                             berkeleydbproxy::Db* pDb,
>                             rtl::OUString& key,
>                             rtl::OUString& ids );
>-            
>-        private:			
>-            
>+
>+        private:
>+
>             rtl::OUString key;
>             com::sun::star::uno::Sequence< rtl::OUString > listId;
>             com::sun::star::uno::Sequence< rtl::OUString > listAnchor;
>@@ -135,31 +135,31 @@
>             void init( Databases *pDatabases,berkeleydbproxy::Db* pDb,const rtl::OUString& ids );
>         };
> 
>-        
>+
>         KeywordInfo( const std::vector< KeywordElement >& aVector );
>-        
>+
>         ~KeywordInfo() { };
>-        
>+
>         com::sun::star::uno::Sequence< rtl::OUString >&
>         getKeywordList() { return listKey; }
>-        
>+
>         com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > >&
>         getIdList() { return listId; }
>-        
>+
>         com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > >&
>         getAnchorList() { return listAnchor; }
>-        
>+
>         com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > >&
>         getTitleList() { return listTitle; }
>-        
>+
>     private:
>-        
>+
>         com::sun::star::uno::Sequence< rtl::OUString > listKey;
>         com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > > listId,listAnchor,listTitle;
>     };  // end class KeywordInfo
> 
> 
>-    
>+
>     class Databases
>     {
>     public:
>@@ -171,7 +171,7 @@
>                 return rKey1.compareTo( rKey2 ) == 0;
>             }
>         };
>-        
>+
>         struct ha
>         {
>             size_t operator()( const rtl::OUString& rName ) const
>@@ -179,12 +179,12 @@
>                 return rName.hashCode();
>             }
>         };
>-        
>-        
>+
>+
>         /**
>          *  Input is the installdirectory in system dependent notation
>          */
>-      
>+
>         Databases( sal_Bool showBasic,
>                  const rtl::OUString& instPath,
>                  const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths,
>@@ -192,24 +192,22 @@
>                  const rtl::OUString& productVersion,
>                  const rtl::OUString& styleSheet,
>                  com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext );
>-      
>+
>         ~Databases();
> 
>         rtl::OString getImagesZipFileURL();
>-        
>-        rtl::OUString getInstallPathAsSystemPath();
>-        
>+
>         rtl::OUString getInstallPathAsURL();
> 
>         const std::vector< rtl::OUString >& getModuleList( const rtl::OUString& Language );
>-        
>+
>         StaticModuleInformation* getStaticInformationForModule( const rtl::OUString& Module,
>                                                                 const rtl::OUString& Language );
>-        
>+
>         bool checkModuleMatchForExtension( const rtl::OUString& Database, const rtl::OUString& doclist );
>         KeywordInfo* getKeyword( const rtl::OUString& Module,
>                                  const rtl::OUString& Language );
>-        
>+
>         berkeleydbproxy::Db* getBerkeley( const rtl::OUString& Module,
>                          const rtl::OUString& Language, bool helpText = false,
>                          const rtl::OUString* pExtensionPath = NULL );
>@@ -218,16 +216,16 @@
>         /**
>          *  The following method returns the Collator for the given language-country combination
>          */
>-        
>+
>         com::sun::star::uno::Reference< com::sun::star::i18n::XCollator >
>         getCollator( const rtl::OUString& Language,
>                      const rtl::OUString& System );   // System not used by current implementation
>         //                                            // of XCollator
>-        
>+
>         /**
>          *  Returns a copy of the popupfile
>          */
>-        
>+
>         void popupDocument( URLParameter* urlPar,char **buffer,int *byteCount );
> 
> 
>@@ -235,73 +233,73 @@
>          *  Returns the cascading stlye sheet used to format the HTML-output.
>          *  First try is language directory, second try is main installation directory.
>          */
>-        
>+
>         void cascadingStylesheet( const rtl::OUString& Language,
>                                   char** buffer,
>                                   int* byteCount );
>-        
>+
> 
>         /**
>          *  Changes the the stylesheet for further reads.
>          */
>-        
>+
>         void changeCSS(const rtl::OUString& newStyleSheet);
> 
> 
>         /**
>          *  Returns the active help text for the given module, language and id.
>          */
>-        
>+
>         void setActiveText( const rtl::OUString& Module,
>                             const rtl::OUString& Language,
>                             const rtl::OUString& Id,
>                             char** buffer,
>                             int* byteCount );
>-        
>+
>         /**
>          *  Has the purpose of forcing the the jarfile to stay open
>          */
>-        
>+
>         com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >
>         jarFile( const rtl::OUString& jar,
>                  const rtl::OUString& Language );
>-        
>+
>         com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >
>         findJarFileForPath( const rtl::OUString& jar, const rtl::OUString& Language,
>             const rtl::OUString& path, rtl::OUString* o_pExtensionPath = NULL,
>             rtl::OUString* o_pExtensionRegistryPath = NULL );
>-        
>+
>         /**
>          *  Maps a given language-locale combination to language.
>          */
>-        
>+
>         rtl::OUString processLang( const rtl::OUString& Language );
> 
>-        
>+
>         /**
>          *  Maps a given language-locale combination to locale.
>          *  The returned string maybe empty
>          */
>-        
>+
>         rtl::OUString country( const rtl::OUString& Language );
>-        
>-        
>+
>+
>         void replaceName( rtl::OUString& oustring ) const;
> 
>         rtl::OUString getProductName() const { return m_vReplacement[0]; }
>         rtl::OUString getProductVersion() const { return m_vReplacement[1]; }
>-        
>+
>         rtl::OUString expandURL( const rtl::OUString& aURL );
> 
>         static rtl::OUString expandURL( const rtl::OUString& aURL,
>             com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext );
> 
>     private:
>-        
>+
>         osl::Mutex                                                                     m_aMutex;
>         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >       m_xContext;
>         com::sun::star::uno::Reference< com::sun::star::lang::XMultiComponentFactory > m_xSMgr;
>-        com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess >	   m_xSFA;
>+        com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess >       m_xSFA;
> 
>         sal_Bool m_bShowBasic;
>         int    m_nErrorDocLength;
>@@ -320,30 +318,28 @@
>             NEWPRODUCTNAME,
>             NEWPRODUCTVERSION
>         };
>-        
>+
>         int                    m_vAdd[7];
>         rtl::OUString          m_vReplacement[7];
>         rtl::OUString          newProdName,newProdVersion,
>             prodName,prodVersion,vendName,vendVersion,vendShort;
>-        
>+
>         rtl::OUString          m_aInstallDirectory;                // Installation directory
>         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;
>-        
>+
>+        std::vector< rtl::OUString >    m_avModules;
>+
>         typedef boost::unordered_map< rtl::OUString,berkeleydbproxy::Db*,ha,eq >   DatabasesTable;
>         DatabasesTable m_aDatabases;         // Language and module dependent databases
>-        
>-        typedef  boost::unordered_map< rtl::OUString,rtl::OUString,ha,eq > LangSetTable; 
>+
>+        typedef  boost::unordered_map< rtl::OUString,rtl::OUString,ha,eq > LangSetTable;
>         LangSetTable m_aLangSet;   // Mapping to of lang-country to lang
>-        
>+
>         typedef boost::unordered_map< rtl::OUString,StaticModuleInformation*,ha,eq > ModInfoTable;
>         ModInfoTable m_aModInfo;   // Module information
>-        
>+
>         typedef boost::unordered_map< rtl::OUString,KeywordInfo*,ha,eq > KeywordInfoTable;
>         KeywordInfoTable m_aKeywordInfo;   // Module information
> 
>@@ -371,7 +367,7 @@
>                 return rKey1.compareTo( rKey2 ) == 0;
>             }
>         };
>-        
>+
>         struct ostring_ha
>         {
>             size_t operator()( const rtl::OString& rName ) const
>@@ -385,13 +381,13 @@
>             rtl::OString,
>             ostring_ha,
>             ostring_eq >      EmptyActiveTextSet;
>-        EmptyActiveTextSet	m_aEmptyActiveTextSet;
>-        
>-        
>-        // methods 
>-        
>+        EmptyActiveTextSet  m_aEmptyActiveTextSet;
>+
>+
>+        // methods
>+
>         void setInstallPath( const rtl::OUString& aInstallDirectory );
>-        
>+
>     }; // end class Databases
> 
> 
>@@ -399,7 +395,7 @@
>     enum IteratorState
>     {
>         INITIAL_MODULE,
>-        //SHARED_MODULE,		// Later, avoids redundancies in help compiling
>+        //SHARED_MODULE,        // Later, avoids redundancies in help compiling
>         USER_EXTENSIONS,
>         SHARED_EXTENSIONS,
>         BUNDLED_EXTENSIONS,
>@@ -419,12 +415,12 @@
> 
>     class ExtensionIteratorBase
>     {
>-        static ExtensionHelpExistanceMap	aHelpExistanceMap;
>+        static ExtensionHelpExistanceMap    aHelpExistanceMap;
> 
>     public:
>-        ExtensionIteratorBase( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, 
>+        ExtensionIteratorBase( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext,
>             Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage );
>-        ExtensionIteratorBase( Databases& rDatabases, const rtl::OUString& aInitialModule, 
>+        ExtensionIteratorBase( Databases& rDatabases, const rtl::OUString& aInitialModule,
>             const rtl::OUString& aLanguage );
>         void init( void );
> 
>@@ -445,45 +441,45 @@
>         void implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
>             com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
> 
>-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >	m_xContext;
>-        com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess >	m_xSFA;
>-        Databases&																	m_rDatabases;
>+        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >    m_xContext;
>+        com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess >    m_xSFA;
>+        Databases&                                                                  m_rDatabases;
> 
>-        IteratorState																m_eState;
>-        rtl::OUString																m_aExtensionPath;
>+        IteratorState                                                               m_eState;
>+        rtl::OUString                                                               m_aExtensionPath;
> 
>-        rtl::OUString																m_aInitialModule;
>-        rtl::OUString																m_aLanguage;
>+        rtl::OUString                                                               m_aInitialModule;
>+        rtl::OUString                                                               m_aLanguage;
> 
>         com::sun::star::uno::Sequence< com::sun::star::uno::Reference
>-            < com::sun::star::deployment::XPackage > >								m_aUserPackagesSeq;
>-        bool																		m_bUserPackagesLoaded;
>+            < com::sun::star::deployment::XPackage > >                              m_aUserPackagesSeq;
>+        bool                                                                        m_bUserPackagesLoaded;
> 
>         com::sun::star::uno::Sequence< com::sun::star::uno::Reference
>-            < com::sun::star::deployment::XPackage > >								m_aSharedPackagesSeq;
>-        bool																		m_bSharedPackagesLoaded;
>+            < com::sun::star::deployment::XPackage > >                              m_aSharedPackagesSeq;
>+        bool                                                                        m_bSharedPackagesLoaded;
> 
>         com::sun::star::uno::Sequence< com::sun::star::uno::Reference
>             < com::sun::star::deployment::XPackage > >                              m_aBundledPackagesSeq;
>-        bool																		m_bBundledPackagesLoaded;
>+        bool                                                                        m_bBundledPackagesLoaded;
> 
>-        int																			m_iUserPackage;
>-        int																			m_iSharedPackage;
>-        int																			m_iBundledPackage;
>+        int                                                                         m_iUserPackage;
>+        int                                                                         m_iSharedPackage;
>+        int                                                                         m_iBundledPackage;
> 
>     }; // end class ExtensionIteratorBase
> 
>-    
>+
>     //===================================================================
>     class DataBaseIterator : public ExtensionIteratorBase
>     {
>     public:
>-        DataBaseIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, 
>+        DataBaseIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext,
>             Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage, bool bHelpText )
>                 : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage )
>                 , m_bHelpText( bHelpText )
>         {}
>-        DataBaseIterator( Databases& rDatabases, const rtl::OUString& aInitialModule, 
>+        DataBaseIterator( Databases& rDatabases, const rtl::OUString& aInitialModule,
>             const rtl::OUString& aLanguage, bool bHelpText )
>                 : ExtensionIteratorBase( rDatabases, aInitialModule, aLanguage )
>                 , m_bHelpText( bHelpText )
>@@ -497,15 +493,15 @@
>             com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage,
>             rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath );
> 
>-        bool																		m_bHelpText;
>+        bool                                                                        m_bHelpText;
> 
>     }; // end class DataBaseIterator
>-    
>+
>     //===================================================================
>     class KeyDataBaseFileIterator : public ExtensionIteratorBase
>     {
>     public:
>-        KeyDataBaseFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, 
>+        KeyDataBaseFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext,
>             Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage )
>                 : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage )
>         {}
>@@ -517,12 +513,12 @@
>             com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
> 
>     }; // end class KeyDataBaseFileIterator
>-    
>+
>     //===================================================================
>     class JarFileIterator : public ExtensionIteratorBase
>     {
>     public:
>-        JarFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, 
>+        JarFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext,
>             Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage )
>                 : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage )
>         {}
>@@ -537,7 +533,7 @@
>                 rtl::OUString* o_pExtensionPath = NULL, rtl::OUString* o_pExtensionRegistryPath = NULL );
> 
>     }; // end class JarFileIterator
>-    
>+
>     //===================================================================
>     class IndexFolderIterator : public ExtensionIteratorBase
>     {
>@@ -554,7 +550,7 @@
>             com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
> 
>     }; // end class KeyDataBaseFileIterator
>-    
>+
>     //===================================================================
> 
> }      // end namespace chelp
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/db.cxx xmlhelp//source/cxxhelp/provider/db.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/db.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/db.cxx	2011-11-29 09:56:03.808323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> 
> #include "db.hxx"
> 
>@@ -280,7 +278,7 @@
> 
> 
> Db::Db()
>-{  
>+{
>     db_internal::check_error( db_create(&m_pDBP,0,0),"Db::Db" );
>     m_pDBHelp = NULL;
> }
>@@ -302,14 +300,14 @@
> {
>     int error = m_pDBP->close(m_pDBP,flags);
>     m_pDBP = 0;
>-    return db_internal::check_error(error,"Db::close"); 
>+    return db_internal::check_error(error,"Db::close");
> }
> 
>-int Db::open(DB_TXN *txnid, 
>+int Db::open(DB_TXN *txnid,
>              const char *file,
>-             const char *database, 
>-             DBTYPE type, 
>-             u_int32_t flags, 
>+             const char *database,
>+             DBTYPE type,
>+             u_int32_t flags,
>              int mode)
> {
>     int err = m_pDBP->open(m_pDBP,txnid,file,database,type,flags,mode);
>@@ -318,8 +316,8 @@
> 
> int Db::open(DB_TXN *txnid,
>              ::rtl::OUString const & fileURL,
>-             DBTYPE type, 
>-             u_int32_t flags, 
>+             DBTYPE type,
>+             u_int32_t flags,
>              int mode)
> {
>     ::rtl::OUString ouPath;
>@@ -329,13 +327,13 @@
> }
> 
> 
>-    
>+
> int Db::get(DB_TXN *txnid, Dbt *key, Dbt *data, u_int32_t flags)
> {
>     int err = m_pDBP->get(m_pDBP,txnid,key,data,flags);
> 
>     // these are non-exceptional outcomes
>-    if (err != DB_NOTFOUND && err != DB_KEYEMPTY) 
>+    if (err != DB_NOTFOUND && err != DB_KEYEMPTY)
>         db_internal::check_error( err,"Db::get" );
> 
>     return err;
>@@ -345,7 +343,7 @@
> {
>     DBC * dbc = 0;
>     int error = m_pDBP->cursor(m_pDBP,txnid,&dbc,flags);
>-  
>+
>     if (!db_internal::check_error(error,"Db::cursor"))
>         *cursorp = new Dbc(dbc);
> 
>@@ -359,7 +357,7 @@
> {
> }
> 
>-Dbc::~Dbc() 
>+Dbc::~Dbc()
> {
> }
> 
>@@ -375,7 +373,7 @@
>     int err = m_pDBC->c_get(m_pDBC,key,data,flags);
> 
>     // these are non-exceptional outcomes
>-    if (err != DB_NOTFOUND && err != DB_KEYEMPTY) 
>+    if (err != DB_NOTFOUND && err != DB_KEYEMPTY)
>         db_internal::check_error( err, "Dbcursor::get" );
> 
>     return err;
>@@ -385,7 +383,7 @@
> 
> 
> Dbt::Dbt()
>-{  
>+{
>     using namespace std;
>     DBT * thispod = this;
>     memset(thispod, 0, sizeof *thispod);
>@@ -401,12 +399,12 @@
>     this->set_size(size_arg);
> }
> 
>-Dbt::~Dbt() 
>+Dbt::~Dbt()
> {
> }
> 
> void * Dbt::get_data() const
>-{ 
>+{
>     return this->data;
> }
> 
>@@ -416,17 +414,17 @@
> }
> 
> u_int32_t Dbt::get_size() const
>-{ 
>+{
>     return this->size;
> }
> 
> void Dbt::set_size(u_int32_t value)
> {
>-    this->size = value; 
>+    this->size = value;
> }
> 
> void Dbt::set_flags(u_int32_t value)
>-{ 
>+{
>     this->flags = value;
> }
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/db.hxx xmlhelp//source/cxxhelp/provider/db.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/db.hxx	2011-05-20 18:06:00.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/db.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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
>@@ -39,10 +39,10 @@
> #include <boost/unordered_map.hpp>
> #include <rtl/string.hxx>
> 
>-extern "C" { 
>-  typedef void *(*db_malloc_fcn_type)(size_t); 
>-  typedef void *(*db_realloc_fcn_type)(void *, size_t); 
>-  typedef void (*db_free_fcn_type)(void *); 
>+extern "C" {
>+  typedef void *(*db_malloc_fcn_type)(size_t);
>+  typedef void *(*db_realloc_fcn_type)(void *, size_t);
>+  typedef void (*db_free_fcn_type)(void *);
> }
> 
> 
>@@ -63,19 +63,19 @@
>             ~Noncopyable() {}
>         };
>     }
>-    
>-    class DbException 
>+
>+    class DbException
>     {
>         rtl::OString what_;
>     public:
>-        explicit DbException(rtl::OString const & whatparam) 
>+        explicit DbException(rtl::OString const & whatparam)
>         : what_(whatparam)
>         {}
>-        
>+
>         const char *what() const
>         { return what_.getStr(); }
>     };
>-  
>+
>     struct eq
>     {
>         bool operator()( const rtl::OString& rKey1, const rtl::OString& rKey2 ) const
>@@ -91,10 +91,10 @@
> 
>     class DBData
>     {
>-        friend class		DBHelp;
>+        friend class        DBHelp;
> 
>-        int					m_nSize;
>-        char*				m_pBuffer;
>+        int                 m_nSize;
>+        char*               m_pBuffer;
> 
>         void copyToBuffer( const char* pSrcData, int nSize );
> 
>@@ -112,22 +112,22 @@
>             { return m_pBuffer; }
>     };
> 
>-    typedef boost::unordered_map< rtl::OString,std::pair<int,int>,ha,eq >	StringToValPosMap;
>-    typedef boost::unordered_map< rtl::OString,rtl::OString,ha,eq >		StringToDataMap;
>+    typedef boost::unordered_map< rtl::OString,std::pair<int,int>,ha,eq >   StringToValPosMap;
>+    typedef boost::unordered_map< rtl::OString,rtl::OString,ha,eq >     StringToDataMap;
> 
>     class DBHelp
>     {
>-        rtl::OUString		m_aFileURL;
>-        StringToDataMap*	m_pStringToDataMap;
>-        StringToValPosMap*	m_pStringToValPosMap;
>+        rtl::OUString       m_aFileURL;
>+        StringToDataMap*    m_pStringToDataMap;
>+        StringToValPosMap*  m_pStringToValPosMap;
>         com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess >
>                             m_xSFA;
> 
>         com::sun::star::uno::Sequence< sal_Int8 >
>                             m_aItData;
>-        const char*			m_pItData;
>-        int					m_nItRead;
>-        int					m_iItPos;
>+        const char*         m_pItData;
>+        int                 m_nItRead;
>+        int                 m_iItPos;
> 
>         bool implReadLenAndData( const char* pData, int& riPos, DBData& rValue );
> 
>@@ -160,12 +160,12 @@
>         void stopIteration( void );
>     };
> 
>-    class Db : db_internal::Noncopyable 
>-    {	
>-    private:	
>+    class Db : db_internal::Noncopyable
>+    {
>+    private:
>         DB* m_pDBP;
>         DBHelp* m_pDBHelp;
>-    
>+
>     public:
>         Db();
>         ~Db();
>@@ -179,55 +179,55 @@
> 
>         int open(DB_TXN *txnid,
>                  const char *file,
>-                 const char *database, 
>-                 DBTYPE type, 
>-                 u_int32_t flags, 
>+                 const char *database,
>+                 DBTYPE type,
>+                 u_int32_t flags,
>                  int mode);
> 
>         int open(DB_TXN *txnid,
>                  ::rtl::OUString const & fileURL,
>-                 DBTYPE type, 
>-                 u_int32_t flags, 
>+                 DBTYPE type,
>+                 u_int32_t flags,
>                  int mode);
> 
>-    
>+
>         int get(DB_TXN* txnid, Dbt *key, Dbt *data, u_int32_t flags);
>-    
>+
>         int cursor(DB_TXN *txnid, Dbc **cursorp, u_int32_t flags);
>     };
>-  
>-    class Dbc : db_internal::Noncopyable 
>-    {	
>+
>+    class Dbc : db_internal::Noncopyable
>+    {
>         friend class Db;
>         friend class Dbt;
> 
>-    private:	
>+    private:
>         DBC* m_pDBC;
>-    
>+
>         explicit Dbc(DBC* pDBC);
>         ~Dbc();
>-    
>+
>     public:
>         int close();
>-    
>+
>         int get(Dbt *key, Dbt *data, u_int32_t flags);
>     };
>-  
>-    class Dbt: private DBT 
>-    {	
>+
>+    class Dbt: private DBT
>+    {
>         friend class Db;
>         friend class Dbc;
>-    
>+
>     public:
>-        Dbt(void *data_arg, u_int32_t size_arg); 
>-    
>-        Dbt(); 
>-    
>+        Dbt(void *data_arg, u_int32_t size_arg);
>+
>+        Dbt();
>+
>         ~Dbt();
> 
>           void *get_data() const;
>         void set_data(void *value);
>-    
>+
>           u_int32_t get_size() const;
>         void set_size(u_int32_t value);
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/inputstream.cxx xmlhelp//source/cxxhelp/provider/inputstream.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/inputstream.cxx	2011-05-20 18:06:00.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/inputstream.cxx	2011-11-29 09:56:03.808323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -27,8 +27,6 @@
>  ************************************************************************/
> 
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> #include "inputstream.hxx"
> 
> 
>@@ -100,11 +98,11 @@
> {
>     if( ! m_bIsOpen )
>         throw io::IOException();
>-    
>+
>     aData.realloc(nBytesToRead);
>     //TODO! translate memory exhaustion (if it were detectable...) into
>     // io::BufferSizeExceededException
>-    
>+
>     sal_uInt64 nrc;
>     m_aFile.read( aData.getArray(),sal_uInt64(nBytesToRead),nrc );
> 
>@@ -137,7 +135,11 @@
>            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 @@
> {
>     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();
> }
> 
>@@ -201,14 +203,14 @@
>     throw( io::IOException,
>            uno::RuntimeException )
> {
>-    osl::FileBase::RC	err;
>-    sal_uInt64			uCurrentPos, uEndPos;
>+    osl::FileBase::RC   err;
>+    sal_uInt64          uCurrentPos, uEndPos;
> 
>     err = m_aFile.getPos( uCurrentPos );
>     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 @@
>     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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/inputstream.hxx xmlhelp//source/cxxhelp/provider/inputstream.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/inputstream.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/inputstream.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -41,34 +41,34 @@
> namespace chelp {
> 
>     // forward declaration
>-    
>+
>     class XInputStream_impl
>         : public cppu::OWeakObject,
>           public com::sun::star::io::XInputStream,
>           public com::sun::star::io::XSeekable
>     {
>     public:
>-        
>+
>         XInputStream_impl( const rtl::OUString& aUncPath );
>-        
>+
>         virtual ~XInputStream_impl();
>-        
>+
>         /**
>          *  Returns an error code as given by filerror.hxx
>          */
>-        
>+
>         bool SAL_CALL CtorSuccess();
>-        
>+
>         virtual com::sun::star::uno::Any SAL_CALL
>         queryInterface(
>             const com::sun::star::uno::Type& rType )
>             throw( com::sun::star::uno::RuntimeException);
>-        
>+
>         virtual void SAL_CALL
>         acquire(
>             void )
>             throw();
>-        
>+
>         virtual void SAL_CALL
>         release(
>             void )
>@@ -135,10 +135,10 @@
> 
>     private:
> 
>-        bool                                               m_bIsOpen;		
>+        bool                                               m_bIsOpen;
>         osl::File                                          m_aFile;
>     };
>-    
>+
> 
> } // end namespace XInputStream_impl
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/makefile.mk xmlhelp//source/cxxhelp/provider/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/makefile.mk	2011-05-20 18:06:00.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/makefile.mk	2012-02-24 13:39:00.670662388 +0100
>@@ -52,9 +52,7 @@
> 
> 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 +69,10 @@
> .ENDIF
> 
> .IF "$(GUI)"=="WNT"
>+.IF "$(COM)"=="MSC"
> CFLAGS+=-GR
> .ENDIF
>+.ENDIF
> 
> # --- General -----------------------------------------------------
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/provider.cxx xmlhelp//source/cxxhelp/provider/provider.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/provider.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/provider.cxx	2012-02-24 13:39:00.670662388 +0100
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> 
> /**************************************************************************
>                                 TODO
>@@ -301,15 +299,6 @@
>     {
>     }
> 
>-    /**
>-     *  now determing
>-     *  productname,
>-     *  productversion,
>-     */
>-
>-    rtl::OUString productname;
>-    ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= productname;
>-
>     xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" );
> 
>     rtl::OUString setupversion(
>@@ -347,13 +336,13 @@
>         setupextension );
> 
>     uno::Sequence< rtl::OUString > aImagesZipPaths( 2 );
>-    xHierAccess = getHierAccess( sProvider,	 "org.openoffice.Office.Common" );
>+    xHierAccess = getHierAccess( sProvider,  "org.openoffice.Office.Common" );
> 
>     rtl::OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) );
>     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 @@
>     m_pDatabases = new Databases( showBasic,
>                                   instPath,
>                                   aImagesZipPaths,
>-                                  productname,
>+                                  utl::ConfigManager::getProductName(),
>                                   productversion,
>                                   stylesheet,
>                                   xContext );
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/provider.hxx xmlhelp//source/cxxhelp/provider/provider.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/provider.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/provider.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -47,34 +47,34 @@
> 
> //#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME         "com.sun.star.ucb.CHelpContentProvider"
> #define MYUCP_CONTENT_PROVIDER_SERVICE_NAME1   "com.sun.star.help.XMLHelp"
>-#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH1	25
>+#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH1 25
> 
> #define MYUCP_CONTENT_PROVIDER_SERVICE_NAME2  "com.sun.star.ucb.HelpContentProvider"
>-#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH2	36
>+#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH2 36
> 
> // URL scheme. This is the scheme the provider will be able to create
> // contents for. The UCB will select the provider ( i.e. in order to create
> // contents ) according to this scheme.
> 
> #define MYUCP_URL_SCHEME        "vnd.sun.star.help"
>-#define MYUCP_URL_SCHEME_LENGTH	18
>+#define MYUCP_URL_SCHEME_LENGTH 18
> #define MYUCP_CONTENT_TYPE      "application/vnd.sun.star.xmlhelp"    // UCB Content Type.
> 
> //=========================================================================
> 
>-    
>+
>     class Databases;
> 
>-    
>+
>     class ContentProvider :
>         public ::ucbhelper::ContentProviderImplHelper,
>         public ::com::sun::star::container::XContainerListener,
>         public ::com::sun::star::lang::XComponent
>     {
>     public:
>-        ContentProvider( 
>+        ContentProvider(
>             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMgr );
>-        
>+
>         virtual ~ContentProvider();
> 
>         // XInterface
>@@ -97,29 +97,29 @@
>         //////////////////////////////////////////////////////////////////////
>         // Additional interfaces
>         //////////////////////////////////////////////////////////////////////
>-        
>+
>         // XComponent
> 
>         virtual void SAL_CALL
>-        dispose(  ) 
>+        dispose(  )
>             throw (::com::sun::star::uno::RuntimeException);
>-        
>+
>         virtual void SAL_CALL
>-        addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) 
>-            throw (::com::sun::star::uno::RuntimeException) 
>+        addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
>+            throw (::com::sun::star::uno::RuntimeException)
>         {
>             (void)xListener;
>         }
>-        
>+
>         virtual void SAL_CALL
>-        removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) 
>-            throw (::com::sun::star::uno::RuntimeException) 
>+        removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
>+            throw (::com::sun::star::uno::RuntimeException)
>         {
>             (void)aListener;
>         }
> 
>         // XConainerListener ( deriver from XEventListener )
>-        
>+
>         virtual void SAL_CALL
>         disposing( const ::com::sun::star::lang::EventObject& Source )
>             throw (::com::sun::star::uno::RuntimeException)
>@@ -130,7 +130,7 @@
> 
>         virtual void SAL_CALL
>         elementInserted( const ::com::sun::star::container::ContainerEvent& Event )
>-            throw (::com::sun::star::uno::RuntimeException) 
>+            throw (::com::sun::star::uno::RuntimeException)
>         {
>             (void)Event;
>         }
>@@ -143,16 +143,16 @@
>         }
> 
>         virtual void SAL_CALL
>-        elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) 
>+        elementReplaced( const ::com::sun::star::container::ContainerEvent& Event )
>             throw (::com::sun::star::uno::RuntimeException);
> 
>-                
>+
>         //////////////////////////////////////////////////////////////////////
>         // Non-interface methods.
>         //////////////////////////////////////////////////////////////////////
> 
>     private:
>-        
>+
>         osl::Mutex     m_aMutex;
>         bool           isInitialized;
>         rtl::OUString  m_aScheme;
>@@ -160,26 +160,26 @@
>         com::sun::star::uno::Reference<com::sun::star::container::XContainer> m_xContainer;
> 
>         // private methods
>-        
>+
>         void init();
>-        
>+
>         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
>-        getConfiguration() const;		
>-        
>+        getConfiguration() const;
>+
>         ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >
>         getHierAccess( const ::com::sun::star::uno::Reference<  ::com::sun::star::lang::XMultiServiceFactory >& sProvider,
>                        const char* file ) const;
>-        
>+
>         ::rtl::OUString
>         getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
>                 const char* key ) const;
>-      
>+
>       sal_Bool
>       getBooleanKey(
>-                    const ::com::sun::star::uno::Reference< 
>+                    const ::com::sun::star::uno::Reference<
>                     ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
>                     const char* key) const;
>-      
>+
>       void subst( rtl::OUString& instpath ) const;
>     };
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetbase.cxx xmlhelp//source/cxxhelp/provider/resultsetbase.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetbase.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/resultsetbase.cxx	2012-02-24 13:39:00.670662388 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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>
>@@ -115,11 +113,11 @@
>     throw( uno::RuntimeException )
> {
>     osl::MutexGuard aGuard( m_aMutex );
>-    
>+
>     if ( ! m_pDisposeEventListeners )
>         m_pDisposeEventListeners =
>             new cppu::OInterfaceContainerHelper( m_aMutex );
>-    
>+
>     m_pDisposeEventListeners->addInterface( Listener );
> }
> 
>@@ -291,7 +289,7 @@
>         if( m_nRow < -1 )
>             m_nRow = -1;
>     }
>-    
>+
>     return 0<= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size();
> }
> 
>@@ -306,14 +304,14 @@
> {
>     if( isAfterLast() || isBeforeFirst() )
>         throw sdbc::SQLException();
>-    
>+
>     if( row > 0 )
>         while( row-- )
>             next();
>     else if( row < 0 )
>         while( row++ && m_nRow > -1 )
>             previous();
>-    
>+
>     return 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size();
> }
> 
>@@ -413,11 +411,11 @@
>     {
>         rtl::OUString url = queryContentIdentifierString();
>         if( ! m_aIdents[m_nRow].is() && url.getLength() )
>-            m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >( 
>+            m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >(
>                 new ::ucbhelper::ContentIdentifier( m_xMSF,url ) );
>         return m_aIdents[m_nRow];
>     }
>-    
>+
>     return uno::Reference< ucb::XContentIdentifier >();
> }
> 
>@@ -440,39 +438,39 @@
>       public beans::XPropertySetInfo
> {
> public:
>-    
>+
>     XPropertySetInfoImpl( const uno::Sequence< beans::Property >& aSeq )
>         : m_aSeq( aSeq )
>     {
>     }
>-    
>+
>     void SAL_CALL acquire( void )
>         throw()
>     {
>         OWeakObject::acquire();
>     }
> 
>-    
>+
>     void SAL_CALL release( void )
>         throw()
>     {
>         OWeakObject::release();
>     }
>-    
>+
>     uno::Any SAL_CALL queryInterface( const uno::Type& rType )
>         throw( uno::RuntimeException )
>     {
>         uno::Any aRet = cppu::queryInterface( rType,
>                                               SAL_STATIC_CAST( beans::XPropertySetInfo*, this ) );
>         return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
>-    }    
>-    
>+    }
>+
>     uno::Sequence< beans::Property > SAL_CALL getProperties()
>         throw( uno::RuntimeException )
>     {
>         return m_aSeq;
>     }
>-    
>+
>     beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName )
>         throw( beans::UnknownPropertyException,
>                uno::RuntimeException)
>@@ -482,7 +480,7 @@
>                 return m_aSeq[i];
>         throw beans::UnknownPropertyException();
>     }
>-    
>+
>     sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name )
>         throw( uno::RuntimeException )
>     {
>@@ -493,7 +491,7 @@
>     }
> 
> private:
>-    
>+
>     uno::Sequence< beans::Property > m_aSeq;
> };
> 
>@@ -509,7 +507,7 @@
>     seq[0].Handle = -1;
>     seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
>     seq[0].Attributes = beans::PropertyAttribute::READONLY;
>-    
>+
>     seq[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" ));
>     seq[1].Handle = -1;
>     seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) );
>@@ -534,7 +532,7 @@
>     if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) ||
>         aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) )
>         return;
>-    
>+
>     throw beans::UnknownPropertyException();
> }
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetbase.hxx xmlhelp//source/cxxhelp/provider/resultsetbase.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetbase.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/resultsetbase.hxx	2012-02-24 13:39:00.670662388 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -49,7 +49,7 @@
> 
> 
> namespace chelp {
>-    
>+
>     class ResultSetBase
>         : public cppu::OWeakObject,
>           public com::sun::star::lang::XComponent,
>@@ -61,26 +61,26 @@
>           public com::sun::star::ucb::XContentAccess
>     {
>     public:
>-        
>+
>         ResultSetBase( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&  xMSF,
>                        const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >&  xProvider,
>                        sal_Int32 nOpenMode,
>                        const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
>                        const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort );
>-        
>+
>         virtual ~ResultSetBase();
>-        
>+
>         // XInterface
>         virtual com::sun::star::uno::Any SAL_CALL
>         queryInterface(
>             const com::sun::star::uno::Type& aType )
>             throw( com::sun::star::uno::RuntimeException);
>-        
>+
>         virtual void SAL_CALL
>         acquire(
>             void )
>             throw();
>-        
>+
>         virtual void SAL_CALL
>         release(
>             void )
>@@ -139,7 +139,7 @@
>             else
>                 return false;
>         }
>-        
>+
>         virtual sal_Int8 SAL_CALL
>         getByte(
>             sal_Int32 columnIndex )
>@@ -457,7 +457,7 @@
>             void  )
>             throw( com::sun::star::sdbc::SQLException,
>                    com::sun::star::uno::RuntimeException);
>-        
>+
>         // XCloseable
> 
>         virtual void SAL_CALL
>@@ -555,11 +555,11 @@
>         typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet;
>         typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > >              ItemSet;
>         typedef std::vector< rtl::OUString >                                                             PathSet;
>-        
>+
>         IdentSet                            m_aIdents;
>         ItemSet                             m_aItems;
>         PathSet                             m_aPath;
>-        
>+
>         com::sun::star::uno::Sequence< com::sun::star::beans::Property >           m_sProperty;
>         com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >  m_sSortingInfo;
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultset.cxx xmlhelp//source/cxxhelp/provider/resultset.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultset.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/resultset.cxx	2011-11-29 09:56:03.809323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetfactory.hxx xmlhelp//source/cxxhelp/provider/resultsetfactory.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetfactory.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/resultsetfactory.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -13,9 +13,9 @@
>     class ResultSetFactory
>     {
>     public:
>-        
>+
>         virtual ~ResultSetFactory() { };
>-        
>+
>         virtual ResultSetBase* createResultSet() = 0;
>     };
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetforquery.cxx xmlhelp//source/cxxhelp/provider/resultsetforquery.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetforquery.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/resultsetforquery.cxx	2012-02-24 13:39:00.670662388 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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>
>@@ -61,10 +59,10 @@
> 
> struct HitItem
> {
>-    rtl::OUString	m_aURL;
>-    float			m_fScore;
>+    rtl::OUString   m_aURL;
>+    float           m_fScore;
> 
>-    HitItem( void )	{}
>+    HitItem( void ) {}
>     HitItem( const rtl::OUString& aURL, float fScore )
>         : m_aURL( aURL )
>         , m_fScore( fScore )
>@@ -86,7 +84,7 @@
>       m_pDatabases( pDatabases ),
>       m_aURLParameter( aURLParameter )
> {
>-    Reference< XTransliteration > xTrans( 
>+    Reference< XTransliteration > xTrans(
>         xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Transliteration" )) ),
>         UNO_QUERY );
>     Locale aLocale( aURLParameter.get_language(),
>@@ -97,10 +95,10 @@
>                            aLocale );
> 
>     // Access Lucene via XInvocation
>-    Reference< script::XInvocation > xInvocation( 
>+    Reference< script::XInvocation > xInvocation(
>         xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.HelpSearch" )) ),
>         UNO_QUERY );
>-    
>+
>     vector< vector< rtl::OUString > > queryList;
>     {
>         sal_Int32 idx;
>@@ -110,10 +108,10 @@
>             idx = query.indexOf( sal_Unicode( ' ' ) );
>             if( idx == -1 )
>                 idx = query.getLength();
>-            
>+
>             vector< rtl::OUString > currentQuery;
>             rtl::OUString tmp(query.copy( 0,idx ));
>-            rtl:: OUString toliterate = tmp;            
>+            rtl:: OUString toliterate = tmp;
>             if(xTrans.is()) {
>                 Sequence<sal_Int32> aSeq;
>                 toliterate = xTrans->transliterate(
>@@ -146,7 +144,7 @@
> 
>         bool bTemporary;
>         while( (idxDir = aIndexFolderIt.nextIndexFolder( bExtension, bTemporary )).getLength() > 0 )
>-        {	
>+        {
>             vector<HitItem> aIndexFolderResultVector;
> 
>             try
>@@ -177,7 +175,7 @@
> 
>                     aParamsSeq[0] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-lang" )) );
>                     aParamsSeq[1] = uno::makeAny( m_aURLParameter.get_language() );
>-                    
>+
>                     aParamsSeq[2] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-index" )) );
>                     rtl::OUString aSystemPath;
>                     osl::FileBase::getSystemPathFromFileURL( idxDir, aSystemPath );
>@@ -265,7 +263,7 @@
>                             if( (it = aResultSet.find( rItem.m_aURL )) != aResultSet.end() )
>                             {
>                                 HitItem aItemCopy( rItem );
>-                                aItemCopy.m_fScore /= nQueryListSize;	// To get average score
>+                                aItemCopy.m_fScore /= nQueryListSize;   // To get average score
>                                 if( n == 0 )
>                                 {
>                                     // Use first pass to create entry
>@@ -307,7 +305,7 @@
>             if( bTemporary )
>                 aIndexFolderIt.deleteTempIndexFolder( idxDir );
> 
>-        }	// Iterator
>+        }   // Iterator
> 
> 
>         int nVectorCount = aIndexFolderResultVectorVector.size();
>@@ -336,7 +334,7 @@
>                 }
>             }
> 
>-            if( iVectorWithBestScore == -1 )	// No item left at all
>+            if( iVectorWithBestScore == -1 )    // No item left at all
>                 break;
> 
>             vector<HitItem>& rIndexFolderVector = *aIndexFolderResultVectorVector[iVectorWithBestScore];
>@@ -358,7 +356,7 @@
> 
>     sal_Int32 replIdx = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" )).getLength();
>     rtl::OUString replWith = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ));
>-    
>+
>     int nResultCount = aCompleteResultVector.size();
>     for( int r = 0 ; r < nResultCount ; ++r )
>     {
>@@ -369,14 +367,14 @@
> 
>     m_aItems.resize( m_aPath.size() );
>     m_aIdents.resize( m_aPath.size() );
>-    
>+
>     Command aCommand;
>     aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ));
>     aCommand.Argument <<= m_sProperty;
>-    
>+
>     for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow )
>     {
>-        m_aPath[m_nRow] = 
>+        m_aPath[m_nRow] =
>             m_aPath[m_nRow]                                          +
>             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" ))           +
>             m_aURLParameter.get_language()                           +
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetforquery.hxx xmlhelp//source/cxxhelp/provider/resultsetforquery.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetforquery.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/resultsetforquery.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -37,14 +37,14 @@
> #include "urlparameter.hxx"
> 
> namespace chelp {
>-    
>+
>     class Databases;
>-    
>+
>     class ResultSetForQuery
>         : public ResultSetBase
>     {
>     public:
>-        
>+
>         ResultSetForQuery( const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>&  xMSF,
>                            const com::sun::star::uno::Reference<com::sun::star::ucb::XContentProvider>&  xProvider,
>                            sal_Int32 nOpenMode,
>@@ -52,10 +52,10 @@
>                            const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort,
>                            URLParameter& aURLParameter,
>                            Databases* pDatabases );
>-        
>-        
>+
>+
>     private:
>-        
>+
>         Databases*   m_pDatabases;
>         URLParameter m_aURLParameter;
>     };
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetforroot.cxx xmlhelp//source/cxxhelp/provider/resultsetforroot.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetforroot.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/resultsetforroot.cxx	2011-11-29 09:56:03.809323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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>
>@@ -55,23 +53,23 @@
>     m_aPath = m_pDatabases->getModuleList( m_aURLParameter.get_language() );
>     m_aItems.resize( m_aPath.size() );
>     m_aIdents.resize( m_aPath.size() );
>-    
>+
>     Command aCommand;
>     aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ));
>     aCommand.Argument <<= m_sProperty;
>-    
>+
>     for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
>     {
>-        m_aPath[i] = 
>+        m_aPath[i] =
>             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" )) +
>             m_aPath[i]                                               +
>             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" ))           +
>             m_aURLParameter.get_language()                           +
>             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" ))             +
>             m_aURLParameter.get_system();
>-        
>+
>         m_nRow = sal_Int32( i );
>-        
>+
>         uno::Reference< XContent > content = queryContent();
>         if( content.is() )
>         {
>@@ -79,7 +77,7 @@
>             cmd->execute( aCommand,0,uno::Reference< XCommandEnvironment >( 0 ) ) >>= m_aItems[i]; //TODO: check return value of operator >>=
>         }
>         m_nRow = 0xffffffff;
>-    }		
>+    }
> }
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetforroot.hxx xmlhelp//source/cxxhelp/provider/resultsetforroot.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultsetforroot.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/resultsetforroot.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -44,7 +44,7 @@
>         : public ResultSetBase
>     {
>     public:
>-        
>+
>         ResultSetForRoot( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&  xMSF,
>                           const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >&  xProvider,
>                           sal_Int32 nOpenMode,
>@@ -52,10 +52,10 @@
>                           const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort,
>                           URLParameter& aURLParameter,
>                           Databases* pDatabases );
>-        
>+
> 
>     private:
>-        
>+
>         URLParameter m_aURLParameter;
>         Databases*   m_pDatabases;
>     };
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultset.hxx xmlhelp//source/cxxhelp/provider/resultset.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/resultset.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/resultset.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -44,11 +44,11 @@
>         com::sun::star::uno::Reference<
>         com::sun::star::ucb::XCommandEnvironment > m_xEnv;
>         ResultSetFactory*                    m_pFactory;
>-        
>+
>     private:
>         virtual void initStatic();
>         virtual void initDynamic();
>-        
>+
>     public:
>         DynamicResultSet(
>             const com::sun::star::uno::Reference<
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/services.cxx xmlhelp//source/cxxhelp/provider/services.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/services.cxx	2011-05-20 18:06:00.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/services.cxx	2012-02-24 13:39:00.670662388 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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,16 +35,9 @@
> 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(
>-    const sal_Char * pImplName, 
>-    void * pServiceManager, 
>+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
>+    const sal_Char * pImplName,
>+    void * pServiceManager,
>     void * /*pRegistryKey*/ )
> {
>     void * pRet = 0;
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/urlparameter.cxx xmlhelp//source/cxxhelp/provider/urlparameter.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/urlparameter.cxx	2011-05-20 18:06:00.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/urlparameter.cxx	2012-02-24 13:39:00.670662388 +0100
>@@ -26,8 +26,6 @@
>  *
>  ************************************************************************/
> 
>-// MARKER(update_precomp.py): autogen include statement, do not remove
>-#include "precompiled_xmlhelp.hxx"
> 
> #include "bufferedinputstream.hxx"
> 
>@@ -121,7 +119,7 @@
> rtl::OString URLParameter::getByName( const char* par )
> {
>     rtl::OUString val;
>-    
>+
>     if( strcmp( par,"Program" ) == 0 )
>         val = get_program();
>     else if( strcmp( par,"Database" ) == 0 )
>@@ -138,7 +136,7 @@
>         val = get_system();
>     else if( strcmp( par,"HelpPrefix" ) == 0 )
>         val = get_prefix();
>-    
>+
>     return rtl::OString( val.getStr(),val.getLength(),RTL_TEXTENCODING_UTF8 );
> }
> 
>@@ -152,13 +150,13 @@
>                                                          get_language() );
>         if( inf )
>             m_aId = inf->get_id();
>-        
>+
>         m_bStart = true;
>     }
>-    
>+
>     return m_aId;
> }
>-        
>+
> rtl::OUString URLParameter::get_tag()
> {
>     if( isFile() )
>@@ -208,7 +206,7 @@
>     }
>     return m_aProgram;
> }
>-            
>+
> 
> void URLParameter::init( bool bDefaultLanguageIsInitialized )
> {
>@@ -226,9 +224,9 @@
>     if(m_bUseDB) {
>         if( ! m_bBerkeleyRead )
>             readBerkeley();
>-        
>+
>         m_bBerkeleyRead = true;
>-        
>+
>         return m_aTag;
>     }
>     else
>@@ -243,14 +241,14 @@
>         if( ! m_bBerkeleyRead )
>             readBerkeley();
>         m_bBerkeleyRead = true;
>-        
>+
>         return m_aPath;
>     }
>     else
>         return get_id();
> }
> 
>-    
>+
> 
> rtl::OUString URLParameter::get_the_title()
> {
>@@ -258,7 +256,7 @@
>         if( ! m_bBerkeleyRead )
>             readBerkeley();
>         m_bBerkeleyRead = true;
>-        
>+
>         return m_aTitle;
>     }
>     else
>@@ -272,7 +270,7 @@
>         if( ! m_bBerkeleyRead )
>             readBerkeley();
>         m_bBerkeleyRead = true;
>-        
>+
>         return m_aJar;
>     }
>     else
>@@ -309,7 +307,7 @@
>             break;
> 
>         rtl::OString keyStr( m_aId.getStr(),m_aId.getLength(),RTL_TEXTENCODING_UTF8 );
>-        
>+
>         DBHelp* pDBHelp = db->getDBHelp();
>         if( pDBHelp != NULL )
>         {
>@@ -518,7 +516,7 @@
>         Reference< XHierarchicalNameAccess > xNA =
>             m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )),
>                                    get_language() );
>-        
>+
>         rtl::OUString path = get_path();
>         if( xNA.is() )
>         {
>@@ -544,11 +542,11 @@
> void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierException )
> {
>     m_aExpr = m_aURL;
>-    
>+
>     sal_Int32 lstIdx = m_aExpr.lastIndexOf( sal_Unicode( '#' ) );
>     if( lstIdx != -1 )
>         m_aExpr = m_aExpr.copy( 0,lstIdx );
>-    
>+
>     if( ! scheme() ||
>         ! name( module() ) ||
>         ! query() ||
>@@ -556,7 +554,7 @@
>         ! m_aSystem.getLength() )
>         throw com::sun::star::ucb::IllegalIdentifierException();
> }
>-        
>+
> 
> bool URLParameter::scheme()
> {
>@@ -664,7 +662,7 @@
>             value = query_.copy( equalIdx+1,delimIdx - equalIdx - 1 ).trim();
>             query_ = query_.copy( delimIdx+1 ).trim();
>         }
>-        
>+
>         if( parameter.compareToAscii( "Language" ) == 0 )
>             m_aLanguage = value;
>         else if( parameter.compareToAscii( "Device" ) == 0 )
>@@ -702,12 +700,12 @@
>         else
>             ret = false;
>     }
>-            
>+
>     return ret;
> }
> 
> struct UserData {
>-    
>+
>     UserData( InputStreamTransformer* pTransformer,
>               URLParameter*           pInitial,
>               Databases*              pDatabases )
>@@ -716,7 +714,7 @@
>           m_pInitial( pInitial )
>     {
>     }
>-    
>+
>     InputStreamTransformer*             m_pTransformer;
>     Databases*                          m_pDatabases;
>     URLParameter*                       m_pInitial;
>@@ -785,7 +783,7 @@
>         {
>         }
>     }
>-    
>+
>     if( xInputStream.is() )
>     {
>         return new Reference<XInputStream>(xInputStream);
>@@ -799,7 +797,7 @@
> 
>     URLParameter urlpar( rtl::OUString::createFromAscii( URI ),
>                          ugblData->m_pDatabases );
>-        
>+
>     jar = urlpar.get_jar();
>     language = urlpar.get_language();
>     path = urlpar.get_path();
>@@ -822,7 +820,7 @@
>         {
>         }
>     }
>-    
>+
>     if( xInputStream.is() )
>         return new Reference<XInputStream>(xInputStream);
>     return 0;
>@@ -909,13 +907,13 @@
>     else
>     {
>         UserData userData( this,urlParam,pDatabases );
>-    
>+
>         // Uses the implementation detail, that rtl::OString::getStr returns a zero terminated character-array
>-        
>+
>         const char* parameter[47];
>         rtl::OString parString[46];
>         int last = 0;
>-        
>+
>         parString[last++] = "Program";
>         rtl::OString aPureProgramm( urlParam->getByName( "Program" ) );
>         parString[last++] = rtl::OString('\'') + aPureProgramm + rtl::OString('\'');
>@@ -947,7 +945,7 @@
>         parString[last++] = rtl::OString('\'') + pDatabases->getImagesZipFileURL() + rtl::OString('\'');
>         parString[last++] = "hp";
>         parString[last++] = rtl::OString('\'') + urlParam->getByName( "HelpPrefix" ) + rtl::OString('\'');
>-        
>+
>         if( parString[last-1].getLength() )
>         {
>             parString[last++] = "sm";
>@@ -974,7 +972,7 @@
>             parString[last++] = "vendorshort";
>             parString[last++] = rtl::OString("''");
>         }
>-        
>+
>         // Do we need to add extension path?
>         ::rtl::OUString aExtensionPath;
>         rtl::OUString aJar = urlParam->get_jar();
>@@ -1065,9 +1063,9 @@
>             addToBuffer((const char*)doc_txt_ptr, doc_txt_len);
>             xmlFree(doc_txt_ptr);
>         }
>-        xmlPopInputCallbacks();	//filePatch
>-        xmlPopInputCallbacks();	//helpPatch
>-        xmlPopInputCallbacks();	//zipMatch
>+        xmlPopInputCallbacks(); //filePatch
>+        xmlPopInputCallbacks(); //helpPatch
>+        xmlPopInputCallbacks(); //zipMatch
>         xmlFreeDoc(res);
>         xmlFreeDoc(doc);
>         xsltFreeStylesheet(cur);
>@@ -1086,7 +1084,7 @@
>     Any aRet = ::cppu::queryInterface( rType,
>                                        SAL_STATIC_CAST( XInputStream*,this ),
>                                        SAL_STATIC_CAST( XSeekable*,this ) );
>-    
>+
>     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
> }
> 
>@@ -1179,7 +1177,7 @@
>         throw IllegalArgumentException();
>     else
>         pos = sal::static_int_cast<sal_Int32>( location );
>-    
>+
>     if( pos > len )
>         pos = len;
> }
>@@ -1198,7 +1196,7 @@
> sal_Int64 SAL_CALL InputStreamTransformer::getLength( void ) throw( IOException,RuntimeException )
> {
>     osl::MutexGuard aGuard( m_aMutex );
>-    
>+
>     return len;
> }
> 
>@@ -1206,7 +1204,7 @@
> void InputStreamTransformer::addToBuffer( const char* buffer_,int len_ )
> {
>     osl::MutexGuard aGuard( m_aMutex );
>-    
>+
>     char* tmp = buffer;
>     buffer = new char[ len+len_ ];
>     rtl_copyMemory( (void*)(buffer),(void*)(tmp),sal_uInt32( len ) );
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/urlparameter.hxx xmlhelp//source/cxxhelp/provider/urlparameter.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/provider/urlparameter.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/provider/urlparameter.hxx	2012-02-24 13:39:00.670662388 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -40,20 +40,20 @@
> 
> namespace chelp {
> 
>-    
>+
>     class Databases;
>-    
>+
> 
>     class DbtToStringConverter
>     {
>     public:
>-    
>+
>         DbtToStringConverter( const sal_Char* ptr,sal_Int32 len )
>             : m_len( len ),
>               m_ptr( ptr )
>         {
>         }
>-    
>+
> 
>         rtl::OUString getHash()
>         {
>@@ -67,13 +67,13 @@
>             }
>             return rtl::OUString();
>         }
>-    
>-        
>+
>+
>         rtl::OUString getFile()
>         {
>             if( ! m_ptr )
>                 return rtl::OUString();
>-        
>+
>             sal_Int32 sizeOfFile = ( sal_Int32 ) m_ptr[0];
>             rtl::OUString File( m_ptr+1,sizeOfFile,RTL_TEXTENCODING_UTF8 );
>             sal_Int32 idx;
>@@ -83,22 +83,22 @@
>                 return File;
>         }
> 
>-    
>+
>         rtl::OUString getDatabase()
>         {
>             if( ! m_ptr )
>-                return rtl::OUString();  	
>-        
>+                return rtl::OUString();
>+
>             sal_Int32 sizeOfDatabase = ( int ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ];
>             return rtl::OUString( m_ptr + 2 + ( sal_Int32 ) m_ptr[0],sizeOfDatabase,RTL_TEXTENCODING_UTF8 );
>         }
>-    
>-    
>+
>+
>         rtl::OUString getTitle()
>         {
>             if( ! m_ptr )
>                 return rtl::OUString();
>-            
>+
>             sal_Int32 sizeOfTitle =
>                 ( sal_Int32 ) m_ptr[  2 + m_ptr[0] +  ( sal_Int32 ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ] ];
>             return rtl::OUString( m_ptr + 3 + m_ptr[0] +  ( sal_Int32 ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ],
>@@ -106,26 +106,26 @@
>                                   RTL_TEXTENCODING_UTF8 );
>         }
> 
>-    
>+
>     private:
> 
>         sal_Int32 m_len;
>-    
>+
>         const sal_Char* m_ptr;
> 
>     };
> 
> 
>-    
>-    
>+
>+
>     class URLParameter
>     {
>     public:
>-        
>+
>         URLParameter( const rtl::OUString& aURL,
>-                      Databases* pDatabases ) 
>+                      Databases* pDatabases )
>             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; }
>@@ -134,25 +134,25 @@
>         bool isModule() const { return m_aId.getLength() == 0 && m_aModule.getLength() != 0; }
>         bool isRoot() const { return m_aModule.getLength() == 0; }
>         bool isErrorDocument();
>-        
>+
>         rtl::OUString get_url() const { return m_aURL; }
>-    
>+
>         rtl::OUString get_id();
>-        
>+
>         rtl::OUString get_tag();
> 
>         //  Not called for an directory
>-        
>+
>         rtl::OUString get_path()   { return get_the_path(); }
>-        
>+
>         rtl::OUString get_eid() const   { return m_aEid; }
>-        
>+
>         rtl::OUString get_title();
>-        
>+
>         rtl::OUString get_jar()      { return get_the_jar(); }      // BerkeleyDb
>-        
>+
>         rtl::OUString get_ExtensionRegistryPath() const { return m_aExtensionRegistryPath; }
>-        
>+
>         rtl::OUString get_module() const { return m_aModule; }
> 
>         rtl::OUString get_dbpar() const
>@@ -162,21 +162,21 @@
>             else
>                 return m_aModule;
>         }
>-        
>+
>         rtl::OUString get_prefix() const { return m_aPrefix; }
>-        
>+
>         rtl::OUString get_language();
> 
>         rtl::OUString get_device() const { return m_aDevice; }
> 
>         rtl::OUString get_program();
>-        
>+
>         rtl::OUString get_query() const { return m_aQuery; }
>-    
>+
>         rtl::OUString get_scope() const { return m_aScope; }
>-        
>+
>         rtl::OUString get_system() const { return m_aSystem; }
>-         
>+
>         sal_Int32     get_hitCount() const { return m_nHitCount; }
> 
>         rtl::OString getByName( const char* par );
>@@ -192,7 +192,7 @@
>                    sal_Int32 CommandId,
>                    const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment,
>                    const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xDataSink );
>-        
>+
>     private:
> 
>         Databases* m_pDatabases;
>@@ -200,9 +200,9 @@
>         bool m_bBerkeleyRead;
>         bool m_bStart;
>         bool m_bUseDB;
>-        
>+
>         rtl::OUString  m_aURL;
>-        
>+
>         rtl::OUString  m_aTag;
>         rtl::OUString  m_aId;
>         rtl::OUString  m_aPath;
>@@ -212,51 +212,51 @@
>         rtl::OUString  m_aExtensionRegistryPath;
>         rtl::OUString  m_aEid;
>         rtl::OUString  m_aDbPar;
>-        
>+
>         rtl::OUString  m_aDefaultLanguage;
>         rtl::OUString  m_aLanguage;
>-        
>+
>         rtl::OUString  m_aPrefix;
>         rtl::OUString  m_aDevice;
>         rtl::OUString  m_aProgram;
>         rtl::OUString  m_aSystem;
>         rtl::OUString  m_aActive;
>-        
>+
>         rtl::OUString  m_aQuery;
>         rtl::OUString  m_aScope;
> 
>         rtl::OUString m_aExpr;
>-        
>+
>         sal_Int32      m_nHitCount;                // The default maximum hitcount
> 
> 
>-        // private methods 
>+        // private methods
> 
>         void init( bool bDefaultLanguageIsInitialized );
>-        
>+
>         rtl::OUString get_the_tag();
> 
>         rtl::OUString get_the_path();
>-        
>+
>         rtl::OUString get_the_title();
> 
>         rtl::OUString get_the_jar();
> 
>         void readBerkeley();
>-        
>+
>         void parse() throw( com::sun::star::ucb::IllegalIdentifierException );
>-        
>+
>         bool scheme();
> 
>         bool module();
> 
>         bool name( bool modulePresent );
>-    
>+
>         bool query();
> 
>     };   // end class URLParameter
> 
>-    
>+
> }  // end namespace chelp
> 
> #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/qe/DocGenerator.cxx xmlhelp//source/cxxhelp/qe/DocGenerator.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/qe/DocGenerator.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/qe/DocGenerator.cxx	2011-11-29 09:56:03.809323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/qe/makefile.mk xmlhelp//source/cxxhelp/qe/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/qe/makefile.mk	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/qe/makefile.mk	2011-09-13 16:39:39.213306217 +0200
>@@ -38,8 +38,10 @@
> .INCLUDE :	settings.mk
> 
> .IF "$(GUI)"=="WNT"
>+.IF "$(COM)"=="MSC"
> CFLAGS+=-GR
> .ENDIF
>+.ENDIF
> 
> SLOFILES=$(SLO)$/DocGenerator.obj
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/test/abidebug.hxx xmlhelp//source/cxxhelp/test/abidebug.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/test/abidebug.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/test/abidebug.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/test/searchdemo.cxx xmlhelp//source/cxxhelp/test/searchdemo.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/test/searchdemo.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/test/searchdemo.cxx	2011-11-29 09:56:03.809323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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>
>@@ -57,10 +55,10 @@
>     rtl::OString bluber = rtl::OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 );
>     char* bluberChr = new char[ 1+bluber.getLength() ];
>     const sal_Char* jux = bluber.getStr();
>-  
>+
>     for( int i = 0; i < bluber.getLength(); ++i )
>         bluberChr[i] = jux[i];
>-    
>+
>     bluberChr[ bluber.getLength() ] = 0;
>     printf( "%s\n",bluberChr );
>     delete[] bluberChr;
>@@ -75,27 +73,27 @@
> {
> 
>     QueryResults* queryResults = 0;
>-  
>+
>     try
>     {
>         rtl::OUString installDir(RTL_CONSTASCII_USTRINGPARAM("//./e|/index/"));
>         QueryProcessor queryProcessor( installDir );
>-      
>+
>         std::vector<rtl::OUString> Query(2);
>         Query[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text*" ));
>         Query[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "abbildung" ));
>         rtl::OUString Scope = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "headingheading" ));
>         int HitCount = 40;
>-      
>+
>          QueryStatement queryStatement( HitCount,Query,Scope );
>         queryResults = queryProcessor.processQuery( queryStatement );
>-      
>+
>         rtl::OUString translations[2];
>         translations[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" ));
>         translations[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ));
>-      
>+
>         PrefixTranslator* translator =  PrefixTranslator::makePrefixTranslator( translations,2 );
>-        
>+
>         QueryHitIterator* it = queryResults->makeQueryHitIterator();
>         sal_Int32 j = 0;
>         while( j < 10 && it->next() )
>@@ -106,7 +104,7 @@
>             print_rtl_OUString( qhd->getDocument() );
>             ++j;
>         }
>-      
>+
>         delete it;
>     }
>     catch( ... )
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/util/Decompressor.cxx xmlhelp//source/cxxhelp/util/Decompressor.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/util/Decompressor.cxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/util/Decompressor.cxx	2011-11-29 09:56:03.809323878 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/util/makefile.mk xmlhelp//source/cxxhelp/util/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/cxxhelp/util/makefile.mk	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/cxxhelp/util/makefile.mk	2011-09-13 16:39:39.213306217 +0200
>@@ -38,8 +38,10 @@
> .INCLUDE :	settings.mk
> 
> .IF "$(GUI)"=="WNT"
>+.IF "$(COM)"=="MSC"
> CFLAGS+=-GR
> .ENDIF
>+.ENDIF
> 
> SLOFILES=\
>         $(SLO)$/Decompressor.obj
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/treeview/tvfactory.cxx xmlhelp//source/treeview/tvfactory.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/treeview/tvfactory.cxx	2011-05-20 18:06:00.000000000 +0200
>+++ xmlhelp//source/treeview/tvfactory.cxx	2012-02-24 13:39:00.671662388 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -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>
>@@ -87,7 +85,7 @@
>                                      SAL_STATIC_CAST( XServiceInfo*,  this ),
>                                      SAL_STATIC_CAST( XTypeProvider*, this ),
>                                      SAL_STATIC_CAST( XMultiServiceFactory*, this ) );
>-    
>+
>     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
> }
> 
>@@ -135,7 +133,7 @@
> 
> 
> 
>-// XMultiServiceFactory 
>+// XMultiServiceFactory
> 
> Reference< XInterface > SAL_CALL
> TVFactory::createInstance(
>@@ -151,7 +149,7 @@
>         -1,
>         aAny,
>         PropertyState_DIRECT_VALUE );
>-    
>+
>     return createInstanceWithArguments( aServiceSpecifier,
>                                         seq );
> }
>@@ -171,25 +169,25 @@
>         cppu::OWeakObject* p = new TVChildTarget( m_xMSF );
>         m_xHDS = Reference< XInterface >( p );
>     }
>-    
>+
>     Reference< XInterface > ret = m_xHDS;
>-    
>+
>     rtl::OUString hierview;
>     for( int i = 0; i < Arguments.getLength(); ++i )
>     {
>         PropertyValue pV;
>         if( ! ( Arguments[i] >>= pV ) )
>             continue;
>-        
>+
>         if( pV.Name.compareToAscii( "nodepath" ) )
>             continue;
>-        
>+
>         if( ! ( pV.Value >>= hierview ) )
>             continue;
>-        
>+
>         break;
>     }
>-    
>+
>     if( hierview.getLength() )
>     {
>         Reference< XHierarchicalNameAccess > xhieraccess( m_xHDS,UNO_QUERY );
>@@ -257,44 +255,35 @@
> }
> 
> //=========================================================================
>-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;
> 
>     void * pRet = 0;
>-    
>+
>     Reference< XMultiServiceFactory > xSMgr(
>         reinterpret_cast< XMultiServiceFactory * >( pServiceManager ) );
>-    
>+
>     Reference< XSingleServiceFactory > xFactory;
>-    
>+
>     //////////////////////////////////////////////////////////////////////
>     // File Content Provider.
>     //////////////////////////////////////////////////////////////////////
>-    
>+
>     if ( TVFactory::getImplementationName_static().compareToAscii( pImplName ) == 0 )
>     {
>         xFactory = TVFactory::createServiceFactory( xSMgr );
>     }
> 
>     //////////////////////////////////////////////////////////////////////
>-    
>+
>     if ( xFactory.is() )
>     {
>         xFactory->acquire();
>         pRet = xFactory.get();
>     }
>-    
>+
>     return pRet;
> }
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/treeview/tvfactory.hxx xmlhelp//source/treeview/tvfactory.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/treeview/tvfactory.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/treeview/tvfactory.hxx	2011-09-13 16:39:39.213306217 +0200
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -41,7 +41,7 @@
> 
> 
> namespace treeview {
>-    
>+
>     class TVFactory:
>         public cppu::OWeakObject,
>         public com::sun::star::lang::XServiceInfo,
>@@ -49,85 +49,85 @@
>         public com::sun::star::lang::XMultiServiceFactory
>     {
>     public:
>-        
>+
>         TVFactory( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF );
> 
>         ~TVFactory();
>-        
>+
>         // XInterface
>         virtual com::sun::star::uno::Any SAL_CALL
>-        queryInterface( 
>-            const com::sun::star::uno::Type& aType ) 
>+        queryInterface(
>+            const com::sun::star::uno::Type& aType )
>             throw( com::sun::star::uno::RuntimeException);
>-                    
>-        virtual void SAL_CALL 
>-        acquire( 
>-            void ) 
>+
>+        virtual void SAL_CALL
>+        acquire(
>+            void )
>             throw();
>-        
>+
>         virtual void SAL_CALL
>         release(
>-            void ) 
>+            void )
>             throw();
>-        
>-        
>+
>+
>         // XTypeProvider
>-        
>+
>         XTYPEPROVIDER_DECL()
> 
> 
>         // XServiceInfo
>         virtual rtl::OUString SAL_CALL
>-        getImplementationName(  
>-            void ) 
>+        getImplementationName(
>+            void )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual sal_Bool SAL_CALL
>-        supportsService( 
>+        supportsService(
>             const rtl::OUString& ServiceName )
>             throw(com::sun::star::uno::RuntimeException );
>-      
>+
>         virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
>-        getSupportedServiceNames( 
>-            void ) 
>+        getSupportedServiceNames(
>+            void )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>-        // XMultiServiceFactory 
>-        
>+
>+        // XMultiServiceFactory
>+
>         virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
>         createInstance(
>             const rtl::OUString& aServiceSpecifier )
>             throw( com::sun::star::uno::Exception,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
>         createInstanceWithArguments(
>             const rtl::OUString& ServiceSpecifier,
>             const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& Arguments )
>             throw( com::sun::star::uno::Exception,
>                    com::sun::star::uno::RuntimeException);
>-        
>+
>         virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
>         getAvailableServiceNames( )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>+
>         // Other
>-        
>+
>         static rtl::OUString SAL_CALL getImplementationName_static();
>-        
>+
>         static com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames_static();
> 
>         static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL
>-        createServiceFactory( 
>+        createServiceFactory(
>             const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr );
>-        
>+
>         static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
>-        CreateInstance( 
>+        CreateInstance(
>             const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory );
>-        
>+
> 
>     private:
>-        
>+
>         // Members
>         com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >  m_xMSF;
>         com::sun::star::uno::Reference< com::sun::star::uno::XInterface >             m_xHDS;
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/treeview/tvread.cxx xmlhelp//source/treeview/tvread.cxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/treeview/tvread.cxx	2011-05-20 18:06:00.000000000 +0200
>+++ xmlhelp//source/treeview/tvread.cxx	2012-02-24 13:39:00.671662388 +0100
>@@ -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,17 +45,18 @@
> #include <com/sun/star/uri/XUriReferenceFactory.hpp>
> #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp>
> #include <comphelper/locale.hxx>
>+#include <comphelper/string.hxx>
> 
> namespace treeview {
> 
>-    
>+
>     class TVDom
>     {
>         friend class TVChildTarget;
>         friend class TVRead;
>-    
>+
>     public:
>-        
>+
>         TVDom( TVDom* arent = 0 )
>             : kind( other ),
>               parent( arent ),
>@@ -145,27 +144,27 @@
>                     if ( len != 0 )
>                         break;
>                 }
>-                
>+
>                 rtl::OUStringBuffer strBuff( 22 + len + id.getLength() );
>                 strBuff.appendAscii(
>                                     "vnd.sun.star.help://"
>                                     ).append(id);
>-                
>+
>                 targetURL = strBuff.makeStringAndClear();
>             }
>-            
>+
>             return targetURL;
>         }
>-    
>+
>     private:
>-    
>+
>         Kind   kind;
>         rtl::OUString  application;
>         rtl::OUString  title;
>         rtl::OUString  id;
>         rtl::OUString  anchor;
>         rtl::OUString  targetURL;
>-        
>+
>         TVDom *parent;
>         std::vector< TVDom* > childs;
>     };
>@@ -199,7 +198,7 @@
>     sal_Int32 idx = -1,k = 0,off;
>     bool cap = false;
>     rtl::OUStringBuffer aStrBuf( 0 );
>-    
>+
>     while( ( idx = oustring.indexOf( sal_Unicode('%'),++idx ) ) != -1 )
>     {
>         if( oustring.indexOf( prodName,idx ) == idx )
>@@ -214,7 +213,7 @@
>             off = VENDORSHORT;
>         else
>             off = -1;
>-        
>+
>         if( off != -1 )
>         {
>             if( ! cap )
>@@ -222,13 +221,13 @@
>                 cap = true;
>                 aStrBuf.ensureCapacity( 256 );
>             }
>-            
>+
>             aStrBuf.append( &oustring.getStr()[k],idx - k );
>             aStrBuf.append( m_vReplacement[off] );
>             k = idx + m_vAdd[off];
>         }
>     }
>-    
>+
>     if( cap )
>     {
>         if( k < oustring.getLength() )
>@@ -274,7 +273,7 @@
>                                      SAL_STATIC_CAST( XHierarchicalNameAccess*, this ),
>                                      SAL_STATIC_CAST( XChangesNotifier*, this ),
>                                      SAL_STATIC_CAST( XComponent*, this ) );
>-    
>+
>     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
> }
> 
>@@ -302,7 +301,7 @@
> {
>     if( ! tvDom )
>         return;
>-    
>+
>     Title = tvDom->title;
>     configData.replaceName( Title );
>     if( tvDom->isLeaf() )
>@@ -381,7 +380,7 @@
>         aName.compareToAscii( "TargetURL" ) == 0    ||
>         aName.compareToAscii( "Children" ) == 0 )
>         return true;
>-    
>+
>     return false;
> }
> 
>@@ -395,11 +394,11 @@
> {
>     sal_Int32 idx;
>     rtl::OUString name( aName );
>-    
>+
>     if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1  &&
>         name.copy( 0,idx ).compareToAscii( "Children" ) == 0 )
>         return Children->getByHierarchicalName( name.copy( 1 + idx ) );
>-    
>+
>     return getByName( name );
> }
> 
>@@ -412,11 +411,11 @@
> {
>     sal_Int32 idx;
>     rtl::OUString name( aName );
>-    
>+
>        if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1  &&
>         name.copy( 0,idx ).compareToAscii( "Children" ) == 0 )
>         return Children->hasByHierarchicalName( name.copy( 1 + idx ) );
>-    
>+
>     return hasByName( name );
> }
> 
>@@ -444,14 +443,14 @@
>         kind = TVDom::tree_leaf;
>     else
>         return;
>-    
>+
>     TVDom **tvDom = static_cast< TVDom** >( userData );
>     TVDom  *p;
>     p = *tvDom;
> 
>     *tvDom = p->newChild();
>     p = *tvDom;
>-    
>+
>     p->setKind( kind );
>     while( *atts )
>     {
>@@ -463,7 +462,7 @@
>             p->setId( *(atts+1) );
>         else if( strcmp( *atts,"anchor" ) == 0 )
>             p->setAnchor( *(atts+1) );
>-        
>+
>         atts+=2;
>     }
> }
>@@ -509,7 +508,7 @@
>         ! configData.system.getLength() )
>         return;
> 
>-    sal_uInt64 	ret,len = 0;
>+    sal_uInt64  ret,len = 0;
>     int j = configData.vFileURL.size();
> 
>     TVDom tvDom;
>@@ -523,7 +522,7 @@
>         aFile.open( osl_File_OpenFlag_Read );
>         aFile.read( s,len,ret );
>         aFile.close();
>-        
>+
>         XML_Parser parser = XML_ParserCreate( 0 );
>         XML_SetElementHandler( parser,
>                                start_handler,
>@@ -581,7 +580,7 @@
>     Sequence< rtl::OUString > seq( Elements.size() );
>     for( unsigned i = 0; i < Elements.size(); ++i )
>         seq[i] = rtl::OUString::valueOf( sal_Int32( 1+i ) );
>-    
>+
>     return seq;
> }
> 
>@@ -677,9 +676,6 @@
>     /*                       reading setup                                */
>     /**********************************************************************/
> 
>-    rtl::OUString productName;
>-    ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= productName;
>-
>     xHierAccess = getHierAccess( sProvider,
>                                  "org.openoffice.Setup" );
> 
>@@ -739,7 +735,7 @@
>         ret = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
>         }
>     url = url + ret;
>-    
>+
>     // first of all, try do determine whether there are any *.tree files present
> 
>     // Start with extensions to set them at the end of the list
>@@ -753,15 +749,15 @@
>     }
> 
>     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 +773,7 @@
>                 ( 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 +798,7 @@
>     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
> 
>@@ -846,7 +842,7 @@
>             OSL_ENSURE( sProvider.is(),"cant instantiate configuration" );
>         }
>     }
>-    
>+
>     return sProvider;
> }
> 
>@@ -877,7 +873,7 @@
>         {
>         }
>     }
>-    
>+
>     return xHierAccess;
> }
> 
>@@ -947,9 +943,9 @@
>             OSL_ENSURE( xCfgMgr.is()," cant instantiate the special config manager " );
>         }
>     }
>-    
>+
>     OSL_ENSURE( xCfgMgr.is(), "specialconfigmanager not found\n" );
>-    
>+
>     if( xCfgMgr.is() )
>         instpath = xCfgMgr->substituteVariables( instpath );
> }
>@@ -1069,7 +1065,7 @@
> 
>     if( m_iUserPackage == m_aUserPackagesSeq.getLength() )
>     {
>-        m_eState = SHARED_EXTENSIONS;		// Later: SHARED_MODULE
>+        m_eState = SHARED_EXTENSIONS;       // Later: SHARED_MODULE
>     }
>     else
>     {
>@@ -1144,8 +1140,7 @@
> 
> 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,
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/treeview/tvread.hxx xmlhelp//source/treeview/tvread.hxx
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//source/treeview/tvread.hxx	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//source/treeview/tvread.hxx	2012-02-24 13:39:00.671662388 +0100
>@@ -2,7 +2,7 @@
> /*************************************************************************
>  *
>  * 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
>@@ -46,11 +46,11 @@
> #include <com/sun/star/lang/XComponent.hpp>
> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
> #include <com/sun/star/deployment/XPackage.hpp>
>-#include "com/sun/star/ucb/XSimpleFileAccess.hpp" 
>+#include "com/sun/star/ucb/XSimpleFileAccess.hpp"
> 
> namespace treeview {
> 
>-    
>+
>     class ConfigData
>     {
>     public:
>@@ -58,12 +58,12 @@
>             PRODUCTNAME, PRODUCTVERSION, VENDORNAME, VENDORVERSION,
>             VENDORSHORT };
>         ConfigData();
>-        int                    m_vAdd[5];		
>+        int                    m_vAdd[5];
>         rtl::OUString          m_vReplacement[5];
>         rtl::OUString          prodName,prodVersion,vendName,vendVersion,vendShort;
> 
>-        std::vector< sal_uInt64 >		vFileLen;
>-        std::vector< rtl::OUString >	vFileURL;
>+        std::vector< sal_uInt64 >       vFileLen;
>+        std::vector< rtl::OUString >    vFileURL;
>         rtl::OUString locale,system;
>         rtl::OUString appendix;
> 
>@@ -83,51 +83,51 @@
>           public com::sun::star::lang::XComponent
>     {
>         friend class TVChildTarget;
>-        
>+
>     public:
>-        
>+
>         virtual ~TVBase() { }
> 
>         // XInterface
>         virtual com::sun::star::uno::Any SAL_CALL
>-        queryInterface( 
>-            const com::sun::star::uno::Type& aType ) 
>+        queryInterface(
>+            const com::sun::star::uno::Type& aType )
>             throw( com::sun::star::uno::RuntimeException);
>-                    
>-        virtual void SAL_CALL 
>-        acquire( 
>-            void ) 
>+
>+        virtual void SAL_CALL
>+        acquire(
>+            void )
>             throw();
>-        
>+
>         virtual void SAL_CALL
>         release(
>-            void ) 
>+            void )
>             throw();
>-        
>-        
>+
>+
>         // XTypeProvider
>-        
>+
>         XTYPEPROVIDER_DECL()
> 
> 
>         // XNameAccess
>-        
>+
>         virtual com::sun::star::uno::Type SAL_CALL
>         getElementType(  )
>             throw( com::sun::star::uno::RuntimeException )
>         {
>             return getCppuVoidType();
>         }
>-        
>-        
>+
>+
>         virtual sal_Bool SAL_CALL hasElements()
>             throw( com::sun::star::uno::RuntimeException )
>         {
>             return true;
>         }
>-        
>+
>         // XChangesNotifier
>-        
>+
>         virtual void SAL_CALL
>         addChangesListener(
>             const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener )
>@@ -136,7 +136,7 @@
>             // read only
>             (void)aListener;
>         }
>-        
>+
>         virtual void SAL_CALL
>         removeChangesListener(
>             const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener )
>@@ -145,22 +145,22 @@
>             // read only
>             (void)aListener;
>         }
>-        
>-        
>+
>+
>         // XComponent
>-        
>+
>         virtual void SAL_CALL dispose( )
>             throw( com::sun::star::uno::RuntimeException )
>         {
>         }
>-        
>+
>         virtual void SAL_CALL addEventListener(
>             const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener )
>             throw( com::sun::star::uno::RuntimeException )
>         {
>             (void)xListener;
>         }
>-        
>+
>         virtual void SAL_CALL
>         removeEventListener(
>             const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )
>@@ -168,104 +168,104 @@
>         {
>             (void)aListener;
>         }
>-        
>-        
>+
>+
>         // Abstract functions
>         // XNameAccess
>-        
>+
>         virtual com::sun::star::uno::Any SAL_CALL
>         getByName( const rtl::OUString& aName )
>             throw( com::sun::star::container::NoSuchElementException,
>                    com::sun::star::lang::WrappedTargetException,
>                    com::sun::star::uno::RuntimeException) = 0;
>-        
>+
>         virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
>         getElementNames( )
>             throw( com::sun::star::uno::RuntimeException ) = 0;
>-        
>+
>         virtual sal_Bool SAL_CALL
>         hasByName( const rtl::OUString& aName )
>             throw( com::sun::star::uno::RuntimeException ) = 0;
>-        
>-        
>+
>+
>         // XHierarchicalNameAccess
>-        
>+
>         virtual com::sun::star::uno::Any SAL_CALL
>         getByHierarchicalName( const rtl::OUString& aName )
>             throw( com::sun::star::container::NoSuchElementException,
>                    com::sun::star::uno::RuntimeException ) = 0;
>-        
>+
>         virtual sal_Bool SAL_CALL
>         hasByHierarchicalName( const rtl::OUString& aName )
>             throw( com::sun::star::uno::RuntimeException ) = 0;
>-        
>-    }; // end class TVBase	
> 
>-    
>+    }; // end class TVBase
>+
>+
>+
>+
> 
>-    
>-    
>     class TVRead
>         : public TVBase
>     {
>         friend class TVChildTarget;
>-        
>+
>     public:
>         TVRead( const ConfigData& configData,TVDom* tvDom = 0 );
>-        
>+
>         ~TVRead();
> 
>         // XNameAccess
>-                
>+
>         virtual com::sun::star::uno::Any SAL_CALL
>         getByName( const rtl::OUString& aName )
>             throw( com::sun::star::container::NoSuchElementException,
>                    com::sun::star::lang::WrappedTargetException,
>                    com::sun::star::uno::RuntimeException);
>-        
>+
>         virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
>         getElementNames( )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual sal_Bool SAL_CALL
>         hasByName( const rtl::OUString& aName )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>-        
>+
>+
>         // XHierarchicalNameAccess
>-        
>+
>         virtual com::sun::star::uno::Any SAL_CALL
>         getByHierarchicalName( const rtl::OUString& aName )
>             throw( com::sun::star::container::NoSuchElementException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual sal_Bool SAL_CALL
>         hasByHierarchicalName( const rtl::OUString& aName )
>             throw( com::sun::star::uno::RuntimeException );
> 
>-        
>+
>     private:
>-        
>+
>         rtl::OUString                    Title;
>-        rtl::OUString                    TargetURL;				
>-        rtl::Reference< TVChildTarget >  Children;		
>+        rtl::OUString                    TargetURL;
>+        rtl::Reference< TVChildTarget >  Children;
> 
>     };  // end class TVRead
>-    
> 
> 
>-    
> 
>-    
>+
>+
>+
>     class TVChildTarget
>         : public TVBase
>     {
>     public:
> 
>         TVChildTarget( const ConfigData& configData,TVDom* tvDom );
>-        
>+
>         TVChildTarget( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF );
>-        
>+
>         ~TVChildTarget();
> 
>         virtual com::sun::star::uno::Any SAL_CALL
>@@ -273,28 +273,28 @@
>             throw( com::sun::star::container::NoSuchElementException,
>                    com::sun::star::lang::WrappedTargetException,
>                    com::sun::star::uno::RuntimeException);
>-        
>+
>         virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
>         getElementNames( )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual sal_Bool SAL_CALL
>         hasByName( const rtl::OUString& aName )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>-        
>+
>+
>         // XHierarchicalNameAccess
>-        
>+
>         virtual com::sun::star::uno::Any SAL_CALL
>         getByHierarchicalName( const rtl::OUString& aName )
>             throw( com::sun::star::container::NoSuchElementException,
>                    com::sun::star::uno::RuntimeException );
>-        
>+
>         virtual sal_Bool SAL_CALL
>         hasByHierarchicalName( const rtl::OUString& aName )
>             throw( com::sun::star::uno::RuntimeException );
>-        
>-        
>+
>+
>     private:
>         std::vector< rtl::Reference< TVRead > >   Elements;
> 
>@@ -303,12 +303,12 @@
> 
>         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
>         getConfiguration(
>-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSgr ) const;		
>-        
>+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSgr ) const;
>+
>         ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >
>         getHierAccess( const ::com::sun::star::uno::Reference<  ::com::sun::star::lang::XMultiServiceFactory >& sProvider,
>                        const char* file ) const;
>-        
>+
>       ::rtl::OUString
>       getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
>                 const char* key ) const;
>@@ -316,12 +316,12 @@
>       sal_Bool
>       getBooleanKey(
>                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
>-                    const char* key) const;		
>-      
>+                    const char* key) const;
>+
>       void subst(
>             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSgr,
>             rtl::OUString& instpath ) const;
>-        
>+
>     };  // end class TVChildTarget
> 
> 
>@@ -355,28 +355,28 @@
>         void implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
>             com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
> 
>-        osl::Mutex																	m_aMutex;
>-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >	m_xContext;
>-        com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess >	m_xSFA;
>+        osl::Mutex                                                                  m_aMutex;
>+        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >    m_xContext;
>+        com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess >    m_xSFA;
> 
>-        IteratorState																m_eState;
>-        rtl::OUString																m_aLanguage;
>+        IteratorState                                                               m_eState;
>+        rtl::OUString                                                               m_aLanguage;
> 
>         com::sun::star::uno::Sequence< com::sun::star::uno::Reference
>-            < com::sun::star::deployment::XPackage > >								m_aUserPackagesSeq;
>-        bool																		m_bUserPackagesLoaded;
>+            < com::sun::star::deployment::XPackage > >                              m_aUserPackagesSeq;
>+        bool                                                                        m_bUserPackagesLoaded;
> 
>         com::sun::star::uno::Sequence< com::sun::star::uno::Reference
>-            < com::sun::star::deployment::XPackage > >								m_aSharedPackagesSeq;
>-        bool																		m_bSharedPackagesLoaded;
>+            < com::sun::star::deployment::XPackage > >                              m_aSharedPackagesSeq;
>+        bool                                                                        m_bSharedPackagesLoaded;
> 
>         com::sun::star::uno::Sequence< com::sun::star::uno::Reference
>-            < com::sun::star::deployment::XPackage > >								m_aBundledPackagesSeq;
>-        bool																		m_bBundledPackagesLoaded;
>+            < com::sun::star::deployment::XPackage > >                              m_aBundledPackagesSeq;
>+        bool                                                                        m_bBundledPackagesLoaded;
> 
>-        int																			m_iUserPackage;
>-        int																			m_iSharedPackage;
>-        int																			m_iBundledPackage;
>+        int                                                                         m_iUserPackage;
>+        int                                                                         m_iSharedPackage;
>+        int                                                                         m_iBundledPackage;
> 
>     }; // end class ExtensionIteratorBase
> 
>@@ -398,7 +398,7 @@
> 
>     }; // end class TreeFileIterator
> 
>-    
>+
> }
> 
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//util/makefile.mk xmlhelp//util/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//util/makefile.mk	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//util/makefile.mk	2012-02-24 13:39:00.673662388 +0100
>@@ -42,8 +42,10 @@
> .INCLUDE: settings.mk
> 
> .IF "$(GUI)"=="WNT"
>+.IF "$(COM)"=="MSC"
> CFLAGS+=-GR
> .ENDIF
>+.ENDIF
> 
> # --- Shared-Library ---------------------------------------------------
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//util/ucpchelp.xml xmlhelp//util/ucpchelp.xml
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/xmlhelp//util/ucpchelp.xml	2011-05-19 12:27:43.000000000 +0200
>+++ xmlhelp//util/ucpchelp.xml	2011-09-13 16:39:39.213306217 +0200
>@@ -38,17 +38,17 @@
> 
>     <project-build-dependency> sablot             </project-build-dependency>
>     <project-build-dependency> unoil              </project-build-dependency>
>-    <project-build-dependency> offuh			  </project-build-dependency>
>+    <project-build-dependency> offuh              </project-build-dependency>
>     <project-build-dependency> external           </project-build-dependency>
>     <project-build-dependency> XmlSearch          </project-build-dependency>
>     <project-build-dependency> ucbhelper          </project-build-dependency>
>     <project-build-dependency> berkeleydb         </project-build-dependency>
> 
>-    <runtime-module-dependency>	sal3			  </runtime-module-dependency>
>-    <runtime-module-dependency>	cppu3			  </runtime-module-dependency>
>-    <runtime-module-dependency>	cppuhelper3$(COM) </runtime-module-dependency>
>+    <runtime-module-dependency> sal3              </runtime-module-dependency>
>+    <runtime-module-dependency> cppu3             </runtime-module-dependency>
>+    <runtime-module-dependency> cppuhelper3$(COM) </runtime-module-dependency>
>     <runtime-module-dependency> libdb32           </runtime-module-dependency>
>-    <runtime-module-dependency>	ucbhelper4$(COM)  </runtime-module-dependency>
>+    <runtime-module-dependency> ucbhelper4$(COM)  </runtime-module-dependency>
> 
>     <type>com.sun.star.beans.Property</type>
>     <type>com.sun.star.beans.PropertyAttribute</type>

Actions: View

Attachments on bug 46506: 57586 | 57587 | 57588