[Libreoffice-commits] .: extensions/source

[Fridrich Strba]

 extensions/source/config/ldap/ldapaccess.hxx      |   27 ++++++++++++
 extensions/source/config/ldap/wrapldapinclude.hxx |   46 ----------------------
 2 files changed, 26 insertions(+), 47 deletions(-)

New commits:
commit 79f15259bc117c27bfe8d1590836ef1565c49278
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jul 18 16:24:21 2012 +0200

    Junking wrapldapinclude.hxx, since it is included only once and is small
    
    Change-Id: I16ec56f8fefd3224b82e074371d9a8a944c75032

diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index 4886dc3..0158b13 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -24,7 +24,32 @@
 
 #include <map>
 
-#include "wrapldapinclude.hxx"
+#ifdef WNT
+#pragma warning (push,1)
+#pragma warning (disable:4668)
+#endif
+
+#ifdef WNT
+#include <windows.h>
+#include <winldap.h>
+#ifndef LDAP_NO_ATTRS
+#    define LDAP_NO_ATTRS L"1.1"
+#endif
+#else // !defined WNT
+#include <ldap.h>
+#endif // WNT
+
+#ifndef LDAP_API
+#    define LDAP_API(rt) rt
+#endif
+#ifndef LDAP_CALL
+#    define LDAP_CALL
+#endif
+
+#ifdef WNT
+#pragma warning (pop)
+#endif // WNT
+
 #include <com/sun/star/ldap/LdapGenericException.hpp>
 
 #include <com/sun/star/ldap/LdapConnectionException.hpp>
diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx
deleted file mode 100644
index e819baa..0000000
--- a/extensions/source/config/ldap/wrapldapinclude.hxx
+++ /dev/null
@@ -1,46 +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 .
- */
-
-#ifdef WNT
-#pragma warning (push,1)
-#pragma warning (disable:4668)
-#endif
-
-#ifdef WNT
-#include <windows.h>
-#include <winldap.h>
-#ifndef LDAP_NO_ATTRS
-#    define LDAP_NO_ATTRS L"1.1"
-#endif
-#else // !defined WNT
-#include <ldap.h>
-#endif // WNT
-
-#ifndef LDAP_API
-#    define LDAP_API(rt) rt
-#endif
-#ifndef LDAP_CALL
-#    define LDAP_CALL
-#endif
-
-#ifdef WNT
-#pragma warning (pop)
-#endif // WNT
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */