o3tl::make_unique -> std::make_unique in sax...svtools (except sc)

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

Change-Id: I6eea0877eaa1886b64c0cce06a43b8088cbccd8e
Reviewed-on: https://gerrit.libreoffice.org/66751
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

11 files changed, 40 insertions, 52 deletions

diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx
index 2ce98e092949..f6cf14732000 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -102,7 +102,6 @@
 #include <format.hxx>
 #include <i18nlangtag/lang.h>
 #include <o3tl/cow_wrapper.hxx>
-#include <o3tl/make_unique.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <rect.hxx>
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index e973fb438175..93735cff80e9 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -30,7 +30,6 @@
 #include "uiobject.hxx"
 #include <strings.hxx>
 
-#include <o3tl/make_unique.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
@@ -558,7 +557,7 @@ void SmElementsControl::addElement(const OUString& aElementVisual, const OUStrin
         maMaxElementDimensions.setHeight( aSizePixel.Height() );
     }
 
-    maElementList.push_back(o3tl::make_unique<SmElement>(std::move(pNode), aElementSource, aHelpText));
+    maElementList.push_back(std::make_unique<SmElement>(std::move(pNode), aElementSource, aHelpText));
 }
 
 void SmElementsControl::setElementSetId(const char* pSetId)
@@ -575,7 +574,7 @@ void SmElementsControl::addElements(const std::pair<const char*, const char*> aE
         const char* pElement = aElementsArray[i].first;
         const char* pElementHelp = aElementsArray[i].second;
         if (!pElement) {
-            maElementList.push_back(o3tl::make_unique<SmElementSeparator>());
+            maElementList.push_back(std::make_unique<SmElementSeparator>());
         } else {
             OUString aElement(OUString::createFromAscii(pElement));
             if (aElement == RID_NEWLINE)
@@ -788,7 +787,7 @@ IMPL_LINK(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, voi
 
     if (pViewSh)
     {
-        std::unique_ptr<SfxStringItem> pInsertCommand = o3tl::make_unique<SfxStringItem>(SID_INSERTCOMMANDTEXT, rElement.getText());
+        std::unique_ptr<SfxStringItem> pInsertCommand = std::make_unique<SfxStringItem>(SID_INSERTCOMMANDTEXT, rElement.getText());
         pViewSh->GetViewFrame()->GetDispatcher()->ExecuteList(
             SID_INSERTCOMMANDTEXT, SfxCallMode::RECORD,
             { pInsertCommand.get() });
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 5c3a1a15314e..0440bd216f19 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -57,7 +57,6 @@
 #include "accessibility.hxx"
 #include <document.hxx>
 #include <view.hxx>
-#include <o3tl/make_unique.hxx>
 #include <strings.hrc>
 #include <smmod.hxx>
 
@@ -1511,7 +1510,7 @@ void SmEditAccessible::Init()
         if (pEditEngine && pEditView)
         {
             assert(!pTextHelper);
-            pTextHelper.reset(new ::accessibility::AccessibleTextHelper( o3tl::make_unique<SmEditSource>( *this ) ));
+            pTextHelper.reset(new ::accessibility::AccessibleTextHelper( std::make_unique<SmEditSource>( *this ) ));
             pTextHelper->SetEventSource( this );
         }
     }
diff --git a/starmath/source/caret.cxx b/starmath/source/caret.cxx
index 87cb1153cdd4..4e2effaa2379 100644
--- a/starmath/source/caret.cxx
+++ b/starmath/source/caret.cxx
@@ -8,8 +8,6 @@
  */
 #include <caret.hxx>
 
-#include <o3tl/make_unique.hxx>
-
 SmCaretPosGraph::SmCaretPosGraph() = default;
 
 SmCaretPosGraph::~SmCaretPosGraph() = default;
@@ -18,7 +16,7 @@ SmCaretPosGraphEntry* SmCaretPosGraph::Add(SmCaretPos pos,
                                            SmCaretPosGraphEntry* left)
 {
     assert(pos.nIndex >= 0);
-    auto entry = o3tl::make_unique<SmCaretPosGraphEntry>(pos, left, nullptr);
+    auto entry = std::make_unique<SmCaretPosGraphEntry>(pos, left, nullptr);
     SmCaretPosGraphEntry* e = entry.get();
     //Set Left and Right to point to the entry itself if they are NULL
     entry->Left = entry->Left ? entry->Left : e;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 9f4bfecd4d5c..1d2f41210154 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -22,7 +22,6 @@
 
 #include <comphelper/fileformat.h>
 #include <comphelper/accessibletexthelper.hxx>
-#include <o3tl/make_unique.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
@@ -545,7 +544,7 @@ Printer* SmDocShell::GetPrt()
     }
     else if (!mpPrinter)
     {
-        auto pOptions = o3tl::make_unique<SfxItemSet>(
+        auto pOptions = std::make_unique<SfxItemSet>(
             GetPool(),
             svl::Items<
                 SID_PRINTTITLE, SID_PRINTZOOM,
@@ -900,7 +899,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
             SfxUndoManager *pTmpUndoMgr = GetUndoManager();
             if (pTmpUndoMgr)
                 pTmpUndoMgr->AddUndoAction(
-                    o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+                    std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
 
             SetFormat( aNewFormat );
             Repaint();
@@ -943,7 +942,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
                 SfxUndoManager *pTmpUndoMgr = GetUndoManager();
                 if (pTmpUndoMgr)
                     pTmpUndoMgr->AddUndoAction(
-                        o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+                        std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
 
                 SetFormat( aNewFormat );
                 Repaint();
@@ -966,7 +965,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
                 SfxUndoManager *pTmpUndoMgr = GetUndoManager();
                 if (pTmpUndoMgr)
                     pTmpUndoMgr->AddUndoAction(
-                        o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+                        std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
 
                 SetFormat( aNewFormat );
                 Repaint();
@@ -989,7 +988,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
                 SfxUndoManager *pTmpUndoMgr = GetUndoManager();
                 if (pTmpUndoMgr)
                     pTmpUndoMgr->AddUndoAction(
-                        o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+                        std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
 
                 SetFormat( aNewFormat );
                 Repaint();
@@ -1017,7 +1016,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
                 SfxUndoManager *pTmpUndoMgr = GetUndoManager();
                 if (pTmpUndoMgr)
                     pTmpUndoMgr->AddUndoAction(
-                        o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+                        std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
 
                 SetFormat( aNewFormat );
                 Repaint();
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 3cb28407d0da..7e0d5c8b88a5 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -28,7 +28,6 @@
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editstat.hxx>
-#include <o3tl/make_unique.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -963,7 +962,7 @@ void SmEditWindow::Flush()
         SmViewShell *pViewSh = rCmdBox.GetView();
         if (pViewSh)
         {
-            std::unique_ptr<SfxStringItem> pTextToFlush = o3tl::make_unique<SfxStringItem>(SID_TEXT, GetText());
+            std::unique_ptr<SfxStringItem> pTextToFlush = std::make_unique<SfxStringItem>(SID_TEXT, GetText());
             pViewSh->GetViewFrame()->GetDispatcher()->ExecuteList(
                     SID_TEXT, SfxCallMode::RECORD,
                     { pTextToFlush.get() });
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index a48c2617217e..674a3116c8d3 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -41,7 +41,6 @@ one go*/
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/propertysetinfo.hxx>
-#include <o3tl/make_unique.hxx>
 #include <rtl/character.hxx>
 #include <sal/log.hxx>
 #include <sfx2/frame.hxx>
@@ -1213,7 +1212,7 @@ void SmXMLNumberContext_Impl::TCharacters(const OUString &rChars)
 
 void SmXMLNumberContext_Impl::EndElement()
 {
-    GetSmImport().GetNodeStack().push_front(o3tl::make_unique<SmTextNode>(aToken,FNT_NUMBER));
+    GetSmImport().GetNodeStack().push_front(std::make_unique<SmTextNode>(aToken,FNT_NUMBER));
 }
 
 
@@ -1290,7 +1289,7 @@ void SmXMLTextContext_Impl::TCharacters(const OUString &rChars)
 
 void SmXMLTextContext_Impl::EndElement()
 {
-    GetSmImport().GetNodeStack().push_front(o3tl::make_unique<SmTextNode>(aToken,FNT_TEXT));
+    GetSmImport().GetNodeStack().push_front(std::make_unique<SmTextNode>(aToken,FNT_TEXT));
 }
 
 
@@ -1331,7 +1330,7 @@ void SmXMLStringContext_Impl::TCharacters(const OUString &rChars)
 
 void SmXMLStringContext_Impl::EndElement()
 {
-    GetSmImport().GetNodeStack().push_front(o3tl::make_unique<SmTextNode>(aToken,FNT_FIXED));
+    GetSmImport().GetNodeStack().push_front(std::make_unique<SmTextNode>(aToken,FNT_FIXED));
 }
 
 
@@ -1828,7 +1827,7 @@ void SmXMLNoneContext_Impl::EndElement()
     aToken.nLevel = 5;
     aToken.eType = TIDENT;
     GetSmImport().GetNodeStack().push_front(
-        o3tl::make_unique<SmTextNode>(aToken,FNT_VARIABLE));
+        std::make_unique<SmTextNode>(aToken,FNT_VARIABLE));
 }
 
 
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index e4d6ca6bfb21..2c76ace91243 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -25,7 +25,6 @@
 #include <tools/lineend.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/syslocale.hxx>
-#include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <rtl/character.hxx>
@@ -1049,7 +1048,7 @@ std::unique_ptr<SmNode> SmParser::DoLine()
         ExpressionArray.emplace_back(std::unique_ptr<SmNode>(new SmExpressionNode(aTok)));
     }
 
-    auto xSNode = o3tl::make_unique<SmLineNode>(m_aCurToken);
+    auto xSNode = std::make_unique<SmLineNode>(m_aCurToken);
     xSNode->SetSubNodes(buildNodeArray(ExpressionArray));
     return xSNode;
 }
@@ -1285,7 +1284,7 @@ std::unique_ptr<SmNode> SmParser::DoOpSubSup()
         throw std::range_error("parser depth limit");
 
     // get operator symbol
-    auto pNode = o3tl::make_unique<SmMathSymbolNode>(m_aCurToken);
+    auto pNode = std::make_unique<SmMathSymbolNode>(m_aCurToken);
     // skip operator token
     NextToken();
     // get sub- supscripts if any
@@ -1370,7 +1369,7 @@ std::unique_ptr<SmNode> SmParser::DoTerm(bool bGroupNumberIdent)
                 NextToken();
                 return pNode;
             }
-            auto xSNode = o3tl::make_unique<SmExpressionNode>(m_aCurToken);
+            auto xSNode = std::make_unique<SmExpressionNode>(m_aCurToken);
             std::unique_ptr<SmNode> xError(DoError(SmParseError::RgroupExpected));
             xSNode->SetSubNodes(std::move(pNode), std::move(xError));
             return std::unique_ptr<SmNode>(xSNode.release());
@@ -1385,20 +1384,20 @@ std::unique_ptr<SmNode> SmParser::DoTerm(bool bGroupNumberIdent)
 
         case TTEXT :
             {
-                auto pNode = o3tl::make_unique<SmTextNode>(m_aCurToken, FNT_TEXT);
+                auto pNode = std::make_unique<SmTextNode>(m_aCurToken, FNT_TEXT);
                 NextToken();
                 return std::unique_ptr<SmNode>(pNode.release());
             }
         case TCHARACTER :
             {
-                auto pNode = o3tl::make_unique<SmTextNode>(m_aCurToken, FNT_VARIABLE);
+                auto pNode = std::make_unique<SmTextNode>(m_aCurToken, FNT_VARIABLE);
                 NextToken();
                 return std::unique_ptr<SmNode>(pNode.release());
             }
         case TIDENT :
         case TNUMBER :
         {
-            auto pTextNode = o3tl::make_unique<SmTextNode>(m_aCurToken,
+            auto pTextNode = std::make_unique<SmTextNode>(m_aCurToken,
                                              m_aCurToken.eType == TNUMBER ?
                                              FNT_NUMBER :
                                              FNT_VARIABLE);
@@ -1471,7 +1470,7 @@ std::unique_ptr<SmNode> SmParser::DoTerm(bool bGroupNumberIdent)
         case TDOTSUP :
         case TDOTSVERT :
             {
-                auto pNode = o3tl::make_unique<SmMathSymbolNode>(m_aCurToken);
+                auto pNode = std::make_unique<SmMathSymbolNode>(m_aCurToken);
                 NextToken();
                 return std::unique_ptr<SmNode>(pNode.release());
             }
@@ -1491,14 +1490,14 @@ std::unique_ptr<SmNode> SmParser::DoTerm(bool bGroupNumberIdent)
         case TEMPTYSET :
         case TINFINITY :
             {
-                auto pNode = o3tl::make_unique<SmMathIdentifierNode>(m_aCurToken);
+                auto pNode = std::make_unique<SmMathIdentifierNode>(m_aCurToken);
                 NextToken();
                 return std::unique_ptr<SmNode>(pNode.release());
             }
 
         case TPLACE:
             {
-                auto pNode = o3tl::make_unique<SmPlaceNode>(m_aCurToken);
+                auto pNode = std::make_unique<SmPlaceNode>(m_aCurToken);
                 NextToken();
                 return std::unique_ptr<SmNode>(pNode.release());
             }
@@ -1578,7 +1577,7 @@ std::unique_ptr<SmNode> SmParser::DoEscape()
         case TLDLINE :
         case TRDLINE :
             {
-                auto pNode = o3tl::make_unique<SmMathSymbolNode>(m_aCurToken);
+                auto pNode = std::make_unique<SmMathSymbolNode>(m_aCurToken);
                 NextToken();
                 return std::unique_ptr<SmNode>(pNode.release());
             }
@@ -1595,7 +1594,7 @@ std::unique_ptr<SmOperNode> SmParser::DoOperator()
 
     assert(TokenInGroup(TG::Oper));
 
-    auto xSNode = o3tl::make_unique<SmOperNode>(m_aCurToken);
+    auto xSNode = std::make_unique<SmOperNode>(m_aCurToken);
 
     // get operator
     auto xOperator = DoOper();
@@ -1765,7 +1764,7 @@ std::unique_ptr<SmStructureNode> SmParser::DoAttribut()
 
     assert(TokenInGroup(TG::Attribute));
 
-    auto xSNode = o3tl::make_unique<SmAttributNode>(m_aCurToken);
+    auto xSNode = std::make_unique<SmAttributNode>(m_aCurToken);
     std::unique_ptr<SmNode> xAttr;
     SmScaleMode  eScaleMode = SmScaleMode::None;
 
@@ -1812,7 +1811,7 @@ std::unique_ptr<SmStructureNode> SmParser::DoFontAttribut()
         case TNBOLD :
         case TPHANTOM :
             {
-                auto pNode = o3tl::make_unique<SmFontNode>(m_aCurToken);
+                auto pNode = std::make_unique<SmFontNode>(m_aCurToken);
                 NextToken();
                 return pNode;
             }
@@ -2071,7 +2070,7 @@ std::unique_ptr<SmBracebodyNode> SmParser::DoBracebody(bool bIsLeftRight)
     if (aDepthGuard.TooDeep())
         throw std::range_error("parser depth limit");
 
-    auto pBody = o3tl::make_unique<SmBracebodyNode>(m_aCurToken);
+    auto pBody = std::make_unique<SmBracebodyNode>(m_aCurToken);
 
     std::vector<std::unique_ptr<SmNode>> aNodes;
     // get body if any
@@ -2081,7 +2080,7 @@ std::unique_ptr<SmBracebodyNode> SmParser::DoBracebody(bool bIsLeftRight)
         {
             if (m_aCurToken.eType == TMLINE)
             {
-                aNodes.emplace_back(o3tl::make_unique<SmMathSymbolNode>(m_aCurToken));
+                aNodes.emplace_back(std::make_unique<SmMathSymbolNode>(m_aCurToken));
                 NextToken();
             }
             else if (m_aCurToken.eType != TRIGHT)
@@ -2098,7 +2097,7 @@ std::unique_ptr<SmBracebodyNode> SmParser::DoBracebody(bool bIsLeftRight)
         {
             if (m_aCurToken.eType == TMLINE)
             {
-                aNodes.emplace_back(o3tl::make_unique<SmMathSymbolNode>(m_aCurToken));
+                aNodes.emplace_back(std::make_unique<SmMathSymbolNode>(m_aCurToken));
                 NextToken();
             }
             else if (!TokenInGroup(TG::RBrace))
@@ -2147,7 +2146,7 @@ std::unique_ptr<SmTextNode> SmParser::DoFunction()
         case TLOG :
         case TEXP :
             {
-                auto pNode = o3tl::make_unique<SmTextNode>(m_aCurToken, FNT_FUNCTION);
+                auto pNode = std::make_unique<SmTextNode>(m_aCurToken, FNT_FUNCTION);
                 NextToken();
                 return pNode;
             }
@@ -2164,7 +2163,7 @@ std::unique_ptr<SmTableNode> SmParser::DoBinom()
     if (aDepthGuard.TooDeep())
         throw std::range_error("parser depth limit");
 
-    auto xSNode = o3tl::make_unique<SmTableNode>(m_aCurToken);
+    auto xSNode = std::make_unique<SmTableNode>(m_aCurToken);
 
     NextToken();
 
@@ -2299,7 +2298,7 @@ std::unique_ptr<SmSpecialNode> SmParser::DoSpecial()
     if (!aSymbolName.isEmpty())
         m_aUsedSymbols.insert( aSymbolName );
 
-    auto pNode = o3tl::make_unique<SmSpecialNode>(m_aCurToken);
+    auto pNode = std::make_unique<SmSpecialNode>(m_aCurToken);
     NextToken();
     return pNode;
 }
@@ -2310,7 +2309,7 @@ std::unique_ptr<SmGlyphSpecialNode> SmParser::DoGlyphSpecial()
     if (aDepthGuard.TooDeep())
         throw std::range_error("parser depth limit");
 
-    auto pNode = o3tl::make_unique<SmGlyphSpecialNode>(m_aCurToken);
+    auto pNode = std::make_unique<SmGlyphSpecialNode>(m_aCurToken);
     NextToken();
     return pNode;
 }
@@ -2321,7 +2320,7 @@ std::unique_ptr<SmExpressionNode> SmParser::DoError(SmParseError eError)
     if (aDepthGuard.TooDeep())
         throw std::range_error("parser depth limit");
 
-    auto xSNode = o3tl::make_unique<SmExpressionNode>(m_aCurToken);
+    auto xSNode = std::make_unique<SmExpressionNode>(m_aCurToken);
     std::unique_ptr<SmErrorNode> pErr(new SmErrorNode(m_aCurToken));
     xSNode->SetSubNodes(std::move(pErr), nullptr);
 
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index 731f15d6f530..a53d53ed0ffd 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -37,7 +37,6 @@
 #include <starmath.hrc>
 
 #include <svx/xmlsecctrl.hxx>
-#include <o3tl/make_unique.hxx>
 
 namespace
 {
@@ -54,7 +53,7 @@ namespace
 
         SfxObjectFactory& rFactory = SmDocShell::Factory();
 
-        auto pUniqueModule = o3tl::make_unique<SmModule>(&rFactory);
+        auto pUniqueModule = std::make_unique<SmModule>(&rFactory);
         SmModule* pModule = pUniqueModule.get();
         SfxApplication::SetModule(SfxToolsModule::Math, std::move(pUniqueModule));
 
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 95086ecd52a5..7179c257e853 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <o3tl/make_unique.hxx>
 #include <sfx2/objface.hxx>
 #include <svl/whiter.hxx>
 #include <sfx2/viewsh.hxx>
@@ -215,7 +214,7 @@ std::unique_ptr<SfxItemSet> SmModule::CreateItemSet( sal_uInt16 nId )
     std::unique_ptr<SfxItemSet> pRet;
     if(nId == SID_SM_EDITOPTIONS)
     {
-        pRet = o3tl::make_unique<SfxItemSet>(
+        pRet = std::make_unique<SfxItemSet>(
             GetPool(),
             svl::Items< //TP_SMPRINT
                 SID_PRINTTITLE, SID_PRINTZOOM,
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index f103b1440a96..8f47001fe79c 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -23,7 +23,6 @@
 #include <utility>
 
 #include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
 #include <sfx2/printer.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -625,7 +624,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
                     SID_AUTO_CLOSE_BRACKETS,    SID_AUTO_CLOSE_BRACKETS,
                     0
                 };
-                auto pItemSet = o3tl::make_unique<SfxItemSet>( SmDocShell::GetPool(), nRange );
+                auto pItemSet = std::make_unique<SfxItemSet>( SmDocShell::GetPool(), nRange );
                 SmModule *pp = SM_MOD();
                 pp->GetConfig()->ConfigToItemSet(*pItemSet);
                 VclPtr<SfxPrinter> pPrinter = SfxPrinter::Create ( aStream, std::move(pItemSet) );