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

[Miklos Vajna]

 oox/source/shape/WpsContext.cxx  |    2 +-
 sw/source/filter/ww8/ww8graf.cxx |    1 -
 sw/source/filter/ww8/ww8par.cxx  |    7 ++++---
 sw/source/filter/ww8/ww8par.hxx  |    3 ++-
 sw/source/filter/ww8/ww8par2.cxx |    4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 08aab3de3ac9d2d284ebfbddb92874853451ddb0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Aug 6 09:11:03 2015 +0200

    sw: use std::unique_ptr<> in ww8
    
    Change-Id: Ia3fc26c8d3ec433e2cdf401b0fc0d70de4611210

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index e030160..c1200bd 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -88,7 +88,6 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <editeng/editobj.hxx>
-#include <boost/scoped_ptr.hpp>
 #include <math.h>
 #include <fmturl.hxx>
 #include <svx/hlnkitem.hxx>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8641ff0..fa8e489 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -129,6 +129,7 @@
 #include "WW8FibData.hxx"
 
 #include <unordered_set>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace sw::util;
@@ -290,9 +291,9 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS
     rStrm.ReadUInt32( nFlags );
 
     sal_uInt16 nLevel = 0;                  // counter for level to climb down in path
-    boost::scoped_ptr< OUString > xLongName;    // link / file name
-    boost::scoped_ptr< OUString > xShortName;   // 8.3-representation of file name
-    boost::scoped_ptr< OUString > xTextMark;    // text mark
+    std::unique_ptr< OUString > xLongName;    // link / file name
+    std::unique_ptr< OUString > xShortName;   // 8.3-representation of file name
+    std::unique_ptr< OUString > xTextMark;    // text mark
 
     // description (ignore)
     if( ::get_flag( nFlags, WW8_HLINK_DESCR ) )
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 62df5d7..e2bd354 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -35,6 +35,7 @@
 #include <deque>
 #include <map>
 #include <utility>
+#include <memory>
 
 #include "ww8struc.hxx"
 #include "ww8scan.hxx"
@@ -1363,7 +1364,7 @@ private:
     // a document position recorded the after-position of TOC section, managed by Read_F_TOX() and End_Field()
     SwPaM* m_pPosAfterTOC;
 
-    boost::scoped_ptr< SwPosition > m_pLastAnchorPos;
+    std::unique_ptr< SwPosition > m_pLastAnchorPos;
 
     bool m_bCareFirstParaEndInToc;
     bool m_bCareLastParaEndInToc;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 25d292d..e8f9a7e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <comphelper/string.hxx>
 #include <tools/solar.h>
 #include <vcl/vclenum.hxx>
@@ -72,6 +71,7 @@
 #include <frmatr.hxx>
 
 #include <iostream>
+#include <memory>
 
 using namespace ::com::sun::star;
 
@@ -3852,7 +3852,7 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
     short nSkip, cbStd;
     OUString sName;
 
-    boost::scoped_ptr<WW8_STD> xStd(Read1Style(nSkip, &sName, &cbStd));// read Style
+    std::unique_ptr<WW8_STD> xStd(Read1Style(nSkip, &sName, &cbStd));// read Style
 
     if (xStd)
         rSI.SetOrgWWIdent( sName, xStd->sti );
commit 1c09657c5c25cf941588610eeab653217399f9b5
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Aug 6 09:00:35 2015 +0200

    cid#1315264 incorrect expression
    
    Change-Id: I33457a2e1a213c6eb172ab188272e9688cd2ccad

diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 9616e0b..657071b 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -100,7 +100,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
 
                     // If the text is not rotated the way the shape wants it already, set the angle.
                     const sal_Int32 nRotation = -270;
-                    if (basegfx::rad2deg(fRotate) != NormAngle360(nRotation * 100) / 100)
+                    if (basegfx::rad2deg(fRotate) != static_cast<double>(NormAngle360(nRotation * 100)) / 100)
                     {
                         comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
                         aCustomShapeGeometry["TextPreRotateAngle"] = uno::makeAny(nRotation);