[Libreoffice-commits] core.git: extensions/Library_WinUserInfoBe.mk extensions/source
extensions/Library_WinUserInfoBe.mk|4 ++
extensions/source/config/WinUserInfo/WinUserInfoBe.cxx | 29 -
2 files changed, 12 insertions(+), 21 deletions(-)
New commits:
commit cf0b49af5464507a269b03900b29e3cba155ce2b
Author: Dhiraj Holden
AuthorDate: Mon Jan 17 10:30:14 2022 -0500
Commit: Stephan Bergmann
CommitDate: Mon Jan 24 15:04:13 2022 +0100
tdf#46037 remove configurationhelper from WinUserInfoBe
Change-Id: I7d23fe4f32c3b67304103ca88a757529ba4faa09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128508
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/extensions/Library_WinUserInfoBe.mk
b/extensions/Library_WinUserInfoBe.mk
index 3d5932f3b279..3e20e09419af 100644
--- a/extensions/Library_WinUserInfoBe.mk
+++ b/extensions/Library_WinUserInfoBe.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_Library_Library,WinUserInfoBe))
$(eval $(call
gb_Library_set_componentfile,WinUserInfoBe,extensions/source/config/WinUserInfo/WinUserInfoBe,services))
+$(eval $(call gb_Library_use_custom_headers,WinUserInfoBe,\
+officecfg/registry \
+))
+
$(eval $(call gb_Library_use_sdk_api,WinUserInfoBe))
$(eval $(call gb_Library_add_exception_objects,WinUserInfoBe,\
diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
index ce4d147220c2..e62068f17b04 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
@@ -11,14 +11,12 @@
#include
#include
-#include
-#include
-#include
-#include
+#include
#include
#include
#include
#include
+#include
#include
#include
@@ -213,16 +211,10 @@ private:
OUStringBuffer sOutBuf;
comphelper::Base64::encode(sOutBuf, seqCachedData);
-auto xIface = comphelper::ConfigurationHelper::openConfig(
-xContext, "org.openoffice.UserProfile/WinUserInfo",
-comphelper::EConfigurationModes::Standard);
-css::uno::Reference xNameReplace(
-xIface, css::uno::UNO_QUERY_THROW);
-xNameReplace->replaceByName("Cache",
css::uno::makeAny(sOutBuf.makeStringAndClear()));
-
-css::uno::Reference xChangesBatch(xIface,
-
css::uno::UNO_QUERY_THROW);
-xChangesBatch->commitChanges();
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create(xContext));
+
officecfg::UserProfile::WinUserInfo::Cache::set(sOutBuf.makeStringAndClear(),
batch);
+batch->commit();
}
catch (const css::uno::Exception&)
{
@@ -236,13 +228,8 @@ private:
if (m_sUserDN.isEmpty())
throw css::uno::RuntimeException();
-auto xIface = comphelper::ConfigurationHelper::openConfig(
-xContext, "org.openoffice.UserProfile/WinUserInfo",
-comphelper::EConfigurationModes::ReadOnly);
-css::uno::Reference xNameAccess(xIface,
-
css::uno::UNO_QUERY_THROW);
-OUString sCache;
-xNameAccess->getByName("Cache") >>= sCache;
+OUString sCache =
officecfg::UserProfile::WinUserInfo::Cache::get(xContext);
+
if (sCache.isEmpty())
throw css::uno::RuntimeException();
[Libreoffice-commits] core.git: extensions/Library_WinUserInfoBe.mk extensions/source
extensions/Library_WinUserInfoBe.mk |1
extensions/source/config/WinUserInfo/WinUserInfoBe.component |5 -
extensions/source/config/WinUserInfo/WinUserInfoBe.cxx | 19 ++---
extensions/source/config/WinUserInfo/WinUserInfoBe.hxx | 11 ---
extensions/source/config/WinUserInfo/componentdef.cxx| 35 ---
5 files changed, 12 insertions(+), 59 deletions(-)
New commits:
commit 545dcd2c743ed40b9adaa2f60692200589b60eb7
Author: Noel Grandin
AuthorDate: Sun Jul 26 20:14:08 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Jul 27 08:30:40 2020 +0200
extensions/WinUserInfo: create instances with uno constructors
See tdf#74608 for motivation.
Change-Id: I16e7da267af4d6e45522b502515cebe52352b2f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99460
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/extensions/Library_WinUserInfoBe.mk
b/extensions/Library_WinUserInfoBe.mk
index 8d9835db5000..34a635851a82 100644
--- a/extensions/Library_WinUserInfoBe.mk
+++ b/extensions/Library_WinUserInfoBe.mk
@@ -16,7 +16,6 @@ $(eval $(call
gb_Library_set_componentfile,WinUserInfoBe,extensions/source/confi
$(eval $(call gb_Library_use_sdk_api,WinUserInfoBe))
$(eval $(call gb_Library_add_exception_objects,WinUserInfoBe,\
- extensions/source/config/WinUserInfo/componentdef \
extensions/source/config/WinUserInfo/WinUserInfoBe \
))
diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.component
b/extensions/source/config/WinUserInfo/WinUserInfoBe.component
index 90c3e0060685..5dd7d21ad748 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.component
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.component
@@ -8,8 +8,9 @@
-->
http://openoffice.org/2010/uno-components";>
-
+xmlns="http://openoffice.org/2010/uno-components";>
+
diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
index f9ebaca1edd7..83223d932bb7 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
@@ -448,19 +448,11 @@ css::uno::Any WinUserInfoBe::getPropertyValue(OUString
const& PropertyName)
!sValue.isEmpty(), sValue.isEmpty() ? css::uno::Any() :
css::uno::makeAny(sValue)));
}
-OUString WinUserInfoBe::getWinUserInfoBeName()
+OUString SAL_CALL WinUserInfoBe::getImplementationName()
{
return "com.sun.star.comp.configuration.backend.WinUserInfoBe";
}
-OUString SAL_CALL WinUserInfoBe::getImplementationName() { return
getWinUserInfoBeName(); }
-
-css::uno::Sequence WinUserInfoBe::getWinUserInfoBeServiceNames()
-{
-css::uno::Sequence aServices{
"com.sun.star.configuration.backend.WinUserInfoBe" };
-return aServices;
-}
-
sal_Bool SAL_CALL WinUserInfoBe::supportsService(const OUString& aServiceName)
{
return cppu::supportsService(this, aServiceName);
@@ -468,10 +460,17 @@ sal_Bool SAL_CALL WinUserInfoBe::supportsService(const
OUString& aServiceName)
css::uno::Sequence SAL_CALL WinUserInfoBe::getSupportedServiceNames()
{
-return getWinUserInfoBeServiceNames();
+return { "com.sun.star.configuration.backend.WinUserInfoBe" };
}
}
}
}
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+extensions_WinUserInfoBe_get_implementation(css::uno::XComponentContext*
context,
+css::uno::Sequence
const&)
+{
+return cppu::acquire(new
extensions::config::WinUserInfo::WinUserInfoBe(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.hxx
b/extensions/source/config/WinUserInfo/WinUserInfoBe.hxx
index 766b88c41227..4ebca2678a59 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.hxx
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.hxx
@@ -92,17 +92,6 @@ public:
{
}
-/**
- Provides the implementation name.
- @return implementation name
-*/
-static OUString getWinUserInfoBeName();
-/**
- Provides the supported services names
- @return service names
-*/
-static css::uno::Sequence getWinUserInfoBeServiceNames();
-
private:
std::unique_ptr m_pImpl;
};
diff --git a/extensions/source/config/WinUserInfo/componentdef.cxx
b/extensions/source/config/WinUserInfo/componentdef.cxx
deleted file mode 100644
index e2d38e98866f..
--- a/extensions/source/config/WinUserInfo/componentdef.cxx
+++ /dev/null
@@ -1,35 +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/.
- */
-
-#include "WinUser
