impress210: #i50899# clean up fill attributes if fill style changes

# HG changeset patch
# User Christian Lippka ORACLE <christian.lippka@oracle.com>
# Date 1299270680 -3600
# Node ID 69091b8fc77c9951fcdc52b800a37a92dc70bf84
# Parent  20c5c9384888da33596d864251881e6e46bdd339

impress210: #i50899# clean up fill attributes if fill style changes

7 files changed, 67 insertions, 4 deletions

diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 4d07bef7faf3..5c7e0df2f0f5 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -52,6 +52,7 @@
 #include <svl/itempool.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lrspitem.hxx>
+#include <svx/sdr/properties/properties.hxx>
 
 #include "glob.hrc"
 #include <editeng/shaditem.hxx>
@@ -386,7 +387,11 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                     if(!mpPage->IsMasterPage())
                     {
                         // on normal pages, switch off fill attribute usage
-                        mpPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+                        SdrPageProperties& rPageProperties = mpPage->getSdrPageProperties();
+                        rPageProperties.ClearItem( XATTR_FILLBITMAP );
+                        rPageProperties.ClearItem( XATTR_FILLGRADIENT );
+                        rPageProperties.ClearItem( XATTR_FILLHATCH );
+                        rPageProperties.PutItem(XFillStyleItem(XFILL_NONE));
                     }
                 }
             }
@@ -402,6 +407,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                 StyleSheetUndoAction* pAction = new StyleSheetUndoAction(mpDoc, (SfxStyleSheet*)pStyleSheet, &(*pTempSet.get()));
                 mpDocSh->GetUndoManager()->AddUndoAction(pAction);
                 pStyleSheet->GetItemSet().Put( *(pTempSet.get()) );
+                sdr::properties::CleanupFillProperties( pStyleSheet->GetItemSet() );
                 pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
             }
             else if( bSetToAllPages )
@@ -423,6 +429,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                         new StyleSheetUndoAction(mpDoc, (SfxStyleSheet*)pStyle, &(*pTempSet.get()));
                     pUndoGroup->AddAction(pAction);
                     pStyle->GetItemSet().Put( *(pTempSet.get()) );
+                    sdr::properties::CleanupFillProperties( pStyleSheet->GetItemSet() );
                     pStyle->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
                 }
 
@@ -437,7 +444,13 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                     {
                         SdBackgroundObjUndoAction *pBackgroundObjUndoAction = new SdBackgroundObjUndoAction(*mpDoc, *pPage, rFillAttributes);
                         pUndoGroup->AddAction(pBackgroundObjUndoAction);
-                        pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+
+                        SdrPageProperties& rPageProperties = pPage->getSdrPageProperties();
+                        rPageProperties.ClearItem( XATTR_FILLBITMAP );
+                        rPageProperties.ClearItem( XATTR_FILLGRADIENT );
+                        rPageProperties.ClearItem( XATTR_FILLHATCH );
+                        rPageProperties.PutItem(XFillStyleItem(XFILL_NONE));
+
                         pPage->ActionChanged();
                     }
                 }
@@ -599,8 +612,10 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
             delete mpBackgroundObjUndoAction;
             mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction(
                 *mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet());
+            SfxItemSet aSet( *pArgs );
+            sdr::properties::CleanupFillProperties(aSet);
             mpPage->getSdrPageProperties().ClearItem();
-            mpPage->getSdrPageProperties().PutItemSet(*pArgs);
+            mpPage->getSdrPageProperties().PutItemSet(aSet);
         }
     }
 
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 64a8791f94d6..b67c71061c7d 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -48,6 +48,7 @@
 #include <editeng/lrspitem.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/svditer.hxx>
+#include <svx/sdr/properties/properties.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <svx/xlndsit.hxx>
@@ -471,6 +472,8 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 
                         SfxItemSet& rAttr = pStyleSheet->GetItemSet();
 
+                        sdr::properties::CleanupFillProperties( rAttr );
+
                         // check for unique names of named items for xml
                         if( rAttr.GetItemState( XATTR_FILLBITMAP ) == SFX_ITEM_SET )
                         {
diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/svx/inc/svx/sdr/properties/pageproperties.hxx
index 592bc38612f5..0e87ccc543d8 100644
--- a/svx/inc/svx/sdr/properties/pageproperties.hxx
+++ b/svx/inc/svx/sdr/properties/pageproperties.hxx
@@ -46,6 +46,9 @@ namespace sdr
             // Do the ItemChange, may do special handling
             virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
 
+            // Called after ItemChange() is done for all items.
+            virtual void PostItemChange(const sal_uInt16 nWhich);
+
         public:
             // basic constructor
             PageProperties(SdrObject& rObj);
diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/svx/inc/svx/sdr/properties/properties.hxx
index eb4cb69fb33a..a6a202f733df 100644
--- a/svx/inc/svx/sdr/properties/properties.hxx
+++ b/svx/inc/svx/sdr/properties/properties.hxx
@@ -188,6 +188,10 @@ namespace sdr
             // default implementation returns 0 (zero)
             virtual sal_uInt32 getVersion() const;
         };
+
+        // checks the FillStyle item and removes unneeded Gradient, FillBitmap and Hatch items
+        void SVX_DLLPUBLIC CleanupFillProperties( SfxItemSet& rItemSet );
+
     } // end of namespace properties
 } // end of namespace sdr
 
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index c03bf92928ef..aa6b10c1582e 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -203,8 +203,10 @@ namespace sdr
         {
         }
 
-        void DefaultProperties::PostItemChange(const sal_uInt16 /*nWhich*/)
+        void DefaultProperties::PostItemChange(const sal_uInt16 nWhich )
         {
+            if( (nWhich == XATTR_FILLSTYLE) && (mpItemSet != NULL) )
+                CleanupFillProperties(*mpItemSet);
         }
 
         void DefaultProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, sal_Bool /*bDontRemoveHardAttr*/)
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 7db4cc365016..7ecaab9b2843 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -88,6 +88,12 @@ namespace sdr
             return 0L;
         }
 
+        void PageProperties::PostItemChange(const sal_uInt16 nWhich )
+        {
+            if( (nWhich == XATTR_FILLSTYLE) && (mpEmptyItemSet != NULL) )
+                CleanupFillProperties(*mpEmptyItemSet);
+        }
+
         void PageProperties::ClearObjectItem(const sal_uInt16 /*nWhich*/)
         {
             // simply ignore item clearing on page objects
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 028440216e34..ce3b99968e65 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -31,6 +31,7 @@
 #include <svl/itemset.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svditer.hxx>
+#include <svx/xfillit0.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -181,6 +182,35 @@ namespace sdr
         {
             return 0;
         }
+
+        void CleanupFillProperties( SfxItemSet& rItemSet )
+        {
+            const bool bFillBitmap = rItemSet.GetItemState(XATTR_FILLBITMAP, sal_False) == SFX_ITEM_SET;
+            const bool bFillGradient = rItemSet.GetItemState(XATTR_FILLGRADIENT, sal_False) == SFX_ITEM_SET;
+            const bool bFillHatch = rItemSet.GetItemState(XATTR_FILLHATCH, sal_False) == SFX_ITEM_SET;
+            if( bFillBitmap || bFillGradient || bFillHatch )
+            {
+                const XFillStyleItem* pFillStyleItem = dynamic_cast< const XFillStyleItem* >( rItemSet.GetItem(XATTR_FILLSTYLE) );
+                if( pFillStyleItem )
+                {
+                    if( bFillBitmap && (pFillStyleItem->GetValue() != XFILL_BITMAP) )
+                    {
+                        rItemSet.ClearItem( XATTR_FILLBITMAP );
+                    }
+
+                    if( bFillGradient && (pFillStyleItem->GetValue() != XFILL_GRADIENT) )
+                    {
+                        rItemSet.ClearItem( XATTR_FILLGRADIENT );
+                    }
+
+                    if( bFillHatch && (pFillStyleItem->GetValue() != XFILL_HATCH) )
+                    {
+                        rItemSet.ClearItem( XATTR_FILLHATCH );
+                    }
+                }
+            }
+        }
+
     } // end of namespace properties
 } // end of namespace sdr