summaryrefslogtreecommitdiff
path: root/chart2/source/view/main/ChartView.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
commitb4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch)
tree26e22c8ab20d2c38bc88dfcc041c8143e0609557 /chart2/source/view/main/ChartView.cxx
parent69bb367315288b644439dc46d34743a2575a3527 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:42 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 737b6a92adca9a8285370918671b93b56a028537 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:21 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e Author: Jani Monoses <jani.monoses@canonical.com> Date: Thu Jan 27 15:33:06 2011 +0200 Remove unused declaration Signed-off-by: Michael Meeks <michael.meeks@novell.com> sc/source/core/tool/token.cxx | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 96bee1507119ca0525845022019d90f0694996aa Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 20 23:44:52 2011 -0500 Fixed incorrect page number in page preview mode. (fdo#33155) When the window is large enough to show several 'Page X' strings, the page number was not properly incremented. This commit fixes it. sc/source/ui/view/gridwin4.cxx | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83 Author: Kohei Yoshida <kyoshida@novell.com> Date: Wed Jan 19 00:24:24 2011 -0500 Fixed incorrect import of cell attributes from Excel documents. When a cell with non-default formatting attribute starts with non-first row in a column, the filter would incorrectly apply the same format to all the cells above it if they didn't have any formats. This commit fixes it. sc/source/filter/excel/xistyle.cxx | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit af63319fcdeea3f9b5018eab83ef5a9e64905446 Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:18:07 2011 -0500 Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c. I created a patch between before and after the merge commit, and reverse-applied it. This is because if you revert a merge commit in git you are denying all future merges from that branch. I wasn't sure if we really wanted that. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/inc/document.hxx | 22 +------ sc/inc/drwlayer.hxx | 2 +- sc/inc/table.hxx | 16 +----- sc/source/core/data/document.cxx | 7 +-- sc/source/core/data/drwlayer.cxx | 6 +- sc/source/core/data/table1.cxx | 38 ++++-------- sc/source/core/data/table2.cxx | 91 ++++++------------------------ sc/source/core/data/table3.cxx | 71 +---------------------- sc/source/filter/xml/xmlrowi.cxx | 17 +---- sc/source/ui/docshell/externalrefmgr.cxx | 7 +- sc/source/ui/view/dbfunc.cxx | 5 +- sc/source/ui/view/tabvwshe.cxx | 4 +- 12 files changed, 52 insertions(+), 234 deletions(-) commit 5ada5635cff38af87830b091b36159cf80e4cf5d Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:04:14 2011 -0500 Revert "This is also part of the merge." This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/source/core/data/table3.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit c900e3db767518b7a60eaf24bdf298c94315f685 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 15d298ba7c4e89b043b3077e17747ba027a62c43 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: calc_libreoffice-3.3.1.1 split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'chart2/source/view/main/ChartView.cxx')
-rw-r--r--chart2/source/view/main/ChartView.cxx104
1 files changed, 52 insertions, 52 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index cac71a27ef53..b358f4481d11 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -257,7 +257,7 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre
return;
// creating the graphic exporter
- uno::Reference< document::XExporter > xExporter( xFactory->createInstance(
+ uno::Reference< document::XExporter > xExporter( xFactory->createInstance(
C2U("com.sun.star.drawing.GraphicExportFilter")), uno::UNO_QUERY);
uno::Reference< document::XFilter > xFilter( xExporter, uno::UNO_QUERY );
@@ -278,8 +278,8 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre
aFilterData[1].Value <<= bUseHighContrast;
aFilterData[2].Name = C2U("Version");
- const sal_Int32 nVersion = SOFFICE_FILEFORMAT_50;
- aFilterData[2].Value <<= nVersion;
+ const sal_Int32 nVersion = SOFFICE_FILEFORMAT_50;
+ aFilterData[2].Value <<= nVersion;
aFilterData[3].Name = C2U("CurrentPage");
aFilterData[3].Value <<= uno::Reference< uno::XInterface >( m_xDrawPage, uno::UNO_QUERY );
@@ -323,7 +323,7 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF
SvMemoryStream aStream( 1024, 1024 );
utl::OStreamWrapper* pStreamWrapper = new utl::OStreamWrapper( aStream );
-
+
uno::Reference< io::XOutputStream > xOutStream( pStreamWrapper );
uno::Reference< io::XInputStream > xInStream( pStreamWrapper );
uno::Reference< io::XSeekable > xSeekable( pStreamWrapper );
@@ -331,13 +331,13 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF
if( xOutStream.is() )
{
this->getMetaFile( xOutStream, bHighContrastMetaFile );
-
+
if( xInStream.is() && xSeekable.is() )
{
xSeekable->seek(0);
sal_Int32 nBytesToRead = xInStream->available();
uno::Sequence< sal_Int8 > aSeq( nBytesToRead );
- xInStream->readBytes( aSeq, nBytesToRead);
+ xInStream->readBytes( aSeq, nBytesToRead);
aRet <<= aSeq;
xInStream->closeInput();
}
@@ -456,7 +456,7 @@ VCoordinateSystem* lcl_getCooSysForPlotter( const std::vector< VCoordinateSystem
typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates wether this is a main or secondary axis
typedef std::pair< VCoordinateSystem* , tFullAxisIndex > tFullCoordinateSystem;
typedef std::map< VCoordinateSystem*, tFullAxisIndex > tCoordinateSystemMap;
-
+
struct AxisUsage
{
AxisUsage();
@@ -660,7 +660,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
// - create plotter for charttypes (for each first scale group at each plotter, as they are independent)
// - add series to plotter (thus each charttype can provide minimum and maximum values for autoscaling)
// - add plotter to coordinate systems
-
+
//iterate through all coordinate systems
uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY );
OSL_ASSERT( xCooSysContainer.is());
@@ -696,7 +696,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
pPlotter->setColorScheme( xColorScheme );
pPlotter->setExplicitCategoriesProvider( pVCooSys->getExplicitCategoriesProvider() );
sal_Int32 nMissingValueTreatment = DiagramHelper::getCorrectedMissingValueTreatment( xDiagram, xChartType );
-
+
if(pVCooSys)
pVCooSys->addMinimumAndMaximumSupplier(pPlotter);
@@ -912,7 +912,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel
{
//precondition: need a initialized m_aSeriesPlotterList
//precondition: need a initialized m_aAxisUsageList
-
+
::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin();
const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end();
@@ -928,7 +928,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel
AxisUsage& rAxisUsage = (*aAxisIter).second;
::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex);
::std::vector< VCoordinateSystem* > aVCooSysList_Z = rAxisUsage.getCoordinateSystems(2,nAxisIndex);
-
+
for( nC=0; nC < aVCooSysList_X.size(); nC++)
aVCooSysList_X[nC]->prepareScaleAutomatismForDimensionAndIndex(rAxisUsage.aScaleAutomatism,0,nAxisIndex);
for( nC=0; nC < aVCooSysList_Z.size(); nC++)
@@ -957,7 +957,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel
::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex);
::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems(1,nAxisIndex);
::std::vector< VCoordinateSystem* > aVCooSysList_Z = rAxisUsage.getCoordinateSystems(2,nAxisIndex);
-
+
if(!aVCooSysList_Y.size())
continue;
@@ -967,7 +967,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel
ExplicitScaleData aExplicitScale;
ExplicitIncrementData aExplicitIncrement;
rAxisUsage.aScaleAutomatism.calculateExplicitScaleAndIncrement( aExplicitScale, aExplicitIncrement );
-
+
for( nC=0; nC < aVCooSysList_X.size(); nC++)
aVCooSysList_X[nC]->setExplicitScaleAndIncrement( 0, nAxisIndex, aExplicitScale, aExplicitIncrement );
for( nC=0; nC < aVCooSysList_Y.size(); nC++)
@@ -994,7 +994,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex );
if( !aVCooSysList_Y.size() )
continue;
-
+
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
if( xDiagram.is() )
{
@@ -1005,7 +1005,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
for( ; aIter != aSeriesVector.end(); aIter++ )
{
- sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
+ sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
if( nAxisIndex == nCurrentIndex )
{
bSeriesAttachedToThisAxis = true;
@@ -1015,7 +1015,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
nAttachedAxisIndex=nCurrentIndex;
}
}
-
+
if( !bSeriesAttachedToThisAxis && nAttachedAxisIndex >= 0 )
{
for( size_t nC = 0; nC < aVCooSysList_Y.size(); ++nC )
@@ -1034,7 +1034,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
aExplicitScaleDest.AxisType = aExplicitScaleSource.AxisType;
aExplicitIncrementDest.BaseValue = aExplicitIncrementSource.BaseValue;
-
+
ScaleData aScale( rAxisUsage.aScaleAutomatism.getScale() );
if( !aScale.Minimum.hasValue() )
{
@@ -1045,7 +1045,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
if( bNewMinOK )
aExplicitScaleDest.Minimum = aExplicitScaleSource.Minimum;
}
- else
+ else
aExplicitIncrementDest.BaseValue = aExplicitScaleDest.Minimum;
if( !aScale.Maximum.hasValue() )
@@ -1055,10 +1055,10 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
if( aScale.Minimum >>= fMin )
bNewMaxOK = (fMin <= aExplicitScaleSource.Maximum);
if( bNewMaxOK )
- aExplicitScaleDest.Maximum = aExplicitScaleSource.Maximum;
+ aExplicitScaleDest.Maximum = aExplicitScaleSource.Maximum;
}
if( !aScale.Origin.hasValue() )
- aExplicitScaleDest.Origin = aExplicitScaleSource.Origin;
+ aExplicitScaleDest.Origin = aExplicitScaleSource.Origin;
if( !aScale.IncrementData.Distance.hasValue() )
aExplicitIncrementDest.Distance = aExplicitIncrementSource.Distance;
@@ -1069,7 +1069,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
if( bAutoMinorInterval )
{
if( aExplicitIncrementDest.SubIncrements.getLength() && aExplicitIncrementSource.SubIncrements.getLength() )
- aExplicitIncrementDest.SubIncrements[0].IntervalCount =
+ aExplicitIncrementDest.SubIncrements[0].IntervalCount =
aExplicitIncrementSource.SubIncrements[0].IntervalCount;
}
@@ -1159,7 +1159,7 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio()
fz = fy*aSingleRatio.DirectionZ/aSingleRatio.DirectionY;
else
fz = aSingleRatio.DirectionZ;
- }
+ }
if( fx>0 && fy>0 && fz>0 )
break;
@@ -1217,7 +1217,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod
if( xPageStyles.is() )
{
rtl::OUString aPageStyle;
-
+
uno::Reference< text::XTextDocument > xTextDocument( xParentProps, uno::UNO_QUERY );
if( xTextDocument.is() )
{
@@ -1276,7 +1276,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod
}
if( !aPageStyle.getLength() )
{
- uno::Reference< text::XText > xText( xTextDocument->getText() );
+ uno::Reference< text::XText > xText( xTextDocument->getText() );
if( xText.is() )
{
uno::Reference< beans::XPropertySet > xTextCursorProps( xText->createTextCursor(), uno::UNO_QUERY );
@@ -1320,7 +1320,7 @@ sal_Int16 lcl_getDefaultWritingModeFromPool( ::boost::shared_ptr< DrawModelWrapp
{
sal_Int16 nWritingMode = text::WritingMode2::LR_TB;
if( pDrawModelWrapper.get() )
- {
+ {
const SfxPoolItem* pItem = &(pDrawModelWrapper->GetItemPool().GetDefaultItem( EE_PARA_WRITINGDIR ));
if( pItem )
nWritingMode = static_cast< sal_Int16 >((static_cast< const SfxInt32Item * >( pItem ))->GetValue());
@@ -1341,7 +1341,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
, const uno::Reference< drawing::XShape>& xDiagram_MarkHandles /*needs to be resized to fit the result*/
)
{
- //return the used rectangle
+ //return the used rectangle
awt::Rectangle aUsedOuterRect( rAvailablePos.X, rAvailablePos.Y, 0, 0 );
// sal_Int32 nDiagramIndex = 0;//todo if more than one diagam is supported
@@ -1381,9 +1381,9 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
);
}
-
+
// - prepare list of all axis and how they are used
- rSeriesPlotterContainer.initAxisUsageList();
+ rSeriesPlotterContainer.initAxisUsageList();
rSeriesPlotterContainer.doAutoScaling( m_xChartModel );
rSeriesPlotterContainer.setScalesFromCooSysToPlotter();
rSeriesPlotterContainer.setNumberFormatsFromAxes();
@@ -1395,7 +1395,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
//aspect ratio
drawing::Direction3D aPreferredAspectRatio(
rSeriesPlotterContainer.getPreferredAspectRatio() );
-
+
uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis(0);
uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis(0);
VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount);
@@ -1410,7 +1410,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
uno::Reference< drawing::XShapes > xTextTargetShapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxes_Shapes) );
// - create axis and grids for all coordinate systems
-
+
//init all coordinate systems
for( nC=0; nC < rVCooSysList.size(); nC++)
{
@@ -1427,7 +1427,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
uno::Reference< drawing::XShape > xBoundingShape( xDiagramPlusAxes_Shapes, uno::UNO_QUERY );
::basegfx::B2IRectangle aConsumedOuterRect;
-
+
//use first coosys only so far; todo: calculate for more than one coosys if we have more in future
//todo: this is just a workaround at the moment for pie and donut labels
bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
@@ -1435,7 +1435,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
{
VCoordinateSystem* pVCooSys = rVCooSysList[0];
pVCooSys->createMaximumAxesLabels();
-
+
aConsumedOuterRect = ::basegfx::B2IRectangle( ShapeFactory::getRectangleOfShape(xBoundingShape) );
::basegfx::B2IRectangle aNewInnerRect( aVDiagram.getCurrentRectangle() );
if( !bUseFixedInnerSize )
@@ -1475,10 +1475,10 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
for( nC=0; nC < rVCooSysList.size(); nC++)
{
VCoordinateSystem* pVCooSys = rVCooSysList[nC];
-
+
pVCooSys->setTransformationSceneToScreen( B3DHomMatrixToHomogenMatrix(
createTransformationSceneToScreen( aVDiagram.getCurrentRectangle() ) ));
-
+
pVCooSys->createAxesShapes();
pVCooSys->createGridShapes();
}
@@ -1526,7 +1526,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
::basegfx::B2IRectangle aNewInnerRect( aVDiagram.getCurrentRectangle() );
if( !bUseFixedInnerSize )
aNewInnerRect = aVDiagram.adjustInnerSize( aConsumedOuterRect );
-
+
for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
{
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
@@ -1537,7 +1537,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
ShapeFactory::removeSubShapes( xSeriesTargetInFrontOfAxis ); //xSeriesTargetBehindAxis is a sub shape of xSeriesTargetInFrontOfAxis and will be removed here
xSeriesTargetBehindAxis.clear();
ShapeFactory::removeSubShapes( xTextTargetShapes );
-
+
//set new transformation
for( nC=0; nC < rVCooSysList.size(); nC++)
{
@@ -1654,7 +1654,7 @@ sal_Bool ChartView::getExplicitValuesForAxis(
if(!xAxis.is())
return sal_False;
-
+
uno::Reference< XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis(xAxis,ChartModelHelper::findDiagram( m_xChartModel ) ) );
const VCoordinateSystem* pVCooSys = findInCooSysList(m_aVCooSysList,xCooSys);
if(!pVCooSys)
@@ -1691,7 +1691,7 @@ uno::Reference< drawing::XShape > ChartView::getShapeForCID( const rtl::OUString
{
SolarMutexGuard aSolarGuard;
SdrObject* pObj = DrawModelWrapper::getNamedSdrObject( rObjectCID, this->getSdrPage() );
- if( pObj )
+ if( pObj )
return uno::Reference< drawing::XShape >( pObj->getUnoShape(), uno::UNO_QUERY);
return 0;
}
@@ -1828,7 +1828,7 @@ sal_Int32 lcl_getExplicitNumberFormatKeyForAxis(
bool bNumberFormatKeyFoundViaAttachedData = false;
sal_Int32 nAxisIndex = 0;
sal_Int32 nDimensionIndex = 1;
-
+
try
{
Reference< XChartTypeContainer > xCTCnt( xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW );
@@ -1945,7 +1945,7 @@ sal_Int32 ExplicitValueProvider::getPercentNumberFormat( const Reference< util::
{
sal_Bool bCreate = sal_True;
const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper();
- Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT,
+ Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT,
rLocaleDataWrapper.getLocale(), bCreate );
if( aKeySeq.getLength() )
{
@@ -1965,9 +1965,9 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
{
sal_Int32 nFormat=0;
if( !xSeriesOrPointProp.is() )
- return nFormat;
+ return nFormat;
- rtl::OUString aPropName( C2U( "NumberFormat" ) );
+ rtl::OUString aPropName( C2U( "NumberFormat" ) );
if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) )
{
uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) );
@@ -2005,7 +2005,7 @@ sal_Int32 ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe
{
sal_Int32 nFormat=0;
if( !xSeriesOrPointProp.is() )
- return nFormat;
+ return nFormat;
if( !(xSeriesOrPointProp->getPropertyValue(C2U( "PercentageNumberFormat" )) >>= nFormat) )
{
nFormat = ExplicitValueProvider::getPercentNumberFormat( xNumberFormatsSupplier );
@@ -2183,7 +2183,7 @@ bool getAvailablePosAndSizeForDiagram(
bool bPosSizeExcludeAxes = false;
if( xProp.is() )
xProp->getPropertyValue( C2U( "PosSizeExcludeAxes" ) ) >>= bPosSizeExcludeAxes;
-
+
//size:
::com::sun::star::chart2::RelativeSize aRelativeSize;
if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativeSize" ) )>>=aRelativeSize) )
@@ -2464,7 +2464,7 @@ void formatPage(
if( ! xModelPage.is())
return;
-
+
if( !xShapeFactory.is() )
return;
@@ -2628,7 +2628,7 @@ void ChartView::createShapes()
{
SolarMutexGuard aSolarGuard;
-
+
//------------ apply fill properties to page
// todo: it would be nicer to just pass the page m_xDrawPage and format it,
// but the draw page does not support XPropertySet
@@ -2651,7 +2651,7 @@ void ChartView::createShapes()
ShapeFactory::setShapeName( xDiagram_OuterRect, C2U("PlotAreaIncludingAxes") );
uno::Reference< drawing::XShapes > xDiagramPlusAxes_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes ) );
-
+
//------------ create some titles
std::auto_ptr<VTitle> apVTitle(0);
bool bAutoPositionDummy = true;
@@ -2741,7 +2741,7 @@ void ChartView::createShapes()
awt::Rectangle aUsedOuterRect = impl_createDiagramAndContent( aSeriesPlotterContainer
, xDiagramPlusAxes_Shapes
, aAvailablePosDia ,aAvailableSizeForDiagram, aPageSize, bUseFixedInnerSize, xDiagram_MarkHandles );
-
+
if( xDiagram_OuterRect.is() )
{
xDiagram_OuterRect->setPosition( awt::Point( aUsedOuterRect.X, aUsedOuterRect.Y ) );
@@ -2776,7 +2776,7 @@ void ChartView::createShapes()
#if OSL_DEBUG_LEVEL > 0
clock_t nEnd = clock();
double fDuration =(double(nEnd-nStart)*1000.0)/double(CLOCKS_PER_SEC);
-
+
OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< chart view :: createShapes():: needed %f msec", fDuration );
#endif
}
@@ -2823,7 +2823,7 @@ void ChartView::impl_updateView()
m_bViewDirty = false;
m_bViewUpdatePending = false;
createShapes();
-
+
if( m_bViewDirty )
{
//avoid recursions due to add-in
@@ -2927,7 +2927,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
if( ChartView::getSdrPage() != pSdrHint->GetPage() )
bShapeChanged=false;
}
-
+
if(!bShapeChanged)
return;