summaryrefslogtreecommitdiff
path: root/include/svx/numfmtsh.hxx
diff options
context:
space:
mode:
authorLaurent Balland-Poirier <laurent.balland-poirier@laposte.net>2016-06-15 22:55:59 +0200
committerEike Rathke <erack@redhat.com>2016-06-29 09:46:20 +0000
commit9724eaa94e1f1e58dbbba2ecad4287245e0f0bf0 (patch)
tree0c46b710a396e20f6fe27335bc1e8df27e520e71 /include/svx/numfmtsh.hxx
parentac265f6210452ee48c1766942a3a311aedc3cdcd (diff)
tdf#100413 Use same default values for preview string and format list
Add specific default values for: - scientific: to distinguish engineering notation - fraction: to have quarter format understandable Change-Id: I73b74713a4bc502e9967b8d2c9983cfc6244912e Reviewed-on: https://gerrit.libreoffice.org/26391 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include/svx/numfmtsh.hxx')
-rw-r--r--include/svx/numfmtsh.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 179b597de497..6c4f6eb64db0 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -130,6 +130,8 @@ public:
sal_uInt16 GetFormatIntegerDigits( const OUString& rFormat ) const;
+ double GetDefaultValNum( const short nType ) const;
+
void MakePreviewString( const OUString& rFormatStr,
OUString& rPreviewStr,
Color*& rpFontColor );
@@ -177,8 +179,6 @@ public:
void SetUseStarFormat( bool bUse ) { bUseStarFormat = bUse; }
private:
- static const double DEFAULT_NUMVALUE;
-
SvNumberFormatter* pFormatter;
SvNumberFormatTable* pCurFmtTable;
SvxNumberValueType eValType;
@@ -197,6 +197,7 @@ private:
sal_uInt32 nCurCurrencyEntryPos;
std::vector<OUString> aCurrencyFormatList;
bool bUseStarFormat;
+ bool bIsDefaultValNum;
SVX_DLLPRIVATE short FillEntryList_Impl( std::vector<OUString>& rList );
SVX_DLLPRIVATE void FillEListWithStd_Impl( std::vector<OUString>& rList,sal_uInt16 aPrivCat, short &Pos);