diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 10:33:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 10:33:45 +0000 |
| commit | bc4e0e096031c231bc04d5339493b81d592e909f (patch) | |
| tree | 087d9c72212ba4bb56aa3fa0faebae908633d591 /sc/source/ui/app/seltrans.cxx | |
| parent | 32524cc4dd9c327617115584cfefffeed2a0a62b (diff) | |
INTEGRATION: CWS filteredrows (1.13.308); FILE MERGED
2008/03/31 22:41:57 er 1.13.308.2: #i33851# handle drag&drop and primary selection
2008/03/19 18:31:52 er 1.13.308.1: #i33851# first wave: treat filtered simple area selection as if it was a multi-selection, effectively disabling all operations that are not supported for a multi-selection
Diffstat (limited to 'sc/source/ui/app/seltrans.cxx')
| -rw-r--r-- | sc/source/ui/app/seltrans.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index c2a953fad67f..59b9b8810723 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: seltrans.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.15 $ * * This file is part of OpenOffice.org. * @@ -133,7 +133,11 @@ ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView const ScMarkData& rMark = pViewData->GetMarkData(); // allow MultiMarked because GetSimpleArea may be able to merge into a simple range // (GetSimpleArea modifies a local copy of MarkData) - if ( ( rMark.IsMarked() || rMark.IsMultiMarked() ) && pViewData->GetSimpleArea( aRange ) ) + // Also allow simple filtered area. + ScMarkType eMarkType; + if ( ( rMark.IsMarked() || rMark.IsMultiMarked() ) && + (((eMarkType = pViewData->GetSimpleArea( aRange )) == SC_MARK_SIMPLE) || + (eMarkType == SC_MARK_SIMPLE_FILTERED)) ) { // only for "real" selection, cursor alone isn't used if ( aRange.aStart == aRange.aEnd ) |