diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-02 18:45:21 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-03 09:58:50 +0200 |
| commit | da09a3cf14ea2c7690b98ec32639125087bcf18f (patch) | |
| tree | ecc0dccfaff1ebc7660cb4e0e1e4ad529ec821ac /sw/source | |
| parent | e88cf047c70cedd6ac3553258d4d33bee878a1e6 (diff) | |
Remove pointless check
This check was originally introduced by me for a few toolbar
controllers (save, underline, currency), as an attempt to reuse
the same controllers also for non-split buttons (see tdf#98745
and tdf#101672). But since then it was copy-pasted to other
places where it probably makes no sense.
Change-Id: I7af2a3f5864ced88c91f330e87f32046d0c21383
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99960
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/sidebar/PageColumnPopup.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/PageMarginPopup.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/PageOrientationPopup.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/PageSizePopup.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/sidebar/PageColumnPopup.cxx b/sw/source/uibase/sidebar/PageColumnPopup.cxx index b0b9e07fc883..e0fcd0d055c5 100644 --- a/sw/source/uibase/sidebar/PageColumnPopup.cxx +++ b/sw/source/uibase/sidebar/PageColumnPopup.cxx @@ -32,7 +32,7 @@ void PageColumnPopup::initialize( const css::uno::Sequence< css::uno::Any >& rAr ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; - if (getToolboxId(nId, &pToolBox) && pToolBox->GetItemCommand(nId) == m_aCommandURL) + if (getToolboxId(nId, &pToolBox)) pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | pToolBox->GetItemBits(nId)); } diff --git a/sw/source/uibase/sidebar/PageMarginPopup.cxx b/sw/source/uibase/sidebar/PageMarginPopup.cxx index 8223386c2a48..776248452a82 100644 --- a/sw/source/uibase/sidebar/PageMarginPopup.cxx +++ b/sw/source/uibase/sidebar/PageMarginPopup.cxx @@ -31,7 +31,7 @@ void PageMarginPopup::initialize( const css::uno::Sequence< css::uno::Any >& rAr ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; - if (getToolboxId(nId, &pToolBox) && pToolBox->GetItemCommand(nId) == m_aCommandURL) + if (getToolboxId(nId, &pToolBox)) pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | pToolBox->GetItemBits(nId)); } diff --git a/sw/source/uibase/sidebar/PageOrientationPopup.cxx b/sw/source/uibase/sidebar/PageOrientationPopup.cxx index 9b34f3c1dee0..e25090a7a9fb 100644 --- a/sw/source/uibase/sidebar/PageOrientationPopup.cxx +++ b/sw/source/uibase/sidebar/PageOrientationPopup.cxx @@ -32,7 +32,7 @@ void PageOrientationPopup::initialize( const css::uno::Sequence< css::uno::Any > ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; - if (getToolboxId(nId, &pToolBox) && pToolBox->GetItemCommand(nId) == m_aCommandURL) + if (getToolboxId(nId, &pToolBox)) pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | pToolBox->GetItemBits(nId)); } diff --git a/sw/source/uibase/sidebar/PageSizePopup.cxx b/sw/source/uibase/sidebar/PageSizePopup.cxx index 0c69f73ba721..1d1f26c8aa11 100644 --- a/sw/source/uibase/sidebar/PageSizePopup.cxx +++ b/sw/source/uibase/sidebar/PageSizePopup.cxx @@ -32,7 +32,7 @@ void PageSizePopup::initialize( const css::uno::Sequence< css::uno::Any >& rArgu ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; - if (getToolboxId(nId, &pToolBox) && pToolBox->GetItemCommand(nId) == m_aCommandURL) + if (getToolboxId(nId, &pToolBox)) pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | pToolBox->GetItemBits(nId)); } |