summaryrefslogtreecommitdiff
path: root/sd/source/ui/app
diff options
context:
space:
mode:
authorIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-02-15 13:28:01 +0100
committerIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-02-15 13:28:01 +0100
commit9f6d1a8205b975546c5a36aca0ce67ce9bb73b53 (patch)
tree1ef6db716ee32eef3695d1ddf36156a67813c959 /sd/source/ui/app
parent7d48c682434ac58110d62a20fd70870b6372f3b3 (diff)
parent2785e67bbcd479f864ea941bfd9a47916fd04aa4 (diff)
chart52: merge with DEV300_m100
Diffstat (limited to 'sd/source/ui/app')
-rw-r--r--sd/source/ui/app/optsitem.cxx336
-rwxr-xr-xsd/source/ui/app/sdmod.cxx8
-rwxr-xr-xsd/source/ui/app/sdmod1.cxx72
-rwxr-xr-xsd/source/ui/app/sdmod2.cxx84
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/sdpopup.cxx24
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/sdresid.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/sdxfer.cxx60
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/tbxww.cxx38
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/tmplctrl.cxx18
9 files changed, 321 insertions, 321 deletions
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 3366a0ea98db..1b68e3ee0031 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -110,7 +110,7 @@ void SdOptionsItem::SetModified()
// - SdOptionsGeneric -
// --------------------
-SdOptionsGeneric::SdOptionsGeneric( USHORT nConfigId, const OUString& rSubTree ) :
+SdOptionsGeneric::SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTree ) :
maSubTree ( rSubTree ),
mpCfgItem ( NULL ),
mnConfigId ( nConfigId ),
@@ -136,12 +136,12 @@ void SdOptionsGeneric::Init() const
{
const Any* pValues = aValues.getConstArray();
- pThis->EnableModify( FALSE );
+ pThis->EnableModify( sal_False );
pThis->mbInit = pThis->ReadData( pValues );
- pThis->EnableModify( TRUE );
+ pThis->EnableModify( sal_True );
}
else
- pThis->mbInit = TRUE;
+ pThis->mbInit = sal_True;
}
}
@@ -175,7 +175,7 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const
Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const
{
- ULONG nCount;
+ sal_uLong nCount;
const char** ppPropNames;
GetPropNameArray( ppPropNames, nCount );
@@ -183,7 +183,7 @@ Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const
Sequence< OUString > aNames( nCount );
OUString* pNames = aNames.getArray();
- for( ULONG i = 0; i < nCount; i++ )
+ for( sal_uLong i = 0; i < nCount; i++ )
pNames[ i ] = OUString::createFromAscii( ppPropNames[ i ] );
return aNames;
@@ -213,26 +213,26 @@ bool SdOptionsGeneric::isMetricSystem()
|*
\************************************************************************/
-SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) :
+SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, bUseConfig ?
( ( SDCFG_DRAW == nConfigId ) ?
B2U( "Office.Draw/Layout" ) :
B2U( "Office.Impress/Layout" ) ) :
OUString() ),
- bRuler( TRUE ),
- bMoveOutline( TRUE ),
- bDragStripes( FALSE ),
- bHandlesBezier( FALSE ),
- bHelplines( TRUE ),
- nMetric((UINT16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)),
+ bRuler( sal_True ),
+ bMoveOutline( sal_True ),
+ bDragStripes( sal_False ),
+ bHandlesBezier( sal_False ),
+ bHelplines( sal_True ),
+ nMetric((sal_uInt16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)),
nDefTab( 1250 )
{
- EnableModify( TRUE );
+ EnableModify( sal_True );
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const
+sal_Bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const
{
return( IsRulerVisible() == rOpt.IsRulerVisible() &&
IsMoveOutline() == rOpt.IsMoveOutline() &&
@@ -245,7 +245,7 @@ BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const
// -----------------------------------------------------------------------------
-void SdOptionsLayout::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const
+void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
{
static const char* aPropNamesMetric[] =
{
@@ -279,22 +279,22 @@ void SdOptionsLayout::GetPropNameArray( const char**& ppNames, ULONG& rCount ) c
// -----------------------------------------------------------------------------
-BOOL SdOptionsLayout::ReadData( const Any* pValues )
+sal_Bool SdOptionsLayout::ReadData( const Any* pValues )
{
if( pValues[0].hasValue() ) SetRulerVisible( *(sal_Bool*) pValues[ 0 ].getValue() );
if( pValues[1].hasValue() ) SetHandlesBezier( *(sal_Bool*) pValues[ 1 ].getValue() );
if( pValues[2].hasValue() ) SetMoveOutline( *(sal_Bool*) pValues[ 2 ].getValue() );
if( pValues[3].hasValue() ) SetDragStripes( *(sal_Bool*) pValues[ 3 ].getValue() );
if( pValues[4].hasValue() ) SetHelplines( *(sal_Bool*) pValues[ 4 ].getValue() );
- if( pValues[5].hasValue() ) SetMetric( (UINT16) *(sal_Int32*) pValues[ 5 ].getValue() );
- if( pValues[6].hasValue() ) SetDefTab( (UINT16) *(sal_Int32*) pValues[ 6 ].getValue() );
+ if( pValues[5].hasValue() ) SetMetric( (sal_uInt16) *(sal_Int32*) pValues[ 5 ].getValue() );
+ if( pValues[6].hasValue() ) SetDefTab( (sal_uInt16) *(sal_Int32*) pValues[ 6 ].getValue() );
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsLayout::WriteData( Any* pValues ) const
+sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const
{
pValues[ 0 ] <<= IsRulerVisible();
pValues[ 1 ] <<= IsHandlesBezier();
@@ -304,7 +304,7 @@ BOOL SdOptionsLayout::WriteData( Any* pValues ) const
pValues[ 5 ] <<= (sal_Int32) GetMetric();
pValues[ 6 ] <<= (sal_Int32) GetDefTab();
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -313,17 +313,17 @@ BOOL SdOptionsLayout::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich )
+SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich )
: SfxPoolItem ( _nWhich )
-, maOptionsLayout ( 0, FALSE )
+, maOptionsLayout ( 0, sal_False )
{
}
// ----------------------------------------------------------------------
-SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
+SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
: SfxPoolItem ( _nWhich )
-, maOptionsLayout ( 0, FALSE )
+, maOptionsLayout ( 0, sal_False )
{
if( pOpts )
{
@@ -388,26 +388,26 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const
|*
\************************************************************************/
-SdOptionsContents::SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ) :
+SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, bUseConfig ?
( ( SDCFG_DRAW == nConfigId ) ?
B2U( "Office.Draw/Content" ) :
B2U( "Office.Impress/Content" ) ) :
OUString() )
{
- EnableModify( TRUE );
+ EnableModify( sal_True );
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsContents::operator==(const SdOptionsContents&) const
+sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const
{
return true;
}
// -----------------------------------------------------------------------------
-void SdOptionsContents::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const
+void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
{
static const char* aPropNames[] =
{
@@ -423,22 +423,22 @@ void SdOptionsContents::GetPropNameArray( const char**& ppNames, ULONG& rCount )
// -----------------------------------------------------------------------------
-BOOL SdOptionsContents::ReadData(const Any*)
+sal_Bool SdOptionsContents::ReadData(const Any*)
{
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsContents::WriteData( Any* pValues ) const
+sal_Bool SdOptionsContents::WriteData( Any* pValues ) const
{
//#i80528# no draft anymore
- pValues[ 0 ] <<= (BOOL)false;
- pValues[ 1 ] <<= (BOOL)false;
- pValues[ 2 ] <<= (BOOL)false;
- pValues[ 3 ] <<= (BOOL)false;
+ pValues[ 0 ] <<= (sal_Bool)false;
+ pValues[ 1 ] <<= (sal_Bool)false;
+ pValues[ 2 ] <<= (sal_Bool)false;
+ pValues[ 3 ] <<= (sal_Bool)false;
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -447,9 +447,9 @@ BOOL SdOptionsContents::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsContentsItem::SdOptionsContentsItem(USHORT _nWhich, SdOptions*, ::sd::FrameView*)
+SdOptionsContentsItem::SdOptionsContentsItem(sal_uInt16 _nWhich, SdOptions*, ::sd::FrameView*)
: SfxPoolItem ( _nWhich )
-, maOptionsContents ( 0, FALSE )
+, maOptionsContents ( 0, sal_False )
{
}
@@ -481,7 +481,7 @@ void SdOptionsContentsItem::SetOptions(SdOptions*) const
|*
\************************************************************************/
-SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) :
+SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, bUseConfig ?
( ( SDCFG_DRAW == nConfigId ) ?
B2U( "Office.Draw/Misc" ) :
@@ -490,28 +490,28 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) :
// #97016#
nDefaultObjectSizeWidth(8000),
nDefaultObjectSizeHeight(5000),
- bStartWithTemplate( TRUE ),
- bMarkedHitMovesAlways( TRUE ),
- bMoveOnlyDragging( FALSE ),
- bCrookNoContortion( FALSE ),
+ bStartWithTemplate( sal_True ),
+ bMarkedHitMovesAlways( sal_True ),
+ bMoveOnlyDragging( sal_False ),
+ bCrookNoContortion( sal_False ),
bQuickEdit( GetConfigId() != SDCFG_DRAW ),
- bMasterPageCache( TRUE ),
- bDragWithCopy( FALSE ),
- bPickThrough( TRUE ),
- bBigHandles( FALSE ),
- bDoubleClickTextEdit( TRUE ),
- bClickChangeRotation( FALSE ),
- bStartWithActualPage( FALSE ),
- bSolidDragging( TRUE ),
- bSolidMarkHdl( TRUE ),
- bSummationOfParagraphs( FALSE ),
+ bMasterPageCache( sal_True ),
+ bDragWithCopy( sal_False ),
+ bPickThrough( sal_True ),
+ bBigHandles( sal_False ),
+ bDoubleClickTextEdit( sal_True ),
+ bClickChangeRotation( sal_False ),
+ bStartWithActualPage( sal_False ),
+ bSolidDragging( sal_True ),
+ bSolidMarkHdl( sal_True ),
+ bSummationOfParagraphs( sal_False ),
// #90356#
- bShowUndoDeleteWarning( TRUE ),
- bSlideshowRespectZOrder( TRUE ),
- bShowComments( TRUE ),
- bPreviewNewEffects( TRUE ),
- bPreviewChangedEffects( FALSE ),
- bPreviewTransitions( TRUE ),
+ bShowUndoDeleteWarning( sal_True ),
+ bSlideshowRespectZOrder( sal_True ),
+ bShowComments( sal_True ),
+ bPreviewNewEffects( sal_True ),
+ bPreviewChangedEffects( sal_False ),
+ bPreviewTransitions( sal_True ),
mnDisplay( 0 ),
mnPenColor( 0xff0000 ),
mnPenWidth( 150.0 ),
@@ -520,12 +520,12 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) :
// formatting.
mnPrinterIndependentLayout (1)
{
- EnableModify( TRUE );
+ EnableModify( sal_True );
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
+sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
{
return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() &&
IsMarkedHitMovesAlways() == rOpt.IsMarkedHitMovesAlways() &&
@@ -562,7 +562,7 @@ BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
// -----------------------------------------------------------------------------
-void SdOptionsMisc::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const
+void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
{
static const char* aPropNames[] =
{
@@ -610,7 +610,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con
// -----------------------------------------------------------------------------
-BOOL SdOptionsMisc::ReadData( const Any* pValues )
+sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
{
if( pValues[0].hasValue() ) SetMarkedHitMovesAlways( *(sal_Bool*) pValues[ 0 ].getValue() );
if( pValues[1].hasValue() ) SetCrookNoContortion( *(sal_Bool*) pValues[ 1 ].getValue() );
@@ -667,12 +667,12 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues )
SetPresentationPenWidth( getSafeValue< double >( pValues[ 26 ] ) );
}
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsMisc::WriteData( Any* pValues ) const
+sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
{
pValues[ 0 ] <<= IsMarkedHitMovesAlways();
pValues[ 1 ] <<= IsCrookNoContortion();
@@ -713,7 +713,7 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const
pValues[ 26 ] <<= GetPresentationPenWidth();
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -722,17 +722,17 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich )
+SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich )
: SfxPoolItem ( _nWhich )
-, maOptionsMisc ( 0, FALSE )
+, maOptionsMisc ( 0, sal_False )
{
}
// ----------------------------------------------------------------------
-SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
+SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
: SfxPoolItem ( _nWhich )
-, maOptionsMisc ( 0, FALSE )
+, maOptionsMisc ( 0, sal_False )
{
if( pOpts )
{
@@ -768,8 +768,8 @@ SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::Fr
maOptionsMisc.SetMasterPagePaintCaching( pView->IsMasterPagePaintCaching() );
maOptionsMisc.SetDragWithCopy( pView->IsDragWithCopy() );
- maOptionsMisc.SetPickThrough( (BOOL)pView->GetModel()->IsPickThroughTransparentTextFrames() );
- maOptionsMisc.SetBigHandles( (BOOL)pView->IsBigHandles() );
+ maOptionsMisc.SetPickThrough( (sal_Bool)pView->GetModel()->IsPickThroughTransparentTextFrames() );
+ maOptionsMisc.SetBigHandles( (sal_Bool)pView->IsBigHandles() );
maOptionsMisc.SetDoubleClickTextEdit( pView->IsDoubleClickTextEdit() );
maOptionsMisc.SetClickChangeRotation( pView->IsClickChangeRotation() );
maOptionsMisc.SetSolidDragging( pView->IsSolidDragging() );
@@ -855,30 +855,30 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
|*
\************************************************************************/
-SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) :
+SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, bUseConfig ?
( ( SDCFG_DRAW == nConfigId ) ?
B2U( "Office.Draw/Snap" ) :
B2U( "Office.Impress/Snap" ) ) :
OUString() ),
- bSnapHelplines( TRUE ),
- bSnapBorder( TRUE ),
- bSnapFrame( FALSE ),
- bSnapPoints( FALSE ),
- bOrtho( FALSE ),
- bBigOrtho( TRUE ),
- bRotate( FALSE ),
+ bSnapHelplines( sal_True ),
+ bSnapBorder( sal_True ),
+ bSnapFrame( sal_False ),
+ bSnapPoints( sal_False ),
+ bOrtho( sal_False ),
+ bBigOrtho( sal_True ),
+ bRotate( sal_False ),
nSnapArea( 5 ),
nAngle( 1500 ),
nBezAngle( 1500 )
{
- EnableModify( TRUE );
+ EnableModify( sal_True );
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const
+sal_Bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const
{
return( IsSnapHelplines() == rOpt.IsSnapHelplines() &&
IsSnapBorder() == rOpt.IsSnapBorder() &&
@@ -894,7 +894,7 @@ BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const
// -----------------------------------------------------------------------------
-void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const
+void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
{
static const char* aPropNames[] =
{
@@ -916,7 +916,7 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con
// -----------------------------------------------------------------------------
-BOOL SdOptionsSnap::ReadData( const Any* pValues )
+sal_Bool SdOptionsSnap::ReadData( const Any* pValues )
{
if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() );
if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1 ].getValue() );
@@ -925,16 +925,16 @@ BOOL SdOptionsSnap::ReadData( const Any* pValues )
if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4 ].getValue() );
if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5 ].getValue() );
if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6 ].getValue() );
- if( pValues[7].hasValue() ) SetSnapArea( (INT16) *(sal_Int32*) pValues[ 7 ].getValue() );
- if( pValues[8].hasValue() ) SetAngle( (INT16) *(sal_Int32*) pValues[ 8 ].getValue() );
- if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (INT16) *(sal_Int32*) pValues[ 9 ].getValue() );
+ if( pValues[7].hasValue() ) SetSnapArea( (sal_Int16) *(sal_Int32*) pValues[ 7 ].getValue() );
+ if( pValues[8].hasValue() ) SetAngle( (sal_Int16) *(sal_Int32*) pValues[ 8 ].getValue() );
+ if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (sal_Int16) *(sal_Int32*) pValues[ 9 ].getValue() );
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsSnap::WriteData( Any* pValues ) const
+sal_Bool SdOptionsSnap::WriteData( Any* pValues ) const
{
pValues[ 0 ] <<= IsSnapHelplines();
pValues[ 1 ] <<= IsSnapBorder();
@@ -947,7 +947,7 @@ BOOL SdOptionsSnap::WriteData( Any* pValues ) const
pValues[ 8 ] <<= (sal_Int32) GetAngle();
pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle();
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -956,17 +956,17 @@ BOOL SdOptionsSnap::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich )
+SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich )
: SfxPoolItem ( _nWhich )
-, maOptionsSnap ( 0, FALSE )
+, maOptionsSnap ( 0, sal_False )
{
}
// ----------------------------------------------------------------------
-SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
+SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
: SfxPoolItem ( _nWhich )
-, maOptionsSnap ( 0, FALSE )
+, maOptionsSnap ( 0, sal_False )
{
if( pView )
{
@@ -978,8 +978,8 @@ SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich, SdOptions* pOpts, ::sd::Fr
maOptionsSnap.SetBigOrtho( pView->IsBigOrtho() );
maOptionsSnap.SetRotate( pView->IsAngleSnapEnabled() );
maOptionsSnap.SetSnapArea( pView->GetSnapMagneticPixel() );
- maOptionsSnap.SetAngle( (INT16) pView->GetSnapAngle() );
- maOptionsSnap.SetEliminatePolyPointLimitAngle( (INT16) pView->GetEliminatePolyPointLimitAngle() );
+ maOptionsSnap.SetAngle( (sal_Int16) pView->GetSnapAngle() );
+ maOptionsSnap.SetEliminatePolyPointLimitAngle( (sal_Int16) pView->GetEliminatePolyPointLimitAngle() );
}
else if( pOpts )
{
@@ -1038,7 +1038,7 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const
|*
\************************************************************************/
-SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) :
+SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId ) ) ?
B2U( "Office.Draw/Zoom" ) :
OUString() ),
@@ -1046,14 +1046,14 @@ SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) :
nY( 1 )
{
- EnableModify( TRUE );
+ EnableModify( sal_True );
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const
+sal_Bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const
{
- INT32 nX1, nX2, nY1, nY2;
+ sal_Int32 nX1, nX2, nY1, nY2;
GetScale( nX1, nY1 );
rOpt.GetScale( nX2, nY2 );
@@ -1064,7 +1064,7 @@ BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const
// -----------------------------------------------------------------------------
-void SdOptionsZoom::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const
+void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
{
static const char* aPropNames[] =
{
@@ -1078,30 +1078,30 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con
// -----------------------------------------------------------------------------
-BOOL SdOptionsZoom::ReadData( const Any* pValues )
+sal_Bool SdOptionsZoom::ReadData( const Any* pValues )
{
- INT32 x = 1, y = 1;
+ sal_Int32 x = 1, y = 1;
if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue() );
if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue() );
SetScale( x, y );
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsZoom::WriteData( Any* pValues ) const
+sal_Bool SdOptionsZoom::WriteData( Any* pValues ) const
{
- INT32 x, y;
+ sal_Int32 x, y;
GetScale( x, y );
pValues[ 0 ] <<= (sal_Int32) x;
pValues[ 1 ] <<= (sal_Int32) y;
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -1110,16 +1110,16 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsGrid::SdOptionsGrid( USHORT nConfigId, BOOL bUseConfig ) :
+SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, bUseConfig ?
( ( SDCFG_DRAW == nConfigId ) ?
B2U( "Office.Draw/Grid" ) :
B2U( "Office.Impress/Grid" ) ) :
OUString() )
{
- EnableModify( FALSE );
+ EnableModify( sal_False );
SetDefaults();
- EnableModify( TRUE );
+ EnableModify( sal_True );
}
// -----------------------------------------------------------------------------
@@ -1132,7 +1132,7 @@ SdOptionsGrid::~SdOptionsGrid()
void SdOptionsGrid::SetDefaults()
{
- const UINT32 nVal = 1000;
+ const sal_uInt32 nVal = 1000;
SetFldDivisionX( nVal );
SetFldDivisionY( nVal );
@@ -1140,15 +1140,15 @@ void SdOptionsGrid::SetDefaults()
SetFldDrawY( nVal );
SetFldSnapX( nVal );
SetFldSnapY( nVal );
- SetUseGridSnap( FALSE );
- SetSynchronize( TRUE );
- SetGridVisible( FALSE );
- SetEqualGrid( TRUE );
+ SetUseGridSnap( sal_False );
+ SetSynchronize( sal_True );
+ SetGridVisible( sal_False );
+ SetEqualGrid( sal_True );
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const
+sal_Bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const
{
return( GetFldDrawX() == rOpt.GetFldDrawX() &&
GetFldDivisionX() == rOpt.GetFldDivisionX() &&
@@ -1164,7 +1164,7 @@ BOOL SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const
// -----------------------------------------------------------------------------
-void SdOptionsGrid::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const
+void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
{
static const char* aPropNamesMetric[] =
{
@@ -1204,20 +1204,20 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con
// -----------------------------------------------------------------------------
-BOOL SdOptionsGrid::ReadData( const Any* pValues )
+sal_Bool SdOptionsGrid::ReadData( const Any* pValues )
{
if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() );
if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1 ].getValue() );
if( pValues[2].hasValue() )
{
- const UINT32 nDivX = FRound( *(double*) pValues[ 2 ].getValue() );
+ const sal_uInt32 nDivX = FRound( *(double*) pValues[ 2 ].getValue() );
SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) );
}
if( pValues[3].hasValue() )
{
- const UINT32 nDivY = FRound( *(double*) pValues[ 3 ].getValue() );
+ const sal_uInt32 nDivY = FRound( *(double*) pValues[ 3 ].getValue() );
SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) );
}
@@ -1228,12 +1228,12 @@ BOOL SdOptionsGrid::ReadData( const Any* pValues )
if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8 ].getValue() );
if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9 ].getValue() );
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsGrid::WriteData( Any* pValues ) const
+sal_Bool SdOptionsGrid::WriteData( Any* pValues ) const
{
pValues[ 0 ] <<= (sal_Int32) GetFldDrawX();
pValues[ 1 ] <<= (sal_Int32) GetFldDrawY();
@@ -1246,7 +1246,7 @@ BOOL SdOptionsGrid::WriteData( Any* pValues ) const
pValues[ 8 ] <<= IsGridVisible();
pValues[ 9 ] <<= IsEqualGrid();
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -1255,7 +1255,7 @@ BOOL SdOptionsGrid::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsGridItem::SdOptionsGridItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) :
+SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) :
SvxGridItem( _nWhich )
{
SetSynchronize( pOpts->IsSynchronize() );
@@ -1307,40 +1307,40 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const
|*
\************************************************************************/
-SdOptionsPrint::SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ) :
+SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, bUseConfig ?
( ( SDCFG_DRAW == nConfigId ) ?
B2U( "Office.Draw/Print" ) :
B2U( "Office.Impress/Print" ) ) :
OUString() ),
- bDraw( TRUE ),
- bNotes( FALSE ),
- bHandout( FALSE ),
- bOutline( FALSE ),
- bDate( FALSE ),
- bTime( FALSE ),
- bPagename( FALSE ),
- bHiddenPages( TRUE ),
- bPagesize( FALSE ),
- bPagetile( FALSE ),
- bWarningPrinter( TRUE ),
- bWarningSize( FALSE ),
- bWarningOrientation( FALSE ),
- bBooklet( FALSE ),
- bFront( TRUE ),
- bBack( TRUE ),
- bCutPage( FALSE ),
- bPaperbin( FALSE ),
- mbHandoutHorizontal( TRUE ),
+ bDraw( sal_True ),
+ bNotes( sal_False ),
+ bHandout( sal_False ),
+ bOutline( sal_False ),
+ bDate( sal_False ),
+ bTime( sal_False ),
+ bPagename( sal_False ),
+ bHiddenPages( sal_True ),
+ bPagesize( sal_False ),
+ bPagetile( sal_False ),
+ bWarningPrinter( sal_True ),
+ bWarningSize( sal_False ),
+ bWarningOrientation( sal_False ),
+ bBooklet( sal_False ),
+ bFront( sal_True ),
+ bBack( sal_True ),
+ bCutPage( sal_False ),
+ bPaperbin( sal_False ),
+ mbHandoutHorizontal( sal_True ),
mnHandoutPages( 6 ),
nQuality( 0 )
{
- EnableModify( TRUE );
+ EnableModify( sal_True );
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const
+sal_Bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const
{
return( IsDraw() == rOpt.IsDraw() &&
IsNotes() == rOpt.IsNotes() &&
@@ -1367,7 +1367,7 @@ BOOL SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const
// -----------------------------------------------------------------------------
-void SdOptionsPrint::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const
+void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
{
static const char* aDrawPropNames[] =
{
@@ -1427,7 +1427,7 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, ULONG& rCount ) co
// -----------------------------------------------------------------------------
-BOOL SdOptionsPrint::ReadData( const Any* pValues )
+sal_Bool SdOptionsPrint::ReadData( const Any* pValues )
{
if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() );
if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1 ].getValue() );
@@ -1439,7 +1439,7 @@ BOOL SdOptionsPrint::ReadData( const Any* pValues )
if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7 ].getValue() );
if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8 ].getValue() );
if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9 ].getValue() );
- if( pValues[10].hasValue() ) SetOutputQuality( (UINT16) *(sal_Int32*) pValues[ 10 ].getValue() );
+ if( pValues[10].hasValue() ) SetOutputQuality( (sal_uInt16) *(sal_Int32*) pValues[ 10 ].getValue() );
if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11 ].getValue() );
// just for impress
@@ -1449,15 +1449,15 @@ BOOL SdOptionsPrint::ReadData( const Any* pValues )
if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() );
if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() );
if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() );
- if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[16].getValue() );
+ if( pValues[16].hasValue() ) SetHandoutPages( (sal_uInt16)*(sal_Int32*) pValues[16].getValue() );
}
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL SdOptionsPrint::WriteData( Any* pValues ) const
+sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const
{
pValues[ 0 ] <<= IsDate();
pValues[ 1 ] <<= IsTime();
@@ -1482,7 +1482,7 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const
pValues[ 16 ] <<= GetHandoutPages();
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -1491,17 +1491,17 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich )
+SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich )
: SfxPoolItem ( _nWhich )
-, maOptionsPrint ( 0, FALSE )
+, maOptionsPrint ( 0, sal_False )
{
}
// ----------------------------------------------------------------------
-SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* )
+SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* )
: SfxPoolItem ( _nWhich )
-, maOptionsPrint ( 0, FALSE )
+, maOptionsPrint ( 0, sal_False )
{
if( pOpts )
{
@@ -1577,14 +1577,14 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const
|*
\************************************************************************/
-SdOptions::SdOptions( USHORT nConfigId ) :
- SdOptionsLayout( nConfigId, TRUE ),
- SdOptionsContents( nConfigId, TRUE ),
- SdOptionsMisc( nConfigId, TRUE ),
- SdOptionsSnap( nConfigId, TRUE ),
- SdOptionsZoom( nConfigId, TRUE ),
- SdOptionsGrid( nConfigId, TRUE ),
- SdOptionsPrint( nConfigId, TRUE )
+SdOptions::SdOptions( sal_uInt16 nConfigId ) :
+ SdOptionsLayout( nConfigId, sal_True ),
+ SdOptionsContents( nConfigId, sal_True ),
+ SdOptionsMisc( nConfigId, sal_True ),
+ SdOptionsSnap( nConfigId, sal_True ),
+ SdOptionsZoom( nConfigId, sal_True ),
+ SdOptionsGrid( nConfigId, sal_True ),
+ SdOptionsPrint( nConfigId, sal_True )
{
}
@@ -1596,7 +1596,7 @@ SdOptions::~SdOptions()
// ----------------------------------------------------------------------
-void SdOptions::StoreConfig( ULONG nOptionsRange )
+void SdOptions::StoreConfig( sal_uLong nOptionsRange )
{
if( nOptionsRange & SD_OPTIONS_LAYOUT )
SdOptionsLayout::Store();
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index c93460fc8b38..b479762b34a1 100755
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -87,7 +87,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(STR_APPLICATIONOBJECTBAR))
\************************************************************************/
SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
-: SfxModule( SfxApplication::CreateResManager("sd"), FALSE,
+: SfxModule( SfxApplication::CreateResManager("sd"), sal_False,
pFact1, pFact2, NULL ),
pTransferClip(NULL),
pTransferDrag(NULL),
@@ -96,7 +96,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
pDrawOptions(NULL),
pSearchItem(NULL),
pNumberFormatter( NULL ),
- bWaterCan(FALSE),
+ bWaterCan(sal_False),
mpResourceContainer(new ::sd::SdGlobalResourceContainer())
{
SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarDraw" ) ) ); // Nicht uebersetzen!
@@ -198,7 +198,7 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
}
if( pOptions )
{
- UINT16 nMetric = pOptions->GetMetric();
+ sal_uInt16 nMetric = pOptions->GetMetric();
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() );
SdDrawDocument* pDoc = NULL;
@@ -240,7 +240,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName,
SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE );
if( pStm )
- xOptionStorage = new SvStorage( pStm, TRUE );
+ xOptionStorage = new SvStorage( pStm, sal_True );
}
if( DOCUMENT_TYPE_DRAW == eType )
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 3c1abc0c7d22..139af4b09915 100755
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -116,7 +116,7 @@ private:
void SdModule::Execute(SfxRequest& rReq)
{
const SfxItemSet* pSet = rReq.GetArgs();
- ULONG nSlotId = rReq.GetSlot();
+ sal_uLong nSlotId = rReq.GetSlot();
switch ( nSlotId )
{
@@ -131,9 +131,9 @@ void SdModule::Execute(SfxRequest& rReq)
// automatische Rechtschreibpruefung
const SfxPoolItem* pItem;
if( pSet && SFX_ITEM_SET == pSet->GetItemState(
- SID_AUTOSPELL_CHECK, FALSE, &pItem ) )
+ SID_AUTOSPELL_CHECK, sal_False, &pItem ) )
{
- BOOL bOnlineSpelling = ( (const SfxBoolItem*) pItem )->GetValue();
+ sal_Bool bOnlineSpelling = ( (const SfxBoolItem*) pItem )->GetValue();
// am Dokument sichern:
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current());
if( pDocSh )
@@ -148,7 +148,7 @@ void SdModule::Execute(SfxRequest& rReq)
case SID_ATTR_METRIC:
{
const SfxPoolItem* pItem;
- if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_METRIC, TRUE, &pItem ) )
+ if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_METRIC, sal_True, &pItem ) )
{
FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue();
switch( eUnit )
@@ -167,7 +167,7 @@ void SdModule::Execute(SfxRequest& rReq)
PutItem( *pItem );
SdOptions* pOptions = GetSdOptions( eDocType );
if(pOptions)
- pOptions->SetMetric( (UINT16)eUnit );
+ pOptions->SetMetric( (sal_uInt16)eUnit );
rReq.Done();
}
}
@@ -187,9 +187,9 @@ void SdModule::Execute(SfxRequest& rReq)
const SfxPoolItem* pItem;
if( pSet &&
(
- SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_LANGUAGE, FALSE, &pItem ) ||
- SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, FALSE, &pItem ) ||
- SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, FALSE, &pItem )
+ SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_LANGUAGE, sal_False, &pItem ) ||
+ SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, sal_False, &pItem ) ||
+ SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, sal_False, &pItem )
)
)
{
@@ -231,7 +231,7 @@ void SdModule::Execute(SfxRequest& rReq)
case SID_OPENHYPERLINK:
case SID_OPENDOC:
{
- BOOL bIntercept = FALSE;
+ sal_Bool bIntercept = sal_False;
::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current());
if (pDocShell)
{
@@ -245,7 +245,7 @@ void SdModule::Execute(SfxRequest& rReq)
// from a shape interaction.
if (rReq.GetArgs() == NULL)
{
- bIntercept = TRUE;
+ bIntercept = sal_True;
}
}
}
@@ -259,7 +259,7 @@ void SdModule::Execute(SfxRequest& rReq)
{
ErrorBox(NULL, WB_OK, String(SdResId(STR_CANT_PERFORM_IN_LIVEMODE))).Execute();
- SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, FALSE );
+ SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, sal_False );
if( pLinkItem )
pLinkItem->GetValue().Call( 0 );
}
@@ -291,7 +291,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest)
SfxObjectShellLock xDocShell;
::sd::DrawDocShell* pDocSh;
xDocShell = pDocSh = new ::sd::DrawDocShell(
- SFX_CREATE_MODE_STANDARD, FALSE);
+ SFX_CREATE_MODE_STANDARD, sal_False);
if(pDocSh)
{
pDocSh->DoInitNew(NULL);
@@ -302,7 +302,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest)
pDoc->StopWorkStartupDelay();
}
- SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, FALSE);
+ SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, sal_False);
SfxViewFrame::LoadDocumentIntoFrame( *pDocSh, pFrmItem, ::sd::OUTLINE_FACTORY_ID );
::sd::ViewShell* pViewSh = pDocSh->GetViewShell();
@@ -510,7 +510,7 @@ void SdModule::AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocume
// The summary page, if it exists, is the last page.
SdPage* pSummaryPage = pDocument->GetSdPage (
- (USHORT)nPageCount-1, PK_STANDARD);
+ (sal_uInt16)nPageCount-1, PK_STANDARD);
OSL_ASSERT (pSummaryPage!=NULL);
// Take the change mode of the template page as indication of the
@@ -535,9 +535,9 @@ SfxFrame* SdModule::CreateFromTemplate( const String& rTemplatePath, const Refer
SfxObjectShellLock xDocShell;
SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() );
- pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) );
+ pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
- ULONG lErr = SFX_APP()->LoadTemplate( xDocShell, rTemplatePath, TRUE, pSet );
+ sal_uLong lErr = SFX_APP()->LoadTemplate( xDocShell, rTemplatePath, sal_True, pSet );
SfxObjectShell* pDocShell = xDocShell;
@@ -562,7 +562,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
if ( SvtModuleOptions().IsImpress() )
{
Reference< XFrame > xTargetFrame;
- SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE);
+ SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False);
if ( pFrmItem )
xTargetFrame = pFrmItem->GetFrame();
@@ -605,9 +605,9 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
const sal_Bool bIsDocEmpty = pPilotDlg->IsDocEmpty();
// So that you can open the document without AutoLayout-Dialog
- pOpt->SetStartWithTemplate(FALSE);
+ pOpt->SetStartWithTemplate(sal_False);
if(bNewDocDirect && !pPilotDlg->GetStartWithFlag())
- bStartWithTemplate = FALSE;
+ bStartWithTemplate = sal_False;
if( pPilotDlg->GetStartType() == ST_OPEN )
{
@@ -658,7 +658,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
}
catch (::com::sun::star::uno::Exception e)
{
- DBG_ASSERT (FALSE, "caught IllegalArgumentException while loading document from Impress autopilot");
+ DBG_ASSERT (sal_False, "caught IllegalArgumentException while loading document from Impress autopilot");
}
}
}
@@ -719,7 +719,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
if((aDocPath.Len() == 0) && pViewFrame && pViewFrame->GetDispatcher())
{
SfxBoolItem aIsChangedItem(SID_MODIFYPAGE, !bIsDocEmpty);
- SfxUInt32Item eAutoLayout( ID_VAL_WHATLAYOUT, (UINT32) AUTOLAYOUT_TITLE );
+ SfxUInt32Item eAutoLayout( ID_VAL_WHATLAYOUT, (sal_uInt32) AUTOLAYOUT_TITLE );
pViewFrame->GetDispatcher()->Execute(SID_MODIFYPAGE,
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aIsChangedItem, &eAutoLayout, 0L);
}
@@ -738,7 +738,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
pDoc->SetChanged(!bIsDocEmpty);
- pDocShell->SetUseUserData(TRUE);
+ pDocShell->SetUseUserData(sal_True);
// #94652# clear UNDO stack after autopilot
pDocShell->ClearUndoBuffer();
@@ -772,7 +772,7 @@ SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, const Reference<
SfxObjectShellLock xDocShell;
::sd::DrawDocShell* pNewDocSh;
- xDocShell = pNewDocSh = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD,FALSE,eDocType);
+ xDocShell = pNewDocSh = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD,sal_False,eDocType);
if(pNewDocSh)
{
pNewDocSh->DoInitNew(NULL);
@@ -802,23 +802,23 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF
// settings for the Outputmedium
Size aNewSize;
- UINT32 nLeft = 0;
- UINT32 nRight = 0;
- UINT32 nLower = 0;
- UINT32 nUpper = 0;
+ sal_uInt32 nLeft = 0;
+ sal_uInt32 nRight = 0;
+ sal_uInt32 nLower = 0;
+ sal_uInt32 nUpper = 0;
switch(eMedium)
{
case OUTPUT_PAGE:
case OUTPUT_OVERHEAD:
{
- SfxPrinter* pPrinter = pDocShell->GetPrinter(TRUE);
+ SfxPrinter* pPrinter = pDocShell->GetPrinter(sal_True);
if( pPrinter && pPrinter->IsValid())
{
// Der Printer gibt leider kein exaktes
// Format (z.B. A4) zurueck
Size aSize(pPrinter->GetPaperSize());
- Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, TRUE);
+ Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, sal_True);
if (ePaper != PAPER_USER)
{
@@ -880,9 +880,9 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF
break;
}
- BOOL bScaleAll = TRUE;
- USHORT nPageCnt = pDoc->GetMasterSdPageCount(PK_STANDARD);
- USHORT i;
+ sal_Bool bScaleAll = sal_True;
+ sal_uInt16 nPageCnt = pDoc->GetMasterSdPageCount(PK_STANDARD);
+ sal_uInt16 i;
SdPage* pPage;
// master pages first
@@ -930,7 +930,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF
}
SdPage* pHandoutPage = pDoc->GetSdPage(0, PK_HANDOUT);
- pHandoutPage->CreateTitleAndLayout(TRUE);
+ pHandoutPage->CreateTitleAndLayout(sal_True);
if( (eMedium != OUTPUT_ORIGINAL) && pViewFrame && pViewFrame->GetDispatcher())
{
@@ -1029,7 +1029,7 @@ void OutlineToImpressFinalizer::operator() (bool)
sd::OutlineViewPageChangesGuard aGuard( pView );
// Remove the first empty pages
- USHORT nPageCount = mrDocument.GetPageCount();
+ sal_uInt16 nPageCount = mrDocument.GetPageCount();
mrDocument.RemovePage( --nPageCount ); // notes page
mrDocument.RemovePage( --nPageCount ); // standard page
*/
@@ -1037,8 +1037,8 @@ void OutlineToImpressFinalizer::operator() (bool)
// Call UpdatePreview once for every slide to resync the
// document with the outliner of the OutlineViewShell.
- USHORT nPageCount (mrDocument.GetSdPageCount(PK_STANDARD));
- for (USHORT nIndex=0; nIndex<nPageCount; nIndex++)
+ sal_uInt16 nPageCount (mrDocument.GetSdPageCount(PK_STANDARD));
+ for (sal_uInt16 nIndex=0; nIndex<nPageCount; nIndex++)
{
SdPage* pPage = mrDocument.GetSdPage(nIndex, PK_STANDARD);
// Make the page the actual page so that the
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 58aba6823d3a..68f0499f72f6 100755
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -114,7 +114,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo
int nPgNum = 0;
Outliner* pOutl = pSdView->GetOutliner();
long nPos = pInfo->GetPara();
- ULONG nParaPos = 0;
+ sal_uLong nParaPos = 0;
for( Paragraph* pPara = pOutl->GetParagraph( 0 ); pPara && nPos >= 0; pPara = pOutl->GetParagraph( ++nParaPos ), nPos-- )
{
@@ -122,7 +122,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo
nPgNum++;
}
- pPage = pViewSh->GetDoc()->GetSdPage( (USHORT)nPgNum, PK_STANDARD );
+ pPage = pViewSh->GetDoc()->GetSdPage( (sal_uInt16)nPgNum, PK_STANDARD );
}
else
{
@@ -261,7 +261,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
{
nPgNum = (pPage->GetPageNum() - 1) / 2 + 1;
}
- aRepresentation = pDoc->CreatePageNumValue((USHORT)nPgNum);
+ aRepresentation = pDoc->CreatePageNumValue((sal_uInt16)nPgNum);
}
else
{
@@ -289,7 +289,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
bool bMasterView;
SdPage* pPage = GetCurrentPage( pViewSh, pInfo, bMasterView );
- USHORT nPageCount = 0;
+ sal_uInt16 nPageCount = 0;
if( !bMasterView )
{
@@ -299,7 +299,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
}
else if( pDoc )
{
- nPageCount = (USHORT)pDoc->GetSdPageCount(PK_STANDARD);
+ nPageCount = (sal_uInt16)pDoc->GetSdPageCount(PK_STANDARD);
}
}
@@ -421,7 +421,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
|* virt. Methoden fuer Optionendialog
|*
\************************************************************************/
-SfxItemSet* SdModule::CreateItemSet( USHORT nSlot )
+SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot )
{
::sd::FrameView* pFrameView = NULL;
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() );
@@ -474,7 +474,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot )
// TP_OPTIONS_LAYOUT:
pRet->Put( SdOptionsLayoutItem( ATTR_OPTIONS_LAYOUT, pOptions, pFrameView ) );
- UINT16 nDefTab = 0;
+ sal_uInt16 nDefTab = 0;
if( pFrameView)
nDefTab = pDoc->GetDefaultTabulator();
else
@@ -490,7 +490,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot )
if( nMetric == (FieldUnit)0xffff )
nMetric = GetFieldUnit();
- pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (UINT16)nMetric ) );
+ pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nMetric ) );
// TP_OPTIONS_CONTENTS:
pRet->Put( SdOptionsContentsItem( ATTR_OPTIONS_CONTENTS, pOptions, pFrameView ) );
@@ -501,7 +501,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot )
{
aSdOptionsMiscItem.GetOptionsMisc().SetSummationOfParagraphs( pDoc->IsSummationOfParagraphs() );
aSdOptionsMiscItem.GetOptionsMisc().SetPrinterIndependentLayout (
- (USHORT)pDoc->GetPrinterIndependentLayout());
+ (sal_uInt16)pDoc->GetPrinterIndependentLayout());
}
pRet->Put( aSdOptionsMiscItem );
@@ -510,10 +510,10 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot )
pRet->Put( SdOptionsSnapItem( ATTR_OPTIONS_SNAP, pOptions, pFrameView ) );
// TP_SCALE:
- UINT32 nW = 10L;
- UINT32 nH = 10L;
- INT32 nX;
- INT32 nY;
+ sal_uInt32 nW = 10L;
+ sal_uInt32 nH = 10L;
+ sal_Int32 nX;
+ sal_Int32 nY;
if( pDocSh )
{
SdrPage* pPage = (SdrPage*) pDoc->GetSdPage(0, PK_STANDARD);
@@ -548,12 +548,12 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot )
return pRet;
}
-void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
+void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
{
const SfxPoolItem* pItem = NULL;
- BOOL bNewDefTab = FALSE;
- BOOL bNewPrintOptions = FALSE;
- BOOL bMiscOptions = FALSE;
+ sal_Bool bNewDefTab = sal_False;
+ sal_Bool bNewPrintOptions = sal_False;
+ sal_Bool bMiscOptions = sal_False;
::sd::FrameView* pFrameView = NULL;
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() );
@@ -581,7 +581,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
SdOptions* pOptions = GetSdOptions(eDocType);
// Raster
if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS ,
- FALSE, (const SfxPoolItem**) &pItem ))
+ sal_False, (const SfxPoolItem**) &pItem ))
{
const SdOptionsGridItem* pGridItem = (SdOptionsGridItem*) pItem;
pGridItem->SetOptions( pOptions );
@@ -590,35 +590,35 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
// Layout
const SdOptionsLayoutItem* pLayoutItem = NULL;
if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_LAYOUT,
- FALSE, (const SfxPoolItem**) &pLayoutItem ))
+ sal_False, (const SfxPoolItem**) &pLayoutItem ))
{
pLayoutItem->SetOptions( pOptions );
}
// Metric
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, sal_False, &pItem ) )
{
if( pDoc && eDocType == pDoc->GetDocumentType() )
PutItem( *pItem );
pOptions->SetMetric( ( (SfxUInt16Item*) pItem )->GetValue() );
}
- UINT16 nDefTab = pOptions->GetDefTab();
+ sal_uInt16 nDefTab = pOptions->GetDefTab();
// Default-Tabulator
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_DEFTABSTOP, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_DEFTABSTOP, sal_False, &pItem ) )
{
nDefTab = ( (SfxUInt16Item*) pItem )->GetValue();
pOptions->SetDefTab( nDefTab );
- bNewDefTab = TRUE;
+ bNewDefTab = sal_True;
}
// Massstab
- if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_X, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_X, sal_False, &pItem ) )
{
- INT32 nX = ( (SfxInt32Item*) pItem )->GetValue();
- if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_Y, FALSE, &pItem ) )
+ sal_Int32 nX = ( (SfxInt32Item*) pItem )->GetValue();
+ if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_Y, sal_False, &pItem ) )
{
- INT32 nY = ( (SfxInt32Item*) pItem )->GetValue();
+ sal_Int32 nY = ( (SfxInt32Item*) pItem )->GetValue();
pOptions->SetScale( nX, nY );
// #92067# Apply to document only if doc type match
@@ -634,7 +634,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
// Contents (Inhalte)
const SdOptionsContentsItem* pContentsItem = NULL;
if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_CONTENTS,
- FALSE, (const SfxPoolItem**) &pContentsItem ))
+ sal_False, (const SfxPoolItem**) &pContentsItem ))
{
pContentsItem->SetOptions( pOptions );
}
@@ -642,16 +642,16 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
// Misc (Sonstiges)
const SdOptionsMiscItem* pMiscItem = NULL;
if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_MISC,
- FALSE, (const SfxPoolItem**) &pMiscItem ))
+ sal_False, (const SfxPoolItem**) &pMiscItem ))
{
pMiscItem->SetOptions( pOptions );
- bMiscOptions = TRUE;
+ bMiscOptions = sal_True;
}
// Fangen/Einrasten
const SdOptionsSnapItem* pSnapItem = NULL;
if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SNAP,
- FALSE, (const SfxPoolItem**) &pSnapItem ))
+ sal_False, (const SfxPoolItem**) &pSnapItem ))
{
pSnapItem->SetOptions( pOptions );
}
@@ -665,14 +665,14 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
// Drucken
const SdOptionsPrintItem* pPrintItem = NULL;
if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_PRINT,
- FALSE, (const SfxPoolItem**) &pPrintItem ))
+ sal_False, (const SfxPoolItem**) &pPrintItem ))
{
pPrintItem->SetOptions( pOptions );
// PrintOptionsSet setzen
SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT, pOptions );
SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC );
- USHORT nFlags = 0;
+ sal_uInt16 nFlags = 0;
nFlags = (aPrintItem.GetOptionsPrint().IsWarningSize() ? SFX_PRINTER_CHG_SIZE : 0) |
(aPrintItem.GetOptionsPrint().IsWarningOrientation() ? SFX_PRINTER_CHG_ORIENTATION : 0);
@@ -682,7 +682,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
aPrintSet.Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, aPrintItem.GetOptionsPrint().IsWarningPrinter() ) );
aPrintSet.Put( aFlagItem );
- bNewPrintOptions = TRUE;
+ bNewPrintOptions = sal_True;
}
// Nur, wenn auch der Dokumenttyp uebereinstimmt...
@@ -690,7 +690,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
{
if( bNewPrintOptions )
{
- pDocSh->GetPrinter(TRUE)->SetOptions( aPrintSet );
+ pDocSh->GetPrinter(sal_True)->SetOptions( aPrintSet );
}
// Am Model den DefTab setzen
@@ -699,11 +699,11 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
SdDrawDocument* pDocument = pDocSh->GetDoc();
pDocument->SetDefaultTabulator( nDefTab );
- ::sd::Outliner* pOutl = pDocument->GetOutliner( FALSE );
+ ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
if( pOutl )
pOutl->SetDefTab( nDefTab );
- ::sd::Outliner* pInternalOutl = pDocument->GetInternalOutliner( FALSE );
+ ::sd::Outliner* pInternalOutl = pDocument->GetInternalOutliner( sal_False );
if( pInternalOutl )
pInternalOutl->SetDefTab( nDefTab );
}
@@ -714,16 +714,16 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
sal_uInt32 nCntrl;
SdDrawDocument* pDocument = pDocSh->GetDoc();
- SdrOutliner& rOutl = pDocument->GetDrawOutliner( FALSE );
+ SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False );
nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
rOutl.SetControlWord( nCntrl | nSum );
- ::sd::Outliner* pOutl = pDocument->GetOutliner( FALSE );
+ ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
if( pOutl )
{
nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
pOutl->SetControlWord( nCntrl | nSum );
}
- pOutl = pDocument->GetInternalOutliner( FALSE );
+ pOutl = pDocument->GetInternalOutliner( sal_False );
if( pOutl )
{
nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
@@ -760,10 +760,10 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
}
if( pViewShell && pViewShell->GetViewFrame() )
- pViewShell->GetViewFrame()->GetBindings().InvalidateAll( TRUE );
+ pViewShell->GetViewFrame()->GetBindings().InvalidateAll( sal_True );
}
-SfxTabPage* SdModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet )
{
SfxTabPage* pRet = NULL;
SfxAllItemSet aSet(*(rSet.GetPool()));
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index 63d6fc0b195c..100632fc6766 100644..100755
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -76,8 +76,8 @@ SdFieldPopup::~SdFieldPopup()
void SdFieldPopup::Fill( LanguageType eLanguage )
{
- USHORT nID = 1;
- USHORT nStyle = MIB_RADIOCHECK | MIB_AUTOCHECK;
+ sal_uInt16 nID = 1;
+ sal_uInt16 nStyle = MIB_RADIOCHECK | MIB_AUTOCHECK;
InsertItem( nID++, String( SdResId( STR_FIX ) ), nStyle );
InsertItem( nID++, String( SdResId( STR_VAR ) ), nStyle );
InsertSeparator();
@@ -112,7 +112,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996
InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle );
- CheckItem( (USHORT) ( pDateField->GetFormat() ) + 1 ); // - 2 + 3 !
+ CheckItem( (sal_uInt16) ( pDateField->GetFormat() ) + 1 ); // - 2 + 3 !
}
else if( pField->ISA( SvxExtTimeField ) )
{
@@ -146,7 +146,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
//SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM
//SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM
- CheckItem( (USHORT) ( pTimeField->GetFormat() ) + 1 ); // - 2 + 3 !
+ CheckItem( (sal_uInt16) ( pTimeField->GetFormat() ) + 1 ); // - 2 + 3 !
}
else if( pField->ISA( SvxExtFileField ) )
{
@@ -163,7 +163,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
InsertItem( nID++, String( SdResId( STR_FILEFORMAT_PATH ) ), nStyle );
InsertItem( nID++, String( SdResId( STR_FILEFORMAT_NAME ) ), nStyle );
- CheckItem( (USHORT) ( pFileField->GetFormat() ) + 3 );
+ CheckItem( (sal_uInt16) ( pFileField->GetFormat() ) + 3 );
}
else if( pField->ISA( SvxAuthorField ) )
{
@@ -175,12 +175,12 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
else
CheckItem( 2 );
- for( USHORT i = 0; i < 4; i++ )
+ for( sal_uInt16 i = 0; i < 4; i++ )
{
aAuthorField.SetFormat( (SvxAuthorFormat) i );
InsertItem( nID++, aAuthorField.GetFormatted(), nStyle );
}
- CheckItem( (USHORT) ( pAuthorField->GetFormat() ) + 3 );
+ CheckItem( (sal_uInt16) ( pAuthorField->GetFormat() ) + 3 );
}
}
@@ -194,14 +194,14 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
SvxFieldData* SdFieldPopup::GetField()
{
SvxFieldData* pNewField = NULL;
- USHORT nCount = GetItemCount();
+ sal_uInt16 nCount = GetItemCount();
if( pField->ISA( SvxDateField ) )
{
const SvxDateField* pDateField = (const SvxDateField*) pField;
SvxDateType eType;
SvxDateFormat eFormat;
- USHORT i;
+ sal_uInt16 i;
if( IsItemChecked( 1 ) )
eType = SVXDATETYPE_FIX;
@@ -234,7 +234,7 @@ SvxFieldData* SdFieldPopup::GetField()
const SvxExtTimeField* pTimeField = (const SvxExtTimeField*) pField;
SvxTimeType eType;
SvxTimeFormat eFormat;
- USHORT i;
+ sal_uInt16 i;
if( IsItemChecked( 1 ) )
eType = SVXTIMETYPE_FIX;
@@ -268,7 +268,7 @@ SvxFieldData* SdFieldPopup::GetField()
const SvxExtFileField* pFileField = (const SvxExtFileField*) pField;
SvxFileType eType;
SvxFileFormat eFormat;
- USHORT i;
+ sal_uInt16 i;
if( IsItemChecked( 1 ) )
eType = SVXFILETYPE_FIX;
@@ -308,7 +308,7 @@ SvxFieldData* SdFieldPopup::GetField()
const SvxAuthorField* pAuthorField = (const SvxAuthorField*) pField;
SvxAuthorType eType;
SvxAuthorFormat eFormat;
- USHORT i;
+ sal_uInt16 i;
if( IsItemChecked( 1 ) )
eType = SVXAUTHORTYPE_FIX;
diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx
index cc32bcb7a8d5..daa450683110 100644..100755
--- a/sd/source/ui/app/sdresid.cxx
+++ b/sd/source/ui/app/sdresid.cxx
@@ -38,7 +38,7 @@
|*
\************************************************************************/
-SdResId::SdResId(USHORT nId) :
+SdResId::SdResId(sal_uInt16 nId) :
ResId(nId, *SD_MOD()->GetResMgr())
{
}
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index ddbc0698a341..48a1f35436e9 100644..100755
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -103,7 +103,7 @@ using namespace ::com::sun::star::datatransfer::clipboard;
// - SdTransferable -
// ------------------
-SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, BOOL bInitOnGetData )
+SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData )
: mpPageDocShell( NULL )
, mpOLEDataHelper( NULL )
, mpObjDesc( NULL )
@@ -116,12 +116,12 @@ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView,
, mpBookmark( NULL )
, mpGraphic( NULL )
, mpImageMap( NULL )
-, mbInternalMove( FALSE )
-, mbOwnDocument( FALSE )
-, mbOwnView( FALSE )
+, mbInternalMove( sal_False )
+, mbOwnDocument( sal_False )
+, mbOwnView( sal_False )
, mbLateInit( bInitOnGetData )
-, mbPageTransferable( FALSE )
-, mbPageTransferablePersistent( FALSE )
+, mbPageTransferable( sal_False )
+, mbPageTransferablePersistent( sal_False )
, mbIsUnoObj( false )
{
if( mpSourceDoc )
@@ -213,7 +213,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
{
mpGraphic = new Graphic( static_cast< SdrGrafObj* >( pObj )->GetTransformedGraphic() );
}
- else if( pObj->IsUnoObj() && FmFormInventor == pObj->GetObjInventor() && ( pObj->GetObjIdentifier() == (UINT16) OBJ_FM_BUTTON ) )
+ else if( pObj->IsUnoObj() && FmFormInventor == pObj->GetObjInventor() && ( pObj->GetObjIdentifier() == (sal_uInt16) OBJ_FM_BUTTON ) )
{
SdrUnoObj* pUnoCtrl = static_cast< SdrUnoObj* >( pObj );
@@ -280,7 +280,7 @@ void SdTransferable::CreateData()
{
if( mpSdDrawDocument && !mpSdViewIntern )
{
- mbOwnView = TRUE;
+ mbOwnView = sal_True;
SdPage* pPage = mpSdDrawDocument->GetSdPage(0, PK_STANDARD);
@@ -314,7 +314,7 @@ void SdTransferable::CreateData()
if( !maDocShellRef.Is() )
{
DBG_ERROR( "SdTransferable::CreateData(), failed to create a model with persist, clipboard operation will fail for OLE objects!" );
- mbOwnDocument = TRUE;
+ mbOwnDocument = sal_True;
}
// Groesse der Source-Seite uebernehmen
@@ -348,7 +348,7 @@ void SdTransferable::CreateData()
Point aOrigin( ( maVisArea = mpSdViewIntern->GetAllMarkedRect() ).TopLeft() );
Size aVector( -aOrigin.X(), -aOrigin.Y() );
- for( ULONG nObj = 0, nObjCount = pPage->GetObjCount(); nObj < nObjCount; nObj++ )
+ for( sal_uLong nObj = 0, nObjCount = pPage->GetObjCount(); nObj < nObjCount; nObj++ )
{
SdrObject* pObj = pPage->GetObj( nObj );
pObj->NbcMove( aVector );
@@ -364,9 +364,9 @@ void SdTransferable::CreateData()
// -----------------------------------------------------------------------------
-BOOL lcl_HasOnlyControls( SdrModel* pModel )
+sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
{
- BOOL bOnlyControls = FALSE; // default if there are no objects
+ sal_Bool bOnlyControls = sal_False; // default if there are no objects
if ( pModel )
{
@@ -377,12 +377,12 @@ BOOL lcl_HasOnlyControls( SdrModel* pModel )
SdrObject* pObj = aIter.Next();
if ( pObj )
{
- bOnlyControls = TRUE; // only set if there are any objects at all
+ bOnlyControls = sal_True; // only set if there are any objects at all
while ( pObj )
{
if (!pObj->ISA(SdrUnoObj))
{
- bOnlyControls = FALSE;
+ bOnlyControls = sal_False;
break;
}
pObj = aIter.Next();
@@ -492,7 +492,7 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
}
else if( mpOLEDataHelper && mpOLEDataHelper->HasFormat( rFlavor ) )
{
- ULONG nOldSwapMode = 0;
+ sal_uLong nOldSwapMode = 0;
if( mpSdDrawDocumentIntern )
{
@@ -547,12 +547,12 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
else if( nFormat == FORMAT_GDIMETAFILE )
{
if( mpSdViewIntern )
- bOK = SetGDIMetaFile( mpSdViewIntern->GetAllMarkedMetaFile( TRUE ), rFlavor );
+ bOK = SetGDIMetaFile( mpSdViewIntern->GetAllMarkedMetaFile( sal_True ), rFlavor );
}
else if( nFormat == FORMAT_BITMAP )
{
if( mpSdViewIntern )
- bOK = SetBitmap( mpSdViewIntern->GetAllMarkedBitmap( TRUE ), rFlavor );
+ bOK = SetBitmap( mpSdViewIntern->GetAllMarkedBitmap( sal_True ), rFlavor );
}
else if( ( nFormat == FORMAT_STRING ) && mpBookmark )
{
@@ -572,7 +572,7 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
}
else if( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE )
{
- ULONG nOldSwapMode = 0;
+ sal_uLong nOldSwapMode = 0;
if( mpSdDrawDocumentIntern )
{
@@ -585,9 +585,9 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
maDocShellRef = new ::sd::DrawDocShell(
mpSdDrawDocumentIntern,
SFX_CREATE_MODE_EMBEDDED,
- TRUE,
+ sal_True,
mpSdDrawDocumentIntern->GetDocumentType());
- mbOwnDocument = FALSE;
+ mbOwnDocument = sal_False;
maDocShellRef->DoInitNew( NULL );
}
@@ -618,7 +618,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
{
try
{
- static const BOOL bDontBurnInStyleSheet = ( getenv( "AVOID_BURN_IN_FOR_GALLERY_THEME" ) != NULL );
+ static const sal_Bool bDontBurnInStyleSheet = ( getenv( "AVOID_BURN_IN_FOR_GALLERY_THEME" ) != NULL );
SdDrawDocument* pDoc = (SdDrawDocument*) pObject;
if ( !bDontBurnInStyleSheet )
pDoc->BurnInStyleSheetAttributes();
@@ -636,7 +636,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
/* testcode
{
const rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
- SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, TRUE );
+ SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, sal_True );
aMedium.IsRemote();
com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
if( SvxDrawingLayerExport( pDoc, xDocOut, xComponent, (pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? "com.sun.star.comp.Impress.XMLClipboardExporter" : "com.sun.star.comp.DrawingLayer.XMLExporter" ) )
@@ -650,7 +650,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
catch( Exception& )
{
DBG_ERROR( "sd::SdTransferable::WriteObject(), exception catched!" );
- bRet = FALSE;
+ bRet = sal_False;
}
}
break;
@@ -670,7 +670,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, sal_False );
// mba: no relative ULRs for clipboard!
SfxMedium aMedium( xWorkStore, String() );
- bRet = pEmbObj->DoSaveObjectAs( aMedium, FALSE );
+ bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False );
pEmbObj->DoSaveCompleted();
uno::Reference< embed::XTransactedObject > xTransact( xWorkStore, uno::UNO_QUERY );
@@ -685,7 +685,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
delete pSrcStm;
}
- bRet = TRUE;
+ bRet = sal_True;
rxOStm->Commit();
}
catch ( Exception& )
@@ -734,7 +734,7 @@ void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rO
// -----------------------------------------------------------------------------
-void SdTransferable::SetPageBookmarks( const List& rPageBookmarks, BOOL bPersistent )
+void SdTransferable::SetPageBookmarks( const List& rPageBookmarks, sal_Bool bPersistent )
{
if( mpSourceDoc )
{
@@ -752,13 +752,13 @@ void SdTransferable::SetPageBookmarks( const List& rPageBookmarks, BOOL bPersist
if( bPersistent )
{
mpSdDrawDocument->CreateFirstPages(mpSourceDoc);
- mpSdDrawDocument->InsertBookmarkAsPage( const_cast< List* >( &rPageBookmarks ), NULL, FALSE, TRUE, 1, TRUE, mpSourceDoc->GetDocSh(), TRUE, TRUE, FALSE );
+ mpSdDrawDocument->InsertBookmarkAsPage( const_cast< List* >( &rPageBookmarks ), NULL, sal_False, sal_True, 1, sal_True, mpSourceDoc->GetDocSh(), sal_True, sal_True, sal_False );
}
else
{
mpPageDocShell = mpSourceDoc->GetDocSh();
- for( ULONG i = 0; i < rPageBookmarks.Count(); i++ )
+ for( sal_uLong i = 0; i < rPageBookmarks.Count(); i++ )
maPageBookmarks.Insert( new String( *static_cast< String* >( rPageBookmarks.GetObject( i ) ) ), LIST_APPEND );
}
@@ -772,9 +772,9 @@ void SdTransferable::SetPageBookmarks( const List& rPageBookmarks, BOOL bPersist
}
}
- // set flags for page transferable; if ( mbPageTransferablePersistent == FALSE ),
+ // set flags for page transferable; if ( mbPageTransferablePersistent == sal_False ),
// don't offer any formats => it's just for internal puposes
- mbPageTransferable = TRUE;
+ mbPageTransferable = sal_True;
mbPageTransferablePersistent = bPersistent;
}
}
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 80bd3a5ac8b9..06eb8f684711 100644..100755
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -60,7 +60,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxControl, TbxImageItem )
|*
\************************************************************************/
/*
-SdPopupWindowTbx::SdPopupWindowTbx( USHORT nId, WindowAlign eAlign,
+SdPopupWindowTbx::SdPopupWindowTbx( sal_uInt16 nId, WindowAlign eAlign,
SdResId aRIdWin, SdResId aRIdTbx,
SfxBindings& rBindings ) :
SfxPopupWindow ( nId, aRIdWin, rBindings ),
@@ -99,10 +99,10 @@ void SdPopupWindowTbx::AdaptToCTL (void)
// Iterate over all tool box items and remove those that are
// specific to complex text layout.
- USHORT i=0;
+ sal_uInt16 i=0;
while (i < aToolBox.GetItemCount())
{
- USHORT nIndex = aToolBox.GetItemId(i);
+ sal_uInt16 nIndex = aToolBox.GetItemId(i);
switch (nIndex)
{
case 0: // Line break.
@@ -121,7 +121,7 @@ void SdPopupWindowTbx::AdaptToCTL (void)
aToolBox.RecalcItems();
// Why is this necessary?
aToolBox.SetLineCount(1);
- USHORT nLineCount = aToolBox.GetLineCount();
+ sal_uInt16 nLineCount = aToolBox.GetLineCount();
aSize = aToolBox.CalcWindowSizePixel(nLineCount);
}
}
@@ -194,7 +194,7 @@ IMPL_LINK( SdPopupWindowTbx, TbxSelectHdl, ToolBox*, pBox)
|*
\************************************************************************/
-SdTbxControl::SdTbxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SdTbxControl::SdTbxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -281,7 +281,7 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow()
/*-------------------------------------------------------------------------*/
-void SdTbxControl::StateChanged( USHORT nSId,
+void SdTbxControl::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pState )
{
SfxToolBoxControl::StateChanged( nSId, eState, pState );
@@ -295,11 +295,11 @@ void SdTbxControl::StateChanged( USHORT nSId,
if( pItem )
{
ToolBox& rTbx = GetToolBox();
- USHORT nImage = pItem->GetValue();
+ sal_uInt16 nImage = pItem->GetValue();
if( nImage == 0 )
{
if( rTbx.IsItemChecked( nSId ) )
- rTbx.CheckItem( nSId, FALSE );
+ rTbx.CheckItem( nSId, sal_False );
}
else
{
@@ -323,28 +323,28 @@ void SdTbxControl::StateChanged( USHORT nSId,
{
if( nSId != SID_OBJECT_CHOOSE_MODE &&
rTbx.IsItemChecked( SID_OBJECT_CHOOSE_MODE ) )
- rTbx.CheckItem( SID_OBJECT_CHOOSE_MODE, FALSE );
+ rTbx.CheckItem( SID_OBJECT_CHOOSE_MODE, sal_False );
if( nSId != SID_DRAWTBX_TEXT &&
rTbx.IsItemChecked( SID_DRAWTBX_TEXT ) )
- rTbx.CheckItem( SID_DRAWTBX_TEXT, FALSE );
+ rTbx.CheckItem( SID_DRAWTBX_TEXT, sal_False );
if( nSId != SID_DRAWTBX_RECTANGLES &&
rTbx.IsItemChecked( SID_DRAWTBX_RECTANGLES ) )
- rTbx.CheckItem( SID_DRAWTBX_RECTANGLES, FALSE );
+ rTbx.CheckItem( SID_DRAWTBX_RECTANGLES, sal_False );
if( nSId != SID_DRAWTBX_ELLIPSES &&
rTbx.IsItemChecked( SID_DRAWTBX_ELLIPSES ) )
- rTbx.CheckItem( SID_DRAWTBX_ELLIPSES, FALSE );
+ rTbx.CheckItem( SID_DRAWTBX_ELLIPSES, sal_False );
if( nSId != SID_DRAWTBX_LINES &&
rTbx.IsItemChecked( SID_DRAWTBX_LINES ) )
- rTbx.CheckItem( SID_DRAWTBX_LINES, FALSE );
+ rTbx.CheckItem( SID_DRAWTBX_LINES, sal_False );
if( nSId != SID_DRAWTBX_ARROWS &&
rTbx.IsItemChecked( SID_DRAWTBX_ARROWS ) )
- rTbx.CheckItem( SID_DRAWTBX_ARROWS, FALSE );
+ rTbx.CheckItem( SID_DRAWTBX_ARROWS, sal_False );
if( nSId != SID_DRAWTBX_3D_OBJECTS &&
rTbx.IsItemChecked( SID_DRAWTBX_3D_OBJECTS ) )
- rTbx.CheckItem( SID_DRAWTBX_3D_OBJECTS, FALSE );
+ rTbx.CheckItem( SID_DRAWTBX_3D_OBJECTS, sal_False );
if( nSId != SID_DRAWTBX_CONNECTORS &&
rTbx.IsItemChecked( SID_DRAWTBX_CONNECTORS ) )
- rTbx.CheckItem( SID_DRAWTBX_CONNECTORS, FALSE );
+ rTbx.CheckItem( SID_DRAWTBX_CONNECTORS, sal_False );
}
}
}
@@ -354,7 +354,7 @@ void SdTbxControl::StateChanged( USHORT nSId,
/*-------------------------------------------------------------------------*/
-BOOL SdTbxControl::IsCheckable( USHORT nSId )
+sal_Bool SdTbxControl::IsCheckable( sal_uInt16 nSId )
{
switch( nSId )
{
@@ -463,9 +463,9 @@ BOOL SdTbxControl::IsCheckable( USHORT nSId )
//case SID_ZOOM_OUT:
- return( TRUE );
+ return( sal_True );
}
- return( FALSE );
+ return( sal_False );
}
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 039df4bbce3f..4d0b121f8f03 100644..100755
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -52,10 +52,10 @@ class TemplatePopup_Impl : public PopupMenu
public:
TemplatePopup_Impl();
- USHORT GetCurId() const { return nCurId; }
+ sal_uInt16 GetCurId() const { return nCurId; }
private:
- USHORT nCurId;
+ sal_uInt16 nCurId;
virtual void Select();
};
@@ -77,8 +77,8 @@ void TemplatePopup_Impl::Select()
// class SdTemplateControl ------------------------------------------
-SdTemplateControl::SdTemplateControl( USHORT _nSlotId,
- USHORT _nId,
+SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId,
+ sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb )
{
@@ -93,7 +93,7 @@ SdTemplateControl::~SdTemplateControl()
// -----------------------------------------------------------------------
void SdTemplateControl::StateChanged(
- USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{
if( eState != SFX_ITEM_AVAILABLE || pState->ISA( SfxVoidItem ) )
GetStatusBar().SetItemText( GetId(), String() );
@@ -130,10 +130,10 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt )
CaptureMouse();
TemplatePopup_Impl aPop;
{
- const USHORT nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD);
+ const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD);
- USHORT nCount = 0;
- for( USHORT nPage = 0; nPage < nMasterCount; ++nPage )
+ sal_uInt16 nCount = 0;
+ for( sal_uInt16 nPage = 0; nPage < nMasterCount; ++nPage )
{
SdPage* pMaster = pDoc->GetMasterSdPage(nPage, PK_STANDARD);
if( pMaster )
@@ -141,7 +141,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt )
}
aPop.Execute( &GetStatusBar(), rCEvt.GetMousePosPixel());
- USHORT nCurrId = aPop.GetCurId()-1;
+ sal_uInt16 nCurrId = aPop.GetCurId()-1;
if( nCurrId < nMasterCount )
{
SdPage* pMaster = pDoc->GetMasterSdPage(nCurrId, PK_STANDARD);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 18:37:07 +0000