dbaccess/source/filter/xml/xmlColumn.cxx | 2 +-
dbaccess/source/filter/xml/xmlComponent.cxx | 2 +-
dbaccess/source/filter/xml/xmlConnectionResource.cxx | 2 +-
dbaccess/source/filter/xml/xmlDataSource.cxx | 2 +-
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 2 +-
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 2 +-
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 2 +-
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 2 +-
dbaccess/source/filter/xml/xmlLogin.cxx | 2 +-
dbaccess/source/filter/xml/xmlQuery.cxx | 2 +-
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 2 +-
dbaccess/source/filter/xml/xmlTable.cxx | 4 ++--
sc/source/filter/xml/xmltabi.cxx | 2 +-
starmath/source/mathmlimport.cxx | 14 +++++++-------
14 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 5079dc73cb7e2198ba77e5a6ac2758e9e1a8a370
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Apr 11 21:20:16 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Apr 12 08:50:47 2020 +0200
improve fastparser logging
so we print out the full namespace, which is quite handy when
tracking down attributes that are not being parsed.
Change-Id: I085d39b365d43c1a53a7c176b633ea38e6a7fb45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92064
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx
b/dbaccess/source/filter/xml/xmlColumn.cxx
index 4816ed62936c..fdd343555cdf 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -81,7 +81,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
m_sCellStyleName = sValue;
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
}
}
}
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx
b/dbaccess/source/filter/xml/xmlComponent.cxx
index 17cd09eaaef3..f6498108e529 100644
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@ -68,7 +68,7 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport
bAsTemplate = sValue == s_sTRUE;
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << "=" << aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
}
if ( !sHREF.isEmpty() && !sName.isEmpty() && _xParentContainer.is() )
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index 7c48b9a00a84..2df56f371f8c 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -69,7 +69,7 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter&
rImport,
aProperty.Name = "Actuate";
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
if ( !aProperty.Name.isEmpty() )
{
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx
b/dbaccess/source/filter/xml/xmlDataSource.cxx
index bc3d7c85e0a1..550a77eb0c16 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -150,7 +150,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
aProperty.Name = "JavaDriverClassPath";
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
if ( !aProperty.Name.isEmpty() )
{
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index a5e1c0af0a7d..8f5c0dec4376 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -74,7 +74,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
bFoundCharset = true;
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
if ( !aProperty.Name.isEmpty() )
{
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index dede8308877c..3432c33bbba7 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -83,7 +83,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter&
rImport
m_aSetting.Name = sValue;
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
}
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 79a0a91ac186..79fa94a4b2cc 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -80,7 +80,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter&
rImport,
sFileTypeExtension = sValue;
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
if ( !aProperty.Name.isEmpty() )
{
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 5781454fd36a..cf616cf7a46d 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -58,7 +58,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter&
rImport
sName = sValue;
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
}
if ( !sName.isEmpty() && _xParentContainer.is() )
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx
b/dbaccess/source/filter/xml/xmlLogin.cxx
index b3fe602ca38d..84a880ba1a19 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -95,7 +95,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
}
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
}
catch(const Exception&)
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx
b/dbaccess/source/filter/xml/xmlQuery.cxx
index 4b8f4fd6fbf8..cd52e183c08b 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -56,7 +56,7 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport
m_bEscapeProcessing = sValue == "true";
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
}
}
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index 6aed4122000d..992803c5ed94 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -65,7 +65,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
sDatabaseName = sValue;
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
}
}
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx
b/dbaccess/source/filter/xml/xmlTable.cxx
index 45685a8fe978..b728a88edaed 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -76,7 +76,7 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
m_bApplyOrder = sValue == "true";
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << "=" << aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
}
uno::Sequence<uno::Any> aArguments(comphelper::InitAnyPropertySequence(
@@ -221,7 +221,7 @@ void OXMLTable::fillAttributes(const uno::Reference<
XFastAttributeList > & _xAt
_rsTableName = sValue;
break;
default:
- SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
}
}
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 2d31ec749fee..deec843b3839 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -461,7 +461,7 @@ ScXMLTableProtectionContext::ScXMLTableProtectionContext(
bDeleteRows = IsXMLToken(aIter, XML_TRUE);
break;
default:
- SAL_WARN("sc", "unknown attribute: " << nToken);
+ SAL_WARN("sc", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(nToken) << "=" << aIter.toString());
}
}
}
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index f33fd934c0d4..ae0f4300d158 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -642,7 +642,7 @@ void SmXMLContext_Helper::RetrieveAttrs(const
uno::Reference<
bMvFound = true;
break;
default:
- SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
break;
}
}
@@ -780,7 +780,7 @@ void SmXMLTokenAttrHelper::RetrieveAttrs(const
uno::Reference<xml::sax::XFastAtt
mbMvFound = true;
break;
default:
- SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
break;
}
}
@@ -1092,7 +1092,7 @@ void SmXMLFencedContext_Impl::startFastElement(sal_Int32
/*nElement*/, const uno
cEnd = sValue[0];
break;
default:
- SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
/*Go to superclass*/
break;
}
@@ -1239,7 +1239,7 @@ void
SmXMLAnnotationContext_Impl::startFastElement(sal_Int32 /*nElement*/, const
bIsStarMath= sValue == "StarMath 5.0";
break;
default:
- SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
break;
}
}
@@ -1454,7 +1454,7 @@ void
SmXMLOperatorContext_Impl::startFastElement(sal_Int32 /*nElement*/, const u
bIsStretchy = sValue == GetXMLToken(XML_TRUE);
break;
default:
- SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
break;
}
}
@@ -1523,7 +1523,7 @@ void SmXMLSpaceContext_Impl::startFastElement(sal_Int32
/*nElement*/,
SAL_WARN("starmath", "ignore mspace's width: " << sValue);
break;
default:
- SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
break;
}
}
@@ -2573,7 +2573,7 @@ void SmXMLActionContext_Impl::startFastElement(sal_Int32
/*nElement*/, const uno
}
break;
default:
- SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+ SAL_WARN("starmath", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
break;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
