Tag: cws_src680_rptchart01 User: oj Date: 2008-01-24 13:03:35+0000 Modified: dba/reportdesign/inc/ReportDefinition.hxx dba/reportdesign/inc/RptDef.hxx dba/reportdesign/inc/RptModel.hxx dba/reportdesign/inc/RptObject.hxx dba/reportdesign/inc/RptResId.hrc dba/reportdesign/inc/helpids.hrc dba/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml dba/reportdesign/util/hidother.src
Log: #i85225# changes for chart File Changes: Directory: /dba/reportdesign/inc/ ================================= File [changed]: ReportDefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/ReportDefinition.hxx?r1=1.3&r2=1.3.62.1 Delta lines: +11 -6 -------------------- --- ReportDefinition.hxx 2007-08-02 14:27:17+0000 1.3 +++ ReportDefinition.hxx 2008-01-24 13:03:32+0000 1.3.62.1 @@ -6,9 +6,9 @@ * * $RCSfile: ReportDefinition.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.62.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:27:17 $ + * last change: $Author: oj $ $Date: 2008/01/24 13:03:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,9 +56,8 @@ #ifndef INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX #include <cppuhelper/propertysetmixin.hxx> #endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif +#include <comphelper/embeddedobjectcontainer.hxx> #ifndef SVX_UNOMOD_HXX #include <svx/unomod.hxx> #endif @@ -97,7 +96,8 @@ */ class REPORTDESIGN_DLLPUBLIC OReportDefinition : public ::cppu::BaseMutex, public ReportDefinitionBase, - public ReportDefinitionPropertySet + public ReportDefinitionPropertySet, + public ::comphelper::IEmbeddedHelper { ::boost::shared_ptr<OReportComponentProperties> m_aProps; ::boost::shared_ptr<OReportDefinitionImpl> m_pImpl; @@ -350,6 +350,11 @@ ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const; static ::boost::shared_ptr<rptui::OReportModel> getSdrModel(::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); + + // comphelper::IEmbeddedHelper + virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const; + virtual ::comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const; }; // ============================================================================= } // namespace reportdesign File [changed]: RptDef.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/RptDef.hxx?r1=1.3&r2=1.3.70.1 Delta lines: +3 -2 ------------------- --- RptDef.hxx 2007-07-09 15:47:00+0000 1.3 +++ RptDef.hxx 2008-01-24 13:03:32+0000 1.3.70.1 @@ -6,9 +6,9 @@ * * $RCSfile: RptDef.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.70.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 15:47:00 $ + * last change: $Author: oj $ $Date: 2008/01/24 13:03:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,6 +70,7 @@ #define OBJ_DLG_FORMATTEDFIELD ((UINT16) OBJ_MAXI + 3) #define OBJ_DLG_HFIXEDLINE ((UINT16) OBJ_MAXI + 4) #define OBJ_DLG_VFIXEDLINE ((UINT16) OBJ_MAXI + 5) +#define OBJ_DLG_SUBREPORT ((UINT16) OBJ_MAXI + 6) // allows the alignment and resizing of controls namespace ControlModification File [changed]: RptModel.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/RptModel.hxx?r1=1.2&r2=1.2.70.1 Delta lines: +10 -3 -------------------- --- RptModel.hxx 2007-07-09 11:56:02+0000 1.2 +++ RptModel.hxx 2008-01-24 13:03:32+0000 1.2.70.1 @@ -6,9 +6,9 @@ * * $RCSfile: RptModel.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.70.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:02 $ + * last change: $Author: oj $ $Date: 2008/01/24 13:03:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,6 +47,10 @@ { class OSingleDocumentController; } +namespace reportdesign +{ + class OReportDefinition; +} namespace rptui { //============================================================================ @@ -63,13 +67,16 @@ private: OXUndoEnvironment* m_pUndoEnv; ::dbaui::OSingleDocumentController* m_pController; + ::reportdesign::OReportDefinition* m_pReportDefinition; + + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); OReportModel( const OReportModel& ); void operator=(const OReportModel& rSrcModel); public: TYPEINFO(); - OReportModel(); + OReportModel(::reportdesign::OReportDefinition* _pReportDefinition); virtual ~OReportModel(); virtual void SetChanged(sal_Bool bFlg = sal_True); File [changed]: RptObject.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/RptObject.hxx?r1=1.4&r2=1.4.20.1 Delta lines: +47 -5 -------------------- --- RptObject.hxx 2007-11-20 18:55:19+0000 1.4 +++ RptObject.hxx 2008-01-24 13:03:32+0000 1.4.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: RptObject.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.20.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/20 18:55:19 $ + * last change: $Author: oj $ $Date: 2008/01/24 13:03:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,9 +35,9 @@ #ifndef _REPORT_RPTUIOBJ_HXX #define _REPORT_RPTUIOBJ_HXX -#ifndef _SVDOUNO_HXX +#include <svx/svdoole2.hxx> #include <svx/svdouno.hxx> -#endif + #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> @@ -168,6 +168,7 @@ inline void setOldParent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) { m_xSection = _xSection; } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getOldParent() const { return m_xSection;} ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getSection() const; + inline const ::rtl::OUString getServiceName() const { return m_sComponentName; } /** releases the reference to our UNO shape (m_xKeepShapeAlive) */ @@ -217,6 +218,47 @@ }; //============================================================================ +// OOle2Obj +//============================================================================ +class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase +{ + friend class OReportPage; + friend class DlgEdFactory; + +public: + static OOle2Obj* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent ) + { + return new OOle2Obj( _xComponent ); + } + OOle2Obj(const ::rtl::OUString& _sComponentName,const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=FALSE); + +protected: + OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); + OOle2Obj(const ::rtl::OUString& _sComponentName); + + + virtual void NbcMove( const Size& rSize ); + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); + virtual void NbcSetLogicRect(const Rectangle& rRect); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + + virtual void SetSnapRectImpl(const Rectangle& _rRect); + virtual SdrPage* GetImplPage() const; + +public: + TYPEINFO(); + + virtual ~OOle2Obj(); + + virtual sal_Int32 GetStep() const; + + virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); + + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); +}; + +//============================================================================ // OUnoObject //============================================================================ class REPORTDESIGN_DLLPUBLIC OUnoObject: public SdrUnoObj , public OObjectBase File [changed]: RptResId.hrc Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/RptResId.hrc?r1=1.3&r2=1.3.20.1 Delta lines: +4 -3 ------------------- --- RptResId.hrc 2007-11-20 18:55:34+0000 1.3 +++ RptResId.hrc 2008-01-24 13:03:32+0000 1.3.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: RptResId.hrc,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.20.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/20 18:55:34 $ + * last change: $Author: oj $ $Date: 2008/01/24 13:03:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -222,6 +222,7 @@ #define RID_STR_SCOPE (RID_STRING_START + 141) #define RID_STR_TYPE (RID_STRING_START + 142) #define RID_STR_TYPE_CONST (RID_STRING_START + 143) +#define RID_STR_CHARTTYPE (RID_STRING_START + 144) // #define RID_STR_ (RID_STRING_START + 130) // ----------------------------------------------------------------------- File [changed]: helpids.hrc Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/helpids.hrc?r1=1.3&r2=1.3.20.1 Delta lines: +6 -5 ------------------- --- helpids.hrc 2007-11-20 18:55:47+0000 1.3 +++ helpids.hrc 2008-01-24 13:03:32+0000 1.3.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: helpids.hrc,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.20.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/20 18:55:47 $ + * last change: $Author: oj $ $Date: 2008/01/24 13:03:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -90,7 +90,7 @@ #define HID_PROP_STARTNEWCOLUMN (HID_RPT_START + 47) #define HID_PROP_STARTNEWPAGE (HID_RPT_START + 48) #define HID_PROP_RESETPAGENUMBER (HID_RPT_START + 49) -// free +#define HID_PROP_CHARTTYPE (HID_RPT_START + 50) #define HID_PROP_MINHEIGHTNEWPAGE (HID_RPT_START + 51) #define HID_PROP_PRINTWHENGROUPCHANGE (HID_RPT_START + 52) // free @@ -120,9 +120,10 @@ #define HID_PROP_PRESERVEIRI (HID_RPT_START + 77) #define HID_PROP_BACKTRANSPARENT (HID_RPT_START + 78) #define HID_PROP_CONTROLBACKGROUNDTRANSPARENT (HID_RPT_START + 79) +#define UID_RPT_PROP_CHARTTYPE_DLG (HID_RPT_START + 80) -#if HID_PROP_CONTROLBACKGROUNDTRANSPARENT > HID_RPT_END +#if UID_RPT_PROP_CHARTTYPE_DLG > HID_RPT_END #error Help-Id Ueberlauf in #file, #line #endif // don't forget to update the file util/hidother.src Directory: /dba/reportdesign/uiconfig/dbreport/toolbar/ ======================================================= File [changed]: reportcontrols.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml?r1=1.3&r2=1.3.18.1 Delta lines: +1 -0 ------------------- --- reportcontrols.xml 2007-11-27 11:59:37+0000 1.3 +++ reportcontrols.xml 2008-01-24 13:03:33+0000 1.3.18.1 @@ -8,6 +8,7 @@ <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" /> <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" /> <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:style="radio auto" /> + <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:style="radio auto" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:helpid="helpid:10928" toolbar:style="radio" /> <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:helpid="helpid:10929" toolbar:style="radio" /> Directory: /dba/reportdesign/util/ ================================== File [changed]: hidother.src Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/hidother.src?r1=1.3&r2=1.3.20.1 Delta lines: +5 -4 ------------------- --- hidother.src 2007-11-20 19:13:28+0000 1.3 +++ hidother.src 2008-01-24 13:03:33+0000 1.3.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: hidother.src,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.20.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/20 19:13:28 $ + * last change: $Author: oj $ $Date: 2008/01/24 13:03:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -141,4 +141,5 @@ hidspecial HID_PROP_FORMULALIST { HelpId = HID_PROP_FORMULALIST; }; hidspecial HID_PROP_SCOPE { HelpId = HID_PROP_SCOPE; }; hidspecial HID_PROP_TYPE { HelpId = HID_PROP_TYPE; }; - +hidspecial HID_PROP_CHARTTYPE { HelpId = HID_PROP_CHARTTYPE; }; +hidspecial UID_RPT_PROP_CHARTTYPE_DLG { HelpId = UID_RPT_PROP_CHARTTYPE_DLG; }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
