diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-11-28 11:59:00 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-28 21:33:54 +0100 |
| commit | 232ad2f2588beff50cb5c1f3b689c581ba317583 (patch) | |
| tree | 40f7ebd9203de3e679b3578a552e28c7a2f09ee3 /sw/inc/unotext.hxx | |
| parent | 85693bffad5c863e5cd4d4b3664856a9fec607d5 (diff) | |
API CHANGE: add a "position" parameter to XParagraph/TextPortionAppend methods
So we can use the new RTF import for clipboard pastes in Writer without
inserting text content to the end of the document only.
Notes:
- SwXText::insertTextPortion: the MovePara() call is removed, as all it did was
trying to move the cursor beyond the end of the document.
- SwRTFReader::Read: the double fake paragraph insertion / deletion is
motivated by the ODT filter.
- RtfFilter::filter: if TextInsertModeRange is not passed, then the behaviour
is not changed.
v2:
- added missing @since tags
- added insertTextContentWithProperties() method
- removed unused appendParagraph() method
Change-Id: I24cddb00a78e3b798e7d88764e59e6a77a6e98a4
Helped-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/inc/unotext.hxx')
| -rw-r--r-- | sw/inc/unotext.hxx | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx index 0d5d47bcd552..7c01aed506fa 100644 --- a/sw/inc/unotext.hxx +++ b/sw/inc/unotext.hxx @@ -206,7 +206,7 @@ public: // XParagraphAppend virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - appendParagraph( + finishParagraph( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rCharacterAndParagraphProperties) @@ -214,10 +214,13 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - finishParagraph( + finishParagraphInsert( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& - rCharacterAndParagraphProperties) + rCharacterAndParagraphProperties, + const ::com::sun::star::uno::Reference< + ::com::sun::star::text::XTextRange >& + xInsertPosition) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -232,6 +235,19 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::text::XTextRange > SAL_CALL + insertTextPortion( + const ::rtl::OUString& rText, + const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::PropertyValue >& + rCharacterAndParagraphProperties, + const ::com::sun::star::uno::Reference< + ::com::sun::star::text::XTextRange >& + rTextRange) + throw (::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::uno::RuntimeException); + // XTextContentAppend virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL @@ -243,6 +259,17 @@ public: rCharacterAndParagraphProperties) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::text::XTextRange > SAL_CALL + insertTextContentWithProperties( + const ::com::sun::star::uno::Reference< + ::com::sun::star::text::XTextContent >& xTextContent, + const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::PropertyValue >& + rCharacterAndParagraphProperties, + const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xInsertPosition) + throw (::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::uno::RuntimeException); // XTextConvert virtual ::com::sun::star::uno::Reference< |