Update from master repository (DEV300_m100).

4 files changed, 14 insertions, 14 deletions

diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index ea58ec2af9d7..35daf49863d8 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -307,19 +307,19 @@ sal_Int32 getNextActionOffset( MetaAction * pCurrAct )
     switch (pCurrAct->GetType()) {
     case META_TEXT_ACTION: {
         MetaTextAction * pAct = static_cast<MetaTextAction *>(pCurrAct);
-        return (pAct->GetLen() == (USHORT)STRING_LEN
+        return (pAct->GetLen() == (sal_uInt16)STRING_LEN
                 ? pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen());
     }
     case META_TEXTARRAY_ACTION: {
         MetaTextArrayAction * pAct =
             static_cast<MetaTextArrayAction *>(pCurrAct);
-        return (pAct->GetLen() == (USHORT)STRING_LEN
+        return (pAct->GetLen() == (sal_uInt16)STRING_LEN
                 ? pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen());
     }
     case META_STRETCHTEXT_ACTION: {
         MetaStretchTextAction * pAct =
             static_cast<MetaStretchTextAction *>(pCurrAct);
-        return (pAct->GetLen() == (USHORT)STRING_LEN
+        return (pAct->GetLen() == (sal_uInt16)STRING_LEN
                 ? pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen());
     }
     case META_FLOATTRANSPARENT_ACTION: {
@@ -357,12 +357,12 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames&   o_rFrames,
     // update modes)
     VirtualDevice aVDev;
     aVDev.SetOutputSizePixel( aAnimSize );
-    aVDev.EnableMapMode( FALSE );
+    aVDev.EnableMapMode( sal_False );
 
     // setup mask VDev (alpha VDev is currently rather slow)
     VirtualDevice aVDevMask;
     aVDevMask.SetOutputSizePixel( aAnimSize );
-    aVDevMask.EnableMapMode( FALSE );
+    aVDevMask.EnableMapMode( sal_False );
 
     switch( aAnimation.GetCycleMode() )
     {
@@ -391,7 +391,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames&   o_rFrames,
             break;
     }
 
-    for( USHORT i=0, nCount=aAnimation.Count(); i<nCount; ++i )
+    for( sal_uInt16 i=0, nCount=aAnimation.Count(); i<nCount; ++i )
     {
         const AnimationBitmap& rAnimBmp( aAnimation.Get(i) );
         switch(rAnimBmp.eDisposal)
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index a5d8acea2140..317d50f352f9 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -415,8 +415,8 @@ ShapeSharedPtr ShapeImporter::createShape(
         aGraphAttrs.SetChannelG( nGreen );
         aGraphAttrs.SetChannelB( nBlue );
         aGraphAttrs.SetGamma( nGamma );
-        aGraphAttrs.SetTransparency( static_cast<BYTE>(nTransparency) );
-        aGraphAttrs.SetRotation( static_cast<USHORT>(nRotation*10) );
+        aGraphAttrs.SetTransparency( static_cast<sal_uInt8>(nTransparency) );
+        aGraphAttrs.SetRotation( static_cast<sal_uInt16>(nRotation*10) );
 
         text::GraphicCrop aGraphCrop;
         if( getPropertyValue( aGraphCrop, xPropSet, OUSTR("GraphicCrop") ))
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index fecf0c30587f..2d639a7abcd8 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -365,10 +365,10 @@ namespace slideshow
             /// Number of shape sprites currenly active on this LayerManager
             sal_Int32                mnActiveSprites;
 
-            /// TRUE, if shapes might need to move to different layer
+            /// sal_True, if shapes might need to move to different layer
             bool                     mbLayerAssociationDirty;
 
-            /// FALSE when deactivated
+            /// sal_False when deactivated
             bool                     mbActive;
 
             /** When true, all sprite animations run in the foreground.  That
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 2fb84f1f9d83..6f72fc1a5d11 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -308,7 +308,7 @@ class DemoApp : public Application
 {
 public:
     virtual void Main();
-    virtual USHORT  Exception( USHORT nError );
+    virtual sal_uInt16  Exception( sal_uInt16 nError );
 };
 
 class ChildWindow : public Window
@@ -427,7 +427,7 @@ DemoWindow::DemoWindow() :
     Show();
 
     maUpdateTimer.SetTimeoutHdl(LINK(this, DemoWindow, updateHdl));
-    maUpdateTimer.SetTimeout( (ULONG)30 );
+    maUpdateTimer.SetTimeout( (sal_uLong)30 );
     maUpdateTimer.Start();
 }
 
@@ -495,7 +495,7 @@ void DemoWindow::Resize()
     // TODO
 }
 
-USHORT DemoApp::Exception( USHORT nError )
+sal_uInt16 DemoApp::Exception( sal_uInt16 nError )
 {
     switch( nError & EXC_MAJORTYPE )
     {
@@ -510,7 +510,7 @@ void DemoApp::Main()
 {
     bool bHelp = false;
 
-    for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
+    for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ )
     {
         ::rtl::OUString aParam = GetCommandLineParam( i );