diff options
| -rw-r--r-- | chart2/source/view/axes/Tickmarks.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/view/axes/Tickmarks.hxx | 7 | ||||
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 4 | ||||
| -rw-r--r-- | include/filter/msfilter/escherex.hxx | 6 | ||||
| -rw-r--r-- | oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 10 |
5 files changed, 13 insertions, 16 deletions
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 73c8e041cf40..80476934e7f2 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -34,8 +34,8 @@ TickInfo::TickInfo( const uno::Reference<chart2::XScaling>& xInverse ) : fScaledTickValue( 0.0 ) , xInverseScaling( xInverse ) , aTickScreenPosition(0.0,0.0) -, bPaintIt( true ) , nFactorForLimitedTextWidth(1) +, bPaintIt( true ) { } diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index 77b9a2b85bdc..54ae03922e4d 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -35,14 +35,11 @@ struct TickInfo { double fScaledTickValue; css::uno::Reference<css::chart2::XScaling> xInverseScaling; - - ::basegfx::B2DVector aTickScreenPosition; - bool bPaintIt; - css::uno::Reference<css::drawing::XShape> xTextShape; - OUString aText;//used only for complex categories so far + ::basegfx::B2DVector aTickScreenPosition; sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of complex categories can have more place than a single simple category + bool bPaintIt; //methods: TickInfo() = delete; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 95b8b27c48d3..450aa4b6f208 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3892,11 +3892,11 @@ beans::PropertyState EscherPropertyValueHelper::GetPropertyState( EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject& rObject, const OString& rId, const GraphicAttr* pGraphicAttr ) : + maPrefMapMode ( rObject.GetPrefMapMode() ), + maPrefSize ( rObject.GetPrefSize() ), mnPictureOffset ( nPictureOffset ), mnRefCount ( 1 ), mnSizeExtra ( 0 ), - maPrefSize ( rObject.GetPrefSize() ), - maPrefMapMode ( rObject.GetPrefMapMode() ), mbIsEmpty ( true ) { mbIsNativeGraphicPossible = ( pGraphicAttr == nullptr ); diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 9ab3d891da2a..a4625984308b 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -525,6 +525,9 @@ class EscherBlibEntry friend class EscherGraphicProvider; friend class EscherEx; + MapMode maPrefMapMode; + Size maPrefSize; + sal_uInt32 mnIdentifier[ 4 ]; sal_uInt32 mnPictureOffset; // offset to the graphic in PictureStreams sal_uInt32 mnSize; // size of real graphic @@ -534,9 +537,6 @@ class EscherBlibEntry ESCHER_BlibType meBlibType; - Size maPrefSize; - MapMode maPrefMapMode; - bool mbIsEmpty; bool mbIsNativeGraphicPossible; diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx index 7645c9affc99..0e7d4aec2169 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx @@ -55,26 +55,26 @@ struct ConditionAttr // not sure this belong here, but wth void loadFromXAttr( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes ); + OUString msVal; sal_Int32 mnFunc; sal_Int32 mnArg; sal_Int32 mnOp; - OUString msVal; sal_Int32 mnVal; }; /// Constraints allow you to specify an ideal (or starting point) size for each shape. struct Constraint { - sal_Int32 mnFor; OUString msForName; + OUString msRefForName; + double mfFactor; + double mfValue; + sal_Int32 mnFor; sal_Int32 mnPointType; sal_Int32 mnType; sal_Int32 mnRefFor; - OUString msRefForName; sal_Int32 mnRefType; sal_Int32 mnRefPointType; - double mfFactor; - double mfValue; sal_Int32 mnOperator; }; |