summaryrefslogtreecommitdiff
path: root/editeng/source/items/frmitems.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source/items/frmitems.cxx')
-rw-r--r--editeng/source/items/frmitems.cxx104
1 files changed, 52 insertions, 52 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index a18fec5c49..042dcca98c 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -189,7 +189,7 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- BYTE nValue = GetValue();
+ sal_uInt8 nValue = GetValue();
if ( PAPERBIN_PRINTER_SETTINGS == nValue )
rText = EE_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
@@ -219,7 +219,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
}
// -----------------------------------------------------------------------
-bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxSizeItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -242,7 +242,7 @@ bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
// -----------------------------------------------------------------------
-bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -429,7 +429,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
}
// -----------------------------------------------------------------------
-bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
bool bRet = true;
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -474,7 +474,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
// -----------------------------------------------------------------------
-bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -504,9 +504,9 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if((rVal >>= nRel) && nRel >= 0 && nRel < USHRT_MAX)
{
if(MID_L_REL_MARGIN== nMemberId)
- nPropLeftMargin = (USHORT)nRel;
+ nPropLeftMargin = (sal_uInt16)nRel;
else
- nPropRightMargin = (USHORT)nRel;
+ nPropRightMargin = (sal_uInt16)nRel;
}
else
return false;
@@ -517,7 +517,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
break;
case MID_FIRST_LINE_REL_INDENT:
- SetPropTxtFirstLineOfst ( (USHORT)nVal );
+ SetPropTxtFirstLineOfst ( (sal_uInt16)nVal );
break;
case MID_FIRST_AUTO:
@@ -820,7 +820,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
}
// -----------------------------------------------------------------------
-bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -846,7 +846,7 @@ bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
// -----------------------------------------------------------------------
-bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -871,12 +871,12 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case MID_UP_MARGIN :
if(!(rVal >>= nVal) || nVal < 0)
return false;
- SetUpper((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
+ SetUpper((sal_uInt16)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
break;
case MID_LO_MARGIN :
if(!(rVal >>= nVal) || nVal < 0)
return false;
- SetLower((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
+ SetLower((sal_uInt16)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
break;
case MID_UP_REL_MARGIN:
case MID_LO_REL_MARGIN:
@@ -885,9 +885,9 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if((rVal >>= nRel) && nRel > 1 )
{
if(MID_UP_REL_MARGIN == nMemberId)
- nPropUpper = (USHORT)nRel;
+ nPropUpper = (sal_uInt16)nRel;
else
- nPropLower = (USHORT)nRel;
+ nPropLower = (sal_uInt16)nRel;
}
else
return false;
@@ -1155,7 +1155,7 @@ int SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
bPos == ( (SvxProtectItem&)rAttr ).bPos );
}
-bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxProtectItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bValue;
@@ -1173,7 +1173,7 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bVal( Any2Bool(rVal) );
@@ -1266,8 +1266,8 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
// class SvxShadowItem ---------------------------------------------------
-SvxShadowItem::SvxShadowItem( const USHORT nId,
- const Color *pColor, const USHORT nW,
+SvxShadowItem::SvxShadowItem( const sal_uInt16 nId,
+ const Color *pColor, const sal_uInt16 nW,
const SvxShadowLocation eLoc ) :
SfxEnumItemInterface( nId ),
aShadowColor(COL_GRAY),
@@ -1279,7 +1279,7 @@ SvxShadowItem::SvxShadowItem( const USHORT nId,
}
// -----------------------------------------------------------------------
-bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1312,7 +1312,7 @@ bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
// -----------------------------------------------------------------------
-bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1549,10 +1549,10 @@ void SvxShadowItem::SetEnumValue( sal_uInt16 nVal )
SvxBorderLine::SvxBorderLine( const Color *pCol, sal_uInt16 nOut, sal_uInt16 nIn, sal_uInt16 nDist,
SvxBorderStyle nStyle )
-: nOutWidth( nOut )
+: m_nStyle( nStyle )
+, nOutWidth( nOut )
, nInWidth ( nIn )
, nDistance( nDist )
-, m_nStyle( nStyle )
{
if ( pCol )
aColor = *pCol;
@@ -1687,8 +1687,8 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
bool SvxBorderLine::HasPriority( const SvxBorderLine& rOtherLine ) const
{
- const USHORT nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
- const USHORT nOtherSize = rOtherLine.GetOutWidth() + rOtherLine.GetDistance() + rOtherLine.GetInWidth();
+ const sal_uInt16 nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
+ const sal_uInt16 nOtherSize = rOtherLine.GetOutWidth() + rOtherLine.GetDistance() + rOtherLine.GetInWidth();
if (nThisSize > nOtherSize)
{
@@ -1823,7 +1823,7 @@ table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Boo
return aLine;
}
// -----------------------------------------------------------------------
-bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
table::BorderLine2 aRetLine;
@@ -1966,7 +1966,7 @@ lcl_extractBorderLine(const uno::Any& rAny, table::BorderLine2& rLine)
template<typename Item>
bool
-lcl_setLine(const uno::Any& rAny, Item& rItem, USHORT nLine, const bool bConvert)
+lcl_setLine(const uno::Any& rAny, Item& rItem, sal_uInt16 nLine, const bool bConvert)
{
bool bDone = false;
table::BorderLine2 aBorderLine;
@@ -1982,7 +1982,7 @@ lcl_setLine(const uno::Any& rAny, Item& rItem, USHORT nLine, const bool bConvert
}
-bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
sal_uInt16 nLine = BOX_LINE_TOP;
@@ -2756,7 +2756,7 @@ void SvxBoxInfoItem::ResetFlags()
nValidFlags = 0x7F; // all valid except Disable
}
-bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
table::BorderLine2 aRetLine;
@@ -2821,7 +2821,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
// -----------------------------------------------------------------------
-bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2850,14 +2850,14 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
else
return sal_False;
if ( aSeq[3] >>= nFlags )
- nValidFlags = (BYTE)nFlags;
+ nValidFlags = (sal_uInt8)nFlags;
else
return sal_False;
if (( aSeq[4] >>= nVal ) && ( nVal >= 0 ))
{
if( bConvert )
nVal = MM100_TO_TWIP(nVal);
- SetDefDist( (USHORT)nVal );
+ SetDefDist( (sal_uInt16)nVal );
}
}
return sal_True;
@@ -2942,7 +2942,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
sal_Int16 nFlags = sal_Int16();
bRet = (rVal >>= nFlags);
if ( bRet )
- nValidFlags = (BYTE)nFlags;
+ nValidFlags = (sal_uInt8)nFlags;
break;
}
case MID_DISTANCE:
@@ -2953,7 +2953,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
if( bConvert )
nVal = MM100_TO_TWIP(nVal);
- SetDefDist( (USHORT)nVal );
+ SetDefDist( (sal_uInt16)nVal );
}
break;
}
@@ -3007,7 +3007,7 @@ XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
}
// -----------------------------------------------------------------------
-bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
style::BreakType eBreak = style::BreakType_NONE;
switch ( (SvxBreak)GetValue() )
@@ -3024,7 +3024,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
return true;
}
// -----------------------------------------------------------------------
-bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
style::BreakType nBreak;
@@ -3207,7 +3207,7 @@ SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
return new SvxLineItem( *this );
}
-bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
+bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
{
sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
nMemId &= ~CONVERT_TWIPS;
@@ -3235,7 +3235,7 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
// -----------------------------------------------------------------------
-bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
+bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
{
sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
nMemId &= ~CONVERT_TWIPS;
@@ -3261,9 +3261,9 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
switch ( nMemId )
{
case MID_FG_COLOR: pLine->SetColor( Color(nVal) ); break;
- case MID_OUTER_WIDTH: pLine->SetOutWidth((USHORT)nVal); break;
- case MID_INNER_WIDTH: pLine->SetInWidth((USHORT)nVal); break;
- case MID_DISTANCE: pLine->SetDistance((USHORT)nVal); break;
+ case MID_OUTER_WIDTH: pLine->SetOutWidth((sal_uInt16)nVal); break;
+ case MID_INNER_WIDTH: pLine->SetInWidth((sal_uInt16)nVal); break;
+ case MID_DISTANCE: pLine->SetDistance((sal_uInt16)nVal); break;
case MID_LINE_STYLE: pLine->SetStyle((SvxBorderStyle)nVal); break;
default:
OSL_FAIL( "Wrong MemberId" );
@@ -3641,7 +3641,7 @@ inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans)
return (sal_Int8)((nTrans * 100 + 127) / 254);
}
-bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId)
@@ -3702,7 +3702,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
// -----------------------------------------------------------------------
-bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId)
@@ -4209,7 +4209,7 @@ CntWallpaperItem* SvxBrushItem::CreateCntWallpaperItem() const
{
CntWallpaperItem* pItem = new CntWallpaperItem( 0 );
pItem->SetColor( aColor.GetColor() );
- pItem->SetStyle( (USHORT)GraphicPos2WallpaperStyle( GetGraphicPos() ) );
+ pItem->SetStyle( (sal_uInt16)GraphicPos2WallpaperStyle( GetGraphicPos() ) );
sal_Bool bLink = (pStrLink != 0);
if( bLink )
{
@@ -4241,14 +4241,14 @@ void SvxBrushItem::ApplyGraphicTransparency_Impl()
}
// class SvxFrameDirectionItem ----------------------------------------------
-SvxFrameDirectionItem::SvxFrameDirectionItem( USHORT _nWhich )
- : SfxUInt16Item( _nWhich, (UINT16)FRMDIR_HORI_LEFT_TOP )
+SvxFrameDirectionItem::SvxFrameDirectionItem( sal_uInt16 _nWhich )
+ : SfxUInt16Item( _nWhich, (sal_uInt16)FRMDIR_HORI_LEFT_TOP )
{
}
SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue ,
- USHORT _nWhich )
- : SfxUInt16Item( _nWhich, (UINT16)nValue )
+ sal_uInt16 _nWhich )
+ : SfxUInt16Item( _nWhich, (sal_uInt16)nValue )
{
}
@@ -4268,21 +4268,21 @@ SfxPoolItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const
return new SvxFrameDirectionItem( *this );
}
-SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ ) const
+SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/ ) const
{
sal_uInt16 nValue;
rStrm >> nValue;
return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() );
}
-SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const
+SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ ) const
{
sal_uInt16 nValue = GetValue();
rStrm << nValue;
return rStrm;
}
-USHORT SvxFrameDirectionItem::GetVersion( USHORT nFVer ) const
+sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const
{
return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0;
}
@@ -4312,7 +4312,7 @@ SfxItemPresentation SvxFrameDirectionItem::GetPresentation(
}
bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
- BYTE )
+ sal_uInt8 )
{
sal_Int16 nVal = sal_Int16();
sal_Bool bRet = ( rVal >>= nVal );
@@ -4346,7 +4346,7 @@ bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
}
bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
- BYTE ) const
+ sal_uInt8 ) const
{
// translate SvxFrameDirection into WritingDirection2
sal_Int16 nVal;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 16:26:41 +0000