diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-15 16:10:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-16 10:44:03 +0100 |
| commit | 882cadaac40226ea9b5dbbceb7e82328d5a935ee (patch) | |
| tree | 8739f3398b596ede283f8891bb8a5c7e4f0b941d /editeng/source/outliner | |
| parent | 67d245adca298134fc8ab4364acbe880b4e0911a (diff) | |
convert EETextFormat to scoped enum
and drop unused BIN constant
Change-Id: I4ecda96f39147f7e9bceb11ecdb4f0ffe42d2053
Reviewed-on: https://gerrit.libreoffice.org/46589
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng/source/outliner')
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 17 | ||||
| -rw-r--r-- | editeng/source/outliner/outlvw.cxx | 13 |
2 files changed, 4 insertions, 26 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index d9985a5479ab..2e8d4aa9d7b3 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1081,7 +1081,7 @@ void Outliner::InvalidateBullet(sal_Int32 nPara) } } -ErrCode Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ) +ErrCode Outliner::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ) { bool bOldUndo = pEditEngine->IsUndoEnabled(); @@ -1093,7 +1093,7 @@ ErrCode Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 e Clear(); ImplBlockInsertionCallbacks( true ); - ErrCode nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs ); + ErrCode nRet = pEditEngine->Read( rInput, rBaseURL, eFormat, pHTTPHeaderAttrs ); bFirstParaIsEmpty = false; @@ -1103,20 +1103,9 @@ ErrCode Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 e { Paragraph* pPara = new Paragraph( 0 ); pParaList->Append(pPara); - - if ( eFormat == EE_FORMAT_BIN ) - { - const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( n ); - const SfxInt16Item& rLevel = rAttrs.Get( EE_PARA_OUTLLEVEL ); - sal_Int16 nDepth = rLevel.GetValue(); - ImplInitDepth( n, nDepth, false ); - } } - if ( eFormat != EE_FORMAT_BIN ) - { - ImpFilterIndents( 0, nParas-1 ); - } + ImpFilterIndents( 0, nParas-1 ); ImplBlockInsertionCallbacks( false ); pEditEngine->SetUpdateMode( bUpdate ); diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 22299ee40f42..d10a0c6db0ee 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1388,22 +1388,11 @@ void OutlinerView::Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueItera for ( sal_Int32 n = nChangesStart; n <= nChangesEnd; n++ ) { - if ( eFormat == EE_FORMAT_BIN ) - { - const SfxItemSet& rAttrs = pOwner->GetParaAttribs( n ); - const SfxInt16Item& rLevel = rAttrs.Get( EE_PARA_OUTLLEVEL ); - sal_uInt16 nDepth = rLevel.GetValue(); - pOwner->ImplInitDepth( n, nDepth, false ); - } - if ( pOwner->ImplGetOutlinerMode() == OutlinerMode::OutlineObject ) pOwner->ImplSetLevelDependentStyleSheet( n ); } - if ( eFormat != EE_FORMAT_BIN ) - { - pOwner->ImpFilterIndents( nChangesStart, nChangesEnd ); - } + pOwner->ImpFilterIndents( nChangesStart, nChangesEnd ); } void OutlinerView::SetBackgroundColor( const Color& rColor ) |