User: rt Date: 2008-06-16 13:31:50+0000 Modified: dba/reportdesign/source/core/sdr/ReportDrawPage.cxx
Log: INTEGRATION: CWS rptchart02 (1.4.4); FILE MERGED 2008/04/16 06:28:10 oj 1.4.4.2: RESYNC: (1.4-1.5); FILE MERGED 2008/03/12 09:45:16 oj 1.4.4.1: impl chart handling File Changes: Directory: /dba/reportdesign/source/core/sdr/ ============================================= File [changed]: ReportDrawPage.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/ReportDrawPage.cxx?r1=1.5&r2=1.6 Delta lines: +20 -2 -------------------- --- ReportDrawPage.cxx 2008-04-10 18:25:57+0000 1.5 +++ ReportDrawPage.cxx 2008-06-16 13:31:48+0000 1.6 @@ -35,6 +35,8 @@ #include <comphelper/mimeconfighelper.hxx> #include <comphelper/classids.hxx> #include <comphelper/embeddedobjectcontainer.hxx> +#include <comphelper/documentconstants.hxx> + #include <svx/svdmodel.hxx> #include <com/sun/star/report/XFixedLine.hpp> #include <com/sun/star/beans/NamedValue.hpp> @@ -73,6 +75,7 @@ if ( xSection.is() ) xFactory.set(xSection->getReportDefinition(),uno::UNO_QUERY); uno::Reference< drawing::XShape > xRet; + uno::Reference< drawing::XShape > xShape; if ( xFactory.is() ) { bool bChangeOrientation = false; @@ -125,7 +128,17 @@ if ( pObj->ISA(OUnoObject) ) { OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObj); - bChangeOrientation = pUnoObj->getObjectId() == OBJ_DLG_HFIXEDLINE; + bChangeOrientation = pUnoObj->GetObjIdentifier() == OBJ_DLG_HFIXEDLINE; + + SvxShapeControl* pShape = new SvxShapeControl( pObj ); + xShape.set(*pShape,uno::UNO_QUERY); + pShape->setShapeKind(pObj->GetObjIdentifier()); + } + else if ( pObj->ISA(OCustomShape) ) + { + SvxCustomShape* pShape = new SvxCustomShape( pObj ); + xShape.set(*pShape,uno::UNO_QUERY); + pShape->setShapeKind(pObj->GetObjIdentifier()); } else if ( pObj->ISA(SdrOle2Obj) ) { @@ -155,9 +168,14 @@ awt::Size aSz( aTmp.Width(), aTmp.Height() ); xObj->setVisualAreaSize( nAspect, aSz ); } + SvxOle2Shape* pShape = new SvxOle2Shape( pObj ); + xShape.set(*pShape,uno::UNO_QUERY); + pShape->setShapeKind(pObj->GetObjIdentifier()); + //xShape = new SvxOle2Shape( pOle2Obj ); } - uno::Reference< drawing::XShape > xShape( SvxDrawPage::_CreateShape( pObj ) ); + if ( !xShape.is() ) + xShape.set( SvxDrawPage::_CreateShape( pObj ) ); try { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
