chart2/source/controller/main/ChartController.cxx | 26 -----------
chart2/source/controller/main/ControllerCommandDispatch.cxx | 27 ------------
chart2/uiconfig/menubar/menubar.xml | 1
3 files changed, 54 deletions(-)
New commits:
commit 543b6dc7668c8b5958b9adc010ab91855cc47a2a
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jul 6 17:34:15 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jul 6 17:20:28 2025 +0200
Drop "Status Bar" element from Chart's View menu
It does nothing, already in OOo 2.4.3.
Change-Id: I2364426d9bdad6cfe959be79412c4a039757525b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187445
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index c7620c1f7b6a..def6c2736caa 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1400,31 +1400,6 @@ void SAL_CALL ChartController::dispatch(
}
}
- else if( aCommand == "StatusBarVisible" )
- {
- // workaround: this should not be necessary.
- uno::Reference< beans::XPropertySet > xPropSet( m_xFrame,
uno::UNO_QUERY );
- if( xPropSet.is() )
- {
- uno::Reference< css::frame::XLayoutManager > xLayoutManager;
- xPropSet->getPropertyValue( u"LayoutManager"_ustr ) >>=
xLayoutManager;
- if ( xLayoutManager.is() )
- {
- bool bIsVisible( xLayoutManager->isElementVisible(
u"private:resource/statusbar/statusbar"_ustr ));
- if( bIsVisible )
- {
- xLayoutManager->hideElement(
u"private:resource/statusbar/statusbar"_ustr );
- xLayoutManager->destroyElement(
u"private:resource/statusbar/statusbar"_ustr );
- }
- else
- {
- xLayoutManager->createElement(
u"private:resource/statusbar/statusbar"_ustr );
- xLayoutManager->showElement(
u"private:resource/statusbar/statusbar"_ustr );
- }
- // @todo: update menu state (checkmark next to "Statusbar").
- }
- }
- }
else if( aCommand == "ChangeTheme" )
comphelper::dispatchCommand(u".uno:ChangeTheme"_ustr, getFrame(),
rArgs);
}
@@ -1761,7 +1736,6 @@ const o3tl::sorted_vector< std::u16string_view >&
ChartController::impl_getAvail
u"NewArrangement", u"Update",
u"DefaultColors", u"BarWidth", u"NumberOfLines",
u"ArrangeRow",
- u"StatusBarVisible",
u"ChartElementSelector",
// sidebar commands
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index b901e865553a..4c97fa1335a5 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -60,25 +60,6 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-bool lcl_isStatusBarVisible( const Reference< frame::XController > &
xController )
-{
- bool bIsStatusBarVisible = false;
- // Status-Bar visible, workaround: this should not be necessary. @todo:
- // remove when Issue #i68864# is fixed
- if( xController.is())
- {
- Reference< beans::XPropertySet > xPropSet( xController->getFrame(),
uno::UNO_QUERY );
- if( xPropSet.is() )
- {
- uno::Reference< css::frame::XLayoutManager > xLayoutManager;
- xPropSet->getPropertyValue( u"LayoutManager"_ustr ) >>=
xLayoutManager;
- if ( xLayoutManager.is() )
- bIsStatusBarVisible = xLayoutManager->isElementVisible(
u"private:resource/statusbar/statusbar"_ustr );
- }
- }
- return bIsStatusBarVisible;
-}
-
bool lcl_arePropertiesSame(std::vector<Reference<beans::XPropertySet>>&
xProperties,
const OUString& aPropName)
{
@@ -953,14 +934,6 @@ void ControllerCommandDispatch::fireStatusEvent(
}
else if (m_aCommandAvailability.contains(rURL))
fireStatusEventForURLImpl( rURL, xSingleListener );
-
- // statusbar. Should be handled by base implementation
- // @todo: remove if Issue 68864 is fixed
- if( rURL.isEmpty() || rURL == ".uno:StatusBarVisible" )
- {
- bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xChartController
));
- fireStatusEventForURL( u".uno:StatusBarVisible"_ustr, uno::Any(
bIsStatusBarVisible ), true, xSingleListener );
- }
}
// ____ XDispatch ____
diff --git a/chart2/uiconfig/menubar/menubar.xml
b/chart2/uiconfig/menubar/menubar.xml
index 53e300045e44..74d431e33e83 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -44,7 +44,6 @@
<menu:menu menu:id=".uno:ViewMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
<menu:menuitem menu:id=".uno:Sidebar" menu:style="text"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:DiagramData"/>
