diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-03-11 09:08:44 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-03-11 09:08:44 +0000 |
| commit | beb1c620c5f73aa0121b1b3ceae8b595e552944c (patch) | |
| tree | 7539d52293561137c11d431fe17f3b2733af3520 /editors | |
| parent | Fix one #ifdef and add two more checks (diff) | |
Fix number calculation. Patch from Tim Tretyak <timothy@umc.com.ua>
Notes
Notes:
svn path=/head/; revision=55846
Diffstat (limited to 'editors')
23 files changed, 437 insertions, 0 deletions
diff --git a/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c b/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice-1.0/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice-1.0/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice-1.1-devel/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice-1.1-devel/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice-1.1/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice-1.1/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice-2.0-devel/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice-2.0-devel/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice-3-devel/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice-3-devel/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice-3/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice-3/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice-3/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice-devel/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice-devel/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice-devel/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-1.0/files/patch-sal+rtl+source+strtmpl.c b/editors/openoffice.org-1.0/files/patch-sal+rtl+source+strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-sal+rtl+source+strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-1.0/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-1.0/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-1.1-devel/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-1.1/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-1.1/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-2-RC/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-2-RC/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-2-devel/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-2-devel/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-2.0-devel/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-2.0/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-2.0/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-2/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-2/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-3-RC/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-3-RC/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-3-devel/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-3-devel/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-3/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-3/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-vcltesttool/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice/files/patch-sal+rtl+source+strtmpl.c b/editors/openoffice/files/patch-sal+rtl+source+strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice/files/patch-sal+rtl+source+strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice/files/patch-sal::rtl::source::strtmpl.c new file mode 100644 index 000000000000..91a5289d6636 --- /dev/null +++ b/editors/openoffice/files/patch-sal::rtl::source::strtmpl.c @@ -0,0 +1,19 @@ +--- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +@@ -1104,10 +1104,12 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) +- break; +- if ( fRet != 0.0 ) +- break; ++ if ( bExp ) { ++ if ( nExp != 0 ) ++ break; ++ } ++ else if ( fRet != 0.0 ) ++ break; + } + /* Exponent separator */ + else if ( (*pStr == 'e') || (*pStr == 'E') ) |