User: rt Date: 2008-06-16 13:34:08+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.cxx
Log: INTEGRATION: CWS rptchart02 (1.8.4); FILE MERGED 2008/05/20 08:17:01 oj 1.8.4.3: make const 2008/04/16 06:28:41 oj 1.8.4.2: RESYNC: (1.8-1.9); FILE MERGED 2008/04/03 06:35:19 oj 1.8.4.1: #i86343# remove unused code 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.9&r2=1.10 Delta lines: +3 -38 -------------------- --- xmlExport.cxx 2008-04-10 18:33:52+0000 1.9 +++ xmlExport.cxx 2008-06-16 13:34:05+0000 1.10 @@ -449,38 +449,6 @@ } } // ----------------------------------------------------------------------------- -void ORptExport::exportImagePosition(sal_Int16 _nImagePosition) -{ - OSL_ENSURE( ( _nImagePosition >= awt::ImagePosition::LeftTop ) && ( _nImagePosition <= awt::ImagePosition::Centered ), - "ORptExport::export: don't know this image position!" ); - - if ( ( _nImagePosition < awt::ImagePosition::LeftTop ) || ( _nImagePosition > awt::ImagePosition::Centered ) ) - // this is important to prevent potential buffer overflows below, so don't optimize - _nImagePosition = awt::ImagePosition::Centered; - - if ( _nImagePosition == awt::ImagePosition::Centered ) - { - AddAttribute( XML_NAMESPACE_FORM, XML_IMAGE_POSITION , GetXMLToken( XML_CENTER ) ); - } - else - { - XMLTokenEnum eXmlImagePositions[] = - { - XML_START, XML_END, XML_TOP, XML_BOTTOM - }; - XMLTokenEnum eXmlImageAligns[] = - { - XML_START, XML_CENTER, XML_END - }; - - XMLTokenEnum eXmlImagePosition = eXmlImagePositions[ _nImagePosition / 3 ]; - XMLTokenEnum eXmlImageAlign = eXmlImageAligns [ _nImagePosition % 3 ]; - - AddAttribute( XML_NAMESPACE_FORM, XML_IMAGE_POSITION , GetXMLToken( eXmlImagePosition ) ); - AddAttribute( XML_NAMESPACE_FORM, XML_IMAGE_ALIGN , GetXMLToken( eXmlImageAlign ) ); - } -} -// ----------------------------------------------------------------------------- void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComponent) { OSL_ENSURE(_xReportComponent.is(),"No component interface!"); @@ -582,9 +550,9 @@ exportAutoStyle(_xProp); Reference<XReportDefinition> xReport = _xProp->getReportDefinition(); - awt::Size aSize = rptui::getStyleProperty<awt::Size>(xReport,PROPERTY_PAPERSIZE); - sal_Int32 nOffset = rptui::getStyleProperty<sal_Int32>(xReport,PROPERTY_LEFTMARGIN); - sal_Int32 nCount = _xProp->getCount(); + const awt::Size aSize = rptui::getStyleProperty<awt::Size>(xReport,PROPERTY_PAPERSIZE); + const sal_Int32 nOffset = rptui::getStyleProperty<sal_Int32>(xReport,PROPERTY_LEFTMARGIN); + const sal_Int32 nCount = _xProp->getCount(); ::std::vector<sal_Int32> aColumnPos; aColumnPos.reserve(2*(nCount + 1)); @@ -1548,9 +1516,6 @@ m_xReportDefinition.set(xDoc,UNO_QUERY_THROW); OSL_ENSURE(m_xReportDefinition.is(),"DataSource is NULL!"); - //if ( !GetNumberFormatsSupplier().is() ) - // SetNumberFormatsSupplier(OXMLHelper::GetNumberFormatsSupplier(m_xReportDefinition)); - SvXMLExport::setSourceDocument(xDoc); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
