mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

writerfilter: Kill RefAndPointer, all it does is one dynamic_cast.

Browse Source 
Change-Id: Ie383f7e4ee89770f722d963e09efda9063a68c16
This commit is contained in:
Jan Holesovsky
2014-06-05 09:23:58 +02:00
parent 14ce4b3372
commit 8f7827d4cd
3 changed files with 4 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
View File

@@ -1730,8 +1730,7 @@ OOXMLFastContextHandlerTable::createFastChildContext
{
addCurrentChild();
mCurrentChild.set
(OOXMLFastContextHandler::createFastChildContext(Element, Attribs));
mCurrentChild.set(OOXMLFastContextHandler::createFastChildContext(Element, Attribs));
return mCurrentChild;
}
@@ -1758,8 +1757,8 @@ void OOXMLFastContextHandlerTable::lcl_endFastElement
void OOXMLFastContextHandlerTable::addCurrentChild()
{
OOXMLFastContextHandler * pHandler = mCurrentChild.getPointer();
if ( pHandler != NULL)
OOXMLFastContextHandler * pHandler = dynamic_cast<OOXMLFastContextHandler*>(mCurrentChild.get());
if (pHandler != NULL)
{
OOXMLValue::Pointer_t pValue(pHandler->getValue());

5
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
View File

@@ -31,7 +31,6 @@
#include "OOXMLParserState.hxx"
#include "OOXMLPropertySetImpl.hxx"
#include "OOXMLDocumentImpl.hxx"
#include "RefAndPointer.hxx"
#include <ooxml/OOXMLFastTokens.hxx>
#include <svtools/embedhlp.hxx>
@@ -61,8 +60,6 @@ class OOXMLFastContextHandler:
xml::sax::XFastContextHandler>
{
public:
typedef RefAndPointer<XFastContextHandler, OOXMLFastContextHandler>
RefAndPointer_t;
typedef boost::shared_ptr<OOXMLFastContextHandler> Pointer_t;
enum ResourceEnum_t { UNKNOWN, STREAM, PROPERTIES, TABLE, SHAPE };
@@ -423,7 +420,7 @@ public:
protected:
OOXMLTableImpl mTable;
RefAndPointer_t mCurrentChild;
uno::Reference<XFastContextHandler> mCurrentChild;
virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE;

102
writerfilter/source/ooxml/RefAndPointer.hxx
View File

@@ -1,102 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_REFANDPOINTER_HXX
#define INCLUDED_WRITERFILTER_SOURCE_OOXML_REFANDPOINTER_HXX
#include <iostream>
#include <com/sun/star/lang/XUnoTunnel.hpp>
namespace writerfilter {
namespace ooxml
{
template <class Interface, class ChildClass>
class RefAndPointer
{
mutable ChildClass * mpHandler;
mutable css::uno::Reference<Interface> mRef;
public:
RefAndPointer()
: mpHandler(NULL)
{
}
RefAndPointer(ChildClass * pHandler)
: mpHandler(pHandler), mRef(pHandler)
{
#ifdef DEBUG_MEMORY
std::clog << "MEMORY:" << mpHandler->getInstanceNumber() << ":RefAndPointer"
<< std::endl;
#endif
}
RefAndPointer(css::uno::Reference<Interface> xRef)
: mRef(xRef)
{
mpHandler = dynamic_cast<ChildClass *>(xRef.get());
#ifdef DEBUG_MEMORY
if (mpHandler != NULL)
std::clog << "MEMORY:" << mpHandler->getInstanceNumber()
<< ":RefAndPointer" << std::endl;
#endif
}
virtual ~RefAndPointer()
{
#ifdef DEBUG_MEMORY
if (mpHandler != NULL)
std::clog << "MEMORY:" << mpHandler->getInstanceNumber()
<< ":~RefAndPointer" << std::endl;
#endif
}
void set(ChildClass * pHandler)
{
mpHandler = pHandler;
mRef = pHandler;
}
void set(css::uno::Reference<Interface> xHandler)
{
mpHandler = dynamic_cast<ChildClass*>(xHandler.get());
mRef = xHandler;
}
ChildClass * getPointer() const { return mpHandler; }
const css::uno::Reference<Interface> getRef() const { return mRef; }
RefAndPointer & operator=
(const RefAndPointer & rSrc)
{
set(rSrc.getHandler());
return *this;
}
bool is() { return getRef().is(); }
operator ChildClass* () { return getPointer(); }
operator css::uno::Reference<Interface> () { return getRef(); }
};
}}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_REFANDPOINTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */