sc/source/core/data/dociter.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 2 +- slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 2 +- xmloff/source/chart/SchXMLPlotAreaContext.cxx | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit bf0e0f88563377ee6f2db26970d3199c08acaa38 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sun Mar 3 09:08:01 2013 +0100 and one more fix for error bar import, related fdo#60083 Change-Id: I76ff4849137aaad175b3c95dce6644d612871201 diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index a587fde..8b9bc0e 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -1110,6 +1110,14 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere aAny >>= aNegRange; } + aAny = SchXMLTools::getPropertyFromContext("PercentageError", + pSeriesStyleContext, pStylesCtxt); + if( aAny.hasValue() && aBarStyle == com::sun::star::chart::ErrorBarStyle::RELATIVE ) + { + xBarProp->setPropertyValue("PositiveError", aAny); + xBarProp->setPropertyValue("NegativeError", aAny); + } + switch(aBarStyle) { case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: commit 969a8c566dc23e1a2c962e0d8e96577c86a5940f Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sun Mar 3 06:41:03 2013 +0100 coverity#982270: fix copy&paste error Change-Id: I845a858935cf00ff3b07dbfead8e827820329309 diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index e1260d3..2446fb3 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -1689,7 +1689,7 @@ void OGLTransitionerImpl::disposeTextures() } if( !mbUseEnteringPixmap ) { glDeleteTextures(1,&GLenteringSlide); - GLleavingSlide = 0; + GLenteringSlide = 0; } mbUseLeavingPixmap = false; commit 11e1b25357b38ec1065145cde125ec6b660d80cc Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sun Mar 3 06:36:22 2013 +0100 coverity#735384: fix copy&paste error Change-Id: If9ecdee058780e7ae518aefeebb74a6d62c4b6f9 diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index ff20478..e82cc5d 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -3666,7 +3666,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc for ( sal_Int32 nRowSpan = 1; nRowSpan < xCell->getRowSpan(); nRowSpan++ ) { sal_uInt32 nR = nRowSpan + nRow; - if ( nR < aColumns.size() ) + if ( nR < aRows.size() ) nBottom += aRows[ nR ].second; else nBottom = maRect.Bottom(); commit a20116d42ecc90ae05fa1e2df542f815d93ab4c8 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sun Mar 3 06:31:56 2013 +0100 coverity#735378: fix copy&paste error Change-Id: Id5d7939ba8020cd966d1ff2678186ad912325a78 diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 9d6098d..36c8092 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -63,7 +63,7 @@ ScDocumentIterator::ScDocumentIterator( ScDocument* pDocument, SCTAB nDocMaxTab = pDoc->GetTableCount() - 1; PutInOrder( nStartTab, nEndTab ); if (!ValidTab(nStartTab) || nStartTab > nDocMaxTab ) nStartTab = nDocMaxTab; - if (!ValidTab(nEndTab) || nStartTab > nDocMaxTab ) nEndTab = nDocMaxTab; + if (!ValidTab(nEndTab) || nEndTab > nDocMaxTab ) nEndTab = nDocMaxTab; pDefPattern = pDoc->GetDefPattern(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits