[Libreoffice-commits] .: unotools/inc unotools/source

[Libreoffice Gerrit user]

 unotools/inc/unotools/textsearch.hxx |   13 +------------
 unotools/source/i18n/textsearch.cxx  |    2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

New commits:
commit ac60fba3b5a506f6659f268a8b4fa8e1da600603
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Oct 18 12:19:04 2012 +0200

    delegating a constructor can't work like this, fdo#55033
    
    Change-Id: I6b057ad68054fe5806daec722b3bfe4e33bc3602

diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx
index 42a9e27..2812ee6 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/unotools/inc/unotools/textsearch.hxx
@@ -71,23 +71,12 @@ private:
     long nTransliterationFlags;
 
 public:
-    SearchParam( const String &rText,
+    SearchParam( const rtl::OUString &rText,
                     SearchType eSrchType = SearchParam::SRCH_NORMAL,
                     sal_Bool bCaseSensitive = sal_True,
                     sal_Bool bWordOnly = sal_False,
                     sal_Bool bSearchInSelection = sal_False );
 
-    // Wrapper to use OUString as parameter
-    SearchParam( const ::rtl::OUString &rText,
-                    SearchType eSrchType = SearchParam::SRCH_NORMAL,
-                    sal_Bool bCaseSensitive = sal_True,
-                    sal_Bool bWordOnly = sal_False,
-                    sal_Bool bSearchInSelection = sal_False )
-    {
-        String rText2(rText);
-        SearchParam( rText2, eSrchType, bCaseSensitive, bWordOnly, bSearchInSelection );
-    }
-
     SearchParam( const SearchParam& );
 
     const String&   GetSrchStr() const          { return sSrchStr; }
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index e0dd061..05eecd8 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -36,7 +36,7 @@ namespace utl
 {
 // ............................................................................
 
-SearchParam::SearchParam( const String &rText,
+SearchParam::SearchParam( const rtl::OUString &rText,
                                 SearchType eType,
                                 sal_Bool bCaseSensitive,
                                 sal_Bool bWrdOnly,