re-base on ALv2 code. Includes:

Patches from Herbert Duerr:
#i118925# fix old word-boundary emulation
http://svn.apache.org/viewvc?view=revision&revision=1301596
#i119031# preserving ASCII in ignore-* transliterations allows full SIMPLE_TRANS_MASK
http://svn.apache.org/viewvc?view=revision&revision=1301104
#i118887# ignore zero-length matches in regexp search
http://svn.apache.org/viewvc?view=revision&revision=1242235
fix transliteration flags for search pattern preprocessing
http://svn.apache.org/viewvc?view=revision&revision=1236199
fix minor typo in comment
http://svn.apache.org/viewvc?view=revision&revision=1234799
improve standard conformance regarding unicode UAX#29 word boundaries
http://svn.apache.org/viewvc?view=revision&revision=1234786
emulate word boundary matching of old regex engine
The new ICU regex engine has much improved unicode capabilities.
The old regex engine had the extensions \< and \> for matching word boundaries.
For the convenience of a smooth upgrade experience these artifacts now get mapped
to \b which is supported by almost all regex engines.
http://svn.apache.org/viewvc?view=revision&revision=1234777
#i118723# fill in regexp matcher group details
http://svn.apache.org/viewvc?view=revision&revision=1228084
use ICU regexp instead of LGPL i18nregexp
http://svn.apache.org/viewvc?view=revision&revision=1177610
#i119031# default to preserve ASCII in ignore-width transliteration
http://svn.apache.org/viewvc?view=revision&revision=1301101

1 files changed, 21 insertions, 31 deletions

diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index ca28435945f5..8bd86a586682 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -1,38 +1,28 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * 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.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef INCLUDED_I18NPOOL_TEXTSEARCH_HXX
 #define INCLUDED_I18NPOOL_TEXTSEARCH_HXX
 
-
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/util/XTextSearch.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <cppuhelper/implbase2.hxx>     // helper for implementations
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -40,13 +30,13 @@
 
 #include <map>
 
-class Regexpr;
+#include <unicode/regex.h>
+using namespace U_ICU_NAMESPACE;
+typedef U_ICU_NAMESPACE::UnicodeString IcuUniString;
+
 class WLevDistance;
 typedef ::std::map< sal_Unicode, sal_Int32 > TextSearchJumpTable;
 
-//  ----------------------------------------------------
-//  class SearchClass
-//  ----------------------------------------------------
 class TextSearch: public cppu::WeakImplHelper2
 <
     ::com::sun::star::util::XTextSearch,
@@ -95,7 +85,7 @@ class TextSearch: public cppu::WeakImplHelper2
                             throw(::com::sun::star::uno::RuntimeException);
 
     // Members and methods for the regular expression search
-    Regexpr* pRegExp;
+    RegexMatcher* pRegexMatcher;
     ::com::sun::star::util::SearchResult SAL_CALL
         RESrchFrwrd( const ::rtl::OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos )
@@ -104,6 +94,7 @@ class TextSearch: public cppu::WeakImplHelper2
         RESrchBkwrd( const ::rtl::OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos )
                             throw(::com::sun::star::uno::RuntimeException);
+    void RESrchPrepare( const ::com::sun::star::util::SearchOptions&);
 
     // Members and methods for the "Weight Levenshtein-Distance" search
     int nLimit;
@@ -152,7 +143,6 @@ public:
                 throw( ::com::sun::star::uno::RuntimeException );
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */