1 files changed, 12 insertions, 13 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index f2fbe0abf589..07dca8d9beca 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -65,12 +65,12 @@
 #include <vcl/settings.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
+#include <connectivity/sqlnode.hxx>
 
 #include <math.h>
 #include <stdio.h>
 
 using namespace ::connectivity;
-using namespace ::connectivity::simple;
 using namespace ::svxform;
 using namespace ::comphelper;
 using namespace ::svt;
@@ -1802,9 +1802,8 @@ OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::X
 
     if ( !rpFormatter.get() )
     {
-        DBToolsObjectFactory aFactory;
-        rpFormatter = aFactory.createFormattedColumnValue(
-            m_xContext, getCursor(), Reference< XPropertySet >( _rxField, UNO_QUERY ) );
+        rpFormatter = ::std::unique_ptr< FormattedColumnValue> (
+            new FormattedColumnValue(m_xContext, getCursor(), Reference< XPropertySet >( _rxField, UNO_QUERY ) ) );
         OSL_ENSURE( rpFormatter.get(), "DbPatternField::Init: no value formatter!" );
     }
     else
@@ -2909,8 +2908,8 @@ bool DbFilterField::commitControl()
             OUString aErrorMsg;
             Reference< XNumberFormatter >  xNumberFormatter(m_rColumn.GetParent().getNumberFormatter());
 
-            ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree(aErrorMsg, aNewText,xNumberFormatter, m_rColumn.GetField());
-            if (xParseNode.is())
+            std::shared_ptr< OSQLParseNode > pParseNode = predicateTree(aErrorMsg, aNewText,xNumberFormatter, m_rColumn.GetField());
+            if (pParseNode != nullptr)
             {
                 OUString aPreparedText;
 
@@ -2920,7 +2919,7 @@ bool DbFilterField::commitControl()
                     Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY);
                 Reference< XConnection >  xConnection(getConnection(xDataSourceRowSet));
 
-                xParseNode->parseNodeToPredicateStr(aPreparedText,
+                pParseNode->parseNodeToPredicateStr(aPreparedText,
                                                     xConnection,
                                                     xNumberFormatter,
                                                     m_rColumn.GetField(),
@@ -3709,7 +3708,7 @@ OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException, std::exception
 }
 
 
-OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXEditCell::getSelectedText() throw( RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3732,7 +3731,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection&
 }
 
 
-::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection( void ) throw( RuntimeException, std::exception )
+::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3744,7 +3743,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection&
 }
 
 
-sal_Bool SAL_CALL FmXEditCell::isEditable( void ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FmXEditCell::isEditable() throw( RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4652,7 +4651,7 @@ OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException, std::excepti
 }
 
 
-OUString SAL_CALL FmXFilterCell::getSelectedText( void ) throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXFilterCell::getSelectedText() throw( RuntimeException, std::exception )
 {
     return getText();
 }
@@ -4663,13 +4662,13 @@ void SAL_CALL FmXFilterCell::setSelection( const ::com::sun::star::awt::Selectio
 }
 
 
-::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection( void ) throw( RuntimeException, std::exception )
+::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection() throw( RuntimeException, std::exception )
 {
     return ::com::sun::star::awt::Selection();
 }
 
 
-sal_Bool SAL_CALL FmXFilterCell::isEditable( void ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FmXFilterCell::isEditable() throw( RuntimeException, std::exception )
 {
     return sal_True;
 }