strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Import drawing layer text boxes correctly

Browse source
This commit is contained in:
Michael Brauer 2000-12-13 08:36:23 +00:00
parent c66bff07bb
commit 4d870d302d
3 changed files with 97 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
xmloff/source/text/txtimp.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: txtimp.cxx,v $
*
* $Revision: 1.31 $
* $Revision: 1.32 $
*
* last change: $Author: mib $ $Date: 2000-12-06 11:41:56 $
* last change: $Author: mib $ $Date: 2000-12-13 09:36:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -176,6 +176,9 @@
#ifndef _XMLOFF_PROGRESSBARHELPER_HXX
#include "ProgressBarHelper.hxx"
#endif
#ifndef _XMLOFF_NMSPMAP_HXX
#include "nmspmap.hxx"
#endif
using namespace ::rtl;
@ -971,6 +974,28 @@ const XMLFontStylesContext *XMLTextImportHelper::GetFontDecls() const
return (XMLFontStylesContext *)&xFontDecls;
}
sal_Bool XMLTextImportHelper::HasDrawNameAttribute(
const Reference< XAttributeList > & xAttrList,
SvXMLNamespaceMap& rNamespaceMap )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
OUString aLocalName;
sal_uInt16 nPrefix =
rNamespaceMap.GetKeyByAttrName( rAttrName, &aLocalName );
if( XML_NAMESPACE_DRAW == nPrefix &&
aLocalName.equalsAsciiL( sXML_name, sizeof( sXML_name ) - 1 ) )
{
return xAttrList->getValueByIndex(i).getLength() != 0;
}
}
return sal_False;
}
SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix, const OUString& rLocalName,
@ -1038,26 +1063,44 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
case XML_TOK_TEXT_TEXTBOX_PAGE:
if( XML_TEXT_TYPE_BODY == eType || XML_TEXT_TYPE_TEXTBOX == eType )
{
TextContentAnchorType eAnchorType =
XML_TEXT_TYPE_TEXTBOX == eType ? TextContentAnchorType_AT_FRAME
: TextContentAnchorType_AT_PAGE;
pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
eAnchorType,
XML_TEXT_FRAME_TEXTBOX );
if( HasDrawNameAttribute( xAttrList, rImport.GetNamespaceMap() ) )
{
TextContentAnchorType eAnchorType =
XML_TEXT_TYPE_TEXTBOX == eType ? TextContentAnchorType_AT_FRAME
: TextContentAnchorType_AT_PAGE;
pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
eAnchorType,
XML_TEXT_FRAME_TEXTBOX );
}
else
{
Reference < XShapes > xShapes;
pContext = rImport.GetShapeImport()->CreateGroupChildContext(
rImport, nPrefix, rLocalName, xAttrList, xShapes );
}
}
break;
case XML_TOK_TEXT_IMAGE_PAGE:
if( XML_TEXT_TYPE_BODY == eType || XML_TEXT_TYPE_TEXTBOX == eType )
{
TextContentAnchorType eAnchorType =
XML_TEXT_TYPE_TEXTBOX == eType ? TextContentAnchorType_AT_FRAME
: TextContentAnchorType_AT_PAGE;
pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
eAnchorType,
XML_TEXT_FRAME_GRAPHIC );
if( HasDrawNameAttribute( xAttrList, rImport.GetNamespaceMap() ) )
{
TextContentAnchorType eAnchorType =
XML_TEXT_TYPE_TEXTBOX == eType ? TextContentAnchorType_AT_FRAME
: TextContentAnchorType_AT_PAGE;
pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
eAnchorType,
XML_TEXT_FRAME_GRAPHIC );
}
else
{
Reference < XShapes > xShapes;
pContext = rImport.GetShapeImport()->CreateGroupChildContext(
rImport, nPrefix, rLocalName, xAttrList, xShapes );
}
}
break;

12
xmloff/source/text/txtparae.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: txtparae.cxx,v $
*
* $Revision: 1.36 $
* $Revision: 1.37 $
*
* last change: $Author: mib $ $Date: 2000-12-07 18:18:53 $
* last change: $Author: mib $ $Date: 2000-12-13 09:36:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1391,8 +1391,12 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
// draw:name
Reference < XNamed > xNamed( rPropSet, UNO_QUERY );
if( xNamed.is() )
GetExport().AddAttribute( XML_NAMESPACE_DRAW, sXML_name,
xNamed->getName() );
{
OUString sName( xNamed->getName() );
if( sName.getLength() )
GetExport().AddAttribute( XML_NAMESPACE_DRAW, sXML_name,
xNamed->getName() );
}
Any aAny;
OUStringBuffer sValue;

40
xmloff/source/text/txtparai.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: txtparai.cxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: dvo $ $Date: 2000-11-30 16:46:20 $
* last change: $Author: mib $ $Date: 2000-12-13 09:36:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1537,17 +1537,37 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
break;
case XML_TOK_TEXT_TEXTBOX:
pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
TextContentAnchorType_AS_CHARACTER,
XML_TEXT_FRAME_TEXTBOX );
if( XMLTextImportHelper::HasDrawNameAttribute( xAttrList, rImport.GetNamespaceMap() ) ||
rImport.GetTextImport()->IsInHeaderFooter() )
{
pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
TextContentAnchorType_AS_CHARACTER,
XML_TEXT_FRAME_TEXTBOX );
}
else
{
Reference < XShapes > xShapes;
pContext = rImport.GetShapeImport()->CreateGroupChildContext(
rImport, nPrefix, rLocalName, xAttrList, xShapes );
}
break;
case XML_TOK_TEXT_IMAGE:
pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
TextContentAnchorType_AS_CHARACTER,
XML_TEXT_FRAME_GRAPHIC );
if( XMLTextImportHelper::HasDrawNameAttribute( xAttrList, rImport.GetNamespaceMap() ) ||
rImport.GetTextImport()->IsInHeaderFooter() )
{
pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
TextContentAnchorType_AS_CHARACTER,
XML_TEXT_FRAME_GRAPHIC );
}
else
{
Reference < XShapes > xShapes;
pContext = rImport.GetShapeImport()->CreateGroupChildContext(
rImport, nPrefix, rLocalName, xAttrList, xShapes );
}
break;
case XML_TOK_TEXT_OBJECT: