diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2013-03-20 14:19:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-23 11:55:27 +0100 |
| commit | c43ffd3d44060c0801138e33a9dfc917133b7c21 (patch) | |
| tree | 7ab3f484b29143d863950db09ce58d1f5c432753 /sw/source/core/unocore/unoflatpara.cxx | |
| parent | 79b231f7a032c7e04b74fa019e18a5d7e3b5f4f3 (diff) | |
Resolves: #i121734# extend XTextMarkup to support ranges
Patch by: Kai Labusch
Review by: arielch, jsc
(cherry picked from commit de75173372c022c3004643d8978f76662261130b)
Conflicts:
offapi/com/sun/star/text/XTextMarkup.idl
sw/inc/unoflatpara.hxx
sw/inc/unotextmarkup.hxx
sw/source/core/unocore/unoflatpara.cxx
Change-Id: I2cfa15f08a893feb8880dc729b76cff3d29ce4eb
Diffstat (limited to 'sw/source/core/unocore/unoflatpara.cxx')
| -rw-r--r-- | sw/source/core/unocore/unoflatpara.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 2c3696a1bf77..c1c2b92446a2 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -44,6 +44,9 @@ #include <viewopt.hxx> #include <comphelper/servicehelper.hxx> +#include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/text/XTextRange.hpp> + using namespace ::com::sun::star; namespace SwUnoCursorHelper { @@ -119,10 +122,17 @@ css::uno::Reference< css::container::XStringKeyMap > SAL_CALL SwXFlatParagraph:: return SwXTextMarkup::getMarkupInfoContainer(); } -void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException) +void SAL_CALL SwXFlatParagraph::commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const uno::Reference< text::XTextRange> & xRange, + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (uno::RuntimeException) +{ + SolarMutexGuard aGuard; + SwXTextMarkup::commitTextRangeMarkup( nType, aIdentifier, xRange, xMarkupInfoContainer ); +} + +void SAL_CALL SwXFlatParagraph::commitStringMarkup(::sal_Int32 nType, const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException) { SolarMutexGuard aGuard; - SwXTextMarkup::commitTextMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer ); + SwXTextMarkup::commitStringMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer ); } // text::XFlatParagraph: |