diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:04:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:04:42 +0000 |
| commit | 5c7810fa899e58a23b044b2ad7dcc77cbc1a5d49 (patch) | |
| tree | e47268ef7c760ee3cfd58b30dbf4d76f6157d2a7 | |
| parent | f142b9f9b397c78096a01c7963d66c7d8da129e5 (diff) | |
INTEGRATION: CWS sb19 (1.20.86); FILE MERGED
2004/12/08 23:12:12 sb 1.20.86.2: RESYNC: (1.20-1.21); FILE MERGED
2004/10/27 07:30:44 mba 1.20.86.1: #110407#: remove static BaseURL
| -rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 6e39e347d8ae..4e8b05138cc6 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdxcgv.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: pjunck $ $Date: 2004-11-03 11:07:23 $ + * last change: $Author: rt $ $Date: 2005-01-11 13:04:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -310,7 +310,7 @@ BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList return TRUE; } -BOOL SdrExchangeView::Paste(SvStream& rInput, USHORT eFormat, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) { Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); @@ -346,7 +346,7 @@ BOOL SdrExchangeView::Paste(SvStream& rInput, USHORT eFormat, const Point& rPos, pObj->SetMergedItemSet(aTempAttr); - pObj->NbcSetText(rInput,eFormat); + pObj->NbcSetText(rInput,rBaseURL,eFormat); pObj->FitFrameToTextSize(); Size aSiz(pObj->GetLogicRect().GetSize()); MapUnit eMap=pMod->GetScaleUnit(); |