o3tl::make_unique -> std::make_unique in dbaccess...framework

Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one

Change-Id: Iad5a422bc5a7da43d905edc91d1c46793332ec5e
Reviewed-on: https://gerrit.libreoffice.org/66545
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 14 insertions, 18 deletions

diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index 8720573e05fc..fc1ec644d9dc 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -26,7 +26,6 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/lineinfo.hxx>
-#include <o3tl/make_unique.hxx>
 #include <vcl/outdevstate.hxx>
 #include <vcl/FilterConfigItem.hxx>
 
diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index d2c002da0900..4ad544efcb56 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -23,7 +23,6 @@
 #include <osl/diagnose.h>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/dibtools.hxx>
-#include <o3tl/make_unique.hxx>
 #include <o3tl/safeint.hxx>
 #include <tools/stream.hxx>
 #include <memory>
@@ -1002,7 +1001,7 @@ namespace emfio
                                 default :
                                     aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::NONE );
                             }
-                            CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfLineStyle>( ReadColor(), aLineInfo, bTransparent ));
+                            CreateObjectIndexed(nIndex, std::make_unique<WinMtfLineStyle>( ReadColor(), aLineInfo, bTransparent ));
                         }
                     }
                     break;
@@ -1092,7 +1091,7 @@ namespace emfio
                                 default :
                                     aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::NONE );
                             }
-                            CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfLineStyle>( aColorRef, aLineInfo, bTransparent ));
+                            CreateObjectIndexed(nIndex, std::make_unique<WinMtfLineStyle>( aColorRef, aLineInfo, bTransparent ));
                         }
                     }
                     break;
@@ -1104,7 +1103,7 @@ namespace emfio
                         if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
                         {
                             mpInputStream->ReadUInt32( nStyle );
-                            CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfFillStyle>( ReadColor(), ( nStyle == BS_HOLLOW ) ));
+                            CreateObjectIndexed(nIndex, std::make_unique<WinMtfFillStyle>( ReadColor(), ( nStyle == BS_HOLLOW ) ));
                         }
                     }
                     break;
@@ -1565,7 +1564,7 @@ namespace emfio
                             // aLogFont.lfHeight = aTransVec.getY();
                             if (mpInputStream->good() && aLogFont.lfHeight != SAL_MIN_INT32 && aLogFont.lfWidth != SAL_MIN_INT32)
                             {
-                                CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfFontStyle>( aLogFont ));
+                                CreateObjectIndexed(nIndex, std::make_unique<WinMtfFontStyle>( aLogFont ));
                             }
                         }
                     }
@@ -1759,7 +1758,7 @@ namespace emfio
                             }
                         }
 
-                        CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfFillStyle>( aBitmap ));
+                        CreateObjectIndexed(nIndex, std::make_unique<WinMtfFillStyle>( aBitmap ));
                     }
                     break;
 
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 3c1bf8347622..7ffc9c62bafb 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -36,7 +36,6 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <vcl/virdev.hxx>
-#include <o3tl/make_unique.hxx>
 #include <o3tl/safeint.hxx>
 #include <officecfg/Setup.hxx>
 #include <officecfg/Office/Linguistic.hxx>
@@ -777,7 +776,7 @@ namespace emfio
 
     void MtfTools::CreateObject()
     {
-        CreateObject(o3tl::make_unique<GDIObj>());
+        CreateObject(std::make_unique<GDIObj>());
     }
 
     void MtfTools::DeleteObject( sal_Int32 nIndex )
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 56169f051fed..24824381516c 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -32,7 +32,6 @@
 #include <vcl/outdev.hxx>
 #include <vcl/wmfexternal.hxx>
 #include <tools/fract.hxx>
-#include <o3tl/make_unique.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <osl/thread.h>
@@ -826,7 +825,7 @@ namespace emfio
                         nCount++;
                 }
                 Color aColor( static_cast<sal_uInt8>( nRed / nCount ), static_cast<sal_uInt8>( nGreen / nCount ), static_cast<sal_uInt8>( nBlue / nCount ) );
-                CreateObject(o3tl::make_unique<WinMtfFillStyle>( aColor, false ));
+                CreateObject(std::make_unique<WinMtfFillStyle>( aColor, false ));
             }
             break;
 
@@ -846,13 +845,13 @@ namespace emfio
 
             case W_META_CREATEBRUSH:
             {
-                CreateObject(o3tl::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
+                CreateObject(std::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
             }
             break;
 
             case W_META_CREATEPATTERNBRUSH:
             {
-                CreateObject(o3tl::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
+                CreateObject(std::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
             }
             break;
 
@@ -929,7 +928,7 @@ namespace emfio
                     default :
                         aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::NONE );
                 }
-                CreateObject(o3tl::make_unique<WinMtfLineStyle>( ReadColor(), aLineInfo, bTransparent ));
+                CreateObject(std::make_unique<WinMtfLineStyle>( ReadColor(), aLineInfo, bTransparent ));
             }
             break;
 
@@ -937,7 +936,7 @@ namespace emfio
             {
                 sal_uInt16  nStyle = 0;
                 mpInputStream->ReadUInt16( nStyle );
-                CreateObject(o3tl::make_unique<WinMtfFillStyle>( ReadColor(), ( nStyle == BS_HOLLOW ) ));
+                CreateObject(std::make_unique<WinMtfFillStyle>( ReadColor(), ( nStyle == BS_HOLLOW ) ));
             }
             break;
 
@@ -981,7 +980,7 @@ namespace emfio
                     eCharSet = RTL_TEXTENCODING_MS_1252;
                 aLogFont.alfFaceName = OUString( lfFaceName, strlen(lfFaceName), eCharSet );
 
-                CreateObject(o3tl::make_unique<WinMtfFontStyle>( aLogFont ));
+                CreateObject(std::make_unique<WinMtfFontStyle>( aLogFont ));
             }
             break;
 
@@ -1159,7 +1158,7 @@ namespace emfio
                                         mpEMFStream.reset();
                                     }
                                     else
-                                        mpEMFStream = o3tl::make_unique<SvMemoryStream>(mnEMFSize, 0);
+                                        mpEMFStream = std::make_unique<SvMemoryStream>(mnEMFSize, 0);
                                 }
                                 else if( (mnEMFRecCount != nComRecCount ) || (mnEMFSize != nEMFTotalSize ) ) // add additional checks here
                                 {
@@ -1431,7 +1430,7 @@ namespace emfio
                         {
                             GDIMetaFile aMeta;
                             mpEMFStream->Seek( 0 );
-                            std::unique_ptr<EmfReader> pEMFReader(o3tl::make_unique<EmfReader>( *mpEMFStream, aMeta ));
+                            std::unique_ptr<EmfReader> pEMFReader(std::make_unique<EmfReader>( *mpEMFStream, aMeta ));
                             bEMFAvailable = pEMFReader->ReadEnhWMF();
                             pEMFReader.reset(); // destroy first!!!