From afea0155c26d0864a9a629b2453afff3490e9bed Mon Sep 17 00:00:00 2001
From: Niklas Nebel <nn@openoffice.org>
Date: Wed, 15 Sep 2010 18:01:02 +0200
Subject: mib19: #163641# use clipboard content in ScVbaRange::Insert only if
it was copied by implnCut/implnCopy
---
sc/source/ui/app/transobj.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'sc/source/ui/app')
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 4b268b9da791..e6b8b3b5049a 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -134,7 +134,8 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc
nDragHandleY( 0 ),
nDragSourceFlags( 0 ),
bDragWasInternal( FALSE ),
- bUsedForLink( FALSE )
+ bUsedForLink( FALSE ),
+ bUseInApi( false )
{
DBG_ASSERT(pDoc->IsClipboard(), "wrong document");
@@ -540,6 +541,11 @@ void ScTransferObj::SetDragWasInternal()
bDragWasInternal = TRUE;
}
+void ScTransferObj::SetUseInApi( bool bSet )
+{
+ bUseInApi = bSet;
+}
+
ScDocument* ScTransferObj::GetSourceDocument()
{
ScDocShell* pSourceDocSh = GetSourceDocShell();
--
cgit
From e4352c7202ce833668146b242eaaaabe030f10e5 Mon Sep 17 00:00:00 2001
From: Niklas Nebel <nn@openoffice.org>
Date: Thu, 7 Oct 2010 19:21:24 +0200
Subject: dr77: #i107273# dispose accessibility text data before deleting
EditView/EditEngine (patch from cmc)
---
sc/source/ui/app/inputwin.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'sc/source/ui/app')
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index b028a0a153ce..4dcd7eb4da86 100755
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -770,11 +770,11 @@ ScTextWnd::ScTextWnd( Window* pParent )
__EXPORT ScTextWnd::~ScTextWnd()
{
- delete pEditView;
- delete pEditEngine;
while (!maAccTextDatas.empty()) {
maAccTextDatas.back()->Dispose();
}
+ delete pEditView;
+ delete pEditEngine;
}
void __EXPORT ScTextWnd::Paint( const Rectangle& rRec )
--
cgit