From d90784064f9b993c044615a8bb0fb7ae984d0ded Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 19 Nov 2014 12:41:46 +0100
Subject: nlsupport.h -> nlsupport.hxx

Change-Id: Iaee3f8a43cba1d4fd02b6a51d42f73c8ef9e99b7
---
 sal/osl/unx/nlsupport.cxx    |  2 +-
 sal/osl/unx/nlsupport.h      | 44 --------------------------------------------
 sal/osl/unx/nlsupport.hxx    | 36 ++++++++++++++++++++++++++++++++++++
 sal/osl/unx/osxlocale.cxx    |  2 +-
 sal/osl/unx/process_impl.cxx |  2 +-
 5 files changed, 39 insertions(+), 47 deletions(-)
 delete mode 100644 sal/osl/unx/nlsupport.h
 create mode 100644 sal/osl/unx/nlsupport.hxx

(limited to 'sal')

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 7e0eee8856de..03107ef4b1fe 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -21,7 +21,7 @@
 #include <osl/diagnose.h>
 #include <osl/process.h>
 
-#include "nlsupport.h"
+#include "nlsupport.hxx"
 
 #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \
     defined(FREEBSD) || defined(MACOSX)  || defined(IOS) || defined(OPENBSD) || \
diff --git a/sal/osl/unx/nlsupport.h b/sal/osl/unx/nlsupport.h
deleted file mode 100644
index 6e243859fe7c..000000000000
--- a/sal/osl/unx/nlsupport.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- 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_SAL_OSL_UNX_NLSUPPORT_H
-#define INCLUDED_SAL_OSL_UNX_NLSUPPORT_H
-
-#include <sal/config.h>
-
-#include <rtl/locale.h>
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-void _imp_getProcessLocale( rtl_Locale ** );
-int  _imp_setProcessLocale( rtl_Locale * );
-
-#if defined IOS || defined MACOSX
-int macosx_getLocale(char *locale, sal_uInt32 bufferLen);
-#endif
-
-#if defined __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/nlsupport.hxx b/sal/osl/unx/nlsupport.hxx
new file mode 100644
index 000000000000..676c00c87b12
--- /dev/null
+++ b/sal/osl/unx/nlsupport.hxx
@@ -0,0 +1,36 @@
+/* -*- 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_SAL_OSL_UNX_NLSUPPORT_HXX
+#define INCLUDED_SAL_OSL_UNX_NLSUPPORT_HXX
+
+#include <sal/config.h>
+
+#include <rtl/locale.h>
+
+void _imp_getProcessLocale( rtl_Locale ** );
+int  _imp_setProcessLocale( rtl_Locale * );
+
+#if defined IOS || defined MACOSX
+int macosx_getLocale(char *locale, sal_uInt32 bufferLen);
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index a64238ec6767..d2fbdb5f22af 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -27,7 +27,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <postmac.h>
 
-#include <nlsupport.h>
+#include <nlsupport.hxx>
 
 namespace
 {
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index c70e11141e74..b632d440dc15 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -35,7 +35,7 @@
 
 #include "uunxapi.h"
 #include "getexecutablefile.hxx"
-#include "nlsupport.h"
+#include "nlsupport.hxx"
 
 #ifdef ANDROID
 #include <osl/detail/android-bootstrap.h>
-- 
cgit