include/xmloff/txtimp.hxx | 1 -
xmloff/source/core/xmltkmap.cxx | 12 +++++++++---
xmloff/source/text/XMLTextFrameContext.cxx | 6 +-----
xmloff/source/text/txtimp.cxx | 1 -
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit e628b94ccf062c2f3161acef11012ae2f5fbc5a3
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Sep 10 10:36:59 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Sep 11 14:35:23 2020 +0200
remove duplicate XML_TOK_TEXT_FRAME_FILTER_NAME
which has been there ever since
commit fd069bee7e57ad529c3c0974559fd2d84ec3151a
Date: Mon Sep 18 16:07:07 2000 +0000
initial import
And add assert to prevent more duplicates
Change-Id: I371a117896c1ab36fabf69da41229a7bcf5459d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102366
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 0eb09e6f580c..f2585b4259eb 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -291,7 +291,6 @@ enum XMLTextFrameAttrTokens
XML_TOK_TEXT_FRAME_REL_HEIGHT,
XML_TOK_TEXT_FRAME_NEXT_CHAIN_NAME,
XML_TOK_TEXT_FRAME_HREF,
- XML_TOK_TEXT_FRAME_FILTER_NAME,
XML_TOK_TEXT_FRAME_Z_INDEX,
XML_TOK_TEXT_FRAME_TRANSFORM,
XML_TOK_TEXT_FRAME_CLASS_ID,
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index d89eb9621638..bf61a37488f4 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -52,10 +52,16 @@ public:
void SvXMLTokenMap_Impl::insert( const SvXMLTokenMapEntry& rEntry )
{
- m_aPrefixAndNameToTokenMap.insert( std::make_pair( std::make_pair(
rEntry.nPrefixKey,
- GetXMLToken( rEntry.eLocalName ) ),
rEntry.nToken ) );
+ bool inserted = m_aPrefixAndNameToTokenMap.insert( std::make_pair(
std::make_pair( rEntry.nPrefixKey,
+ GetXMLToken( rEntry.eLocalName ) ),
rEntry.nToken ) ).second;
+ assert(inserted && "duplicate token");
+ (void)inserted;
if( rEntry.nFastToken )
- m_aFastTokenToTokenMap.insert( std::make_pair( rEntry.nFastToken,
rEntry.nToken ) );
+ {
+ bool inserted2 = m_aFastTokenToTokenMap.insert( std::make_pair(
rEntry.nFastToken, rEntry.nToken ) ).second;
+ assert(inserted2 && "duplicate token");
+ (void)inserted2;
+ }
}
sal_uInt16 SvXMLTokenMap_Impl::get( sal_uInt16 nKeyPrefix, const OUString&
rLName ) const
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index 58988bae259c..7ab210dbd938 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -355,7 +355,6 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext
OUString sStyleName;
OUString sNextName;
OUString sHRef;
- OUString sFilterName;
OUString sCode;
OUString sMimeType;
OUString sFrameName;
@@ -689,7 +688,7 @@ void XMLTextFrameContext_Impl::Create()
xPropSet->setPropertyValue("Graphic", Any(xGraphic));
// filter name
- xPropSet->setPropertyValue( "GraphicFilter", Any(sFilterName) );
+ xPropSet->setPropertyValue( "GraphicFilter", Any(OUString()) );
// rotation
xPropSet->setPropertyValue( "GraphicRotation", Any(nRotation) );
@@ -1015,9 +1014,6 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
case XML_TOK_TEXT_FRAME_HREF:
sHRef = rValue;
break;
- case XML_TOK_TEXT_FRAME_FILTER_NAME:
- sFilterName = rValue;
- break;
case XML_TOK_TEXT_FRAME_TRANSFORM:
{
// RotateFlyFrameFix: im/export full 'draw:transform' using
existing tooling
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 73e6b61d853d..75e73c899171 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -372,7 +372,6 @@ const SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
{ XML_NAMESPACE_STYLE, XML_REL_HEIGHT, XML_TOK_TEXT_FRAME_REL_HEIGHT },
{ XML_NAMESPACE_DRAW, XML_CHAIN_NEXT_NAME,
XML_TOK_TEXT_FRAME_NEXT_CHAIN_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_FRAME_HREF },
- { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_FILTER_NAME },
{ XML_NAMESPACE_DRAW, XML_ZINDEX, XML_TOK_TEXT_FRAME_Z_INDEX },
{ XML_NAMESPACE_DRAW, XML_TRANSFORM, XML_TOK_TEXT_FRAME_TRANSFORM },
{ XML_NAMESPACE_DRAW, XML_CLASS_ID, XML_TOK_TEXT_FRAME_CLASS_ID },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
