diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-04-17 09:37:31 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-04-25 23:27:56 +0200 |
| commit | 41f5c11c3b5f5b57f480dd809b850fe563b53691 (patch) | |
| tree | df139718c1c5249de728e697b6aea74152874fe0 /sc/source | |
| parent | c67a0d0f7ddd8ababa3197d86998979c1ce725d0 (diff) | |
vcl: change ErrorHandlerFlags to DialogMask
Change-Id: I1959ac97f679d8d719f851f9869962b39a20ded9
Reviewed-on: https://gerrit.libreoffice.org/36841
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/xml/xmlwrap.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh8.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 5805a6e0498c..8c6cd1b00bc3 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -221,13 +221,13 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo (bMustBeSuccessfull ? SCERR_IMPORT_FILE_ROWCOL : SCWARN_IMPORT_FILE_ROWCOL), sDocName, sErr, - ErrorHandlerFlags::ButtonsOk | ErrorHandlerFlags::MessageError ); + DialogMask::ButtonsOk | DialogMask::MessageError ); } else { OSL_ENSURE( bMustBeSuccessfull, "Warnings are not supported" ); nReturn = *new StringErrorInfo( SCERR_IMPORT_FORMAT_ROWCOL, sErr, - ErrorHandlerFlags::ButtonsOk | ErrorHandlerFlags::MessageError ); + DialogMask::ButtonsOk | DialogMask::MessageError ); } } } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index bfb3edd65290..fec3e7f473bf 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2463,7 +2463,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) SetError(*new StringErrorInfo( SCWARN_EXPORT_NONCONVERTIBLE_CHARS, aImExport.GetNonConvertibleChars(), - ErrorHandlerFlags::ButtonsOk | ErrorHandlerFlags::MessageInfo)); + DialogMask::ButtonsOk | DialogMask::MessageInfo)); } } } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 586f48e3967a..725a8b906649 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -1091,10 +1091,10 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi OUString sEncoding( SvxTextEncodingTable().GetTextString( eCharSet)); nErr = *new TwoStringErrorInfo( (bEncErr ? SCERR_EXPORT_ENCODING : SCERR_EXPORT_FIELDWIDTH), sPosition, sEncoding, - ErrorHandlerFlags::ButtonsOk | ErrorHandlerFlags::MessageError); + DialogMask::ButtonsOk | DialogMask::MessageError); } else if ( !aException.Message.isEmpty() ) - nErr = *new StringErrorInfo( SCERR_EXPORT_SQLEXCEPTION, aException.Message, ErrorHandlerFlags::ButtonsOk | ErrorHandlerFlags::MessageError); + nErr = *new StringErrorInfo( SCERR_EXPORT_SQLEXCEPTION, aException.Message, DialogMask::ButtonsOk | DialogMask::MessageError); else nErr = SCERR_EXPORT_DATA; } |