[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

Kohei Yoshida kohei.yoshida at gmail.com
Fri Jun 21 13:13:46 PDT 2013


 sc/inc/fillinfo.hxx              |    8 +++++---
 sc/source/core/data/fillinfo.cxx |    1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit f8421c030d5c22d17e16fdbf3c99154a41cb9156
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Jun 21 16:16:24 2013 -0400

    Make them officially non-copyable.
    
    Change-Id: Ie8f8c2227b35ffb81f902458ce1b0a732b430b53

diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index a55d638..9999a89 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -25,6 +25,8 @@
 #include "colorscale.hxx"
 #include "cellvalue.hxx"
 
+#include <boost/noncopyable.hpp>
+
 class SfxItemSet;
 class SvxBrushItem;
 class SvxBoxItem;
@@ -90,7 +92,7 @@ struct ScIconSetInfo
     bool mbShowValue;
 };
 
-struct CellInfo
+struct CellInfo : boost::noncopyable
 {
     ScRefCellValue              maCell;
 
@@ -145,7 +147,7 @@ struct CellInfo
 
 const SCCOL SC_ROTMAX_NONE = SCCOL_MAX;
 
-struct RowInfo
+struct RowInfo : boost::noncopyable
 {
     CellInfo*           pCellInfo;
 
@@ -166,7 +168,7 @@ private:
     RowInfo&        operator=( const RowInfo& );
 };
 
-struct ScTableInfo
+struct ScTableInfo : boost::noncopyable
 {
     svx::frame::Array   maArray;
     RowInfo*            mpRowInfo;
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index c0c02d6..34c2562 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -323,7 +323,6 @@ void ScDocument::FillInfo(
         //! Conditionals auch bei HASATTR_ROTATE abfragen ????
 
         OSL_ENSURE( nArrCount>2, "nArrCount too small" );
-//      FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-2, nX1, nX2 );
         FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-1, nCol1, nCol2 );
         //  FindMaxRotCol setzt nRotMaxCol
 


More information about the Libreoffice-commits mailing list