mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #81916#: CreateFromClipboard with Window pointer

Browse Source
This commit is contained in:
jp
2001-05-22 15:41:30 +00:00
parent 719e226ecd
commit ba99b060f4
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sw/source/ui/shells/drwtxtex.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: drwtxtex.cxx,v $ * $RCSfile: drwtxtex.cxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: os $ $Date: 2001-04-18 09:08:49 $ * last change: $Author: jp $ $Date: 2001-05-22 16:37:11 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -772,7 +772,8 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
case SID_PASTE: case SID_PASTE:
{ {
TransferableDataHelper aDataHelper( TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard() ); TransferableDataHelper::CreateFromSystemClipboard(
&GetView().GetEditWin() ) );
if( !aDataHelper.GetTransferable().is() || if( !aDataHelper.GetTransferable().is() ||
!SwTransferable::IsPaste( GetShell(), aDataHelper )) !SwTransferable::IsPaste( GetShell(), aDataHelper ))

7
sw/source/ui/uiview/srcview.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: srcview.cxx,v $ * $RCSfile: srcview.cxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: os $ $Date: 2001-05-15 10:14:56 $ * last change: $Author: jp $ $Date: 2001-05-22 16:41:30 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -805,7 +805,8 @@ void SwSrcView::GetState(SfxItemSet& rSet)
if( bDisable ) if( bDisable )
{ {
TransferableDataHelper aDataHelper( TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard() ); TransferableDataHelper::CreateFromSystemClipboard(
&aEditWin) );
bDisable = !aDataHelper.GetTransferable().is() || bDisable = !aDataHelper.GetTransferable().is() ||
0 == aDataHelper.GetFormatCount(); 0 == aDataHelper.GetFormatCount();
} }

10
sw/source/ui/uiview/view.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: view.cxx,v $ * $RCSfile: view.cxx,v $
* *
* $Revision: 1.22 $ * $Revision: 1.23 $
* *
* last change: $Author: mtg $ $Date: 2001-05-16 17:08:38 $ * last change: $Author: jp $ $Date: 2001-05-22 16:41:30 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -1630,7 +1630,8 @@ BOOL SwView::IsPasteAllowed()
if( nLastPasteDestination != nPasteDestination ) if( nLastPasteDestination != nPasteDestination )
{ {
TransferableDataHelper aDataHelper( TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard() ); TransferableDataHelper::CreateFromSystemClipboard(
&GetEditWin()) );
if( aDataHelper.GetTransferable().is() ) if( aDataHelper.GetTransferable().is() )
{ {
bPasteState = SwTransferable::IsPaste( *pWrtShell, aDataHelper ); bPasteState = SwTransferable::IsPaste( *pWrtShell, aDataHelper );
@@ -1653,7 +1654,8 @@ BOOL SwView::IsPasteSpecialAllowed()
if( nLastPasteDestination != nPasteDestination ) if( nLastPasteDestination != nPasteDestination )
{ {
TransferableDataHelper aDataHelper( TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard() ); TransferableDataHelper::CreateFromSystemClipboard(
&GetEditWin()) );
if( aDataHelper.GetTransferable().is() ) if( aDataHelper.GetTransferable().is() )
{ {
bPasteState = SwTransferable::IsPaste( *pWrtShell, aDataHelper ); bPasteState = SwTransferable::IsPaste( *pWrtShell, aDataHelper );