icon-themes/colibre/links.txt | 2 +-
sc/source/filter/inc/rtfparse.hxx | 2 +-
sc/source/filter/rtf/rtfparse.cxx | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 0d7193bd2cd2f1bd24232095d7617f0764c58a9b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Jul 11 12:27:05 2018 +0200
loplugin:useuniqueptr in ScRTFParser
Change-Id: I3192704e0dc594f7496978414a8c1d93a4e0e5bb
Reviewed-on: https://gerrit.libreoffice.org/57300
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/filter/inc/rtfparse.hxx
b/sc/source/filter/inc/rtfparse.hxx
index 9817dca66536..dfe0a0a2abc7 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -55,7 +55,7 @@ private:
size_t mnCurPos;
ScRTFColTwips aColTwips;
- ScRTFCellDefault* pInsDefault;
+ std::unique_ptr<ScRTFCellDefault> pInsDefault;
ScRTFCellDefault* pActDefault;
ScRTFCellDefault* pDefMerge;
sal_uLong nStartAdjust;
diff --git a/sc/source/filter/rtf/rtfparse.cxx
b/sc/source/filter/rtf/rtfparse.cxx
index e324ca18fe14..7744b485f8f4 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -47,12 +47,12 @@ ScRTFParser::ScRTFParser( EditEngine* pEditP ) :
long nMM = OutputDevice::LogicToLogic( 12, MapUnit::MapPoint,
MapUnit::Map100thMM );
pPool->SetPoolDefaultItem( SvxFontHeightItem( nMM, 100, EE_CHAR_FONTHEIGHT
) );
// Free-flying pInsDefault
- pInsDefault = new ScRTFCellDefault( pPool );
+ pInsDefault.reset( new ScRTFCellDefault( pPool ) );
}
ScRTFParser::~ScRTFParser()
{
- delete pInsDefault;
+ pInsDefault.reset();
maDefaultList.clear();
}
@@ -271,7 +271,7 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
nLastWidth = maDefaultList.back()->nTwips;
nColCnt = 0;
- if (pActDefault != pInsDefault)
+ if (pActDefault != pInsDefault.get())
pActDefault = nullptr;
maDefaultList.clear();
pDefMerge = nullptr;
@@ -281,7 +281,7 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
break;
case RTF_CLMGF: // The first cell of cells to be merged
{
- pDefMerge = pInsDefault;
+ pDefMerge = pInsDefault.get();
nRtfLastToken = pInfo->nToken;
}
break;
@@ -304,9 +304,9 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
bNewDef = true;
pInsDefault->nCol = nColCnt;
pInsDefault->nTwips = pInfo->nTokenValue; // Right cell border
- maDefaultList.push_back(
std::unique_ptr<ScRTFCellDefault>(pInsDefault) );
+ maDefaultList.push_back( std::move(pInsDefault) );
// New free-flying pInsDefault
- pInsDefault = new ScRTFCellDefault( pPool );
+ pInsDefault.reset( new ScRTFCellDefault( pPool ) );
if ( ++nColCnt > nColMax )
nColMax = nColCnt;
nRtfLastToken = pInfo->nToken;
@@ -330,7 +330,7 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
NewCellRow(); // before was no \intbl, bad behavior
// Broken RTF? Let's save what we can
if ( !pActDefault )
- pActDefault = pInsDefault;
+ pActDefault = pInsDefault.get();
if ( pActDefault->nColOverlap > 0 )
{ // Not merged with preceding
mxActEntry->nCol = pActDefault->nCol;
commit c6dc541a59a22c59d23c43c3dfcf8ef2c96095a6
Author: andreas kainz <kain...@gmail.com>
Date: Thu Jul 12 10:22:46 2018 +0200
tdf#117697 add missing section icon in search
Change-Id: Iea2b4a7c98a2751048dc2228ac550708bd22c238
Reviewed-on: https://gerrit.libreoffice.org/57318
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index e2a65d70dedd..590ed8309b0d 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1667,7 +1667,7 @@ sw/res/sr20002.png cmd/sc_inserttable.png
sw/res/sr20003.png cmd/sc_insertframe.png
sw/res/sr20004.png cmd/sc_showsinglepage.png
sw/res/sr20005.png cmd/sc_editdoc.png
-sw/res/sr20007.png sw/res/sc_insertsection.png
+sw/res/sr20007.png cmd/sc_insertsection.png
sw/res/sr20008.png cmd/sc_insertbookmark.png
sw/res/sr20009.png cmd/sc_toggleobjectbeziermode.png
sw/res/sr20010.png cmd/sc_drawchart.png
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
