[Libreoffice-commits] core.git: connectivity/source sw/source

[Miklos Vajna]

 connectivity/source/drivers/writer/WCatalog.cxx |    3 ++-
 sw/source/filter/ww8/rtfattributeoutput.cxx     |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5b12898378556538c86f92ed368d6be6c461a169
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Feb 15 22:52:30 2018 +0100

    connectitivty: can use o3tl::make_unique<> here
    
    Change-Id: Ia01bf2866e3f688dfab64c5fd72e787e4409fb75
    Reviewed-on: https://gerrit.libreoffice.org/49830
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/connectivity/source/drivers/writer/WCatalog.cxx b/connectivity/source/drivers/writer/WCatalog.cxx
index ea78c89bc4e7..9d273e201945 100644
--- a/connectivity/source/drivers/writer/WCatalog.cxx
+++ b/connectivity/source/drivers/writer/WCatalog.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
 #include <connectivity/sdbcx/VCollection.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <writer/WConnection.hxx>
 
@@ -54,7 +55,7 @@ void OWriterCatalog::refreshTables()
     if (m_pTables)
         m_pTables->reFill(aVector);
     else
-        m_pTables.reset(new OWriterTables(m_xMetaData, *this, m_aMutex, aVector));
+        m_pTables = o3tl::make_unique<OWriterTables>(m_xMetaData, *this, m_aMutex, aVector);
 }
 
 } // namespace writer
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 88c70e14532d..50a653d79560 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -63,7 +63,6 @@
 #include <fmtclds.hxx>
 #include <fmtrowsplt.hxx>
 #include <fmtline.hxx>
-#include <breakit.hxx>
 #include <fmtanchr.hxx>
 #include <ftninfo.hxx>
 #include <htmltbl.hxx>