User: rt Date: 2007-07-06 08:29:22+0000 Modified: dba/dbaccess/source/ui/inc/dlgsave.hxx
Log: INTEGRATION: CWS oj14 (1.9.8); FILE MERGED 2006/11/08 13:43:43 oj 1.9.8.4: merge conflicts 2006/11/07 09:26:04 oj 1.9.8.3: RESYNC: (1.9-1.11); FILE MERGED 2006/11/07 07:32:41 oj 1.9.8.2: moved Issue number: Submitted by: Reviewed by: 2006/01/03 08:46:17 oj 1.9.8.1: moved to inc 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.11&r2=1.12 Delta lines: +24 -41 --------------------- --- dlgsave.hxx 2006-08-28 15:07:49+0000 1.11 +++ dlgsave.hxx 2007-07-06 08:29:20+0000 1.12 @@ -32,33 +32,34 @@ * MA 02111-1307 USA * ************************************************************************/ + #ifndef DBAUI_DLGSAVE_HXX #define DBAUI_DLGSAVE_HXX +#ifndef _DBASHARED_APITOOLS_HXX_ +#include "apitools.hxx" +#endif #ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> #endif -#ifndef _BUTTON_HXX //autogen -#include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen -#include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen -#include <vcl/edit.hxx> -#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 -#ifndef DBAUI_SQLNAMEEDIT_HXX -#include "SqlNameEdit.hxx" -#endif + +namespace com { namespace sun { namespace star { + namespace container { + class XNameAccess; + class XHierarchicalNameAccess; + } + namespace sdbc { + class XDatabaseMetaData; + class XConnection; + } +}}} + #define SAD_DEFAULT 0x0000 #define SAD_ADDITIONAL_DESCRIPTION 0x0001 @@ -67,36 +68,17 @@ #define SAD_TITLE_PASTE_AS 0x0100 #define SAD_TITLE_RENAME 0x0200 +class Button; +class Edit; namespace dbaui { + class OSaveAsDlgImpl; class IObjectNameCheck; class OSaveAsDlg : public ModalDialog { private: - FixedText m_aDescription; - FixedText m_aCatalogLbl; - OSQLNameComboBox m_aCatalog; - FixedText m_aSchemaLbl; - OSQLNameComboBox m_aSchema; - FixedText m_aLabel; - OSQLNameEdit m_aTitle; - OKButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_HELP; - String m_aQryLabel; - String m_sTblLabel; - rtl::OUString m_sCatalog; - rtl::OUString m_sSchema; - String m_aName; - - const IObjectNameCheck& - m_rObjectNameCheck; + OSaveAsDlgImpl* m_pImpl; ::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::lang::XMultiServiceFactory >& _rxORB, @@ -111,10 +93,11 @@ const String& _sLabel, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); + virtual ~OSaveAsDlg(); - String getName() const { return m_aName; } - String getCatalog() const { return m_aCatalog.IsVisible() ? m_aCatalog.GetText() : String(m_sCatalog); } - String getSchema() const { return m_aSchema.IsVisible() ? m_aSchema.GetText() : String(m_sSchema); } + String getName() const; + String getCatalog() const; + String getSchema() const; private: DECL_LINK(ButtonClickHdl, Button *); DECL_LINK(EditModifyHdl, Edit * ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
