7e403195e5
...with a boost::optional fallback for Xcode < 10 (as std::optional is only
available starting with Xcode 10 according to
<https://en.cppreference.com/w/cpp/compiler_support>, and our baseline for iOS
and macOS is still Xcode 9.3 according to README.md). And mechanically rewrite
all code to use o3tl::optional instead of boost::optional.
One immediate benefit is that disabling -Wmaybe-uninitialized for GCC as per
fed7c3deb3
"Slience bogus
-Werror=maybe-uninitialized" should no longer be necessary (and whose check
happened to no longer trigger for GCC 10 trunk, even though that compiler would
still emit bogus -Wmaybe-uninitialized for uses of boost::optional under
--enable-optimized, which made me ponder whether this switch from
boost::optional to std::optional would be a useful thing to do; I keep that
configure.ac check for now, though, and will only remove it in a follow up
commit).
Another longer-term benefit is that the code is now already in good shape for an
eventual switch to std::optional (a switch we would have done anyway once we no
longer need to support Xcode < 10).
Only desktop/qa/desktop_lib/test_desktop_lib.cxx heavily uses
boost::property_tree::ptree::get_child_optional returning boost::optional, so
let it keep using boost::optional for now.
After a number of preceding commits have paved the way for this change, this
commit is completely mechanical, done with
> git ls-files -z | grep -vz -e '^bin/find-unneeded-includes$' -e '^configure.ac$' -e '^desktop/qa/desktop_lib/test_desktop_lib.cxx$' -e '^dictionaries$' -e '^external/' -e '^helpcontent2$' -e '^include/IwyuFilter_include.yaml$' -e '^sc/IwyuFilter_sc.yaml$' -e '^solenv/gdb/boost/optional.py$' -e '^solenv/vs/LibreOffice.natvis$' -e '^translations$' -e '\.svg$' | xargs -0 sed -i -E -e 's|\<boost(/optional)?/optional\.hpp\>|o3tl/optional.hxx|g' -e 's/\<boost(\s*)::(\s*)(make_)?optional\>/o3tl\1::\2\3optional/g' -e 's/\<boost(\s*)::(\s*)none\>/o3tl\1::\2nullopt/g'
(before committing include/o3tl/optional.hxx, and relying on some GNU features).
It excludes some files where mention of boost::optional et al should apparently
not be changed (and the sub-repo directory stubs). It turned out that all uses
of boost::none across the code base were in combination with boost::optional, so
had all to be rewritten as o3tl::nullopt.
Change-Id: Ibfd9f4b3d5a8aee6e6eed310b988c4e5ffd8b11b
Reviewed-on: https://gerrit.libreoffice.org/84128
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
333 lines
12 KiB
C++
333 lines
12 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 .
|
|
*/
|
|
#ifndef INCLUDED_SW_INC_REDLINE_HXX
|
|
#define INCLUDED_SW_INC_REDLINE_HXX
|
|
|
|
#include <tools/datetime.hxx>
|
|
#include <rtl/ustring.hxx>
|
|
|
|
#include "pam.hxx"
|
|
|
|
#include "IDocumentRedlineAccess.hxx"
|
|
|
|
#include <cstddef>
|
|
#include <memory>
|
|
#include <vector>
|
|
#include <o3tl/optional.hxx>
|
|
|
|
|
|
class SfxItemSet;
|
|
|
|
class SW_DLLPUBLIC SwRedlineExtraData
|
|
{
|
|
SwRedlineExtraData( const SwRedlineExtraData& ) = delete;
|
|
SwRedlineExtraData& operator=( const SwRedlineExtraData& ) = delete;
|
|
|
|
protected:
|
|
SwRedlineExtraData() {}
|
|
|
|
public:
|
|
virtual ~SwRedlineExtraData();
|
|
virtual SwRedlineExtraData* CreateNew() const = 0;
|
|
|
|
virtual void Reject( SwPaM& rPam ) const;
|
|
virtual bool operator == ( const SwRedlineExtraData& ) const;
|
|
};
|
|
|
|
class SW_DLLPUBLIC SwRedlineExtraData_FormatColl final : public SwRedlineExtraData
|
|
{
|
|
OUString m_sFormatNm;
|
|
std::unique_ptr<SfxItemSet> m_pSet;
|
|
sal_uInt16 m_nPoolId;
|
|
bool m_bFormatAll; // don't strip the last paragraph mark
|
|
public:
|
|
SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 nPoolFormatId,
|
|
const SfxItemSet* pSet = nullptr, bool bFormatAll = true );
|
|
virtual ~SwRedlineExtraData_FormatColl() override;
|
|
virtual SwRedlineExtraData* CreateNew() const override;
|
|
virtual void Reject( SwPaM& rPam ) const override;
|
|
virtual bool operator == ( const SwRedlineExtraData& ) const override;
|
|
|
|
const OUString& GetFormatName() const { return m_sFormatNm; }
|
|
void SetItemSet( const SfxItemSet& rSet );
|
|
SfxItemSet* GetItemSet( ) const { return m_pSet.get(); }
|
|
void SetFormatAll( bool bAll ) { m_bFormatAll = bAll; }
|
|
};
|
|
|
|
class SwRedlineExtraData_Format final : public SwRedlineExtraData
|
|
{
|
|
std::vector<sal_uInt16> m_aWhichIds;
|
|
|
|
SwRedlineExtraData_Format( const SwRedlineExtraData_Format& rCpy );
|
|
|
|
public:
|
|
SwRedlineExtraData_Format( const SfxItemSet& rSet );
|
|
virtual ~SwRedlineExtraData_Format() override;
|
|
virtual SwRedlineExtraData* CreateNew() const override;
|
|
virtual void Reject( SwPaM& rPam ) const override;
|
|
virtual bool operator == ( const SwRedlineExtraData& ) const override;
|
|
};
|
|
|
|
class SW_DLLPUBLIC SwRedlineData
|
|
{
|
|
friend class SwRangeRedline;
|
|
SwRedlineData* m_pNext; // Points to other data.
|
|
SwRedlineExtraData* m_pExtraData;
|
|
|
|
OUString m_sComment;
|
|
DateTime m_aStamp;
|
|
RedlineType m_eType;
|
|
bool m_bAutoFormat;
|
|
std::size_t const m_nAuthor;
|
|
sal_uInt16 m_nSeqNo;
|
|
|
|
public:
|
|
SwRedlineData( RedlineType eT, std::size_t nAut );
|
|
SwRedlineData( const SwRedlineData& rCpy, bool bCpyNext = true );
|
|
|
|
// For sw3io: pNext/pExtraData are taken over.
|
|
SwRedlineData( RedlineType eT, std::size_t nAut, const DateTime& rDT,
|
|
const OUString& rCmnt, SwRedlineData* pNxt );
|
|
|
|
~SwRedlineData();
|
|
|
|
bool operator==( const SwRedlineData& rCmp ) const
|
|
{
|
|
return m_nAuthor == rCmp.m_nAuthor &&
|
|
m_eType == rCmp.m_eType &&
|
|
m_bAutoFormat == rCmp.m_bAutoFormat &&
|
|
m_sComment == rCmp.m_sComment &&
|
|
(( !m_pNext && !rCmp.m_pNext ) ||
|
|
( m_pNext && rCmp.m_pNext && *m_pNext == *rCmp.m_pNext )) &&
|
|
(( !m_pExtraData && !rCmp.m_pExtraData ) ||
|
|
( m_pExtraData && rCmp.m_pExtraData &&
|
|
*m_pExtraData == *rCmp.m_pExtraData ));
|
|
}
|
|
bool operator!=( const SwRedlineData& rCmp ) const
|
|
{ return !operator==( rCmp ); }
|
|
|
|
RedlineType GetType() const { return m_eType; }
|
|
|
|
std::size_t GetAuthor() const { return m_nAuthor; }
|
|
const OUString& GetComment() const { return m_sComment; }
|
|
const DateTime& GetTimeStamp() const { return m_aStamp; }
|
|
const SwRedlineData* Next() const{ return m_pNext; }
|
|
|
|
void SetComment( const OUString& rS ) { m_sComment = rS; }
|
|
void SetTimeStamp( const DateTime& rDT ) { m_aStamp = rDT; }
|
|
|
|
void SetAutoFormat() { m_bAutoFormat = true; }
|
|
bool IsAutoFormat() const { return m_bAutoFormat; }
|
|
bool CanCombine( const SwRedlineData& rCmp ) const;
|
|
|
|
// ExtraData gets copied, the pointer is therefore not taken over by
|
|
// the RedlineObject
|
|
void SetExtraData( const SwRedlineExtraData* pData );
|
|
const SwRedlineExtraData* GetExtraData() const { return m_pExtraData; }
|
|
|
|
// For UI-side pooling of Redline-actions.
|
|
// At the moment only used for Autoformat with Redline.
|
|
// Value != 0 means there can be others!
|
|
sal_uInt16 GetSeqNo() const { return m_nSeqNo; }
|
|
void SetSeqNo( sal_uInt16 nNo ) { m_nSeqNo = nNo; }
|
|
|
|
OUString GetDescr() const;
|
|
};
|
|
|
|
class SW_DLLPUBLIC SwRangeRedline : public SwPaM
|
|
{
|
|
SwRedlineData* m_pRedlineData;
|
|
SwNodeIndex* m_pContentSect;
|
|
bool m_bDelLastPara : 1;
|
|
bool m_bIsVisible : 1;
|
|
sal_uInt32 const m_nId;
|
|
|
|
o3tl::optional<long> m_oLOKLastNodeTop;
|
|
|
|
void MoveToSection();
|
|
void CopyToSection();
|
|
void DelCopyOfSection(size_t nMyPos);
|
|
void MoveFromSection(size_t nMyPos);
|
|
|
|
public:
|
|
static sal_uInt32 m_nLastId;
|
|
|
|
SwRangeRedline( RedlineType eType, const SwPaM& rPam );
|
|
SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam );
|
|
SwRangeRedline( const SwRedlineData& rData, const SwPosition& rPos );
|
|
// For sw3io: pData is taken over!
|
|
SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos,
|
|
bool bDelLP) :
|
|
SwPaM( rPos ), m_pRedlineData( pData ), m_pContentSect( nullptr ),
|
|
m_bDelLastPara( bDelLP ), m_bIsVisible( true ), m_nId( m_nLastId++ )
|
|
{}
|
|
SwRangeRedline( const SwRangeRedline& );
|
|
virtual ~SwRangeRedline() override;
|
|
|
|
sal_uInt32 GetId() const { return m_nId; }
|
|
SwNodeIndex* GetContentIdx() const { return m_pContentSect; }
|
|
// For Undo.
|
|
void SetContentIdx( const SwNodeIndex* );
|
|
|
|
bool IsVisible() const { return m_bIsVisible; }
|
|
bool IsDelLastPara() const { return m_bDelLastPara; }
|
|
|
|
void SetStart( const SwPosition& rPos, SwPosition* pSttPtr = nullptr );
|
|
void SetEnd( const SwPosition& rPos, SwPosition* pEndPtr = nullptr );
|
|
|
|
/// Do we have a valid selection?
|
|
bool HasValidRange() const;
|
|
|
|
const SwRedlineData& GetRedlineData(sal_uInt16 nPos = 0) const;
|
|
bool operator!=( const SwRedlineData& rCmp ) const
|
|
{ return *m_pRedlineData != rCmp; }
|
|
void SetAutoFormat() { m_pRedlineData->SetAutoFormat(); }
|
|
bool IsAutoFormat() const { return m_pRedlineData->IsAutoFormat(); }
|
|
|
|
sal_uInt16 GetStackCount() const;
|
|
std::size_t GetAuthor( sal_uInt16 nPos = 0) const;
|
|
OUString const & GetAuthorString( sal_uInt16 nPos = 0 ) const;
|
|
const DateTime& GetTimeStamp( sal_uInt16 nPos = 0) const;
|
|
RedlineType GetType( sal_uInt16 nPos = 0 ) const;
|
|
const OUString& GetComment( sal_uInt16 nPos = 0 ) const;
|
|
|
|
void SetComment( const OUString& rS ) { m_pRedlineData->SetComment( rS ); }
|
|
|
|
/** ExtraData gets copied, the pointer is therefore not taken over by
|
|
* the RedLineObject.*/
|
|
void SetExtraData( const SwRedlineExtraData* pData )
|
|
{ m_pRedlineData->SetExtraData( pData ); }
|
|
const SwRedlineExtraData* GetExtraData() const
|
|
{ return m_pRedlineData->GetExtraData(); }
|
|
|
|
// For UI-side pooling of Redline-actions.
|
|
// At the moment only used for Autoformat with Redline.
|
|
// Value != 0 means there can be others!
|
|
sal_uInt16 GetSeqNo() const { return m_pRedlineData->GetSeqNo(); }
|
|
void SetSeqNo( sal_uInt16 nNo ) { m_pRedlineData->SetSeqNo( nNo ); }
|
|
|
|
// At Hide/ShowOriginal the list is traversed two times in order to
|
|
// hide the Del-Redlines via Copy and Delete.
|
|
// Otherwise at Move the attribution would be handled incorrectly.
|
|
// All other callers must always give 0.
|
|
void CallDisplayFunc(size_t nMyPos);
|
|
void Show(sal_uInt16 nLoop , size_t nMyPos);
|
|
void Hide(sal_uInt16 nLoop , size_t nMyPos);
|
|
void ShowOriginal(sal_uInt16 nLoop, size_t nMyPos);
|
|
|
|
/// Calculates the intersection with text node number nNdIdx.
|
|
void CalcStartEnd(sal_uLong nNdIdx, sal_Int32& rStart, sal_Int32& rEnd) const;
|
|
|
|
enum class Invalidation { Add, Remove };
|
|
/// Initiate the layout.
|
|
void InvalidateRange(Invalidation);
|
|
|
|
bool IsOwnRedline( const SwRangeRedline& rRedl ) const
|
|
{ return GetAuthor() == rRedl.GetAuthor(); }
|
|
bool CanCombine( const SwRangeRedline& rRedl ) const;
|
|
|
|
void PushData( const SwRangeRedline& rRedl, bool bOwnAsNext = true );
|
|
bool PopData();
|
|
|
|
/**
|
|
Returns textual description of a redline data element of
|
|
this redline.
|
|
|
|
The textual description of the selected element contains the
|
|
kind of redline and the possibly shortened text of the redline.
|
|
|
|
@return textual description of the selected redline data element
|
|
*/
|
|
OUString GetDescr();
|
|
|
|
bool operator<( const SwRangeRedline& ) const;
|
|
void dumpAsXml(xmlTextWriterPtr pWriter) const;
|
|
|
|
void MaybeNotifyRedlinePositionModification(long nTop);
|
|
};
|
|
|
|
void MaybeNotifyRedlineModification(SwRangeRedline* pRedline, SwDoc* pDoc);
|
|
|
|
/// Base object for 'Redlines' that are not of 'Ranged' type (like table row insert\delete)
|
|
class SW_DLLPUBLIC SwExtraRedline
|
|
{
|
|
private:
|
|
SwExtraRedline(SwExtraRedline const&) = delete;
|
|
SwExtraRedline& operator=(SwExtraRedline const&) = delete;
|
|
public:
|
|
SwExtraRedline() = default;
|
|
virtual ~SwExtraRedline();
|
|
};
|
|
|
|
/// Redline that holds information about a table-row that had some change
|
|
class SW_DLLPUBLIC SwTableRowRedline : public SwExtraRedline
|
|
{
|
|
private:
|
|
SwRedlineData m_aRedlineData;
|
|
const SwTableLine& m_rTableLine;
|
|
|
|
public:
|
|
SwTableRowRedline(const SwRedlineData& rData, const SwTableLine& rTableLine);
|
|
virtual ~SwTableRowRedline() override;
|
|
|
|
/** ExtraData gets copied, the pointer is therefore not taken over by
|
|
* the RedLineObject.*/
|
|
void SetExtraData( const SwRedlineExtraData* pData )
|
|
{ m_aRedlineData.SetExtraData( pData ); }
|
|
const SwTableLine& GetTableLine() const
|
|
{ return m_rTableLine; }
|
|
const SwRedlineData& GetRedlineData() const
|
|
{ return m_aRedlineData; }
|
|
};
|
|
|
|
/// Redline that holds information about a table-cell that had some change
|
|
class SW_DLLPUBLIC SwTableCellRedline : public SwExtraRedline
|
|
{
|
|
private:
|
|
SwRedlineData m_aRedlineData;
|
|
const SwTableBox& m_rTableBox;
|
|
|
|
public:
|
|
SwTableCellRedline(const SwRedlineData& rData, const SwTableBox& rTableBox);
|
|
virtual ~SwTableCellRedline() override;
|
|
|
|
/** ExtraData gets copied, the pointer is therefore not taken over by
|
|
* the RedLineObject.*/
|
|
void SetExtraData( const SwRedlineExtraData* pData )
|
|
{ m_aRedlineData.SetExtraData( pData ); }
|
|
const SwTableBox& GetTableBox() const
|
|
{ return m_rTableBox; }
|
|
const SwRedlineData& GetRedlineData() const
|
|
{ return m_aRedlineData; }
|
|
};
|
|
|
|
class SW_DLLPUBLIC SwRedlineHint final : public SfxHint
|
|
{
|
|
};
|
|
|
|
|
|
namespace sw {
|
|
|
|
std::vector<SwRangeRedline*> GetAllValidRanges(std::unique_ptr<SwRangeRedline> p);
|
|
|
|
} // namespace sw
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|