From c21979a3279953ec28fc3d6e379b9a3ba98c4fd3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 13 Jun 2014 17:53:15 +0200 Subject: loplugin:staticcall Change-Id: I7691a6d267ea572e3fdd028c1cfae7b721a76da7 --- xmloff/source/chart/SchXMLAxisContext.cxx | 9 ++++----- xmloff/source/chart/SchXMLChartContext.cxx | 4 ++-- xmloff/source/chart/SchXMLLegendContext.cxx | 2 +- xmloff/source/chart/SchXMLPlotAreaContext.cxx | 10 +++++----- .../chart/SchXMLRegressionCurveObjectContext.cxx | 2 +- xmloff/source/chart/SchXMLSeries2Context.cxx | 10 +++++----- xmloff/source/core/xmlexp.cxx | 2 +- xmloff/source/draw/XMLShapePropertySetContext.cxx | 2 +- xmloff/source/draw/XMLShapeStyleContext.cxx | 2 +- xmloff/source/draw/sdxmlexp.cxx | 4 ++-- xmloff/source/draw/sdxmlimp.cxx | 4 ++-- xmloff/source/draw/shapeexport.cxx | 22 +++++++++++----------- xmloff/source/draw/ximp3dobject.cxx | 8 ++++---- xmloff/source/draw/ximp3dscene.cxx | 8 ++++---- xmloff/source/forms/elementexport.cxx | 4 ++-- xmloff/source/forms/elementimport.cxx | 9 ++++----- xmloff/source/forms/formcellbinding.cxx | 10 +++++----- xmloff/source/forms/layerimport.cxx | 4 ++-- xmloff/source/forms/propertyexport.cxx | 2 +- xmloff/source/forms/propertyimport.cxx | 10 +++++----- xmloff/source/forms/propertyimport.hxx | 1 - xmloff/source/style/DashStyle.cxx | 4 ++-- xmloff/source/style/HatchStyle.cxx | 4 ++-- xmloff/source/style/XMLFootnoteSeparatorExport.cxx | 4 ++-- xmloff/source/style/bordrhdl.cxx | 4 ++-- xmloff/source/style/xmltabe.cxx | 2 +- xmloff/source/text/XMLTextColumnsContext.cxx | 6 ++---- xmloff/source/text/txtflde.cxx | 2 +- xmloff/source/transform/ChartOASISTContext.cxx | 2 +- xmloff/source/transform/MergeElemTContext.cxx | 2 +- xmloff/source/transform/NotesTContext.cxx | 2 +- xmloff/source/transform/Oasis2OOo.cxx | 2 +- xmloff/source/transform/StyleOASISTContext.cxx | 16 ++++++++-------- xmloff/source/transform/StyleOOoTContext.cxx | 8 ++++---- 34 files changed, 91 insertions(+), 96 deletions(-) (limited to 'xmloff/source') diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 0308c8e15dc4..5dc939ecfaef 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -225,7 +225,7 @@ void SchXMLAxisContext::CreateGrid( const OUString& sAutoStyleName, bool bIsMajo if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - m_rImportHelper.GetChartFamilyID(), sAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName ); if( pStyle && pStyle->ISA( XMLPropStyleContext )) (( XMLPropStyleContext* )pStyle )->FillPropertySet( xGridProp ); @@ -270,7 +270,6 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList { // parse attributes sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - SchXMLImport& rImport = ( SchXMLImport& )GetImport(); const SvXMLTokenMap& rAttrTokenMap = theAxisAttributeTokenMap::get(); for( sal_Int16 i = 0; i < nAttrCount; i++ ) @@ -285,7 +284,7 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList case XML_TOK_AXIS_DIMENSION: { sal_uInt16 nEnumVal; - if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisDimensionMap )) + if( SvXMLUnitConverter::convertEnum( nEnumVal, aValue, aXMLAxisDimensionMap )) m_aCurrentAxis.eDimension = ( SchXMLAxisDimension )nEnumVal; } break; @@ -295,7 +294,7 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList case XML_TOK_AXIS_TYPE: case XML_TOK_AXIS_TYPE_EXT: sal_uInt16 nEnumVal; - if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisTypeMap )) + if( SvXMLUnitConverter::convertEnum( nEnumVal, aValue, aXMLAxisTypeMap )) { m_nAxisType = nEnumVal; m_bAxisTypeImported = true; @@ -472,7 +471,7 @@ void SchXMLAxisContext::CreateAxis() if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - m_rImportHelper.GetChartFamilyID(), m_aAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), m_aAutoStyleName ); if( pStyle && pStyle->ISA( XMLPropStyleContext )) { diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index ca848149d33c..c88aac727027 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -370,7 +370,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - mrImportHelper.GetChartFamilyID(), sAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName ); if( pStyle && pStyle->ISA( XMLPropStyleContext )) (( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp ); @@ -1196,7 +1196,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - mrImportHelper.GetChartFamilyID(), msAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), msAutoStyleName ); if( pStyle && pStyle->ISA( XMLPropStyleContext )) (( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp ); diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx index bfb122fb6a82..c072ab9f6b42 100644 --- a/xmloff/source/chart/SchXMLLegendContext.cxx +++ b/xmloff/source/chart/SchXMLLegendContext.cxx @@ -204,7 +204,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - mrImportHelper.GetChartFamilyID(), sAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName ); if( pStyle && pStyle->ISA( XMLPropStyleContext )) (( XMLPropStyleContext* )pStyle )->FillPropertySet( xLegendProps ); diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 9353c80d5e4b..0e915ea06a4d 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -323,7 +323,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - mrImportHelper.GetChartFamilyID(), msAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), msAutoStyleName ); XMLPropStyleContext* pPropStyleContext = const_cast< XMLPropStyleContext * >( @@ -843,7 +843,7 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - mrImportHelper.GetChartFamilyID(), sAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName ); if( pStyle && pStyle->ISA( XMLPropStyleContext )) (( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp ); @@ -913,7 +913,7 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - mrImportHelper.GetChartFamilyID(), sAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName ); if( pStyle && pStyle->ISA( XMLPropStyleContext )) (( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp ); @@ -1015,7 +1015,7 @@ void SetErrorBarStyleProperties( const OUString& rStyleName, uno::Reference< bea SchXMLImportHelper& rImportHelper ) { const SvXMLStylesContext* pStylesCtxt = rImportHelper.GetAutoStylesContext(); - const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(rImportHelper.GetChartFamilyID(), + const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(SchXMLImportHelper::GetChartFamilyID(), rStyleName); XMLPropStyleContext &rSeriesStyleContext = @@ -1028,7 +1028,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere SchXMLImportHelper& rImportHelper, OUString& aPosRange, OUString& aNegRange) { const SvXMLStylesContext* pStylesCtxt = rImportHelper.GetAutoStylesContext(); - const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(rImportHelper.GetChartFamilyID(), + const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(SchXMLImportHelper::GetChartFamilyID(), aStyleName); XMLPropStyleContext * pSeriesStyleContext = diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index acb01344cf39..32eb7255e56f 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -181,7 +181,7 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - mrImportHelper.GetChartFamilyID(), sAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName ); XMLPropStyleContext* pPropStyleContext = const_cast< XMLPropStyleContext* >( dynamic_cast< const XMLPropStyleContext* >( pStyle )); diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index beebfa0265cf..9f69e4d17187 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -397,7 +397,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib mrGlobalChartTypeUsedBySeries = (maSeriesChartTypeName.equals( maGlobalChartTypeName )); sal_Int32 nCoordinateSystemIndex = 0;//so far we can only import one coordinate system m_xSeries.set( - mrImportHelper.GetNewDataSeries( mxNewDoc, nCoordinateSystemIndex, maSeriesChartTypeName, ! mrGlobalChartTypeUsedBySeries )); + SchXMLImportHelper::GetNewDataSeries( mxNewDoc, nCoordinateSystemIndex, maSeriesChartTypeName, ! mrGlobalChartTypeUsedBySeries )); Reference< chart2::data::XLabeledDataSequence > xLabeledSeq( SchXMLTools::GetNewLabeledDataSequence(), uno::UNO_QUERY_THROW ); if( bIsCandleStick ) @@ -477,7 +477,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib if( pStylesCtxt ) { const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext( - mrImportHelper.GetChartFamilyID(), msAutoStyleName ); + SchXMLImportHelper::GetChartFamilyID(), msAutoStyleName ); const XMLPropStyleContext* pPropStyleContext = dynamic_cast< const XMLPropStyleContext * >( pStyle ); @@ -808,7 +808,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe { rCurrStyleName = iStyle->msStyleName; rpStyle = pStylesCtxt->FindStyleChildContext( - rImportHelper.GetChartFamilyID(), rCurrStyleName ); + SchXMLImportHelper::GetChartFamilyID(), rCurrStyleName ); } //set style to series @@ -1057,7 +1057,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri { rCurrStyleName = iStyle->msSeriesStyleNameForDonuts; rpStyle = pStylesCtxt->FindStyleChildContext( - rImportHelper.GetChartFamilyID(), rCurrStyleName ); + SchXMLImportHelper::GetChartFamilyID(), rCurrStyleName ); } // note: SvXMLStyleContext::FillPropertySet is not const @@ -1082,7 +1082,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri { rCurrStyleName = iStyle->msStyleName; rpStyle = pStylesCtxt->FindStyleChildContext( - rImportHelper.GetChartFamilyID(), rCurrStyleName ); + SchXMLImportHelper::GetChartFamilyID(), rCurrStyleName ); } // note: SvXMLStyleContext::FillPropertySet is not const diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 5f4d9b9622fe..7730c882002e 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -602,7 +602,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo if(!mxNumberFormatsSupplier.is() ) { - mxNumberFormatsSupplier = mxNumberFormatsSupplier.query( mxModel ); + mxNumberFormatsSupplier.set(mxModel, css::uno::UNO_QUERY); if(mxNumberFormatsSupplier.is() && mxHandler.is()) mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier); } diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index 226954d632f1..b8a1e8a5a39c 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -53,7 +53,7 @@ void XMLShapePropertySetContext::EndElement() if( mxBulletStyle.Is() ) { SvxXMLListStyleContext* pBulletStyle = (SvxXMLListStyleContext*)&mxBulletStyle; - xNumRule = pBulletStyle->CreateNumRule( GetImport().GetModel() ); + xNumRule = SvxXMLListStyleContext::CreateNumRule( GetImport().GetModel() ); if( xNumRule.is() ) pBulletStyle->FillUnoNumRule(xNumRule, NULL /* const SvI18NMap * ??? */ ); } diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 4dbafca44003..fad397572064 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -175,7 +175,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet DBG_ASSERT( pListStyle, "list-style not found for shape style" ); if( pListStyle ) { - uno::Reference< container::XIndexReplace > xNumRule( pListStyle->CreateNumRule( GetImport().GetModel() ) ); + uno::Reference< container::XIndexReplace > xNumRule( SvxXMLListStyleContext::CreateNumRule( GetImport().GetModel() ) ); pListStyle->FillUnoNumRule(xNumRule, NULL /* const SvI18NMap * ??? */ ); property->maValue <<= xNumRule; } diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 4eacdcf585ea..90b7642a9339 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -485,7 +485,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent Reference < drawing::XMasterPagesSupplier > xMasterPagesSupplier(GetModel(), UNO_QUERY); if(xMasterPagesSupplier.is()) { - mxDocMasterPages = mxDocMasterPages.query( xMasterPagesSupplier->getMasterPages() ); + mxDocMasterPages.set(xMasterPagesSupplier->getMasterPages(), css::uno::UNO_QUERY); if(mxDocMasterPages.is()) { mnDocMasterPageCount = mxDocMasterPages->getCount(); @@ -497,7 +497,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent Reference xDrawPagesSupplier(GetModel(), UNO_QUERY); if(xDrawPagesSupplier.is()) { - mxDocDrawPages = mxDocDrawPages.query( xDrawPagesSupplier->getDrawPages() ); + mxDocDrawPages.set(xDrawPagesSupplier->getDrawPages(), css::uno::UNO_QUERY); if(mxDocDrawPages.is()) { mnDocDrawPageCount = mxDocDrawPages->getCount(); diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 8fb0ea1fa586..bc7565bb2d6a 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -345,14 +345,14 @@ void SAL_CALL SdXMLImport::setTargetDocument( const uno::Reference< lang::XCompo // prepare access to master pages uno::Reference < drawing::XMasterPagesSupplier > xMasterPagesSupplier(GetModel(), uno::UNO_QUERY); if(xMasterPagesSupplier.is()) - mxDocMasterPages = mxDocMasterPages.query( xMasterPagesSupplier->getMasterPages() ); + mxDocMasterPages.set(xMasterPagesSupplier->getMasterPages(), css::uno::UNO_QUERY); // prepare access to draw pages uno::Reference xDrawPagesSupplier(GetModel(), uno::UNO_QUERY); if(!xDrawPagesSupplier.is()) throw lang::IllegalArgumentException(); - mxDocDrawPages = mxDocDrawPages.query( xDrawPagesSupplier->getDrawPages() ); + mxDocDrawPages.set(xDrawPagesSupplier->getDrawPages(), css::uno::UNO_QUERY); if(!mxDocDrawPages.is()) throw lang::IllegalArgumentException(); diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index acccb67a0e93..16782d86278b 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -3426,7 +3426,7 @@ void XMLShapeExport::ImpExport3DShape( // write minEdge if(aPos3D != ::basegfx::B3DVector(-2500.0, -2500.0, -2500.0)) // write only when not default { - mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aPos3D); + SvXMLUnitConverter::convertB3DVector(sStringBuffer, aPos3D); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_MIN_EDGE, aStr); } @@ -3434,7 +3434,7 @@ void XMLShapeExport::ImpExport3DShape( // write maxEdge if(aDir3D != ::basegfx::B3DVector(2500.0, 2500.0, 2500.0)) // write only when not default { - mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aDir3D); + SvXMLUnitConverter::convertB3DVector(sStringBuffer, aDir3D); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_MAX_EDGE, aStr); } @@ -3463,7 +3463,7 @@ void XMLShapeExport::ImpExport3DShape( // write Center if(aPos3D != ::basegfx::B3DVector(0.0, 0.0, 0.0)) // write only when not default { - mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aPos3D); + SvXMLUnitConverter::convertB3DVector(sStringBuffer, aPos3D); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_CENTER, aStr); } @@ -3471,7 +3471,7 @@ void XMLShapeExport::ImpExport3DShape( // write Size if(aDir3D != ::basegfx::B3DVector(5000.0, 5000.0, 5000.0)) // write only when not default { - mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aDir3D); + SvXMLUnitConverter::convertB3DVector(sStringBuffer, aDir3D); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SIZE, aStr); } @@ -3567,7 +3567,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen ::basegfx::B3DVector aVRP(aCamGeo.vrp.PositionX, aCamGeo.vrp.PositionY, aCamGeo.vrp.PositionZ); if(aVRP != ::basegfx::B3DVector(0.0, 0.0, 1.0)) // write only when not default { - mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aVRP); + SvXMLUnitConverter::convertB3DVector(sStringBuffer, aVRP); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_VRP, aStr); } @@ -3575,7 +3575,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen ::basegfx::B3DVector aVPN(aCamGeo.vpn.DirectionX, aCamGeo.vpn.DirectionY, aCamGeo.vpn.DirectionZ); if(aVPN != ::basegfx::B3DVector(0.0, 0.0, 1.0)) // write only when not default { - mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aVPN); + SvXMLUnitConverter::convertB3DVector(sStringBuffer, aVPN); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_VPN, aStr); } @@ -3583,7 +3583,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen ::basegfx::B3DVector aVUP(aCamGeo.vup.DirectionX, aCamGeo.vup.DirectionY, aCamGeo.vup.DirectionZ); if(aVUP != ::basegfx::B3DVector(0.0, 1.0, 0.0)) // write only when not default { - mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aVUP); + SvXMLUnitConverter::convertB3DVector(sStringBuffer, aVUP); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_VUP, aStr); } @@ -3696,7 +3696,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s aPropName += aIndexStr; xPropSet->getPropertyValue(aPropName) >>= xLightDir; aLightDirection = ::basegfx::B3DVector(xLightDir.DirectionX, xLightDir.DirectionY, xLightDir.DirectionZ); - mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aLightDirection); + SvXMLUnitConverter::convertB3DVector(sStringBuffer, aLightDirection); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_DIRECTION, aStr); @@ -4336,7 +4336,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean { ::basegfx::B3DVector aVec3D( aExtrusionFirstLightDirection.DirectionX, aExtrusionFirstLightDirection.DirectionY, aExtrusionFirstLightDirection.DirectionZ ); - rUnitConverter.convertB3DVector( aStrBuffer, aVec3D ); + SvXMLUnitConverter::convertB3DVector( aStrBuffer, aVec3D ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_FIRST_LIGHT_DIRECTION, aStr ); } @@ -4349,7 +4349,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean { ::basegfx::B3DVector aVec3D( aExtrusionSecondLightDirection.DirectionX, aExtrusionSecondLightDirection.DirectionY, aExtrusionSecondLightDirection.DirectionZ ); - rUnitConverter.convertB3DVector( aStrBuffer, aVec3D ); + SvXMLUnitConverter::convertB3DVector( aStrBuffer, aVec3D ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_SECOND_LIGHT_DIRECTION, aStr ); } @@ -4405,7 +4405,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean { ::basegfx::B3DVector aVec3D( aExtrusionRotationCenter.DirectionX, aExtrusionRotationCenter.DirectionY, aExtrusionRotationCenter.DirectionZ ); - rUnitConverter.convertB3DVector( aStrBuffer, aVec3D ); + SvXMLUnitConverter::convertB3DVector( aStrBuffer, aVec3D ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_ROTATION_CENTER, aStr ); } diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index e5d5d9ec4d6b..623584dccb8f 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -133,7 +133,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( case XML_TOK_3DCUBEOBJ_MINEDGE: { ::basegfx::B3DVector aNewVec; - GetImport().GetMM100UnitConverter().convertB3DVector(aNewVec, sValue); + SvXMLUnitConverter::convertB3DVector(aNewVec, sValue); if(aNewVec != maMinEdge) { @@ -145,7 +145,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( case XML_TOK_3DCUBEOBJ_MAXEDGE: { ::basegfx::B3DVector aNewVec; - GetImport().GetMM100UnitConverter().convertB3DVector(aNewVec, sValue); + SvXMLUnitConverter::convertB3DVector(aNewVec, sValue); if(aNewVec != maMaxEdge) { @@ -235,7 +235,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( case XML_TOK_3DSPHEREOBJ_CENTER: { ::basegfx::B3DVector aNewVec; - GetImport().GetMM100UnitConverter().convertB3DVector(aNewVec, sValue); + SvXMLUnitConverter::convertB3DVector(aNewVec, sValue); if(aNewVec != maCenter) { @@ -247,7 +247,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( case XML_TOK_3DSPHEREOBJ_SIZE: { ::basegfx::B3DVector aNewVec; - GetImport().GetMM100UnitConverter().convertB3DVector(aNewVec, sValue); + SvXMLUnitConverter::convertB3DVector(aNewVec, sValue); if(aNewVec != maSize) { diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index b3e5953a0cb8..f1dc67962568 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -64,7 +64,7 @@ SdXML3DLightContext::SdXML3DLightContext( } case XML_TOK_3DLIGHT_DIRECTION: { - GetImport().GetMM100UnitConverter().convertB3DVector(maDirection, sValue); + SvXMLUnitConverter::convertB3DVector(maDirection, sValue); break; } case XML_TOK_3DLIGHT_ENABLED: @@ -255,7 +255,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co else if( IsXMLToken( rLocalName, XML_VRP ) ) { ::basegfx::B3DVector aNewVec; - mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue); + SvXMLUnitConverter::convertB3DVector(aNewVec, rValue); if(aNewVec != maVRP) { @@ -267,7 +267,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co else if( IsXMLToken( rLocalName, XML_VPN ) ) { ::basegfx::B3DVector aNewVec; - mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue); + SvXMLUnitConverter::convertB3DVector(aNewVec, rValue); if(aNewVec != maVPN) { @@ -279,7 +279,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co else if( IsXMLToken( rLocalName, XML_VUP ) ) { ::basegfx::B3DVector aNewVec; - mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue); + SvXMLUnitConverter::convertB3DVector(aNewVec, rValue); if(aNewVec != maVUP) { diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 6a94b3484c95..c30699d675e2 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -1791,7 +1791,7 @@ namespace xmloff sal_Int16 nLinkageType = aHelper.isCellIntegerBinding( xBinding ) ? 1 : 0; OUStringBuffer sBuffer; - m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum( + SvXMLUnitConverter::convertEnum( sBuffer, (sal_uInt16)nLinkageType, OEnumMapper::getEnumMap( OEnumMapper::epListLinkageType ) @@ -1835,7 +1835,7 @@ namespace xmloff Reference< XListEntrySink > xSink( m_xProps, UNO_QUERY ); Reference< XListEntrySource > xSource; if ( xSink.is() ) - xSource = xSource.query( xSink->getListEntrySource() ); + xSource.set(xSink->getListEntrySource(), css::uno::UNO_QUERY); OSL_ENSURE( xSource.is(), "OControlExport::exportCellListSourceRange: list source or sink!" ); if ( xSource.is() ) { diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 201291e3012b..1d1dc065a0b7 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -949,7 +949,7 @@ namespace xmloff _rPropValue.Value <<= sValue; } else - _rPropValue.Value = PropertyConversion::convertString(GetImport(), aProp.Type, sValue); + _rPropValue.Value = PropertyConversion::convertString(aProp.Type, sValue); } void OControlImport::EndElement() @@ -1125,7 +1125,7 @@ namespace xmloff if ( _rLocalName == GetXMLToken( XML_IMAGE_POSITION ) ) { OSL_VERIFY( PropertyConversion::convertString( - m_rContext.getGlobalContext(), ::getCppuType( &m_nImagePosition ), + ::getCppuType( &m_nImagePosition ), _rValue, OEnumMapper::getEnumMap( OEnumMapper::epImagePosition ) ) >>= m_nImagePosition ); m_bHaveImagePosition = true; @@ -1135,7 +1135,7 @@ namespace xmloff if ( _rLocalName == GetXMLToken( XML_IMAGE_ALIGN ) ) { OSL_VERIFY( PropertyConversion::convertString( - m_rContext.getGlobalContext(), ::getCppuType( &m_nImageAlign ), + ::getCppuType( &m_nImageAlign ), _rValue, OEnumMapper::getEnumMap( OEnumMapper::epImageAlign ) ) >>= m_nImageAlign ); return true; @@ -1243,7 +1243,7 @@ namespace xmloff OSL_ENSURE(pProperty, "ORadioImport::handleAttribute: invalid property map!"); if (pProperty) { - const Any aBooleanValue( PropertyConversion::convertString(m_rContext.getGlobalContext(), pProperty->aPropertyType, _rValue, pProperty->pEnumMap) ); + const Any aBooleanValue( PropertyConversion::convertString(pProperty->aPropertyType, _rValue, pProperty->pEnumMap) ); // create and store a new PropertyValue PropertyValue aNewValue; @@ -1673,7 +1673,6 @@ namespace xmloff { sal_Int16 nLinkageType = 0; PropertyConversion::convertString( - m_rContext.getGlobalContext(), ::cppu::UnoType::get(), _rValue, OEnumMapper::getEnumMap( OEnumMapper::epListLinkageType ) diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index c7ba0fd6e735..b8720e99391b 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -103,7 +103,7 @@ FormCellBindingHelper::FormCellBindingHelper( const Reference< XPropertySet >& _ OSL_ENSURE( m_xControlModel.is(), "FormCellBindingHelper::FormCellBindingHelper: invalid control model!" ); if ( !m_xDocument.is() ) - m_xDocument = m_xDocument.query( getDocument( m_xControlModel ) ); + m_xDocument.set(getDocument( m_xControlModel ), css::uno::UNO_QUERY); OSL_ENSURE( m_xDocument.is(), "FormCellBindingHelper::FormCellBindingHelper: Did not find the spreadsheet document!" ); } @@ -152,11 +152,11 @@ Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAdd if ( _rAddress.isEmpty() || !convertStringAddress( _rAddress, aAddress ) ) return xBinding; - xBinding = xBinding.query( createDocumentDependentInstance( + xBinding.set(createDocumentDependentInstance( _bUseIntegerBinding ? OUString(SERVICE_LISTINDEXCELLBINDING) : OUString(SERVICE_CELLVALUEBINDING), PROPERTY_BOUND_CELL, makeAny( aAddress ) - ) ); + ), css::uno::UNO_QUERY); return xBinding; } @@ -170,11 +170,11 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr return xSource; // create a range object for this address - xSource = xSource.query( createDocumentDependentInstance( + xSource.set(createDocumentDependentInstance( SERVICE_CELLRANGELISTSOURCE, PROPERTY_LIST_CELL_RANGE, makeAny( aRangeAddress ) - ) ); + ), css::uno::UNO_QUERY); return xSource; } diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index fa1ff91a3286..4da67a7e2500 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -384,7 +384,7 @@ void OFormLayerXMLImport_Impl::startPage(const Reference< XDrawPage >& _rxDrawPa m_xCurrentPageFormsSupp.clear(); OSL_ENSURE(_rxDrawPage.is(), "OFormLayerXMLImport_Impl::startPage: NULL page!"); - m_xCurrentPageFormsSupp = m_xCurrentPageFormsSupp.query( _rxDrawPage ); + m_xCurrentPageFormsSupp.set(_rxDrawPage, css::uno::UNO_QUERY); OSL_ENSURE( m_xCurrentPageFormsSupp.is(), "OFormLayerXMLImport_Impl::startPage: invalid draw page (no XFormsSupplier)!" ); if ( !m_xCurrentPageFormsSupp.is() ) return; @@ -444,7 +444,7 @@ void OFormLayerXMLImport_Impl::endPage() // now that we have all children of the forms collection, attach the events Reference< XIndexAccess > xIndexContainer; if ( m_xCurrentPageFormsSupp.is() && m_xCurrentPageFormsSupp->hasForms() ) - xIndexContainer = xIndexContainer.query( m_xCurrentPageFormsSupp->getForms() ); + xIndexContainer.set(m_xCurrentPageFormsSupp->getForms(), css::uno::UNO_QUERY); if ( xIndexContainer.is() ) ODefaultEventAttacherManager::setEvents( xIndexContainer ); diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 8f016d231f6f..5fca30d844ed 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -371,7 +371,7 @@ namespace xmloff // let the formatter of the export context build a string OUStringBuffer sBuffer; - m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum(sBuffer, (sal_uInt16)nCurrentValue, _pValueMap); + SvXMLUnitConverter::convertEnum(sBuffer, (sal_uInt16)nCurrentValue, _pValueMap); AddAttribute(_nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear()); } diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index c992b6f52073..584092878289 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -83,7 +83,7 @@ namespace } } -Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, +Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const bool _bInvertBoolean ) { Any aReturn; @@ -131,7 +131,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #if OSL_DEBUG_LEVEL > 0 bool bSuccess = #endif - _rImporter.GetMM100UnitConverter().convertEnum(nEnumValue, _rReadCharacters, _pEnumMap); + SvXMLUnitConverter::convertEnum(nEnumValue, _rReadCharacters, _pEnumMap); OSL_ENSURE(bSuccess, "PropertyConversion::convertString: could not convert to an enum value!"); if (bEnumAsInt) if (TypeClass_SHORT == _rExpectedType.getTypeClass()) @@ -336,7 +336,7 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUStr aNewValue.Name = pProperty->sPropertyName; // convert the value string into the target type - aNewValue.Value = PropertyConversion::convertString(m_rContext.getGlobalContext(), pProperty->aPropertyType, _rValue, pProperty->pEnumMap, pProperty->bInverseSemantics); + aNewValue.Value = PropertyConversion::convertString(pProperty->aPropertyType, _rValue, pProperty->pEnumMap, pProperty->bInverseSemantics); implPushBackPropertyValue( aNewValue ); return true; } @@ -463,7 +463,7 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx else { aPropValue.Value = - PropertyConversion::convertString(GetImport(), aPropType, + PropertyConversion::convertString(aPropType, sValue); } @@ -527,7 +527,7 @@ void OListPropertyContext::EndElement() ++values, ++pListElement ) { - *pListElement = PropertyConversion::convertString( GetImport(), aType, *values ); + *pListElement = PropertyConversion::convertString( aType, *values ); } PropertyValue aSequenceValue; diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index fc90556ad967..f7b91457f608 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -43,7 +43,6 @@ namespace xmloff { public: static ::com::sun::star::uno::Any convertString( - SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap = NULL, diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index fa0471f6e4da..a4e26b266a58 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -129,7 +129,7 @@ void XMLDashStyleImport::importXML( case XML_TOK_DASH_STYLE: { sal_uInt16 eValue; - if( rUnitConverter.convertEnum( eValue, rStrValue, pXML_DashStyle_Enum ) ) + if( SvXMLUnitConverter::convertEnum( eValue, rStrValue, pXML_DashStyle_Enum ) ) { aLineDash.Style = (drawing::DashStyle) eValue; } @@ -245,7 +245,7 @@ bool XMLDashStyleExport::exportXML( rStrName ); // Style - rUnitConverter.convertEnum( aOut, aLineDash.Style, pXML_DashStyle_Enum ); + SvXMLUnitConverter::convertEnum( aOut, aLineDash.Style, pXML_DashStyle_Enum ); aStrValue = aOut.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue ); diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index 6d1db910ad4e..f3d324495a74 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -122,7 +122,7 @@ bool XMLHatchStyleImport::importXML( case XML_TOK_HATCH_STYLE: { sal_uInt16 eValue; - bHasStyle = rUnitConverter.convertEnum( eValue, rStrValue, pXML_HatchStyle_Enum ); + bHasStyle = SvXMLUnitConverter::convertEnum( eValue, rStrValue, pXML_HatchStyle_Enum ); if( bHasStyle ) aHatch.Style = (drawing::HatchStyle) eValue; } @@ -194,7 +194,7 @@ bool XMLHatchStyleExport::exportXML( rExport.GetMM100UnitConverter(); // Style - if( !rUnitConverter.convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) ) + if( !SvXMLUnitConverter::convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) ) { bRet = false; } diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 5404963d799c..9aaf8583daa2 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -143,7 +143,7 @@ void XMLFootnoteSeparatorExport::exportXML( { XML_DASH, 3 }, { XML_TOKEN_INVALID, 0 } }; - if (rExport.GetMM100UnitConverter().convertEnum( + if (SvXMLUnitConverter::convertEnum( sBuf, nLineStyle, aXML_LineStyle_Enum ) ) { rExport.AddAttribute(XML_NAMESPACE_STYLE, XML_LINE_STYLE, @@ -159,7 +159,7 @@ void XMLFootnoteSeparatorExport::exportXML( { XML_TOKEN_INVALID, 0 } }; - if (rExport.GetMM100UnitConverter().convertEnum( + if (SvXMLUnitConverter::convertEnum( sBuf, eLineAdjust, aXML_HorizontalAdjust_Enum)) { rExport.AddAttribute(XML_NAMESPACE_STYLE, XML_ADJUSTMENT, diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index 860f9a44b44c..0e12efcdafa3 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -192,13 +192,13 @@ bool XMLBorderHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, co while( aTokens.getNextToken( aToken ) && !aToken.isEmpty() ) { if( !bHasWidth && - rUnitConverter.convertEnum( nNamedWidth, aToken, + SvXMLUnitConverter::convertEnum( nNamedWidth, aToken, pXML_NamedBorderWidths ) ) { bHasWidth = true; } else if( !bHasStyle && - rUnitConverter.convertEnum( nStyle, aToken, + SvXMLUnitConverter::convertEnum( nStyle, aToken, pXML_BorderStyles ) ) { bHasStyle = true; diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index 5c16c9d8b9b1..d1c92f23ad94 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -57,7 +57,7 @@ void SvxXMLTabStopExport::exportTabStop( const ::com::sun::star::style::TabStop* // type attribute if( style::TabAlign_LEFT != pTabStop->Alignment ) { - rUnitConv.convertEnum( sBuffer, pTabStop->Alignment, + SvXMLUnitConverter::convertEnum( sBuffer, pTabStop->Alignment, pXML_tabstop_style ); rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_TYPE, sBuffer.makeStringAndClear() ); diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 1e7f98bdd349..348471c6c8e5 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -242,8 +242,7 @@ XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl( case XML_TOK_COLUMN_SEP_ALIGN: { sal_uInt16 nAlign; - if( GetImport().GetMM100UnitConverter(). - convertEnum( nAlign, rValue, + if( SvXMLUnitConverter::convertEnum( nAlign, rValue, pXML_Sep_Align_Enum ) ) eVertAlign = (VerticalAlignment)nAlign; } @@ -251,8 +250,7 @@ XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl( case XML_TOK_COLUMN_SEP_STYLE: { sal_uInt16 nStyleVal; - if( GetImport().GetMM100UnitConverter(). - convertEnum( nStyleVal, rValue, + if( SvXMLUnitConverter::convertEnum( nStyleVal, rValue, pXML_Sep_Style_Enum ) ) nStyle = (sal_Int8)nStyleVal; } diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 372999395b37..3eee437e7957 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -446,7 +446,7 @@ enum FieldIdEnum XMLTextFieldExport::MapFieldName( { // map name to prelim. ID sal_uInt16 nTmp; - bool bRet = GetExport().GetMM100UnitConverter().convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( nTmp, sFieldName, aFieldServiceNameMapping); // check return diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx index 62e48b740c02..1311a3e38368 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -85,7 +85,7 @@ void XMLChartOASISTransformerContext::StartElement( case XML_ATACTION_DECODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); - if( GetTransformer().DecodeStyleName(aAttrValue) ) + if( XMLTransformerBase::DecodeStyleName(aAttrValue) ) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 404d25ffcccb..7a5381cc0252 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -136,7 +136,7 @@ XMLPersTextContentRNGTransformTContext::~XMLPersTextContentRNGTransformTContext( void XMLPersTextContentRNGTransformTContext::Characters( const OUString& rChars ) { OUString aConvChars( rChars ); - GetTransformer().ConvertRNGDateTimeToISO( aConvChars ); + XMLTransformerBase::ConvertRNGDateTimeToISO( aConvChars ); XMLPersTextContentTContext::Characters( aConvChars ); } diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx index 121a63cb3402..85bdddeeae70 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -106,7 +106,7 @@ void XMLNotesTransformerContext::StartElement( case XML_ATACTION_DECODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); - if( GetTransformer().DecodeStyleName(aAttrValue) ) + if( XMLTransformerBase::DecodeStyleName(aAttrValue) ) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index e6e8070c7430..2969ef12fb98 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1213,7 +1213,7 @@ void XMLTableTransformerContext_Impl::StartElement( { const OUString& rValue = xAttrList->getValueByIndex( i ); OUString aAttrValue( rValue ); - if( GetTransformer().DecodeStyleName(aAttrValue) ) + if( XMLTransformerBase::DecodeStyleName(aAttrValue) ) { if ( !pMutableAttrList ) { diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 6ea187f936c1..0e78db043d9e 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -207,7 +207,7 @@ void XMLPropertiesTContext_Impl::StartElement( case XML_ATACTION_DECODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); - GetTransformer().DecodeStyleName(aAttrValue); + XMLTransformerBase::DecodeStyleName(aAttrValue); pAttrList->AddAttribute( rAttrName, aAttrValue ); } break; @@ -219,14 +219,14 @@ void XMLPropertiesTContext_Impl::StartElement( ::xmloff::token::GetXMLToken( (*aIter).second.GetQNameTokenFromParam1()) ) ); OUString aAttrValue( rAttrValue ); - GetTransformer().DecodeStyleName(aAttrValue); + XMLTransformerBase::DecodeStyleName(aAttrValue); pAttrList->AddAttribute( aNewAttrQName, aAttrValue ); } break; case XML_ATACTION_NEG_PERCENT: { OUString aAttrValue( rAttrValue ); - GetTransformer().NegPercent(aAttrValue); + XMLTransformerBase::NegPercent(aAttrValue); pAttrList->AddAttribute( rAttrName, aAttrValue ); } break; @@ -238,7 +238,7 @@ void XMLPropertiesTContext_Impl::StartElement( ::xmloff::token::GetXMLToken( (*aIter).second.GetQNameTokenFromParam1()) ) ); OUString aAttrValue( rAttrValue ); - GetTransformer().NegPercent(aAttrValue); + XMLTransformerBase::NegPercent(aAttrValue); pAttrList->AddAttribute( aNewAttrQName, aAttrValue ); } break; @@ -400,13 +400,13 @@ void XMLPropertiesTContext_Impl::StartElement( // #i25616# case XML_OPTACTION_OPACITY: aOpacityValueRemember = rAttrValue; - GetTransformer().NegPercent(aOpacityValueRemember); + XMLTransformerBase::NegPercent(aOpacityValueRemember); break; // #i25616# case XML_OPTACTION_IMAGE_OPACITY: aImageOpacityValueRemember = rAttrValue; - GetTransformer().NegPercent(aImageOpacityValueRemember); + XMLTransformerBase::NegPercent(aImageOpacityValueRemember); break; case XML_OPTACTION_KEEP_TOGETHER: @@ -867,7 +867,7 @@ void XMLStyleOASISTContext::StartElement( case XML_ATACTION_DECODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); - if( GetTransformer().DecodeStyleName(aAttrValue) ) + if( XMLTransformerBase::DecodeStyleName(aAttrValue) ) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; @@ -882,7 +882,7 @@ void XMLStyleOASISTContext::StartElement( case XML_ATACTION_NEG_PERCENT: { OUString aAttrValue( rAttrValue ); - if( GetTransformer().NegPercent(aAttrValue) ) + if( XMLTransformerBase::NegPercent(aAttrValue) ) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 62afb7c9ae31..e8b225adc5a7 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -476,14 +476,14 @@ void XMLPropertiesOOoTContext_Impl::StartElement( case XML_ATACTION_NEG_PERCENT: { OUString aAttrValue( sAttrValue ); - GetTransformer().NegPercent(aAttrValue); + XMLTransformerBase::NegPercent(aAttrValue); pContext->AddAttribute( sAttrName, aAttrValue ); } break; case XML_ATACTION_RENAME_NEG_PERCENT: { OUString aAttrValue( sAttrValue ); - GetTransformer().NegPercent(aAttrValue); + XMLTransformerBase::NegPercent(aAttrValue); pContext->AddAttribute( aAction.GetQNamePrefixFromParam1(), aAction.GetQNameTokenFromParam1(), aAttrValue ); @@ -836,7 +836,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( case XML_PTACTION_TRANSPARENCY : { OUString aAttrValue( sAttrValue ); - GetTransformer().NegPercent(aAttrValue); + XMLTransformerBase::NegPercent(aAttrValue); pContext->AddAttribute( XML_NAMESPACE_DRAW, XML_OPACITY, aAttrValue ); @@ -1256,7 +1256,7 @@ void XMLStyleOOoTContext::StartElement( case XML_ATACTION_NEG_PERCENT: { OUString aAttrValue( sAttrValue ); - if( GetTransformer().NegPercent(aAttrValue) ) + if( XMLTransformerBase::NegPercent(aAttrValue) ) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; -- cgit