diff options
Diffstat (limited to 'filter/source/pdf')
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 28 | ||||
-rw-r--r-- | filter/source/pdf/pdfexport.cxx | 8 | ||||
-rw-r--r-- | filter/source/pdf/pdffilter.cxx | 2 | ||||
-rw-r--r-- | filter/source/pdf/pdfuno.cxx | 2 |
4 files changed, 20 insertions, 20 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index e9976c5ea534..1fe1474e9ca7 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -245,14 +245,14 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue > mbSignPDF = maConfigItem.ReadBool( "SignPDF", false ); //queue the tab pages for later creation (created when first shown) - mnSigningPageId = AddTabPage("digitalsignatures", ImpPDFTabSigningPage::Create, 0); - mnSecurityPageId = AddTabPage("security", ImpPDFTabSecurityPage::Create, 0); - mnLinksPage = AddTabPage("links", ImpPDFTabLinksPage::Create, 0); - mnInterfacePageId = AddTabPage("userinterface", ImpPDFTabViewerPage::Create, 0); - mnViewPageId = AddTabPage("initialview", ImpPDFTabOpnFtrPage::Create, 0); + mnSigningPageId = AddTabPage("digitalsignatures", ImpPDFTabSigningPage::Create, nullptr); + mnSecurityPageId = AddTabPage("security", ImpPDFTabSecurityPage::Create, nullptr); + mnLinksPage = AddTabPage("links", ImpPDFTabLinksPage::Create, nullptr); + mnInterfacePageId = AddTabPage("userinterface", ImpPDFTabViewerPage::Create, nullptr); + mnViewPageId = AddTabPage("initialview", ImpPDFTabOpnFtrPage::Create, nullptr); //last queued is the first to be displayed (or so it seems..) - mnGeneralPageId = AddTabPage("general", ImpPDFTabGeneralPage::Create, 0 ); + mnGeneralPageId = AddTabPage("general", ImpPDFTabGeneralPage::Create, nullptr ); //get the string property value (from sfx2/source/dialog/mailmodel.cxx) to overwrite the text for the Ok button OUString sOkButtonText = maConfigItem.ReadString( "_OkButtonString", OUString() ); @@ -278,7 +278,7 @@ ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const { return static_cast<ImpPDFTabSecurityPage*>(pSecurityPage); } - return NULL; + return nullptr; } ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const @@ -288,7 +288,7 @@ ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const { return static_cast<ImpPDFTabLinksPage*>(pLinksPage); } - return NULL; + return nullptr; } ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const @@ -298,7 +298,7 @@ ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const { return static_cast<ImpPDFTabGeneralPage*>(pGeneralPage); } - return NULL; + return nullptr; } IMPL_LINK_NOARG_TYPED(ImpPDFTabDialog, CancelHdl, Button*, void) @@ -513,7 +513,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* pParent, const SfxItemSe , mbExportFormFieldsUserSelection(false) , mbIsPresentation(false) , mbIsWriter(false) - , mpaParent(0) + , mpaParent(nullptr) { get(mpRbAll, "all"); get(mpRbRange, "range"); @@ -805,7 +805,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleAddStreamHdl, CheckBox&, void) IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void) { //set the security page status (and its controls as well) - ImpPDFTabSecurityPage* pSecPage = mpaParent ? mpaParent->getSecurityPage() : NULL; + ImpPDFTabSecurityPage* pSecPage = mpaParent ? mpaParent->getSecurityPage() : nullptr; if (pSecPage) { pSecPage->ImplPDFASecurityControl(!mpCbPDFA1b->IsChecked()); @@ -834,7 +834,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void } // PDF/A-1 doesn't allow launch action, so enable/disable the selection on // Link page - ImpPDFTabLinksPage* pLinksPage = mpaParent ? mpaParent->getLinksPage() : NULL; + ImpPDFTabLinksPage* pLinksPage = mpaParent ? mpaParent->getLinksPage() : nullptr; if (pLinksPage) pLinksPage->ImplPDFALinkControl(!mpCbPDFA1b->IsChecked()); @@ -1319,7 +1319,7 @@ void ImpPDFTabSecurityPage::enablePermissionControls() { bool bIsPDFASel = false; ImpPDFTabDialog* pParent = static_cast<ImpPDFTabDialog*>(GetTabDialog()); - ImpPDFTabGeneralPage* pGeneralPage = pParent ? pParent->getGeneralPage() : NULL; + ImpPDFTabGeneralPage* pGeneralPage = pParent ? pParent->getGeneralPage() : nullptr; if (pGeneralPage) { bIsPDFASel = pGeneralPage->IsPdfaSelected(); @@ -1544,7 +1544,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, Button*, voi } ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rErrors) - : MessageDialog(NULL, "WarnPDFDialog", "filter/ui/warnpdfdialog.ui") + : MessageDialog(nullptr, "WarnPDFDialog", "filter/ui/warnpdfdialog.ui") { get(m_pErrors, "errors"); get(m_pExplanation, "message"); diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 0e82712b275b..3ad411e98bce 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -165,8 +165,8 @@ bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, bool bRet = false; try { - Any* pFirstPage = NULL; - Any* pLastPage = NULL; + Any* pFirstPage = nullptr; + Any* pLastPage = nullptr; bool bExportNotesPages = false; @@ -810,7 +810,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& if ( pOut ) { - DBG_ASSERT( pOut->GetExtOutDevData() == NULL, "PDFExport: ExtOutDevData already set!!!" ); + DBG_ASSERT( pOut->GetExtOutDevData() == nullptr, "PDFExport: ExtOutDevData already set!!!" ); std::unique_ptr<vcl::PDFExtOutDevData> pPDFExtOutDevData(new vcl::PDFExtOutDevData( *pOut )); pOut->SetExtOutDevData( pPDFExtOutDevData.get() ); pPDFExtOutDevData->SetIsExportNotes( mbExportNotes ); @@ -928,7 +928,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& bRet = pPDFWriter->Emit(); aErrors = pPDFWriter->GetErrors(); } - pOut->SetExtOutDevData( NULL ); + pOut->SetExtOutDevData( nullptr ); if( bReChangeToNormalView ) { try diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 793b9449abe9..86af0bba5e05 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -157,7 +157,7 @@ public: IMPL_LINK_TYPED( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void ) { if( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) - m_pFocusWindow = NULL; + m_pFocusWindow = nullptr; } sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescriptor ) diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx index 72a324e6ff03..94c8769120f0 100644 --- a/filter/source/pdf/pdfuno.cxx +++ b/filter/source/pdf/pdfuno.cxx @@ -37,7 +37,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { OUString aImplName( OUString::createFromAscii( pImplName ) ); - void* pRet = 0; + void* pRet = nullptr; if( pServiceManager ) { |