From f2b815de56a2c2cfe6bb3f757cd70f7bbcbfe562 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Mon, 14 Apr 2014 19:45:32 +0200 Subject: writerfilter: QNameToString is for debugging, avoid using that in real code. Change-Id: I8462204bb0fe4da8de1d05a42347466e40e54169 --- 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 ++- .../source/resourcemodel/qnametostrcore.cxx | 2 + writerfilter/source/rtftok/rtfsprm.cxx | 6 ++- 7 files changed, 47 insertions(+), 16 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx index 80908820577d..95e8cb1fb7e2 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 dd82dd779779..efa6be2bddd2 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 23152e68747d..cb2c8f73a6e5 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::Pointer_t pProperties = rSprm.getProps(); diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx index 1c795256e92c..924c188268ad 100644 --- a/writerfilter/source/ooxml/Handler.cxx +++ b/writerfilter/source/ooxml/Handler.cxx @@ -18,7 +18,6 @@ */ #include -#include #include "Handler.hxx" namespace writerfilter { diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index b5587738462a..5bcda5fa0ad1 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -107,7 +107,11 @@ writerfilter::Reference::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 a4737533971c..032176883470 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 776aa6eeb7c2..dc55aca0f168 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) -- cgit