framework/inc/uielement/macrosmenucontroller.hxx | 1 - framework/source/uielement/fontmenucontroller.cxx | 1 - framework/source/uielement/toolbarsmenucontroller.cxx | 1 - 3 files changed, 3 deletions(-)
New commits: commit a12b14c1806609fbf31ec9ff37c794e7acb5fe99 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Nov 29 21:10:54 2021 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Nov 30 09:48:06 2021 +0100 drop unneeded include Change-Id: Iea28a59086d23c4edd91d0c531bf3a1337b5da78 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126071 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index beb9779efb66..7419f02a7059 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -20,7 +20,6 @@ #pragma once #include <svtools/popupmenucontrollerbase.hxx> -#include <vcl/menu.hxx> namespace framework { commit 1fbbfc24199f8d46e7b28b77cb9deb003708512c Author: Caolán McNamara <[email protected]> AuthorDate: Mon Nov 29 16:44:51 2021 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Nov 30 09:47:50 2021 +0100 remove out of date comments Change-Id: If1fb6c86b04d559eabb5b35fa35f09408a90522f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126069 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index ce89834c5035..5dfdb4cb7f72 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -101,7 +101,6 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq m_xPopupMenu->insertItem( i+1, rName, css::awt::MenuItemStyle::RADIOCHECK | css::awt::MenuItemStyle::AUTOCHECK, i ); if ( rName == m_aFontFamilyName ) m_xPopupMenu->checkItem( i+1, true ); - // use VCL popup menu pointer to set vital information that are not part of the awt implementation OUString aFontNameCommand = aFontNameCommandPrefix + INetURLObject::encode( rName, INetURLObject::PART_HTTP_QUERY, INetURLObject::EncodeMechanism::All ); m_xPopupMenu->setCommand(i + 1, aFontNameCommand); // Store font name into item command. } diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index b7096c075605..78a1a2aa9b52 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -395,7 +395,6 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co if ( aSortedTbs[i].bVisible ) m_xPopupMenu->checkItem( nIndex, true ); - // use VCL popup menu pointer to set vital information that are not part of the awt implementation OUStringBuffer aStrBuf( aStaticCmdPart ); sal_Int32 n = aSortedTbs[i].aCommand.lastIndexOf( '/' );
