#98399#: different flags for ImageRotation and ImageReflection

5 files changed, 42 insertions, 11 deletions

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 026d1df8db19..1160b57ab601 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: globals.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2002-04-17 12:53:06 $
+ *  last change: $Author: mba $ $Date: 2002-08-23 11:13:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,6 +144,7 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_SbxObject;
     SvStringHashEntryRef MM_Container;
     SvStringHashEntryRef MM_ImageRotation;
+    SvStringHashEntryRef MM_ImageReflection;
     SvStringHashEntryRef MM_IsCollection;
     SvStringHashEntryRef MM_ReadOnlyDoc;
     SvStringHashEntryRef MM_ConfigName;
@@ -254,6 +255,7 @@ HASH_INLINE(FastCall)
 HASH_INLINE(SbxObject)
 HASH_INLINE(Container)
 HASH_INLINE(ImageRotation)
+HASH_INLINE(ImageReflection)
 HASH_INLINE(IsCollection)
 HASH_INLINE(ReadOnlyDoc)
 HASH_INLINE(ConfigName)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 3634b83f8b2a..4642111964a7 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: slot.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2002-04-17 12:53:06 $
+ *  last change: $Author: mba $ $Date: 2002-08-23 11:13:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,6 +104,7 @@ class SvMetaSlot : public SvMetaAttribute
     SvBOOL          aFastCall;
     SvBOOL          aContainer;
     SvBOOL          aImageRotation;
+    SvBOOL          aImageReflection;
     SvIdentifier    aPseudoPrefix;
     SvString        aDisableFlags;
     SvMetaSlot*     pLinkedSlot;
@@ -210,6 +211,8 @@ protected:
             { aContainer = bSet; }
     void    SetImageRotation( BOOL bSet )
             { aImageRotation = bSet; }
+    void    SetImageReflection( BOOL bSet )
+            { aImageReflection = bSet; }
 
 public:
             SV_DECL_META_FACTORY1( SvMetaSlot, SvMetaReference, 11 )
@@ -258,6 +261,7 @@ public:
     BOOL                GetFastCall() const;
     BOOL                GetContainer() const;
     BOOL                GetImageRotation() const;
+    BOOL                GetImageReflection() const;
     SvMetaSlot*         GetLinkedSlot() const
                         { return pLinkedSlot; }
     SvMetaSlot*         GetNextSlot() const
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index f51055c1513e..bc0dc0271ed7 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: slot.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2002-06-14 12:22:12 $
+ *  last change: $Author: mba $ $Date: 2002-08-23 11:13:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -219,6 +219,7 @@ void SvMetaSlot::Load( SvPersistStream & rStm )
 
     TEST_READ
     if( nMask & 0x0001 ) rStm >> aUnoName;
+    if( nMask & 0x0002 ) rStm >> aImageReflection;
 }
 
 void SvMetaSlot::Save( SvPersistStream & rStm )
@@ -335,11 +336,14 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
     if( nMask & 0x8000 ) rStm << aImageRotation;
 
     nMask = 0;
-    if( aUnoName.IsSet() )  nMask |= 0x0001;
+    if( aUnoName.IsSet() )          nMask |= 0x0001;
+    if( aImageReflection.IsSet() )  nMask |= 0x0002;
 
     rStm << nMask;
     TEST_WRITE
     if( nMask & 0x0001 ) rStm << aUnoName;
+    TEST_WRITE
+    if( nMask & 0x0002 ) rStm << aImageReflection;
 }
 
 /*************************************************************************
@@ -572,6 +576,12 @@ BOOL SvMetaSlot::GetImageRotation() const
     return ((SvMetaSlot *)GetRef())->GetImageRotation();
 }
 
+BOOL SvMetaSlot::GetImageReflection() const
+{
+    if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection;
+    return ((SvMetaSlot *)GetRef())->GetImageReflection();
+}
+
 const ByteString& SvMetaSlot::GetUnoName() const
 {
     if( aUnoName.IsSet() || !GetRef() ) return aUnoName;
@@ -686,6 +696,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
     bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
     bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
+    bOk |= aImageReflection.ReadSvIdl( SvHash_ImageReflection(), rInStm );
     bOk |= aUnoName.ReadSvIdl( SvHash_UnoName(), rInStm );
 
     if( !bOk )
@@ -912,6 +923,12 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
         aDel = ", ";
     }
 
+    if( aImageReflection )
+    {
+        ( aOut += aDel ) += aImageReflection.GetSvIdlString( SvHash_ImageReflection() );
+        aDel = ", ";
+    }
+
     if( aOut.Len() )
     {
         WriteTab( rOutStm, nTab );
@@ -1453,6 +1470,8 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
         rOutStm << MakeSlotName( SvHash_ReadOnlyDoc() ).GetBuffer() << '|';
     if( GetImageRotation() )
         rOutStm << MakeSlotName( SvHash_ImageRotation() ).GetBuffer() << '|';
+    if( GetImageReflection() )
+        rOutStm << MakeSlotName( SvHash_ImageReflection() ).GetBuffer() << '|';
 
     rOutStm << '0';
 
@@ -1887,6 +1906,9 @@ void SvMetaSlot::CompareSlotAttributes( SvMetaSlot* pSlot )
     if ( GetImageRotation() != pSlot->GetImageRotation() )
         aStr += "    ImageRotation\n";
 
+    if ( GetImageReflection() != pSlot->GetImageReflection() )
+        aStr += "    ImageReflection\n";
+
     if ( !GetPseudoPrefix().Equals( pSlot->GetPseudoPrefix() ) )
         aStr += "    PseudoPrefix\n";
 
@@ -1944,6 +1966,7 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
     WriteBool( GetHasDialog(), rStrm );
     WriteBool( GetReadOnlyDoc(), rStrm );
     WriteBool( GetImageRotation(), rStrm );
+    WriteBool( GetImageReflection(), rStrm );
 
     rStrm << GetDisableFlags().GetBuffer() << ',';
 
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index a2f8322d05b6..702329f74542 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: command.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2002-04-17 12:53:07 $
+ *  last change: $Author: mba $ $Date: 2002-08-23 11:13:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -138,6 +138,7 @@ char* SyntaxStrings[] = {
 "\t\tHasDialog",
 "\t\tIsCollection",
 "\t\tImageRotation",
+"\t\tImageReflection",
 "\t\tPseudoPrefix   = Identifier",
 "\t\tPseudoSlots",
 "\t\tReadOnly",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index dbb1423917e4..8a5d5a356230 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: globals.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2002-04-17 12:53:07 $
+ *  last change: $Author: mba $ $Date: 2002-08-23 11:13:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -216,6 +216,7 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(SbxObject)
     A_ENTRY(Container)
     A_ENTRY(ImageRotation)
+    A_ENTRY(ImageReflection)
     A_ENTRY(IsCollection)
     A_ENTRY(ReadOnlyDoc)
     A_ENTRY(ConfigName)