sc/source/ui/condformat/condformatdlg.cxx | 10 ++--------
sc/source/ui/dbgui/dbnamdlg.cxx | 12 +++---------
sc/source/ui/miscdlgs/acredlin.cxx | 8 +-------
sc/source/ui/miscdlgs/highred.cxx | 12 ++----------
sc/source/ui/miscdlgs/simpref.cxx | 8 +-------
sc/source/ui/namedlg/namedefdlg.cxx | 12 ++----------
sc/source/ui/namedlg/namedlg.cxx | 10 +---------
7 files changed, 12 insertions(+), 60 deletions(-)
New commits:
commit be326abdd5371e9f8715a064289bcff64af47bdb
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Wed Mar 2 10:28:07 2016 +0100
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+loger...@ok.de>
Reviewed-on: https://gerrit.libreoffice.org/22826
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 6d2e05b..5bc73a1 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -525,12 +525,6 @@ bool ScCondFormatDlg::IsRefInputMode() const
return mpEdRange->IsEnabled();
}
-#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
-
void ScCondFormatDlg::SetReference(const ScRange& rRef, ScDocument*)
{
formula::RefEdit* pEdit = mpLastEdit;
@@ -544,9 +538,9 @@ void ScCondFormatDlg::SetReference(const ScRange& rRef,
ScDocument*)
sal_uInt16 n = 0;
if (mpLastEdit && mpLastEdit != mpEdRange)
- n = ABS_DREF3D;
+ n = SCR_ABS_3D;
else
- n = ABS_DREF;
+ n = SCR_ABS;
OUString aRefStr(rRef.Format(n, mpViewData->GetDocument(),
ScAddress::Details(mpViewData->GetDocument()->GetAddressConvention(), 0, 0)));
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 422e7ab..5b1ba88 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -33,12 +33,6 @@
#include "dbnamdlg.hxx"
#include <dbdocfun.hxx>
-#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
-
class DBSaveData;
static DBSaveData* pSaveObj = nullptr;
@@ -225,7 +219,7 @@ void ScDbNameDlg::Init()
theCurArea = ScRange( ScAddress( nStartCol, nStartRow, nStartTab ),
ScAddress( nEndCol, nEndRow, nEndTab ) );
- theAreaStr = theCurArea.Format(ABS_DREF3D, pDoc, aAddrDetails);
+ theAreaStr = theCurArea.Format(SCR_ABS_3D, pDoc, aAddrDetails);
if ( pDBColl )
{
@@ -301,7 +295,7 @@ void ScDbNameDlg::SetReference( const ScRange& rRef,
ScDocument* pDocP )
theCurArea = rRef;
- OUString aRefStr(theCurArea.Format(ABS_DREF3D, pDocP, aAddrDetails));
+ OUString aRefStr(theCurArea.Format(SCR_ABS_3D, pDocP, aAddrDetails));
m_pEdAssign->SetRefString( aRefStr );
m_pOptions->Enable();
m_pBtnAdd->Enable();
@@ -370,7 +364,7 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName )
pData->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd );
theCurArea = ScRange( ScAddress( nColStart, nRowStart, nTab ),
ScAddress( nColEnd, nRowEnd, nTab ) );
- OUString theArea(theCurArea.Format(ABS_DREF3D, pDoc, aAddrDetails));
+ OUString theArea(theCurArea.Format(SCR_ABS_3D, pDoc, aAddrDetails));
m_pEdAssign->SetText( theArea );
m_pBtnAdd->SetText( aStrModify );
m_pBtnHeader->Check( pData->HasHeader() );
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx
b/sc/source/ui/miscdlgs/acredlin.cxx
index 9afd0aa..ce7b2f2 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -41,12 +41,6 @@
// 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
-
#define RD_SPECIAL_NONE 0
#define RD_SPECIAL_CONTENT 1
#define RD_SPECIAL_VISCONTENT 2
@@ -257,7 +251,7 @@ void ScAcceptChgDlg::Init()
if( !aChangeViewSet.GetTheRangeList().empty() )
{
const ScRange* pRangeEntry = aChangeViewSet.GetTheRangeList().front();
- OUString aRefStr(pRangeEntry->Format(ABS_DREF3D, pDoc));
+ OUString aRefStr(pRangeEntry->Format(SCR_ABS_3D, pDoc));
pTPFilter->SetRange(aRefStr);
}
diff --git a/sc/source/ui/miscdlgs/highred.cxx
b/sc/source/ui/miscdlgs/highred.cxx
index dd8f2fc..927bf3d 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -28,14 +28,6 @@
#include <vcl/msgbox.hxx>
#include <sfx2/app.hxx>
-// 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
-
// class ScHighlightChgDlg
ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW,
vcl::Window* pParent,
@@ -134,7 +126,7 @@ void ScHighlightChgDlg::Init()
if ( !aChangeViewSet.GetTheRangeList().empty() )
{
const ScRange* pRangeEntry = aChangeViewSet.GetTheRangeList().front();
- OUString aRefStr(pRangeEntry->Format(ABS_DREF3D, pDoc));
+ OUString aRefStr(pRangeEntry->Format(SCR_ABS_3D, pDoc));
m_pFilterCtr->SetRange(aRefStr);
}
m_pFilterCtr->Enable();
@@ -150,7 +142,7 @@ void ScHighlightChgDlg::SetReference( const ScRange& rRef,
ScDocument* pDocP )
{
if ( rRef.aStart != rRef.aEnd )
RefInputStart(m_pEdAssign);
- OUString aRefStr(rRef.Format(ABS_DREF3D, pDocP,
pDocP->GetAddressConvention()));
+ OUString aRefStr(rRef.Format(SCR_ABS_3D, pDocP,
pDocP->GetAddressConvention()));
m_pEdAssign->SetRefString( aRefStr );
m_pFilterCtr->SetRange(aRefStr);
}
diff --git a/sc/source/ui/miscdlgs/simpref.cxx
b/sc/source/ui/miscdlgs/simpref.cxx
index efb13fb..0c56888 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -28,12 +28,6 @@
#include "simpref.hxx"
#include "scmod.hxx"
-#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
-
ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW,
vcl::Window* pParent)
: ScAnyRefDlg(pB, pCW, pParent, "SimpleRefDialog",
"modules/scalc/ui/simplerefdialog.ui")
,
@@ -108,7 +102,7 @@ void ScSimpleRefDlg::SetReference( const ScRange& rRef,
ScDocument* pDocP )
aRefStr = aAdr.Format(SCA_ABS_3D, pDocP,
pDocP->GetAddressConvention());
}
else
- aRefStr = theCurArea.Format(ABS_DREF3D, pDocP,
pDocP->GetAddressConvention());
+ aRefStr = theCurArea.Format(SCR_ABS_3D, pDocP,
pDocP->GetAddressConvention());
if ( bMultiSelection )
{
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx
b/sc/source/ui/namedlg/namedefdlg.cxx
index 7c81325..71760df 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 3d5f0aa..dfc00be 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 );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
