diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-30 15:37:25 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-31 06:28:41 +0000 |
commit | 3d7325898547c94826cfddc6852d400e84e2dda1 (patch) | |
tree | 894e0f527f0dc42f478b10d34cf95c94e6d74e83 | |
parent | fafb2cf4de2eb2de46afab0738b7fd95663c0164 (diff) |
loplugin:unusedmethods
Change-Id: Ifeb818227a960cab8fd2e8e7352468efbfe1232c
Reviewed-on: https://gerrit.libreoffice.org/25668
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
-rwxr-xr-x | compilerplugins/clang/unusedmethods.py | 2 | ||||
-rw-r--r-- | include/sfx2/sfxsids.hrc | 1 | ||||
-rw-r--r-- | include/svl/undo.hxx | 2 | ||||
-rw-r--r-- | include/svtools/xwindowitem.hxx | 53 | ||||
-rw-r--r-- | include/vcl/accel.hxx | 1 | ||||
-rw-r--r-- | include/vcl/bitmapaccess.hxx | 14 | ||||
-rw-r--r-- | include/vcl/dockwin.hxx | 1 | ||||
-rw-r--r-- | include/vcl/keycod.hxx | 1 | ||||
-rw-r--r-- | include/vcl/menu.hxx | 1 | ||||
-rw-r--r-- | include/vcl/salnativewidgets.hxx | 1 | ||||
-rw-r--r-- | include/vcl/toolbox.hxx | 2 | ||||
-rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/dialog/securitypage.cxx | 1 | ||||
-rw-r--r-- | svl/source/undo/undo.cxx | 7 | ||||
-rw-r--r-- | svtools/Library_svt.mk | 1 | ||||
-rw-r--r-- | svtools/source/misc/xwindowitem.cxx | 62 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 15 | ||||
-rw-r--r-- | vcl/source/window/accel.cxx | 29 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 13 | ||||
-rw-r--r-- | vcl/source/window/keycod.cxx | 26 | ||||
-rw-r--r-- | vcl/source/window/menu.cxx | 12 |
22 files changed, 8 insertions, 254 deletions
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index a15107994374..a4717c912fe0 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -270,6 +270,8 @@ for d in definitionSet: # ignore the SfxPoolItem CreateDefault methods for now if d[1].endswith("::CreateDefault()"): continue + if "::operator" in d[1]: + continue unusedSet.add(d) # used by the "unused return types" analysis tmp1set.add((method, definitionToSourceLocationMap[d])) diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index c722c51590ba..f5bbec72fe2e 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -127,7 +127,6 @@ #define SID_PRINTDOCDIRECT (SID_SFX_START + 509) #define SID_PICKLIST (SID_SFX_START + 510) #define SID_DOC_SERVICE (SID_SFX_START + 511) -#define SID_ATTR_XWINDOW (SID_SFX_START + 777) #define SID_PLUGIN_MODE (SID_SFX_START + 827) #define SID_EXPORTDOC (SID_SFX_START + 829) #define SID_EXPORTDOCASPDF (SID_SFX_START + 1673) diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 8c54c08d4309..59adae466895 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -181,7 +181,6 @@ namespace svl virtual ~IUndoManager() { }; virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ) = 0; - virtual size_t GetMaxUndoActionCount() const = 0; virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) = 0; @@ -300,7 +299,6 @@ public: // IUndoManager overridables virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ) override; - virtual size_t GetMaxUndoActionCount() const override; virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) override; virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const override; virtual sal_uInt16 GetUndoActionId() const override; diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx deleted file mode 100644 index cbb1ee2f6565..000000000000 --- a/include/svtools/xwindowitem.hxx +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- 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_SVTOOLS_XWINDOWITEM_HXX -#define INCLUDED_SVTOOLS_XWINDOWITEM_HXX - - -#include <svtools/svtdllapi.h> - -#include <svl/poolitem.hxx> -#include <toolkit/helper/vclunohelper.hxx> - -#include <com/sun/star/awt/XWindow.hpp> - -namespace vcl { class Window; } - - -class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem -{ - css::uno::Reference< css::awt::XWindow > m_xWin; - - XWindowItem & operator = ( const XWindowItem & ) = delete; - -public: - XWindowItem(); - XWindowItem( const XWindowItem &rItem ); - virtual ~XWindowItem(); - - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; - virtual bool operator == ( const SfxPoolItem& rAttr ) const override; - - vcl::Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index f34b44372fc9..0e453ec3933b 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -73,7 +73,6 @@ public: sal_uInt16 GetItemCount() const; sal_uInt16 GetItemId( sal_uInt16 nPos ) const; - vcl::KeyCode GetKeyCode( sal_uInt16 nItemId ) const; Accelerator* GetAccel( sal_uInt16 nItemId ) const; diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx index de2c9a71dd77..e0d0a5a2588b 100644 --- a/include/vcl/bitmapaccess.hxx +++ b/include/vcl/bitmapaccess.hxx @@ -113,18 +113,8 @@ public: BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; private: - - BitmapReadAccess() - {} - - BitmapReadAccess(const BitmapReadAccess&) - : BitmapInfoAccess() - {} - - BitmapReadAccess& operator=(const BitmapReadAccess&) - { - return *this; - } + BitmapReadAccess(const BitmapReadAccess&) = delete; + BitmapReadAccess& operator=(const BitmapReadAccess&) = delete; protected: Scanline* mpScanBuf; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 5351f11403fd..789ee9cba7db 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -281,7 +281,6 @@ public: virtual void doDeferredInit(WinBits nBits); protected: DockingWindow( WindowType nType ); - DockingWindow(vcl::Window* pParent, const ResId& rResId); public: DockingWindow(vcl::Window* pParent, WinBits nStyle = WB_STDDOCKWIN); diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 374066e3539c..89e57b988265 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -39,7 +39,6 @@ private: public: KeyCode() { nKeyCodeAndModifiers = 0; eFunc = KeyFuncType::DONTKNOW; } - KeyCode( const ResId& rResId ); KeyCode( sal_uInt16 nKey, sal_uInt16 nModifier = 0 ); KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool bMod2, bool bMod3 ); KeyCode( KeyFuncType eFunction ); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 92d4b4e30bff..c4fa65b151c3 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -391,7 +391,6 @@ public: vcl::Window* GetWindow() const { return pWindow; } - void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr ); OUString GetAccessibleName( sal_uInt16 nItemId ) const; // returns whether the item a position nItemPos is highlighted or not. diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 88f1ae0cb89b..80aac4e7b620 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -448,7 +448,6 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue bool isBothAligned() const { return isLeftAligned() && isRightAligned(); } bool isNotAligned() const { return !(mnAlignment & (TabitemFlags::LeftAligned | TabitemFlags::RightAligned)); } bool isFirst() const { return bool(mnAlignment & TabitemFlags::FirstInGroup); } - bool isLast() const { return bool(mnAlignment & TabitemFlags::LastInGroup); } const Rectangle& getContentRect() const { return maContentRect; } }; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index c7b6a8dae884..95cc60bb447d 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -404,8 +404,6 @@ public: /// Convenience method to hide items (via ShowItem). void HideItem(sal_uInt16 nItemId) { ShowItem( nItemId, false ); } - /// Overload to provide HideItem via command id. - void HideItem(const OUString& rCommand) { ShowItem(rCommand, false); } bool IsItemVisible( sal_uInt16 nItemId ) const; bool IsItemReallyVisible( sal_uInt16 nItemId ) const; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index f137e4aa6077..58a1b56e29ce 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -148,7 +148,6 @@ class RscTypCont inline void SETCONST( RscConst *p1, const char * p2, SymbolType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, ToolBoxItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, RSWND p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } - inline void SETCONST( RscConst *p1, Atom p2, WindowBorderStyle p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, KeyFuncType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, ToolBoxItemType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index bdf1c5260151..6f6d690c2352 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; #include <svx/dataaccessdescriptor.hxx> #include <svx/drawitem.hxx> #include <svx/fmshell.hxx> -#include <svtools/xwindowitem.hxx> #include <sfx2/passwd.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/dispatch.hxx> @@ -562,13 +561,6 @@ void ScDocShell::Execute( SfxRequest& rReq ) const SfxBoolItem* pItem = rReq.GetArg<SfxBoolItem>(FID_CHG_RECORD); bool bDo = true; - // xmlsec05/06: - // getting real parent window when called from Security-Options TP - vcl::Window* pParent = nullptr; - const SfxPoolItem* pParentItem; - if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) - pParent = static_cast<const XWindowItem*>( pParentItem )->GetWindowPtr(); - // desired state ScChangeTrack* pChangeTrack = rDoc.GetChangeTrack(); bool bActivateTracking = (pChangeTrack == nullptr); // toggle @@ -580,7 +572,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( !pItem ) { // no dialog on playing the macro - ScopedVclPtrInstance<WarningBox> aBox( pParent ? pParent : GetActiveDialogParent(), + ScopedVclPtrInstance<WarningBox> aBox( GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_NO), ScGlobal::GetRscString( STR_END_REDLINING ) ); bDo = ( aBox->Execute() == RET_YES ); @@ -626,11 +618,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) case SID_CHG_PROTECT : { - vcl::Window* pParent = nullptr; - const SfxPoolItem* pParentItem; - if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) - pParent = static_cast<const XWindowItem*>( pParentItem )->GetWindowPtr(); - if ( ExecuteChangeProtectionDialog( pParent ) ) + if ( ExecuteChangeProtectionDialog( nullptr ) ) { rReq.Done(); SetDocumentModified(); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 23a9fd3f5d79..985f1b55b13f 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -37,7 +37,6 @@ #include <svl/poolitem.hxx> #include <svl/intitem.hxx> #include <svl/PasswordHelper.hxx> -#include <svtools/xwindowitem.hxx> #include "../appl/app.hrc" diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 57d654d92f77..e849637aed73 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -492,13 +492,6 @@ void SfxUndoManager::SetMaxUndoActionCount( size_t nMaxUndoActionCount ) } -size_t SfxUndoManager::GetMaxUndoActionCount() const -{ - UndoManagerGuard aGuard( *m_xData ); - return m_xData->pActUndoArray->nMaxUndoActions; -} - - void SfxUndoManager::ImplClearCurrentLevel_NoNotify( UndoManagerGuard& i_guard ) { // clear array diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 27bea8da19e2..9bb7f0f36a72 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -195,7 +195,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/misc/transfer \ svtools/source/misc/transfer2 \ svtools/source/misc/unitconv \ - svtools/source/misc/xwindowitem \ svtools/source/svhtml/htmlkywd \ svtools/source/svhtml/htmlout \ svtools/source/svhtml/htmlsupp \ diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx deleted file mode 100644 index 96ab3b4e8535..000000000000 --- a/svtools/source/misc/xwindowitem.cxx +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- 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 <svtools/xwindowitem.hxx> - -#include <vcl/window.hxx> - - -using namespace ::com::sun::star; - - -XWindowItem::XWindowItem() : - SfxPoolItem() -{ -} - - -XWindowItem::XWindowItem( const XWindowItem &rItem ) : - SfxPoolItem( Which() ), - m_xWin( rItem.m_xWin ) -{ -} - - -XWindowItem::~XWindowItem() -{ -} - - -SfxPoolItem * XWindowItem::Clone( SfxItemPool* /*pPool*/ ) const -{ - return new XWindowItem( *this ); -} - - -bool XWindowItem::operator == ( const SfxPoolItem & rAttr ) const -{ - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); - - const XWindowItem * pItem = dynamic_cast< const XWindowItem * >(&rAttr); - return pItem && m_xWin == pItem->m_xWin; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index ad55f89b1265..9fb52ac1cb44 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -47,7 +47,6 @@ #include <editeng/langitem.hxx> #include <svx/viewlayoutitem.hxx> #include <svx/zoomslideritem.hxx> -#include <svtools/xwindowitem.hxx> #include <svx/linkwarn.hxx> #include <sfx2/htmlmode.hxx> #include <vcl/svapp.hxx> @@ -579,12 +578,7 @@ void SwView::Execute(SfxRequest &rReq) { OSL_ENSURE( !static_cast<const SfxBoolItem*>(pItem)->GetValue(), "SwView::Execute(): password set an redlining off doesn't match!" ); // xmlsec05: new password dialog - vcl::Window* pParent; - const SfxPoolItem* pParentItem; - if( SfxItemState::SET == pArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) - pParent = static_cast<const XWindowItem*>( pParentItem )->GetWindowPtr(); - else - pParent = &GetViewFrame()->GetWindow(); + vcl::Window* pParent = &GetViewFrame()->GetWindow(); ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg( pParent ); aPasswdDlg->SetMinLen( 1 ); //#i69751# the result of Execute() can be ignored @@ -617,12 +611,7 @@ void SwView::Execute(SfxRequest &rReq) // xmlsec05: new password dialog // message box for wrong password - vcl::Window* pParent; - const SfxPoolItem* pParentItem; - if( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) - pParent = static_cast<const XWindowItem*>( pParentItem )->GetWindowPtr(); - else - pParent = &GetViewFrame()->GetWindow(); + vcl::Window* pParent = &GetViewFrame()->GetWindow(); ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg( pParent ); aPasswdDlg->SetMinLen( 1 ); if(!aPasswd.getLength()) diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 01d75c7cd647..bf72b66c1d8e 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -123,25 +123,6 @@ static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry ) } } -static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nId ) -{ - sal_uInt16 nIndex = ImplAccelEntryGetIndex( pList, nId ); - if ( nIndex != ACCELENTRY_NOTFOUND ) - { - while ( nIndex ) - { - nIndex--; - if ( (*pList)[ nIndex ]->mnId != nId ) - break; - } - - if ( (*pList)[ nIndex ]->mnId != nId ) - nIndex++; - } - - return nIndex; -} - void Accelerator::ImplInit() { mnCurId = 0; @@ -295,16 +276,6 @@ sal_uInt16 Accelerator::GetItemCount() const return (sal_uInt16)mpData->maIdList.size(); } -vcl::KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const -{ - - sal_uInt16 nIndex = ImplAccelEntryGetFirstPos( &(mpData->maIdList), nItemId ); - if ( nIndex != ACCELENTRY_NOTFOUND ) - return mpData->maIdList[ nIndex ]->maKeyCode; - else - return vcl::KeyCode(); -} - sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const { diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 984d713959f6..a42bca14c5a0 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -427,19 +427,6 @@ DockingWindow::DockingWindow( vcl::Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -DockingWindow::DockingWindow( vcl::Window* pParent, const ResId& rResId ) : - Window( WINDOW_DOCKINGWINDOW ) -{ - ImplInitDockingWindowData(); - rResId.SetRT( RSC_DOCKINGWINDOW ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - //Find the real parent stashed in mpDialogParent. void DockingWindow::doDeferredInit(WinBits nBits) { diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index be3e282c2193..7f7661ee1ad6 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -75,32 +75,6 @@ vcl::KeyCode::KeyCode( KeyFuncType eFunction ) eFunc = eFunction; } -vcl::KeyCode::KeyCode( const ResId& rResId ) - : nKeyCodeAndModifiers(0) - , eFunc(KeyFuncType::DONTKNOW) -{ - rResId.SetRT( RSC_KEYCODE ); - - ResMgr* pResMgr = rResId.GetResMgr(); - if ( pResMgr && pResMgr->GetResource( rResId ) ) - { - pResMgr->Increment( sizeof( RSHEADER_TYPE ) ); - - sal_uLong nKeyCode = pResMgr->ReadLong(); - sal_uLong nModifier = pResMgr->ReadLong(); - sal_uLong nKeyFunc = pResMgr->ReadLong(); - - eFunc = (KeyFuncType)nKeyFunc; - if ( eFunc != KeyFuncType::DONTKNOW ) - { - sal_uInt16 nDummy; - ImplGetKeyCode( eFunc, nKeyCodeAndModifiers, nDummy, nDummy, nDummy ); - } - else - nKeyCodeAndModifiers = sal::static_int_cast<sal_uInt16>(nKeyCode | nModifier); - } -} - OUString vcl::KeyCode::GetName( vcl::Window* pWindow ) const { if ( !pWindow ) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 64549365efd9..1506724c881e 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2339,18 +2339,6 @@ Rectangle Menu::GetBoundingRectangle( sal_uInt16 nPos ) const return aRet; } -void Menu::SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr ) -{ - size_t nPos; - MenuItemData* pData = pItemList->GetData( nItemId, nPos ); - - if (pData && !rStr.equals(pData->aAccessibleName)) - { - pData->aAccessibleName = rStr; - ImplCallEventListeners(VCLEVENT_MENU_ACCESSIBLENAMECHANGED, nPos); - } -} - OUString Menu::GetAccessibleName( sal_uInt16 nItemId ) const { MenuItemData* pData = pItemList->GetData( nItemId ); |