diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-09-21 21:12:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-22 20:29:00 +0200 |
commit | 5372962696ba4271ffb6b2b230fab5261108af6b (patch) | |
tree | cb41f536f35de2d34c6d2fc3a5d1a16667dc856e | |
parent | 32eac27a2c22aae63941479482ef21e8d75a5122 (diff) |
unwind ItemWrapperHelper
Change-Id: I171150342e04bee6efd97f36f769a2c3d1db4bd7
Reviewed-on: https://gerrit.libreoffice.org/60887
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | cui/source/tabpages/align.cxx | 1 | ||||
-rw-r--r-- | cui/source/tabpages/border.cxx | 5 | ||||
-rw-r--r-- | include/sfx2/tabdlg.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 15 |
4 files changed, 5 insertions, 18 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 3dd853fe0248..8832ec7df80c 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -32,7 +32,6 @@ #include <svx/dlgutil.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> -#include <sfx2/itemconnect.hxx> #include <svl/cjkoptions.hxx> #include <svl/languageoptions.hxx> #include <svx/flagsdef.hxx> diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 59607465d0ca..c64aa54e6669 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -42,7 +42,6 @@ #include <svl/intitem.hxx> #include <svl/ilstitem.hxx> #include <svl/int64item.hxx> -#include <sfx2/itemconnect.hxx> #include <sal/macros.h> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -374,8 +373,8 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor mbHorEnabled = pBoxInfo->IsHorEnabled(); mbVerEnabled = pBoxInfo->IsVerEnabled(); - mbTLBREnabled = sfx::ItemWrapperHelper::IsKnownItem( rCoreAttrs, SID_ATTR_BORDER_DIAG_TLBR ); - mbBLTREnabled = sfx::ItemWrapperHelper::IsKnownItem( rCoreAttrs, SID_ATTR_BORDER_DIAG_BLTR ); + mbTLBREnabled = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_BORDER_DIAG_TLBR)) != SfxItemState::UNKNOWN; + mbBLTREnabled = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_BORDER_DIAG_BLTR)) != SfxItemState::UNKNOWN; if(pBoxInfo->IsDist()) { diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 12dd8201fce9..5342dd089173 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -374,8 +374,6 @@ protected: public: void SetTabDialog(SfxTabDialog* pDialog); void SetDialogController(SfxTabDialogController* pDialog); -protected: - void AddItemConnection( sfx::ItemConnectionBase* pConnection ); public: virtual ~SfxTabPage() override; virtual void dispose() override; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index d4bfaf1db24d..889fab6b5a13 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -32,7 +32,6 @@ #include <sfx2/ctrlitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/sfxdlg.hxx> -#include <sfx2/itemconnect.hxx> #include <sfx2/viewsh.hxx> #include <uitest/sfx_uiobject.hxx> #include <unotools/viewoptions.hxx> @@ -51,7 +50,6 @@ using namespace ::com::sun::star::uno; struct TabPageImpl { bool mbStandard; - sfx::ItemConnectionArray maItemConn; VclPtr<SfxTabDialog> mxDialog; SfxTabDialogController* mpDialogController; css::uno::Reference< css::frame::XFrame > mxFrame; @@ -213,15 +211,13 @@ void SfxTabPage::dispose() TabPage::dispose(); } -bool SfxTabPage::FillItemSet( SfxItemSet* rSet ) +bool SfxTabPage::FillItemSet( SfxItemSet* ) { - return pImpl->maItemConn.DoFillItemSet( *rSet, GetItemSet() ); + return false; } -void SfxTabPage::Reset( const SfxItemSet* rSet ) +void SfxTabPage::Reset( const SfxItemSet* ) { - pImpl->maItemConn.DoApplyFlags( rSet ); - pImpl->maItemConn.DoReset( rSet ); } void SfxTabPage::ActivatePage( const SfxItemSet& ) @@ -327,11 +323,6 @@ void SfxTabPage::ChangesApplied() { } -void SfxTabPage::AddItemConnection( sfx::ItemConnectionBase* pConnection ) -{ - pImpl->maItemConn.AddConnection( pConnection ); -} - void SfxTabPage::SetTabDialog(SfxTabDialog* pDialog) { pImpl->mxDialog = pDialog; |