diff options
Diffstat (limited to 'reportdesign/source/filter')
58 files changed, 635 insertions, 635 deletions
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index fae4e234bdb3..b029a0ddc83a 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport")); ::comphelper::disposeComponent(xProp); } // if ( xProp.is() ) - } + } catch(Exception&) { } diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index 442017d9a940..b7ad819b3a94 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,9 +84,9 @@ public: ORptTypeDetection(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + ::rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ) diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index e5fec78cda69..b4002229d1f7 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( ::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin(); ::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end(); for (; i != aEnd ; ++i) - { + { sal_Int16 nContextID = aPropMapper->GetEntryContextId(i->mnIndex); switch (nContextID) { diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx index ece3c364b7d6..abdd342b0c80 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef RPT_XMLAUTOSTYLE_HXX +#ifndef RPT_XMLAUTOSTYLE_HXX #define RPT_XMLAUTOSTYLE_HXX #include <xmloff/maptype.hxx> diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index f47f360c4687..9548d62fba8a 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ OXMLCell::OXMLCell( ORptFilter& rImport if ( !m_pCell ) m_pCell = this; - OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); + OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); @@ -116,7 +116,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY); static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); @@ -140,7 +140,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); - + OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); setComponent(xControl.get()); if ( xControl.is() ) @@ -151,7 +151,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( { rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Reference< XImageControl > xControl(xFactor->createInstance(SERVICE_IMAGECONTROL),uno::UNO_QUERY); - + OSL_ENSURE(xControl.is(),"Could not create ImageControl!"); setComponent(xControl.get()); if ( xControl.is() ) @@ -215,7 +215,7 @@ void OXMLCell::EndElement() uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); xControl->setDataField(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + m_sText); - + OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); setComponent(xControl.get()); m_xComponent = xControl.get(); @@ -258,8 +258,8 @@ ORptFilter& OXMLCell::GetOwnImport() return static_cast<ORptFilter&>(GetImport()); } // ----------------------------------------------------------------------------- -void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _xComponent) -{ +void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _xComponent) +{ m_pCell->m_xComponent = _xComponent; m_xComponent = _xComponent; } @@ -274,7 +274,7 @@ void OXMLCell::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); m_sText += s_sStringConcat; } - + m_sText += s_Quote + rChars + s_Quote; } } diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx index e5cdcbda48f5..8360a691f599 100644 --- a/reportdesign/source/filter/xml/xmlCell.hxx +++ b/reportdesign/source/filter/xml/xmlCell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace rptxml class OXMLTable; class OXMLCell : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; OXMLTable* m_pContainer; OXMLCell* m_pCell; ::rtl::OUString m_sStyleName; diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index a6599cce79ff..3f90b9bc0d28 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ SvXMLImportContext* OXMLRowColumn::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -142,9 +142,9 @@ void OXMLRowColumn::fillStyle(const ::rtl::OUString& _sStyleName) { PropertySetInfo* pInfo = new PropertySetInfo(); static PropertyMapEntry pMap[] = - { - {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), PROPERTY_ID_WIDTH, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), PROPERTY_ID_HEIGHT, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), PROPERTY_ID_WIDTH, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), PROPERTY_ID_HEIGHT, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; pInfo->add(pMap); @@ -157,7 +157,7 @@ void OXMLRowColumn::fillStyle(const ::rtl::OUString& _sStyleName) xProp->getPropertyValue(PROPERTY_WIDTH) >>= nWidth; m_pContainer->addWidth(nWidth); } - else + else { pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_TABLE_ROW,_sStyleName)); if ( pAutoStyle ) diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx index 21a53a3221c9..47c57dbb78ee 100644 --- a/reportdesign/source/filter/xml/xmlColumn.hxx +++ b/reportdesign/source/filter/xml/xmlColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index dd1387db40da..cbe97b2a7102 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,13 +57,13 @@ namespace rptxml OXMLComponent::OXMLComponent( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList - ,const Reference< XReportComponent > & _xComponent + ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XReportComponent > & _xComponent ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) ,m_xComponent(_xComponent) { - DBG_CTOR( rpt_OXMLComponent,NULL); + DBG_CTOR( rpt_OXMLComponent,NULL); OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); OSL_ENSURE(m_xComponent.is(),"Component is NULL!"); @@ -72,7 +72,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); - + for(sal_Int16 i = 0; i < nLength; ++i) { try @@ -84,7 +84,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_NAME: + case XML_TOK_NAME: m_xComponent->setName(sValue); break; case XML_TOK_TEXT_STYLE_NAME: @@ -100,13 +100,13 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport { OSL_ENSURE(0,"Exception catched while putting props into report component!"); } - } + } } // ----------------------------------------------------------------------------- OXMLComponent::~OXMLComponent() { - DBG_DTOR( rpt_OXMLComponent,NULL); + DBG_DTOR( rpt_OXMLComponent,NULL); } // ----------------------------------------------------------------------------- //---------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx index 1daca10d9a2a..217de3669d55 100644 --- a/reportdesign/source/filter/xml/xmlComponent.hxx +++ b/reportdesign/source/filter/xml/xmlComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ namespace rptxml class OXMLComponent : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; ::rtl::OUString m_sName; ::rtl::OUString m_sTextStyleName; - + OXMLComponent(const OXMLComponent&); void operator =(const OXMLComponent&); public: diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 16135095268a..30d27143f193 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,13 +70,13 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_FUNCTION_FORMULA: + case XML_TOK_FUNCTION_FORMULA: m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,uno::makeAny(ORptFilter::convertFormula(sValue))); break; default: break; } - + } } catch(const Exception&) diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx index c7af29faf9c6..fd457de45218 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace rptxml class ORptFilter; class OXMLCondPrtExpr : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; OXMLCondPrtExpr(const OXMLCondPrtExpr&); void operator =(const OXMLCondPrtExpr&); public: diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 6e717557aca8..f2d039d319df 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,9 +38,9 @@ #include <unotools/datetime.hxx> #include <com/sun/star/util/DateTime.hpp> -#define TYPE_DATE 1 -#define TYPE_TIME 2 -#define TYPE_DATETIME 3 +#define TYPE_DATE 1 +#define TYPE_TIME 2 +#define TYPE_DATETIME 3 namespace rptxml { @@ -67,7 +67,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); OSL_ENSURE(m_xControl.is(),"Control is NULL!"); - + const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); @@ -91,15 +91,15 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport static MapString2Type s_aTypeNameMap; if (!s_aTypeNameMap.size()) { - s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); - s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_TIME)] = ::getCppuType( static_cast< com::sun::star::util::Time* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); + s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); + s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_TIME)] = ::getCppuType( static_cast< com::sun::star::util::Time* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); } const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue); @@ -115,7 +115,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport break; } } - + } // ----------------------------------------------------------------------------- @@ -131,7 +131,7 @@ SvXMLImportContext* OXMLControlProperty::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -184,7 +184,7 @@ void OXMLControlProperty::addValue(const ::rtl::OUString& _sValue) if ( !m_bIsList ) m_aSetting.Value = aValue; - else + else { sal_Int32 nPos = m_aSequence.getLength(); m_aSequence.realloc(nPos+1); @@ -203,7 +203,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe Any aReturn; switch (_rExpectedType.getTypeClass()) { - case TypeClass_BOOLEAN: // sal_Bool + case TypeClass_BOOLEAN: // sal_Bool { bool bValue; #if OSL_DEBUG_LEVEL > 0 @@ -212,14 +212,14 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLControlProperty::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a boolean!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a boolean!")); aReturn <<= bValue; } break; - case TypeClass_SHORT: // sal_Int16 - case TypeClass_LONG: // sal_Int32 - { // it's a real int32/16 property + case TypeClass_SHORT: // sal_Int16 + case TypeClass_LONG: // sal_Int32 + { // it's a real int32/16 property sal_Int32 nValue(0); #if OSL_DEBUG_LEVEL > 0 sal_Bool bSuccess = @@ -227,8 +227,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLControlProperty::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into an integer!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into an integer!")); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; else @@ -249,8 +249,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLControlProperty::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a double!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a double!")); aReturn <<= (double)nValue; } break; @@ -260,11 +260,11 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_STRUCT: { // recognized structs: - static ::com::sun::star::uno::Type s_aDateType = ::getCppuType(static_cast< ::com::sun::star::util::Date* >(NULL)); - static ::com::sun::star::uno::Type s_aTimeType = ::getCppuType(static_cast< ::com::sun::star::util::Time* >(NULL)); - static ::com::sun::star::uno::Type s_aDateTimeType = ::getCppuType(static_cast< ::com::sun::star::util::DateTime* >(NULL)); + static ::com::sun::star::uno::Type s_aDateType = ::getCppuType(static_cast< ::com::sun::star::util::Date* >(NULL)); + static ::com::sun::star::uno::Type s_aTimeType = ::getCppuType(static_cast< ::com::sun::star::util::Time* >(NULL)); + static ::com::sun::star::uno::Type s_aDateTimeType = ::getCppuType(static_cast< ::com::sun::star::util::DateTime* >(NULL)); sal_Int32 nType = 0; - if ( _rExpectedType.equals(s_aDateType) ) + if ( _rExpectedType.equals(s_aDateType) ) nType = TYPE_DATE; else if ( _rExpectedType.equals(s_aTimeType) ) nType = TYPE_TIME; @@ -280,8 +280,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OPropertyImport::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a double!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a double!")); // then convert it into the target type switch (nType) diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx index 6335f993e00e..646a7e1ee93a 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.hxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace rptxml ::com::sun::star::beans::PropertyValue m_aSetting; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSequence; OXMLControlProperty* m_pContainer; - ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently + ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently sal_Bool m_bIsList; ORptFilter& GetOwnImport(); @@ -71,7 +71,7 @@ namespace rptxml /** adds value to property - @param _sValue + @param _sValue The value to add. */ void addValue(const ::rtl::OUString& _sValue); diff --git a/reportdesign/source/filter/xml/xmlEnums.hxx b/reportdesign/source/filter/xml/xmlEnums.hxx index 6986a36c4f9e..af293e902c45 100644 --- a/reportdesign/source/filter/xml/xmlEnums.hxx +++ b/reportdesign/source/filter/xml/xmlEnums.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,16 +45,16 @@ namespace rptxml enum XMLReportToken { XML_TOK_REPORT_HEADER, - XML_TOK_PAGE_HEADER , + XML_TOK_PAGE_HEADER , XML_TOK_GROUP, - XML_TOK_DETAIL , - XML_TOK_PAGE_FOOTER , + XML_TOK_DETAIL , + XML_TOK_PAGE_FOOTER , XML_TOK_REPORT_FOOTER, - XML_TOK_HEADER_ON_NEW_PAGE , - XML_TOK_FOOTER_ON_NEW_PAGE , - XML_TOK_COMMAND_TYPE , - XML_TOK_COMMAND , - XML_TOK_FILTER , + XML_TOK_HEADER_ON_NEW_PAGE , + XML_TOK_FOOTER_ON_NEW_PAGE , + XML_TOK_COMMAND_TYPE , + XML_TOK_COMMAND , + XML_TOK_FILTER , XML_TOK_CAPTION , XML_TOK_ESCAPE_PROCESSING , XML_TOK_REPORT_FUNCTION , @@ -66,26 +66,26 @@ namespace rptxml }; enum XMLGroup { - XML_TOK_START_NEW_COLUMN , - XML_TOK_RESET_PAGE_NUMBER , - XML_TOK_PRINT_HEADER_ON_EACH_PAGE , - XML_TOK_GROUP_EXPRESSION , - XML_TOK_GROUP_HEADER , + XML_TOK_START_NEW_COLUMN , + XML_TOK_RESET_PAGE_NUMBER , + XML_TOK_PRINT_HEADER_ON_EACH_PAGE , + XML_TOK_GROUP_EXPRESSION , + XML_TOK_GROUP_HEADER , XML_TOK_GROUP_GROUP , XML_TOK_GROUP_DETAIL , - XML_TOK_GROUP_FOOTER , - XML_TOK_SORT_ASCENDING , - XML_TOK_GROUP_FUNCTION , + XML_TOK_GROUP_FOOTER , + XML_TOK_SORT_ASCENDING , + XML_TOK_GROUP_FUNCTION , XML_TOK_GROUP_KEEP_TOGETHER }; enum XMLSection { XML_TOK_SECTION_NAME, XML_TOK_TABLE, - XML_TOK_VISIBLE , - XML_TOK_FORCE_NEW_PAGE , - XML_TOK_FORCE_NEW_COLUMN , - XML_TOK_KEEP_TOGETHER , + XML_TOK_VISIBLE , + XML_TOK_FORCE_NEW_PAGE , + XML_TOK_FORCE_NEW_COLUMN , + XML_TOK_KEEP_TOGETHER , XML_TOK_REPEAT_SECTION, XML_TOK_PAGE_PRINT_OPTION, XML_TOK_SECT_STYLE_NAME @@ -119,13 +119,13 @@ namespace rptxml ,XML_TOK_COV_CELL ,XML_TOK_NUMBER_COLUMNS_SPANNED ,XML_TOK_NUMBER_ROWS_SPANNED - ,XML_TOK_TEXT_STYLE_NAME + ,XML_TOK_TEXT_STYLE_NAME ,XML_TOK_TRANSFORM ,XML_TOK_CONDITIONAL_PRINT_EXPRESSION }; enum XMLReportElement { - XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE + XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE ,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION ,XML_TOK_PRINT_REPEATED_VALUES ,XML_TOK_COMPONENT @@ -133,19 +133,19 @@ namespace rptxml }; enum XMLControlProperty { - XML_TOK_PROPERTY_NAME - ,XML_TOK_VALUE_TYPE - ,XML_TOK_LIST_PROPERTY - ,XML_TOK_VALUE - ,XML_TOK_CURRENCY - ,XML_TOK_DATE_VALUE - ,XML_TOK_TIME_VALUE - ,XML_TOK_STRING_VALUE + XML_TOK_PROPERTY_NAME + ,XML_TOK_VALUE_TYPE + ,XML_TOK_LIST_PROPERTY + ,XML_TOK_VALUE + ,XML_TOK_CURRENCY + ,XML_TOK_DATE_VALUE + ,XML_TOK_TIME_VALUE + ,XML_TOK_STRING_VALUE ,XML_TOK_BOOLEAN_VALUE ,XML_TOK_PROPERTIES ,XML_TOK_SIZE ,XML_TOK_IMAGE_DATA - ,XML_TOK_IMAGE_POSITION + ,XML_TOK_IMAGE_POSITION ,XML_TOK_IMAGE_ALIGN ,XML_TOK_SCALE ,XML_TOK_LABEL @@ -173,7 +173,7 @@ namespace rptxml ,XML_TOK_ENABLED ,XML_TOK_FORMULA }; - + // ----------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index a8fdacf51e9e..a99de7c06b11 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #include "precompiled_reportdesign.hxx" - + #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" #include <xmloff/ProgressBarHelper.hxx> @@ -151,7 +151,7 @@ namespace rptxml aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } - + //--------------------------------------------------------------------- Reference< XInterface > ODBFullExportHelper::create(Reference< XComponentContext > const & xContext) { @@ -169,7 +169,7 @@ namespace rptxml aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } - + //--------------------------------------------------------------------- class OSpecialHanldeXMLExportPropertyMapper : public SvXMLExportPropertyMapper @@ -240,8 +240,8 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1 _GetNamespaceMap().Add( GetXMLToken(XML_NP_FORM), GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_DRAW), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_TEXT), GetXMLToken(XML_N_TEXT), XML_NAMESPACE_TEXT ); - - + + if( (getExportFlags() & (EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS) ) != 0 ) _GetNamespaceMap().Add( GetXMLToken(XML_NP_FO), GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO ); @@ -275,14 +275,14 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1 m_sTableStyle = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_STYLE_NAME) ); m_sColumnStyle = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_COLUMN) ); m_sCellStyle = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_REPORT, GetXMLToken(XML_STYLE_NAME) ); - + m_xPropHdlFactory = new OXMLRptPropHdlFactory(); UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper1 = new XMLPropertySetMapper(OXMLHelper::GetTableStyleProps(),xFac); UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper2 = new XMLTextPropertySetMapper(TEXT_PROP_MAP_TABLE_DEFAULTS ); xTableStylesPropertySetMapper1->AddMapperEntry(xTableStylesPropertySetMapper2); - + m_xTableStylesExportPropertySetMapper = new SvXMLExportPropertyMapper(xTableStylesPropertySetMapper1); //m_xTableStylesExportPropertySetMapper->ChainExportMapper(xTableStylesPropertySetMapper2); @@ -336,7 +336,7 @@ uno::Sequence< ::rtl::OUString > ORptExport::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); - + return aServices; } //-------------------------------------------------------------------------- @@ -388,7 +388,7 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR const ::rtl::OUString* pDetailFieldsIter = aDetailFields.getConstArray(); const ::rtl::OUString* pIter = aMasterFields.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aMasterFields.getLength(); + const ::rtl::OUString* pEnd = pIter + aMasterFields.getLength(); for(;pIter != pEnd;++pIter,++pDetailFieldsIter) { AddAttribute( XML_NAMESPACE_REPORT, XML_MASTER , *pIter ); @@ -398,7 +398,7 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR } } } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefinition) { if ( _xReportDefinition.is() ) @@ -406,7 +406,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini exportFunctions(_xReportDefinition->getFunctions().get()); exportGroupsExpressionAsFunction(_xReportDefinition->getGroups()); //exportMasterDetailFields(_xReportDefinition.get()); - + if ( _xReportDefinition->getReportHeaderOn() ) { SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_HEADER, sal_True, sal_True); @@ -419,7 +419,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_EnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION,sValue.makeStringAndClear()); - + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_HEADER, sal_True, sal_True); exportSection(_xReportDefinition->getPageHeader(),true); } // if ( _xReportDefinition->getPageHeaderOn() ) @@ -441,7 +441,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, sal_True, sal_True); exportSection(_xReportDefinition->getReportFooter()); } // if ( _xReportDefinition->getReportFooterOn() ) - } + } } // ----------------------------------------------------------------------------- void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComponent) @@ -451,7 +451,7 @@ void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComp return; AddAttribute(XML_NAMESPACE_DRAW, XML_NAME,_xReportComponent->getName()); - + SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT, sal_False, sal_False); } // ----------------------------------------------------------------------------- @@ -473,7 +473,7 @@ void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _x exportStyleName(xCond.get(),GetAttrList(),m_sCellStyle); SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION, sal_True, sal_True); } // for (sal_Int32 i = 0; i < nCount ; ++i) - } + } catch(uno::Exception&) { OSL_ENSURE(0,"Can not access format condition!"); @@ -491,7 +491,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT, sal_True, sal_True); if ( _xReportElement->getCount() ) - { + { exportFormatConditions(_xReportElement); } @@ -558,7 +558,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) aRowPos.reserve(2*(nCount + 1)); aRowPos.push_back(0); aRowPos.push_back(_xProp->getHeight()); - + sal_Int32 i; for (i = 0 ; i< nCount ; ++i) { @@ -615,7 +615,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) sal_Int32 xi = 0; sal_Int32 yi = 0; bool isOverlap = false; - + for (i = 0 ; i< nCount ; ++i) { Reference<XReportComponent> xReportElement(_xProp->getByIndex(i),uno::UNO_QUERY); @@ -675,7 +675,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) sal_Int32 nColSpan = x2 - x1; sal_Int32 nRowSpan = y2 - y1; - aInsert->second[y1].second[x1] = + aInsert->second[y1].second[x1] = TCell( aElementSize.Width , // -1 why? aElementSize.Height, // -1 why? @@ -720,7 +720,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr uno::Reference< report::XFormatCondition > xCond(xFormattedField->getByIndex(j),uno::UNO_QUERY); exportAutoStyle(xCond.get(),xFormattedField); } // for (sal_Int32 j = 0; j < nCount ; ++j) - } + } catch(uno::Exception&) { OSL_ENSURE(0,"Can not access format condition!"); @@ -735,7 +735,7 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader OSL_ENSURE(_xSection.is(),"Section is NULL -> GPF"); ::rtl::OUStringBuffer sValue; AddAttribute(XML_NAMESPACE_TABLE, XML_NAME,_xSection->getName()); - + if ( !_xSection->getVisible() ) AddAttribute(XML_NAMESPACE_REPORT, XML_VISIBLE,XML_FALSE); @@ -752,12 +752,12 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader if ( _xSection->getKeepTogether() ) AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER, XML_TRUE ); } - + exportStyleName(_xSection.get(),GetAttrList(),m_sTableStyle); /// TODO export as table layout SvXMLElementExport aComponents(*this,XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True); - + ::rtl::OUString sExpr = _xSection->getConditionalPrintExpression(); if ( sExpr.getLength() ) { @@ -797,7 +797,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) return; TGrid::iterator aRowIter = aFind->second.begin(); TGrid::iterator aRowEnd = aFind->second.end(); - + sal_Int32 nEmptyCellColSpan = 0; TGridStyleMap::iterator aRowFind = m_aRowStyleNames.find(_xSection.get()); TStringVec::iterator aHeightIter = aRowFind->second.begin(); @@ -813,7 +813,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { ::std::vector< TCell >::iterator aColIter = aRowIter->second.begin(); ::std::vector< TCell >::iterator aColEnd = aRowIter->second.end(); - nEmptyCellColSpan = 0; + nEmptyCellColSpan = 0; for (; aColIter != aColEnd; ++aColIter) { sal_Bool bCoveredCell = sal_False; @@ -831,10 +831,10 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) nColSpan = 1; if ( !--(aRowSpanFind->second) ) aRowSpan.erase(aRowSpanFind); - + if ( aColIter->nColSpan > 1 ) nColSpan += aColIter->nColSpan - 1; - + bCoveredCell = sal_True; aColIter = aColIter + (aColIter->nColSpan - 1); } @@ -862,7 +862,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) } if ( aColIter->xElement.is() ) exportStyleName(aColIter->xElement.get(),GetAttrList(),m_sTableStyle); - + // start <table:table-cell> Reference<XFormattedField> xFormattedField(aColIter->xElement,uno::UNO_QUERY); if ( xFormattedField.is() ) @@ -901,7 +901,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) Reference<XReportDefinition> xReportDefinition(xElement,uno::UNO_QUERY); Reference< XImageControl > xImage(xElement,uno::UNO_QUERY); Reference<XSection> xSection(xElement,uno::UNO_QUERY); - + XMLTokenEnum eToken = XML_SECTION; sal_Bool bExportData = sal_False; if ( xElement->supportsService(SERVICE_FIXEDTEXT) ) @@ -978,8 +978,8 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) exportShapes(_xSection); } aColIter = aColIter + (aColIter->nColSpan - 1); - } - else + } + else ++nEmptyCellColSpan; if ( bCoveredCell ) { @@ -987,7 +987,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, sal_True, sal_True); } - + } } // for (sal_Int32 i = 0 ; i< nCount ; ++i) if ( nEmptyCellColSpan ) @@ -1065,7 +1065,7 @@ bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const :: bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1; if ( !bRet ) AddAttribute(XML_NAMESPACE_REPORT, eName,sFieldData); - + return bRet; } // ----------------------------------------------------------------------------- @@ -1138,7 +1138,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef const SvXMLEnumMapEntry* aXML_KeepTogetherEnumMap = OXMLHelper::GetKeepTogetherOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_KeepTogetherEnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER,sValue.makeStringAndClear()); - + SvXMLElementExport aGroup(*this,XML_NAMESPACE_REPORT, XML_GROUP, sal_True, sal_True); exportFunctions(xGroup->getFunctions().get()); if ( xGroup->getHeaderOn() ) @@ -1306,8 +1306,8 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted } } } - - + + if ( !aPropertyStates.empty() ) m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_CELL, aPropertyStates ))); } @@ -1326,7 +1326,7 @@ void ORptExport::SetBodyAttributes() } // ----------------------------------------------------------------------------- void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xReport) -{ +{ if ( _xReport.is() ) { ::rtl::OUStringBuffer sValue; @@ -1379,7 +1379,7 @@ void ORptExport::collectComponentStyles() uno::Reference< report::XSection> xParent(xProp->getParent(),uno::UNO_QUERY); if ( xParent.is() ) exportAutoStyle(xProp.get()); - + if ( xProp->getReportHeaderOn() ) exportSectionAutoStyle(xProp->getReportHeader()); if ( xProp->getPageHeaderOn() ) @@ -1415,14 +1415,14 @@ void ORptExport::_ExportAutoStyles() ,GetMM100UnitConverter() ,GetNamespaceMap() ); - + GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL ,GetDocHandler() ,GetMM100UnitConverter() ,GetNamespaceMap() ); - - + + /*GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_REPORT_ID ,GetDocHandler() ,GetMM100UnitConverter() @@ -1478,7 +1478,7 @@ void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >& xDoc // ----------------------------------------------------------------------------- void ORptExport::_ExportFontDecls() { - GetFontAutoStylePool(); // make sure the pool is created + GetFontAutoStylePool(); // make sure the pool is created collectComponentStyles(); SvXMLExport::_ExportFontDecls(); } @@ -1520,17 +1520,17 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor } else { - + if ( sToken.indexOf('"') == 0 && sToken.lastIndexOf('"') == sToken.getLength()-1 ) sToken = sToken.copy(1,sToken.getLength()-2); - + sal_Bool bPrevCharIsSpace = sal_False; GetTextParagraphExport()->exportText(sToken,bPrevCharIsSpace); } } } while ( nIndex >= 0 ); - } + } } Reference< XFixedText > xFT(_xReportElement,UNO_QUERY); if ( xFT.is() ) @@ -1569,7 +1569,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa { pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False)); exportMasterDetailFields(xShape.get()); - exportReportElement(xShape.get()); + exportReportElement(xShape.get()); } AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_PARAGRAPH ); @@ -1653,7 +1653,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("([")); sFunction += sExpression; sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]")); - + if ( sPrefix.getLength() ) sFunction += sPrefix; sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 3d71e8deac69..8e4f2f22a71b 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,80 +120,80 @@ public: typedef ::std::map< Reference<XPropertySet> ,TGrid > TSectionsGrid; typedef ::std::map< Reference<XGroup> ,Reference<XFunction> > TGroupFunctionMap; private: - ::std::auto_ptr< TStringPair > m_aAutoIncrement; - ::std::auto_ptr< TDelimiter > m_aDelimiter; - ::std::vector< Any > m_aDataSourceSettings; + ::std::auto_ptr< TStringPair > m_aAutoIncrement; + ::std::auto_ptr< TDelimiter > m_aDelimiter; + ::std::vector< Any > m_aDataSourceSettings; TSectionsGrid m_aSectionsGrid; - - TPropertyStyleMap m_aAutoStyleNames; + + TPropertyStyleMap m_aAutoStyleNames; TGridStyleMap m_aColumnStyleNames; TGridStyleMap m_aRowStyleNames; - TGroupFunctionMap m_aGroupFunctionMap; - - ::rtl::OUString m_sCharSet; + TGroupFunctionMap m_aGroupFunctionMap; + + ::rtl::OUString m_sCharSet; ::rtl::OUString m_sTableStyle; ::rtl::OUString m_sCellStyle; ::rtl::OUString m_sColumnStyle; - Any m_aPreviewMode; - UniReference < SvXMLExportPropertyMapper> m_xExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xSectionPropMapper; - UniReference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xCellStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xColumnStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xRowStylesExportPropertySetMapper; + Any m_aPreviewMode; + UniReference < SvXMLExportPropertyMapper> m_xExportHelper; + UniReference < SvXMLExportPropertyMapper> m_xSectionPropMapper; + UniReference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper> m_xCellStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper> m_xColumnStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper> m_xRowStylesExportPropertySetMapper; UniReference < SvXMLExportPropertyMapper > m_xParaPropMapper; - UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; + UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; - mutable UniReference < XMLPropertySetMapper > m_xControlStylePropertyMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xControlStylePropertyMapper; + mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - Reference<XReportDefinition> m_xReportDefinition; - sal_Bool m_bAllreadyFilled; + Reference<XReportDefinition> m_xReportDefinition; + sal_Bool m_bAllreadyFilled; - void exportReport(const Reference<XReportDefinition>& _xReportDefinition); /// <element name="office:report"> + void exportReport(const Reference<XReportDefinition>& _xReportDefinition); /// <element name="office:report"> void exportReportAttributes(const Reference<XReportDefinition>& _xReport); - void exportFunctions(const Reference<XIndexAccess>& _xFunctions); /// <ref name="rpt-function"/> + void exportFunctions(const Reference<XIndexAccess>& _xFunctions); /// <ref name="rpt-function"/> void exportFunction(const Reference< XFunction>& _xFunction); - void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet); - void exportComponent(const Reference<XReportComponent>& _xReportComponent); - sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); - void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); - void exportSection(const Reference<XSection>& _xProp,bool bHeader = false); + void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet); + void exportComponent(const Reference<XReportComponent>& _xReportComponent); + sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); + void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); + void exportSection(const Reference<XSection>& _xProp,bool bHeader = false); void exportContainer(const Reference< XSection>& _xSection); void exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph = true); void exportTableColumns(const Reference< XSection>& _xSection); - void exportSectionAutoStyle(const Reference<XSection>& _xProp); - void exportReportElement(const Reference<XReportControlModel>& _xReportElement); - void exportFormatConditions(const Reference<XReportControlModel>& _xReportElement); - void exportAutoStyle(XPropertySet* _xProp,const Reference<XFormattedField>& _xParentFormattedField = Reference<XFormattedField>()); - void exportAutoStyle(const Reference<XSection>& _xProp); + void exportSectionAutoStyle(const Reference<XSection>& _xProp); + void exportReportElement(const Reference<XReportControlModel>& _xReportElement); + void exportFormatConditions(const Reference<XReportControlModel>& _xReportElement); + void exportAutoStyle(XPropertySet* _xProp,const Reference<XFormattedField>& _xParentFormattedField = Reference<XFormattedField>()); + void exportAutoStyle(const Reference<XSection>& _xProp); void exportReportComponentAutoStyles(const Reference<XSection>& _xProp); - void collectComponentStyles(); + void collectComponentStyles(); void collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames); void exportParagraph(const Reference< XReportControlModel >& _xReportElement); bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::rtl::OUString& _sFormula); void exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups); ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula); - ::rtl::OUString implConvertNumber(sal_Int32 _nValue); + ::rtl::OUString implConvertNumber(sal_Int32 _nValue); private: ORptExport(); - virtual void SetBodyAttributes(); + virtual void SetBodyAttributes(); protected: - virtual void _ExportStyles( BOOL bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportContent(); - virtual void _ExportMasterStyles(); - virtual void _ExportFontDecls(); - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); - virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); + virtual void _ExportStyles( BOOL bUsed ); + virtual void _ExportAutoStyles(); + virtual void _ExportContent(); + virtual void _ExportMasterStyles(); + virtual void _ExportFontDecls(); + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); + virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); virtual XMLShapeExport* CreateShapeExport(); - virtual ~ORptExport(){}; -public: - + virtual ~ORptExport(){}; +public: + ORptExport(const Reference< XMultiServiceFactory >& _rxMSF, sal_uInt16 nExportFlag = (EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS)); // XServiceInfo virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); @@ -248,7 +248,7 @@ class ORptStylesExportHelper public: static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 9abb4056108b..7d1f3e231beb 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -330,7 +330,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > if ( !m_xDatabaseDataProvider.is() || !m_xDatabaseDataProvider->getActiveConnection().is() ) throw uno::Exception(); - uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( + uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory")),m_xContext), uno::UNO_QUERY); m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get()); diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index 3a3d1ad0c851..1e4627098091 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index c30c3344b9e0..284a678227e9 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -150,7 +150,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( return pContext; static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); - const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); + const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); Reference<XMultiServiceFactory> xFactor = m_rImport.getServiceFactory(); m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); @@ -213,10 +213,10 @@ void OXMLFixedContent::EndElement() m_xComponent = xControl.get(); xControl->setLabel(m_sLabel); } - + m_pContainer->addCell(m_xComponent); m_rCell.setComponent(m_xComponent); - + OXMLReportElementBase::EndElement(); } } @@ -232,7 +232,7 @@ void OXMLFixedContent::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); m_sPageText += s_sStringConcat; } - + m_sPageText += s_Quote + rChars + s_Quote; } } diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index 42e9eaeefb4f..53bf91377d8f 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.hxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 6d70a78ec147..1180547ab6c8 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,10 +79,10 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_ENABLED: + case XML_TOK_ENABLED: m_xComponent->setEnabled(sValue == s_sTRUE); break; - case XML_TOK_FORMULA: + case XML_TOK_FORMULA: m_xComponent->setFormula(ORptFilter::convertFormula(sValue)); break; case XML_TOK_FORMAT_STYLE_NAME: diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx index 446b0a9760d6..bf0d1cda8183 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace rptxml { ORptFilter& m_rImport; ::rtl::OUString m_sStyleName; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent; OXMLFormatCondition(const OXMLFormatCondition&); void operator =(const OXMLFormatCondition&); public: diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 65fdbe1ee81f..aec8621eff7d 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ DBG_NAME( rpt_OXMLFormattedField ) OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName ,const uno::Reference< xml::sax::XAttributeList > & _xAttrList - ,const uno::Reference< XFormattedField > & _xComponent + ,const uno::Reference< XFormattedField > & _xComponent ,OXMLTable* _pContainer ,bool _bPageCount) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) @@ -71,7 +71,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_DATA_FORMULA: + case XML_TOK_DATA_FORMULA: _xComponent->setDataField(ORptFilter::convertFormula(sValue)); break; case XML_TOK_SELECT_PAGE: diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx index 5a3a28a48b9c..6437cf007c9c 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.hxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index fd0ede7b2244..00eb1759da8e 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ DBG_NAME( rpt_OXMLFunction ) OXMLFunction::OXMLFunction( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList - ,const Reference< XFunctionsSupplier >& _xFunctions + ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XFunctionsSupplier >& _xFunctions ,bool _bAddToReport ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) @@ -60,7 +60,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport OSL_ENSURE(m_xFunctions.is(),"Functions is NULL!"); m_xFunction = m_xFunctions->createFunction(); - + OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap(); @@ -82,7 +82,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport case XML_TOK_FUNCTION_NAME: m_xFunction->setName(sValue); break; - case XML_TOK_FUNCTION_FORMULA: + case XML_TOK_FUNCTION_FORMULA: m_xFunction->setFormula(ORptFilter::convertFormula(sValue)); break; case XML_TOK_PRE_EVALUATED: diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx index 2e6b33215b85..9e81d0791640 100644 --- a/reportdesign/source/filter/xml/xmlFunction.hxx +++ b/reportdesign/source/filter/xml/xmlFunction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,10 +40,10 @@ namespace rptxml class OXMLFunction : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > m_xFunction; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > m_xFunction; bool m_bAddToReport; - + ORptFilter& GetOwnImport(); OXMLFunction(const OXMLFunction&); @@ -54,7 +54,7 @@ namespace rptxml , sal_uInt16 nPrfx ,const ::rtl::OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xFunctions + ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xFunctions ,bool _bAddToReport = false ); virtual ~OXMLFunction(); diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index c5fad4d165cd..f56239dbd8eb 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ DBG_NAME( rpt_OXMLGroup ) OXMLGroup::OXMLGroup( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XAttributeList > & _xAttrList ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) { @@ -70,7 +70,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport m_xGroups = _rImport.getReportDefinition()->getGroups(); OSL_ENSURE(m_xGroups.is(),"Groups is NULL!"); m_xGroup = m_xGroups->createGroup(); - + OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap(); @@ -103,7 +103,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport sal_Int32 nLen = sValue.getLength(); if ( nLen ) { - + const static ::rtl::OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\"")); sal_Int32 nPos = sValue.indexOf(s_sChanged); if ( nPos == -1 ) @@ -119,7 +119,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport sValue = sValue.replaceAt(nIndex,2,s_sSingleQuote); nIndex = sValue.indexOf(s_sQuote,nIndex+2); } - nLen = sValue.getLength() - 1; + nLen = sValue.getLength() - 1; } sValue = sValue.copy(nPos,nLen-nPos-1); const ORptFilter::TGroupFunctionMap& aFunctions = _rImport.getFunctions(); @@ -149,7 +149,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport { nGroupOn = report::GroupOn::MONTH; } - else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT((MONTH")),0) + else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT((MONTH")),0) && sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) ) { nGroupOn = report::GroupOn::QUARTAL; @@ -167,7 +167,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport nGroupOn = report::GroupOn::INTERVAL; _rImport.removeFunction(sExpression); sExpression = sExpression.copy(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT_count_")).getLength()); - + nIndex = 0; ::rtl::OUString sInterval = sCompleteFormula.getToken(1,'/',nIndex); nIndex = 0; @@ -176,7 +176,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport } m_xGroup->setGroupOn(nGroupOn); - + _rImport.removeFunction(sValue); sValue = sExpression; } @@ -212,7 +212,7 @@ SvXMLImportContext* OXMLGroup::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetGroupElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetGroupElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx index 06dfedf87785..5aa34fe4f7ba 100644 --- a/reportdesign/source/filter/xml/xmlGroup.hxx +++ b/reportdesign/source/filter/xml/xmlGroup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,9 +38,9 @@ namespace rptxml class OXMLGroup : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > m_xGroups; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; - + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > m_xGroups; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; + ORptFilter& GetOwnImport(); OXMLGroup(const OXMLGroup&); diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 9e4569704d9c..584d702d0dba 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,12 +73,12 @@ namespace rptxml DBG_NAME(rpt_OPropertyHandlerFactory) OPropertyHandlerFactory::OPropertyHandlerFactory() { - DBG_CTOR(rpt_OPropertyHandlerFactory,NULL); + DBG_CTOR(rpt_OPropertyHandlerFactory,NULL); } // ----------------------------------------------------------------------------- OPropertyHandlerFactory::~OPropertyHandlerFactory() { - DBG_DTOR(rpt_OPropertyHandlerFactory,NULL); + DBG_DTOR(rpt_OPropertyHandlerFactory,NULL); } // ----------------------------------------------------------------------------- const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const @@ -93,9 +93,9 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 { static SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] = { - { XML_TOP, style::VerticalAlignment_TOP }, - { XML_MIDDLE, style::VerticalAlignment_MIDDLE }, - { XML_BOTTOM, style::VerticalAlignment_BOTTOM }, + { XML_TOP, style::VerticalAlignment_TOP }, + { XML_MIDDLE, style::VerticalAlignment_MIDDLE }, + { XML_BOTTOM, style::VerticalAlignment_BOTTOM }, { XML_TOKEN_INVALID, 0 } }; @@ -115,15 +115,15 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 return pHandler; } // ----------------------------------------------------------------------------- -#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_T( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_T( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } #define MAP_CONST_ASCII_T( name, prefix, token, type, context ) { name, sizeof(name)-1,XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_S( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } -#define GMAP( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_C( name, prefix, token, type, context ) { name, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_S( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define GMAP( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_C( name, prefix, token, type, context ) { name, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0, SvtSaveOptions::ODFVER_010} // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat) @@ -134,15 +134,15 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _ { MAP_CONST_C( PROPERTY_FORMATKEY, STYLE, DATA_STYLE_NAME, XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ), - MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, - FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), - MAP_CONST_C( PROPERTY_VERTICALALIGN, STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), + MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_C( PROPERTY_VERTICALALIGN, STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), MAP_CONST_C( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, - FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), - MAP_CONST_P( PROPERTY_CONTROLBACKGROUND, - FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + MAP_CONST_P( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), MAP_CONST_P( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, - FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), MAP_CONST_C_ASCII( "BorderLeft", FO, BORDER_LEFT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderRight", FO, BORDER_RIGHT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderTop", FO, BORDER_TOP, XML_TYPE_BORDER, 0 ), @@ -157,12 +157,12 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _ { MAP_CONST_C( PROPERTY_FORMATKEY, STYLE, DATA_STYLE_NAME, XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ), - MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, - FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), MAP_CONST_C( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, - FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), MAP_CONST_C( PROPERTY_VERTICALALIGN, - STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), + STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), MAP_CONST_C_ASCII( "BorderLeft", FO, BORDER_LEFT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderRight", FO, BORDER_RIGHT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderTop", FO, BORDER_TOP, XML_TYPE_BORDER, 0 ), @@ -202,7 +202,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps() //MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0), //MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_SC_ISVISIBLE ), MAP_CONST_S( "Width", STYLE, COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ), - // MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), + // MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), MAP_END() }; return aXMLColumnStylesProperties; @@ -212,10 +212,10 @@ const SvXMLEnumMapEntry* OXMLHelper::GetReportPrintOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { XML_ALL_PAGES, report::ReportPrintOption::ALL_PAGES }, // default - { XML_NOT_WITH_REPORT_HEADER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER }, - { XML_NOT_WITH_REPORT_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_FOOTER }, - { XML_NOT_WITH_REPORT_HEADER_NOR_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER }, + // { XML_ALL_PAGES, report::ReportPrintOption::ALL_PAGES }, // default + { XML_NOT_WITH_REPORT_HEADER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER }, + { XML_NOT_WITH_REPORT_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_FOOTER }, + { XML_NOT_WITH_REPORT_HEADER_NOR_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; @@ -225,10 +225,10 @@ const SvXMLEnumMapEntry* OXMLHelper::GetForceNewPageOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { XML_NONE, report::ForceNewPage::NONE }, // default - { XML_BEFORE_SECTION, report::ForceNewPage::BEFORE_SECTION }, - { XML_AFTER_SECTION, report::ForceNewPage::AFTER_SECTION }, - { XML_BEFORE_AFTER_SECTION, report::ForceNewPage::BEFORE_AFTER_SECTION }, + // { XML_NONE, report::ForceNewPage::NONE }, // default + { XML_BEFORE_SECTION, report::ForceNewPage::BEFORE_SECTION }, + { XML_AFTER_SECTION, report::ForceNewPage::AFTER_SECTION }, + { XML_BEFORE_AFTER_SECTION, report::ForceNewPage::BEFORE_AFTER_SECTION }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; @@ -238,9 +238,9 @@ const SvXMLEnumMapEntry* OXMLHelper::GetKeepTogetherOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { XML_NO, report::KeepTogether::NO }, // default - { XML_WHOLE_GROUP, report::KeepTogether::WHOLE_GROUP }, - { XML_WITH_FIRST_DETAIL, report::KeepTogether::WITH_FIRST_DETAIL }, + // { XML_NO, report::KeepTogether::NO }, // default + { XML_WHOLE_GROUP, report::KeepTogether::WHOLE_GROUP }, + { XML_WITH_FIRST_DETAIL, report::KeepTogether::WITH_FIRST_DETAIL }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; @@ -258,22 +258,22 @@ const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions() return s_aXML_EnumMap; } // ----------------------------------------------------------------------------- -#define PROPERTY_ID_FONTNAME 1 -#define PROPERTY_ID_FONTHEIGHT 2 -#define PROPERTY_ID_FONTWIDTH 3 -#define PROPERTY_ID_FONTSTYLENAME 4 -#define PROPERTY_ID_FONTFAMILY 5 -#define PROPERTY_ID_FONTCHARSET 6 -#define PROPERTY_ID_FONTPITCH 7 -#define PROPERTY_ID_FONTCHARWIDTH 8 -#define PROPERTY_ID_FONTWEIGHT 9 -#define PROPERTY_ID_FONTSLANT 10 -#define PROPERTY_ID_FONTUNDERLINE 11 -#define PROPERTY_ID_FONTSTRIKEOUT 12 +#define PROPERTY_ID_FONTNAME 1 +#define PROPERTY_ID_FONTHEIGHT 2 +#define PROPERTY_ID_FONTWIDTH 3 +#define PROPERTY_ID_FONTSTYLENAME 4 +#define PROPERTY_ID_FONTFAMILY 5 +#define PROPERTY_ID_FONTCHARSET 6 +#define PROPERTY_ID_FONTPITCH 7 +#define PROPERTY_ID_FONTCHARWIDTH 8 +#define PROPERTY_ID_FONTWEIGHT 9 +#define PROPERTY_ID_FONTSLANT 10 +#define PROPERTY_ID_FONTUNDERLINE 11 +#define PROPERTY_ID_FONTSTRIKEOUT 12 #define PROPERTY_ID_FONTORIENTATION 13 -#define PROPERTY_ID_FONTKERNING 14 +#define PROPERTY_ID_FONTKERNING 14 #define PROPERTY_ID_FONTWORDLINEMODE 15 -#define PROPERTY_ID_FONTTYPE 16 +#define PROPERTY_ID_FONTTYPE 16 void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const uno::Reference<beans::XPropertySet>& _xProp) { if ( !_xProp.is() || !_sStyleName.getLength() || !_pAutoStyles ) @@ -283,30 +283,30 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty { ::com::sun::star::awt::FontDescriptor aFont; static comphelper::PropertyMapEntry pMap[] = - { - {PROPERTY_FONTNAME, static_cast<sal_uInt16>(PROPERTY_FONTNAME.length), PROPERTY_ID_FONTNAME, &::getCppuType(&aFont.Name) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARFONTHEIGHT, static_cast<sal_uInt16>(PROPERTY_CHARFONTHEIGHT.length), PROPERTY_ID_FONTHEIGHT, &::getCppuType(&aFont.Height) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTWIDTH.length), PROPERTY_ID_FONTWIDTH, &::getCppuType(&aFont.Width) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTSTYLENAME, static_cast<sal_uInt16>(PROPERTY_FONTSTYLENAME.length), PROPERTY_ID_FONTSTYLENAME, &::getCppuType(&aFont.StyleName) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTFAMILY, static_cast<sal_uInt16>(PROPERTY_FONTFAMILY.length), PROPERTY_ID_FONTFAMILY, &::getCppuType(&aFont.Family) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTCHARSET, static_cast<sal_uInt16>(PROPERTY_FONTCHARSET.length), PROPERTY_ID_FONTCHARSET, &::getCppuType(&aFont.CharSet) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTPITCH, static_cast<sal_uInt16>(PROPERTY_FONTPITCH.length), PROPERTY_ID_FONTPITCH, &::getCppuType(&aFont.Pitch) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTCHARWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTCHARWIDTH.length), PROPERTY_ID_FONTCHARWIDTH, &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0}, - {PROPERTY_FONTWEIGHT, static_cast<sal_uInt16>(PROPERTY_FONTWEIGHT.length), PROPERTY_ID_FONTWEIGHT, &::getCppuType(&aFont.Weight) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARPOSTURE, static_cast<sal_uInt16>(PROPERTY_CHARPOSTURE.length), PROPERTY_ID_FONTSLANT, &::getCppuType(&aFont.Slant) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTUNDERLINE, static_cast<sal_uInt16>(PROPERTY_FONTUNDERLINE.length), PROPERTY_ID_FONTUNDERLINE, &::getCppuType(&aFont.Underline) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARSTRIKEOUT, static_cast<sal_uInt16>(PROPERTY_CHARSTRIKEOUT.length), PROPERTY_ID_FONTSTRIKEOUT, &::getCppuType(&aFont.Strikeout) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTORIENTATION, static_cast<sal_uInt16>(PROPERTY_FONTORIENTATION.length), PROPERTY_ID_FONTORIENTATION, &::getCppuType(&aFont.Orientation) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTKERNING, static_cast<sal_uInt16>(PROPERTY_FONTKERNING.length), PROPERTY_ID_FONTKERNING, &::getCppuType(&aFont.Kerning) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARWORDMODE, static_cast<sal_uInt16>(PROPERTY_CHARWORDMODE.length), PROPERTY_ID_FONTWORDLINEMODE, &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTTYPE, static_cast<sal_uInt16>(PROPERTY_FONTTYPE.length), PROPERTY_ID_FONTTYPE, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0}, - //{PROPERTY_BACKGROUNDCOLOR, static_cast<sal_uInt16>(PROPERTY_BACKGROUNDCOLOR.length), PROPERTY_ID_BACKGROUNDCOLOR, &::getCppuType(&nBackgroundColor) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_PARAADJUST, static_cast<sal_uInt16>(PROPERTY_PARAADJUST.length), PROPERTY_ID_ALIGN, &::getCppuType(&nAlign) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CONTROLBORDER, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDER.length), PROPERTY_ID_BORDER, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CONTROLBORDERCOLOR, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDERCOLOR.length), PROPERTY_ID_BORDERCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CHARCOLOR, static_cast<sal_uInt16>(PROPERTY_TEXTCOLOR.length), PROPERTY_ID_TEXTCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_FORMATKEY, static_cast<sal_uInt16>(PROPERTY_FORMATKEY.length), PROPERTY_ID_FORMATKEY, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CHARUNDERLINECOLOR, static_cast<sal_uInt16>(PROPERTY_CHARUNDERLINECOLOR.length), PROPERTY_ID_TEXTLINECOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + { + {PROPERTY_FONTNAME, static_cast<sal_uInt16>(PROPERTY_FONTNAME.length), PROPERTY_ID_FONTNAME, &::getCppuType(&aFont.Name) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARFONTHEIGHT, static_cast<sal_uInt16>(PROPERTY_CHARFONTHEIGHT.length), PROPERTY_ID_FONTHEIGHT, &::getCppuType(&aFont.Height) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTWIDTH.length), PROPERTY_ID_FONTWIDTH, &::getCppuType(&aFont.Width) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTSTYLENAME, static_cast<sal_uInt16>(PROPERTY_FONTSTYLENAME.length), PROPERTY_ID_FONTSTYLENAME, &::getCppuType(&aFont.StyleName) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTFAMILY, static_cast<sal_uInt16>(PROPERTY_FONTFAMILY.length), PROPERTY_ID_FONTFAMILY, &::getCppuType(&aFont.Family) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTCHARSET, static_cast<sal_uInt16>(PROPERTY_FONTCHARSET.length), PROPERTY_ID_FONTCHARSET, &::getCppuType(&aFont.CharSet) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTPITCH, static_cast<sal_uInt16>(PROPERTY_FONTPITCH.length), PROPERTY_ID_FONTPITCH, &::getCppuType(&aFont.Pitch) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTCHARWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTCHARWIDTH.length), PROPERTY_ID_FONTCHARWIDTH, &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0}, + {PROPERTY_FONTWEIGHT, static_cast<sal_uInt16>(PROPERTY_FONTWEIGHT.length), PROPERTY_ID_FONTWEIGHT, &::getCppuType(&aFont.Weight) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARPOSTURE, static_cast<sal_uInt16>(PROPERTY_CHARPOSTURE.length), PROPERTY_ID_FONTSLANT, &::getCppuType(&aFont.Slant) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTUNDERLINE, static_cast<sal_uInt16>(PROPERTY_FONTUNDERLINE.length), PROPERTY_ID_FONTUNDERLINE, &::getCppuType(&aFont.Underline) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARSTRIKEOUT, static_cast<sal_uInt16>(PROPERTY_CHARSTRIKEOUT.length), PROPERTY_ID_FONTSTRIKEOUT, &::getCppuType(&aFont.Strikeout) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTORIENTATION, static_cast<sal_uInt16>(PROPERTY_FONTORIENTATION.length), PROPERTY_ID_FONTORIENTATION, &::getCppuType(&aFont.Orientation) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTKERNING, static_cast<sal_uInt16>(PROPERTY_FONTKERNING.length), PROPERTY_ID_FONTKERNING, &::getCppuType(&aFont.Kerning) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARWORDMODE, static_cast<sal_uInt16>(PROPERTY_CHARWORDMODE.length), PROPERTY_ID_FONTWORDLINEMODE, &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTTYPE, static_cast<sal_uInt16>(PROPERTY_FONTTYPE.length), PROPERTY_ID_FONTTYPE, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0}, + //{PROPERTY_BACKGROUNDCOLOR, static_cast<sal_uInt16>(PROPERTY_BACKGROUNDCOLOR.length), PROPERTY_ID_BACKGROUNDCOLOR, &::getCppuType(&nBackgroundColor) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_PARAADJUST, static_cast<sal_uInt16>(PROPERTY_PARAADJUST.length), PROPERTY_ID_ALIGN, &::getCppuType(&nAlign) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CONTROLBORDER, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDER.length), PROPERTY_ID_BORDER, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CONTROLBORDERCOLOR, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDERCOLOR.length), PROPERTY_ID_BORDERCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CHARCOLOR, static_cast<sal_uInt16>(PROPERTY_TEXTCOLOR.length), PROPERTY_ID_TEXTCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_FORMATKEY, static_cast<sal_uInt16>(PROPERTY_FORMATKEY.length), PROPERTY_ID_FORMATKEY, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CHARUNDERLINECOLOR, static_cast<sal_uInt16>(PROPERTY_CHARUNDERLINECOLOR.length), PROPERTY_ID_TEXTLINECOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, { NULL, 0, 0, NULL, 0, 0 } }; try @@ -317,22 +317,22 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); pAutoStyle->FillPropertySet(xProp); - xProp->getPropertyValue(PROPERTY_FONTNAME) >>= aFont.Name; - xProp->getPropertyValue(PROPERTY_CHARFONTHEIGHT) >>= aFont.Height; - xProp->getPropertyValue(PROPERTY_FONTWIDTH) >>= aFont.Width; - xProp->getPropertyValue(PROPERTY_FONTSTYLENAME) >>= aFont.StyleName; - xProp->getPropertyValue(PROPERTY_FONTFAMILY) >>= aFont.Family; - xProp->getPropertyValue(PROPERTY_FONTCHARSET) >>= aFont.CharSet; - xProp->getPropertyValue(PROPERTY_FONTPITCH) >>= aFont.Pitch; - xProp->getPropertyValue(PROPERTY_FONTCHARWIDTH) >>= aFont.CharacterWidth; - xProp->getPropertyValue(PROPERTY_FONTWEIGHT) >>= aFont.Weight; - xProp->getPropertyValue(PROPERTY_CHARPOSTURE) >>= aFont.Slant; - xProp->getPropertyValue(PROPERTY_FONTUNDERLINE) >>= aFont.Underline; - xProp->getPropertyValue(PROPERTY_CHARSTRIKEOUT) >>= aFont.Strikeout; - xProp->getPropertyValue(PROPERTY_FONTORIENTATION) >>= aFont.Orientation; - xProp->getPropertyValue(PROPERTY_FONTKERNING) >>= aFont.Kerning; - xProp->getPropertyValue(PROPERTY_CHARWORDMODE) >>= aFont.WordLineMode; - xProp->getPropertyValue(PROPERTY_FONTTYPE) >>= aFont.Type; + xProp->getPropertyValue(PROPERTY_FONTNAME) >>= aFont.Name; + xProp->getPropertyValue(PROPERTY_CHARFONTHEIGHT) >>= aFont.Height; + xProp->getPropertyValue(PROPERTY_FONTWIDTH) >>= aFont.Width; + xProp->getPropertyValue(PROPERTY_FONTSTYLENAME) >>= aFont.StyleName; + xProp->getPropertyValue(PROPERTY_FONTFAMILY) >>= aFont.Family; + xProp->getPropertyValue(PROPERTY_FONTCHARSET) >>= aFont.CharSet; + xProp->getPropertyValue(PROPERTY_FONTPITCH) >>= aFont.Pitch; + xProp->getPropertyValue(PROPERTY_FONTCHARWIDTH) >>= aFont.CharacterWidth; + xProp->getPropertyValue(PROPERTY_FONTWEIGHT) >>= aFont.Weight; + xProp->getPropertyValue(PROPERTY_CHARPOSTURE) >>= aFont.Slant; + xProp->getPropertyValue(PROPERTY_FONTUNDERLINE) >>= aFont.Underline; + xProp->getPropertyValue(PROPERTY_CHARSTRIKEOUT) >>= aFont.Strikeout; + xProp->getPropertyValue(PROPERTY_FONTORIENTATION) >>= aFont.Orientation; + xProp->getPropertyValue(PROPERTY_FONTKERNING) >>= aFont.Kerning; + xProp->getPropertyValue(PROPERTY_CHARWORDMODE) >>= aFont.WordLineMode; + xProp->getPropertyValue(PROPERTY_FONTTYPE) >>= aFont.Type; uno::Reference<report::XReportControlFormat> xReportControlModel(_xProp,uno::UNO_QUERY); if ( xReportControlModel.is() && aFont.Name.getLength() ) { @@ -353,11 +353,11 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet() { static comphelper::PropertyMapEntry pMap[] = - { - {PROPERTY_BORDERLEFT, static_cast<sal_uInt16>(PROPERTY_BORDERLEFT.length), 0, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERRIGHT, static_cast<sal_uInt16>(PROPERTY_BORDERRIGHT.length), 1, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERTOP, static_cast<sal_uInt16>(PROPERTY_BORDERTOP.length), 2, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(PROPERTY_BORDERBOTTOM.length), 3, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_BORDERLEFT, static_cast<sal_uInt16>(PROPERTY_BORDERLEFT.length), 0, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERRIGHT, static_cast<sal_uInt16>(PROPERTY_BORDERRIGHT.length), 1, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERTOP, static_cast<sal_uInt16>(PROPERTY_BORDERTOP.length), 2, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(PROPERTY_BORDERBOTTOM.length), 3, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; return comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); @@ -367,24 +367,24 @@ SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_REPORT_HEADER, XML_TOK_REPORT_HEADER }, - { XML_NAMESPACE_REPORT, XML_PAGE_HEADER , XML_TOK_PAGE_HEADER }, - { XML_NAMESPACE_REPORT, XML_GROUP, XML_TOK_GROUP }, - { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_DETAIL }, - { XML_NAMESPACE_REPORT, XML_PAGE_FOOTER , XML_TOK_PAGE_FOOTER }, - { XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, XML_TOK_REPORT_FOOTER }, - { XML_NAMESPACE_REPORT, XML_HEADER_ON_NEW_PAGE, XML_TOK_HEADER_ON_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_FOOTER_ON_NEW_PAGE, XML_TOK_FOOTER_ON_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_COMMAND_TYPE, XML_TOK_COMMAND_TYPE }, - { XML_NAMESPACE_REPORT, XML_COMMAND, XML_TOK_COMMAND }, - { XML_NAMESPACE_REPORT, XML_FILTER, XML_TOK_FILTER }, - { XML_NAMESPACE_REPORT, XML_CAPTION, XML_TOK_CAPTION }, - { XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, - { XML_NAMESPACE_REPORT, XML_FUNCTION, XML_TOK_REPORT_FUNCTION }, - { XML_NAMESPACE_OFFICE, XML_MIMETYPE, XML_TOK_REPORT_MIMETYPE }, - { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_REPORT_NAME }, - { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, XML_TOK_MASTER_DETAIL_FIELDS }, - { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_SUB_FRAME }, + { XML_NAMESPACE_REPORT, XML_REPORT_HEADER, XML_TOK_REPORT_HEADER }, + { XML_NAMESPACE_REPORT, XML_PAGE_HEADER , XML_TOK_PAGE_HEADER }, + { XML_NAMESPACE_REPORT, XML_GROUP, XML_TOK_GROUP }, + { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_DETAIL }, + { XML_NAMESPACE_REPORT, XML_PAGE_FOOTER , XML_TOK_PAGE_FOOTER }, + { XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, XML_TOK_REPORT_FOOTER }, + { XML_NAMESPACE_REPORT, XML_HEADER_ON_NEW_PAGE, XML_TOK_HEADER_ON_NEW_PAGE }, + { XML_NAMESPACE_REPORT, XML_FOOTER_ON_NEW_PAGE, XML_TOK_FOOTER_ON_NEW_PAGE }, + { XML_NAMESPACE_REPORT, XML_COMMAND_TYPE, XML_TOK_COMMAND_TYPE }, + { XML_NAMESPACE_REPORT, XML_COMMAND, XML_TOK_COMMAND }, + { XML_NAMESPACE_REPORT, XML_FILTER, XML_TOK_FILTER }, + { XML_NAMESPACE_REPORT, XML_CAPTION, XML_TOK_CAPTION }, + { XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, + { XML_NAMESPACE_REPORT, XML_FUNCTION, XML_TOK_REPORT_FUNCTION }, + { XML_NAMESPACE_OFFICE, XML_MIMETYPE, XML_TOK_REPORT_MIMETYPE }, + { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_REPORT_NAME }, + { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, XML_TOK_MASTER_DETAIL_FIELDS }, + { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_SUB_FRAME }, XML_TOKEN_MAP_END }; return new SvXMLTokenMap( aElemTokenMap ); @@ -394,9 +394,9 @@ SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, XML_TOK_MASTER_DETAIL_FIELD}, - { XML_NAMESPACE_REPORT, XML_MASTER, XML_TOK_MASTER}, - { XML_NAMESPACE_REPORT, XML_DETAIL, XML_TOK_SUB_DETAIL}, + { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, XML_TOK_MASTER_DETAIL_FIELD}, + { XML_NAMESPACE_REPORT, XML_MASTER, XML_TOK_MASTER}, + { XML_NAMESPACE_REPORT, XML_DETAIL, XML_TOK_SUB_DETAIL}, XML_TOKEN_MAP_END }; return new SvXMLTokenMap( aElemTokenMap ); diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index 0fd7612e3248..4995161a5e91 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,11 +37,11 @@ #include <memory> -#define CTF_RPT_NUMBERFORMAT (XML_DB_CTF_START + 1) +#define CTF_RPT_NUMBERFORMAT (XML_DB_CTF_START + 1) -#define XML_STYLE_FAMILY_REPORT_ID 700 -#define XML_STYLE_FAMILY_REPORT_NAME "report-element" -#define XML_STYLE_FAMILY_REPORT_PREFIX "rptelem" +#define XML_STYLE_FAMILY_REPORT_ID 700 +#define XML_STYLE_FAMILY_REPORT_NAME "report-element" +#define XML_STYLE_FAMILY_REPORT_PREFIX "rptelem" class SvXMLImport; @@ -55,8 +55,8 @@ namespace rptxml OPropertyHandlerFactory(const OPropertyHandlerFactory&); void operator =(const OPropertyHandlerFactory&); protected: - mutable ::std::auto_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; - mutable ::std::auto_ptr<XMLPropertyHandler> m_pTextAlignHandler; + mutable ::std::auto_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; + mutable ::std::auto_ptr<XMLPropertyHandler> m_pTextAlignHandler; public: OPropertyHandlerFactory(); virtual ~OPropertyHandlerFactory(); @@ -69,15 +69,15 @@ namespace rptxml public: static UniReference < XMLPropertySetMapper > GetCellStylePropertyMap(bool _bOldFormat = false); - static const SvXMLEnumMapEntry* GetReportPrintOptions(); - static const SvXMLEnumMapEntry* GetForceNewPageOptions(); - static const SvXMLEnumMapEntry* GetKeepTogetherOptions(); - static const SvXMLEnumMapEntry* GetCommandTypeOptions(); + static const SvXMLEnumMapEntry* GetReportPrintOptions(); + static const SvXMLEnumMapEntry* GetForceNewPageOptions(); + static const SvXMLEnumMapEntry* GetKeepTogetherOptions(); + static const SvXMLEnumMapEntry* GetCommandTypeOptions(); static const SvXMLEnumMapEntry* GetImageScaleOptions(); - + static const XMLPropertyMapEntry* GetTableStyleProps(); static const XMLPropertyMapEntry* GetColumnStyleProps(); - + static const XMLPropertyMapEntry* GetRowStyleProps(); static void copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& _xProp); @@ -85,7 +85,7 @@ namespace rptxml static SvXMLTokenMap* GetReportElemTokenMap(); static SvXMLTokenMap* GetSubDocumentElemTokenMap(); - + }; // ----------------------------------------------------------------------------- } // rptxml diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index ab7567214fdf..a665e74abdef 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx index 597c4ffea31a..77eee02d4345 100644 --- a/reportdesign/source/filter/xml/xmlImage.hxx +++ b/reportdesign/source/filter/xml/xmlImage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index a61c4b21928b..decca01c4aa5 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -168,7 +168,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName switch( m_pReportElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) { - case XML_TOK_COMMAND_TYPE: + case XML_TOK_COMMAND_TYPE: { sal_uInt16 nRet = static_cast<sal_uInt16>(sdb::CommandType::COMMAND); const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetCommandTypeOptions(); @@ -176,13 +176,13 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName m_xDatabaseDataProvider->setCommandType(nRet); } break; - case XML_TOK_COMMAND: + case XML_TOK_COMMAND: m_xDatabaseDataProvider->setCommand(sValue); break; - case XML_TOK_FILTER: + case XML_TOK_FILTER: m_xDatabaseDataProvider->setFilter(sValue); break; - case XML_TOK_ESCAPE_PROCESSING: + case XML_TOK_ESCAPE_PROCESSING: m_xDatabaseDataProvider->setEscapeProcessing(sValue == s_sTRUE); break; default: @@ -219,10 +219,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName switch( pMasterElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) { - case XML_TOK_MASTER: + case XML_TOK_MASTER: sMasterField = sValue; break; - case XML_TOK_SUB_DETAIL: + case XML_TOK_SUB_DETAIL: sDetailField = sValue; break; } @@ -281,9 +281,9 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName xNewAttribs = pList; pList->AppendAttributeList(_xAttrList); pList->AddAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("local-table.$A$1:.$Z$65536"))); - + } - + if ( bExport ) m_xDelegatee->startElement(_sName,xNewAttribs); } @@ -304,7 +304,7 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName) m_xDatabaseDataProvider->setDetailFields(uno::Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); bExport = false; } - else if ( _sName.equalsAscii("rpt:detail") + else if ( _sName.equalsAscii("rpt:detail") || _sName.equalsAscii("rpt:formatted-text") || _sName.equalsAscii("rpt:master-detail-field") || _sName.equalsAscii("rpt:report-component") @@ -361,8 +361,8 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > } // if ( !m_xDatabaseDataProvider.is() ) m_aArguments = m_xDatabaseDataProvider->detectArguments(NULL); - - uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( + + uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory")),m_xContext), uno::UNO_QUERY); m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get()); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index 4ea40033edda..d2e531629f79 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,8 +97,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider; - - ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; + + ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; }; // ----------------------------------------------------------------------------- } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 745203f25c51..f36a6df7a2e7 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ SvXMLImportContext* OXMLMasterFields::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetSubDocumentElemTokenMap(); + const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetSubDocumentElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx index c684c020be24..b3d784e91f84 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.hxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx index 358aeba8e0f4..645c0bad893d 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx index 703428832507..1c36503a746d 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 6990c9144b20..a27712d15c8f 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ DBG_NAME( rpt_OXMLReport ) OXMLReport::OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, - const Reference< XAttributeList > & _xAttrList + const Reference< XAttributeList > & _xAttrList ,const uno::Reference< report::XReportDefinition >& _xComponent ,OXMLTable* _pContainer) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) @@ -78,7 +78,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_COMMAND_TYPE: + case XML_TOK_COMMAND_TYPE: { sal_uInt16 nRet = static_cast<sal_uInt16>(sdb::CommandType::COMMAND); const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetCommandTypeOptions(); @@ -86,16 +86,16 @@ OXMLReport::OXMLReport( ORptFilter& rImport, m_xComponent->setCommandType(nRet); } break; - case XML_TOK_COMMAND: + case XML_TOK_COMMAND: m_xComponent->setCommand(sValue); break; - case XML_TOK_FILTER: + case XML_TOK_FILTER: m_xComponent->setFilter(sValue); break; - case XML_TOK_CAPTION: + case XML_TOK_CAPTION: m_xComponent->setCaption(sValue); break; - case XML_TOK_ESCAPE_PROCESSING: + case XML_TOK_ESCAPE_PROCESSING: m_xComponent->setEscapeProcessing(sValue == s_sTRUE); break; case XML_TOK_REPORT_MIMETYPE: @@ -149,7 +149,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext( SvXMLImportContext *pContext = _CreateChildContext(nPrefix,rLocalName,xAttrList); if ( pContext ) return pContext; - const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap(); + const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index 858090f39f2c..a1300897fa12 100644 --- a/reportdesign/source/filter/xml/xmlReport.hxx +++ b/reportdesign/source/filter/xml/xmlReport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace rptxml OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xComponent ,OXMLTable* _pContainer); virtual ~OXMLReport(); diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 2ef2ad192423..a3a8b3cee183 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE: + case XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE: m_xComponent->setPrintWhenGroupChange(s_sTRUE == sValue); break; case XML_TOK_PRINT_REPEATED_VALUES: @@ -104,7 +104,7 @@ SvXMLImportContext* OXMLReportElement::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetReportElementElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetReportElementElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx index 333322430832..00bdbe2d734b 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.hxx +++ b/reportdesign/source/filter/xml/xmlReportElement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace rptxml class ORptFilter; class OXMLReportElement : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > m_xComponent; ORptFilter& GetOwnImport(); OXMLReportElement(const OXMLReportElement&); void operator =(const OXMLReportElement&); diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index 01de1e714bf9..031eca201534 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ SvXMLImportContext* OXMLReportElementBase::_CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap(); + const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index c1d212748a86..546bdd0af2e0 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ namespace rptxml protected: ORptFilter& m_rImport; OXMLTable* m_pContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, @@ -67,7 +67,7 @@ namespace rptxml virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - + virtual void EndElement(); }; // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index fbff64b2a617..d5cba84aefd6 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ OXMLRow::OXMLRow( ORptFilter& rImport DBG_CTOR( rpt_OXMLRow,NULL); OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); - + const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); @@ -85,7 +85,7 @@ OXMLRow::OXMLRow( ORptFilter& rImport break; } } - + } // ----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ SvXMLImportContext* OXMLRow::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -140,9 +140,9 @@ void OXMLRow::EndElement() { PropertySetInfo* pInfo = new PropertySetInfo(); static PropertyMapEntry pMap[] = - { - {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; pInfo->add(pMap); @@ -155,7 +155,7 @@ void OXMLRow::EndElement() xProp->getPropertyValue(PROPERTY_WIDTH) >>= nWidth; m_pContainer->addWidth(nWidth); } - else + else { pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_TABLE_ROW,m_sStyleName)); if ( pAutoStyle ) diff --git a/reportdesign/source/filter/xml/xmlRow.hxx b/reportdesign/source/filter/xml/xmlRow.hxx index e31a36003b26..bbbe189ecd86 100644 --- a/reportdesign/source/filter/xml/xmlRow.hxx +++ b/reportdesign/source/filter/xml/xmlRow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 098858190d28..3dc4567bf9ea 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - + case XML_TOK_PAGE_PRINT_OPTION: if ( _bPageHeader ) m_xSection->getReportDefinition()->setPageHeaderOption(lcl_getReportPrintOption(sValue)); @@ -113,7 +113,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport, } // ----------------------------------------------------------------------------- OXMLSection::~OXMLSection() -{ +{ DBG_DTOR( rpt_OXMLSection,NULL); } // ----------------------------------------------------------------------------- @@ -125,7 +125,7 @@ SvXMLImportContext* OXMLSection::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap(); uno::Reference<lang::XMultiServiceFactory> xFactor = rImport.getServiceFactory(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx index 866401974a0c..6172e74b0be4 100644 --- a/reportdesign/source/filter/xml/xmlSection.hxx +++ b/reportdesign/source/filter/xml/xmlSection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ namespace rptxml class OXMLSection : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - sal_Bool m_bPageHeader; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; + sal_Bool m_bPageHeader; ORptFilter& GetOwnImport(); - + OXMLSection(const OXMLSection&); void operator =(const OXMLSection&); public: diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index afb2ceff5431..8e38218ecd94 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -229,7 +229,7 @@ UniReference < SvXMLImportPropertyMapper > { m_xCellImpPropMapper = new XMLTextImportPropertyMapper/*OSpecialHanldeXMLImportPropertyMapper*/( rImport.GetCellStylesPropertySetMapper(), m_rImport , const_cast<XMLFontStylesContext*>(m_rImport.GetFontDecls())); - + m_xCellImpPropMapper->ChainImportMapper(XMLTextImportHelper::CreateParaExtPropMapper(m_rImport, const_cast<XMLFontStylesContext*>(m_rImport.GetFontDecls()))); } xMapper = m_xCellImpPropMapper; @@ -238,9 +238,9 @@ UniReference < SvXMLImportPropertyMapper > case XML_STYLE_FAMILY_TABLE_COLUMN: { if( !m_xColumnImpPropMapper.is() ) - m_xColumnImpPropMapper = + m_xColumnImpPropMapper = new SvXMLImportPropertyMapper( rImport.GetColumnStylesPropertySetMapper(), m_rImport ); - + xMapper = m_xColumnImpPropMapper; } break; @@ -266,7 +266,7 @@ UniReference < SvXMLImportPropertyMapper > break; } } - + return xMapper; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 07ba5be94c56..8fec6ff9a6c8 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,16 +47,16 @@ namespace rptxml class OControlStyleContext : public XMLPropStyleContext { - ::rtl::OUString m_sDataStyleName; - ::rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; - SvXMLStylesContext* pStyles; - // std::vector<ScXMLMapContent> aMaps; - com::sun::star::uno::Any aConditionalFormat; - sal_Int32 m_nNumberFormat; + ::rtl::OUString m_sDataStyleName; + ::rtl::OUString sPageStyle; + const rtl::OUString sNumberFormat; + SvXMLStylesContext* pStyles; + // std::vector<ScXMLMapContent> aMaps; + com::sun::star::uno::Any aConditionalFormat; + sal_Int32 m_nNumberFormat; ORptFilter& m_rImport; - sal_Bool bConditionalFormatCreated : 1; - sal_Bool bParentSet : 1; + sal_Bool bConditionalFormatCreated : 1; + sal_Bool bParentSet : 1; ORptFilter& GetOwnImport() const; diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index 623eceaa849f..9bfc17808082 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ DBG_NAME( rpt_OXMLSubDocument ) OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport, sal_uInt16 nPrfx ,const ::rtl::OUString& rLName - ,const Reference< XReportComponent > & _xComponent + ,const Reference< XReportComponent > & _xComponent ,OXMLTable* _pContainer ,OXMLCell* _pCellParent) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) @@ -78,7 +78,7 @@ SvXMLImportContext* OXMLSubDocument::_CreateChildContext( SvXMLImportContext *pContext = OXMLReportElementBase::_CreateChildContext(_nPrefix,_rLocalName,xAttrList); if ( pContext ) return pContext; - const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetReportElemTokenMap(); + const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetReportElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { @@ -122,7 +122,7 @@ void OXMLSubDocument::EndElement() { // #i94115# this is no longer need. // m_pContainer->addCell(m_xComponent.get()); - + if ( !m_aMasterFields.empty() ) m_xComponent->setMasterFields(Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); if ( !m_aDetailFields.empty() ) @@ -130,8 +130,8 @@ void OXMLSubDocument::EndElement() m_xComponent->setName(m_xFake->getName()); m_xComponent->setPrintRepeatedValues(m_xFake->getPrintRepeatedValues()); - uno::Reference< report::XReportControlModel > xFakeModel(m_xFake,uno::UNO_QUERY); - uno::Reference< report::XReportControlModel > xComponentModel(m_xComponent,uno::UNO_QUERY); + uno::Reference< report::XReportControlModel > xFakeModel(m_xFake,uno::UNO_QUERY); + uno::Reference< report::XReportControlModel > xComponentModel(m_xComponent,uno::UNO_QUERY); if ( xComponentModel.is() && xFakeModel.is() ) { const sal_Int32 nCount = xFakeModel->getCount(); @@ -144,12 +144,12 @@ void OXMLSubDocument::EndElement() ::comphelper::copyProperties(xCond.get(),xNewCond.get()); xComponentModel->insertByIndex(xComponentModel->getCount(),uno::makeAny(xNewCond)); } // for (sal_Int32 i = 0; i < nCount ; ++i) - } + } catch(uno::Exception&) { OSL_ENSURE(0,"Can not access format condition!"); } - + } } } diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index e26996e81ee0..50bb1b91c8d5 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ namespace rptxml class OXMLCell; class OXMLSubDocument : public OXMLReportElementBase, public IMasterDetailFieds { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake; ::std::vector< ::rtl::OUString> m_aMasterFields; ::std::vector< ::rtl::OUString> m_aDetailFields; OXMLCell* m_pCellParent; diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index f70a65d98bcc..e9ba7ac425f1 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,7 +127,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport } // ----------------------------------------------------------------------------- OXMLTable::~OXMLTable() -{ +{ DBG_DTOR( rpt_OXMLTable,NULL); } // ----------------------------------------------------------------------------- @@ -139,7 +139,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); Reference<XMultiServiceFactory> xFactor = rImport.getServiceFactory(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) @@ -265,7 +265,7 @@ void OXMLTable::EndElement() try { (*aCellIter)->setSize(awt::Size(nWidth,nHeight)); - (*aCellIter)->setPosition(awt::Point(nPosX,nPosY)); + (*aCellIter)->setPosition(awt::Point(nPosX,nPosY)); } catch(beans::PropertyVetoException) { @@ -310,8 +310,8 @@ void OXMLTable::addCell(const Reference<XReportComponent>& _xElement) } // ----------------------------------------------------------------------------- void OXMLTable::incrementRowIndex() -{ - ++m_nRowIndex; +{ + ++m_nRowIndex; m_nColumnIndex = 0; m_aGrid.push_back(::std::vector<TCell>(m_aWidth.size())); } diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx index 4b6bbd2f429b..29105d9b3cd2 100644 --- a/reportdesign/source/filter/xml/xmlTable.hxx +++ b/reportdesign/source/filter/xml/xmlTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,14 +51,14 @@ namespace rptxml ::std::vector< ::std::vector<TCell> > m_aGrid; ::std::vector<sal_Int32> m_aHeight; ::std::vector<sal_Int32> m_aWidth; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - ::rtl::OUString m_sStyleName; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; + ::rtl::OUString m_sStyleName; sal_Int32 m_nColSpan; sal_Int32 m_nRowSpan; sal_Int32 m_nRowIndex; sal_Int32 m_nColumnIndex; ORptFilter& GetOwnImport(); - + OXMLTable(const OXMLTable&); void operator =(const OXMLTable&); public: @@ -85,7 +85,7 @@ namespace rptxml void incrementRowIndex(); inline void incrementColumnIndex() { ++m_nColumnIndex; } - + inline sal_Int32 getRowIndex() const { return m_nRowIndex; } inline sal_Int32 getColumnIndex() const { return m_nColumnIndex; } diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 1e1f2ba71305..8574b949845e 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,12 +116,12 @@ RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl( XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList ) ,m_rImport(rImport) { - DBG_CTOR(rpt_RptMLMasterStylesContext_Impl,NULL); + DBG_CTOR(rpt_RptMLMasterStylesContext_Impl,NULL); } RptMLMasterStylesContext_Impl::~RptMLMasterStylesContext_Impl() { - DBG_DTOR(rpt_RptMLMasterStylesContext_Impl,NULL); + DBG_DTOR(rpt_RptMLMasterStylesContext_Impl,NULL); } void RptMLMasterStylesContext_Impl::EndElement() @@ -182,10 +182,10 @@ sal_Int32 ReadThroughComponent( { xParser->parseStream( aParserInput ); } - catch( SAXParseException& + catch( SAXParseException& #if OSL_DEBUG_LEVEL > 1 -r +r #endif ) { @@ -240,7 +240,7 @@ sal_Int32 ReadThroughComponent( { uno::Reference< io::XStream > xDocStream; sal_Bool bEncrypted = sal_False; - + try { // open stream (and set parser input) @@ -249,7 +249,7 @@ sal_Int32 ReadThroughComponent( { // stream name not found! Then try the compatibility name. // if no stream can be opened, return immediatly with OK signal - + // do we even have an alternative name? if ( NULL == pCompatibilityStreamName ) return 0; @@ -330,7 +330,7 @@ Sequence< ::rtl::OUString > ORptImportHelper::getSupportedServiceNames_Static( //--------------------------------------------------------------------- Reference< XInterface > ORptContentImportHelper::create(const Reference< XComponentContext > & xContext) { - return static_cast< XServiceInfo* >(new ORptFilter(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | + return static_cast< XServiceInfo* >(new ORptFilter(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | IMPORT_FONTDECLS )); } //--------------------------------------------------------------------- @@ -389,10 +389,10 @@ Sequence< ::rtl::OUString > ORptMetaImportHelper::getSupportedServiceNames_Stati // - ORptFilter - // ------------- DBG_NAME(rpt_ORptFilter) -ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags ) +ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags ) :SvXMLImport(_rxMSF,nImportFlags) { - DBG_CTOR(rpt_ORptFilter,NULL); + DBG_CTOR(rpt_ORptFilter,NULL); GetMM100UnitConverter().setCoreMeasureUnit(MAP_100TH_MM); GetMM100UnitConverter().setXMLMeasureUnit(MAP_CM); GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__rpt) ), @@ -414,7 +414,7 @@ ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal ORptFilter::~ORptFilter() throw() { - DBG_DTOR(rpt_ORptFilter,NULL); + DBG_DTOR(rpt_ORptFilter,NULL); } //------------------------------------------------------------------------------ uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContext > const & xContext) @@ -438,7 +438,7 @@ uno::Sequence< ::rtl::OUString > ORptFilter::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_IMPORTFILTER; - + return aServices; } @@ -453,7 +453,7 @@ sal_Bool SAL_CALL ORptFilter::supportsService(const ::rtl::OUString& ServiceName return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor ) +sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { Window* pFocusWindow = Application::GetFocusWindow(); @@ -475,11 +475,11 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { ::rtl::OUString sFileName; - uno::Reference< embed::XStorage > xStorage; + uno::Reference< embed::XStorage > xStorage; uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier; - + const PropertyValue* pIter = rDescriptor.getConstArray(); - const PropertyValue* pEnd = pIter + rDescriptor.getLength(); + const PropertyValue* pEnd = pIter + rDescriptor.getLength(); for(;pIter != pEnd;++pIter) { if( pIter->Name.equalsAscii( "FileName" ) ) @@ -491,7 +491,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) Sequence< PropertyValue > aComponent; pIter->Value >>= aComponent; const PropertyValue* pComponentIter = aComponent.getConstArray(); - const PropertyValue* pComponentEnd = pComponentIter + aComponent.getLength(); + const PropertyValue* pComponentEnd = pComponentIter + aComponent.getLength(); for(;pComponentIter != pComponentEnd;++pComponentIter) { if( pComponentIter->Name.equalsAscii( "ActiveConnection" ) ) @@ -503,20 +503,20 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) } } } - + if ( sFileName.getLength() != 0 ) { uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY); SfxMediumRef pMedium = new SfxMedium( sFileName, ( STREAM_READ | STREAM_NOCREATE ), FALSE, 0 ); - + if( pMedium ) { try { xStorage = pMedium->GetStorage(); - // nError = pMedium->GetError(); + // nError = pMedium->GetError(); } catch(const Exception&) { @@ -535,13 +535,13 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY ); uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames(); const ::rtl::OUString* pDebugIter = aSeq.getConstArray(); - const ::rtl::OUString* pDebugEnd = pDebugIter + aSeq.getLength(); + const ::rtl::OUString* pDebugEnd = pDebugIter + aSeq.getLength(); for(;pDebugIter != pDebugEnd;++pDebugIter) { (void)*pDebugIter; } #endif - + Reference< document::XGraphicObjectResolver > xGraphicObjectResolver; uno::Reference<document::XEmbeddedObjectResolver> xEmbeddedObjectResolver; uno::Reference< lang::XMultiServiceFactory > xServiceFactory( getServiceFactory(), uno::UNO_QUERY); @@ -560,8 +560,8 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) static const ::rtl::OUString s_sOld(RTL_CONSTASCII_USTRINGPARAM("OldFormat")); static comphelper::PropertyMapEntry pMap[] = - { - { MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 }, + { + { MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 }, { MAP_LEN( "StreamName"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN("PrivateData"), 0, &::getCppuType( (uno::Reference<XInterface> *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "BaseURI"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, @@ -590,7 +590,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ,xProp ); - + try { xProp->setPropertyValue(s_sOld,uno::makeAny(!(xStorage->hasByName(s_sMeta) || xStorage->isStreamElement( s_sMeta )))); @@ -642,11 +642,11 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ,xProp ); } - + bRet = nRet == 0; - if ( bRet ) + if ( bRet ) { m_xReportDefinition->setModified(sal_False); } @@ -740,22 +740,22 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const { - if ( !m_pDocElemTokenMap.get() ) + if ( !m_pDocElemTokenMap.get() ) { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - //{ XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - //{ XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - //{ XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_REPORT, XML_TOK_DOC_REPORT }, - { XML_NAMESPACE_OOO, XML_REPORT, XML_TOK_DOC_REPORT }, - { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, - { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, - { XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, XML_TOK_DOC_META }, - //{ XML_NAMESPACE_OOO, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, + { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + //{ XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, + //{ XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + //{ XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OFFICE, XML_REPORT, XML_TOK_DOC_REPORT }, + { XML_NAMESPACE_OOO, XML_REPORT, XML_TOK_DOC_REPORT }, + { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, + { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, + { XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, XML_TOK_DOC_META }, + //{ XML_NAMESPACE_OOO, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, XML_TOKEN_MAP_END }; m_pDocElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -765,7 +765,7 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetReportElemTokenMap() const { - if ( !m_pReportElemTokenMap.get() ) + if ( !m_pReportElemTokenMap.get() ) m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap()); return *m_pReportElemTokenMap; } @@ -783,11 +783,11 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME }, - { XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA}, - { XML_NAMESPACE_REPORT, XML_PRE_EVALUATED, XML_TOK_PRE_EVALUATED }, - { XML_NAMESPACE_REPORT, XML_INITIAL_FORMULA,XML_TOK_INITIAL_FORMULA }, - { XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING,XML_TOK_DEEP_TRAVERSING }, + { XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME }, + { XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA}, + { XML_NAMESPACE_REPORT, XML_PRE_EVALUATED, XML_TOK_PRE_EVALUATED }, + { XML_NAMESPACE_REPORT, XML_INITIAL_FORMULA,XML_TOK_INITIAL_FORMULA }, + { XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING,XML_TOK_DEEP_TRAVERSING }, XML_TOKEN_MAP_END }; m_pFunctionElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -801,15 +801,15 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED }, - { XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA }, - { XML_NAMESPACE_REPORT, XML_STYLE_NAME , XML_TOK_FORMAT_STYLE_NAME }, + { XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED }, + { XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA }, + { XML_NAMESPACE_REPORT, XML_STYLE_NAME , XML_TOK_FORMAT_STYLE_NAME }, XML_TOKEN_MAP_END }; m_pFormatElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); } return *m_pFormatElemTokenMap; -} +} // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const { @@ -817,19 +817,19 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN }, - { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, - { XML_NAMESPACE_REPORT, XML_PRINT_HEADER_ON_EACH_PAGE , XML_TOK_PRINT_HEADER_ON_EACH_PAGE }, - { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, - { XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION , XML_TOK_GROUP_EXPRESSION }, - { XML_NAMESPACE_REPORT, XML_GROUP_HEADER , XML_TOK_GROUP_HEADER }, - { XML_NAMESPACE_REPORT, XML_GROUP , XML_TOK_GROUP_GROUP }, - { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_GROUP_DETAIL }, - { XML_NAMESPACE_REPORT, XML_GROUP_FOOTER , XML_TOK_GROUP_FOOTER }, - { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING , XML_TOK_SORT_ASCENDING }, - { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_GROUP_KEEP_TOGETHER }, - { XML_NAMESPACE_REPORT, XML_FUNCTION , XML_TOK_GROUP_FUNCTION }, - //{ XML_NAMESPACE_REPORT, XML_ , XML_TOK_ }, + { XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN }, + { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, + { XML_NAMESPACE_REPORT, XML_PRINT_HEADER_ON_EACH_PAGE , XML_TOK_PRINT_HEADER_ON_EACH_PAGE }, + { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, + { XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION , XML_TOK_GROUP_EXPRESSION }, + { XML_NAMESPACE_REPORT, XML_GROUP_HEADER , XML_TOK_GROUP_HEADER }, + { XML_NAMESPACE_REPORT, XML_GROUP , XML_TOK_GROUP_GROUP }, + { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_GROUP_DETAIL }, + { XML_NAMESPACE_REPORT, XML_GROUP_FOOTER , XML_TOK_GROUP_FOOTER }, + { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING , XML_TOK_SORT_ASCENDING }, + { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_GROUP_KEEP_TOGETHER }, + { XML_NAMESPACE_REPORT, XML_FUNCTION , XML_TOK_GROUP_FUNCTION }, + //{ XML_NAMESPACE_REPORT, XML_ , XML_TOK_ }, XML_TOKEN_MAP_END }; m_pGroupElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -843,11 +843,11 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES }, - { XML_NAMESPACE_REPORT, XML_PRINT_ONLY_WHEN_GROUP_CHANGE,XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION }, - { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT }, - { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION }, + { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES }, + { XML_NAMESPACE_REPORT, XML_PRINT_ONLY_WHEN_GROUP_CHANGE,XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE }, + { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION }, + { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT }, + { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION }, XML_TOKEN_MAP_END }; m_pElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -861,15 +861,15 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL }, - { XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES }, - { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE }, - { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA }, - { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE }, - { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT }, - { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA }, - { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI }, - { XML_NAMESPACE_REPORT, XML_SELECT_PAGE ,XML_TOK_SELECT_PAGE }, + { XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL }, + { XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES }, + { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE }, + { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA }, + { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE }, + { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT }, + { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA }, + { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI }, + { XML_NAMESPACE_REPORT, XML_SELECT_PAGE ,XML_TOK_SELECT_PAGE }, XML_TOKEN_MAP_END }; m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -883,15 +883,15 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME }, - { XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE }, - { XML_NAMESPACE_FORM, XML_LIST_PROPERTY ,XML_TOK_LIST_PROPERTY }, - { XML_NAMESPACE_OOO, XML_VALUE ,XML_TOK_VALUE }, - { XML_NAMESPACE_OOO, XML_CURRENCY ,XML_TOK_CURRENCY }, - { XML_NAMESPACE_OOO, XML_DATE_VALUE ,XML_TOK_DATE_VALUE }, - { XML_NAMESPACE_OOO, XML_TIME_VALUE ,XML_TOK_TIME_VALUE }, - { XML_NAMESPACE_OOO, XML_STRING_VALUE ,XML_TOK_STRING_VALUE }, - { XML_NAMESPACE_OOO, XML_BOOLEAN_VALUE ,XML_TOK_BOOLEAN_VALUE }, + { XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME }, + { XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE }, + { XML_NAMESPACE_FORM, XML_LIST_PROPERTY ,XML_TOK_LIST_PROPERTY }, + { XML_NAMESPACE_OOO, XML_VALUE ,XML_TOK_VALUE }, + { XML_NAMESPACE_OOO, XML_CURRENCY ,XML_TOK_CURRENCY }, + { XML_NAMESPACE_OOO, XML_DATE_VALUE ,XML_TOK_DATE_VALUE }, + { XML_NAMESPACE_OOO, XML_TIME_VALUE ,XML_TOK_TIME_VALUE }, + { XML_NAMESPACE_OOO, XML_STRING_VALUE ,XML_TOK_STRING_VALUE }, + { XML_NAMESPACE_OOO, XML_BOOLEAN_VALUE ,XML_TOK_BOOLEAN_VALUE }, XML_TOKEN_MAP_END }; m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -905,9 +905,9 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME }, - { XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME }, - { XML_NAMESPACE_REPORT, XML_TRANSFORM , XML_TOK_TRANSFORM }, + { XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME }, + { XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME }, + { XML_NAMESPACE_REPORT, XML_TRANSFORM , XML_TOK_TRANSFORM }, XML_TOKEN_MAP_END }; m_pComponentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -921,17 +921,17 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME }, - { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN , XML_TOK_COLUMN }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW , XML_TOK_ROW }, - { XML_NAMESPACE_TABLE, XML_TABLE_CELL , XML_TOK_CELL }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS , XML_TOK_TABLE_COLUMNS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS , XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL }, - { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED }, - { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, + { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN , XML_TOK_COLUMN }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW , XML_TOK_ROW }, + { XML_NAMESPACE_TABLE, XML_TABLE_CELL , XML_TOK_CELL }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS , XML_TOK_TABLE_COLUMNS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROWS , XML_TOK_TABLE_ROWS }, + { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL }, + { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED }, + { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED }, + { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, XML_TOKEN_MAP_END }; m_pColumnTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -945,15 +945,15 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE }, - { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME }, - { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE }, - { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN }, - { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_KEEP_TOGETHER }, - { XML_NAMESPACE_REPORT, XML_REPEAT_SECTION , XML_TOK_REPEAT_SECTION }, - { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_SECT_STYLE_NAME }, - { XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION , XML_TOK_PAGE_PRINT_OPTION }, + { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE }, + { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME }, + { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE }, + { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE }, + { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN }, + { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_KEEP_TOGETHER }, + { XML_NAMESPACE_REPORT, XML_REPEAT_SECTION , XML_TOK_REPEAT_SECTION }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_SECT_STYLE_NAME }, + { XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION , XML_TOK_PAGE_PRINT_OPTION }, XML_TOKEN_MAP_END }; @@ -968,18 +968,18 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_TEXT, XML_P , XML_TOK_P }, - { XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT }, - { XML_NAMESPACE_REPORT, XML_FORMATTED_TEXT , XML_TOK_FORMATTED_TEXT }, - { XML_NAMESPACE_REPORT, XML_IMAGE , XML_TOK_IMAGE }, - { XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT , XML_TOK_SUB_DOCUMENT }, - { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE , XML_TOK_CUSTOM_SHAPE }, - { XML_NAMESPACE_DRAW, XML_FRAME , XML_TOK_FRAME }, - { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER , XML_TOK_PAGE_NUMBER }, - { XML_NAMESPACE_TEXT, XML_PAGE_COUNT , XML_TOK_PAGE_COUNT }, - { XML_NAMESPACE_TEXT, XML_TAB , XML_TOK_TEXT_TAB_STOP }, - { XML_NAMESPACE_TEXT, XML_LINE_BREAK , XML_TOK_TEXT_LINE_BREAK }, - { XML_NAMESPACE_TEXT, XML_S , XML_TOK_TEXT_S }, + { XML_NAMESPACE_TEXT, XML_P , XML_TOK_P }, + { XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT }, + { XML_NAMESPACE_REPORT, XML_FORMATTED_TEXT , XML_TOK_FORMATTED_TEXT }, + { XML_NAMESPACE_REPORT, XML_IMAGE , XML_TOK_IMAGE }, + { XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT , XML_TOK_SUB_DOCUMENT }, + { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE , XML_TOK_CUSTOM_SHAPE }, + { XML_NAMESPACE_DRAW, XML_FRAME , XML_TOK_FRAME }, + { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER , XML_TOK_PAGE_NUMBER }, + { XML_NAMESPACE_TEXT, XML_PAGE_COUNT , XML_TOK_PAGE_COUNT }, + { XML_NAMESPACE_TEXT, XML_TAB , XML_TOK_TEXT_TAB_STOP }, + { XML_NAMESPACE_TEXT, XML_LINE_BREAK , XML_TOK_TEXT_LINE_BREAK }, + { XML_NAMESPACE_TEXT, XML_S , XML_TOK_TEXT_S }, XML_TOKEN_MAP_END }; m_pCellElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -1004,7 +1004,7 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const ::rtl::OUString& rLoca return pContext; } // ----------------------------------------------------------------------------- -SvXMLImport& ORptFilter::getGlobalContext() +SvXMLImport& ORptFilter::getGlobalContext() { return *this; } diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 9e4970d97d3d..e179a0baf5ff 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,34 +80,34 @@ public: DECLARE_STL_USTRINGACCESS_MAP(Sequence<PropertyValue>,TPropertyNameMap); DECLARE_STL_USTRINGACCESS_MAP( Reference<XFunction> ,TGroupFunctionMap); private: - + TGroupFunctionMap m_aFunctions; - com::sun::star::uno::Any m_aViewSettings; - Reference< XComponent > m_xSrcDoc; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupsElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pSectionElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pControlElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pFunctionElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pSubDocumentElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pFormatElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pCellElemTokenMap; - - UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; - UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - - Reference<XReportDefinition> m_xReportDefinition; + com::sun::star::uno::Any m_aViewSettings; + Reference< XComponent > m_xSrcDoc; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupsElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pSectionElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pControlElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pFunctionElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pSubDocumentElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pFormatElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pCellElemTokenMap; + + UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; + UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + + Reference<XReportDefinition> m_xReportDefinition; ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; - sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); + sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); SvXMLImportContext* CreateStylesContext(const ::rtl::OUString& rLocalName, const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ); @@ -123,9 +123,9 @@ protected: virtual XMLShapeImportHelper* CreateShapeImport(); - virtual ~ORptFilter() throw(); + virtual ~ORptFilter() throw(); public: - + ORptFilter( const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags = IMPORT_ALL ); // XFilter @@ -145,7 +145,7 @@ public: inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } /** return the SdrModel of the real model * - * \return + * \return */ ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_pReportModel; } void FinishStyles(); @@ -154,7 +154,7 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + const SvXMLTokenMap& GetDocElemTokenMap() const; const SvXMLTokenMap& GetReportElemTokenMap() const; const SvXMLTokenMap& GetGroupElemTokenMap() const; @@ -176,16 +176,16 @@ public: static ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula); /** inserts a new function * - * \param _xFunction + * \param _xFunction */ void insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction); void removeFunction(const ::rtl::OUString& _sFunctionName); inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } + + virtual SvXMLImport& getGlobalContext(); - virtual SvXMLImport& getGlobalContext(); - - virtual void enterEventContext(); - virtual void leaveEventContext(); + virtual void enterEventContext(); + virtual void leaveEventContext(); sal_Bool isOldFormat() const; }; diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index 3e4a09d3993a..cf5d753008d3 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ cppu::ImplementationEntry entries[] = { &cppu::createSingleComponentFactory, 0, 0 }, { &ORptMetaImportHelper::create, &ORptMetaImportHelper::getImplementationName_Static, &ORptMetaImportHelper::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } |