diff options
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 12 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.hxx | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 7eeb05e0dee3..4fb689d2eb7a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -5871,6 +5871,18 @@ <value>true</value> </prop> </group> + <group oor:name="HTML"> + <info> + <desc>Contains settings for importing HTML.</desc> + </info> + <prop oor:name="IgnoreComments" oor:type="xs:boolean" oor:nillable="false"> + <info> + <desc>Specifies whether HTML comments should be ignored or imported as postits / annotations.</desc> + <label>Ignore HTML comments</label> + </info> + <value>false</value> + </prop> + </group> </group> </group> <group oor:name="Numbering"> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 3a165f897102..b0e9c2ce64a9 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -116,6 +116,7 @@ #include <sfx2/viewfrm.hxx> #include <svx/svdobj.hxx> +#include <officecfg/Office/Writer.hxx> #include <swerror.h> #include <hints.hxx> @@ -312,6 +313,10 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn, m_nTableDepth( 0 ), m_pTempViewFrame(nullptr) { + // If requested explicitly, then force ignoring of comments (don't create postits for them). + if (officecfg::Office::Writer::Filter::Import::HTML::IgnoreComments::get()) + m_bIgnoreHTMLComments = true; + m_nEventId = nullptr; m_bUpperSpace = m_bViewCreated = m_bChkJumpMark = false; diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 0d6a60932518..2f10550fef93 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -448,7 +448,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient bool m_bSelect : 1; bool m_bInFootEndNoteAnchor : 1; bool m_bInFootEndNoteSymbol : 1; - bool const m_bIgnoreHTMLComments : 1; + bool m_bIgnoreHTMLComments : 1; bool m_bRemoveHidden : 1; // the filter implementation might set the hidden flag bool m_bBodySeen : 1; |