From dcc667ac5ef0d7b4bbdfba0727ef6e2be3ed5313 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 22 Aug 2017 11:11:44 +0200 Subject: convert message box style bits to scoped enum and fix harmless bug in ImpSVGDialog::ImpSVGDialog, which there since commit 6456f1d81090dd5fe44455c09ae3ede7ec6ac38a Date: Fri Feb 4 14:52:54 2011 +0100 ka102: added/removed files for SVG import and module cleanup Change-Id: I66b2ec2b029431ab453e54e962863e4ed7d78962 Reviewed-on: https://gerrit.libreoffice.org/41412 Tested-by: Jenkins Reviewed-by: Noel Grandin --- chart2/source/controller/dialogs/DataBrowser.cxx | 6 +++--- chart2/source/controller/dialogs/tp_Scale.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index b9ef8f7c6129..04f9218cebc0 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -131,7 +131,7 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt ) Edit::MouseButtonDown( rMEvt ); if( m_bShowWarningBox ) - ScopedVclPtrInstance(this, WinBits( WB_OK ), + ScopedVclPtrInstance(this, MessBoxStyle::Ok, SchResId(STR_INVALID_NUMBER))->Execute(); } @@ -752,13 +752,13 @@ void DataBrowser::MouseButtonDown( const BrowserMouseEvent& rEvt ) void DataBrowser::ShowWarningBox() { - ScopedVclPtrInstance(this, WinBits( WB_OK ), + ScopedVclPtrInstance(this, MessBoxStyle::Ok, SchResId(STR_INVALID_NUMBER))->Execute(); } bool DataBrowser::ShowQueryBox() { - ScopedVclPtrInstance pQueryBox(this, WB_YES_NO, SchResId(STR_DATA_EDITOR_INCORRECT_INPUT)); + ScopedVclPtrInstance pQueryBox(this, MessBoxStyle::YesNo, SchResId(STR_DATA_EDITOR_INCORRECT_INPUT)); return pQueryBox->Execute() == RET_YES; } diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index caaf1d7eb19b..6f72cfaf3f4d 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -614,7 +614,7 @@ bool ScaleTabPage::ShowWarning(const char* pResIdMessage, Control* pControl /* = if (pResIdMessage == nullptr) return false; - ScopedVclPtrInstance(this, WinBits( WB_OK ), SchResId(pResIdMessage))->Execute(); + ScopedVclPtrInstance(this, MessBoxStyle::Ok, SchResId(pResIdMessage))->Execute(); if( pControl ) { pControl->GrabFocus(); -- cgit