[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/frmedt/fetab.cxx |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 8d09cb5398d0a045e9514a72bd022fd1bc7942bc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 8 15:37:09 2018 +0100

    Resolves: tdf#117499 no ok button in info dialog
    
    Change-Id: I91e02403b11d87d89f7b488838a6c0dbfd932492
    Reviewed-on: https://gerrit.libreoffice.org/53990
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 0e04ad50b980..d5762593724c 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -178,7 +178,7 @@ void SwFEShell::InsertRow( sal_uInt16 nCnt, bool bBehind )
     {
         vcl::Window* pWin = GetWin();
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                        DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                        DialogMask::MessageInfo | DialogMask::ButtonsOk );
         return;
     }
 
@@ -218,7 +218,7 @@ void SwFEShell::InsertCol( sal_uInt16 nCnt, bool bBehind )
     {
         vcl::Window* pWin = GetWin();
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                        DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                        DialogMask::MessageInfo | DialogMask::ButtonsOk );
         return;
     }
 
@@ -228,7 +228,7 @@ void SwFEShell::InsertCol( sal_uInt16 nCnt, bool bBehind )
     {
         vcl::Window* pWin = GetWin();
         ErrorHandler::HandleError( ERR_TBLINSCOL_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                        DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                        DialogMask::MessageInfo | DialogMask::ButtonsOk );
         return;
     }
 
@@ -273,7 +273,7 @@ bool SwFEShell::DeleteCol()
     {
         vcl::Window* pWin = GetWin();
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                        DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                        DialogMask::MessageInfo | DialogMask::ButtonsOk );
         return false;
     }
 
@@ -325,7 +325,7 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
     {
         vcl::Window* pWin = GetWin();
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                        DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                        DialogMask::MessageInfo | DialogMask::ButtonsOk );
         return false;
     }
 
@@ -445,7 +445,7 @@ TableMergeErr SwFEShell::MergeTab()
         {
             vcl::Window* pWin = GetWin();
             ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                            DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                            DialogMask::MessageInfo | DialogMask::ButtonsOk );
         }
         else
         {
@@ -477,7 +477,7 @@ void SwFEShell::SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight )
     {
         vcl::Window* pWin = GetWin();
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                        DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                        DialogMask::MessageInfo | DialogMask::ButtonsOk );
         return;
     }
 
@@ -487,7 +487,7 @@ void SwFEShell::SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight )
     {
         vcl::Window* pWin = GetWin();
         ErrorHandler::HandleError( ERR_TBLSPLIT_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                        DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                        DialogMask::MessageInfo | DialogMask::ButtonsOk );
         return;
     }
     StartAllAction();
@@ -1281,7 +1281,7 @@ bool SwFEShell::DeleteTableSel()
     {
         vcl::Window* pWin = GetWin();
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                        DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                        DialogMask::MessageInfo | DialogMask::ButtonsOk );
         return false;
     }
 
@@ -2174,7 +2174,7 @@ void SwFEShell::SetColRowWidthHeight( TableChgWidthHeightType eType, sal_uInt16
     {
         vcl::Window* pWin = GetWin();
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR, pWin ? pWin->GetFrameWeld() : nullptr,
-                        DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
+                        DialogMask::MessageInfo | DialogMask::ButtonsOk );
         return;
     }