[Libreoffice-commits] core.git: svtools/inc svtools/source

[Caolán McNamara]

 svtools/inc/svtools/ctrlbox.hxx    |    1 +
 svtools/source/control/ctrlbox.cxx |   21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

New commits:
commit d50fbfabb61dd9854771a846a39d84d0e4f83ab6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 22 14:37:45 2013 +0100

    restore a FontSizeBox::GetValue variant
    
    correctly removed by 994a737a317165db736f2a2f6a25b3439207da5d but
    we will need it again soon
    
    Change-Id: Ifedf8da2a33e834a5cba6da11c63c784572bd58d

diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 0a8e566..39e5bb0 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -539,6 +539,7 @@ public:
     virtual void    SetValue( sal_Int64 nNewValue  );
     virtual sal_Int64   GetValue( FieldUnit eOutUnit ) const;
     virtual sal_Int64   GetValue() const;
+    sal_Int64           GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const;
 
 private:
     // declared as private because some compilers would generate the default functions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 684a10d..663d2473 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1992,6 +1992,27 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue )
     SetValue( nNewValue, FUNIT_NONE );
 }
 
+// -----------------------------------------------------------------------
+
+sal_Int64 FontSizeBox::GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const
+{
+    if ( !bRelative )
+    {
+        sal_Int64 nComboVal = static_cast<sal_Int64>(reinterpret_cast<long>(ComboBox::GetEntryData( nPos )));
+        if ( nComboVal < 0 )     // marked as special?
+        {
+            return MetricField::ConvertValue( -nComboVal, mnBaseValue, GetDecimalDigits(),
+                                              meUnit, eOutUnit );
+        }
+    }
+
+    // do normal font size processing
+    sal_Int64 nRetValue = MetricBox::GetValue( nPos, eOutUnit );
+    return nRetValue;
+}
+
+// -----------------------------------------------------------------------
+
 sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const
 {
     if ( !bRelative )