include/vcl/toolkit/dialog.hxx | 6 +++---
vcl/inc/osx/vclnsapp.h | 5 +----
2 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit ae1ac7eaf14a78bff050b90daaf7a9996cfc2f9a
Author: oguzbalkaya <oguz.balk...@gmail.com>
AuthorDate: Wed Aug 4 00:08:12 2021 +0300
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Thu Aug 5 20:22:37 2021 +0200
tdf#143148: Use pragma once instead of include guards
Change-Id: I036dd26b2e70c12896afcef2ce25586e8db3098c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119959
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/vcl/inc/osx/vclnsapp.h b/vcl/inc/osx/vclnsapp.h
index 82f0229a9f93..5cf8582c3771 100644
--- a/vcl/inc/osx/vclnsapp.h
+++ b/vcl/inc/osx/vclnsapp.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_VCLNSAPP_H
-#define INCLUDED_VCL_INC_OSX_VCLNSAPP_H
+#pragma once
#include <config_features.h>
@@ -63,6 +62,4 @@ class AquaSalFrame;
-(void)setDockIconClickHandler: (NSObject*)pHandler;
@end
-#endif // INCLUDED_VCL_INC_OSX_VCLNSAPP_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c4127ca194a20aa81da6fb09d765f353cadd6eb8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Aug 5 16:49:18 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Aug 5 20:22:22 2021 +0200
make Dialog::GetDefaultParent private
Change-Id: I47d8e125646ee72aa6a9c12bbfdf09a784769d85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120080
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx
index 377ae37cc66d..52f58957bc5a 100644
--- a/include/vcl/toolkit/dialog.hxx
+++ b/include/vcl/toolkit/dialog.hxx
@@ -74,6 +74,9 @@ private:
DECL_DLLPRIVATE_LINK(ImplAsyncCloseHdl, void*, void);
DECL_DLLPRIVATE_LINK(ResponseHdl, Button*, void);
+ // get the default parent for a dialog as is done in standard
initialization
+ SAL_DLLPRIVATE static vcl::Window* GetDefaultParent(WinBits nStyle);
+
protected:
void ImplInitDialog( vcl::Window* pParent, WinBits nStyle, InitFlag
eFlag = InitFlag::Default );
@@ -102,9 +105,6 @@ public:
virtual ~Dialog() override;
virtual void dispose() override;
- // get the default parent for a dialog as is done in standard
initialization
- static vcl::Window* GetDefaultParent(WinBits nStyle);
-
virtual bool EventNotify( NotifyEvent& rNEvt ) override;
virtual void StateChanged( StateChangedType nStateChange ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
