diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 08:59:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 08:59:18 +0000 |
| commit | 519df0a9da52ffd63088ff28d745634866fb16ff (patch) | |
| tree | 0a75903c126c9ad8e7b4d20fab1fe9f8d25e3e9f /basctl | |
| parent | 2a6d8f1968745df012bc108b47fbcbb25939577c (diff) | |
INTEGRATION: CWS ab34 (1.46.16); FILE MERGED
2007/07/24 14:01:12 ab 1.46.16.5: RESYNC: (1.48-1.49); FILE MERGED
2007/07/24 10:21:25 ab 1.46.16.4: #i77072# Drag & Drop support in Dialog Organizer
2007/06/27 12:59:11 ab 1.46.16.3: RESYNC: (1.47-1.48); FILE MERGED
2007/04/24 10:17:27 ab 1.46.16.2: RESYNC: (1.46-1.47); FILE MERGED
2007/03/13 10:51:47 ab 1.46.16.1: #i74083# Modified patch code
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/dlged/dlged.cxx | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index b7bb3f114547..d14184726923 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dlged.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: hr $ $Date: 2007-08-02 17:31:03 $ + * last change: $Author: hr $ $Date: 2007-08-03 09:59:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -929,20 +929,6 @@ void DlgEditor::Copy() Reference< XInputStream > xStream( xISP->createInputStream() ); Sequence< sal_Int8 > DialogModelBytes; implCopyStreamToByteSequence( xStream, DialogModelBytes ); - /* - sal_Int32 nRead = xStream->readBytes( bytes, xStream->available() ); - for (;;) - { - Sequence< sal_Int8 > readBytes; - nRead = xStream->readBytes( readBytes, 1024 ); - if (! nRead) - break; - - sal_Int32 nPos = bytes.getLength(); - bytes.realloc( nPos + nRead ); - ::rtl_copyMemory( bytes.getArray() + nPos, readBytes.getConstArray(), (sal_uInt32)nRead ); - } - */ xStream->closeInput(); // set clipboard content @@ -1175,7 +1161,7 @@ void DlgEditor::Paste() { Reference< resource::XStringResourceResolver > xSourceStringResolver( xStringResourcePersistence, UNO_QUERY ); - LocalizationMgr::moveResourcesForPastedEditorObject( this, + LocalizationMgr::copyResourcesForPastedEditorObject( this, aControlAny, aOUniqueName, xSourceStringResolver ); } else |