Tag: cws_src680_oj14 User: fs Date: 2007-07-02 20:22:00+0000 Modified: dba/reportdesign/inc/RptObject.hxx dba/reportdesign/source/core/inc/ReportDrawPage.hxx dba/reportdesign/source/core/sdr/ReportDrawPage.cxx
Log: preparation of #i78827# File Changes: Directory: /dba/reportdesign/inc/ ================================= File [changed]: RptObject.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/RptObject.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +3 -2 ------------------- --- RptObject.hxx 2007-05-10 06:28:41+0000 1.1.2.1 +++ RptObject.hxx 2007-07-02 20:21:56+0000 1.1.2.2 @@ -6,9 +6,9 @@ * * $RCSfile: RptObject.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/10 06:28:41 $ + * last change: $Author: fs $ $Date: 2007/07/02 20:21:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,7 @@ #ifndef _COM_SUN_STAR_REPORT_XSECTION_HPP_ #include <com/sun/star/report/XSection.hpp> #endif + #ifndef _SVDOCIRC_HXX #include <svx/svdocirc.hxx> #endif Directory: /dba/reportdesign/source/core/inc/ ============================================= File [changed]: ReportDrawPage.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/inc/ReportDrawPage.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -4 ------------------- --- ReportDrawPage.hxx 2007-05-09 13:50:38+0000 1.1.2.1 +++ ReportDrawPage.hxx 2007-07-02 20:21:56+0000 1.1.2.2 @@ -1,14 +1,12 @@ -#ifndef REPORTDRAWPAGE_HXX_INCLUDED -#define REPORTDRAWPAGE_HXX_INCLUDED /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportDrawPage.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 13:50:38 $ + * last change: $Author: fs $ $Date: 2007/07/02 20:21:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,6 +33,9 @@ * ************************************************************************/ +#ifndef REPORTDRAWPAGE_HXX_INCLUDED +#define REPORTDRAWPAGE_HXX_INCLUDED + #ifndef _SVX_UNOWPAGE_HXX #include <svx/unopage.hxx> #endif 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.1.2.2&r2=1.1.2.3 Delta lines: +68 -66 --------------------- --- ReportDrawPage.cxx 2007-06-26 20:25:31+0000 1.1.2.2 +++ ReportDrawPage.cxx 2007-07-02 20:21:57+0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: ReportDrawPage.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: fs $ $Date: 2007/06/26 20:25:31 $ + * last change: $Author: fs $ $Date: 2007/07/02 20:21:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,8 +66,9 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pObj ) const throw () { OObjectBase* pBaseObj = dynamic_cast<OObjectBase*>(pObj); - if ( pBaseObj ) - { + if ( !pBaseObj ) + return SvxDrawPage::_CreateShape( pObj ); + uno::Reference< report::XSection> xSection = m_xSection; uno::Reference< lang::XMultiServiceFactory> xFactory; if ( xSection.is() ) @@ -78,7 +79,9 @@ bool bChangeOrientation = false; ::rtl::OUString sServiceName; if ( pObj->ISA(OCustomShape) ) + { sServiceName = SERVICE_SHAPE; + } else if ( pObj->ISA(OUnoObject) ) { OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObj); @@ -138,9 +141,8 @@ DBG_UNHANDLED_EXCEPTION(); } } - return xRet; // pBaseObj->getReportComponent().get(); - } - return SvxDrawPage::_CreateShape( pObj ); + + return xRet; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
