[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/qt5 vcl/unx

[Tor Lillqvist]

 include/vcl/layout.hxx              |    2 --
 vcl/inc/window.h                    |    2 ++
 vcl/qt5/Qt5Frame.cxx                |    1 +
 vcl/unx/generic/window/salframe.cxx |    1 +
 vcl/unx/gtk/gtksalframe.cxx         |    1 +
 vcl/unx/gtk3/gtk3gtkframe.cxx       |    1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 15fb717539c00fe26c59a6b1b86b464764b9749a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 14 00:10:58 2017 +0200

    No need for bestmaxFrameSizeForScreenSize to be declared publicly
    
    It is used only inside vcl, and it should stay that way.
    
    Change-Id: Ia1a14ab13cb7d3580771c880f959abb2b695b032
    Reviewed-on: https://gerrit.libreoffice.org/44698
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 49f69db5b421..7c89f568442b 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -654,8 +654,6 @@ public:
         VclMultiLineEdit *pSecondaryMessage);
 };
 
-VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize);
-
 //Get first window of a pTopLevel window as
 //if any intermediate layout widgets didn't exist
 //i.e. acts like pChild = pChild->GetWindow(GetWindowType::FirstChild);
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index f11c1afcffa9..4ecc2940dc17 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -78,6 +78,8 @@ namespace dnd {
     class XDropTarget;
 }}}}}
 
+VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize);
+
 bool ImplWindowFrameProc( vcl::Window* pInst, SalEvent nEvent, const void* pEvent );
 
 struct ImplWinData
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index e853b7d43d9e..95e3363efe3f 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -33,6 +33,7 @@
 #include <QtWidgets/QApplication>
 
 #include <saldatabasic.hxx>
+#include <window.h>
 #include <vcl/layout.hxx>
 #include <vcl/syswin.hxx>
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 39d90583dc12..4d539934f464 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -61,6 +61,7 @@
 
 #include <unx/gensys.h>
 #include <sallayout.hxx>
+#include <window.h>
 
 #include <sal/macros.h>
 #include <com/sun/star/uno/Exception.hpp>
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 2d53534c0934..fd1c3857fc4b 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -54,6 +54,7 @@
 #include <dlfcn.h>
 #include <vcl/salbtype.hxx>
 #include <impbmp.hxx>
+#include <window.h>
 #include <strings.hrc>
 #include <bitmaps.hlst>
 #include <sal/macros.h>
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 3169ef152e2e..1f76432faded 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -59,6 +59,7 @@
 #include <dlfcn.h>
 #include <vcl/salbtype.hxx>
 #include <impbmp.hxx>
+#include <window.h>
 #include <strings.hrc>
 #include <bitmaps.hlst>
 #include <sal/macros.h>