#i99305#,#i99132# remove DOS lineends, remove solenv/unxmacxp/inc/poll.h

5 files changed, 838 insertions, 838 deletions

diff --git a/xmlhelp/source/com/sun/star/help/HelpComponent.java b/xmlhelp/source/com/sun/star/help/HelpComponent.java
index 35c856ec57..b27ea5bb78 100755
--- a/xmlhelp/source/com/sun/star/help/HelpComponent.java
+++ b/xmlhelp/source/com/sun/star/help/HelpComponent.java
@@ -1,138 +1,138 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: HelpSearch.java,v $

- * $Revision: 1.2 $

- *

- * 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.

- *

- ************************************************************************/

-

-package com.sun.star.help;

-

-import com.sun.star.lib.uno.helper.Factory;

-import com.sun.star.lang.XSingleComponentFactory;

-import com.sun.star.registry.XRegistryKey;

-    

-/*

-import com.sun.star.lib.uno.helper.Factory;

-import com.sun.star.lang.XMultiComponentFactory;

-import com.sun.star.lang.XSingleComponentFactory;

-import com.sun.star.lib.uno.helper.WeakBase;

-import com.sun.star.uno.UnoRuntime;

-import com.sun.star.uno.XComponentContext;

-import com.sun.star.registry.XRegistryKey;

-import com.sun.star.lang.XInitialization;

-import com.sun.star.lang.XTypeProvider;

-import com.sun.star.lang.XServiceInfo;

-import com.sun.star.uno.Type;

-import com.sun.star.uno.Any;

-import com.sun.star.uno.AnyConverter;

-

-import org.apache.lucene.analysis.Analyzer;

-import org.apache.lucene.analysis.standard.StandardAnalyzer;

-import org.apache.lucene.document.Document;

-import org.apache.lucene.index.FilterIndexReader;

-import org.apache.lucene.index.IndexReader;

-import org.apache.lucene.index.Term;

-import org.apache.lucene.queryParser.QueryParser;

-import org.apache.lucene.search.Hits;

-import org.apache.lucene.search.IndexSearcher;

-import org.apache.lucene.search.Query;

-import org.apache.lucene.search.Searcher;

-import org.apache.lucene.search.TermQuery;

-import org.apache.lucene.search.WildcardQuery;

-

-import com.sun.star.script.XInvocation;

-import com.sun.star.beans.XIntrospectionAccess;

-

-import java.io.FileOutputStream;

-import java.io.PrintStream;

-import java.io.File;

-*/

-

-/** This class capsulates the class, that implements the minimal component, a

- * factory for creating the service (<CODE>__getComponentFactory</CODE>) and a

- * method, that writes the information into the given registry key

- * (<CODE>__writeRegistryServiceInfo</CODE>).

- */

-public class HelpComponent

-{

-    /**

-     * Gives a factory for creating the service.

-     * This method is called by the <code>JavaLoader</code>

-     * <p>

-     * @return  returns a <code>XSingleComponentFactory</code> for creating

-     *          the component

-     * @param   sImplName the name of the implementation for which a

-     *          service is desired

-     * @see     com.sun.star.comp.loader.JavaLoader

-     */

-    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());

-        else if ( sImplName.equals( HelpIndexer.class.getName() ) )

-            xFactory = Factory.createComponentFactory(HelpIndexer.class,

-                                             HelpIndexer.getServiceNames());

-        return xFactory;

-    }

-

-    /**

-     * Writes the service information into the given registry key.

-     * This method is called by the <code>JavaLoader</code>

-     * <p>

-     * @return  returns true if the operation succeeded

-     * @param   regKey the registryKey

-     * @see     com.sun.star.comp.loader.JavaLoader

-     */

-    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)

-    {

-        boolean bSuccessHelpSearch = Factory.writeRegistryServiceInfo

-            (HelpSearch._HelpSearch.class.getName(),

-             HelpSearch._HelpSearch.getServiceNames(), regKey);

-        boolean bSuccessHelpIndexer = Factory.writeRegistryServiceInfo

-            (HelpIndexer.class.getName(),

-             HelpIndexer.getServiceNames(), regKey);

-

-        return bSuccessHelpSearch && bSuccessHelpIndexer;

-    }

-    /** This method is a member of the interface for initializing an object

-     * directly after its creation.

-     * @param object This array of arbitrary objects will be passed to the

-     * component after its creation.

-     * @throws Exception Every exception will not be handled, but will be

-     * passed to the caller.

-     */

-    public void initialize( Object[] object )

-        throws com.sun.star.uno.Exception

-    {

-        /* The component describes what arguments its expected and in which

-         * order!At this point you can read the objects and can intialize

-         * your component using these objects.

-         */

-    }

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: HelpSearch.java,v $
+ * $Revision: 1.2 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+package com.sun.star.help;
+
+import com.sun.star.lib.uno.helper.Factory;
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.registry.XRegistryKey;
+    
+/*
+import com.sun.star.lib.uno.helper.Factory;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.registry.XRegistryKey;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XTypeProvider;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.Any;
+import com.sun.star.uno.AnyConverter;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.FilterIndexReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.Hits;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Searcher;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.WildcardQuery;
+
+import com.sun.star.script.XInvocation;
+import com.sun.star.beans.XIntrospectionAccess;
+
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.io.File;
+*/
+
+/** This class capsulates the class, that implements the minimal component, a
+ * factory for creating the service (<CODE>__getComponentFactory</CODE>) and a
+ * method, that writes the information into the given registry key
+ * (<CODE>__writeRegistryServiceInfo</CODE>).
+ */
+public class HelpComponent
+{
+    /**
+     * Gives a factory for creating the service.
+     * This method is called by the <code>JavaLoader</code>
+     * <p>
+     * @return  returns a <code>XSingleComponentFactory</code> for creating
+     *          the component
+     * @param   sImplName the name of the implementation for which a
+     *          service is desired
+     * @see     com.sun.star.comp.loader.JavaLoader
+     */
+    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());
+        else if ( sImplName.equals( HelpIndexer.class.getName() ) )
+            xFactory = Factory.createComponentFactory(HelpIndexer.class,
+                                             HelpIndexer.getServiceNames());
+        return xFactory;
+    }
+
+    /**
+     * Writes the service information into the given registry key.
+     * This method is called by the <code>JavaLoader</code>
+     * <p>
+     * @return  returns true if the operation succeeded
+     * @param   regKey the registryKey
+     * @see     com.sun.star.comp.loader.JavaLoader
+     */
+    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
+    {
+        boolean bSuccessHelpSearch = Factory.writeRegistryServiceInfo
+            (HelpSearch._HelpSearch.class.getName(),
+             HelpSearch._HelpSearch.getServiceNames(), regKey);
+        boolean bSuccessHelpIndexer = Factory.writeRegistryServiceInfo
+            (HelpIndexer.class.getName(),
+             HelpIndexer.getServiceNames(), regKey);
+
+        return bSuccessHelpSearch && bSuccessHelpIndexer;
+    }
+    /** This method is a member of the interface for initializing an object
+     * directly after its creation.
+     * @param object This array of arbitrary objects will be passed to the
+     * component after its creation.
+     * @throws Exception Every exception will not be handled, but will be
+     * passed to the caller.
+     */
+    public void initialize( Object[] object )
+        throws com.sun.star.uno.Exception
+    {
+        /* The component describes what arguments its expected and in which
+         * order!At this point you can read the objects and can intialize
+         * your component using these objects.
+         */
+    }
+}
diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java b/xmlhelp/source/com/sun/star/help/HelpSearch.java
index 3a3a260411..ceaa859f90 100644
--- a/xmlhelp/source/com/sun/star/help/HelpSearch.java
+++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java
@@ -1,351 +1,351 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: HelpSearch.java,v $

- * $Revision: 1.3 $

- *

- * 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.

- *

- ************************************************************************/

-

-package com.sun.star.help;

-

-import com.sun.star.lib.uno.helper.Factory;

-import com.sun.star.lang.XMultiComponentFactory;

-import com.sun.star.lang.XSingleComponentFactory;

-import com.sun.star.lib.uno.helper.WeakBase;

-import com.sun.star.uno.UnoRuntime;

-import com.sun.star.uno.XComponentContext;

-import com.sun.star.registry.XRegistryKey;

-import com.sun.star.lang.XInitialization;

-import com.sun.star.lang.XTypeProvider;

-import com.sun.star.lang.XServiceInfo;

-import com.sun.star.uno.Type;

-import com.sun.star.uno.Any;

-import com.sun.star.uno.AnyConverter;

-

-import org.apache.lucene.analysis.Analyzer;

-import org.apache.lucene.analysis.standard.StandardAnalyzer;

-import org.apache.lucene.analysis.cjk.CJKAnalyzer;

-import org.apache.lucene.document.Document;

-import org.apache.lucene.index.FilterIndexReader;

-import org.apache.lucene.index.IndexReader;

-import org.apache.lucene.index.Term;

-import org.apache.lucene.search.Hits;

-import org.apache.lucene.search.IndexSearcher;

-import org.apache.lucene.search.Query;

-import org.apache.lucene.search.Searcher;

-import org.apache.lucene.search.TermQuery;

-import org.apache.lucene.search.WildcardQuery;

-

-import com.sun.star.script.XInvocation;

-import com.sun.star.beans.XIntrospectionAccess;

-

-/** This class capsulates the class, that implements the minimal component, a

- * factory for creating the service (<CODE>__getComponentFactory</CODE>) and a

- * method, that writes the information into the given registry key

- * (<CODE>__writeRegistryServiceInfo</CODE>).

- */

-public class HelpSearch

-{

-    /** This class implements the component. At least the interfaces XServiceInfo,

-     * XTypeProvider, and XInitialization should be provided by the service.

-     */

-    public static class _HelpSearch extends WeakBase

-        implements XServiceInfo, XInvocation

-    {

-        /** The service name, that must be used to get an instance of this service.

-         */

-        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

-         */

-        private XComponentContext m_cmpCtx;

-

-        /** The service manager, that gives access to all registered services.

-         * 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.

-         */

-        public _HelpSearch(XComponentContext xCompContext)

-        {

-            try {

-                m_cmpCtx = xCompContext;

-                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.

-         */

-        public String[] getSupportedServiceNames()

-        {

-            return getServiceNames();

-        }

-

-        /** This method is a simple helper function to used in the

-         * static component initialisation functions as well as in

-         * getSupportedServiceNames.

-         */

-        public static String[] getServiceNames()

-        {

-            String[] sSupportedServiceNames = { __serviceName };

-            return sSupportedServiceNames;

-        }

-      

-        /** This method returns true, if the given service will be

-         * supported by the component.

-         * @param sServiceName Service name.

-         * @return True, if the given service name will be supported.

-         */

-        public boolean supportsService( String sServiceName )

-        {

-            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,

-                        com.sun.star.script.CannotConvertException,

-                        com.sun.star.reflection.InvocationTargetException

-        {

-            String[] aRet = null;

-            if( !aFunctionName.equals( aSearchMethodName ) )

-                throw new com.sun.star.lang.IllegalArgumentException();

-

-            Object[] aScoreOutArray = new Object[1];

-            aScoreOutArray[0] = null;

-            try

-            {

-                aRet =  doQuery( aParams, aScoreOutArray );

-            }

-            catch( Exception e )

-            {

-                aRet = null;

-            }

-

-            Object aScoreArray = aScoreOutArray[0];

-            if( aScoreArray == null )

-            {

-                aOutParamIndex[0] = new short[0];

-                aOutParam[0] = new Object[0];

-            }

-            else

-            {

-                short nInParamCount = (short)aParams.length;

-                aOutParamIndex[0] = new short[1];

-                aOutParamIndex[0][0] = nInParamCount;

-                aOutParam[0] = new Object[1];

-                aOutParam[0][0] = aScoreArray;

-            }

-

-            Any aRetAny = new Any( new Type( String[].class ), aRet );

-            return aRetAny;

-        }

-

-        public void setValue( String aPropertyName, java.lang.Object aValue )

-            throws	com.sun.star.beans.UnknownPropertyException,

-                    com.sun.star.script.CannotConvertException,

-                    com.sun.star.reflection.InvocationTargetException {

-            throw new com.sun.star.beans.UnknownPropertyException();

-        }

-

-        public Object getValue( String aPropertyName )

-            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;

-        }

-        public boolean hasProperty( String aName ) {

-            return false;

-        }

-        

-        // Command line interface for testing

-        private static String[] doQuery( Object[] args, Object[] aScoreOutArray ) throws Exception

-        {

-             String aLanguageStr = "";

-             String aIndexStr = "";

-            String aQueryStr = "";

-            boolean bCaptionOnly = false;

-

-            int nParamCount = args.length;

-            String aStrs[] = new String[nParamCount];

-            for( int i = 0 ; i < nParamCount ; i++ )

-            {

-                try

-                {

-                    aStrs[i] = AnyConverter.toString( args[i] );

-                }

-                catch( IllegalArgumentException e )

-                {

-                    aStrs[i] = "";

-                }

-            }

-

-            // TODO: Error handling

-            for( int i = 0 ; i < nParamCount ; i++ )

-            {

-                if ("-lang".equals(aStrs[i]) )

-                {

-                    aLanguageStr = aStrs[i + 1];

-                    i++;

-                }

-                else if( "-index".equals(aStrs[i]) )

-                {

-                    aIndexStr = aStrs[i+1];

-                    i++;

-                }

-                else if( "-query".equals(aStrs[i]) )

-                {

-                    aQueryStr = aStrs[i+1];

-                    i++;

-                }

-                else if( "-caption".equals(aStrs[i]) )

-                {

-                    bCaptionOnly = true;

-                }

-            }

-            String[] aDocs = queryImpl( aLanguageStr, aIndexStr, aQueryStr, bCaptionOnly, aScoreOutArray );

-

-            return aDocs;

-        }

-

-        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();

-

-            String aField;

-            if( bCaptionOnly )

-                aField = "caption";

-            else

-                aField = "content";

-

-            Query aQuery;

-            if( aQueryStr.endsWith( "*" ) )

-                aQuery = new WildcardQuery( new Term( aField, aQueryStr ) );

-            else

-                aQuery = new TermQuery( new Term( aField, aQueryStr ) );

-

-            // Perform search

-            Hits aHits = searcher.search( aQuery );

-            int nHitCount = aHits.length();

-

-            String aDocs[] = new String[nHitCount];	

-            float aScores[] = null;

-            aScores = new float[nHitCount];

-            for( int iHit = 0 ; iHit < nHitCount ; iHit++ )

-            {

-                Document aDoc = aHits.doc( iHit );

-                String aPath = aDoc.get( "path" );

-                aDocs[iHit] = ( aPath != null ) ? aPath : "";

-                aScores[iHit] = aHits.score( iHit );

-            }

-            aScoreOutArray[0] = aScores;

-

-            reader.close();

-

-            return aDocs;

-        }

-    }

-

-    /**

-     * Gives a factory for creating the service.

-     * This method is called by the <code>JavaLoader</code>

-     * <p>

-     * @return  returns a <code>XSingleComponentFactory</code> for creating

-     *          the component

-     * @param   sImplName the name of the implementation for which a

-     *          service is desired

-     * @see     com.sun.star.comp.loader.JavaLoader

-     */

-    public static XSingleComponentFactory __getComponentFactory(String sImplName)

-    {

-        XSingleComponentFactory xFactory = null;

-    

-        if ( sImplName.equals( _HelpSearch.class.getName() ) )

-            xFactory = Factory.createComponentFactory(_HelpSearch.class,

-                                             _HelpSearch.getServiceNames());

-        

-        return xFactory;

-    }

-

-    /**

-     * Writes the service information into the given registry key.

-     * This method is called by the <code>JavaLoader</code>

-     * <p>

-     * @return  returns true if the operation succeeded

-     * @param   regKey the registryKey

-     * @see     com.sun.star.comp.loader.JavaLoader

-     */

-    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {

-        return Factory.writeRegistryServiceInfo(_HelpSearch.class.getName(),

-                                                _HelpSearch.getServiceNames(),

-                                                regKey);

-    }

-        /** This method is a member of the interface for initializing an object

-         * directly after its creation.

-         * @param object This array of arbitrary objects will be passed to the

-         * component after its creation.

-         * @throws Exception Every exception will not be handled, but will be

-         * passed to the caller.

-         */

-        public void initialize( Object[] object )

-            throws com.sun.star.uno.Exception {

-            /* The component describes what arguments its expected and in which

-             * order!At this point you can read the objects and can intialize

-             * your component using these objects.

-             */

-        }

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: HelpSearch.java,v $
+ * $Revision: 1.3 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+package com.sun.star.help;
+
+import com.sun.star.lib.uno.helper.Factory;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.registry.XRegistryKey;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XTypeProvider;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.Any;
+import com.sun.star.uno.AnyConverter;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.analysis.cjk.CJKAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.FilterIndexReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.Hits;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Searcher;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.WildcardQuery;
+
+import com.sun.star.script.XInvocation;
+import com.sun.star.beans.XIntrospectionAccess;
+
+/** This class capsulates the class, that implements the minimal component, a
+ * factory for creating the service (<CODE>__getComponentFactory</CODE>) and a
+ * method, that writes the information into the given registry key
+ * (<CODE>__writeRegistryServiceInfo</CODE>).
+ */
+public class HelpSearch
+{
+    /** This class implements the component. At least the interfaces XServiceInfo,
+     * XTypeProvider, and XInitialization should be provided by the service.
+     */
+    public static class _HelpSearch extends WeakBase
+        implements XServiceInfo, XInvocation
+    {
+        /** The service name, that must be used to get an instance of this service.
+         */
+        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
+         */
+        private XComponentContext m_cmpCtx;
+
+        /** The service manager, that gives access to all registered services.
+         * 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.
+         */
+        public _HelpSearch(XComponentContext xCompContext)
+        {
+            try {
+                m_cmpCtx = xCompContext;
+                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.
+         */
+        public String[] getSupportedServiceNames()
+        {
+            return getServiceNames();
+        }
+
+        /** This method is a simple helper function to used in the
+         * static component initialisation functions as well as in
+         * getSupportedServiceNames.
+         */
+        public static String[] getServiceNames()
+        {
+            String[] sSupportedServiceNames = { __serviceName };
+            return sSupportedServiceNames;
+        }
+      
+        /** This method returns true, if the given service will be
+         * supported by the component.
+         * @param sServiceName Service name.
+         * @return True, if the given service name will be supported.
+         */
+        public boolean supportsService( String sServiceName )
+        {
+            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,
+                        com.sun.star.script.CannotConvertException,
+                        com.sun.star.reflection.InvocationTargetException
+        {
+            String[] aRet = null;
+            if( !aFunctionName.equals( aSearchMethodName ) )
+                throw new com.sun.star.lang.IllegalArgumentException();
+
+            Object[] aScoreOutArray = new Object[1];
+            aScoreOutArray[0] = null;
+            try
+            {
+                aRet =  doQuery( aParams, aScoreOutArray );
+            }
+            catch( Exception e )
+            {
+                aRet = null;
+            }
+
+            Object aScoreArray = aScoreOutArray[0];
+            if( aScoreArray == null )
+            {
+                aOutParamIndex[0] = new short[0];
+                aOutParam[0] = new Object[0];
+            }
+            else
+            {
+                short nInParamCount = (short)aParams.length;
+                aOutParamIndex[0] = new short[1];
+                aOutParamIndex[0][0] = nInParamCount;
+                aOutParam[0] = new Object[1];
+                aOutParam[0][0] = aScoreArray;
+            }
+
+            Any aRetAny = new Any( new Type( String[].class ), aRet );
+            return aRetAny;
+        }
+
+        public void setValue( String aPropertyName, java.lang.Object aValue )
+            throws	com.sun.star.beans.UnknownPropertyException,
+                    com.sun.star.script.CannotConvertException,
+                    com.sun.star.reflection.InvocationTargetException {
+            throw new com.sun.star.beans.UnknownPropertyException();
+        }
+
+        public Object getValue( String aPropertyName )
+            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;
+        }
+        public boolean hasProperty( String aName ) {
+            return false;
+        }
+        
+        // Command line interface for testing
+        private static String[] doQuery( Object[] args, Object[] aScoreOutArray ) throws Exception
+        {
+             String aLanguageStr = "";
+             String aIndexStr = "";
+            String aQueryStr = "";
+            boolean bCaptionOnly = false;
+
+            int nParamCount = args.length;
+            String aStrs[] = new String[nParamCount];
+            for( int i = 0 ; i < nParamCount ; i++ )
+            {
+                try
+                {
+                    aStrs[i] = AnyConverter.toString( args[i] );
+                }
+                catch( IllegalArgumentException e )
+                {
+                    aStrs[i] = "";
+                }
+            }
+
+            // TODO: Error handling
+            for( int i = 0 ; i < nParamCount ; i++ )
+            {
+                if ("-lang".equals(aStrs[i]) )
+                {
+                    aLanguageStr = aStrs[i + 1];
+                    i++;
+                }
+                else if( "-index".equals(aStrs[i]) )
+                {
+                    aIndexStr = aStrs[i+1];
+                    i++;
+                }
+                else if( "-query".equals(aStrs[i]) )
+                {
+                    aQueryStr = aStrs[i+1];
+                    i++;
+                }
+                else if( "-caption".equals(aStrs[i]) )
+                {
+                    bCaptionOnly = true;
+                }
+            }
+            String[] aDocs = queryImpl( aLanguageStr, aIndexStr, aQueryStr, bCaptionOnly, aScoreOutArray );
+
+            return aDocs;
+        }
+
+        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();
+
+            String aField;
+            if( bCaptionOnly )
+                aField = "caption";
+            else
+                aField = "content";
+
+            Query aQuery;
+            if( aQueryStr.endsWith( "*" ) )
+                aQuery = new WildcardQuery( new Term( aField, aQueryStr ) );
+            else
+                aQuery = new TermQuery( new Term( aField, aQueryStr ) );
+
+            // Perform search
+            Hits aHits = searcher.search( aQuery );
+            int nHitCount = aHits.length();
+
+            String aDocs[] = new String[nHitCount];	
+            float aScores[] = null;
+            aScores = new float[nHitCount];
+            for( int iHit = 0 ; iHit < nHitCount ; iHit++ )
+            {
+                Document aDoc = aHits.doc( iHit );
+                String aPath = aDoc.get( "path" );
+                aDocs[iHit] = ( aPath != null ) ? aPath : "";
+                aScores[iHit] = aHits.score( iHit );
+            }
+            aScoreOutArray[0] = aScores;
+
+            reader.close();
+
+            return aDocs;
+        }
+    }
+
+    /**
+     * Gives a factory for creating the service.
+     * This method is called by the <code>JavaLoader</code>
+     * <p>
+     * @return  returns a <code>XSingleComponentFactory</code> for creating
+     *          the component
+     * @param   sImplName the name of the implementation for which a
+     *          service is desired
+     * @see     com.sun.star.comp.loader.JavaLoader
+     */
+    public static XSingleComponentFactory __getComponentFactory(String sImplName)
+    {
+        XSingleComponentFactory xFactory = null;
+    
+        if ( sImplName.equals( _HelpSearch.class.getName() ) )
+            xFactory = Factory.createComponentFactory(_HelpSearch.class,
+                                             _HelpSearch.getServiceNames());
+        
+        return xFactory;
+    }
+
+    /**
+     * Writes the service information into the given registry key.
+     * This method is called by the <code>JavaLoader</code>
+     * <p>
+     * @return  returns true if the operation succeeded
+     * @param   regKey the registryKey
+     * @see     com.sun.star.comp.loader.JavaLoader
+     */
+    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
+        return Factory.writeRegistryServiceInfo(_HelpSearch.class.getName(),
+                                                _HelpSearch.getServiceNames(),
+                                                regKey);
+    }
+        /** This method is a member of the interface for initializing an object
+         * directly after its creation.
+         * @param object This array of arbitrary objects will be passed to the
+         * component after its creation.
+         * @throws Exception Every exception will not be handled, but will be
+         * passed to the caller.
+         */
+        public void initialize( Object[] object )
+            throws com.sun.star.uno.Exception {
+            /* The component describes what arguments its expected and in which
+             * order!At this point you can read the objects and can intialize
+             * your component using these objects.
+             */
+        }
+}
diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
index 66f7fc9271..46ca7405b8 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
@@ -1,107 +1,107 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: DocGenerator.hxx,v $

- * $Revision: 1.3 $

- *

- * 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.

- *

- ************************************************************************/

-#ifndef _XMLSEARCH_QE_DOCGENERATOR_HXX_

-#define _XMLSEARCH_QE_DOCGENERATOR_HXX_

-

-#include <rtl/ref.hxx>

-#ifndef _RTL_USTRING_HXX__

-#include  <rtl/ustring.hxx>

-#endif

-#include <excep/XmlSearchExceptions.hxx>

-#include <util/CompressorIterator.hxx>

-#include <util/Decompressor.hxx>

-

-

-namespace xmlsearch {

-

-    namespace qe {

-

-

-        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_;			

-            std::vector< RoleFiller* > fillers_;

-        };

-

-

-        class GeneratorHeap

-        {

-        public:

-            

-            GeneratorHeap()

-                : heapSize_( 0 ),

-                  free_( 0 )

-            { }

-        private:

-

-            sal_Int32   heapSize_,free_;

-        };

-    

-    

-

-    }

-}

-

-#endif

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DocGenerator.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _XMLSEARCH_QE_DOCGENERATOR_HXX_
+#define _XMLSEARCH_QE_DOCGENERATOR_HXX_
+
+#include <rtl/ref.hxx>
+#ifndef _RTL_USTRING_HXX__
+#include  <rtl/ustring.hxx>
+#endif
+#include <excep/XmlSearchExceptions.hxx>
+#include <util/CompressorIterator.hxx>
+#include <util/Decompressor.hxx>
+
+
+namespace xmlsearch {
+
+    namespace qe {
+
+
+        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_;			
+            std::vector< RoleFiller* > fillers_;
+        };
+
+
+        class GeneratorHeap
+        {
+        public:
+            
+            GeneratorHeap()
+                : heapSize_( 0 ),
+                  free_( 0 )
+            { }
+        private:
+
+            sal_Int32   heapSize_,free_;
+        };
+    
+    
+
+    }
+}
+
+#endif
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
index 336bc96282..cc72e77f71 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
@@ -1,178 +1,178 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: Query.hxx,v $

- * $Revision: 1.4 $

- *

- * 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.

- *

- ************************************************************************/

-#ifndef _XMLSEARCH_QE_QUERY_HXX_

-#define _XMLSEARCH_QE_QUERY_HXX_

-

-#include <sal/types.h>

-#include <rtl/memory.h>

-#include <rtl/ustring.hxx>

-#include <vector>

-

-

-namespace xmlsearch {

-  

-    namespace qe {

-    

-        class Search;

-        class RoleFiller;

-    

-        class QueryHit

-        {

-        public:

-

-            QueryHit( sal_Int32 nColumns,double penalty,sal_Int32 doc,sal_Int32 begin,sal_Int32 end )

-                : doc_( doc ),

-                  begin_( begin ),

-                  end_( end ),

-                    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_ )

-                    return penalty_ < o->penalty_;

-                else if( begin_ != o->begin_ )

-                    return begin_ < o->begin_;

-                else if( end_ != o->end_ )

-                    return end_ < o->end_;

-                else

-                    return false;

-            }

-      

-            bool worseThan( const QueryHit* o )

-            {

-                if( penalty_ != o->penalty_ )

-                    return penalty_ > o->penalty_;

-                else if( begin_ != o->begin_ )

-                    return begin_ > o->begin_;

-                else if( end_ != o->end_ )

-                    return end_ > o->end_;

-                else

-                    return false;

-            }

-

-            bool worseThan( double penalty,sal_Int32 begin,sal_Int32 end )

-            {

-                if( penalty_ != penalty )

-                    return penalty_ > penalty;

-                else if( begin_ != begin )

-                    return begin_ > begin;

-                else if( end_ != end )

-                    return end_ > end;

-                else

-                    return false;

-            }

-            

-            bool compareTo( const QueryHit* o ) const

-            {

-                if( penalty_ != o->penalty_ )

-                    return penalty_ < o->penalty_;

-                else if( begin_ != o->begin_ )

-                    return begin_ < o->begin_;

-                else if( end_ != o->end_ )

-                    return end_ < o->end_;

-                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

-        {

-        public:

-

-            static PrefixTranslator* makePrefixTranslator( const rtl::OUString*,sal_Int32 )

-            {

-                return 0;

-            }

-        };

-    }

-

-}

-

-

-#endif

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: Query.hxx,v $
+ * $Revision: 1.4 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _XMLSEARCH_QE_QUERY_HXX_
+#define _XMLSEARCH_QE_QUERY_HXX_
+
+#include <sal/types.h>
+#include <rtl/memory.h>
+#include <rtl/ustring.hxx>
+#include <vector>
+
+
+namespace xmlsearch {
+  
+    namespace qe {
+    
+        class Search;
+        class RoleFiller;
+    
+        class QueryHit
+        {
+        public:
+
+            QueryHit( sal_Int32 nColumns,double penalty,sal_Int32 doc,sal_Int32 begin,sal_Int32 end )
+                : doc_( doc ),
+                  begin_( begin ),
+                  end_( end ),
+                    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_ )
+                    return penalty_ < o->penalty_;
+                else if( begin_ != o->begin_ )
+                    return begin_ < o->begin_;
+                else if( end_ != o->end_ )
+                    return end_ < o->end_;
+                else
+                    return false;
+            }
+      
+            bool worseThan( const QueryHit* o )
+            {
+                if( penalty_ != o->penalty_ )
+                    return penalty_ > o->penalty_;
+                else if( begin_ != o->begin_ )
+                    return begin_ > o->begin_;
+                else if( end_ != o->end_ )
+                    return end_ > o->end_;
+                else
+                    return false;
+            }
+
+            bool worseThan( double penalty,sal_Int32 begin,sal_Int32 end )
+            {
+                if( penalty_ != penalty )
+                    return penalty_ > penalty;
+                else if( begin_ != begin )
+                    return begin_ > begin;
+                else if( end_ != end )
+                    return end_ > end;
+                else
+                    return false;
+            }
+            
+            bool compareTo( const QueryHit* o ) const
+            {
+                if( penalty_ != o->penalty_ )
+                    return penalty_ < o->penalty_;
+                else if( begin_ != o->begin_ )
+                    return begin_ < o->begin_;
+                else if( end_ != o->end_ )
+                    return end_ < o->end_;
+                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
+        {
+        public:
+
+            static PrefixTranslator* makePrefixTranslator( const rtl::OUString*,sal_Int32 )
+            {
+                return 0;
+            }
+        };
+    }
+
+}
+
+
+#endif
diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
index 0e8413ea2d..fd6c468fba 100644
--- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
+++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
@@ -1,64 +1,64 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: DocGenerator.cxx,v $

- * $Revision: 1.10 $

- *

- * 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): autogen include statement, do not remove

-#include "precompiled_xmlhelp.hxx"

-#include <qe/DocGenerator.hxx>

-#include <qe/Query.hxx>

-

-

-using namespace xmlsearch;

-using namespace xmlsearch::qe;

-

-

-const sal_Int32 NonnegativeIntegerGenerator::END = -1;

-

-

-RoleFiller RoleFiller::roleFiller_;

-

-

-RoleFiller::RoleFiller()

-    : m_nRefcount( 0 ),

-      fixedRole_( 0 ),

-      filled_( 0 ),

-      begin_( 0 ),

-      end_( 0 ),

-      parentContext_( 0 ),

-      limit_( 0 ),

-      next_( 0 ),

-      fillers_( 0 )

-{

-}

-

-

-RoleFiller::~RoleFiller()

-{

-

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DocGenerator.cxx,v $
+ * $Revision: 1.10 $
+ *
+ * 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): autogen include statement, do not remove
+#include "precompiled_xmlhelp.hxx"
+#include <qe/DocGenerator.hxx>
+#include <qe/Query.hxx>
+
+
+using namespace xmlsearch;
+using namespace xmlsearch::qe;
+
+
+const sal_Int32 NonnegativeIntegerGenerator::END = -1;
+
+
+RoleFiller RoleFiller::roleFiller_;
+
+
+RoleFiller::RoleFiller()
+    : m_nRefcount( 0 ),
+      fixedRole_( 0 ),
+      filled_( 0 ),
+      begin_( 0 ),
+      end_( 0 ),
+      parentContext_( 0 ),
+      limit_( 0 ),
+      next_( 0 ),
+      fillers_( 0 )
+{
+}
+
+
+RoleFiller::~RoleFiller()
+{
+
+}