[Libreoffice-commits] core.git: 2 commits - connectivity/source editeng/source include/editeng
Noel Grandin
noel at peralex.com
Thu Mar 3 07:43:15 UTC 2016
connectivity/source/drivers/dbase/DIndex.cxx | 5 -
connectivity/source/drivers/dbase/dindexnode.cxx | 4 -
connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 32 +-------
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 9 --
connectivity/source/drivers/postgresql/pq_preparedstatement.hxx | 2
connectivity/source/drivers/postgresql/pq_statement.cxx | 8 --
connectivity/source/drivers/postgresql/pq_statement.hxx | 2
connectivity/source/inc/dbase/DIndex.hxx | 3
connectivity/source/inc/dbase/dindexnode.hxx | 2
connectivity/source/inc/hsqldb/HStorageAccess.hxx | 8 +-
editeng/source/accessibility/AccessibleParaManager.cxx | 5 -
editeng/source/editeng/editeng.cxx | 21 ++---
editeng/source/editeng/editobj.cxx | 4 -
editeng/source/editeng/eehtml.cxx | 15 +---
editeng/source/editeng/eehtml.hxx | 2
editeng/source/editeng/impedit.cxx | 6 -
editeng/source/editeng/impedit.hxx | 10 +-
editeng/source/editeng/impedit2.cxx | 21 ++---
editeng/source/items/numitem.cxx | 7 -
editeng/source/items/paperinf.cxx | 6 -
editeng/source/items/paraitem.cxx | 7 -
editeng/source/misc/svxacorr.cxx | 5 -
editeng/source/outliner/outlin2.cxx | 12 +--
editeng/source/outliner/outliner.cxx | 37 +---------
editeng/source/outliner/outlvw.cxx | 8 +-
editeng/source/rtf/rtfitem.cxx | 8 +-
editeng/source/rtf/svxrtf.cxx | 12 ---
editeng/source/uno/unoedprx.cxx | 4 -
include/editeng/AccessibleParaManager.hxx | 3
include/editeng/borderline.hxx | 2
include/editeng/editeng.hxx | 12 +--
include/editeng/editobj.hxx | 3
include/editeng/numitem.hxx | 2
include/editeng/outliner.hxx | 18 ++--
include/editeng/paperinf.hxx | 2
include/editeng/splwrap.hxx | 2
include/editeng/svxacorr.hxx | 3
include/editeng/svxrtf.hxx | 4 -
include/editeng/tstpitem.hxx | 3
39 files changed, 114 insertions(+), 205 deletions(-)
New commits:
commit b76842f63b19e9855fbdfee7c201ff73672464b6
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 3 08:56:35 2016 +0200
loplugin:unuseddefaultparams in editeng
Change-Id: I1dc0ba262c06bd69cf92aae20b344fe23f460f55
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index f57576f..4fbcd90 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -96,8 +96,7 @@ namespace accessibility
void AccessibleParaManager::FireEvent( sal_Int32 nPara,
const sal_Int16 nEventId,
- const uno::Any& rNewValue,
- const uno::Any& rOldValue ) const
+ const uno::Any& rNewValue ) const
{
DBG_ASSERT( 0 <= nPara && maChildren.size() > static_cast<size_t>(nPara),
"AccessibleParaManager::FireEvent: invalid index" );
@@ -106,7 +105,7 @@ namespace accessibility
{
auto maChild( GetChild( nPara ).first.get() );
if( maChild.is() )
- maChild->FireEvent( nEventId, rNewValue, rOldValue );
+ maChild->FireEvent( nEventId, rNewValue, css::uno::Any() );
}
}
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index efcf607..d69a1af 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -551,10 +551,10 @@ OUString EditEngine::GetText( LineEnd eEnd ) const
return pImpEditEngine->GetEditDoc().GetText( eEnd );
}
-OUString EditEngine::GetText( const ESelection& rESelection, const LineEnd eEnd ) const
+OUString EditEngine::GetText( const ESelection& rESelection ) const
{
EditSelection aSel( pImpEditEngine->CreateSel( rESelection ) );
- return pImpEditEngine->GetSelected( aSel, eEnd );
+ return pImpEditEngine->GetSelected( aSel );
}
sal_uInt32 EditEngine::GetTextLen() const
@@ -799,9 +799,9 @@ EditSelection EditEngine::InsertText(
return pImpEditEngine->InsertText(rxDataObj, rBaseURL, rPaM, bUseSpecial);
}
-EditPaM EditEngine::EndOfWord(const EditPaM& rPaM, sal_Int16 nWordType)
+EditPaM EditEngine::EndOfWord(const EditPaM& rPaM)
{
- return pImpEditEngine->EndOfWord(rPaM, nWordType);
+ return pImpEditEngine->EndOfWord(rPaM);
}
EditPaM EditEngine::GetPaM(const Point& aDocPos, bool bSmart)
@@ -873,9 +873,9 @@ const ParaPortionList& EditEngine::GetParaPortions() const
}
void EditEngine::SeekCursor(
- ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut, sal_uInt16 nIgnoreWhich)
+ ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut)
{
- pImpEditEngine->SeekCursor(pNode, nPos, rFont, pOut, nIgnoreWhich);
+ pImpEditEngine->SeekCursor(pNode, nPos, rFont, pOut);
}
EditPaM EditEngine::DeleteSelection(const EditSelection& rSel)
@@ -908,9 +908,9 @@ void EditEngine::SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, s
pImpEditEngine->SetAttribs(rSel, rSet, nSpecial);
}
-OUString EditEngine::GetSelected(const EditSelection& rSel, const LineEnd eParaSep) const
+OUString EditEngine::GetSelected(const EditSelection& rSel) const
{
- return pImpEditEngine->GetSelected(rSel, eParaSep);
+ return pImpEditEngine->GetSelected(rSel);
}
EditPaM EditEngine::DeleteSelected(const EditSelection& rSel)
@@ -2732,10 +2732,9 @@ void EditEngine::CallImportHandler(ImportInfo& rInfo)
pImpEditEngine->aImportHdl.Call(rInfo);
}
-EditPaM EditEngine::InsertParaBreak(
- const EditSelection& rEditSelection, bool bKeepEndingAttribs)
+EditPaM EditEngine::InsertParaBreak(const EditSelection& rEditSelection)
{
- return pImpEditEngine->ImpInsertParaBreak(rEditSelection, bKeepEndingAttribs);
+ return pImpEditEngine->ImpInsertParaBreak(rEditSelection);
}
EditPaM EditEngine::InsertLineBreak(const EditSelection& rEditSelection)
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 77783c9..eadcd4c 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -369,7 +369,7 @@ void EditTextObject::Store( SvStream& rOStream ) const
rOStream.Seek( nEndPos );
}
-EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool )
+EditTextObject* EditTextObject::Create( SvStream& rIStream )
{
sal_Size nStartPos = rIStream.Tell();
@@ -390,7 +390,7 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobal
if ( rIStream.GetError() )
return nullptr;
- EditTextObject* pTxtObj = new EditTextObject(pGlobalTextObjectPool);
+ EditTextObject* pTxtObj = new EditTextObject(nullptr);
pTxtObj->CreateData(rIStream);
// Make sure that the stream is left at the correct place.
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 0d060ce..d250b78 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -521,20 +521,17 @@ void EditHTMLParser::ImpInsertParaBreak()
aCurSel = mpEditEngine->InsertParaBreak(aCurSel);
}
-void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSel )
+void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems )
{
// pSel, when character attributes, otherwise paragraph attributes for
// the current paragraph.
- DBG_ASSERT( pSel || ( aCurSel.Min().GetNode() == aCurSel.Max().GetNode() ), "ImpInsertAttribs: Selection?" );
+ DBG_ASSERT( aCurSel.Min().GetNode() == aCurSel.Max().GetNode(), "ImpInsertAttribs: Selection?" );
- EditPaM aStartPaM( pSel ? pSel->Min() : aCurSel.Min() );
- EditPaM aEndPaM( pSel ? pSel->Max() : aCurSel.Max() );
+ EditPaM aStartPaM( aCurSel.Min() );
+ EditPaM aEndPaM( aCurSel.Max() );
- if ( !pSel )
- {
- aStartPaM.SetIndex( 0 );
- aEndPaM.SetIndex( aEndPaM.GetNode()->Len() );
- }
+ aStartPaM.SetIndex( 0 );
+ aEndPaM.SetIndex( aEndPaM.GetNode()->Len() );
if (mpEditEngine->IsImportHandlerSet())
{
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index 92c2582..66af55e 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -62,7 +62,7 @@ private:
void ImpInsertParaBreak();
void ImpInsertText( const OUString& rText );
- void ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSel = nullptr );
+ void ImpSetAttribs( const SfxItemSet& rItems );
void ImpSetStyleSheet( sal_uInt16 nHeadingLevel );
protected:
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 77c0a72..b3b09d7 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -719,7 +719,7 @@ void ImpEditView::CalcAnchorPoint()
}
}
-void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, sal_uInt16 nShowCursorFlags )
+void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor )
{
// No ShowCursor in an empty View ...
if ( ( aOutArea.Left() >= aOutArea.Right() ) && ( aOutArea.Top() >= aOutArea.Bottom() ) )
@@ -750,9 +750,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, sal_uInt16
const ParaPortion* pParaPortion = pEditEngine->GetParaPortions()[nPara];
- nShowCursorFlags |= nExtraCursorFlags;
-
- nShowCursorFlags |= GETCRSR_TXTONLY;
+ sal_uInt16 nShowCursorFlags = nExtraCursorFlags | GETCRSR_TXTONLY;
// Use CursorBidiLevel 0/1 in meaning of
// 0: prefer portion end, normal mode
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 5449e44..a9f4ba6 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -347,7 +347,7 @@ public:
void CalcAnchorPoint();
void RecalcOutputArea();
- void ShowCursor( bool bGotoCursor, bool bForceVisCursor, sal_uInt16 nShowCursorFlags = 0 );
+ void ShowCursor( bool bGotoCursor, bool bForceVisCursor );
Pair Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck = ScrollRangeCheck::NoNegative );
void SetInsertMode( bool bInsert );
@@ -566,7 +566,7 @@ private:
EditPaM ImpInsertParaBreak( const EditSelection& rEditSelection, bool bKeepEndingAttribs = true );
EditPaM ImpInsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
EditPaM ImpInsertFeature(const EditSelection& rCurSel, const SfxPoolItem& rItem);
- void ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars, EditUndoRemoveChars* pCurUndo = nullptr );
+ void ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars );
void ImpRemoveParagraph( sal_Int32 nPara );
EditSelection ImpMoveParagraphs( Range aParagraphs, sal_Int32 nNewPos );
@@ -597,9 +597,9 @@ private:
static EditPaM CursorEndOfParagraph( const EditPaM& rPaM );
EditPaM CursorStartOfDoc();
EditPaM CursorEndOfDoc();
- EditPaM WordLeft( const EditPaM& rPaM, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
+ EditPaM WordLeft( const EditPaM& rPaM );
EditPaM WordRight( const EditPaM& rPaM, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
- EditPaM StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
+ EditPaM StartOfWord( const EditPaM& rPaM );
EditPaM EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
EditSelection SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES, bool bAcceptStartOfWord = true );
EditSelection SelectSentence( const EditSelection& rCurSel ) const;
@@ -1006,7 +1006,7 @@ public:
void SetAddExtLeading( bool b );
bool IsAddExtLeading() const { return bAddExtLeading; }
- rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable( bool bGetInternal = true ) const;
+ rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
static void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
/** sets a link that is called at the beginning of a drag operation at an edit view */
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index f40a2b8..b96977f 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1396,7 +1396,7 @@ EditPaM ImpEditEngine::PageDown( const EditPaM& rPaM, EditView* pView )
return GetPaM( aBottomRight );
}
-EditPaM ImpEditEngine::WordLeft( const EditPaM& rPaM, sal_Int16 nWordType )
+EditPaM ImpEditEngine::WordLeft( const EditPaM& rPaM )
{
const sal_Int32 nCurrentPos = rPaM.GetIndex();
EditPaM aNewPaM( rPaM );
@@ -1422,10 +1422,10 @@ EditPaM ImpEditEngine::WordLeft( const EditPaM& rPaM, sal_Int16 nWordType )
uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
i18n::Boundary aBoundary =
- _xBI->getWordBoundary(aNewPaM.GetNode()->GetString(), nCurrentPos, aLocale, nWordType, true);
+ _xBI->getWordBoundary(aNewPaM.GetNode()->GetString(), nCurrentPos, aLocale, css::i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
if ( aBoundary.startPos >= nCurrentPos )
aBoundary = _xBI->previousWord(
- aNewPaM.GetNode()->GetString(), nCurrentPos, aLocale, nWordType);
+ aNewPaM.GetNode()->GetString(), nCurrentPos, aLocale, css::i18n::WordType::ANYWORD_IGNOREWHITESPACES);
aNewPaM.SetIndex( ( aBoundary.startPos != (-1) ) ? aBoundary.startPos : 0 );
}
@@ -1464,7 +1464,7 @@ EditPaM ImpEditEngine::WordRight( const EditPaM& rPaM, sal_Int16 nWordType )
return aNewPaM;
}
-EditPaM ImpEditEngine::StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType )
+EditPaM ImpEditEngine::StartOfWord( const EditPaM& rPaM )
{
EditPaM aNewPaM( rPaM );
@@ -1477,7 +1477,7 @@ EditPaM ImpEditEngine::StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType )
uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
i18n::Boundary aBoundary = _xBI->getWordBoundary(
- rPaM.GetNode()->GetString(), rPaM.GetIndex(), aLocale, nWordType, true);
+ rPaM.GetNode()->GetString(), rPaM.GetIndex(), aLocale, css::i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
aNewPaM.SetIndex( aBoundary.startPos );
return aNewPaM;
@@ -2035,7 +2035,7 @@ SvxCellVerJustify ImpEditEngine::GetVerJustification( sal_Int32 nPara ) const
}
// Text changes
-void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars, EditUndoRemoveChars* pCurUndo )
+void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars )
{
if ( IsUndoEnabled() && !IsInUndo() )
{
@@ -2057,10 +2057,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars, EditU
break; // for
}
}
- if ( pCurUndo && ( CreateEditPaM( pCurUndo->GetEPaM() ) == rPaM ) )
- pCurUndo->GetStr() += aStr;
- else
- InsertUndo(new EditUndoRemoveChars(pEditEngine, CreateEPaM(rPaM), aStr));
+ InsertUndo(new EditUndoRemoveChars(pEditEngine, CreateEPaM(rPaM), aStr));
}
aEditDoc.RemoveChars( rPaM, nChars );
@@ -4275,10 +4272,10 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, bool bRight )
}
}
-rtl::Reference<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable( bool bGetInternal ) const
+rtl::Reference<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable() const
{
rtl::Reference<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable;
- if ( !xF.is() && bGetInternal )
+ if ( !xF.is() )
xF = EE_DLL().GetGlobalData()->GetForbiddenCharsTable();
return xF;
}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 40bdebb..4420583 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -828,7 +828,7 @@ void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
}
}
-OUString SvxNumRule::MakeNumString( const SvxNodeNum& rNum, bool bInclStrings ) const
+OUString SvxNumRule::MakeNumString( const SvxNodeNum& rNum ) const
{
OUString aStr;
if( SVX_NO_NUM > rNum.GetLevel() && !( SVX_NO_NUMLEVEL & rNum.GetLevel() ) )
@@ -874,10 +874,7 @@ OUString SvxNumRule::MakeNumString( const SvxNodeNum& rNum, bool bInclStrings )
}
}
- if( bInclStrings )
- {
- aStr = rMyNFmt.GetPrefix() + aStr + rMyNFmt.GetSuffix();
- }
+ aStr = rMyNFmt.GetPrefix() + aStr + rMyNFmt.GetSuffix();
}
return aStr;
}
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 345bc6c..118d532d3 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -93,11 +93,11 @@ Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy
}
-long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit )
+long SvxPaperInfo::GetSloppyPaperDimension( long nSize )
{
- nSize = eUnit == MAP_100TH_MM ? nSize : OutputDevice::LogicToLogic(nSize, eUnit, MAP_100TH_MM);
+ nSize = OutputDevice::LogicToLogic(nSize, MAP_TWIP, MAP_100TH_MM);
nSize = PaperInfo::sloppyFitPageDimension(nSize);
- return eUnit == MAP_100TH_MM ? nSize : OutputDevice::LogicToLogic(nSize, MAP_100TH_MM, eUnit);
+ return OutputDevice::LogicToLogic(nSize, MAP_100TH_MM, MAP_TWIP);
}
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 6f5d4b5..c60dff6 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -1130,17 +1130,16 @@ bool SvxTabStopItem::Insert( const SvxTabStop& rTab )
return maTabStops.insert( rTab ).second;
}
-void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart,
- sal_uInt16 nEnd )
+void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart )
{
- for( sal_uInt16 i = nStart; i < nEnd && i < pTabs->Count(); i++ )
+ for( sal_uInt16 i = nStart; i < pTabs->Count(); i++ )
{
const SvxTabStop& rTab = (*pTabs)[i];
sal_uInt16 nTabPos = GetPos(rTab);
if(SVX_TAB_NOTFOUND != nTabPos)
Remove(nTabPos);
}
- for( sal_uInt16 i = nStart; i < nEnd && i < pTabs->Count(); i++ )
+ for( sal_uInt16 i = nStart; i < pTabs->Count(); i++ )
{
maTabStops.insert( (*pTabs)[i] );
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3d98c2d..156f6a9 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -716,8 +716,7 @@ bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
- sal_Int32 , sal_Int32 nEndPos,
- LanguageType eLang )
+ sal_Int32 , sal_Int32 nEndPos )
{
// Condition:
// at the beginning: _ or * after Space with the following !Space
@@ -733,7 +732,7 @@ bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString& rT
bool bAlphaNum = false;
sal_Int32 nPos = nEndPos;
sal_Int32 nFndPos = -1;
- CharClass& rCC = GetCharClass( eLang );
+ CharClass& rCC = GetCharClass( LANGUAGE_SYSTEM );
while( nPos )
{
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 10e7a8f..ea85f55 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -178,9 +178,9 @@ void Outliner::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect )
pEditEngine->Draw( pOutDev, rOutRect );
}
-void Outliner::Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation )
+void Outliner::Draw( OutputDevice* pOutDev, const Point& rStartPos )
{
- pEditEngine->Draw( pOutDev, rStartPos, nOrientation );
+ pEditEngine->Draw( pOutDev, rStartPos );
}
void Outliner::SetPaperSize( const Size& rSize )
@@ -328,9 +328,9 @@ sal_Int32 Outliner::GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const
return pEditEngine->GetLineLen( nParagraph, nLine );
}
-sal_uLong Outliner::GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine )
+sal_uLong Outliner::GetLineHeight( sal_Int32 nParagraph )
{
- return pEditEngine->GetLineHeight( nParagraph, nLine );
+ return pEditEngine->GetLineHeight( nParagraph );
}
void Outliner::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
@@ -486,9 +486,9 @@ void Outliner::QuickInsertLineBreak( const ESelection& rSel )
pEditEngine->QuickInsertLineBreak( rSel );
}
-void Outliner::QuickFormatDoc( bool bFull )
+void Outliner::QuickFormatDoc()
{
- pEditEngine->QuickFormatDoc( bFull );
+ pEditEngine->QuickFormatDoc();
}
void Outliner::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY )
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 0b96792..e858c08 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -229,24 +229,11 @@ void Outliner::Init( sal_uInt16 nMode )
EnableUndo(bWasUndoEnabled);
}
-void Outliner::SetMaxDepth( sal_Int16 nDepth, bool bCheckParagraphs )
+void Outliner::SetMaxDepth( sal_Int16 nDepth )
{
if( nMaxDepth != nDepth )
{
nMaxDepth = std::min( nDepth, (sal_Int16)(SVX_MAX_NUM-1) );
-
- if( bCheckParagraphs )
- {
- sal_Int32 nParagraphs = pParaList->GetParagraphCount();
- for ( sal_Int32 nPara = 0; nPara < nParagraphs; nPara++ )
- {
- Paragraph* pPara = pParaList->GetParagraph( nPara );
- if( pPara && pPara->GetDepth() > nMaxDepth )
- {
- SetDepth( pPara, nMaxDepth );
- }
- }
- }
}
}
@@ -506,7 +493,7 @@ void Outliner::SetText( const OUString& rText, Paragraph* pPara )
// pView == 0 -> Ignore tabs
-bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara,EditView* pView)
+bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara )
{
bool bConverted = false;
@@ -565,13 +552,7 @@ bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara,EditView* pView)
if ( aDelSel.HasRange() )
{
- if ( pView )
- {
- pView->SetSelection( aDelSel );
- pView->DeleteSelected();
- }
- else
- pEditEngine->QuickDelete( aDelSel );
+ pEditEngine->QuickDelete( aDelSel );
}
const SfxInt16Item& rLevel = static_cast<const SfxInt16Item&>( pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL ) );
@@ -709,14 +690,12 @@ void Outliner::ImplCheckNumBulletItem( sal_Int32 nPara )
pPara->aBulSize.Width() = -1;
}
-void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle )
+void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara )
{
DBG_ASSERT( ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT ) || ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEVIEW ), "SetLevelDependendStyleSheet: Wrong Mode!" );
- SfxStyleSheet* pStyle = pLevelStyle;
- if ( !pStyle )
- pStyle = GetStyleSheet( nPara );
+ SfxStyleSheet* pStyle = GetStyleSheet( nPara );
if ( pStyle )
{
@@ -743,7 +722,7 @@ void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet*
}
}
-void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo, bool bUndoAction )
+void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo )
{
DBG_ASSERT( ( nDepth >= nMinDepth ) && ( nDepth <= nMaxDepth ), "ImplInitDepth - Depth is invalid!" );
@@ -762,8 +741,6 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUnd
pEditEngine->SetUpdateMode( false );
bool bUndo = bCreateUndo && IsUndoEnabled();
- if ( bUndo && bUndoAction )
- UndoActionStart( OLUNDO_DEPTH );
SfxItemSet aAttrs( pEditEngine->GetParaAttribs( nPara ) );
aAttrs.Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nDepth ) );
@@ -774,8 +751,6 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUnd
if ( bUndo )
{
InsertUndo( new OutlinerUndoChangeDepth( this, nPara, nOldDepth, nDepth ) );
- if ( bUndoAction )
- UndoActionEnd( OLUNDO_DEPTH );
}
pEditEngine->SetUpdateMode( bUpdate );
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 5a6c9f0..ffefab1 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1269,9 +1269,9 @@ OUString OutlinerView::GetSelected() const
return pEditView->GetSelected();
}
-void OutlinerView::StartSpeller( bool bMultiDoc )
+void OutlinerView::StartSpeller()
{
- pEditView->StartSpeller( bMultiDoc );
+ pEditView->StartSpeller();
}
EESpellState OutlinerView::StartThesaurus()
@@ -1371,9 +1371,9 @@ sal_uInt16 OutlinerView::GetInvalidateMore() const
}
-bool OutlinerView::IsCursorAtWrongSpelledWord( bool bMarkIfWrong )
+bool OutlinerView::IsCursorAtWrongSpelledWord()
{
- return pEditView->IsCursorAtWrongSpelledWord( bMarkIfWrong );
+ return pEditView->IsCursorAtWrongSpelledWord();
}
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index ae2eadd..510eba5 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -94,10 +94,10 @@ inline const SvxEscapementItem& GetEscapement(const SfxItemSet& rSet,sal_uInt16
inline const SvxLineSpacingItem& GetLineSpacing(const SfxItemSet& rSet,sal_uInt16 nId,bool bInP=true)
{ return static_cast<const SvxLineSpacingItem&>(rSet.Get( nId,bInP)); }
// frm
-inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,sal_uInt16 nId,bool bInP=true)
- { return static_cast<const SvxLRSpaceItem&>(rSet.Get( nId,bInP)); }
-inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,sal_uInt16 nId,bool bInP=true)
- { return static_cast<const SvxULSpaceItem&>(rSet.Get( nId,bInP)); }
+inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,sal_uInt16 nId)
+ { return static_cast<const SvxLRSpaceItem&>(rSet.Get( nId)); }
+inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,sal_uInt16 nId)
+ { return static_cast<const SvxULSpaceItem&>(rSet.Get( nId)); }
void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
SfxPoolItem& rItem )
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 592eb4a..be4305b 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -653,7 +653,7 @@ util::DateTime SvxRTFParser::GetDateTimeStamp( )
return aDT;
}
-void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
+void SvxRTFParser::ReadInfo()
{
int _nOpenBrakets = 1; // the first was already detected earlier!!
DBG_ASSERT(m_xDocProps.is(),
@@ -745,15 +745,9 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
case RTF_NOFCHARS:
NextToken( nToken );
break;
-
-// default:
}
}
- if( pChkForVerNo &&
- sComment == OUString::createFromAscii( pChkForVerNo ) )
- nVersionNo = nVersNo;
-
SkipToken(); // the closing brace is evaluated "above"
}
@@ -813,12 +807,12 @@ const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId )
return *pDfltFont;
}
-SvxRTFItemStackType* SvxRTFParser::_GetAttrSet( bool const bCopyAttr )
+SvxRTFItemStackType* SvxRTFParser::_GetAttrSet()
{
SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back();
SvxRTFItemStackType* pNew;
if( pAkt )
- pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, bCopyAttr );
+ pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, false/*bCopyAttr*/ );
else
pNew = new SvxRTFItemStackType( *pAttrPool, &aWhichMap[0],
*pInsPos );
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 3d83bf8..5126b6d 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -99,13 +99,13 @@ public:
void SetFieldOffset( sal_Int32 nOffset, sal_Int32 nLen ) { mnFieldOffset = nOffset; mnFieldLen = nLen; }
sal_Int32 GetFieldOffset() const { return mnFieldOffset; }
sal_Int32 GetFieldLen() const { return mnFieldLen; }
- void AreInField( bool bInField = true ) { mbInField = bInField; }
+ void AreInField() { mbInField = true; }
bool InField() const { return mbInField; }
void SetBulletOffset( sal_Int32 nOffset, sal_Int32 nLen ) { mnBulletOffset = nOffset; mnBulletLen = nLen; }
sal_Int32 GetBulletOffset() const { return mnBulletOffset; }
sal_Int32 GetBulletLen() const { return mnBulletLen; }
- void AreInBullet( bool bInBullet = true ) { mbInBullet = bInBullet; }
+ void AreInBullet() { mbInBullet = true; }
bool InBullet() const { return mbInBullet; }
/// returns false if the given range is non-editable (e.g. contains bullets or _parts_ of fields)
diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx
index 704af2e..cf527fd 100644
--- a/include/editeng/AccessibleParaManager.hxx
+++ b/include/editeng/AccessibleParaManager.hxx
@@ -131,8 +131,7 @@ namespace accessibility
void FireEvent( sal_Int32 nPara,
const sal_Int16 nEventId,
- const css::uno::Any& rNewValue = css::uno::Any(),
- const css::uno::Any& rOldValue = css::uno::Any() ) const;
+ const css::uno::Any& rNewValue = css::uno::Any() ) const;
static bool IsReferencable(rtl::Reference<AccessibleEditableTextPara> const & aChild);
bool IsReferencable( sal_Int32 nChild ) const;
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index ef5ea81..c2b993c 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -114,7 +114,7 @@ namespace editeng {
void GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sal_uInt16 nIn = 0, sal_uInt16 nDist = 0 );
// TODO Hacky method to mirror lines in only a few cases
- void SetMirrorWidths( bool bMirror = true ) { m_bMirrorWidths = bMirror; }
+ void SetMirrorWidths() { m_bMirrorWidths = true; }
long GetWidth( ) const { return m_nWidth; }
sal_uInt16 GetOutWidth() const;
sal_uInt16 GetInWidth() const;
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index d99149d..1a0078c 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -175,8 +175,7 @@ private:
css::uno::Reference<css::datatransfer::XTransferable >& rxDataObj,
const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial);
- EDITENG_DLLPRIVATE EditPaM EndOfWord(
- const EditPaM& rPaM, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES);
+ EDITENG_DLLPRIVATE EditPaM EndOfWord(const EditPaM& rPaM);
EDITENG_DLLPRIVATE EditPaM GetPaM(const Point& aDocPos, bool bSmart = true);
@@ -271,7 +270,7 @@ public:
void SetMaxAutoPaperSize( const Size& rSz );
OUString GetText( LineEnd eEnd = LINEEND_LF ) const;
- OUString GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const;
+ OUString GetText( const ESelection& rSelection ) const;
sal_uInt32 GetTextLen() const;
sal_uInt32 GetTextHeight() const;
sal_uInt32 GetTextHeightNTP() const;
@@ -551,8 +550,7 @@ public:
EditPaM InsertField(const EditSelection& rEditSelection, const SvxFieldItem& rFld);
EditPaM InsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
EditSelection InsertText(const EditTextObject& rTextObject, const EditSelection& rSel);
- EditPaM InsertParaBreak(
- const EditSelection& rEditSelection, bool bKeepEndingAttribs = true);
+ EditPaM InsertParaBreak(const EditSelection& rEditSelection);
EditPaM InsertLineBreak(const EditSelection& rEditSelection);
EditPaM CursorLeft(
@@ -561,7 +559,7 @@ public:
const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = css::i18n::CharacterIteratorMode::SKIPCELL);
void SeekCursor(
- ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = nullptr, sal_uInt16 nIgnoreWhich = 0);
+ ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = nullptr);
EditPaM DeleteSelection(const EditSelection& rSel);
@@ -572,7 +570,7 @@ public:
void SetParaAttribsOnly(sal_Int32 nPara, const SfxItemSet& rSet);
void SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, sal_uInt8 nSpecial = 0);
- OUString GetSelected(const EditSelection& rSel, const LineEnd eParaSep = LINEEND_LF) const;
+ OUString GetSelected(const EditSelection& rSel) const;
EditPaM DeleteSelected(const EditSelection& rSel);
SvtScriptType GetScriptType(const EditSelection& rSel) const;
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index 4a3939c..2206cc9 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -100,8 +100,7 @@ public:
void Store( SvStream& rOStream ) const;
- static EditTextObject* Create(
- SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool = nullptr );
+ static EditTextObject* Create( SvStream& rIStream );
sal_Int32 GetParagraphCount() const;
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 46043d0..31f7569 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -284,7 +284,7 @@ public:
SvxNumRuleFlags GetFeatureFlags() const {return nFeatureFlags;}
void SetFeatureFlag( SvxNumRuleFlags nFlag, bool bSet = true ) { if(bSet) nFeatureFlags |= nFlag; else nFeatureFlags &= ~nFlag; }
- OUString MakeNumString( const SvxNodeNum&, bool bInclStrings = true ) const;
+ OUString MakeNumString( const SvxNodeNum& ) const;
SvxNumRuleType GetNumRuleType() const { return eNumberingType; }
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index f95a292..8405387 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -293,7 +293,7 @@ public:
Pointer GetPointer( const Point& rPosPixel );
void Command( const CommandEvent& rCEvt );
- void StartSpeller( bool bMultipleDoc = false );
+ void StartSpeller();
EESpellState StartThesaurus();
sal_Int32 StartSearchAndReplace( const SvxSearchItem& rSearchItem );
@@ -361,7 +361,7 @@ public:
*/
void EnableBullets();
- bool IsCursorAtWrongSpelledWord( bool bMarkIfWrong = false );
+ bool IsCursorAtWrongSpelledWord();
bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false );
void ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack = nullptr );
@@ -634,13 +634,13 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
void ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRecalcChildren );
OUString ImplGetBulletText( sal_Int32 nPara );
void ImplCheckNumBulletItem( sal_Int32 nPara );
- void ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo, bool bUndoAction = false );
- void ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle = nullptr );
+ void ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo );
+ void ImplSetLevelDependendStyleSheet( sal_Int32 nPara );
void ImplBlockInsertionCallbacks( bool b );
void ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara );
- bool ImpConvertEdtToOut( sal_Int32 nPara, EditView* pView = nullptr );
+ bool ImpConvertEdtToOut( sal_Int32 nPara );
void ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount );
vcl::Font ImpCalcBulletFont( sal_Int32 nPara ) const;
@@ -717,7 +717,7 @@ public:
void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor() const;
- void SetMaxDepth( sal_Int16 nDepth, bool bCheckParas = false );
+ void SetMaxDepth( sal_Int16 nDepth );
sal_Int16 GetMaxDepth() const { return nMaxDepth; }
void SetUpdateMode( bool bUpdate );
@@ -798,7 +798,7 @@ public:
Link<EditStatus&, void> GetStatusEventHdl() const;
void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect );
- void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );
+ void Draw( OutputDevice* pOutDev, const Point& rStartPos );
const Size& GetPaperSize() const;
void SetPaperSize( const Size& rSize );
@@ -885,7 +885,7 @@ public:
sal_uLong GetLineCount( sal_Int32 nParagraph ) const;
sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const;
- sal_uLong GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine = 0 );
+ sal_uLong GetLineHeight( sal_Int32 nParagraph );
sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr );
@@ -900,7 +900,7 @@ public:
void QuickInsertText( const OUString& rText, const ESelection& rSel );
void QuickDelete( const ESelection& rSel );
void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 );
- void QuickFormatDoc( bool bFull = false );
+ void QuickFormatDoc();
bool UpdateFields();
void RemoveFields( bool bKeepFieldText, std::function<bool ( const SvxFieldData* )> isFieldData = [] (const SvxFieldData* ){return true;} );
diff --git a/include/editeng/paperinf.hxx b/include/editeng/paperinf.hxx
index e357476..d135170 100644
--- a/include/editeng/paperinf.hxx
+++ b/include/editeng/paperinf.hxx
@@ -40,7 +40,7 @@ public:
static Size GetPaperSize( Paper ePaper, MapUnit eUnit = MAP_TWIP );
static Size GetPaperSize( const Printer* pPrinter );
static Paper GetSvxPaper( const Size &rSize, MapUnit eUnit = MAP_TWIP, bool bSloppy = false );
- static long GetSloppyPaperDimension( long nSize, MapUnit eUnit = MAP_TWIP );
+ static long GetSloppyPaperDimension( long nSize );
static OUString GetName( Paper ePaper );
};
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index e2c0af7..77df49a 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -95,7 +95,7 @@ public:
inline bool IsStartDone(){ return bStartDone; }
inline bool IsEndDone(){ return bEndDone; }
inline bool IsHyphen(){ return bHyphen; } // Split instead of Spell check
- inline void SetHyphen( const bool bNew = true ){ bHyphen = bNew; }
+ inline void SetHyphen() { bHyphen = true; }
inline bool IsAllRight() { return bAllRight; }
protected:
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index b5c54a0..15558a49 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -395,8 +395,7 @@ public:
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM );
bool FnChgWeightUnderl( SvxAutoCorrDoc&, const OUString&,
- sal_Int32 nSttPos, sal_Int32 nEndPos,
- LanguageType eLang = LANGUAGE_SYSTEM );
+ sal_Int32 nSttPos, sal_Int32 nEndPos );
bool FnCapitalStartSentence( SvxAutoCorrDoc&, const OUString&, bool bNormalPos,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM);
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 30b1dfc..ba597e0 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -224,7 +224,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
void ClearStyleTbl();
void ClearAttrStack();
- SvxRTFItemStackType* _GetAttrSet(bool bCopyAttr = false); // Create new ItemStackType:s
+ SvxRTFItemStackType* _GetAttrSet(); // Create new ItemStackType:s
void _ClearStyleAttr( SvxRTFItemStackType& rStkType );
// Sets all the attributes that are different from the current
@@ -268,7 +268,7 @@ protected:
// Read Document-Info
css::util::DateTime GetDateTimeStamp( );
OUString& GetTextToEndGroup( OUString& rStr );
- void ReadInfo( const sal_Char* pChkForVerNo = nullptr );
+ void ReadInfo();
inline SfxItemSet& GetAttrSet();
// no text yet inserted? (SttPos from the top stack entry!)
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 5a9667b..14dc78a 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -117,8 +117,7 @@ public:
// unprivatized:
sal_uInt16 Count() const { return maTabStops.size(); }
bool Insert( const SvxTabStop& rTab );
- void Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart = 0,
- sal_uInt16 nEnd = USHRT_MAX );
+ void Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart = 0 );
void Remove( const sal_uInt16 nPos, const sal_uInt16 nLen = 1 )
{ maTabStops.erase( maTabStops.begin() + nPos, maTabStops.begin() + nPos + nLen ); }
commit 4dedf654d83ddc22c93d98fe6c7225b8e1e416bd
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 3 08:18:17 2016 +0200
loplugin:unuseddefaultparams in connectivity
Change-Id: I03cc69a924913713a0da819899ce259305b88016
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 3a74eff..78a162e 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -172,11 +172,10 @@ bool ODbaseIndex::openIndexFile()
return m_pFileStream != nullptr;
}
-OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp,
- const OOperand* pOperand)
+OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp)
{
openIndexFile();
- return new OIndexIterator(this, pOp, pOperand);
+ return new OIndexIterator(this, pOp, nullptr);
}
bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 84d7cad..1697b7f 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -362,10 +362,10 @@ void ONDXPage::Release(bool bSave)
aParent.Clear();
}
-void ONDXPage::ReleaseFull(bool bSave)
+void ONDXPage::ReleaseFull()
{
ONDXPagePtr aTempParent = aParent;
- Release(bSave);
+ Release();
if (aTempParent.Is())
{
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 79c8587..34e8183 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -143,7 +143,7 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nati
}
-jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, jstring key, DataLogFile* logger )
+jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, jstring key )
{
std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>();
@@ -172,12 +172,6 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name,
if (tmpInt < 0 )
tmpInt = 256 +tmpInt;
- if ( logger )
- {
-#ifdef HSQLDB_DBG
- logger->write( tmpInt );
-#endif
- }
return tmpInt;
}
}
@@ -205,7 +199,7 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ
}
-jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger )
+jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jbyteArray buffer, jint off, jint len )
{
#ifdef HSQLDB_DBG
{
@@ -243,12 +237,6 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js
return -1;
env->SetByteArrayRegion(buffer,off,nBytesRead,reinterpret_cast<jbyte*>(&aData[0]));
- if ( logger )
- {
-#ifdef HSQLDB_DBG
- logger->write( aData.getConstArray(), nBytesRead );
-#endif
- }
return nBytesRead;
}
ThrowException( env,
@@ -413,7 +401,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ
}
-void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger )
+void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jbyteArray buffer, jint off, jint len )
{
std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>();
@@ -435,12 +423,6 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst
Sequence< ::sal_Int8 > aData(reinterpret_cast<sal_Int8 *>(buf + off),len);
env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT);
xOut->writeBytes(aData);
- if ( logger )
- {
-#ifdef HSQLDB_DBG
- logger->write( aData.getConstArray(), len );
-#endif
- }
}
}
else
@@ -478,7 +460,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ
}
-void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jint v, DataLogFile* logger )
+void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jint v )
{
std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>();
@@ -494,12 +476,6 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j
oneByte[3] = (sal_Int8) ((v >> 0) & 0xFF);
xOut->writeBytes(oneByte);
- if ( logger )
- {
-#ifdef HSQLDB_DBG
- logger->write( oneByte.getConstArray(), 4 );
-#endif
- }
}
else
{
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 27fe0bd..a5f3cad 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -310,18 +310,11 @@ void PreparedStatement::close( ) throw (SQLException, RuntimeException, std::ex
}
}
-void PreparedStatement::raiseSQLException(
- const char * errorMsg, const char *errorType )
+void PreparedStatement::raiseSQLException( const char * errorMsg )
throw( SQLException )
{
OUStringBuffer buf(128);
buf.append( "pq_driver: ");
- if( errorType )
- {
- buf.append( "[" );
- buf.appendAscii( errorType );
- buf.append( "]" );
- }
buf.append(
OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) );
buf.append( " (caused by statement '" );
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
index 2b41292..67a4a9e 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
@@ -250,7 +250,7 @@ public: // OComponentHelper
private:
void checkColumnIndex( sal_Int32 parameterIndex );
void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException);
- void raiseSQLException( const char * errorMsg, const char *errorType = nullptr )
+ void raiseSQLException( const char * errorMsg )
throw ( com::sun::star::sdbc::SQLException );
// PGresult *pgExecute( OString *pQuery );
};
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index bff2a19..8a0056a 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -242,17 +242,11 @@ void Statement::close( ) throw (SQLException, RuntimeException, std::exception)
}
void Statement::raiseSQLException(
- const OUString & sql, const char * errorMsg, const char *errorType )
+ const OUString & sql, const char * errorMsg )
throw( SQLException )
{
OUStringBuffer buf(128);
buf.append( "pq_driver: ");
- if( errorType )
- {
- buf.append( "[" );
- buf.appendAscii( errorType );
- buf.append( "]" );
- }
buf.append(
OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) );
buf.append( " (caused by statement '" );
diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx
index 920ff5d..a7fbceb 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.hxx
@@ -176,7 +176,7 @@ public: // XResultSetMetaDataSupplier (is required by framework (see
private:
void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException);
- void raiseSQLException( const OUString & sql, const char * errorMsg, const char *errorType = nullptr )
+ void raiseSQLException( const OUString & sql, const char * errorMsg )
throw ( com::sun::star::sdbc::SQLException );
};
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 2340761..7c20b1d 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -105,8 +105,7 @@ namespace connectivity
const ODbaseTable* getTable() const { return m_pTable; }
const NDXHeader& getHeader() const { return m_aHeader; }
- OIndexIterator* createIterator(OBoolOperator_BASE* pOp,
- const OOperand_BASE* pOperand = nullptr);
+ OIndexIterator* createIterator(OBoolOperator_BASE* pOp);
void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;}
void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;}
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index a056010..7f60083 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -137,7 +137,7 @@ namespace connectivity
bool Delete(sal_uInt16);
void Remove(sal_uInt16);
void Release(bool bSave = true);
- void ReleaseFull(bool bSave = true);
+ void ReleaseFull();
// Split and merge
ONDXNode Split(ONDXPage& rPage);
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index 00e53a7..7fe6541 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -29,10 +29,10 @@ namespace connectivity { namespace hsqldb
class DataLogFile;
} }
-jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, jstring key, ::connectivity::hsqldb::DataLogFile* logger = nullptr );
-jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = nullptr );
-void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = nullptr );
-void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = nullptr );
+jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, jstring key );
+jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len );
+void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len );
+void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v );
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX
More information about the Libreoffice-commits
mailing list