diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:59:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:59:41 +0000 |
| commit | 695fa2b020b958617e6a23c03b9ed32df3e2c9f4 (patch) | |
| tree | 126a6ab04b24bf478e0d56db842fbb9d1d9dbf5c /svx | |
| parent | c9fc0a2e7a395800fc71277adbca1de60792ca63 (diff) | |
INTEGRATION: CWS sb19 (1.96.88); FILE MERGED
2004/12/08 22:40:08 sb 1.96.88.2: RESYNC: (1.96-1.97); FILE MERGED
2004/10/27 07:30:35 mba 1.96.88.1: #110407#: remove static BaseURL
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/editeng/impedit2.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index a2ee43d04c0e..70cb9db97a63 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impedit2.cxx,v $ * - * $Revision: 1.97 $ + * $Revision: 1.98 $ * - * last change: $Author: rt $ $Date: 2004-11-26 18:12:39 $ + * last change: $Author: rt $ $Date: 2005-01-11 12:59:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3319,7 +3319,7 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable( #endif } -EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransferable >& rxDataObj, const EditPaM& rPaM, BOOL bUseSpecial ) +EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, BOOL bUseSpecial ) { EditSelection aNewSelection( rPaM ); @@ -3339,7 +3339,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer aData >>= aSeq; { SvMemoryStream aBinStream( aSeq.getArray(), aSeq.getLength(), STREAM_READ ); - aNewSelection = Read( aBinStream, EE_FORMAT_BIN, rPaM ); + aNewSelection = Read( aBinStream, rBaseURL, EE_FORMAT_BIN, rPaM ); } bDone = TRUE; } @@ -3373,7 +3373,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer aData >>= aSeq; { SvMemoryStream aRTFStream( aSeq.getArray(), aSeq.getLength(), STREAM_READ ); - aNewSelection = Read( aRTFStream, EE_FORMAT_RTF, rPaM ); + aNewSelection = Read( aRTFStream, rBaseURL, EE_FORMAT_RTF, rPaM ); } bDone = TRUE; } |