diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-22 09:20:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-22 09:20:01 +0100 |
| commit | f10e4157ce6c134bb9561b7b48254c2c566726eb (patch) | |
| tree | 418b130ad362ae237ef1586681b48c1f5e3bc8dc | |
| parent | QueryBox DLG_SPECIAL_FORCED -> MessageDialog + string (diff) | |
| download | core-f10e4157ce6c134bb9561b7b48254c2c566726eb.tar.gz core-f10e4157ce6c134bb9561b7b48254c2c566726eb.zip | |
QueryBox QB_CONNECT -> MessageDialog + string
Change-Id: I593527c365ad6925229a3dd7d9e1c589fc4e34a5
| -rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/dialog/regionsw.hrc | 2 | ||||
| -rw-r--r-- | sw/source/uibase/dialog/regionsw.src | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 31b53dae3788..14e078f78bfe 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -23,7 +23,6 @@ #include <svl/PasswordHelper.hxx> #include <vcl/svapp.hxx> #include <vcl/layout.hxx> -#include <vcl/msgbox.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include <sfx2/passwd.hxx> @@ -961,7 +960,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) bool bContent = pSectRepr->IsContent(); if( pBox->IsChecked() && bContent && rSh.HasSelection() ) { - if( RET_NO == QueryBox( this, SW_RES(QB_CONNECT) ).Execute() ) + if (RET_NO == MessageDialog(this, SW_RES(STR_QUERY_CONNECT), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute()) pBox->Check( false ); } if( bFile ) @@ -1709,7 +1708,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) if( pBox->IsChecked() ) { if( m_pWrtSh->HasSelection() && - RET_NO == QueryBox( this, SW_RES(QB_CONNECT) ).Execute() ) + RET_NO == MessageDialog(this, SW_RES(STR_QUERY_CONNECT), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute()) pBox->Check( false ); } diff --git a/sw/source/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc index bc7f18895ffe..44f327cb7722 100644 --- a/sw/source/uibase/dialog/regionsw.hrc +++ b/sw/source/uibase/dialog/regionsw.hrc @@ -27,7 +27,7 @@ #define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6) #define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7) -#define QB_CONNECT (RC_REGIONSW_BEGIN+10) +#define STR_QUERY_CONNECT (RC_REGIONSW_BEGIN+10) #define STR_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) #define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src index 65b45b189375..1e99ba9bf5df 100644 --- a/sw/source/uibase/dialog/regionsw.src +++ b/sw/source/uibase/dialog/regionsw.src @@ -47,11 +47,9 @@ String STR_INFO_DUPLICATE { Text [ en-US ] = "Duplicate section name" ; }; -QueryBox QB_CONNECT +String STR_QUERY_CONNECT { - Buttons = WB_YES_NO ; - DefButton = WB_DEF_NO ; - Message [ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ; + Text[ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ; }; String STR_WRONG_PASSWORD { |