[Libreoffice-commits] .: Branch 'feature/smaller-base-cell' - 2 commits - sc/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/column.hxx               |    4 ++++
 sc/source/core/data/column3.cxx |    5 +++++
 2 files changed, 9 insertions(+)

New commits:
commit 61825f99d788027129e30e55fcf92ad4fc82815d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 17:17:22 2012 -0500

    Make ScColumn explicitly non-copyable.
    
    Change-Id: I0e3f552f8ed8a57f399ba9e01c06a23d9a9da854

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 05c80a5..d157edb 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -116,6 +116,9 @@ friend class ScCellIterator;
 friend class ScHorizontalCellIterator;
 friend class ScHorizontalAttrIterator;
 
+    ScColumn(const ScColumn&); // disabled
+    ScColumn& operator= (const ScColumn&); // disabled
+
 public:
                 ScColumn();
                 ~ScColumn();
commit a31bc883f26ad1c99b5b837230de2f38ecf4c464
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 17:14:54 2012 -0500

    Add empty GetTextWidth() to ScColumn. Will be implemented later.
    
    Change-Id: I4df0719fee426ab5d54bfc2ac8fa4c37325906e2

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index b0c53cc..05c80a5 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -381,6 +381,7 @@ public:
     xub_StrLen  GetMaxNumberStringLen( sal_uInt16& nPrecision,
                                        SCROW nRowStart, SCROW nRowEnd ) const;
 
+    sal_uInt16 GetTextWidth(SCROW nRow) const;
     void SetTextWidth(SCROW nRow, sal_uInt16 nWidth);
 
 private:
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index e9110cc..f57a98a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1950,6 +1950,11 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
     return nStringLen;
 }
 
+sal_uInt16 ScColumn::GetTextWidth(SCROW nRow) const
+{
+    return 0;
+}
+
 void ScColumn::SetTextWidth(SCROW nRow, sal_uInt16 nWidth)
 {
 }