Kaydet (Commit) 88e940f3 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Dead code

Change-Id: I08bd15316e7952d05b769326c0a8a1d3493b0eb8
üst d2cc121e
...@@ -73,48 +73,6 @@ XFCell::XFCell() ...@@ -73,48 +73,6 @@ XFCell::XFCell()
m_bProtect = false; m_bProtect = false;
} }
XFCell::XFCell(const XFCell& other) : XFContentContainer(other)
{
if( other.m_pSubTable )
m_pSubTable = new XFTable(*other.m_pSubTable);
else
m_pSubTable = NULL;
m_pOwnerRow = NULL;
m_nCol = other.m_nCol;
m_nColSpaned = other.m_nColSpaned;
m_nRepeated = other.m_nRepeated;
m_eValueType = other.m_eValueType;
m_bProtect = other.m_bProtect;
m_strValue = other.m_strValue;
m_strDisplay = other.m_strDisplay;
m_strFormula = other.m_strFormula;
}
XFCell& XFCell::operator=(const XFCell& other)
{
if( this == &other )
return *this;
if( m_pSubTable )
delete m_pSubTable;
if( other.m_pSubTable )
m_pSubTable = new XFTable(*other.m_pSubTable);
else
m_pSubTable = NULL;
m_pOwnerRow = NULL;
m_nCol = other.m_nCol;
m_nColSpaned = other.m_nColSpaned;
m_nRepeated = other.m_nRepeated;
m_eValueType = other.m_eValueType;
m_bProtect = other.m_bProtect;
m_strValue = other.m_strValue;
m_strDisplay = other.m_strDisplay;
m_strFormula = other.m_strFormula;
return *this;
}
XFCell::~XFCell() XFCell::~XFCell()
{ {
if( m_pSubTable ) if( m_pSubTable )
......
...@@ -76,10 +76,6 @@ class XFCell : public XFContentContainer ...@@ -76,10 +76,6 @@ class XFCell : public XFContentContainer
public: public:
XFCell(); XFCell();
XFCell(const XFCell& other);
XFCell& operator=(const XFCell& other);
virtual ~XFCell(); virtual ~XFCell();
public: public:
......
...@@ -92,10 +92,6 @@ public: ...@@ -92,10 +92,6 @@ public:
*/ */
OUString GetStyleName() {return m_strStyleName;} OUString GetStyleName() {return m_strStyleName;}
/**
*/
XFContent* Clone() {return NULL;}
protected: protected:
XFContent() {} XFContent() {}
......
...@@ -64,39 +64,6 @@ XFContentContainer::XFContentContainer() ...@@ -64,39 +64,6 @@ XFContentContainer::XFContentContainer()
{ {
} }
XFContentContainer::XFContentContainer(const XFContentContainer& other):XFContent(other)
{
std::vector<XFContent*>::const_iterator it;
for( it = other.m_aContents.begin(); it != other.m_aContents.end(); ++it )
{
XFContent *pContent = *it;
if( pContent )
{
XFContent *pClone = pContent->Clone();
if( pClone )
Add(pClone);
}
}
}
XFContentContainer& XFContentContainer::operator=(const XFContentContainer& other)
{
std::vector<XFContent*>::const_iterator it;
for( it = other.m_aContents.begin(); it != other.m_aContents.end(); ++it )
{
XFContent *pContent = *it;
if( pContent )
{
XFContent *pClone = pContent->Clone();
if( pClone )
Add(pClone);
}
}
return *this;
}
XFContentContainer::~XFContentContainer() XFContentContainer::~XFContentContainer()
{ {
std::vector<XFContent*>::iterator it; std::vector<XFContent*>::iterator it;
......
...@@ -60,23 +60,24 @@ ...@@ -60,23 +60,24 @@
#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENTCONTAINER_HXX #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENTCONTAINER_HXX
#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENTCONTAINER_HXX #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENTCONTAINER_HXX
#include "xfcontent.hxx" #include <sal/config.h>
#include <vector> #include <vector>
#include <boost/noncopyable.hpp>
#include "xfcontent.hxx"
/** /**
* @brief * @brief
* A container for content. * A container for content.
* The contents will be deleted when delete container. * The contents will be deleted when delete container.
*/ */
class XFContentContainer : public XFContent class XFContentContainer : public XFContent, private boost::noncopyable
{ {
public: public:
XFContentContainer(); XFContentContainer();
XFContentContainer(const XFContentContainer& other);
XFContentContainer& operator=(const XFContentContainer& other);
/** /**
* @descr Destructure, all contents will be deleted too. * @descr Destructure, all contents will be deleted too.
*/ */
......
...@@ -73,35 +73,6 @@ XFRow::XFRow() ...@@ -73,35 +73,6 @@ XFRow::XFRow()
{ {
} }
XFRow::XFRow(const XFRow& other):XFContent(other)
{
m_pOwnerTable = NULL;
m_nRepeat = other.m_nRepeat;
m_nRow = other.m_nRow;
for( int i=1; i<=other.GetCellCount(); i++ )
{
XFCell *pCell = new XFCell;
*pCell = *other.GetCell(i);
AddCell(pCell);
}
}
XFRow& XFRow::operator=(const XFRow& other)
{
m_pOwnerTable = NULL;
m_nRepeat = other.m_nRepeat;
m_nRow = other.m_nRow;
for( int i=1; i<=other.GetCellCount(); i++ )
{
XFCell *pCell = new XFCell;
*pCell = *other.GetCell(i);
AddCell(pCell);
}
return *this;
}
XFRow::~XFRow() XFRow::~XFRow()
{ {
std::map<sal_Int32,XFCell*>::iterator it; std::map<sal_Int32,XFCell*>::iterator it;
......
...@@ -70,10 +70,6 @@ class XFRow : public XFContent ...@@ -70,10 +70,6 @@ class XFRow : public XFContent
public: public:
XFRow(); XFRow();
XFRow(const XFRow& other);
XFRow& operator=(const XFRow& other);
virtual ~XFRow(); virtual ~XFRow();
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment