Skip to content

C
core
Kaydet (Commit) f10e4157 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

QueryBox QB_CONNECT -> MessageDialog + string 

Change-Id: I593527c365ad6925229a3dd7d9e1c589fc4e34a5
üst d2fa1d55
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
sw/source/ui/dialog/uiregionsw.cxx
Dosyayı görüntüle @ f10e4157
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <svl/PasswordHelper.hxx> #include <svl/PasswordHelper.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
#include <svl/eitem.hxx> #include <svl/eitem.hxx>
#include <sfx2/passwd.hxx> #include <sfx2/passwd.hxx>
...@@ -961,7 +960,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) ...@@ -961,7 +960,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
bool bContent = pSectRepr->IsContent(); bool bContent = pSectRepr->IsContent();
if( pBox->IsChecked() && bContent && rSh.HasSelection() ) 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 ); pBox->Check( false );
} }
if( bFile ) if( bFile )
...@@ -1709,7 +1708,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) ...@@ -1709,7 +1708,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
if( pBox->IsChecked() ) if( pBox->IsChecked() )
{ {
if( m_pWrtSh->HasSelection() && 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 ); pBox->Check( false );
} }
......
sw/source/uibase/dialog/regionsw.hrc
Dosyayı görüntüle @ f10e4157
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6) #define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6)
#define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7) #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_PASSWORD (RC_REGIONSW_BEGIN+11)
#define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) #define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12)
......
sw/source/uibase/dialog/regionsw.src
Dosyayı görüntüle @ f10e4157
...@@ -47,11 +47,9 @@ String STR_INFO_DUPLICATE ...@@ -47,11 +47,9 @@ String STR_INFO_DUPLICATE
{ {
Text [ en-US ] = "Duplicate section name" ; Text [ en-US ] = "Duplicate section name" ;
}; };
QueryBox QB_CONNECT String STR_QUERY_CONNECT
{ {
Buttons = WB_YES_NO ; Text[ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ;
DefButton = WB_DEF_NO ;
Message [ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ;
}; };
String STR_WRONG_PASSWORD String STR_WRONG_PASSWORD
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment