diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-21 21:44:01 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-22 00:24:27 +0100 |
| commit | 278c53c93333bed24a74c4c1931e725b64deef02 (patch) | |
| tree | 328054d29429d5210bd4c06edd1b2f7de54d800f /reportdesign | |
| parent | ac5455a6883b9a774a13d9a29267669fe4d5c38d (diff) | |
restructure the code a bit more
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/Formula.hxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index c09e06b33354..184d25df0f01 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -60,7 +60,7 @@ FormulaDialog::FormulaDialog(Window* pParent , const ::boost::shared_ptr< IFunctionManager >& _pFunctionMgr , const ::rtl::OUString& _sFormula , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet) - : FormulaModalDialog( pParent, false,false,false,this,_pFunctionMgr.get(),this) + : FormulaModalDialog( pParent, false,false,false,_pFunctionMgr.get(),this) ,m_aFunctionManager(_pFunctionMgr) ,m_pFormulaData(new FormEditData()) ,m_pAddField(NULL) diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index a297027517ed..623d1c73bd38 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -30,7 +30,6 @@ #define RPTUI_FORMULA_HXX #include <formula/formula.hxx> -#include <formula/IFunctionDescription.hxx> #include <formula/IControlReferenceHandler.hxx> #include <boost/shared_ptr.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -45,8 +44,7 @@ class FunctionManager; class OAddFieldWindow; //============================================================================ -class FormulaDialog : public formula::IFormulaEditorHelper, - public formula::FormulaModalDialog, +class FormulaDialog : public formula::FormulaModalDialog, public formula::IControlReferenceHandler { ::boost::shared_ptr< formula::IFunctionManager > m_aFunctionManager; |