Kaydet (Commit) ce3441c2 authored tarafından Noel Grandin's avatar Noel Grandin

convert HelpProcessingErrorClass to scoped enum

and drop unused HELPPROCESSING_INTERNAL_ERROR enumerator

Change-Id: I0f2cf063a3f1472e1d52bab5039b1c3158d4865e
üst 1b9f6808
...@@ -159,6 +159,7 @@ for d in definitionSet: ...@@ -159,6 +159,7 @@ for d in definitionSet:
"sd/source/ui/dlg/PhotoAlbumDialog.hxx", # SlideImageLayout (from UI) "sd/source/ui/dlg/PhotoAlbumDialog.hxx", # SlideImageLayout (from UI)
"sd/inc/pres.hxx", # AutoLayout (from UI) "sd/inc/pres.hxx", # AutoLayout (from UI)
"sc/source/ui/inc/scuitphfedit.hxx", # ScHFEntryId (from UI) "sc/source/ui/inc/scuitphfedit.hxx", # ScHFEntryId (from UI)
"include/i18nlangtag/languagetag.hxx", # LanguageTag::ScriptType
# represents constants from an external API # represents constants from an external API
"opencl/inc/opencl_device_selection.h", "opencl/inc/opencl_device_selection.h",
"vcl/inc/sft.hxx", "vcl/inc/sft.hxx",
...@@ -166,6 +167,7 @@ for d in definitionSet: ...@@ -166,6 +167,7 @@ for d in definitionSet:
"vcl/unx/gtk/xid_fullscreen_on_all_monitors.c", "vcl/unx/gtk/xid_fullscreen_on_all_monitors.c",
"vcl/unx/gtk/salnativewidgets-gtk.cxx", "vcl/unx/gtk/salnativewidgets-gtk.cxx",
"sc/inc/callform.hxx", # ParamType "sc/inc/callform.hxx", # ParamType
"include/i18nlangtag/applelangid.hxx", # AppleLanguageId
]): ]):
continue continue
......
...@@ -486,9 +486,8 @@ void BackendImpl::implProcessHelp( ...@@ -486,9 +486,8 @@ void BackendImpl::implProcessHelp(
sal_uInt16 nErrStrId = 0; sal_uInt16 nErrStrId = 0;
switch( aErrorInfo.m_eErrorClass ) switch( aErrorInfo.m_eErrorClass )
{ {
case HELPPROCESSING_GENERAL_ERROR: case HelpProcessingErrorClass::General: nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break;
case HELPPROCESSING_INTERNAL_ERROR: nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break; case HelpProcessingErrorClass::XmlParsing: nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
case HELPPROCESSING_XMLPARSING_ERROR: nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
default: ; default: ;
}; };
......
...@@ -199,7 +199,7 @@ struct HelpProcessingException ...@@ -199,7 +199,7 @@ struct HelpProcessingException
, m_nXMLParsingLine( 0 ) , m_nXMLParsingLine( 0 )
{} {}
HelpProcessingException( const std::string& aErrorMsg, const std::string& aXMLParsingFile, int nXMLParsingLine ) HelpProcessingException( const std::string& aErrorMsg, const std::string& aXMLParsingFile, int nXMLParsingLine )
: m_eErrorClass( HELPPROCESSING_XMLPARSING_ERROR ) : m_eErrorClass( HelpProcessingErrorClass::XmlParsing )
, m_aErrorMsg( aErrorMsg ) , m_aErrorMsg( aErrorMsg )
, m_aXMLParsingFile( aXMLParsingFile ) , m_aXMLParsingFile( aXMLParsingFile )
, m_nXMLParsingLine( nXMLParsingLine ) , m_nXMLParsingLine( nXMLParsingLine )
......
...@@ -449,7 +449,7 @@ bool HelpCompiler::compile() ...@@ -449,7 +449,7 @@ bool HelpCompiler::compile()
{ {
std::stringstream aStrStream; std::stringstream aStrStream;
aStrStream << "ERROR: file not existing: " << inputFile.native_file_string().c_str() << std::endl; aStrStream << "ERROR: file not existing: " << inputFile.native_file_string().c_str() << std::endl;
throw HelpProcessingException( HELPPROCESSING_GENERAL_ERROR, aStrStream.str() ); throw HelpProcessingException( HelpProcessingErrorClass::General, aStrStream.str() );
} }
} }
......
...@@ -31,23 +31,22 @@ ...@@ -31,23 +31,22 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
enum HelpProcessingErrorClass enum class HelpProcessingErrorClass
{ {
HELPPROCESSING_NO_ERROR, NONE,
HELPPROCESSING_GENERAL_ERROR, // Missing files, options etc. General, // Missing files, options etc.
HELPPROCESSING_INTERNAL_ERROR, // Unexpected problems XmlParsing // Errors thrown by libxml
HELPPROCESSING_XMLPARSING_ERROR // Errors thrown by libxml
}; };
struct HelpProcessingErrorInfo struct HelpProcessingErrorInfo
{ {
HelpProcessingErrorClass m_eErrorClass; HelpProcessingErrorClass m_eErrorClass;
OUString m_aErrorMsg; OUString m_aErrorMsg;
OUString m_aXMLParsingFile; OUString m_aXMLParsingFile;
sal_Int32 m_nXMLParsingLine; sal_Int32 m_nXMLParsingLine;
HelpProcessingErrorInfo() HelpProcessingErrorInfo()
: m_eErrorClass( HELPPROCESSING_NO_ERROR ) : m_eErrorClass( HelpProcessingErrorClass::NONE )
, m_nXMLParsingLine( -1 ) , m_nXMLParsingLine( -1 )
{} {}
......
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