diff options
| author | David Tardon <dtardon@redhat.com> | 2014-12-10 10:32:53 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-12-10 16:12:05 +0000 |
| commit | 60b069ded797e654a5a169d4e331ed01db87015d (patch) | |
| tree | 25c94286dbd1d95d6e29949b4cc9bd720204bb82 | |
| parent | d255f53044908773ef0701c2560dadb7df5f1c3e (diff) | |
paste from system from the top left of selection
For example,
1. echo -e "5,6\n7,8"
2. select the lines and copy them to clipboard
3. select an area in Calc, starting from bottom right
4. paste
5. select comma as data separator in the CSV import dialog
I think most people would expect the data to appear in the selected
area, but currently it would be inserted starting from active cell
(which is the bottom right cell of the selection).
Reviewed-on: https://gerrit.libreoffice.org/13410
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 781639eb84fc09d0260092238c3f50216f15a3ff)
Reviewed-on: https://gerrit.libreoffice.org/13421
Conflicts:
sc/source/ui/view/viewfun3.cxx
Change-Id: Ief0e05deda18928a832dca2a261f8493ac9a03a9
Reviewed-on: https://gerrit.libreoffice.org/13424
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | sc/source/ui/view/viewfun3.cxx | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index be5d96c68218..dc05c142c02d 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -681,8 +681,24 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, bool bApi ) if ( !aDataHelper.GetTransferable().is() ) return false; + SCCOL nPosX = 0; + SCROW nPosY = 0; + + ScViewData* pViewData = GetViewData(); + ScRange aRange; + if ( pViewData->GetSimpleArea( aRange ) == SC_MARK_SIMPLE ) + { + nPosX = aRange.aStart.Col(); + nPosY = aRange.aStart.Row(); + } + else + { + nPosX = pViewData->GetCurX(); + nPosY = pViewData->GetCurY(); + } + bRet = PasteDataFormat( nFormatId, aDataHelper.GetTransferable(), - GetViewData()->GetCurX(), GetViewData()->GetCurY(), + nPosX, nPosY, NULL, false, !bApi ); // allow warning dialog if ( !bRet && !bApi ) |