summaryrefslogtreecommitdiff
path: root/sw/source/ui/uiview
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2001-03-23 14:55:45 +0000
committerjp <jp@openoffice.org>2001-03-23 14:55:45 +0000
commit33e9ee0956e80328a3f10420bcdf510e99ac8a21 (patch)
tree9d51611f3fe97861d966d24d3f7df0126331698f /sw/source/ui/uiview
parentfbea6da1f860468aa29ea7e5f0b1a2f640958eef (diff)
use new Drag&Drop / Clipboard API
Diffstat (limited to 'sw/source/ui/uiview')
-rw-r--r--sw/source/ui/uiview/srcview.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 933853b2dff2..e253b568c128 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: srcview.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: tl $ $Date: 2001-03-19 16:00:15 $
+ * last change: $Author: jp $ $Date: 2001-03-23 15:54:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -209,9 +209,6 @@
#ifndef _SHELLIO_HXX
#include <shellio.hxx>
#endif
-#ifndef _DATAEX_HXX
-#include <dataex.hxx>
-#endif
#ifndef _CMDID_H
#include <cmdid.h> // FN_ ...
@@ -776,15 +773,18 @@ void SwSrcView::GetState(SfxItemSet& rSet)
case SID_PASTE:
{
SvDataObjectRef xObj;
- if ( Clipboard::GetFormatCount() )
+ BOOL bDisable = TRUE;
+ if( Clipboard::GetFormatCount() )
{
- SwModule* pMod = SW_MOD();
- if ( pMod->pClipboard )
- xObj = pMod->pClipboard ;
+ if( SW_MOD()->pClipboard )
+ bDisable = FALSE;
else
- xObj = SvDataObject::PasteClipboard();
+ {
+ SvDataObjectRef xObj( SvDataObject::PasteClipboard());
+ bDisable = !xObj.Is();
+ }
}
- if(!xObj.Is())
+ if( bDisable )
rSet.DisableItem(nWhich);
}
break;