diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-18 16:45:02 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-18 16:51:18 -0500 |
commit | cdc8ebf9646e773351c91039a62f2414c7b02105 (patch) | |
tree | ed0cedf4dc04dd347293d4e40a04bb997c218fdb /sc/inc/column.hxx | |
parent | 3c7b65c171eeade3272cc766b813b99a35a6ef7d (diff) |
fdo#74573: Delete ranges that are non-empty before pasting from clipboard.
The conditional formatting part is still not working. But other bits
appear to be working now.
Change-Id: Ia8a2cbe57cd2fa9ca9ad46635a91a1d8b99b0e7d
Diffstat (limited to 'sc/inc/column.hxx')
-rw-r--r-- | sc/inc/column.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 9b362702a6ad..7f0c365dcddf 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -232,6 +232,7 @@ public: bool InitBlockPosition( sc::ColumnBlockPosition& rBlockPos ); bool InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const; + void DeleteBeforeCopyFromClip( sc::CopyFromClipContext& rCxt, const ScColumn& rClipCol ); void CopyOneCellFromClip( sc::CopyFromClipContext& rCxt, SCROW nRow1, SCROW nRow2 ); void CopyFromClip( @@ -592,6 +593,9 @@ private: // cell notes void SwapCellNotes( SCROW nRow1, SCROW nRow2 ); + void DeleteCells( + sc::ColumnBlockPosition& rBlockPos, SCROW nRow1, SCROW nRow2, sal_uInt16 nDelFlag, + std::vector<SCROW>& rDeleted ); }; #endif |