INTEGRATION: CWS supdremove (1.17.24); FILE MERGED

2007/11/16 10:23:26 vg 1.17.24.1: #i83674# cleanup: remove obsolete SUPD macro use

1 files changed, 2 insertions, 20 deletions

diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 8b7feaeac72c..6133adaf677c 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: slot.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 12:48:09 $
+ *  last change: $Author: obo $ $Date: 2008-01-07 08:41:06 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -194,9 +194,7 @@ void SvMetaSlot::Load( SvPersistStream & rStm )
 
     TEST_READ
     if( nMask & 0x0001 ) rStm >> aUnoName;
-#if SUPD>=643
     if( nMask & 0x0002 ) rStm >> aImageReflection;
-#endif
 }
 
 void SvMetaSlot::Save( SvPersistStream & rStm )
@@ -314,16 +312,12 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
 
     nMask = 0;
     if( aUnoName.IsSet() )          nMask |= 0x0001;
-#if SUPD>=643
     if( aImageReflection.IsSet() )  nMask |= 0x0002;
-#endif
     rStm << nMask;
     TEST_WRITE
     if( nMask & 0x0001 ) rStm << aUnoName;
-#if SUPD>=643
     TEST_WRITE
     if( nMask & 0x0002 ) rStm << aImageReflection;
-#endif
 }
 
 /*************************************************************************
@@ -556,13 +550,11 @@ BOOL SvMetaSlot::GetImageRotation() const
     return ((SvMetaSlot *)GetRef())->GetImageRotation();
 }
 
-#if SUPD>=643
 BOOL SvMetaSlot::GetImageReflection() const
 {
     if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection;
     return ((SvMetaSlot *)GetRef())->GetImageReflection();
 }
-#endif
 
 const ByteString& SvMetaSlot::GetUnoName() const
 {
@@ -678,9 +670,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
     bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
     bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
-#if SUPD>=643
     bOk |= aImageReflection.ReadSvIdl( SvHash_ImageReflection(), rInStm );
-#endif
     bOk |= aUnoName.ReadSvIdl( SvHash_UnoName(), rInStm );
 
     if( !bOk )
@@ -907,13 +897,11 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
         aDel = ", ";
     }
 
-#if SUPD>=643
     if( aImageReflection )
     {
         ( aOut += aDel ) += aImageReflection.GetSvIdlString( SvHash_ImageReflection() );
         aDel = ", ";
     }
-#endif
 
     if( aOut.Len() )
     {
@@ -1461,10 +1449,8 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
         rOutStm << MakeSlotName( SvHash_ReadOnlyDoc() ).GetBuffer() << '|';
     if( GetImageRotation() )
         rOutStm << MakeSlotName( SvHash_ImageRotation() ).GetBuffer() << '|';
-#if SUPD>=643
     if( GetImageReflection() )
         rOutStm << MakeSlotName( SvHash_ImageReflection() ).GetBuffer() << '|';
-#endif
     rOutStm << '0';
 
     rOutStm << ',' << endl;
@@ -1872,10 +1858,8 @@ void SvMetaSlot::CompareSlotAttributes( SvMetaSlot* pSlot )
 
     if ( GetImageRotation() != pSlot->GetImageRotation() )
         aStr += "    ImageRotation\n";
-#if SUPD>=643
     if ( GetImageReflection() != pSlot->GetImageReflection() )
         aStr += "    ImageReflection\n";
-#endif
     if ( !GetPseudoPrefix().Equals( pSlot->GetPseudoPrefix() ) )
         aStr += "    PseudoPrefix\n";
 
@@ -1932,9 +1916,7 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
     WriteBool( GetHasDialog(), rStrm );
     WriteBool( GetReadOnlyDoc(), rStrm );
     WriteBool( GetImageRotation(), rStrm );
-#if SUPD>=643
     WriteBool( GetImageReflection(), rStrm );
-#endif
     rStrm << GetDisableFlags().GetBuffer() << ',';
 
     if( GetSynchron() )