summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/impgraph.cxx11
-rw-r--r--vcl/source/gdi/impvect.cxx3
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx5
-rw-r--r--vcl/source/gdi/pngread.cxx9
-rw-r--r--vcl/source/gdi/region.cxx21
-rw-r--r--vcl/source/gdi/svmconverter.cxx3
-rw-r--r--vcl/source/gdi/wall.cxx21
7 files changed, 33 insertions, 40 deletions
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 45c00a8d3f88..f99d44799aaa 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -43,7 +43,6 @@
#include <com/sun/star/graphic/XPrimitive2D.hpp>
#include <vcl/dibtools.hxx>
#include <memory>
-#include <o3tl/make_unique.hxx>
#include <vcl/gdimetafiletools.hxx>
#include <vcl/pdfread.hxx>
@@ -208,7 +207,7 @@ ImpGraphic::ImpGraphic(const ImpGraphic& rImpGraphic)
{
if( rImpGraphic.mpAnimation )
{
- mpAnimation = o3tl::make_unique<Animation>( *rImpGraphic.mpAnimation );
+ mpAnimation = std::make_unique<Animation>( *rImpGraphic.mpAnimation );
maEx = mpAnimation->GetBitmapEx();
}
}
@@ -286,7 +285,7 @@ ImpGraphic::ImpGraphic(const VectorGraphicDataPtr& rVectorGraphicDataPtr)
ImpGraphic::ImpGraphic( const Animation& rAnimation ) :
maEx ( rAnimation.GetBitmapEx() ),
- mpAnimation ( o3tl::make_unique<Animation>( rAnimation ) ),
+ mpAnimation ( std::make_unique<Animation>( rAnimation ) ),
meType ( GraphicType::Bitmap ),
mnSizeBytes ( 0 ),
mbSwapOut ( false ),
@@ -334,7 +333,7 @@ ImpGraphic& ImpGraphic::operator=( const ImpGraphic& rImpGraphic )
if ( rImpGraphic.mpAnimation )
{
- mpAnimation = o3tl::make_unique<Animation>( *rImpGraphic.mpAnimation );
+ mpAnimation = std::make_unique<Animation>( *rImpGraphic.mpAnimation );
maEx = mpAnimation->GetBitmapEx();
}
else
@@ -1459,7 +1458,7 @@ bool ImpGraphic::ImplSwapOut()
bRet = ImplSwapOut( xOStm.get() );
if( bRet )
{
- mpSwapFile = o3tl::make_unique<ImpSwapFile>();
+ mpSwapFile = std::make_unique<ImpSwapFile>();
mpSwapFile->aSwapURL = aTmpURL;
mpSwapFile->maOriginURL = getOriginURL();
}
@@ -1813,7 +1812,7 @@ void ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
if( !rIStm.GetError() && ( 0x5344414e == nMagic1 ) && ( 0x494d4931 == nMagic2 ) )
{
- rImpGraphic.mpAnimation = o3tl::make_unique<Animation>();
+ rImpGraphic.mpAnimation = std::make_unique<Animation>();
ReadAnimation( rIStm, *rImpGraphic.mpAnimation );
// #108077# manually set loaded BmpEx to Animation
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 896182663dca..a27094c02f9a 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include <sal/log.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/bitmapaccess.hxx>
#include <tools/poly.hxx>
#include <tools/helpers.hxx>
@@ -167,7 +166,7 @@ void ImplPointArray::ImplSetSize( sal_uLong nSize )
mnSize = nSize;
mnRealSize = 0;
- mpArray = o3tl::make_unique<Point[]>( nTotal );
+ mpArray = std::make_unique<Point[]>( nTotal );
}
inline Point& ImplPointArray::operator[]( sal_uLong nPos )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3afb4c509abf..cdcfdc00bd3b 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -42,7 +42,6 @@
#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/numeric.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/file.hxx>
#include <osl/thread.h>
#include <rtl/crc.h>
@@ -2090,8 +2089,8 @@ void PDFWriterImpl::beginCompression()
{
if (!g_bDebugDisableCompression)
{
- m_pCodec = o3tl::make_unique<ZCodec>( 0x4000, 0x4000 );
- m_pMemStream = o3tl::make_unique<SvMemoryStream>();
+ m_pCodec = std::make_unique<ZCodec>( 0x4000, 0x4000 );
+ m_pMemStream = std::make_unique<SvMemoryStream>();
m_pCodec->BeginCompression();
}
}
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index f4bdbf8ae9bc..a3f449b4f8ab 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -35,7 +35,6 @@
#include <vcl/svapp.hxx>
#include <vcl/alpha.hxx>
#include <osl/endian.h>
-#include <o3tl/make_unique.hxx>
#include <bitmapwriteaccess.hxx>
namespace vcl
@@ -666,14 +665,14 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
if ( !mpInflateInBuf || !mpScanPrior )
return false;
- mpBmp = o3tl::make_unique<Bitmap>( maTargetSize, mnTargetDepth );
+ mpBmp = std::make_unique<Bitmap>( maTargetSize, mnTargetDepth );
mxAcc = BitmapScopedWriteAccess(*mpBmp);
if (!mxAcc)
return false;
if ( mbAlphaChannel )
{
- mpAlphaMask = o3tl::make_unique<AlphaMask>( maTargetSize );
+ mpAlphaMask = std::make_unique<AlphaMask>( maTargetSize );
mpAlphaMask->Erase( 128 );
mxAlphaAcc = AlphaScopedWriteAccess(*mpAlphaMask);
mpMaskAcc = mxAlphaAcc.get();
@@ -791,13 +790,13 @@ bool PNGReaderImpl::ImplReadTransparent()
{
if( bNeedAlpha)
{
- mpAlphaMask = o3tl::make_unique<AlphaMask>( maTargetSize );
+ mpAlphaMask = std::make_unique<AlphaMask>( maTargetSize );
mxAlphaAcc = AlphaScopedWriteAccess(*mpAlphaMask);
mpMaskAcc = mxAlphaAcc.get();
}
else
{
- mpMaskBmp = o3tl::make_unique<Bitmap>( maTargetSize, 1 );
+ mpMaskBmp = std::make_unique<Bitmap>( maTargetSize, 1 );
mxMaskAcc = BitmapScopedWriteAccess(*mpMaskBmp);
mpMaskAcc = mxMaskAcc.get();
}
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index ce963a977dbc..ff2fbfdf0580 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -35,7 +35,6 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <tools/poly.hxx>
-#include <o3tl/make_unique.hxx>
namespace
{
@@ -92,7 +91,7 @@ namespace
OSL_ASSERT(ImplIsPolygonRectilinear (rPolyPoly));
// Create a new RegionBand object as container of the bands.
- std::unique_ptr<RegionBand> pRegionBand( o3tl::make_unique<RegionBand>() );
+ std::unique_ptr<RegionBand> pRegionBand( std::make_unique<RegionBand>() );
long nLineId = 0;
// Iterate over all polygons.
@@ -190,7 +189,7 @@ namespace
long nLineID = 0;
// initialisation and creation of Bands
- std::unique_ptr<RegionBand> pRegionBand( o3tl::make_unique<RegionBand>() );
+ std::unique_ptr<RegionBand> pRegionBand( std::make_unique<RegionBand>() );
pRegionBand->CreateBandRange(rPolygonBoundingBox.Top(), rPolygonBoundingBox.Bottom());
// insert polygons
@@ -565,7 +564,7 @@ void vcl::Region::Union( const tools::Rectangle& rRect )
return;
}
- std::unique_ptr<RegionBand> pNew( o3tl::make_unique<RegionBand>(*pCurrent));
+ std::unique_ptr<RegionBand> pNew( std::make_unique<RegionBand>(*pCurrent));
// get justified rectangle
const long nLeft(std::min(rRect.Left(), rRect.Right()));
@@ -656,7 +655,7 @@ void vcl::Region::Intersect( const tools::Rectangle& rRect )
return;
}
- std::unique_ptr<RegionBand> pNew( o3tl::make_unique<RegionBand>(*pCurrent));
+ std::unique_ptr<RegionBand> pNew( std::make_unique<RegionBand>(*pCurrent));
// get justified rectangle
const long nLeft(std::min(rRect.Left(), rRect.Right()));
@@ -735,7 +734,7 @@ void vcl::Region::Exclude( const tools::Rectangle& rRect )
return;
}
- std::unique_ptr<RegionBand> pNew( o3tl::make_unique<RegionBand>(*pCurrent));
+ std::unique_ptr<RegionBand> pNew( std::make_unique<RegionBand>(*pCurrent));
// get justified rectangle
const long nLeft(std::min(rRect.Left(), rRect.Right()));
@@ -818,7 +817,7 @@ void vcl::Region::XOr( const tools::Rectangle& rRect )
}
// only region band mode possibility left here or null/empty
- std::unique_ptr<RegionBand> pNew( o3tl::make_unique<RegionBand>(*getRegionBand()));
+ std::unique_ptr<RegionBand> pNew( std::make_unique<RegionBand>(*getRegionBand()));
// get justified rectangle
const long nLeft(std::min(rRect.Left(), rRect.Right()));
@@ -913,7 +912,7 @@ void vcl::Region::Union( const vcl::Region& rRegion )
}
// prepare source and target
- std::unique_ptr<RegionBand> pNew( o3tl::make_unique<RegionBand>(*pCurrent));
+ std::unique_ptr<RegionBand> pNew( std::make_unique<RegionBand>(*pCurrent));
// union with source
pNew->Union(*pSource);
@@ -1031,7 +1030,7 @@ void vcl::Region::Intersect( const vcl::Region& rRegion )
else
{
// prepare new regionBand
- std::unique_ptr<RegionBand> pNew( o3tl::make_unique<RegionBand>(*pCurrent));
+ std::unique_ptr<RegionBand> pNew( std::make_unique<RegionBand>(*pCurrent));
// intersect with source
pNew->Intersect(*pSource);
@@ -1115,7 +1114,7 @@ void vcl::Region::Exclude( const vcl::Region& rRegion )
}
// prepare source and target
- std::unique_ptr<RegionBand> pNew( o3tl::make_unique<RegionBand>(*pCurrent));
+ std::unique_ptr<RegionBand> pNew( std::make_unique<RegionBand>(*pCurrent));
// union with source
const bool bSuccess(pNew->Exclude(*pSource));
@@ -1202,7 +1201,7 @@ bool vcl::Region::XOr( const vcl::Region& rRegion )
}
// prepare source and target
- std::unique_ptr<RegionBand> pNew( o3tl::make_unique<RegionBand>(*pCurrent));
+ std::unique_ptr<RegionBand> pNew( std::make_unique<RegionBand>(*pCurrent));
// union with source
pNew->XOr(*pSource);
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index c1d40686a50a..defa1b650888 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -35,7 +35,6 @@
#include <svmconverter.hxx>
#include <memory>
-#include <o3tl/make_unique.hxx>
// Inlines
static void ImplReadRect( SvStream& rIStm, tools::Rectangle& rRect )
@@ -994,7 +993,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
case GDI_PUSH_ACTION:
{
- aLIStack.push(o3tl::make_unique<LineInfo>(aLineInfo));
+ aLIStack.push(std::make_unique<LineInfo>(aLineInfo));
rMtf.AddAction( new MetaPushAction( PushFlags::ALL ) );
// #106172# Track font relevant data in shadow VDev
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 3045dfe50a9c..6c127b910944 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -26,7 +26,6 @@
#include <wall2.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/settings.hxx>
-#include <o3tl/make_unique.hxx>
ImplWallpaper::ImplWallpaper() :
maColor( COL_TRANSPARENT ), meStyle( WallpaperStyle::NONE )
@@ -37,13 +36,13 @@ ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) :
maColor( rImplWallpaper.maColor ), meStyle(rImplWallpaper.meStyle)
{
if ( rImplWallpaper.mpBitmap )
- mpBitmap = o3tl::make_unique<BitmapEx>( *rImplWallpaper.mpBitmap );
+ mpBitmap = std::make_unique<BitmapEx>( *rImplWallpaper.mpBitmap );
if( rImplWallpaper.mpCache )
- mpCache = o3tl::make_unique<BitmapEx>( *rImplWallpaper.mpCache );
+ mpCache = std::make_unique<BitmapEx>( *rImplWallpaper.mpCache );
if ( rImplWallpaper.mpGradient )
- mpGradient = o3tl::make_unique<Gradient>( *rImplWallpaper.mpGradient );
+ mpGradient = std::make_unique<Gradient>( *rImplWallpaper.mpGradient );
if ( rImplWallpaper.mpRect )
mpRect = *rImplWallpaper.mpRect;
@@ -82,13 +81,13 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
if( bGrad )
{
- rImplWallpaper.mpGradient = o3tl::make_unique<Gradient>();
+ rImplWallpaper.mpGradient = std::make_unique<Gradient>();
ReadGradient( rIStm, *rImplWallpaper.mpGradient );
}
if( bBmp )
{
- rImplWallpaper.mpBitmap = o3tl::make_unique<BitmapEx>();
+ rImplWallpaper.mpBitmap = std::make_unique<BitmapEx>();
ReadDIBBitmapEx(*rImplWallpaper.mpBitmap, rIStm);
}
@@ -154,13 +153,13 @@ Wallpaper::Wallpaper( const Color& rColor ) : mpImplWallpaper()
Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) : mpImplWallpaper()
{
- mpImplWallpaper->mpBitmap = o3tl::make_unique<BitmapEx>( rBmpEx );
+ mpImplWallpaper->mpBitmap = std::make_unique<BitmapEx>( rBmpEx );
mpImplWallpaper->meStyle = WallpaperStyle::Tile;
}
Wallpaper::Wallpaper( const Gradient& rGradient ) : mpImplWallpaper()
{
- mpImplWallpaper->mpGradient = o3tl::make_unique<Gradient>( rGradient );
+ mpImplWallpaper->mpGradient = std::make_unique<Gradient>( rGradient );
mpImplWallpaper->meStyle = WallpaperStyle::Tile;
}
@@ -169,7 +168,7 @@ Wallpaper::~Wallpaper() = default;
void Wallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) const
{
if( !mpImplWallpaper->mpCache )
- const_cast< ImplWallpaper* >(mpImplWallpaper.get())->mpCache = o3tl::make_unique<BitmapEx>( rBmp );
+ const_cast< ImplWallpaper* >(mpImplWallpaper.get())->mpCache = std::make_unique<BitmapEx>( rBmp );
else
*const_cast< ImplWallpaper* >(mpImplWallpaper.get())->mpCache = rBmp;
}
@@ -229,7 +228,7 @@ void Wallpaper::SetBitmap( const BitmapEx& rBitmap )
if ( mpImplWallpaper->mpBitmap )
*(mpImplWallpaper->mpBitmap) = rBitmap;
else
- mpImplWallpaper->mpBitmap = o3tl::make_unique<BitmapEx>( rBitmap );
+ mpImplWallpaper->mpBitmap = std::make_unique<BitmapEx>( rBitmap );
}
if( WallpaperStyle::NONE == mpImplWallpaper->meStyle || WallpaperStyle::ApplicationGradient == mpImplWallpaper->meStyle)
@@ -256,7 +255,7 @@ void Wallpaper::SetGradient( const Gradient& rGradient )
if ( mpImplWallpaper->mpGradient )
*(mpImplWallpaper->mpGradient) = rGradient;
else
- mpImplWallpaper->mpGradient = o3tl::make_unique<Gradient>( rGradient );
+ mpImplWallpaper->mpGradient = std::make_unique<Gradient>( rGradient );
if( WallpaperStyle::NONE == mpImplWallpaper->meStyle || WallpaperStyle::ApplicationGradient == mpImplWallpaper->meStyle )
mpImplWallpaper->meStyle = WallpaperStyle::Tile;
generated by cgit (git 2.34.1) at 2024-12-27 09:14:57 +0000