From 93ddb2cc0bedac9a97260826741f7dfcdca0947d Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 26 Mar 2015 12:54:04 +0200
Subject: convert BUTTON_ constants to enum class

Change-Id: I0fd391a6b2850e5d7dcbf2cb95cfa39ee5561bd9
---
 uui/source/alreadyopen.cxx | 4 ++--
 uui/source/filechanged.cxx | 2 +-
 uui/source/lockfailed.cxx  | 4 ++--
 uui/source/openlocked.cxx  | 2 +-
 uui/source/trylater.cxx    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'uui')

diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index e53a9b3759ea..d5cf01b0ff02 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -32,14 +32,14 @@ AlreadyOpenQueryBox::AlreadyOpenQueryBox( vcl::Window* pParent, ResMgr* pResMgr,
         AddButton( ResId(STR_ALREADYOPEN_RETRY_SAVE_BTN, *pResMgr).toString(), RET_YES,
                 BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
         AddButton( ResId(STR_ALREADYOPEN_SAVE_BTN, *pResMgr).toString(), RET_NO, 0 );
-        AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+        AddButton( StandardButtonType::CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
     }
     else
     {
         AddButton( ResId(STR_ALREADYOPEN_READONLY_BTN, *pResMgr).toString(), RET_YES,
                 BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
         AddButton( ResId(STR_ALREADYOPEN_OPEN_BTN, *pResMgr).toString(), RET_NO, 0 );
-        AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+        AddButton( StandardButtonType::CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
     }
 
     SetButtonHelpText( RET_YES, OUString() );
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 0a4bd33c582e..5ab63f708293 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -29,7 +29,7 @@ FileChangedQueryBox::FileChangedQueryBox( vcl::Window* pParent, ResMgr* pResMgr
 
     AddButton(ResId(STR_FILECHANGED_SAVEANYWAY_BTN, *pResMgr).toString(), RET_YES,
             BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON);
-    AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+    AddButton( StandardButtonType::CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
 
     SetButtonHelpText( RET_YES, OUString() );
     SetMessText(ResId(STR_FILECHANGED_MSG, *pResMgr).toString());
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 48c4f23a935d..aa75130525eb 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -29,8 +29,8 @@ LockFailedQueryBox::LockFailedQueryBox( vcl::Window* pParent, ResMgr* pResMgr )
 {
     SetImage( ErrorBox::GetStandardImage() );
 
-    AddButton( BUTTON_OK, RET_OK, BUTTONDIALOG_OKBUTTON );
-    AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+    AddButton( StandardButtonType::OK, RET_OK, BUTTONDIALOG_OKBUTTON );
+    AddButton( StandardButtonType::CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
 
     SetMessText(ResId(STR_LOCKFAILED_MSG, *pResMgr ).toString());
     SetCheckBoxText(ResId(STR_LOCKFAILED_DONTSHOWAGAIN, *pResMgr).toString());
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index b4f7ee594f12..a1618bb7ff91 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -32,7 +32,7 @@ OpenLockedQueryBox::OpenLockedQueryBox( vcl::Window* pParent, ResMgr* pResMgr, c
 
     AddButton(ResId(STR_OPENLOCKED_OPENCOPY_BTN, *pResMgr).toString(), RET_NO, 0);
 
-    AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+    AddButton( StandardButtonType::CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
     SetButtonHelpText( RET_YES, OUString() );
     SetButtonHelpText( RET_NO, OUString() );
 
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 8c1c5705b2d4..1446397e0d19 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
@@ -30,7 +30,7 @@ TryLaterQueryBox::TryLaterQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const
     AddButton(ResId(STR_TRYLATER_RETRYSAVING_BTN, *pResMgr).toString(), RET_YES,
             BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON);
     AddButton(ResId(STR_TRYLATER_SAVEAS_BTN, *pResMgr).toString(), RET_NO, 0);
-    AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+    AddButton( StandardButtonType::CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
 
     SetButtonHelpText( RET_YES, OUString() );
     SetButtonHelpText( RET_NO, OUString() );
-- 
cgit