diff options
| author | Eike Rathke <erack@redhat.com> | 2014-04-04 11:57:43 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-04 11:28:40 -0500 |
| commit | 42ab5947518d92db9f0e1ccf063b211a3fd308ff (patch) | |
| tree | db4e04fccaf5f7b2612b6e3ae088cd004e9ffd6e | |
| parent | 4862068a2c7343c100ec2f56c9ab8159e6e51a17 (diff) | |
accept proper number style condition != as not equal operator, fdo#76777
ODF 1.2 specifies '!=' as not equal operator in <number:number-style>
<style:map> style:condition attribute. So far '<>' is written, accept
the correct operator.
Change-Id: I6087992ee35fff5c7aa52b7cec2b83b0a78dbac1
(cherry picked from commit dfcc851d65c8d81988843ef31a75b5d30051ddfd)
Reviewed-on: https://gerrit.libreoffice.org/8834
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 20500afcc1a8..8773f3aff2a8 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -2068,7 +2068,14 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex ) if (!bDefaultCond) { - sal_Int32 nPos = sRealCond.indexOf( '.' ); + // Convert != to <> + sal_Int32 nPos = sRealCond.indexOf( "!=" ); + if ( nPos >= 0 ) + { + sRealCond = sRealCond.replaceAt( nPos, 2, "<>" ); + } + + nPos = sRealCond.indexOf( '.' ); if ( nPos >= 0 ) { // #i8026# #103991# localize decimal separator |