chart2/source/view/charttypes/PieChart.cxx | 8 ++++----
chart2/source/view/charttypes/PieChart.hxx | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c827e94a6b0f74fda954a0ba9eac59df652935c2
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jun 29 10:50:57 2017 +0200
PieChart::PieLabelInfo::moveAwayFrom bAlternativeMoveDirection is "TODO"
...ever since the code's introduction in
ed4d9ca0934aa1ab10470e1197edce7913c86f0d "INTEGRATION: CWS chart17:
#i63857#,
#i4039# more flexible placement of data point labels, best fit for pie
labels"
Change-Id: Iba1c98c186c0f2bf3e611d26c452d990eed1275a
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index 729cef58edd6..72df0caf6566 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -770,7 +770,7 @@ PieChart::PieLabelInfo::PieLabelInfo()
* document, if the test is positive the routine returns true else returns
* false.
*/
-bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix,
const awt::Size& rPageSize, bool bMoveHalfWay, bool bMoveClockwise, bool
bAlternativeMoveDirection )
+bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix,
const awt::Size& rPageSize, bool bMoveHalfWay, bool bMoveClockwise )
{
//return true if the move was successful
if(!this->bMovementAllowed)
@@ -785,7 +785,7 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const
PieChart::PieLabelInfo* pFix, c
aOverlap.intersect( lcl_getRect( pFix->xLabelGroupShape ) );
if( !aOverlap.isEmpty() )
{
- (void)bAlternativeMoveDirection;//todo
+ //TODO: alternative move direction
///the label is shifted along the direction orthogonal to the vector
///starting at the pie/donut center and ending at this label anchor
@@ -1041,7 +1041,7 @@ bool PieChart::tryMoveLabels( PieLabelInfo* pFirstBorder,
PieLabelInfo* pSecondB
///invocation has moved a label in a position that it is not
///completely inside the page document
- if( !pCurrent->moveAwayFrom( pFix, rPageSize, !bSingleCenter &&
pCurrent == p2, !bLabelOrderIsAntiClockWise, rbAlternativeMoveDirection ) )
+ if( !pCurrent->moveAwayFrom( pFix, rPageSize, !bSingleCenter &&
pCurrent == p2, !bLabelOrderIsAntiClockWise ) )
{
if( !rbAlternativeMoveDirection )
{
@@ -1077,7 +1077,7 @@ bool PieChart::tryMoveLabels( PieLabelInfo* pFirstBorder,
PieLabelInfo* pSecondB
PieLabelInfo* pFix = nullptr;
for( pFix = p2->pNext ;pFix != pCurrent; pFix = pFix->pPrevious )
{
- if( !pCurrent->moveAwayFrom( pFix, rPageSize, false,
bLabelOrderIsAntiClockWise, rbAlternativeMoveDirection ) )
+ if( !pCurrent->moveAwayFrom( pFix, rPageSize, false,
bLabelOrderIsAntiClockWise ) )
{
if( !rbAlternativeMoveDirection )
{
diff --git a/chart2/source/view/charttypes/PieChart.hxx
b/chart2/source/view/charttypes/PieChart.hxx
index f32e5104edf6..dd6c5f2de600 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -120,7 +120,7 @@ private: //member
{
PieLabelInfo();
bool moveAwayFrom( const PieLabelInfo* pFix, const css::awt::Size&
rPageSize
- , bool bMoveHalfWay, bool bMoveClockwise, bool
bAlternativeMoveDirection );
+ , bool bMoveHalfWay, bool bMoveClockwise );
css::uno::Reference< css::drawing::XShape > xTextShape;
css::uno::Reference< css::drawing::XShape > xLabelGroupShape;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
