[Libreoffice-commits] core.git: 2 commits - cui/source sc/inc sc/source
Tamás Zolnai
tamas.zolnai at collabora.com
Fri Dec 8 06:24:16 UTC 2017
cui/source/dialogs/cuicharmap.cxx | 4
sc/inc/textuno.hxx | 2
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 8 -
sc/source/ui/app/uiitems.cxx | 52 -----------
sc/source/ui/dbgui/asciiopt.cxx | 16 ---
sc/source/ui/docshell/externalrefmgr.cxx | 3
sc/source/ui/inc/areasave.hxx | 2
sc/source/ui/inc/asciiopt.hxx | 1
sc/source/ui/inc/cellmergeoption.hxx | 1
sc/source/ui/inc/uiitems.hxx | 10 --
sc/source/ui/undo/areasave.cxx | 13 --
sc/source/ui/unoobj/chart2uno.cxx | 30 ------
sc/source/ui/unoobj/textuno.cxx | 12 --
sc/source/ui/view/cellmergeoption.cxx | 10 --
14 files changed, 2 insertions(+), 162 deletions(-)
New commits:
commit 2432c550d203053214310a23630f89baecdff6cc
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date: Fri Dec 8 04:01:02 2017 +0100
Update recent characters only when the selected character is inserted
Change-Id: Ic8cd715553f995d8adc1e84381c00646c9c252af
Reviewed-on: https://gerrit.libreoffice.org/46065
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 31c259188431..c01af450b5f8 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -631,9 +631,9 @@ void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph)
aArgs[1].Name = "FontName";
aArgs[1].Value <<= aFont.GetFamilyName();
comphelper::dispatchCommand(".uno:InsertSymbol", aArgs);
- }
- updateRecentCharacterList(sGlyph, aFont.GetFamilyName());
+ updateRecentCharacterList(sGlyph, aFont.GetFamilyName());
+ }
}
commit 818f9e4017d16d6a48265638393dec4f9ed30649
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Tue Dec 5 19:08:39 2017 +0100
clang-tidy modernize-use-equals-default in sc/source/ui
Change-Id: I827e05835838508eb83053a3de80dfa5f53cb685
Reviewed-on: https://gerrit.libreoffice.org/46046
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 0d72c9b95008..c88a2831261d 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -220,7 +220,6 @@ class ScCellTextCursor : public SvxUnoTextCursor
rtl::Reference<ScCellObj> mxTextObj;
public:
- ScCellTextCursor(const ScCellTextCursor& rOther);
ScCellTextCursor(ScCellObj& rText);
virtual ~ScCellTextCursor() throw() override;
@@ -271,7 +270,6 @@ private:
css::uno::Reference< css::text::XText > xParentText;
public:
- ScDrawTextCursor(const ScDrawTextCursor& rOther);
ScDrawTextCursor( const css::uno::Reference< css::text::XText >& xParent,
const SvxUnoTextBase& rText );
virtual ~ScDrawTextCursor() throw() override;
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 203058d7cc11..e5bb6a38389a 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -559,20 +559,12 @@ struct ScShapeChild
: mnRangeId(0)
{
}
- ScShapeChild(const ScShapeChild& rOld);
~ScShapeChild();
mutable rtl::Reference< ::accessibility::AccessibleShape > mpAccShape;
css::uno::Reference< css::drawing::XShape > mxShape;
sal_Int32 mnRangeId;
};
-ScShapeChild::ScShapeChild(const ScShapeChild& rOld)
-:
-mpAccShape(rOld.mpAccShape),
-mxShape(rOld.mxShape),
-mnRangeId(rOld.mnRangeId)
-{}
-
ScShapeChild::~ScShapeChild()
{
if (mpAccShape.is())
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index a28e02234ad0..dd0f4eb27f79 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -137,17 +137,6 @@ ScSortItem::ScSortItem( sal_uInt16 nWhichP,
if ( pSortData ) theSortData = *pSortData;
}
-ScSortItem::ScSortItem( const ScSortItem& rItem ) :
- SfxPoolItem ( rItem ),
- pViewData ( rItem.pViewData ),
- theSortData ( rItem.theSortData )
-{
-}
-
-ScSortItem::~ScSortItem()
-{
-}
-
bool ScSortItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
@@ -272,17 +261,6 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP,
if ( pSubTotalData ) theSubTotalData = *pSubTotalData;
}
-ScSubTotalItem::ScSubTotalItem( const ScSubTotalItem& rItem ) :
- SfxPoolItem ( rItem ),
- pViewData ( rItem.pViewData ),
- theSubTotalData ( rItem.theSubTotalData )
-{
-}
-
-ScSubTotalItem::~ScSubTotalItem()
-{
-}
-
bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
@@ -361,16 +339,6 @@ ScConsolidateItem::ScConsolidateItem(
if ( pConsolidateData ) theConsData = *pConsolidateData;
}
-ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) :
- SfxPoolItem ( rItem ),
- theConsData ( rItem.theConsData )
-{
-}
-
-ScConsolidateItem::~ScConsolidateItem()
-{
-}
-
bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
@@ -440,16 +408,6 @@ ScSolveItem::ScSolveItem( sal_uInt16 nWhichP,
if ( pSolveData ) theSolveData = *pSolveData;
}
-ScSolveItem::ScSolveItem( const ScSolveItem& rItem )
- : SfxPoolItem ( rItem ),
- theSolveData ( rItem.theSolveData )
-{
-}
-
-ScSolveItem::~ScSolveItem()
-{
-}
-
bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
@@ -474,16 +432,6 @@ ScTabOpItem::ScTabOpItem( sal_uInt16 nWhichP,
if ( pTabOpData ) theTabOpData = *pTabOpData;
}
-ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem )
- : SfxPoolItem ( rItem ),
- theTabOpData ( rItem.theTabOpData )
-{
-}
-
-ScTabOpItem::~ScTabOpItem()
-{
-}
-
bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index e75d5f02ec43..a20a1736ec7a 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -39,22 +39,6 @@ ScAsciiOptions::ScAsciiOptions() :
{
}
-ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) :
- bFixedLen ( rOpt.bFixedLen ),
- aFieldSeps ( rOpt.aFieldSeps ),
- bMergeFieldSeps ( rOpt.bMergeFieldSeps ),
- bQuotedFieldAsText(rOpt.bQuotedFieldAsText),
- bDetectSpecialNumber(rOpt.bDetectSpecialNumber),
- cTextSep ( rOpt.cTextSep ),
- eCharSet ( rOpt.eCharSet ),
- eLang ( rOpt.eLang ),
- bCharSetSystem ( rOpt.bCharSetSystem ),
- nStartRow ( rOpt.nStartRow ),
- mvColStart ( rOpt.mvColStart ),
- mvColFormat ( rOpt.mvColFormat )
-{
-}
-
ScAsciiOptions::~ScAsciiOptions()
{
}
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 9cee85bee434..fb10655bfb09 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -117,9 +117,6 @@ public:
NotifyLinkListener(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) :
mnFileId(nFileId), meType(eType) {}
- NotifyLinkListener(const NotifyLinkListener& r) :
- mnFileId(r.mnFileId), meType(r.meType) {}
-
void operator() (ScExternalRefManager::LinkListener* p) const
{
p->notify(mnFileId, meType);
diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx
index 1582faa35c63..6efee92d5722 100644
--- a/sc/source/ui/inc/areasave.hxx
+++ b/sc/source/ui/inc/areasave.hxx
@@ -39,7 +39,6 @@ private:
public:
ScAreaLinkSaver( const ScAreaLink& rSource );
- ScAreaLinkSaver( const ScAreaLinkSaver& rCopy );
bool IsEqual( const ScAreaLink& rCompare ) const;
bool IsEqualSource( const ScAreaLink& rCompare ) const;
@@ -54,7 +53,6 @@ class ScAreaLinkSaveCollection
DataType maData;
public:
ScAreaLinkSaveCollection();
- ScAreaLinkSaveCollection( const ScAreaLinkSaveCollection& r );
~ScAreaLinkSaveCollection();
bool IsEqual( const ScDocument* pDoc ) const;
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index 61308a9fe7d2..5f1bfda2f4ff 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -43,7 +43,6 @@ private:
public:
ScAsciiOptions();
- ScAsciiOptions(const ScAsciiOptions& rOpt);
~ScAsciiOptions();
static const sal_Unicode cDefaultTextSep = '"';
diff --git a/sc/source/ui/inc/cellmergeoption.hxx b/sc/source/ui/inc/cellmergeoption.hxx
index a172633280f9..282cf9a585be 100644
--- a/sc/source/ui/inc/cellmergeoption.hxx
+++ b/sc/source/ui/inc/cellmergeoption.hxx
@@ -29,7 +29,6 @@ struct ScCellMergeOption
explicit ScCellMergeOption(SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
bool bCenter = false);
- explicit ScCellMergeOption(const ScCellMergeOption& r);
ScRange getSingleRange(SCTAB nTab) const;
ScRange getFirstSingleRange() const;
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index cefe54402c59..735c4a489f81 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -134,8 +134,6 @@ public:
const ScSortParam* pSortData );
ScSortItem( sal_uInt16 nWhich,
const ScSortParam* pSortData );
- ScSortItem( const ScSortItem& rItem );
- virtual ~ScSortItem() override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -184,8 +182,6 @@ public:
const ScSubTotalParam* pSubTotalData );
ScSubTotalItem( sal_uInt16 nWhich,
const ScSubTotalParam* pSubTotalData );
- ScSubTotalItem( const ScSubTotalItem& rItem );
- virtual ~ScSubTotalItem() override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -221,8 +217,6 @@ class ScConsolidateItem : public SfxPoolItem
public:
ScConsolidateItem( sal_uInt16 nWhich,
const ScConsolidateParam* pParam );
- ScConsolidateItem( const ScConsolidateItem& rItem );
- virtual ~ScConsolidateItem() override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -259,8 +253,6 @@ class ScSolveItem : public SfxPoolItem
public:
ScSolveItem( sal_uInt16 nWhich,
const ScSolveParam* pParam );
- ScSolveItem( const ScSolveItem& rItem );
- virtual ~ScSolveItem() override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -276,8 +268,6 @@ class ScTabOpItem : public SfxPoolItem
public:
ScTabOpItem( sal_uInt16 nWhich,
const ScTabOpParam* pParam );
- ScTabOpItem( const ScTabOpItem& rItem );
- virtual ~ScTabOpItem() override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx
index 51710f907ff1..0112164d2365 100644
--- a/sc/source/ui/undo/areasave.cxx
+++ b/sc/source/ui/undo/areasave.cxx
@@ -34,16 +34,6 @@ ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLink& rSource ) :
{
}
-ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ) :
- aFileName ( rCopy.aFileName ),
- aFilterName ( rCopy.aFilterName ),
- aOptions ( rCopy.aOptions ),
- aSourceArea ( rCopy.aSourceArea ),
- aDestArea ( rCopy.aDestArea ),
- nRefresh ( rCopy.nRefresh )
-{
-}
-
bool ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const
{
return ( aFileName == rCompare.GetFile() &&
@@ -86,9 +76,6 @@ void ScAreaLinkSaver::InsertNewLink( ScDocument* pDoc )
ScAreaLinkSaveCollection::ScAreaLinkSaveCollection() {}
-ScAreaLinkSaveCollection::ScAreaLinkSaveCollection( const ScAreaLinkSaveCollection& r ) :
- maData(r.maData) {}
-
ScAreaLinkSaveCollection::~ScAreaLinkSaveCollection() {}
bool ScAreaLinkSaveCollection::IsEqual( const ScDocument* pDoc ) const
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index f42fd4f1fff6..41e248971911 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -843,15 +843,6 @@ public:
{
}
- Tokens2RangeString(const Tokens2RangeString& r) :
- mpRangeStr(r.mpRangeStr),
- mpDoc(r.mpDoc),
- meGrammar(r.meGrammar),
- mcRangeSep(r.mcRangeSep),
- mbFirst(r.mbFirst)
- {
- }
-
void operator() (const ScTokenRef& rToken)
{
ScCompiler aCompiler(mpDoc, ScAddress(0,0,0), meGrammar);
@@ -895,13 +886,6 @@ public:
{
}
- Tokens2RangeStringXML(const Tokens2RangeStringXML& r) :
- mpRangeStr(r.mpRangeStr),
- mpDoc(r.mpDoc),
- mbFirst(r.mbFirst)
- {
- }
-
void operator() (const ScTokenRef& rToken)
{
if (mbFirst)
@@ -1612,11 +1596,6 @@ public:
{
}
- InsertTabNumber(const InsertTabNumber& r) :
- mpTabNumVector(r.mpTabNumVector)
- {
- }
-
void operator() (const ScTokenRef& pToken) const
{
if (!ScRefTokenHelper::isRef(pToken))
@@ -3035,9 +3014,6 @@ public:
AccumulateRangeSize() :
mnCols(0), mnRows(0) {}
- AccumulateRangeSize(const AccumulateRangeSize& r) :
- mnCols(r.mnCols), mnRows(r.mnRows) {}
-
void operator() (const ScTokenRef& pToken)
{
ScRange r;
@@ -3068,12 +3044,6 @@ public:
mnCount(0),
mbColumn(bColumn) {}
- GenerateLabelStrings(const GenerateLabelStrings& r) :
- mpLabels(r.mpLabels),
- meOrigin(r.meOrigin),
- mnCount(r.mnCount),
- mbColumn(r.mbColumn) {}
-
void operator() (const ScTokenRef& pToken)
{
bool bExternal = ScRefTokenHelper::isExternalRef(pToken);
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 81a2448c9f59..ee4600b6627c 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -567,12 +567,6 @@ sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements()
return mxUnoText->hasElements();
}
-ScCellTextCursor::ScCellTextCursor(const ScCellTextCursor& rOther) :
- SvxUnoTextCursor( rOther ),
- mxTextObj( rOther.mxTextObj )
-{
-}
-
ScCellTextCursor::ScCellTextCursor(ScCellObj& rText) :
SvxUnoTextCursor( rText.GetUnoText() ),
mxTextObj( &rText )
@@ -740,12 +734,6 @@ ScHeaderFooterTextCursor* ScHeaderFooterTextCursor::getImplementation(
return pRet;
}
-ScDrawTextCursor::ScDrawTextCursor(const ScDrawTextCursor& rOther) :
- SvxUnoTextCursor( rOther ),
- xParentText( rOther.xParentText )
-{
-}
-
ScDrawTextCursor::ScDrawTextCursor( const uno::Reference<text::XText>& xParent,
const SvxUnoTextBase& rText ) :
SvxUnoTextCursor( rText ),
diff --git a/sc/source/ui/view/cellmergeoption.cxx b/sc/source/ui/view/cellmergeoption.cxx
index a9c770264d26..524117080f7a 100644
--- a/sc/source/ui/view/cellmergeoption.cxx
+++ b/sc/source/ui/view/cellmergeoption.cxx
@@ -32,16 +32,6 @@ ScCellMergeOption::ScCellMergeOption(SCCOL nStartCol, SCROW nStartRow, SCCOL nEn
{
}
-ScCellMergeOption::ScCellMergeOption(const ScCellMergeOption& r) :
- maTabs(r.maTabs),
- mnStartCol(r.mnStartCol),
- mnStartRow(r.mnStartRow),
- mnEndCol(r.mnEndCol),
- mnEndRow(r.mnEndRow),
- mbCenter(r.mbCenter)
-{
-}
-
ScRange ScCellMergeOption::getSingleRange(SCTAB nTab) const
{
return ScRange(mnStartCol, mnStartRow, nTab, mnEndCol, mnEndRow, nTab);
More information about the Libreoffice-commits
mailing list