[Libreoffice-commits] core.git: lotuswordpro/source

Stephan Bergmann sbergman at redhat.com
Wed Dec 16 06:49:21 PST 2015


 lotuswordpro/source/filter/xfilter/xfstylecont.cxx |   12 ------------
 lotuswordpro/source/filter/xfilter/xfstylecont.hxx |    4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 98498fc7632f5cf55ba1cf0ac857af3a70ee10bd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 16 15:46:54 2015 +0100

    These would probably wreak havoc
    
    ...judging by how XFStyleContainer appears to own the pointers in m_aStyles, but
    are apparently not needed anyway
    
    Change-Id: I5ca64680bf8b7b5198f30dac4f4558069d476970

diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
index 7e4d60c..d08aeb5 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
@@ -70,18 +70,6 @@ XFStyleContainer::XFStyleContainer(const OUString& strStyleNamePrefix)
 {
 }
 
-XFStyleContainer::XFStyleContainer(const XFStyleContainer& other):
-    m_aStyles(other.m_aStyles), m_strStyleNamePrefix(other.m_strStyleNamePrefix)
-{
-}
-
-XFStyleContainer& XFStyleContainer::operator=(const XFStyleContainer& other)
-{
-    this->m_strStyleNamePrefix = other.m_strStyleNamePrefix;
-    this->m_aStyles = other.m_aStyles;
-    return *this;
-}
-
 XFStyleContainer::~XFStyleContainer()
 {
     std::vector<IXFStyle*>::iterator it;
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
index de6b6f1..af76510 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
@@ -87,9 +87,9 @@ public:
 
     explicit XFStyleContainer(const OUString& strStyleNamePrefix);
 
-    XFStyleContainer(const XFStyleContainer& other);
+    XFStyleContainer(const XFStyleContainer& other) = delete;
 
-    XFStyleContainer& operator=(const XFStyleContainer& other);
+    XFStyleContainer& operator=(const XFStyleContainer& other) = delete;
 
     virtual ~XFStyleContainer();
 


More information about the Libreoffice-commits mailing list