diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:02:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:02:09 +0000 |
| commit | c2221a03c0c8d82d165a2c94382aaf820fc628c2 (patch) | |
| tree | 72bc0f112e9c0cb820134802101bfe4b31f3c88e /svx/source/outliner/outliner.cxx | |
| parent | fc75f4d26abdceaf4c13de5a78fcf449a77ffe37 (diff) | |
INTEGRATION: CWS sb19 (1.56.472); FILE MERGED
2004/12/08 22:59:34 sb 1.56.472.2: RESYNC: (1.56-1.57); FILE MERGED
2004/10/27 07:30:40 mba 1.56.472.1: #110407#: remove static BaseURL
Diffstat (limited to 'svx/source/outliner/outliner.cxx')
| -rw-r--r-- | svx/source/outliner/outliner.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx index d58c45dbcc..e107d7f073 100644 --- a/svx/source/outliner/outliner.cxx +++ b/svx/source/outliner/outliner.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outliner.cxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: rt $ $Date: 2004-11-26 18:13:51 $ + * last change: $Author: rt $ $Date: 2005-01-11 13:02:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1202,10 +1202,10 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos, // aTextPos ist Bottom, jetzt die Baseline liefern: FontMetric aMetric( pOutDev->GetFontMetric() ); aTextPos.Y() -= aMetric.GetDescent(); - + // #101498# DrawingText( aTextPos, pPara->GetText(), 0, pPara->GetText().Len(), pBuf, aSvxFont, nPara, 0xFFFF, 0xFF); - + delete[] pBuf; } pOutDev->SetFont( aOldFont ); @@ -1300,7 +1300,7 @@ void Outliner::InvalidateBullet( Paragraph* pPara, ULONG nPara ) } } -ULONG Outliner::Read( SvStream& rInput, USHORT eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ) +ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ) { DBG_CHKTHIS(Outliner,0); @@ -1313,7 +1313,7 @@ ULONG Outliner::Read( SvStream& rInput, USHORT eFormat, SvKeyValueIterator* pHTT Clear(); ImplBlockInsertionCallbacks( TRUE ); - ULONG nRet = pEditEngine->Read( rInput, (EETextFormat)eFormat, pHTTPHeaderAttrs ); + ULONG nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs ); bFirstParaIsEmpty = FALSE; |