summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-11 08:41:51 +0200
committerNoel Grandin <noel@peralex.com>2015-08-11 09:48:17 +0200
commit0f2a9bb2139becbf353db792b22c13a5ded25a6a (patch)
treef6c3757fff359a96410b80cd16e754d4cbf84ed1 /editeng
parent4712396b3b6c61b7a54ca631790561eeea5ffc93 (diff)
loplugin: defaultparams
Change-Id: I2a1255c00a051b29381ec57c380eafb08c4900d9
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editview.cxx4
-rw-r--r--editeng/source/editeng/eertfpar.cxx4
-rw-r--r--editeng/source/editeng/impedit.cxx4
-rw-r--r--editeng/source/editeng/impedit2.cxx32
-rw-r--r--editeng/source/editeng/impedit3.cxx2
-rw-r--r--editeng/source/editeng/impedit5.cxx8
-rw-r--r--editeng/source/misc/acorrcfg.cxx2
-rw-r--r--editeng/source/misc/svxacorr.cxx20
-rw-r--r--editeng/source/outliner/outlin2.cxx2
-rw-r--r--editeng/source/outliner/outlvw.cxx12
-rw-r--r--editeng/source/rtf/rtfitem.cxx10
-rw-r--r--editeng/source/rtf/svxrtf.cxx36
-rw-r--r--editeng/source/uno/unoedhlp.cxx4
-rw-r--r--editeng/source/uno/unofdesc.cxx14
-rw-r--r--editeng/source/uno/unofored.cxx6
-rw-r--r--editeng/source/uno/unoforou.cxx6
-rw-r--r--editeng/source/uno/unotext.cxx14
17 files changed, 90 insertions, 90 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index d9e4431d1012..28a57a306a62 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -523,7 +523,7 @@ void EditView::Copy()
void EditView::Paste()
{
Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
- pImpEditView->Paste( aClipBoard, false );
+ pImpEditView->Paste( aClipBoard );
}
void EditView::PasteSpecial()
@@ -1344,7 +1344,7 @@ void EditView::SetCursorLogicPosition(const Point& rPosition, bool bPoint, bool
pImpEditView->DrawSelection(aSelection);
if (pImpEditView->GetEditSelection() != aSelection)
pImpEditView->SetEditSelection(aSelection);
- ShowCursor(/*bGotoCursor=*/false, /*bForceCursor=*/true);
+ ShowCursor(/*bGotoCursor=*/false);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index ebda6204709b..1125257edf82 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -571,7 +571,7 @@ void EditRTFParser::ReadField()
}
}
- SkipToken( -1 ); // the closing brace is evaluated "above"
+ SkipToken(); // the closing brace is evaluated "above"
}
void EditRTFParser::SkipGroup()
@@ -596,7 +596,7 @@ void EditRTFParser::SkipGroup()
}
}
- SkipToken( -1 ); // the closing brace is evaluated "above"
+ SkipToken(); // the closing brace is evaluated "above"
}
EditNodeIdx::EditNodeIdx(EditEngine* pEE, ContentNode* pNd) :
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 106888096a51..3b651644fd45 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -768,7 +768,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, sal_uInt16
}
else
{
- EditPaM aNext = pEditEngine->CursorRight( aPaM, (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL );
+ EditPaM aNext = pEditEngine->CursorRight( aPaM );
Rectangle aTmpRect = pEditEngine->pImpEditEngine->PaMtoEditCursor( aNext, GETCRSR_TXTONLY );
if ( aTmpRect.Top() != aEditCursor.Top() )
aTmpRect = pEditEngine->pImpEditEngine->PaMtoEditCursor( aNext, GETCRSR_TXTONLY|GETCRSR_ENDOFLINE );
@@ -922,7 +922,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, sal_uInt16
}
else
// #i32593# Reset correct orientation in horizontal layout
- GetCursor()->SetOrientation( 0 );
+ GetCursor()->SetOrientation();
GetCursor()->SetSize( aCursorSz );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 574c12abfd8e..8269dae61488 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -237,7 +237,7 @@ void ImpEditEngine::InitDoc(bool bKeepParaAttribs)
for ( sal_Int32 n = bKeepParaAttribs ? 1 : 0; n < nParas; n++ )
{
if ( aEditDoc[n]->GetStyleSheet() )
- EndListening( *aEditDoc[n]->GetStyleSheet(), false );
+ EndListening( *aEditDoc[n]->GetStyleSheet() );
}
if ( bKeepParaAttribs )
@@ -324,7 +324,7 @@ bool ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
pView->pImpEditView->DrawSelection();
pView->pImpEditView->SetEditSelection( aNewSelection );
pView->pImpEditView->DrawSelection();
- pView->ShowCursor( true, true );
+ pView->ShowCursor( true );
}
else if ( rMEvt.GetClicks() == 3 )
{
@@ -337,7 +337,7 @@ bool ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
pView->pImpEditView->DrawSelection();
pView->pImpEditView->SetEditSelection( aNewSelection );
pView->pImpEditView->DrawSelection();
- pView->ShowCursor( true, true );
+ pView->ShowCursor();
}
}
return true;
@@ -477,7 +477,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
if ( mpIMEInfos && mpIMEInfos->nLen )
{
EditPaM aPaM( pView->pImpEditView->GetEditSelection().Max() );
- Rectangle aR1 = PaMtoEditCursor( aPaM, 0 );
+ Rectangle aR1 = PaMtoEditCursor( aPaM );
sal_Int32 nInputEnd = mpIMEInfos->aPos.GetIndex() + mpIMEInfos->nLen;
@@ -813,7 +813,7 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
aPaM = CursorStartOfParagraph( aPaM );
if( aPaM == aOldPaM )
{
- aPaM = CursorLeft( aPaM, i18n::CharacterIteratorMode::SKIPCELL );
+ aPaM = CursorLeft( aPaM );
aPaM = CursorStartOfParagraph( aPaM );
}
bKeyModifySelection = false;
@@ -822,7 +822,7 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
aPaM = CursorEndOfParagraph( aPaM );
if( aPaM == aOldPaM )
{
- aPaM = CursorRight( aPaM, i18n::CharacterIteratorMode::SKIPCELL );
+ aPaM = CursorRight( aPaM );
aPaM = CursorEndOfParagraph( aPaM );
}
bKeyModifySelection = false;
@@ -844,11 +844,11 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
bKeyModifySelection = true;
break;
case com::sun::star::awt::Key::SELECT_BACKWARD:
- aPaM = CursorLeft( aPaM, i18n::CharacterIteratorMode::SKIPCELL );
+ aPaM = CursorLeft( aPaM );
bKeyModifySelection = true;
break;
case com::sun::star::awt::Key::SELECT_FORWARD:
- aPaM = CursorRight( aPaM, i18n::CharacterIteratorMode::SKIPCELL );
+ aPaM = CursorRight( aPaM );
bKeyModifySelection = true;
break;
case com::sun::star::awt::Key::SELECT_WORD_BACKWARD:
@@ -863,7 +863,7 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
aPaM = CursorStartOfParagraph( aPaM );
if( aPaM == aOldPaM )
{
- aPaM = CursorLeft( aPaM, i18n::CharacterIteratorMode::SKIPCELL );
+ aPaM = CursorLeft( aPaM );
aPaM = CursorStartOfParagraph( aPaM );
}
bKeyModifySelection = true;
@@ -872,7 +872,7 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
aPaM = CursorEndOfParagraph( aPaM );
if( aPaM == aOldPaM )
{
- aPaM = CursorRight( aPaM, i18n::CharacterIteratorMode::SKIPCELL );
+ aPaM = CursorRight( aPaM );
aPaM = CursorEndOfParagraph( aPaM );
}
bKeyModifySelection = true;
@@ -1013,7 +1013,7 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
{
// Check if we are within a portion and don't have overwrite mode, then it's easy...
sal_Int32 nPortionStart;
- sal_Int32 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, false );
+ sal_Int32 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart );
const TextPortion& rTextPortion = pParaPortion->GetTextPortions()[nTextPortion];
bool bPortionBoundary = ( aPaM.GetIndex() == nPortionStart ) || ( aPaM.GetIndex() == (nPortionStart+rTextPortion.GetLen()) );
@@ -2217,7 +2217,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
if ( bBackward )
{
- pLeft->SetStyleSheet( pRight->GetStyleSheet(), true );
+ pLeft->SetStyleSheet( pRight->GetStyleSheet() );
pLeft->GetContentAttribs().GetItems().Set( pRight->GetContentAttribs().GetItems() );
pLeft->GetCharAttribs().GetDefFont() = pRight->GetCharAttribs().GetDefFont();
}
@@ -2465,7 +2465,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara )
{
aEditDoc.RemoveItemsFromPool(*pNode);
if ( pNode->GetStyleSheet() )
- EndListening( *pNode->GetStyleSheet(), false );
+ EndListening( *pNode->GetStyleSheet() );
delete pNode;
}
}
@@ -2497,7 +2497,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c,
if (aFirstWordSel.Min().GetIndex() == 0 && aFirstWordSel.Max().GetIndex() == 0)
{
// para does not start with word -> select next/first word
- EditPaM aRightWord( WordRight( aFirstWordSel.Max(), 1 ) );
+ EditPaM aRightWord( WordRight( aFirstWordSel.Max() ) );
aFirstWordSel = SelectWord( EditSelection( aRightWord ) );
}
@@ -2506,7 +2506,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c,
// but to some following char like '.'. ':', ...
// In those cases we need aSecondWordSel to see if aSel
// will actually effect the first word.)
- EditPaM aRight2Word( WordRight( aFirstWordSel.Max(), 1 ) );
+ EditPaM aRight2Word( WordRight( aFirstWordSel.Max() ) );
aSecondWordSel = SelectWord( EditSelection( aRight2Word ) );
}
bool bIsFirstWordInFirstPara = aESel.nEndPara == 0 &&
@@ -3654,7 +3654,7 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, bool bSmart
if ( nCurIndex && ( nCurIndex == pLine->GetEnd() ) &&
( pLine != &pPortion->GetLines()[pPortion->GetLines().Count()-1] ) )
{
- aPaM = CursorLeft( aPaM, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL );
+ aPaM = CursorLeft( aPaM );
}
return aPaM;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 7511b33e3c70..f774aa87a33a 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3741,7 +3741,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev
DBG_ASSERT( bVDevValid, "VDef could not be enlarged!" );
if ( !bVDevValid )
{
- Paint( pView, rRect, 0, false /* ohne VDev */ );
+ Paint( pView, rRect, 0);
return;
}
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index f7ed0b1e2269..18dc864562e2 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -87,10 +87,10 @@ void ImpEditEngine::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle )
pNode->GetContentAttribs().GetItems() ) );
}
if ( pCurStyle )
- EndListening( *pCurStyle, false );
+ EndListening( *pCurStyle );
pNode->SetStyleSheet( pStyle, aStatus.UseCharAttribs() );
if ( pStyle )
- StartListening( *pStyle, false );
+ StartListening( *pStyle );
ParaAttribsChanged( pNode );
}
FormatAndUpdate();
@@ -257,7 +257,7 @@ void ImpEditEngine::InsertUndo( EditUndo* pUndo, bool bTryMerge )
if ( pUndoMarkSelection )
{
EditUndoMarkSelection* pU = new EditUndoMarkSelection(pEditEngine, *pUndoMarkSelection);
- GetUndoManager().AddUndoAction( pU, false );
+ GetUndoManager().AddUndoAction( pU );
delete pUndoMarkSelection;
pUndoMarkSelection = NULL;
}
@@ -414,7 +414,7 @@ SfxItemSet ImpEditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int
// StyleSheet / Parattribs...
if ( pNode->GetStyleSheet() && ( nFlags & GetAttribsFlags::STYLESHEET ) )
- aAttribs.Set(pNode->GetStyleSheet()->GetItemSet(), true);
+ aAttribs.Set(pNode->GetStyleSheet()->GetItemSet());
if ( nFlags & GetAttribsFlags::PARAATTRIBS )
aAttribs.Put( pNode->GetContentAttribs().GetItems() );
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index a60392ada986..a42aa5c114e7 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -220,7 +220,7 @@ void SvxBaseAutoCorrCfg::Load(bool bInit)
}
}
if( nFlags )
- rParent.pAutoCorrect->SetAutoCorrFlag( nFlags, true );
+ rParent.pAutoCorrect->SetAutoCorrFlag( nFlags );
rParent.pAutoCorrect->SetAutoCorrFlag( ( 0xffff & ~nFlags ), false );
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3007ba034ee0..04226e4fbb66 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1141,7 +1141,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
sal_Unicode cInsChar, bool bSttQuote,
bool bIns )
{
- LanguageType eLang = rDoc.GetLanguage( nInsPos, false );
+ LanguageType eLang = rDoc.GetLanguage( nInsPos );
sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
OUString sChg( cInsChar );
@@ -1182,7 +1182,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
OUString SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
sal_Unicode cInsChar, bool bSttQuote )
{
- LanguageType eLang = rDoc.GetLanguage( nInsPos, false );
+ LanguageType eLang = rDoc.GetLanguage( nInsPos );
sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
OUString sRet = OUString(cRet);
@@ -1256,7 +1256,7 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
if ( IsAutoCorrFlag( AddNonBrkSpace ) )
{
if ( NeedsHardspaceAutocorr( cChar ) &&
- FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, false ) ) )
+ FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos ) ) )
{
nRet = AddNonBrkSpace;
}
@@ -1313,7 +1313,7 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
if( !nPos && !IsWordDelim( rTxt[ 0 ]))
--nCapLttrPos; // Absatz Anfang und kein Blank !
- LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, false );
+ LanguageType eLang = rDoc.GetLanguage( nCapLttrPos );
if( LANGUAGE_SYSTEM == eLang )
eLang = MsLangId::getSystemLanguage();
CharClass& rCC = GetCharClass( eLang );
@@ -1429,7 +1429,7 @@ SvxAutoCorrectLanguageLists& SvxAutoCorrect::_GetLanguageList(
{
LanguageTag aLanguageTag( eLang);
if (m_pLangTable->find(aLanguageTag) == m_pLangTable->end())
- (void)CreateLanguageFile(aLanguageTag, true);
+ (void)CreateLanguageFile(aLanguageTag);
return *(m_pLangTable->find(aLanguageTag)->second);
}
@@ -1474,7 +1474,7 @@ bool SvxAutoCorrect::AddCplSttException( const OUString& rNew,
iter = m_pLangTable->find(aLangTagUndetermined);
if (iter != m_pLangTable->end())
pLists = iter->second.get();
- else if(CreateLanguageFile(aLangTagUndetermined, true))
+ else if(CreateLanguageFile(aLangTagUndetermined))
pLists = m_pLangTable->find(aLangTagUndetermined)->second.get();
}
OSL_ENSURE(pLists, "No auto correction data");
@@ -1496,7 +1496,7 @@ bool SvxAutoCorrect::AddWrtSttException( const OUString& rNew,
iter = m_pLangTable->find(aLangTagUndetermined);
if (iter != m_pLangTable->end())
pLists = iter->second.get();
- else if(CreateLanguageFile(aLangTagUndetermined, true))
+ else if(CreateLanguageFile(aLangTagUndetermined))
pLists = m_pLangTable->find(aLangTagUndetermined)->second.get();
}
OSL_ENSURE(pLists, "No auto correction file!");
@@ -1534,7 +1534,7 @@ bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
if( 3 > nEnde - nCapLttrPos )
return false;
- LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, false );
+ LanguageType eLang = rDoc.GetLanguage( nCapLttrPos );
if( LANGUAGE_SYSTEM == eLang )
eLang = MsLangId::getSystemLanguage();
@@ -1552,7 +1552,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b
{
OSL_ENSURE(m_pLangTable->find(rLanguageTag) == m_pLangTable->end(), "Language already exists ");
- OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false, false ));
+ OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false ));
OUString sShareDirFile( sUserDirFile );
SvxAutoCorrectLanguageLists* pLists = 0;
@@ -1578,7 +1578,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b
else if(
( FStatHelper::IsDocument( sUserDirFile ) ||
FStatHelper::IsDocument( sShareDirFile =
- GetAutoCorrFileName( rLanguageTag, false, false, false ) ) ||
+ GetAutoCorrFileName( rLanguageTag, false, false ) ) ||
FStatHelper::IsDocument( sShareDirFile =
GetAutoCorrFileName( rLanguageTag, false, false, true) )
) ||
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 9001a84ab8fd..3c79be03dbc3 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -311,7 +311,7 @@ void Outliner::UndoActionEnd( sal_uInt16 nId )
void Outliner::InsertUndo( EditUndo* pUndo )
{
- pEditEngine->GetUndoManager().AddUndoAction( pUndo, false );
+ pEditEngine->GetUndoManager().AddUndoAction( pUndo );
}
bool Outliner::IsInUndo()
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 1a9e10bf49c7..4a0d96ea5581 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -210,7 +210,7 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin )
ESelection aTmpSel(nTemp,0,nTemp,0);
pEditView->SetSelection( aTmpSel );
}
- pEditView->ShowCursor( true, true );
+ pEditView->ShowCursor( true );
pOwner->UndoActionEnd( OLUNDO_INSERT );
bKeyProcessed = true;
}
@@ -228,7 +228,7 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin )
// Position the cursor
ESelection aTmpSel(nTemp,0,nTemp,0);
pEditView->SetSelection( aTmpSel );
- pEditView->ShowCursor( true, true );
+ pEditView->ShowCursor( true );
pOwner->UndoActionEnd( OLUNDO_INSERT );
bKeyProcessed = true;
}
@@ -541,7 +541,7 @@ void OutlinerView::Indent( short nDiff )
pOwner->mnDepthChangeHdlPrevFlags = pPara->nFlags;
pOwner->pHdlParagraph = pPara;
- pOwner->ImplInitDepth( nPara, nNewDepth, true, false );
+ pOwner->ImplInitDepth( nPara, nNewDepth, true );
pOwner->ImplCalcBulletText( nPara, false, false );
if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
@@ -668,7 +668,7 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
pOwner->UndoActionEnd( OLUNDO_INSERT );
- pEditView->ShowCursor( true, true );
+ pEditView->ShowCursor( true );
}
@@ -704,7 +704,7 @@ void OutlinerView::PasteSpecial()
pEditView->SetEditEngineUpdateMode( true );
pOwner->UndoActionEnd( OLUNDO_INSERT );
- pEditView->ShowCursor( true, true );
+ pEditView->ShowCursor( true );
}
}
@@ -1181,7 +1181,7 @@ void OutlinerView::RemoveAttribs( bool bRemoveParaAttribs, sal_uInt16 nWhich, bo
for ( sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
- pOwner->ImplInitDepth( nPara, pPara->GetDepth(), false, false );
+ pOwner->ImplInitDepth( nPara, pPara->GetDepth(), false );
}
}
pOwner->UndoActionEnd( OLUNDO_ATTR );
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 5e1f233e3648..fb3e84c61eb3 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -282,7 +282,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
if( bIsInReadStyleTab )
{
if( !bFirstToken )
- SkipToken( -1 );
+ SkipToken();
bContinue = false;
}
else
@@ -1267,7 +1267,7 @@ ATTR_SETEMPHASIS:
{
// unknown token, so token "returned in Parser"
if( !bFirstToken )
- SkipToken( -1 );
+ SkipToken();
bContinue = false;
}
}
@@ -1356,7 +1356,7 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
// Fill with defaults is still missing!
rSet.Put( aAttr );
- SkipToken( -1 );
+ SkipToken();
}
static void SetBorderLine( int nBorderTyp, SvxBoxItem& rItem,
@@ -1566,7 +1566,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
SetBorderLine( nBorderTyp, aAttr, aBrd );
rSet.Put( aAttr );
- SkipToken( -1 );
+ SkipToken();
}
inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading )
@@ -1698,7 +1698,7 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
(sal_uInt8)CalcShading( aCol.GetBlue(), aFCol.GetBlue(), nFillValue ) );
rSet.Put( SvxBrushItem( aColor, nWh ) );
- SkipToken( -1 );
+ SkipToken();
}
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 6fb3283016e7..e2d525941ce5 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -252,9 +252,9 @@ INSINGLECHAR:
case RTF_SHADOW:
if( RTF_IGNOREFLAG != GetStackPtr( -1 )->nTokenId )
break;
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
if( '{' == GetStackPtr( -1 )->nTokenId )
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
ReadAttr( nToken, &GetAttrSet() );
break;
@@ -274,10 +274,10 @@ INSINGLECHAR:
{
if( RTF_IGNOREFLAG != GetStackPtr( -1 )->nTokenId )
break;
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
if( '{' == GetStackPtr( -1 )->nTokenId )
{
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
}
}
ReadAttr( nToken, &GetAttrSet() );
@@ -319,7 +319,7 @@ void SvxRTFParser::ReadStyleTable()
case '{':
{
if( RTF_IGNOREFLAG != GetNextToken() )
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ) &&
RTF_PN != nToken )
nToken = SkipToken( -2 );
@@ -375,10 +375,10 @@ void SvxRTFParser::ReadStyleTable()
{
if( RTF_IGNOREFLAG != GetStackPtr( -1 )->nTokenId )
break;
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
if( '{' == GetStackPtr( -1 )->nTokenId )
{
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
}
}
ReadAttr( nToken, &pStyle->aAttrSet );
@@ -388,7 +388,7 @@ void SvxRTFParser::ReadStyleTable()
}
}
pStyle.reset(); // Delete the Last Style
- SkipToken( -1 ); // the closing brace is evaluated "above"
+ SkipToken(); // the closing brace is evaluated "above"
// Flag back to old state
bChkStyleAttr = bSaveChkStyleAttr;
@@ -435,7 +435,7 @@ void SvxRTFParser::ReadColorTable()
break;
}
}
- SkipToken( -1 ); // the closing brace is evaluated "above"
+ SkipToken(); // the closing brace is evaluated "above"
}
void SvxRTFParser::ReadFontTable()
@@ -467,7 +467,7 @@ void SvxRTFParser::ReadFontTable()
break;
case '{':
if( RTF_IGNOREFLAG != GetNextToken() )
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
// immediately skip unknown and all known but non-evaluated
// groups
else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ) &&
@@ -567,7 +567,7 @@ void SvxRTFParser::ReadFontTable()
}
// the last one we have to delete manually
pFont.reset();
- SkipToken( -1 ); // the closing brace is evaluated "above"
+ SkipToken(); // the closing brace is evaluated "above"
// set the default font in the Document
if( bNewDoc && IsParserWorking() )
@@ -597,7 +597,7 @@ OUString& SvxRTFParser::GetTextToEndGroup( OUString& rStr )
case '{':
{
if( RTF_IGNOREFLAG != GetNextToken() )
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
else if( RTF_UNKNOWNCONTROL != GetNextToken() )
nToken = SkipToken( -2 );
else
@@ -618,7 +618,7 @@ OUString& SvxRTFParser::GetTextToEndGroup( OUString& rStr )
break;
}
}
- SkipToken( -1 ); // the closing brace is evaluated "above"
+ SkipToken(); // the closing brace is evaluated "above"
return rStr;
}
@@ -641,7 +641,7 @@ util::DateTime SvxRTFParser::GetDateTimeStamp( )
bContinue = false;
}
}
- SkipToken( -1 ); // the closing brace is evaluated "above"
+ SkipToken(); // the closing brace is evaluated "above"
return aDT;
}
@@ -661,7 +661,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
case '{':
{
if( RTF_IGNOREFLAG != GetNextToken() )
- nToken = SkipToken( -1 );
+ nToken = SkipToken();
else if( RTF_UNKNOWNCONTROL != GetNextToken() )
nToken = SkipToken( -2 );
else
@@ -745,7 +745,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
sComment == OUString::createFromAscii( pChkForVerNo ) )
nVersionNo = nVersNo;
- SkipToken( -1 ); // the closing brace is evaluated "above"
+ SkipToken(); // the closing brace is evaluated "above"
}
@@ -1006,7 +1006,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
if (bCrsrBack && 50 < pAkt->m_pChildList->size())
{
// at the beginning of a paragraph? Move back one position
- MovePos(true);
+ MovePos();
bCrsrBack = false;
// Open a new Group.
@@ -1032,7 +1032,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
if( bCrsrBack )
// at the beginning of a paragraph? Move back one position
- MovePos(true);
+ MovePos();
} while( false );
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index c966a1ab588f..460eda3c65dd 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -188,7 +188,7 @@ bool SvxEditSourceHelper::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nE
if ( nLen )
{
sal_Int32 nStartIdx, nEndIdx;
- GetAttributeRun( nStartIdx, nEndIdx, rEE, nParaIdx, nLen, false );
+ GetAttributeRun( nStartIdx, nEndIdx, rEE, nParaIdx, nLen );
SfxItemSet aSet = rEE.GetAttribs( nParaIdx, nLen-1, nLen, GetAttribsFlags::CHARATTRIBS );
if ( aSet == aCrrntSet )
{
@@ -212,7 +212,7 @@ bool SvxEditSourceHelper::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nE
if ( nLen )
{
sal_Int32 nStartIdx, nEndIdx;
- GetAttributeRun( nStartIdx, nEndIdx, rEE, nParaIdx, 0, false );
+ GetAttributeRun( nStartIdx, nEndIdx, rEE, nParaIdx, 0 );
SfxItemSet aSet = rEE.GetAttribs( nParaIdx, 0, 1, GetAttribsFlags::CHARATTRIBS );
if ( aSet == aCrrntSet )
{
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index e2cb103fb3fb..3a82ced47fac 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -132,7 +132,7 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
{
const SfxPoolItem* pItem = NULL;
{
- const SvxFontItem* pFontItem = static_cast<const SvxFontItem*>(&rSet.Get( EE_CHAR_FONTINFO, true ));
+ const SvxFontItem* pFontItem = static_cast<const SvxFontItem*>(&rSet.Get( EE_CHAR_FONTINFO ));
rDesc.Name = pFontItem->GetFamilyName();
rDesc.StyleName = pFontItem->GetStyleName();
rDesc.Family = sal::static_int_cast< sal_Int16 >(
@@ -142,37 +142,37 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
pFontItem->GetPitch());
}
{
- pItem = &rSet.Get( EE_CHAR_FONTHEIGHT, true );
+ pItem = &rSet.Get( EE_CHAR_FONTHEIGHT );
uno::Any aHeight;
if( pItem->QueryValue( aHeight, MID_FONTHEIGHT ) )
aHeight >>= rDesc.Height;
}
{
- pItem = &rSet.Get( EE_CHAR_ITALIC, true );
+ pItem = &rSet.Get( EE_CHAR_ITALIC );
uno::Any aFontSlant;
if(pItem->QueryValue( aFontSlant, MID_POSTURE ))
aFontSlant >>= rDesc.Slant;
}
{
- pItem = &rSet.Get( EE_CHAR_UNDERLINE, true );
+ pItem = &rSet.Get( EE_CHAR_UNDERLINE );
uno::Any aUnderline;
if(pItem->QueryValue( aUnderline, MID_TL_STYLE ))
aUnderline >>= rDesc.Underline;
}
{
- pItem = &rSet.Get( EE_CHAR_WEIGHT, true );
+ pItem = &rSet.Get( EE_CHAR_WEIGHT );
uno::Any aWeight;
if(pItem->QueryValue( aWeight, MID_WEIGHT ))
aWeight >>= rDesc.Weight;
}
{
- pItem = &rSet.Get( EE_CHAR_STRIKEOUT, true );
+ pItem = &rSet.Get( EE_CHAR_STRIKEOUT );
uno::Any aStrikeOut;
if(pItem->QueryValue( aStrikeOut, MID_CROSS_OUT ))
aStrikeOut >>= rDesc.Strikeout;
}
{
- const SvxWordLineModeItem* pWLMItem = static_cast<const SvxWordLineModeItem*>(&rSet.Get( EE_CHAR_WLM, true ));
+ const SvxWordLineModeItem* pWLMItem = static_cast<const SvxWordLineModeItem*>(&rSet.Get( EE_CHAR_WLM ));
rDesc.WordLineMode = pWLMItem->GetValue();
}
}
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 163dc74c4802..7544e35f5263 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -59,7 +59,7 @@ sal_Int32 SvxEditEngineForwarder::GetTextLen( sal_Int32 nParagraph ) const
OUString SvxEditEngineForwarder::GetText( const ESelection& rSel ) const
{
- return convertLineEnd(rEditEngine.GetText(rSel, LINEEND_LF), GetSystemLineEnd());
+ return convertLineEnd(rEditEngine.GetText(rSel), GetSystemLineEnd());
}
SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
@@ -323,9 +323,9 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nInd
// #109151# Don't use paragraph height, but line height
// instead. aLast is already CTL-correct
if( bIsVertical)
- aLast.SetSize( Size( rEditEngine.GetLineHeight(nPara,0), 1 ) );
+ aLast.SetSize( Size( rEditEngine.GetLineHeight(nPara), 1 ) );
else
- aLast.SetSize( Size( 1, rEditEngine.GetLineHeight(nPara,0) ) );
+ aLast.SetSize( Size( 1, rEditEngine.GetLineHeight(nPara) ) );
}
return aLast;
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index e0c863f65d40..93d90290a69f 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -69,7 +69,7 @@ OUString SvxOutlinerForwarder::GetText( const ESelection& rSel ) const
//! GetText (ESelection) should probably also be in the Outliner
// in the time being use as the hack for the EditEngine:
EditEngine* pEditEngine = const_cast<EditEngine*>(&rOutliner.GetEditEngine());
- return pEditEngine->GetText( rSel, LINEEND_LF );
+ return pEditEngine->GetText( rSel );
}
static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib, EditEngine& rEditEngine )
@@ -324,9 +324,9 @@ Rectangle SvxOutlinerForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex
// #109151# Don't use paragraph height, but line height
// instead. aLast is already CTL-correct
if( bIsVertical)
- aLast.SetSize( Size( rOutliner.GetLineHeight(nPara,0), 1 ) );
+ aLast.SetSize( Size( rOutliner.GetLineHeight(nPara), 1 ) );
else
- aLast.SetSize( Size( 1, rOutliner.GetLineHeight(nPara,0) ) );
+ aLast.SetSize( Size( 1, rOutliner.GetLineHeight(nPara) ) );
}
return aLast;
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 4933369eeb68..7b35d6e721d3 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -426,7 +426,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName
return;
}
- _setPropertyValue( PropertyName, aValue, -1 );
+ _setPropertyValue( PropertyName, aValue );
}
void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const uno::Any& aValue, sal_Int32 nPara )
@@ -602,7 +602,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& Property
return uno::makeAny(aSel);
}
- return _getPropertyValue( PropertyName, -1 );
+ return _getPropertyValue( PropertyName );
}
uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sal_Int32 nPara )
@@ -767,7 +767,7 @@ void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString&
// XMultiPropertySet
void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
- _setPropertyValues( aPropertyNames, aValues, -1 );
+ _setPropertyValues( aPropertyNames, aValues );
}
void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
@@ -891,7 +891,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt
uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException, std::exception)
{
- return _getPropertyValues( aPropertyNames, -1 );
+ return _getPropertyValues( aPropertyNames );
}
uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) throw (uno::RuntimeException)
@@ -949,7 +949,7 @@ void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequenc
beans::PropertyState SAL_CALL SvxUnoTextRangeBase::getPropertyState( const OUString& PropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
- return _getPropertyState( PropertyName, -1 );
+ return _getPropertyState( PropertyName );
}
static const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE_CHAR_FONTHEIGHT, EE_CHAR_ITALIC,
@@ -1059,7 +1059,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUStr
uno::Sequence< beans::PropertyState > SAL_CALL SvxUnoTextRangeBase::getPropertyStates( const uno::Sequence< OUString >& aPropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
- return _getPropertyStates( aPropertyName, -1 );
+ return _getPropertyStates( aPropertyName );
}
uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(const uno::Sequence< OUString >& PropertyName, sal_Int32 nPara /* = -1 */)
@@ -1196,7 +1196,7 @@ bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const Sf
void SAL_CALL SvxUnoTextRangeBase::setPropertyToDefault( const OUString& PropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
- _setPropertyToDefault( PropertyName, -1 );
+ _setPropertyToDefault( PropertyName );
}
void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sal_Int32 nPara /* = -1 */)