Tag: cws_src680_reportdesign01 User: lla Date: 2007-10-11 09:05:54+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.cxx dba/reportdesign/source/ui/dlg/AddField.cxx dba/reportdesign/source/ui/inspection/GeometryHandler.cxx
Log: #i82497# compile problems on linux File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.cxx?r1=1.5.20.3&r2=1.5.20.4 Delta lines: +5 -5 ------------------- --- xmlExport.cxx 2007-09-21 12:09:26+0000 1.5.20.3 +++ xmlExport.cxx 2007-10-11 09:05:51+0000 1.5.20.4 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.5.20.3 $ + * $Revision: 1.5.20.4 $ * - * last change: $Author: oj $ $Date: 2007/09/21 12:09:26 $ + * last change: $Author: lla $ $Date: 2007/10/11 09:05:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1011,15 +1011,15 @@ else if ( xElement->supportsService(SERVICE_IMAGECONTROL) ) { eToken = XML_IMAGE; - Reference< XImageControl > xImage(xElement,uno::UNO_QUERY); - ::rtl::OUString sTargetLocation = xImage->getImageURL(); + Reference< XImageControl > xImageC(xElement,uno::UNO_QUERY); + ::rtl::OUString sTargetLocation = xImageC->getImageURL(); if ( sTargetLocation.getLength() ) { sTargetLocation = GetRelativeReference(sTargetLocation); AddAttribute(XML_NAMESPACE_FORM, XML_IMAGE_DATA,sTargetLocation); } bExportData = sal_True; - if ( xImage->getScaleImage() ) + if ( xImageC->getScaleImage() ) AddAttribute(XML_NAMESPACE_REPORT, XML_SCALE, XML_TRUE ); } else if ( xReportDefinition.is() ) Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: AddField.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/AddField.cxx?r1=1.2.28.1&r2=1.2.28.2 Delta lines: +5 -5 ------------------- --- AddField.cxx 2007-09-07 11:24:01+0000 1.2.28.1 +++ AddField.cxx 2007-10-11 09:05:52+0000 1.2.28.2 @@ -4,9 +4,9 @@ * * $RCSfile: AddField.cxx,v $ * - * $Revision: 1.2.28.1 $ + * $Revision: 1.2.28.2 $ * - * last change: $Author: oj $ $Date: 2007/09/07 11:24:01 $ + * last change: $Author: lla $ $Date: 2007/10/11 09:05:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -424,7 +424,7 @@ } } // ----------------------------------------------------------------------------- -void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent ) +void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { if ( m_pListBox.get() ) { @@ -434,7 +434,7 @@ } } // ----------------------------------------------------------------------------- -void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) +void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException) { if ( m_pListBox.get() ) { @@ -444,7 +444,7 @@ } } // ----------------------------------------------------------------------------- -void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) +void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException) { } // ============================================================================= Directory: /dba/reportdesign/source/ui/inspection/ ================================================== File [changed]: GeometryHandler.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/GeometryHandler.cxx?r1=1.4.20.7&r2=1.4.20.8 Delta lines: +6 -6 ------------------- --- GeometryHandler.cxx 2007-10-11 07:45:17+0000 1.4.20.7 +++ GeometryHandler.cxx 2007-10-11 09:05:52+0000 1.4.20.8 @@ -4,9 +4,9 @@ * * $RCSfile: GeometryHandler.cxx,v $ * - * $Revision: 1.4.20.7 $ + * $Revision: 1.4.20.8 $ * - * last change: $Author: oj $ $Date: 2007/10/11 07:45:17 $ + * last change: $Author: lla $ $Date: 2007/10/11 09:05:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -325,8 +325,8 @@ DBG_NAME(rpt_GeometryHandler) GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const & context) : GeometryHandler_Base(m_aMutex) - ,m_xContext(context) ,m_aPropertyListeners( m_aMutex ) + ,m_xContext(context) ,m_pInfoService(new OPropertyInfoService()) ,m_nDataFieldType(0) ,m_bIn(false) @@ -1710,12 +1710,12 @@ const sal_Int32 nCount = xGroups->getCount(); if ( nCount ) { - const uno::Reference< report::XGroup> xGroup(xGroups->getByIndex(nCount - 1),uno::UNO_QUERY_THROW); + const uno::Reference< report::XGroup> xGroup2(xGroups->getByIndex(nCount - 1),uno::UNO_QUERY_THROW); String sGroupName = String(ModuleRes(RID_STR_SCOPE_GROUP)); - _rsNamePostFix = xGroup->getExpression(); + _rsNamePostFix = xGroup2->getExpression(); sGroupName.SearchAndReplaceAscii("%1",_rsNamePostFix); m_sScope = sGroupName; - xReturn = xGroup.get(); + xReturn = xGroup2.get(); } } if ( !m_sScope.getLength() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
