INTEGRATION: CWS os100 (1.2.152); FILE MERGED

2007/07/10 14:07:55 os 1.2.152.1: #i65257# text append interfaces

4 files changed, 40 insertions, 11 deletions

diff --git a/svx/inc/svx/unoedsrc.hxx b/svx/inc/svx/unoedsrc.hxx
index 78470c6c77b5..648485ac00c5 100644
--- a/svx/inc/svx/unoedsrc.hxx
+++ b/svx/inc/svx/unoedsrc.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unoedsrc.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:43:55 $
+ *  last change: $Author: obo $ $Date: 2007-07-18 13:05:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -199,6 +199,12 @@ public:
 
     virtual SfxItemPool* GetPool() const = 0;
 
+     virtual const SfxItemSet*   GetEmptyItemSetPtr() = 0;
+
+     // implementation functions for XParagraphAppend and XTextPortionAppend
+     virtual void        AppendParagraph() = 0;
+     virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet ) = 0;
+
     /** Query state of forwarder
 
         @return sal_False, if no longer valid
diff --git a/svx/inc/svx/unofored.hxx b/svx/inc/svx/unofored.hxx
index a63a39277a81..5520d40fa6c5 100644
--- a/svx/inc/svx/unofored.hxx
+++ b/svx/inc/svx/unofored.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unofored.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:44:16 $
+ *  last change: $Author: obo $ $Date: 2007-07-18 13:05:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -96,6 +96,11 @@ public:
     virtual USHORT          GetDepth( USHORT nPara ) const;
     virtual sal_Bool        SetDepth( USHORT nPara, USHORT nNewDepth );
 
+    virtual const SfxItemSet*   GetEmptyItemSetPtr();
+
+    // implementation functions for XParagraphAppend and XTextPortionAppend
+    virtual void        AppendParagraph();
+    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
 };
 
 #endif
diff --git a/svx/inc/svx/unoforou.hxx b/svx/inc/svx/unoforou.hxx
index cb3dd9cd858e..b0f21ec77d5e 100644
--- a/svx/inc/svx/unoforou.hxx
+++ b/svx/inc/svx/unoforou.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unoforou.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:44:27 $
+ *  last change: $Author: obo $ $Date: 2007-07-18 13:06:06 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -119,6 +119,12 @@ public:
 
     /* this method flushes internal caches for this forwarder */
     void                flushCache();
+
+    virtual const SfxItemSet*   GetEmptyItemSetPtr();
+
+    // implementation functions for XParagraphAppend and XTextPortionAppend
+    virtual void        AppendParagraph();
+    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
 };
 
 #endif
diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx
index 9256db9fc922..c2da5616855d 100644
--- a/svx/inc/svx/unotext.hxx
+++ b/svx/inc/svx/unotext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unotext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:46:39 $
+ *  last change: $Author: obo $ $Date: 2007-07-18 13:06:20 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -73,8 +73,8 @@
 #ifndef _COM_SUN_STAR_TEXT_XTEXTRANGECOMPARE_HPP_
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 #endif
-#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
-#include <com/sun/star/lang/Locale.hpp>
+#ifndef _COM_SUN_STAR_TEXT_XTEXTAPPEND_HPP_
+#include <com/sun/star/text/XTextAppend.hpp>
 #endif
 
 #ifndef _CPPUHELPER_WEAK_HXX_
@@ -314,6 +314,11 @@ public:
     virtual USHORT          GetDepth( USHORT nPara ) const;
     virtual sal_Bool        SetDepth( USHORT nPara, USHORT nNewDepth );
 
+    virtual const SfxItemSet*   GetEmptyItemSetPtr();
+
+    // implementation functions for XParagraphAppend and XTextPortionAppend
+    virtual void        AppendParagraph();
+    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
 };
 
 namespace accessibility
@@ -461,7 +466,7 @@ public:
 };
 
 class SVX_DLLPUBLIC SvxUnoTextBase  : public SvxUnoTextRangeBase,
-                        public ::com::sun::star::text::XText,
+                        public ::com::sun::star::text::XTextAppend,
                         public ::com::sun::star::container::XEnumerationAccess,
                         public ::com::sun::star::text::XTextRangeMover,
                         public ::com::sun::star::lang::XTypeProvider
@@ -515,6 +520,13 @@ public:
     // ::com::sun::star::text::XTextRangeMover
     virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nParagraphs ) throw(::com::sun::star::uno::RuntimeException);
 
+    // com::sun::star::text::XParagraphAppend (new import API)
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendParagraph( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishParagraph( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+
+    // com::sun::star::text::XTextPortionAppend (new import API)
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendTextPortion( const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+
     // ::com::sun::star::lang::XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);