4f9f1ac333
The problem was that we don't allow even opening embedded objects in protected sections, which means the content of multi-page embedded objects can't even be viewed in protected sections, which probably goes too far. Fix this relaxing the condition in SwEditWin::MouseButtonDown() to allow launching the OLE object on double-click, and then make sure that the native data is not updated in SfxInPlaceClient_Impl::saveObject() and the replacement image is not updated in svt::EmbedEventListener_Impl::stateChanged(). This is complicated by only the Writer layout knowing if a given OLE object is anchored in a protected frame, so pass down a callback to sfx2/ and svtools/ to check if the OLE object is protected. Not copying the protected bit has the benefit of behaving correctly if the section turns into non-protected: copying would not work properly, as SfxInPlaceClient is created on demand, so not re-created when the protectedness of the section is changed. Change-Id: Ib3a8f2092d27dc1ebd3ef355c95a4a473988b163 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125815 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
54 lines
1.7 KiB
C++
54 lines
1.7 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_SWCLI_HXX
|
|
#define INCLUDED_SW_INC_SWCLI_HXX
|
|
#include <sfx2/ipclient.hxx>
|
|
|
|
class SwView;
|
|
class SwEditWin;
|
|
namespace svt
|
|
{
|
|
class EmbeddedObjectRef;
|
|
}
|
|
|
|
class SwOleClient final : public SfxInPlaceClient
|
|
{
|
|
bool m_IsInDoVerb;
|
|
bool m_IsOldCheckForOLEInCaption;
|
|
|
|
virtual void ObjectAreaChanged() override;
|
|
virtual void RequestNewObjectArea(tools::Rectangle&) override;
|
|
virtual void ViewChanged() override;
|
|
|
|
public:
|
|
SwOleClient(SwView* pView, SwEditWin* pWin, const svt::EmbeddedObjectRef&);
|
|
|
|
void SetInDoVerb(bool const bFlag) { m_IsInDoVerb = bFlag; }
|
|
|
|
bool IsCheckForOLEInCaption() const { return m_IsOldCheckForOLEInCaption; }
|
|
|
|
virtual void FormatChanged() override;
|
|
|
|
bool IsProtected() const override;
|
|
};
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|