diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-01-14 13:10:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-16 10:53:05 +0000 |
| commit | 5f9d7ab963dbc1e13e4645fcef954cb8772cbb63 (patch) | |
| tree | 01984712018833b5e0f4a742914717a3f9051289 /include | |
| parent | d762c154178399a2ec1ab1d6aa9e8d5133f93d63 (diff) | |
Resolves: #i123457# suppress import and export of hyperlinks without an URL
(cherry picked from commit 71d322a8ce0f5f5cbfd66fd689ff10b3490c1ee4)
Conflicts:
include/xmloff/xmlexp.hxx
xmloff/source/core/xmlexp.cxx
xmloff/source/text/txtparae.cxx
xmloff/source/text/txtparai.cxx
Change-Id: Ie8291c93c86815cab68482b35a5e88a3bd9b731e
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/txtparae.hxx | 11 | ||||
| -rw-r--r-- | include/xmloff/xmlexp.hxx | 18 |
2 files changed, 21 insertions, 8 deletions
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 585cc3f83bd7..87b32fc30ef5 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -105,6 +105,17 @@ public: enum FieldmarkType { NONE, TEXT, CHECK }; // Used for simulating fieldmarks in OpenDocument 1.n Strict (for n <= 2). CHECK currently ignored. + + void exportTextRangeSpan( + const ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > & rTextRange, + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropSet, + ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & xPropSetInfo, + const sal_Bool bIsUICharStyle, + const sal_Bool bHasAutoStyle, + const OUString& sStyle, + bool& rPrevCharIsSpace, + FieldmarkType& openFieldMark); + protected: const OUString sActualSize; diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index b734777a3a33..2e77c5c00c06 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -654,14 +654,16 @@ inline void SvXMLExport::SetGraphicResolver( // Helper class to export an element. class XMLOFF_DLLPUBLIC SvXMLElementExport { - SvXMLExport& rExport; - OUString aName; - sal_Bool bIgnWS : 1; - sal_Bool bDoSomething : 1; - - SAL_DLLPRIVATE void StartElement( SvXMLExport& rExp, sal_uInt16 nPrefix, - const OUString& rName, - sal_Bool bIgnWSOutside ); + SvXMLExport& mrExport; + OUString maElementName; + const sal_Bool mbIgnoreWhitespaceInside :1; + const sal_Bool mbDoSomething :1; + + SAL_DLLPRIVATE + void StartElement( + const sal_uInt16 nPrefix, + const OUString& rName, + const sal_Bool bIgnoreWhitespaceOutside ); public: |