diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-10 14:13:03 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-10 14:14:05 +0100 |
commit | 20edd9cfbd865a087f8735a647b9cf3c2fbd22b5 (patch) | |
tree | cd6d324587fb12e0dca812d3bd6d0291efc13cc5 /svtools | |
parent | f3374fbb08de91b38597414110f3587c1a332b15 (diff) |
revert lunatic commit, restore paste
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/misc/transfer.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 3625f9a12aa6..cbb5eedb3bb3 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -2242,7 +2242,6 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window if( pWindow ) xClipboard = pWindow->GetClipboard(); -#if 0 if( xClipboard.is() ) { try @@ -2260,7 +2259,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window { } } -#endif + return aRet; } |