summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-01-17 17:10:29 +0100
committerIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-01-17 17:10:29 +0100
commitf718b312b7de8a48dc959b871c188768a6e067d5 (patch)
treeb79c0897ee3481bbd30f07ac78815a7640638eaa /chart2
parent2ce9a356b9c14263008c3c182d5e69508d2c9107 (diff)
chart46: #i25706# compiler error after rebase
Diffstat (limited to 'chart2')
-rwxr-xr-xchart2/source/inc/NumberFormatterWrapper.hxx2
-rwxr-xr-xchart2/source/tools/ExplicitCategoriesProvider.cxx1
-rwxr-xr-xchart2/source/tools/InternalDataProvider.cxx3
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx3
4 files changed, 2 insertions, 7 deletions
diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx
index 964fd3f79f06..e4ef4b8600db 100755
--- a/chart2/source/inc/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/NumberFormatterWrapper.hxx
@@ -63,7 +63,7 @@ private: //private member
};
-class FixedNumberFormatter
+class OOO_DLLPUBLIC_CHARTTOOLS FixedNumberFormatter
{
public:
FixedNumberFormatter( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 9e2987be1ee4..39a76b2bf119 100755
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -214,7 +214,6 @@ void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl::
bool bColorChanged = false;
NumberFormatterWrapper aNumberFormatterWrapper( xNumberFormatsSupplier );
- SvNumberFormatter* pSvNumberFormatter = aNumberFormatterWrapper.getSvNumberFormatter();
for(sal_Int32 nN=0;nN<nCount;nN++)
{
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index b7df7e6d27a4..2d51bd0f7acd 100755
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -365,7 +365,6 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum
vector< vector< uno::Any > > aNewCategories;//inner count is level
{
ExplicitCategoriesProvider aExplicitCategoriesProvider( ChartModelHelper::getFirstCoordinateSystem(xChartModel), xChartModel );
- bool bIsDateAxis = aExplicitCategoriesProvider.isDateAxis();
const Sequence< Reference< chart2::data::XLabeledDataSequence> >& rSplitCategoriesList( aExplicitCategoriesProvider.getSplitCategoriesList() );
sal_Int32 nLevelCount = rSplitCategoriesList.getLength();
@@ -385,7 +384,7 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum
else if( nLength < nCatLength )
aDataSeq.realloc( nCatLength );
transform( aNewCategories.begin(), aNewCategories.end(), aDataSeq.getConstArray(),
- aNewCategories.begin(), lcl_setStringAtLevel(nL) );
+ aNewCategories.begin(), lcl_setAnyAtLevel(nL) );
}
if( !nLevelCount )
{
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 1e5911b76358..0aad597d2475 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -49,11 +49,8 @@
#include <com/sun/star/lang/XTypeProvider.hpp>
// header for class SvxShape
#include <svx/unoshape.hxx>
-// header for GetSdrObjectFromXShape
-#include <svx/unoapi.hxx>
// header for class E3dScene
#include <svx/scene3d.hxx>
-#include <rtl/math.hxx>
#include <svx/e3dsceneupdater.hxx>
//.............................................................................