diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 13:55:27 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 13:55:27 +0000 |
| commit | 296cd0541245669b75d0e49ef5fcfda7b130cfd9 (patch) | |
| tree | a810a41a78c9be27a84d3ff450d205c4a7793c9f /svx/source/svdraw | |
| parent | e916045dd5741e35e1d10b04b8be64e21cbf930f (diff) | |
INTEGRATION: CWS aw053 (1.80.66); FILE MERGED
2007/09/14 10:37:10 aw 1.80.66.1: #i80528# Removal of draft paint modes
Diffstat (limited to 'svx/source/svdraw')
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 73 |
1 files changed, 31 insertions, 42 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 3b10fe7ea57e..152325120d8f 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdoole2.cxx,v $ * - * $Revision: 1.81 $ + * $Revision: 1.82 $ * - * last change: $Author: ihi $ $Date: 2007-11-26 13:35:35 $ + * last change: $Author: ihi $ $Date: 2007-11-26 14:55:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1252,56 +1252,45 @@ sal_Bool SdrOle2Obj::DoPaintObject(XOutputDevice& rOut, const SdrPaintInfoRec& r //if ( ( nState != embed::EmbedStates::INPLACE_ACTIVE && nState != embed::EmbedStates::UI_ACTIVE ) || // pModel && SfxInPlaceClient::GetActiveWindow( pModel->GetPersist(), xObjRef ) != pOut ) { - if ((rInfoRec.nPaintMode & SDRPAINTMODE_DRAFTGRAF) ==0) + if ( nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) { - if ( nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) + // PlugIn-Objekt connecten + if (rInfoRec.pPV!=NULL) { - // PlugIn-Objekt connecten - if (rInfoRec.pPV!=NULL) - { - SdrOle2Obj* pOle2Obj = (SdrOle2Obj*) this; - SdrView* pSdrView = (SdrView*) &rInfoRec.pPV->GetView(); - pSdrView->DoConnect(pOle2Obj); - } + SdrOle2Obj* pOle2Obj = (SdrOle2Obj*) this; + SdrView* pSdrView = (SdrView*) &rInfoRec.pPV->GetView(); + pSdrView->DoConnect(pOle2Obj); } + } - // #108759# Temporarily set the current background - // color, since OLEs rely on that during - // auto-colored text rendering - Wallpaper aOldBg( pOut->GetBackground() ); + // #108759# Temporarily set the current background + // color, since OLEs rely on that during + // auto-colored text rendering + Wallpaper aOldBg( pOut->GetBackground() ); - if( rInfoRec.pPV && GetPage() ) - pOut->SetBackground( rInfoRec.pPV->GetView().CalcBackgroundColor( GetSnapRect(), - rInfoRec.pPV->GetVisibleLayers(), - *GetPage() ) ); + if( rInfoRec.pPV && GetPage() ) + pOut->SetBackground( rInfoRec.pPV->GetView().CalcBackgroundColor( GetSnapRect(), + rInfoRec.pPV->GetVisibleLayers(), + *GetPage() ) ); - pOut->Push( PUSH_CLIPREGION ); - pOut->IntersectClipRegion( aRect ); + pOut->Push( PUSH_CLIPREGION ); + pOut->IntersectClipRegion( aRect ); - GetGraphic(); - PaintGraphic_Impl( rOut, rInfoRec, nState == embed::EmbedStates::ACTIVE ); + GetGraphic(); + PaintGraphic_Impl( rOut, rInfoRec, nState == embed::EmbedStates::ACTIVE ); - /* - if ( !mpImpl->pMetaFile ) - GetGDIMetaFile(); - if ( mpImpl->pMetaFile ) - mpImpl->pMetaFile->Play( pOut, aRect.TopLeft(), aRect.GetSize() ); - //(*ppObjRef)->DoDraw(pOut,aRect.TopLeft(),aRect.GetSize(),JobSetup()); - */ + /* + if ( !mpImpl->pMetaFile ) + GetGDIMetaFile(); + if ( mpImpl->pMetaFile ) + mpImpl->pMetaFile->Play( pOut, aRect.TopLeft(), aRect.GetSize() ); + //(*ppObjRef)->DoDraw(pOut,aRect.TopLeft(),aRect.GetSize(),JobSetup()); + */ - pOut->Pop(); + pOut->Pop(); - // #108759# Restore old background - pOut->SetBackground( aOldBg ); - } - else if( ( rInfoRec.nPaintMode & SDRPAINTMODE_HIDEDRAFTGRAF ) == 0 ) - { // sonst SDRPAINTMODE_DRAFTGRAF - Polygon aPoly(Rect2Poly(aRect,aGeo)); - pOut->SetLineColor(Color(COL_BLACK)); - pOut->DrawPolyLine(aPoly); - pOut->DrawLine(aPoly[0],aPoly[2]); - pOut->DrawLine(aPoly[1],aPoly[3]); - } + // #108759# Restore old background + pOut->SetBackground( aOldBg ); } } else if ( GetGraphic() ) |