INTEGRATION: CWS swqbugfixes06 (1.4.40); FILE MERGED

2004/08/24 14:22:06 od 1.4.40.1: #i33242# - correct handling of anchor position of at-character anchored
           Writer fly frames and drawing objects of type 'Text'.

2 files changed, 29 insertions, 9 deletions

diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index 2702a2b53b..7d6f3b5b50 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLTextFrameHyperlinkContext.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 08:39:23 $
+ *  last change: $Author: obo $ $Date: 2004-09-09 10:48:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,8 +110,12 @@ public:
                     ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
 
     ::com::sun::star::text::TextContentAnchorType GetAnchorType() const;
-    ::com::sun::star::uno::Reference < 
+    ::com::sun::star::uno::Reference <
         ::com::sun::star::text::XTextContent > GetTextContent() const;
+    // --> OD 2004-08-24 #i33242#
+    ::com::sun::star::uno::Reference <
+        ::com::sun::star::drawing::XShape > GetShape() const;
+    // <--
 };
 
 
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index db0159cd65..cc01c82871 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtparaimphint.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-14 14:03:35 $
+ *  last change: $Author: obo $ $Date: 2004-09-09 10:49:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -299,7 +299,7 @@ public:
     }
 
     Reference < XTextContent > GetTextContent() const
-    { 
+    {
         Reference <XTextContent > xTxt;
         SvXMLImportContext *pContext = &xContext;
         if( pContext->ISA( XMLTextFrameContext ) )
@@ -311,6 +311,20 @@ public:
         return xTxt;
     }
 
+    // --> OD 2004-08-24 #i33242#
+    Reference < drawing::XShape > GetShape() const
+    {
+        Reference < drawing::XShape > xShape;
+        SvXMLImportContext *pContext = &xContext;
+        if( pContext->ISA( XMLTextFrameContext ) )
+            xShape = PTR_CAST( XMLTextFrameContext, pContext )->GetShape();
+        else if( pContext->ISA( XMLTextFrameHyperlinkContext ) )
+            xShape = PTR_CAST( XMLTextFrameHyperlinkContext, pContext )->GetShape();
+
+        return xShape;
+    }
+    // <--
+
     sal_Bool IsBoundAtChar() const
     {
         sal_Bool bRet = sal_False;
@@ -345,10 +359,12 @@ public:
     {
     }
 
-    SvXMLShapeContext* GetShapeContext() const
-    { 
-    return static_cast<SvXMLShapeContext*>(&xContext);
+    // --> OD 2004-08-24 #i33242#
+    Reference < drawing::XShape > GetShape() const
+    {
+        return static_cast<SvXMLShapeContext*>(&xContext)->getShape();
     }
+    // <--
 };
 // <--
 #endif