summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/controlwrapper.hxx10
-rw-r--r--include/sfx2/itemconnect.hxx54
2 files changed, 24 insertions, 40 deletions
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index e2d5b55b2ee3..079258dbfc1a 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -148,7 +148,7 @@ public:
/** Derived classes enable, disable, show, or hide control(s).
@descr Will do nothing, if the corresponding parameter is TRISTATE_INDET. */
- virtual void ModifyControl( TriState eEnable, TriState eShow ) = 0;
+ virtual void ModifyControl( TriState eShow ) = 0;
/** Derived classes return true if the control is in "don't know" state. */
virtual bool IsControlDontKnow() const = 0;
@@ -194,7 +194,7 @@ public:
/** Enables, disables, shows, or hides the control.
@descr Does nothing, if the corresponding parameter is TRISTATE_INDET. */
- virtual void ModifyControl( TriState eEnable, TriState eShow ) override;
+ virtual void ModifyControl( TriState eShow ) override;
/** Derived classes return the value the control contains. */
virtual ValueT GetControlValue() const = 0;
@@ -374,7 +374,7 @@ public:
void RegisterControlWrapper( ControlWrapperBase& rWrapper );
/** Enables, disables, shows, or hides the registered controls. */
- virtual void ModifyControl( TriState eEnable, TriState eShow ) override;
+ virtual void ModifyControl( TriState eShow ) override;
/** Returns true if all registered controls are in "don't know" state. */
virtual bool IsControlDontKnow() const override;
@@ -469,10 +469,8 @@ PosT PosValueMapper< PosT, ValueT >::GetPosFromValue( ValueT nValue ) const
template< typename ControlT, typename ValueT >
-inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eEnable, TriState eShow )
+inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eShow )
{
- if( eEnable != TRISTATE_INDET )
- mrControl.Enable( eEnable == TRISTATE_TRUE );
if( eShow != TRISTATE_INDET )
mrControl.Show( eShow == TRISTATE_TRUE );
}
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index 95a9e5509f39..a60d4531038d 100644
--- a/include/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
@@ -21,35 +21,26 @@
#define INCLUDED_SFX2_ITEMCONNECT_HXX
#include <sal/config.h>
+#include <o3tl/typed_flags_set.hxx>
#include <sfx2/dllapi.h>
-
-#include <memory>
-
#include <sfx2/itemwrapper.hxx>
#include <sfx2/controlwrapper.hxx>
+#include <memory>
-namespace sfx {
-
-typedef int ItemConnFlags;
+enum class ItemConnFlags
+{
/** No special state for the connection. */
-const ItemConnFlags ITEMCONN_NONE = 0x0000;
-
-/** Connection is inactive - virtual functions will not be called. */
-const ItemConnFlags ITEMCONN_INACTIVE = 0x0001;
-
-/** Enable control(s), if the item is known. */
-const ItemConnFlags ITEMCONN_ENABLE_KNOWN = 0x0010;
-/** Disable control(s), if the item is unknown. */
-const ItemConnFlags ITEMCONN_DISABLE_UNKNOWN = 0x0020;
-/** Show control(s), if the item is known. */
-const ItemConnFlags ITEMCONN_SHOW_KNOWN = 0x0040;
+ NONE = 0x0000,
/** Hide control(s), if the item is unknown. */
-const ItemConnFlags ITEMCONN_HIDE_UNKNOWN = 0x0080;
-
-/** Default value for constructors. */
-const ItemConnFlags ITEMCONN_DEFAULT = ITEMCONN_NONE;
+ HideUnknown = 0x0001,
+};
+namespace o3tl
+{
+ template<> struct typed_flags<ItemConnFlags> : is_typed_flags<ItemConnFlags, 0x0001> {};
+}
+namespace sfx {
// Base connection classes
@@ -180,9 +171,6 @@ class SFX2_DLLPUBLIC ItemConnectionBase
public:
virtual ~ItemConnectionBase();
- /** Returns true if this connection is active. */
- bool IsActive() const;
-
/** Calls the virtual ApplyFlags() function, if connection is active. */
void DoApplyFlags( const SfxItemSet* pItemSet );
/** Calls the virtual Reset() function, if connection is active. */
@@ -191,7 +179,7 @@ public:
bool DoFillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet );
protected:
- explicit ItemConnectionBase( ItemConnFlags nFlags = ITEMCONN_DEFAULT );
+ explicit ItemConnectionBase( ItemConnFlags nFlags = ItemConnFlags::NONE );
/** Derived classes implement actions according to current flags here. */
virtual void ApplyFlags( const SfxItemSet* pItemSet ) = 0;
@@ -200,8 +188,6 @@ protected:
/** Derived classes implement filling item sets from controls here. */
virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) = 0;
- /** Returns whether to enable a control, according to current flags. */
- TriState GetEnableState( bool bKnown ) const;
/** Returns whether to show a control, according to current flags. */
TriState GetShowState( bool bKnown ) const;
@@ -236,13 +222,13 @@ public:
/** Receives pointer to a newly created control wrapper.
@descr Takes ownership of the control wrapper. */
explicit ItemControlConnection( sal_uInt16 nSlot, ControlWrpT* pNewCtrlWrp,
- ItemConnFlags nFlags = ITEMCONN_DEFAULT );
+ ItemConnFlags nFlags = ItemConnFlags::NONE );
/** Convenience constructor. Receives reference to a control directly.
@descr May only be used, if ControlWrpT::ControlWrpT( ControlType& )
constructor exists. */
explicit ItemControlConnection( sal_uInt16 nSlot, ControlType& rControl,
- ItemConnFlags nFlags = ITEMCONN_DEFAULT );
+ ItemConnFlags nFlags = ItemConnFlags::NONE );
virtual ~ItemControlConnection() override;
@@ -274,7 +260,7 @@ class SFX2_DLLPUBLIC DummyItemConnection:
{
public:
explicit DummyItemConnection( sal_uInt16 nSlot, vcl::Window& rWindow,
- ItemConnFlags nFlags = ITEMCONN_DEFAULT );
+ ItemConnFlags nFlags = ItemConnFlags::NONE );
protected:
virtual void ApplyFlags( const SfxItemSet* pItemSet ) override;
@@ -309,7 +295,7 @@ public:
typedef typename ItemControlConnectionType::ControlWrapperType MetricFieldWrapperType;
explicit MetricConnection( sal_uInt16 nSlot, MetricField& rField,
- FieldUnit eItemUnit = FUNIT_NONE, ItemConnFlags nFlags = ITEMCONN_DEFAULT );
+ FieldUnit eItemUnit = FUNIT_NONE, ItemConnFlags nFlags = ItemConnFlags::NONE );
};
@@ -334,7 +320,7 @@ public:
typedef typename ListBoxWrapperType::MapEntryType MapEntryType;
explicit ListBoxConnection( sal_uInt16 nSlot, ListBox& rListBox,
- const MapEntryType* pMap = nullptr, ItemConnFlags nFlags = ITEMCONN_DEFAULT );
+ const MapEntryType* pMap = nullptr, ItemConnFlags nFlags = ItemConnFlags::NONE );
};
@@ -359,7 +345,7 @@ public:
typedef typename ValueSetWrapperType::MapEntryType MapEntryType;
explicit ValueSetConnection( sal_uInt16 nSlot, ValueSet& rValueSet,
- const MapEntryType* pMap = nullptr, ItemConnFlags nFlags = ITEMCONN_DEFAULT );
+ const MapEntryType* pMap = nullptr, ItemConnFlags nFlags = ItemConnFlags::NONE );
};
@@ -428,7 +414,7 @@ template< typename ItemWrpT, typename ControlWrpT >
void ItemControlConnection< ItemWrpT, ControlWrpT >::ApplyFlags( const SfxItemSet* pItemSet )
{
bool bKnown = ItemWrapperHelper::IsKnownItem( *pItemSet, maItemWrp.GetSlotId() );
- mxCtrlWrp->ModifyControl( GetEnableState( bKnown ), GetShowState( bKnown ) );
+ mxCtrlWrp->ModifyControl( GetShowState( bKnown ) );
}
template< typename ItemWrpT, typename ControlWrpT >
generated by cgit (git 2.34.1) at 2025-01-16 23:50:06 +0000