#82658# fixed backgrounds for drawing applications

4 files changed, 37 insertions, 11 deletions

diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 09f4e9ca1eb3..47fb58b1ee62 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdpropls.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-17 16:11:04 $
+ *  last change: $Author: cl $ $Date: 2001-01-17 22:03:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -358,6 +358,7 @@ const XMLPropertyMapEntry aXMLSDPresPageProps[] =
     { "Duration",           XML_NAMESPACE_PRESENTATION, "duration",         XML_SD_TYPE_PRESPAGE_DURATION, CTF_PAGE_TRANS_DURATION },
     { "Visible",            XML_NAMESPACE_PRESENTATION, "visibility",       XML_SD_TYPE_PRESPAGE_VISIBILITY, CTF_PAGE_VISIBLE },
     { "Sound",              XML_NAMESPACE_PRESENTATION, "sound",            XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PAGE_SOUND_URL },
+    { "BackgroundFullSize", XML_NAMESPACE_DRAW,         "background-size",  XML_SD_TYPE_PRESPAGE_BACKSIZE, CTF_PAGE_BACKSIZE },
 
     { "FillStyle",                  XML_NAMESPACE_DRAW, sXML_fill,                  XML_SD_TYPE_FILLSTYLE, 0 },
     { "FillColor",                  XML_NAMESPACE_DRAW, sXML_fill_color,            XML_TYPE_COLOR, 0 },
@@ -648,6 +649,13 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
                 pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr );
                 break;
             }
+            case XML_SD_TYPE_PRESPAGE_BACKSIZE:
+            {
+                const OUString aTrueStr( OUString::createFromAscii(sXML_full) );
+                const OUString aFalseStr( OUString::createFromAscii(sXML_border) );
+                pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr );
+                break;
+            }
 
             //////////////////////////////////////////////////////////////////
             // 3D Properties
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 1e7b7fde762f..a100be55707b 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdpropls.hxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-17 16:11:05 $
+ *  last change: $Author: cl $ $Date: 2001-01-17 22:03:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,6 +134,7 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps[];
 #define XML_SD_TYPE_FILLBITMAPSIZE                  (XML_SD_TYPES_START + 20 )
 #define XML_SD_TYPE_LOGICAL_SIZE                    (XML_SD_TYPES_START + 21 )
 #define XML_SD_TYPE_BITMAP_REFPOINT                 (XML_SD_TYPES_START + 22 )
+#define XML_SD_TYPE_PRESPAGE_BACKSIZE               (XML_SD_TYPES_START + 23 )
 
 // 3D property types
 #define XML_SD_TYPE_BACKFACE_CULLING                (XML_SD_TYPES_START + 40 )
@@ -157,6 +158,7 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps[];
 #define CTF_PAGE_TRANS_STYLE        1008
 #define CTF_PAGE_TRANS_SPEED        1009
 #define CTF_PAGE_TRANS_DURATION     1010
+#define CTF_PAGE_BACKSIZE           1011
 
 //////////////////////////////////////////////////////////////////////////////
 // enum maps for attributes
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 745ac2e824b6..f5baaf47d1db 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxmlexp.cxx,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-17 16:11:05 $
+ *  last change: $Author: cl $ $Date: 2001-01-17 22:03:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1500,10 +1500,16 @@ void SdXMLExport::ImpPrepMasterPageInfos()
                         aAny >>= xPropSet2;
                     }
 
+                    uno::Reference< beans::XPropertySet > xPropSet;
                     if( xPropSet2.is() )
+                        xPropSet = PropertySetMerger_CreateInstance( xPropSet1, xPropSet2 );
+                    else
+                        xPropSet = xPropSet1;
+
+                    if( xPropSet.is() )
                     {
                         const UniReference< SvXMLExportPropertyMapper > aMapperRef( GetPresPagePropsMapper() );
-                        std::vector< XMLPropertyState > xPropStates( aMapperRef->Filter( xPropSet2 ) );
+                        std::vector< XMLPropertyState > xPropStates( aMapperRef->Filter( xPropSet ) );
 
                         if( !xPropStates.empty() )
                         {
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 4ac16dd4dda6..4b3c66c01428 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ximpstyl.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-17 16:11:05 $
+ *  last change: $Author: cl $ $Date: 2001-01-17 22:03:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,6 +113,10 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #endif
 
+#ifndef _XMLOFF_PROPERTYSETMERGER_HXX_
+#include "PropertySetMerger.hxx"
+#endif
+
 #ifndef _SDPROPLS_HXX
 #include "sdpropls.hxx"
 #endif
@@ -849,11 +853,17 @@ SdXMLMasterPageContext::SdXMLMasterPageContext(
                             }
                         }
 
-                        if(xPropSet2.is())
+                        uno::Reference< beans::XPropertySet > xPropSet;
+                        if( xPropSet2.is() )
+                            xPropSet = PropertySetMerger_CreateInstance( xPropSet1, xPropSet2 );
+                        else
+                            xPropSet = xPropSet1;
+
+                        if(xPropSet.is())
                         {
                             try
                             {
-                                pPropStyle->FillPropertySet(xPropSet2);
+                                pPropStyle->FillPropertySet(xPropSet);
 
                                 uno::Any aAny;
                                 aAny <<= xPropSet2;