[Libreoffice-commits] core.git: sd/inc sd/source

Takeshi Abe tabe at fixedpoint.jp
Tue Jun 20 06:12:37 UTC 2017


 sd/inc/stlsheet.hxx         |    2 +-
 sd/source/core/stlsheet.cxx |    9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 80759b5871093bc9fde2f03b88678c82e97bc381
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Jun 20 00:34:38 2017 +0900

    sd: Do not copy SdStyleSheet
    
    Anyway copy assignment operator has been deleted already.
    
    Change-Id: Ie9ee9d8a9434b41b3b36d2483424776829572837
    Reviewed-on: https://gerrit.libreoffice.org/38973
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 41b94338e183..29e6f4a4698b 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -54,7 +54,6 @@ class SdStyleSheet : public SdStyleSheetBase, private ::cppu::BaseMutex
 {
 public:
     SdStyleSheet( const OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask );
-    SdStyleSheet( const SdStyleSheet& );
 
     virtual bool        SetParent (const OUString& rParentName) override;
     virtual SfxItemSet& GetItemSet() override;
@@ -149,6 +148,7 @@ protected:
     std::unique_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
 
 private:
+    SdStyleSheet( const SdStyleSheet& ) = delete;
     SdStyleSheet& operator=( const SdStyleSheet& ) = delete;
 };
 
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 5fabb740dbd2..0cfc22087dbe 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -138,15 +138,6 @@ SdStyleSheet::SdStyleSheet(const OUString& rDisplayName, SfxStyleSheetBasePool&
 {
 }
 
-SdStyleSheet::SdStyleSheet( const SdStyleSheet & r )
-: SdStyleSheetBase( r )
-, ::cppu::BaseMutex()
-, msApiName( r.msApiName )
-, mxPool( r.mxPool )
-, mrBHelper( m_aMutex )
-{
-}
-
 SdStyleSheet::~SdStyleSheet()
 {
     delete pSet;


More information about the Libreoffice-commits mailing list