diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-01-09 19:38:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-01-09 20:21:59 +0100 |
| commit | 6efffbbfce9c27439f54970f7a569b069ce46eba (patch) | |
| tree | cecff16ae5325875c3e6471170040c38859bff56 /sd | |
| parent | 2ab481b038b62b1ff576ac4d49d03c1798cd7f84 (diff) | |
Improve loplugin:redundantcast for sal_Int... vs. ::sal_Int...
Change-Id: I1548a76fdc03afee68f1e5c01bc665e616f2edf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86501
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 8 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 512507f65268..b8f65a88aa9d 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -2702,28 +2702,28 @@ void SdImportTest::testTdf51340() uno::Reference< beans::XPropertySet > xPropSet( xParagraph, uno::UNO_QUERY_THROW ); css::style::LineSpacing aSpacing; xPropSet->getPropertyValue( "ParaLineSpacing" ) >>= aSpacing; - CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>(css::style::LineSpacingMode::PROP), aSpacing.Mode ); + CPPUNIT_ASSERT_EQUAL( css::style::LineSpacingMode::PROP, aSpacing.Mode ); CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>(90), aSpacing.Height ); // Second paragraph has a 125% line spacing set on slide layout xParagraph.set( getParagraphFromShape( 1, xShape ) ); xPropSet.set( xParagraph, uno::UNO_QUERY_THROW ); xPropSet->getPropertyValue( "ParaLineSpacing" ) >>= aSpacing; - CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>(css::style::LineSpacingMode::PROP), aSpacing.Mode ); + CPPUNIT_ASSERT_EQUAL( css::style::LineSpacingMode::PROP, aSpacing.Mode ); CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>(125), aSpacing.Height ); // Third paragraph has a 70% line spacing set directly on normal slide (master slide property is overridden) xParagraph.set( getParagraphFromShape( 2, xShape ) ); xPropSet.set( xParagraph, uno::UNO_QUERY_THROW ); xPropSet->getPropertyValue( "ParaLineSpacing" ) >>= aSpacing; - CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>(css::style::LineSpacingMode::PROP), aSpacing.Mode ); + CPPUNIT_ASSERT_EQUAL( css::style::LineSpacingMode::PROP, aSpacing.Mode ); CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>(70), aSpacing.Height ); // Fourth paragraph has a 190% line spacing set directly on normal slide (slide layout property is overridden) xParagraph.set( getParagraphFromShape( 3, xShape ) ); xPropSet.set( xParagraph, uno::UNO_QUERY_THROW ); xPropSet->getPropertyValue( "ParaLineSpacing" ) >>= aSpacing; - CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>(css::style::LineSpacingMode::PROP), aSpacing.Mode ); + CPPUNIT_ASSERT_EQUAL( css::style::LineSpacingMode::PROP, aSpacing.Mode ); CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>(190), aSpacing.Height ); xDocShRef->DoClose(); diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 6e57dacdd376..8179504de015 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -1138,7 +1138,7 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider* pBuProv, bool bG case css::style::LineSpacingMode::PROP : default: - mnLineSpacing = static_cast<sal_Int16>( aLineSpacing.Height ); + mnLineSpacing = aLineSpacing.Height; break; } } |