diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-09-09 09:48:13 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-09-09 09:48:13 +0000 |
| commit | 431844199194efe316789cd43caf70ba8cf6acc7 (patch) | |
| tree | b1b139d350f6eda7d10e35d06b278289f3eae57b /xmloff | |
| parent | c29d3267dfccdf2b9c562a6b8fdd605bcb11d260 (diff) | |
INTEGRATION: CWS swqbugfixes06 (1.19.40); FILE MERGED
2004/08/24 14:22:05 od 1.19.40.1: #i33242# - correct handling of anchor position of at-character anchored
Writer fly frames and drawing objects of type 'Text'.
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLTextFrameContext.hxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index 4782bcf333..8e0ec5ade9 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextFrameContext.hxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2004-07-13 08:36:48 $ + * last change: $Author: obo $ $Date: 2004-09-09 10:48:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ #include <com/sun/star/text/TextContentAnchorType.hpp> #endif -#ifndef _XMLOFF_XMLICTXT_HXX +#ifndef _XMLOFF_XMLICTXT_HXX #include "xmlictxt.hxx" #endif @@ -93,7 +93,7 @@ class XMLTextFrameContext : public SvXMLImportContext sal_Bool m_bHasName; sal_Bool CreateIfNotThere(); - sal_Bool CreateIfNotThere( ::com::sun::star::uno::Reference < + sal_Bool CreateIfNotThere( ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet ); public: @@ -116,14 +116,18 @@ public: ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); void SetHyperlink( const ::rtl::OUString& rHRef, - const ::rtl::OUString& rName, + const ::rtl::OUString& rName, const ::rtl::OUString& rTargetFrameName, sal_Bool bMap ); ::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; + // <-- }; |