diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:59:26 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:59:26 +0000 |
| commit | 0c76ceb4baa41c74d167797fbb14db5de0e55659 (patch) | |
| tree | f61ae0819b31a0d0f7723a8f5f2d852786440f55 /dbaccess/source | |
| parent | 67979d3638e3b447a6cb4e93419cf18d82473961 (diff) | |
INTEGRATION: CWS dba30b (1.16.24); FILE MERGED
2008/04/15 22:13:48 fs 1.16.24.2: RESYNC: (1.16-1.17); FILE MERGED
2008/03/16 14:05:51 fs 1.16.24.1: #i86996# support for passing additional parameters
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/inc/linkeddocuments.hxx | 100 |
1 files changed, 57 insertions, 43 deletions
diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index a58f557c8df5..8807e3b71840 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: linkeddocuments.hxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.18 $ * * This file is part of OpenOffice.org. * @@ -31,6 +31,8 @@ #ifndef _DBAUI_LINKEDDOCUMENTS_HXX_ #define _DBAUI_LINKEDDOCUMENTS_HXX_ +#include "AppElementType.hxx" + #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> #endif @@ -59,6 +61,9 @@ #ifndef _STRING_HXX #include <tools/string.hxx> #endif +#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX +#include <comphelper/namedvaluecollection.hxx> +#endif class Window; //...................................................................... @@ -96,47 +101,42 @@ namespace dbaui ); ~OLinkedDocumentsAccess(); - enum EOpenMode - { - OPEN_NORMAL, - OPEN_DESIGN, - OPEN_FORMAIL - }; - inline sal_Bool isConnected() const { return m_xConnection.is(); } - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> open(const ::rtl::OUString& _rLinkName - ,::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition - , EOpenMode _eOpenMode = OPEN_NORMAL); - - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> newDocument(sal_Int32 _nNewFormId - ,::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition - ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _sObjectName); - - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> newWithPilot( - const char* _pWizardService - ,::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition - ,const sal_Int32 _nCommandType = -1 - ,const ::rtl::OUString& _rObjectName = ::rtl::OUString() - ); - - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> newFormWithPilot( - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition - ,const sal_Int32 _nCommandType = -1 - ,const ::rtl::OUString& _rObjectName = ::rtl::OUString() - ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> newReportWithPilot( - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition - ,const sal_Int32 _nCommandType = -1 - ,const ::rtl::OUString& _rObjectName = ::rtl::OUString() - ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> newQueryWithPilot( - const sal_Int32 _nCommandType = -1 - ,const ::rtl::OUString& _rObjectName = ::rtl::OUString() - ); - - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> newTableWithPilot(); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> + open( + const ::rtl::OUString& _rLinkName, + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition, + ElementOpenMode _eOpenMode, + const ::comphelper::NamedValueCollection& _rAdditionalArgs + ); + + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + newDocument( + sal_Int32 _nNewFormId, + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _sObjectName + ); + + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + newFormWithPilot( + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition, + const sal_Int32 _nCommandType = -1, + const ::rtl::OUString& _rObjectName = ::rtl::OUString() + ); + + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + newReportWithPilot( + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition, + const sal_Int32 _nCommandType = -1, + const ::rtl::OUString& _rObjectName = ::rtl::OUString() + ); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + newQueryWithPilot(); + + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + newTableWithPilot(); enum RESULT { @@ -144,9 +144,23 @@ namespace dbaui SUCCESS, CANCEL }; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> implOpen(const ::rtl::OUString& _rLinkName - ,::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition - , EOpenMode _eOpenMode); + private: + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + impl_open( + const ::rtl::OUString& _rLinkName, + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition, + ElementOpenMode _eOpenMode, + const ::comphelper::NamedValueCollection& _rAdditionalArgs + ); + + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + impl_newWithPilot( + const char* _pWizardService, + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _xDefinition, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _rObjectName + ); + }; //...................................................................... |