[Libreoffice-commits] core.git: lotuswordpro/source
Stephan Bergmann
sbergman at redhat.com
Wed Jun 11 06:45:32 PDT 2014
lotuswordpro/source/filter/xfilter/xfcell.cxx | 42 --------------
lotuswordpro/source/filter/xfilter/xfcell.hxx | 4 -
lotuswordpro/source/filter/xfilter/xfcontent.hxx | 4 -
lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx | 33 -----------
lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx | 13 ++--
lotuswordpro/source/filter/xfilter/xfrow.cxx | 29 ---------
lotuswordpro/source/filter/xfilter/xfrow.hxx | 4 -
7 files changed, 7 insertions(+), 122 deletions(-)
New commits:
commit 88e940f3150529a09265ab9d820c8189d6534011
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jun 11 15:45:03 2014 +0200
Dead code
Change-Id: I08bd15316e7952d05b769326c0a8a1d3493b0eb8
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index 18313a4..ac79dda 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 3193db8..8f62f08 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 7a59c3b..8988a28 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 39f05f4..d3774c5 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 84ca53a..7b0648d 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 9ce38ec..7f7a540 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 16a3c3c..ec2c3be 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:
More information about the Libreoffice-commits
mailing list