summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells/mediash.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/shells/mediash.cxx')
-rw-r--r--sw/source/ui/shells/mediash.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index 36aa18f2d01c..ed73541da8d6 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -104,10 +104,10 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
if( pSdrView )
{
const SfxItemSet* pArgs = rReq.GetArgs();
- USHORT nSlotId = rReq.GetSlot();
- BOOL bChanged = pSdrView->GetModel()->IsChanged();
+ sal_uInt16 nSlotId = rReq.GetSlot();
+ sal_Bool bChanged = pSdrView->GetModel()->IsChanged();
- pSdrView->GetModel()->SetChanged( FALSE );
+ pSdrView->GetModel()->SetChanged( sal_False );
switch( nSlotId )
{
@@ -132,7 +132,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
{
const SfxPoolItem* pItem;
- if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) )
+ if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, sal_False, &pItem ) ) )
pItem = NULL;
if( pItem )
@@ -163,7 +163,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
if( pSdrView->GetModel()->IsChanged() )
GetShell().SetModified();
else if( bChanged )
- pSdrView->GetModel()->SetChanged(TRUE);
+ pSdrView->GetModel()->SetChanged(sal_True);
}
}
@@ -172,7 +172,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
void SwMediaShell::GetMediaState(SfxItemSet &rSet)
{
SfxWhichIter aIter( rSet );
- USHORT nWhich = aIter.FirstWhich();
+ sal_uInt16 nWhich = aIter.FirstWhich();
while( nWhich )
{