diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-03-03 14:57:39 +0530 |
|---|---|---|
| committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-03-23 20:29:39 +0530 |
| commit | aaffd4536c359c67da201e507264bf78636e66ad (patch) | |
| tree | 1b20a75867ed95b4fe232018f809bc5c74e30195 /desktop/source | |
| parent | 98de85d176fe2a8d77ea55e1f972d92722c5c471 (diff) | |
lok: Do not use UNO for fetching tracked changes
See inline comment for reasons.
Also, move the SwRedlineTypeToOUString function as inline to same header
file containing redline types.
Change-Id: I9b4be4f104c095b2ccd8287d935347c81fd25974
Reviewed-on: https://gerrit.libreoffice.org/34950
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: pranavk <pranavk@collabora.co.uk>
(cherry picked from commit e6cca48bc9deb1049f8d501406269b71f91511ca)
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/lib/init.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b462c1684f6b..3500d2b7673e 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2500,7 +2500,10 @@ static char* getTrackedChanges(LibreOfficeKitDocument* pThis) uno::Reference<document::XRedlinesSupplier> xRedlinesSupplier(pDocument->mxComponent, uno::UNO_QUERY); std::stringstream aStream; - if (xRedlinesSupplier.is()) + // We want positions of the track changes also which is not possible from + // UNO. Enable positioning information for text documents only for now, so + // construct the tracked changes JSON from inside the sw/, not here using UNO + if (doc_getDocumentType(pThis) != LOK_DOCTYPE_TEXT && xRedlinesSupplier.is()) { uno::Reference<container::XEnumeration> xRedlines = xRedlinesSupplier->getRedlines()->createEnumeration(); boost::property_tree::ptree aRedlines; |