diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-23 19:38:56 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-13 18:48:37 +0200 |
| commit | 202018a41c14a65b57643af02b76e8356f47244b (patch) | |
| tree | daeb6b40a38c85a6902347ef27ef6e38490c5ae5 /vcl/inc | |
| parent | 1baf051aa1055e9789585fdd4859d23e6e14ac7d (diff) | |
lok: Support per-view help data
Used for showing tooltip windows in LO online.
Change-Id: I8b6a7272c75025e717923c839fa8fd9f4cab2903
Reviewed-on: https://gerrit.libreoffice.org/84717
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/84803
Tested-by: Jenkins
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/helpwin.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index 5d2e19e80654..fc5e14ffda02 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -24,6 +24,7 @@ #include <vcl/timer.hxx> enum class QuickHelpFlags; +struct ImplSVHelpData; class HelpTextWindow : public FloatingWindow { @@ -73,6 +74,7 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, QuickHe const OUString& rHelpText, const Point& rScreenPos, const tools::Rectangle& rHelpArea ); VCL_DLLPUBLIC void ImplDestroyHelpWindow( bool bUpdateHideTime ); +VCL_DLLPUBLIC void ImplDestroyHelpWindow(ImplSVHelpData& rHelpData, bool bUpdateHideTime); void ImplSetHelpWindowPos( vcl::Window* pHelpWindow, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle, const Point& rPos, const tools::Rectangle& rHelpArea ); diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 654b9ec968f1..69fdcca77c46 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -369,6 +369,7 @@ struct ImplSchedulerContext struct ImplSVData { + ImplSVData(); ~ImplSVData(); SalData* mpSalData = nullptr; SalInstance* mpDefInst = nullptr; // Default SalInstance @@ -386,7 +387,7 @@ struct ImplSVData ImplSVGDIData maGDIData; // indepen data for Output classes ImplSVWinData maWinData; // indepen data for Windows classes ImplSVCtrlData maCtrlData; // indepen data for Control classes - ImplSVHelpData maHelpData; // indepen data for Help classes + ImplSVHelpData* mpHelpData; // Data for Help classes ImplSVNWFData maNWFData; UnoWrapperBase* mpUnoWrapper = nullptr; VclPtr<vcl::Window> mpIntroWindow; // the splash screen @@ -422,6 +423,8 @@ VCL_PLUGIN_PUBLIC OUString VclResId(const char* pId); DockingManager* ImplGetDockingManager(); BlendFrameCache* ImplGetBlendFrameCache(); +VCL_PLUGIN_PUBLIC ImplSVHelpData& ImplGetSVHelpData(); + VCL_DLLPUBLIC bool ImplCallPreNotify( NotifyEvent& rEvt ); VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData(); |