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:44:48 -0500 |
| commit | bfab5b3bccf34f65d4238d0b43743c7c0365f859 (patch) | |
| tree | 6018f73701482cda7998da56219b9e8bc44ebc1b | |
| parent | 31023bf702f352a62f779b22ab4523538a159066 (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/8836
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 ece3ea8db7f3..3debbf467b84 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -2067,7 +2067,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 |