diff options
| author | Noel Grandin <noel@peralex.com> | 2015-06-11 10:06:49 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-06 08:55:50 -0500 |
| commit | aaeead445c1c73de6f8f4c088ef87dd6fb24c661 (patch) | |
| tree | 25339038b555394fd8b3e505803ce0f32a195f01 /oox | |
| parent | 7a58bd20dce4119507344e9a0c5a8aa44662045d (diff) | |
convert expressions like 'size() == 0' to 'empty()'
(cherry picked from commit 776a3f14f2d987312b926ebc1ad09321a3a87f0d)
Change-Id: Ia5c8c0f38a347f398d587970a22e03f29ffd37af
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/presentationfragmenthandler.cxx | 4 | ||||
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 84dabe59600a..d1438918b14b 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -79,7 +79,7 @@ PresentationFragmentHandler::~PresentationFragmentHandler() throw() void ResolveTextFields( XmlFilterBase& rFilter ) { const oox::core::TextFieldStack& rTextFields = rFilter.getTextFieldStack(); - if ( rTextFields.size() ) + if ( !rTextFields.empty() ) { Reference< frame::XModel > xModel( rFilter.getModel() ); oox::core::TextFieldStack::const_iterator aIter( rTextFields.begin() ); @@ -192,7 +192,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage Reference< drawing::XMasterPagesSupplier > xMPS( xModel, uno::UNO_QUERY_THROW ); Reference< drawing::XDrawPages > xMasterPages( xMPS->getMasterPages(), uno::UNO_QUERY_THROW ); - if( !(rFilter.getMasterPages().size() )) + if( rFilter.getMasterPages().empty() ) xMasterPages->getByIndex( 0 ) >>= xMasterPage; else xMasterPage = xMasterPages->insertNewByIndex( xMasterPages->getCount() ); diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index b69fc8c851cd..68103f048cb5 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -437,7 +437,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception) else if (mxDiagramShapeContext.is()) { basegfx::B2DHomMatrix aMatrix; - if (mpShape->getExtDrawings().size() == 0) + if (mpShape->getExtDrawings().empty()) { mpShape->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix, mpShape->getFillProperties() ); xResult = mpShape->getXShape(); |