diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-12-27 17:18:44 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-01 13:19:28 +0100 |
commit | b199e335c01f265ba2604c020928b63356b42d15 (patch) | |
tree | 1015423b1bb5b45ce28e8a4a47ea6e20188b8795 /include | |
parent | f0fc4ac88d0d82ee81e0a55bdc54421f955705f0 (diff) |
weld NumberFormatPropertyPanel
including GtkMenuToolButton hackery to support a toggled state
Change-Id: Ia1cf5fd7d56c2e475194cd2d0431611f278f5a33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85873
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/tbcontrl.hxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 9e6c387d2dda..315fd9e1c57e 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -264,6 +264,9 @@ private: OUString m_aFormatString; LanguageType m_eLanguage; sal_uInt32 m_nFormatKey; + + weld::Toolbar* m_pToolbar; + std::unique_ptr<svtools::ToolbarPopupBase> m_xPopover; public: static void GetCurrencySymbols( std::vector<OUString>& rList, bool bFlag, std::vector<sal_uInt16>& rCurrencyList ); @@ -274,9 +277,14 @@ public: // XToolbarController virtual void SAL_CALL execute( sal_Int16 nSelectModifier ) override; + // XComponent + virtual void SAL_CALL dispose() override; + using svt::ToolboxController::createPopupWindow; virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; + void EndPopupMode(); + // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; |