impress210: merge

4 files changed, 37 insertions, 0 deletions

diff --git a/xmloff/source/transform/ActionMapTypesOOo.hxx b/xmloff/source/transform/ActionMapTypesOOo.hxx
index ff8081b025cf..a9ed15ecb74a 100644
--- a/xmloff/source/transform/ActionMapTypesOOo.hxx
+++ b/xmloff/source/transform/ActionMapTypesOOo.hxx
@@ -86,6 +86,7 @@ enum ActionMapTypesOOo
     OOO_SOURCE_SERVICE_ACTIONS,
     OOO_DRAW_AREA_POLYGON_ACTIONS,
     OOO_SCRIPT_ACTIONS,
+    OOO_ANIMATION_ACTIONS,
     MAX_OOO_ACTIONS
 };
 
diff --git a/xmloff/source/transform/AttrTransformerAction.hxx b/xmloff/source/transform/AttrTransformerAction.hxx
index ffcd8b43ada0..0cfb6a116c2c 100644
--- a/xmloff/source/transform/AttrTransformerAction.hxx
+++ b/xmloff/source/transform/AttrTransformerAction.hxx
@@ -135,6 +135,7 @@ enum XMLAttrTransformerAction
     XML_ATACTION_GAMMA_OOO,              // converts double value to percentage
     XML_ATACTION_DECODE_ID,              // converts strings with non numeric characters to only numeric character ids
     XML_ATACTION_OPACITY_FIX,            // converts transparency to opacity and back
+    XML_ATACTION_SHAPEID,                // convert shape id
     XML_ATACTION_USER_DEFINED=0x40000000,// user defined actions start here
     XML_ATACTION_END=XML_TACTION_END
 };
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 103202c48866..b678da6b2304 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -573,6 +573,14 @@ static XMLTransformerActionInit aActionTable[] =
     ENTRY1( TABLE, SOURCE_SERVICE, XML_ETACTION_PROC_ATTRS,
             OOO_SOURCE_SERVICE_ACTIONS ),
 
+    // fix id strings in old animation elements
+    ENTRY1( PRESENTATION, DIM, XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( PRESENTATION, PLAY, XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( PRESENTATION, SHOW_TEXT, XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( PRESENTATION, SHOW_SHAPE, XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( PRESENTATION, HIDE_TEXT, XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( PRESENTATION, HIDE_SHAPE, XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ETACTION_EOT )
 };
 
@@ -755,6 +763,9 @@ static XMLTransformerActionInit aShapeActionTable[] =
     ENTRY2( CHART, LEGEND_POSITION, XML_ATACTION_RENAME_ATTRIBUTE,
             RENAME_ENTRY( XML_LEFT, XML_START ),
             RENAME_ENTRY( XML_RIGHT, XML_END )),
+    ENTRY0( DRAW, ID, XML_ATACTION_SHAPEID ),
+    ENTRY0( DRAW, START_SHAPE, XML_ATACTION_SHAPEID ),
+    ENTRY0( DRAW, END_SHAPE, XML_ATACTION_SHAPEID ),
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
@@ -778,6 +789,7 @@ static XMLTransformerActionInit aConnectorActionTable[] =
     ENTRY1Q( FORM, ID, XML_ATACTION_RENAME,
                     XML_NAMESPACE_DRAW, XML_CONTROL ),
     ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ),
+    ENTRY0( DRAW, ID, XML_ATACTION_SHAPEID ),
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
@@ -1036,6 +1048,14 @@ static XMLTransformerActionInit aSourceServiceActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
+// OOO_ANIMATION_ACTIONS
+static XMLTransformerActionInit aAnimationsActionTable[] =
+{
+    ENTRY0( DRAW, SHAPE_ID, XML_ATACTION_SHAPEID ),
+    ENTRY0( PRESENTATION, PATH_ID, XML_ATACTION_SHAPEID ),
+    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+};
+
 // OOO_DRAW_AREA_POLYGON_ACTIONS (to be added to OOO_SHAPE_ACTIONS)
 static XMLTransformerActionInit aDrawAreaPolygonActionTable[] =
 {
@@ -1777,6 +1797,10 @@ XMLTransformerActions *OOo2OasisTransformer::GetUserDefinedActions(
                     m_aActions[OOO_SCRIPT_ACTIONS] =
                         new XMLTransformerActions( aScriptActionTable );
                     break;
+                case OOO_ANIMATION_ACTIONS:
+                    m_aActions[OOO_ANIMATION_ACTIONS] =
+                        new XMLTransformerActions( aAnimationsActionTable );
+                    break;
             }
         }
         pActions = m_aActions[n];
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 61bb73120da6..f2d7af5585c0 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -248,6 +248,9 @@ void SAL_CALL XMLTransformerBase::startElement( const OUString& rName,
 {
     SvXMLNamespaceMap *pRewindMap = 0;
 
+    bool bRect = rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "presentation:show-shape" ) );
+    (void)bRect;
+
     // Process namespace attributes. This must happen before creating the
     // context, because namespace decaration apply to the element name itself.
     XMLMutableAttributeList *pMutableAttrList = 0;
@@ -888,6 +891,14 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList(
                     }
                     break;
                 // <--
+                case XML_ATACTION_SHAPEID:
+                {
+                    OUString sNewValue( RTL_CONSTASCII_USTRINGPARAM( "shape" ) );
+                    sNewValue += rAttrValue;
+                    pMutableAttrList->SetValueByIndex( i, sNewValue );
+                    break;
+                }
+
                 default:
                     OSL_ENSURE( !this, "unknown action" );
                     break;