961ffd72e2
In writer the ViewOptions are in the ViewShell and are copied when a new ViewShell is created from that ViewShell so the dark/light-mode and doc color are the same in a new view as the old view. But in calc the ViewOptions exist in both the ViewShell and Document and a new ViewShell copies from the document not the old ViewShell. Setting the ViewOptions of a ViewShell in calc doesn't have an effect of having the same setting in a new view in calc. So if you create a new view from an old view you got the ViewOptions of the document, whose light/dark mode remained as "Default" when the old view dark/light more was set. So the mismatch triggered an invalidate. These additions to ViewOptions are relatively new in calc, and the desire is to get the same behaviour in calc as in writer, so move the new additions to a separate class that belongs to the ViewShell and copy them from the current ViewShell when creating a new ViewShell. Change-Id: Ie4b1dbb0437763ec4c8d067179c1fbef520161e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161791 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161880 Tested-by: Jenkins
176 lines
5.6 KiB
C++
176 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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <svx/optgrid.hxx>
|
|
|
|
#include "scdllapi.h"
|
|
#include "optutil.hxx"
|
|
#include "global.hxx"
|
|
|
|
// View options
|
|
|
|
enum ScViewOption
|
|
{
|
|
VOPT_FORMULAS = 0,
|
|
VOPT_NULLVALS,
|
|
VOPT_SYNTAX,
|
|
VOPT_NOTES,
|
|
VOPT_FORMULAS_MARKS,
|
|
VOPT_VSCROLL,
|
|
VOPT_HSCROLL,
|
|
VOPT_TABCONTROLS,
|
|
VOPT_OUTLINER,
|
|
VOPT_HEADER,
|
|
VOPT_GRID,
|
|
VOPT_GRID_ONTOP,
|
|
VOPT_HELPLINES,
|
|
VOPT_ANCHOR,
|
|
VOPT_PAGEBREAKS,
|
|
VOPT_SUMMARY,
|
|
// tdf#96854 - move/copy sheet dialog: last used option for action (true: copy, false: move)
|
|
VOPT_COPY_SHEET,
|
|
VOPT_THEMEDCURSOR,
|
|
};
|
|
|
|
enum ScVObjType
|
|
{
|
|
VOBJ_TYPE_OLE = 0,
|
|
VOBJ_TYPE_CHART,
|
|
VOBJ_TYPE_DRAW
|
|
};
|
|
|
|
#define MAX_OPT sal_uInt16(VOPT_THEMEDCURSOR)+1
|
|
#define MAX_TYPE sal_uInt16(VOBJ_TYPE_DRAW)+1
|
|
|
|
// SvxGrid options with standard operators
|
|
|
|
class ScGridOptions : public SvxOptionsGrid
|
|
{
|
|
public:
|
|
ScGridOptions() {}
|
|
ScGridOptions( const SvxOptionsGrid& rOpt ) : SvxOptionsGrid( rOpt ) {}
|
|
|
|
void SetDefaults();
|
|
bool operator== ( const ScGridOptions& rOpt ) const;
|
|
bool operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); }
|
|
};
|
|
|
|
class SC_DLLPUBLIC ScViewRenderingOptions
|
|
{
|
|
public:
|
|
ScViewRenderingOptions();
|
|
|
|
const OUString& GetColorSchemeName() const { return sColorSchemeName; }
|
|
void SetColorSchemeName( const OUString& rName ) { sColorSchemeName = rName; }
|
|
|
|
const Color& GetDocColor() const { return aDocCol; }
|
|
void SetDocColor(const Color& rDocColor) { aDocCol = rDocColor; }
|
|
|
|
bool operator==(const ScViewRenderingOptions& rOther) const;
|
|
|
|
private:
|
|
// The name of the color scheme
|
|
OUString sColorSchemeName;
|
|
// The background color of the document
|
|
Color aDocCol;
|
|
};
|
|
|
|
// Options - View
|
|
|
|
class SC_DLLPUBLIC ScViewOptions
|
|
{
|
|
public:
|
|
ScViewOptions();
|
|
ScViewOptions( const ScViewOptions& rCpy );
|
|
~ScViewOptions();
|
|
|
|
void SetDefaults();
|
|
|
|
void SetOption( ScViewOption eOpt, bool bNew ) { aOptArr[eOpt] = bNew; }
|
|
bool GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; }
|
|
|
|
void SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; }
|
|
ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; }
|
|
|
|
void SetGridColor( const Color& rCol, const OUString& rName ) { aGridCol = rCol; aGridColName = rName;}
|
|
Color const & GetGridColor( OUString* pStrName = nullptr ) const;
|
|
|
|
const ScGridOptions& GetGridOptions() const { return aGridOpt; }
|
|
void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; }
|
|
std::unique_ptr<SvxGridItem> CreateGridItem() const;
|
|
|
|
ScViewOptions& operator= ( const ScViewOptions& rCpy );
|
|
bool operator== ( const ScViewOptions& rOpt ) const;
|
|
bool operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); }
|
|
|
|
private:
|
|
bool aOptArr [MAX_OPT];
|
|
ScVObjMode aModeArr [MAX_TYPE];
|
|
Color aGridCol;
|
|
OUString aGridColName;
|
|
ScGridOptions aGridOpt;
|
|
};
|
|
|
|
// Item for the options dialog - View
|
|
|
|
class SC_DLLPUBLIC ScTpViewItem final : public SfxPoolItem
|
|
{
|
|
public:
|
|
ScTpViewItem( const ScViewOptions& rOpt );
|
|
virtual ~ScTpViewItem() override;
|
|
|
|
ScTpViewItem(ScTpViewItem const &) = default;
|
|
ScTpViewItem(ScTpViewItem &&) = default;
|
|
ScTpViewItem & operator =(ScTpViewItem const &) = delete; // due to SfxPoolItem
|
|
ScTpViewItem & operator =(ScTpViewItem &&) = delete; // due to SfxPoolItem
|
|
|
|
virtual bool operator==( const SfxPoolItem& ) const override;
|
|
virtual ScTpViewItem* Clone( SfxItemPool *pPool = nullptr ) const override;
|
|
|
|
const ScViewOptions& GetViewOptions() const { return theOptions; }
|
|
|
|
private:
|
|
ScViewOptions theOptions;
|
|
};
|
|
|
|
// CfgItem for View options
|
|
|
|
class ScViewCfg : public ScViewOptions
|
|
{
|
|
ScLinkConfigItem aLayoutItem;
|
|
ScLinkConfigItem aDisplayItem;
|
|
ScLinkConfigItem aGridItem;
|
|
|
|
DECL_LINK( LayoutCommitHdl, ScLinkConfigItem&, void );
|
|
DECL_LINK( DisplayCommitHdl, ScLinkConfigItem&, void );
|
|
DECL_LINK( GridCommitHdl, ScLinkConfigItem&, void );
|
|
|
|
static css::uno::Sequence<OUString> GetLayoutPropertyNames();
|
|
static css::uno::Sequence<OUString> GetDisplayPropertyNames();
|
|
static css::uno::Sequence<OUString> GetGridPropertyNames();
|
|
|
|
public:
|
|
ScViewCfg();
|
|
|
|
void SetOptions( const ScViewOptions& rNew );
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|