diff options
Diffstat (limited to 'svx/source/form/fmshimp.cxx')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 120bfb174e75..3b13e0402c15 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -268,6 +268,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::script; using namespace ::svxform; using namespace ::svx; +using namespace ::dbtools; //= helper @@ -653,10 +654,10 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) m_xAttachedFrame = _pViewFrame->GetFrame().GetFrameInterface(); // to prevent deletion of this we acquire our refcounter once - ::comphelper::increment(FmXFormShell_BASE::m_refCount); + osl_atomic_increment(&m_refCount); // correct the refcounter - ::comphelper::decrement(FmXFormShell_BASE::m_refCount); + osl_atomic_decrement(&m_refCount); // cache the current configuration settings we're interested in implAdjustConfigCache(); @@ -742,21 +743,6 @@ bool FmXFormShell::IsReadonlyDoc() const return true; } - -Any SAL_CALL FmXFormShell::queryInterface( const Type& type) throw ( RuntimeException, std::exception ) -{ - return FmXFormShell_BASE::queryInterface(type); -} - -Sequence< Type > SAL_CALL FmXFormShell::getTypes( ) throw(RuntimeException, std::exception) -{ - return FmXFormShell_BASE::getTypes(); -} - -Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeException, std::exception) -{ - return css::uno::Sequence<sal_Int8>(); -} // EventListener void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( RuntimeException, std::exception ) @@ -1627,7 +1613,7 @@ bool FmXFormShell::GetY2KState(sal_uInt16& n) Reference< XRowSet> xDB(xForm, UNO_QUERY); DBG_ASSERT(xDB.is(), "FmXFormShell::GetY2KState : current form has no dbform-interface !"); - Reference< XNumberFormatsSupplier> xSupplier( getNumberFormats(OStaticDataAccessTools().getRowSetConnection(xDB), false)); + Reference< XNumberFormatsSupplier> xSupplier( getNumberFormats(getConnection(xDB), false)); if (xSupplier.is()) { Reference< XPropertySet> xSet(xSupplier->getNumberFormatSettings()); @@ -1658,7 +1644,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) Reference< XRowSet > xActiveRowSet( xActiveForm, UNO_QUERY ); if ( xActiveRowSet.is() ) { - Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getRowSetConnection( xActiveRowSet ), false ) ); + Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getConnection( xActiveRowSet ), false ) ); if (xSupplier.is()) { Reference< XPropertySet> xSet(xSupplier->getNumberFormatSettings()); @@ -1698,7 +1684,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) Reference< XRowSet> xElementAsRowSet( xCurrentElement, UNO_QUERY ); if ( xElementAsRowSet.is() ) { - Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getRowSetConnection( xElementAsRowSet ), false ) ); + Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getConnection( xElementAsRowSet ), false ) ); if (!xSupplier.is()) continue; @@ -2106,7 +2092,7 @@ void FmXFormShell::startListening() return; Reference< XRowSet> xDatabaseForm(m_xActiveForm, UNO_QUERY); - if (xDatabaseForm.is() && getRowSetConnection(xDatabaseForm).is()) + if (xDatabaseForm.is() && getConnection(xDatabaseForm).is()) { Reference< XPropertySet> xActiveFormSet(m_xActiveForm, UNO_QUERY); if (xActiveFormSet.is()) @@ -2747,8 +2733,8 @@ bool FmXFormShell::IsPropBrwOpen() const if ( impl_checkDisposed() ) return false; - return( ( m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() ) ? - m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow(SID_FM_SHOW_PROPERTIES) : sal_False ); + return m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() + && m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow(SID_FM_SHOW_PROPERTIES); } @@ -3826,7 +3812,7 @@ namespace try { Reference< XConnection > xConn; - if ( OStaticDataAccessTools().isEmbeddedInDatabase( _rxLoadable.get(), xConn ) ) + if ( isEmbeddedInDatabase( _rxLoadable.get(), xConn ) ) return true; // is there already a active connection |