diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-02-07 18:01:48 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-02-07 18:01:48 +0100 |
commit | 981b1b3d5a9bcdad2a267bedcc5da22266103a0b (patch) | |
tree | f993fa9a1ab8c36ee014e8f9021d7e5e3139a1e4 /chart2/source/tools | |
parent | e1d7ba29323a12fe05f5bf2aa40a822055f7d065 (diff) |
removetooltypes01: #i112600# adjust rebase in chart2, starmath, sc, sd
Diffstat (limited to 'chart2/source/tools')
-rwxr-xr-x | chart2/source/tools/NumberFormatterWrapper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index 829a64cc6617..c4711a4da8be 100755 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -102,7 +102,7 @@ SvNumberFormatter* NumberFormatterWrapper::getSvNumberFormatter() const Date NumberFormatterWrapper::getNullDate() const { - USHORT nYear = 1899,nDay = 30,nMonth = 12; + sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12; Date aRet(nDay,nMonth,nYear); util::DateTime aUtilDate; @@ -130,7 +130,7 @@ rtl::OUString NumberFormatterWrapper::getFormattedString( return aText; } // i99104 handle null date correctly - USHORT nYear = 1899,nDay = 30,nMonth = 12; + sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12; if ( m_aNullDate.hasValue() ) { Date* pDate = m_pNumberFormatter->GetNullDate(); |