CWS-TOOLING: integrate CWS impress188

3 files changed, 74 insertions, 20 deletions

diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index eae1925e4105..9dac5b4cd469 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -323,8 +323,9 @@ const XMLPropertyMapEntry aXMLSDPresPageProps[] =
     DPMAP( "FillStyle",                 XML_NAMESPACE_DRAW, XML_FILL,                   XML_SD_TYPE_FILLSTYLE, 0 ),
     DPMAP( "FillColor",                 XML_NAMESPACE_DRAW, XML_FILL_COLOR,             XML_TYPE_COLOR, 0 ),
     DPMAP( "FillGradientName",          XML_NAMESPACE_DRAW, XML_FILL_GRADIENT_NAME,     XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_FILLGRADIENTNAME ),
-    DPMAP( "FillGradientStepCount",     XML_NAMESPACE_DRAW, XML_GRADIENT_STEP_COUNT,    XML_TYPE_NUMBER16, 0 ),
+    DPMAP( "FillGradientStepCount",     XML_NAMESPACE_DRAW, XML_GRADIENT_STEP_COUNT,    XML_TYPE_NUMBER, 0 ),
     DPMAP( "FillHatchName",             XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME,        XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_FILLHATCHNAME ),
+    GMAP( "FillBackground",                 XML_NAMESPACE_DRAW, XML_FILL_HATCH_SOLID,       XML_TYPE_BOOL, 0 ),
     DPMAP( "FillBitmapName",                XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME,    XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_FILLBITMAPNAME ),
     DPMAP( "FillTransparenceGradientName",  XML_NAMESPACE_DRAW, XML_OPACITY_NAME,       XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_FILLTRANSNAME ),
     DPMAP( "FillBitmapSizeX",           XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH,       XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 ),
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 8a043dab564d..3ec0d01ff1e5 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -27,7 +27,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
+
+#include <memory>
+
 #include "unointerfacetouniqueidentifiermapper.hxx"
+#include <com/sun/star/presentation/ClickAction.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/text/XText.hpp>
@@ -540,6 +544,38 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
     }
     sal_Int32 nZIndex = 0;
     uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY );
+
+
+    ::std::auto_ptr< SvXMLElementExport >  mpHyperlinkElement;
+
+    // export hyperlinks with <a><shape/></a>. Currently only in draw since draw
+    // does not support document events
+    if( xSet.is() && (GetExport().GetModelType() == SvtModuleOptions::E_DRAW) ) try
+    {
+        presentation::ClickAction eAction = presentation::ClickAction_NONE;
+        xSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("OnClick"))) >>= eAction;
+
+        if( (eAction == presentation::ClickAction_DOCUMENT) ||
+            (eAction == presentation::ClickAction_BOOKMARK) )
+        {
+            OUString sURL;
+            xSet->getPropertyValue(msBookmark) >>= sURL;
+
+            if( sURL.getLength() )
+            {
+                mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sURL );
+                mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
+                mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
+                mpHyperlinkElement.reset( new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_A, sal_True, sal_True) );
+            }
+        }
+    }
+    catch( uno::Exception& )
+    {
+        DBG_ERROR("XMLShapeExport::exportShape(): exception during hyperlink export");
+    }
+
+
     if( xSet.is() )
         xSet->getPropertyValue(msZIndex) >>= nZIndex;
 
@@ -847,6 +883,8 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
         }
     }
 
+    mpHyperlinkElement.reset();
+
     // #97489# #97111#
     // if there was an error and no element for the shape was exported
     // we need to clear the attribute list or the attributes will be
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index f4e7c1466ecd..365fb000389e 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -372,31 +372,46 @@ void SdXMLShapeContext::EndElement()
 
     if( msHyperlink.getLength() != 0 ) try
     {
-        Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW );
-        Reference< XNameReplace > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
+        const OUString sBookmark( RTL_CONSTASCII_USTRINGPARAM( "Bookmark" ) );
 
-        uno::Sequence< beans::PropertyValue > aProperties( 3 );
-        aProperties[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) );
-        aProperties[0].Handle = -1;
-        aProperties[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("Presentation") );
-        aProperties[0].State = beans::PropertyState_DIRECT_VALUE;
+        Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY );
+        if( xEventsSupplier.is() )
+        {
+            const OUString sEventType( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) );
+            const OUString sClickAction( RTL_CONSTASCII_USTRINGPARAM( "ClickAction" ) );
+
+            Reference< XNameReplace > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
 
-        aProperties[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ClickAction" ) );
-        aProperties[1].Handle = -1;
-        aProperties[1].Value <<= ::com::sun::star::presentation::ClickAction_DOCUMENT;
-        aProperties[1].State = beans::PropertyState_DIRECT_VALUE;
+            uno::Sequence< beans::PropertyValue > aProperties( 3 );
+            aProperties[0].Name = sEventType;
+            aProperties[0].Handle = -1;
+            aProperties[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("Presentation") );
+            aProperties[0].State = beans::PropertyState_DIRECT_VALUE;
 
-        aProperties[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Bookmark" ) );
-        aProperties[2].Handle = -1;
-        aProperties[2].Value <<= msHyperlink;
-        aProperties[2].State = beans::PropertyState_DIRECT_VALUE;
+            aProperties[1].Name = sClickAction;
+            aProperties[1].Handle = -1;
+            aProperties[1].Value <<= ::com::sun::star::presentation::ClickAction_DOCUMENT;
+            aProperties[1].State = beans::PropertyState_DIRECT_VALUE;
 
-        const OUString sAPIEventName( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) );
-        xEvents->replaceByName( sAPIEventName, Any( aProperties ) );
+            aProperties[2].Name = sBookmark;
+            aProperties[2].Handle = -1;
+            aProperties[2].Value <<= msHyperlink;
+            aProperties[2].State = beans::PropertyState_DIRECT_VALUE;
+
+            const OUString sAPIEventName( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) );
+            xEvents->replaceByName( sAPIEventName, Any( aProperties ) );
+        }
+        else
+        {
+            // in draw use the Bookmark property
+            Reference< beans::XPropertySet > xSet( mxShape, UNO_QUERY_THROW );
+            xSet->setPropertyValue( sBookmark, Any( msHyperlink ) );
+            xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) ), Any( ::com::sun::star::presentation::ClickAction_DOCUMENT ) );
+        }
     }
     catch( Exception& )
     {
-        DBG_ERROR("xmloff::SdXMLShapeContext::EndElement(), exception caught!");
+        DBG_ERROR("xmloff::SdXMLShapeContext::EndElement(), exception caught while setting hyperlink!");
     }
 
     if( mxLockable.is() )
@@ -3668,7 +3683,7 @@ void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::
 
 SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
-    if( mxTableImportContext.Is() )
+    if( mxTableImportContext.Is() && (nPrefix == XML_NAMESPACE_TABLE) )
         return mxTableImportContext->CreateChildContext(nPrefix, rLocalName, xAttrList);
     else
         return SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName, xAttrList);