Tag: cws_src680_oj14 User: oj Date: 2006/11/08 05:43:45 Modified: dba/dbaccess/source/ui/dlg/dlgsave.cxx dba/dbaccess/source/ui/inc/databaseobjectview.hxx dba/dbaccess/source/ui/inc/dlgsave.hxx
Log: merge conflicts File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dlgsave.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dlgsave.cxx?r1=1.26.8.4&r2=1.26.8.5 Delta lines: +15 -90 --------------------- --- dlgsave.cxx 7 Nov 2006 09:22:23 -0000 1.26.8.4 +++ dlgsave.cxx 8 Nov 2006 13:43:43 -0000 1.26.8.5 @@ -4,9 +4,9 @@ * * $RCSfile: dlgsave.cxx,v $ * - * $Revision: 1.26.8.4 $ + * $Revision: 1.26.8.5 $ * - * last change: $Author: oj $ $Date: 2006/11/07 09:22:23 $ + * last change: $Author: oj $ $Date: 2006/11/08 13:43:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -126,31 +126,19 @@ String m_aName; const IObjectNameCheck& m_rObjectNameCheck; - 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; sal_Int32 m_nType; sal_Int32 m_nFlags; OSaveAsDlgImpl( 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::sdbc::XConnection>& _xConnection, const String& rDefault, + const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); OSaveAsDlgImpl( Window * pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxNames, - const String& rDefault, - const String& _sLabel, - sal_Int32 _nFlags); - OSaveAsDlgImpl( Window * pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess>& _rxNames, const String& rDefault, - const String& _sLabel, - const String& _sParentURL, + const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); }; // ----------------------------------------------------------------------------- @@ -158,10 +146,9 @@ // ----------------------------------------------------------------------------- OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, const sal_Int32& _rType, - const Reference<XNameAccess>& _rxNames, - const Reference< XDatabaseMetaData>& _rxMetaData, const Reference< XConnection>& _xConnection, const String& rDefault, + const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags) :m_aDescription(_pParent, ResId (FT_DESCRIPTION)) ,m_aCatalogLbl(_pParent, ResId (FT_CATALOG)) @@ -175,13 +162,9 @@ ,m_aPB_HELP(_pParent, ResId( PB_HELP)) ,m_aQryLabel(ResId(STR_QRY_LABEL)) ,m_sTblLabel(ResId(STR_TBL_LABEL)) - ,m_aExists(ResId(STR_OBJECT_EXISTS_ALREADY)) - ,m_aExistsOverwrite(ResId(STR_OBJECT_EXISTS_ALREADY_OVERWRITE)) ,m_aName(rDefault) - ,m_xNames(_rxNames) - ,m_xMetaData(_rxMetaData) - ,m_nType(_rType) ,m_rObjectNameCheck( _rObjectNameCheck ) + ,m_nType(_rType) ,m_nFlags(_nFlags) { if ( _xConnection.is() ) @@ -197,9 +180,7 @@ } // ----------------------------------------------------------------------------- OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, - const Reference<XNameAccess>& _rxNames, const String& rDefault, - const String& _sLabel, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags) :m_aDescription(_pParent, ResId (FT_DESCRIPTION)) @@ -214,41 +195,10 @@ ,m_aPB_HELP(_pParent, ResId( PB_HELP)) ,m_aQryLabel(ResId(STR_QRY_LABEL)) ,m_sTblLabel(ResId(STR_TBL_LABEL)) - ,m_aExists(ResId(STR_OBJECT_EXISTS_ALREADY)) - ,m_aExistsOverwrite(ResId(STR_OBJECT_EXISTS_ALREADY_OVERWRITE)) ,m_aName(rDefault) - ,m_xNames(_rxNames) ,m_rObjectNameCheck( _rObjectNameCheck ) - ,m_nFlags(_nFlags) ,m_nType(CommandType::COMMAND) -{ -} -// ----------------------------------------------------------------------------- -OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, - const Reference<XHierarchicalNameAccess>& _rxNames, - const String& rDefault, - const String& _sLabel, - const String& _sParentURL, - sal_Int32 _nFlags) - :m_aDescription(_pParent, ResId (FT_DESCRIPTION)) - ,m_aCatalogLbl(_pParent, ResId (FT_CATALOG)) - ,m_aCatalog(_pParent, ResId (ET_CATALOG)) - ,m_aSchemaLbl(_pParent, ResId (FT_SCHEMA)) - ,m_aSchema(_pParent, ResId (ET_SCHEMA)) - ,m_aLabel(_pParent, ResId (FT_TITLE)) - ,m_aTitle(_pParent, ResId (ET_TITLE)) - ,m_aPB_OK(_pParent, ResId( PB_OK ) ) - ,m_aPB_CANCEL(_pParent, ResId( PB_CANCEL )) - ,m_aPB_HELP(_pParent, ResId( PB_HELP)) - ,m_aQryLabel(ResId(STR_QRY_LABEL)) - ,m_sTblLabel(ResId(STR_TBL_LABEL)) - ,m_aExists(ResId(STR_OBJECT_EXISTS_ALREADY)) - ,m_aExistsOverwrite(ResId(STR_OBJECT_EXISTS_ALREADY_OVERWRITE)) - ,m_aName(rDefault) - ,m_xHierarchyNames(_rxNames) ,m_nFlags(_nFlags) - ,m_nType(CommandType::COMMAND) - ,m_sParentURL(_sParentURL) { } // ----------------------------------------------------------------------------- @@ -298,7 +248,7 @@ :ModalDialog( pParent, ModuleRes(DLG_SAVE_AS)) ,m_xORB( _rxORB ) { - m_pImpl = new OSaveAsDlgImpl(this,_rType,_rxNames,_rxMetaData,_xConnection,rDefault,_rObjectNameCheck,_nFlags); + m_pImpl = new OSaveAsDlgImpl(this,_rType,_xConnection,rDefault,_rObjectNameCheck,_nFlags); switch (_rType) { @@ -311,7 +261,7 @@ { m_pImpl->m_aLabel.SetText(m_pImpl->m_sTblLabel); Point aPos(m_pImpl->m_aPB_OK.GetPosPixel()); - if(_rxMetaData.is() && !_rxMetaData->supportsCatalogsInTableDefinitions()) + if(m_pImpl->m_xMetaData.is() && !m_pImpl->m_xMetaData->supportsCatalogsInTableDefinitions()) { m_pImpl->m_aCatalogLbl.Hide(); m_pImpl->m_aCatalog.Hide(); @@ -331,7 +281,7 @@ &XDatabaseMetaData::getCatalogs, _xConnection->getCatalog() ); } - if ( !m_xMetaData->supportsSchemasInTableDefinitions()) + if ( !m_pImpl->m_xMetaData->supportsSchemasInTableDefinitions()) { m_pImpl->m_aSchemaLbl.Hide(); m_pImpl->m_aSchema.Hide(); @@ -344,14 +294,14 @@ else { lcl_fillComboList( m_pImpl->m_aSchema, _xConnection, - &XDatabaseMetaData::getSchemas, m_xMetaData->getUserName() ); + &XDatabaseMetaData::getSchemas, m_pImpl->m_xMetaData->getUserName() ); } OSL_ENSURE(m_pImpl->m_xMetaData.is(),"The metadata can not be null!"); if(m_pImpl->m_aName.Search('.') != STRING_NOTFOUND) { ::rtl::OUString sCatalog,sSchema,sTable; - ::dbtools::qualifiedNameComponents(_rxMetaData, + ::dbtools::qualifiedNameComponents(m_pImpl->m_xMetaData, m_pImpl->m_aName, sCatalog, sSchema, @@ -377,7 +327,7 @@ m_pImpl->m_aPB_CANCEL.SetPosPixel(Point(m_pImpl->m_aPB_CANCEL.GetPosPixel().X(),aPos.Y())); m_pImpl->m_aPB_HELP.SetPosPixel(Point(m_pImpl->m_aPB_HELP.GetPosPixel().X(),aPos.Y())); - USHORT nLength = m_xMetaData.is() ? static_cast<USHORT>(m_xMetaData->getMaxTableNameLength()) : 0; + USHORT nLength = m_pImpl->m_xMetaData.is() ? static_cast<USHORT>(m_pImpl->m_xMetaData->getMaxTableNameLength()) : 0; nLength = nLength ? nLength : EDIT_NOLIMIT; m_pImpl->m_aTitle.SetMaxTextLen(nLength); @@ -412,25 +362,11 @@ :ModalDialog( pParent, ModuleRes(DLG_SAVE_AS)) ,m_xORB( _rxORB ) { - m_pImpl = new OSaveAsDlgImpl(this,_rxNames,rDefault,_sLabel,m_rObjectNameCheck,_nFlags); + m_pImpl = new OSaveAsDlgImpl(this,rDefault,_rObjectNameCheck,_nFlags); implInitOnlyTitle(_sLabel); implInit(); } // ----------------------------------------------------------------------------- -OSaveAsDlg::OSaveAsDlg( Window * pParent, - const Reference<XHierarchicalNameAccess>& _rxNames, - const String& rDefault, - const String& _sLabel, - const String& _sParentURL, - sal_Int32 _nFlags) - :ModalDialog( pParent, ModuleRes(DLG_SAVE_AS)) -{ - m_pImpl = new OSaveAsDlgImpl(this,_rxNames,rDefault,_sLabel,_sParentURL,_nFlags); - implInitOnlyTitle(_sLabel); - implInit(); -} - -// ----------------------------------------------------------------------------- OSaveAsDlg::~OSaveAsDlg() { DELETEZ(m_pImpl); @@ -441,24 +377,13 @@ if (pButton == &m_pImpl->m_aPB_OK) { m_pImpl->m_aName = m_pImpl->m_aTitle.GetText(); - sal_Bool bError = sal_False; - if ( m_pImpl->m_xHierarchyNames.is() ) - { - String sTest; - if ( m_pImpl->m_sParentURL.Len() ) - sTest = m_pImpl->m_sParentURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - sTest += m_pImpl->m_aName; - bError = m_pImpl->m_xHierarchyNames->hasByHierarchicalName(sTest); - } - else - bError = m_pImpl->m_xNames->hasByName(m_pImpl->m_aName); ::rtl::OUString sNameToCheck( m_pImpl->m_aName ); if ( m_pImpl->m_nType == CommandType::TABLE ) { sNameToCheck = ::dbtools::composeTableName( - m_xMetaData, + m_pImpl->m_xMetaData, getCatalog(), getSchema(), sNameToCheck, Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: databaseobjectview.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/databaseobjectview.hxx?r1=1.2.28.1&r2=1.2.28.2 Delta lines: +2 -10 -------------------- --- databaseobjectview.hxx 8 Nov 2006 12:11:47 -0000 1.2.28.1 +++ databaseobjectview.hxx 8 Nov 2006 13:43:43 -0000 1.2.28.2 @@ -4,9 +4,9 @@ * * $RCSfile: databaseobjectview.hxx,v $ * - * $Revision: 1.2.28.1 $ + * $Revision: 1.2.28.2 $ * - * last change: $Author: oj $ $Date: 2006/11/08 12:11:47 $ + * last change: $Author: oj $ $Date: 2006/11/08 13:43:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -283,14 +283,6 @@ //====================================================================== class OReportDesigner : public DatabaseObjectView { - protected: - - virtual void fillDispatchArgs( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDispatchArguments, - const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rObjectName - ); - public: OReportDesigner(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication File [changed]: dlgsave.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dlgsave.hxx?r1=1.9.8.3&r2=1.9.8.4 Delta lines: +3 -6 ------------------- --- dlgsave.hxx 7 Nov 2006 09:26:04 -0000 1.9.8.3 +++ dlgsave.hxx 8 Nov 2006 13:43:43 -0000 1.9.8.4 @@ -4,9 +4,9 @@ * * $RCSfile: dlgsave.hxx,v $ * - * $Revision: 1.9.8.3 $ + * $Revision: 1.9.8.4 $ * - * last change: $Author: oj $ $Date: 2006/11/07 09:26:04 $ + * last change: $Author: oj $ $Date: 2006/11/08 13:43:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,9 +36,6 @@ #ifndef DBAUI_DLGSAVE_HXX #define DBAUI_DLGSAVE_HXX -#ifndef _SVT_GENERICUNODIALOG_HXX_ -#include <svtools/genericunodialog.hxx> -#endif #ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
