ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Add content mapping into XFastParser.

Browse Source 
Ideally this gets done for free in the parsing thread.

Change-Id: I2392fd51c8152c48cf03ac9ed26e6f62aa6ac4f8
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193626
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195191
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Michael Meeks
2025-12-08 09:42:21 +01:00
committed by Caolán McNamara
parent e4cf301a6b
commit d66a2686d0
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sax/source/fastparser/fastparser.cxx
+21 -8
View File
@@ -26,6 +26,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/container/XMap.hpp>
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
@@ -37,6 +38,7 @@
#include <sal/log.hxx>
#include <salhelper/thread.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <comphelper/string.hxx>
#include <o3tl/string_view.hxx>
#include <queue>
@@ -271,6 +273,7 @@ public:
void produce( bool bForceFlush = false );
bool m_bIgnoreMissingNSDecl;
bool m_bDisableThreadedParser;
css::uno::Reference<css::container::XMap> mxMap; /// _ prefix string mapper for translation
private:
bool consume(EventList&);
@@ -1360,6 +1363,10 @@ void FastSaxParserImpl::sendPendingCharacters()
{
Entity& rEntity = getEntity();
OUString sChars( pendingCharacters.data(), pendingCharacters.size(), RTL_TEXTENCODING_UTF8 );
if (sChars[0] == '_' && mxMap)
mxMap->get(uno::Any(sChars)) >>= sChars;
if (rEntity.mbEnableThreads)
{
Event& rEvent = rEntity.getEvent( CallbackType::CHARACTERS );
@@ -1463,15 +1470,21 @@ FastSaxParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments)
if ( !(rArguments[0] >>= str) )
throw IllegalArgumentException();
if ( str == "IgnoreMissingNSDecl" )
mpImpl->m_bIgnoreMissingNSDecl = true;
else if ( str == "DoSmeplease" )
; //just ignore as this is already immune to billion laughs
else if ( str == "DisableThreadedParser" )
mpImpl->m_bDisableThreadedParser = true;
else
throw IllegalArgumentException();
auto opts = comphelper::string::split(str, ',');
for (auto &s : opts)
{
if ( s == "IgnoreMissingNSDecl" )
mpImpl->m_bIgnoreMissingNSDecl = true;
else if ( s == "DoSmeplease" )
; //just ignore as this is already immune to billion laughs
else if ( s == "DisableThreadedParser" )
mpImpl->m_bDisableThreadedParser = true;
else
throw IllegalArgumentException();
}
if (rArguments.size() > 1)
rArguments[1] >>= mpImpl->mxMap;
}
void FastSaxParser::parseStream( const xml::sax::InputSource& aInputSource )