diff options
Diffstat (limited to 'svx/source/form/fmpgeimp.cxx')
| -rw-r--r-- | svx/source/form/fmpgeimp.cxx | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 7c7edd7a3111..463ad07e6b09 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -28,7 +28,6 @@ #include "formcontrolfactory.hxx" #include "svx/svditer.hxx" #include "svx/fmresids.hrc" -#include "svx/dbtoolsclient.hxx" #include "treevisitor.hxx" #include <com/sun/star/sdb/CommandType.hpp> @@ -49,6 +48,7 @@ #include <comphelper/uno3.hxx> #include <comphelper/types.hxx> #include <unotools/streamwrap.hxx> +#include <connectivity/dbtools.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -63,6 +63,7 @@ using ::com::sun::star::container::XMap; using ::com::sun::star::container::EnumerableMap; using ::com::sun::star::drawing::XControlShape; using namespace ::svxform; +using namespace ::dbtools; FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage ) @@ -79,7 +80,7 @@ namespace class FormComponentInfo { public: - size_t childCount( const Reference< XInterface >& _component ) const + static size_t childCount( const Reference< XInterface >& _component ) { Reference< XIndexAccess > xContainer( _component, UNO_QUERY ); if ( xContainer.is() ) @@ -87,7 +88,7 @@ namespace return 0; } - Reference< XInterface > getChild( const Reference< XInterface >& _component, size_t _index ) const + static Reference< XInterface > getChild( const Reference< XInterface >& _component, size_t _index ) { Reference< XIndexAccess > xContainer( _component, UNO_QUERY_THROW ); return Reference< XInterface >( xContainer->getByIndex( _index ), UNO_QUERY ); @@ -103,24 +104,22 @@ namespace { } - size_t childCount( const FormComponentPair& _components ) const + static size_t childCount( const FormComponentPair& _components ) { - size_t lhsCount = m_aComponentInfo.childCount( _components.first ); - size_t rhsCount = m_aComponentInfo.childCount( _components.second ); + size_t lhsCount = FormComponentInfo::childCount( _components.first ); + size_t rhsCount = FormComponentInfo::childCount( _components.second ); if ( lhsCount != rhsCount ) throw RuntimeException( "Found inconsistent form component hierarchies (1)!" ); return lhsCount; } - FormComponentPair getChild( const FormComponentPair& _components, size_t _index ) const + static FormComponentPair getChild( const FormComponentPair& _components, size_t _index ) { return FormComponentPair( - m_aComponentInfo.getChild( _components.first, _index ), - m_aComponentInfo.getChild( _components.second, _index ) + FormComponentInfo::getChild( _components.first, _index ), + FormComponentInfo::getChild( _components.second, _index ) ); } - private: - FormComponentInfo m_aComponentInfo; }; typedef ::std::map< Reference< XControlModel >, Reference< XControlModel >, ::comphelper::OInterfaceCompare< XControlModel > > MapControlModels; @@ -575,7 +574,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( Reference< XConnection > xFormConnection; xFormProps->getPropertyValue( FM_PROP_ACTIVE_CONNECTION ) >>= xFormConnection; if ( !xFormConnection.is() ) - OStaticDataAccessTools().isEmbeddedInDatabase( xFormProps, xFormConnection ); + isEmbeddedInDatabase( xFormProps, xFormConnection ); if (xFormConnection.is()) { Reference< XChild > xConnAsChild(xFormConnection, UNO_QUERY); |