[Libreoffice-commits] core.git: 2 commits - desktop/inc desktop/source desktop/test embedserv/source solenv/clang-format
Philipp Hofer (via logerrit)
logerrit at kemper.freedesktop.org
Fri Nov 13 14:16:34 UTC 2020
desktop/inc/migration.hxx | 4 -
desktop/source/app/cmdlinehelp.hxx | 4 -
desktop/source/app/desktopcontext.cxx | 17 ++---
desktop/source/app/langselect.hxx | 5 -
desktop/source/app/main.c | 6 +-
desktop/source/app/userinstall.hxx | 8 +-
desktop/source/deployment/gui/dp_gui_dependencydialog.cxx | 8 --
desktop/source/deployment/gui/dp_gui_dependencydialog.hxx | 17 +++--
desktop/source/deployment/gui/license_dialog.hxx | 15 ++---
desktop/source/deployment/inc/dp_persmap.h | 17 ++---
desktop/source/deployment/inc/dp_platform.hxx | 10 +--
desktop/source/deployment/inc/dp_resource.h | 7 +-
desktop/source/deployment/manager/dp_properties.hxx | 30 ++++------
desktop/source/deployment/misc/dp_resource.cxx | 24 +++-----
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx | 25 ++++----
desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx | 20 +++---
desktop/source/deployment/registry/help/dp_helpbackenddb.hxx | 27 ++++-----
desktop/source/deployment/registry/package/dp_extbackenddb.hxx | 26 ++++----
desktop/source/migration/services/jvmfwk.hxx | 4 -
desktop/source/pkgchk/unopkg/unopkg_main.c | 4 -
desktop/test/deployment/executable_content/build/hello.c | 6 --
embedserv/source/embed/ed_iinplace.cxx | 30 +++-------
embedserv/source/embed/esdll.cxx | 7 --
embedserv/source/embed/guid.hxx | 6 +-
embedserv/source/inc/embservconst.h | 6 +-
embedserv/source/inprocserv/advisesink.hxx | 29 +++++----
solenv/clang-format/excludelist | 26 --------
27 files changed, 159 insertions(+), 229 deletions(-)
New commits:
commit 5035f265cd6e19ef3589db55ca0b780944812365
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 12:55:42 2020 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Fri Nov 13 15:15:46 2020 +0100
tdf#123936 Formatting files in module embedserv with clang-format
Change-Id: I475628cbec4c22a4b5ec535991d4f68154e3919e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105665
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/embedserv/source/embed/ed_iinplace.cxx b/embedserv/source/embed/ed_iinplace.cxx
index 0c6e869e633c..eb33bf5ac4d0 100644
--- a/embedserv/source/embed/ed_iinplace.cxx
+++ b/embedserv/source/embed/ed_iinplace.cxx
@@ -20,30 +20,26 @@
#include <embeddoc.hxx>
#include <osl/diagnose.h>
-
-COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetWindow(HWND *hWnd)
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetWindow(HWND* hWnd)
{
- OSL_ENSURE(m_pDocHolder,"no document for inplace activation");
+ OSL_ENSURE(m_pDocHolder, "no document for inplace activation");
*hWnd = m_pDocHolder->GetTopMostWinHandle();
- if(*hWnd != nullptr)
+ if (*hWnd != nullptr)
return NOERROR;
else
return ERROR;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::ContextSensitiveHelp(BOOL)
-{
- return NOERROR;
-}
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::ContextSensitiveHelp(BOOL) { return NOERROR; }
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate()
{
// no locking is used since the OLE must use the same thread always
- if ( m_bIsInVerbHandling )
+ if (m_bIsInVerbHandling)
return E_UNEXPECTED;
- BooleanGuard_Impl aGuard( m_bIsInVerbHandling );
+ BooleanGuard_Impl aGuard(m_bIsInVerbHandling);
m_pDocHolder->InPlaceDeactivate();
@@ -57,11 +53,10 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate()
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::UIDeactivate()
{
// no locking is used since the OLE must use the same thread always
- if ( m_bIsInVerbHandling )
+ if (m_bIsInVerbHandling)
return E_UNEXPECTED;
- BooleanGuard_Impl aGuard( m_bIsInVerbHandling );
-
+ BooleanGuard_Impl aGuard(m_bIsInVerbHandling);
m_pDocHolder->UIDeactivate();
@@ -74,14 +69,11 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::UIDeactivate()
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetObjectRects(LPCRECT aRect, LPCRECT aClip)
{
- OSL_ENSURE(m_pDocHolder,"no document for inplace activation");
+ OSL_ENSURE(m_pDocHolder, "no document for inplace activation");
- return m_pDocHolder->SetObjectRects(aRect,aClip);
+ return m_pDocHolder->SetObjectRects(aRect, aClip);
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::ReactivateAndUndo()
-{
- return E_NOTIMPL;
-}
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::ReactivateAndUndo() { return E_NOTIMPL; }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index bfffe73bb3f6..59a749078d37 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -37,15 +37,12 @@ END_OBJECT_MAP()
// DLL Entry Point
-
#include <syswinwrapper.hxx>
#include <docholder.hxx>
-
HINSTANCE DocumentHolder::m_hInstance;
-extern "C"
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
+extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
{
DocumentHolder::m_hInstance = hInstance;
if (!winwrap::HatchWindowRegister(hInstance))
@@ -60,7 +57,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
{
_Module.Term();
}
- return TRUE; // ok
+ return TRUE; // ok
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/embed/guid.hxx b/embedserv/source/embed/guid.hxx
index eca39c2880c8..2cbf28b5b93a 100644
--- a/embedserv/source/embed/guid.hxx
+++ b/embedserv/source/embed/guid.hxx
@@ -28,11 +28,11 @@
#include <common.h>
-OUString getFilterNameFromGUID_Impl( GUID const * );
+OUString getFilterNameFromGUID_Impl(GUID const*);
-std::u16string_view getServiceNameFromGUID_Impl( GUID const * );
+std::u16string_view getServiceNameFromGUID_Impl(GUID const*);
-wchar_t const * getStorageTypeFromGUID_Impl( GUID const * guid );
+wchar_t const* getStorageTypeFromGUID_Impl(GUID const* guid);
#endif
diff --git a/embedserv/source/inc/embservconst.h b/embedserv/source/inc/embservconst.h
index aca7c8e49728..0b48df3d2c2d 100644
--- a/embedserv/source/inc/embservconst.h
+++ b/embedserv/source/inc/embservconst.h
@@ -35,8 +35,10 @@ extern "C" const GUID DECLSPEC_SELECTANY OID_CalcOASISServer = { SO3_SC_OLE_EMBE
extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingServer = { SO3_SDRAW_OLE_EMBED_CLASSID_60 };
extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer = { SO3_SDRAW_OLE_EMBED_CLASSID_8 };
-extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationServer = { SO3_SIMPRESS_OLE_EMBED_CLASSID_60 };
-extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer = { SO3_SIMPRESS_OLE_EMBED_CLASSID_8 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationServer
+ = { SO3_SIMPRESS_OLE_EMBED_CLASSID_60 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer
+ = { SO3_SIMPRESS_OLE_EMBED_CLASSID_8 };
extern "C" const GUID DECLSPEC_SELECTANY OID_MathServer = { SO3_SM_OLE_EMBED_CLASSID_60 };
extern "C" const GUID DECLSPEC_SELECTANY OID_MathOASISServer = { SO3_SM_OLE_EMBED_CLASSID_8 };
diff --git a/embedserv/source/inprocserv/advisesink.hxx b/embedserv/source/inprocserv/advisesink.hxx
index e1bc55a4c0a6..1a89e38b4c3b 100644
--- a/embedserv/source/inprocserv/advisesink.hxx
+++ b/embedserv/source/inprocserv/advisesink.hxx
@@ -25,20 +25,20 @@
#include <memory>
#if !defined WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <objidl.h>
#include "smartpointer.hxx"
-namespace inprocserv {
-
+namespace inprocserv
+{
class OleWrapperAdviseSink : public IAdviseSink
{
protected:
ULONG m_nRefCount;
- ComSmart< IAdviseSink > m_pListener;
+ ComSmart<IAdviseSink> m_pListener;
DWORD m_nListenerID;
std::unique_ptr<FORMATETC> m_pFormatEtc;
@@ -57,17 +57,18 @@ public:
OleWrapperAdviseSink();
// an AdviseSink for IOleObject interface
- explicit OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener );
+ explicit OleWrapperAdviseSink(const ComSmart<IAdviseSink>& pListener);
// an AdviseSink for IDataObject interface
- OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener, FORMATETC* pFormatEtc, DWORD nDataRegFlag );
+ OleWrapperAdviseSink(const ComSmart<IAdviseSink>& pListener, FORMATETC* pFormatEtc,
+ DWORD nDataRegFlag);
// an AdviseSink for IViewObject interface
- OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener, DWORD nAspect, DWORD nViewRegFlag );
+ OleWrapperAdviseSink(const ComSmart<IAdviseSink>& pListener, DWORD nAspect, DWORD nViewRegFlag);
virtual ~OleWrapperAdviseSink();
- void SetRegID( DWORD nRegID ) { m_nRegID = nRegID; }
+ void SetRegID(DWORD nRegID) { m_nRegID = nRegID; }
DWORD GetRegID() { return m_nRegID; }
bool IsOleAdvise() { return m_bObjectAdvise; }
@@ -76,7 +77,7 @@ public:
FORMATETC* GetFormatEtc() { return m_pFormatEtc.get(); }
DWORD GetAspect() { return m_nAspect; }
- ComSmart< IAdviseSink >& GetOrigAdvise() { return m_pListener; }
+ ComSmart<IAdviseSink>& GetOrigAdvise() { return m_pListener; }
void DisconnectOrigAdvise() { m_pListener = nullptr; }
void SetClosed() { m_bClosed = TRUE; }
@@ -87,11 +88,11 @@ public:
STDMETHODIMP_(ULONG) AddRef() override;
STDMETHODIMP_(ULONG) Release() override;
- STDMETHODIMP_(void) OnDataChange(FORMATETC *, STGMEDIUM *) override;
- STDMETHODIMP_(void) OnViewChange(DWORD, LONG) override;
- STDMETHODIMP_(void) OnRename(IMoniker *) override;
- STDMETHODIMP_(void) OnSave() override;
- STDMETHODIMP_(void) OnClose() override;
+ STDMETHODIMP_(void) OnDataChange(FORMATETC*, STGMEDIUM*) override;
+ STDMETHODIMP_(void) OnViewChange(DWORD, LONG) override;
+ STDMETHODIMP_(void) OnRename(IMoniker*) override;
+ STDMETHODIMP_(void) OnSave() override;
+ STDMETHODIMP_(void) OnClose() override;
};
}; // namespace advisesink
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 8b4027c9a162..3ae634007501 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -3741,12 +3741,9 @@ embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
embeddedobj/test/mtexecutor/mteregister.cxx
embedserv/source/embed/docholder.cxx
embedserv/source/embed/ed_idataobj.cxx
-embedserv/source/embed/ed_iinplace.cxx
embedserv/source/embed/ed_ioleobject.cxx
embedserv/source/embed/ed_ipersiststr.cxx
-embedserv/source/embed/esdll.cxx
embedserv/source/embed/guid.cxx
-embedserv/source/embed/guid.hxx
embedserv/source/embed/iipaobj.cxx
embedserv/source/embed/intercept.cxx
embedserv/source/embed/servprov.cxx
@@ -3756,13 +3753,11 @@ embedserv/source/inc/common.h
embedserv/source/inc/docholder.hxx
embedserv/source/inc/embeddoc.hxx
embedserv/source/inc/embeddocaccess.hxx
-embedserv/source/inc/embservconst.h
embedserv/source/inc/iipaobj.hxx
embedserv/source/inc/intercept.hxx
embedserv/source/inc/servprov.hxx
embedserv/source/inc/syswinwrapper.hxx
embedserv/source/inprocserv/advisesink.cxx
-embedserv/source/inprocserv/advisesink.hxx
embedserv/source/inprocserv/dllentry.cxx
embedserv/source/inprocserv/inprocembobj.cxx
embedserv/source/inprocserv/inprocembobj.h
commit eedafe6e5c1c1f598170e6349c29ed19437d1f8c
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 12:54:26 2020 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Fri Nov 13 15:15:34 2020 +0100
tdf#123936 Formatting files in module desktop with clang-format
Change-Id: I39856d77a2ef506612b68fccfd0ba9c9d6b1debc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105661
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/desktop/inc/migration.hxx b/desktop/inc/migration.hxx
index e28b8f9a55d3..bbe420f0c31c 100644
--- a/desktop/inc/migration.hxx
+++ b/desktop/inc/migration.hxx
@@ -19,8 +19,8 @@
#pragma once
-namespace desktop {
-
+namespace desktop
+{
class Migration
{
public:
diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx
index 668e93e469a4..5a32125053a0 100644
--- a/desktop/source/app/cmdlinehelp.hxx
+++ b/desktop/source/app/cmdlinehelp.hxx
@@ -23,8 +23,8 @@
namespace desktop
{
- void displayCmdlineHelp( OUString const & unknown );
- void displayVersion();
+void displayCmdlineHelp(OUString const& unknown);
+void displayVersion();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index efabac38328e..5d43bb6489e6 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -26,33 +26,30 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::task;
-
namespace desktop
{
-
-DesktopContext::DesktopContext( const Reference< XCurrentContext > & ctx )
- : m_xNextContext( ctx )
+DesktopContext::DesktopContext(const Reference<XCurrentContext>& ctx)
+ : m_xNextContext(ctx)
{
}
-Any SAL_CALL DesktopContext::getValueByName( const OUString& Name)
+Any SAL_CALL DesktopContext::getValueByName(const OUString& Name)
{
Any retVal;
- if ( Name == JAVA_INTERACTION_HANDLER_NAME )
+ if (Name == JAVA_INTERACTION_HANDLER_NAME)
{
#if HAVE_FEATURE_JAVA
- retVal <<= Reference< XInteractionHandler >( new svt::JavaInteractionHandler());
+ retVal <<= Reference<XInteractionHandler>(new svt::JavaInteractionHandler());
#endif
}
- else if( m_xNextContext.is() )
+ else if (m_xNextContext.is())
{
// Call next context in chain if found
- retVal = m_xNextContext->getValueByName( Name );
+ retVal = m_xNextContext->getValueByName(Name);
}
return retVal;
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index d469b58bb4f4..496f67570ba3 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -21,10 +21,9 @@
#include <sal/config.h>
-namespace desktop::langselect {
-
+namespace desktop::langselect
+{
bool prepareLocale();
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
index 643c42a7ad24..6631c3ceb337 100644
--- a/desktop/source/app/main.c
+++ b/desktop/source/app/main.c
@@ -29,7 +29,7 @@
static int g_Exiting = 0;
/* HACK: detect calls to xmlCleanupParser, which causes hard to debug crashes */
-__attribute__ ((visibility("default"))) void xmlCleanupParser(void)
+__attribute__((visibility("default"))) void xmlCleanupParser(void)
{
/* there are libraries that register xmlCleanupParser as an atexit handler,
which is not entirely sound (another atexit handler could want to
@@ -44,7 +44,8 @@ __attribute__ ((visibility("default"))) void xmlCleanupParser(void)
#endif
#endif
-SAL_IMPLEMENT_MAIN() {
+SAL_IMPLEMENT_MAIN()
+{
int ret = soffice_main();
#ifdef DBG_UTIL
#ifdef __gnu_linux__
@@ -54,5 +55,4 @@ SAL_IMPLEMENT_MAIN() {
return ret;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx
index c89be31b84eb..527df2dcce70 100644
--- a/desktop/source/app/userinstall.hxx
+++ b/desktop/source/app/userinstall.hxx
@@ -21,9 +21,10 @@
#include <sal/config.h>
-namespace desktop::userinstall {
-
-enum Status {
+namespace desktop::userinstall
+{
+enum Status
+{
EXISTED,
CREATED,
ERROR_NO_SPACE,
@@ -32,7 +33,6 @@ enum Status {
};
Status finalize();
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 2f02a991aea8..f94b2989177b 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sal/config.h>
#include <rtl/ustring.hxx>
@@ -27,8 +26,7 @@
using dp_gui::DependencyDialog;
-DependencyDialog::DependencyDialog(
- weld::Window * parent, std::vector< OUString > const & dependencies)
+DependencyDialog::DependencyDialog(weld::Window* parent, std::vector<OUString> const& dependencies)
: GenericDialogController(parent, "desktop/ui/dependenciesdialog.ui", "Dependencies")
, m_xList(m_xBuilder->weld_tree_view("depListTreeview"))
{
@@ -39,8 +37,6 @@ DependencyDialog::DependencyDialog(
}
}
-DependencyDialog::~DependencyDialog()
-{
-}
+DependencyDialog::~DependencyDialog() {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index fa0322c5fec0..bdbab41d194a 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -25,24 +25,25 @@
#include <vector>
-namespace vcl { class Window; }
-
-namespace dp_gui {
+namespace vcl
+{
+class Window;
+}
+namespace dp_gui
+{
class DependencyDialog : public weld::GenericDialogController
{
public:
- DependencyDialog(
- weld::Window* parent, std::vector< OUString > const & dependencies);
+ DependencyDialog(weld::Window* parent, std::vector<OUString> const& dependencies);
virtual ~DependencyDialog() override;
private:
- DependencyDialog(DependencyDialog const &) = delete;
- DependencyDialog& operator =(DependencyDialog const &) = delete;
+ DependencyDialog(DependencyDialog const&) = delete;
+ DependencyDialog& operator=(DependencyDialog const&) = delete;
std::unique_ptr<weld::TreeView> m_xList;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 63042699e341..3c628a880df6 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -24,9 +24,8 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-
-namespace dp_gui {
-
+namespace dp_gui
+{
class LicenseDialog
: public ::cppu::WeakImplHelper<css::ui::dialogs::XExecutableDialog, css::lang::XServiceInfo>
{
@@ -37,16 +36,16 @@ class LicenseDialog
sal_Int16 solar_execute();
public:
- LicenseDialog( css::uno::Sequence<css::uno::Any> const & args,
- css::uno::Reference<css::uno::XComponentContext> const & xComponentContext );
+ LicenseDialog(css::uno::Sequence<css::uno::Any> const& args,
+ css::uno::Reference<css::uno::XComponentContext> const& xComponentContext);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
// XExecutableDialog
- virtual void SAL_CALL setTitle( OUString const & title ) override;
+ virtual void SAL_CALL setTitle(OUString const& title) override;
virtual sal_Int16 SAL_CALL execute() override;
};
}
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index 14ef9e30640d..c36979807309 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -25,9 +25,7 @@
namespace dp_misc
{
-
-typedef std::unordered_map<
- OString, OString > t_string2string_map;
+typedef std::unordered_map<OString, OString> t_string2string_map;
// Class to read obsolete registered extensions
// should be removed for LibreOffice 4.0
@@ -41,23 +39,22 @@ class PersistentMap final
public:
~PersistentMap();
- PersistentMap( OUString const & url );
+ PersistentMap(OUString const& url);
/** in mem db */
PersistentMap();
- bool has( OString const & key ) const;
- bool get( OString * value, OString const & key ) const;
+ bool has(OString const& key) const;
+ bool get(OString* value, OString const& key) const;
const t_string2string_map& getEntries() const { return m_entries; }
- void put( OString const & key, OString const & value );
- bool erase( OString const & key );
+ void put(OString const& key, OString const& value);
+ bool erase(OString const& key);
private:
void open();
void readAll();
- void add( OString const & key, OString const & value );
+ void add(OString const& key, OString const& value);
void flush();
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 1050658c5e2a..9547bc07df18 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -19,7 +19,6 @@
#pragma once
-
#include "dp_misc_api.hxx"
#include <com/sun/star/uno/Sequence.hxx>
@@ -27,19 +26,16 @@
namespace dp_misc
{
-
-
-DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString const & getPlatformString();
+DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString const& getPlatformString();
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
- bool platform_fits( OUString const & platform_string );
+bool platform_fits(OUString const& platform_string);
/** determines if the current platform corresponds to one of the platform strings.
*/
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
-bool hasValidPlatform( css::uno::Sequence< OUString > const & platformStrings);
-
+bool hasValidPlatform(css::uno::Sequence<OUString> const& platformStrings);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index 76f3b8d773a2..471960e8d4de 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -22,10 +22,9 @@
#include <i18nlangtag/languagetag.hxx>
#include "dp_misc_api.hxx"
-namespace dp_misc {
-
-DESKTOP_DEPLOYMENTMISC_DLLPUBLIC const LanguageTag & getOfficeLanguageTag();
-
+namespace dp_misc
+{
+DESKTOP_DEPLOYMENTMISC_DLLPUBLIC const LanguageTag& getOfficeLanguageTag();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index bc928b8aecf6..d87e2951ccb2 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -19,35 +19,32 @@
#pragma once
-
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <optional>
-
-namespace dp_manager {
-
-
+namespace dp_manager
+{
class ExtensionProperties final
{
OUString m_propFileUrl;
const css::uno::Reference<css::ucb::XCommandEnvironment> m_xCmdEnv;
const css::uno::Reference<css::uno::XComponentContext> m_xContext;
- ::std::optional< OUString> m_prop_suppress_license;
- ::std::optional< OUString> m_prop_extension_update;
+ ::std::optional<OUString> m_prop_suppress_license;
+ ::std::optional<OUString> m_prop_extension_update;
- static OUString getPropertyValue(css::beans::NamedValue const & v);
-public:
+ static OUString getPropertyValue(css::beans::NamedValue const& v);
- ExtensionProperties(OUString const & urlExtension,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
- css::uno::Reference<css::uno::XComponentContext> const & xContext);
+public:
+ ExtensionProperties(OUString const& urlExtension,
+ css::uno::Reference<css::ucb::XCommandEnvironment> const& xCmdEnv,
+ css::uno::Reference<css::uno::XComponentContext> const& xContext);
- ExtensionProperties(OUString const & urlExtension,
- css::uno::Sequence<css::beans::NamedValue> const & properties,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
- css::uno::Reference<css::uno::XComponentContext> const & xContext);
+ ExtensionProperties(OUString const& urlExtension,
+ css::uno::Sequence<css::beans::NamedValue> const& properties,
+ css::uno::Reference<css::ucb::XCommandEnvironment> const& xCmdEnv,
+ css::uno::Reference<css::uno::XComponentContext> const& xContext);
void write();
@@ -57,5 +54,4 @@ public:
};
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index 3204061762c2..9e0184291ee0 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -17,37 +17,33 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <dp_resource.h>
#include <unotools/configmgr.hxx>
#include <i18nlangtag/languagetag.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace dp_misc {
-namespace {
-
-struct OfficeLocale :
- public rtl::StaticWithInit<LanguageTag, OfficeLocale> {
- LanguageTag operator () () {
+namespace dp_misc
+{
+namespace
+{
+struct OfficeLocale : public rtl::StaticWithInit<LanguageTag, OfficeLocale>
+{
+ LanguageTag operator()()
+ {
OUString slang(utl::ConfigManager::getUILocale());
//fallback, the locale is currently only set when the user starts the
//office for the first time.
if (slang.isEmpty())
slang = "en-US";
- return LanguageTag( slang);
+ return LanguageTag(slang);
}
};
} // anon namespace
-const LanguageTag & getOfficeLanguageTag()
-{
- return OfficeLocale::get();
-}
-
+const LanguageTag& getOfficeLanguageTag() { return OfficeLocale::get(); }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index aef8a2f0e72c..15ac91853019 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -25,14 +25,17 @@
#include <optional>
#include <dp_backenddb.hxx>
-namespace com::sun::star::uno { class XComponentContext; }
-
-namespace dp_registry::backend::configuration {
+namespace com::sun::star::uno
+{
+class XComponentContext;
+}
+namespace dp_registry::backend::configuration
+{
/* The XML file stores the extensions which are currently registered.
They will be removed when they are revoked.
*/
-class ConfigurationBackendDb: public dp_registry::backend::BackendDb
+class ConfigurationBackendDb : public dp_registry::backend::BackendDb
{
protected:
virtual OUString getDbNSName() override;
@@ -56,18 +59,14 @@ public:
};
public:
+ ConfigurationBackendDb(css::uno::Reference<css::uno::XComponentContext> const& xContext,
+ OUString const& url);
- ConfigurationBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext,
- OUString const & url);
+ void addEntry(OUString const& url, Data const& data);
- void addEntry(OUString const & url, Data const & data);
-
- ::std::optional<Data> getEntry(OUString const & url);
- std::vector< OUString> getAllDataUrls();
+ ::std::optional<Data> getEntry(OUString const& url);
+ std::vector<OUString> getAllDataUrls();
};
-
-
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index 47c696225074..0561a8c546dc 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -22,17 +22,20 @@
#include <rtl/ustring.hxx>
#include <dp_backenddb.hxx>
-namespace com::sun::star::uno { class XComponentContext; }
-
-namespace dp_registry::backend::executable {
+namespace com::sun::star::uno
+{
+class XComponentContext;
+}
+namespace dp_registry::backend::executable
+{
/* The XML file stores the extensions which are currently registered.
They will be removed when they are revoked.
The format looks like this:
<?xml version="1.0"?>
*/
-class ExecutableBackendDb: public dp_registry::backend::RegisteredDb
+class ExecutableBackendDb : public dp_registry::backend::RegisteredDb
{
protected:
virtual OUString getDbNSName() override;
@@ -44,14 +47,9 @@ protected:
virtual OUString getKeyElementName() override;
public:
-
- ExecutableBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext,
- OUString const & url);
-
+ ExecutableBackendDb(css::uno::Reference<css::uno::XComponentContext> const& xContext,
+ OUString const& url);
};
-
-
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index ad3b414e8113..60172f32e6f3 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -23,14 +23,17 @@
#include <optional>
#include <dp_backenddb.hxx>
-namespace com::sun::star::uno { class XComponentContext; }
-
-namespace dp_registry::backend::help {
+namespace com::sun::star::uno
+{
+class XComponentContext;
+}
+namespace dp_registry::backend::help
+{
/* The XML file stores the extensions which are currently registered.
They will be removed when they are revoked.
*/
-class HelpBackendDb: public dp_registry::backend::BackendDb
+class HelpBackendDb : public dp_registry::backend::BackendDb
{
protected:
virtual OUString getDbNSName() override;
@@ -47,25 +50,19 @@ public:
/* the URL to the folder containing the compiled help files, etc.
*/
OUString dataUrl;
-
};
public:
+ HelpBackendDb(css::uno::Reference<css::uno::XComponentContext> const& xContext,
+ OUString const& url);
- HelpBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext,
- OUString const & url);
+ void addEntry(OUString const& url, Data const& data);
- void addEntry(OUString const & url, Data const & data);
-
- ::std::optional<Data> getEntry(OUString const & url);
+ ::std::optional<Data> getEntry(OUString const& url);
//must also return the data urls for entries with @active="false". That is,
//those are currently revoked.
- std::vector< OUString> getAllDataUrls();
-
+ std::vector<OUString> getAllDataUrls();
};
-
-
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index 0c81a4b721ff..c9a607e7a8c0 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -26,14 +26,17 @@
#include <dp_backenddb.hxx>
-namespace com::sun::star::uno { class XComponentContext; }
-
-namespace dp_registry::backend::bundle {
+namespace com::sun::star::uno
+{
+class XComponentContext;
+}
+namespace dp_registry::backend::bundle
+{
/* The XML file stores the extensions which are currently registered.
They will be removed when they are revoked.
*/
-class ExtensionBackendDb: public dp_registry::backend::BackendDb
+class ExtensionBackendDb : public dp_registry::backend::BackendDb
{
protected:
virtual OUString getDbNSName() override;
@@ -44,23 +47,20 @@ protected:
public:
struct Data
{
- /* every element consists of a pair of the url to the item (jar,rdb, etc)
+ /* every element consists of a pair of the url to the item (jar,rdb, etc)
and the media type
*/
- std::vector< std::pair< OUString, OUString> > items;
+ std::vector<std::pair<OUString, OUString>> items;
};
public:
- ExtensionBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext,
- OUString const & url);
+ ExtensionBackendDb(css::uno::Reference<css::uno::XComponentContext> const& xContext,
+ OUString const& url);
- void addEntry(OUString const & url, Data const & data);
-
- Data getEntry(OUString const & url);
+ void addEntry(OUString const& url, Data const& data);
+ Data getEntry(OUString const& url);
};
-
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx
index 53495c93590e..63ec7e71798d 100644
--- a/desktop/source/migration/services/jvmfwk.hxx
+++ b/desktop/source/migration/services/jvmfwk.hxx
@@ -22,13 +22,11 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-
namespace migration
{
-
OUString jvmfwk_getImplementationName();
-css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames();
+css::uno::Sequence<OUString> jvmfwk_getSupportedServiceNames();
} //end blind namespace
diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.c b/desktop/source/pkgchk/unopkg/unopkg_main.c
index 9905cb6e7e59..83b20b0b489e 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_main.c
+++ b/desktop/source/pkgchk/unopkg/unopkg_main.c
@@ -21,8 +21,6 @@
#include "unopkg_main.h"
-SAL_IMPLEMENT_MAIN() {
- return unopkg_main();
-}
+SAL_IMPLEMENT_MAIN() { return unopkg_main(); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/test/deployment/executable_content/build/hello.c b/desktop/test/deployment/executable_content/build/hello.c
index b88f0e1c039e..d527e71524f7 100644
--- a/desktop/test/deployment/executable_content/build/hello.c
+++ b/desktop/test/deployment/executable_content/build/hello.c
@@ -17,10 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
-int main(int argc , char** argv, char** envp)
+int main(int argc, char** argv, char** envp)
{
//prevent warning about unused parameters
//we need to provide parameter names in C
@@ -28,9 +27,8 @@ int main(int argc , char** argv, char** envp)
(void)argv;
(void)envp;
- fprintf(stdout,"Hello world!\n");
+ fprintf(stdout, "Hello world!\n");
return 0;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index a5c4affa2c16..8b4027c9a162 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -3284,7 +3284,6 @@ desktop/inc/app.hxx
desktop/inc/dp_misc.h
desktop/inc/dp_shared.hxx
desktop/inc/lib/init.hxx
-desktop/inc/migration.hxx
desktop/qa/deployment_misc/test_dp_version.cxx
desktop/qa/desktop_app/test_desktop_app.cxx
desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -3294,29 +3293,22 @@ desktop/source/app/check_ext_deps.cxx
desktop/source/app/cmdlineargs.cxx
desktop/source/app/cmdlineargs.hxx
desktop/source/app/cmdlinehelp.cxx
-desktop/source/app/cmdlinehelp.hxx
desktop/source/app/crashreport.cxx
-desktop/source/app/desktopcontext.cxx
desktop/source/app/desktopcontext.hxx
desktop/source/app/dispatchwatcher.cxx
desktop/source/app/dispatchwatcher.hxx
desktop/source/app/langselect.cxx
-desktop/source/app/langselect.hxx
desktop/source/app/lockfile2.cxx
-desktop/source/app/main.c
desktop/source/app/officeipcthread.cxx
desktop/source/app/officeipcthread.hxx
desktop/source/app/opencl.cxx
desktop/source/app/sofficemain.cxx
desktop/source/app/updater.cxx
desktop/source/app/userinstall.cxx
-desktop/source/app/userinstall.hxx
desktop/source/deployment/dp_log.cxx
desktop/source/deployment/dp_persmap.cxx
desktop/source/deployment/dp_xml.cxx
desktop/source/deployment/gui/dp_gui.h
-desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
-desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
desktop/source/deployment/gui/dp_gui_dialog2.cxx
desktop/source/deployment/gui/dp_gui_dialog2.hxx
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -3332,16 +3324,12 @@ desktop/source/deployment/gui/dp_gui_updatedialog.hxx
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
desktop/source/deployment/gui/license_dialog.cxx
-desktop/source/deployment/gui/license_dialog.hxx
desktop/source/deployment/inc/dp_dependencies.hxx
desktop/source/deployment/inc/dp_descriptioninfoset.hxx
desktop/source/deployment/inc/dp_identifier.hxx
desktop/source/deployment/inc/dp_interact.h
desktop/source/deployment/inc/dp_package.hxx
-desktop/source/deployment/inc/dp_persmap.h
-desktop/source/deployment/inc/dp_platform.hxx
desktop/source/deployment/inc/dp_registry.hxx
-desktop/source/deployment/inc/dp_resource.h
desktop/source/deployment/inc/dp_ucb.h
desktop/source/deployment/inc/dp_update.hxx
desktop/source/deployment/inc/dp_version.hxx
@@ -3358,14 +3346,12 @@ desktop/source/deployment/manager/dp_manager.cxx
desktop/source/deployment/manager/dp_manager.h
desktop/source/deployment/manager/dp_managerfac.cxx
desktop/source/deployment/manager/dp_properties.cxx
-desktop/source/deployment/manager/dp_properties.hxx
desktop/source/deployment/misc/dp_dependencies.cxx
desktop/source/deployment/misc/dp_descriptioninfoset.cxx
desktop/source/deployment/misc/dp_identifier.cxx
desktop/source/deployment/misc/dp_interact.cxx
desktop/source/deployment/misc/dp_misc.cxx
desktop/source/deployment/misc/dp_platform.cxx
-desktop/source/deployment/misc/dp_resource.cxx
desktop/source/deployment/misc/dp_ucb.cxx
desktop/source/deployment/misc/dp_update.cxx
desktop/source/deployment/misc/dp_version.cxx
@@ -3375,20 +3361,16 @@ desktop/source/deployment/registry/component/dp_compbackenddb.hxx
desktop/source/deployment/registry/component/dp_component.cxx
desktop/source/deployment/registry/configuration/dp_configuration.cxx
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
-desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
desktop/source/deployment/registry/dp_backend.cxx
desktop/source/deployment/registry/dp_backenddb.cxx
desktop/source/deployment/registry/dp_registry.cxx
desktop/source/deployment/registry/executable/dp_executable.cxx
desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
-desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
desktop/source/deployment/registry/help/dp_help.cxx
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
-desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
desktop/source/deployment/registry/inc/dp_backend.h
desktop/source/deployment/registry/inc/dp_backenddb.hxx
desktop/source/deployment/registry/package/dp_extbackenddb.cxx
-desktop/source/deployment/registry/package/dp_extbackenddb.hxx
desktop/source/deployment/registry/package/dp_package.cxx
desktop/source/deployment/registry/script/dp_lib_container.cxx
desktop/source/deployment/registry/script/dp_lib_container.h
@@ -3408,7 +3390,6 @@ desktop/source/migration/migration_impl.hxx
desktop/source/migration/services/basicmigration.cxx
desktop/source/migration/services/basicmigration.hxx
desktop/source/migration/services/jvmfwk.cxx
-desktop/source/migration/services/jvmfwk.hxx
desktop/source/migration/services/misc.hxx
desktop/source/migration/services/oo3extensionmigration.cxx
desktop/source/migration/services/oo3extensionmigration.hxx
@@ -3419,14 +3400,12 @@ desktop/source/offacc/acceptor.cxx
desktop/source/offacc/acceptor.hxx
desktop/source/pkgchk/unopkg/unopkg_app.cxx
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
-desktop/source/pkgchk/unopkg/unopkg_main.c
desktop/source/pkgchk/unopkg/unopkg_misc.cxx
desktop/source/pkgchk/unopkg/unopkg_shared.h
desktop/source/splash/splash.cxx
desktop/source/splash/unxsplash.cxx
desktop/source/splash/unxsplash.hxx
desktop/test/deployment/active/active_native.cxx
-desktop/test/deployment/executable_content/build/hello.c
desktop/test/deployment/passive/passive_native.cxx
desktop/unx/source/args.c
desktop/unx/source/args.h
More information about the Libreoffice-commits
mailing list