basctl/source/basicide/basobj2.cxx | 2 +- cui/source/options/optinet2.cxx | 4 +--- cui/source/tabpages/autocdlg.cxx | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit 734e4dc9f2676f59ed264abd16aae9afdef5ed84 Author: Noel Grandin <n...@peralex.com> Date: Tue Apr 14 15:31:10 2015 +0200 loplugin:cstylecast Change-Id: I3607afd9f553b9b3246dd67aca93e932625861a7 diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index b74c37e..3a82df4 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -732,7 +732,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl) nSelEntryPos == APPLY_NUMBERING) { ScopedVclPtrInstance< SvxCharacterMap > pMapDlg(this); - ImpUserData* pUserData = (ImpUserData*)m_pCheckLB->FirstSelected()->GetUserData(); + ImpUserData* pUserData = static_cast<ImpUserData*>(m_pCheckLB->FirstSelected()->GetUserData()); pMapDlg->SetCharFont(*pUserData->pFont); pMapDlg->SetChar( (*pUserData->pString)[0] ); if(RET_OK == pMapDlg->Execute()) commit acf245c0e83c1039becc84cb59e534bdb78d98d6 Author: Noel Grandin <n...@peralex.com> Date: Tue Apr 14 15:20:19 2015 +0200 wrap dialog subclass in ScopedVclPtrInstance Change-Id: I79b982ffa121cc38c467f79bd56d498abd4f8cac diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 16edfe7..53b1ee2 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -836,12 +836,10 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl) // Unlike the mpCertPathDlg, we *don't* keep the same dialog object around between // invocations. Seems clearer to my little brain that way. - TSAURLsDialog* pTSAURLsDlg = new TSAURLsDialog(this); + ScopedVclPtrInstance<TSAURLsDialog> pTSAURLsDlg(this); pTSAURLsDlg->Execute(); - delete pTSAURLsDlg; - return 0; } commit d320bc8a6fa60bf28d80fd7b76a94134c64abdd6 Author: Noel Grandin <n...@peralex.com> Date: Tue Apr 14 15:14:36 2015 +0200 calling static member function through member call syntax Change-Id: I29e8faa03f668a7471b47e7aca3c2400f034c3b6 diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 8505061..43d1be3 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -243,7 +243,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, SbMethod* pMethod = NULL; ScopedVclPtrInstance< MacroChooser > pChooser( nullptr, true ); - if ( bChooseOnly || !SvtModuleOptions().IsBasicIDE() ) + if ( bChooseOnly || !SvtModuleOptions::IsBasicIDE() ) pChooser->SetMode(MacroChooser::ChooseOnly); if ( !bChooseOnly && rxLimitToDocument.is() ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits