summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/bindings.hxx5
-rw-r--r--include/sfx2/frame.hxx1
-rw-r--r--include/sfx2/frmdescr.hxx51
-rw-r--r--include/sfx2/frmhtml.hxx4
-rw-r--r--include/sfx2/itemconnect.hxx25
-rw-r--r--include/sfx2/sidebar/ControllerItem.hxx5
-rw-r--r--include/sfx2/unoctitm.hxx24
7 files changed, 1 insertions, 114 deletions
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 9d88ea25b52a..4aef796ec225 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -49,10 +49,8 @@ class SfxBindings;
class SfxBindings_Impl;
class Timer;
class SfxWorkWindow;
-class SfxUnoControllerItem;
struct SfxFoundCache_Impl;
class SfxFoundCacheArr_Impl;
-class SfxUnoControllerArr_Impl;
enum class SfxCallMode : sal_uInt16
{
@@ -199,9 +197,6 @@ public:
SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const;
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
SAL_DLLPRIVATE SfxBindings* GetSubBindings_Impl() const;
- SAL_DLLPRIVATE void InvalidateUnoControllers_Impl();
- SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
- SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE void SetRecorder_Impl( css::uno::Reference< css::frame::XDispatchRecorder >& );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 9264dcbf0d96..19a8656c2faa 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -70,7 +70,6 @@ class SfxFrameSetDescriptor;
class SfxDispatcher;
class Rectangle;
class SfxRequest;
-class SfxUnoControllerItem;
class SystemWindow;
class SfxFrameArr_Impl;
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 633ac8b94fd0..ae28c0ea5254 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -135,57 +135,6 @@ public:
SfxFrameDescriptor* Clone() const;
};
-// No block to implement a =operator
-struct SfxFrameProperties
-{
- OUString aURL;
- OUString aName;
- long lMarginWidth;
- long lMarginHeight;
- long lSize;
- long lSetSize;
- long lFrameSpacing;
- long lInheritedFrameSpacing;
- ScrollingMode eScroll;
- SizeSelector eSizeSelector;
- SizeSelector eSetSizeSelector;
- bool bHasBorder;
- bool bBorderSet;
- bool bResizable;
- bool bSetResizable;
- bool bIsRootSet;
- bool bIsInColSet;
- bool bHasBorderInherited;
- SfxFrameDescriptor* pFrame;
-
-private:
- SfxFrameProperties( SfxFrameProperties& ) {}
-public:
- SfxFrameProperties()
- : lMarginWidth( SIZE_NOT_SET ),
- lMarginHeight( SIZE_NOT_SET ),
- lSize( 1L ),
- lSetSize( 1L ),
- lFrameSpacing( SPACING_NOT_SET ),
- lInheritedFrameSpacing( SPACING_NOT_SET ),
- eScroll( ScrollingAuto ),
- eSizeSelector( SIZE_REL ),
- eSetSizeSelector( SIZE_REL ),
- bHasBorder( true ),
- bBorderSet( true ),
- bResizable( true ),
- bSetResizable( true ),
- bIsRootSet( false ),
- bIsInColSet( false ),
- bHasBorderInherited( true ),
- pFrame( nullptr ) {}
-
- ~SfxFrameProperties() { delete pFrame; }
-
- bool operator ==( const SfxFrameProperties& ) const;
- SfxFrameProperties& operator =( const SfxFrameProperties &rProp );
-};
-
#endif // INCLUDED_SFX2_FRMDESCR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index 616d5a973ce1..4ca4a30f04c5 100644
--- a/include/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
@@ -31,9 +31,7 @@ class SfxMedium;
class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser
{
-protected:
- SfxFrameHTMLParser( SvStream& rStream, bool bIsNewDoc=true, SfxMedium *pMediumPtr=nullptr ):
- SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {};
+ SfxFrameHTMLParser() = delete;
public:
// These methods can also be used by other parsers.
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index bfe9b253e926..21d663739fac 100644
--- a/include/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
@@ -293,23 +293,6 @@ private:
typedef ItemControlConnection< BoolItemWrapper, CheckBoxWrapper > CheckBoxConnection;
-/** Connection between an item and the VCL NumericField. */
-template< typename ItemWrpT >
-class NumericConnection : public ItemControlConnection< ItemWrpT,
- NumericFieldWrapper< typename ItemWrpT::ItemValueType > >
-{
- typedef ItemControlConnection< ItemWrpT,
- NumericFieldWrapper< typename ItemWrpT::ItemValueType > >
- ItemControlConnectionType;
-
-public:
- typedef typename ItemControlConnectionType::ControlWrapperType NumericFieldWrapperType;
-
- explicit NumericConnection( sal_uInt16 nSlot, NumericField& rField,
- ItemConnFlags nFlags = ITEMCONN_DEFAULT );
-};
-
-
/** Connection between an item and the VCL MetricField.
Adds support of different field units during control value <-> item value
@@ -494,14 +477,6 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet(
template< typename ItemWrpT >
-NumericConnection< ItemWrpT >::NumericConnection(
- sal_uInt16 nSlot, NumericField& rField, ItemConnFlags nFlags ) :
- ItemControlConnectionType( nSlot, rField, nFlags )
-{
-}
-
-
-template< typename ItemWrpT >
MetricConnection< ItemWrpT >::MetricConnection(
sal_uInt16 nSlot, MetricField& rField, FieldUnit eItemUnit, ItemConnFlags nFlags ) :
ItemControlConnectionType( nSlot, new MetricFieldWrapperType( rField, eItemUnit ), nFlags )
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 7a52de26bae3..ef2bf845c9f6 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -94,11 +94,6 @@ public:
*/
void RequestUpdate();
- /** Return the extended help text for the command.
- Returns an empty string when the UNO command name is not available.
- */
- ::rtl::OUString GetHelpText() const;
-
/** Return the icon for the command.
*/
Image GetIcon() const;
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 1eab7de7dfeb..8d58738ec694 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -42,30 +42,6 @@ class SfxBindings;
class SfxFrame;
class SfxDispatcher;
-class SfxUnoControllerItem : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
-{
- css::util::URL aCommand;
- css::uno::Reference< css::frame::XDispatch > xDispatch;
- SfxControllerItem* pCtrlItem;
- SfxBindings* pBindings;
-
- css::uno::Reference< css::frame::XDispatch > TryGetDispatch( SfxFrame* pFrame );
-
-public:
-
- SfxUnoControllerItem( SfxControllerItem*, SfxBindings&, const OUString& );
- virtual ~SfxUnoControllerItem();
-
- // XStatusListener
- virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
-
- // Something else
- virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
- void GetNewDispatch();
- void ReleaseDispatch();
- void ReleaseBindings();
-};
-
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
SfxStatusDispatcher_Impl_ListenerContainer;
generated by cgit (git 2.34.1) at 2025-02-27 12:52:02 +0000