diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-19 19:07:14 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:26:25 +0100 |
| commit | 12f6e237b8b7b8ff9508edc9e348a387290c240c (patch) | |
| tree | 1db57e584ff7613edfac522f9b1b88a4c4ad0060 /sw | |
| parent | e218bbcbf60345115772ccb2fa63418c13895bd0 (diff) | |
vclptr: misc. bug fixing.
Change-Id: Id56188c0f72b74bc9ce6eed558a8339d4175d628
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/tiledrendering/tiledrendering.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index c89d6f49574e..8f9a51aee6dc 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -130,14 +130,14 @@ IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG ) // // SystemGraphicsData aData; // [setup the aData] - // VirtualDevice aDevice(&aData, [color depth]); + // VirtualDevice pDevice(&aData, [color depth]); ScopedVclPtr< VirtualDevice > pDevice(new VirtualDevice()); // paint to it pViewShell->PaintTile(*pDevice.get(), contextWidth, contextHeight, tilePosX, tilePosY, tileWidth, tileHeight); - // copy the aDevice content to mpImage - Bitmap aBitmap(pDevice->GetBitmap(aDevice->PixelToLogic(Point(0,0)), pDevice->PixelToLogic(Size(contextWidth, contextHeight)))); + // copy the pDevice content to mpImage + Bitmap aBitmap(pDevice->GetBitmap(pDevice->PixelToLogic(Point(0,0)), pDevice->PixelToLogic(Size(contextWidth, contextHeight)))); mpImage->SetImage(Image(aBitmap)); // update the dialog size diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 91ac5290f87a..d8ec94862bd0 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1248,7 +1248,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) co GDIMetaFile aMtf; aMtf.Record( pVirtDev.get() ); - aGrf.Draw( &aVirtDev, aPt, aSz ); + aGrf.Draw( pVirtDev, aPt, aSz ); aMtf.Stop(); aMtf.SetPrefMapMode( aTmp ); aMtf.SetPrefSize( aSz ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 00ce3847aab1..6ad6d8350762 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -7671,7 +7671,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) vcl::Window *pWin = pSh->GetWin(); sal_uInt16 nZoom = pSh->GetViewOptions()->GetZoom(); - ::SetOutDevAndWin( pSh, &aDev, 0, 100 ); + ::SetOutDevAndWin( pSh, pDev, 0, 100 ); gProp.bSFlyMetafile = true; gProp.pSFlyMetafileOut = pWin; @@ -7689,15 +7689,15 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) pImp->PaintLayer( pIDDMA->GetHellId(), 0, aOut, &aPageBackgrdColor, pFlyPage->IsRightToLeft(), &aSwRedirector ); - gProp.pSLines->PaintLines( &aDev, gProp ); + gProp.pSLines->PaintLines( pDev, gProp ); if ( pFly->IsFlyInCntFrm() ) pFly->Paint( aOut ); - gProp.pSLines->PaintLines( &aDev, gProp ); + gProp.pSLines->PaintLines( pDev, gProp ); // OD 30.08.2002 #102450# - add 3rd parameter pImp->PaintLayer( pIDDMA->GetHeavenId(), 0, aOut, &aPageBackgrdColor, pFlyPage->IsRightToLeft(), &aSwRedirector ); - gProp.pSLines->PaintLines( &aDev, gProp ); + gProp.pSLines->PaintLines( pDev, gProp ); DELETEZ( gProp.pSLines ); gProp.pSFlyOnlyDraw = 0; |