User: ihi Date: 2007-11-21 16:08:57+0000 Modified: dba/dbaccess/source/ui/misc/databaseobjectview.cxx
Log: INTEGRATION: CWS dba24c (1.5.40); FILE MERGED 2007/09/13 11:37:51 fs 1.5.40.1: #i49183# also allow to edit a view's command, if it supports the XAlterView interface File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: databaseobjectview.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/databaseobjectview.cxx?r1=1.5&r2=1.6 Delta lines: +12 -13 --------------------- --- databaseobjectview.cxx 2007-07-06 08:36:01+0000 1.5 +++ databaseobjectview.cxx 2007-11-21 16:08:55+0000 1.6 @@ -235,9 +235,9 @@ //---------------------------------------------------------------------- QueryDesigner::QueryDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame, - sal_Bool _bCreateView, sal_Bool _bPreferSQLView ) + bool _bCreateView, sal_Bool _bPreferSQLView ) :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< ::rtl::OUString >( URL_COMPONENT_QUERYDESIGN ) ) - ,m_bCreateView( _bCreateView ) + ,m_nCommandType( _bCreateView ? CommandType::TABLE : CommandType::QUERY ) ,m_bPreferSQLView( _bPreferSQLView ) { } @@ -251,18 +251,17 @@ sal_Bool bIncludeQueryName = 0 != _rObjectName.getLength(); sal_Int32 nPos = _rDispatchArguments.getLength(); - _rDispatchArguments.realloc(_rDispatchArguments.getLength() + 2 + (bIncludeQueryName ? 1 : 0) ); + _rDispatchArguments.realloc(_rDispatchArguments.getLength() + 2 + ( bIncludeQueryName ? 1 : 0 ) ); + _rDispatchArguments[nPos ].Name = PROPERTY_GRAPHICAL_DESIGN; + _rDispatchArguments[nPos++].Value <<= ::cppu::bool2any( !m_bPreferSQLView ); - _rDispatchArguments[nPos ].Name = PROPERTY_QUERYDESIGNVIEW; - _rDispatchArguments[nPos++].Value <<= ::cppu::bool2any(!m_bPreferSQLView); - - _rDispatchArguments[nPos ].Name = PROPERTY_CREATEVIEW; - _rDispatchArguments[nPos++].Value <<= ::cppu::bool2any(m_bCreateView); + _rDispatchArguments[nPos ].Name = PROPERTY_COMMANDTYPE; + _rDispatchArguments[nPos++].Value <<= m_nCommandType; - if (bIncludeQueryName) + if ( bIncludeQueryName ) { - _rDispatchArguments[nPos ].Name = PROPERTY_CURRENTQUERY; + _rDispatchArguments[nPos ].Name = PROPERTY_COMMAND; _rDispatchArguments[nPos++].Value <<= _rObjectName; } } @@ -395,10 +394,10 @@ { } //====================================================================== - //= OReportDesigner + //= ReportDesigner //====================================================================== //---------------------------------------------------------------------- - OReportDesigner::OReportDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication , const Reference< XFrame >& _rxParentFrame) + ReportDesigner::ReportDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication , const Reference< XFrame >& _rxParentFrame) :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame,static_cast< ::rtl::OUString >( URL_COMPONENT_REPORTDESIGN ) ) { } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
