1 files changed, 8 insertions, 7 deletions

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index bd8baf20b71c..0d90129f74d8 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -86,6 +86,7 @@ using namespace ::com::sun::star::container;
 using namespace ::cppu;
 using namespace ::svxform;
 using namespace ::svx;
+using namespace ::dbtools;
 
 OUString FieldServiceFromId(sal_Int32 nID)
 {
@@ -281,7 +282,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
             try
             {
                 OUString sSignificantSource( sDatasource.isEmpty() ? sDatabaseLocation : sDatasource );
-                xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, OUString(), OUString(),
+                xConnection = getConnection_withFeedback(sSignificantSource, OUString(), OUString(),
                                   static_cast<FmGridControl*>(GetParent())->getContext() );
             }
             catch(NoSuchElementException&)
@@ -393,7 +394,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
     try
     {
         // need number formats
-        Reference< XNumberFormatsSupplier > xSupplier = OStaticDataAccessTools().getNumberFormats(xConnection, true);
+        Reference< XNumberFormatsSupplier > xSupplier = getNumberFormats(xConnection, true);
         Reference< XNumberFormats >  xNumberFormats;
         if (xSupplier.is())
             xNumberFormats = xSupplier->getNumberFormats();
@@ -548,7 +549,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
 
         FormControlFactory aControlFactory;
         aControlFactory.initializeControlModel( DocumentClassification::classifyHostDocument( xCols ), xCol );
-        aControlFactory.initializeFieldDependentProperties( xField, xCol, xNumberFormats );
+        FormControlFactory::initializeFieldDependentProperties( xField, xCol, xNumberFormats );
 
         xCol->setPropertyValue(FM_PROP_CONTROLSOURCE, makeAny(sFieldName));
         if ( xSecondCol.is() )
@@ -919,7 +920,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
                 // ein paar Properties hinueberretten
                 Reference< XPropertySet > xReplaced( xCols->getByIndex( nPos ), UNO_QUERY );
 
-                OStaticDataAccessTools().TransferFormComponentProperties(
+                TransferFormComponentProperties(
                     xReplaced, xNewCol, Application::GetSettings().GetUILanguageTag().getLocale() );
 
                 xCols->replaceByIndex( nPos, makeAny( xNewCol ) );
@@ -961,7 +962,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
         if ( eInspectorAction != eNone )
         {
             FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
-            SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True );
+            SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction != eCloseInspector );
 
             pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON,
                                       &aIFaceItem, &aShowItem, 0L );
@@ -1431,14 +1432,14 @@ void FmGridControl::markColumn(sal_uInt16 nId)
         // deselektieren
         if (m_nMarkedColumnId != BROWSER_INVALIDID)
         {
-            HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(m_nMarkedColumnId) & ~HIB_FLAT;
+            HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(m_nMarkedColumnId) & ~HeaderBarItemBits::FLAT;
             GetHeaderBar()->SetItemBits(m_nMarkedColumnId, aBits);
         }
 
 
         if (nId != BROWSER_INVALIDID)
         {
-            HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(nId) | HIB_FLAT;
+            HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(nId) | HeaderBarItemBits::FLAT;
             GetHeaderBar()->SetItemBits(nId, aBits);
         }
         m_nMarkedColumnId = nId;