diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-23 15:30:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-26 08:29:38 +0200 |
| commit | 606077ed58dfbc133d99a6a38a8aabf552a687bb (patch) | |
| tree | 96dbb8dd1450ca40a65726e3f4f5df4f3bb7ad21 /sc/source/ui/undo/undoblk.cxx | |
| parent | 5d944079fa264777293a869e38e38424edceedfa (diff) | |
convert HASATTR constants to typed_flags_set
Remove unused constant RTL.
Inline PAINTEXT constant since it is only used in one place.
Change-Id: I7b2c15e7579fc5bc475d00fe714f17592bd5e2a1
Diffstat (limited to 'sc/source/ui/undo/undoblk.cxx')
| -rw-r--r-- | sc/source/ui/undo/undoblk.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index c7bd62961c90..2d7c7b26423d 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -197,7 +197,7 @@ void ScUndoInsertCells::DoChange( const bool bUndo ) for( i=0; i<nCount; i++ ) { if ( rDoc.HasAttrib( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), pTabs[i], - aWorkRange.aEnd.Col(), aWorkRange.aEnd.Row(), pTabs[i], HASATTR_MERGED ) ) + aWorkRange.aEnd.Col(), aWorkRange.aEnd.Row(), pTabs[i], HasAttrFlags::Merged ) ) { SCCOL nEndCol = aWorkRange.aEnd.Col(); SCROW nEndRow = aWorkRange.aEnd.Row(); @@ -417,7 +417,7 @@ void ScUndoDeleteCells::DoChange( const bool bUndo ) for( i=0; i<nCount; i++ ) { if ( rDoc.HasAttrib( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), pTabs[i], - aWorkRange.aEnd.Col(), aWorkRange.aEnd.Row(), pTabs[i], HASATTR_MERGED | HASATTR_OVERLAPPED ) ) + aWorkRange.aEnd.Col(), aWorkRange.aEnd.Row(), pTabs[i], HasAttrFlags::Merged | HasAttrFlags::Overlapped ) ) { // #i51445# old merge flag attributes must be deleted also for single cells, // not only for whole columns/rows @@ -1235,7 +1235,7 @@ void ScUndoDragDrop::DoUndo( ScRange aRange ) rDoc.DeleteAreaTab( aRange, nDelFlags ); pRefUndoDoc->CopyToDocument(aRange, nUndoFlags, false, rDoc); - if ( rDoc.HasAttrib( aRange, HASATTR_MERGED ) ) + if ( rDoc.HasAttrib( aRange, HasAttrFlags::Merged ) ) rDoc.ExtendMerge( aRange, true ); aPaintRange.aEnd.SetCol( std::max( aPaintRange.aEnd.Col(), aRange.aEnd.Col() ) ); @@ -1691,7 +1691,7 @@ void ScUndoSelectionStyle::DoChange( const bool bUndo ) SetViewMarkData( aMarkData ); ScRange aWorkRange( aRange ); - if ( rDoc.HasAttrib( aWorkRange, HASATTR_MERGED ) ) // Merged cells? + if ( rDoc.HasAttrib( aWorkRange, HasAttrFlags::Merged ) ) // Merged cells? rDoc.ExtendMerge( aWorkRange, true ); sal_uInt16 nExtFlags = 0; |