diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-03-02 10:28:07 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-03 07:07:54 +0000 |
| commit | be326abdd5371e9f8715a064289bcff64af47bdb (patch) | |
| tree | 082a4e811efa1044526208daa8ade2957a2d780e /sc/source/ui/namedlg | |
| parent | 74c93c91ebce735e0defacc30054ca809c2db02d (diff) | |
remove double defines
search ABS_* defines and replace with equal
SC*_* defines from address.hxx
then removed double defines
Change-Id: I1a5385daf6e1fb6f959f142c04f2515e7b85a80e
Signed-off-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-on: https://gerrit.libreoffice.org/22826
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/ui/namedlg')
| -rw-r--r-- | sc/source/ui/namedlg/namedefdlg.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/namedlg/namedlg.cxx | 10 |
2 files changed, 3 insertions, 19 deletions
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 7c813258f283..71760dffcccd 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -24,14 +24,6 @@ #include "tokenarray.hxx" #include "sc.hrc" -// defines ------------------------------------------------------------------- - -#define ABS_SREF SCA_VALID \ - | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ - | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D - ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* pViewData, const std::map<OUString, ScRangeName*>& aRangeMap, const ScAddress& aCursorPos, const bool bUndo ) @@ -83,7 +75,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* p ScRange aRange; pViewData->GetSimpleArea( aRange ); - OUString aAreaStr(aRange.Format(ABS_DREF3D, mpDoc, + OUString aAreaStr(aRange.Format(SCR_ABS_3D, mpDoc, ScAddress::Details(mpDoc->GetAddressConvention(), 0, 0))); m_pEdRange->SetText( aAreaStr ); @@ -310,7 +302,7 @@ void ScNameDefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if ( rRef.aStart != rRef.aEnd ) RefInputStart(m_pEdRange); - OUString aRefStr(rRef.Format(ABS_DREF3D, pDocP, + OUString aRefStr(rRef.Format(SCR_ABS_3D, pDocP, ScAddress::Details(pDocP->GetAddressConvention(), 0, 0))); m_pEdRange->SetRefString( aRefStr ); } diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 3d5f0aafa665..dfc00bed1d49 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -39,14 +39,6 @@ #include <map> -// defines ------------------------------------------------------------------- - -#define ABS_SREF SCA_VALID \ - | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ - | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D - //logic ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, @@ -189,7 +181,7 @@ void ScNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if ( rRef.aStart != rRef.aEnd ) RefInputStart(m_pEdAssign); - OUString aRefStr(rRef.Format(ABS_DREF3D, pDocP, + OUString aRefStr(rRef.Format(SCR_ABS_3D, pDocP, ScAddress::Details(pDocP->GetAddressConvention(), 0, 0))); m_pEdAssign->SetRefString( aRefStr ); } |