[Libreoffice-commits] core.git: 2 commits - basic/source editeng/source include/basic include/editeng sc/source sd/qa sd/source svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Nov 17 07:10:12 UTC 2017
basic/source/sbx/sbxcurr.cxx | 12 +++++------
basic/source/sbx/sbxint.cxx | 30 ++++++++++++++--------------
editeng/source/editeng/editdoc.cxx | 2 -
editeng/source/editeng/impedit2.cxx | 26 +++++++++++-------------
editeng/source/editeng/impedit3.cxx | 12 +++++------
editeng/source/outliner/outliner.cxx | 2 -
editeng/source/uno/unotext.cxx | 4 +--
include/basic/sbxdef.hxx | 6 -----
include/editeng/eeitem.hxx | 23 +++++++++++++--------
sc/source/filter/xcl97/xcl97rec.cxx | 2 -
sc/source/ui/drawfunc/drtxtob.cxx | 14 ++++---------
sd/qa/unit/import-tests.cxx | 2 -
sd/qa/unit/misc-tests.cxx | 4 +--
sd/source/core/stlsheet.cxx | 2 -
sd/source/ui/view/drtxtob.cxx | 7 ++----
sd/source/ui/view/drtxtob1.cxx | 4 +--
sd/source/ui/view/drviews3.cxx | 5 +---
sd/source/ui/view/drviewsf.cxx | 16 +++++---------
svx/source/svdraw/svdoashp.cxx | 2 -
svx/source/svdraw/svdotextdecomposition.cxx | 2 -
sw/source/uibase/shells/annotsh.cxx | 7 ++----
sw/source/uibase/shells/drwtxtex.cxx | 7 ++----
22 files changed, 89 insertions(+), 102 deletions(-)
New commits:
commit 93117d454afc4d7402ae791526e66330f981c4d0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Nov 15 14:20:57 2017 +0200
TypedWhichId for EE_PARA* constants
Change-Id: I64d1765336f39c3e3ded4d58ebdee80e97624276
Reviewed-on: https://gerrit.libreoffice.org/44799
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 8db5de5780d8..950db73bc07e 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1816,7 +1816,7 @@ ContentAttribs::ContentAttribs( SfxItemPool& rPool )
SvxTabStop ContentAttribs::FindTabStop( sal_Int32 nCurPos, sal_uInt16 nDefTab )
{
- const SvxTabStopItem& rTabs = static_cast<const SvxTabStopItem&>( GetItem( EE_PARA_TABS ) );
+ const SvxTabStopItem& rTabs = GetItem( EE_PARA_TABS );
for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ )
{
const SvxTabStop& rTab = rTabs[i];
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index a8571b69a200..0b24721a93c7 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2054,7 +2054,7 @@ SvxAdjust ImpEditEngine::GetJustification( sal_Int32 nPara ) const
if ( !aStatus.IsOutliner() )
{
- eJustification = static_cast<const SvxAdjustItem&>(GetParaAttrib( nPara, EE_PARA_JUST )).GetAdjust();
+ eJustification = GetParaAttrib( nPara, EE_PARA_JUST ).GetAdjust();
if ( IsRightToLeft( nPara ) )
{
@@ -2069,15 +2069,13 @@ SvxAdjust ImpEditEngine::GetJustification( sal_Int32 nPara ) const
SvxCellJustifyMethod ImpEditEngine::GetJustifyMethod( sal_Int32 nPara ) const
{
- const SvxJustifyMethodItem& rItem = static_cast<const SvxJustifyMethodItem&>(
- GetParaAttrib(nPara, EE_PARA_JUST_METHOD));
+ const SvxJustifyMethodItem& rItem = GetParaAttrib(nPara, EE_PARA_JUST_METHOD);
return static_cast<SvxCellJustifyMethod>(rItem.GetEnumValue());
}
SvxCellVerJustify ImpEditEngine::GetVerJustification( sal_Int32 nPara ) const
{
- const SvxVerJustifyItem& rItem = static_cast<const SvxVerJustifyItem&>(
- GetParaAttrib(nPara, EE_PARA_VER_JUST));
+ const SvxVerJustifyItem& rItem = GetParaAttrib(nPara, EE_PARA_VER_JUST);
return static_cast<SvxCellVerJustify>(rItem.GetEnumValue());
}
@@ -3600,8 +3598,8 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion )
if ( pPortion->IsVisible() )
{
- const SvxULSpaceItem& rULSpace = static_cast<const SvxULSpaceItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE ));
- const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
+ const SvxULSpaceItem& rULSpace = pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE );
+ const SvxLineSpacingItem& rLSItem = pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix )
? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
@@ -3671,7 +3669,7 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, bool bSmart
EditPaM aPaM;
aPaM.SetNode( pPortion->GetNode() );
- const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
+ const SvxLineSpacingItem& rLSItem = pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix )
? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
@@ -3698,7 +3696,7 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, bool bSmart
if ( !pLine ) // may happen only in the range of SA!
{
#if OSL_DEBUG_LEVEL > 0
- const SvxULSpaceItem& rULSpace = static_cast<const SvxULSpaceItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE ));
+ const SvxULSpaceItem& rULSpace = pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE );
OSL_ENSURE( nY+GetYValue( rULSpace.GetLower() ) >= aDocPos.Y() , "Index in no line, GetPaM ?" );
#endif
aPaM.SetIndex( pPortion->GetNode()->Len() );
@@ -4086,8 +4084,8 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
if ( !aStatus.IsOutliner() )
{
- const SvxULSpaceItem& rULItem = static_cast<const SvxULSpaceItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE ));
- const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
+ const SvxULSpaceItem& rULItem = pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE );
+ const SvxLineSpacingItem& rLSItem = pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
sal_Int32 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
if ( nSBL )
@@ -4117,8 +4115,8 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
ParaPortion* pPrev = GetParaPortions().SafeGetObject( nPortion-1 );
if (pPrev)
{
- const SvxULSpaceItem& rPrevULItem = static_cast<const SvxULSpaceItem&>(pPrev->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE ));
- const SvxLineSpacingItem& rPrevLSItem = static_cast<const SvxLineSpacingItem&>(pPrev->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
+ const SvxULSpaceItem& rPrevULItem = pPrev->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE );
+ const SvxLineSpacingItem& rPrevLSItem = pPrev->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
// In relation between WinWord6/Writer3:
// With a proportional line spacing the paragraph spacing is
@@ -4188,7 +4186,7 @@ tools::Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_Int32
long nY = pPortion->GetFirstLineOffset();
- const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
+ const SvxLineSpacingItem& rLSItem = pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix )
? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index dece17fbb7a9..f03af5f20595 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -645,7 +645,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
sal_Int32 nMinLabelWidth = 0;
sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pNode, &nSpaceBefore, &nMinLabelWidth );
const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pNode );
- const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>( pNode->GetContentAttribs().GetItem( EE_PARA_SBL ) );
+ const SvxLineSpacingItem& rLSItem = pNode->GetContentAttribs().GetItem( EE_PARA_SBL );
const bool bScriptSpace = pNode->GetContentAttribs().GetItem( EE_PARA_ASIANCJKSPACING ).GetValue();
const short nInvalidDiff = pParaPortion->GetInvalidDiff();
@@ -1686,7 +1686,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion )
sal_Int32 nSpaceBefore = 0;
sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pParaPortion->GetNode(), &nSpaceBefore );
const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pParaPortion->GetNode() );
- const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pParaPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
+ const SvxLineSpacingItem& rLSItem = pParaPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
long nStartX = GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBefore );
tools::Rectangle aBulletArea = tools::Rectangle( Point(), Point() );
@@ -3028,7 +3028,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po
Point aParaStart( aStartPos );
- const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
+ const SvxLineSpacingItem& rLSItem = pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix )
? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
bool bPaintBullet (false);
@@ -3785,7 +3785,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po
if ( !aStatus.IsOutliner() )
{
- const SvxULSpaceItem& rULItem = static_cast<const SvxULSpaceItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE ));
+ const SvxULSpaceItem& rULItem = pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE );
long nUL = GetYValue( rULItem.GetLower() );
if ( !IsVertical() )
aStartPos.Y() += nUL;
@@ -4148,11 +4148,11 @@ long ImpEditEngine::CalcVertLineSpacing(Point& rStartPos) const
const ParaPortion* pPortion = rParaPortions[i];
nTotalOccupiedHeight += pPortion->GetFirstLineOffset();
- const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem(EE_PARA_SBL));
+ const SvxLineSpacingItem& rLSItem = pPortion->GetNode()->GetContentAttribs().GetItem(EE_PARA_SBL);
sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix )
? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
- const SvxULSpaceItem& rULItem = static_cast<const SvxULSpaceItem&>(pPortion->GetNode()->GetContentAttribs().GetItem(EE_PARA_ULSPACE));
+ const SvxULSpaceItem& rULItem = pPortion->GetNode()->GetContentAttribs().GetItem(EE_PARA_ULSPACE);
long nUL = GetYValue( rULItem.GetLower() );
const EditLineList& rLines = pPortion->GetLines();
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 341d84984d55..d9985a5479ab 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1540,7 +1540,7 @@ tools::Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, boo
if ( bAdjust && !bOutlineMode )
{
// Adjust when centered or align right
- const SvxAdjustItem& rItem = static_cast<const SvxAdjustItem&>(pEditEngine->GetParaAttrib( nPara, EE_PARA_JUST ));
+ const SvxAdjustItem& rItem = pEditEngine->GetParaAttrib( nPara, EE_PARA_JUST );
if ( ( !pEditEngine->IsRightToLeft( nPara ) && ( rItem.GetAdjust() != SvxAdjust::Left ) ) ||
( pEditEngine->IsRightToLeft( nPara ) && ( rItem.GetAdjust() != SvxAdjust::Right ) ) )
{
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 4902128db4ee..78307abe011d 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -88,8 +88,8 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap()
SVX_UNOEDIT_PARA_PROPERTIES,
{ OUString("TextField"), EE_FEATURE_FIELD, cppu::UnoType<text::XTextField>::get(), beans::PropertyAttribute::READONLY, 0 },
{ OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
- { OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
+ { OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
return aSvxTextPortionPropertyMap;
diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx
index afc0eb8cd715..b9933cb3ad82 100644
--- a/include/editeng/eeitem.hxx
+++ b/include/editeng/eeitem.hxx
@@ -23,13 +23,18 @@
#include <svl/solar.hrc>
#include <svl/typedwhich.hxx>
+class SfxBoolItem;
+class SfxInt16Item;
+class SvxAdjustItem;
class SvxForbiddenRuleItem;
class SvxFrameDirectionItem;
class SvxHangingPunctuationItem;
-class SfxBoolItem;
-class SfxInt16Item;
+class SvxLineSpacingItem;
class SvxLRSpaceItem;
+class SvXMLAttrContainerItem;
class SvxScriptSpaceItem;
+class SvxTabStopItem;
+class SvxULSpaceItem;
/*
* NOTE: Changes in this file will probably require
@@ -42,7 +47,7 @@ class SvxScriptSpaceItem;
// Paragraph attributes:
#define EE_PARA_START (EE_ITEMS_START+0)
#define EE_PARA_WRITINGDIR TypedWhichId<SvxFrameDirectionItem>(EE_ITEMS_START+0)
-#define EE_PARA_XMLATTRIBS (EE_ITEMS_START+1)
+#define EE_PARA_XMLATTRIBS TypedWhichId<SvXMLAttrContainerItem>(EE_ITEMS_START+1)
#define EE_PARA_HANGINGPUNCTUATION TypedWhichId<SvxHangingPunctuationItem>(EE_ITEMS_START+2)
#define EE_PARA_FORBIDDENRULES TypedWhichId<SvxForbiddenRuleItem>(EE_ITEMS_START+3)
#define EE_PARA_ASIANCJKSPACING TypedWhichId<SvxScriptSpaceItem>(EE_ITEMS_START+4)
@@ -53,12 +58,12 @@ class SvxScriptSpaceItem;
#define EE_PARA_OUTLLEVEL TypedWhichId<SfxInt16Item>(EE_ITEMS_START+9)
#define EE_PARA_BULLET TypedWhichId<SvxBulletItem>(EE_ITEMS_START+10)
#define EE_PARA_LRSPACE TypedWhichId<SvxLRSpaceItem>(EE_ITEMS_START+11)
-#define EE_PARA_ULSPACE (EE_ITEMS_START+12)
-#define EE_PARA_SBL (EE_ITEMS_START+13)
-#define EE_PARA_JUST (EE_ITEMS_START+14)
-#define EE_PARA_TABS (EE_ITEMS_START+15)
-#define EE_PARA_JUST_METHOD (EE_ITEMS_START+16)
-#define EE_PARA_VER_JUST (EE_ITEMS_START+17)
+#define EE_PARA_ULSPACE TypedWhichId<SvxULSpaceItem>(EE_ITEMS_START+12)
+#define EE_PARA_SBL TypedWhichId<SvxLineSpacingItem>(EE_ITEMS_START+13)
+#define EE_PARA_JUST TypedWhichId<SvxAdjustItem>(EE_ITEMS_START+14)
+#define EE_PARA_TABS TypedWhichId<SvxTabStopItem>(EE_ITEMS_START+15)
+#define EE_PARA_JUST_METHOD TypedWhichId<SvxJustifyMethodItem>(EE_ITEMS_START+16)
+#define EE_PARA_VER_JUST TypedWhichId<SvxVerJustifyItem>(EE_ITEMS_START+17)
#define EE_PARA_END (EE_ITEMS_START+17)
// Character attributes:
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 8ac8765f246c..6109de2251f4 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -737,7 +737,7 @@ static sal_uInt8 lcl_GetHorAlignFromItemSet( const SfxItemSet& rItemSet )
{
sal_uInt8 nHorAlign = EXC_OBJ_HOR_LEFT;
- switch( static_cast< const SvxAdjustItem& >( rItemSet.Get( EE_PARA_JUST ) ).GetAdjust() )
+ switch( rItemSet.Get( EE_PARA_JUST ).GetAdjust() )
{
case SvxAdjust::Left: nHorAlign = EXC_OBJ_HOR_LEFT; break;
case SvxAdjust::Center: nHorAlign = EXC_OBJ_HOR_CENTER; break;
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 597c26df9493..6f6d034af866 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -761,8 +761,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
case SID_PARASPACE_INCREASE:
case SID_PARASPACE_DECREASE:
{
- SvxULSpaceItem aULSpace(
- static_cast< const SvxULSpaceItem& >( aEditAttr.Get( EE_PARA_ULSPACE ) ) );
+ SvxULSpaceItem aULSpace( aEditAttr.Get( EE_PARA_ULSPACE ) );
sal_uInt16 nUpper = aULSpace.GetUpper();
sal_uInt16 nLower = aULSpace.GetLower();
@@ -1002,7 +1001,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_ITALIC, nScript );
// Alignment
- SvxAdjust eAdj = static_cast<const SvxAdjustItem&>(aAttrSet.Get(EE_PARA_JUST)).GetAdjust();
+ SvxAdjust eAdj = aAttrSet.Get(EE_PARA_JUST).GetAdjust();
switch( eAdj )
{
case SvxAdjust::Left:
@@ -1048,8 +1047,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
if ( eState == SfxItemState::DONTCARE )
rDestSet.InvalidateItem(SID_ATTR_PARA_LRSPACE);
//xuxu for Line Space
- SvxLineSpacingItem aLineSP = static_cast<const SvxLineSpacingItem&>(aAttrSet.
- Get( EE_PARA_SBL ));
+ SvxLineSpacingItem aLineSP = aAttrSet.Get( EE_PARA_SBL );
aLineSP.SetWhich(SID_ATTR_PARA_LINESPACE);
rDestSet.Put(aLineSP);
Invalidate(SID_ATTR_PARA_LINESPACE);
@@ -1057,8 +1055,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
if ( eState == SfxItemState::DONTCARE )
rDestSet.InvalidateItem(SID_ATTR_PARA_LINESPACE);
//xuxu for UL Space
- SvxULSpaceItem aULSP = static_cast<const SvxULSpaceItem&>(aAttrSet.
- Get( EE_PARA_ULSPACE ));
+ SvxULSpaceItem aULSP = aAttrSet.Get( EE_PARA_ULSPACE );
aULSP.SetWhich(SID_ATTR_PARA_ULSPACE);
rDestSet.Put(aULSP);
Invalidate(SID_ATTR_PARA_ULSPACE);
@@ -1079,8 +1076,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
// Line spacing
- sal_uInt16 nLineSpace = static_cast<const SvxLineSpacingItem&>(aAttrSet.
- Get( EE_PARA_SBL )).GetPropLineSpace();
+ sal_uInt16 nLineSpace = aAttrSet.Get( EE_PARA_SBL ).GetPropLineSpace();
switch( nLineSpace )
{
case 100:
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index d80981457188..f27a9ec685b2 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -348,7 +348,7 @@ void SdImportTest::testN759180()
CPPUNIT_ASSERT(pTxtObj);
std::vector<EECharAttrib> rLst;
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
- const SvxULSpaceItem *pULSpace = dynamic_cast<const SvxULSpaceItem *>(aEdit.GetParaAttribs(0).GetItem(EE_PARA_ULSPACE));
+ const SvxULSpaceItem *pULSpace = aEdit.GetParaAttribs(0).GetItem(EE_PARA_ULSPACE);
CPPUNIT_ASSERT(pULSpace);
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Para bottom spacing is wrong!", static_cast<sal_uInt16>(0), pULSpace->GetLower());
aEdit.GetCharAttribs(1, rLst);
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 60be08f83c09..78cf97a95361 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -227,7 +227,7 @@ void SdMiscTest::testTdf99396TextEdit()
{
const EditTextObject& rEdit = pTableObject->getText(0)->GetOutlinerParaObject()->GetTextObject();
const SfxItemSet& rParaAttribs = rEdit.GetParaAttribs(0);
- auto pAdjust = static_cast<const SvxAdjustItem*>(rParaAttribs.GetItem(EE_PARA_JUST));
+ auto pAdjust = rParaAttribs.GetItem(EE_PARA_JUST);
CPPUNIT_ASSERT_EQUAL(SvxAdjust::Right, pAdjust->GetAdjust());
}
@@ -245,7 +245,7 @@ void SdMiscTest::testTdf99396TextEdit()
{
const EditTextObject& rEdit = pTableObject->getText(0)->GetOutlinerParaObject()->GetTextObject();
const SfxItemSet& rParaAttribs = rEdit.GetParaAttribs(0);
- auto pAdjust = static_cast<const SvxAdjustItem*>(rParaAttribs.GetItem(EE_PARA_JUST));
+ auto pAdjust = rParaAttribs.GetItem(EE_PARA_JUST);
CPPUNIT_ASSERT_EQUAL(SvxAdjust::Center, pAdjust->GetAdjust());
}
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index edd71b9be94e..0fe25f35df06 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -554,7 +554,7 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems)
if (rSet.GetItemState(EE_PARA_ULSPACE) != SfxItemState::SET || !bOnlyMissingItems)
{
- const SvxULSpaceItem& rULItem = static_cast<const SvxULSpaceItem&>(pCurSet->Get(EE_PARA_ULSPACE));
+ const SvxULSpaceItem& rULItem = pCurSet->Get(EE_PARA_ULSPACE);
SvxULSpaceItem aNewULItem(rULItem);
double fLowerFraction = double(rULItem.GetLower()) / nOldHeight;
aNewULItem.SetLower((sal_uInt16)(fLowerFraction * nNewHeight));
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index cfbe431edc98..9f17f7f08915 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -463,7 +463,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
for( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ )
{
const SfxItemSet& rItems = pOLV->GetOutliner()->GetParaAttribs( nPara );
- const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( rItems.Get( EE_PARA_ULSPACE ) );
+ const SvxULSpaceItem& rItem = rItems.Get( EE_PARA_ULSPACE );
nUpper = std::max( nUpper, (long)rItem.GetUpper() );
}
if( nUpper == 0 )
@@ -479,7 +479,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
// paragraph justification
SvxLRSpaceItem aLR = aAttrSet.Get( EE_PARA_LRSPACE );
rSet.Put(aLR);
- SvxAdjust eAdj = static_cast<const SvxAdjustItem&>( aAttrSet.Get( EE_PARA_JUST ) ).GetAdjust();
+ SvxAdjust eAdj = aAttrSet.Get( EE_PARA_JUST ).GetAdjust();
switch( eAdj )
{
case SvxAdjust::Left:
@@ -565,8 +565,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
rSet.InvalidateItem(EE_PARA_LRSPACE);
rSet.InvalidateItem(SID_ATTR_PARA_LRSPACE);
}
- sal_uInt16 nLineSpace = static_cast<const SvxLineSpacingItem&>( aAttrSet.
- Get( EE_PARA_SBL ) ).GetPropLineSpace();
+ sal_uInt16 nLineSpace = aAttrSet.Get( EE_PARA_SBL ).GetPropLineSpace();
switch( nLineSpace )
{
case 100:
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 945b5b856660..b2db72bf1b55 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -153,7 +153,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
SfxItemSet aAttr( pStyleSheet->GetItemSet() );
SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) );
aAttr.Put( aTmpSet, false ); // sal_False= InvalidItems is not default, handle it as "holes"
- const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( aAttr.Get( EE_PARA_ULSPACE ) );
+ const SvxULSpaceItem& rItem = aAttr.Get( EE_PARA_ULSPACE );
std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>(rItem.Clone()));
long nUpper = pNewItem->GetUpper();
@@ -194,7 +194,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
if( aEditAttr.GetItemState( EE_PARA_ULSPACE ) >= SfxItemState::DEFAULT )
{
SfxItemSet aNewAttrs(*(aEditAttr.GetPool()), aEditAttr.GetRanges());
- const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( aEditAttr.Get( EE_PARA_ULSPACE ) );
+ const SvxULSpaceItem& rItem = aEditAttr.Get( EE_PARA_ULSPACE );
std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>( rItem.Clone() ));
long nUpper = pNewItem->GetUpper();
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 109a83061684..274644ec72a9 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -652,8 +652,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
case SID_ATTR_TABSTOP:
if (pArgs && mpDrawView->IsTextEdit())
{
- const SvxTabStopItem& rItem = static_cast<const SvxTabStopItem&>(
- pArgs->Get( EE_PARA_TABS ));
+ const SvxTabStopItem& rItem = pArgs->Get( EE_PARA_TABS );
SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_TABS, EE_PARA_TABS>{} );
@@ -898,7 +897,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
mpDrawView->GetAttributes( aEditAttr );
if( aEditAttr.GetItemState( EE_PARA_TABS ) >= SfxItemState::DEFAULT )
{
- const SvxTabStopItem& rItem = static_cast<const SvxTabStopItem&>( aEditAttr.Get( EE_PARA_TABS ) );
+ const SvxTabStopItem& rItem = aEditAttr.Get( EE_PARA_TABS );
rSet.Put( rItem );
const SvxLRSpaceItem& rLRSpaceItem = aEditAttr.Get( EE_PARA_LRSPACE );
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index ab5f07bd21b3..b4833f19a2bd 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -288,8 +288,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
SfxItemSet aAttrs( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aAttrs );
- SvxAdjustItem aItem= static_cast<const SvxAdjustItem&>( aAttrs.Get( EE_PARA_JUST ) );
- SvxAdjust eAdj = aItem.GetAdjust();
+ SvxAdjust eAdj = aAttrs.Get( EE_PARA_JUST ).GetAdjust();
if ( eAdj == SvxAdjust::Left)
{
rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true ) );
@@ -305,8 +304,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
SfxItemSet aAttrs( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aAttrs );
- SvxAdjustItem aItem= static_cast<const SvxAdjustItem&>( aAttrs.Get( EE_PARA_JUST ) );
- SvxAdjust eAdj = aItem.GetAdjust();
+ SvxAdjust eAdj = aAttrs.Get( EE_PARA_JUST ).GetAdjust();
if ( eAdj == SvxAdjust::Center)
{
rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) );
@@ -322,8 +320,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
SfxItemSet aAttrs( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aAttrs );
- SvxAdjustItem aItem= static_cast<const SvxAdjustItem&>( aAttrs.Get( EE_PARA_JUST ) );
- SvxAdjust eAdj = aItem.GetAdjust();
+ SvxAdjust eAdj = aAttrs.Get( EE_PARA_JUST ).GetAdjust();
if ( eAdj == SvxAdjust::Right)
{
rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) );
@@ -339,8 +336,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
SfxItemSet aAttrs( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aAttrs );
- SvxAdjustItem aItem= static_cast<const SvxAdjustItem&>( aAttrs.Get( EE_PARA_JUST ) );
- SvxAdjust eAdj = aItem.GetAdjust();
+ SvxAdjust eAdj = aAttrs.Get( EE_PARA_JUST ).GetAdjust();
if ( eAdj == SvxAdjust::Block)
{
rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) );
@@ -366,7 +362,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
{
SfxItemSet aAttrs( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aAttrs );
- SvxLineSpacingItem aLineLR = static_cast<const SvxLineSpacingItem&>( aAttrs.Get( EE_PARA_SBL ) );
+ SvxLineSpacingItem aLineLR = aAttrs.Get( EE_PARA_SBL );
rSet.Put(aLineLR);
bAttr = true;
Invalidate(SID_ATTR_PARA_LINESPACE);
@@ -376,7 +372,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
{
SfxItemSet aAttrs( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aAttrs );
- SvxULSpaceItem aULSP = static_cast<const SvxULSpaceItem&>( aAttrs.Get( EE_PARA_ULSPACE ) );
+ SvxULSpaceItem aULSP = aAttrs.Get( EE_PARA_ULSPACE );
aULSP.SetWhich(SID_ATTR_PARA_ULSPACE);
rSet.Put(aULSP);
bAttr = true;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 2e22f915fd5c..c16be0657ea4 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2701,7 +2701,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle&
// else the alignment is wanted.
if(SDRTEXTHORZADJUST_BLOCK == eHAdj)
{
- SvxAdjust eAdjust = static_cast<const SvxAdjustItem&>(GetObjectItemSet().Get(EE_PARA_JUST)).GetAdjust();
+ SvxAdjust eAdjust = GetObjectItemSet().Get(EE_PARA_JUST).GetAdjust();
switch (eAdjust)
{
case SvxAdjust::Left: eHAdj = SDRTEXTHORZADJUST_LEFT; break;
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 002ae0084394..97d76f6075ea 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1018,7 +1018,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
// else the alignment is wanted.
if(SDRTEXTHORZADJUST_BLOCK == eHAdj)
{
- SvxAdjust eAdjust = static_cast<const SvxAdjustItem&>(GetObjectItemSet().Get(EE_PARA_JUST)).GetAdjust();
+ SvxAdjust eAdjust = GetObjectItemSet().Get(EE_PARA_JUST).GetAdjust();
switch(eAdjust)
{
case SvxAdjust::Left: eHAdj = SDRTEXTHORZADJUST_LEFT; break;
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 48234bd84ae0..07e6da2a0eac 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -193,8 +193,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
case SID_PARASPACE_INCREASE:
case SID_PARASPACE_DECREASE:
{
- SvxULSpaceItem aULSpace(
- static_cast< const SvxULSpaceItem& >( aEditAttr.Get( EE_PARA_ULSPACE ) ) );
+ SvxULSpaceItem aULSpace( aEditAttr.Get( EE_PARA_ULSPACE ) );
sal_uInt16 nUpper = aULSpace.GetUpper();
sal_uInt16 nLower = aULSpace.GetLower();
@@ -659,7 +658,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
SfxItemState eState = aEditAttr.GetItemState( EE_PARA_SBL );
if( eState >= SfxItemState::DEFAULT )
{
- SvxLineSpacingItem aLR = static_cast<const SvxLineSpacingItem&>( aEditAttr.Get( EE_PARA_SBL ) );
+ SvxLineSpacingItem aLR = aEditAttr.Get( EE_PARA_SBL );
rSet.Put(aLR);
}
else
@@ -675,7 +674,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
SfxItemState eState = aEditAttr.GetItemState( EE_PARA_ULSPACE );
if( eState >= SfxItemState::DEFAULT )
{
- SvxULSpaceItem aULSpace = static_cast<const SvxULSpaceItem&>( aEditAttr.Get( EE_PARA_ULSPACE ) );
+ SvxULSpaceItem aULSpace = aEditAttr.Get( EE_PARA_ULSPACE );
if ( !aULSpace.GetUpper() && !aULSpace.GetLower() )
rSet.DisableItem( SID_PARASPACE_DECREASE );
else if ( aULSpace.GetUpper() >= 5670 && aULSpace.GetLower() >= 5670 )
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index b414398e3d0d..696500197643 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -256,8 +256,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
case SID_PARASPACE_INCREASE:
case SID_PARASPACE_DECREASE:
{
- SvxULSpaceItem aULSpace(
- static_cast< const SvxULSpaceItem& >( aEditAttr.Get( EE_PARA_ULSPACE ) ) );
+ SvxULSpaceItem aULSpace( aEditAttr.Get( EE_PARA_ULSPACE ) );
sal_uInt16 nUpper = aULSpace.GetUpper();
sal_uInt16 nLower = aULSpace.GetLower();
@@ -681,7 +680,7 @@ ASK_ADJUST:
SfxItemState eState = aEditAttr.GetItemState(EE_PARA_SBL);
if( eState >= SfxItemState::DEFAULT )
{
- SvxLineSpacingItem aLR = static_cast<const SvxLineSpacingItem&>( aEditAttr.Get( EE_PARA_SBL ) );
+ SvxLineSpacingItem aLR = aEditAttr.Get( EE_PARA_SBL );
rSet.Put(aLR);
}
else
@@ -698,7 +697,7 @@ ASK_ADJUST:
SfxItemState eState = aEditAttr.GetItemState(EE_PARA_ULSPACE);
if( eState >= SfxItemState::DEFAULT )
{
- SvxULSpaceItem aULSpace = static_cast<const SvxULSpaceItem&>( aEditAttr.Get( EE_PARA_ULSPACE ) );
+ SvxULSpaceItem aULSpace = aEditAttr.Get( EE_PARA_ULSPACE );
if ( !aULSpace.GetUpper() && !aULSpace.GetLower() )
rSet.DisableItem( SID_PARASPACE_DECREASE );
else if ( aULSpace.GetUpper() >= 5670 && aULSpace.GetLower() >= 5670 )
commit 7f055f373bf2a19f6f2c73914eaa4f3c6fa57f98
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Nov 13 12:54:07 2017 +0200
inline SbxMAXSALUINT64 and friends
which don't offer any value
Change-Id: Ie8082abc80ffd0e7719f4fa9a0d5f93203628ee5
Reviewed-on: https://gerrit.libreoffice.org/44798
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index ed1d1db2c546..06a71227bf94 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -204,9 +204,9 @@ start:
// is unreachable, obviously. Avoid warning by ifdeffing
// this out for now. Do not delete this #if 0 block unless
// you know for sure the 'break' above is intentional.
- if ( nRes > SbxMAXSALINT64 )
+ if ( nRes > SAL_MAX_INT64 )
{
- SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SbxMAXSALINT64;
+ SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SAL_MAX_INT64;
}
#endif
}
@@ -214,13 +214,13 @@ start:
nRes = p->nInt64 * CURRENCY_FACTOR; break;
#if 0
// As above
- if ( nRes > SbxMAXSALINT64 )
+ if ( nRes > SAL_MAX_INT64 )
{
- SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SbxMAXSALINT64;
+ SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SAL_MAX_INT64;
}
- else if ( nRes < SbxMINSALINT64 )
+ else if ( nRes < SAL_MIN_INT64 )
{
- SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SbxMINSALINT64;
+ SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SAL_MIN_INT64;
}
break;
#endif
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index e3230259f205..97357b6ed6bc 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -339,13 +339,13 @@ start:
sal_Int64 ImpDoubleToSalInt64( double d )
{
sal_Int64 nRes;
- if( d > SbxMAXSALINT64 )
+ if( d > SAL_MAX_INT64 )
{
- SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SbxMAXSALINT64;
+ SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SAL_MAX_INT64;
}
- else if( d < SbxMINSALINT64 )
+ else if( d < SAL_MIN_INT64 )
{
- SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SbxMINSALINT64;
+ SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SAL_MIN_INT64;
}
else
nRes = (sal_Int64) rtl::math::round( d );
@@ -355,9 +355,9 @@ sal_Int64 ImpDoubleToSalInt64( double d )
sal_uInt64 ImpDoubleToSalUInt64( double d )
{
sal_uInt64 nRes;
- if( d > SbxMAXSALUINT64 )
+ if( d > SAL_MAX_UINT64 )
{
- SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SbxMAXSALUINT64;
+ SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SAL_MAX_UINT64;
}
else if( d < 0.0 )
{
@@ -372,7 +372,7 @@ sal_uInt64 ImpDoubleToSalUInt64( double d )
double ImpSalUInt64ToDouble( sal_uInt64 n )
{
double d = 0.0;
- if( n > SbxMAXSALINT64 )
+ if( n > SAL_MAX_INT64 )
SbxBase::SetError( ERRCODE_BASIC_CONVERSION );
else
d = (double)(sal_Int64) n;
@@ -418,9 +418,9 @@ start:
case SbxSALINT64:
nRes = p->nInt64; break;
case SbxSALUINT64:
- if( p->uInt64 > SbxMAXSALINT64 )
+ if( p->uInt64 > SAL_MAX_INT64 )
{
- SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SbxMAXSALINT64;
+ SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SAL_MAX_INT64;
}
else
nRes = (sal_Int64) p->uInt64;
@@ -705,9 +705,9 @@ start:
SbxDataType t;
if( ImpScan( *p->pOUString, d, t, nullptr, false ) != ERRCODE_NONE )
nRes = 0;
- else if( d > SbxMAXSALUINT64 )
+ else if( d > SAL_MAX_UINT64 )
{
- SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SbxMAXSALUINT64;
+ SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); nRes = SAL_MAX_UINT64;
}
else if( d < 0.0 )
{
@@ -818,7 +818,7 @@ start:
case SbxLPSTR:
if( !p->pOUString )
p->pOUString = new OUString;
- if( n > SbxMAXSALINT64 )
+ if( n > SAL_MAX_INT64 )
SbxBase::SetError( ERRCODE_BASIC_CONVERSION );
else
{
@@ -881,16 +881,16 @@ start:
*p->pDouble = ImpSalUInt64ToDouble( n ); break;
case SbxBYREF | SbxCURRENCY:
- if ( n > ( SbxMAXSALINT64 / CURRENCY_FACTOR ) )
+ if ( n > ( SAL_MAX_INT64 / CURRENCY_FACTOR ) )
{
SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW );
- n = SbxMAXSALINT64;
+ n = SAL_MAX_INT64;
}
*p->pnInt64 = ( sal_Int64) ( n * CURRENCY_FACTOR ); break;
case SbxBYREF | SbxSALUINT64:
*p->puInt64 = n; break;
case SbxBYREF | SbxSALINT64:
- if( n > SbxMAXSALINT64 )
+ if( n > SAL_MAX_INT64 )
{
SbxBase::SetError( ERRCODE_BASIC_MATH_OVERFLOW ); n = 0;
}
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index f015b963c621..74ae183f50ed 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -176,7 +176,7 @@ namespace o3tl
// of the implementation. Only type double is greedy and takes
// what it gets.
-#define SbxMAXCHAR u'\xFFFF'
+#define SbxMAXCHAR (u'\xFFFF')
#define SbxMINCHAR (0)
#define SbxMAXBYTE ( 255)
#define SbxMAXINT ( 32767)
@@ -186,10 +186,6 @@ namespace o3tl
#define SbxMINLNG ((sal_Int32)(-2147483647-1))
#define SbxMAXULNG ((sal_uInt32) 0xffffffff)
-#define SbxMAXSALUINT64 SAL_MAX_UINT64
-#define SbxMAXSALINT64 SAL_MAX_INT64
-#define SbxMINSALINT64 SAL_MIN_INT64
-
// Currency stored as SbxSALINT64 == sal_Int64
// value range limits are ~(2^63 - 1)/10000
// fixed precision has 4 digits right of decimal pt
More information about the Libreoffice-commits
mailing list