[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
Jan Holesovsky
kendy at collabora.com
Mon Apr 14 11:14:20 PDT 2014
writerfilter/inc/resourcemodel/QNameToString.hxx | 2
writerfilter/source/dmapper/BorderHandler.cxx | 1
writerfilter/source/dmapper/DomainMapper.cxx | 45 +++++++++++++------
writerfilter/source/ooxml/Handler.cxx | 1
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 6 ++
writerfilter/source/resourcemodel/qnametostrcore.cxx | 2
writerfilter/source/rtftok/rtfsprm.cxx | 6 ++
7 files changed, 47 insertions(+), 16 deletions(-)
New commits:
commit f2b815de56a2c2cfe6bb3f757cd70f7bbcbfe562
Author: Jan Holesovsky <kendy at collabora.com>
Date: Mon Apr 14 19:45:32 2014 +0200
writerfilter: QNameToString is for debugging, avoid using that in real code.
Change-Id: I8462204bb0fe4da8de1d05a42347466e40e54169
diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx
index 8090882..95e8cb1f 100644
--- a/writerfilter/inc/resourcemodel/QNameToString.hxx
+++ b/writerfilter/inc/resourcemodel/QNameToString.hxx
@@ -69,7 +69,9 @@ protected:
public:
static Pointer_t Instance();
+#ifdef DEBUG_LOGGING
string operator()(sal_uInt32 nId);
+#endif
};
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index dd82dd7..efa6be2 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -19,7 +19,6 @@
#include <BorderHandler.hxx>
#include <TDefTableHandler.hxx>
#include <PropertyMap.hxx>
-#include <resourcemodel/QNameToString.hxx>
#include <ConversionHelper.hxx>
#include <com/sun/star/table/BorderLine2.hpp>
#include <ooxml/resourceids.hxx>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 23152e6..cb2c8f7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -911,13 +911,14 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
m_pImpl->m_bIgnoreNextPara = true;
break;
case NS_ooxml::LN_CT_DataBinding_prefixMappings:
+ m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_DataBinding_prefixMappings", sStringValue);
+ break;
case NS_ooxml::LN_CT_DataBinding_xpath:
+ m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_DataBinding_xpath", sStringValue);
+ break;
case NS_ooxml::LN_CT_DataBinding_storeItemID:
- {
- OUString sName = OUString::createFromAscii((*QNameToString::Instance())(nName).c_str());
- m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, sName, sStringValue);
- }
- break;
+ m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_DataBinding_storeItemID", sStringValue);
+ break;
default:
{
#if OSL_DEBUG_LEVEL > 0
@@ -2268,7 +2269,21 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
case NS_ooxml::LN_CT_SdtPr_id:
{
// this is an unsupported SDT property, create a grab bag for it
- OUString sName = OUString::createFromAscii((*QNameToString::Instance())(nSprmId).c_str());
+ OUString sName;
+ switch (nSprmId)
+ {
+ case NS_ooxml::LN_CT_SdtPr_dataBinding: sName = "ooxml:CT_SdtPr_dataBinding"; break;
+ case NS_ooxml::LN_CT_SdtPr_equation: sName = "ooxml:CT_SdtPr_equation"; break;
+ case NS_ooxml::LN_CT_SdtPr_checkbox: sName = "ooxml:CT_SdtPr_checkbox"; break;
+ case NS_ooxml::LN_CT_SdtPr_docPartObj: sName = "ooxml:CT_SdtPr_docPartObj"; break;
+ case NS_ooxml::LN_CT_SdtPr_docPartList: sName = "ooxml:CT_SdtPr_docPartList"; break;
+ case NS_ooxml::LN_CT_SdtPr_picture: sName = "ooxml:CT_SdtPr_picture"; break;
+ case NS_ooxml::LN_CT_SdtPr_citation: sName = "ooxml:CT_SdtPr_citation"; break;
+ case NS_ooxml::LN_CT_SdtPr_group: sName = "ooxml:CT_SdtPr_group"; break;
+ case NS_ooxml::LN_CT_SdtPr_text: sName = "ooxml:CT_SdtPr_text"; break;
+ case NS_ooxml::LN_CT_SdtPr_id: sName = "ooxml:CT_SdtPr_id"; break;
+ default: assert(false);
+ };
enableInteropGrabBag(sName);
// process subitems
@@ -2281,17 +2296,23 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
}
break;
case NS_ooxml::LN_CT_SdtCheckbox_checked:
+ m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtCheckbox_checked", sStringValue);
+ break;
case NS_ooxml::LN_CT_SdtCheckbox_checkedState:
+ m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtCheckbox_checkedState", sStringValue);
+ break;
case NS_ooxml::LN_CT_SdtCheckbox_uncheckedState:
+ m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtCheckbox_uncheckedState", sStringValue);
+ break;
case NS_ooxml::LN_CT_SdtDocPart_docPartGallery:
+ m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtDocPart_docPartGallery", sStringValue);
+ break;
case NS_ooxml::LN_CT_SdtDocPart_docPartCategory:
+ m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtDocPart_docPartCategory", sStringValue);
+ break;
case NS_ooxml::LN_CT_SdtDocPart_docPartUnique:
- {
- // this is a child of an unsupported SDT property, store in the grab bag
- OUString sName = OUString::createFromAscii((*QNameToString::Instance())(nSprmId).c_str());
- m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, sName, sStringValue);
- }
- break;
+ m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtDocPart_docPartUnique", sStringValue);
+ break;
case NS_ooxml::LN_EG_SectPrContents_pgNumType:
{
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index 1c79525..924c188 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -18,7 +18,6 @@
*/
#include <ooxml/resourceids.hxx>
-#include <resourcemodel/QNameToString.hxx>
#include "Handler.hxx"
namespace writerfilter {
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index b558773..5bcda5f 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -107,7 +107,11 @@ writerfilter::Reference<Properties>::Pointer_t OOXMLPropertyImpl::getProps()
string OOXMLPropertyImpl::getName() const
{
- string sResult = (*QNameToString::Instance())(mId);
+ string sResult;
+
+#ifdef DEBUG_LOGGING
+ sResult = (*QNameToString::Instance())(mId);
+#endif
if (sResult.length() == 0)
sResult = fastTokenToId(mId);
diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx b/writerfilter/source/resourcemodel/qnametostrcore.cxx
index a473753..0321768 100644
--- a/writerfilter/source/resourcemodel/qnametostrcore.cxx
+++ b/writerfilter/source/resourcemodel/qnametostrcore.cxx
@@ -31,6 +31,7 @@ QNameToString::Pointer_t QNameToString::Instance()
return pInstance;
}
+#ifdef DEBUG_LOGGING
string QNameToString::operator()(Id qName)
{
Map::const_iterator aIt = mMap.find(qName);
@@ -40,6 +41,7 @@ string QNameToString::operator()(Id qName)
return string();
}
+#endif
QNameToString::QNameToString()
{
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 776aa6e..dc55aca 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -61,7 +61,11 @@ std::string RTFSprm::toString() const
{
OStringBuffer aBuf("RTFSprm");
- std::string sResult = (*QNameToString::Instance())(m_nKeyword);
+ std::string sResult;
+
+#ifdef DEBUG_LOGGING
+ sResult = (*QNameToString::Instance())(m_nKeyword);
+#endif
aBuf.append(" ('");
if (sResult.length() == 0)
More information about the Libreoffice-commits
mailing list