Kaydet (Commit) 79c1b86e authored tarafından Caolán McNamara's avatar Caolán McNamara

MessageDialog isn't ready for this usage just yet

Change-Id: If6c886ac4115dd0a030660fd0147491815fa411a
üst 110ca044
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <vcl/layout.hxx> #include <vcl/msgbox.hxx>
#include <sot/storinfo.hxx> #include <sot/storinfo.hxx>
#include <moduldlg.hrc> #include <moduldlg.hrc>
...@@ -291,7 +291,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) ...@@ -291,7 +291,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
OUString aLibName = GetEntryText( pEntry, 0 ); OUString aLibName = GetEntryText( pEntry, 0 );
if ( aLibName.equalsIgnoreAsciiCase( "Standard" ) ) if ( aLibName.equalsIgnoreAsciiCase( "Standard" ) )
{ {
MessageDialog(this, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB)).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB) ).Execute();
return false; return false;
} }
...@@ -301,7 +301,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) ...@@ -301,7 +301,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) && !xModLibContainer->isLibraryLink( aLibName ) ) || if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) && !xModLibContainer->isLibraryLink( aLibName ) ) ||
( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) ) ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) )
{ {
MessageDialog(this, IDE_RESSTR(RID_STR_LIBISREADONLY)).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBISREADONLY) ).Execute();
return false; return false;
} }
...@@ -353,7 +353,7 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewNam ...@@ -353,7 +353,7 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewNam
} }
catch (const container::ElementExistException& ) catch (const container::ElementExistException& )
{ {
MessageDialog(this, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED)).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED) ).Execute();
return false; return false;
} }
catch (const container::NoSuchElementException& ) catch (const container::NoSuchElementException& )
...@@ -366,9 +366,9 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewNam ...@@ -366,9 +366,9 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewNam
if ( !bValid ) if ( !bValid )
{ {
if ( rNewName.getLength() > 30 ) if ( rNewName.getLength() > 30 )
MessageDialog(this, IDE_RESSTR(RID_STR_LIBNAMETOLONG)).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBNAMETOLONG) ).Execute();
else else
MessageDialog(this, IDE_RESSTR(RID_STR_BADSBXNAME)).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) ).Execute();
} }
return bValid; return bValid;
...@@ -384,7 +384,7 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler) ...@@ -384,7 +384,7 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
EndDialog(1); EndDialog(1);
else else
{ {
MessageDialog(this, IDE_RESSTR(RID_STR_BADSBXNAME)).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) ).Execute();
m_pEdit->GrabFocus(); m_pEdit->GrabFocus();
} }
return 0; return 0;
...@@ -868,7 +868,7 @@ void LibPage::InsertLib() ...@@ -868,7 +868,7 @@ void LibPage::InsertLib()
} }
if ( !pLibDlg ) if ( !pLibDlg )
MessageDialog(this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE), VCL_MESSAGE_INFO).Execute(); InfoBox( this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE) ).Execute();
else else
{ {
bool bChanges = false; bool bChanges = false;
...@@ -905,7 +905,7 @@ void LibPage::InsertLib() ...@@ -905,7 +905,7 @@ void LibPage::InsertLib()
// check, if the library is the Standard library // check, if the library is the Standard library
if ( aLibName == "Standard" ) if ( aLibName == "Standard" )
{ {
MessageDialog(this, IDE_RESSTR(RID_STR_REPLACESTDLIB)).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_REPLACESTDLIB) ).Execute();
continue; continue;
} }
...@@ -917,7 +917,7 @@ void LibPage::InsertLib() ...@@ -917,7 +917,7 @@ void LibPage::InsertLib()
aErrStr = aErrStr.replaceAll("XX", aLibName); aErrStr = aErrStr.replaceAll("XX", aLibName);
aErrStr += "\n"; aErrStr += "\n";
aErrStr += IDE_RESSTR(RID_STR_LIBISREADONLY); aErrStr += IDE_RESSTR(RID_STR_LIBISREADONLY);
MessageDialog(this, aErrStr).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
continue; continue;
} }
...@@ -934,7 +934,7 @@ void LibPage::InsertLib() ...@@ -934,7 +934,7 @@ void LibPage::InsertLib()
aErrStr = aErrStr.replaceAll("XX", aLibName); aErrStr = aErrStr.replaceAll("XX", aLibName);
aErrStr += "\n" ; aErrStr += "\n" ;
aErrStr += IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED); aErrStr += IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED);
MessageDialog(this, aErrStr).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
continue; continue;
} }
} }
...@@ -953,7 +953,7 @@ void LibPage::InsertLib() ...@@ -953,7 +953,7 @@ void LibPage::InsertLib()
{ {
OUString aErrStr( IDE_RESSTR(RID_STR_NOIMPORT) ); OUString aErrStr( IDE_RESSTR(RID_STR_NOIMPORT) );
aErrStr = aErrStr.replaceAll("XX", aLibName); aErrStr = aErrStr.replaceAll("XX", aLibName);
MessageDialog(this, aErrStr).Execute(); ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
continue; continue;
} }
} }
...@@ -1545,15 +1545,17 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, ...@@ -1545,15 +1545,17 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
if ( aLibName.getLength() > 30 ) if ( aLibName.getLength() > 30 )
{ {
MessageDialog(pWin, IDEResId(RID_STR_LIBNAMETOLONG).toString()).Execute(); ErrorBox( pWin, WB_OK | WB_DEF_OK, IDEResId(RID_STR_LIBNAMETOLONG).toString() ).Execute();
} }
else if ( !IsValidSbxName( aLibName ) ) else if ( !IsValidSbxName( aLibName ) )
{ {
MessageDialog(pWin, IDEResId(RID_STR_BADSBXNAME).toString()).Execute(); ErrorBox( pWin, WB_OK | WB_DEF_OK,
IDEResId(RID_STR_BADSBXNAME).toString() ).Execute();
} }
else if ( rDocument.hasLibrary( E_SCRIPTS, aLibName ) || rDocument.hasLibrary( E_DIALOGS, aLibName ) ) else if ( rDocument.hasLibrary( E_SCRIPTS, aLibName ) || rDocument.hasLibrary( E_DIALOGS, aLibName ) )
{ {
MessageDialog(pWin, IDEResId(RID_STR_SBXNAMEALLREADYUSED2).toString()).Execute(); ErrorBox( pWin, WB_OK | WB_DEF_OK,
IDEResId(RID_STR_SBXNAMEALLREADYUSED2).toString() ).Execute();
} }
else else
{ {
......
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