[Libreoffice-commits] core.git: 2 commits - starmath/inc

[Takeshi Abe]

 starmath/inc/cursor.hxx |    2 ++
 starmath/inc/parse.hxx  |    8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 5c5e809605d750d87ae7a5334f8406894f6a4184
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Nov 4 00:56:45 2014 +0900

    mark as noncopyable
    
    Change-Id: Ic464974087f9f8fb161aaffde232668ba01c2f62

diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 22de086..c740991 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -26,6 +26,7 @@
 
 #include "types.hxx"
 
+#include <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
 class SmNode;
@@ -169,7 +170,7 @@ struct SmTokenTableEntry
     sal_uInt16      nLevel;
 };
 
-class SmParser
+class SmParser : boost::noncopyable
 {
     OUString        m_aBufferString;
     SmToken         m_aCurToken;
@@ -190,10 +191,6 @@ class SmParser
     //! locale where '.' is decimal separator!
     ::com::sun::star::lang::Locale m_aDotLoc;
 
-    // declare copy-constructor and assignment-operator private
-    SmParser(const SmParser &);
-    SmParser & operator = (const SmParser &);
-
 protected:
 #if OSL_DEBUG_LEVEL > 1
     bool            IsDelimiter( const OUString &rTxt, sal_Int32 nPos );
commit 67276f70039c460332eabc00bd4109d301b2f40a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Nov 4 00:40:34 2014 +0900

    include <list> where needed
    
    Change-Id: Ia6784bf95d9d0c57b79bdf7373f4836709563b7a

diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 6f80e41..4ce2efc 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -12,6 +12,8 @@
 #include "node.hxx"
 #include "caret.hxx"
 
+#include <list>
+
 /** Factor to multiple the squared horizontal distance with
  * Used for Up and Down movement.
  */
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 376113c..22de086 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -23,7 +23,6 @@
 
 #include <set>
 #include <stack>
-#include <list>
 
 #include "types.hxx"