diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 1924ea45930b..4d2be4be689f 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unoadmin.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: fs $ $Date: 2000-10-25 12:49:14 $ + * last change: $Author: fs $ $Date: 2000-10-31 08:07:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,26 +94,28 @@ protected: SfxPoolItem** m_pItemPoolDefaults; // pool defaults ODsnTypeCollection m_aCollection; // datasource type collection + ::rtl::OUString m_sInitialSelection; + protected: ODatabaseAdministrationDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); ~ODatabaseAdministrationDialog(); public: // XTypeProvider - virtual staruno::Sequence SAL_CALL getImplementationId( ) throw(staruno::RuntimeException); + virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(staruno::RuntimeException); - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(staruno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static staruno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( staruno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( staruno::RuntimeException ); - static staruno::Reference< staruno::XInterface > - SAL_CALL Create(const staruno::Reference< starlang::XMultiServiceFactory >&); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + SAL_CALL Create(const ::com::sun::star::uno::Reference< starlang::XMultiServiceFactory >&); // XPropertySet - virtual staruno::Reference SAL_CALL getPropertySetInfo() throw(staruno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // OPropertyArrayUsageHelper @@ -123,6 +125,7 @@ protected: // OGenericUnoDialog overridables virtual Dialog* createDialog(Window* _pParent); virtual void destroyDialog(); + virtual void implInitialize(const staruno::Any& _rValue); }; //......................................................................... @@ -134,6 +137,9 @@ protected: /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.1 2000/10/25 12:49:14 fs + * moved herein from ..\dlg + * * Revision 1.2 2000/10/11 11:31:03 fs * new implementations - still under construction * diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index fd2a1afaec15..f10fac291b7c 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoadmin.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: fs $ $Date: 2000-10-27 08:08:47 $ + * last change: $Author: fs $ $Date: 2000-10-31 08:08:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,7 +99,7 @@ #endif // --- -#define THISREF() static_cast< starlang::XServiceInfo* >(this) +#define THISREF() static_cast< XServiceInfo* >(this) using namespace dbaui; @@ -113,9 +113,13 @@ namespace dbaui { //......................................................................... + using namespace ::com::sun::star::uno; + using namespace ::com::sun::star::lang; + using namespace ::com::sun::star::beans; + //========================================================================= //------------------------------------------------------------------------- -ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const staruno::Reference< starlang::XMultiServiceFactory >& _rxORB) +ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XMultiServiceFactory >& _rxORB) :OGenericUnoDialog(_rxORB) ,m_pDatasourceItems(NULL) ,m_pItemPool(NULL) @@ -137,38 +141,38 @@ ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog() } //------------------------------------------------------------------------- -staruno::Sequence SAL_CALL ODatabaseAdministrationDialog::getImplementationId( ) throw(staruno::RuntimeException) +Sequence SAL_CALL ODatabaseAdministrationDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } //------------------------------------------------------------------------- -staruno::Reference< staruno::XInterface > SAL_CALL ODatabaseAdministrationDialog::Create(const staruno::Reference< starlang::XMultiServiceFactory >& _rxFactory) +Reference< XInterface > SAL_CALL ODatabaseAdministrationDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new ODatabaseAdministrationDialog(_rxFactory)); } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseAdministrationDialog::getImplementationName() throw(staruno::RuntimeException) +::rtl::OUString SAL_CALL ODatabaseAdministrationDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString ODatabaseAdministrationDialog::getImplementationName_Static() throw(staruno::RuntimeException) +::rtl::OUString ODatabaseAdministrationDialog::getImplementationName_Static() throw(RuntimeException) { return ::rtl::OUString::createFromAscii("org.openoffice.comp.sdb.ODatabaseAdministrationDialog"); } //------------------------------------------------------------------------- -::comphelper::StringSequence SAL_CALL ODatabaseAdministrationDialog::getSupportedServiceNames() throw(staruno::RuntimeException) +::comphelper::StringSequence SAL_CALL ODatabaseAdministrationDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------- -::comphelper::StringSequence ODatabaseAdministrationDialog::getSupportedServiceNames_Static() throw(staruno::RuntimeException) +::comphelper::StringSequence ODatabaseAdministrationDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.DatasourceAdministrationDialog"); @@ -176,9 +180,9 @@ staruno::Reference< staruno::XInterface > SAL_CALL ODatabaseAdministrationDialog } //------------------------------------------------------------------------- -staruno::Reference SAL_CALL ODatabaseAdministrationDialog::getPropertySetInfo() throw(staruno::RuntimeException) +Reference SAL_CALL ODatabaseAdministrationDialog::getPropertySetInfo() throw(RuntimeException) { - staruno::Reference xInfo( createPropertySetInfo( getInfoHelper() ) ); + Reference xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } @@ -191,7 +195,7 @@ staruno::Reference SAL_CALL ODatabaseAdministratio //------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* ODatabaseAdministrationDialog::createArrayHelper( ) const { - staruno::Sequence< starbeans::Property > aProps; + Sequence< Property > aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } @@ -207,7 +211,26 @@ void ODatabaseAdministrationDialog::destroyDialog() Dialog* ODatabaseAdministrationDialog::createDialog(Window* _pParent) { ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, &m_aCollection); - return new ODbAdminDialog(_pParent, m_pDatasourceItems, m_xORB); + ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_xORB); + pDialog->selectDataSource(m_sInitialSelection); + return pDialog; +} + +//------------------------------------------------------------------------------ +void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue) +{ + starbeans::PropertyValue aProperty; + if (_rValue >>= aProperty) + { + if (aProperty.Name.equalsAsciiL("InitialSelection", sizeof("InitialSelection") - 1)) + { + aProperty.Value >>= m_sInitialSelection; + if (m_pDialog) + static_cast(m_pDialog)->selectDataSource(m_sInitialSelection); + return; + } + } + OGenericUnoDialog::implInitialize(_rValue); } //......................................................................... @@ -217,6 +240,9 @@ Dialog* ODatabaseAdministrationDialog::createDialog(Window* _pParent) /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.2 2000/10/27 08:08:47 fs + * don't include stringconstants.hrc directly anymore + * * Revision 1.1 2000/10/25 12:56:26 fs * moved herein from ..\dlg *