mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support an initial selection

Browse Source
This commit is contained in:
Frank Schönheit
2000-10-31 07:08:48 +00:00
parent 1c55b4609c
commit a56371eed2
2 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dbaccess/source/ui/inc/unoadmin.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: unoadmin.hxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -94,26 +94,28 @@ protected:
SfxPoolItem** m_pItemPoolDefaults; // pool defaults SfxPoolItem** m_pItemPoolDefaults; // pool defaults
ODsnTypeCollection m_aCollection; // datasource type collection ODsnTypeCollection m_aCollection; // datasource type collection
::rtl::OUString m_sInitialSelection;
protected: protected:
ODatabaseAdministrationDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); ODatabaseAdministrationDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
~ODatabaseAdministrationDialog(); ~ODatabaseAdministrationDialog();
public: public:
// XTypeProvider // XTypeProvider
virtual staruno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(staruno::RuntimeException); virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw(staruno::RuntimeException); virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(staruno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo - static methods // XServiceInfo - static methods
static staruno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( staruno::RuntimeException ); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
static ::rtl::OUString getImplementationName_Static(void) throw( staruno::RuntimeException ); static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
static staruno::Reference< staruno::XInterface > static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL Create(const staruno::Reference< starlang::XMultiServiceFactory >&); SAL_CALL Create(const ::com::sun::star::uno::Reference< starlang::XMultiServiceFactory >&);
// XPropertySet // XPropertySet
virtual staruno::Reference<starbeans::XPropertySetInfo> 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(); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
// OPropertyArrayUsageHelper // OPropertyArrayUsageHelper
@@ -123,6 +125,7 @@ protected:
// OGenericUnoDialog overridables // OGenericUnoDialog overridables
virtual Dialog* createDialog(Window* _pParent); virtual Dialog* createDialog(Window* _pParent);
virtual void destroyDialog(); virtual void destroyDialog();
virtual void implInitialize(const staruno::Any& _rValue);
}; };
//......................................................................... //.........................................................................
@@ -134,6 +137,9 @@ protected:
/************************************************************************* /*************************************************************************
* history: * history:
* $Log: not supported by cvs2svn $ * $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 * Revision 1.2 2000/10/11 11:31:03 fs
* new implementations - still under construction * new implementations - still under construction
* *

54
dbaccess/source/ui/uno/unoadmin.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: unoadmin.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -99,7 +99,7 @@
#endif #endif
// --- // ---
#define THISREF() static_cast< starlang::XServiceInfo* >(this) #define THISREF() static_cast< XServiceInfo* >(this)
using namespace dbaui; 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) :OGenericUnoDialog(_rxORB)
,m_pDatasourceItems(NULL) ,m_pDatasourceItems(NULL)
,m_pItemPool(NULL) ,m_pItemPool(NULL)
@@ -137,38 +141,38 @@ ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog()
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
staruno::Sequence<sal_Int8> SAL_CALL ODatabaseAdministrationDialog::getImplementationId( ) throw(staruno::RuntimeException) Sequence<sal_Int8> SAL_CALL ODatabaseAdministrationDialog::getImplementationId( ) throw(RuntimeException)
{ {
static ::cppu::OImplementationId aId; static ::cppu::OImplementationId aId;
return aId.getImplementationId(); 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)); return *(new ODatabaseAdministrationDialog(_rxFactory));
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseAdministrationDialog::getImplementationName() throw(staruno::RuntimeException) ::rtl::OUString SAL_CALL ODatabaseAdministrationDialog::getImplementationName() throw(RuntimeException)
{ {
return getImplementationName_Static(); 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"); 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(); return getSupportedServiceNames_Static();
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
::comphelper::StringSequence ODatabaseAdministrationDialog::getSupportedServiceNames_Static() throw(staruno::RuntimeException) ::comphelper::StringSequence ODatabaseAdministrationDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{ {
::comphelper::StringSequence aSupported(1); ::comphelper::StringSequence aSupported(1);
aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.DatasourceAdministrationDialog"); aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.DatasourceAdministrationDialog");
@@ -176,9 +180,9 @@ staruno::Reference< staruno::XInterface > SAL_CALL ODatabaseAdministrationDialog
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
staruno::Reference<starbeans::XPropertySetInfo> SAL_CALL ODatabaseAdministrationDialog::getPropertySetInfo() throw(staruno::RuntimeException) Reference<XPropertySetInfo> SAL_CALL ODatabaseAdministrationDialog::getPropertySetInfo() throw(RuntimeException)
{ {
staruno::Reference<starbeans::XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo; return xInfo;
} }
@@ -191,7 +195,7 @@ staruno::Reference<starbeans::XPropertySetInfo> SAL_CALL ODatabaseAdministratio
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* ODatabaseAdministrationDialog::createArrayHelper( ) const ::cppu::IPropertyArrayHelper* ODatabaseAdministrationDialog::createArrayHelper( ) const
{ {
staruno::Sequence< starbeans::Property > aProps; Sequence< Property > aProps;
describeProperties(aProps); describeProperties(aProps);
return new ::cppu::OPropertyArrayHelper(aProps); return new ::cppu::OPropertyArrayHelper(aProps);
} }
@@ -207,7 +211,26 @@ void ODatabaseAdministrationDialog::destroyDialog()
Dialog* ODatabaseAdministrationDialog::createDialog(Window* _pParent) Dialog* ODatabaseAdministrationDialog::createDialog(Window* _pParent)
{ {
ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, &m_aCollection); 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<ODbAdminDialog*>(m_pDialog)->selectDataSource(m_sInitialSelection);
return;
}
}
OGenericUnoDialog::implInitialize(_rValue);
} }
//......................................................................... //.........................................................................
@@ -217,6 +240,9 @@ Dialog* ODatabaseAdministrationDialog::createDialog(Window* _pParent)
/************************************************************************* /*************************************************************************
* history: * history:
* $Log: not supported by cvs2svn $ * $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 * Revision 1.1 2000/10/25 12:56:26 fs
* moved herein from ..\dlg * moved herein from ..\dlg
* *