diff options
Diffstat (limited to 'patches/scsolver/scsolver-source-inc-dialog-hxx.diff')
| -rw-r--r-- | patches/scsolver/scsolver-source-inc-dialog-hxx.diff | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/patches/scsolver/scsolver-source-inc-dialog-hxx.diff b/patches/scsolver/scsolver-source-inc-dialog-hxx.diff index e2caf9564..fb2331066 100644 --- a/patches/scsolver/scsolver-source-inc-dialog-hxx.diff +++ b/patches/scsolver/scsolver-source-inc-dialog-hxx.diff @@ -1,6 +1,6 @@ --- /dev/null +++ scsolver/source/inc/dialog.hxx -@@ -0,0 +1,224 @@ +@@ -0,0 +1,228 @@ +/************************************************************************* + * + * The Contents of this file are made available subject to @@ -74,14 +74,13 @@ +class WindowFocusListener; +class WindowMouseListener; +class ConstListBoxListener; -+ +class OKCancelBtnListener; ++class ConstDlgCloseAction; ++class SolverDlgCloseAction; + -+ -+//--------------------------------------------------------------------------- -+// Class ConstEditDialog -+ -+ ++/** ++ * Constraint input dialog. ++ */ +class ConstEditDialog : public BaseDialog +{ +public: @@ -90,6 +89,7 @@ + virtual const rtl::OUString getDialogName() const { return ascii( "ConstEditDialog" ); } + virtual void setVisible( bool ); + virtual bool doneRangeSelection() const; ++ virtual void close(); + + void initialize(); + void reset(); @@ -124,11 +124,13 @@ + OKCancelBtnListener* m_pCancelListener; + RngBtnListener* m_pLeftRngListener; + RngBtnListener* m_pRightRngListener; ++ TopWindowListener* m_pTopWindowListener; ++ ConstDlgCloseAction* m_pCloseAction; +}; + -+//--------------------------------------------------------------------------- -+// Class SolverDialog -+ ++/** ++ * Main solver dialog. ++ */ +class SolverDialog : public BaseDialog +{ + @@ -139,15 +141,15 @@ + virtual const rtl::OUString getDialogName() const { return ascii( "SolverDialog" ); } + virtual void setVisible( bool ); + virtual bool doneRangeSelection() const { return true; } ++ virtual void close(); + + void initialize(); -+ + + ConstEditDialog* getConstEditDialog(); -+ OptionDialog* getOptionDialog(); ++ OptionDialog* getOptionDialog(); + + sal_Int16 getSelectedConstraintPos(); -+ ++ + Reference< awt::XTextComponent > getXTextComponentFromWidget( const rtl::OUString& ) const; + + rtl::OUString getTargetCellAddress() const; @@ -178,6 +180,8 @@ + void saveModelToDocument(); + void loadModelFromDocument(); + ++ void updateWidgets(); ++ + ResMgr& GetResMgr(); + +protected: @@ -198,9 +202,9 @@ + std::auto_ptr<MessageDialog> m_pSolFoundDlg; + + // Action Listeners ++ TopWindowListener* m_pTopWindowListener; + RngBtnListener* m_pTargetRngListener; + RngBtnListener* m_pVarCellsRngListener; -+ WindowMouseListener* m_pWindowMouseListener; + SolveBtnListener* m_pSolveListener; + CloseBtnListener* m_pOKListener; + SaveBtnListener* m_pSaveListener; @@ -211,8 +215,8 @@ + ConstEditBtnListener* m_pConstAddListener; + ConstEditBtnListener* m_pConstChangeListener; + ConstEditBtnListener* m_pConstDeleteListener; -+ WindowFocusListener* m_pWindowFocusListener; + ConstListBoxListener* m_pConstListBoxListener; ++ SolverDlgCloseAction* m_pCloseAction; + + // Constraint + std::vector< ConstraintString > m_aConstraint; |