diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-04-26 16:30:48 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-05-15 10:14:55 +0200 |
| commit | 4d313ef26a85808193c3fb961af244b569853284 (patch) | |
| tree | a76026f088fd88ce39b9b7c5fae54d72ddebd352 /include | |
| parent | 1446ab8c3ac85c28d04772a507accae7aedcfbfc (diff) | |
tdf#117039: update infobar instead of removing and re-adding it
Apparently AppendInfoBar ends up calling back into SID_SIGNATURE
status function at some point, creating an endless recursion. I'm
too lazy to debug why so I'm cowardly avoiding it
Change-Id: Ib1e4b7f12fea197887b099e9a9f03b4e58884ec1
Reviewed-on: https://gerrit.libreoffice.org/53519
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 43459bac67363f49aadd851e686d4a74b8ddc256)
Reviewed-on: https://gerrit.libreoffice.org/53648
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 8853067a29e091a230a6397bd7c100494ae9f5bf)
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/infobar.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/viewfrm.hxx | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 4e49213c19f6..9382bf0fcb45 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -50,11 +50,14 @@ class SfxInfoBarWindow : public vcl::Window { private: OUString m_sId; + InfoBarType m_eType; VclPtr<FixedImage> m_pImage; VclPtr<FixedText> m_pMessage; VclPtr<Button> m_pCloseBtn; std::vector< VclPtr<PushButton> > m_aActionBtns; + void SetForeAndBackgroundColors( InfoBarType eType ); + public: SfxInfoBarWindow( vcl::Window* parent, const OUString& sId, const OUString& sMessage, @@ -66,6 +69,7 @@ class SfxInfoBarWindow : public vcl::Window const OUString& getId() const { return m_sId; } virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void Resize( ) override; + void Update( const OUString& sNewMessage, InfoBarType eType ); basegfx::BColor m_aBackgroundColor; basegfx::BColor m_aForegroundColor; diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 333e055c6996..2760f191efa3 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -173,6 +173,8 @@ public: const OUString& sMessage, InfoBarType aInfoBarType); void RemoveInfoBar(const OUString& sId); + void UpdateInfoBar(const OUString& sId, + const OUString& sMessage, InfoBarType eType); bool HasInfoBarWithID(const OUString& sId); SAL_DLLPRIVATE void GetDocNumber_Impl(); |