[ooo-build-commit] Branch 'ooo/master' - 2 commits - sd/source

[Jan Holesovsky]

 sd/source/ui/unoidl/unopback.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 6704001e3c8219781b65cd13b70835cc30849bfd
Author: Release Engineers <releng at openoffice.org>
Date:   Mon Jun 22 13:50:27 2009 +0000

    #i10000# one } to much

diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index c208d6b..fd45577 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -192,13 +192,12 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
 
                         default:
                             setPropertyValue( aPropertyName, *pAny );
-                        }
                     }
+                }
                     else
                         setPropertyValue( aIt->sName, *pAny );
-                }
-                ++aIt;
             }
+                ++aIt;
         }
     }
 
commit d0964fe12ab082507947b4d6860b18bfa4b8e650
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Jun 22 13:21:25 2009 +0000

    #i10000# build fix

diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index e2b4768..c208d6b 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -136,24 +136,25 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
             uno::Any* pAny;
             PropertyEntryVector_t aProperties = mpPropSet->getPropertyMap()->getPropertyEntries();
             PropertyEntryVector_t::const_iterator aIt = aProperties.begin();
+
             while( aIt != aProperties.end() )
             {
                 pAny = mpPropSet->GetUsrAnyForID( aIt->nWID );
                 if( pAny )
                 {
-                    OUString aPropertyName( OUString::createFromAscii(pMap->pName));
-                    switch( pMap->nWID )
+                    OUString aPropertyName( aIt->sName );
+                    switch( aIt->nWID )
                     {
                         case XATTR_FILLFLOATTRANSPARENCE :
                         case XATTR_FILLGRADIENT :
                         {
                             if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::awt::Gradient*)0) )
-                                && ( pMap->nMemberId == MID_FILLGRADIENT ) )
+                                && ( aIt->nMemberId == MID_FILLGRADIENT ) )
                             {
                                 setPropertyValue( aPropertyName, *pAny );
                             }
                             else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
-                                        ( pMap->nMemberId == MID_NAME ) )
+                                        ( aIt->nMemberId == MID_NAME ) )
                             {
                                 setPropertyValue( aPropertyName, *pAny );
                             }
@@ -162,12 +163,12 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
                         case XATTR_FILLHATCH :
                         {
                             if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::drawing::Hatch*)0) )
-                                && ( pMap->nMemberId == MID_FILLHATCH ) )
+                                && ( aIt->nMemberId == MID_FILLHATCH ) )
                             {
                                 setPropertyValue( aPropertyName, *pAny );
                             }
                             else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
-                                        ( pMap->nMemberId == MID_NAME ) )
+                                        ( aIt->nMemberId == MID_NAME ) )
                             {
                                 setPropertyValue( aPropertyName, *pAny );
                             }
@@ -177,12 +178,12 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
                         {
                             if ( ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) ) ||
                                     ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >*)0) ) ) &&
-                                    ( pMap->nMemberId == MID_BITMAP ) )
+                                    ( aIt->nMemberId == MID_BITMAP ) )
                             {
                                 setPropertyValue( aPropertyName, *pAny );
                             }
                             else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
-                                        ( ( pMap->nMemberId == MID_NAME ) || ( pMap->nMemberId == MID_GRAFURL ) ) )
+                                        ( ( aIt->nMemberId == MID_NAME ) || ( aIt->nMemberId == MID_GRAFURL ) ) )
                             {
                                 setPropertyValue( aPropertyName, *pAny );
                             }