summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-08-06 16:42:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-08-07 10:04:27 +0200
commit55bd275e83f45d9962c7ee8cbe2241982a0ae40a (patch)
tree00c04ba3effcb60055e6bab8715e08fc538e4a86 /dbaccess
parent9e44075af76822106f738855bf36f0428088336d (diff)
result of MnemonicGenerator::CreateMnemonic was unused
since... commit 93257759580e6df10cc9eddbf1800a17d61cfc48 Date: Tue Jul 30 15:38:52 2013 +0200 convert vcl/mnemonic.hxx from XubString to OUString Change-Id: I2df7a6b29aa30ad5ad936b524061aeaef837ca9d remove the code that doesn't do anything since 2013 rather than reintroduce this fringe edge-case again Change-Id: Ic30ccbff0e1a5e2fa545c55109473c05e919f7e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100260 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx49
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx1
2 files changed, 14 insertions, 36 deletions
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 39da2cd497e1..c0a224538313 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -644,20 +644,9 @@ void OApplicationDetailView::impl_createPage( ElementType _eType, const Referenc
Resize();
}
-const TaskPaneData& OApplicationDetailView::impl_getTaskPaneData( ElementType _eType )
-{
- if ( m_aTaskPaneData.empty() )
- m_aTaskPaneData.resize( ELEMENT_COUNT );
- OSL_ENSURE( ( _eType >= 0 ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OApplicationDetailView::impl_getTaskPaneData: illegal element type!" );
- TaskPaneData& rData = m_aTaskPaneData[ _eType ];
-
- //oj: do not check, otherwise extensions will only be visible after a reload.
- impl_fillTaskPaneData( _eType, rData );
-
- return rData;
-}
+namespace {
-void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPaneData& _rData ) const
+void impl_fillTaskPaneData(ElementType _eType, TaskPaneData& _rData)
{
TaskEntryList& rList( _rData.aTasks );
rList.clear(); rList.reserve( 4 );
@@ -693,31 +682,21 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane
default:
OSL_FAIL( "OApplicationDetailView::impl_fillTaskPaneData: illegal element type!" );
}
+}
- MnemonicGenerator aAllMnemonics( m_aExternalMnemonics );
+}
- // remove the entries which are not enabled currently
- for ( TaskEntryList::iterator pTask = rList.begin();
- pTask != rList.end();
- )
- {
- if ( pTask->bHideWhenDisabled
- && !getBorderWin().getView()->getCommandController().isCommandEnabled( pTask->sUNOCommand )
- )
- pTask = rList.erase( pTask );
- else
- {
- aAllMnemonics.RegisterMnemonic( pTask->sTitle );
- ++pTask;
- }
- }
+const TaskPaneData& OApplicationDetailView::impl_getTaskPaneData( ElementType _eType )
+{
+ if ( m_aTaskPaneData.empty() )
+ m_aTaskPaneData.resize( ELEMENT_COUNT );
+ OSL_ENSURE( ( _eType >= 0 ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OApplicationDetailView::impl_getTaskPaneData: illegal element type!" );
+ TaskPaneData& rData = m_aTaskPaneData[ _eType ];
- // for the remaining entries, assign mnemonics
- for (auto const& task : rList)
- {
- aAllMnemonics.CreateMnemonic(task.sTitle);
- // don't do this for now, until our task window really supports mnemonics
- }
+ //oj: do not check, otherwise extensions will only be visible after a reload.
+ impl_fillTaskPaneData( _eType, rData );
+
+ return rData;
}
OUString OApplicationDetailView::getQualifiedName( SvTreeListEntry* _pEntry ) const
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 38bc41ab1e46..97ad813142f8 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -360,7 +360,6 @@ namespace dbaui
);
const TaskPaneData& impl_getTaskPaneData( ElementType _eType );
- void impl_fillTaskPaneData( ElementType _eType, TaskPaneData& _rData ) const;
};
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX