diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-18 11:34:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-19 09:05:58 +0200 |
| commit | cdbe8a8700d5460e41d80b00310c6ff8977bc492 (patch) | |
| tree | fb8f92ea13ccffad72894770ff75c8e8abc2a6c7 /basctl | |
| parent | 618baf4c5b40f19be6e47e1384fbc7a6b7610416 (diff) | |
loplugin:constantparam
and tweak the plugin to handle a crash seen with clang-9
Change-Id: Ie1ccf80c16a20dbca58e5bd081af13f75cf5ac8f
Reviewed-on: https://gerrit.libreoffice.org/75850
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basobj2.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/basicide/macrodlg.cxx | 5 | ||||
| -rw-r--r-- | basctl/source/basicide/macrodlg.hxx | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 29c1ff6d5598..4131f7a6453d 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -249,7 +249,7 @@ OUString ChooseMacro(weld::Window* pParent, OUString aScriptURL; SbMethod* pMethod = nullptr; - MacroChooser aChooser(pParent, xDocFrame, true); + MacroChooser aChooser(pParent, xDocFrame); if ( bChooseOnly || !SvtModuleOptions::IsBasicIDE() ) aChooser.SetMode(MacroChooser::ChooseOnly); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 019a87801ad7..1c0b620d42ff 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -52,7 +52,7 @@ using std::map; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -MacroChooser::MacroChooser(weld::Window* pParnt, const Reference< frame::XFrame >& xDocFrame, bool bCreateEntries) +MacroChooser::MacroChooser(weld::Window* pParnt, const Reference< frame::XFrame >& xDocFrame) : SfxDialogController(pParnt, "modules/BasicIDE/ui/basicmacrodialog.ui", "BasicMacroDialog") , m_xDocumentFrame(xDocFrame) // the Sfx doesn't ask the BasicManager whether modified or not @@ -109,8 +109,7 @@ MacroChooser::MacroChooser(weld::Window* pParnt, const Reference< frame::XFrame if (SfxDispatcher* pDispatcher = GetDispatcher()) pDispatcher->Execute( SID_BASICIDE_STOREALLMODULESOURCES ); - if (bCreateEntries) - m_xBasicBox->ScanAllEntries(); + m_xBasicBox->ScanAllEntries(); } MacroChooser::~MacroChooser() diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index ceacc143c890..9ab71acc13fa 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -89,7 +89,7 @@ private: std::unique_ptr<weld::Button> m_xNewLibButton; std::unique_ptr<weld::Button> m_xNewModButton; public: - MacroChooser(weld::Window *pParent, const ::css::uno::Reference< ::css::frame::XFrame >& xDocFrame, bool bCreateEntries); + MacroChooser(weld::Window *pParent, const ::css::uno::Reference< ::css::frame::XFrame >& xDocFrame); virtual ~MacroChooser() override; SbMethod* GetMacro(); |