diff options
| author | Laurent Balland <laurent.balland@mailo.fr> | 2023-04-21 18:06:32 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2023-06-27 17:26:22 +0200 |
| commit | 8ef4d3a4160af967937e9bb7c60bee4a8eb71a1b (patch) | |
| tree | dff6f9fd134eed69e4b7612db0cef9a00feb2715 /include | |
| parent | bc82afbfd320ecf5e7ed5dc87d1606b97dd10821 (diff) | |
related tdf#153993 Embedded text in scientific numbers
Embedded text was limited to number:number. But scientific notation may
require embedded text like
0.000" "000E+00
This change extend ODF format to support embedded text in
number:scientific-number also
Change-Id: I4e3220b06efbd9228d722bf518e137d7707ccf4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150804
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/xmlnumfe.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index fd0711b3a0c3..43e1814dc26b 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -64,12 +64,14 @@ private: SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor ); SAL_DLLPRIVATE void WriteIntegerElement_Impl( sal_Int32 nInteger, sal_Int32 nBlankInteger, bool bGrouping ); + SAL_DLLPRIVATE void WriteEmbeddedEntries_Impl( const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries ); SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, sal_Int32 nMinDecimals, sal_Int32 nInteger, sal_Int32 nBlankInteger, const OUString& rDashStr, bool bGrouping, sal_Int32 nTrailingThousands, const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries ); SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, sal_Int32 nMinDecimals, sal_Int32 nInteger, sal_Int32 nBlankInteger, - bool bGrouping, sal_Int32 nExp, sal_Int32 nExpInterval, bool bExpSign ); + bool bGrouping, sal_Int32 nExp, sal_Int32 nExpInterval, bool bExpSign, + const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries ); SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, sal_Int32 nBlankInteger, bool bGrouping, const SvNumberformat& rFormat, sal_uInt16 nPart ); SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const OUString& rString, |