summaryrefslogtreecommitdiffstats
path: root/svl
diff options
context:
space:
mode:
authorLaurent Balland-Poirier <laurent.balland-poirier@laposte.net>2016-08-12 17:20:08 +0200
committerEike Rathke <erack@redhat.com>2016-08-15 11:57:36 +0000
commitab98c81e1c4913aac3ce6453aa95c581dd582058 (patch)
tree2ba3e371055245e3a30bb016133d51b95c63eac7 /svl
parentconvert SvxSpellArea to scoped enum (diff)
downloadcore-ab98c81e1c4913aac3ce6453aa95c581dd582058.tar.gz
core-ab98c81e1c4913aac3ce6453aa95c581dd582058.zip
tdf#79398 Export to XL DBNum codes
Change-Id: Ibe24b68b89909eecdf73fe4f7db19de26396194d Update: only if corresponding code exists Reviewed-on: https://gerrit.libreoffice.org/28090 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'svl')
-rw-r--r--svl/source/numbers/zformat.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index d38b3f479da2..2fc1912b0e3f 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -217,11 +217,6 @@ sal_uInt8 SvNumberNatNum::MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang
return nNatNum;
}
-#ifdef THE_FUTURE
-/* XXX NOTE: even though the MapNatNumToDBNum method is currently unused please
- * don't remove it in case we'd have to use it for some obscure exports to
- * Excel. */
-
// static
sal_uInt8 SvNumberNatNum::MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLang, bool bDate )
{
@@ -326,7 +321,6 @@ sal_uInt8 SvNumberNatNum::MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLan
}
return nDBNum;
}
-#endif
/**
* SvNumFor
@@ -4724,6 +4718,12 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
}
const SvNumberNatNum& rNum = NumFor[n].GetNatNum();
+ if ( rNum.IsSet() && rNum.GetDBNum() > 0 )
+ {
+ aPrefix += "[DBNum";
+ aPrefix += OUString::number( rNum.GetDBNum() );
+ aPrefix += "]";
+ }
sal_uInt16 nAnz = NumFor[n].GetCount();
if ( nSem && (nAnz || !aPrefix.isEmpty()) )