[Libreoffice-commits] .: chart2/source
chart2/source/view/main/ChartView.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0f1e33c54d02a20c476413ceebc99460a9cfef1f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Mar 30 11:52:33 2012 +0300
WaE: format '%i' expects type 'int', but argument has type 'long int'
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 77fe6ab..fbc507d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3044,12 +3044,12 @@ int closeCallback(void* )
void dumpPositionAsAttribute(const awt::Point rPoint, xmlTextWriterPtr
xmlWriter)
{
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(position),
%i,%i, rPoint.X, rPoint.Y);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(position),
%li,%li, rPoint.X, rPoint.Y);
}
void dumpSizeAsAttribute(const awt::Size rSize, xmlTextWriterPtr xmlWriter)
{
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(size), %ix%i,
rSize.Width, rSize.Height);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(size), %lix%li,
rSize.Width, rSize.Height);
}
void dumpShapeDescriptorAsAttribute( uno::Reference drawing::XShapeDescriptor
xDescr, xmlTextWriterPtr xmlWriter )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/charttypes/Splines.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8a6552c0c0464d467a785cfd9c864301b81591cb
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 23 22:54:12 2012 +0100
use fabs for double values, not abs, fdo#47632
diff --git a/chart2/source/view/charttypes/Splines.cxx
b/chart2/source/view/charttypes/Splines.cxx
index 2005c1c..6c0c877 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -465,7 +465,7 @@ bool createParameterT(const tPointVecType aUniquePoints,
double* t)
{
dx = aUniquePoints[i].first - aUniquePoints[i-1].first;
dy = aUniquePoints[i].second - aUniquePoints[i-1].second;
-fDiffMax = (abs(dx)abs(dy)) ? abs(dx) : abs(dy);
+fDiffMax = (fabs(dx)fabs(dy)) ? fabs(dx) : fabs(dy);
// same as above, so should not be zero
dx /= fDiffMax;
dy /= fDiffMax;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/inc/ShapeFactory.hxx | 31 ++-
chart2/source/view/main/ShapeFactory.cxx | 300 +++
2 files changed, 329 insertions(+), 2 deletions(-)
New commits:
commit 6974cc9a83bee80e81d27794293a4adc25731206
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Mar 13 18:05:08 2012 +0100
first part for new chart test concept
Idea:
- write the layout data to a xml file
still missing:
- xml export part
- some more properties need to be exported
- some more structure information need to be dumped
- find a way to start dumping after importing
diff --git a/chart2/source/view/inc/ShapeFactory.hxx
b/chart2/source/view/inc/ShapeFactory.hxx
index 176f76a..480736a 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -42,17 +42,41 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/graphic/XGraphic.hpp
+#define ENABLE_DUMP 0
+
//.
namespace chart
{
//.
+class DumpHelper
+{
+private:
+//XmlTextWriterPtr pWriter;
+
+public:
+ //void writeStripe(const Stripe rStripe);
+
+ void writeElement(const char*);
+ void writeAttribute(const char* pAttrName, const char* pAttrValue);
+ void writeAttribute(const char* pAttrName, const
com::sun::star::drawing::Position3D rPosition);
+ void writeAttribute(const char* pAttrName, const rtl::OUString rName);
+ void writeAttribute(const char* pAttrName, const sal_Int32);
+ void writeAttribute(const char* pAttrName, const
com::sun::star::drawing::Direction3D rPosition);
+ void writeAttribute(const char* pAttrName, const
com::sun::star::drawing::PointSequenceSequence rPoints);
+ void endElement();
+};
+
+
class Stripe;
class ShapeFactory
{
public:
-ShapeFactory(::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xFactory)
-{m_xShapeFactory = xFactory;}
+ShapeFactory(::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xFactory):
+m_xShapeFactory(xFactory),
+mbDump(ENABLE_DUMP)
+{
+}
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes
createGroup2D(
@@ -247,6 +271,9 @@ private:
//member:
::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory
m_xShapeFactory;
+
+bool mbDump;
+DumpHelper maDumpHerlper;
};
//.
diff --git a/chart2/source/view/main/ShapeFactory.cxx
b/chart2/source/view/main/ShapeFactory.cxx
index 47da6f6..08e8e17 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -60,6 +60,8 @@
#include basegfx/matrix/b3dhommatrix.hxx
#include algorithm
+#include iostream
+#include rtl/oustringostreaminserter.hxx
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -67,6 +69,52 @@ using ::com::sun::star::uno::Reference;
//.
namespace chart
{
+/*
+void DumpHelper::writeStripe(const Stripe rStripe)
+{
+std::cout Stripe std::endl;
+}*/
+
+void DumpHelper::writeElement(const char* pName)
+{
+std::cout pName std::endl;
+}
+
+void DumpHelper::writeAttribute(const char* pAttrName, const rtl::OUString
rName)
+{
+std::cout pAttrName rName std::endl;
+}
+
+void DumpHelper::writeAttribute(const char* pAttrName, const char* pAttrValue)
+{
+std::cout pAttrName pAttrValue std::endl;
+}
+
+void DumpHelper::writeAttribute(const char* pAttrName, const
drawing::Position3D rPos)
+{
+std::cout pAttrName rPos.PositionX , rPos.PositionY
, rPos.PositionZ std::endl;
+}
+
+void DumpHelper::writeAttribute(const char* pAttrName, const
drawing::Direction3D rDirection)
+{
+std::cout pAttrName rDirection.DirectionX ,
rDirection.DirectionY , rDirection.DirectionZ std::endl;
+}
+
+void DumpHelper::writeAttribute(const char* pAttrName, const sal_Int32 nValue)
+{
+std::cout pAttrName nValue std::endl;
+}
+
+void DumpHelper::writeAttribute(const char* pAttrName, const
drawing::PointSequenceSequence )
+{
+std::cout pAttrName std::endl;
+}
+
+void DumpHelper::endElement()
+{
+std::cout EndElement std::endl;
+}
+
//.
//-
@@ -461,8 +509,20 @@ uno::Referencedrawing::XShape
ASSERT_EXCEPTION( e );
}
}
+
+if(mbDump)
+{
+maDumpHerlper.writeElement(Cube);
+}
+
uno::Referencedrawing::XShape xShape = impl_createCube( xTarget,
rPosition, rSize, nRotateZAngleHundredthDegree,
[Libreoffice-commits] .: chart2/source
chart2/source/view/inc/ShapeFactory.hxx |3 +
chart2/source/view/main/ShapeFactory.cxx | 64 ---
2 files changed, 45 insertions(+), 22 deletions(-)
New commits:
commit 3edbc2cf8d3ea3417d97fd278585178d55eacff8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Mar 13 22:15:27 2012 +0100
add some more dump output + WaE unitialized values
diff --git a/chart2/source/view/inc/ShapeFactory.hxx
b/chart2/source/view/inc/ShapeFactory.hxx
index 480736a..8fe7ba0 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -36,6 +36,7 @@
#include com/sun/star/drawing/HomogenMatrix.hpp
#include com/sun/star/drawing/PointSequenceSequence.hpp
#include com/sun/star/drawing/PolyPolygonShape3D.hpp
+#include com/sun/star/drawing/PolyPolygonBezierCoords.hpp
#include com/sun/star/drawing/Position3D.hpp
#include com/sun/star/drawing/XDrawPage.hpp
#include com/sun/star/drawing/XShapes.hpp
@@ -64,6 +65,8 @@ public:
void writeAttribute(const char* pAttrName, const sal_Int32);
void writeAttribute(const char* pAttrName, const
com::sun::star::drawing::Direction3D rPosition);
void writeAttribute(const char* pAttrName, const
com::sun::star::drawing::PointSequenceSequence rPoints);
+ void writeAttribute(const char* pAttrName, const
com::sun::star::drawing::PolyPolygonShape3D rPoints);
+ void writeAttribute(const char* pAttrName, const
com::sun::star::drawing::PolyPolygonBezierCoords rCoords);
void endElement();
};
diff --git a/chart2/source/view/main/ShapeFactory.cxx
b/chart2/source/view/main/ShapeFactory.cxx
index 08e8e17..f9589c2 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -42,7 +42,6 @@
#include com/sun/star/drawing/NormalsKind.hpp
#include com/sun/star/drawing/PointSequence.hpp
#include com/sun/star/drawing/PolygonKind.hpp
-#include com/sun/star/drawing/PolyPolygonBezierCoords.hpp
#include com/sun/star/drawing/ProjectionMode.hpp
#include com/sun/star/drawing/ShadeMode.hpp
#include com/sun/star/drawing/TextFitToSizeType.hpp
@@ -110,6 +109,16 @@ void DumpHelper::writeAttribute(const char* pAttrName,
const drawing::PointSeque
std::cout pAttrName std::endl;
}
+void DumpHelper::writeAttribute(const char* pAttrName, const
drawing::PolyPolygonShape3D )
+{
+std::cout pAttrName std::endl;
+}
+
+void DumpHelper::writeAttribute(const char* pAttrName, const
drawing::PolyPolygonBezierCoords )
+{
+std::cout pAttrName std::endl;
+}
+
void DumpHelper::endElement()
{
std::cout EndElement std::endl;
@@ -564,8 +573,9 @@ uno::Referencedrawing::XShape
, uno::makeAny( nPercentDiagonal ) );
//Polygon
+uno::Any aAny = createPolyPolygon_Cube( rSize,
double(nPercentDiagonal)/200.0, bRounded);
xProp-setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D )
-, createPolyPolygon_Cube( rSize,
double(nPercentDiagonal)/200.0,bRounded) );
+, aAny );
//Matrix for position
{
@@ -584,7 +594,9 @@ uno::Referencedrawing::XShape
{
maDumpHerlper.writeAttribute(depth,static_castsal_Int32(fDepth));
maDumpHerlper.writeAttribute(PercentDiagonal,nPercentDiagonal);
-maDumpHerlper.writeAttribute(Polygon,);
+drawing::PolyPolygonShape3D aPP;
+aAny = aPP;
+maDumpHerlper.writeAttribute(Polygon, aPP);
maDumpHerlper.writeAttribute(Matrix,);
}
}
@@ -860,7 +872,9 @@ uno::Referencedrawing::XShape
if(mbDump)
{
maDumpHerlper.writeAttribute(PercentDiagonal,
nPercentDiagonal);
-maDumpHerlper.writeAttribute(Polygon,);
+drawing::PolyPolygonShape3D aPP;
+aPPolygon = aPP;
+maDumpHerlper.writeAttribute(Polygon, aPP);
maDumpHerlper.writeAttribute(Matrix,);
maDumpHerlper.writeAttribute(SegmentsHor,CHART_3DOBJECT_SEGMENTCOUNT);
maDumpHerlper.writeAttribute(SegmentsVert,
static_castsal_Int32(nVerticalSegmentCount));
@@ -1100,7 +1114,7 @@ uno::Reference drawing::XShape
if(mbDump)
{
-maDumpHerlper.writeAttribute(PolyPolygonBezier, );
+maDumpHerlper.writeAttribute(PolyPolygonBezier, aCoords);
}
}
catch( const uno::Exception e )
@@ -1200,11 +1214,11 @@ uno::Reference drawing::XShape
{
maDumpHerlper.writeAttribute(depth,static_castsal_Int32(fDepth));
maDumpHerlper.writeAttribute(PercentDiagonal,nPercentDiagonal);
-maDumpHerlper.writeAttribute(Polygon, );
+maDumpHerlper.writeAttribute(Polygon, aPoly);
maDumpHerlper.writeAttribute(DoubleSided, true);
[Libreoffice-commits] .: chart2/source
chart2/source/view/axes/VCartesianAxis.cxx | 36 +++--
1 file changed, 9 insertions(+), 27 deletions(-)
New commits:
commit a1be31fd8bf830a4f5961e690bcffd050782e210
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 4 20:45:45 2012 +0100
fdo#44832: Follow-up fix for axis labels for complex categories
Don't add special handling for second and following
categories.
[From Markus's patch email to the list, edited by tml]
This patch is not obvious and I'm not sure that it will not introduce
another regression. I don't fully understand why we need to add
special handling for labels of second and following categories.
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index a6547ef..8291efb 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1333,20 +1333,15 @@ void VCartesianAxis::doStaggeringOfLabels( const
AxisLabelProperties rAxisLabel
for( sal_Int32 nTextLevel=0; nTextLevelnTextLevelCount; nTextLevel++ )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr TickIter apTickIter = createLabelTickIterator(
nTextLevel );
+::std::auto_ptr TickIter apTickIter =
createLabelTickIterator( nTextLevel );
SAL_WNODEPRECATED_DECLARATIONS_POP
-if(apTickIter.get())
-{
-double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-if( nTextLevel0 )
+if(apTickIter.get())
{
-lcl_shiftLables( *apTickIter.get(),
aCummulatedLabelsDistance );
-fRotationAngleDegree = 0.0;
+double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
+aCummulatedLabelsDistance += lcl_getLabelsDistance(
*apTickIter.get()
+, pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties )
+, fRotationAngleDegree );
}
-aCummulatedLabelsDistance += lcl_getLabelsDistance(
*apTickIter.get()
-, pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties )
-, fRotationAngleDegree );
-}
}
}
else if( rAxisLabelProperties.getIsStaggered() )
@@ -1408,18 +1403,9 @@ void VCartesianAxis::createLabels()
AxisLabelProperties aComplexProps(m_aAxisLabelProperties);
if( m_aAxisProperties.m_bComplexCategories )
{
-if( nTextLevel==0 )
-{
-aComplexProps.bLineBreakAllowed = true;
-aComplexProps.bOverlapAllowed =
!::rtl::math::approxEqual( aComplexProps.fRotationAngleDegree, 0.0 );
-}
-else
-{
-aComplexProps.bOverlapAllowed = true;
-aComplexProps.bRhythmIsFix = true;
-aComplexProps.nRhythm = 1;
-aComplexProps.fRotationAngleDegree = 0.0;
-}
+aComplexProps.bLineBreakAllowed = true;
+aComplexProps.bOverlapAllowed = !::rtl::math::approxEqual(
aComplexProps.fRotationAngleDegree, 0.0 );
+
}
AxisLabelProperties rAxisLabelProperties =
m_aAxisProperties.m_bComplexCategories ? aComplexProps : m_aAxisLabelProperties;
while( !createTextShapes( m_xTextTarget, *apTickIter.get(),
rAxisLabelProperties, pTickFactory2D, nScreenDistanceBetweenTicks ) )
@@ -1515,8 +1501,6 @@ void VCartesianAxis::updatePositions()
,static_castsal_Int32(aTickScreenPos2D.getY()));
double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-if( nDepth0 )
-fRotationAngleDegree = 0.0;
// #i78696# use mathematically correct rotation now
const double fRotationAnglePi(fRotationAngleDegree * (F_PI
/ -180.0));
@@ -1615,8 +1599,6 @@ void VCartesianAxis::createShapes()
if( apTickIter.get() )
{
double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-if( nTextLevel0 )
-fRotationAngleDegree = 0.0;
B2DVector aLabelsDistance( lcl_getLabelsDistance(
*apTickIter.get(), pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties, false ), fRotationAngleDegree ) );
sal_Int32 nCurrentLength =
static_castsal_Int32(aLabelsDistance.getLength());
aTickmarkPropertiesList.push_back(
m_aAxisProperties.makeTickmarkPropertiesForComplexCategories( nOffset +
nCurrentLength, 0,
[Libreoffice-commits] .: chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 05a0b08606ac77cf7d3e294998138610b53b1b6d Author: Katarina Machalkova bu...@bubli.org Date: Sun Mar 4 23:19:48 2012 +0100 fdo#37197: No legend entry for regression curve if not applicable make the original check more general, to cover all chart types that don't support statistics diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 82cec0c..8dfef2e 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -2303,8 +2303,9 @@ std::vector ViewLegendEntry VSeriesPlotter::createLegendEntriesForSeries( aResult.push_back(aEntry); } -// regression curves -if ( 3 == m_nDimension ) // #i63016# +// don't show legend entry of regression curve friends if this type of chart +// doesn't support statistics #i63016#, fdo#37197 +if (!ChartTypeHelper::isSupportingStatisticProperties( m_xChartTypeModel, m_nDimension )) return aResult; Reference XRegressionCurveContainer xRegrCont( rSeries.getModel(), uno::UNO_QUERY ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/main/VLegendSymbolFactory.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit fd33b0d28e9f73b4911b43bedf334296b8025485
Author: Katarina Machalkova bu...@bubli.org
Date: Mon Feb 20 22:20:12 2012 +0100
fdo#31551: Show actual line width in the legend
however, limit the line width from above by legend entry height
(which +- matches the font height)
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx
b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 31b2cbc..79db3c1 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -44,7 +44,8 @@ namespace
void lcl_setPropetiesToShape(
const Reference beans::XPropertySet xProp,
const Reference drawing::XShape xShape,
-::chart::VLegendSymbolFactory::tPropertyType ePropertyType )
+::chart::VLegendSymbolFactory::tPropertyType ePropertyType,
+const awt::Size aMaxSymbolExtent = awt::Size(0,0))
{
const ::chart::tPropertyNameMap aFilledSeriesNameMap(
::chart::PropertyMapper::getPropertyNameMapForFilledSeriesProperties());
const ::chart::tPropertyNameMap aLineSeriesNameMap(
::chart::PropertyMapper::getPropertyNameMapForLineSeriesProperties());
@@ -83,7 +84,8 @@ void lcl_setPropetiesToShape(
sal_Int32 nLineWidth = 0;
if( pLineWidthAny (*pLineWidthAny=nLineWidth) )
{
-const sal_Int32 nMaxLineWidthForLegend = 50;/*1/100 mm*///todo:
make this dependent from legend entry height
+// use legend entry height as upper limit for line width
+sal_Int32 nMaxLineWidthForLegend = aMaxSymbolExtent.Height;
if( nLineWidthnMaxLineWidthForLegend )
*pLineWidthAny = uno::makeAny( nMaxLineWidthForLegend );
}
@@ -134,7 +136,7 @@ Reference drawing::XShape
VLegendSymbolFactory::createSymbol(
xLine-setSize( awt::Size( rEntryKeyAspectRatio.Width, 0 ));
xLine-setPosition( awt::Point( 0,
rEntryKeyAspectRatio.Height/2 ));
-lcl_setPropetiesToShape( xLegendEntryProperties, xLine,
ePropertyType );
+lcl_setPropetiesToShape( xLegendEntryProperties, xLine,
ePropertyType, rEntryKeyAspectRatio );
}
Reference drawing::XShape xSymbol;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source unusedcode.easy
chart2/source/view/axes/Tickmarks_Equidistant.cxx | 27 --
chart2/source/view/axes/Tickmarks_Equidistant.hxx |5
unusedcode.easy |3 --
3 files changed, 35 deletions(-)
New commits:
commit 00445037550d07952ea428a4fcd0a3f205f75794
Author: Santiago Martinez smvar...@gmail.com
Date: Tue Jan 31 19:59:31 2012 +0100
Remove unused code.
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 7e15dda..73379b0 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -626,33 +626,6 @@ bool EquidistantTickIter::gotoNext()
return true;
}
-bool EquidistantTickIter::gotoIndex( sal_Int32 nTickIndex )
-{
-if( nTickIndex 0 )
-return false;
-if( nTickIndex = m_nTickCount )
-return false;
-
-if( nTickIndex m_nCurrentPos )
-if( !gotoFirst() )
-return false;
-
-while( nTickIndex m_nCurrentPos )
-if( !gotoNext() )
-return false;
-
-return true;
-}
-
-sal_Int32 EquidistantTickIter::getCurrentIndex() const
-{
-return m_nCurrentPos;
-}
-sal_Int32 EquidistantTickIter::getMaxIndex() const
-{
-return m_nTickCount-1;
-}
-
double* EquidistantTickIter::nextValue()
{
if( gotoNext() )
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx
b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
index c312b2f..c9f2dc5 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
@@ -60,11 +60,6 @@ public:
sal_Int32 getCurrentDepth() const { return m_nCurrentDepth; }
-protected:
-boolgotoIndex( sal_Int32 nTickIndex );
-sal_Int32 getCurrentIndex() const;
-sal_Int32 getMaxIndex() const;
-
private: //methods
sal_Int32 getIntervalCount( sal_Int32 nDepth );
boolisAtLastPartTick();
diff --git a/unusedcode.easy b/unusedcode.easy
index a54e369..32f3dac 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1228,9 +1228,6 @@
canvas::tools::mergeViewAndRenderState(com::sun::star::rendering::ViewState, co
canvas::tools::prependToViewState(com::sun::star::rendering::ViewState,
basegfx::B2DHomMatrix const)
canvas::tools::verifyInput(com::sun::star::geometry::RealSize2D const, char
const*, com::sun::star::uno::Referencecom::sun::star::uno::XInterface const,
short)
canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout
const, char const*,
com::sun::star::uno::Referencecom::sun::star::uno::XInterface const, short)
-chart::EquidistantTickIter::getCurrentIndex() const
-chart::EquidistantTickIter::getMaxIndex() const
-chart::EquidistantTickIter::gotoIndex(int)
cmis::Content::exchangeIdentity(com::sun::star::uno::Referencecom::sun::star::ucb::XContentIdentifier
const)
cmis::Content::queryChildren(std::__debug::listrtl::Referencecmis::Content,
std::allocatorrtl::Referencecmis::Content )
comphelper::AccessibleEventNotifier::getEventListeners(unsigned int)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/main/ChartView.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c447d9ba8c7d40670c59a9ec9d45f32a36c1efcd
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jan 14 12:33:24 2012 +0100
Some cppcheck cleaning
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 3e5df18..1750879 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1428,7 +1428,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
SeriesPlotterContainer
//use first coosys only so far; todo: calculate for more than one coosys
if we have more in future
//todo: this is just a workaround at the moment for pie and donut labels
bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
-if( !bIsPieOrDonut rVCooSysList.size() 0 )
+if( !bIsPieOrDonut (!rVCooSysList.empty()) )
{
VCoordinateSystem* pVCooSys = rVCooSysList[0];
pVCooSys-createMaximumAxesLabels();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx | 206 +--
1 file changed, 161 insertions(+), 45 deletions(-)
New commits:
commit de9a19ab6ba28ce15fdcf25397540ce0ac02b416
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 9 17:06:56 2012 -0500
fdo#44546: Hopefully correct automatic calculation of y-axis scale.
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 2d1c7bb..6af1d3d 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -79,11 +79,12 @@
#include svx/unoshape.hxx
#include functional
+#include map
+
+#include boost/ptr_container/ptr_map.hpp
+
+namespace chart {
-//.
-namespace chart
-{
-//.
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
@@ -1500,6 +1501,142 @@ void VDataSeriesGroup::getMinimumAndMaximiumX( double
rfMinimum, double rfMaxi
::rtl::math::setNan(rfMaximum);
}
+namespace {
+
+/**
+ * Keep track of minimum and maximum Y values for one or more data series.
+ * When multiple data series exist, that indicates that the data series are
+ * stacked.
+ *
+ * pFor each X value, we calculate separate Y value ranges for each data
+ * series in the first pass. In the second pass, we calculate the minimum Y
+ * value by taking the absolute minimum value of all data series, whereas
+ * the maxium Y value is the sum of all the series maximum Y values./p
+ *
+ * pOnce that's done for all X values, the final min / max Y values get
+ * calculated by taking the absolute min / max Y values across all the X
+ * values./p
+ */
+class PerXMinMaxCalculator
+{
+typedef std::pairdouble, double MinMaxType;
+typedef std::mapsize_t, MinMaxType SeriesMinMaxType;
+typedef boost::ptr_mapdouble, SeriesMinMaxType GroupMinMaxType;
+typedef boost::unordered_mapdouble, MinMaxType TotalStoreType;
+GroupMinMaxType maSeriesGroup;
+size_t mnCurSeries;
+
+public:
+PerXMinMaxCalculator() : mnCurSeries(0) {}
+
+void nextSeries() { ++mnCurSeries; }
+
+void setValue(double fX, double fY)
+{
+SeriesMinMaxType* pStore = getByXValue(fX); // get storage for given X
value.
+if (!pStore)
+// This shouldn't happen!
+return;
+
+SeriesMinMaxType::iterator it = pStore-lower_bound(mnCurSeries);
+if (it != pStore-end() !pStore-key_comp()(mnCurSeries, it-first))
+{
+MinMaxType r = it-second;
+// A min-max pair already exists for this series. Update it.
+if (fY r.first)
+r.first = fY;
+if (r.second fY)
+r.second = fY;
+}
+else
+{
+// No existing pair. Insert a new one.
+pStore-insert(
+it, SeriesMinMaxType::value_type(
+mnCurSeries, MinMaxType(fY,fY)));
+}
+}
+
+void getTotalRange(double rfMin, double rfMax) const
+{
+rtl::math::setNan(rfMin);
+rtl::math::setNan(rfMax);
+
+TotalStoreType aStore;
+getTotalStore(aStore);
+
+if (aStore.empty())
+return;
+
+TotalStoreType::const_iterator it = aStore.begin(), itEnd =
aStore.end();
+rfMin = it-second.first;
+rfMax = it-second.second;
+for (++it; it != itEnd; ++it)
+{
+if (rfMin it-second.first)
+rfMin = it-second.first;
+if (rfMax it-second.second)
+rfMax = it-second.second;
+}
+}
+
+private:
+/**
+ * Parse all data and reduce them into a set of global Y value ranges per
+ * X value.
+ */
+void getTotalStore(TotalStoreType rStore) const
+{
+TotalStoreType aStore;
+GroupMinMaxType::const_iterator it = maSeriesGroup.begin(), itEnd =
maSeriesGroup.end();
+for (; it != itEnd; ++it)
+{
+double fX = it-first;
+
+const SeriesMinMaxType rSeries = *it-second;
+SeriesMinMaxType::const_iterator itSeries = rSeries.begin(),
itSeriesEnd = rSeries.end();
+for (; itSeries != itSeriesEnd; ++itSeries)
+{
+double fYMin = itSeries-second.first, fYMax =
itSeries-second.second;
+TotalStoreType::iterator itr = aStore.find(fX);
+if (itr == aStore.end())
+// New min-max pair for give X value.
+aStore.insert(
+TotalStoreType::value_type(fX,
std::pairdouble,double(fYMin,fYMax)));
+else
+{
+MinMaxType r = itr-second;
+if (fYMin r.first)
+r.first =
[Libreoffice-commits] .: chart2/source dbaccess/source extensions/source sc/source svl/inc svl/source svx/source sw/source xmloff/source
chart2/source/controller/dialogs/DataBrowser.cxx |3 --- chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |3 --- chart2/source/controller/dialogs/tp_AxisPositions.cxx |3 --- chart2/source/controller/dialogs/tp_Scale.cxx |3 --- dbaccess/source/ui/browser/sbagrid.cxx|1 - dbaccess/source/ui/control/FieldDescControl.cxx |1 - dbaccess/source/ui/dlg/dlgattr.cxx|1 - dbaccess/source/ui/misc/UITools.cxx |2 -- extensions/source/propctrlr/usercontrol.hxx |1 - sc/source/core/data/documen2.cxx |1 - sc/source/core/data/documen8.cxx |1 - sc/source/core/data/document.cxx |1 - sc/source/core/inc/core_pch.hxx |2 -- sc/source/filter/inc/filt_pch.hxx |2 -- sc/source/ui/inc/ui_pch.hxx |2 -- sc/source/ui/view/cellsh1.cxx |1 - sc/source/ui/view/formatsh.cxx|1 - sc/source/ui/view/tabvwsh5.cxx|1 - sc/source/ui/view/tabvwsha.cxx|1 - svl/inc/svl/zforlist.hxx |6 -- svl/source/numbers/numuno.cxx |2 -- svx/source/items/numfmtsh.cxx |1 - sw/source/core/doc/docfmt.cxx |1 - sw/source/core/doc/tblcpy.cxx |1 - sw/source/core/doc/tblrwcl.cxx|1 - sw/source/core/docnode/ndcopy.cxx |1 - sw/source/ui/shells/tabsh.cxx |1 - sw/source/ui/utlui/numfmtlb.cxx |1 - xmloff/source/style/xmlnumfe.cxx |1 - xmloff/source/style/xmlnumfi.cxx |1 - 30 files changed, 48 deletions(-) New commits: commit 5b031b4ea68df5ca210a5631c801414b476d8094 Author: Marcel Metz mm...@adrian-broher.net Date: Sat Jan 7 22:14:05 2012 +0400 Remove superfluous _ZFORLIST_DECLARE_TABLE definition. diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 5de9287..182a36f 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -29,9 +29,6 @@ // header for class SvNumberformat #ifndef _ZFORMAT_HXX -#ifndef _ZFORLIST_DECLARE_TABLE -#define _ZFORLIST_DECLARE_TABLE -#endif #include svl/zformat.hxx #endif // header for SvNumberFormatter diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index ba13051..e3a6d22 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -27,9 +27,6 @@ / #ifndef _ZFORLIST_HXX -#ifndef _ZFORLIST_DECLARE_TABLE -#define _ZFORLIST_DECLARE_TABLE -#endif #include svl/zforlist.hxx #endif diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 8632c4a..b51b303 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -49,9 +49,6 @@ // header for class SvNumberformat #ifndef _ZFORMAT_HXX -#ifndef _ZFORLIST_DECLARE_TABLE -#define _ZFORLIST_DECLARE_TABLE -#endif #include svl/zformat.hxx #endif diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 39ce58b..fd456ff 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -49,9 +49,6 @@ // header for class SvNumberformat #ifndef _ZFORMAT_HXX -#ifndef _ZFORLIST_DECLARE_TABLE -#define _ZFORLIST_DECLARE_TABLE -#endif #include svl/zformat.hxx #endif diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 7ba5def..6fc1751 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -38,7 +38,6 @@ #define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO -#define _ZFORLIST_DECLARE_TABLE #include svx/numinf.hxx #include svx/dbaexchange.hxx #include com/sun/star/ui/dialogs/XExecutableDialog.hpp diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index ecdd3b8..c100d9d 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -48,7 +48,6 @@ #include svx/svxids.hrc #include svx/algitem.hxx #include svl/itempool.hxx -#define
[Libreoffice-commits] .: chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx | 57 ---
1 file changed, 42 insertions(+), 15 deletions(-)
New commits:
commit 70afe780231dc086a07494db97a2bac2ca0a0939
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Dec 13 19:46:31 2011 -0500
fdo#43681: Set correct auto scaling for stacked data series.
With this change, the automatic y-axis scaling should be more accurate
for stacked charts (i.e. stacked line, area, bar charts) with dates on
the x-axis. The previous algorithm only calculated the max and min
y-values of the individual data, without taking into account the stacking
type when the x-axis type was date.
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 9a01b95..2d1c7bb 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1378,7 +1378,7 @@ void
VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double rfMinY, d
::std::vector ::std::vector VDataSeriesGroup ::const_iterator
aZSlotIter = m_aZSlots.begin();
const ::std::vector ::std::vector VDataSeriesGroup ::const_iterator
aZSlotEnd = m_aZSlots.end();
-for( ; aZSlotIter != aZSlotEnd; aZSlotIter++ )
+for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
::std::vector VDataSeriesGroup ::const_iterator aXSlotIter =
aZSlotIter-begin();
const ::std::vector VDataSeriesGroup ::const_iterator aXSlotEnd =
aZSlotIter-end();
@@ -1499,16 +1499,24 @@ void VDataSeriesGroup::getMinimumAndMaximiumX( double
rfMinimum, double rfMaxi
if(::rtl::math::isInf(rfMaximum))
::rtl::math::setNan(rfMaximum);
}
-void VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange( double
rfMinY, double rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const
+
+void VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange(
+double rfMinY, double rfMaxY, double fMinX, double fMaxX, sal_Int32
nAxisIndex ) const
{
-const ::std::vector VDataSeries* * pSeriesList = this-m_aSeriesVector;
+::rtl::math::setNan(rfMinY);
+::rtl::math::setNan(rfMaxY);
-::std::vector VDataSeries* ::const_iterator aSeriesIter =
pSeriesList-begin();
-const ::std::vector VDataSeries* ::const_iterator aSeriesEnd =
pSeriesList-end();
+if (m_aSeriesVector.empty())
+// No data series. Bail out.
+return;
-::rtl::math::setInf(rfMinY, false);
-::rtl::math::setInf(rfMaxY, true);
+// Collect minimum y-value and accumulative maximum y-value for each
+// x-value first, in case of stacked data series.
+typedef boost::unordered_mapdouble, std::pairdouble,double
MinMaxPerXType;
+MinMaxPerXType aStore;
+std::vectorVDataSeries*::const_iterator aSeriesIter =
m_aSeriesVector.begin();
+const std::vectorVDataSeries*::const_iterator aSeriesEnd =
m_aSeriesVector.end();
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
sal_Int32 nPointCount = (*aSeriesIter)-getTotalPointCount();
@@ -1525,16 +1533,35 @@ void
VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange( double rfMinY,
double fY = (*aSeriesIter)-getYValue( nN );
if( ::rtl::math::isNan(fY) )
continue;
-if(rfMaxYfY)
-rfMaxY=fY;
-if(rfMinYfY)
-rfMinY=fY;
+
+MinMaxPerXType::iterator itr = aStore.find(fX);
+if (itr == aStore.end())
+aStore.insert(MinMaxPerXType::value_type(fX,
std::pairdouble,double(fY, fY)));
+else
+{
+std::pairdouble,double r = itr-second;
+if (fY r.first)
+r.first = fY; // min y-value
+
+r.second += fY; // accumulative max y-value.
+}
}
}
-if(::rtl::math::isInf(rfMinY))
-::rtl::math::setNan(rfMinY);
-if(::rtl::math::isInf(rfMaxY))
-::rtl::math::setNan(rfMaxY);
+
+if (aStore.empty())
+// No data within the specified x range.
+return;
+
+MinMaxPerXType::const_iterator itr = aStore.begin(), itrEnd = aStore.end();
+rfMinY = itr-second.first;
+rfMaxY = itr-second.second;
+for (++itr; itr != itrEnd; ++itr)
+{
+if (rfMinY itr-second.first)
+rfMinY = itr-second.first;
+if (rfMaxY itr-second.second)
+rfMaxY = itr-second.second;
+}
}
void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source cppu/source dmake/tests framework/inc idlc/inc l10ntools/source linguistic/source odk/examples padmin/source qadevOOo/tests sfx2/source solenv/gbuild sw/source u
chart2/source/view/axes/VCartesianAxis.cxx
|2 +-
cppu/source/threadpool/threadpool.hxx
|2 +-
dmake/tests/recipes-9
|2 +-
framework/inc/threadhelp/fairrwlock.hxx
|4 ++--
idlc/inc/idlc/errorhandler.hxx
|2 +-
l10ntools/source/xmlparse.cxx
|2 +-
linguistic/source/convdic.cxx
|2 +-
odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Thumbs.java
|2 +-
padmin/source/padialog.src
|2 +-
qadevOOo/tests/java/ifc/frame/_XStorable.java
|4 ++--
qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges.java
|2 +-
qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java
|6 +++---
sfx2/source/view/viewprn.cxx
|2 +-
solenv/gbuild/Module.mk
|2 +-
sw/source/core/txtnode/thints.cxx
|2 +-
sw/source/ui/uiview/view2.cxx
|2 +-
udkapi/com/sun/star/test/XSimpleTest.idl
|2 +-
wizards/com/sun/star/wizards/web/FTPDialog.java
|2 +-
xmerge/source/activesync/XMergeFilter.cpp
|2 +-
19 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit ad2eb6c4ba3ca36e2302c721a106dac80d266325
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Thu Dec 8 09:05:20 2011 +0100
Less succes, more success
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index b345c47..2d73cb7 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -600,7 +600,7 @@ bool VCartesianAxis::createTextShapes(
, TickFactory_2D* pTickFactory
, sal_Int32 nScreenDistanceBetweenTicks )
{
-//returns true if the text shapes have been created succesfully
+//returns true if the text shapes have been created successfully
//otherwise false - in this case the AxisLabelProperties have changed
//and contain new instructions for the next try for text shape creation
diff --git a/cppu/source/threadpool/threadpool.hxx
b/cppu/source/threadpool/threadpool.hxx
index 273798c..498ea4a 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -120,7 +120,7 @@ namespace cppu_threadpool {
void * enter( const ByteSequence aThreadId, sal_Int64 nDisposeId );
/
- * @return true, if queue could be succesfully revoked.
+ * @return true, if queue could be successfully revoked.
/
sal_Bool revokeQueue( const ByteSequence aThreadId , sal_Bool
bAsynchron );
diff --git a/dmake/tests/recipes-9 b/dmake/tests/recipes-9
index 409b6cb..fdc7853 100755
--- a/dmake/tests/recipes-9
+++ b/dmake/tests/recipes-9
@@ -83,7 +83,7 @@ else
fi
-# Test 4 - Ignore a succesfully executed, but failing recipe.
+# Test 4 - Ignore a successfully executed, but failing recipe.
cat $file1 EOT
SHELL*:=/bin/sh
SHELLFLAGS*:=-ce
diff --git a/framework/inc/threadhelp/fairrwlock.hxx
b/framework/inc/threadhelp/fairrwlock.hxx
index a47d451..72cbf42 100644
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
@@ -125,7 +125,7 @@ class FairRWLock : public IRWLock
inline virtual void acquireReadAccess()
{
// Put call in SERIALIZE-queue!
-// After successful acquiring this mutex we are alone ...
+// After successfully acquiring this mutex we are alone ...
::osl::MutexGuard aSerializeGuard( m_aSerializer );
// ... but we should synchronize us with other reader!
@@ -190,7 +190,7 @@ class FairRWLock : public IRWLock
// are registered (not for releasing them!) or writer finished
their work!
// Don't use a guard to do so - because you must hold the mutex
till
// you call releaseWriteAccess()!
-// After succesfull acquire you have to wait for current working
reader.
+// After successfully acquiring you have to wait for current
working reader.
// Used condition will open by last gone reader object.
m_aSerializer.acquire();
m_aWriteCondition.wait();
diff --git
[Libreoffice-commits] .: chart2/source
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 17
++
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 8cff18bee2a560c682b5c54d8f68c8bf9d8a69a8
Author: Kristian Rietveld k...@lanedo.com
Date: Sat Oct 22 09:39:12 2011 +0200
Put neq-operator for awt::Size in correct namespace
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index f9062ba..aa156b2 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -61,6 +61,17 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
using ::rtl::OUString;
+
+namespace com { namespace sun { namespace star { namespace awt {
+
+// this operator is not defined by default
+bool operator!=( const awt::Size rSize1, const awt::Size rSize2 )
+{
+return (rSize1.Width != rSize2.Width) || (rSize1.Height != rSize2.Height);
+}
+
+} } } }
+
//.
namespace chart
{
@@ -97,12 +108,6 @@ public:
virtual ~WrappedSymbolBitmapURLProperty();
};
-// this operator is not defined by default
-bool operator!=( const awt::Size rSize1, const awt::Size rSize2 )
-{
-return (rSize1.Width != rSize2.Width) || (rSize1.Height != rSize2.Height);
-}
-
class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty
awt::Size
{
public:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/controller/main/ShapeController.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0b24bd7a6ec714c74795cf417e35bd036303f3b9
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Sep 25 11:11:27 2011 -0500
hide a WaE... should be fixed properly when the issue is understood
diff --git a/chart2/source/controller/main/ShapeController.cxx
b/chart2/source/controller/main/ShapeController.cxx
index c4db4bb..138db4f 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -328,6 +328,7 @@ void ShapeController::executeDispatch_FormatArea()
SfxItemPool rItemPool =
pDrawViewWrapper-GetModel()-GetItemPool();
SfxItemSet aSet( rItemPool, rItemPool.GetFirstWhich(),
rItemPool.GetLastWhich() );
const SvxColorListItem* pColorItem = static_cast const
SvxColorListItem* ( aSet.GetItem( SID_COLOR_TABLE ) );
+(void)pColorItem; /* FIXME hide a WaE but the real cause
for it should be settled */
if ( pDlg-Execute() == RET_OK )
{
const SfxItemSet* pOutAttr = pDlg-GetOutputItemSet();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
