ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Remove listeners of SvtAccessibilityOptions

Browse Source 
This class no longer notifies listeners since 2019
commit 3135d820d0
so presumably the listeners can be dropped as well.

The sd part tried to execute SID commands which seem
to be removed since 2004
commit f77ad7f15f

Change-Id: I81d234aabe10b53278c89ffd846240507854d0c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161237
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
This commit is contained in:
Gabor Kelemen
2023-12-24 22:39:48 +01:00
committed by Thorsten Behrens
parent a89a42e55f
commit 4b818d79f9
12 changed files with 1 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compilerplugins/clang/unusedfields.readonly.results
-4
View File
@@ -488,8 +488,6 @@ sc/inc/formulagroup.hxx:38
sc::FormulaGroupEntry::(anonymous union at /home/noel/libo-plugin/sc/inc/formulagroup.hxx:35:5) mpCells ScFormulaCell **
sc/inc/reordermap.hxx:20
sc::ColRowReorderMapType maData DataType
sc/inc/scmod.hxx:97
ScModule m_pAccessOptions std::unique_ptr<SvtAccessibilityOptions>
sc/inc/scmod.hxx:98
ScModule m_pCTLOptions std::unique_ptr<SvtCTLOptions>
sc/inc/userlist.hxx:64
@@ -662,8 +660,6 @@ sw/inc/shellio.hxx:149
SwReader mpStg tools::SvRef<SotStorage>
sw/inc/swevent.hxx:71
SwCallMouseEvent::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sw/inc/swevent.hxx:69:9) pFormat const SwFrameFormat *
sw/inc/swmodule.hxx:91
SwModule m_pAccessibilityOptions std::unique_ptr<SvtAccessibilityOptions>
sw/inc/swmodule.hxx:92
SwModule m_pCTLOptions std::unique_ptr<SvtCTLOptions>
sw/qa/api/SwXHeadFootText.cxx:76
include/svx/svdview.hxx
-7
View File
@@ -23,7 +23,6 @@
// levels free in svdmark itself (MS compiler include depth limit)
#include <svx/svdhdl.hxx>
#include <tools/weakbase.h>
#include <svtools/accessibilityoptions.hxx>
#include <svx/svxdllapi.h>
#include <svx/svdcrtv.hxx>
#include <vcl/event.hxx>
@@ -151,8 +150,6 @@ class SVXCORE_DLLPUBLIC SdrView : public SdrCreateView, public tools::WeakBase
bool mbNoExtendedKeyDispatcher : 1;
bool mbMasterPagePaintCaching : 1;
SvtAccessibilityOptions maAccessibilityOptions;
public:
explicit SdrView(
SdrModel& rSdrModel,
@@ -188,8 +185,6 @@ public:
using SdrCreateView::RequestHelp;
virtual bool Command(const CommandEvent& rCEvt, vcl::Window* pWin) override;
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, ConfigurationHints ) override;
bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll=false) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
/* new interface src537 */
@@ -232,8 +227,6 @@ public:
// and more...
OUString GetStatusText();
virtual void onAccessibilityOptionsChanged();
// Do not create ObjectContact locally, but offer a call to allow override
// and to create own derivations of ObjectContact
virtual sdr::contact::ObjectContact* createViewSpecificObjectContact(
sc/inc/scmod.hxx
-2
View File
@@ -37,7 +37,6 @@
class KeyEvent;
class EditView;
class SfxErrorHandler;
class SvtAccessibilityOptions;
class SvtCTLOptions;
class SvtUserOptions;
@@ -94,7 +93,6 @@ class SAL_DLLPUBLIC_RTTI ScModule final : public SfxModule, public SfxListener,
std::unique_ptr<ScNavipiCfg> m_pNavipiCfg;
std::unique_ptr<ScAddInCfg> m_pAddInCfg;
std::unique_ptr<svtools::ColorConfig> m_pColorConfig;
std::unique_ptr<SvtAccessibilityOptions> m_pAccessOptions;
std::unique_ptr<SvtCTLOptions> m_pCTLOptions;
std::unique_ptr<SvtUserOptions> m_pUserOptions;
std::unique_ptr<SfxErrorHandler> m_pErrorHdl;
sc/source/ui/app/scmod.cxx
+1 -6
View File
@@ -176,7 +176,7 @@ ScModule::~ScModule()
void ScModule::ConfigurationChanged(utl::ConfigurationBroadcaster* p, ConfigurationHints eHints)
{
if ( p == m_pColorConfig.get() || p == m_pAccessOptions.get() )
if ( p == m_pColorConfig.get() )
{
// Test if detective objects have to be updated with new colors
// (if the detective colors haven't been used yet, there's nothing to update)
@@ -341,11 +341,6 @@ void ScModule::DeleteCfg()
m_pColorConfig->RemoveListener(this);
m_pColorConfig.reset();
}
if ( m_pAccessOptions )
{
m_pAccessOptions->RemoveListener(this);
m_pAccessOptions.reset();
}
if ( m_pCTLOptions )
{
m_pCTLOptions->RemoveListener(this);
sd/source/ui/inc/View.hxx
-2
View File
@@ -197,8 +197,6 @@ public:
std::vector<OUString> &rBookmarkList,
const sal_uInt16 nType );
virtual void onAccessibilityOptionsChanged() override;
/** returns true if we have an undo manager and there is an open list undo action */
bool isRecordingUndo() const;
sd/source/ui/view/sdview.cxx
-41
View File
@@ -1033,47 +1033,6 @@ bool View::IsVectorizeAllowed() const
return bRet;
}
void View::onAccessibilityOptionsChanged()
{
if( !mpViewSh )
return;
::sd::Window* pWindow = mpViewSh->GetActiveWindow();
if( !pWindow )
return;
const StyleSettings& rStyleSettings = pWindow->GetSettings().GetStyleSettings();
if( mpViewSh->GetViewFrame() && mpViewSh->GetViewFrame()->GetDispatcher() )
{
sal_uInt16 nOutputSlot, nPreviewSlot;
if( rStyleSettings.GetHighContrastMode() )
{
nOutputSlot = SID_OUTPUT_QUALITY_CONTRAST;
}
else
{
nOutputSlot = SID_OUTPUT_QUALITY_COLOR;
}
if( rStyleSettings.GetHighContrastMode()
&& officecfg::Office::Common::Accessibility::IsForPagePreviews::get() )
{
nPreviewSlot = SID_PREVIEW_QUALITY_CONTRAST;
}
else
{
nPreviewSlot = SID_PREVIEW_QUALITY_COLOR;
}
mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nOutputSlot, SfxCallMode::ASYNCHRON );
mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nPreviewSlot, SfxCallMode::ASYNCHRON );
}
mpViewSh->Invalidate();
}
IMPL_LINK( View, OnParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, aParam, void )
{
SdrObject* pObj = GetTextEditObject();
svx/source/svdraw/svdview.cxx
-15
View File
@@ -148,13 +148,10 @@ SdrView::SdrView(
mbNoExtendedKeyDispatcher(false),
mbMasterPagePaintCaching(false)
{
maAccessibilityOptions.AddListener(this);
onAccessibilityOptionsChanged();
}
SdrView::~SdrView()
{
maAccessibilityOptions.RemoveListener(this);
}
bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
@@ -1503,18 +1500,6 @@ bool SdrView::MoveShapeHandle(const sal_uInt32 handleNum, const Point& aEndPoint
return true;
}
void SdrView::ConfigurationChanged( ::utl::ConfigurationBroadcaster*p, ConfigurationHints nHint)
{
onAccessibilityOptionsChanged();
SdrCreateView::ConfigurationChanged(p, nHint);
}
/** method is called whenever the global SvtAccessibilityOptions is changed */
void SdrView::onAccessibilityOptionsChanged()
{
}
void SdrView::SetMasterPagePaintCaching(bool bOn)
{
if(mbMasterPagePaintCaching == bOn)
sw/inc/swmodule.hxx
-2
View File
@@ -52,7 +52,6 @@ class SwTransferable;
class SwToolbarConfigItem;
class SwAttrPool;
namespace svtools{ class ColorConfig;}
class SvtAccessibilityOptions;
class SvtCTLOptions;
class SvtUserOptions;
enum class SwCompareMode;
@@ -88,7 +87,6 @@ class SW_DLLPUBLIC SwModule final : public SfxModule, public SfxListener, public
std::unique_ptr<SwToolbarConfigItem> m_pWebToolbarConfig;
std::unique_ptr<SwDBConfig> m_pDBConfig;
std::unique_ptr<svtools::ColorConfig> m_pColorConfig;
std::unique_ptr<SvtAccessibilityOptions> m_pAccessibilityOptions;
std::unique_ptr<SvtCTLOptions> m_pCTLOptions;
std::unique_ptr<SvtUserOptions> m_pUserOptions;
sw/inc/view.hxx
-1
View File
@@ -58,7 +58,6 @@ struct SwSearchOptions;
class CommandEvent;
class InsCaptionOpt;
class SvGlobalName;
class SvtAccessibilityOptions;
class SwTransferable;
class SwMailMergeConfigItem;
class SwTextNode; // #i23726#
sw/inc/viewsh.hxx
-1
View File
@@ -55,7 +55,6 @@ class SwViewShellImp;
class SwPrintData;
struct ShellResource;
class SwRegionRects;
class SvtAccessibilityOptions;
class SwPagePreviewLayout;
class SwTextFrame;
sw/source/uibase/app/apphdl.cxx
-31
View File
@@ -945,11 +945,6 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
m_pColorConfig->RemoveListener(this);
m_pColorConfig.reset();
}
if( m_pAccessibilityOptions )
{
m_pAccessibilityOptions->RemoveListener(this);
m_pAccessibilityOptions.reset();
}
if( m_pCTLOptions )
{
m_pCTLOptions->RemoveListener(this);
@@ -1019,32 +1014,6 @@ void SwModule::ConfigurationChanged(utl::ConfigurationBroadcaster* pBrdCst, Conf
pViewShell = SfxViewShell::GetNext( *pViewShell );
}
}
#if !ENABLE_WASM_STRIP_ACCESSIBILITY
else if ( pBrdCst == m_pAccessibilityOptions.get() )
{
//set Accessibility options
SfxViewShell* pViewShell = SfxViewShell::GetFirst();
while(pViewShell)
{
if(pViewShell->GetWindow())
{
auto pSwView = dynamic_cast<SwView *>( pViewShell );
auto pPagePreview = dynamic_cast<SwPagePreview *>( pViewShell );
if(pSwView)
pSwView->ApplyAccessibilityOptions();
else if(pPagePreview)
pPagePreview->ApplyAccessibilityOptions();
if(pSwView || pPagePreview || dynamic_cast< const SwSrcView *>( pViewShell ) != nullptr)
{
pViewShell->GetWindow()->Invalidate();
}
}
pViewShell = SfxViewShell::GetNext( *pViewShell );
}
}
#endif
else if( pBrdCst == m_pCTLOptions.get() )
{
const SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
sw/source/uibase/inc/pview.hxx
-1
View File
@@ -39,7 +39,6 @@ class Button;
class SwRect;
class DataChangedEvent;
class CommandEvent;
class SvtAccessibilityOptions;
class SwPagePreviewLayout;
/// Provides the VCL widget that is used for the main area of the File -> Print Preview window.