From 0666e43c45876199ddc71e378554878cca6f0539 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 2 Nov 2012 15:13:28 +0200
Subject: fdo#46808, use service constructor for i18n::CharacterClassification

Change-Id: I0499ad7de27b1539e97f01ab8aa0ef2d6713ae76
---
 forms/source/component/Filter.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'forms')

diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 298bf90cae4c..ba3f208f99a2 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -57,6 +57,7 @@
 #include <com/sun/star/awt/XItemList.hpp>
 
 #include <comphelper/numbers.hxx>
+#include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <connectivity/dbtools.hxx>
@@ -102,7 +103,7 @@ namespace frm
     OFilterControl::OFilterControl( const Reference< XMultiServiceFactory >& _rxORB )
         :UnoControl( _rxORB )
         ,m_aTextListeners( *this )
-        ,m_aParser( _rxORB )
+        ,m_aParser( comphelper::getComponentContext(_rxORB) )
         ,m_nControlClass( FormComponentType::TEXTFIELD )
         ,m_bFilterList( sal_False )
         ,m_bMultiLine( sal_False )
@@ -348,7 +349,7 @@ namespace frm
                         sItemText = itemPos->second;
                         if ( !sItemText.isEmpty() )
                         {
-                            ::dbtools::OPredicateInputController aPredicateInput( maContext.getLegacyServiceFactory(), m_xConnection, getParseContext() );
+                            ::dbtools::OPredicateInputController aPredicateInput( maContext.getUNOContext(), m_xConnection, getParseContext() );
                             ::rtl::OUString sErrorMessage;
                             OSL_VERIFY( aPredicateInput.normalizePredicateString( sItemText, m_xField, &sErrorMessage ) );
                         }
@@ -533,7 +534,7 @@ namespace frm
             aNewText.trim();
             if ( !aNewText.isEmpty() )
             {
-                ::dbtools::OPredicateInputController aPredicateInput( maContext.getLegacyServiceFactory(), m_xConnection, getParseContext() );
+                ::dbtools::OPredicateInputController aPredicateInput( maContext.getUNOContext(), m_xConnection, getParseContext() );
                 ::rtl::OUString sErrorMessage;
                 if ( !aPredicateInput.normalizePredicateString( aNewText, m_xField, &sErrorMessage ) )
                 {
-- 
cgit