diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 15:45:03 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 15:45:03 +0200 |
commit | 88e940f3150529a09265ab9d820c8189d6534011 (patch) | |
tree | c26d4b8ef09fd932be6b29e9a77c7df5eac0ad6f /lotuswordpro | |
parent | d2cc121e0798a007a6e0409b09c16ce747ab959f (diff) |
Dead code
Change-Id: I08bd15316e7952d05b769326c0a8a1d3493b0eb8
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfcell.cxx | 42 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfcell.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfcontent.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx | 33 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx | 13 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfrow.cxx | 29 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfrow.hxx | 4 |
7 files changed, 7 insertions, 122 deletions
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx index 18313a4f8a0e..ac79dda1e331 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx @@ -73,48 +73,6 @@ XFCell::XFCell() 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() { if( m_pSubTable ) diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx index 3193db8a542f..8f62f0849cf7 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx @@ -76,10 +76,6 @@ class XFCell : public XFContentContainer public: XFCell(); - XFCell(const XFCell& other); - - XFCell& operator=(const XFCell& other); - virtual ~XFCell(); public: diff --git a/lotuswordpro/source/filter/xfilter/xfcontent.hxx b/lotuswordpro/source/filter/xfilter/xfcontent.hxx index 7a59c3bc6604..8988a2800edf 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontent.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontent.hxx @@ -92,10 +92,6 @@ public: */ OUString GetStyleName() {return m_strStyleName;} - /** - */ - XFContent* Clone() {return NULL;} - protected: XFContent() {} diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx index 39f05f4992ba..d3774c5471a1 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx @@ -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() { std::vector<XFContent*>::iterator it; diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx index 84ca53ab9a7e..7b0648d0f13f 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx @@ -60,23 +60,24 @@ #ifndef 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 <boost/noncopyable.hpp> + +#include "xfcontent.hxx" + /** * @brief * A container for content. * The contents will be deleted when delete container. */ -class XFContentContainer : public XFContent +class XFContentContainer : public XFContent, private boost::noncopyable { public: XFContentContainer(); - XFContentContainer(const XFContentContainer& other); - - XFContentContainer& operator=(const XFContentContainer& other); - /** * @descr Destructure, all contents will be deleted too. */ diff --git a/lotuswordpro/source/filter/xfilter/xfrow.cxx b/lotuswordpro/source/filter/xfilter/xfrow.cxx index 9ce38ec075b1..7f7a54078833 100644 --- a/lotuswordpro/source/filter/xfilter/xfrow.cxx +++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx @@ -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() { std::map<sal_Int32,XFCell*>::iterator it; diff --git a/lotuswordpro/source/filter/xfilter/xfrow.hxx b/lotuswordpro/source/filter/xfilter/xfrow.hxx index 16a3c3c2c954..ec2c3bef12ae 100644 --- a/lotuswordpro/source/filter/xfilter/xfrow.hxx +++ b/lotuswordpro/source/filter/xfilter/xfrow.hxx @@ -70,10 +70,6 @@ class XFRow : public XFContent public: XFRow(); - XFRow(const XFRow& other); - - XFRow& operator=(const XFRow& other); - virtual ~XFRow(); public: |