e4fb4937b3
Made accept/reject handle move redlines other pair, (moveto-movefrom) and handle the whole move redline, even if it is split into small pieces that separated from each other. Added unique ID to every move redline to help find their other parts. This move ID is generated in case of: move recognition moveing a paragraph. (directly create move redline with unique id without calling the recognition it is faster and more stable) (there are other cases that could be improved to not use recognition, but generate ID directly, like moveing selected partial text with mouse) Implemented the odt export/import of this move ID. it is a tag like this: "<loext:move-id>4</loext:move-id>" next to creator/date Improved the docx import to generate this move ID, so move redlines can find their other parts (Not changed Docx export... it works a bit, but far from perfect) Improved move reckognition: It can find them even if they are split into multiple parts differently. (like "ab"+"cd" == "a"+"bcd") Disabled this because of probably performance issue. made a complex unit test for it. Note: Left the move recognition on every place, to avoid as much regressions as possible.. but in the future, we may can disable it in some cases. Note2: We will have to keep move recognitnion, because there are documents from past, saved without any move informations in the file, and users expect to see move redlines there. (generated by the recognition.) Change-Id: If968d4235b676c5e538cfaf4187a4482a86eae9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157740 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158611 Tested-by: Jenkins
86 lines
2.9 KiB
C++
86 lines
2.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include "XMLChangeInfoContext.hxx"
|
|
#include "XMLChangedRegionImportContext.hxx"
|
|
#include <XMLStringBufferImportContext.hxx>
|
|
#include <com/sun/star/uno/Reference.h>
|
|
#include <xmloff/xmlnamespace.hxx>
|
|
#include <xmloff/xmltoken.hxx>
|
|
#include <xmloff/xmlimp.hxx>
|
|
#include <sal/log.hxx>
|
|
|
|
|
|
using namespace ::xmloff::token;
|
|
|
|
using ::com::sun::star::uno::Reference;
|
|
|
|
|
|
XMLChangeInfoContext::XMLChangeInfoContext(
|
|
SvXMLImport& rImport,
|
|
XMLChangedRegionImportContext& rPParent,
|
|
const OUString& rChangeType)
|
|
: SvXMLImportContext(rImport)
|
|
, rType(rChangeType)
|
|
, rChangedRegion(rPParent)
|
|
{
|
|
}
|
|
|
|
XMLChangeInfoContext::~XMLChangeInfoContext()
|
|
{
|
|
}
|
|
|
|
css::uno::Reference< css::xml::sax::XFastContextHandler > XMLChangeInfoContext::createFastChildContext(
|
|
sal_Int32 nElement,
|
|
const css::uno::Reference< css::xml::sax::XFastAttributeList >& )
|
|
{
|
|
SvXMLImportContextRef xContext;
|
|
|
|
switch (nElement)
|
|
{
|
|
case XML_ELEMENT(DC, XML_CREATOR):
|
|
xContext = new XMLStringBufferImportContext(GetImport(), sAuthorBuffer);
|
|
break;
|
|
case XML_ELEMENT(DC, XML_DATE):
|
|
xContext = new XMLStringBufferImportContext(GetImport(), sDateTimeBuffer);
|
|
break;
|
|
case XML_ELEMENT(LO_EXT, XML_MOVE_ID):
|
|
xContext = new XMLStringBufferImportContext(GetImport(), sMovedIDBuffer);
|
|
break;
|
|
case XML_ELEMENT(TEXT, XML_P):
|
|
case XML_ELEMENT(LO_EXT, XML_P):
|
|
xContext = new XMLStringBufferImportContext(GetImport(), sCommentBuffer);
|
|
break;
|
|
default:
|
|
XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
|
|
}
|
|
|
|
return xContext;
|
|
}
|
|
|
|
void XMLChangeInfoContext::endFastElement(sal_Int32 )
|
|
{
|
|
// set values at changed region context
|
|
rChangedRegion.SetChangeInfo(rType, sAuthorBuffer.makeStringAndClear(),
|
|
sCommentBuffer.makeStringAndClear(), sDateTimeBuffer,
|
|
sMovedIDBuffer.makeStringAndClear());
|
|
sDateTimeBuffer.setLength(0);
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|