chart2/source/view/axes/VAxisProperties.cxx | 2 +- sc/source/core/data/fillinfo.cxx | 4 ++-- sc/source/ui/vba/vbacharts.cxx | 2 +- svx/source/svdraw/svdoedge.cxx | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit bc3d9d8e099774da2bf9db818ec78bbe45df0c99 Author: Herbert Dürr <[email protected]> Date: Tue Mar 19 15:05:25 2013 +0000 WaE: make good the commenting-out, else there are confusing unused-result warnings diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 0f05b5f..9756023 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -952,8 +952,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right()); long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top()); long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom()); - //int bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() && - aBoundRect1.Bottom()>aBoundRect2.Top() && aBoundRect1.Top()<aBoundRect2.Bottom(); FASTBOOL bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() && aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom(); unsigned nMainCase=3; commit 75894372c679592b9f177a9fa8ce7888962a4da8 Author: Herbert Dürr <[email protected]> Date: Tue Mar 19 14:53:14 2013 +0000 WaE: fix AxisProperties's copy construction for its m_nDimensionIndex member diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index f19f427..eeeafe4 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -197,7 +197,7 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel AxisProperties::AxisProperties( const AxisProperties& rAxisProperties ) : m_xAxisModel( rAxisProperties.m_xAxisModel ) - , m_nDimensionIndex( m_nDimensionIndex ) + , m_nDimensionIndex( rAxisProperties.m_nDimensionIndex ) , m_bIsMainAxis( rAxisProperties.m_bIsMainAxis ) , m_bSwapXAndY( rAxisProperties.m_bSwapXAndY ) , m_eCrossoverType( rAxisProperties.m_eCrossoverType ) commit 9a4605d6044f93d516437822778d4cb128910c60 Author: Herbert Dürr <[email protected]> Date: Tue Mar 19 14:44:15 2013 +0000 WaE: fix miscount in ScVbaCharts::getCount() caused by typo diff --git a/sc/source/ui/vba/vbacharts.cxx b/sc/source/ui/vba/vbacharts.cxx index 7b545d1..42fb6cc 100644 --- a/sc/source/ui/vba/vbacharts.cxx +++ b/sc/source/ui/vba/vbacharts.cxx @@ -75,7 +75,7 @@ ScVbaCharts::getCount() throw (uno::RuntimeException) if ( xTableChartsSupplier.is() ) { uno::Reference< table::XTableCharts > xTableCharts = xTableChartsSupplier->getCharts(); - ncount =+ xTableCharts->getElementNames().getLength(); + ncount += xTableCharts->getElementNames().getLength(); } } } commit 709e97b9f2e4260001a19042737508c2da9a1e43 Author: Herbert Dürr <[email protected]> Date: Tue Mar 19 14:29:47 2013 +0000 WaE: make good the commenting-out, else there are confusing unused-result warnings The original message for the unfinished comment-out change was: "1.4.76.1: #i25238# Support for inplace editing - please ask MBA" Maybe it should be removed altogether. Silencing the justifiable warning is good enough for now though. diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 3548aed..6a84e29 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -509,13 +509,13 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX pInfo->pShadowAttr = pShadowAttr; // nWidth wird nicht mehr einzeln gesetzt - sal_Bool bEmbed = sal_False; //bIsEmbedded && + sal_Bool bEmbed = sal_False; /*bIsEmbedded && nTab >= aEmbedRange.aStart.Tab() && nTab <= aEmbedRange.aEnd.Tab() && nX >= aEmbedRange.aStart.Col() && nX <= aEmbedRange.aEnd.Col() && nCurRow >= aEmbedRange.aStart.Row() && - nCurRow <= aEmbedRange.aEnd.Row(); + nCurRow <= aEmbedRange.aEnd.Row(); */ if (bScenario) {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
