diff options
22 files changed, 27 insertions, 57 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index b908046458a6..6591ebc3b8d1 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -181,8 +181,7 @@ public: ::oox::core::XmlFilterBase& rFilterBase, const Theme* pTheme, const css::uno::Reference< css::drawing::XShapes >& rxShapes, - basegfx::B2DHomMatrix& aTransformation, - const css::awt::Rectangle* pShapeRect = nullptr ); + basegfx::B2DHomMatrix& aTransformation ); void setXShape( const css::uno::Reference< css::drawing::XShape >& rXShape ) { mxShape = rXShape; }; @@ -230,7 +229,6 @@ protected: Shape& rMaster, const Theme* pTheme, const css::uno::Reference< css::drawing::XShapes >& rxShapes, - const css::awt::Rectangle& rClientRect, ShapeIdMap* pShapeMap, const basegfx::B2DHomMatrix& aTransformation ); diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index 3d793a4ee143..382b77b56810 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -137,7 +137,7 @@ private: /** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. */ bool setFillBitmapUrl( sal_Int32 nPropId, const css::uno::Any& rValue ); /** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName */ - bool setFillBitmapNameFromUrl( sal_Int32 nPropId, const css::uno::Any& rValue ); + bool setFillBitmapNameFromUrl( const css::uno::Any& rValue ); // not implemented, to prevent implicit conversion from enum to int css::uno::Any& operator[]( ShapeProperty ePropId ) = delete; diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index 8efc626cebfa..ef537d688e4a 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -165,7 +165,7 @@ private: const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > & aSeriesSeq, - bool bJapaneseCandleSticks, bool& rPrimaryAxes ); + bool& rPrimaryAxes ); void exportSeriesText( const css::uno::Reference< css::chart2::data::XDataSequence >& xValueSeq ); void exportSeriesCategory( diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index eaebe8621e59..25a91398a201 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -307,9 +307,7 @@ public: void convertAxPicture( PropertyMap& rPropMap, const StreamDataSequence& rPicData, - sal_Int32 nPicSizeMode, - sal_Int32 nPicAlign, - bool bPicTiling ) const; + sal_Int32 nPicSizeMode ) const; /** Converts the Forms 2.0 value for checked/unchecked/dontknow to UNO properties. */ diff --git a/oox/inc/drawingml/customshapegeometry.hxx b/oox/inc/drawingml/customshapegeometry.hxx index 6108d1483ff9..a8a97c0882ad 100644 --- a/oox/inc/drawingml/customshapegeometry.hxx +++ b/oox/inc/drawingml/customshapegeometry.hxx @@ -32,7 +32,7 @@ namespace oox { namespace drawingml { class CustomShapeGeometryContext : public ::oox::core::ContextHandler2 { public: - CustomShapeGeometryContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties ); + CustomShapeGeometryContext( ::oox::core::ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties ); virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; private: diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx index 912bfd26251e..0a4a338e8db6 100644 --- a/oox/inc/drawingml/customshapeproperties.hxx +++ b/oox/inc/drawingml/customshapeproperties.hxx @@ -110,8 +110,7 @@ public: CustomShapeProperties(); ~CustomShapeProperties(); - void pushToPropSet( const ::oox::core::FilterBase& rFilterBase, - const css::uno::Reference < css::beans::XPropertySet > & xPropSet, + void pushToPropSet( const css::uno::Reference < css::beans::XPropertySet > & xPropSet, const css::uno::Reference < css::drawing::XShape > & xShape, const css::awt::Size &aSize ); diff --git a/oox/inc/drawingml/misccontexts.hxx b/oox/inc/drawingml/misccontexts.hxx index 67d2d0e1666f..4c26599a9787 100644 --- a/oox/inc/drawingml/misccontexts.hxx +++ b/oox/inc/drawingml/misccontexts.hxx @@ -34,7 +34,6 @@ class SolidFillContext : public ColorContext public: explicit SolidFillContext( ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, FillProperties& rFillProps ); }; @@ -123,7 +122,6 @@ class DuotoneContext : public ::oox::core::ContextHandler2 public: explicit DuotoneContext( ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, BlipFillProperties& rBlipProps ); virtual ~DuotoneContext() override; diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 471bca3f0327..d15337dd7cbd 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -1160,7 +1160,7 @@ ContextHandlerRef Path2DListContext::onCreateContext( sal_Int32 aElementToken, c } // CT_CustomGeometry2D -CustomShapeGeometryContext::CustomShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& /* rAttribs */, CustomShapeProperties& rCustomShapeProperties ) +CustomShapeGeometryContext::CustomShapeGeometryContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties ) : ContextHandler2( rParent ) , mrCustomShapeProperties( rCustomShapeProperties ) { diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 0474ae68396f..a043dabb359a 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -111,7 +111,7 @@ static OUString GetConnectorShapeType( sal_Int32 nType ) return sType; } -void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFilterBase */, +void CustomShapeProperties::pushToPropSet( const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape, const awt::Size &aSize ) { if ( mnShapePresetType >= 0 ) diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx index 71f17f65d65a..87a52f14446f 100644 --- a/oox/source/drawingml/diagram/constraintlistcontext.cxx +++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx @@ -31,7 +31,6 @@ namespace oox { namespace drawingml { // CT_ConstraintLists ConstraintListContext::ConstraintListContext( ContextHandler2Helper& rParent, - const AttributeList&, const LayoutAtomPtr &pNode ) : ContextHandler2( rParent ) , mpNode( pNode ) diff --git a/oox/source/drawingml/diagram/constraintlistcontext.hxx b/oox/source/drawingml/diagram/constraintlistcontext.hxx index 730cd2d88a30..b1a9116aba33 100644 --- a/oox/source/drawingml/diagram/constraintlistcontext.hxx +++ b/oox/source/drawingml/diagram/constraintlistcontext.hxx @@ -29,7 +29,7 @@ namespace oox { namespace drawingml { class ConstraintListContext : public ::oox::core::ContextHandler2 { public: - ConstraintListContext( ContextHandler2Helper& rParent, const AttributeList& rAttributes, const LayoutAtomPtr &pNode ); + ConstraintListContext( ContextHandler2Helper& rParent, const LayoutAtomPtr &pNode ); virtual ~ConstraintListContext() override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override; diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 63ad0667f6f3..87fa59aef23c 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -145,7 +145,6 @@ void AlgAtom::accept( LayoutAtomVisitor& rVisitor ) } void AlgAtom::layoutShape( const ShapePtr& rShape, - const Diagram& /*rDgm*/, const OUString& rName ) const { switch(mnType) @@ -513,7 +512,6 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI class ShapeLayoutingVisitor : public LayoutAtomVisitor { ShapePtr mpParentShape; - const Diagram& mrDgm; OUString maName; virtual void visit(ConstraintAtom& rAtom) override; @@ -525,10 +523,8 @@ class ShapeLayoutingVisitor : public LayoutAtomVisitor public: ShapeLayoutingVisitor(const ShapePtr& rParentShape, - const Diagram& rDgm, const OUString& rName) : mpParentShape(rParentShape), - mrDgm(rDgm), maName(rName) {} @@ -658,7 +654,6 @@ void ShapeCreationVisitor::visit(LayoutNode& rAtom) // layout shapes - now all child shapes are created ShapeLayoutingVisitor aLayoutingVisitor(pCurrParent, - mrDgm, rAtom.getName()); aLayoutingVisitor.defaultVisit(rAtom); } @@ -678,7 +673,7 @@ void ShapeLayoutingVisitor::visit(ConstraintAtom& /*rAtom*/) void ShapeLayoutingVisitor::visit(AlgAtom& rAtom) { - rAtom.layoutShape(mpParentShape,mrDgm,maName); + rAtom.layoutShape(mpParentShape, maName); } void ShapeLayoutingVisitor::visit(ForEachAtom& /*rAtom*/) diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx index de8d80b5be51..68cff05e85c8 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx @@ -158,7 +158,6 @@ public: void addParam( sal_Int32 nType, sal_Int32 nVal ) { maMap[nType]=nVal; } void layoutShape( const ShapePtr& rShape, - const Diagram& rDgm, const OUString& rName ) const; private: sal_Int32 mnType; diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index 3bf6d78e7624..d96a49b0529e 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -297,7 +297,7 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement, } case DGM_TOKEN( constrLst ): // CT_Constraints - return new ConstraintListContext( *this, rAttribs, mpNode ); + return new ConstraintListContext( *this, mpNode ); case DGM_TOKEN( presOf ): { // CT_PresentationOf diff --git a/oox/source/drawingml/misccontexts.cxx b/oox/source/drawingml/misccontexts.cxx index 012c3f34370f..f5dc16d19b05 100644 --- a/oox/source/drawingml/misccontexts.cxx +++ b/oox/source/drawingml/misccontexts.cxx @@ -37,7 +37,7 @@ namespace oox { namespace drawingml { SolidFillContext::SolidFillContext( ContextHandler2Helper& rParent, - const AttributeList&, FillProperties& rFillProps ) : + FillProperties& rFillProps ) : ColorContext( rParent, rFillProps.maFillColor ) { } @@ -181,7 +181,7 @@ ContextHandlerRef BlipContext::onCreateContext( return new ColorChangeContext( *this, rAttribs, mrBlipProps ); case A_TOKEN( duotone ): - return new DuotoneContext( *this, rAttribs, mrBlipProps ); + return new DuotoneContext( *this, mrBlipProps ); case A_TOKEN( extLst ): return new BlipExtensionContext( *this, mrBlipProps ); @@ -198,7 +198,7 @@ ContextHandlerRef BlipContext::onCreateContext( } DuotoneContext::DuotoneContext( ContextHandler2Helper& rParent, - const AttributeList& /*rAttribs*/, BlipFillProperties& rBlipProps ) : + BlipFillProperties& rBlipProps ) : ContextHandler2( rParent ), mrBlipProps( rBlipProps ), mnColorIndex( 0 ) @@ -279,7 +279,7 @@ ContextHandlerRef FillPropertiesContext::createFillContext( switch( nElement ) { case A_TOKEN( noFill ): { rFillProps.moFillType = getBaseToken( nElement ); return nullptr; }; - case A_TOKEN( solidFill ): { rFillProps.moFillType = getBaseToken( nElement ); return new SolidFillContext( rParent, rAttribs, rFillProps ); }; + case A_TOKEN( solidFill ): { rFillProps.moFillType = getBaseToken( nElement ); return new SolidFillContext( rParent, rFillProps ); }; case A_TOKEN( gradFill ): { rFillProps.moFillType = getBaseToken( nElement ); return new GradientFillContext( rParent, rAttribs, rFillProps.maGradientProps ); }; case A_TOKEN( pattFill ): { rFillProps.moFillType = getBaseToken( nElement ); return new PatternFillContext( rParent, rAttribs, rFillProps.maPatternProps ); }; case A_TOKEN( blipFill ): { rFillProps.moFillType = getBaseToken( nElement ); return new BlipFillContext( rParent, rAttribs, rFillProps.maBlipProps ); }; diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 198986d88da2..ef14ed900759 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -263,7 +263,7 @@ void Shape::addShape( // if this is a group shape, we have to add also each child shape Reference< XShapes > xShapes( xShape, UNO_QUERY ); if ( xShapes.is() ) - addChildren( rFilterBase, *this, pTheme, xShapes, awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap, aMatrix ); + addChildren( rFilterBase, *this, pTheme, xShapes, pShapeMap, aMatrix ); if( meFrameType == FRAMETYPE_DIAGRAM ) { @@ -319,14 +319,9 @@ void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText ) void Shape::addChildren( ::oox::core::XmlFilterBase& rFilterBase, const Theme* pTheme, const Reference< XShapes >& rxShapes, - basegfx::B2DHomMatrix& aTransformation, - const awt::Rectangle* pShapeRect ) + basegfx::B2DHomMatrix& aTransformation ) { - addChildren(rFilterBase, *this, pTheme, rxShapes, - pShapeRect ? - *pShapeRect : - awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), - nullptr, aTransformation); + addChildren(rFilterBase, *this, pTheme, rxShapes, nullptr, aTransformation); } struct ActionLockGuard @@ -354,7 +349,6 @@ void Shape::addChildren( Shape& rMaster, const Theme* pTheme, const Reference< XShapes >& rxShapes, - const awt::Rectangle&, ShapeIdMap* pShapeMap, const basegfx::B2DHomMatrix& aTransformation ) { @@ -1090,7 +1084,7 @@ Reference< XShape > const & Shape::createAndInsert( // for these ==cscode== and ==csdata== markers, so don't "clean up" these SAL_INFOs SAL_INFO("oox.cscode", "==cscode== shape name: '" << msName << "'"); SAL_INFO("oox.csdata", "==csdata== shape name: '" << msName << "'"); - mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, mxShape, maSize ); + mpCustomShapePropertiesPtr->pushToPropSet( xSet, mxShape, maSize ); } else if( getTextBody() ) getTextBody()->getTextProperties().pushVertSimulation(); diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx index 82f5207d91e4..80b9201fbaff 100644 --- a/oox/source/drawingml/shapepropertiescontext.cxx +++ b/oox/source/drawingml/shapepropertiescontext.cxx @@ -61,7 +61,7 @@ ContextHandlerRef ShapePropertiesContext::onCreateContext( sal_Int32 aElementTok // GeometryGroup case A_TOKEN( custGeom ): // custom geometry "CT_CustomGeometry2D" - return new CustomShapeGeometryContext( *this, rAttribs, *(mrShape.getCustomShapeProperties()) ); + return new CustomShapeGeometryContext( *this, *mrShape.getCustomShapeProperties() ); case A_TOKEN( prstGeom ): // preset geometry "CT_PresetGeometry2D" { diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx index aca31842bae9..2b87d77f3428 100644 --- a/oox/source/drawingml/shapepropertymap.cxx +++ b/oox/source/drawingml/shapepropertymap.cxx @@ -104,7 +104,7 @@ bool ShapePropertyMap::setAnyProperty( ShapeProperty ePropId, const Any& rValue return setFillBitmapUrl( nPropId, rValue ); case ShapeProperty::FillBitmapNameFromUrl: - return setFillBitmapNameFromUrl( nPropId, rValue ); + return setFillBitmapNameFromUrl( rValue ); default:; // suppress compiler warnings } @@ -193,7 +193,7 @@ bool ShapePropertyMap::setFillBitmapUrl( sal_Int32 nPropId, const Any& rValue ) return false; } -bool ShapePropertyMap::setFillBitmapNameFromUrl( sal_Int32 /*nPropId*/, const Any& rValue ) +bool ShapePropertyMap::setFillBitmapNameFromUrl( const Any& rValue ) { if( rValue.has< OUString >() ) { diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 4936e65b18cf..7b786c782fba 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1848,8 +1848,7 @@ void ChartExport::exportStockChart( const Reference< chart2::XChartType >& xChar Reference< chart2::XDataSeriesContainer > xDSCnt( xChartType, uno::UNO_QUERY ); if(xDSCnt.is()) - exportCandleStickSeries( - xDSCnt->getDataSeries(), bJapaneseCandleSticks, bPrimaryAxes ); + exportCandleStickSeries( xDSCnt->getDataSeries(), bPrimaryAxes ); // export stock properties Reference< css::chart::XStatisticDisplay > xStockPropProvider( mxDiagram, uno::UNO_QUERY ); @@ -2201,7 +2200,6 @@ void ChartExport::exportSeries( const Reference<chart2::XChartType>& xChartType, void ChartExport::exportCandleStickSeries( const Sequence< Reference< chart2::XDataSeries > > & aSeriesSeq, - bool /*bJapaneseCandleSticks*/, bool& rPrimaryAxes) { for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aSeriesSeq.getLength(); ++nSeriesIdx ) diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 24b33d842840..96ecfbf91b69 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -481,7 +481,7 @@ void ControlConverter::convertAxPicture( PropertyMap& rPropMap, const StreamData } void ControlConverter::convertAxPicture( PropertyMap& rPropMap, const StreamDataSequence& rPicData, - sal_Int32 nPicSizeMode, sal_Int32 /*nPicAlign*/, bool /*bPicTiling*/ ) const + sal_Int32 nPicSizeMode ) const { // the picture convertPicture( rPropMap, rPicData ); @@ -1324,7 +1324,7 @@ void AxImageModel::convertProperties( PropertyMap& rPropMap, const ControlConver rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_FLAGS_ENABLED ) ); rConv.convertAxBackground( rPropMap, mnBackColor, mnFlags, ApiTransparencyMode::Void ); rConv.convertAxBorder( rPropMap, mnBorderColor, mnBorderStyle, mnSpecialEffect ); - rConv.convertAxPicture( rPropMap, maPictureData, mnPicSizeMode, mnPicAlign, mbPicTiling ); + rConv.convertAxPicture( rPropMap, maPictureData, mnPicSizeMode ); AxControlModelBase::convertProperties( rPropMap, rConv ); } diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx index 6fd9c99d9790..b68214ce0952 100644 --- a/oox/source/ppt/dgmlayout.cxx +++ b/oox/source/ppt/dgmlayout.cxx @@ -123,19 +123,11 @@ bool QuickDiagrammingLayout::importDocument() // don't add pShape itself, but only its children pShape->setXShape(getParentShape()); - const awt::Size& rSize=xParentShape->getSize(); - const awt::Point& rPoint=xParentShape->getPosition(); - const long nScaleFactor=360; - const awt::Rectangle aRect(nScaleFactor*rPoint.X, - nScaleFactor*rPoint.Y, - nScaleFactor*rSize.Width, - nScaleFactor*rSize.Height); basegfx::B2DHomMatrix aMatrix; pShape->addChildren( *this, mpThemePtr.get(), xParentShapes, - aMatrix, - &aRect ); + aMatrix ); return true; } diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 3d109e310682..9c415af67604 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -378,7 +378,7 @@ void PPTShape::addShape( // if this is a group shape, we have to add also each child shape Reference<XShapes> xShapes(xShape, UNO_QUERY); if (xShapes.is()) - addChildren( rFilterBase, *this, pTheme, xShapes, awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap, aTransformation ); + addChildren( rFilterBase, *this, pTheme, xShapes, pShapeMap, aTransformation ); } } catch (const Exception&) |