ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:indentation in canvas..chart2

Browse Source 
Change-Id: I9ef57a2e9aaf298f4cfd029aa9b8143871b1bc21
Reviewed-on: https://gerrit.libreoffice.org/67526
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-02-08 10:01:20 +01:00
parent 587ac01f97
commit 21b224211c
16 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
canvas/source/cairo/cairo_spritecanvashelper.cxx
+2 -1
View File
@@ -337,7 +337,8 @@ namespace cairocanvas
const ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
aFirst( rUpdateArea.maComponentList.begin() );
::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
aSecond( aFirst ); ++aSecond;
aSecond( aFirst );
++aSecond;
ENSURE_OR_THROW( aFirst->second.getSprite().is(),
"VCLCanvas::scrollUpdate(): no sprite" );
canvas/source/tools/spriteredrawmanager.cxx
+2 -1
View File
@@ -335,7 +335,8 @@ namespace canvas
const SpriteConnectedRanges::ComponentListType::const_iterator aFirst(
rUpdateArea.maComponentList.begin() );
SpriteConnectedRanges::ComponentListType::const_iterator aSecond(
aFirst ); ++aSecond;
aFirst );
++aSecond;
if( !aFirst->second.isPureMove() ||
!aSecond->second.isPureMove() ||
canvas/workben/canvasdemo.cxx
+1 -1
View File
@@ -123,7 +123,7 @@ class DemoRenderer
0, 1 );
rendering::FontRequest aFontRequest( aFontInfo, 12.0, 0.0, aLocale );
uno::Sequence< beans::PropertyValue > aExtraFontProperties;
mxDefaultFont = xCanvas->createFont( aFontRequest, aExtraFontProperties, aFontMatrix );
mxDefaultFont = xCanvas->createFont( aFontRequest, aExtraFontProperties, aFontMatrix );
if( !mxDefaultFont.is() )
fprintf( stderr, "Failed to create font\n" );
}
chart2/qa/extras/charttest.hxx
+1 -1
View File
@@ -593,7 +593,7 @@ awt::Size ChartTest::getPageSize( const Reference< chart2::XChartDocument > & xC
uno::Reference< com::sun::star::embed::XVisualObject > xVisualObject( xChartDoc, uno::UNO_QUERY );
CPPUNIT_ASSERT( xVisualObject.is() );
aSize = xVisualObject->getVisualAreaSize( com::sun::star::embed::Aspects::MSOLE_CONTENT );
return aSize;
return aSize;
}
awt::Size ChartTest::getSize(css::uno::Reference<chart2::XDiagram> xDiagram, const awt::Size& rPageSize)
chart2/source/controller/dialogs/tp_AxisLabel.cxx
+1 -1
View File
@@ -136,7 +136,7 @@ bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs )
{
const SfxPoolItem* pPoolItem = nullptr;
const SfxPoolItem* pPoolItem = nullptr;
// show description
SfxItemState aState = rInAttrs->GetItemState( SCHATTR_AXIS_SHOWDESCR, false, &pPoolItem );
chart2/source/controller/main/ChartController_Properties.cxx
+2 -2
View File
@@ -246,7 +246,7 @@ wrapper::ItemConverter* createItemConverter(
uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ),
eMapTo, pRefSize.get(), bDataSeries, bUseSpecialFillColor, nSpecialFillColor, true,
nNumberFormat, nPercentNumberFormat );
break;
break;
}
case OBJECTTYPE_GRID:
case OBJECTTYPE_SUBGRID:
@@ -282,7 +282,7 @@ wrapper::ItemConverter* createItemConverter(
xObjectProperties, rDrawModel.GetItemPool(), rDrawModel,
uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ),
pRefSize.get());
break;
break;
}
case OBJECTTYPE_DATA_STOCK_RANGE:
break;
chart2/source/controller/main/ControllerCommandDispatch.cxx
+3 -3
View File
@@ -492,9 +492,9 @@ void ControllerCommandDispatch::initialize()
if( xModifyBroadcaster.is())
xModifyBroadcaster->addModifyListener( this );
// Listen selection modifications (Arrangement feature - issue 63017).
if( m_xSelectionSupplier.is() )
m_xSelectionSupplier->addSelectionChangeListener( this );
// Listen selection modifications (Arrangement feature - issue 63017).
if( m_xSelectionSupplier.is() )
m_xSelectionSupplier->addSelectionChangeListener( this );
if( m_apModelState.get() && xModel.is())
m_apModelState->update( xModel );
chart2/source/controller/main/ShapeController.cxx
+1 -1
View File
@@ -288,7 +288,7 @@ void ShapeController::executeDispatch_FormatArea()
pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr< AbstractSvxAreaTabDialog > pDlg(
ScopedVclPtr< AbstractSvxAreaTabDialog > pDlg(
pFact->CreateSvxAreaTabDialog(pChartWindow->GetFrameWeld(), &aAttr, &pDrawModelWrapper->getSdrModel(), true));
if ( pDlg->Execute() == RET_OK )
{
chart2/source/model/main/DataSeriesProperties.cxx
+1 -1
View File
@@ -78,7 +78,7 @@ void DataSeriesProperties::AddDefaultsToMap(
// PROP_DATASERIES_ATTRIBUTED_DATA_POINTS has no default
// add properties of service DataPointProperties
DataPointProperties::AddDefaultsToMap( rOutMap );
DataPointProperties::AddDefaultsToMap( rOutMap );
}
} // namespace chart
chart2/source/model/main/Diagram.cxx
+6 -6
View File
@@ -154,26 +154,26 @@ void lcl_AddPropertiesToVector(
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID );
rOutProperties.emplace_back( "3DRelativeHeight",
rOutProperties.emplace_back( "3DRelativeHeight",
PROP_DIAGRAM_3DRELATIVEHEIGHT,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::MAYBEVOID );
rOutProperties.emplace_back( "DataTableHBorder",
rOutProperties.emplace_back( "DataTableHBorder",
PROP_DIAGRAM_DATATABLEHBORDER,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT );
rOutProperties.emplace_back( "DataTableVBorder",
rOutProperties.emplace_back( "DataTableVBorder",
PROP_DIAGRAM_DATATABLEVBORDER,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT );
rOutProperties.emplace_back( "DataTableOutline",
rOutProperties.emplace_back( "DataTableOutline",
PROP_DIAGRAM_DATATABLEOUTLINE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT );
rOutProperties.emplace_back( "ExternalData",
rOutProperties.emplace_back( "ExternalData",
PROP_DIAGRAM_EXTERNALDATA,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID );
@@ -201,7 +201,7 @@ private:
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_DATATABLEOUTLINE, false );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_DIAGRAM_STARTING_ANGLE, 90 );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_DIAGRAM_3DRELATIVEHEIGHT, 100 );
::chart::SceneProperties::AddDefaultsToMap( rOutMap );
::chart::SceneProperties::AddDefaultsToMap( rOutMap );
}
};
chart2/source/model/main/PageBackground.cxx
+1 -1
View File
@@ -76,7 +76,7 @@ private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
std::vector< css::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
chart2/source/tools/ChartTypeHelper.cxx
+2 -2
View File
@@ -175,7 +175,7 @@ bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChartTyp
//@todo ask charttype itself --> need model change first
if(xChartType.is())
{
if(nDimensionCount==3)
if(nDimensionCount==3)
return false;
OUString aChartTypeName = xChartType->getChartType();
@@ -197,7 +197,7 @@ bool ChartTypeHelper::isSupportingOverlapAndGapWidthProperties(
//@todo ask charttype itself --> need model change first
if(xChartType.is())
{
if(nDimensionCount==3)
if(nDimensionCount==3)
return false;
OUString aChartTypeName = xChartType->getChartType();
chart2/source/tools/DiagramHelper.cxx
+1 -1
View File
@@ -923,7 +923,7 @@ static void lcl_generateAutomaticCategoriesFromChartType(
if(!xChartType.is())
return;
OUString aMainSeq( xChartType->getRoleOfSequenceForSeriesLabel() );
Reference< XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY );
Reference< XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY );
if( xSeriesCnt.is() )
{
Sequence< Reference< XDataSeries > > aSeriesSeq( xSeriesCnt->getDataSeries() );
chart2/source/tools/LinePropertiesHelper.cxx
+1 -1
View File
@@ -42,7 +42,7 @@ void LinePropertiesHelper::AddPropertiesToVector(
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT );
rOutProperties.emplace_back( "LineDash",
rOutProperties.emplace_back( "LineDash",
PROP_LINE_DASH,
cppu::UnoType<drawing::LineDash>::get(),
beans::PropertyAttribute::BOUND
chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+5 -5
View File
@@ -58,15 +58,15 @@ void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression(
aValues = RegressionCalculationHelper::cleanup(
aXValues, aYValues,
RegressionCalculationHelper::isValidAndXPositiveAndYNegative());
nMax = aValues.first.size();
if( nMax <= 1 )
{
nMax = aValues.first.size();
if( nMax <= 1 )
{
::rtl::math::setNan( & m_fSlope );
::rtl::math::setNan( & m_fIntercept );
::rtl::math::setNan( & m_fCorrelationCoeffitient );
return;
}
m_fSign = -1.0;
}
m_fSign = -1.0;
}
double fAverageX = 0.0, fAverageY = 0.0;
chart2/source/view/main/ShapeFactory.cxx
+1 -1
View File
@@ -1919,7 +1919,7 @@ uno::Reference< drawing::XShape >
{
try
{
uno::Sequence<OUString> aPropertyNames {
uno::Sequence<OUString> aPropertyNames {
UNO_NAME_3D_POLYPOLYGON3D,
UNO_NAME_3D_LINEONLY
};