|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
From 2f35fa5c95a3a6ae28ef15af88eabe8ba3e586bc Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Message-Id: <2f35fa5c95a3a6ae28ef15af88eabe8ba3e586bc.1480426428.git.erack@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
From: Eike Rathke <erack@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Date: Sat, 26 Nov 2016 11:23:24 +0100
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Subject: [PATCH] Resolves: tdf#103493 copying note captions needs a completed
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
destination sheet
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
MIME-Version: 1.0
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
This is a multi-part message in MIME format.
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
--------------erAck-patch-parts
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Content-Type: text/plain; charset=UTF-8; format=fixed
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Content-Transfer-Encoding: 8bit
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
If a copied sheet's destination position is before its source position, the
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
source's ScColumn::nTab members still pointed to the original source position
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
when the captions were created, which led to the wrong drawing layer page being
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
used and at the end the drawing shapes not being correctly assigned.
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
(cherry picked from commit 0a2a7436b4041bb34b01a183b9264af8488d1af3)
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Backported.
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Conflicts:
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc/inc/table.hxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc/source/core/data/documen2.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc/source/core/data/table2.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Change-Id: I9c3cc97d8b4486756023b9ab02da28079a1d0627
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
---
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc/inc/table.hxx | 5 ++++-
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc/source/core/data/documen2.cxx | 11 +++++++++--
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc/source/core/data/table2.cxx | 23 ++++++++++++++++-------
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
3 files changed, 29 insertions(+), 10 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
--------------erAck-patch-parts
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Content-Type: text/x-patch; name="0001-Resolves-tdf-103493-copying-note-captions-needs-a-co.patch"
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Content-Transfer-Encoding: 8bit
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
Content-Disposition: attachment; filename="0001-Resolves-tdf-103493-copying-note-captions-needs-a-co.patch"
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
index ead8ba4..bf7c63e 100644
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
--- a/sc/inc/table.hxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+++ b/sc/inc/table.hxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
@@ -444,7 +444,10 @@ public:
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
void CopyToTable(
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- const ScMarkData* pMarkData = nullptr, bool bAsLink = false, bool bColRowFlags = true );
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ const ScMarkData* pMarkData = nullptr, bool bAsLink = false, bool bColRowFlags = true,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ bool bCopyCaptions = true );
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ void CopyCaptionsToTable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pDestTab, bool bCloneCaption );
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
void UndoToTable(
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
index 57ee5f4..949cd55 100644
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
--- a/sc/source/core/data/documen2.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+++ b/sc/source/core/data/documen2.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
@@ -874,8 +874,9 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
{
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
SetNoListening( true ); // noch nicht bei CopyToTable/Insert
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc::CopyToDocContext aCopyDocCxt(*this);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- maTabs[nOldPos]->CopyToTable(aCopyDocCxt, 0, 0, MAXCOL, MAXROW, InsertDeleteFlags::ALL, (pOnlyMarked != nullptr),
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- maTabs[nNewPos], pOnlyMarked );
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ maTabs[nOldPos]->CopyToTable(aCopyDocCxt, 0, 0, MAXCOL, MAXROW, InsertDeleteFlags::ALL,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ (pOnlyMarked != nullptr), maTabs[nNewPos], pOnlyMarked,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ false /*bAsLink*/, true /*bColRowFlags*/, false /*bCopyCaptions*/ );
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
maTabs[nNewPos]->SetTabBgColor(maTabs[nOldPos]->GetTabBgColor());
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
SCTAB nDz = nNewPos - nOldPos;
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
@@ -913,6 +914,12 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
// Copy the RTL settings
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
maTabs[nNewPos]->SetLayoutRTL(maTabs[nOldPos]->IsLayoutRTL());
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
maTabs[nNewPos]->SetLoadingRTL(maTabs[nOldPos]->IsLoadingRTL());
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ // Finally copy the note captions, which need
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ // 1. the updated source ScColumn::nTab members if nNewPos <= nOldPos
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ // 2. row heights and column widths of the destination
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ // 3. RTL settings of the destination
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ maTabs[nOldPos]->CopyCaptionsToTable( 0, 0, MAXCOL, MAXROW, maTabs[nNewPos], true /*bCloneCaption*/);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
}
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
return bValid;
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
index 5d43a37..629743c 100644
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
--- a/sc/source/core/data/table2.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+++ b/sc/source/core/data/table2.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
@@ -1090,7 +1090,7 @@ void ScTable::StartListeningFormulaCells(
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
void ScTable::CopyToTable(
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- bool bAsLink, bool bColRowFlags )
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ bool bAsLink, bool bColRowFlags, bool bCopyCaptions )
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
{
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
if (!ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2))
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
return;
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
@@ -1210,14 +1210,23 @@ void ScTable::CopyToTable(
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
if(nFlags & InsertDeleteFlags::OUTLINE) // also only when bColRowFlags
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
pDestTab->SetOutlineTable( pOutlineTable );
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- if (nFlags & (InsertDeleteFlags::NOTE|InsertDeleteFlags::ADDNOTES))
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ if (bCopyCaptions && (nFlags & (InsertDeleteFlags::NOTE | InsertDeleteFlags::ADDNOTES)))
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
{
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
bool bCloneCaption = (nFlags & InsertDeleteFlags::NOCAPTIONS) == InsertDeleteFlags::NONE;
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- for (SCCOL i = nCol1; i <= nCol2; i++)
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- {
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- aCol[i].CopyCellNotesToDocument(nRow1, nRow2, pDestTab->aCol[i], bCloneCaption);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- pDestTab->aCol[i].UpdateNoteCaptions(nRow1, nRow2);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
- }
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ CopyCaptionsToTable( nCol1, nRow1, nCol2, nRow2, pDestTab, bCloneCaption);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+}
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+void ScTable::CopyCaptionsToTable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pDestTab,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ bool bCloneCaption )
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+{
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ if (!ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2))
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ return;
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ for (SCCOL i = nCol1; i <= nCol2; i++)
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ {
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ aCol[i].CopyCellNotesToDocument(nRow1, nRow2, pDestTab->aCol[i], bCloneCaption);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
+ pDestTab->aCol[i].UpdateNoteCaptions(nRow1, nRow2);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
}
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
}
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
--------------erAck-patch-parts--
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
a5fe07f |
|