mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore a FontSizeBox::GetValue variant

Browse Source 
correctly removed by 994a737a31 but
we will need it again soon

Change-Id: Ifedf8da2a33e834a5cba6da11c63c784572bd58d
This commit is contained in:
Caolán McNamara
2013-04-22 14:37:45 +01:00
parent 2174bb1af6
commit d50fbfabb6
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
svtools/inc/svtools/ctrlbox.hxx
View File

@@ -539,6 +539,7 @@ public:
virtual void SetValue( sal_Int64 nNewValue ); virtual void SetValue( sal_Int64 nNewValue );
virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const;
virtual sal_Int64 GetValue() const; virtual sal_Int64 GetValue() const;
sal_Int64 GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const;
private: private:
// declared as private because some compilers would generate the default functions // declared as private because some compilers would generate the default functions

21
svtools/source/control/ctrlbox.cxx
View File

@@ -1992,6 +1992,27 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue )
SetValue( nNewValue, FUNIT_NONE ); 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 sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const
{ {
if ( !bRelative ) if ( !bRelative )