[Libreoffice-commits] core.git: writerfilter/source
Jan Holesovsky
kendy at collabora.com
Thu Jun 5 02:55:09 PDT 2014
writerfilter/source/ooxml/OOXMLFastHelper.hxx | 75 --------------------------
1 file changed, 75 deletions(-)
New commits:
commit dc9cc46f3223aff3f85d3ce9696178a5f4d3d087
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Jun 5 11:53:58 2014 +0200
writerfilter: Kill createAndSetParent and createAndSetParentRef.
Change-Id: Id212984b7f525e9aea2c390f181e68b5725aa20d
diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
index 2f10ff7..93281dc 100644
--- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
@@ -32,16 +32,9 @@ template <class T>
class OOXMLFastHelper
{
public:
- static css::uno::Reference<css::xml::sax::XFastContextHandler> createAndSetParent
- (OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId);
-
static css::uno::Reference<css::xml::sax::XFastContextHandler> createAndSetParentAndDefine
(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId, Id nDefine);
- static css::uno::Reference<css::xml::sax::XFastContextHandler> createAndSetParentRef
- (OOXMLFastContextHandler * pHandler, sal_uInt32 nToken,
- const css::uno::Reference < css::xml::sax::XFastAttributeList > & Attribs);
-
static void newProperty(OOXMLFastContextHandler * pHandler,
Id nId,
const OUString & rValue);
@@ -56,39 +49,6 @@ public:
template <class T>
uno::Reference<css::xml::sax::XFastContextHandler>
-OOXMLFastHelper<T>::createAndSetParent
-(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId)
-{
-#ifdef DEBUG_HELPER
- debug_logger->startElement("helper.createAndSetParent");
- debug_logger->attribute("context", pHandler->getType());
- debug_logger->attribute("id", (*QNameToString::Instance())(nId));
-#endif
-
- OOXMLFastContextHandler * pTmp = new T(pHandler);
-
- pTmp->setToken(nToken);
- pTmp->setId(nId);
-
-#ifdef DEBUG_CREATE
- debug_logger->startElement("createAndSetParent");
- debug_logger->attribute("context", pHandler->getType());
- debug_logger->attribute("token", fastTokenToId(pTmp->getToken()));
- debug_logger->attribute("id", (*QNameToString::Instance())(nId));
-
- debug_logger->startElement("created");
- debug_logger->addTag(pTmp->toTag());
- debug_logger->endElement("created");
- debug_logger->endElement("helper.createAndSetParent");
-#endif
-
- css::uno::Reference<css::xml::sax::XFastContextHandler> aResult(pTmp);
-
- return aResult;
-}
-
-template <class T>
-uno::Reference<css::xml::sax::XFastContextHandler>
OOXMLFastHelper<T>::createAndSetParentAndDefine
(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId, Id nDefine)
{
@@ -123,41 +83,6 @@ OOXMLFastHelper<T>::createAndSetParentAndDefine
}
template <class T>
-uno::Reference<css::xml::sax::XFastContextHandler>
-OOXMLFastHelper<T>::createAndSetParentRef
-(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken,
- const css::uno::Reference < css::xml::sax::XFastAttributeList > & Attribs)
-{
-#ifdef DEBUG_HELPER
- debug_logger->startElement("helper.createAndSetParentRef");
- debug_logger->attribute("context", pHandler->getType());
- debug_logger->attribute("type", fastTokenToId(nToken));
-#endif
-
- boost::shared_ptr<OOXMLFastContextHandler> pTmp(new T(pHandler));
-
- css::uno::Reference<css::xml::sax::XFastContextHandler> xChild =
- pTmp->createFastChildContext(nToken, Attribs);
-
- if (xChild.is())
- {
- OOXMLFastContextHandler* pResult = dynamic_cast<OOXMLFastContextHandler *>(xChild.get());
- pResult->setToken(nToken);
- pResult->setParent(pHandler);
- }
-
-
-#ifdef DEBUG_HELPER
- debug_logger->startElement("created");
- debug_logger->addTag(pTmp->toTag());
- debug_logger->endElement("created");
- debug_logger->endElement("helper.createAndSetParentRef");
-#endif
-
- return xChild;
-}
-
-template <class T>
void OOXMLFastHelper<T>::newProperty(OOXMLFastContextHandler * pHandler,
Id nId,
const OUString & rValue)
More information about the Libreoffice-commits
mailing list