editeng/source/editeng/eehtml.cxx | 4 ++--
include/svtools/htmlkywd.hxx | 2 +-
include/svtools/htmltokn.h | 4 ++--
sc/source/filter/html/htmlpars.cxx | 4 ++--
svtools/source/svhtml/htmlkywd.cxx | 2 +-
svtools/source/svhtml/parhtml.cxx | 4 ++--
sw/inc/poolfmt.hxx | 2 +-
sw/inc/strings.hrc | 2 +-
sw/source/core/doc/DocumentStylePoolManager.cxx | 4 ++--
sw/source/filter/html/css1atr.cxx | 10 +++++-----
sw/source/filter/html/htmlcss1.cxx | 2 +-
sw/source/filter/html/swhtml.cxx | 4 ++--
12 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 585b0a39d7170ef30d0a1d03601e008613df9807
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Wed Jan 6 12:46:45 2021 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Tue Feb 2 00:57:00 2021 +0100
Fix typo in code
As per request in comments here:
https://gerrit.libreoffice.org/c/core/+/108661
I don't remember if it was already corrected and rejected.
Anyway, this is massive and it compiles on my laptop.
Let's see adding devs.
Thanks a lot to Seth!
Change-Id: I27d1fe1dccecd6644304fc6c3c2feb8413598285
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108816
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/editeng/source/editeng/eehtml.cxx
b/editeng/source/editeng/eehtml.cxx
index ea38d05d290d..d83b5410d14f 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -370,8 +370,8 @@ void EditHTMLParser::NextToken( HtmlTokenId nToken )
case HtmlTokenId::ADDRESS_OFF:
// case HtmlTokenId::BLOCKQUOTE_ON: //! special handling
// case HtmlTokenId::BLOCKQUOTE_OFF:
- case HtmlTokenId::CITIATION_ON:
- case HtmlTokenId::CITIATION_OFF:
+ case HtmlTokenId::CITATION_ON:
+ case HtmlTokenId::CITATION_OFF:
case HtmlTokenId::CODE_ON:
case HtmlTokenId::CODE_OFF:
case HtmlTokenId::DEFINSTANCE_ON:
diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 1594dbc6b829..24133bd159cd 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -61,7 +61,7 @@
#define OOO_STRING_SVTOOLS_HTML_bold "b"
#define OOO_STRING_SVTOOLS_HTML_caption "caption"
#define OOO_STRING_SVTOOLS_HTML_center "center"
-#define OOO_STRING_SVTOOLS_HTML_citiation "cite"
+#define OOO_STRING_SVTOOLS_HTML_citation "cite"
#define OOO_STRING_SVTOOLS_HTML_code "code"
#define OOO_STRING_SVTOOLS_HTML_col "col"
#define OOO_STRING_SVTOOLS_HTML_colgroup "colgroup"
diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h
index c4acf8dbeef7..ea27faa89471 100644
--- a/include/svtools/htmltokn.h
+++ b/include/svtools/htmltokn.h
@@ -108,8 +108,8 @@ enum class HtmlTokenId : sal_Int16
CAPTION_OFF, // HTML 3.0
CENTER_ON, // Netscape
CENTER_OFF, // Netscape
- CITIATION_ON,
- CITIATION_OFF,
+ CITATION_ON,
+ CITATION_OFF,
CODE_ON,
CODE_OFF,
COL_ON, // HTML3 Table Model Draft
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index 13b00a60bb30..f922bb21b86d 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1599,7 +1599,7 @@ void ScHTMLLayoutParser::ProcToken( HtmlImportInfo* pInfo
)
case HtmlTokenId::ADDRESS_ON :
case HtmlTokenId::BLOCKQUOTE_ON :
case HtmlTokenId::BLOCKQUOTE30_ON :
- case HtmlTokenId::CITIATION_ON :
+ case HtmlTokenId::CITATION_ON :
case HtmlTokenId::VARIABLE_ON :
{
if ( IsAtBeginningOfText( pInfo ) )
@@ -2878,7 +2878,7 @@ void ScHTMLQueryParser::ProcessToken( const
HtmlImportInfo& rInfo )
case HtmlTokenId::ADDRESS_ON: // <address>
case HtmlTokenId::BLOCKQUOTE_ON: // <blockquote>
case HtmlTokenId::BLOCKQUOTE30_ON: // <bq>
- case HtmlTokenId::CITIATION_ON: // <cite>
+ case HtmlTokenId::CITATION_ON: // <cite>
case HtmlTokenId::VARIABLE_ON: // <var>
mpCurrTable->PutItem( SvxPostureItem( ITALIC_NORMAL,
ATTR_FONT_POSTURE ) );
break;
diff --git a/svtools/source/svhtml/htmlkywd.cxx
b/svtools/source/svhtml/htmlkywd.cxx
index 482bfab5e611..1873b8ee186a 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -82,7 +82,7 @@ HTML_TokenEntry const aHTMLTokenTab[] = {
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_linebreak),
HtmlTokenId::LINEBREAK},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_caption),
HtmlTokenId::CAPTION_ON}, // HTML 3.0
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_center),
HtmlTokenId::CENTER_ON}, // Netscape
- {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_citiation),
HtmlTokenId::CITIATION_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_citation),
HtmlTokenId::CITATION_ON},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_code),
HtmlTokenId::CODE_ON},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_col),
HtmlTokenId::COL_ON}, // HTML 3 Table Model Draft
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_colgroup),
HtmlTokenId::COLGROUP_ON}, // HTML 3 Table Model Draft
diff --git a/svtools/source/svhtml/parhtml.cxx
b/svtools/source/svhtml/parhtml.cxx
index be66cc8b6ac8..6796c6ca8738 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1714,8 +1714,8 @@ HtmlTokenId HTMLParser::FilterPRE( HtmlTokenId nToken )
case HtmlTokenId::EMPHASIS_ON:
case HtmlTokenId::EMPHASIS_OFF:
- case HtmlTokenId::CITIATION_ON:
- case HtmlTokenId::CITIATION_OFF:
+ case HtmlTokenId::CITATION_ON:
+ case HtmlTokenId::CITATION_OFF:
case HtmlTokenId::STRONG_ON:
case HtmlTokenId::STRONG_OFF:
case HtmlTokenId::CODE_ON:
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 31cb1dfa2c49..56f787d5e46a 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -133,7 +133,7 @@ RES_POOLCHR_NORMAL_END,
RES_POOLCHR_HTML_BEGIN = RES_POOLCHR_BEGIN + 50, ///< HTML-styles.
RES_POOLCHR_HTML_EMPHASIS = RES_POOLCHR_HTML_BEGIN,
-RES_POOLCHR_HTML_CITIATION,
+RES_POOLCHR_HTML_CITATION,
RES_POOLCHR_HTML_STRONG,
RES_POOLCHR_HTML_CODE,
RES_POOLCHR_HTML_SAMPLE,
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 5b0497593442..56e7ab0473ba 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -44,7 +44,7 @@
#define STR_POOLCHR_VERT_NUM NC_("STR_POOLCHR_VERT_NUM",
"Vertical Numbering Symbols")
// Drawing templates for HTML
#define STR_POOLCHR_HTML_EMPHASIS
NC_("STR_POOLCHR_HTML_EMPHASIS", "Emphasis")
-#define STR_POOLCHR_HTML_CITIATION
NC_("STR_POOLCHR_HTML_CITIATION", "Quotation")
+#define STR_POOLCHR_HTML_CITATION
NC_("STR_POOLCHR_HTML_CITATION", "Quotation")
#define STR_POOLCHR_HTML_STRONG NC_("STR_POOLCHR_HTML_STRONG",
"Strong Emphasis")
#define STR_POOLCHR_HTML_CODE NC_("STR_POOLCHR_HTML_CODE",
"Source Text")
#define STR_POOLCHR_HTML_SAMPLE NC_("STR_POOLCHR_HTML_SAMPLE",
"Example")
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index a8da344f1e5e..b2f2b09e1b54 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -477,7 +477,7 @@ static const char* STR_POOLCHR_ARY[] =
static const char* STR_POOLCHR_HTML_ARY[] =
{
STR_POOLCHR_HTML_EMPHASIS,
- STR_POOLCHR_HTML_CITIATION,
+ STR_POOLCHR_HTML_CITATION,
STR_POOLCHR_HTML_STRONG,
STR_POOLCHR_HTML_CODE,
STR_POOLCHR_HTML_SAMPLE,
@@ -1581,7 +1581,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool(
sal_uInt16 nId )
break;
case RES_POOLCHR_HTML_EMPHASIS:
- case RES_POOLCHR_HTML_CITIATION:
+ case RES_POOLCHR_HTML_CITATION:
case RES_POOLCHR_HTML_VARIABLE:
{
SetAllScriptItem( aSet, SvxPostureItem( ITALIC_NORMAL,
RES_CHRATR_POSTURE) );
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index e0c2f9fb8021..b2515833eba7 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -663,10 +663,10 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFormat
*pFormat, OString& rTok
rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_blockquote);
}
- else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_citiation)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_citation)
{
- rRefPoolId = RES_POOLCHR_HTML_CITIATION;
- rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation);
+ rRefPoolId = RES_POOLCHR_HTML_CITATION;
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_citation);
}
else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_code)
{
@@ -856,8 +856,8 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFormat
*pFormat, OString& rTok
case RES_POOLCHR_HTML_EMPHASIS:
rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis);
break;
- case RES_POOLCHR_HTML_CITIATION:
- rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation);
+ case RES_POOLCHR_HTML_CITATION:
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_citation);
break;
case RES_POOLCHR_HTML_STRONG:
rToken = OString(OOO_STRING_SVTOOLS_HTML_strong);
diff --git a/sw/source/filter/html/htmlcss1.cxx
b/sw/source/filter/html/htmlcss1.cxx
index 2560ef45bb8d..3f06fd00321b 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1131,7 +1131,7 @@ SwCharFormat* SwCSS1Parser::GetChrFormat( HtmlTokenId
nToken2, const OUString& r
switch( nToken2 )
{
case HtmlTokenId::EMPHASIS_ON: nPoolId = RES_POOLCHR_HTML_EMPHASIS;
break;
- case HtmlTokenId::CITIATION_ON: nPoolId = RES_POOLCHR_HTML_CITIATION;
break;
+ case HtmlTokenId::CITATION_ON: nPoolId = RES_POOLCHR_HTML_CITATION;
break;
case HtmlTokenId::STRONG_ON: nPoolId = RES_POOLCHR_HTML_STRONG;
break;
case HtmlTokenId::CODE_ON: nPoolId = RES_POOLCHR_HTML_CODE;
break;
case HtmlTokenId::SAMPLE_ON: nPoolId = RES_POOLCHR_HTML_SAMPLE;
break;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index d0173d398fa9..231ad8443fce 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1909,7 +1909,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
break;
case HtmlTokenId::EMPHASIS_ON:
- case HtmlTokenId::CITIATION_ON:
+ case HtmlTokenId::CITATION_ON:
case HtmlTokenId::STRONG_ON:
case HtmlTokenId::CODE_ON:
case HtmlTokenId::SAMPLE_ON:
@@ -1935,7 +1935,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
break;
case HtmlTokenId::EMPHASIS_OFF:
- case HtmlTokenId::CITIATION_OFF:
+ case HtmlTokenId::CITATION_OFF:
case HtmlTokenId::STRONG_OFF:
case HtmlTokenId::CODE_OFF:
case HtmlTokenId::SAMPLE_OFF:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
