From f9d5c9151aa41fccb6099624a998e4cc6655d373 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 5 Oct 2006 15:15:59 +0000 Subject: INTEGRATION: CWS dr50 (1.92.108); FILE MERGED 2006/09/05 11:40:46 nn 1.92.108.1: #i68690# use the right sheets when looking for merged cells during paste --- sc/inc/document.hxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sc/inc/document.hxx') diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index e0d5d12c45e7..78606a9edcc2 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -4,9 +4,9 @@ * * $RCSfile: document.hxx,v $ * - * $Revision: 1.92 $ + * $Revision: 1.93 $ * - * last change: $Author: rt $ $Date: 2006-05-04 15:00:37 $ + * last change: $Author: kz $ $Date: 2006-10-05 16:15:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -744,6 +744,9 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; /** Returns true, if there is any data to create a selection list for rPos. */ BOOL HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + BOOL ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow, + SCCOL& rEndCol, SCROW& rEndRow, const ScMarkData& rMark, + BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, SCTAB nTab, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); -- cgit