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>
208 lines
5.6 KiB
C++
208 lines
5.6 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 <fmundo.hxx>
|
|
#include <fmdocumentclassification.hxx>
|
|
#include <fmcontrollayout.hxx>
|
|
|
|
#include <svx/fmmodel.hxx>
|
|
#include <svx/fmpage.hxx>
|
|
#include <svx/svdobj.hxx>
|
|
|
|
#include <sfx2/objsh.hxx>
|
|
|
|
#include <o3tl/optional.hxx>
|
|
|
|
using ::com::sun::star::uno::Reference;
|
|
using ::com::sun::star::container::XNameContainer;
|
|
using namespace svxform;
|
|
|
|
|
|
struct FmFormModelImplData
|
|
{
|
|
rtl::Reference<FmXUndoEnvironment> mxUndoEnv;
|
|
bool bOpenInDesignIsDefaulted;
|
|
o3tl::optional<bool> aControlsUseRefDevice;
|
|
|
|
FmFormModelImplData()
|
|
:bOpenInDesignIsDefaulted( true )
|
|
{
|
|
}
|
|
};
|
|
|
|
FmFormModel::FmFormModel(
|
|
SfxItemPool* pPool,
|
|
SfxObjectShell* pPers)
|
|
: SdrModel(
|
|
pPool,
|
|
pPers)
|
|
, m_pObjShell(nullptr)
|
|
, m_bOpenInDesignMode(false)
|
|
, m_bAutoControlFocus(false)
|
|
{
|
|
m_pImpl.reset( new FmFormModelImplData );
|
|
m_pImpl->mxUndoEnv = new FmXUndoEnvironment(*this);
|
|
}
|
|
|
|
FmFormModel::~FmFormModel()
|
|
{
|
|
if (m_pObjShell && m_pImpl->mxUndoEnv->IsListening(*m_pObjShell))
|
|
SetObjectShell(nullptr);
|
|
|
|
ClearUndoBuffer();
|
|
// minimum limit for undos
|
|
SetMaxUndoActionCount(1);
|
|
}
|
|
|
|
SdrPage* FmFormModel::AllocPage(bool bMasterPage)
|
|
{
|
|
return new FmFormPage(*this, bMasterPage);
|
|
}
|
|
|
|
void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
|
|
{
|
|
// hack for as long as the method is internal
|
|
if (m_pObjShell && !m_pImpl->mxUndoEnv->IsListening( *m_pObjShell ))
|
|
SetObjectShell(m_pObjShell);
|
|
|
|
SdrModel::InsertPage( pPage, nPos );
|
|
}
|
|
|
|
SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum)
|
|
{
|
|
FmFormPage* pToBeRemovedPage = dynamic_cast< FmFormPage* >( GetPage( nPgNum ) );
|
|
OSL_ENSURE( pToBeRemovedPage, "FmFormModel::RemovePage: *which page*?" );
|
|
|
|
if ( pToBeRemovedPage )
|
|
{
|
|
Reference< XNameContainer > xForms( pToBeRemovedPage->GetForms( false ), css::uno::UNO_QUERY );
|
|
if ( xForms.is() )
|
|
m_pImpl->mxUndoEnv->RemoveForms( xForms );
|
|
}
|
|
|
|
FmFormPage* pRemovedPage = static_cast<FmFormPage*>(SdrModel::RemovePage(nPgNum));
|
|
OSL_ENSURE( pRemovedPage == pToBeRemovedPage, "FmFormModel::RemovePage: inconsistency!" );
|
|
return pRemovedPage;
|
|
}
|
|
|
|
void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
|
|
{
|
|
// hack for as long as the method is internal
|
|
if (m_pObjShell && !m_pImpl->mxUndoEnv->IsListening( *m_pObjShell ))
|
|
SetObjectShell(m_pObjShell);
|
|
|
|
SdrModel::InsertMasterPage(pPage, nPos);
|
|
}
|
|
|
|
SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum)
|
|
{
|
|
FmFormPage* pPage = static_cast<FmFormPage*>(SdrModel::RemoveMasterPage(nPgNum));
|
|
|
|
if ( pPage )
|
|
{
|
|
Reference< XNameContainer > xForms( pPage->GetForms( false ), css::uno::UNO_QUERY );
|
|
if ( xForms.is() )
|
|
m_pImpl->mxUndoEnv->RemoveForms( xForms );
|
|
}
|
|
|
|
return pPage;
|
|
}
|
|
|
|
|
|
void FmFormModel::implSetOpenInDesignMode( bool _bOpenDesignMode )
|
|
{
|
|
if( _bOpenDesignMode != m_bOpenInDesignMode )
|
|
{
|
|
m_bOpenInDesignMode = _bOpenDesignMode;
|
|
|
|
if ( m_pObjShell )
|
|
m_pObjShell->SetModified();
|
|
}
|
|
// no matter if we really did it or not - from now on, it does not count as defaulted anymore
|
|
m_pImpl->bOpenInDesignIsDefaulted = false;
|
|
}
|
|
|
|
|
|
void FmFormModel::SetOpenInDesignMode( bool bOpenDesignMode )
|
|
{
|
|
implSetOpenInDesignMode( bOpenDesignMode );
|
|
}
|
|
|
|
|
|
bool FmFormModel::OpenInDesignModeIsDefaulted( )
|
|
{
|
|
return m_pImpl->bOpenInDesignIsDefaulted;
|
|
}
|
|
|
|
|
|
bool FmFormModel::ControlsUseRefDevice() const
|
|
{
|
|
if ( !m_pImpl->aControlsUseRefDevice )
|
|
{
|
|
DocumentType eDocType = eUnknownDocumentType;
|
|
if ( m_pObjShell )
|
|
eDocType = DocumentClassification::classifyHostDocument( m_pObjShell->GetModel() );
|
|
m_pImpl->aControlsUseRefDevice = ControlLayouter::useDocumentReferenceDevice(eDocType);
|
|
}
|
|
return *m_pImpl->aControlsUseRefDevice;
|
|
}
|
|
|
|
|
|
void FmFormModel::SetAutoControlFocus( bool _bAutoControlFocus )
|
|
{
|
|
if( _bAutoControlFocus != m_bAutoControlFocus )
|
|
{
|
|
m_bAutoControlFocus = _bAutoControlFocus;
|
|
m_pObjShell->SetModified();
|
|
}
|
|
}
|
|
|
|
|
|
void FmFormModel::SetObjectShell( SfxObjectShell* pShell )
|
|
{
|
|
if (pShell == m_pObjShell)
|
|
return;
|
|
|
|
if (m_pObjShell)
|
|
{
|
|
m_pImpl->mxUndoEnv->EndListening( *this );
|
|
m_pImpl->mxUndoEnv->EndListening( *m_pObjShell );
|
|
}
|
|
|
|
m_pObjShell = pShell;
|
|
|
|
if (m_pObjShell)
|
|
{
|
|
m_pImpl->mxUndoEnv->SetReadOnly( m_pObjShell->IsReadOnly() || m_pObjShell->IsReadOnlyUI(), FmXUndoEnvironment::Accessor() );
|
|
|
|
if (!m_pImpl->mxUndoEnv->IsReadOnly())
|
|
m_pImpl->mxUndoEnv->StartListening(*this);
|
|
|
|
m_pImpl->mxUndoEnv->StartListening( *m_pObjShell );
|
|
}
|
|
}
|
|
|
|
|
|
FmXUndoEnvironment& FmFormModel::GetUndoEnv()
|
|
{
|
|
return *m_pImpl->mxUndoEnv;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|