diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:20:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:32 +0100 |
| commit | 8d12f43bb3668f4fdfcef0bd149d8b023e312e18 (patch) | |
| tree | 989292510ee579777678940fcb5c93d75c3925dd /oox/source/ole/olehelper.cxx | |
| parent | loplugin:nullptr (automatic rewrite) (diff) | |
| download | core-8d12f43bb3668f4fdfcef0bd149d8b023e312e18.tar.gz core-8d12f43bb3668f4fdfcef0bd149d8b023e312e18.zip | |
loplugin:nullptr (automatic rewrite)
Change-Id: I62a20b440064aca6f102e61cb3984bb95e739a4f
Diffstat (limited to 'oox/source/ole/olehelper.cxx')
| -rw-r--r-- | oox/source/ole/olehelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index cf9bbed1fcfa..ed13efd1fb2f 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -333,7 +333,7 @@ Reference< css::frame::XFrame > lcl_getFrame( const Reference< css::frame::XMod if ( rxModel.is() ) { Reference< css::frame::XController > xController = rxModel->getCurrentController(); - xFrame = xController.is() ? xController->getFrame() : NULL; + xFrame = xController.is() ? xController->getFrame() : nullptr; } return xFrame; } @@ -362,12 +362,12 @@ public: } OUString getFullName() { return maFullName; } OUString getTypeName() { return maTypeName; } - bool isValid() { return mpModel != NULL; } + bool isValid() { return mpModel != nullptr; } void exportName( const Reference< XOutputStream >& rxOut ); void exportCompObj( const Reference< XOutputStream >& rxOut ); void exportControl( const Reference< XOutputStream >& rxOut, const css::awt::Size& rSize ); }; -OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : maControl( "Unknown" ), mpModel( NULL ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel ) +OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : maControl( "Unknown" ), mpModel( nullptr ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel ) { // try to get the guid Reference< css::beans::XPropertySet > xProps( xCntrlModel, UNO_QUERY ); |