diff options
| author | Eike Rathke <erack@redhat.com> | 2017-02-20 20:55:39 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-02-20 20:58:17 +0100 |
| commit | 2f6d2c0c47ebfd1b98f9610aec99566fe3a1a982 (patch) | |
| tree | d2c256625306102264624124fb67fea0ed55bab8 /sc | |
| parent | ce315ac12119f30be5789784010889e38b6f75a4 (diff) | |
use SvNumberformat::GetMaskedType()
... instead of manually masking out css::util::NumberFormat::DEFINED
Change-Id: I0761132800b2b1693df41085695f36cd3cc1236b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/column3.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/viewfun6.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index dd332880c269..9bd32c0aec8c 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1700,7 +1700,7 @@ bool ScColumn::ParseString( bool bOverwrite = false; if ( pOldFormat ) { - short nOldType = pOldFormat->GetType() & ~css::util::NumberFormat::DEFINED; + short nOldType = pOldFormat->GetMaskedType(); if ( nOldType == css::util::NumberFormat::NUMBER || nOldType == css::util::NumberFormat::DATE || nOldType == css::util::NumberFormat::TIME || nOldType == css::util::NumberFormat::LOGICAL ) { diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 92a18048dbf0..97ca1bdb4f23 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -269,7 +269,7 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const OUString& rUndoStr) SvNumberFormatter* pFormatter = rDoc.GetFormatTable(); const SvNumberformat* pCurNumFormatEntry = pFormatter->GetEntry(nCurNumFormat); const short nCurNumFormatType = (pCurNumFormatEntry ? - (pCurNumFormatEntry->GetType() & ~css::util::NumberFormat::DEFINED) : css::util::NumberFormat::UNDEFINED); + pCurNumFormatEntry->GetMaskedType() : css::util::NumberFormat::UNDEFINED); if (bInputMode) { |