[Libreoffice-commits] core.git: chart2/source include/sfx2 include/svx sc/source sd/source sfx2/source svx/source sw/source
Henry Castro (via logerrit)
logerrit at kemper.freedesktop.org
Mon Apr 6 01:06:56 UTC 2020
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/glow/GlowPropertyPanel.hxx | 3 +
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 4 ++
svx/source/sidebar/line/LinePropertyPanel.hxx | 4 ++
svx/source/sidebar/media/MediaPlaybackPanel.hxx | 6 +++
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 ++
34 files changed, 163 insertions(+)
New commits:
commit 219cb84f901676a738892e87ba6f726805d5e72c
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Mar 27 19:24:14 2020 -0400
Commit: Henry Castro <hcastro at collabora.com>
CommitDate: Mon Apr 6 03:06:07 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 <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Henry Castro <hcastro at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91577
Tested-by: Jenkins
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index dec036e1a5d6..b8515f6ffbeb 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -56,6 +56,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 01125ba0c532..4bcd297792e7 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -49,6 +49,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 37a321af2b83..decd8e0d401c 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -60,6 +60,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 51befddff94d..71f7cd84c8b6 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();
};
@@ -67,6 +70,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;
};
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index d6bde2831b80..2847606789e1 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.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 {};
+
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 1140edfa2c2d..4ddd43b06f4d 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.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;}
virtual boost::property_tree::ptree DumpAsPropertyTree() override;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index bab8a5c7d175..a4b81aa15675 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -56,6 +56,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 d0fbdd7e787a..7fa66e2c1f54 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.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;}
// constructor/destructor
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index c3464cd84b66..a064b246ed21 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -66,6 +66,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 94a6a2fe50dd..1baa03845ea0 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1617,6 +1617,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 82ec1b671f72..1b039e44ad9d 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -233,6 +233,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 c0c92841c0b3..fa8817f5eb8e 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -323,6 +323,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 c2aa21ad2191..fc6463073bbd 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -47,6 +47,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 <unoctitm.hxx>
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 1360db98bc9d..c831fa4c7fce 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 1459d154689c..a362e3d8d5cf 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -50,6 +50,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/glow/GlowPropertyPanel.hxx b/svx/source/sidebar/glow/GlowPropertyPanel.hxx
index fe954311ce1a..d7afea8913ee 100644
--- a/svx/source/sidebar/glow/GlowPropertyPanel.hxx
+++ b/svx/source/sidebar/glow/GlowPropertyPanel.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:
sfx2::sidebar::ControllerItem maGlowController;
sfx2::sidebar::ControllerItem maGlowColorController;
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index 9dc3b6b0af9e..c587b1719f8b 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -46,6 +46,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 faf1bda87100..aea19a5643c1 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -60,6 +60,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 b7f516aaf746..a510d2fbe24e 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx
@@ -66,9 +66,15 @@ 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, const OString&, void);
DECL_LINK(VolumeSlideHdl, weld::Scale&, void);
DECL_LINK(SeekHdl, weld::Scale&, void);
+
DECL_LINK(TimeoutHdl, Timer*, void);
};
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 3efb7e64c036..db1ecd9bae7a 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -60,6 +60,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 9f4d06be9d16..47bb5f8a4686 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -761,6 +761,9 @@ void PosSizePropertyPanel::NotifyItemUpdate(
mxCbxScale->set_active(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 ccb32fbc4f21..eacd06f4672e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -76,6 +76,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
std::unique_ptr<weld::Label> mxFtPosX;
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index 51c8d071f474..8ad3871af1ee 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.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 {};
+
SfxBindings* GetBindings() { return mpBindings;}
void Initialize();
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 8c2c210df969..162a272e978f 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -136,6 +136,9 @@ public:
const 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 d855af799854..2817abaad65e 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.hxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.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() const { return mpBindings; }
PageFooterPanel(
vcl::Window* pParent,
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx
index 63b3ccd902f6..1f83e03cd7a4 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.hxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx
@@ -52,6 +52,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 60132d536080..061411d48eeb 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.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() const { return mpBindings; }
PageHeaderPanel(
vcl::Window* pParent,
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx
index bed8786a37fd..ccaceae2aeb9 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.hxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx
@@ -56,6 +56,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 ba0f60b2a034..48a953cfa7b4 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 ed67b3ebfc7e..03386c7e3f85 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.hxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.hxx
@@ -34,6 +34,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 1eafe682d450..f3e58ab3f0f2 100644
--- a/sw/source/uibase/sidebar/ThemePanel.hxx
+++ b/sw/source/uibase/sidebar/ThemePanel.hxx
@@ -31,6 +31,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 d0934743c4fe..d1d23b637271 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
@@ -43,6 +43,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;
More information about the Libreoffice-commits
mailing list