basctl/source/basicide/basobj3.cxx | 2
compilerplugins/clang/constparams.cxx | 2
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 6 -
editeng/source/misc/svxacorr.cxx | 62 ++++++++----------
hwpfilter/source/hwpfile.cxx | 4 -
hwpfilter/source/hwpfile.h | 2
i18nutil/source/utility/paper.cxx | 8 --
include/drawinglayer/primitive2d/textlayoutdevice.hxx | 2
include/editeng/svxacorr.hxx | 6 -
include/i18nutil/paper.hxx | 2
include/sfx2/linkmgr.hxx | 2
include/sfx2/templatelocalview.hxx | 2
include/svx/extrud3d.hxx | 2
include/svx/galtheme.hxx | 2
include/svx/lathe3d.hxx | 2
include/svx/svdoole2.hxx | 2
sax/source/fastparser/fastparser.cxx | 4 -
sc/inc/document.hxx | 4 -
sc/inc/table.hxx | 10 +-
sc/source/core/data/document.cxx | 4 -
sc/source/core/data/table2.cxx | 4 -
sc/source/core/data/table4.cxx | 4 -
sc/source/core/data/table7.cxx | 2
sc/source/ui/inc/reffact.hxx | 2
sc/source/ui/view/reffact.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 9 --
sd/source/ui/inc/DrawDocShell.hxx | 2
sd/source/ui/view/drviews2.cxx | 5 -
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 2
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/linkmgr2.cxx | 6 -
sfx2/source/appl/sfxhelp.cxx | 2
sfx2/source/control/templatelocalview.cxx | 11 ---
sfx2/source/doc/docfile.cxx | 2
slideshow/source/engine/eventmultiplexer.cxx | 4 -
slideshow/source/inc/eventmultiplexer.hxx | 2
starmath/source/ooxmlexport.cxx | 5 -
starmath/source/ooxmlexport.hxx | 2
svl/source/items/stylepool.cxx | 4 -
svx/source/engine3d/extrud3d.cxx | 2
svx/source/engine3d/lathe3d.cxx | 2
svx/source/gallery2/galtheme.cxx | 5 -
svx/source/svdraw/svdopath.cxx | 4 -
sw/source/filter/html/swhtml.cxx | 6 -
sw/source/filter/html/swhtml.hxx | 6 -
unotools/source/config/useroptions.cxx | 4 -
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 2
47 files changed, 104 insertions(+), 129 deletions(-)
New commits:
commit ec02714d6cd5be67d03e333efddb42ab572cae77
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Jan 23 13:21:59 2018 +0200
loplugin:unused-returns in drawinglayer..svx
Change-Id: I033a78cc7fe7d8e5086f1c855c4aa371cc98dc7c
Reviewed-on: https://gerrit.libreoffice.org/48400
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 66090ad2e34e..9d07e1683d2f 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -229,7 +229,7 @@ namespace drawinglayer
return mrDevice.GetTextWidth(rText, nIndex, nLength);
}
- bool TextLayouterDevice::getTextOutlines(
+ void TextLayouterDevice::getTextOutlines(
basegfx::B2DPolyPolygonVector& rB2DPolyPolyVector,
const OUString& rText,
sal_uInt32 nIndex,
@@ -255,7 +255,7 @@ namespace drawinglayer
aIntegerDXArray[a] = basegfx::fround(rDXArray[a]);
}
- return mrDevice.GetTextOutlines(
+ mrDevice.GetTextOutlines(
rB2DPolyPolyVector,
rText,
nIndex,
@@ -266,7 +266,7 @@ namespace drawinglayer
}
else
{
- return mrDevice.GetTextOutlines(
+ mrDevice.GetTextOutlines(
rB2DPolyPolyVector,
rText,
nIndex,
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 0b830e96c3b6..8652609603ac 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -362,11 +362,10 @@ void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, bool
bOn )
// Two capital letters at the beginning of word?
-bool SvxAutoCorrect::FnCapitalStartWord( SvxAutoCorrDoc& rDoc, const OUString&
rTxt,
+void SvxAutoCorrect::FnCapitalStartWord( SvxAutoCorrDoc& rDoc, const OUString&
rTxt,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang )
{
- bool bRet = false;
CharClass& rCC = GetCharClass( eLang );
// Delete all non alphanumeric. Test the characters at the beginning/end of
@@ -431,7 +430,7 @@ bool SvxAutoCorrect::FnCapitalStartWord( SvxAutoCorrDoc&
rDoc, const OUString& r
Sequence< css::beans::PropertyValue > aEmptySeq;
if (xSpeller->isValid(sWord,
static_cast<sal_uInt16>(eLang), aEmptySeq))
{
- return false;
+ return;
}
}
sal_Unicode cSave = rTxt[ nSttPos ];
@@ -441,12 +440,10 @@ bool SvxAutoCorrect::FnCapitalStartWord( SvxAutoCorrDoc&
rDoc, const OUString& r
{
if( SaveWordWrdSttLst & nFlags )
rDoc.SaveCpltSttWord( CapitalStartWord, nSttPos,
sWord, cSave );
- bRet = true;
}
}
}
}
- return bRet;
}
@@ -822,14 +819,14 @@ bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc&
rDoc, const OUString& rT
}
-bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
+void SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
const OUString& rTxt, bool bNormalPos,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang )
{
if( rTxt.isEmpty() || nEndPos <= nSttPos )
- return false;
+ return;
CharClass& rCC = GetCharClass( eLang );
OUString aText( rTxt );
@@ -862,14 +859,14 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
} while( !bAtStart );
if (!pWordStt)
- return false; // no character to be replaced
+ return; // no character to be replaced
if (rCC.isDigit(aText, pStr - pStart))
- return false; // already ok
+ return; // already ok
if (IsUpperLetter(rCC.getCharacterType(aText, pWordStt - pStart)))
- return false; // already ok
+ return; // already ok
//See if the text is the start of a protocol string, e.g. have text of
//"http" see if it is the start of "http:" and if so leave it alone
@@ -878,15 +875,15 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
if (nIndex + nProtocolLen <= rTxt.getLength())
{
if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex,
nProtocolLen)) != INetProtocol::NotValid)
- return false; // already ok
+ return; // already ok
}
if (0x1 == *pWordStt || 0x2 == *pWordStt)
- return false; // already ok
+ return; // already ok
if( *pDelim && 2 >= pDelim - pWordStt &&
lcl_IsInAsciiArr( ".-)>", *pDelim ) )
- return false;
+ return;
if( !bAtStart ) // Still no beginning of a paragraph?
{
@@ -899,7 +896,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
// and full width question marks are treated as word delimiters
else if ( 0x3002 != *pStr && 0xFF0E != *pStr && 0xFF01 != *pStr &&
0xFF1F != *pStr )
- return false; // no valid separator -> no replacement
+ return; // no valid separator -> no replacement
}
if( bAtStart ) // at the beginning of a paragraph?
@@ -912,8 +909,9 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
// valid separator -> replace
OUString sChar( *pWordStt );
sChar = rCC.titlecase(sChar); //see fdo#56740
- return !comphelper::string::equals(sChar, *pWordStt) &&
- rDoc.ReplaceRange( pWordStt - pStart, 1, sChar );
+ if (!comphelper::string::equals(sChar, *pWordStt))
+ rDoc.ReplaceRange( pWordStt - pStart, 1, sChar );
+ return;
}
aText = *pPrevPara;
@@ -929,7 +927,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
} while( !bAtStart );
if( bAtStart )
- return false; // no valid separator -> no replacement
+ return; // no valid separator -> no replacement
}
// Found [ \t]+[A-Z0-9]+ until here. Test now on the paragraph separator.
@@ -954,10 +952,10 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
//previous word is a . So probably last word is an
//anagram that ends in . and not truly the end of a
//previous sentence, so don't autocapitalize this word
- return false;
+ return;
}
if( nFlag & Flags::FullStop )
- return false; // no valid separator -> no replacement
+ return; // no valid separator -> no replacement
nFlag |= Flags::FullStop;
pExceptStt = pStr;
}
@@ -966,7 +964,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
case 0xFF01 :
{
if( nFlag & Flags::ExclamationMark )
- return false; // no valid separator -> no replacement
+ return; // no valid separator -> no replacement
nFlag |= Flags::ExclamationMark;
}
break;
@@ -974,13 +972,13 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
case 0xFF1F :
{
if( nFlag & Flags::QuestionMark)
- return false; // no valid separator -> no replacement
+ return; // no valid separator -> no replacement
nFlag |= Flags::QuestionMark;
}
break;
default:
if( nFlag == Flags::NONE )
- return false; // no valid separator -> no replacement
+ return; // no valid separator -> no replacement
else
bContinue = false;
break;
@@ -988,7 +986,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
if( bContinue && pStr-- == pStart )
{
- return false; // no valid separator -> no replacement
+ return; // no valid separator -> no replacement
}
} while( bContinue );
if( Flags::FullStop != nFlag )
@@ -996,7 +994,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
}
if( 2 > ( pStr - pStart ) )
- return false;
+ return;
if (!rCC.isLetterNumeric(aText, pStr-- - pStart))
{
@@ -1029,7 +1027,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
}
if( !bValid )
- return false; // no valid separator -> no replacement
+ return; // no valid separator -> no replacement
}
bool bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9';
@@ -1047,7 +1045,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
}
if( bNumericOnly ) // consists of only numbers, then not
- return false;
+ return;
if (NonFieldWordDelim(*pStr))
++pStr;
@@ -1059,7 +1057,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
{
sWord = OUString(pStr, pExceptStt - pStr + 1);
if( FindInCplSttExceptList(eLang, sWord) )
- return false;
+ return;
// Delete all non alphanumeric. Test the characters at the
// beginning/end of the word ( recognizes: "(min.", "/min.", and so
on.)
@@ -1078,10 +1076,10 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
if( !sTmp.isEmpty() && sTmp.getLength() != sWord.getLength() &&
FindInCplSttExceptList(eLang, sTmp))
- return false;
+ return;
if(FindInCplSttExceptList(eLang, sWord, true))
- return false;
+ return;
}
// Ok, then replace
@@ -1094,8 +1092,6 @@ bool SvxAutoCorrect::FnCapitalStartSentence(
SvxAutoCorrDoc& rDoc,
// Perhaps someone wants to have the word
if( bRet && SaveWordCplSttLst & nFlags )
rDoc.SaveCpltSttWord( CapitalStartSentence, nSttPos, sWord, cSave );
-
- return bRet;
}
bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const OUString&
rTxt,
@@ -2585,7 +2581,7 @@ bool SvxAutoCorrectLanguageLists::PutText( const
OUString& rShort, const OUStrin
return bRet;
}
-bool SvxAutoCorrectLanguageLists::PutText( const OUString& rShort,
+void SvxAutoCorrectLanguageLists::PutText( const OUString& rShort,
SfxObjectShell& rShell )
{
// First get the current list!
@@ -2617,8 +2613,6 @@ bool SvxAutoCorrectLanguageLists::PutText( const
OUString& rShort,
catch ( const uno::Exception& )
{
}
-
- return bRet;
}
// Keep the list sorted ...
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 13d1416ece4b..f10334707130 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -218,7 +218,7 @@ void HWPFile::ParaListRead()
ReadParaList(plist);
}
-bool HWPFile::ReadParaList(std::vector < HWPPara* > &aplist)
+void HWPFile::ReadParaList(std::vector < HWPPara* > &aplist)
{
std::unique_ptr<HWPPara> spNode( new HWPPara );
unsigned char tmp_etcflag;
@@ -249,8 +249,6 @@ bool HWPFile::ReadParaList(std::vector < HWPPara* > &aplist)
aplist.push_back(spNode.release());
spNode.reset( new HWPPara );
}
-
- return true;
}
bool HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist,
unsigned char flag)
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index 0f569d358257..645219216ab5 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -162,7 +162,7 @@ class DLLEXPORT HWPFile
* Reads main paragraph list
*/
bool ReadParaList(std::vector<std::unique_ptr<HWPPara>> &aplist,
unsigned char flag = 0);
- bool ReadParaList(std::vector<HWPPara*> &aplist);
+ void ReadParaList(std::vector<HWPPara*> &aplist);
/**
* Sets if the stream is compressed
*/
diff --git a/i18nutil/source/utility/paper.cxx
b/i18nutil/source/utility/paper.cxx
index 0d4b434c061c..c2728f697183 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -157,10 +157,10 @@ static const size_t nTabSize = SAL_N_ELEMENTS(aDinTab);
#define MAXSLOPPY 21
-bool PaperInfo::doSloppyFit()
+void PaperInfo::doSloppyFit()
{
if (m_eType != PAPER_USER)
- return true;
+ return;
for ( size_t i = 0; i < nTabSize; ++i )
{
@@ -174,11 +174,9 @@ bool PaperInfo::doSloppyFit()
m_nPaperWidth = aDinTab[i].m_nWidth;
m_nPaperHeight = aDinTab[i].m_nHeight;
m_eType = static_cast<Paper>(i);
- return true;
+ return;
}
}
-
- return false;
}
bool PaperInfo::sloppyEqual(const PaperInfo &rOther) const
diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index 478c630f311f..6a44d737c5dd 100644
--- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -86,7 +86,7 @@ namespace drawinglayer
sal_uInt32 nIndex,
sal_uInt32 nLength) const;
- bool getTextOutlines(
+ void getTextOutlines(
basegfx::B2DPolyPolygonVector&,
const rtl::OUString& rText,
sal_uInt32 nIndex,
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index a7d03a9a971a..86d3ea3d9154 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -218,7 +218,7 @@ public:
// - pure Text
bool PutText( const OUString& rShort, const OUString& rLong );
// - Text with attribution (only the SWG - SWG format!)
- bool PutText( const OUString& rShort, SfxObjectShell& );
+ void PutText( const OUString& rShort, SfxObjectShell& );
// - Make combined changes in one pass
bool MakeCombinedChanges( std::vector<SvxAutocorrWord>& aNewEntries,
std::vector<SvxAutocorrWord>& aDeleteEntries );
};
@@ -376,7 +376,7 @@ public:
bool bAbbreviation = false);
// Methods for the auto-correction
- bool FnCapitalStartWord( SvxAutoCorrDoc&, const OUString&,
+ void FnCapitalStartWord( SvxAutoCorrDoc&, const OUString&,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang );
bool FnChgOrdinalNumber( SvxAutoCorrDoc&, const OUString&,
@@ -393,7 +393,7 @@ public:
LanguageType eLang );
bool FnChgWeightUnderl( SvxAutoCorrDoc&, const OUString&,
sal_Int32 nEndPos );
- bool FnCapitalStartSentence( SvxAutoCorrDoc&, const OUString&, bool
bNormalPos,
+ void FnCapitalStartSentence( SvxAutoCorrDoc&, const OUString&, bool
bNormalPos,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang);
bool FnCorrectCapsLock( SvxAutoCorrDoc&, const OUString&,
diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx
index cbd13a56c818..75f77de05401 100644
--- a/include/i18nutil/paper.hxx
+++ b/include/i18nutil/paper.hxx
@@ -128,7 +128,7 @@ public:
long getWidth() const { return m_nPaperWidth; }
long getHeight() const { return m_nPaperHeight; }
bool sloppyEqual(const PaperInfo &rOther) const;
- bool doSloppyFit();
+ void doSloppyFit();
static PaperInfo getSystemDefaultPaper();
static PaperInfo getDefaultPaperForLocale(const css::lang::Locale &
rLocale);
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index ed939d32e7fe..a7def55012e5 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -100,7 +100,7 @@ public:
void InsertDDELink( SvBaseLink* );
// Connect the links to a pseudo-object and add to the list
- bool InsertFileLink( sfx2::SvBaseLink&,
+ void InsertFileLink( sfx2::SvBaseLink&,
sal_uInt16 nFileType,
const OUString& rFileNm,
const OUString* pFilterNm = nullptr,
diff --git a/include/sfx2/templatelocalview.hxx
b/include/sfx2/templatelocalview.hxx
index 975aa40f0b75..7617ceb297a5 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -125,7 +125,7 @@ public:
bool moveTemplate (const ThumbnailViewItem* pItem, const sal_uInt16
nSrcItem,
const sal_uInt16 nTargetItem);
- bool moveTemplates (const std::set<const
ThumbnailViewItem*,selection_cmp_fn> &rItems, const sal_uInt16 nTargetItem);
+ void moveTemplates (const std::set<const
ThumbnailViewItem*,selection_cmp_fn> &rItems, const sal_uInt16 nTargetItem);
bool copyFrom(TemplateContainerItem *pItem, const OUString &rPath);
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index f720ce184d12..3f191502b305 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -126,7 +126,7 @@ public:
static void ReleaseObject(SgaObject* pObj);
bool InsertObject(const SgaObject& rObj, sal_uInt32
nPos = SAL_MAX_UINT32);
- bool RemoveObject(sal_uInt32 nPos);
+ void RemoveObject(sal_uInt32 nPos);
SAL_DLLPRIVATE bool ChangeObjectPos(sal_uInt32 nOldPos, sal_uInt32
nNewPos);
const OUString& GetName() const;
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 4da4d057efb8..edeccfa5984a 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -189,7 +189,7 @@ public:
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const OUString& rMimeType, const css::uno::Any & rValue ) override;
- bool Connect() { return GetRealObject() != nullptr; }
+ void Connect() { GetRealObject(); }
};
#endif // INCLUDED_SVX_SVDOOLE2_HXX
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index b5d3edb68e59..2d462a44ddb1 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -699,10 +699,8 @@ SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool()
return mpDoc->GetStyleSheetPool();
}
-bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
+void DrawDocShell::GotoBookmark(const OUString& rBookmark)
{
- bool bFound = false;
-
if (mpViewShell && dynamic_cast< const DrawViewShell *>( mpViewShell ) !=
nullptr)
{
DrawViewShell* pDrawViewShell =
static_cast<DrawViewShell*>(mpViewShell);
@@ -762,7 +760,6 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
{
// Jump to the bookmarked page. This is done in three steps.
- bFound = true;
SdPage* pPage;
if (bIsMasterPage)
pPage = static_cast<SdPage*>(
mpDoc->GetMasterPage(nPageNumber) );
@@ -774,7 +771,7 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
PageKind eNewPageKind = pPage->GetPageKind();
if( (eNewPageKind != PageKind::Standard) &&
(mpDoc->GetDocumentType() == DocumentType::Draw) )
- return false;
+ return;
if (eNewPageKind != pDrawViewShell->GetPageKind())
{
@@ -857,8 +854,6 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
rBindings.Invalidate(SID_NAVIGATOR_STATE, true);
rBindings.Invalidate(SID_NAVIGATOR_PAGENAME);
}
-
- return bFound;
}
/**
diff --git a/sd/source/ui/inc/DrawDocShell.hxx
b/sd/source/ui/inc/DrawDocShell.hxx
index 61b491565170..7638d35b61b2 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -129,7 +129,7 @@ public:
void Disconnect(sd::ViewShell const * pViewSh);
void UpdateTablePointers();
- bool GotoBookmark(const OUString& rBookmark);
+ void GotoBookmark(const OUString& rBookmark);
Bitmap GetPagePreviewBitmap(SdPage* pPage);
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 3d50e77825c5..c6c29dbce508 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -311,7 +311,7 @@ public:
return m_aResults;
}
- bool collect()
+ void collect()
{
// Set to MASTER mode
EditMode eOldMode = m_rDrawViewShell.GetEditMode();
@@ -345,13 +345,12 @@ public:
if (hasCustomPropertyField(aSections,
m_aKeyCreator.makeCategoryNameKey()))
{
iterateSectionsAndCollect(aSections, rEditText);
- return true;
+ return;
}
}
}
}
}
- return false;
}
};
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 4f91e64a1343..b6d5d4eb91fb 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -434,12 +434,12 @@ void LinkManager::LinkServerShell(const OUString& rPath,
SfxObjectShell& rServer
}
}
-bool LinkManager::InsertFileLink(
+void LinkManager::InsertFileLink(
sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const OUString& rFileNm,
const OUString* pFilterNm, const OUString* pRange)
{
if (!(OBJECT_CLIENT_SO & rLink.GetObjType()))
- return false;
+ return;
OUStringBuffer aBuf;
aBuf.append(rFileNm);
@@ -455,7 +455,7 @@ bool LinkManager::InsertFileLink(
}
OUString aCmd = aBuf.makeStringAndClear();
- return InsertLink(&rLink, nFileType, SfxLinkUpdateMode::ONCALL, &aCmd);
+ InsertLink(&rLink, nFileType, SfxLinkUpdateMode::ONCALL, &aCmd);
}
// A transfer is aborted, so cancel all download media
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 958429f6e005..76f79fafb501 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -573,11 +573,9 @@ bool TemplateLocalView::moveTemplate (const
ThumbnailViewItem *pItem, const sal_
return false;
}
-bool TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*,
selection_cmp_fn> &rItems,
+void TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*,
selection_cmp_fn> &rItems,
const sal_uInt16 nTargetItem)
{
- bool ret = true;
-
TemplateContainerItem *pTarget = nullptr;
TemplateContainerItem *pSrc = nullptr;
@@ -623,12 +621,11 @@ bool TemplateLocalView::moveTemplates(const
std::set<const ThumbnailViewItem*, s
sMsg =
sMsg.replaceFirst("$1",getRegionName(nTargetRegion));
ScopedVclPtrInstance<MessageDialog>(this,
sMsg.replaceFirst( "$2",pViewItem->maTitle))->Execute();
- return false; //return if any single move operation
fails
+ return; //return if any single move operation fails
}
if
(!mpDocTemplates->Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnDocId))
{
- ret = false;
continue;
}
}
@@ -691,10 +688,6 @@ bool TemplateLocalView::moveTemplates(const std::set<const
ThumbnailViewItem*, s
Invalidate();
}
}
- else
- ret = false;
-
- return ret;
}
bool TemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUString
&rPath)
diff --git a/slideshow/source/engine/eventmultiplexer.cxx
b/slideshow/source/engine/eventmultiplexer.cxx
index 88b64ddd8143..d93aea365871 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -1127,9 +1127,9 @@ void EventMultiplexer::notifyViewRemoved( const
UnoViewSharedPtr& rView )
{ return pHandler.lock()->viewRemoved( rView ); } );
}
-bool EventMultiplexer::notifyViewChanged( const UnoViewSharedPtr& rView )
+void EventMultiplexer::notifyViewChanged( const UnoViewSharedPtr& rView )
{
- return mpImpl->maViewHandlers.applyAll(
+ mpImpl->maViewHandlers.applyAll(
[&rView]( const ViewEventHandlerWeakPtr& pHandler )
{ return pHandler.lock()->viewChanged( rView ); } );
}
diff --git a/slideshow/source/inc/eventmultiplexer.hxx
b/slideshow/source/inc/eventmultiplexer.hxx
index 5a34fc08bcd0..209184bc274a 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -461,7 +461,7 @@ public:
@param rView
View that has changed
*/
- bool notifyViewChanged( const UnoViewSharedPtr& rView );
+ void notifyViewChanged( const UnoViewSharedPtr& rView );
/** View changed
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index e718a4ed7ca5..74f5ef77c45f 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -24,16 +24,15 @@ SmOoxmlExport::SmOoxmlExport(const SmNode *const pIn,
OoxmlVersion const v,
{
}
-bool SmOoxmlExport::ConvertFromStarMath( const ::sax_fastparser::FSHelperPtr&
serializer )
+void SmOoxmlExport::ConvertFromStarMath( const ::sax_fastparser::FSHelperPtr&
serializer )
{
if( m_pTree == nullptr )
- return false;
+ return;
m_pSerializer = serializer;
m_pSerializer->startElementNS( XML_m, XML_oMath,
FSNS( XML_xmlns, XML_m ),
"http://schemas.openxmlformats.org/officeDocument/2006/math";, FSEND );
HandleNode( m_pTree, 0 );
m_pSerializer->endElementNS( XML_m, XML_oMath );
- return true;
}
// NOTE: This is still work in progress and unfinished, but it already covers
a good
diff --git a/starmath/source/ooxmlexport.hxx b/starmath/source/ooxmlexport.hxx
index fac866b05d2f..f7e05d7d165f 100644
--- a/starmath/source/ooxmlexport.hxx
+++ b/starmath/source/ooxmlexport.hxx
@@ -24,7 +24,7 @@ class SmOoxmlExport : public SmWordExportBase
public:
SmOoxmlExport(const SmNode* pIn, oox::core::OoxmlVersion version,
oox::drawingml::DocumentType documentType);
- bool ConvertFromStarMath( const ::sax_fastparser::FSHelperPtr&
m_pSerializer );
+ void ConvertFromStarMath( const ::sax_fastparser::FSHelperPtr&
m_pSerializer );
private:
void HandleVerticalStack( const SmNode* pNode, int nLevel ) override;
void HandleText( const SmNode* pNode, int nLevel ) override;
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 8b63c7ab3b5b..7c3705f85ae7 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -453,7 +453,7 @@ void GalleryTheme::ReleaseObject( SgaObject* pObject )
delete pObject;
}
-bool GalleryTheme::RemoveObject(sal_uInt32 nPos)
+void GalleryTheme::RemoveObject(sal_uInt32 nPos)
{
GalleryObject* pEntry = nullptr;
if ( nPos < aObjectList.size() )
@@ -475,13 +475,10 @@ bool GalleryTheme::RemoveObject(sal_uInt32 nPos)
Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(),
pEntry ) );
Broadcast( GalleryHint( GalleryHintType::OBJECT_REMOVED, GetName(),
pEntry ) );
delete pEntry;
- pEntry = nullptr;
ImplSetModified( true );
ImplBroadcast( nPos );
}
-
- return( pEntry != nullptr );
}
bool GalleryTheme::ChangeObjectPos(sal_uInt32 nOldPos, sal_uInt32 nNewPos)
commit 945a119675788f7c8f0a133ac0271f9340c1653a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Jan 23 12:22:26 2018 +0200
loplugin:constparams
Change-Id: I7c695073d9a9d3b7a641d6eb9fe01a47d8c3a504
Reviewed-on: https://gerrit.libreoffice.org/48392
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basctl/source/basicide/basobj3.cxx
b/basctl/source/basicide/basobj3.cxx
index 246486331538..7043bba6110a 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
extern "C" {
- SAL_DLLPUBLIC_EXPORT long basicide_handle_basic_error( void * pPtr )
+ SAL_DLLPUBLIC_EXPORT long basicide_handle_basic_error( void const * pPtr )
{
return HandleBasicError( static_cast<StarBASIC const *>(pPtr) );
}
diff --git a/compilerplugins/clang/constparams.cxx
b/compilerplugins/clang/constparams.cxx
index f075d0c06edc..89be6f684033 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -209,6 +209,8 @@ bool ConstParams::CheckTraverseFunctionDecl(FunctionDecl *
functionDecl)
|| name == "Read_Footnote"
|| name == "Read_Field"
|| name == "Read_And"
+ // passed as a LINK<> to another method
+ || name == "GlobalBasicErrorHdl_Impl"
)
return false;
}
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 7001ee86cfd5..1b78d4547740 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -44,7 +44,7 @@ private:
public:
- E3dExtrudeObj(E3dDefaultAttributes& rDefault, const
basegfx::B2DPolyPolygon& rPP, double fDepth);
+ E3dExtrudeObj(E3dDefaultAttributes const & rDefault, const
basegfx::B2DPolyPolygon& rPP, double fDepth);
E3dExtrudeObj();
// PercentDiagonal: 0..100, before 0.0..0.5
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index acc1e4186ce2..3c5a0e23b015 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -42,7 +42,7 @@ class SVX_DLLPUBLIC E3dLatheObj final : public
E3dCompoundObject
void SetDefaultAttributes(E3dDefaultAttributes const & rDefault);
public:
- E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon&
rPoly2D);
+ E3dLatheObj(E3dDefaultAttributes const & rDefault, const
basegfx::B2DPolyPolygon& rPoly2D);
E3dLatheObj();
// HorizontalSegments:
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index f48ad47f2937..ff5388f53d5f 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -251,7 +251,7 @@ private:
bool consume(EventList&);
void deleteUsedEvents();
void sendPendingCharacters();
- void addUnknownElementWithPrefix(const xmlChar **attributes, int i,
rtl::Reference< FastAttributeList >& xAttributes);
+ void addUnknownElementWithPrefix(const xmlChar **attributes, int i,
rtl::Reference< FastAttributeList > const & xAttributes);
sal_Int32 GetToken( const xmlChar* pName, sal_Int32 nameLen );
/// @throws css::xml::sax::SAXException
@@ -1231,7 +1231,7 @@ void FastSaxParserImpl::callbackStartElement(const
xmlChar *localName , const xm
}
}
-void FastSaxParserImpl::addUnknownElementWithPrefix(const xmlChar
**attributes, int i, rtl::Reference< FastAttributeList >& xAttributes)
+void FastSaxParserImpl::addUnknownElementWithPrefix(const xmlChar
**attributes, int i, rtl::Reference< FastAttributeList > const & xAttributes)
{
OUString aNamespaceURI;
if ( !m_bIgnoreMissingNSDecl || attributes[i + 2] != nullptr )
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index d8a47d600e19..77ad1046294a 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1029,9 +1029,9 @@ public:
// return TRUE = number format is set
SC_DLLPUBLIC bool SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const
OUString& rString,
- ScSetStringParam* pParam = nullptr );
+ const ScSetStringParam * pParam = nullptr );
SC_DLLPUBLIC bool SetString( const ScAddress& rPos, const OUString&
rString,
- ScSetStringParam* pParam = nullptr );
+ const ScSetStringParam* pParam = nullptr );
/**
* This method manages the lifecycle of the passed edit text object. When
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index ac1b6f406fca..9698b4fbc462 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -406,7 +406,7 @@ public:
bool IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, bool bIgnoreNotes ) const;
bool SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString&
rString,
- ScSetStringParam* pParam = nullptr );
+ const ScSetStringParam * pParam = nullptr );
bool SetEditText( SCCOL nCol, SCROW nRow, EditTextObject* pEditText );
void SetEditText( SCCOL nCol, SCROW nRow, const EditTextObject& rEditText,
const SfxItemPool* pEditPool );
@@ -505,7 +505,7 @@ public:
sc::CopyFromClipContext& rCxt, const ScTable& rClipTab,
sc::ColumnSpanSet& rBroadcastSpans );
void CopyOneCellFromClip(
- sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2, SCROW nSrcRow, ScTable* pSrcTab );
+ sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2, SCROW nSrcRow, const ScTable* pSrcTab );
void CopyFromClip(
sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
@@ -531,7 +531,7 @@ public:
InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab );
void CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
- SCCOL nDx, SCROW nDy, ScTable* pTable);
+ SCCOL nDx, SCROW nDy, const ScTable* pTable);
void TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2,
ScTable* pTransClip, InsertDeleteFlags nFlags,
bool bAsLink );
@@ -1077,11 +1077,11 @@ private:
void FillSeriesSimple(
const ScCellValue& rSrcCell, SCCOLROW& rInner, SCCOLROW nIMin,
SCCOLROW nIMax,
- SCCOLROW& rCol, SCCOLROW& rRow, bool bVertical, ScProgress* pProgress,
sal_uLong& rProgress );
+ const SCCOLROW& rCol, const SCCOLROW& rRow, bool bVertical,
ScProgress* pProgress, sal_uLong& rProgress );
void FillAutoSimple(
SCCOLROW nISrcStart, SCCOLROW nISrcEnd, SCCOLROW nIStart, SCCOLROW
nIEnd,
- SCCOLROW& rInner, SCCOLROW& rCol, SCCOLROW& rRow,
+ SCCOLROW& rInner, const SCCOLROW& rCol, const SCCOLROW& rRow,
sal_uLong nActFormCnt, sal_uLong nMaxFormCnt,
bool bHasFiltered, bool bVertical, bool bPositive,
ScProgress* pProgress, sal_uLong& rProgress );
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index ea48500ad16b..f4e2d98bb41c 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3360,7 +3360,7 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const
ScMarkData& rMark,
}
bool ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const
OUString& rString,
- ScSetStringParam* pParam )
+ const ScSetStringParam* pParam )
{
ScTable* pTab = FetchTable(nTab);
if (!pTab)
@@ -3399,7 +3399,7 @@ bool ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB
nTab, const OUString&
}
bool ScDocument::SetString(
- const ScAddress& rPos, const OUString& rString, ScSetStringParam* pParam )
+ const ScAddress& rPos, const OUString& rString, const ScSetStringParam*
pParam )
{
return SetString(rPos.Col(), rPos.Row(), rPos.Tab(), rString, pParam);
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index de8eb7a9f5ba..2c5ed4149566 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -566,7 +566,7 @@ void ScTable::CopyCellToDocument(SCCOL nSrcCol, SCROW
nSrcRow, SCCOL nDestCol, S
}
void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
- SCCOL nDx, SCROW nDy, ScTable* pTable)
+ SCCOL nDx, SCROW nDy, const ScTable* pTable)
{
ScRange aOldRange( nCol1 - nDx, nRow1 - nDy, pTable->nTab, nCol2 - nDx,
nRow2 - nDy, pTable->nTab);
ScRange aNewRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab );
@@ -1386,7 +1386,7 @@ bool ScTable::TestCopyScenarioTo( const ScTable* pDestTab
) const
}
bool ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const OUString&
rString,
- ScSetStringParam* pParam )
+ const ScSetStringParam * pParam )
{
if (ValidColRow(nCol,nRow))
return aCol[nCol].SetString(
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 64ac8f3088b1..805915768a4d 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1268,7 +1268,7 @@ void ScTable::FillFormulaVertical(
void ScTable::FillSeriesSimple(
const ScCellValue& rSrcCell, SCCOLROW& rInner, SCCOLROW nIMin, SCCOLROW
nIMax,
- SCCOLROW& rCol, SCCOLROW& rRow, bool bVertical, ScProgress* pProgress,
sal_uLong& rProgress )
+ const SCCOLROW& rCol, const SCCOLROW& rRow, bool bVertical, ScProgress*
pProgress, sal_uLong& rProgress )
{
bool bHidden = false;
SCCOLROW nHiddenLast = -1;
@@ -1348,7 +1348,7 @@ void ScTable::FillSeriesSimple(
void ScTable::FillAutoSimple(
SCCOLROW nISrcStart, SCCOLROW nISrcEnd, SCCOLROW nIStart, SCCOLROW nIEnd,
- SCCOLROW& rInner, SCCOLROW& rCol, SCCOLROW& rRow, sal_uLong nActFormCnt,
+ SCCOLROW& rInner, const SCCOLROW& rCol, const SCCOLROW& rRow, sal_uLong
nActFormCnt,
sal_uLong nMaxFormCnt, bool bHasFiltered, bool bVertical, bool bPositive,
ScProgress* pProgress, sal_uLong& rProgress )
{
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index 6fe30a795fa7..1c6e16cf36fb 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -118,7 +118,7 @@ void ScTable::DeleteBeforeCopyFromClip(
}
void ScTable::CopyOneCellFromClip(
- sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2, SCROW nSrcRow, ScTable* pSrcTab )
+ sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2, SCROW nSrcRow, const ScTable* pSrcTab )
{
ScRange aSrcRange = rCxt.getClipDoc()->GetClipParam().getWholeRange();
SCCOL nSrcColSize = aSrcRange.aEnd.Col() - aSrcRange.aStart.Col() + 1;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 9c4dea3defdf..9780f9f6839c 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -31,7 +31,7 @@
class Class : public SfxChildWindow
\
{
\
public:
\
- Class( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
\
+ Class( vcl::Window*, sal_uInt16, SfxBindings*, const SfxChildWinInfo*
); \
SFX_DECL_CHILDWINDOW_WITHID(Class);
\
};
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index c4c0d419f9c4..2213e91a8df7 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -78,7 +78,7 @@ namespace
Class::Class( vcl::Window* pParentP, \
sal_uInt16 nId, \
SfxBindings* p, \
- SfxChildWinInfo* pInfo ) \
+ const SfxChildWinInfo* pInfo ) \
: SfxChildWindow(pParentP, nId) \
{ \
/************************************************************************************/\
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index d9828d355afa..a55c45e7a093 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1107,7 +1107,7 @@ static void pad_or_truncate_to_32( const OString& rStr,
sal_Char* pBuffer )
}
// pass at least pData->m_nKeyLength bytes in
-static sal_uInt32 password_to_key( const OString& rPwd, sal_uInt8* pOutKey,
PDFFileImplData* pData, bool bComputeO )
+static sal_uInt32 password_to_key( const OString& rPwd, sal_uInt8* pOutKey,
PDFFileImplData const * pData, bool bComputeO )
{
// see PDF reference 1.4 Algorithm 3.2
// encrypt pad string
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 82e1d6394f7b..b572ff23cb61 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -417,7 +417,7 @@ void SfxApplication::Invalidate( sal_uInt16 nId )
#ifndef DISABLE_DYNLOADING
-typedef long (*basicide_handle_basic_error)(void*);
+typedef long (*basicide_handle_basic_error)(void const *);
typedef void (*basicide_macro_organizer)(sal_Int16);
extern "C" { static void thisModule() {} }
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 971e6f6e263d..acbf7e427bd7 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -130,7 +130,7 @@ OUString getHelpRootURL()
return s_instURL;
}
-bool impl_checkHelpLocalePath(OUString& rpPath)
+bool impl_checkHelpLocalePath(OUString const & rpPath)
{
osl::DirectoryItem directoryItem;
bool bOK = false;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index bfc4476fdcd0..0e50ed9141ac 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3401,7 +3401,7 @@ bool SfxMedium::SetWritableForUserOnly( const OUString&
aURL )
namespace
{
/// Get the parent directory of a temporary file for output purposes.
-OUString GetLogicBase(std::unique_ptr<SfxMedium_Impl>& pImpl)
+OUString GetLogicBase(std::unique_ptr<SfxMedium_Impl> const & pImpl)
{
OUString aLogicBase;
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 6e52248eb82a..15fb042ef0e9 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -69,7 +69,7 @@ namespace {
// #i86923#
Node* findChildNode( const SfxPoolItem& rItem,
const bool bIsItemIgnorable );
- Node* nextItemSet( Node* pLast,
+ Node* nextItemSet( Node const * pLast,
const bool bSkipUnusedItemSet,
const bool bSkipIgnorable );
// #i86923#
@@ -155,7 +155,7 @@ namespace {
* introduce parameters <bSkipUnusedItemSets> and <bSkipIgnorable>
* and its handling.
*/
- Node* Node::nextItemSet( Node* pLast,
+ Node* Node::nextItemSet( Node const * pLast,
const bool bSkipUnusedItemSets,
const bool bSkipIgnorable )
{
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 8a4e829454fb..3b3bb93956c3 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -55,7 +55,7 @@ sdr::properties::BaseProperties*
E3dExtrudeObj::CreateObjectSpecificProperties()
// Constructor creates a two cover surface tools::PolyPolygon and (point-count
1) side
// surfaces rectangles from the passed PolyPolygon
-E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const
basegfx::B2DPolyPolygon& rPP, double fDepth)
+E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes const & rDefault, const
basegfx::B2DPolyPolygon& rPP, double fDepth)
: E3dCompoundObject(),
maExtrudePolygon(rPP)
{
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index c2fb0f5ac1b1..99268c6d5ff8 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -52,7 +52,7 @@ sdr::properties::BaseProperties*
E3dLatheObj::CreateObjectSpecificProperties()
// Constructor from 3D polygon, scale is the conversion factor for the
coordinates
-E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const
basegfx::B2DPolyPolygon& rPoly2D)
+E3dLatheObj::E3dLatheObj(E3dDefaultAttributes const & rDefault, const
basegfx::B2DPolyPolygon& rPoly2D)
: E3dCompoundObject(),
maPolyPoly2D(rPoly2D)
{
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index a53539ff0c35..8a14da00bfdd 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -519,7 +519,7 @@ public:
bool BegCreate(SdrDragStat& rStat);
bool MovCreate(SdrDragStat& rStat);
bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- bool BckCreate(SdrDragStat& rStat);
+ bool BckCreate(SdrDragStat const & rStat);
void BrkCreate(SdrDragStat& rStat);
Pointer GetCreatePointer() const;
@@ -1504,7 +1504,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat&
rStat, SdrCreateCmd eCmd)
return bRet;
}
-bool ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat)
+bool ImpPathForDragAndCreate::BckCreate(SdrDragStat const & rStat)
{
ImpPathCreateUser* pU=static_cast<ImpPathCreateUser*>(rStat.GetUser());
if (aPathPolygon.Count()>0) {
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 4d939b4cba8d..4115bb6f9e6b 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -3224,7 +3224,7 @@ void SwHTMLParser::DeleteAttr( HTMLAttr* pAttr )
*ppHead = pNext;
}
-void SwHTMLParser::SaveAttrTab(std::shared_ptr<HTMLAttrTable>& rNewAttrTab)
+void SwHTMLParser::SaveAttrTab(std::shared_ptr<HTMLAttrTable> const &
rNewAttrTab)
{
// preliminary paragraph attributes are not allowed here, they could
// be set here and then the pointers become invalid!
@@ -3251,7 +3251,7 @@ void
SwHTMLParser::SaveAttrTab(std::shared_ptr<HTMLAttrTable>& rNewAttrTab)
}
}
-void SwHTMLParser::SplitAttrTab( std::shared_ptr<HTMLAttrTable>& rNewAttrTab,
+void SwHTMLParser::SplitAttrTab( std::shared_ptr<HTMLAttrTable> const &
rNewAttrTab,
bool bMoveEndBack )
{
// preliminary paragraph attributes are not allowed here, they could
@@ -3352,7 +3352,7 @@ void SwHTMLParser::SplitAttrTab(
std::shared_ptr<HTMLAttrTable>& rNewAttrTab,
}
}
-void SwHTMLParser::RestoreAttrTab(std::shared_ptr<HTMLAttrTable>& rNewAttrTab)
+void SwHTMLParser::RestoreAttrTab(std::shared_ptr<HTMLAttrTable> const &
rNewAttrTab)
{
// preliminary paragraph attributes are not allowed here, they could
// be set here and then the pointers become invalid!
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 9674a8892eaf..e61ff697bc41 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -535,10 +535,10 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
void DeleteAttr( HTMLAttr* pAttr );
void EndContextAttrs( HTMLAttrContext *pContext );
- void SaveAttrTab(std::shared_ptr<HTMLAttrTable>& rNewAttrTab);
+ void SaveAttrTab(std::shared_ptr<HTMLAttrTable> const & rNewAttrTab);
void SplitAttrTab( const SwPosition& rNewPos );
- void SplitAttrTab(std::shared_ptr<HTMLAttrTable>& rNewAttrTab, bool
bMoveEndBack);
- void RestoreAttrTab(std::shared_ptr<HTMLAttrTable>& rNewAttrTab);
+ void SplitAttrTab(std::shared_ptr<HTMLAttrTable> const & rNewAttrTab, bool
bMoveEndBack);
+ void RestoreAttrTab(std::shared_ptr<HTMLAttrTable> const & rNewAttrTab);
void InsertAttr( const SfxPoolItem& rItem, bool bInsAtStart );
void InsertAttrs( HTMLAttrs& rAttrs );
diff --git a/unotools/source/config/useroptions.cxx
b/unotools/source/config/useroptions.cxx
index adf58180204a..fbc7aaf37f6f 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -98,7 +98,7 @@ public:
OUString GetToken (UserOptToken nToken) const;
void SetToken (UserOptToken nToken, OUString const& rNewToken);
bool GetBoolValue (UserOptToken nToken) const;
- void SetBoolValue (UserOptToken nToken, bool& bNewValue);
+ void SetBoolValue (UserOptToken nToken, bool bNewValue);
void Notify ();
private:
@@ -207,7 +207,7 @@ bool SvtUserOptions::Impl::GetBoolValue (UserOptToken
nToken) const
return GetValue_Impl<bool>( nToken );
}
-void SvtUserOptions::Impl::SetBoolValue (UserOptToken nToken, bool& bNewValue)
+void SvtUserOptions::Impl::SetBoolValue (UserOptToken nToken, bool bNewValue)
{
SetValue_Impl<bool>( nToken, bNewValue );
}
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index c23aa86b464a..f22086e3d224 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -421,7 +421,7 @@ namespace {
// Ensures that the indicator is reset after exiting OOXMLDocumentImpl::resolve
class StatusIndicatorGuard{
public:
- explicit
StatusIndicatorGuard(css::uno::Reference<css::task::XStatusIndicator>&
xStatusIndicator)
+ explicit
StatusIndicatorGuard(css::uno::Reference<css::task::XStatusIndicator> const &
xStatusIndicator)
:mxStatusIndicator(xStatusIndicator)
{
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
