summaryrefslogtreecommitdiff
path: root/sc/source/ui/miscdlgs/solvrdlg.cxx
diff options
context:
space:
mode:
authorTomaž Vajngerl <quikee@gmail.com>2013-07-10 20:54:33 +0200
committerTomaž Vajngerl <quikee@gmail.com>2013-07-14 22:25:20 +0200
commitf879676b3b48477eb0d7de96efd67209e9ec74fa (patch)
tree76924eeaf3817a02c6f8a2d513a2162fb181dd56 /sc/source/ui/miscdlgs/solvrdlg.cxx
parentc06ddaa0d7b97ef4a6738b5a5ce192e31d6e0d0d (diff)
If you do DRY don't do it with a MACRO.
Change-Id: I02f5d3c0540afeb3d925e605f1233f40d4e26370
Diffstat (limited to 'sc/source/ui/miscdlgs/solvrdlg.cxx')
-rw-r--r--sc/source/ui/miscdlgs/solvrdlg.cxx26
1 files changed, 12 insertions, 14 deletions
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 80395f1f850b..b7eae4771bff 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -32,15 +32,15 @@
#define _SOLVRDLG_CXX
#include "solvrdlg.hxx"
-#undef _SOLVERDLG_CXX
+#undef _SOLVRDLG_CXX
-
-#define ERRORBOX(s) ErrorBox( this, WinBits( WB_OK | WB_DEF_OK), s ).Execute()
-
-
-//============================================================================
-// class ScSolverDlg
-//----------------------------------------------------------------------------
+namespace
+{
+ void lclErrorDialog( Window* pParent, OUString aString )
+ {
+ ErrorBox( pParent, WinBits( WB_OK | WB_DEF_OK), aString ).Execute();
+ }
+}
ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
ScDocument* pDocument,
@@ -165,22 +165,22 @@ void ScSolverDlg::RaiseError( ScSolverErr eError )
switch ( eError )
{
case SOLVERR_NOFORMULA:
- ERRORBOX( errMsgNoFormula );
+ lclErrorDialog( this, errMsgNoFormula );
m_pEdFormulaCell->GrabFocus();
break;
case SOLVERR_INVALID_FORMULA:
- ERRORBOX( errMsgInvalidForm );
+ lclErrorDialog( this, errMsgInvalidForm );
m_pEdFormulaCell->GrabFocus();
break;
case SOLVERR_INVALID_VARIABLE:
- ERRORBOX( errMsgInvalidVar );
+ lclErrorDialog( this, errMsgInvalidVar );
m_pEdVariableCell->GrabFocus();
break;
case SOLVERR_INVALID_TARGETVALUE:
- ERRORBOX( errMsgInvalidVal );
+ lclErrorDialog( this, errMsgInvalidVal );
m_pEdTargetVal->GrabFocus();
break;
}
@@ -293,6 +293,4 @@ IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl)
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */