diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:53 +0100 |
| commit | 01b49802c7cda7fd4d5ba71263cef7bc95234b89 (patch) | |
| tree | b8d92f1c6abf5ac548d0bcb0c581ebfcffd8bfac /sw/source/uibase/uno/SwXFilterOptions.cxx | |
| parent | 6cd7bf2043146a630925a2e49336f02c802f707a (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/uibase/uno/SwXFilterOptions.cxx')
| -rw-r--r-- | sw/source/uibase/uno/SwXFilterOptions.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index d2bec2560321..252c740db290 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -95,12 +95,12 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::excepti pInStream.reset(utl::UcbStreamHelper::CreateStream( xInputStream )); uno::Reference< XUnoTunnel > xTunnel(xModel, uno::UNO_QUERY); - SwDocShell* pDocShell = 0; + SwDocShell* pDocShell = nullptr; if(xTunnel.is()) { SwXTextDocument* pXDoc = reinterpret_cast< SwXTextDocument * >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SwXTextDocument::getUnoTunnelId()))); - pDocShell = pXDoc ? pXDoc->GetDocShell() : 0; + pDocShell = pXDoc ? pXDoc->GetDocShell() : nullptr; } if(pDocShell) { @@ -108,7 +108,7 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::excepti SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - std::unique_ptr<AbstractSwAsciiFilterDlg> pAsciiDlg(pFact->CreateSwAsciiFilterDlg(NULL, *pDocShell, + std::unique_ptr<AbstractSwAsciiFilterDlg> pAsciiDlg(pFact->CreateSwAsciiFilterDlg(nullptr, *pDocShell, pInStream.get())); OSL_ENSURE(pAsciiDlg, "Dialog creation failed!"); if(RET_OK == pAsciiDlg->Execute()) |