#93635#: setting of transparent color is not neccessary anymore

2 files changed, 4 insertions, 41 deletions

diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 7b3edc9f06ac..9335fc222fe6 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuoaprms.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2001-06-20 17:16:55 $
+ *  last change: $Author: ka $ $Date: 2001-10-23 11:54:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -148,7 +148,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
     short nInvisibleSet     = ATTR_MISSING;
     short nSoundOnSet       = ATTR_MISSING;
     short nSoundFileSet     = ATTR_MISSING;
-    short nBlueScreenSet    = ATTR_MISSING;
     short nPlayFullSet      = ATTR_MISSING;
     short nClickActionSet   = ATTR_MISSING;
     short nBookmarkSet      = ATTR_MISSING;
@@ -170,7 +169,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
     BOOL            bFadeOut        = FALSE;
     Color           aFadeColor      = COL_LIGHTGRAY;
     BOOL            bInvisible      = FALSE;
-    Color           aBlueScreen     = COL_LIGHTMAGENTA;
     BOOL            bSoundOn        = FALSE;
     String          aSound;
     BOOL            bPlayFull       = FALSE;
@@ -219,9 +217,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
         aSound              = pInfo->aSoundFile;
         nSoundFileSet       = ATTR_SET;
 
-        aBlueScreen         = pInfo->aBlueScreen;
-        nBlueScreenSet      = ATTR_SET;
-
         bPlayFull           = pInfo->bPlayFull;
         nPlayFullSet        = ATTR_SET;
 
@@ -279,9 +274,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
             if( aSound != pInfo->aSoundFile )
                 nSoundFileSet = ATTR_MIXED;
 
-            if( aBlueScreen != pInfo->aBlueScreen )
-                nBlueScreenSet = ATTR_MIXED;
-
             if( bPlayFull != pInfo->bPlayFull )
                 nPlayFullSet = ATTR_MIXED;
 
@@ -332,9 +324,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
             if (nSoundFileSet == ATTR_SET)
                 nSoundFileSet = ATTR_MIXED;
 
-            if (nBlueScreenSet == ATTR_SET)
-                nBlueScreenSet = ATTR_MIXED;
-
             if (nPlayFullSet == ATTR_SET && bPlayFull == TRUE)
                 nPlayFullSet = ATTR_MIXED;
 
@@ -399,7 +388,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
             bInvisible      = pInfo->bDimHide;         nInvisibleSet       = ATTR_SET;
             bSoundOn        = pInfo->bSoundOn;         nSoundOnSet         = ATTR_SET;
             aSound          = pInfo->aSoundFile;       nSoundFileSet       = ATTR_SET;
-            aBlueScreen     = pInfo->aBlueScreen;      nBlueScreenSet      = ATTR_SET;
             bPlayFull       = pInfo->bPlayFull;        nPlayFullSet        = ATTR_SET;
             eClickAction    = pInfo->eClickAction;     nClickActionSet     = ATTR_SET;
             aBookmark       = pInfo->aBookmark;        nBookmarkSet        = ATTR_SET;
@@ -477,14 +465,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
         else
             aSet.InvalidateItem(ATTR_ANIMATION_SOUNDFILE);
 
-        if (nBlueScreenSet == ATTR_SET)
-            aSet.Put(SvxColorItem(aBlueScreen, ATTR_ANIMATION_TRANSPCOLOR));
-        else if (nBlueScreenSet == ATTR_MIXED)
-            aSet.InvalidateItem(ATTR_ANIMATION_TRANSPCOLOR);
-        else
-            aSet.Put(SvxColorItem(RGB_Color(COL_LIGHTMAGENTA), ATTR_ANIMATION_TRANSPCOLOR));
-
-
         if (nPlayFullSet == ATTR_SET)
             aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, bPlayFull));
         else if (nPlayFullSet == ATTR_MIXED)
@@ -628,14 +608,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
     else
         nFadeColorSet = ATTR_MISSING;
 
-    if (pArgs->GetItemState(ATTR_ANIMATION_TRANSPCOLOR) == SFX_ITEM_SET)
-    {
-        aBlueScreen = ((SvxColorItem&)pArgs->Get(ATTR_ANIMATION_TRANSPCOLOR)).GetValue();
-        nBlueScreenSet = ATTR_SET;
-    }
-    else
-        nBlueScreenSet = ATTR_MISSING;
-
     if (pArgs->GetItemState(ATTR_ANIMATION_PLAYFULL) == SFX_ITEM_SET)
     {
         bPlayFull = ((SfxBoolItem&)pArgs->Get(ATTR_ANIMATION_PLAYFULL)).GetValue();
@@ -706,7 +678,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
         nInvisibleSet      == ATTR_SET  ||
         nSoundOnSet        == ATTR_SET  ||
         nSoundFileSet      == ATTR_SET  ||
-        nBlueScreenSet     == ATTR_SET  ||
         nPlayFullSet       == ATTR_SET  ||
         nClickActionSet    == ATTR_SET  ||
         nBookmarkSet       == ATTR_SET  ||
@@ -804,7 +775,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
                 pAction->SetDimHide(pInfo->bDimHide, pInfo->bDimHide);
                 pAction->SetSoundOn(pInfo->bSoundOn, pInfo->bSoundOn);
                 pAction->SetSound(pInfo->aSoundFile, pInfo->aSoundFile);
-                pAction->SetBlueScreen(pInfo->aBlueScreen, pInfo->aBlueScreen);
                 pAction->SetPlayFull(pInfo->bPlayFull, pInfo->bPlayFull);
                 pAction->SetPathObj(pInfo->pPathObj, pInfo->pPathObj);
                 pAction->SetClickAction(pInfo->eClickAction, pInfo->eClickAction);
@@ -834,7 +804,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
                 pAction->SetDimHide(pInfo->bDimHide, bInvisible);
                 pAction->SetSoundOn(pInfo->bSoundOn, bSoundOn);
                 pAction->SetSound(pInfo->aSoundFile, aSound);
-                pAction->SetBlueScreen(pInfo->aBlueScreen, aBlueScreen);
                 pAction->SetPlayFull(pInfo->bPlayFull, bPlayFull);
                 pAction->SetPathObj(pInfo->pPathObj, pPath);
                 pAction->SetClickAction(pInfo->eClickAction, eClickAction);
@@ -876,9 +845,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters
                 if (nSoundFileSet == ATTR_SET)
                     pInfo->aSoundFile = aSound;
 
-                if (nBlueScreenSet == ATTR_SET)
-                    pInfo->aBlueScreen = aBlueScreen;
-
                 if (nPlayFullSet == ATTR_SET)
                     pInfo->bPlayFull = bPlayFull;
 
diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx
index f1d828d98223..00a170095582 100644
--- a/sd/source/ui/func/unoaprms.cxx
+++ b/sd/source/ui/func/unoaprms.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoaprms.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ka $ $Date: 2001-10-22 13:36:53 $
+ *  last change: $Author: ka $ $Date: 2001-10-23 11:54:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,7 +98,6 @@ SdAnimationPrmsUndoAction::SdAnimationPrmsUndoAction(
         bNewDimHide     = bOldDimHide    = pInfo->bDimHide;
         bNewSoundOn     = bOldSoundOn    = pInfo->bSoundOn;
         aNewSoundFile   = aOldSoundFile  = pInfo->aSoundFile;
-        aNewBlueScreen  = aOldBlueScreen = pInfo->aBlueScreen;
         bNewPlayFull    = bOldPlayFull   = pInfo->bPlayFull;
 
         pNewPathObj     = pOldPathObj    = pInfo->pPathObj;
@@ -142,7 +141,6 @@ void SdAnimationPrmsUndoAction::Undo()
             pInfo->bDimHide     = bOldDimHide;
             pInfo->bSoundOn     = bOldSoundOn;
             pInfo->aSoundFile   = aOldSoundFile;
-            pInfo->aBlueScreen  = aOldBlueScreen;
             pInfo->bPlayFull    = bOldPlayFull;
             pInfo->SetPath(pOldPathObj);
             pInfo->eClickAction = eOldClickAction;
@@ -198,7 +196,6 @@ void SdAnimationPrmsUndoAction::Redo()
     pInfo->bDimHide     = bNewDimHide;
     pInfo->bSoundOn     = bNewSoundOn;
     pInfo->aSoundFile   = aNewSoundFile;
-    pInfo->aBlueScreen  = aNewBlueScreen;
     pInfo->bPlayFull    = bNewPlayFull;
     pInfo->SetPath(pNewPathObj);
     pInfo->eClickAction = eNewClickAction;