summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xmloff/inc/xmlkywd.hxx9
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx5
-rw-r--r--xmloff/source/text/txtimp.cxx7
-rw-r--r--xmloff/source/text/txtparae.cxx54
-rw-r--r--xmloff/source/text/txtprmap.cxx9
5 files changed, 25 insertions, 59 deletions
diff --git a/xmloff/inc/xmlkywd.hxx b/xmloff/inc/xmlkywd.hxx
index cb9c5b5422f8..2d919e9c5396 100644
--- a/xmloff/inc/xmlkywd.hxx
+++ b/xmloff/inc/xmlkywd.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmlkywd.hxx,v $
*
- * $Revision: 1.131 $
+ * $Revision: 1.132 $
*
- * last change: $Author: mib $ $Date: 2001-03-21 09:55:38 $
+ * last change: $Author: mib $ $Date: 2001-03-21 13:39:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -587,6 +587,7 @@ XML_CONSTASCII_ACTION( sXML_double_sided, "double-sided" );
XML_CONSTASCII_ACTION( sXML_down, "down" );
XML_CONSTASCII_ACTION( sXML_draft, "draft");
XML_CONSTASCII_ACTION( sXML_draw, "draw" );
+XML_CONSTASCII_ACTION( sXML_draw_aspect, "draw-aspect" );
XML_CONSTASCII_ACTION( sXML_drawing, "drawing" );
XML_CONSTASCII_ACTION( sXML_drawings, "drawings" );
XML_CONSTASCII_ACTION( sXML_drawpool , "drawpool" );
@@ -1751,6 +1752,10 @@ XML_CONSTASCII_ACTION( sXML_view_settings, "view-settings" );
XML_CONSTASCII_ACTION( sXML_visibility, "visibility" );
XML_CONSTASCII_ACTION( sXML_visible, "visible" );
XML_CONSTASCII_ACTION( sXML_visible_area, "visible-area" );
+XML_CONSTASCII_ACTION( sXML_visible_area_top, "visible-area-top" );
+XML_CONSTASCII_ACTION( sXML_visible_area_left, "visible-area-left" );
+XML_CONSTASCII_ACTION( sXML_visible_area_width, "visible-area-width" );
+XML_CONSTASCII_ACTION( sXML_visible_area_height, "visible-area-height" );
XML_CONSTASCII_ACTION( sXML_visited_style_name, "visited-style-name" );
XML_CONSTASCII_ACTION( sXML_volatile, "volatile" );
XML_CONSTASCII_ACTION( sXML_volume, "volume" );
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 2bb81222f2b9..5a0728b50dbf 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: XMLTextFrameContext.cxx,v $
*
- * $Revision: 1.33 $
+ * $Revision: 1.34 $
*
- * last change: $Author: mib $ $Date: 2001-03-21 10:01:02 $
+ * last change: $Author: mib $ $Date: 2001-03-21 13:40:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -610,6 +610,7 @@ XMLTextFrameContext::XMLTextFrameContext(
if( sURL.getLength() )
xPropSet = GetImport().GetTextImport()
->createAndInsertOLEObject( GetImport(), sURL,
+ sStyleName,
nWidth, nHeight );
break;
}
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index dbd15fc27fe4..f16d62a8333c 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtimp.cxx,v $
*
- * $Revision: 1.60 $
+ * $Revision: 1.61 $
*
- * last change: $Author: mib $ $Date: 2001-03-21 10:01:02 $
+ * last change: $Author: mib $ $Date: 2001-03-21 13:40:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1519,7 +1519,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
break;
case XML_TOK_TEXT_FORMS:
- pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName);
+// pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName);
bContent = sal_False;
break;
@@ -1794,6 +1794,7 @@ sal_Bool XMLTextImportHelper::IsInHeaderFooter() const
Reference< XPropertySet> XMLTextImportHelper::createAndInsertOLEObject(
SvXMLImport& rImport,
const OUString& rHRef,
+ const OUString& rStyleName,
sal_Int32 nWidth, sal_Int32 nHeight )
{
Reference< XPropertySet> xPropSet;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 1cc2d37ba8b6..5b89be7116d3 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtparae.cxx,v $
*
- * $Revision: 1.68 $
+ * $Revision: 1.69 $
*
- * last change: $Author: mib $ $Date: 2001-03-21 10:01:02 $
+ * last change: $Author: mib $ $Date: 2001-03-21 13:40:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2084,54 +2084,14 @@ void XMLTextParagraphExport::exportShape(
void XMLTextParagraphExport::_collectTextEmbeddedAutoStyles(
const Reference < XPropertySet > & rPropSet )
{
- Add( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet );
+ DBG_ASSERT( !this, "no API implementation avialable" );
}
void XMLTextParagraphExport::_exportTextEmbedded(
const Reference < XPropertySet > & rPropSet,
const Reference < XPropertySetInfo > & rPropSetInfo )
{
- OUString sStyle;
- Any aAny;
-
- if( rPropSetInfo->hasPropertyByName( sFrameStyleName ) )
- {
- aAny = rPropSet->getPropertyValue( sFrameStyleName );
- aAny >>= sStyle;
- }
-
- OUString sAutoStyle( sStyle );
- sAutoStyle = Find( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet, sStyle );
- if( sAutoStyle.getLength() )
- GetExport().AddAttribute( XML_NAMESPACE_DRAW, sXML_style_name,
- sAutoStyle );
- addTextFrameAttributes( rPropSet, sal_False );
-
-
- // xlink:href
- OUString sURL;
- sal_Bool bExtern;
- getTextEmbeddedObjectProperties( rPropSet, sURL, bExtern );
-
- sURL = GetExport().AddEmbeddedObject( sURL );
-
- GetExport().AddAttribute(XML_NAMESPACE_XLINK, sXML_href, sURL );
- GetExport().AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_type,
- sXML_simple );
- GetExport().AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_show,
- sXML_embed );
- GetExport().AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_actuate,
- sXML_onLoad );
-
- const sal_Char *pElem = bExtern ? sXML_object_ole : sXML_object;
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW,
- pElem, sal_False, sal_True );
-
- exportEvents( rPropSet );
- exportAlternativeText( rPropSet, rPropSetInfo );
- // draw:contour
- exportContour( rPropSet, rPropSetInfo );
-
+ DBG_ASSERT( !this, "no API implementation avialable" );
}
void XMLTextParagraphExport::exportEvents( const Reference < XPropertySet > & rPropSet )
@@ -2186,12 +2146,6 @@ void XMLTextParagraphExport::exportTextEmbedded(
}
}
-void XMLTextParagraphExport::getTextEmbeddedObjectProperties(
- const Reference < XPropertySet >& rPropSet,
- OUString& rStreamName, sal_Bool& r ) const
-{
-}
-
void XMLTextParagraphExport::setTextEmbeddedGraphicURL(
const Reference < XPropertySet >& rPropSet,
OUString& rStreamName ) const
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index d6757c9d8331..28ab3a22125e 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtprmap.cxx,v $
*
- * $Revision: 1.33 $
+ * $Revision: 1.34 $
*
- * last change: $Author: mib $ $Date: 2001-03-21 10:01:02 $
+ * last change: $Author: mib $ $Date: 2001-03-21 13:40:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -623,6 +623,11 @@ XMLPropertyMapEntry aXMLFramePropMap[] =
M_E( "", DRAW, frame_display_border, XML_TYPE_BOOL|MID_FLAG_NO_PROPERTY, CTF_FRAME_DISPLAY_BORDER ),
M_E( "", DRAW, frame_margin_horizontal, XML_TYPE_MEASURE_PX|MID_FLAG_NO_PROPERTY, CTF_FRAME_MARGIN_HORI ),
M_E( "", DRAW, frame_margin_vertical, XML_TYPE_MEASURE_PX|MID_FLAG_NO_PROPERTY, CTF_FRAME_MARGIN_VERT ),
+ M_E( "", DRAW, visible_area_left, XML_TYPE_MEASURE|MID_FLAG_NO_PROPERTY, CTF_OLE_VIS_AREA_LEFT ),
+ M_E( "", DRAW, visible_area_top, XML_TYPE_MEASURE|MID_FLAG_NO_PROPERTY, CTF_OLE_VIS_AREA_TOP ),
+ M_E( "", DRAW, visible_area_width, XML_TYPE_MEASURE|MID_FLAG_NO_PROPERTY, CTF_OLE_VIS_AREA_WIDTH ),
+ M_E( "", DRAW, visible_area_height, XML_TYPE_MEASURE|MID_FLAG_NO_PROPERTY, CTF_OLE_VIS_AREA_HEIGHT ),
+ M_E( "", DRAW, draw_aspect, XML_TYPE_NUMBER16|MID_FLAG_NO_PROPERTY, CTF_OLE_DRAW_ASPECT ),
M_E( "UserDefinedAttributes", TEXT, xmlns, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
{ 0, 0, 0, 0 }
};
generated by cgit (git 2.34.1) at 2025-01-15 13:34:45 +0000