chart2/source/controller/sidebar/ChartAxisPanel.hxx | 4 ++ chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 4 ++ chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 4 ++ include/sfx2/bindings.hxx | 2 + include/sfx2/ctrlitem.hxx | 2 + include/sfx2/sidebar/ControllerItem.hxx | 4 ++ include/svx/sidebar/AreaPropertyPanelBase.hxx | 4 ++ sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 4 ++ sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 4 ++ sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 4 ++ sd/source/ui/sidebar/SlideBackground.hxx | 5 ++ sfx2/source/control/bindings.cxx | 27 ++++++++++++++++ sfx2/source/control/ctrlitem.cxx | 7 ++++ sfx2/source/control/statcach.cxx | 13 +++++++ sfx2/source/control/unoctitm.cxx | 1 sfx2/source/inc/statcach.hxx | 1 sfx2/source/sidebar/ControllerItem.cxx | 7 ++++ svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 4 ++ svx/source/sidebar/line/LinePropertyPanel.hxx | 4 ++ svx/source/sidebar/media/MediaPlaybackPanel.hxx | 5 ++ svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 4 ++ svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 3 + svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 4 ++ svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 4 ++ sw/source/uibase/inc/navipi.hxx | 3 + sw/source/uibase/sidebar/PageFooterPanel.hxx | 4 ++ sw/source/uibase/sidebar/PageFormatPanel.hxx | 4 ++ sw/source/uibase/sidebar/PageHeaderPanel.hxx | 4 ++ sw/source/uibase/sidebar/PageStylesPanel.hxx | 4 ++ sw/source/uibase/sidebar/StylePresetsPanel.hxx | 4 ++ sw/source/uibase/sidebar/TableEditPanel.hxx | 3 + sw/source/uibase/sidebar/ThemePanel.hxx | 4 ++ sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 4 ++ 33 files changed, 159 insertions(+)
New commits: commit c2bb20652142f0cadbba3cf82f73a62f6c569981 Author: Henry Castro <[email protected]> AuthorDate: Fri Mar 27 19:24:14 2020 -0400 Commit: Henry Castro <[email protected]> CommitDate: Thu May 21 00:40:50 2020 +0200 lok: introduce QueryControlState function The sidebar usually executes UNO commands to the core framework, however the controls already have formatted the text that is useful in Online client side. For example the units conversion. The QueryControlState method will retrieve the current formatted text of the sidebar control to be used in Client Side. Change-Id: I0b3e3a1462d4391ac911352f35808a5e5d9f9ffb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91237 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Henry Castro <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91577 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94516 Tested-by: Henry Castro <[email protected]> diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx index 0c9bd74ab182..1c28148f12c3 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx @@ -57,6 +57,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + // constructor/destructor ChartAxisPanel( vcl::Window* pParent, diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx index c6e20976f9ae..3f0b9202bf5e 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx @@ -53,6 +53,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + // constructor/destructor ChartErrorBarPanel( vcl::Window* pParent, diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx index 83dcbffd70ae..d1fc2691fc16 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx @@ -63,6 +63,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + // constructor/destructor ChartSeriesPanel( vcl::Window* pParent, diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 8b8cc0c7080d..28b4d5248517 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -141,6 +141,8 @@ public: */ SfxItemState QueryState( sal_uInt16 nSID, std::unique_ptr<SfxPoolItem> &rpState ); + void QueryControlState ( sal_uInt16 nSID, boost::property_tree::ptree& rState ); + const SfxPoolItem* ExecuteSynchron( sal_uInt16 nSlot, const SfxPoolItem **pArgs = nullptr); bool Execute( sal_uInt16 nSlot, diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index fc93c62beff2..489fdb9461a8 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -64,6 +64,8 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void GetControlState( sal_uInt16 nSID, boost::property_tree::ptree& ); + MapUnit GetCoreMetric() const; static SfxItemState GetItemState( const SfxPoolItem* pState ); diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 6b55fc173dfa..84e6e6defa72 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -45,6 +45,9 @@ public: const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState) = 0; + virtual void GetControlState( + const sal_uInt16 nSId, + boost::property_tree::ptree& rState) = 0; virtual ~ItemUpdateReceiverInterface(); }; @@ -70,6 +73,7 @@ public: private: virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState (sal_uInt16 nSId, boost::property_tree::ptree& rState) override; ItemUpdateReceiverInterface& mrItemUpdateReceiver; css::uno::Reference<css::lang::XComponent> mxFrameActionListener; diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index abe5a603514c..858813f68136 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -67,6 +67,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + const static sal_Int32 DEFAULT_CENTERX; const static sal_Int32 DEFAULT_CENTERY; const static sal_Int32 DEFAULT_ANGLE; diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index a405ecbe7fb2..6a96ad7ad31e 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -51,6 +51,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + SfxBindings* GetBindings() { return mpBindings;} virtual boost::property_tree::ptree DumpAsPropertyTree() override; diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 006e0b03700c..f51c4fb32bd4 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -55,6 +55,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + SfxBindings* GetBindings() { return mpBindings;} // constructor/destructor diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 0406f3384381..b9430636d051 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -55,6 +55,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + SfxBindings* GetBindings() { return mpBindings;} // constructor/destructor diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index f27184985af4..41963834b53c 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -70,6 +70,11 @@ public: const sal_uInt16 nSID, const SfxItemState eState, const SfxPoolItem* pState) override; + + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + virtual void HandleContextChange( const vcl::EnumContext& rContext) override; virtual boost::property_tree::ptree DumpAsPropertyTree() override; diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 1180050d6cc7..1d6fd0d62441 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1624,6 +1624,33 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, std::unique_ptr<SfxPoolI return eState; } +void SfxBindings::QueryControlState( sal_uInt16 nSlot, boost::property_tree::ptree& rState ) +{ + if ( SfxGetpApp()->IsDowning() ) + return; + + if ( pDispatcher ) + pDispatcher->Flush(); + + if ( pImpl->pSubBindings ) + pImpl->pSubBindings->QueryControlState( nSlot, rState ); + + SfxStateCache* pCache = GetStateCache( nSlot ); + if ( pCache ) + { + if ( pImpl->bMsgDirty ) + { + UpdateSlotServer_Impl(); + pCache = GetStateCache( nSlot ); + } + + if (pCache && pCache->GetItemLink() ) + { + pCache->GetState(rState); + } + } +} + void SfxBindings::SetSubBindings_Impl( SfxBindings *pSub ) { if ( pImpl->pSubBindings ) diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 5775a9a4f04e..8b82c1448139 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -234,6 +234,13 @@ void SfxControllerItem::StateChanged { } +void SfxControllerItem::GetControlState +( + sal_uInt16, + boost::property_tree::ptree& +) +{ +} void SfxStatusForwarder::StateChanged ( diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 080d5275a107..f9c1e35c7cc8 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -326,6 +326,19 @@ void SfxStateCache::SetState SetState_Impl( eState, pState, bMaybeDirty ); } +void SfxStateCache::GetState +( + boost::property_tree::ptree& rState +) +{ + if ( !mxDispatch.is() && pController ) + { + for ( SfxControllerItem *pCtrl = pController; + pCtrl; + pCtrl = pCtrl->GetItemLink() ) + pCtrl->GetControlState( nId, rState ); + } +} void SfxStateCache::SetVisibleState( bool bShow ) { diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index ddd11ebf29d8..9fa1026f06d9 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -49,6 +49,7 @@ #include <uno/current_context.hxx> #include <vcl/svapp.hxx> #include <vcl/uitest/logger.hxx> +#include <boost/property_tree/json_parser.hpp> #include <sfx2/app.hxx> #include <sfx2/unoctitm.hxx> diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 5b218b9ae9dd..3fb3268fb097 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -97,6 +97,7 @@ public: void SetCachedState(bool bAlways); void Invalidate( bool bWithSlot ); void SetVisibleState( bool bShow ); + void GetState( boost::property_tree::ptree& ); SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewBinding ); SfxControllerItem* GetItemLink() const; diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index 088677115893..8d37f10b70aa 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -67,6 +67,13 @@ void ControllerItem::StateChanged ( mrItemUpdateReceiver.NotifyItemUpdate(nSID, eState, pState); } +void ControllerItem::GetControlState ( + sal_uInt16 nSID, + boost::property_tree::ptree& rState) +{ + mrItemUpdateReceiver.GetControlState(nSID, rState); +} + void ControllerItem::RequestUpdate() { std::unique_ptr<SfxPoolItem> pState; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 459d203deb62..0899e1eca39b 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -54,6 +54,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + SfxBindings* GetBindings() { return mpBindings;} // constructor/destructor diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index be8406a3c8c9..cf2479b90237 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -71,6 +71,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + SfxBindings* GetBindings() { return mpBindings;} // constructor/destructor diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.hxx b/svx/source/sidebar/media/MediaPlaybackPanel.hxx index 9f050e1247ad..00e6092fd7c2 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx @@ -70,6 +70,11 @@ private: virtual void NotifyItemUpdate( const sal_uInt16 nSID, const SfxItemState eState, const SfxPoolItem* pState) override; + + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + DECL_LINK(PlayToolBoxSelectHdl, ToolBox*, void); DECL_LINK(VolumeSlideHdl, Slider*, void); DECL_LINK(SeekHdl, Slider*, void); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 0c1c5bcc6099..ccc02ccb51f4 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -63,6 +63,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + static FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); ParaPropertyPanel ( diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 5dde7497a0d8..9c00e4602864 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -817,6 +817,9 @@ void PosSizePropertyPanel::NotifyItemUpdate( mpCbxScale->Check( static_cast<bool>(sUserData.toInt32()) ); } +void PosSizePropertyPanel::GetControlState(const sal_uInt16 /*nSID*/, boost::property_tree::ptree& /*rState*/) +{ +} void PosSizePropertyPanel::executeSize() { diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index ab72632649c9..d73275f2b6d5 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -84,6 +84,10 @@ public: SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); + virtual void GetControlState( + const sal_uInt16 nSId, + boost::property_tree::ptree& rState) override; + private: //Position VclPtr<FixedText> mpFtPosX; diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index 7346b808eddf..08e5df1f3a28 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -48,6 +48,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + SfxBindings* GetBindings() { return mpBindings;} void Initialize(); diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 95025b428ad9..0894facf0421 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -143,6 +143,9 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void GetControlState(const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + virtual void StateChanged(StateChangedType nStateChange) override; static OUString CreateDropFileName( TransferableDataHelper& rData ); diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index d41789ecad67..d40fbe5b1a2b 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -54,6 +54,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + SfxBindings* GetBindings() const { return mpBindings; } PageFooterPanel( vcl::Window* pParent, diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx index 1df56eccae92..7a01c57ffd2c 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.hxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx @@ -54,6 +54,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + PageFormatPanel( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx index 3861b0203795..373347ae74eb 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx @@ -54,6 +54,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + SfxBindings* GetBindings() const { return mpBindings; } PageHeaderPanel( vcl::Window* pParent, diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx index 4dcadf0d9d17..e9fd1eb4ac0a 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.hxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -58,6 +58,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + SfxBindings* GetBindings() const { return mpBindings; } PageStylesPanel( vcl::Window* pParent, diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx index b392f9cb077e..cc66dd5af436 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx @@ -34,6 +34,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + private: struct TemplateEntry { diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx b/sw/source/uibase/sidebar/TableEditPanel.hxx index a825bc01cc38..13ae11b5dd99 100644 --- a/sw/source/uibase/sidebar/TableEditPanel.hxx +++ b/sw/source/uibase/sidebar/TableEditPanel.hxx @@ -33,6 +33,9 @@ public: virtual void NotifyItemUpdate(const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState(const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override{}; + private: TableEditPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx index 898caae9fc4a..58f30bf7a79f 100644 --- a/sw/source/uibase/sidebar/ThemePanel.hxx +++ b/sw/source/uibase/sidebar/ThemePanel.hxx @@ -38,6 +38,10 @@ public: const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + private: ThemePanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index d50c9fc560db..d436a1dff375 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -45,6 +45,10 @@ namespace sw { namespace sidebar { const SfxItemState eState, const SfxPoolItem* pState) override; + virtual void GetControlState( + const sal_uInt16 /*nSId*/, + boost::property_tree::ptree& /*rState*/) override {}; + virtual ~WrapPropertyPanel() override; virtual void dispose() override; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
