diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-11-26 17:27:45 +0100 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-26 21:15:09 +0100 |
commit | e641975076db46381f39ebca82bd43c503c3880c (patch) | |
tree | 2072372c1a2d371ebe00501e488579ad0647ec20 /sd | |
parent | c4c4c7e37462eddb3da0b9150a7edfdccfb0aa55 (diff) |
clang-tidy modernize-use-equals-default in sd
Change-Id: Ib3d3bb1a0484cb8bb6411444254644252e3614cf
Reviewed-on: https://gerrit.libreoffice.org/45293
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/OutlinerIterator.hxx | 7 | ||||
-rw-r--r-- | sd/inc/drawdoc.hxx | 1 | ||||
-rw-r--r-- | sd/source/core/drawdoc.cxx | 17 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPageDescriptor.cxx | 23 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPageDescriptor.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsLayouter.cxx | 17 | ||||
-rw-r--r-- | sd/source/ui/view/OutlinerIterator.cxx | 9 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellManager.cxx | 22 |
10 files changed, 0 insertions, 105 deletions
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index d61448db7c91..0696fbffc265 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -288,13 +288,6 @@ public: it is as a marker in comparisons. */ IteratorPosition(); - /** Create a new object with all data members set from the given - position. - @param aPosition - The position object from which to take the values that are - assigned to the data members of this object. - */ - IteratorPosition (const IteratorPosition& aPosition); /** Compare two positions for equality. @return diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 2ce8fabb9de4..8a0af1398287 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -126,7 +126,6 @@ namespace sd bool mbShowPauseLogo; PresentationSettings(); - PresentationSettings( const PresentationSettings& r ); }; } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index ff30462fc3c9..620607507790 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -130,23 +130,6 @@ PresentationSettings::PresentationSettings() { } -PresentationSettings::PresentationSettings( const PresentationSettings& r ) -: maPresPage( r.maPresPage ), - mbAll( r.mbAll ), - mbEndless( r.mbEndless ), - mbCustomShow( r.mbCustomShow ), - mbManual( r.mbManual ), - mbMouseVisible( r.mbMouseVisible ), - mbMouseAsPen( r.mbMouseAsPen ), - mbLockedPages( r.mbLockedPages ), - mbAlwaysOnTop( r.mbAlwaysOnTop ), - mbFullScreen( r.mbFullScreen ), - mbAnimationAllowed( r.mbAnimationAllowed ), - mnPauseTimeout( r.mnPauseTimeout ), - mbShowPauseLogo( r.mbShowPauseLogo ) -{ -} - SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) : FmFormModel( !utl::ConfigManager::IsFuzzing() ? SvtPathOptions().GetPalettePath() : OUString(), nullptr, pDrDocSh ) , mpOutliner(nullptr) diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index 26e44eff0f7e..87a27d597870 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -55,29 +55,6 @@ MasterPageDescriptor::MasterPageDescriptor ( { } -MasterPageDescriptor::MasterPageDescriptor (const MasterPageDescriptor& rDescriptor) - : maToken(rDescriptor.maToken), - meOrigin(rDescriptor.meOrigin), - msURL(rDescriptor.msURL), - msPageName(rDescriptor.msPageName), - msStyleName(rDescriptor.msStyleName), - mbIsPrecious(rDescriptor.mbIsPrecious), - mpMasterPage(rDescriptor.mpMasterPage), - mpSlide(rDescriptor.mpSlide), - maSmallPreview(rDescriptor.maSmallPreview), - maLargePreview(rDescriptor.maLargePreview), - mpPreviewProvider(rDescriptor.mpPreviewProvider), - mpPageObjectProvider(rDescriptor.mpPageObjectProvider), - mnTemplateIndex(rDescriptor.mnTemplateIndex), - meURLClassification(rDescriptor.meURLClassification), - mnUseCount(rDescriptor.mnUseCount) -{ -} - -MasterPageDescriptor::~MasterPageDescriptor() -{ -} - void MasterPageDescriptor::SetToken (MasterPageContainer::Token aToken) { maToken = aToken; diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx index d4bb8cc40def..dfc7795189b5 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx @@ -46,8 +46,6 @@ public: const bool bIsPrecious, const std::shared_ptr<PageObjectProvider>& rpPageObjectProvider, const std::shared_ptr<PreviewProvider>& rpPreviewProvider); - MasterPageDescriptor (const MasterPageDescriptor& rDescriptor); - ~MasterPageDescriptor(); void SetToken (MasterPageContainer::Token aToken); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index ae4c84f7c55e..c3539b117b3b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -45,12 +45,6 @@ public: public: Representative (const Bitmap& rBitmap, const bool bIsExcluded) : maBitmap(rBitmap), mbIsExcluded(bIsExcluded) {} - Representative (const Representative& rOther) - : maBitmap(rOther.maBitmap), mbIsExcluded(rOther.mbIsExcluded) {} - Representative& operator= (Representative const& rOther) - { if (&rOther != this) {maBitmap = rOther.maBitmap; mbIsExcluded = rOther.mbIsExcluded; } - return *this; - } Bitmap maBitmap; bool mbIsExcluded; diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index da897269b030..eab9fec453f2 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -198,7 +198,6 @@ class InsertPosition { public: InsertPosition(); - InsertPosition& operator= (const InsertPosition& rInsertPosition); bool operator== (const InsertPosition& rInsertPosition) const; bool operator!= (const InsertPosition& rInsertPosition) const; diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 2a044b553f79..81536d264d43 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -1175,23 +1175,6 @@ InsertPosition::InsertPosition() { } -InsertPosition& InsertPosition::operator= (const InsertPosition& rInsertPosition) -{ - if (this != &rInsertPosition) - { - mnRow = rInsertPosition.mnRow; - mnColumn = rInsertPosition.mnColumn; - mnIndex = rInsertPosition.mnIndex; - mbIsAtRunStart = rInsertPosition.mbIsAtRunStart; - mbIsAtRunEnd = rInsertPosition.mbIsAtRunEnd; - mbIsExtraSpaceNeeded = rInsertPosition.mbIsExtraSpaceNeeded; - maLocation = rInsertPosition.maLocation; - maLeadingOffset = rInsertPosition.maLeadingOffset; - maTrailingOffset = rInsertPosition.maTrailingOffset; - } - return *this; -} - bool InsertPosition::operator== (const InsertPosition& rInsertPosition) const { // Do not compare the geometrical information (maLocation). diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 92966a6be78a..d94aa84d5297 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -44,15 +44,6 @@ IteratorPosition::IteratorPosition() { } -IteratorPosition::IteratorPosition (const IteratorPosition& aPosition) -: mxObject(aPosition.mxObject) -, mnText(aPosition.mnText) -, mnPageIndex(aPosition.mnPageIndex) -, mePageKind(aPosition.mePageKind) -, meEditMode(aPosition.meEditMode) -{ -} - bool IteratorPosition::operator== (const IteratorPosition& aPosition) const { return mxObject.get() == aPosition.mxObject.get() diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 8fbbda2e9d71..6938dce54226 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -56,8 +56,6 @@ public: ShellDescriptor (); explicit ShellDescriptor (ShellId nId); - ShellDescriptor (const ShellDescriptor& rDescriptor); - ShellDescriptor& operator= (const ShellDescriptor& rDescriptor); vcl::Window* GetWindow() const; }; @@ -1173,26 +1171,6 @@ ShellDescriptor::ShellDescriptor ( { } -ShellDescriptor::ShellDescriptor (const ShellDescriptor& rDescriptor) - : mpShell(rDescriptor.mpShell), - mnId(rDescriptor.mnId), - mpFactory(rDescriptor.mpFactory), - mbIsListenerAddedToWindow(rDescriptor.mbIsListenerAddedToWindow) -{ -} - -ShellDescriptor& ShellDescriptor::operator= (const ShellDescriptor& rDescriptor) -{ - if (this != &rDescriptor) - { - mpShell = rDescriptor.mpShell; - mnId = rDescriptor.mnId; - mpFactory = rDescriptor.mpFactory; - mbIsListenerAddedToWindow = rDescriptor.mbIsListenerAddedToWindow; - } - return *this; -} - vcl::Window* ShellDescriptor::GetWindow() const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); |