diff options
Diffstat (limited to 'formula')
47 files changed, 1280 insertions, 1232 deletions
diff --git a/formula/inc/AddressConvention.hxx b/formula/inc/AddressConvention.hxx index 942573fa486f..d14091860160 100644 --- a/formula/inc/AddressConvention.hxx +++ b/formula/inc/AddressConvention.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/formula/inc/formula/ExternalReferenceHelper.hxx index e933f6d3413b..3ea961faf033 100644 --- a/formula/inc/formula/ExternalReferenceHelper.hxx +++ b/formula/inc/formula/ExternalReferenceHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx index b67d78abd16e..4da7318807a2 100644 --- a/formula/inc/formula/FormulaCompiler.hxx +++ b/formula/inc/formula/FormulaCompiler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ public: FormulaCompiler(FormulaTokenArray& _rArr); virtual ~FormulaCompiler(); - // SUNWS8 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; @@ -121,7 +121,7 @@ public: mbEnglish = FormulaGrammar::isEnglish( meGrammar); } virtual ~OpCodeMap(); - + /// Get the symbol String -> OpCode hash map for finds. inline const OpCodeHashMap* getHashMap() const { return mpHashMap; } @@ -199,7 +199,7 @@ public: @return Map for nLanguage. If nLanguage is unknown, a NULL map is returned. */ OpCodeMapPtr GetOpCodeMap( const sal_Int32 nLanguage ) const; - + /** Create an internal symbol map from API mapping. @param bEnglish Use English number parser / formatter instead of native. @@ -242,6 +242,8 @@ public: including an address reference convention. */ inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; } + static void UpdateSeparatorsNative( const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep ); + protected: virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const; virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const; @@ -261,7 +263,7 @@ protected: virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); - virtual void LocalizeString( String& rName ); // modify rName - input: exact name + virtual void LocalizeString( String& rName ); // modify rName - input: exact name virtual BOOL IsImportingXML() const; BOOL GetToken(); @@ -289,7 +291,7 @@ protected: String aCorrectedSymbol; // autocorrected Symbol OpCodeMapPtr mxSymbols; // which symbols are used - + FormulaTokenRef pToken; // current token FormulaTokenRef pCurrentFactorToken; // current factor token (of Factor() method) FormulaTokenArray* pArr; @@ -303,7 +305,7 @@ protected: short nNumFmt; // set during CompileTokenArray() USHORT pc; - FormulaGrammar::Grammar + FormulaGrammar::Grammar meGrammar; // The grammar used, language plus convention. BOOL bAutoCorrect; // whether to apply AutoCorrection @@ -318,6 +320,7 @@ private: void InitSymbolsEnglish() const; /// only SymbolsEnglish, maybe later void InitSymbolsPODF() const; /// only SymbolsPODF, on demand void InitSymbolsODFF() const; /// only SymbolsODFF, on demand + void InitSymbolsEnglishXL() const; /// only SymbolsEnglishXL, on demand void loadSymbols(USHORT _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const; @@ -365,12 +368,13 @@ private: operator FormulaToken*() { return operator->(); } }; - + mutable NonConstOpCodeMapPtr mxSymbolsODFF; // ODFF symbols mutable NonConstOpCodeMapPtr mxSymbolsPODF; // ODF 1.1 symbols mutable NonConstOpCodeMapPtr mxSymbolsNative; // native symbols mutable NonConstOpCodeMapPtr mxSymbolsEnglish; // English symbols + mutable NonConstOpCodeMapPtr mxSymbolsEnglishXL; // English Excel symbols (for VBA formula parsing) }; // ============================================================================= } // formula diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/formula/inc/formula/FormulaOpCodeMapperObj.hxx index cce1557a9063..08407819117e 100644 --- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx +++ b/formula/inc/formula/FormulaOpCodeMapperObj.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2< { ::std::auto_ptr<FormulaCompiler> m_pCompiler; public: - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext); diff --git a/formula/inc/formula/IControlReferenceHandler.hxx b/formula/inc/formula/IControlReferenceHandler.hxx index d6574cb5aac7..5b5a78b0467f 100644 --- a/formula/inc/formula/IControlReferenceHandler.hxx +++ b/formula/inc/formula/IControlReferenceHandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx index c0579f1ac7fc..110b1dfd2470 100644 --- a/formula/inc/formula/IFunctionDescription.hxx +++ b/formula/inc/formula/IFunctionDescription.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,10 +116,10 @@ namespace formula { public: IStructHelper(){} - virtual SvLBoxEntry* InsertEntry(const XubString& rText, SvLBoxEntry* pParent, + virtual SvLBoxEntry* InsertEntry(const XubString& rText, SvLBoxEntry* pParent, USHORT nFlag,ULONG nPos=0,IFormulaToken* pScToken=NULL) = 0; - virtual String GetEntryText(SvLBoxEntry* pEntry) const = 0; + virtual String GetEntryText(SvLBoxEntry* pEntry) const = 0; virtual SvLBoxEntry* GetParent(SvLBoxEntry* pEntry) const = 0; }; @@ -155,7 +155,7 @@ namespace formula virtual void setDispatcherLock( BOOL bLock ) = 0; virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked) = 0; virtual void doClose(BOOL _bOk) = 0; - virtual void insertEntryToLRUList(const IFunctionDescription* pDesc) = 0; + virtual void insertEntryToLRUList(const IFunctionDescription* pDesc) = 0; virtual void showReference(const String& _sFormula) = 0; }; diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc index c1a8117ab0b0..e4dc05aca4e9 100644 --- a/formula/inc/formula/compiler.hrc +++ b/formula/inc/formula/compiler.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/formula/inc/formula/errorcodes.hxx b/formula/inc/formula/errorcodes.hxx index 1593f710b4e7..f08af17e095e 100644 --- a/formula/inc/formula/errorcodes.hxx +++ b/formula/inc/formula/errorcodes.hxx @@ -64,7 +64,7 @@ const USHORT errInterpOverflow = 527; // Not displayed, temporary for TrackFormulas, // Cell depends on another cell that has errCircularReference const USHORT errTrackFromCircRef = 528; -// ScInterpreter internal: no numeric value but numeric queried. If this is +// ScInterpreter internal: no numeric value but numeric queried. If this is // set as mnStringNoValueError no error is generated but 0 returned. const USHORT errCellNoValue = 529; // Interpreter: needed AddIn not found @@ -75,9 +75,9 @@ const USHORT errNoMacro = 531; const USHORT errDivisionByZero = 532; // #DIV/0! // Compiler: a non-simple (str,err,val) value was put in an array const USHORT errNestedArray = 533; -// ScInterpreter internal: no numeric value but numeric queried. If this is -// temporarily (!) set as mnStringNoValueError, the error is generated and can -// be used to distinguish that condition from all other (inherited) errors. Do +// ScInterpreter internal: no numeric value but numeric queried. If this is +// temporarily (!) set as mnStringNoValueError, the error is generated and can +// be used to distinguish that condition from all other (inherited) errors. Do // not use for anything else! Never push or inherit the error otherwise! const USHORT errNotNumericString = 534; diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx index 0ae141cc30d5..da211d4f7449 100644 --- a/formula/inc/formula/formdata.hxx +++ b/formula/inc/formula/formdata.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,48 +41,48 @@ public: FormEditData(); virtual ~FormEditData(); - virtual void SaveValues(); - void RestoreValues(); - BOOL HasParent() const { return pParent != NULL; } + virtual void SaveValues(); + void RestoreValues(); + BOOL HasParent() const { return pParent != NULL; } - inline USHORT GetMode() const { return nMode; } - inline xub_StrLen GetFStart() const { return nFStart; } - inline USHORT GetCatSel() const { return nCatSel; } - inline USHORT GetFuncSel() const { return nFuncSel; } - inline USHORT GetOffset() const { return nOffset; } - inline USHORT GetEdFocus() const { return nEdFocus; } - inline const String& GetUndoStr() const { return aUndoStr; } - inline BOOL GetMatrixFlag()const{ return bMatrix;} - inline ULONG GetUniqueId()const { return nUniqueId;} - inline const Selection& GetSelection()const { return aSelection;} + inline USHORT GetMode() const { return nMode; } + inline xub_StrLen GetFStart() const { return nFStart; } + inline USHORT GetCatSel() const { return nCatSel; } + inline USHORT GetFuncSel() const { return nFuncSel; } + inline USHORT GetOffset() const { return nOffset; } + inline USHORT GetEdFocus() const { return nEdFocus; } + inline const String& GetUndoStr() const { return aUndoStr; } + inline BOOL GetMatrixFlag()const{ return bMatrix;} + inline ULONG GetUniqueId()const { return nUniqueId;} + inline const Selection& GetSelection()const { return aSelection;} - inline void SetMode( USHORT nNew ) { nMode = nNew; } - inline void SetFStart( xub_StrLen nNew ) { nFStart = nNew; } - inline void SetCatSel( USHORT nNew ) { nCatSel = nNew; } - inline void SetFuncSel( USHORT nNew ) { nFuncSel = nNew; } - inline void SetOffset( USHORT nNew ) { nOffset = nNew; } - inline void SetEdFocus( USHORT nNew ) { nEdFocus = nNew; } - inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; } - inline void SetMatrixFlag(BOOL bNew) { bMatrix=bNew;} - inline void SetUniqueId(ULONG nNew) { nUniqueId=nNew;} - inline void SetSelection(const Selection& aSel) { aSelection=aSel;} + inline void SetMode( USHORT nNew ) { nMode = nNew; } + inline void SetFStart( xub_StrLen nNew ) { nFStart = nNew; } + inline void SetCatSel( USHORT nNew ) { nCatSel = nNew; } + inline void SetFuncSel( USHORT nNew ) { nFuncSel = nNew; } + inline void SetOffset( USHORT nNew ) { nOffset = nNew; } + inline void SetEdFocus( USHORT nNew ) { nEdFocus = nNew; } + inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; } + inline void SetMatrixFlag(BOOL bNew) { bMatrix=bNew;} + inline void SetUniqueId(ULONG nNew) { nUniqueId=nNew;} + inline void SetSelection(const Selection& aSel) { aSelection=aSel;} protected: - void Reset(); + void Reset(); FormEditData( const FormEditData& ); const FormEditData& operator=( const FormEditData& r ); - FormEditData* pParent; // fuer Verschachtelung + FormEditData* pParent; // fuer Verschachtelung private: - USHORT nMode; // enum ScFormulaDlgMode - xub_StrLen nFStart; - USHORT nCatSel; - USHORT nFuncSel; - USHORT nOffset; - USHORT nEdFocus; - String aUndoStr; - BOOL bMatrix; - ULONG nUniqueId; - Selection aSelection; + USHORT nMode; // enum ScFormulaDlgMode + xub_StrLen nFStart; + USHORT nCatSel; + USHORT nFuncSel; + USHORT nOffset; + USHORT nEdFocus; + String aUndoStr; + BOOL bMatrix; + ULONG nUniqueId; + Selection aSelection; }; diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index 812c6631d39b..d88d1fe62057 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,13 +76,13 @@ protected: protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); - void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); - void RefInputDoneAfter( BOOL bForced = FALSE ); - ULONG FindFocusWin(Window *pWin); - void SetFocusWin(Window *pWin,ULONG nUniqueId); - void HighlightFunctionParas(const String& aFormula); + void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); + void RefInputDoneAfter( BOOL bForced = FALSE ); + ULONG FindFocusWin(Window *pWin); + void SetFocusWin(Window *pWin,ULONG nUniqueId); + void HighlightFunctionParas(const String& aFormula); void SetMeText(const String& _sText); FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); @@ -93,10 +93,10 @@ protected: void CheckMatrix(); void DoEnter(BOOL _bOk); BOOL isUserMatrix() const; - const IFunctionDescription* getCurrentFunctionDescription() const; + const IFunctionDescription* getCurrentFunctionDescription() const; BOOL UpdateParaWin(Selection& _rSelection); void UpdateParaWin(const Selection& _rSelection,const String& _sRefStr); - RefEdit* GetActiveEdit(); + RefEdit* GetActiveEdit(); void SetEdSelection(); const FormulaHelper& GetFormulaHelper() const; @@ -125,13 +125,13 @@ protected: protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); - void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); - void RefInputDoneAfter( BOOL bForced = FALSE ); - ULONG FindFocusWin(Window *pWin); - void SetFocusWin(Window *pWin,ULONG nUniqueId); - void HighlightFunctionParas(const String& aFormula); + void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); + void RefInputDoneAfter( BOOL bForced = FALSE ); + ULONG FindFocusWin(Window *pWin); + void SetFocusWin(Window *pWin,ULONG nUniqueId); + void HighlightFunctionParas(const String& aFormula); void SetMeText(const String& _sText); FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); @@ -142,10 +142,10 @@ protected: void CheckMatrix(); void DoEnter(BOOL _bOk); BOOL isUserMatrix() const; - const IFunctionDescription* getCurrentFunctionDescription() const; + const IFunctionDescription* getCurrentFunctionDescription() const; BOOL UpdateParaWin(Selection& _rSelection); void UpdateParaWin(const Selection& _rSelection,const String& _sRefStr); - RefEdit* GetActiveEdit(); + RefEdit* GetActiveEdit(); void SetEdSelection(); const FormulaHelper& GetFormulaHelper() const; diff --git a/formula/inc/formula/formuladllapi.h b/formula/inc/formula/formuladllapi.h index cc047674199b..fb2a0e4c8575 100644 --- a/formula/inc/formula/formuladllapi.h +++ b/formula/inc/formula/formuladllapi.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #ifndef INCLUDED_FORMULADLLAPI_H #define INCLUDED_FORMULADLLAPI_H - + #include "sal/types.h" #if defined(FORMULA_DLLIMPLEMENTATION) @@ -36,6 +36,6 @@ #define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define FORMULA_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_FORMULADLLAPI_H */ diff --git a/formula/inc/formula/formulahelper.hxx b/formula/inc/formula/formulahelper.hxx index 063b7b0cc06a..54cf27277681 100644 --- a/formula/inc/formula/formulahelper.hxx +++ b/formula/inc/formula/formulahelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx index a65960960028..05c765af50bb 100644 --- a/formula/inc/formula/funcutl.hxx +++ b/formula/inc/formula/funcutl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/formula/inc/formula/grammar.hxx b/formula/inc/formula/grammar.hxx index 691dbcb71517..a6f542ac5054 100644 --- a/formula/inc/formula/grammar.hxx +++ b/formula/inc/formula/grammar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,6 +127,16 @@ public: GRAM_NATIVE_XL_R1C1 = ::com::sun::star::sheet::FormulaLanguage::NATIVE | ((CONV_XL_R1C1 + kConventionOffset) << kConventionShift), + /// English with Excel A1 reference style. + GRAM_ENGLISH_XL_A1 = ::com::sun::star::sheet::FormulaLanguage::XL_ENGLISH | + ((CONV_XL_A1 + + kConventionOffset) << kConventionShift) | + kEnglishBit, + /// English with Excel R1C1 reference style. + GRAM_ENGLISH_XL_R1C1 = ::com::sun::star::sheet::FormulaLanguage::XL_ENGLISH | + ((CONV_XL_R1C1 + + kConventionOffset) << kConventionShift) | + kEnglishBit, /// Central definition of the default grammar to be used. GRAM_DEFAULT = GRAM_NATIVE_UI, @@ -177,6 +187,8 @@ public: case GRAM_NATIVE_ODF : case GRAM_NATIVE_XL_A1 : case GRAM_NATIVE_XL_R1C1 : + case GRAM_ENGLISH_XL_A1 : + case GRAM_ENGLISH_XL_R1C1: return true; default: return extractFormulaLanguage( eGrammar) == GRAM_EXTERNAL; diff --git a/formula/inc/formula/intruref.hxx b/formula/inc/formula/intruref.hxx index 640ce14e4b37..93b988d6d6b0 100644 --- a/formula/inc/formula/intruref.hxx +++ b/formula/inc/formula/intruref.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,13 +53,13 @@ public: p->IncRef(); } inline SimpleIntrusiveReference( T *t ) - { + { p = t; if ( p ) t->IncRef(); } inline void Clear() - { + { if ( p ) { p->DecRef(); diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx index 53f387ae7641..390ab21048d3 100644 --- a/formula/inc/formula/opcode.hxx +++ b/formula/inc/formula/opcode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,39 +28,39 @@ #ifndef FORMULA_OPCODE_HXX #define FORMULA_OPCODE_HXX -#include "formula/compiler.hrc" // OpCodes +#include "formula/compiler.hrc" // OpCodes #include <tools/solar.h> enum OpCodeEnum { // Special commands - ocPush = SC_OPCODE_PUSH, - ocCall = SC_OPCODE_CALL, - ocStop = SC_OPCODE_STOP, - ocExternal = SC_OPCODE_EXTERNAL, - ocName = SC_OPCODE_NAME, + ocPush = SC_OPCODE_PUSH, + ocCall = SC_OPCODE_CALL, + ocStop = SC_OPCODE_STOP, + ocExternal = SC_OPCODE_EXTERNAL, + ocName = SC_OPCODE_NAME, ocExternalRef = SC_OPCODE_EXTERNAL_REF, // Jump commands - ocIf = SC_OPCODE_IF, - ocChose = SC_OPCODE_CHOSE, + ocIf = SC_OPCODE_IF, + ocChose = SC_OPCODE_CHOSE, // Parentheses and separators - ocOpen = SC_OPCODE_OPEN, - ocClose = SC_OPCODE_CLOSE, - ocSep = SC_OPCODE_SEP, + ocOpen = SC_OPCODE_OPEN, + ocClose = SC_OPCODE_CLOSE, + ocSep = SC_OPCODE_SEP, ocArrayOpen = SC_OPCODE_ARRAY_OPEN, ocArrayClose = SC_OPCODE_ARRAY_CLOSE, ocArrayRowSep = SC_OPCODE_ARRAY_ROW_SEP, ocArrayColSep = SC_OPCODE_ARRAY_COL_SEP, // Special OpCodes - ocMissing = SC_OPCODE_MISSING, - ocBad = SC_OPCODE_BAD, - ocSpaces = SC_OPCODE_SPACES, - ocMatRef = SC_OPCODE_MAT_REF, + ocMissing = SC_OPCODE_MISSING, + ocBad = SC_OPCODE_BAD, + ocSpaces = SC_OPCODE_SPACES, + ocMatRef = SC_OPCODE_MAT_REF, // Access commands - ocDBArea = SC_OPCODE_DB_AREA, - ocMacro = SC_OPCODE_MACRO, - ocColRowName = SC_OPCODE_COL_ROW_NAME, - ocColRowNameAuto = SC_OPCODE_COL_ROW_NAME_AUTO, + ocDBArea = SC_OPCODE_DB_AREA, + ocMacro = SC_OPCODE_MACRO, + ocColRowName = SC_OPCODE_COL_ROW_NAME, + ocColRowNameAuto = SC_OPCODE_COL_ROW_NAME_AUTO, // Percent operator _follows_ value ocPercentSign = SC_OPCODE_PERCENT_SIGN, // Error constants @@ -72,326 +72,326 @@ enum OpCodeEnum ocErrNum = SC_OPCODE_ERROR_NUM, ocErrNA = SC_OPCODE_ERROR_NA, // Binary operators - ocAdd = SC_OPCODE_ADD, - ocSub = SC_OPCODE_SUB, - ocMul = SC_OPCODE_MUL, - ocDiv = SC_OPCODE_DIV, - ocAmpersand = SC_OPCODE_AMPERSAND, - ocPow = SC_OPCODE_POW, - ocEqual = SC_OPCODE_EQUAL, - ocNotEqual = SC_OPCODE_NOT_EQUAL, - ocLess = SC_OPCODE_LESS, - ocGreater = SC_OPCODE_GREATER, - ocLessEqual = SC_OPCODE_LESS_EQUAL, - ocGreaterEqual = SC_OPCODE_GREATER_EQUAL, - ocAnd = SC_OPCODE_AND, - ocOr = SC_OPCODE_OR, - ocIntersect = SC_OPCODE_INTERSECT, - ocUnion = SC_OPCODE_UNION, - ocRange = SC_OPCODE_RANGE, + ocAdd = SC_OPCODE_ADD, + ocSub = SC_OPCODE_SUB, + ocMul = SC_OPCODE_MUL, + ocDiv = SC_OPCODE_DIV, + ocAmpersand = SC_OPCODE_AMPERSAND, + ocPow = SC_OPCODE_POW, + ocEqual = SC_OPCODE_EQUAL, + ocNotEqual = SC_OPCODE_NOT_EQUAL, + ocLess = SC_OPCODE_LESS, + ocGreater = SC_OPCODE_GREATER, + ocLessEqual = SC_OPCODE_LESS_EQUAL, + ocGreaterEqual = SC_OPCODE_GREATER_EQUAL, + ocAnd = SC_OPCODE_AND, + ocOr = SC_OPCODE_OR, + ocIntersect = SC_OPCODE_INTERSECT, + ocUnion = SC_OPCODE_UNION, + ocRange = SC_OPCODE_RANGE, // Unary operators - ocNot = SC_OPCODE_NOT, - ocNeg = SC_OPCODE_NEG, - ocNegSub = SC_OPCODE_NEG_SUB, + ocNot = SC_OPCODE_NOT, + ocNeg = SC_OPCODE_NEG, + ocNegSub = SC_OPCODE_NEG_SUB, // Functions with no parameters - ocPi = SC_OPCODE_PI, - ocRandom = SC_OPCODE_RANDOM, - ocTrue = SC_OPCODE_TRUE, - ocFalse = SC_OPCODE_FALSE, - ocGetActDate = SC_OPCODE_GET_ACT_DATE, - ocGetActTime = SC_OPCODE_GET_ACT_TIME, - ocNotAvail = SC_OPCODE_NO_VALUE, - ocCurrent = SC_OPCODE_CURRENT, + ocPi = SC_OPCODE_PI, + ocRandom = SC_OPCODE_RANDOM, + ocTrue = SC_OPCODE_TRUE, + ocFalse = SC_OPCODE_FALSE, + ocGetActDate = SC_OPCODE_GET_ACT_DATE, + ocGetActTime = SC_OPCODE_GET_ACT_TIME, + ocNotAvail = SC_OPCODE_NO_VALUE, + ocCurrent = SC_OPCODE_CURRENT, // Functions with one parameter - ocDeg = SC_OPCODE_DEG, - ocRad = SC_OPCODE_RAD, - ocSin = SC_OPCODE_SIN, - ocCos = SC_OPCODE_COS, - ocTan = SC_OPCODE_TAN, - ocCot = SC_OPCODE_COT, - ocArcSin = SC_OPCODE_ARC_SIN, - ocArcCos = SC_OPCODE_ARC_COS, - ocArcTan = SC_OPCODE_ARC_TAN, - ocArcCot = SC_OPCODE_ARC_COT, - ocSinHyp = SC_OPCODE_SIN_HYP, - ocCosHyp = SC_OPCODE_COS_HYP, - ocTanHyp = SC_OPCODE_TAN_HYP, - ocCotHyp = SC_OPCODE_COT_HYP, - ocArcSinHyp = SC_OPCODE_ARC_SIN_HYP, - ocArcCosHyp = SC_OPCODE_ARC_COS_HYP, - ocArcTanHyp = SC_OPCODE_ARC_TAN_HYP, - ocArcCotHyp = SC_OPCODE_ARC_COT_HYP, - ocExp = SC_OPCODE_EXP, - ocLn = SC_OPCODE_LN, - ocSqrt = SC_OPCODE_SQRT, - ocFact = SC_OPCODE_FACT, - ocGetYear = SC_OPCODE_GET_YEAR, - ocGetMonth = SC_OPCODE_GET_MONTH, - ocGetDay = SC_OPCODE_GET_DAY, - ocGetHour = SC_OPCODE_GET_HOUR, - ocGetMin = SC_OPCODE_GET_MIN, - ocGetSec = SC_OPCODE_GET_SEC, - ocPlusMinus = SC_OPCODE_PLUS_MINUS, - ocAbs = SC_OPCODE_ABS, - ocInt = SC_OPCODE_INT, - ocPhi = SC_OPCODE_PHI, - ocGauss = SC_OPCODE_GAUSS, - ocIsEmpty = SC_OPCODE_IS_EMPTY, - ocIsString = SC_OPCODE_IS_STRING, - ocIsNonString = SC_OPCODE_IS_NON_STRING, - ocIsLogical = SC_OPCODE_IS_LOGICAL, - ocType = SC_OPCODE_TYPE, - ocCell = SC_OPCODE_CELL, - ocIsRef = SC_OPCODE_IS_REF, - ocIsValue = SC_OPCODE_IS_VALUE, - ocIsFormula = SC_OPCODE_IS_FORMULA, - ocIsNA = SC_OPCODE_IS_NV, - ocIsErr = SC_OPCODE_IS_ERR, - ocIsError = SC_OPCODE_IS_ERROR, - ocIsEven = SC_OPCODE_IS_EVEN, - ocIsOdd = SC_OPCODE_IS_ODD, - ocN = SC_OPCODE_N, + ocDeg = SC_OPCODE_DEG, + ocRad = SC_OPCODE_RAD, + ocSin = SC_OPCODE_SIN, + ocCos = SC_OPCODE_COS, + ocTan = SC_OPCODE_TAN, + ocCot = SC_OPCODE_COT, + ocArcSin = SC_OPCODE_ARC_SIN, + ocArcCos = SC_OPCODE_ARC_COS, + ocArcTan = SC_OPCODE_ARC_TAN, + ocArcCot = SC_OPCODE_ARC_COT, + ocSinHyp = SC_OPCODE_SIN_HYP, + ocCosHyp = SC_OPCODE_COS_HYP, + ocTanHyp = SC_OPCODE_TAN_HYP, + ocCotHyp = SC_OPCODE_COT_HYP, + ocArcSinHyp = SC_OPCODE_ARC_SIN_HYP, + ocArcCosHyp = SC_OPCODE_ARC_COS_HYP, + ocArcTanHyp = SC_OPCODE_ARC_TAN_HYP, + ocArcCotHyp = SC_OPCODE_ARC_COT_HYP, + ocExp = SC_OPCODE_EXP, + ocLn = SC_OPCODE_LN, + ocSqrt = SC_OPCODE_SQRT, + ocFact = SC_OPCODE_FACT, + ocGetYear = SC_OPCODE_GET_YEAR, + ocGetMonth = SC_OPCODE_GET_MONTH, + ocGetDay = SC_OPCODE_GET_DAY, + ocGetHour = SC_OPCODE_GET_HOUR, + ocGetMin = SC_OPCODE_GET_MIN, + ocGetSec = SC_OPCODE_GET_SEC, + ocPlusMinus = SC_OPCODE_PLUS_MINUS, + ocAbs = SC_OPCODE_ABS, + ocInt = SC_OPCODE_INT, + ocPhi = SC_OPCODE_PHI, + ocGauss = SC_OPCODE_GAUSS, + ocIsEmpty = SC_OPCODE_IS_EMPTY, + ocIsString = SC_OPCODE_IS_STRING, + ocIsNonString = SC_OPCODE_IS_NON_STRING, + ocIsLogical = SC_OPCODE_IS_LOGICAL, + ocType = SC_OPCODE_TYPE, + ocCell = SC_OPCODE_CELL, + ocIsRef = SC_OPCODE_IS_REF, + ocIsValue = SC_OPCODE_IS_VALUE, + ocIsFormula = SC_OPCODE_IS_FORMULA, + ocIsNA = SC_OPCODE_IS_NV, + ocIsErr = SC_OPCODE_IS_ERR, + ocIsError = SC_OPCODE_IS_ERROR, + ocIsEven = SC_OPCODE_IS_EVEN, + ocIsOdd = SC_OPCODE_IS_ODD, + ocN = SC_OPCODE_N, // String functions - ocGetDateValue = SC_OPCODE_GET_DATE_VALUE, - ocGetTimeValue = SC_OPCODE_GET_TIME_VALUE, - ocCode = SC_OPCODE_CODE, - ocTrim = SC_OPCODE_TRIM, - ocUpper = SC_OPCODE_UPPER, - ocPropper = SC_OPCODE_PROPPER, - ocLower = SC_OPCODE_LOWER, - ocLen = SC_OPCODE_LEN, - ocT = SC_OPCODE_T, - ocValue = SC_OPCODE_VALUE, - ocClean = SC_OPCODE_CLEAN, - ocChar = SC_OPCODE_CHAR, - ocLog10 = SC_OPCODE_LOG10, - ocEven = SC_OPCODE_EVEN, - ocOdd = SC_OPCODE_ODD, - ocStdNormDist = SC_OPCODE_STD_NORM_DIST, - ocFisher = SC_OPCODE_FISHER, - ocFisherInv = SC_OPCODE_FISHER_INV, - ocSNormInv = SC_OPCODE_S_NORM_INV, - ocGammaLn = SC_OPCODE_GAMMA_LN, - ocGamma = SC_OPCODE_GAMMA, - ocErrorType = SC_OPCODE_ERROR_TYPE, - ocErrCell = SC_OPCODE_ERR_CELL, - ocFormula = SC_OPCODE_FORMULA, - ocArabic = SC_OPCODE_ARABIC, - ocInfo = SC_OPCODE_INFO, + ocGetDateValue = SC_OPCODE_GET_DATE_VALUE, + ocGetTimeValue = SC_OPCODE_GET_TIME_VALUE, + ocCode = SC_OPCODE_CODE, + ocTrim = SC_OPCODE_TRIM, + ocUpper = SC_OPCODE_UPPER, + ocPropper = SC_OPCODE_PROPPER, + ocLower = SC_OPCODE_LOWER, + ocLen = SC_OPCODE_LEN, + ocT = SC_OPCODE_T, + ocValue = SC_OPCODE_VALUE, + ocClean = SC_OPCODE_CLEAN, + ocChar = SC_OPCODE_CHAR, + ocLog10 = SC_OPCODE_LOG10, + ocEven = SC_OPCODE_EVEN, + ocOdd = SC_OPCODE_ODD, + ocStdNormDist = SC_OPCODE_STD_NORM_DIST, + ocFisher = SC_OPCODE_FISHER, + ocFisherInv = SC_OPCODE_FISHER_INV, + ocSNormInv = SC_OPCODE_S_NORM_INV, + ocGammaLn = SC_OPCODE_GAMMA_LN, + ocGamma = SC_OPCODE_GAMMA, + ocErrorType = SC_OPCODE_ERROR_TYPE, + ocErrCell = SC_OPCODE_ERR_CELL, + ocFormula = SC_OPCODE_FORMULA, + ocArabic = SC_OPCODE_ARABIC, + ocInfo = SC_OPCODE_INFO, ocBahtText = SC_OPCODE_BAHTTEXT, ocJis = SC_OPCODE_JIS, ocAsc = SC_OPCODE_ASC, ocUnicode = SC_OPCODE_UNICODE, ocUnichar = SC_OPCODE_UNICHAR, // Functions with more than one parameters - ocArcTan2 = SC_OPCODE_ARC_TAN_2, - ocCeil = SC_OPCODE_CEIL, - ocFloor = SC_OPCODE_FLOOR, - ocRound = SC_OPCODE_ROUND, - ocRoundUp = SC_OPCODE_ROUND_UP, - ocRoundDown = SC_OPCODE_ROUND_DOWN, - ocTrunc = SC_OPCODE_TRUNC, - ocLog = SC_OPCODE_LOG, - ocPower = SC_OPCODE_POWER, - ocGCD = SC_OPCODE_GGT, - ocLCM = SC_OPCODE_KGV, - ocMod = SC_OPCODE_MOD, - ocSumProduct = SC_OPCODE_SUM_PRODUCT, - ocSumSQ = SC_OPCODE_SUM_SQ, - ocSumX2MY2 = SC_OPCODE_SUM_X2MY2, - ocSumX2DY2 = SC_OPCODE_SUM_X2DY2, - ocSumXMY2 = SC_OPCODE_SUM_XMY2, - ocGetDate = SC_OPCODE_GET_DATE, - ocGetTime = SC_OPCODE_GET_TIME, - ocGetDiffDate = SC_OPCODE_GET_DIFF_DATE, - ocGetDiffDate360 = SC_OPCODE_GET_DIFF_DATE_360, - ocMin = SC_OPCODE_MIN, - ocMax = SC_OPCODE_MAX, - ocSum = SC_OPCODE_SUM, - ocProduct = SC_OPCODE_PRODUCT, - ocAverage = SC_OPCODE_AVERAGE, - ocCount = SC_OPCODE_COUNT, - ocCount2 = SC_OPCODE_COUNT_2, - ocNPV = SC_OPCODE_NBW, - ocIRR = SC_OPCODE_IKV, - ocMIRR = SC_OPCODE_MIRR, - ocISPMT = SC_OPCODE_ISPMT, - ocVar = SC_OPCODE_VAR, - ocVarP = SC_OPCODE_VAR_P, - ocStDev = SC_OPCODE_ST_DEV, - ocStDevP = SC_OPCODE_ST_DEV_P, - ocB = SC_OPCODE_B, - ocNormDist = SC_OPCODE_NORM_DIST, - ocExpDist = SC_OPCODE_EXP_DIST, - ocBinomDist = SC_OPCODE_BINOM_DIST, - ocPoissonDist = SC_OPCODE_POISSON_DIST, - ocKombin = SC_OPCODE_KOMBIN, - ocKombin2 = SC_OPCODE_KOMBIN_2, - ocVariationen = SC_OPCODE_VARIATIONEN, - ocVariationen2 = SC_OPCODE_VARIATIONEN_2, - ocBW = SC_OPCODE_BW, - ocDIA = SC_OPCODE_DIA, - ocGDA = SC_OPCODE_GDA, - ocGDA2 = SC_OPCODE_GDA_2, - ocVBD = SC_OPCODE_VBD, - ocLaufz = SC_OPCODE_LAUFZ, - ocLIA = SC_OPCODE_LIA, - ocRMZ = SC_OPCODE_RMZ, - ocColumns = SC_OPCODE_COLUMNS, - ocRows = SC_OPCODE_ROWS, - ocColumn = SC_OPCODE_COLUMN, - ocRow = SC_OPCODE_ROW, - ocZGZ = SC_OPCODE_ZGZ, - ocZW = SC_OPCODE_ZW, - ocZZR = SC_OPCODE_ZZR, - ocZins = SC_OPCODE_ZINS, - ocZinsZ = SC_OPCODE_ZINS_Z, - ocKapz = SC_OPCODE_KAPZ, - ocKumZinsZ = SC_OPCODE_KUM_ZINS_Z, - ocKumKapZ = SC_OPCODE_KUM_KAP_Z, - ocEffektiv = SC_OPCODE_EFFEKTIV, - ocNominal = SC_OPCODE_NOMINAL, - ocSubTotal = SC_OPCODE_SUB_TOTAL, + ocArcTan2 = SC_OPCODE_ARC_TAN_2, + ocCeil = SC_OPCODE_CEIL, + ocFloor = SC_OPCODE_FLOOR, + ocRound = SC_OPCODE_ROUND, + ocRoundUp = SC_OPCODE_ROUND_UP, + ocRoundDown = SC_OPCODE_ROUND_DOWN, + ocTrunc = SC_OPCODE_TRUNC, + ocLog = SC_OPCODE_LOG, + ocPower = SC_OPCODE_POWER, + ocGCD = SC_OPCODE_GGT, + ocLCM = SC_OPCODE_KGV, + ocMod = SC_OPCODE_MOD, + ocSumProduct = SC_OPCODE_SUM_PRODUCT, + ocSumSQ = SC_OPCODE_SUM_SQ, + ocSumX2MY2 = SC_OPCODE_SUM_X2MY2, + ocSumX2DY2 = SC_OPCODE_SUM_X2DY2, + ocSumXMY2 = SC_OPCODE_SUM_XMY2, + ocGetDate = SC_OPCODE_GET_DATE, + ocGetTime = SC_OPCODE_GET_TIME, + ocGetDiffDate = SC_OPCODE_GET_DIFF_DATE, + ocGetDiffDate360 = SC_OPCODE_GET_DIFF_DATE_360, + ocMin = SC_OPCODE_MIN, + ocMax = SC_OPCODE_MAX, + ocSum = SC_OPCODE_SUM, + ocProduct = SC_OPCODE_PRODUCT, + ocAverage = SC_OPCODE_AVERAGE, + ocCount = SC_OPCODE_COUNT, + ocCount2 = SC_OPCODE_COUNT_2, + ocNPV = SC_OPCODE_NBW, + ocIRR = SC_OPCODE_IKV, + ocMIRR = SC_OPCODE_MIRR, + ocISPMT = SC_OPCODE_ISPMT, + ocVar = SC_OPCODE_VAR, + ocVarP = SC_OPCODE_VAR_P, + ocStDev = SC_OPCODE_ST_DEV, + ocStDevP = SC_OPCODE_ST_DEV_P, + ocB = SC_OPCODE_B, + ocNormDist = SC_OPCODE_NORM_DIST, + ocExpDist = SC_OPCODE_EXP_DIST, + ocBinomDist = SC_OPCODE_BINOM_DIST, + ocPoissonDist = SC_OPCODE_POISSON_DIST, + ocKombin = SC_OPCODE_KOMBIN, + ocKombin2 = SC_OPCODE_KOMBIN_2, + ocVariationen = SC_OPCODE_VARIATIONEN, + ocVariationen2 = SC_OPCODE_VARIATIONEN_2, + ocBW = SC_OPCODE_BW, + ocDIA = SC_OPCODE_DIA, + ocGDA = SC_OPCODE_GDA, + ocGDA2 = SC_OPCODE_GDA_2, + ocVBD = SC_OPCODE_VBD, + ocLaufz = SC_OPCODE_LAUFZ, + ocLIA = SC_OPCODE_LIA, + ocRMZ = SC_OPCODE_RMZ, + ocColumns = SC_OPCODE_COLUMNS, + ocRows = SC_OPCODE_ROWS, + ocColumn = SC_OPCODE_COLUMN, + ocRow = SC_OPCODE_ROW, + ocZGZ = SC_OPCODE_ZGZ, + ocZW = SC_OPCODE_ZW, + ocZZR = SC_OPCODE_ZZR, + ocZins = SC_OPCODE_ZINS, + ocZinsZ = SC_OPCODE_ZINS_Z, + ocKapz = SC_OPCODE_KAPZ, + ocKumZinsZ = SC_OPCODE_KUM_ZINS_Z, + ocKumKapZ = SC_OPCODE_KUM_KAP_Z, + ocEffektiv = SC_OPCODE_EFFEKTIV, + ocNominal = SC_OPCODE_NOMINAL, + ocSubTotal = SC_OPCODE_SUB_TOTAL, // Database functions - ocDBSum = SC_OPCODE_DB_SUM, - ocDBCount = SC_OPCODE_DB_COUNT, - ocDBCount2 = SC_OPCODE_DB_COUNT_2, - ocDBAverage = SC_OPCODE_DB_AVERAGE, - ocDBGet = SC_OPCODE_DB_GET, - ocDBMax = SC_OPCODE_DB_MAX, - ocDBMin = SC_OPCODE_DB_MIN, - ocDBProduct = SC_OPCODE_DB_PRODUCT, - ocDBStdDev = SC_OPCODE_DB_STD_DEV, - ocDBStdDevP = SC_OPCODE_DB_STD_DEV_P, - ocDBVar = SC_OPCODE_DB_VAR, - ocDBVarP = SC_OPCODE_DB_VAR_P, + ocDBSum = SC_OPCODE_DB_SUM, + ocDBCount = SC_OPCODE_DB_COUNT, + ocDBCount2 = SC_OPCODE_DB_COUNT_2, + ocDBAverage = SC_OPCODE_DB_AVERAGE, + ocDBGet = SC_OPCODE_DB_GET, + ocDBMax = SC_OPCODE_DB_MAX, + ocDBMin = SC_OPCODE_DB_MIN, + ocDBProduct = SC_OPCODE_DB_PRODUCT, + ocDBStdDev = SC_OPCODE_DB_STD_DEV, + ocDBStdDevP = SC_OPCODE_DB_STD_DEV_P, + ocDBVar = SC_OPCODE_DB_VAR, + ocDBVarP = SC_OPCODE_DB_VAR_P, // Management functions - ocIndirect = SC_OPCODE_INDIRECT, - ocIndirectXL = SC_OPCODE_INDIRECT_XL, - ocAddress = SC_OPCODE_ADDRESS, - ocAddressXL = SC_OPCODE_ADDRESS_XL, - ocMatch = SC_OPCODE_MATCH, - ocCountEmptyCells = SC_OPCODE_COUNT_EMPTY_CELLS, - ocCountIf = SC_OPCODE_COUNT_IF, - ocSumIf = SC_OPCODE_SUM_IF, - ocLookup = SC_OPCODE_LOOKUP, - ocVLookup = SC_OPCODE_V_LOOKUP, - ocHLookup = SC_OPCODE_H_LOOKUP, - ocMultiArea = SC_OPCODE_MULTI_AREA, - ocOffset = SC_OPCODE_OFFSET, - ocIndex = SC_OPCODE_INDEX, - ocAreas = SC_OPCODE_AREAS, + ocIndirect = SC_OPCODE_INDIRECT, + ocIndirectXL = SC_OPCODE_INDIRECT_XL, + ocAddress = SC_OPCODE_ADDRESS, + ocAddressXL = SC_OPCODE_ADDRESS_XL, + ocMatch = SC_OPCODE_MATCH, + ocCountEmptyCells = SC_OPCODE_COUNT_EMPTY_CELLS, + ocCountIf = SC_OPCODE_COUNT_IF, + ocSumIf = SC_OPCODE_SUM_IF, + ocLookup = SC_OPCODE_LOOKUP, + ocVLookup = SC_OPCODE_V_LOOKUP, + ocHLookup = SC_OPCODE_H_LOOKUP, + ocMultiArea = SC_OPCODE_MULTI_AREA, + ocOffset = SC_OPCODE_OFFSET, + ocIndex = SC_OPCODE_INDEX, + ocAreas = SC_OPCODE_AREAS, // String functions - ocCurrency = SC_OPCODE_CURRENCY, - ocReplace = SC_OPCODE_REPLACE, - ocFixed = SC_OPCODE_FIXED, - ocFind = SC_OPCODE_FIND, - ocExact = SC_OPCODE_EXACT, - ocLeft = SC_OPCODE_LEFT, - ocRight = SC_OPCODE_RIGHT, - ocSearch = SC_OPCODE_SEARCH, - ocMid = SC_OPCODE_MID, - ocText = SC_OPCODE_TEXT, - ocSubstitute = SC_OPCODE_SUBSTITUTE, - ocRept = SC_OPCODE_REPT, - ocConcat = SC_OPCODE_CONCAT, + ocCurrency = SC_OPCODE_CURRENCY, + ocReplace = SC_OPCODE_REPLACE, + ocFixed = SC_OPCODE_FIXED, + ocFind = SC_OPCODE_FIND, + ocExact = SC_OPCODE_EXACT, + ocLeft = SC_OPCODE_LEFT, + ocRight = SC_OPCODE_RIGHT, + ocSearch = SC_OPCODE_SEARCH, + ocMid = SC_OPCODE_MID, + ocText = SC_OPCODE_TEXT, + ocSubstitute = SC_OPCODE_SUBSTITUTE, + ocRept = SC_OPCODE_REPT, + ocConcat = SC_OPCODE_CONCAT, // Matrix functions - ocMatValue = SC_OPCODE_MAT_VALUE, - ocMatDet = SC_OPCODE_MAT_DET, - ocMatInv = SC_OPCODE_MAT_INV, - ocMatMult = SC_OPCODE_MAT_MULT, - ocMatTrans = SC_OPCODE_MAT_TRANS, - ocMatrixUnit = SC_OPCODE_MATRIX_UNIT, + ocMatValue = SC_OPCODE_MAT_VALUE, + ocMatDet = SC_OPCODE_MAT_DET, + ocMatInv = SC_OPCODE_MAT_INV, + ocMatMult = SC_OPCODE_MAT_MULT, + ocMatTrans = SC_OPCODE_MAT_TRANS, + ocMatrixUnit = SC_OPCODE_MATRIX_UNIT, // BackSolver - ocBackSolver = SC_OPCODE_BACK_SOLVER, + ocBackSolver = SC_OPCODE_BACK_SOLVER, // Statistical functions - ocHypGeomDist = SC_OPCODE_HYP_GEOM_DIST, - ocLogNormDist = SC_OPCODE_LOG_NORM_DIST, - ocTDist = SC_OPCODE_T_DIST, - ocFDist = SC_OPCODE_F_DIST, - ocChiDist = SC_OPCODE_CHI_DIST, + ocHypGeomDist = SC_OPCODE_HYP_GEOM_DIST, + ocLogNormDist = SC_OPCODE_LOG_NORM_DIST, + ocTDist = SC_OPCODE_T_DIST, + ocFDist = SC_OPCODE_F_DIST, + ocChiDist = SC_OPCODE_CHI_DIST, ocChiSqDist = SC_OPCODE_CHISQ_DIST, ocChiSqInv = SC_OPCODE_CHISQ_INV, - ocWeibull = SC_OPCODE_WEIBULL, - ocNegBinomVert = SC_OPCODE_NEG_BINOM_VERT, - ocKritBinom = SC_OPCODE_KRIT_BINOM, - ocKurt = SC_OPCODE_KURT, - ocHarMean = SC_OPCODE_HAR_MEAN, - ocGeoMean = SC_OPCODE_GEO_MEAN, - ocStandard = SC_OPCODE_STANDARD, - ocAveDev = SC_OPCODE_AVE_DEV, - ocSchiefe = SC_OPCODE_SCHIEFE, - ocDevSq = SC_OPCODE_DEV_SQ, - ocMedian = SC_OPCODE_MEDIAN, - ocModalValue = SC_OPCODE_MODAL_VALUE, - ocZTest = SC_OPCODE_Z_TEST, - ocTTest = SC_OPCODE_T_TEST, - ocRank = SC_OPCODE_RANK, - ocPercentile = SC_OPCODE_PERCENTILE, - ocPercentrank = SC_OPCODE_PERCENT_RANK, - ocLarge = SC_OPCODE_LARGE, - ocSmall = SC_OPCODE_SMALL, - ocFrequency = SC_OPCODE_FREQUENCY, - ocQuartile = SC_OPCODE_QUARTILE, - ocNormInv = SC_OPCODE_NORM_INV, - ocConfidence = SC_OPCODE_CONFIDENCE, - ocFTest = SC_OPCODE_F_TEST, - ocTrimMean = SC_OPCODE_TRIM_MEAN, - ocProb = SC_OPCODE_PROB, - ocCorrel = SC_OPCODE_CORREL, - ocCovar = SC_OPCODE_COVAR, - ocPearson = SC_OPCODE_PEARSON, - ocRSQ = SC_OPCODE_RSQ, - ocSTEYX = SC_OPCODE_STEYX, - ocSlope = SC_OPCODE_SLOPE, - ocIntercept = SC_OPCODE_INTERCEPT, - ocTrend = SC_OPCODE_TREND, - ocGrowth = SC_OPCODE_GROWTH, - ocRGP = SC_OPCODE_RGP, - ocRKP = SC_OPCODE_RKP, - ocForecast = SC_OPCODE_FORECAST, - ocChiInv = SC_OPCODE_CHI_INV, - ocGammaDist = SC_OPCODE_GAMMA_DIST, - ocGammaInv = SC_OPCODE_GAMMA_INV, - ocTInv = SC_OPCODE_T_INV, - ocFInv = SC_OPCODE_F_INV, - ocChiTest = SC_OPCODE_CHI_TEST, - ocLogInv = SC_OPCODE_LOG_INV, - ocTableOp = SC_OPCODE_TABLE_OP, - ocBetaDist = SC_OPCODE_BETA_DIST, - ocBetaInv = SC_OPCODE_BETA_INV, + ocWeibull = SC_OPCODE_WEIBULL, + ocNegBinomVert = SC_OPCODE_NEG_BINOM_VERT, + ocKritBinom = SC_OPCODE_KRIT_BINOM, + ocKurt = SC_OPCODE_KURT, + ocHarMean = SC_OPCODE_HAR_MEAN, + ocGeoMean = SC_OPCODE_GEO_MEAN, + ocStandard = SC_OPCODE_STANDARD, + ocAveDev = SC_OPCODE_AVE_DEV, + ocSchiefe = SC_OPCODE_SCHIEFE, + ocDevSq = SC_OPCODE_DEV_SQ, + ocMedian = SC_OPCODE_MEDIAN, + ocModalValue = SC_OPCODE_MODAL_VALUE, + ocZTest = SC_OPCODE_Z_TEST, + ocTTest = SC_OPCODE_T_TEST, + ocRank = SC_OPCODE_RANK, + ocPercentile = SC_OPCODE_PERCENTILE, + ocPercentrank = SC_OPCODE_PERCENT_RANK, + ocLarge = SC_OPCODE_LARGE, + ocSmall = SC_OPCODE_SMALL, + ocFrequency = SC_OPCODE_FREQUENCY, + ocQuartile = SC_OPCODE_QUARTILE, + ocNormInv = SC_OPCODE_NORM_INV, + ocConfidence = SC_OPCODE_CONFIDENCE, + ocFTest = SC_OPCODE_F_TEST, + ocTrimMean = SC_OPCODE_TRIM_MEAN, + ocProb = SC_OPCODE_PROB, + ocCorrel = SC_OPCODE_CORREL, + ocCovar = SC_OPCODE_COVAR, + ocPearson = SC_OPCODE_PEARSON, + ocRSQ = SC_OPCODE_RSQ, + ocSTEYX = SC_OPCODE_STEYX, + ocSlope = SC_OPCODE_SLOPE, + ocIntercept = SC_OPCODE_INTERCEPT, + ocTrend = SC_OPCODE_TREND, + ocGrowth = SC_OPCODE_GROWTH, + ocRGP = SC_OPCODE_RGP, + ocRKP = SC_OPCODE_RKP, + ocForecast = SC_OPCODE_FORECAST, + ocChiInv = SC_OPCODE_CHI_INV, + ocGammaDist = SC_OPCODE_GAMMA_DIST, + ocGammaInv = SC_OPCODE_GAMMA_INV, + ocTInv = SC_OPCODE_T_INV, + ocFInv = SC_OPCODE_F_INV, + ocChiTest = SC_OPCODE_CHI_TEST, + ocLogInv = SC_OPCODE_LOG_INV, + ocTableOp = SC_OPCODE_TABLE_OP, + ocBetaDist = SC_OPCODE_BETA_DIST, + ocBetaInv = SC_OPCODE_BETA_INV, // miscellaneous - ocWeek = SC_OPCODE_WEEK, - ocGetDayOfWeek = SC_OPCODE_GET_DAY_OF_WEEK, - ocNoName = SC_OPCODE_NO_NAME, - ocStyle = SC_OPCODE_STYLE, - ocDde = SC_OPCODE_DDE, - ocBase = SC_OPCODE_BASE, - ocTable = SC_OPCODE_TABLE, - ocTables = SC_OPCODE_TABLES, - ocMinA = SC_OPCODE_MIN_A, - ocMaxA = SC_OPCODE_MAX_A, - ocAverageA = SC_OPCODE_AVERAGE_A, - ocStDevA = SC_OPCODE_ST_DEV_A, - ocStDevPA = SC_OPCODE_ST_DEV_P_A, - ocVarA = SC_OPCODE_VAR_A, - ocVarPA = SC_OPCODE_VAR_P_A, - ocEasterSunday = SC_OPCODE_EASTERSUNDAY, - ocDecimal = SC_OPCODE_DECIMAL, - ocConvert = SC_OPCODE_CONVERT, - ocRoman = SC_OPCODE_ROMAN, + ocWeek = SC_OPCODE_WEEK, + ocGetDayOfWeek = SC_OPCODE_GET_DAY_OF_WEEK, + ocNoName = SC_OPCODE_NO_NAME, + ocStyle = SC_OPCODE_STYLE, + ocDde = SC_OPCODE_DDE, + ocBase = SC_OPCODE_BASE, + ocTable = SC_OPCODE_TABLE, + ocTables = SC_OPCODE_TABLES, + ocMinA = SC_OPCODE_MIN_A, + ocMaxA = SC_OPCODE_MAX_A, + ocAverageA = SC_OPCODE_AVERAGE_A, + ocStDevA = SC_OPCODE_ST_DEV_A, + ocStDevPA = SC_OPCODE_ST_DEV_P_A, + ocVarA = SC_OPCODE_VAR_A, + ocVarPA = SC_OPCODE_VAR_P_A, + ocEasterSunday = SC_OPCODE_EASTERSUNDAY, + ocDecimal = SC_OPCODE_DECIMAL, + ocConvert = SC_OPCODE_CONVERT, + ocRoman = SC_OPCODE_ROMAN, ocHyperLink = SC_OPCODE_HYPERLINK, ocGetPivotData = SC_OPCODE_GET_PIVOT_DATA, ocEuroConvert = SC_OPCODE_EUROCONVERT, - ocNumberValue = SC_OPCODE_NUMBERVALUE, + ocNumberValue = SC_OPCODE_NUMBERVALUE, // internal stuff - ocInternalBegin = SC_OPCODE_INTERNAL_BEGIN, - ocTTT = SC_OPCODE_TTT, - ocInternalEnd = SC_OPCODE_INTERNAL_END, + ocInternalBegin = SC_OPCODE_INTERNAL_BEGIN, + ocTTT = SC_OPCODE_TTT, + ocInternalEnd = SC_OPCODE_INTERNAL_END, // from here on ExtraData - ocDataToken1 = SC_OPCODE_DATA_TOKEN_1, + ocDataToken1 = SC_OPCODE_DATA_TOKEN_1, // no OpCode - ocNone = SC_OPCODE_NONE + ocNone = SC_OPCODE_NONE }; #ifndef DBG_UTIL diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx index be1b2f6acdf4..eafb2480af8e 100644 --- a/formula/inc/formula/token.hxx +++ b/formula/inc/formula/token.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ public: virtual ~FormulaToken(); inline void Delete() { delete this; } - inline StackVar GetType() const { return eType; } + inline StackVar GetType() const { return eType; } BOOL IsFunction() const; // pure functions, no operators BOOL IsMatrixFunction() const; // if a function _always_ returns a Matrix BYTE GetParamCount() const; @@ -159,12 +159,12 @@ public: virtual BOOL TextEqual( const formula::FormulaToken& rToken ) const; virtual BOOL operator==( const FormulaToken& rToken ) const; - virtual bool isFunction() const + virtual bool isFunction() const { return IsFunction(); } - virtual sal_uInt32 getArgumentCount() const + virtual sal_uInt32 getArgumentCount() const { return GetParamCount(); } diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx index 54e8179c3f65..fc379fc4bb05 100644 --- a/formula/inc/formula/tokenarray.hxx +++ b/formula/inc/formula/tokenarray.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -249,7 +249,7 @@ struct ImpTokenIterator class FORMULA_DLLPUBLIC FormulaTokenIterator { ImpTokenIterator* pCur; - + public: FormulaTokenIterator( const FormulaTokenArray& ); ~FormulaTokenIterator(); diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc index dfd7403f8de8..ff51f806b734 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #define FORMULA_HELPID_HRC #ifndef _SOLAR_HRC -#include <svl/solar.hrc> // HID_FORMULA_START +#include <svl/solar.hrc> // HID_FORMULA_START #endif #define HID_FORMULADLG_FORMULA (HID_FORMULA_START + 0) @@ -52,10 +52,10 @@ #define HID_FORMULATAB_FUNCTION (HID_FORMULA_START +18) #define HID_FORMULATAB_STRUCT (HID_FORMULA_START +19) - + #if HID_FORMULATAB_STRUCT > HID_FORMULA_END -#error Help-Id Ueberlauf in #file, #line -#endif +#error Help-Id Ueberlauf in #file, #line +#endif // don't forget to update the file util/hidother.src #endif //FORMULA_HELPID_HRC diff --git a/formula/inc/pch/precompiled_formula.cxx b/formula/inc/pch/precompiled_formula.cxx index 9a56cf658e57..e9079eebf2c9 100644 --- a/formula/inc/pch/precompiled_formula.cxx +++ b/formula/inc/pch/precompiled_formula.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/formula/inc/pch/precompiled_formula.hxx b/formula/inc/pch/precompiled_formula.hxx index 7dd6970f7b87..6334ffecb28d 100644 --- a/formula/inc/pch/precompiled_formula.hxx +++ b/formula/inc/pch/precompiled_formula.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 51e2ca99f157..2a2832d59f0d 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -343,7 +343,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create { FormulaMapGroupSpecialOffset::MAT_REF , ocMatRef } , { FormulaMapGroupSpecialOffset::DB_AREA , ocDBArea } , { FormulaMapGroupSpecialOffset::MACRO , ocMacro } , - { FormulaMapGroupSpecialOffset::COL_ROW_NAME , ocColRowName } + { FormulaMapGroupSpecialOffset::COL_ROW_NAME , ocColRowName } }; const size_t nCount = sizeof(aMap)/sizeof(aMap[0]); // Preallocate vector elements. @@ -484,7 +484,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create } } const FormulaOpCodeMapEntry* pRet = aVec.empty() ? 0 : &aVec[0]; - return uno::Sequence< FormulaOpCodeMapEntry >(pRet, aVec.size()); + return uno::Sequence< FormulaOpCodeMapEntry >(pRet, aVec.size()); } //----------------------------------------------------------------------------- @@ -568,6 +568,11 @@ FormulaCompiler::OpCodeMapPtr FormulaCompiler::GetOpCodeMap( const sal_Int32 nLa InitSymbolsNative(); xMap = mxSymbolsNative; break; + case FormulaLanguage::XL_ENGLISH: + if (!mxSymbolsEnglishXL) + InitSymbolsEnglishXL(); + xMap = mxSymbolsEnglishXL; + break; default: ; // nothing, NULL map returned } @@ -681,6 +686,22 @@ void FormulaCompiler::InitSymbolsODFF() const mxSymbolsODFF = s_sSymbol; } // ----------------------------------------------------------------------------- +void FormulaCompiler::InitSymbolsEnglishXL() const +{ + static NonConstOpCodeMapPtr s_sSymbol; + if ( !s_sSymbol.get() ) + loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH,FormulaGrammar::GRAM_ENGLISH,s_sSymbol); + mxSymbolsEnglishXL = s_sSymbol; + + // TODO: For now, just replace the separators to the Excel English + // variants. Later, if we want to properly map Excel functions with Calc + // functions, we'll need to do a little more work here. + mxSymbolsEnglishXL->putOpCode(sal_Unicode(','), ocSep); + mxSymbolsEnglishXL->putOpCode(sal_Unicode(','), ocArrayColSep); + mxSymbolsEnglishXL->putOpCode(sal_Unicode(';'), ocArrayRowSep); +} + +// ----------------------------------------------------------------------------- void FormulaCompiler::loadSymbols(USHORT _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const { if ( !_xMap.get() ) @@ -1556,7 +1577,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff DBG_ERRORFILE("unknown OpCode"); rBuffer.append(GetNativeSymbol( ocErrName )); } - if( bNext ) + if( bNext ) { if (eOp == ocExternalRef) { @@ -1678,6 +1699,17 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & rBuffer.append(sal_Unicode('"')); } } + +void FormulaCompiler::UpdateSeparatorsNative( + const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep ) +{ + NonConstOpCodeMapPtr xSymbolsNative; + lcl_fillNativeSymbols(xSymbolsNative); + xSymbolsNative->putOpCode(rSep, ocSep); + xSymbolsNative->putOpCode(rArrayColSep, ocArrayColSep); + xSymbolsNative->putOpCode(rArrayRowSep, ocArrayRowSep); +} + // ----------------------------------------------------------------------------- OpCode FormulaCompiler::NextToken() { diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index c16be9acd121..d245067eb737 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const ::rtl::OUString return ::comphelper::findValue( getSupportedServiceNames_Static(), _rServiceName, sal_True ).getLength() != 0; } //------------------------------------------------------------------------ -FormulaOpCodeMapperObj::FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler) +FormulaOpCodeMapperObj::FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler) : m_pCompiler(_pCompiler) { } @@ -105,7 +105,7 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings( // -------------------------------------------------------------------------------- uno::Sequence< ::rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames( ) throw(uno::RuntimeException) { - return getSupportedServiceNames_Static(); + return getSupportedServiceNames_Static(); } uno::Sequence< rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static() { diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx index 39809ab9b6eb..0b45a0e4d02a 100644 --- a/formula/source/core/api/services.cxx +++ b/formula/source/core/api/services.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,11 +47,11 @@ namespace cppu::ImplementationEntry entries[] = { { &FormulaOpCodeMapperObj::create, &FormulaOpCodeMapperObj::getImplementationName_Static, &FormulaOpCodeMapperObj::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } -extern "C" +extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * implName, void * serviceManager, void * registryKey) diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index ccc740633c39..f10ecf4eb022 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -946,7 +946,7 @@ void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const Missi if ( mnCurArg == 2 ) { pNewArr->AddOpCode( ocSep ); - pNewArr->AddDouble( 1.0 ); // 4th, Cumulative=TRUE() + pNewArr->AddDouble( 1.0 ); // 4th, Cumulative=TRUE() } break; case ocLogNormDist: @@ -1356,10 +1356,10 @@ BOOL FormulaErrorToken::operator==( const FormulaToken& r ) const nError == static_cast< const FormulaErrorToken & >(r).GetError(); } double FormulaMissingToken::GetDouble() const { return 0.0; } -const String& FormulaMissingToken::GetString() const -{ +const String& FormulaMissingToken::GetString() const +{ static String aDummyString; - return aDummyString; + return aDummyString; } BOOL FormulaMissingToken::operator==( const FormulaToken& r ) const { diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc index ee055f3bb29d..9808a99c3680 100644 --- a/formula/source/core/inc/core_resource.hrc +++ b/formula/source/core/inc/core_resource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,8 +31,8 @@ #include <svl/solar.hrc> //------------------------------------------------------------------------------ -#define RID_CORE_STRINGS_START RID_FORMULA_START -#define RID_CORE_OTHER_START RID_FORMULA_START +#define RID_CORE_STRINGS_START RID_FORMULA_START +#define RID_CORE_OTHER_START RID_FORMULA_START //------------------------------------------------------------------------------ //- String-IDs diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx index c38c158e0a23..54cfbaee24af 100644 --- a/formula/source/core/inc/core_resource.hxx +++ b/formula/source/core/inc/core_resource.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ namespace formula class ResourceManager { friend class OModuleClient; - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static ResMgr* m_pImpl; + static ::osl::Mutex s_aMutex; /// access safety + static sal_Int32 s_nClients; /// number of registered clients + static ResMgr* m_pImpl; private: // no instantiation allowed @@ -63,9 +63,9 @@ namespace formula protected: static void ensureImplExists(); /// register a client for the module - static void registerClient(); + static void registerClient(); /// revoke a client for the module - static void revokeClient(); + static void revokeClient(); public: /** loads the string with the specified resource id @@ -87,19 +87,19 @@ namespace formula const ::rtl::OUString& _rReplace ); - static ResMgr* getResManager(); + static ResMgr* getResManager(); }; //========================================================================= //= OModuleClient //========================================================================= - /** base class for objects which uses any global module-specific ressources + /** base class for objects which uses any global module-specific ressources */ class OModuleClient { public: - OModuleClient() { ResourceManager::registerClient(); } - ~OModuleClient() { ResourceManager::revokeClient(); } + OModuleClient() { ResourceManager::registerClient(); } + ~OModuleClient() { ResourceManager::revokeClient(); } }; diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index 15ed492b5b72..ad816f8a373e 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ namespace formula //================================================================== //= ResourceManager //================================================================== - ::osl::Mutex ResourceManager::s_aMutex; - sal_Int32 ResourceManager::s_nClients = 0; + ::osl::Mutex ResourceManager::s_aMutex; + sal_Int32 ResourceManager::s_nClients = 0; ResMgr* ResourceManager::m_pImpl = NULL; //------------------------------------------------------------------ @@ -96,7 +96,7 @@ namespace formula m_pImpl = NULL; } } - ResMgr* ResourceManager::getResManager() + ResMgr* ResourceManager::getResManager() { ensureImplExists(); return m_pImpl; diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index eaa326ab31c6..d2996e78fba7 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index e0472000d1d5..28523a24eb92 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,14 +39,14 @@ class ValWnd : public Window public: ValWnd( Window* pParent, const ResId& rId ); - void SetValue( const String& rStrVal ); + void SetValue( const String& rStrVal ); protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); private: - String aStrValue; - Rectangle aRectOut; + String aStrValue; + Rectangle aRectOut; }; //============================================================================ @@ -55,18 +55,18 @@ class EditBox : public Control { private: - MultiLineEdit* pMEdit; - Link aSelChangedLink; - Selection aOldSel; - BOOL bMouseFlag; + MultiLineEdit* pMEdit; + Link aSelChangedLink; + Selection aOldSel; + BOOL bMouseFlag; DECL_LINK( ChangedHdl, EditBox* ); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void SelectionChanged(); - virtual void Resize(); - virtual void GetFocus(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void SelectionChanged(); + virtual void Resize(); + virtual void GetFocus(); public: @@ -76,12 +76,12 @@ public: virtual ~EditBox(); - MultiLineEdit* GetEdit() {return pMEdit;} + MultiLineEdit* GetEdit() {return pMEdit;} void SetSelChangedHdl( const Link& rLink ) { aSelChangedLink = rLink; } const Link& GetSelChangedHdl() const { return aSelChangedLink; } - void UpdateOldSel(); + void UpdateOldSel(); }; //============================================================================ @@ -92,17 +92,17 @@ class ArgEdit : public RefEdit public: ArgEdit( Window* pParent, const ResId& rResId ); - void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, + void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, ScrollBar& rArgSlider, USHORT nArgCount ); protected: - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); private: - ArgEdit* pEdPrev; - ArgEdit* pEdNext; - ScrollBar* pSlider; - USHORT nArgs; + ArgEdit* pEdPrev; + ArgEdit* pEdNext; + ScrollBar* pSlider; + USHORT nArgs; }; @@ -113,57 +113,57 @@ class ArgInput { private: - Link aFxClickLink; - Link aRefClickLink; - Link aFxFocusLink; - Link aRefFocusLink; - Link aEdFocusLink; - Link aEdModifyLink; - - FixedText* pFtArg; - ImageButton* pBtnFx; - ArgEdit* pEdArg; - RefButton* pRefBtn; - - DECL_LINK( FxBtnClickHdl, ImageButton* ); - DECL_LINK( RefBtnClickHdl,RefButton* ); - DECL_LINK( FxBtnFocusHdl, ImageButton* ); - DECL_LINK( RefBtnFocusHdl,RefButton* ); - DECL_LINK( EdFocusHdl, ArgEdit* ); - DECL_LINK( EdModifyHdl,ArgEdit* ); + Link aFxClickLink; + Link aRefClickLink; + Link aFxFocusLink; + Link aRefFocusLink; + Link aEdFocusLink; + Link aEdModifyLink; + + FixedText* pFtArg; + ImageButton* pBtnFx; + ArgEdit* pEdArg; + RefButton* pRefBtn; + + DECL_LINK( FxBtnClickHdl, ImageButton* ); + DECL_LINK( RefBtnClickHdl,RefButton* ); + DECL_LINK( FxBtnFocusHdl, ImageButton* ); + DECL_LINK( RefBtnFocusHdl,RefButton* ); + DECL_LINK( EdFocusHdl, ArgEdit* ); + DECL_LINK( EdModifyHdl,ArgEdit* ); protected: - virtual void FxClick(); - virtual void RefClick(); - virtual void FxFocus(); - virtual void RefFocus(); - virtual void EdFocus(); - virtual void EdModify(); + virtual void FxClick(); + virtual void RefClick(); + virtual void FxFocus(); + virtual void RefFocus(); + virtual void EdFocus(); + virtual void EdModify(); public: ArgInput(); - void InitArgInput ( FixedText* pftArg, - ImageButton* pbtnFx, - ArgEdit* pedArg, - RefButton* prefBtn); + void InitArgInput ( FixedText* pftArg, + ImageButton* pbtnFx, + ArgEdit* pedArg, + RefButton* prefBtn); - void SetArgName(const String &aArg); - String GetArgName(); - void SetArgNameFont(const Font&); + void SetArgName(const String &aArg); + String GetArgName(); + void SetArgNameFont(const Font&); - void SetArgVal(const String &aVal); - String GetArgVal(); + void SetArgVal(const String &aVal); + String GetArgVal(); - void SetArgSelection (const Selection& rSel ); - void ReplaceSelOfArg (const String& rStr ); + void SetArgSelection (const Selection& rSel ); + void ReplaceSelOfArg (const String& rStr ); - Selection GetArgSelection(); + Selection GetArgSelection(); - ArgEdit* GetArgEdPtr() {return pEdArg;} + ArgEdit* GetArgEdPtr() {return pEdArg;} void SetFxClickHdl( const Link& rLink ) { aFxClickLink = rLink; } diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 89d3508bc119..3adbd95d9fd1 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ namespace formula { - namespace + namespace { //============================================================================ class OEmptyFunctionDescription : public IFunctionDescription @@ -58,12 +58,12 @@ namespace formula }; } //=================================================================== -// class FormulaHelper - statische Methoden +// class FormulaHelper - statische Methoden //=================================================================== #define FUNC_NOTFOUND 0xffff -FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager) +FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager) :m_pSysLocale(new SvtSysLocale) ,m_pFunctionManager(_pFunctionManager) ,open(_pFunctionManager->getSingleToken(IFunctionManager::eOk)) @@ -74,16 +74,16 @@ FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager) { m_pCharClass = m_pSysLocale->GetCharClassPtr(); } -BOOL FormulaHelper::GetNextFunc( const String& rFormula, - BOOL bBack, - xub_StrLen& rFStart, // Ein- und Ausgabe - xub_StrLen* pFEnd, // = NULL - const IFunctionDescription** ppFDesc, // = NULL - ::std::vector< ::rtl::OUString>* pArgs ) const // = NULL +BOOL FormulaHelper::GetNextFunc( const String& rFormula, + BOOL bBack, + xub_StrLen& rFStart, // Ein- und Ausgabe + xub_StrLen* pFEnd, // = NULL + const IFunctionDescription** ppFDesc, // = NULL + ::std::vector< ::rtl::OUString>* pArgs ) const // = NULL { - BOOL bFound = FALSE; - xub_StrLen nOldStart = rFStart; - String aFname; + BOOL bFound = FALSE; + xub_StrLen nOldStart = rFStart; + String aFname; rFStart = GetFunctionStart( rFormula, rFStart, bBack, ppFDesc ? &aFname : NULL ); bFound = ( rFStart != FUNC_NOTFOUND ); @@ -131,15 +131,15 @@ BOOL FormulaHelper::GetNextFunc( const String& rFormula, //------------------------------------------------------------------------ -void FormulaHelper::FillArgStrings( const String& rFormula, - xub_StrLen nFuncPos, - USHORT nArgs, +void FormulaHelper::FillArgStrings( const String& rFormula, + xub_StrLen nFuncPos, + USHORT nArgs, ::std::vector< ::rtl::OUString >& _rArgs ) const { - xub_StrLen nStart = 0; - xub_StrLen nEnd = 0; - USHORT i; - BOOL bLast = FALSE; + xub_StrLen nStart = 0; + xub_StrLen nEnd = 0; + USHORT i; + BOOL bLast = FALSE; for ( i=0; i<nArgs && !bLast; i++ ) { @@ -189,7 +189,7 @@ inline BOOL IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_ if( _pCharClass->isLetterNumeric( rStr, nPos ) ) return TRUE; else - { // In internationalized versions function names may contain a dot + { // In internationalized versions function names may contain a dot // and in every version also an underscore... ;-) sal_Unicode c = rStr.GetChar(nPos); return c == '.' || c == '_'; @@ -197,18 +197,18 @@ inline BOOL IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_ } -xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula, - xub_StrLen nStart, - BOOL bBack, - String* pFuncName ) const +xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula, + xub_StrLen nStart, + BOOL bBack, + String* pFuncName ) const { xub_StrLen nStrLen = rFormula.Len(); if ( nStrLen < nStart ) return nStart; - xub_StrLen nFStart = FUNC_NOTFOUND; - xub_StrLen nParPos = nStart; + xub_StrLen nFStart = FUNC_NOTFOUND; + xub_StrLen nParPos = nStart; BOOL bRepeat, bFound; do @@ -262,11 +262,11 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula, { if ( IsFormulaText( m_pCharClass,rFormula, nFStart ) ) { - // Funktion gefunden + // Funktion gefunden if ( pFuncName ) *pFuncName = rFormula.Copy( nFStart, nParPos-nFStart ); } - else // Klammern ohne Funktion -> weitersuchen + else // Klammern ohne Funktion -> weitersuchen { bRepeat = TRUE; if ( !bBack ) @@ -277,7 +277,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula, bRepeat = FALSE; } } - else // keine Klammern gefunden + else // keine Klammern gefunden { nFStart = FUNC_NOTFOUND; if ( pFuncName ) @@ -291,16 +291,16 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula, //------------------------------------------------------------------------ -xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart ) const +xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart ) const { xub_StrLen nStrLen = rStr.Len(); if ( nStrLen < nStart ) return nStart; - short nParCount = 0; + short nParCount = 0; bool bInArray = false; - BOOL bFound = FALSE; + BOOL bFound = FALSE; while ( !bFound && (nStart < nStrLen) ) { @@ -322,7 +322,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart else if ( nParCount < 0 ) { bFound = TRUE; - nStart--; // einen zu weit gelesen + nStart--; // einen zu weit gelesen } } else if ( c == arrayOpen ) @@ -338,7 +338,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart if ( !bInArray && nParCount == 0 ) { bFound = TRUE; - nStart--; // einen zu weit gelesen + nStart--; // einen zu weit gelesen } } nStart++; // hinter gefundene Position stellen @@ -356,9 +356,9 @@ xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, US if ( nStrLen < nStart ) return nStart; - short nParCount = 0; + short nParCount = 0; bool bInArray = false; - BOOL bFound = FALSE; + BOOL bFound = FALSE; while ( !bFound && (nStart < nStrLen) ) { diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc index bb9e2a5a2ad5..9e6378a53d2c 100644 --- a/formula/source/ui/dlg/formdlgs.hrc +++ b/formula/source/ui/dlg/formdlgs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,55 +26,55 @@ ************************************************************************/ -#define FT_RESULT 1 -#define WND_RESULT 2 -#define FT_EDITNAME 3 -#define STR_TITLE1 4 -#define STR_TITLE2 5 -#define BTN_HELP 6 -#define BTN_CANCEL 7 -#define BTN_BACKWARD 8 -#define BTN_FORWARD 9 -#define BTN_END 10 -#define BTN_MATRIX 11 -#define FT_FUNCNAME 12 -#define FT_FUNCDESC 13 -#define FT_HEADLINE 14 -#define GB_EDIT 15 -#define FT_FORMULA 16 -#define ED_FORMULA 17 -#define TC_FUNCTION 18 -#define ED_REF 19 -#define RB_REF 20 -#define FT_FORMULA_RESULT 21 -#define WND_FORMULA_RESULT 22 -#define STR_END 23 +#define FT_RESULT 1 +#define WND_RESULT 2 +#define FT_EDITNAME 3 +#define STR_TITLE1 4 +#define STR_TITLE2 5 +#define BTN_HELP 6 +#define BTN_CANCEL 7 +#define BTN_BACKWARD 8 +#define BTN_FORWARD 9 +#define BTN_END 10 +#define BTN_MATRIX 11 +#define FT_FUNCNAME 12 +#define FT_FUNCDESC 13 +#define FT_HEADLINE 14 +#define GB_EDIT 15 +#define FT_FORMULA 16 +#define ED_FORMULA 17 +#define TC_FUNCTION 18 +#define ED_REF 19 +#define RB_REF 20 +#define FT_FORMULA_RESULT 21 +#define WND_FORMULA_RESULT 22 +#define STR_END 23 // Fuer Tabpage -#define TP_FUNCTION 1 -#define TP_STRUCT 2 +#define TP_FUNCTION 1 +#define TP_STRUCT 2 // Funktions-Tabpage -#define FT_FUNCTION 1 -#define FT_CATEGORY 2 -#define LB_CATEGORY 3 -#define LB_FUNCTION 4 +#define FT_FUNCTION 1 +#define FT_CATEGORY 2 +#define LB_CATEGORY 3 +#define LB_FUNCTION 4 // Struktur-Tabpage -#define FT_STRUCT 1 -#define TLB_STRUCT 2 +#define FT_STRUCT 1 +#define TLB_STRUCT 2 // Bitmaps -#define BMP_STR_CLOSE 1 -#define BMP_STR_OPEN 2 -#define BMP_STR_END 3 -#define BMP_STR_ERROR 4 +#define BMP_STR_CLOSE 1 +#define BMP_STR_OPEN 2 +#define BMP_STR_END 3 +#define BMP_STR_ERROR 4 #define BMP_STR_CLOSE_H 11 #define BMP_STR_OPEN_H 12 #define BMP_STR_END_H 13 #define BMP_STR_ERROR_H 14 // Texte -#define STR_STRUCT_ERR1 1 -#define STR_STRUCT_ERR2 2 +#define STR_STRUCT_ERR1 1 +#define STR_STRUCT_ERR2 2 diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src index 8ea9545c09a1..c85aa561ced8 100644 --- a/formula/source/ui/dlg/formdlgs.src +++ b/formula/source/ui/dlg/formdlgs.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ TabPage RID_FORMULATAB_FUNCTION Hide = TRUE ; Size = MAP_APPFONT ( 96 , 180 ) ; HelpId = HID_FORMULATAB_FUNCTION ; - // Titel wird dynamisch gesetzt (s.u.) - // 1. Seite + // Titel wird dynamisch gesetzt (s.u.) + // 1. Seite ListBox LB_CATEGORY { HelpId = HID_FORMULA_LB_CATEGORY; @@ -51,17 +51,17 @@ TabPage RID_FORMULATAB_FUNCTION < "Last Used" ; Default ; > ; < "All" ; Default ; > ; }; - // < "Database" ; Default ; > ; - // < "Date&Time" ; Default ; > ; - // < "Financial" ; Default ; > ; - // < "Information" ; Default ; > ; - // < "Logical" ; Default ; > ; - // < "Mathematical" ; Default ; > ; - // < "Array" ; Default ; > ; - // < "Statistical" ; Default ; > ; - // < "Spreadsheet" ; Default ; > ; - // < "Text" ; Default ; > ; - // < "Add-in" ; Default ; > ; + // < "Database" ; Default ; > ; + // < "Date&Time" ; Default ; > ; + // < "Financial" ; Default ; > ; + // < "Information" ; Default ; > ; + // < "Logical" ; Default ; > ; + // < "Mathematical" ; Default ; > ; + // < "Array" ; Default ; > ; + // < "Statistical" ; Default ; > ; + // < "Spreadsheet" ; Default ; > ; + // < "Text" ; Default ; > ; + // < "Add-in" ; Default ; > ; //}; }; ListBox LB_FUNCTION @@ -90,8 +90,8 @@ TabPage RID_FORMULATAB_STRUCT Hide = TRUE ; Size = MAP_APPFONT ( 96 , 180 ) ; HelpId = HID_FORMULATAB_STRUCT ; - // Titel wird dynamisch gesetzt (s.u.) - // 1. Seite + // Titel wird dynamisch gesetzt (s.u.) + // 1. Seite Control TLB_STRUCT { Border = TRUE ; diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index caa22cd3c015..f1a97171fa11 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,35 +100,35 @@ namespace formula RefInputStartBefore( RefEdit* pEdit, RefButton* pButton ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton ); void RefInputDoneAfter( BOOL bForced ); - BOOL CalcValue( const String& rStrExp, String& rStrResult ); - BOOL CalcStruct( const String& rStrExp); - void UpdateValues(); - void DeleteArgs(); + BOOL CalcValue( const String& rStrExp, String& rStrResult ); + BOOL CalcStruct( const String& rStrExp); + void UpdateValues(); + void DeleteArgs(); xub_StrLen GetFunctionPos(xub_StrLen nPos); - void ClearAllParas(); + void ClearAllParas(); void MakeTree(IStructHelper* _pTree,SvLBoxEntry* pParent,FormulaToken* _pToken,long Count); void fillTree(IStructHelper* _pTree); void UpdateTokenArray( const String& rStrExp); String RepairFormula(const String& aFormula); - void FillDialog(BOOL nFlag=TRUE); - void EditNextFunc( BOOL bForward, xub_StrLen nFStart=NOT_FOUND ); - void EditThisFunc(xub_StrLen nFStart); - void EditFuncParas(xub_StrLen nEditPos); + void FillDialog(BOOL nFlag=TRUE); + void EditNextFunc( BOOL bForward, xub_StrLen nFStart=NOT_FOUND ); + void EditThisFunc(xub_StrLen nFStart); + void EditFuncParas(xub_StrLen nEditPos); - void UpdateArgInput( USHORT nOffset, USHORT nInput ); - void Update(); + void UpdateArgInput( USHORT nOffset, USHORT nInput ); + void Update(); void Update(const String& _sExp); - void SaveArg( USHORT nEd ); - void UpdateSelection(); - void DoEnter( BOOL bOk ); - void UpdateFunctionDesc(); - void ResizeArgArr( const IFunctionDescription* pNewFunc ); - void FillListboxes(); - void FillControls(BOOL &rbNext, BOOL &rbPrev); + void SaveArg( USHORT nEd ); + void UpdateSelection(); + void DoEnter( BOOL bOk ); + void UpdateFunctionDesc(); + void ResizeArgArr( const IFunctionDescription* pNewFunc ); + void FillListboxes(); + void FillControls(BOOL &rbNext, BOOL &rbPrev); FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); void SetMeText(const String& _sText); @@ -179,71 +179,71 @@ namespace formula IFormulaEditorHelper* m_pHelper; Dialog* m_pParent; IControlReferenceHandler* m_pDlg; - TabControl aTabCtrl; - GroupBox aGEdit; //! MUST be placed before pParaWin for initializing - ParaWin* pParaWin; - FixedText aFtHeadLine; - FixedInfo aFtFuncName; - FixedInfo aFtFuncDesc; - - FixedText aFtEditName; - //FixedInfo aFtEditDesc; - - FixedText aFtResult; - ValWnd aWndResult; - - FixedText aFtFormula; - EditBox aMEFormula; - - CheckBox aBtnMatrix; - HelpButton aBtnHelp; - CancelButton aBtnCancel; - - PushButton aBtnBackward; - PushButton aBtnForward; - OKButton aBtnEnd; - - RefEdit aEdRef; - RefButton aRefBtn; - - FixedText aFtFormResult; - ValWnd aWndFormResult; - - RefEdit* pTheRefEdit; - RefButton* pTheRefButton; - FuncPage* pFuncPage; - StructPage* pStructPage; - String aOldFormula; - BOOL bStructUpdate; + TabControl aTabCtrl; + GroupBox aGEdit; //! MUST be placed before pParaWin for initializing + ParaWin* pParaWin; + FixedText aFtHeadLine; + FixedInfo aFtFuncName; + FixedInfo aFtFuncDesc; + + FixedText aFtEditName; + //FixedInfo aFtEditDesc; + + FixedText aFtResult; + ValWnd aWndResult; + + FixedText aFtFormula; + EditBox aMEFormula; + + CheckBox aBtnMatrix; + HelpButton aBtnHelp; + CancelButton aBtnCancel; + + PushButton aBtnBackward; + PushButton aBtnForward; + OKButton aBtnEnd; + + RefEdit aEdRef; + RefButton aRefBtn; + + FixedText aFtFormResult; + ValWnd aWndFormResult; + + RefEdit* pTheRefEdit; + RefButton* pTheRefButton; + FuncPage* pFuncPage; + StructPage* pStructPage; + String aOldFormula; + BOOL bStructUpdate; MultiLineEdit* pMEdit; - BOOL bUserMatrixFlag; - Timer aTimer; + BOOL bUserMatrixFlag; + Timer aTimer; - const String aTitle1; - const String aTitle2; - const String aTxtEnd; - const String aTxtOk; // hinter aBtnEnd + const String aTitle1; + const String aTitle2; + const String aTxtEnd; + const String aTxtOk; // hinter aBtnEnd FormulaHelper m_aFormulaHelper; SmartId m_aSmartEditHelpId; - ULONG nOldHelp; - ULONG nOldUnique; - ULONG nActivWinId; - BOOL bIsShutDown; + ULONG nOldHelp; + ULONG nOldUnique; + ULONG nActivWinId; + BOOL bIsShutDown; - Font aFntBold; - Font aFntLight; - USHORT nEdFocus; + Font aFntBold; + Font aFntLight; + USHORT nEdFocus; // Selection theCurSel; - BOOL bEditFlag; - const IFunctionDescription* pFuncDesc; - xub_StrLen nArgs; + BOOL bEditFlag; + const IFunctionDescription* pFuncDesc; + xub_StrLen nArgs; ::std::vector< ::rtl::OUString > m_aArguments; - Selection aFuncSel; + Selection aFuncSel; FormulaDlg_Impl(Dialog* pParent , bool _bSupportFunctionResult @@ -266,45 +266,45 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent m_pHelper (_pHelper), m_pParent (pParent), m_pDlg (_pDlg), - aTabCtrl ( pParent, ModuleRes( TC_FUNCTION ) ), - aGEdit ( pParent, ModuleRes( GB_EDIT ) ), - aFtHeadLine ( pParent, ModuleRes( FT_HEADLINE ) ), - aFtFuncName ( pParent, ModuleRes( FT_FUNCNAME ) ), - aFtFuncDesc ( pParent, ModuleRes( FT_FUNCDESC ) ), + aTabCtrl ( pParent, ModuleRes( TC_FUNCTION ) ), + aGEdit ( pParent, ModuleRes( GB_EDIT ) ), + aFtHeadLine ( pParent, ModuleRes( FT_HEADLINE ) ), + aFtFuncName ( pParent, ModuleRes( FT_FUNCNAME ) ), + aFtFuncDesc ( pParent, ModuleRes( FT_FUNCDESC ) ), // - aFtEditName ( pParent, ModuleRes( FT_EDITNAME ) ), - aFtResult ( pParent, ModuleRes( FT_RESULT ) ), - aWndResult ( pParent, ModuleRes( WND_RESULT ) ), + aFtEditName ( pParent, ModuleRes( FT_EDITNAME ) ), + aFtResult ( pParent, ModuleRes( FT_RESULT ) ), + aWndResult ( pParent, ModuleRes( WND_RESULT ) ), - aFtFormula ( pParent, ModuleRes( FT_FORMULA ) ), - aMEFormula ( pParent, ModuleRes( ED_FORMULA ) ), + aFtFormula ( pParent, ModuleRes( FT_FORMULA ) ), + aMEFormula ( pParent, ModuleRes( ED_FORMULA ) ), // - aBtnMatrix ( pParent, ModuleRes( BTN_MATRIX ) ), - aBtnHelp ( pParent, ModuleRes( BTN_HELP ) ), - aBtnCancel ( pParent, ModuleRes( BTN_CANCEL ) ), - aBtnBackward ( pParent, ModuleRes( BTN_BACKWARD ) ), - aBtnForward ( pParent, ModuleRes( BTN_FORWARD ) ), - aBtnEnd ( pParent, ModuleRes( BTN_END ) ), - aEdRef ( pParent, _pDlg, ModuleRes( ED_REF) ), - aRefBtn ( pParent, ModuleRes( RB_REF),&aEdRef,_pDlg ), - aFtFormResult ( pParent, ModuleRes( FT_FORMULA_RESULT)), - aWndFormResult ( pParent, ModuleRes( WND_FORMULA_RESULT)), + aBtnMatrix ( pParent, ModuleRes( BTN_MATRIX ) ), + aBtnHelp ( pParent, ModuleRes( BTN_HELP ) ), + aBtnCancel ( pParent, ModuleRes( BTN_CANCEL ) ), + aBtnBackward ( pParent, ModuleRes( BTN_BACKWARD ) ), + aBtnForward ( pParent, ModuleRes( BTN_FORWARD ) ), + aBtnEnd ( pParent, ModuleRes( BTN_END ) ), + aEdRef ( pParent, _pDlg, ModuleRes( ED_REF) ), + aRefBtn ( pParent, ModuleRes( RB_REF),&aEdRef,_pDlg ), + aFtFormResult ( pParent, ModuleRes( FT_FORMULA_RESULT)), + aWndFormResult ( pParent, ModuleRes( WND_FORMULA_RESULT)), // - pTheRefEdit (NULL), - pMEdit (NULL), - bUserMatrixFlag (FALSE), + pTheRefEdit (NULL), + pMEdit (NULL), + bUserMatrixFlag (FALSE), // - aTitle1 ( ModuleRes( STR_TITLE1 ) ), // lokale Resource - aTitle2 ( ModuleRes( STR_TITLE2 ) ), // lokale Resource - aTxtEnd ( ModuleRes( STR_END ) ), // lokale Resource - aTxtOk ( aBtnEnd.GetText() ), + aTitle1 ( ModuleRes( STR_TITLE1 ) ), // lokale Resource + aTitle2 ( ModuleRes( STR_TITLE2 ) ), // lokale Resource + aTxtEnd ( ModuleRes( STR_END ) ), // lokale Resource + aTxtOk ( aBtnEnd.GetText() ), m_aFormulaHelper(_pFunctionMgr), // - nActivWinId (0), - bIsShutDown (FALSE), - nEdFocus (0), - pFuncDesc (NULL), - nArgs (0) + nActivWinId (0), + bIsShutDown (FALSE), + nEdFocus (0), + pFuncDesc (NULL), + nArgs (0) { pParaWin = new ParaWin( pParent,_pDlg, aGEdit.GetPosPixel()); aGEdit.Hide(); @@ -331,7 +331,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage); aTabCtrl.SetTabPage( TP_STRUCT, pStructPage); - nOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" + nOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" nOldUnique = pParent->GetUniqueId(); aFtResult.Show( _bSupportResult ); @@ -345,9 +345,9 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent else aBtnMatrix.Hide(); - aBtnCancel .SetClickHdl( LINK( this, FormulaDlg_Impl, BtnHdl ) ); - aBtnEnd .SetClickHdl( LINK( this, FormulaDlg_Impl, BtnHdl ) ); - aBtnForward .SetClickHdl( LINK( this, FormulaDlg_Impl, BtnHdl ) ); + aBtnCancel .SetClickHdl( LINK( this, FormulaDlg_Impl, BtnHdl ) ); + aBtnEnd .SetClickHdl( LINK( this, FormulaDlg_Impl, BtnHdl ) ); + aBtnForward .SetClickHdl( LINK( this, FormulaDlg_Impl, BtnHdl ) ); aBtnBackward.SetClickHdl( LINK( this, FormulaDlg_Impl, BtnHdl ) ); pFuncPage->SetDoubleClickHdl( LINK( this, FormulaDlg_Impl, DblClkHdl ) ); @@ -363,7 +363,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent pParaWin->SetArgumentFonts(aFntBold,aFntLight); - // function description for choosing a function is no longer in a different color + // function description for choosing a function is no longer in a different color aFtHeadLine.SetFont(aFntBold); aFtFuncName.SetFont(aFntLight); @@ -797,10 +797,10 @@ void FormulaDlg_Impl::FillDialog(BOOL nFlag) // ----------------------------------------------------------------------------- void FormulaDlg_Impl::FillListboxes() { - // Umschalten zwischen den "Seiten" + // Umschalten zwischen den "Seiten" FormEditData* pData = m_pHelper->getFormEditData(); String aNewTitle; - // 1. Seite: Funktion auswaehlen + // 1. Seite: Funktion auswaehlen if ( pFuncDesc && pFuncDesc->getCategory() ) { if( pFuncPage->GetCategory() != pFuncDesc->getCategory()->getNumber() + 1 ) @@ -817,30 +817,30 @@ void FormulaDlg_Impl::FillListboxes() } FuncSelHdl(NULL); - // ResizeArgArr jetzt schon in UpdateFunctionDesc + // ResizeArgArr jetzt schon in UpdateFunctionDesc m_pHelper->setDispatcherLock( TRUE);// Modal-Modus einschalten aNewTitle = aTitle1; - // HelpId fuer 1. Seite ist die aus der Resource + // HelpId fuer 1. Seite ist die aus der Resource m_pParent->SetHelpId( nOldHelp ); m_pParent->SetUniqueId( nOldUnique ); } // ----------------------------------------------------------------------------- void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) { - // Umschalten zwischen den "Seiten" + // Umschalten zwischen den "Seiten" FormEditData* pData = m_pHelper->getFormEditData(); if (!pData ) return; String aNewTitle; - // 2. Seite oder Editieren: ausgewaehlte Funktion anzeigen + // 2. Seite oder Editieren: ausgewaehlte Funktion anzeigen - xub_StrLen nFStart = pData->GetFStart(); - String aFormula = m_pHelper->getCurrentFormula(); + xub_StrLen nFStart = pData->GetFStart(); + String aFormula = m_pHelper->getCurrentFormula(); xub_StrLen nNextFStart = nFStart; xub_StrLen nNextFEnd = 0; @@ -887,14 +887,14 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) USHORT nOffset = pData->GetOffset(); nEdFocus = pData->GetEdFocus(); - // Verkettung der Edit's fuer Focus-Kontrolle + // Verkettung der Edit's fuer Focus-Kontrolle if(bTestFlag) pParaWin->SetArgumentOffset(nOffset); USHORT nActiv=0; xub_StrLen nArgPos= m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); xub_StrLen nEditPos=(xub_StrLen) pMEdit->GetSelection().Min(); - BOOL bFlag=FALSE; + BOOL bFlag=FALSE; for(USHORT i=0;i<nArgs;i++) { @@ -922,7 +922,7 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) aFtEditName.SetText(String()); pMEdit->SetSmartHelpId(m_aSmartEditHelpId); } - // Test, ob vorne/hinten noch mehr Funktionen sind + // Test, ob vorne/hinten noch mehr Funktionen sind xub_StrLen nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); rbNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart ); @@ -979,12 +979,12 @@ String FormulaDlg_Impl::RepairFormula(const String& aFormula) void FormulaDlg_Impl::DoEnter(BOOL bOk) { - // Eingabe ins Dokument uebernehmen oder abbrechen + // Eingabe ins Dokument uebernehmen oder abbrechen if ( bOk) { - // ggf. Dummy-Argumente entfernen - String aInputFormula = m_pHelper->getCurrentFormula(); - String aString = RepairFormula(pMEdit->GetText()); + // ggf. Dummy-Argumente entfernen + String aInputFormula = m_pHelper->getCurrentFormula(); + String aString = RepairFormula(pMEdit->GetText()); m_pHelper->setSelection(0, aInputFormula.Len()); m_pHelper->setCurrentFormula(aString); } @@ -992,10 +992,10 @@ void FormulaDlg_Impl::DoEnter(BOOL bOk) m_pHelper->switchBack(); m_pHelper->dispatch(bOk,aBtnMatrix.IsChecked()); - // Daten loeschen + // Daten loeschen m_pHelper->deleteFormData(); - // Dialog schliessen + // Dialog schliessen m_pHelper->doClose(bOk); } // ----------------------------------------------------------------------------- @@ -1004,22 +1004,22 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) { if ( pBtn == &aBtnCancel ) { - DoEnter(FALSE); // schliesst den Dialog + DoEnter(FALSE); // schliesst den Dialog } else if ( pBtn == &aBtnEnd ) { - DoEnter(TRUE); // schliesst den Dialog + DoEnter(TRUE); // schliesst den Dialog } else if ( pBtn == &aBtnForward ) { - //@pMEdit->GrabFocus(); // Damit die Selektion auch angezeigt wird. + //@pMEdit->GrabFocus(); // Damit die Selektion auch angezeigt wird. const IFunctionDescription* pDesc =pFuncPage->GetFuncDesc( pFuncPage->GetFunction() ); if(pDesc==pFuncDesc || !pFuncPage->IsVisible()) EditNextFunc( TRUE ); else { - DblClkHdl(pFuncPage); //new + DblClkHdl(pFuncPage); //new aBtnForward.Enable(FALSE); //new } //@EditNextFunc( TRUE ); @@ -1039,9 +1039,9 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) // ----------------------------------------------------------------------------- -// -------------------------------------------------------------------------- -// Funktionen fuer 1. Seite -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Funktionen fuer 1. Seite +// -------------------------------------------------------------------------- void FormulaDlg_Impl::ResizeArgArr( const IFunctionDescription* pNewFunc ) { @@ -1085,8 +1085,8 @@ void FormulaDlg_Impl::UpdateFunctionDesc() aFtFuncDesc.SetText( pDesc->getDescription() ); ResizeArgArr( pDesc ); - if ( !m_aArguments.empty() ) // noch Argumente da? - aSig = pDesc->getFormula( m_aArguments ); // fuer Eingabezeile + if ( !m_aArguments.empty() ) // noch Argumente da? + aSig = pDesc->getFormula( m_aArguments ); // fuer Eingabezeile //@ m_pHelper->setCurrentFormula( aSig ); } } @@ -1107,8 +1107,8 @@ IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG ) { USHORT nFunc = pFuncPage->GetFunction(); - // ex-UpdateLRUList - const IFunctionDescription* pDesc = pFuncPage->GetFuncDesc(nFunc); + // ex-UpdateLRUList + const IFunctionDescription* pDesc = pFuncPage->GetFuncDesc(nFunc); m_pHelper->insertEntryToLRUList(pDesc); String aFuncName = pFuncPage->GetSelFunctionName(); @@ -1137,9 +1137,9 @@ IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG ) } // ----------------------------------------------------------------------------- -// -------------------------------------------------------------------------- -// Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Funktionen fuer rechte Seite +// -------------------------------------------------------------------------- void FormulaDlg_Impl::SetData(xub_StrLen nFStart,xub_StrLen nNextFStart,xub_StrLen nNextFEnd,xub_StrLen& PrivStart,xub_StrLen& PrivEnd) { xub_StrLen nFEnd; @@ -1182,8 +1182,8 @@ void FormulaDlg_Impl::EditThisFunc(xub_StrLen nFStart) pData->SetFStart(nFStart); } - xub_StrLen nNextFStart = nFStart; - xub_StrLen nNextFEnd = 0; + xub_StrLen nNextFStart = nFStart; + xub_StrLen nNextFEnd = 0; BOOL bFound; @@ -1219,19 +1219,19 @@ void FormulaDlg_Impl::EditNextFunc( BOOL bForward, xub_StrLen nFStart ) pData->SetFStart(nFStart); } - xub_StrLen nNextFStart = 0; - xub_StrLen nNextFEnd = 0; + xub_StrLen nNextFStart = 0; + xub_StrLen nNextFEnd = 0; BOOL bFound; if ( bForward ) { - nNextFStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); + nNextFStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); //@bFound = m_pHelper->getNextFunction( aFormula, FALSE, nNextFStart, &nNextFEnd, &pFuncDesc ); bFound = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nNextFStart, &nNextFEnd); } else { - nNextFStart = nFStart; + nNextFStart = nFStart; //@bFound = m_pHelper->getNextFunction( aFormula, TRUE, nNextFStart, &nNextFEnd, &pFuncDesc ); bFound = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nNextFStart, &nNextFEnd); } @@ -1260,10 +1260,10 @@ void FormulaDlg_Impl::EditFuncParas(xub_StrLen nEditPos) sal_Int32 nArgPos=m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); m_aFormulaHelper.GetArgStrings(m_aArguments,aFormula, nFStart, nArgs ); -// m_aArguments = ScFormulaUtil::GetArgStrings( aFormula, nFStart, nArgs ); +// m_aArguments = ScFormulaUtil::GetArgStrings( aFormula, nFStart, nArgs ); USHORT nActiv=pParaWin->GetSliderPos(); - BOOL bFlag=FALSE; + BOOL bFlag=FALSE; ::std::vector< ::rtl::OUString >::iterator aIter = m_aArguments.begin(); ::std::vector< ::rtl::OUString >::iterator aEnd = m_aArguments.end(); for(USHORT i=0;aIter != aEnd;i++,++aIter) @@ -1325,7 +1325,7 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin*, pPtr ) aBtnForward.Enable(TRUE); //@ Damit eine neue Fkt eingegeben werden kann. aTabCtrl.SetCurPageId(TP_FUNCTION); - String aUndoStr = m_pHelper->getCurrentFormula(); // bevor unten ein ";" eingefuegt wird + String aUndoStr = m_pHelper->getCurrentFormula(); // bevor unten ein ";" eingefuegt wird FormEditData* pData = m_pHelper->getFormEditData(); if (!pData) return 0; @@ -1373,10 +1373,10 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG ) if (!pData) return 0; bEditFlag=TRUE; - String aInputFormula=m_pHelper->getCurrentFormula(); - String aString=pMEdit->GetText(); + String aInputFormula=m_pHelper->getCurrentFormula(); + String aString=pMEdit->GetText(); - Selection aSel =pMEdit->GetSelection(); + Selection aSel =pMEdit->GetSelection(); xub_StrLen nTest=0; if(aString.Len()==0) //falls alles geloescht wurde @@ -1439,10 +1439,10 @@ IMPL_LINK( FormulaDlg_Impl, FormulaCursorHdl, EditBox*, EMPTYARG ) bEditFlag=TRUE; - String aInputFormula=m_pHelper->getCurrentFormula(); - String aString=pMEdit->GetText(); + String aInputFormula=m_pHelper->getCurrentFormula(); + String aString=pMEdit->GetText(); - Selection aSel =pMEdit->GetSelection(); + Selection aSel =pMEdit->GetSelection(); m_pHelper->setSelection((xub_StrLen)aSel.Min(),(xub_StrLen)aSel.Max()); if(aSel.Min()==0) @@ -1651,7 +1651,7 @@ BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula) { pMEdit->GrabFocus(); xub_StrLen nLen = aFormula.Len(); - BOOL bMatrix = nLen > 3 // Matrix-Formel ? + BOOL bMatrix = nLen > 3 // Matrix-Formel ? && aFormula.GetChar(0) == '{' && aFormula.GetChar(1) == '=' && aFormula.GetChar(nLen-1) == '}'; @@ -1669,7 +1669,7 @@ BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula) IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, pStruP ) { bStructUpdate=FALSE; - if(pStructPage->IsVisible()) aBtnForward.Enable(FALSE); //@New + if(pStructPage->IsVisible()) aBtnForward.Enable(FALSE); //@New if(pStructPage==pStruP) { @@ -1681,28 +1681,28 @@ IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, pStruP ) //if(pScTokA!=NULL) //{ - // ScToken* pToken = pScTokA->First(); + // ScToken* pToken = pScTokA->First(); - // while(pToken!=NULL) - // { - // String aString; + // while(pToken!=NULL) + // { + // String aString; // if ( pToken == pOrigToken ) // break; - // pComp->CreateStringFromToken( aString,pToken); + // pComp->CreateStringFromToken( aString,pToken); // nTokPos = sal::static_int_cast<xub_StrLen>( nTokPos + aString.Len() ); - // pToken=pScTokA->Next(); - // } - // EditThisFunc(nTokPos); + // pToken=pScTokA->Next(); + // } + // EditThisFunc(nTokPos); //} //if( pOrigToken ) //{ - // String aStr; - // pComp->CreateStringFromToken( aStr, pOrigToken ); - // String aEntryTxt=pStructPage->GetSelectedEntryText(); + // String aStr; + // pComp->CreateStringFromToken( aStr, pOrigToken ); + // String aEntryTxt=pStructPage->GetSelectedEntryText(); - // if(aEntryTxt!=aStr) - // ShowReference(aEntryTxt); + // if(aEntryTxt!=aStr) + // ShowReference(aEntryTxt); //} } @@ -1772,7 +1772,7 @@ BOOL FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection) { pParaWin->SetRefMode(TRUE); - String aStrEd; + String aStrEd; Edit* pEd = GetCurrRefEdit(); if(pEd!=NULL && pTheRefEdit==NULL) { @@ -1829,8 +1829,8 @@ void FormulaDlg_Impl::SetEdSelection() if( pEd ) { Selection theSel = aEdRef.GetSelection(); - // Edit may have the focus -> call ModifyHdl in addition - // to what's happening in GetFocus + // Edit may have the focus -> call ModifyHdl in addition + // to what's happening in GetFocus pEd->GetModifyHdl().Call(pEd); pEd->GrabFocus(); pEd->SetSelection(theSel); @@ -1966,7 +1966,7 @@ void FormulaModalDialog::disableOk() m_pImpl->aBtnEnd.Disable(); } // ----------------------------------------------------------------------------- -const IFunctionDescription* FormulaModalDialog::getCurrentFunctionDescription() const +const IFunctionDescription* FormulaModalDialog::getCurrentFunctionDescription() const { OSL_VERIFY(!m_pImpl->pFuncDesc || m_pImpl->pFuncDesc->getSuppressedArgumentCount() == m_pImpl->nArgs); return m_pImpl->pFuncDesc; @@ -1981,7 +1981,7 @@ BOOL FormulaModalDialog::UpdateParaWin(Selection& _rSelection) return m_pImpl->UpdateParaWin(_rSelection); } // ----------------------------------------------------------------------------- -RefEdit* FormulaModalDialog::GetActiveEdit() +RefEdit* FormulaModalDialog::GetActiveEdit() { return m_pImpl->pParaWin->GetActiveEdit(); } @@ -1991,9 +1991,9 @@ void FormulaModalDialog::SetEdSelection() m_pImpl->SetEdSelection(); } -// -------------------------------------------------------------------------- -// Initialisierung / gemeinsaME Funktionen fuer Dialog -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Initialisierung / gemeinsaME Funktionen fuer Dialog +// -------------------------------------------------------------------------- FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent , bool _bSupportFunctionResult @@ -2007,8 +2007,8 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, ,_pHelper,_pFunctionMgr,_pDlg)) { FreeResource(); - if(GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId - SetHelpId(GetUniqueId()); //fuer einen ModelessDialog entfernt und + if(GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId + SetHelpId(GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. SetText(m_pImpl->aTitle1); @@ -2120,7 +2120,7 @@ void FormulaDlg::disableOk() m_pImpl->aBtnEnd.Disable(); } // ----------------------------------------------------------------------------- -const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const +const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const { OSL_VERIFY(!m_pImpl->pFuncDesc || m_pImpl->pFuncDesc->getSuppressedArgumentCount() == m_pImpl->nArgs); return m_pImpl->pFuncDesc; @@ -2135,7 +2135,7 @@ BOOL FormulaDlg::UpdateParaWin(Selection& _rSelection) return m_pImpl->UpdateParaWin(_rSelection); } // ----------------------------------------------------------------------------- -RefEdit* FormulaDlg::GetActiveEdit() +RefEdit* FormulaDlg::GetActiveEdit() { return m_pImpl->pParaWin->GetActiveEdit(); } @@ -2177,11 +2177,11 @@ void FormEditData::Reset() pParent = NULL; nMode = 0; nFStart = 0; - nCatSel = 1; //! oder 0 (zuletzt benutzte) + nCatSel = 1; //! oder 0 (zuletzt benutzte) nFuncSel = 0; nOffset = 0; nEdFocus = 0; - bMatrix =FALSE; + bMatrix =FALSE; nUniqueId=0; aSelection.Min()=0; aSelection.Max()=0; @@ -2195,24 +2195,24 @@ void FormEditData::RestoreValues() if (pTemp) { *this = *pTemp; - pTemp->pParent = NULL; // sonst wird der auch geloescht! + pTemp->pParent = NULL; // sonst wird der auch geloescht! delete pTemp; } } // ----------------------------------------------------------------------------- const FormEditData& FormEditData::operator=( const FormEditData& r ) { - pParent = r.pParent; - nMode = r.nMode; - nFStart = r.nFStart; - nCatSel = r.nCatSel; - nFuncSel = r.nFuncSel; - nOffset = r.nOffset; - nEdFocus = r.nEdFocus; - aUndoStr = r.aUndoStr; - bMatrix = r.bMatrix ; - nUniqueId = r.nUniqueId; - aSelection = r.aSelection; + pParent = r.pParent; + nMode = r.nMode; + nFStart = r.nFStart; + nCatSel = r.nCatSel; + nFuncSel = r.nFuncSel; + nOffset = r.nOffset; + nEdFocus = r.nEdFocus; + aUndoStr = r.aUndoStr; + bMatrix = r.bMatrix ; + nUniqueId = r.nUniqueId; + aSelection = r.aSelection; return *this; } // ----------------------------------------------------------------------------- diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 1da4aef269a8..3633afa29316 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,10 +95,10 @@ inline USHORT Lb2Cat( USHORT nLbPos ) FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager): TabPage(pParent,ModuleRes(RID_FORMULATAB_FUNCTION)), // - aFtCategory ( this, ModuleRes( FT_CATEGORY ) ), - aLbCategory ( this, ModuleRes( LB_CATEGORY ) ), - aFtFunction ( this, ModuleRes( FT_FUNCTION ) ), - aLbFunction ( this, ModuleRes( LB_FUNCTION ) ), + aFtCategory ( this, ModuleRes( FT_CATEGORY ) ), + aLbCategory ( this, ModuleRes( LB_CATEGORY ) ), + aFtFunction ( this, ModuleRes( FT_FUNCTION ) ), + aLbFunction ( this, ModuleRes( LB_FUNCTION ) ), m_pFunctionManager(_pFunctionManager) { FreeResource(); @@ -113,7 +113,7 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager): const IFunctionCategory* pCategory = m_pFunctionManager->getCategory(j); aLbCategory.SetEntryData(aLbCategory.InsertEntry(pCategory->getName()),(void*)pCategory); } - + aLbCategory.SelectEntryPos(1); UpdateFunctionList(); aLbCategory.SetSelectHdl( LINK( this, FuncPage, SelHdl ) ); @@ -134,9 +134,9 @@ void FuncPage::impl_addFunctions(const IFunctionCategory* _pCategory) void FuncPage::UpdateFunctionList() { - USHORT nSelPos = aLbCategory.GetSelectEntryPos(); + USHORT nSelPos = aLbCategory.GetSelectEntryPos(); const IFunctionCategory* pCategory = static_cast<const IFunctionCategory*>(aLbCategory.GetEntryData(nSelPos)); - USHORT nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos ) + USHORT nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos ) ? Lb2Cat( nSelPos ) : 0; (void)nCategory; @@ -180,7 +180,7 @@ void FuncPage::UpdateFunctionList() aLbFunction.SetUpdateMode( TRUE ); aLbFunction.SelectEntryPos(0); - if(IsVisible()) SelHdl(&aLbFunction); + if(IsVisible()) SelHdl(&aLbFunction); } IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) @@ -248,7 +248,7 @@ String FuncPage::GetSelFunctionName() const { return aLbFunction.GetSelectEntry(); } -const IFunctionDescription* FuncPage::GetFuncDesc( USHORT nPos ) const +const IFunctionDescription* FuncPage::GetFuncDesc( USHORT nPos ) const { // nicht schoen, aber hoffentlich selten return (const IFunctionDescription*) aLbFunction.GetEntryData(nPos); diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 77b32f495c64..09f77cc81019 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,8 +54,8 @@ class FormulaListBox : public ListBox { protected: - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); public: FormulaListBox( Window* pParent, WinBits nWinStyle = WB_BORDER ); @@ -72,16 +72,16 @@ class FuncPage : public TabPage { private: OModuleClient m_aModuleClient; - Link aDoubleClickLink; - Link aSelectionLink; - FixedText aFtCategory; - ListBox aLbCategory; - FixedText aFtFunction; + Link aDoubleClickLink; + Link aSelectionLink; + FixedText aFtCategory; + ListBox aLbCategory; + FixedText aFtFunction; FormulaListBox aLbFunction; - const IFunctionManager* + const IFunctionManager* m_pFunctionManager; - ::std::vector< TFunctionDesc > aLRUList; + ::std::vector< TFunctionDesc > aLRUList; SmartId m_aSmartHelpId; @@ -91,24 +91,24 @@ private: protected: - void UpdateFunctionList(); - void InitLRUList(); + void UpdateFunctionList(); + void InitLRUList(); public: FuncPage( Window* pParent,const IFunctionManager* _pFunctionManager); - void SetCategory(USHORT nCat); - void SetFunction(USHORT nFunc); - void SetFocus(); - USHORT GetCategory(); - USHORT GetFunction(); - USHORT GetFunctionEntryCount(); + void SetCategory(USHORT nCat); + void SetFunction(USHORT nFunc); + void SetFocus(); + USHORT GetCategory(); + USHORT GetFunction(); + USHORT GetFunctionEntryCount(); USHORT GetFuncPos(const IFunctionDescription* _pDesc); - const IFunctionDescription* GetFuncDesc( USHORT nPos ) const; - String GetSelFunctionName() const; + const IFunctionDescription* GetFuncDesc( USHORT nPos ) const; + String GetSelFunctionName() const; void SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; } const Link& GetDoubleClickHdl() const { return aDoubleClickLink; } diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 6298e94c4ba0..4ba8d87c139b 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,8 +89,8 @@ void ValWnd::SetValue( const String& rStrVal ) if ( aStrValue != rStrVal ) { aStrValue = rStrVal; - DrawRect( aRectOut ); // alten Text loeschen - Paint( aRectOut ); // und neu malen + DrawRect( aRectOut ); // alten Text loeschen + Paint( aRectOut ); // und neu malen } } @@ -99,11 +99,11 @@ void ValWnd::SetValue( const String& rStrVal ) //---------------------------------------------------------------------------- ArgEdit::ArgEdit( Window* pParent, const ResId& rResId ) - : RefEdit( pParent, rResId ), - pEdPrev ( NULL ), - pEdNext ( NULL ), - pSlider ( NULL ), - nArgs ( 0 ) + : RefEdit( pParent, rResId ), + pEdPrev ( NULL ), + pEdNext ( NULL ), + pSlider ( NULL ), + nArgs ( 0 ) { } @@ -112,10 +112,10 @@ ArgEdit::ArgEdit( Window* pParent, const ResId& rResId ) void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, ScrollBar& rArgSlider, USHORT nArgCount ) { - pEdPrev = pPrevEdit; - pEdNext = pNextEdit; + pEdPrev = pPrevEdit; + pEdNext = pNextEdit; pSlider = &rArgSlider; - nArgs = nArgCount; + nArgs = nArgCount; } //---------------------------------------------------------------------------- @@ -124,10 +124,10 @@ void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aCode = rKEvt.GetKeyCode(); - BOOL bUp = (aCode.GetCode() == KEY_UP); - BOOL bDown = (aCode.GetCode() == KEY_DOWN); - ArgEdit* pEd = NULL; + KeyCode aCode = rKEvt.GetKeyCode(); + BOOL bUp = (aCode.GetCode() == KEY_UP); + BOOL bDown = (aCode.GetCode() == KEY_DOWN); + ArgEdit* pEd = NULL; if ( pSlider && ( !aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() ) @@ -135,9 +135,9 @@ void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt ) { if ( nArgs > 1 ) { - long nThumb = pSlider->GetThumbPos(); - BOOL bDoScroll = FALSE; - BOOL bChangeFocus = FALSE; + long nThumb = pSlider->GetThumbPos(); + BOOL bDoScroll = FALSE; + BOOL bChangeFocus = FALSE; if ( bDown ) { @@ -205,16 +205,16 @@ void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt ) /************************************************************************* -#* Member: ArgInput Datum:13.01.97 +#* Member: ArgInput Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Konstruktor der Klasse ArgInput +#* Funktion: Konstruktor der Klasse ArgInput #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -227,23 +227,23 @@ ArgInput::ArgInput() } /************************************************************************* -#* Member: InitArgInput Datum:13.01.97 +#* Member: InitArgInput Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Initialisiert die Pointer der Klasse +#* Funktion: Initialisiert die Pointer der Klasse #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ -void ArgInput::InitArgInput(FixedText* pftArg, - ImageButton* pbtnFx, - ArgEdit* pedArg, - RefButton* prefBtn) +void ArgInput::InitArgInput(FixedText* pftArg, + ImageButton* pbtnFx, + ArgEdit* pedArg, + RefButton* prefBtn) { pFtArg =pftArg; pBtnFx =pbtnFx; @@ -269,16 +269,16 @@ void ArgInput::InitArgInput(FixedText* pftArg, } /************************************************************************* -#* Member: SetArgName Datum:13.01.97 +#* Member: SetArgName Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Setzt den Namen fuer das Argument +#* Funktion: Setzt den Namen fuer das Argument #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::SetArgName(const String &aArg) @@ -287,16 +287,16 @@ void ArgInput::SetArgName(const String &aArg) } /************************************************************************* -#* Member: GetArgName Datum:06.02.97 +#* Member: GetArgName Datum:06.02.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Liefert den Namen fuer das Argument zurueck +#* Funktion: Liefert den Namen fuer das Argument zurueck #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ String ArgInput::GetArgName() @@ -310,72 +310,72 @@ String ArgInput::GetArgName() /************************************************************************* -#* Member: SetArgName Datum:13.01.97 +#* Member: SetArgName Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Setzt den Namen fuer das Argument +#* Funktion: Setzt den Namen fuer das Argument #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ -void ArgInput::SetArgNameFont (const Font &aFont) +void ArgInput::SetArgNameFont (const Font &aFont) { if(pFtArg !=NULL) pFtArg->SetFont(aFont); } /************************************************************************* -#* Member: SetArgSelection Datum:13.01.97 +#* Member: SetArgSelection Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Stellt die Selection fuer die EditBox ein. +#* Funktion: Stellt die Selection fuer die EditBox ein. #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ -void ArgInput::SetArgSelection (const Selection& rSel ) +void ArgInput::SetArgSelection (const Selection& rSel ) { if(pEdArg !=NULL) pEdArg ->SetSelection(rSel ); } /************************************************************************* -#* Member: SetArgSelection Datum:13.01.97 +#* Member: SetArgSelection Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Liefert die Selection fuer die EditBox zurueck. +#* Funktion: Liefert die Selection fuer die EditBox zurueck. #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ -Selection ArgInput::GetArgSelection () +Selection ArgInput::GetArgSelection () { - Selection aSel; + Selection aSel; if(pEdArg !=NULL) aSel=pEdArg ->GetSelection(); return aSel; } /************************************************************************* -#* Member: SetArgSelection Datum:13.01.97 +#* Member: SetArgSelection Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Ersetzt die Selection in der EditBox. +#* Funktion: Ersetzt die Selection in der EditBox. #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::ReplaceSelOfArg(const String& rStr ) @@ -386,16 +386,16 @@ void ArgInput::ReplaceSelOfArg(const String& rStr ) /************************************************************************* -#* Member: SetArgVal Datum:13.01.97 +#* Member: SetArgVal Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Setzt den Wert fuer das Argument +#* Funktion: Setzt den Wert fuer das Argument #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::SetArgVal(const String &aVal) @@ -407,16 +407,16 @@ void ArgInput::SetArgVal(const String &aVal) } /************************************************************************* -#* Member: SetArgName Datum:13.01.97 +#* Member: SetArgName Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Liefert den Wert fuer das Argument +#* Funktion: Liefert den Wert fuer das Argument #* -#* Input: --- +#* Input: --- #* -#* Output: String +#* Output: String #* #************************************************************************/ String ArgInput::GetArgVal() @@ -430,16 +430,16 @@ String ArgInput::GetArgVal() } /************************************************************************* -#* Member: SetArgName Datum:13.01.97 +#* Member: SetArgName Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Versteckt die Controls +#* Funktion: Versteckt die Controls #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::Hide() @@ -454,16 +454,16 @@ void ArgInput::Hide() } /************************************************************************* -#* Member: SetArgName Datum:13.01.97 +#* Member: SetArgName Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Zaubert die Controls wieder hervor. +#* Funktion: Zaubert die Controls wieder hervor. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::Show() @@ -478,16 +478,16 @@ void ArgInput::Show() } /************************************************************************* -#* Member: FxClick Datum:13.01.97 +#* Member: FxClick Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Gibt den Event weiter. +#* Funktion: Gibt den Event weiter. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::FxClick() @@ -496,16 +496,16 @@ void ArgInput::FxClick() } /************************************************************************* -#* Member: RefClick Datum:13.01.97 +#* Member: RefClick Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Gibt den Event weiter. +#* Funktion: Gibt den Event weiter. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::RefClick() @@ -514,16 +514,16 @@ void ArgInput::RefClick() } /************************************************************************* -#* Member: FxFocus Datum:13.01.97 +#* Member: FxFocus Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Gibt den Event weiter. +#* Funktion: Gibt den Event weiter. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::FxFocus() @@ -532,16 +532,16 @@ void ArgInput::FxFocus() } /************************************************************************* -#* Member: RefFocus Datum:13.01.97 +#* Member: RefFocus Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Gibt den Event weiter. +#* Funktion: Gibt den Event weiter. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::RefFocus() @@ -550,16 +550,16 @@ void ArgInput::RefFocus() } /************************************************************************* -#* Member: EdFocus Datum:13.01.97 +#* Member: EdFocus Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Gibt den Event weiter. +#* Funktion: Gibt den Event weiter. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::EdFocus() @@ -568,16 +568,16 @@ void ArgInput::EdFocus() } /************************************************************************* -#* Member: EdModify Datum:13.01.97 +#* Member: EdModify Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Gibt den Event weiter. +#* Funktion: Gibt den Event weiter. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::EdModify() @@ -586,16 +586,16 @@ void ArgInput::EdModify() } /************************************************************************* -#* Handle: FxBtnHdl Datum:13.01.97 +#* Handle: FxBtnHdl Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Handle fuer Fx-Button Click-Event. +#* Funktion: Handle fuer Fx-Button Click-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, FxBtnClickHdl, ImageButton*, pBtn ) @@ -606,16 +606,16 @@ IMPL_LINK( ArgInput, FxBtnClickHdl, ImageButton*, pBtn ) } /************************************************************************* -#* Handle: RefBtnClickHdl Datum:13.01.97 +#* Handle: RefBtnClickHdl Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Handle fuer Fx-Button Click-Event. +#* Funktion: Handle fuer Fx-Button Click-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, RefBtnClickHdl,RefButton*, pBtn ) @@ -626,16 +626,16 @@ IMPL_LINK( ArgInput, RefBtnClickHdl,RefButton*, pBtn ) } /************************************************************************* -#* Handle: FxBtnFocusHdl Datum:13.01.97 +#* Handle: FxBtnFocusHdl Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Handle fuer Fx-Button Focus-Event. +#* Funktion: Handle fuer Fx-Button Focus-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, FxBtnFocusHdl, ImageButton*, pBtn ) @@ -646,16 +646,16 @@ IMPL_LINK( ArgInput, FxBtnFocusHdl, ImageButton*, pBtn ) } /************************************************************************* -#* Handle: RefBtnFocusHdl Datum:13.01.97 +#* Handle: RefBtnFocusHdl Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Handle fuer Fx-Button Focus-Event. +#* Funktion: Handle fuer Fx-Button Focus-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, RefBtnFocusHdl,RefButton*, pBtn ) @@ -666,16 +666,16 @@ IMPL_LINK( ArgInput, RefBtnFocusHdl,RefButton*, pBtn ) } /************************************************************************* -#* Handle: EdFocusHdl Datum:13.01.97 +#* Handle: EdFocusHdl Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Handle fuer Fx-Button Focus-Event. +#* Funktion: Handle fuer Fx-Button Focus-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, EdFocusHdl, ArgEdit*, pEd ) @@ -686,16 +686,16 @@ IMPL_LINK( ArgInput, EdFocusHdl, ArgEdit*, pEd ) } /************************************************************************* -#* Handle: RefBtnClickHdl Datum:13.01.97 +#* Handle: RefBtnClickHdl Datum:13.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: ArgInput +#* Klasse: ArgInput #* -#* Funktion: Handle fuer Fx-Button Focus-Event. +#* Funktion: Handle fuer Fx-Button Focus-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd ) @@ -706,19 +706,19 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd ) } /************************************************************************* -#* Member: EditBox Datum:20.01.97 +#* Member: EditBox Datum:20.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: EditBox +#* Klasse: EditBox #* -#* Funktion: Konstruktor der Klasse ArgInput +#* Funktion: Konstruktor der Klasse ArgInput #* -#* Input: Parent, Window-Style +#* Input: Parent, Window-Style #* -#* Output: --- +#* Output: --- #* #************************************************************************/ -EditBox::EditBox( Window* pParent,WinBits nWinStyle) +EditBox::EditBox( Window* pParent,WinBits nWinStyle) :Control(pParent,nWinStyle|WB_DIALOGCONTROL) { pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | (nWinStyle & WB_TABSTOP) | @@ -729,16 +729,16 @@ EditBox::EditBox( Window* pParent,WinBits nWinStyle) } /************************************************************************* -#* Member: EditBox Datum:20.01.97 +#* Member: EditBox Datum:20.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: EditBox +#* Klasse: EditBox #* -#* Funktion: Konstruktor der Klasse ArgInput +#* Funktion: Konstruktor der Klasse ArgInput #* -#* Input: Parent, Resource +#* Input: Parent, Resource #* -#* Output: --- +#* Output: --- #* #************************************************************************/ EditBox::EditBox( Window* pParent, const ResId& rResId ) @@ -756,8 +756,8 @@ EditBox::EditBox( Window* pParent, const ResId& rResId ) WinBits nWinStyle=GetStyle() | WB_DIALOGCONTROL; SetStyle(nWinStyle); - // #105582# the HelpId from the resource must be set for the MultiLineEdit, - // not for the control that contains it. + // #105582# the HelpId from the resource must be set for the MultiLineEdit, + // not for the control that contains it. pMEdit->SetSmartHelpId( GetSmartHelpId() ); SetSmartHelpId( SmartId() ); } @@ -770,17 +770,17 @@ EditBox::~EditBox() delete pTheEdit; } /************************************************************************* -#* Member: EditBox Datum:20.01.97 +#* Member: EditBox Datum:20.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: EditBox +#* Klasse: EditBox #* -#* Funktion: Wenn sich die Selektion geaendert hat, so wird -#* diese Funktion aufgerufen. +#* Funktion: Wenn sich die Selektion geaendert hat, so wird +#* diese Funktion aufgerufen. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void EditBox::SelectionChanged() @@ -789,17 +789,17 @@ void EditBox::SelectionChanged() } /************************************************************************* -#* Member: EditBox Datum:20.05.98 +#* Member: EditBox Datum:20.05.98 #*------------------------------------------------------------------------ #* -#* Klasse: EditBox +#* Klasse: EditBox #* -#* Funktion: Wenn sich die Groesse geaendert hat, so muss -#* auch der MultiLineEdit angepasst werden.. +#* Funktion: Wenn sich die Groesse geaendert hat, so muss +#* auch der MultiLineEdit angepasst werden.. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void EditBox::Resize() @@ -809,18 +809,18 @@ void EditBox::Resize() } /************************************************************************* -#* Member: GetFocus Datum:26.05.98 +#* Member: GetFocus Datum:26.05.98 #*------------------------------------------------------------------------ #* -#* Klasse: EditBox +#* Klasse: EditBox #* -#* Funktion: Wenn der Control aktiviert wird, so wird -#* die Selection aufgehoben und der Cursor ans -#* Ende gesetzt. +#* Funktion: Wenn der Control aktiviert wird, so wird +#* die Selection aufgehoben und der Cursor ans +#* Ende gesetzt. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void EditBox::GetFocus() @@ -834,17 +834,17 @@ void EditBox::GetFocus() /************************************************************************* -#* Member: EditBox Datum:20.01.97 +#* Member: EditBox Datum:20.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: EditBox +#* Klasse: EditBox #* -#* Funktion: Wenn ein Event ausgeloest wird, so wird diese Routine -#* zuerst aufgerufen und ein PostUserEvent verschickt. +#* Funktion: Wenn ein Event ausgeloest wird, so wird diese Routine +#* zuerst aufgerufen und ein PostUserEvent verschickt. #* -#* Input: Notify-Event +#* Input: Notify-Event #* -#* Output: --- +#* Output: --- #* #************************************************************************/ long EditBox::PreNotify( NotifyEvent& rNEvt ) @@ -883,17 +883,17 @@ long EditBox::PreNotify( NotifyEvent& rNEvt ) } /************************************************************************* -#* Member: EditBox Datum:21.01.97 +#* Member: EditBox Datum:21.01.97 #*------------------------------------------------------------------------ #* -#* Klasse: EditBox +#* Klasse: EditBox #* -#* Funktion: Wenn ein Event ausgeloest wurde, so wird diese Routine -#* zuerst aufgerufen. +#* Funktion: Wenn ein Event ausgeloest wurde, so wird diese Routine +#* zuerst aufgerufen. #* -#* Input: Key-Event +#* Input: Key-Event #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( EditBox, ChangedHdl, EditBox*, EMPTYARG ) @@ -913,8 +913,8 @@ IMPL_LINK( EditBox, ChangedHdl, EditBox*, EMPTYARG ) void EditBox::UpdateOldSel() { - // if selection is set for editing a function, store it as aOldSel, - // so SelectionChanged isn't called in the next ChangedHdl call + // if selection is set for editing a function, store it as aOldSel, + // so SelectionChanged isn't called in the next ChangedHdl call if (pMEdit) aOldSel = pMEdit->GetSelection(); @@ -922,7 +922,7 @@ void EditBox::UpdateOldSel() //---------------------------------------------------------------------------- //============================================================================ -// class RefEdit +// class RefEdit //---------------------------------------------------------------------------- #define SC_ENABLE_TIME 100 @@ -1027,7 +1027,7 @@ IMPL_LINK( RefEdit, UpdateHdl, Timer*, EMPTYARG ) //============================================================================ -// class RefButton +// class RefButton //---------------------------------------------------------------------------- RefButton::RefButton( Window* _pParent, const ResId& rResId) : ImageButton( _pParent, rResId ), diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 0de42f971edd..3876621a3ec0 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include "helpids.hrc" #include "formula/formdata.hxx" #include "formula/IFunctionDescription.hxx" -#include "ModuleHelper.hxx" +#include "ModuleHelper.hxx" #include "ForResId.hrc" #define VAR_ARGS 30 @@ -49,42 +49,42 @@ namespace formula //============================================================================ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos): - TabPage (pParent,ModuleRes(RID_FORMULATAB_PARAMETER)), - pFuncDesc ( NULL ), + TabPage (pParent,ModuleRes(RID_FORMULATAB_PARAMETER)), + pFuncDesc ( NULL ), pMyParent (_pDlg), - aFtEditDesc ( this, ModuleRes( FT_EDITDESC ) ), - aFtArgName ( this, ModuleRes( FT_PARNAME ) ), - aFtArgDesc ( this, ModuleRes( FT_PARDESC ) ), - - aFtArg1 ( this, ModuleRes( FT_ARG1 ) ), - aFtArg2 ( this, ModuleRes( FT_ARG2 ) ), - aFtArg3 ( this, ModuleRes( FT_ARG3 ) ), - aFtArg4 ( this, ModuleRes( FT_ARG4 ) ), - - aBtnFx1 ( this, ModuleRes( BTN_FX1 ) ), - aBtnFx2 ( this, ModuleRes( BTN_FX2 ) ), - aBtnFx3 ( this, ModuleRes( BTN_FX3 ) ), - aBtnFx4 ( this, ModuleRes( BTN_FX4 ) ), - - aEdArg1 ( this, ModuleRes( ED_ARG1 ) ), - aEdArg2 ( this, ModuleRes( ED_ARG2 ) ), - aEdArg3 ( this, ModuleRes( ED_ARG3 ) ), - aEdArg4 ( this, ModuleRes( ED_ARG4 ) ), - - aRefBtn1 ( this, ModuleRes( RB_ARG1 ) ), - aRefBtn2 ( this, ModuleRes( RB_ARG2 ) ), - aRefBtn3 ( this, ModuleRes( RB_ARG3 ) ), - aRefBtn4 ( this, ModuleRes( RB_ARG4 ) ), - - aSlider ( this, ModuleRes( WND_SLIDER ) ), + aFtEditDesc ( this, ModuleRes( FT_EDITDESC ) ), + aFtArgName ( this, ModuleRes( FT_PARNAME ) ), + aFtArgDesc ( this, ModuleRes( FT_PARDESC ) ), + + aFtArg1 ( this, ModuleRes( FT_ARG1 ) ), + aFtArg2 ( this, ModuleRes( FT_ARG2 ) ), + aFtArg3 ( this, ModuleRes( FT_ARG3 ) ), + aFtArg4 ( this, ModuleRes( FT_ARG4 ) ), + + aBtnFx1 ( this, ModuleRes( BTN_FX1 ) ), + aBtnFx2 ( this, ModuleRes( BTN_FX2 ) ), + aBtnFx3 ( this, ModuleRes( BTN_FX3 ) ), + aBtnFx4 ( this, ModuleRes( BTN_FX4 ) ), + + aEdArg1 ( this, ModuleRes( ED_ARG1 ) ), + aEdArg2 ( this, ModuleRes( ED_ARG2 ) ), + aEdArg3 ( this, ModuleRes( ED_ARG3 ) ), + aEdArg4 ( this, ModuleRes( ED_ARG4 ) ), + + aRefBtn1 ( this, ModuleRes( RB_ARG1 ) ), + aRefBtn2 ( this, ModuleRes( RB_ARG2 ) ), + aRefBtn3 ( this, ModuleRes( RB_ARG3 ) ), + aRefBtn4 ( this, ModuleRes( RB_ARG4 ) ), + + aSlider ( this, ModuleRes( WND_SLIDER ) ), m_sOptional ( ModuleRes( STR_OPTIONAL ) ), m_sRequired ( ModuleRes( STR_REQUIRED ) ), - bRefMode (FALSE) + bRefMode (FALSE) { Image aFxHC( ModuleRes( IMG_FX_H ) ); FreeResource(); aDefaultString=aFtEditDesc.GetText(); - + SetPosPixel(aPos); nEdFocus=NOT_FOUND; nActiveLine=0; @@ -116,8 +116,8 @@ void ParaWin::UpdateArgDesc( USHORT nArg ) if ( (nArgs > 0) && (nArg<nArgs) ) { - String aArgDesc; - String aArgName; + String aArgDesc; + String aArgName; SetArgumentDesc( String() ); SetArgumentText( String() ); @@ -158,9 +158,9 @@ void ParaWin::UpdateArgInput( USHORT nOffset, USHORT i ) if(nArg<nArgs) { USHORT nRealArg = aVisibleArgMapping[nArg]; - SetArgNameFont (i,(pFuncDesc->isParameterOptional(nRealArg)) + SetArgNameFont (i,(pFuncDesc->isParameterOptional(nRealArg)) ? aFntLight : aFntBold ); - SetArgName (i,pFuncDesc->getParameterName(nRealArg)); + SetArgName (i,pFuncDesc->getParameterName(nRealArg)); } } else @@ -245,7 +245,7 @@ String ParaWin::GetArgument(USHORT no) return aStr; } -String ParaWin::GetActiveArgName() +String ParaWin::GetActiveArgName() { String aStr; if(nArgs>0 && nEdFocus!=NOT_FOUND) @@ -304,7 +304,7 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) aEdArg3.SetHelpId( nHelpId ); aEdArg4.SetHelpId( nHelpId ); - // Unique-IDs muessen gleich bleiben fuer Automatisierung + // Unique-IDs muessen gleich bleiben fuer Automatisierung SetUniqueId( HID_FORMULA_FAP_PAGE ); aEdArg1.SetUniqueId( HID_FORMULA_FAP_EDIT1 ); aEdArg2.SetUniqueId( HID_FORMULA_FAP_EDIT2 ); @@ -378,10 +378,10 @@ void ParaWin::InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx, aArgInput[nPos].Hide(); - aArgInput[nPos].SetFxClickHdl ( LINK( this, ParaWin, GetFxHdl ) ); - aArgInput[nPos].SetFxFocusHdl ( LINK( this, ParaWin, GetFxFocusHdl ) ); - aArgInput[nPos].SetEdFocusHdl ( LINK( this, ParaWin, GetEdFocusHdl ) ); - aArgInput[nPos].SetEdModifyHdl ( LINK( this, ParaWin, ModifyHdl ) ); + aArgInput[nPos].SetFxClickHdl ( LINK( this, ParaWin, GetFxHdl ) ); + aArgInput[nPos].SetFxFocusHdl ( LINK( this, ParaWin, GetFxFocusHdl ) ); + aArgInput[nPos].SetEdFocusHdl ( LINK( this, ParaWin, GetEdFocusHdl ) ); + aArgInput[nPos].SetEdModifyHdl ( LINK( this, ParaWin, ModifyHdl ) ); } void ParaWin::ClearAll() @@ -404,7 +404,7 @@ void ParaWin::SetArgumentOffset(USHORT nOffset) String aString; aArgInput[i].SetArgVal(aString); aArgInput[i].GetArgEdPtr()->Init( - (i==0) ? (ArgEdit *)NULL : aArgInput[i-1].GetArgEdPtr(), + (i==0) ? (ArgEdit *)NULL : aArgInput[i-1].GetArgEdPtr(), (i==3 || i==nArgs-1) ? (ArgEdit *)NULL : aArgInput[i+1].GetArgEdPtr(), aSlider, nArgs ); } diff --git a/formula/source/ui/dlg/parawin.hrc b/formula/source/ui/dlg/parawin.hrc index 484ca5393766..f6367c6259db 100644 --- a/formula/source/ui/dlg/parawin.hrc +++ b/formula/source/ui/dlg/parawin.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,28 +25,28 @@ * ************************************************************************/ -// #define RID_SCTAB_PARAMETER 256 +// #define RID_SCTAB_PARAMETER 256 -#define FT_PARNAME 1 -#define FT_PARDESC 2 -#define FT_EDITDESC 3 -#define FT_ARG1 4 -#define FT_ARG2 5 -#define FT_ARG3 6 -#define FT_ARG4 7 -#define BTN_FX1 8 -#define BTN_FX2 9 -#define BTN_FX3 10 -#define BTN_FX4 11 -#define ED_ARG1 12 -#define ED_ARG2 13 -#define ED_ARG3 14 -#define ED_ARG4 15 -#define RB_ARG1 16 -#define RB_ARG2 17 -#define RB_ARG3 18 -#define RB_ARG4 19 -#define WND_SLIDER 20 +#define FT_PARNAME 1 +#define FT_PARDESC 2 +#define FT_EDITDESC 3 +#define FT_ARG1 4 +#define FT_ARG2 5 +#define FT_ARG3 6 +#define FT_ARG4 7 +#define BTN_FX1 8 +#define BTN_FX2 9 +#define BTN_FX3 10 +#define BTN_FX4 11 +#define ED_ARG1 12 +#define ED_ARG2 13 +#define ED_ARG3 14 +#define ED_ARG4 15 +#define RB_ARG1 16 +#define RB_ARG2 17 +#define RB_ARG3 18 +#define RB_ARG4 19 +#define WND_SLIDER 20 #define IMG_FX_H 30 #define STR_OPTIONAL 1 diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index 8f128e5ad4bf..bfaebccdca09 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace formula { //============================================================================ -#define NOT_FOUND 0xffff +#define NOT_FOUND 0xffff //============================================================================ class IFunctionDescription; class IControlReferenceHandler; @@ -53,51 +53,51 @@ class ParaWin : public TabPage { private: OModuleClient m_aModuleClient; - Link aScrollLink; - Link aFxLink; - Link aArgModifiedLink; + Link aScrollLink; + Link aFxLink; + Link aArgModifiedLink; ::std::vector<USHORT> aVisibleArgMapping; - const IFunctionDescription* pFuncDesc; - IControlReferenceHandler* pMyParent; - USHORT nArgs; // unsuppressed arguments - Font aFntBold; - Font aFntLight; - - FixedInfo aFtEditDesc; - FixedText aFtArgName; - FixedInfo aFtArgDesc; - - FixedText aFtArg1; - FixedText aFtArg2; - FixedText aFtArg3; - FixedText aFtArg4; - - ImageButton aBtnFx1; - ImageButton aBtnFx2; - ImageButton aBtnFx3; - ImageButton aBtnFx4; - - ArgEdit aEdArg1; - ArgEdit aEdArg2; - ArgEdit aEdArg3; - ArgEdit aEdArg4; - - RefButton aRefBtn1; - RefButton aRefBtn2; - RefButton aRefBtn3; - RefButton aRefBtn4; - - ScrollBar aSlider; + const IFunctionDescription* pFuncDesc; + IControlReferenceHandler* pMyParent; + USHORT nArgs; // unsuppressed arguments + Font aFntBold; + Font aFntLight; + + FixedInfo aFtEditDesc; + FixedText aFtArgName; + FixedInfo aFtArgDesc; + + FixedText aFtArg1; + FixedText aFtArg2; + FixedText aFtArg3; + FixedText aFtArg4; + + ImageButton aBtnFx1; + ImageButton aBtnFx2; + ImageButton aBtnFx3; + ImageButton aBtnFx4; + + ArgEdit aEdArg1; + ArgEdit aEdArg2; + ArgEdit aEdArg3; + ArgEdit aEdArg4; + + RefButton aRefBtn1; + RefButton aRefBtn2; + RefButton aRefBtn3; + RefButton aRefBtn4; + + ScrollBar aSlider; String m_sOptional; String m_sRequired; - BOOL bRefMode; + BOOL bRefMode; - USHORT nEdFocus; - USHORT nActiveLine; + USHORT nEdFocus; + USHORT nActiveLine; - ArgInput aArgInput[4]; - String aDefaultString; + ArgInput aArgInput[4]; + String aDefaultString; ::std::vector<String> aParaArray; @@ -109,52 +109,52 @@ private: protected: - virtual void SliderMoved(); - virtual void ArgumentModified(); - virtual void FxClick(); + virtual void SliderMoved(); + virtual void ArgumentModified(); + virtual void FxClick(); - void InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx, + void InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx, ArgEdit& rEdArg, RefButton& rRefBtn); - void DelParaArray(); - void SetArgumentDesc(const String& aText); - void SetArgumentText(const String& aText); + void DelParaArray(); + void SetArgumentDesc(const String& aText); + void SetArgumentText(const String& aText); - void SetArgName (USHORT no,const String &aArg); - void SetArgNameFont (USHORT no,const Font&); - void SetArgVal (USHORT no,const String &aArg); + void SetArgName (USHORT no,const String &aArg); + void SetArgNameFont (USHORT no,const Font&); + void SetArgVal (USHORT no,const String &aArg); - void HideParaLine(USHORT no); - void ShowParaLine(USHORT no); - void UpdateArgDesc( USHORT nArg ); - void UpdateArgInput( USHORT nOffset, USHORT i ); + void HideParaLine(USHORT no); + void ShowParaLine(USHORT no); + void UpdateArgDesc( USHORT nArg ); + void UpdateArgInput( USHORT nOffset, USHORT i ); public: ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos); ~ParaWin(); - void SetFunctionDesc(const IFunctionDescription* pFDesc); - void SetArgumentOffset(USHORT nOffset); - void SetEditDesc(const String& aText); - void UpdateParas(); - void ClearAll(); + void SetFunctionDesc(const IFunctionDescription* pFDesc); + void SetArgumentOffset(USHORT nOffset); + void SetEditDesc(const String& aText); + void UpdateParas(); + void ClearAll(); - BOOL IsRefMode() {return bRefMode;} - void SetRefMode(BOOL bFlag) {bRefMode=bFlag;} + BOOL IsRefMode() {return bRefMode;} + void SetRefMode(BOOL bFlag) {bRefMode=bFlag;} - USHORT GetActiveLine(); - void SetActiveLine(USHORT no); - RefEdit* GetActiveEdit(); - String GetActiveArgName(); + USHORT GetActiveLine(); + void SetActiveLine(USHORT no); + RefEdit* GetActiveEdit(); + String GetActiveArgName(); - String GetArgument(USHORT no); - void SetArgument(USHORT no, const String& aString); - void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont); + String GetArgument(USHORT no); + void SetArgument(USHORT no, const String& aString); + void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont); - void SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen - USHORT GetSliderPos(); - void SetSliderPos(USHORT nSliderPos); + void SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen + USHORT GetSliderPos(); + void SetSliderPos(USHORT nSliderPos); void SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; } const Link& GetScrollHdl() const { return aScrollLink; } diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src index 78be77040b88..eda2bfcecda9 100644 --- a/formula/source/ui/dlg/parawin.src +++ b/formula/source/ui/dlg/parawin.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,12 +32,12 @@ #define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; } //--------------------------------------------------------------------------- -#define FT_ARGBLOCK( y ) \ +#define FT_ARGBLOCK( y ) \ Pos = MAP_APPFONT (6 , y ) ; \ Size = MAP_APPFONT ( 74 , 8 ) ; \ Right = TRUE ; -#define FXBUTTONBLOCK( y ) \ +#define FXBUTTONBLOCK( y ) \ Pos = MAP_APPFONT (83 , y-1 ) ; \ Size = MAP_APPFONT ( 13 , 15 ) ; \ TabStop = TRUE ; \ @@ -50,26 +50,26 @@ MaskColor = STD_MASKCOLOR;\ }; -#define ED_ARGBLOCK( y ) \ - Border = TRUE; \ - Pos = MAP_APPFONT( 98, y ); \ - Size = MAP_APPFONT( 66, 12 ); \ +#define ED_ARGBLOCK( y ) \ + Border = TRUE; \ + Pos = MAP_APPFONT( 98, y ); \ + Size = MAP_APPFONT( 66, 12 ); \ TabStop = TRUE; -#define RB_ARGBLOCK( y ) \ +#define RB_ARGBLOCK( y ) \ Pos = MAP_APPFONT ( 166 , y-1 ) ; \ Size = MAP_APPFONT ( 13 , 15 ) ; \ - TabStop = FALSE ; \ - QuickHelpText [ en-US ] = "Select"; \ + TabStop = FALSE ; \ + QuickHelpText [ en-US ] = "Select"; \ //--------------------------------------------------------------------------- - // jetzt alles zusammen + // jetzt alles zusammen TabPage RID_FORMULATAB_PARAMETER { - Border = FALSE; - Size = MAP_APPFONT( 203, 128 ); + Border = FALSE; + Size = MAP_APPFONT( 203, 128 ); DialogControl = TRUE; SVLook = TRUE; @@ -167,7 +167,7 @@ TabPage RID_FORMULATAB_PARAMETER ImageBitmap = Bitmap { File = "fx_h.bmp" ; }; MaskColor = STD_MASKCOLOR; }; - + }; diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index c32d3dfa3b52..3c7da5a3f8b0 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,13 +104,13 @@ void StructListBox::LoseFocus() StructPage::StructPage(Window* pParent): TabPage(pParent,ModuleRes(RID_FORMULATAB_STRUCT)), // - aFtStruct ( this, ModuleRes( FT_STRUCT ) ), - aTlbStruct ( this, ModuleRes( TLB_STRUCT ) ), + aFtStruct ( this, ModuleRes( FT_STRUCT ) ), + aTlbStruct ( this, ModuleRes( TLB_STRUCT ) ), maImgEnd ( ModuleRes( BMP_STR_END ) ), maImgError ( ModuleRes( BMP_STR_ERROR ) ), maImgEndHC ( ModuleRes( BMP_STR_END_H ) ), maImgErrorHC ( ModuleRes( BMP_STR_ERROR_H ) ), - pSelectedToken ( NULL ) + pSelectedToken ( NULL ) { aTlbStruct.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN| WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION); @@ -161,7 +161,7 @@ String StructPage::GetEntryText(SvLBoxEntry* pEntry) const String aString; if(pEntry!=NULL) aString=aTlbStruct.GetEntryText(pEntry); - return aString; + return aString; } SvLBoxEntry* StructPage::GetParent(SvLBoxEntry* pEntry) const @@ -194,7 +194,7 @@ IMPL_LINK( StructPage, SelectHdl, SvTreeListBox*, pTlb ) { if(pTlb==&aTlbStruct) { - SvLBoxEntry* pCurEntry=aTlbStruct.GetCurEntry(); + SvLBoxEntry* pCurEntry=aTlbStruct.GetCurEntry(); if(pCurEntry!=NULL) { pSelectedToken=(IFormulaToken *)pCurEntry->GetUserData(); diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index a71ca6800832..8e5dff4e6ed9 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,11 +45,11 @@ namespace formula { class IFormulaToken; -class StructListBox : public SvTreeListBox +class StructListBox : public SvTreeListBox { private: - BOOL bActiveFlag; + BOOL bActiveFlag; protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -67,10 +67,10 @@ public: ULONG nPos = LIST_APPEND, IFormulaToken* pToken = NULL ); - void SetActiveFlag(BOOL bFlag=TRUE); - BOOL GetActiveFlag(); - void GetFocus(); - void LoseFocus(); + void SetActiveFlag(BOOL bFlag=TRUE); + BOOL GetActiveFlag(); + void GetFocus(); + void LoseFocus(); }; //============================================================================ @@ -80,16 +80,16 @@ class StructPage : public TabPage { private: OModuleClient m_aModuleClient; - Link aSelLink; + Link aSelLink; - FixedText aFtStruct; - StructListBox aTlbStruct; + FixedText aFtStruct; + StructListBox aTlbStruct; Image maImgEnd; Image maImgError; Image maImgEndHC; Image maImgErrorHC; - IFormulaToken* pSelectedToken; + IFormulaToken* pSelectedToken; DECL_LINK( SelectHdl, SvTreeListBox* ); @@ -97,21 +97,21 @@ private: protected: - IFormulaToken* GetFunctionEntry(SvLBoxEntry* pEntry); + IFormulaToken* GetFunctionEntry(SvLBoxEntry* pEntry); public: StructPage( Window* pParent); - void ClearStruct(); - virtual SvLBoxEntry* InsertEntry(const XubString& rText, SvLBoxEntry* pParent, + void ClearStruct(); + virtual SvLBoxEntry* InsertEntry(const XubString& rText, SvLBoxEntry* pParent, USHORT nFlag,ULONG nPos=0,IFormulaToken* pScToken=NULL); - virtual String GetEntryText(SvLBoxEntry* pEntry) const; + virtual String GetEntryText(SvLBoxEntry* pEntry) const; virtual SvLBoxEntry* GetParent(SvLBoxEntry* pEntry) const; - String GetSelectedEntryText(); - IFormulaToken* GetSelectedToken(); + String GetSelectedEntryText(); + IFormulaToken* GetSelectedToken(); void SetSelectionHdl( const Link& rLink ) { aSelLink = rLink; } const Link& GetSelectionHdl() const { return aSelLink; } diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index a09e3fd03d0d..32b59f296cec 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,25 +28,25 @@ #ifndef FORMULA_FORRESID_HRC #define FORMULA_FORRESID_HRC -// include ----------------------------------------------------------- +// include ----------------------------------------------------------- #ifndef _SOLAR_HRC #include <svl/solar.hrc> #endif -#define RID_DIALOG_START RID_FORMULA_START -#define RID_PAGE_START RID_FORMULA_START -#define RID_ERRORBOX_START RID_FORMULA_START -#define RID_QUERYBOX_START RID_FORMULA_START -#define RID_TOOLBOX_START RID_FORMULA_START -#define RID_BITMAP_START RID_FORMULA_START -#define RID_IMAGE_START RID_FORMULA_START -#define RID_IMAGELIST_START RID_FORMULA_START -#define RID_MENU_START RID_FORMULA_START -#define RID_STRING_START RID_FORMULA_START -#define RID_UNTYPED_START RID_FORMULA_START -#define RID_WARN_START RID_FORMULA_START -#define RID_CONTROL_START RID_FORMULA_START +#define RID_DIALOG_START RID_FORMULA_START +#define RID_PAGE_START RID_FORMULA_START +#define RID_ERRORBOX_START RID_FORMULA_START +#define RID_QUERYBOX_START RID_FORMULA_START +#define RID_TOOLBOX_START RID_FORMULA_START +#define RID_BITMAP_START RID_FORMULA_START +#define RID_IMAGE_START RID_FORMULA_START +#define RID_IMAGELIST_START RID_FORMULA_START +#define RID_MENU_START RID_FORMULA_START +#define RID_STRING_START RID_FORMULA_START +#define RID_UNTYPED_START RID_FORMULA_START +#define RID_WARN_START RID_FORMULA_START +#define RID_CONTROL_START RID_FORMULA_START #define RID_MISC_START RID_FORMULA_START // Dialog Control Id's ----------------------------------------------------------- @@ -54,16 +54,16 @@ // strings // bitmap -#define RID_BMP_REFBTN1 (RID_BITMAP_START + 0) -#define RID_BMP_REFBTN1_H (RID_BITMAP_START + 1) -#define RID_BMP_REFBTN2 (RID_BITMAP_START + 2) -#define RID_BMP_REFBTN2_H (RID_BITMAP_START + 3) +#define RID_BMP_REFBTN1 (RID_BITMAP_START + 0) +#define RID_BMP_REFBTN1_H (RID_BITMAP_START + 1) +#define RID_BMP_REFBTN2 (RID_BITMAP_START + 2) +#define RID_BMP_REFBTN2_H (RID_BITMAP_START + 3) // pages -#define RID_FORMULATAB_STRUCT (RID_PAGE_START + 0) -#define RID_FORMULATAB_FUNCTION (RID_PAGE_START + 1) -#define RID_FORMULADLG_FORMULA (RID_PAGE_START + 2) +#define RID_FORMULATAB_STRUCT (RID_PAGE_START + 0) +#define RID_FORMULATAB_FUNCTION (RID_PAGE_START + 1) +#define RID_FORMULADLG_FORMULA (RID_PAGE_START + 2) #define RID_FORMULATAB_PARAMETER (RID_PAGE_START + 3) #define RID_FORMULADLG_FORMULA_MODAL (RID_PAGE_START + 4) diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx index de80a167a195..23079b1e6705 100644 --- a/formula/source/ui/inc/ModuleHelper.hxx +++ b/formula/source/ui/inc/ModuleHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,18 +48,18 @@ namespace formula // not implemented. OModule is a static class protected: - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered + static ::osl::Mutex s_aMutex; /// access safety + static sal_Int32 s_nClients; /// number of registered clients + static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered public: /// get the vcl res manager of the module - static ResMgr* getResManager(); + static ResMgr* getResManager(); protected: /// register a client for the module - static void registerClient(); + static void registerClient(); /// revoke a client for the module - static void revokeClient(); + static void revokeClient(); private: /** ensure that the impl class exists @@ -71,13 +71,13 @@ namespace formula //========================================================================= //= OModuleClient //========================================================================= - /** base class for objects which uses any global module-specific ressources + /** base class for objects which uses any global module-specific ressources */ class FORMULA_DLLPUBLIC OModuleClient { public: - OModuleClient() { OModule::registerClient(); } - ~OModuleClient() { OModule::revokeClient(); } + OModuleClient() { OModule::registerClient(); } + ~OModuleClient() { OModule::revokeClient(); } }; //========================================================================= @@ -91,7 +91,7 @@ namespace formula ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { } }; //......................................................................... -} // namespace formula +} // namespace formula //......................................................................... #endif // FORMULA_MODULE_HELPER_RPT_HXX_ diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index b13419b70158..20b053a5ce0e 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ #endif #define EXPAND_PROTOCOL "vnd.sun.star.expand:" -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ +#define ENTER_MOD_METHOD() \ + ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() //......................................................................... @@ -54,7 +54,7 @@ namespace formula */ class OModuleImpl { - ResMgr* m_pRessources; + ResMgr* m_pRessources; public: /// ctor @@ -62,7 +62,7 @@ public: ~OModuleImpl(); /// get the manager for the ressources of the module - ResMgr* getResManager(); + ResMgr* getResManager(); }; DBG_NAME( rpt_OModuleImpl ) @@ -84,7 +84,7 @@ OModuleImpl::~OModuleImpl() } //------------------------------------------------------------------------- -ResMgr* OModuleImpl::getResManager() +ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -100,11 +100,11 @@ ResMgr* OModuleImpl::getResManager() //========================================================================= //= OModule //========================================================================= -::osl::Mutex OModule::s_aMutex; -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = NULL; +::osl::Mutex OModule::s_aMutex; +sal_Int32 OModule::s_nClients = 0; +OModuleImpl* OModule::s_pImpl = NULL; //------------------------------------------------------------------------- -ResMgr* OModule::getResManager() +ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); @@ -137,6 +137,6 @@ void OModule::ensureImpl() } //......................................................................... -} // namespace formula +} // namespace formula //......................................................................... diff --git a/formula/util/hidother.src b/formula/util/hidother.src index 8f56afa1cd55..8cf49660e919 100644 --- a/formula/util/hidother.src +++ b/formula/util/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |