chart2/source/view/axes/VAxisBase.cxx | 3 ++- chart2/source/view/axes/VCartesianGrid.cxx | 4 ++-- chart2/source/view/axes/VCoordinateSystem.cxx | 2 +- chart2/source/view/axes/VPolarAngleAxis.cxx | 4 ++-- chart2/source/view/axes/VPolarAxis.cxx | 2 +- chart2/source/view/charttypes/PieChart.cxx | 6 ++++-- chart2/source/view/inc/VCoordinateSystem.hxx | 3 ++- sc/source/core/data/table3.cxx | 4 ---- sc/source/filter/xml/xmlexprt.cxx | 17 +++-------------- 9 files changed, 17 insertions(+), 28 deletions(-)
New commits: commit f5ef8396744966b9bd648bc0d1cb654db8c250be Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Wed Mar 7 15:09:16 2012 +0100 export all row styles, fdo#44336 only exporting the used row styles is a loss of information since this means that all following rows use the height of the default row style # Changes to be committed: diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index b246f73..6c9e7b8 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2449,16 +2449,10 @@ void ScXMLExport::_ExportAutoStyles() { sal_Int32 nRows(pDoc->GetLastChangedRow(sal::static_int_cast<SCTAB>(nTable))); pSharedData->SetLastRow(nTable, nRows); - table::CellRangeAddress aCellAddress(GetEndAddress(xTable, nTable)); - if (aCellAddress.EndRow > nRows) - { - ++nRows; - pRowStyles->AddNewTable(nTable, aCellAddress.EndRow); - } - else - pRowStyles->AddNewTable(nTable, nRows); + + pRowStyles->AddNewTable(nTable, MAXROW); sal_Int32 nRow = 0; - while (nRow <= nRows && nRow <= MAXROW) + while (nRow <= MAXROW) { sal_Int32 nIndex = 0; Reference <beans::XPropertySet> xRowProperties(xTableRows->getByIndex(nRow), uno::UNO_QUERY); @@ -2472,11 +2466,6 @@ void ScXMLExport::_ExportAutoStyles() if (nRow > nOld + 1) pRowStyles->AddFieldStyleName(nTable, nOld + 1, nIndex, nRow - 1); } - if (aCellAddress.EndRow > nRows) - { - sal_Int32 nIndex(pRowStyles->GetStyleNameIndex(nTable, nRows)); - pRowStyles->AddFieldStyleName(nTable, nRows + 1, nIndex, aCellAddress.EndRow); - } } } } commit bea018a7040c36e91487b27c7b59c6c8a970bf5f Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Tue Mar 6 17:53:50 2012 +0100 there should be no need any more for this check diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 613bd6d..d740a30 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -385,14 +385,10 @@ short ScTable::CompareCell( sal_uInt16 nSort, if (pCell1) { eType1 = pCell1->GetCellType(); - if (eType1 == CELLTYPE_NOTE) - pCell1 = NULL; } if (pCell2) { eType2 = pCell2->GetCellType(); - if (eType2 == CELLTYPE_NOTE) - pCell2 = NULL; } if (pCell1) commit db5cdd9cb29e315df5aa5b30bfdf0262d7ee36d7 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Tue Mar 6 02:30:55 2012 +0100 some more auto_ptr -> scoped_ptr in chart2 diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index a444be3..9f20430 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -34,6 +34,7 @@ #include "macros.hxx" #include <memory> +#include <boost/scoped_ptr.hpp> //............................................................................. namespace chart @@ -167,7 +168,7 @@ void VAxisBase::setExplicitScaleAndIncrement( void VAxisBase::createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) { - std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() ); + boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() ); if( m_aScale.ShiftedCategoryPosition ) apTickFactory->getAllTicksShifted( rAllTickInfos ); else diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 166ea93..362459d 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <vector> -#include <memory> +#include <boost/scoped_ptr.hpp> //............................................................................. namespace chart @@ -229,7 +229,7 @@ void VCartesianGrid::createShapes() //----------------------------------------- //create all scaled tickmark values - std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() ); + boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() ); TickFactory& aTickFactory = *apTickFactory.get(); ::std::vector< ::std::vector< TickInfo > > aAllTickInfos; aTickFactory.getAllTicks( aAllTickInfos ); diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index de7cc0d..1af1bb5 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -259,7 +259,7 @@ void VCoordinateSystem::impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex void VCoordinateSystem::setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider /*takes ownership*/ ) { - m_apExplicitCategoriesProvider = ::std::auto_ptr< ExplicitCategoriesProvider >(pExplicitCategoriesProvider); + m_apExplicitCategoriesProvider.reset(pExplicitCategoriesProvider); } ExplicitCategoriesProvider* VCoordinateSystem::getExplicitCategoriesProvider() diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index f58009e..11f73cd 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -36,7 +36,7 @@ #include "PolarLabelPositionHelper.hxx" #include <tools/color.hxx> -#include <memory> +#include <boost/scoped_ptr.hpp> //............................................................................. namespace chart @@ -182,7 +182,7 @@ void VPolarAngleAxis::createLabels() { //----------------------------------------- //get the transformed screen values for all tickmarks in aAllTickInfos - std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() ); + boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() ); //create tick mark text shapes //@todo: iterate through all tick depth wich should be labeled diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index a5c5baa..f08eb41 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -33,7 +33,7 @@ #include "Tickmarks.hxx" #include "ShapeFactory.hxx" -#include <memory> +#include <boost/scoped_ptr.hpp> //............................................................................. namespace chart diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 6c4bb18..5e7e167 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -43,6 +43,8 @@ #include <com/sun/star/container/XChild.hpp> #include <rtl/math.hxx> +#include <boost/scoped_ptr.hpp> + //............................................................................. namespace chart { @@ -429,11 +431,11 @@ void PieChart::createShapes() //--------------------------- //point color: - std::auto_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(0); + boost::scoped_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(NULL); { if(!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is()) { - apOverwritePropertiesMap = std::auto_ptr< tPropertyNameValueMap >( new tPropertyNameValueMap() ); + apOverwritePropertiesMap.reset( new tPropertyNameValueMap() ); (*apOverwritePropertiesMap)[C2U("FillColor")] = uno::makeAny( m_xColorScheme->getColorByIndex( nPointIndex )); } diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 4efe628..f8acd4a 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -45,6 +45,7 @@ #include<map> #include <vector> #include <boost/shared_ptr.hpp> +#include <boost/scoped_ptr.hpp> //............................................................................. namespace chart @@ -201,7 +202,7 @@ private: tFullExplicitScaleMap m_aSecondaryExplicitScales; tFullExplicitIncrementMap m_aSecondaryExplicitIncrements; - ::std::auto_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider; + boost::scoped_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider; }; //............................................................................. _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits