summaryrefslogtreecommitdiff
path: root/scaddins
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2003-12-01 17:17:27 +0000
committerRüdiger Timm <rt@openoffice.org>2003-12-01 17:17:27 +0000
commitaf26b8322cb8aca2b8012f6031d24e5eef19e35b (patch)
treea05ff90146af9272bc1491b081ef92fa0e433cee /scaddins
parentf8239ce67f54eac623f4de9d78b7299dad4ae167 (diff)
INTEGRATION: CWS ooo20031110 (1.33.26); FILE MERGED
2003/11/16 03:32:54 waratah 1.33.26.1: #i22277# implement const wrapper for large constant Added todo and a few comments to make a little easier to understand
Diffstat (limited to 'scaddins')
-rw-r--r--scaddins/source/analysis/analysis.cxx30
1 files changed, 25 insertions, 5 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 47fc185a23ae..daff143770cc 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: analysis.cxx,v $
*
- * $Revision: 1.33 $
+ * $Revision: 1.34 $
*
- * last change: $Author: vg $ $Date: 2003-06-04 10:31:33 $
+ * last change: $Author: rt $ $Date: 2003-12-01 18:17:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -982,15 +982,35 @@ double SAL_CALL AnalysisAddIn::getBessely( double fNum, sal_Int32 nOrder ) THROW
RETURN_FINITE( fRet );
}
-
+//TODO none of the numeric suffixes to the definitions below make sense.
+//TODO: Should not use _ as an application prefix, reserved for compiler.
#define _P 10 // max. number of places
+
+// -0x200
#define _MIN2 -512 // min. val for binary numbers
+
+// 0x1FF
#define _MAX2 511 // min. val for binary numbers
+
+// -0x20000000
#define _MIN8 -536870912 // min. val for octal numbers
+
+// 0x1FFFFFFF
#define _MAX8 536870911 // max. val for octal numbers
-#define _MIN16 -1099511627776 // min. val for hexadecimal numbers
-#define _MAX16 1099511627775 // max. val for hexadecimal numbers
+
+// -0x10000000000
+#define _MIN16 SAL_CONST_INT64(-1099511627776) // min. val for hexadecimal numbers
+
+// 0xFFFFFFFFFF
+#define _MAX16 SAL_CONST_INT64(1099511627775) // max. val for hexadecimal numbers
+
+
#define GETPLACES() aAnyConv.getInt32(xOpt,rPlaces,sal_Int32(0x80000000))
+
+// within the following macro takes _MIN and adds the second parameter to
+// create a second macro call eg:
+// DOUBLECONV( 2, 8 ) resolves to _MIN8, which resolves to 536870911
+
#define DOUBLECONV(from,to) ConvertFromDec(sal_Int64(ConvertToDec(aNum,from,_P)),_MIN##to,_MAX##to,to,GETPLACES(),_P)