summaryrefslogtreecommitdiff
path: root/formula/inc
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-04 12:41:00 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-04 12:41:00 +0000
commitc272dcf4402a0052258994c973ece9d75f0f5178 (patch)
tree529f6a5ad4fc972a2560abd4ab121c344f741543 /formula/inc
parentd79b04a34959cbf9794c18a7cbbe2104a9115445 (diff)
CWS-TOOLING: integrate CWS calcperf03
2009-01-27 17:45:09 +0100 er r267014 : satisfy some stoneage compiler (tinderbox error) 2009-01-26 13:53:16 +0100 er r266921 : corrected merge accident 2009-01-23 23:27:18 +0100 er r266857 : #i97468# for better accuracy use ::rtl::math::atanh() in ATANH and FISHER, tanh() in FISHERINV; patch from <regina> 2009-01-23 23:08:14 +0100 er r266854 : #i97467# added C99 atanh() substitute rtl_math_atanh() and ::rtl::math::atanh() since not all compilers have it; patch from <regina> Plus in rtl_math_log1p() made a variable volatile to prevent compilers from being too smart. 2009-01-23 19:20:43 +0100 er r266849 : #i95381# make PODF adapter recognize empty/missing parameter, in this case ADDRESS 3rd parameter 2009-01-23 17:34:21 +0100 er r266841 : #i95450# support ADDRESS 3rd parameter (abs) as missing parameter 2009-01-23 15:53:23 +0100 er r266830 : some minor beautification 2009-01-23 15:45:20 +0100 er r266829 : small bits missed during integration of cws frmdlg 2009-01-23 02:56:38 +0100 er r266764 : removed CVS nonsense 2009-01-23 02:50:15 +0100 er r266763 : get rid of nasty DOS lineends 2009-01-23 01:56:09 +0100 er r266762 : #i98318# fix crash with external references constructed via Function Wizard; also fixes crash #i98338# and WaE #i97555# 2009-01-22 15:58:41 +0100 er r266732 : #i97547# EUROCONVERT: add SKK/EUR 2009-01-21 15:47:39 +0100 er r266676 : CWS-TOOLING: rebase CWS calcperf03 to trunk@266428 (milestone: DEV300:m39) 2009-01-09 17:22:23 +0100 er r266105 : #i89976# use ::std::nth_element() instead of a fully sorted array for MEDIAN, PERCENTILE, QUARTILE, LARGE, SMALL 2008-11-07 20:13:55 +0100 er r263483 : #i95967# Broadcast: use bulk broadcast also for single cell changes as multiple identical listeners may be involved; speeds up the Zaske document to draw level with Excel 2008-11-07 20:08:37 +0100 er r263482 : #i95967# Notify: spare a vtable access
Diffstat (limited to 'formula/inc')
-rw-r--r--formula/inc/formula/FormulaCompiler.hxx3
-rw-r--r--formula/inc/formula/intruref.hxx10
-rw-r--r--formula/inc/formula/tokenarray.hxx20
3 files changed, 17 insertions, 16 deletions
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index 5f5cea3d0b..9aa65ba30d 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -89,10 +89,11 @@ public:
FormulaCompiler(FormulaTokenArray& _rArr);
virtual ~FormulaCompiler();
- // SUNWS7 needs a forward declared friend, otherwise members of the outer
+ // SUNWS8 needs a forward declared friend, otherwise members of the outer
// class are not accessible.
class OpCodeMap;
friend class FormulaCompiler::OpCodeMap;
+
/** Mappings from strings to OpCodes and vice versa. */
class FORMULA_DLLPUBLIC OpCodeMap
{
diff --git a/formula/inc/formula/intruref.hxx b/formula/inc/formula/intruref.hxx
index 831eeb1f91..a0dc9ad5ee 100644
--- a/formula/inc/formula/intruref.hxx
+++ b/formula/inc/formula/intruref.hxx
@@ -31,8 +31,8 @@
#ifndef FORMULA_INTRUREF_HXX
#define FORMULA_INTRUREF_HXX
-namespace formula
-{
+namespace formula
+{
/** A simple intrusive refcounting template, not thread safe, but therefore
also a bit faster than boost's smart_ptr or uno::Reference equivalents, and
@@ -96,9 +96,9 @@ public:
inline operator T*() const { return p; }
inline T* get() const { return p; }
};
-// =============================================================================
-} // formula
-// =============================================================================
+// =============================================================================
+} // formula
+// =============================================================================
#endif // SC_INTRUREF_HXX
diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index 703c799285..46192f9271 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -74,30 +74,30 @@ class FORMULA_DLLPUBLIC FormulaTokenArray
friend class FormulaMissingContext;
protected:
- FormulaToken** pCode; // Token code array
- FormulaToken** pRPN; // RPN array
+ FormulaToken** pCode; // Token code array
+ FormulaToken** pRPN; // RPN array
USHORT nLen; // Length of token array
USHORT nRPN; // Length of RPN array
USHORT nIndex; // Current step index
USHORT nError; // Error code
short nRefs; // Count of cell references
ScRecalcMode nMode; // Flags to indicate when to recalc this code
- BOOL bHyperLink; // If HYPERLINK() occurs in the formula.
+ BOOL bHyperLink; // If HYPERLINK() occurs in the formula.
protected:
void Assign( const FormulaTokenArray& );
/// Also used by the compiler. The token MUST had been allocated with new!
- FormulaToken* Add( FormulaToken* );
+ FormulaToken* Add( FormulaToken* );
inline void SetCombinedBitsRecalcMode( ScRecalcMode nBits )
- { nMode |= (nBits & ~RECALCMODE_EMASK); }
+ { nMode |= (nBits & ~RECALCMODE_EMASK); }
inline ScRecalcMode GetCombinedBitsRecalcMode() const
- { return nMode & ~RECALCMODE_EMASK; }
+ { return nMode & ~RECALCMODE_EMASK; }
/** Exclusive bits already set in nMode are
zero'ed, nVal may contain combined bits, but
only one exclusive bit may be set! */
inline void SetMaskedRecalcMode( ScRecalcMode nBits )
- { nMode = GetCombinedBitsRecalcMode() | nBits; }
+ { nMode = GetCombinedBitsRecalcMode() | nBits; }
public:
FormulaTokenArray();
@@ -222,14 +222,14 @@ public:
/** Determines if this formula needs any changes to convert it to something
previous versions of OOo could consume (Plain Old Formula). */
- bool NeedsPofRewrite(const MissingConvention & rConv);
+ bool NeedsPofRewrite(const MissingConvention & rConv);
/** Rewrites to Plain Old Formula, substituting missing parameters. The
FormulaTokenArray* returned is new'ed. */
- FormulaTokenArray* RewriteMissingToPof(const MissingConvention & rConv);
+ FormulaTokenArray* RewriteMissingToPof(const MissingConvention & rConv);
/** Determines if this formula may be followed by a reference. */
- bool MayReferenceFollow();
+ bool MayReferenceFollow();
};
inline OpCode FormulaTokenArray::GetOuterFuncOpCode()