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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index 28bbf44c13dc..2d2e59f79f78 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -43,7 +43,7 @@ void SvxLineSpacingToolBoxControl::initialize( const css::uno::Sequence< css::un 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/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index 5c1bf67dcc89..7957b1794e46 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -39,7 +39,7 @@ void TextCharacterSpacingPopup::initialize( const css::uno::Sequence< css::uno:: 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/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 88b110e8c1f1..a08029b4be88 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -695,7 +695,7 @@ void SvxTableToolBoxControl::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)); } @@ -753,7 +753,7 @@ void SvxColumnsToolBoxControl::initialize( const css::uno::Sequence< css::uno::A 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)); } |