vcl/inc/svmain.hxx | 30 ++++++++++++++++++++++++++++++
vcl/osx/salinst.cxx | 1 +
vcl/source/app/svmain.cxx | 4 +---
vcl/source/app/svmainhook.cxx | 4 ++++
4 files changed, 36 insertions(+), 3 deletions(-)
New commits:
commit 57ecf341a42866c8ed207768603a379173961c71
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Apr 7 13:41:06 2014 +0200
Clean up ImplSVMainHook declaration
Change-Id: I51d7eac6160a3c3abc96733fa30fdcbb41bb5509
diff --git a/vcl/inc/svmain.hxx b/vcl/inc/svmain.hxx
new file mode 100644
index 0000000..6ea93fa
--- /dev/null
+++ b/vcl/inc/svmain.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_INC_SVMAIN_HXX
+#define INCLUDED_VCL_INC_SVMAIN_HXX
+
+#include <sal/config.h>
+
+// #i47888# allow for alternative initialization as required for e.g. MacOSX
+bool ImplSVMainHook( int* );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index fce9e95..4414bef 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -46,6 +46,7 @@
#include "print.h"
#include "impbmp.hxx"
#include "salimestatus.hxx"
+#include "svmain.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index f0277ea..f5b05fe 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -52,6 +52,7 @@
#include "salinst.hxx"
#include "salwtype.hxx"
#include "svdata.hxx"
+#include "svmain.hxx"
#include "dbggui.hxx"
#include "accmgr.hxx"
#include "idlemgr.hxx"
@@ -180,9 +181,6 @@ int ImplSVMain()
int SVMain()
{
- // #i47888# allow for alternative initialization as required for e.g.
MacOSX
- extern bool ImplSVMainHook( int* );
-
int nRet;
if( !Application::IsConsoleOnly() && ImplSVMainHook( &nRet ) )
return nRet;
diff --git a/vcl/source/app/svmainhook.cxx b/vcl/source/app/svmainhook.cxx
index 1f2ba0d..4974cff 100644
--- a/vcl/source/app/svmainhook.cxx
+++ b/vcl/source/app/svmainhook.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <svmain.hxx>
+
#ifndef MACOSX
// MacOSX implementation of ImplSVMainHook is in osx/salinst.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
