summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/backendtest/VisualBackendTest.cxx2
-rw-r--r--vcl/backendtest/outputdevice/outputdevice.cxx2
-rw-r--r--vcl/qa/cppunit/svm/svmtest.cxx48
-rw-r--r--vcl/source/gdi/gdimtf.cxx4
-rw-r--r--vcl/source/gdi/impanmvw.cxx2
-rw-r--r--vcl/source/gdi/impgraph.cxx2
-rw-r--r--vcl/source/gdi/print2.cxx18
-rw-r--r--vcl/source/graphic/GraphicObject2.cxx4
-rw-r--r--vcl/source/graphic/Manager.cxx2
-rw-r--r--vcl/source/image/ImplImageTree.cxx2
-rw-r--r--vcl/source/uitest/uiobject.cxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx2
-rw-r--r--vcl/win/gdi/gdiimpl.cxx4
-rw-r--r--vcl/win/gdi/salgdi2.cxx10
-rw-r--r--vcl/workben/vcldemo.cxx2
15 files changed, 53 insertions, 53 deletions
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index 07aa218cf137..366005a5b198 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -432,7 +432,7 @@ public:
rRenderContext.DrawOutDev(Point(), mpVDev->GetOutputSizePixel(),
Point(), mpVDev->GetOutputSizePixel(),
- *mpVDev.get());
+ *mpVDev);
rRenderContext.SetTextColor(COL_LIGHTRED);
rRenderContext.DrawText(Point(10, 10), "FPS: " + OUString::number(int(fps)));
return;
diff --git a/vcl/backendtest/outputdevice/outputdevice.cxx b/vcl/backendtest/outputdevice/outputdevice.cxx
index 1b2bc1a1bf59..408ce09551f7 100644
--- a/vcl/backendtest/outputdevice/outputdevice.cxx
+++ b/vcl/backendtest/outputdevice/outputdevice.cxx
@@ -23,7 +23,7 @@ Bitmap OutputDeviceTestAnotherOutDev::setupDrawOutDev()
initialSetup(13, 13, constBackgroundColor);
- mpVirtualDevice->DrawOutDev(Point(2, 2), aSourceSize, Point(), aSourceSize, *pSourceDev.get());
+ mpVirtualDevice->DrawOutDev(Point(2, 2), aSourceSize, Point(), aSourceSize, *pSourceDev);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index 163522634781..3de88cec4a18 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -241,7 +241,7 @@ void SvmTest::testPixel()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawPixel(Point(8, 1), COL_GREEN);
pVirtualDev->DrawPixel(Point(1, 8), COL_BLUE);
@@ -262,7 +262,7 @@ void SvmTest::testPoint()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawPixel(Point(4, 4));
@@ -304,7 +304,7 @@ void SvmTest::testLine()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawLine(Point(1, 1), Point(8, 8));
LineInfo aLineInfo(LineStyle::Dash, 7);
@@ -338,7 +338,7 @@ void SvmTest::testRect()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -366,7 +366,7 @@ void SvmTest::testRoundRect()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -393,7 +393,7 @@ void SvmTest::testEllipse()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -423,7 +423,7 @@ void SvmTest::testArc()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -453,7 +453,7 @@ void SvmTest::testPie()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -483,7 +483,7 @@ void SvmTest::testChord()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -526,7 +526,7 @@ void SvmTest::testPolyLine()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
tools::Polygon aPolygon(3);
aPolygon.SetPoint(Point(1, 8), 0);
@@ -578,7 +578,7 @@ void SvmTest::testPolygon()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
tools::Polygon aPolygon(3);
aPolygon.SetPoint(Point(1, 8), 0);
@@ -621,7 +621,7 @@ void SvmTest::testPolyPolygon()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
tools::Polygon aPolygon(3);
aPolygon.SetPoint(Point(1, 8), 0);
@@ -663,7 +663,7 @@ void SvmTest::testText()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawText(Point(4,6), "xABC", 1, 2);
@@ -685,7 +685,7 @@ void SvmTest::testTextArray()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
long const aDX[] = { 10, 15, 20, 25, 30, 35 };
pVirtualDev->DrawTextArray(Point(4,6), "123456", aDX, 1, 4);
@@ -707,7 +707,7 @@ void SvmTest::testStrechText()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawStretchText(Point(4,6), 10, "123456", 1, 4);
checkStrechText(writeAndRead(aGDIMetaFile, "strecthtext.svm"));
@@ -728,7 +728,7 @@ void SvmTest::testTextRect()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawText(tools::Rectangle(Point(0,0), Size(5,5)), "123456", DrawTextFlags::Center);
checkTextRect(writeAndRead(aGDIMetaFile, "textrectangle.svm"));
@@ -748,7 +748,7 @@ void SvmTest::testTextLine()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawTextLine(Point(4,6), 10, STRIKEOUT_SINGLE, LINESTYLE_SINGLE, LINESTYLE_SINGLE);
checkTextLine(writeAndRead(aGDIMetaFile, "textline.svm"));
@@ -785,7 +785,7 @@ void SvmTest::testBitmaps()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
Bitmap aBitmap1(Size(4,4), 24);
{
@@ -846,7 +846,7 @@ void SvmTest::testBitmapExs()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
Bitmap aBitmap1(Size(4,4), 24);
{
@@ -902,7 +902,7 @@ void SvmTest::testMasks()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
Bitmap aBitmap1(Size(4,4), 24);
{
@@ -948,7 +948,7 @@ void SvmTest::testPushPop()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(COL_YELLOW);
pVirtualDev->Push();
@@ -977,7 +977,7 @@ void SvmTest::testTextColor()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetTextColor(Color(0x123456));
@@ -997,7 +997,7 @@ void SvmTest::testTextFillColor()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetTextFillColor(Color(0x234567));
@@ -1017,7 +1017,7 @@ void SvmTest::testTextLineColor()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetTextLineColor(Color(0x345678));
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 13b57d27e1e0..db292eebb298 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1024,7 +1024,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
{
MetaGradientAction* pAct = static_cast<MetaGradientAction*>(pAction);
- ImplAddGradientEx( aMtf, *aMapVDev.get(),
+ ImplAddGradientEx( aMtf, *aMapVDev,
ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos ),
pAct->GetGradient() );
}
@@ -1056,7 +1056,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
{
// Add rotated gradientex
MetaGradientExAction* pAct = static_cast<MetaGradientExAction*>(pAction);
- ImplAddGradientEx( aMtf, *aMapVDev.get(),
+ ImplAddGradientEx( aMtf, *aMapVDev,
ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ),
pAct->GetGradient() );
}
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 0c13f5fd6f9d..9b5a2de8acfd 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -182,7 +182,7 @@ void ImplAnimView::drawToPos( sal_uLong nPos )
if (xOldClip)
pRenderContext->SetClipRegion( maClip );
- pRenderContext->DrawOutDev( maDispPt, maDispSz, Point(), maSzPix, *aVDev.get() );
+ pRenderContext->DrawOutDev( maDispPt, maDispSz, Point(), maSzPix, *aVDev );
if (pGuard)
pGuard->SetPaintRect(tools::Rectangle(maDispPt, maDispSz));
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 7d1cbbde664d..45c00a8d3f88 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -707,7 +707,7 @@ Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters)
{
// get hairline and full bound rect
tools::Rectangle aHairlineRect;
- const tools::Rectangle aRect(maMetaFile.GetBoundRect(*aVDev.get(), &aHairlineRect));
+ const tools::Rectangle aRect(maMetaFile.GetBoundRect(*aVDev, &aHairlineRect));
if(!aRect.IsEmpty() && !aHairlineRect.IsEmpty())
{
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 8390b97286ab..373acaba0700 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -762,7 +762,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
aBackgroundComponent.aBounds,
aBackgroundComponent.aBgColor,
static_cast<const MetaRectAction*>(pCurrAct)->GetRect(),
- *aMapModeVDev.get()) )
+ *aMapModeVDev) )
bStillBackground=false; // incomplete occlusion of background
else
nLastBgAction=nActionNum; // this _is_ background
@@ -778,7 +778,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
aBackgroundComponent.aBounds,
aBackgroundComponent.aBgColor,
aPoly.GetBoundRect(),
- *aMapModeVDev.get()) )
+ *aMapModeVDev) )
bStillBackground=false; // incomplete occlusion of background
else
nLastBgAction=nActionNum; // this _is_ background
@@ -795,7 +795,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
aBackgroundComponent.aBounds,
aBackgroundComponent.aBgColor,
aPoly.GetBoundRect(),
- *aMapModeVDev.get()) )
+ *aMapModeVDev) )
bStillBackground=false; // incomplete occlusion of background
else
nLastBgAction=nActionNum; // this _is_ background
@@ -807,7 +807,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
aBackgroundComponent.aBounds,
aBackgroundComponent.aBgColor,
static_cast<const MetaWallpaperAction*>(pCurrAct)->GetRect(),
- *aMapModeVDev.get()) )
+ *aMapModeVDev) )
bStillBackground=false; // incomplete occlusion of background
else
nLastBgAction=nActionNum; // this _is_ background
@@ -816,14 +816,14 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
default:
{
if( ImplIsNotTransparent( *pCurrAct,
- *aMapModeVDev.get() ) )
+ *aMapModeVDev ) )
bStillBackground=false; // non-transparent action, possibly
// not uniform
else
// extend current bounds (next uniform action
// needs to fully cover this area)
aBackgroundComponent.aBounds.Union(
- ImplCalcActionBounds(*pCurrAct, *aMapModeVDev.get()) );
+ ImplCalcActionBounds(*pCurrAct, *aMapModeVDev) );
break;
}
}
@@ -871,7 +871,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
pCurrAct->Execute( aMapModeVDev.get() );
// cache bounds of current action
- const tools::Rectangle aBBCurrAct( ImplCalcActionBounds(*pCurrAct, *aMapModeVDev.get()) );
+ const tools::Rectangle aBBCurrAct( ImplCalcActionBounds(*pCurrAct, *aMapModeVDev) );
// accumulate collected bounds here, initialize with current action
tools::Rectangle aTotalBounds( aBBCurrAct ); // thus,
@@ -897,7 +897,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
// not be considered for connected components,
// too. Just put each of them into a separate
// component.
- aTotalComponents.bIsFullyTransparent = !ImplIsNotTransparent(*pCurrAct, *aMapModeVDev.get());
+ aTotalComponents.bIsFullyTransparent = !ImplIsNotTransparent(*pCurrAct, *aMapModeVDev);
if( !aBBCurrAct.IsEmpty() &&
!aTotalComponents.bIsFullyTransparent )
@@ -1294,7 +1294,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
// given background color
ImplConvertTransparentAction(rOutMtf,
*pCurrAct,
- *aMapModeVDev.get(),
+ *aMapModeVDev,
aBackgroundComponent.aBgColor);
}
else
diff --git a/vcl/source/graphic/GraphicObject2.cxx b/vcl/source/graphic/GraphicObject2.cxx
index ac3be21a5bfa..7148c1098c87 100644
--- a/vcl/source/graphic/GraphicObject2.cxx
+++ b/vcl/source/graphic/GraphicObject2.cxx
@@ -306,7 +306,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r
aVDev->SetMapMode( aMapMode );
// draw bitmap content
- if( ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX,
+ if( ImplRenderTempTile( *aVDev, nNumTilesInCacheX,
nNumTilesInCacheY, rSizePixel, pAttr ) )
{
BitmapEx aTileBitmap( aVDev->GetBitmap( Point(0,0), aVDev->GetOutputSize() ) );
@@ -321,7 +321,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r
else
aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetMask() );
- if( aAlphaGraphic.ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX,
+ if( aAlphaGraphic.ImplRenderTempTile( *aVDev, nNumTilesInCacheX,
nNumTilesInCacheY, rSizePixel, pAttr ) )
{
// Combine bitmap and alpha/mask
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 83c2dfb73529..98ef80eebddc 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -146,7 +146,7 @@ void Manager::unregisterGraphic(ImpGraphic* pImpGraphic)
std::shared_ptr<ImpGraphic> Manager::copy(std::shared_ptr<ImpGraphic> const& rImpGraphicPtr)
{
- auto pReturn = std::make_shared<ImpGraphic>(*rImpGraphicPtr.get());
+ auto pReturn = std::make_shared<ImpGraphic>(*rImpGraphicPtr);
registerGraphic(pReturn, "Copy");
return pReturn;
}
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 2a42ae235532..b6ea1196c054 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -163,7 +163,7 @@ void loadImageFromStream(std::shared_ptr<SvStream> const & xStream, OUString con
else if (rPath.endsWith(".svg"))
{
rParameters.mbWriteImageToCache = true; // We always want to cache a SVG image
- vcl::bitmap::loadFromSvg(*xStream.get(), rPath, rParameters.mrBitmap, aScalePercentage / 100.0);
+ vcl::bitmap::loadFromSvg(*xStream, rPath, rParameters.mrBitmap, aScalePercentage / 100.0);
if (bConvertToDarkTheme)
BitmapFilter::Filter(rParameters.mrBitmap, BitmapLightenFilter());
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 899fbb97d75c..37b9636f2906 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -465,7 +465,7 @@ OUString escape(const OUString& rStr)
OUString WindowUIObject::dumpState() const
{
OUStringBuffer aStateString = "{\"name\":\"" + mxWindow->get_id() + "\"";
- aStateString.append(", \"ImplementationName\":\"").appendAscii(typeid(*mxWindow.get()).name()).append("\"");
+ aStateString.append(", \"ImplementationName\":\"").appendAscii(typeid(*mxWindow).name()).append("\"");
StringMap aState = const_cast<WindowUIObject*>(this)->get_state();
for (auto const& elem : aState)
{
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 1af613902663..8b45e80c9327 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -566,7 +566,7 @@ cairo::SurfaceSharedPtr X11SalGraphics::CreateBitmapSurface( const OutputDevice&
css::uno::Any X11SalGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& /*rSize*/) const
{
- cairo::X11Surface& rXlibSurface=dynamic_cast<cairo::X11Surface&>(*rSurface.get());
+ cairo::X11Surface& rXlibSurface=dynamic_cast<cairo::X11Surface&>(*rSurface);
css::uno::Sequence< css::uno::Any > args( 3 );
args[0] <<= false; // do not call XFreePixmap on it
args[1] <<= rXlibSurface.getPixmap()->mhDrawable;
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index b9041acdefd4..2eb537931d50 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -2436,7 +2436,7 @@ bool WinSalGraphicsImpl::TryDrawBitmapGDIPlus(const SalTwoRect& rTR, const SalBi
paintToGdiPlus(
aGraphics,
rTR,
- *aARGB.get());
+ *aARGB);
return true;
}
@@ -2489,7 +2489,7 @@ bool WinSalGraphicsImpl::drawAlphaBitmap(
paintToGdiPlus(
aGraphics,
rTR,
- *aARGB.get());
+ *aARGB);
return true;
}
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 4167d1a78c39..394ac4acebe8 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -169,8 +169,8 @@ void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSal
{
std::unique_ptr<WinSalBitmap> pWinSalBitmap(new WinSalBitmap());
SalBitmap& rConstBitmap = const_cast<SalBitmap&>(rSalBitmap);
- convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap.get());
- mpImpl->drawBitmap(rPosAry, *pWinSalBitmap.get());
+ convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap);
+ mpImpl->drawBitmap(rPosAry, *pWinSalBitmap);
}
else
{
@@ -187,14 +187,14 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
{
std::unique_ptr<WinSalBitmap> pWinSalBitmap(new WinSalBitmap());
SalBitmap& rConstBitmap = const_cast<SalBitmap&>(rSSalBitmap);
- convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap.get());
+ convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap);
std::unique_ptr<WinSalBitmap> pWinTransparentSalBitmap(new WinSalBitmap());
SalBitmap& rConstTransparentBitmap = const_cast<SalBitmap&>(rSTransparentBitmap);
- convertToWinSalBitmap(rConstTransparentBitmap, *pWinTransparentSalBitmap.get());
+ convertToWinSalBitmap(rConstTransparentBitmap, *pWinTransparentSalBitmap);
- mpImpl->drawBitmap(rPosAry, *pWinSalBitmap.get(), *pWinTransparentSalBitmap.get());
+ mpImpl->drawBitmap(rPosAry, *pWinSalBitmap, *pWinTransparentSalBitmap);
}
else
{
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index ab59b663efb1..f6b0c2338e33 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1917,7 +1917,7 @@ public:
pDev->DrawWallpaper(aSubRect, aWallpaper );
rRenderContext.DrawOutDev(aExclude.TopLeft(), aExclude.GetSize(),
- Point( 0, 0 ), aExclude.GetSize(), *pDev.get() );
+ Point( 0, 0 ), aExclude.GetSize(), *pDev );
}
};
generated by cgit (git 2.34.1) at 2025-01-06 11:15:51 +0000