From de832d01ecdbadbdc36e371af301e4053a72696e Mon Sep 17 00:00:00 2001 From: "ivan.ilyin" Date: Wed, 28 Sep 2011 14:41:35 +0300 Subject: [PATCH] SANKORE-274 fix CUT command for W3CWigdet items --- src/domain/UBGraphicsWidgetItem.cpp | 8 ++++++++ src/domain/UBGraphicsWidgetItem.h | 2 ++ src/domain/UBGraphicsWidgetItemDelegate.cpp | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index 1f3be2bd..8750dce3 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -231,6 +231,14 @@ void UBGraphicsWidgetItem::removeAllDatastoreEntries() void UBGraphicsWidgetItem::remove() +{ + + if (mDelegate) + mDelegate->remove(); + +} + +void UBGraphicsWidgetItem::removeScript() { if (mWebKitWidget && mWebKitWidget->page() && mWebKitWidget->page()->mainFrame()) { diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h index 71b08841..465ae4c8 100644 --- a/src/domain/UBGraphicsWidgetItem.h +++ b/src/domain/UBGraphicsWidgetItem.h @@ -62,6 +62,8 @@ class UBGraphicsWidgetItem : public UBGraphicsProxyWidget void removeAllDatastoreEntries(); virtual void remove(); + void removeScript(); + protected: diff --git a/src/domain/UBGraphicsWidgetItemDelegate.cpp b/src/domain/UBGraphicsWidgetItemDelegate.cpp index 67d256ab..8b45eefa 100644 --- a/src/domain/UBGraphicsWidgetItemDelegate.cpp +++ b/src/domain/UBGraphicsWidgetItemDelegate.cpp @@ -105,7 +105,6 @@ UBGraphicsWidgetItem* UBGraphicsWidgetItemDelegate::delegated() void UBGraphicsWidgetItemDelegate::remove(bool canundo) { - delegated()->remove(); + delegated()->removeScript(); UBGraphicsItemDelegate::remove(canundo); - }