User: obo Date: 2006/07/10 08:32:09 Modified: dba/dbaccess/source/ui/inc/dlgsave.hxx
Log: INTEGRATION: CWS qiq (1.9.124); FILE MERGED 2006/05/17 11:46:46 fs 1.9.124.1: refactored OSaveAsDlg in preparation of #i51143# File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dlgsave.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dlgsave.hxx?r1=1.9&r2=1.10 Delta lines: +16 -25 --------------------- --- dlgsave.hxx 8 Sep 2005 15:53:21 -0000 1.9 +++ dlgsave.hxx 10 Jul 2006 15:32:07 -0000 1.10 @@ -47,15 +47,12 @@ #ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> #endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ -#include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HPP_ -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#endif #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #endif +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> #endif @@ -64,8 +61,7 @@ #endif #define SAD_DEFAULT 0x0000 -#define SAD_OVERWRITE 0x0001 -#define SAD_ADDITIONAL_DESCRIPTION 0x0002 +#define SAD_ADDITIONAL_DESCRIPTION 0x0001 #define SAD_TITLE_STORE_AS 0x0000 #define SAD_TITLE_PASTE_AS 0x0100 @@ -73,6 +69,7 @@ namespace dbaui { + class IObjectNameCheck; class OSaveAsDlg : public ModalDialog { private: @@ -89,33 +86,27 @@ String m_aQryLabel; String m_sTblLabel; String m_aName; - String m_aExists; - String m_aExistsOverwrite; - String m_sParentURL; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xNames; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess> m_xHierarchyNames; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + const IObjectNameCheck& + m_rObjectNameCheck; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; sal_Int32 m_nType; sal_Int32 m_nFlags; public: OSaveAsDlg( Window * pParent,const sal_Int32& _rType, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMetaData, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const String& rDefault, + const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); - OSaveAsDlg( Window * pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxNames, - const String& rDefault, - const String& _sLabel, - sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); - OSaveAsDlg( Window * pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess>& _rxNames, - const String& rDefault, + + OSaveAsDlg( Window* _pParent, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const String& _rDefault, const String& _sLabel, - const String& _sParentURL, + const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); String getName() const { return m_aName; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
