diff options
Diffstat (limited to 'formula/source/ui/dlg')
| -rw-r--r-- | formula/source/ui/dlg/ControlHelper.hxx | 116 | ||||
| -rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 74 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formdlgs.hrc | 76 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formdlgs.src | 32 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 366 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 20 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcpage.hxx | 40 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 386 | ||||
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 84 | ||||
| -rw-r--r-- | formula/source/ui/dlg/parawin.hrc | 44 | ||||
| -rw-r--r-- | formula/source/ui/dlg/parawin.hxx | 144 | ||||
| -rw-r--r-- | formula/source/ui/dlg/parawin.src | 28 | ||||
| -rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 12 | ||||
| -rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 34 |
14 files changed, 728 insertions, 728 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 9d33dfa06198..346f2c72955f 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -2,7 +2,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,14 +40,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; }; //============================================================================ @@ -56,18 +56,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: @@ -77,12 +77,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(); }; //============================================================================ @@ -93,17 +93,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; }; @@ -114,57 +114,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 927d882345dc..7da397f8f1e5 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -2,7 +2,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 @@ -34,7 +34,7 @@ namespace formula { - namespace + namespace { //============================================================================ class OEmptyFunctionDescription : public IFunctionDescription @@ -59,12 +59,12 @@ namespace formula }; } //=================================================================== -// class FormulaHelper - static Method +// class FormulaHelper - static Method //=================================================================== #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)) @@ -75,16 +75,16 @@ FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager) { m_pCharClass = m_pSysLocale->GetCharClassPtr(); } -BOOL FormulaHelper::GetNextFunc( const String& rFormula, - BOOL bBack, - xub_StrLen& rFStart, // Input and output - 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, // Input and output + 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 ); @@ -132,15 +132,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++ ) { @@ -190,7 +190,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 == '_'; @@ -198,18 +198,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 @@ -263,11 +263,11 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula, { if ( IsFormulaText( m_pCharClass,rFormula, nFStart ) ) { - // Function found + // Function found if ( pFuncName ) *pFuncName = rFormula.Copy( nFStart, nParPos-nFStart ); } - else // Brackets without function -> keep searching + else // Brackets without function -> keep searching { bRepeat = TRUE; if ( !bBack ) @@ -278,7 +278,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula, bRepeat = FALSE; } } - else // No brackets found + else // No brackets found { nFStart = FUNC_NOTFOUND; if ( pFuncName ) @@ -292,16 +292,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) ) { @@ -323,7 +323,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart else if ( nParCount < 0 ) { bFound = TRUE; - nStart--; // read one too far + nStart--; // read one too far } } else if ( c == arrayOpen ) @@ -339,7 +339,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart if ( !bInArray && nParCount == 0 ) { bFound = TRUE; - nStart--; // read one too far + nStart--; // read one too far } } nStart++; // Set behind found position @@ -357,9 +357,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 9e6378a53d2c..bb9e2a5a2ad5 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 c85aa561ced8..8ea9545c09a1 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 bc4449f7c40d..d8e7fa9f5b09 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -2,7 +2,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 @@ -101,35 +101,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); @@ -180,71 +180,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; // behind aBtnEnd + const String aTitle1; + const String aTitle2; + const String aTxtEnd; + const String aTxtOk; // behind 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 @@ -267,45 +267,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 ) ), // local resource - aTitle2 ( ModuleRes( STR_TITLE2 ) ), // local resource - aTxtEnd ( ModuleRes( STR_END ) ), // local resource - aTxtOk ( aBtnEnd.GetText() ), + aTitle1 ( ModuleRes( STR_TITLE1 ) ), // local resource + aTitle2 ( ModuleRes( STR_TITLE2 ) ), // local resource + aTxtEnd ( ModuleRes( STR_END ) ), // local 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(); @@ -332,7 +332,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage); aTabCtrl.SetTabPage( TP_STRUCT, pStructPage); - nOldHelp = pParent->GetHelpId(); // HelpId from resource always for "Page 1" + nOldHelp = pParent->GetHelpId(); // HelpId from resource always for "Page 1" nOldUnique = pParent->GetUniqueId(); aFtResult.Show( _bSupportResult ); @@ -346,9 +346,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 ) ); @@ -364,7 +364,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); @@ -796,10 +796,10 @@ void FormulaDlg_Impl::FillDialog(BOOL nFlag) // ----------------------------------------------------------------------------- void FormulaDlg_Impl::FillListboxes() { - // Switch between the "Pages" + // Switch between the "Pages" FormEditData* pData = m_pHelper->getFormEditData(); String aNewTitle; - // 1. Page: select function + // 1. Page: select function if ( pFuncDesc && pFuncDesc->getCategory() ) { if( pFuncPage->GetCategory() != pFuncDesc->getCategory()->getNumber() + 1 ) @@ -816,30 +816,30 @@ void FormulaDlg_Impl::FillListboxes() } FuncSelHdl(NULL); - // ResizeArgArr is now already in UpdateFunctionDesc + // ResizeArgArr is now already in UpdateFunctionDesc m_pHelper->setDispatcherLock( TRUE);// Activate Modal-Mode aNewTitle = aTitle1; - // HelpId for 1. page is the one from the resource + // HelpId for 1. page is the one from the resource m_pParent->SetHelpId( nOldHelp ); m_pParent->SetUniqueId( nOldUnique ); } // ----------------------------------------------------------------------------- void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) { - // Switch between the "Pages" + // Switch between the "Pages" FormEditData* pData = m_pHelper->getFormEditData(); if (!pData ) return; String aNewTitle; - // 2. Page or Edit: show selected function + // 2. Page or Edit: show selected function - 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; @@ -886,14 +886,14 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) USHORT nOffset = pData->GetOffset(); nEdFocus = pData->GetEdFocus(); - // Concatenate the Edit's for Focus-Control + // Concatenate the Edit's for Focus-Control 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++) { @@ -921,7 +921,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 ); @@ -978,12 +978,12 @@ String FormulaDlg_Impl::RepairFormula(const String& aFormula) void FormulaDlg_Impl::DoEnter(BOOL bOk) { - // Accept input to the document or cancel + // Accept input to the document or cancel if ( bOk) { - // remove dummy arguments - String aInputFormula = m_pHelper->getCurrentFormula(); - String aString = RepairFormula(pMEdit->GetText()); + // remove dummy arguments + String aInputFormula = m_pHelper->getCurrentFormula(); + String aString = RepairFormula(pMEdit->GetText()); m_pHelper->setSelection(0, aInputFormula.Len()); m_pHelper->setCurrentFormula(aString); } @@ -991,10 +991,10 @@ void FormulaDlg_Impl::DoEnter(BOOL bOk) m_pHelper->switchBack(); m_pHelper->dispatch(bOk,aBtnMatrix.IsChecked()); - // Clear data + // Clear data m_pHelper->deleteFormData(); - // Close dialog + // Close dialog m_pHelper->doClose(bOk); } // ----------------------------------------------------------------------------- @@ -1003,22 +1003,22 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) { if ( pBtn == &aBtnCancel ) { - DoEnter(FALSE); // closes the Dialog + DoEnter(FALSE); // closes the Dialog } else if ( pBtn == &aBtnEnd ) { - DoEnter(TRUE); // closes the Dialog + DoEnter(TRUE); // closes the Dialog } else if ( pBtn == &aBtnForward ) { - //@pMEdit->GrabFocus(); // In order to show the selection too + //@pMEdit->GrabFocus(); // In order to show the selection too 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 ); @@ -1038,9 +1038,9 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) // ----------------------------------------------------------------------------- -// -------------------------------------------------------------------------- -// Functions for 1. Page -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Functions for 1. Page +// -------------------------------------------------------------------------- void FormulaDlg_Impl::ResizeArgArr( const IFunctionDescription* pNewFunc ) { @@ -1084,8 +1084,8 @@ void FormulaDlg_Impl::UpdateFunctionDesc() aFtFuncDesc.SetText( pDesc->getDescription() ); ResizeArgArr( pDesc ); - if ( !m_aArguments.empty() ) // still arguments there? - aSig = pDesc->getFormula( m_aArguments ); // for input line + if ( !m_aArguments.empty() ) // still arguments there? + aSig = pDesc->getFormula( m_aArguments ); // for input line //@ m_pHelper->setCurrentFormula( aSig ); } } @@ -1106,8 +1106,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(); @@ -1136,9 +1136,9 @@ IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG ) } // ----------------------------------------------------------------------------- -// -------------------------------------------------------------------------- -// Functions for right Page -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Functions for right Page +// -------------------------------------------------------------------------- void FormulaDlg_Impl::SetData(xub_StrLen nFStart,xub_StrLen nNextFStart,xub_StrLen nNextFEnd,xub_StrLen& PrivStart,xub_StrLen& PrivEnd) { xub_StrLen nFEnd; @@ -1181,8 +1181,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; @@ -1218,19 +1218,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); } @@ -1259,10 +1259,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) @@ -1324,7 +1324,7 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin*, pPtr ) aBtnForward.Enable(TRUE); //@ In order to be able to input another function. aTabCtrl.SetCurPageId(TP_FUNCTION); - String aUndoStr = m_pHelper->getCurrentFormula(); // it will be added before a ";" + String aUndoStr = m_pHelper->getCurrentFormula(); // it will be added before a ";" FormEditData* pData = m_pHelper->getFormEditData(); if (!pData) return 0; @@ -1372,10 +1372,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) //in case everything was cleared @@ -1438,10 +1438,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) @@ -1650,7 +1650,7 @@ BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula) { pMEdit->GrabFocus(); xub_StrLen nLen = aFormula.Len(); - BOOL bMatrix = nLen > 3 // Matrix-Formula ? + BOOL bMatrix = nLen > 3 // Matrix-Formula ? && aFormula.GetChar(0) == '{' && aFormula.GetChar(1) == '=' && aFormula.GetChar(nLen-1) == '}'; @@ -1668,7 +1668,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 bStructUpdate=TRUE; return 0; @@ -1736,7 +1736,7 @@ BOOL FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection) { pParaWin->SetRefMode(TRUE); - String aStrEd; + String aStrEd; Edit* pEd = GetCurrRefEdit(); if(pEd!=NULL && pTheRefEdit==NULL) { @@ -1793,8 +1793,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); @@ -1930,7 +1930,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; @@ -1945,7 +1945,7 @@ BOOL FormulaModalDialog::UpdateParaWin(Selection& _rSelection) return m_pImpl->UpdateParaWin(_rSelection); } // ----------------------------------------------------------------------------- -RefEdit* FormulaModalDialog::GetActiveEdit() +RefEdit* FormulaModalDialog::GetActiveEdit() { return m_pImpl->pParaWin->GetActiveEdit(); } @@ -1955,9 +1955,9 @@ void FormulaModalDialog::SetEdSelection() m_pImpl->SetEdSelection(); } -// -------------------------------------------------------------------------- -// Initialisation / General functions for Dialog -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Initialisation / General functions for Dialog +// -------------------------------------------------------------------------- FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent , bool _bSupportFunctionResult @@ -1971,8 +1971,8 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, ,_pHelper,_pFunctionMgr,_pDlg)) { FreeResource(); - if(GetHelpId()==0) //Hack which hides the HelpId for a model Dialog in SfxModelessDialog - SetHelpId(GetUniqueId()); //and will be changed in a UniqueId, + if(GetHelpId()==0) //Hack which hides the HelpId for a model Dialog in SfxModelessDialog + SetHelpId(GetUniqueId()); //and will be changed in a UniqueId, //at this point we reverse it. SetText(m_pImpl->aTitle1); } @@ -2083,7 +2083,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; @@ -2098,7 +2098,7 @@ BOOL FormulaDlg::UpdateParaWin(Selection& _rSelection) return m_pImpl->UpdateParaWin(_rSelection); } // ----------------------------------------------------------------------------- -RefEdit* FormulaDlg::GetActiveEdit() +RefEdit* FormulaDlg::GetActiveEdit() { return m_pImpl->pParaWin->GetActiveEdit(); } @@ -2140,11 +2140,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; @@ -2158,24 +2158,24 @@ void FormEditData::RestoreValues() if (pTemp) { *this = *pTemp; - pTemp->pParent = NULL; // otherwise it would be cleared too! + pTemp->pParent = NULL; // otherwise it would be cleared too! 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 62268699cfc8..98534e1663eb 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -2,7 +2,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 @@ -96,10 +96,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(); @@ -114,7 +114,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 ) ); @@ -135,9 +135,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; @@ -181,7 +181,7 @@ void FuncPage::UpdateFunctionList() aLbFunction.SetUpdateMode( TRUE ); aLbFunction.SelectEntryPos(0); - if(IsVisible()) SelHdl(&aLbFunction); + if(IsVisible()) SelHdl(&aLbFunction); } IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) @@ -249,7 +249,7 @@ String FuncPage::GetSelFunctionName() const { return aLbFunction.GetSelectEntry(); } -const IFunctionDescription* FuncPage::GetFuncDesc( USHORT nPos ) const +const IFunctionDescription* FuncPage::GetFuncDesc( USHORT nPos ) const { // not pretty, but hopefully rare return (const IFunctionDescription*) aLbFunction.GetEntryData(nPos); diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index ac0731a8a3d5..29b0de62991a 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -2,7 +2,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 @@ -55,8 +55,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 ); @@ -73,16 +73,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; @@ -92,24 +92,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 41b89fd34491..e5deee9d5baa 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -2,7 +2,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 @@ -90,8 +90,8 @@ void ValWnd::SetValue( const String& rStrVal ) if ( aStrValue != rStrVal ) { aStrValue = rStrVal; - DrawRect( aRectOut ); // alten Text loeschen - Paint( aRectOut ); // and neu malen + DrawRect( aRectOut ); // alten Text loeschen + Paint( aRectOut ); // and neu malen } } @@ -100,11 +100,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 ) { } @@ -113,10 +113,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; } //---------------------------------------------------------------------------- @@ -125,10 +125,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() ) @@ -136,9 +136,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 ) { @@ -206,16 +206,16 @@ void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt ) /************************************************************************* -#* Member: ArgInput Date:13.01.97 +#* Member: ArgInput Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: ArgInput class constructor +#* Function: ArgInput class constructor #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -228,23 +228,23 @@ ArgInput::ArgInput() } /************************************************************************* -#* Member: InitArgInput Date:13.01.97 +#* Member: InitArgInput Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Initializes the class' Pointer +#* Function: Initializes the class' Pointer #* -#* 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; @@ -270,16 +270,16 @@ void ArgInput::InitArgInput(FixedText* pftArg, } /************************************************************************* -#* Member: SetArgName Date:13.01.97 +#* Member: SetArgName Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Sets the Name for the Argument +#* Function: Sets the Name for the Argument #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::SetArgName(const String &aArg) @@ -288,16 +288,16 @@ void ArgInput::SetArgName(const String &aArg) } /************************************************************************* -#* Member: GetArgName Date:06.02.97 +#* Member: GetArgName Date:06.02.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Returns the Name for the Argument +#* Function: Returns the Name for the Argument #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ String ArgInput::GetArgName() @@ -311,72 +311,72 @@ String ArgInput::GetArgName() /************************************************************************* -#* Member: SetArgName Date:13.01.97 +#* Member: SetArgName Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Sets the Name for the Argument +#* Function: Sets the Name for the 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 Date:13.01.97 +#* Member: SetArgSelection Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Sets up the Selection for the EditBox. +#* Function: Sets up the Selection for the EditBox. #* -#* 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 Date:13.01.97 +#* Member: SetArgSelection Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Returns the Selection for the EditBox. +#* Function: Returns the Selection for the EditBox. #* -#* 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 Date:13.01.97 +#* Member: SetArgSelection Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Replaces the Selection in the EditBox. +#* Function: Replaces the Selection in the EditBox. #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::ReplaceSelOfArg(const String& rStr ) @@ -387,16 +387,16 @@ void ArgInput::ReplaceSelOfArg(const String& rStr ) /************************************************************************* -#* Member: SetArgVal Date:13.01.97 +#* Member: SetArgVal Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Sets the Value for the Argument +#* Function: Sets the Value for the Argument #* -#* Input: String +#* Input: String #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::SetArgVal(const String &aVal) @@ -408,16 +408,16 @@ void ArgInput::SetArgVal(const String &aVal) } /************************************************************************* -#* Member: SetArgName Date:13.01.97 +#* Member: SetArgName Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Returns the Value for the Argument +#* Function: Returns the Value for the Argument #* -#* Input: --- +#* Input: --- #* -#* Output: String +#* Output: String #* #************************************************************************/ String ArgInput::GetArgVal() @@ -431,16 +431,16 @@ String ArgInput::GetArgVal() } /************************************************************************* -#* Member: SetArgName Date:13.01.97 +#* Member: SetArgName Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Hides the Controls +#* Function: Hides the Controls #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::Hide() @@ -455,16 +455,16 @@ void ArgInput::Hide() } /************************************************************************* -#* Member: SetArgName Date:13.01.97 +#* Member: SetArgName Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Casts the Controls again. +#* Function: Casts the Controls again. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::Show() @@ -479,16 +479,16 @@ void ArgInput::Show() } /************************************************************************* -#* Member: FxClick Date:13.01.97 +#* Member: FxClick Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Forwards the Event. +#* Function: Forwards the Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::FxClick() @@ -497,16 +497,16 @@ void ArgInput::FxClick() } /************************************************************************* -#* Member: RefClick Date:13.01.97 +#* Member: RefClick Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Forwards the Event. +#* Function: Forwards the Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::RefClick() @@ -515,16 +515,16 @@ void ArgInput::RefClick() } /************************************************************************* -#* Member: FxFocus Date:13.01.97 +#* Member: FxFocus Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Forwards the Event. +#* Function: Forwards the Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::FxFocus() @@ -533,16 +533,16 @@ void ArgInput::FxFocus() } /************************************************************************* -#* Member: RefFocus Date:13.01.97 +#* Member: RefFocus Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Forwards the Event. +#* Function: Forwards the Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::RefFocus() @@ -551,16 +551,16 @@ void ArgInput::RefFocus() } /************************************************************************* -#* Member: EdFocus Date:13.01.97 +#* Member: EdFocus Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Forwards the Event. +#* Function: Forwards the Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::EdFocus() @@ -569,16 +569,16 @@ void ArgInput::EdFocus() } /************************************************************************* -#* Member: EdModify Date:13.01.97 +#* Member: EdModify Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Forwards the Event. +#* Function: Forwards the Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ArgInput::EdModify() @@ -587,16 +587,16 @@ void ArgInput::EdModify() } /************************************************************************* -#* Handle: FxBtnHdl Date:13.01.97 +#* Handle: FxBtnHdl Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Handle for Fx-Button Click-Event. +#* Function: Handle for Fx-Button Click-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, FxBtnClickHdl, ImageButton*, pBtn ) @@ -607,16 +607,16 @@ IMPL_LINK( ArgInput, FxBtnClickHdl, ImageButton*, pBtn ) } /************************************************************************* -#* Handle: RefBtnClickHdl Date:13.01.97 +#* Handle: RefBtnClickHdl Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Handle for Fx-Button Click-Event. +#* Function: Handle for Fx-Button Click-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, RefBtnClickHdl,RefButton*, pBtn ) @@ -627,16 +627,16 @@ IMPL_LINK( ArgInput, RefBtnClickHdl,RefButton*, pBtn ) } /************************************************************************* -#* Handle: FxBtnFocusHdl Date:13.01.97 +#* Handle: FxBtnFocusHdl Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Handle for Fx-Button Focus-Event. +#* Function: Handle for Fx-Button Focus-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, FxBtnFocusHdl, ImageButton*, pBtn ) @@ -647,16 +647,16 @@ IMPL_LINK( ArgInput, FxBtnFocusHdl, ImageButton*, pBtn ) } /************************************************************************* -#* Handle: RefBtnFocusHdl Date:13.01.97 +#* Handle: RefBtnFocusHdl Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Handle for Fx-Button Focus-Event. +#* Function: Handle for Fx-Button Focus-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, RefBtnFocusHdl,RefButton*, pBtn ) @@ -667,16 +667,16 @@ IMPL_LINK( ArgInput, RefBtnFocusHdl,RefButton*, pBtn ) } /************************************************************************* -#* Handle: EdFocusHdl Date:13.01.97 +#* Handle: EdFocusHdl Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Handle for Fx-Button Focus-Event. +#* Function: Handle for Fx-Button Focus-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, EdFocusHdl, ArgEdit*, pEd ) @@ -687,16 +687,16 @@ IMPL_LINK( ArgInput, EdFocusHdl, ArgEdit*, pEd ) } /************************************************************************* -#* Handle: RefBtnClickHdl Date:13.01.97 +#* Handle: RefBtnClickHdl Date:13.01.97 #*------------------------------------------------------------------------ #* -#* Class: ArgInput +#* Class: ArgInput #* -#* Function: Handle for Fx-Button Focus-Event. +#* Function: Handle for Fx-Button Focus-Event. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd ) @@ -707,19 +707,19 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd ) } /************************************************************************* -#* Member: EditBox Date:20.01.97 +#* Member: EditBox Date:20.01.97 #*------------------------------------------------------------------------ #* -#* Class: EditBox +#* Class: EditBox #* -#* Function: Constructor from Class ArgInput +#* Function: Constructor from Class 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) | @@ -730,16 +730,16 @@ EditBox::EditBox( Window* pParent,WinBits nWinStyle) } /************************************************************************* -#* Member: EditBox Date:20.01.97 +#* Member: EditBox Date:20.01.97 #*------------------------------------------------------------------------ #* -#* Class: EditBox +#* Class: EditBox #* -#* Function: Constructor from Class ArgInput +#* Function: Constructor from Class ArgInput #* -#* Input: Parent, Resource +#* Input: Parent, Resource #* -#* Output: --- +#* Output: --- #* #************************************************************************/ EditBox::EditBox( Window* pParent, const ResId& rResId ) @@ -757,8 +757,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() ); } @@ -771,16 +771,16 @@ EditBox::~EditBox() delete pTheEdit; } /************************************************************************* -#* Member: EditBox Date:20.01.97 +#* Member: EditBox Date:20.01.97 #*------------------------------------------------------------------------ #* -#* Class: EditBox +#* Class: EditBox #* -#* Function: When the seleccion is changed this function will be called +#* Function: When the seleccion is changed this function will be called #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void EditBox::SelectionChanged() @@ -789,17 +789,17 @@ void EditBox::SelectionChanged() } /************************************************************************* -#* Member: EditBox Date:20.05.98 +#* Member: EditBox Date:20.05.98 #*------------------------------------------------------------------------ #* -#* Class: EditBox +#* Class: EditBox #* -#* Function: When the size is changed, MultiLineEdit must -#* be adapted.. +#* Function: When the size is changed, MultiLineEdit must +#* be adapted.. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void EditBox::Resize() @@ -809,18 +809,18 @@ void EditBox::Resize() } /************************************************************************* -#* Member: GetFocus Date:26.05.98 +#* Member: GetFocus Date:26.05.98 #*------------------------------------------------------------------------ #* -#* Class: EditBox +#* Class: EditBox #* -#* Function: When the Control is activated, -#* the Selection is repealed and the Cursor set -#* at the end. +#* Function: When the Control is activated, +#* the Selection is repealed and the Cursor set +#* at the end. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void EditBox::GetFocus() @@ -834,17 +834,17 @@ void EditBox::GetFocus() /************************************************************************* -#* Member: EditBox Date:20.01.97 +#* Member: EditBox Date:20.01.97 #*------------------------------------------------------------------------ #* -#* Class: EditBox +#* Class: EditBox #* -#* Function: When an Event is cleared, this Routine is -#* first called and a PostUserEvent is sent. +#* Function: When an Event is cleared, this Routine is +#* first called and a PostUserEvent is sent. #* -#* Input: Notify-Event +#* Input: Notify-Event #* -#* Output: --- +#* Output: --- #* #************************************************************************/ long EditBox::PreNotify( NotifyEvent& rNEvt ) @@ -883,17 +883,17 @@ long EditBox::PreNotify( NotifyEvent& rNEvt ) } /************************************************************************* -#* Member: EditBox Date:21.01.97 +#* Member: EditBox Date:21.01.97 #*------------------------------------------------------------------------ #* -#* Class: EditBox +#* Class: EditBox #* -#* Function: When an Event cleared wurde, this routine is -#* first called. +#* Function: When an Event cleared wurde, this routine is +#* first called. #* -#* 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 e651dec89ee4..a193750b8c3e 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -2,7 +2,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,7 +41,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 @@ -50,42 +50,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; @@ -117,8 +117,8 @@ void ParaWin::UpdateArgDesc( USHORT nArg ) if ( (nArgs > 0) && (nArg<nArgs) ) { - String aArgDesc; - String aArgName; + String aArgDesc; + String aArgName; SetArgumentDesc( String() ); SetArgumentText( String() ); @@ -159,9 +159,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 @@ -246,7 +246,7 @@ String ParaWin::GetArgument(USHORT no) return aStr; } -String ParaWin::GetActiveArgName() +String ParaWin::GetActiveArgName() { String aStr; if(nArgs>0 && nEdFocus!=NOT_FOUND) @@ -305,7 +305,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 ); @@ -379,10 +379,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() @@ -405,7 +405,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 f6367c6259db..484ca5393766 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 55c92e5ff436..5aedaa367c34 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -2,7 +2,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,7 +45,7 @@ namespace formula { //============================================================================ -#define NOT_FOUND 0xffff +#define NOT_FOUND 0xffff //============================================================================ class IFunctionDescription; class IControlReferenceHandler; @@ -54,51 +54,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; @@ -110,52 +110,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 eda2bfcecda9..78be77040b88 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 ea2569248823..3bbd18283486 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -2,7 +2,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 @@ -105,13 +105,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); @@ -162,7 +162,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 @@ -195,7 +195,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 98a0be4b84cc..d5677fd33f6a 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -2,7 +2,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,11 +46,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 ); @@ -68,10 +68,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(); }; //============================================================================ @@ -81,16 +81,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* ); @@ -98,21 +98,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; } |