strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS rptchart02 (1.4.4); FILE MERGED

Browse source 
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
This commit is contained in:
Rüdiger Timm 2008-06-16 12:31:48 +00:00
parent 848221eb32
commit ec273935ab
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reportdesign/source/core/sdr/ReportDrawPage.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ReportDrawPage.cxx,v $
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* This file is part of OpenOffice.org.
*
@ -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 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb
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 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb
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 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb
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
{