diff options
| author | Kurt Zenker <kz@openoffice.org> | 2011-04-12 16:50:12 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2011-04-12 16:50:12 +0200 |
| commit | f468f344e424802b977f85dedc1a862a9314b240 (patch) | |
| tree | 9b5e34890593b85041eea21992961dd7cd94361a | |
| parent | b4221af29dacb70b8a03777624a5988d6657131f (diff) | |
| parent | 0d8b141a8081ff5172d98f3d6b51266833085a6c (diff) | |
CWS-TOOLING: integrate CWS aw084_OOO340
| -rw-r--r-- | drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 21 |
2 files changed, 24 insertions, 1 deletions
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index a08f718e4283..3ed8d135ffbd 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -408,7 +408,9 @@ namespace drawinglayer } catch(const uno::Exception&) { - DBG_UNHANDLED_EXCEPTION(); + // #i116763# removing since there is a good alternative when the xControlView + // is not found and it is allowed to happen + // DBG_UNHANDLED_EXCEPTION(); // process recursively and use the decomposition as Bitmap process(rCandidate.get2DDecomposition(getViewInformation2D())); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 352fb8ace115..b9e00cf89008 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2948,6 +2948,27 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta // Ueber die Portions der Zeile... // -------------------------------------------------- nIndex = pLine->GetStart(); + + // #i108052# When stripping a callback for empty paragraphs is needed. This + // was somehow lost/removed/killed by making the TextPortions with empty + // paragraph to type PORTIONKIND_TAB instead of PORTIONKIND_TEXT. Adding here + // since I could not find out who and why this has changed. + if(bStripOnly && pLine->GetStartPortion() == pLine->GetEndPortion()) + { + const Color aOverlineColor(pOutDev->GetOverlineColor()); + const Color aTextLineColor(pOutDev->GetTextLineColor()); + + GetEditEnginePtr()->DrawingText( + aTmpPos, String(), 0, 0, 0, + aTmpFont, n, nIndex, 0, + 0, + 0, + false, true, false, // support for EOL/EOP TEXT comments + 0, + aOverlineColor, + aTextLineColor); + } + for ( sal_uInt16 y = pLine->GetStartPortion(); y <= pLine->GetEndPortion(); y++ ) { DBG_ASSERT( pPortion->GetTextPortions().Count(), "Zeile ohne Textportion im Paint!" ); |