[Libreoffice-commits] core.git: extensions/Library_ldapbe2.mk extensions/source

2020-07-23 Thread Noel Grandin (via logerrit) 
 extensions/Library_ldapbe2.mk   |1 
 extensions/source/config/ldap/componentdef.cxx  |   57 
 extensions/source/config/ldap/ldapbe2.component |5 +
 extensions/source/config/ldap/ldapuserprofilebe.cxx |   23 +++-
 extensions/source/config/ldap/ldapuserprofilebe.hxx |   12 
 5 files changed, 12 insertions(+), 86 deletions(-)

New commits:
commit 1bd28e209f2c3ad5fa9c60e365289db70219831e
Author: Noel Grandin 
AuthorDate: Thu Jul 23 10:06:15 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Jul 23 12:07:01 2020 +0200

extensions/ldap: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: I159eb26fd69151065080d3f70a6fc9df0104068f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99273
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index e76dcc21a5dd..6d81426ad53e 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Library_add_defs,ldapbe2,\
 endif
 
 $(eval $(call gb_Library_add_exception_objects,ldapbe2,\
-   extensions/source/config/ldap/componentdef \
extensions/source/config/ldap/ldapaccess \
extensions/source/config/ldap/ldapuserprofilebe \
 ))
diff --git a/extensions/source/config/ldap/componentdef.cxx 
b/extensions/source/config/ldap/componentdef.cxx
deleted file mode 100644
index 4767e09727bb..
--- a/extensions/source/config/ldap/componentdef.cxx
+++ /dev/null
@@ -1,57 +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 .
- */
-
-
-#include "ldapuserprofilebe.hxx"
-#include 
-
-using namespace extensions::config::ldap ;
-
-
-static uno::Reference createLdapUserProfileBe(
-   const uno::Reference& aContext) {
-return * new LdapUserProfileBe(aContext) ;
-}
-
-
-const cppu::ImplementationEntry kImplementations_entries[] =
-{
-{
-createLdapUserProfileBe,
-LdapUserProfileBe::getLdapUserProfileBeName,
-LdapUserProfileBe::getLdapUserProfileBeServiceNames,
-cppu::createSingleComponentFactory,
-nullptr,
-0
-},
-{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
-} ;
-
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * ldapbe2_component_getFactory(const char 
*aImplementationName,
-  void *aServiceManager,
-  void *aRegistryKey) {
-return cppu::component_getFactoryHelper(aImplementationName,
-aServiceManager,
-aRegistryKey,
-kImplementations_entries) ;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/config/ldap/ldapbe2.component 
b/extensions/source/config/ldap/ldapbe2.component
index 7e07ba415f56..8f6ea3f80639 100644
--- a/extensions/source/config/ldap/ldapbe2.component
+++ b/extensions/source/config/ldap/ldapbe2.component
@@ -18,8 +18,9 @@
  -->
 
 http://openoffice.org/2010/uno-components;>
-  
+xmlns="http://openoffice.org/2010/uno-components;>
+  
 
   
 
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx 
b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index fdb6ccba9b77..8be633a4ca3e 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -187,21 +187,9 @@ css::uno::Any LdapUserProfileBe::getPropertyValue(
 }
 
 
-OUString LdapUserProfileBe::getLdapUserProfileBeName() {
-return "com.sun.star.comp.configuration.backend.LdapUserProfileBe";
-}
-
-
 OUString SAL_CALL LdapUserProfileBe::getImplementationName()
 {
-return getLdapUserProfileBeName() ;
-}
-
-
-uno::Sequence LdapUserProfileBe::getLdapUserProfileBeServiceNames()
-{
-uno::Sequence aServices { 
"com.sun.star.configuration.backend.LdapUserProfileBe" };
-return aServices ;
+return "com.sun.star.comp.configuration.backend.LdapUserProfileBe";
 }
 
 sal_Bool SAL_CALL

[Libreoffice-commits] core.git: extensions/Library_ldapbe2.mk extensions/source

2018-05-09 Thread Mike Kaganski 
 extensions/Library_ldapbe2.mk   |1 
 extensions/source/config/ldap/ldapuserprofilebe.cxx |   41 +---
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 5ed889e80805daf8471054786c1e424a73744ad3
Author: Mike Kaganski 
Date:   Wed May 9 16:19:46 2018 +0300

Don't throw in LdapUserProfileBe ctor on LDAP misconfiguration

Otherwise LO crashes e.g. at opening Expert Configuration dialog.
Instead, log the event, create an empty backend, and return empty values.

Change-Id: I433fc89c003e7886dfc5242a4ef8defa46d643d3
Reviewed-on: https://gerrit.libreoffice.org/53958
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins 

diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index 0364d58e8bd1..5ea5a9597101 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_add_exception_objects,ldapbe2,\
 ))
 
 $(eval $(call gb_Library_use_libraries,ldapbe2,\
+   comphelper \
cppuhelper \
cppu \
salhelper \
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx 
b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index 00fdf01e22df..a1208f4bd578 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -42,6 +43,8 @@ LdapUserProfileBe::LdapUserProfileBe( const 
uno::Referencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/Library_ldapbe2.mk extensions/source

2014-04-13 Thread Stephan Bergmann 
 extensions/Library_ldapbe2.mk|1 
 extensions/source/abpilot/abpservices.cxx|9 -
 extensions/source/abpilot/datasourcehandling.cxx |8 -
 extensions/source/abpilot/unodialogabp.cxx   |2 
 extensions/source/abpilot/unodialogabp.hxx   |1 
 extensions/source/config/ldap/ldapaccess.cxx |7 -
 extensions/source/dbpilots/dbpservices.cxx   |   11 --
 extensions/source/dbpilots/dbpservices.hxx   |   37 +++
 extensions/source/dbpilots/wizardservices.cxx|2 
 extensions/source/logging/consolehandler.cxx |1 
 extensions/source/logging/csvformatter.cxx   |1 
 extensions/source/logging/filehandler.cxx|1 
 extensions/source/logging/log_services.cxx   |   11 --
 extensions/source/logging/log_services.hxx   |   37 +++
 extensions/source/logging/logger.cxx |1 
 extensions/source/logging/plaintextformatter.cxx |1 
 extensions/source/plugin/unx/npnapi.cxx  |4 
 extensions/source/plugin/unx/npwrap.cxx  |4 
 extensions/source/plugin/unx/npwrap.hxx  |   31 ++
 extensions/source/propctrlr/MasterDetailLinkDialog.cxx   |1 
 extensions/source/propctrlr/browserlistbox.cxx   |8 -
 extensions/source/propctrlr/buttonnavigationhandler.cxx  |1 
 extensions/source/propctrlr/cellbindinghandler.cxx   |1 
 extensions/source/propctrlr/composeduiupdate.cxx |8 -
 extensions/source/propctrlr/controlfontdialog.cxx|1 
 extensions/source/propctrlr/defaultforminspection.cxx|1 
 extensions/source/propctrlr/defaulthelpprovider.cxx  |1 
 extensions/source/propctrlr/editpropertyhandler.cxx  |1 
 extensions/source/propctrlr/eformspropertyhandler.cxx|1 
 extensions/source/propctrlr/eventhandler.cxx |1 
 extensions/source/propctrlr/formcomponenthandler.cxx |1 
 extensions/source/propctrlr/formcontroller.cxx   |1 
 extensions/source/propctrlr/formgeometryhandler.cxx  |2 
 extensions/source/propctrlr/formlinkdialog.cxx   |1 
 extensions/source/propctrlr/genericpropertyhandler.cxx   |   10 --
 extensions/source/propctrlr/objectinspectormodel.cxx |1 
 extensions/source/propctrlr/pcrservices.cxx  |   27 -
 extensions/source/propctrlr/pcrservices.hxx  |   53 +++
 extensions/source/propctrlr/pcrunodialogs.cxx|1 
 extensions/source/propctrlr/propcontroller.cxx   |1 
 extensions/source/propctrlr/stringrepresentation.cxx |9 +
 extensions/source/propctrlr/submissionhandler.cxx|3 
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx |3 
 extensions/source/update/check/updatecheck.cxx   |3 
 extensions/source/update/check/updatecheckjob.cxx|4 
 45 files changed, 218 insertions(+), 97 deletions(-)

New commits:
commit a6611be6bc145a9f538a9f1bbe6d40f32ebad1c9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Sun Apr 13 23:44:29 2014 +0200

Clean up function declarations and some unused functions

Change-Id: Ie81d270267b6c3c3620ade62eb393b28d995a654

diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index a2d46fe..0eb2699 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\
 ))
 else # 0S!=WNT
 $(eval $(call gb_Library_use_externals,ldapbe2,\
+   boost_headers \
openldap \
nss3 \
plc4 \
diff --git a/extensions/source/abpilot/abpservices.cxx 
b/extensions/source/abpilot/abpservices.cxx
index 4a2ef7f..efa0867 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -18,20 +18,13 @@
  */
 
 #include componentmodule.hxx
-
-
+#include unodialogabp.hxx
 
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
-
-
-extern C void SAL_CALL createRegistryInfo_OABSPilotUno();
-
-
-
 extern C void SAL_CALL abp_initializeModule()
 {
 static sal_Bool s_bInit = sal_False;
diff --git a/extensions/source/abpilot/datasourcehandling.cxx 
b/extensions/source/abpilot/datasourcehandling.cxx
index c5ded23..c8372da 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -23,6 +23,7 @@
 #include componentmodule.hxx
 #include datasourcehandling.hxx
 
+#include boost/noncopyable.hpp
 #include com/sun/star/beans/XPropertySet.hpp
 #include