Tag: cws_src680_rpt23fix02 User: oj Date: 2007-07-24 12:46:35+0000 Added: dba/reportdesign/inc/conditionalexpression.hxx dba/reportdesign/inc/reportformula.hxx
Modified: dba/reportdesign/inc/ReportDefinition.hxx dba/reportdesign/inc/RptObject.hxx dba/reportdesign/inc/UndoActions.hxx Log: merge from rpt23fix01 File Changes: Directory: /dba/reportdesign/inc/ ================================= File [changed]: ReportDefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/ReportDefinition.hxx?r1=1.2&r2=1.2.4.1 Delta lines: +11 -6 -------------------- --- ReportDefinition.hxx 2007-07-09 11:56:02+0000 1.2 +++ ReportDefinition.hxx 2007-07-24 12:46:32+0000 1.2.4.1 @@ -38,8 +38,8 @@ #ifndef _COM_SUN_STAR_REPORT_XREPORTDEFINITION_HPP_ #include <com/sun/star/report/XReportDefinition.hpp> #endif -#ifndef _CPPUHELPER_COMPBASE6_HXX_ -#include <cppuhelper/compbase6.hxx> +#ifndef _CPPUHELPER_COMPBASE7_HXX_ +#include <cppuhelper/compbase7.hxx> #endif #ifndef _CPPUHELPER_BASEMUTEX_HXX_ #include <cppuhelper/basemutex.hxx> @@ -81,11 +81,12 @@ namespace reportdesign { class OReportComponentProperties; - typedef ::cppu::WeakComponentImplHelper6< com::sun::star::report::XReportDefinition + typedef ::cppu::WeakComponentImplHelper7< com::sun::star::report::XReportDefinition ,com::sun::star::document::XEventBroadcaster ,com::sun::star::lang::XServiceInfo ,com::sun::star::frame::XModule ,com::sun::star::lang::XUnoTunnel + ,com::sun::star::util::XNumberFormatsSupplier ,SvxUnoDrawMSFactory> ReportDefinitionBase; typedef ::cppu::PropertySetMixin<com::sun::star::report::XReportDefinition> ReportDefinitionPropertySet; @@ -336,6 +337,10 @@ virtual void SAL_CALL setIdentifier( const ::rtl::OUString& Identifier ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException); + // XNumberFormatsSupplier + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext(); /** return the SdrModel of the real model File [changed]: RptObject.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/RptObject.hxx?r1=1.2&r2=1.2.4.1 Delta lines: +16 -7 -------------------- --- RptObject.hxx 2007-07-09 11:56:02+0000 1.2 +++ RptObject.hxx 2007-07-24 12:46:32+0000 1.2.4.1 @@ -114,8 +114,8 @@ { public: typedef ::comphelper::ImplementationReference<OPropertyMediator,::com::sun::star::beans::XPropertyChangeListener> TMediator; -protected: +protected: mutable TMediator m_xMediator; mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener; //mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> @@ -146,6 +146,10 @@ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShapeOf( SdrObject& _rSdrObject ); +private: + static void ensureSdrObjectOwnership( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxShape ); + public: void StartListening(); void EndListening(sal_Bool bRemoveListener = sal_True); @@ -178,9 +182,14 @@ class REPORTDESIGN_DLLPUBLIC OCustomShape: public SdrObjCustomShape , public OObjectBase { friend class OReportPage; - friend class OObjectBase; friend class DlgEdFactory; +public: + static OCustomShape* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent ) + { + return new OCustomShape( _xComponent ); + } + protected: OCustomShape(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); OCustomShape(const ::rtl::OUString& _sComponentName); @@ -217,8 +226,6 @@ friend class DlgEdFactory; sal_uInt16 m_nObjectType; - - ::rtl::OUString GetDefaultName() const; protected: OUnoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent ,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _xControlModel @@ -257,6 +264,8 @@ inline sal_uInt16 getObjectId() const { return m_nObjectType; } + static ::rtl::OUString GetDefaultName(const OUnoObject* _pObj); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); }; File [changed]: UndoActions.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/UndoActions.hxx?r1=1.2&r2=1.2.4.1 Delta lines: +4 -3 ------------------- --- UndoActions.hxx 2007-07-09 11:56:02+0000 1.2 +++ UndoActions.hxx 2007-07-24 12:46:32+0000 1.2.4.1 @@ -170,6 +170,7 @@ TYPEINFO(); OCommentUndoAction( SdrModel& rMod ,USHORT nCommentID); + virtual ~OCommentUndoAction(); virtual UniString GetComment() const { return m_strComment; } virtual void Undo(); File [added]: conditionalexpression.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/conditionalexpression.hxx?rev=1.1.4.2&content-type=text/vnd.viewcvs-markup Added lines: 0 -------------- File [added]: reportformula.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/reportformula.hxx?rev=1.1.4.2&content-type=text/vnd.viewcvs-markup Added lines: 0 -------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
