summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-03-06 09:30:34 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-03-06 09:52:04 +0200
commit1cbef3eb084b78734165f79854b58afc860bac1c (patch)
tree748b1262b62a1c43b58fc8f6a75246b0a58a389d /sw
parent24ae6e86671c0729a6a6ea7da86b262b4fdd1c0f (diff)
convert HTMLScriptLanguage to scoped enum
Change-Id: If87863b520da704410a6ad261330bbde7ef8008c
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/html/htmlbas.cxx4
-rw-r--r--sw/source/filter/html/swhtml.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 539c07dd5c27..f2b0e98e8a8d 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -77,7 +77,7 @@ void SwHTMLParser::EndScript()
switch( m_eScriptLang )
{
- case HTML_SL_STARBASIC:
+ case HTMLScriptLanguage::StarBasic:
bInsIntoBasic = true;
break;
default:
@@ -184,7 +184,7 @@ void SwHTMLParser::AddScriptSource()
{
// We'll just remember a few strings here
if( aToken.getLength() > 2 &&
- (HTML_SL_STARBASIC==m_eScriptLang && aToken[ 0 ] == '\'') )
+ (HTMLScriptLanguage::StarBasic==m_eScriptLang && aToken[ 0 ] == '\'') )
{
sal_Int32 nPos = -1;
if( m_aBasicLib.isEmpty() )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 95fb0b6163a4..e835bc70d568 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -301,7 +301,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn,
m_nEventId = nullptr;
m_bUpperSpace = m_bViewCreated = m_bChkJumpMark = false;
- m_eScriptLang = HTML_SL_UNKNOWN;
+ m_eScriptLang = HTMLScriptLanguage::Unknown;
rCursor.DeleteMark();
m_pPam = &rCursor; // re-use existing cursor: avoids spurious ~SwIndexReg assert