From db02ac8b89b8ec1e3d84f2676665667916582423 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Fri, 12 Feb 2010 16:56:44 +0100
Subject: changefileheader2: #i10000#: convert files with CR/LF characters to
 CR only

---
 .../source/cxxhelp/provider/resultsetforquery.cxx  | 74 +++++++++++-----------
 1 file changed, 37 insertions(+), 37 deletions(-)

(limited to 'xmlhelp')

diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index ea812266f6e0..055b59048722 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -43,8 +43,8 @@
 #define INCLUDED_STL_SET
 #endif
 
-#include <qe/Query.hxx>
-#include <qe/DocGenerator.hxx>
+#include <qe/Query.hxx>
+#include <qe/DocGenerator.hxx>
 #include "resultsetforquery.hxx"
 #include "databases.hxx"
 
@@ -158,8 +158,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
             try
             {
                 vector< vector<HitItem>* > aQueryListResultVectorVector;
-                set< rtl::OUString > aSet,aCurrent,aResultSet;
-
+                set< rtl::OUString > aSet,aCurrent,aResultSet;
+
                 int nQueryListSize = queryList.size();
                 if( nQueryListSize > 1 )
                     hitCount = 2000;
@@ -178,25 +178,25 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
                     }
                     pQueryResultVector->reserve( hitCount );
 
-                    int nParamCount = bCaptionsOnly ? 7 : 6;
-                    Sequence<uno::Any> aParamsSeq( nParamCount );
-
-                    aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
-                    aParamsSeq[1] = uno::makeAny( m_aURLParameter.get_language() );
-                    
-                    aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-index" ) );
-                    rtl::OUString aSystemPath;
-                    osl::FileBase::getSystemPathFromFileURL( idxDir, aSystemPath );
-                    aParamsSeq[3] = uno::makeAny( aSystemPath );
-
-                    aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-query" ) );
-
-                    const std::vector< rtl::OUString >& aListItem = queryList[i];
-                    ::rtl::OUString aNewQueryStr = aListItem[0];
-                    aParamsSeq[5] = uno::makeAny( aNewQueryStr );
-
-                    if( bCaptionsOnly )
-                        aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-caption" ) );
+                    int nParamCount = bCaptionsOnly ? 7 : 6;
+                    Sequence<uno::Any> aParamsSeq( nParamCount );
+
+                    aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+                    aParamsSeq[1] = uno::makeAny( m_aURLParameter.get_language() );
+
+                    aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-index" ) );
+                    rtl::OUString aSystemPath;
+                    osl::FileBase::getSystemPathFromFileURL( idxDir, aSystemPath );
+                    aParamsSeq[3] = uno::makeAny( aSystemPath );
+
+                    aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-query" ) );
+
+                    const std::vector< rtl::OUString >& aListItem = queryList[i];
+                    ::rtl::OUString aNewQueryStr = aListItem[0];
+                    aParamsSeq[5] = uno::makeAny( aNewQueryStr );
+
+                    if( bCaptionsOnly )
+                        aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-caption" ) );
 
                     Sequence< sal_Int16 > aOutParamIndex;
                     Sequence< uno::Any > aOutParam;
@@ -245,22 +245,22 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
                         }
                     }
 
-                    // intersect
+                    // intersect
                     if( nQueryListSize > 1 )
                     {
-                        if( i == 0 )
-                        {
-                            aResultSet = aSet;
-                        }
-                        else
-                        {
-                            aCurrent = aResultSet;
-                            aResultSet.clear();
-                            set_intersection( aSet.begin(),aSet.end(),
-                                              aCurrent.begin(),aCurrent.end(),
-                                              inserter(aResultSet,aResultSet.begin()));
-                        }
-                    }
+                        if( i == 0 )
+                        {
+                            aResultSet = aSet;
+                        }
+                        else
+                        {
+                            aCurrent = aResultSet;
+                            aResultSet.clear();
+                            set_intersection( aSet.begin(),aSet.end(),
+                                              aCurrent.begin(),aCurrent.end(),
+                                              inserter(aResultSet,aResultSet.begin()));
+                        }
+                    }
                 }
 
                 // Combine results in aIndexFolderResultVector
-- 
cgit