Skip to content

C
core
Kaydet (Commit) c6a5b81a authored tarafından Rüdiger Timm's avatar Rüdiger Timm
Dosyalara gözat
Seçenekler

INTEGRATION: CWS calc23 (1.89.24); FILE MERGED 

2004/10/11 08:30:05 nn 1.89.24.2: RESYNC: (1.89-1.90); FILE MERGED
2004/10/04 14:42:36 sab 1.89.24.1: #i34953#; add temporary shape functionality
üst acfecc01
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 44 deletions
xmloff/source/draw/ximpshap.cxx
Dosyayı görüntüle @ c6a5b81a
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: ximpshap.cxx,v $ * $RCSfile: ximpshap.cxx,v $
* *
* $Revision: 1.90 $ * $Revision: 1.91 $
* *
* last change: $Author: kz $ $Date: 2004-10-04 18:11:28 $ * last change: $Author: rt $ $Date: 2004-10-22 07:55:13 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -266,8 +266,9 @@ SdXMLShapeContext::SdXMLShapeContext( ...@@ -266,8 +266,9 @@ SdXMLShapeContext::SdXMLShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SvXMLShapeContext( rImport, nPrfx, rLocalName ), sal_Bool bTemporaryShape)
: SvXMLShapeContext( rImport, nPrfx, rLocalName, bTemporaryShape ),
mxShapes( rShapes ), mxShapes( rShapes ),
mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID), mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID),
mbIsPlaceholder(FALSE), mbIsPlaceholder(FALSE),
...@@ -502,8 +503,8 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) ...@@ -502,8 +503,8 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape)
xImp->addShape( xShape, mxAttrList, mxShapes ); xImp->addShape( xShape, mxAttrList, mxShapes );
// #107848# // #107848#
if(!GetImport().HasTextImport() if(!mbTemporaryShape && (!GetImport().HasTextImport()
|| !GetImport().GetTextImport()->IsInsideDeleteContext()) || !GetImport().GetTextImport()->IsInsideDeleteContext()))
{ {
xImp->shapeWithZIndexAdded( xShape, mnZOrder ); xImp->shapeWithZIndexAdded( xShape, mnZOrder );
} }
...@@ -923,8 +924,9 @@ SdXMLRectShapeContext::SdXMLRectShapeContext( ...@@ -923,8 +924,9 @@ SdXMLRectShapeContext::SdXMLRectShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
mnRadius( 0L ) mnRadius( 0L )
{ {
} }
...@@ -996,8 +998,9 @@ SdXMLLineShapeContext::SdXMLLineShapeContext( ...@@ -996,8 +998,9 @@ SdXMLLineShapeContext::SdXMLLineShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
mnX1( 0L ), mnX1( 0L ),
mnY1( 0L ), mnY1( 0L ),
mnX2( 1L ), mnX2( 1L ),
...@@ -1117,8 +1120,9 @@ SdXMLEllipseShapeContext::SdXMLEllipseShapeContext( ...@@ -1117,8 +1120,9 @@ SdXMLEllipseShapeContext::SdXMLEllipseShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
mnCX( 0L ), mnCX( 0L ),
mnCY( 0L ), mnCY( 0L ),
mnRX( 1L ), mnRX( 1L ),
...@@ -1246,8 +1250,8 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( ...@@ -1246,8 +1250,8 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes, sal_Bool bClosed) uno::Reference< drawing::XShapes >& rShapes, sal_Bool bClosed, sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
mbClosed( bClosed ) mbClosed( bClosed )
{ {
} }
...@@ -1335,8 +1339,9 @@ SdXMLPathShapeContext::SdXMLPathShapeContext( ...@@ -1335,8 +1339,9 @@ SdXMLPathShapeContext::SdXMLPathShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
mbClosed( TRUE ) mbClosed( TRUE )
{ {
} }
...@@ -1465,8 +1470,9 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext( ...@@ -1465,8 +1470,9 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
mnRadius(0) mnRadius(0)
{ {
} }
...@@ -1638,8 +1644,9 @@ SdXMLControlShapeContext::SdXMLControlShapeContext( ...@@ -1638,8 +1644,9 @@ SdXMLControlShapeContext::SdXMLControlShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
{ {
} }
...@@ -1711,8 +1718,9 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext( ...@@ -1711,8 +1718,9 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
maStart(0,0), maStart(0,0),
maEnd(1,1), maEnd(1,1),
mnType( (USHORT)drawing::ConnectorType_STANDARD ), mnType( (USHORT)drawing::ConnectorType_STANDARD ),
...@@ -1888,8 +1896,9 @@ SdXMLMeasureShapeContext::SdXMLMeasureShapeContext( ...@@ -1888,8 +1896,9 @@ SdXMLMeasureShapeContext::SdXMLMeasureShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
maStart(0,0), maStart(0,0),
maEnd(1,1) maEnd(1,1)
{ {
...@@ -2001,8 +2010,9 @@ SdXMLPageShapeContext::SdXMLPageShapeContext( ...@@ -2001,8 +2010,9 @@ SdXMLPageShapeContext::SdXMLPageShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), mnPageNumber(0) sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnPageNumber(0)
{ {
} }
...@@ -2096,8 +2106,9 @@ SdXMLCaptionShapeContext::SdXMLCaptionShapeContext( ...@@ -2096,8 +2106,9 @@ SdXMLCaptionShapeContext::SdXMLCaptionShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
// #86616# for correct edge rounding import mnRadius needs to be initialized // #86616# for correct edge rounding import mnRadius needs to be initialized
mnRadius( 0L ) mnRadius( 0L )
{ {
...@@ -2182,8 +2193,9 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( ...@@ -2182,8 +2193,9 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
maURL() maURL()
{ {
} }
...@@ -2356,8 +2368,9 @@ SdXMLChartShapeContext::SdXMLChartShapeContext( ...@@ -2356,8 +2368,9 @@ SdXMLChartShapeContext::SdXMLChartShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
mpChartContext( NULL ) mpChartContext( NULL )
{ {
} }
...@@ -2465,8 +2478,9 @@ TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext ); ...@@ -2465,8 +2478,9 @@ TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext );
SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const rtl::OUString& rLocalName, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
{ {
} }
...@@ -2663,8 +2677,9 @@ TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext ); ...@@ -2663,8 +2677,9 @@ TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext );
SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const rtl::OUString& rLocalName, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
mbIsScript( sal_False ) mbIsScript( sal_False )
{ {
} }
...@@ -2818,8 +2833,9 @@ TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext ); ...@@ -2818,8 +2833,9 @@ TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext );
SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const rtl::OUString& rLocalName, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) : com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), sal_Bool bTemporaryShape) :
SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
mbMedia( false ) mbMedia( false )
{ {
} }
...@@ -3037,8 +3053,9 @@ TYPEINIT1( SdXMLFloatingFrameShapeContext, SdXMLShapeContext ); ...@@ -3037,8 +3053,9 @@ TYPEINIT1( SdXMLFloatingFrameShapeContext, SdXMLShapeContext );
SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const rtl::OUString& rLocalName, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
{ {
} }
...@@ -3119,8 +3136,9 @@ TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext ); ...@@ -3119,8 +3136,9 @@ TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext );
SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const rtl::OUString& rLocalName, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
{ {
uno::Reference < util::XCloneable > xClone( xAttrList, uno::UNO_QUERY ); uno::Reference < util::XCloneable > xClone( xAttrList, uno::UNO_QUERY );
if( xClone.is() ) if( xClone.is() )
...@@ -3187,8 +3205,9 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext( ...@@ -3187,8 +3205,9 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes,
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
{ {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment