[Libreoffice-commits] core.git: svx/source
svx/source/xml/xmlgrhlp.cxx | 38 --
1 file changed, 16 insertions(+), 22 deletions(-)
New commits:
commit 56c233961f3121f45448fe06104c36fe3bf92f4c
Author: Noel Grandin
AuthorDate: Sat Dec 25 08:35:48 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 26 08:27:27 2021 +0100
no need to store 3 different refs to the same object
Change-Id: I025719a9682cf0f0a6e3773362fe37d80fddb1ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127490
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index f78787d5b674..0604f0f95d8e 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -984,9 +984,7 @@ protected:
private:
SvXMLGraphicHelperMode m_eGraphicHelperMode;
-Reference< XGraphicObjectResolver > m_xGraphicObjectResolver;
-Reference< XGraphicStorageHandler > m_xGraphicStorageHandler;
-Reference< XBinaryStreamResolver > m_xBinaryStreamResolver;
+rtl::Reference m_xXMLGraphicHelper;
};
SvXMLGraphicImportExportHelper::SvXMLGraphicImportExportHelper(
SvXMLGraphicHelperMode eMode ) :
@@ -995,12 +993,11 @@
SvXMLGraphicImportExportHelper::SvXMLGraphicImportExportHelper( SvXMLGraphicHelp
void SvXMLGraphicImportExportHelper::disposing(std::unique_lock&)
{
-Reference< XComponent > xComp( m_xGraphicObjectResolver, UNO_QUERY );
-OSL_ASSERT( xComp.is());
-if( xComp.is())
-xComp->dispose();
-// m_xBinaryStreamResolver and m_xGraphicStorageHandler are a reference to
the same object,
-// don't call dispose() again
+if (m_xXMLGraphicHelper)
+{
+m_xXMLGraphicHelper->dispose();
+m_xXMLGraphicHelper.clear();
+}
}
// XInitialization
@@ -1011,57 +1008,54 @@ void SAL_CALL
SvXMLGraphicImportExportHelper::initialize(
if( aArguments.hasElements() )
aArguments[0] >>= xStorage;
-rtl::Reference pHelper( SvXMLGraphicHelper::Create(
xStorage, m_eGraphicHelperMode ));
-m_xGraphicObjectResolver = pHelper;
-m_xGraphicStorageHandler = pHelper;
-m_xBinaryStreamResolver = pHelper;
+m_xXMLGraphicHelper = SvXMLGraphicHelper::Create( xStorage,
m_eGraphicHelperMode );
}
// XGraphicObjectResolver
OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL(
const OUString& aURL )
{
-return m_xGraphicObjectResolver->resolveGraphicObjectURL( aURL );
+return m_xXMLGraphicHelper->resolveGraphicObjectURL( aURL );
}
// XGraphicStorageHandler
uno::Reference SAL_CALL
SvXMLGraphicImportExportHelper::loadGraphic(OUString const & rURL)
{
-return m_xGraphicStorageHandler->loadGraphic(rURL);
+return m_xXMLGraphicHelper->loadGraphic(rURL);
}
uno::Reference SAL_CALL
SvXMLGraphicImportExportHelper::loadGraphicFromOutputStream(uno::Reference
const & rxOutputStream)
{
-return
m_xGraphicStorageHandler->loadGraphicFromOutputStream(rxOutputStream);
+return m_xXMLGraphicHelper->loadGraphicFromOutputStream(rxOutputStream);
}
OUString SAL_CALL
SvXMLGraphicImportExportHelper::saveGraphic(css::uno::Reference
const & rxGraphic)
{
-return m_xGraphicStorageHandler->saveGraphic(rxGraphic);
+return m_xXMLGraphicHelper->saveGraphic(rxGraphic);
}
OUString SAL_CALL
SvXMLGraphicImportExportHelper::saveGraphicByName(css::uno::Reference
const & rxGraphic,
OUString &
rOutSavedMimeType, OUString const & rRequestName)
{
-return m_xGraphicStorageHandler->saveGraphicByName(rxGraphic,
rOutSavedMimeType, rRequestName);
+return m_xXMLGraphicHelper->saveGraphicByName(rxGraphic,
rOutSavedMimeType, rRequestName);
}
uno::Reference SAL_CALL
SvXMLGraphicImportExportHelper::createInputStream(uno::Reference
const & rxGraphic)
{
-return m_xGraphicStorageHandler->createInputStream(rxGraphic);
+return m_xXMLGraphicHelper->createInputStream(rxGraphic);
}
// XBinaryStreamResolver
Reference< io::XInputStream > SAL_CALL
SvXMLGraphicImportExportHelper::getInputStream( const OUString& aURL )
{
-return m_xBinaryStreamResolver->getInputStream( aURL );
+return m_xXMLGraphicHelper->getInputStream( aURL );
}
Reference< io::XOutputStream > SAL_CALL
SvXMLGraphicImportExportHelper::createOutputStream()
{
-return m_xBinaryStreamResolver->createOutputStream();
+return m_xXMLGraphicHelper->createOutputStream();
}
OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const
Reference< io::XOutputStream >& aBinaryStream )
{
-return m_xBinaryStreamResolver->resolveOutputStream( aBinaryStream );
+return m_xXMLGraphicHelper->resolveOutputStream( aBinaryStream );
}
// XServiceInfo
[Libreoffice-commits] core.git: framework/inc framework/source
framework/inc/uielement/statusbaritem.hxx| 10 --
framework/source/uielement/statusbaritem.cxx | 12 +---
2 files changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 8566b3f8d2c89ac408e5a66335f978848bfc9e9f
Author: Noel Grandin
AuthorDate: Fri Dec 24 20:42:20 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 26 08:23:53 2021 +0100
use comphelper::WeakComponentImplHelper in StatusbarItem
Change-Id: I2c278547d16c5ad0530188f1e465cb784d345746
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127460
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/inc/uielement/statusbaritem.hxx
b/framework/inc/uielement/statusbaritem.hxx
index 62e3c1f4e62e..44fecd1dff68 100644
--- a/framework/inc/uielement/statusbaritem.hxx
+++ b/framework/inc/uielement/statusbaritem.hxx
@@ -19,8 +19,7 @@
#pragma once
#include
-#include
-#include
+#include
#include
class StatusBar;
@@ -30,10 +29,9 @@ namespace framework
struct AddonStatusbarItemData;
-typedef cppu::WeakComponentImplHelper< css::ui::XStatusbarItem >
StatusbarItem_Base;
+typedef comphelper::WeakComponentImplHelper< css::ui::XStatusbarItem >
StatusbarItem_Base;
-class StatusbarItem final : protected cppu::BaseMutex,
- public StatusbarItem_Base
+class StatusbarItem final : public StatusbarItem_Base
{
public:
explicit StatusbarItem(
@@ -42,7 +40,7 @@ public:
const OUString& aCommand );
virtual ~StatusbarItem() override;
-void SAL_CALL disposing() override;
+void disposing(std::unique_lock&) override;
// css::ui::XStatusbarItem Attributes
virtual OUString SAL_CALL getCommand() override;
diff --git a/framework/source/uielement/statusbaritem.cxx
b/framework/source/uielement/statusbaritem.cxx
index a453f0079fc0..27985791ae86 100644
--- a/framework/source/uielement/statusbaritem.cxx
+++ b/framework/source/uielement/statusbaritem.cxx
@@ -62,8 +62,7 @@ StatusbarItem::StatusbarItem(
StatusBar *pStatusBar,
sal_uInt16 nId,
const OUString&aCommand )
-: StatusbarItem_Base( m_aMutex )
-, m_pStatusBar( pStatusBar )
+: m_pStatusBar( pStatusBar )
, m_nId( nId )
, m_nStyle( 0 )
, m_aCommand( aCommand )
@@ -77,21 +76,20 @@ StatusbarItem::~StatusbarItem()
{
}
-void SAL_CALL StatusbarItem::disposing()
+void StatusbarItem::disposing(std::unique_lock&)
{
-osl::MutexGuard aGuard( m_aMutex );
m_pStatusBar = nullptr;
}
OUString SAL_CALL StatusbarItem::getCommand()
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
return m_aCommand;
}
::sal_uInt16 SAL_CALL StatusbarItem::getItemId()
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
return m_nId;
}
@@ -106,7 +104,7 @@ OUString SAL_CALL StatusbarItem::getCommand()
::sal_uInt16 SAL_CALL StatusbarItem::getStyle()
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
return m_nStyle;
}
[Libreoffice-commits] core.git: framework/inc framework/source
framework/inc/uielement/uicommanddescription.hxx|8 +++-
framework/source/uielement/uicommanddescription.cxx | 14 ++
2 files changed, 9 insertions(+), 13 deletions(-)
New commits:
commit a839a6afada46b44095be184548f6fa75d80e961
Author: Noel Grandin
AuthorDate: Fri Dec 24 20:46:01 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 26 08:23:14 2021 +0100
use comphelper::WeakComponentImplHelper in UICommandDescription
Change-Id: I042c9761c60d3b1c39950cfede80958edf2d84c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127461
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/inc/uielement/uicommanddescription.hxx
b/framework/inc/uielement/uicommanddescription.hxx
index 146b4f42db3a..aeeb1f9aa216 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -26,19 +26,17 @@
#include
#include
-#include
-#include
+#include
#include
#include
#include
namespace framework
{
-typedef ::cppu::WeakComponentImplHelper< css::lang::XServiceInfo,
+typedef comphelper::WeakComponentImplHelper< css::lang::XServiceInfo,
css::container::XNameAccess > UICommandDescription_BASE;
-class UICommandDescription : private cppu::BaseMutex,
- public UICommandDescription_BASE
+class UICommandDescription : public UICommandDescription_BASE
{
public:
UICommandDescription( const css::uno::Reference<
css::uno::XComponentContext >& rxContext );
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index 682b482766fc..9f81afced1a7 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -565,8 +565,7 @@ void
UICommandDescription::ensureGenericUICommandsForLanguage(const LanguageTag&
}
UICommandDescription::UICommandDescription(const Reference< XComponentContext
>& rxContext)
-: UICommandDescription_BASE(m_aMutex)
-, m_aPrivateResourceURL(PRIVATE_RESOURCE_URL)
+: m_aPrivateResourceURL(PRIVATE_RESOURCE_URL)
, m_xContext(rxContext)
{
SvtSysLocale aSysLocale;
@@ -584,14 +583,13 @@ UICommandDescription::UICommandDescription(const
Reference< XComponentContext >&
}
UICommandDescription::UICommandDescription(const Reference< XComponentContext
>& rxContext, bool)
-: UICommandDescription_BASE(m_aMutex)
-, m_xContext(rxContext)
+: m_xContext(rxContext)
{
}
UICommandDescription::~UICommandDescription()
{
-osl::MutexGuard g(rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
m_aModuleToCommandFileMap.clear();
m_aUICommandsHashMap.clear();
m_xGenericUICommands.clear();
@@ -637,7 +635,7 @@ Any SAL_CALL UICommandDescription::getByName( const
OUString& aName )
const LanguageTag& rCurrentLanguage = aSysLocale.GetUILanguageTag();
Any a;
-osl::MutexGuard g(rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
ModuleToCommandFileMap::const_iterator pM2CIter =
m_aModuleToCommandFileMap.find( aName );
if ( pM2CIter != m_aModuleToCommandFileMap.end() )
@@ -682,14 +680,14 @@ Any SAL_CALL UICommandDescription::getByName( const
OUString& aName )
Sequence< OUString > SAL_CALL UICommandDescription::getElementNames()
{
-osl::MutexGuard g(rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
return comphelper::mapKeysToSequence( m_aModuleToCommandFileMap );
}
sal_Bool SAL_CALL UICommandDescription::hasByName( const OUString& aName )
{
-osl::MutexGuard g(rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
ModuleToCommandFileMap::const_iterator pIter =
m_aModuleToCommandFileMap.find( aName );
return ( pIter != m_aModuleToCommandFileMap.end() );
[Libreoffice-commits] core.git: framework/source
framework/source/services/substitutepathvars.cxx | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 92c0775f2fa4f90ef9a19cb1d466e6bfec3dd9f0
Author: Noel Grandin
AuthorDate: Fri Dec 24 20:49:12 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 26 08:22:42 2021 +0100
use comphelper::WeakComponentImplHelper in SubstitutePathVariables
Change-Id: I1b41ae57b65b42ef63d2d2c026cf78a00b5b937d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127462
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/services/substitutepathvars.cxx
b/framework/source/services/substitutepathvars.cxx
index 84725a3a18c4..bf50f889a9e4 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -20,8 +20,7 @@
#include
#include
-#include
-#include
+#include
#include
#include
@@ -129,12 +128,11 @@ struct ReSubstFixedVarOrder
}
};
-typedef ::cppu::WeakComponentImplHelper<
+typedef comphelper::WeakComponentImplHelper<
css::util::XStringSubstitution,
css::lang::XServiceInfo > SubstitutePathVariables_BASE;
-class SubstitutePathVariables : private cppu::BaseMutex,
-public SubstitutePathVariables_BASE
+class SubstitutePathVariables : public SubstitutePathVariables_BASE
{
public:
explicit SubstitutePathVariables(const css::uno::Reference<
css::uno::XComponentContext >& xContext);
@@ -191,7 +189,6 @@ private:
};
SubstitutePathVariables::SubstitutePathVariables( const Reference<
XComponentContext >& xContext ) :
-SubstitutePathVariables_BASE(m_aMutex),
m_xContext( xContext )
{
SetPredefinedPathVariables();
@@ -227,19 +224,19 @@ SubstitutePathVariables::SubstitutePathVariables( const
Reference< XComponentCon
// XStringSubstitution
OUString SAL_CALL SubstitutePathVariables::substituteVariables( const
OUString& aText, sal_Bool bSubstRequired )
{
-osl::MutexGuard g(rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
return impl_substituteVariable( aText, bSubstRequired );
}
OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const
OUString& aText )
{
-osl::MutexGuard g(rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
return impl_reSubstituteVariables( aText );
}
OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const
OUString& aVariable )
{
-osl::MutexGuard g(rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
return impl_getSubstituteVariableValue( aVariable );
}
[Libreoffice-commits] core.git: framework/source
framework/source/services/taskcreatorsrv.cxx | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 2d1ed93e46e01f575b3f3755bf9f5da0d6f370ef
Author: Noel Grandin
AuthorDate: Fri Dec 24 20:50:28 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 26 08:22:20 2021 +0100
use comphelper::WeakComponentImplHelper in TaskCreatorService
Change-Id: I2414ef01bc0990c68bb6fa02a897bfa19d7982a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127463
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/services/taskcreatorsrv.cxx
b/framework/source/services/taskcreatorsrv.cxx
index 9ce0941fb745..c484e115d7c6 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -35,8 +35,7 @@
#include
#include
-#include
-#include
+#include
#include
#include
#include
@@ -47,12 +46,11 @@ using namespace framework;
namespace {
-typedef ::cppu::WeakComponentImplHelper<
+typedef comphelper::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::lang::XSingleServiceFactory> TaskCreatorService_BASE;
-class TaskCreatorService : private cppu::BaseMutex,
- public TaskCreatorService_BASE
+class TaskCreatorService : public TaskCreatorService_BASE
{
private:
@@ -106,8 +104,7 @@ private:
};
TaskCreatorService::TaskCreatorService(const css::uno::Reference<
css::uno::XComponentContext >& xContext)
-: TaskCreatorService_BASE(m_aMutex)
-, m_xContext (xContext )
+: m_xContext (xContext )
{
}
[Libreoffice-commits] core.git: framework/source
framework/source/uiconfiguration/windowstateconfiguration.cxx | 17 --
1 file changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 058c64ad17ef8ed0d7f583a804368aa8d0071e59
Author: Noel Grandin
AuthorDate: Fri Dec 24 20:54:15 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 26 08:21:59 2021 +0100
use comphelper::WeakComponentImplHelper in WindowStateConfiguration
Change-Id: Iada515ab1926aa1e0b7a3f39690d7c6eebf28aea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127465
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx
b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index cc6f72f36a11..acb0ae059ff9 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -36,8 +36,7 @@
#include
#include
-#include
-#include
+#include
#include
#include
#include
@@ -1222,11 +1221,10 @@ void
ConfigurationAccess_WindowState::impl_initializeConfigAccess()
}
}
-typedef ::cppu::WeakComponentImplHelper< css::container::XNameAccess,
+typedef comphelper::WeakComponentImplHelper< css::container::XNameAccess,
css::lang::XServiceInfo> WindowStateConfiguration_BASE;
-class WindowStateConfiguration : private cppu::BaseMutex,
- public WindowStateConfiguration_BASE
+class WindowStateConfiguration : public WindowStateConfiguration_BASE
{
public:
explicit WindowStateConfiguration( const css::uno::Reference<
css::uno::XComponentContext >& rxContext );
@@ -1271,7 +1269,6 @@ private:
};
WindowStateConfiguration::WindowStateConfiguration( const Reference<
XComponentContext >& rxContext ) :
-WindowStateConfiguration_BASE(m_aMutex),
m_xContext( rxContext )
{
css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =
@@ -1317,14 +1314,14 @@ WindowStateConfiguration::WindowStateConfiguration(
const Reference< XComponentC
WindowStateConfiguration::~WindowStateConfiguration()
{
-osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
m_aModuleToFileHashMap.clear();
m_aModuleToWindowStateHashMap.clear();
}
Any SAL_CALL WindowStateConfiguration::getByName( const OUString&
aModuleIdentifier )
{
-osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
ModuleToWindowStateFileMap::const_iterator pIter =
m_aModuleToFileHashMap.find( aModuleIdentifier );
if ( pIter != m_aModuleToFileHashMap.end() )
@@ -1353,14 +1350,14 @@ Any SAL_CALL WindowStateConfiguration::getByName( const
OUString& aModuleIdentif
Sequence< OUString > SAL_CALL WindowStateConfiguration::getElementNames()
{
-osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
return comphelper::mapKeysToSequence( m_aModuleToFileHashMap );
}
sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const OUString& aName )
{
-osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
ModuleToWindowStateFileMap::const_iterator pIter =
m_aModuleToFileHashMap.find( aName );
return ( pIter != m_aModuleToFileHashMap.end() );
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/ar/recsave.png |binary icon-themes/colibre/cmd/32/mailmergesavedocuments.png |binary icon-themes/colibre/cmd/32/recsave.png|binary icon-themes/colibre/cmd/32/save.png |binary icon-themes/colibre/cmd/32/saveacopy.png |binary icon-themes/colibre/cmd/32/saveall.png|binary icon-themes/colibre/cmd/32/saveas.png |binary icon-themes/colibre/cmd/32/saveasremote.png |binary icon-themes/colibre/cmd/32/saveastemplate.png |binary icon-themes/colibre/cmd/32/savebackground.png |binary icon-themes/colibre/cmd/ar/lc_recsave.png |binary icon-themes/colibre/cmd/ar/sc_recsave.png |binary icon-themes/colibre/cmd/lc_mailmergesavedocuments.png |binary icon-themes/colibre/cmd/lc_recsave.png|binary icon-themes/colibre/cmd/lc_save.png |binary icon-themes/colibre/cmd/lc_saveacopy.png |binary icon-themes/colibre/cmd/lc_saveall.png|binary icon-themes/colibre/cmd/lc_saveasremote.png |binary icon-themes/colibre/cmd/lc_saveastemplate.png |binary icon-themes/colibre/cmd/lc_savebackground.png |binary icon-themes/colibre/cmd/sc_mailmergesavedocuments.png |binary icon-themes/colibre/cmd/sc_recsave.png|binary icon-themes/colibre/cmd/sc_save.png |binary icon-themes/colibre/cmd/sc_saveacopy.png |binary icon-themes/colibre/cmd/sc_saveas.png |binary icon-themes/colibre/cmd/sc_saveasremote.png |binary icon-themes/colibre/cmd/sc_saveastemplate.png |binary icon-themes/colibre/cmd/sc_savebackground.png |binary icon-themes/colibre/res/savemodified_extralarge.png |binary icon-themes/colibre/res/savemodified_large.png|binary icon-themes/colibre/res/savemodified_small.png|binary icon-themes/colibre_svg/cmd/32/ar/recsave.svg |2 +- icon-themes/colibre_svg/cmd/32/mailmergesavedocuments.svg |2 +- icon-themes/colibre_svg/cmd/32/recsave.svg|2 +- icon-themes/colibre_svg/cmd/32/save.svg |2 +- icon-themes/colibre_svg/cmd/32/saveacopy.svg |2 +- icon-themes/colibre_svg/cmd/32/saveall.svg|2 +- icon-themes/colibre_svg/cmd/32/saveas.svg |2 +- icon-themes/colibre_svg/cmd/32/saveasremote.svg |2 +- icon-themes/colibre_svg/cmd/32/saveastemplate.svg |2 +- icon-themes/colibre_svg/cmd/32/savebackground.svg |2 +- icon-themes/colibre_svg/cmd/ar/lc_recsave.svg |2 +- icon-themes/colibre_svg/cmd/ar/sc_recsave.svg |3 +-- icon-themes/colibre_svg/cmd/lc_mailmergesavedocuments.svg |2 +- icon-themes/colibre_svg/cmd/lc_recsave.svg|2 +- icon-themes/colibre_svg/cmd/lc_save.svg |2 +- icon-themes/colibre_svg/cmd/lc_saveacopy.svg |2 +- icon-themes/colibre_svg/cmd/lc_saveall.svg|2 +- icon-themes/colibre_svg/cmd/lc_saveasremote.svg |2 +- icon-themes/colibre_svg/cmd/lc_saveastemplate.svg |2 +- icon-themes/colibre_svg/cmd/lc_savebackground.svg |2 +- icon-themes/colibre_svg/cmd/sc_mailmergesavedocuments.svg |2 +- icon-themes/colibre_svg/cmd/sc_recsave.svg|3 +-- icon-themes/colibre_svg/cmd/sc_save.svg |2 +- icon-themes/colibre_svg/cmd/sc_saveacopy.svg |2 +- icon-themes/colibre_svg/cmd/sc_saveas.svg |2 +- icon-themes/colibre_svg/cmd/sc_saveasremote.svg |2 +- icon-themes/colibre_svg/cmd/sc_saveastemplate.svg |3 +-- icon-themes/colibre_svg/cmd/sc_savebackground.svg |3 +-- icon-themes/colibre_svg/res/savemodified_extralarge.svg |2 +- icon-themes/colibre_svg/res/savemodified_large.svg|2 +- icon-themes/colibre_svg/res/savemodified_small.svg|2 +- 62 files changed, 31 insertions(+), 35 deletions(-) New commits: commit 5abdeb97d14a956b152ff7c08add9f313d554358 Author: Rizal Muttaqin AuthorDate: Sat Dec 25 21:07:14 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sun Dec 26 01:55:11 2021 +0100 Colibre: update Save related icons Change-Id: I01542908edf1d855fe723e0a7818cd05297f49aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127473 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/ar/recsave.png b/icon-themes/colibre/cmd/32/ar/recsave.png index 7389970a1ff3..ecb925d2d1d3 100644 Binary files a/icon-themes/colibre/cmd/32/ar/recsave.png and b/icon-themes/colibre/cmd/32/ar/recsave.png differ diff --git a/icon-themes/colibre/cmd/32/mailme
[Libreoffice-commits] core.git: comphelper/source include/comphelper
comphelper/source/misc/compbase.cxx |5 -
include/comphelper/compbase.hxx |1 -
2 files changed, 6 deletions(-)
New commits:
commit 9f5188173a4a37a9d41ee90a874f1f17136e
Author: Mike Kaganski
AuthorDate: Sat Dec 25 19:29:32 2021 +0100
Commit: Jan-Marek Glogowski
CommitDate: Sat Dec 25 23:35:39 2021 +0100
Revert "Init WeakComponentImplHelperBase::m_bDisposed"
This reverts commit c1f21a6ce6491ac82a022502c618e2758d3b3a31.
Reason for revert: a better fix is implemented in commit
f0c0c62c10e4ffdb9ce44202e2540d2f39a9fcb5
author Noel Grandin
dateSat Dec 25 11:43:11 2021 +0200
uninitialised field in comphelper::WeakComponentImplHelperBase
That change allows to keep the ctor implicitly defined and inline.
Change-Id: Icb8064ebc77d4120d279d30df5de4ebee5479b4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127474
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/comphelper/source/misc/compbase.cxx
b/comphelper/source/misc/compbase.cxx
index b8a207ceedb1..6e2019a255ae 100644
--- a/comphelper/source/misc/compbase.cxx
+++ b/comphelper/source/misc/compbase.cxx
@@ -11,11 +11,6 @@
namespace comphelper
{
-WeakComponentImplHelperBase::WeakComponentImplHelperBase()
-: m_bDisposed(false)
-{
-}
-
WeakComponentImplHelperBase::~WeakComponentImplHelperBase() {}
// css::lang::XComponent
diff --git a/include/comphelper/compbase.hxx b/include/comphelper/compbase.hxx
index ce3e44b3732e..5b7e1f7ba7a1 100644
--- a/include/comphelper/compbase.hxx
+++ b/include/comphelper/compbase.hxx
@@ -31,7 +31,6 @@ class COMPHELPER_DLLPUBLIC WeakComponentImplHelperBase :
public cppu::OWeakObjec
public
css::lang::XComponent
{
public:
-WeakComponentImplHelperBase();
virtual ~WeakComponentImplHelperBase() override;
// css::lang::XComponent
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/source
sc/source/core/tool/interpr1.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit eb050ea5b004e2f4a6ba96474177251f678707e9 Author: Eike Rathke AuthorDate: Sat Dec 25 19:38:14 2021 +0100 Commit: Eike Rathke CommitDate: Sat Dec 25 23:20:45 2021 +0100 Related: tdf#146377 Let AND(), OR(), XOR() propagate the current error, if any ... instead of forcing Err:504 Change-Id: I7e91671ffc61bf82d9095378656b41981040f55e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127492 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit 4674ff347cd2e71445503efdc0c110d094daa80b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127476 diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index fae8a6eeb222..345ab7115815 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -1342,7 +1342,7 @@ void ScInterpreter::ScAnd() } break; default: -Pop(); +PopError(); SetError( FormulaError::IllegalParameter); } } @@ -1441,7 +1441,7 @@ void ScInterpreter::ScOr() } break; default: -Pop(); +PopError(); SetError( FormulaError::IllegalParameter); } } @@ -1543,7 +1543,7 @@ void ScInterpreter::ScXor() } break; default: -Pop(); +PopError(); SetError( FormulaError::IllegalParameter); } }
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/dbaccess/res/lc039.png |binary icon-themes/colibre/dbaccess/res/sc039.png |binary icon-themes/colibre/sd/res/pagobjex.png|binary icon-themes/colibre/sw/res/sc20248.png |binary icon-themes/colibre_svg/dbaccess/res/lc039.svg |2 +- icon-themes/colibre_svg/dbaccess/res/sc039.svg |3 ++- icon-themes/colibre_svg/sd/res/pagobjex.svg|2 +- icon-themes/colibre_svg/sw/res/sc20248.svg |3 ++- 8 files changed, 6 insertions(+), 4 deletions(-) New commits: commit 8d95c59b79516fe1eab0fd8612962470bce303e1 Author: Rizal Muttaqin AuthorDate: Sat Dec 25 22:14:08 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Dec 25 22:53:34 2021 +0100 Colibre: update Save related icons part II Change-Id: Ic2bbd21ae12d8465cc8ba1f6429e0c516f6dbc59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127458 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit 5e528165e2e6026d2d1ba3386f2b45544c0c6ab1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127475 diff --git a/icon-themes/colibre/dbaccess/res/lc039.png b/icon-themes/colibre/dbaccess/res/lc039.png index d117989919f5..b9bab570f49c 100644 Binary files a/icon-themes/colibre/dbaccess/res/lc039.png and b/icon-themes/colibre/dbaccess/res/lc039.png differ diff --git a/icon-themes/colibre/dbaccess/res/sc039.png b/icon-themes/colibre/dbaccess/res/sc039.png index 4b1624a98118..36543dd673bd 100644 Binary files a/icon-themes/colibre/dbaccess/res/sc039.png and b/icon-themes/colibre/dbaccess/res/sc039.png differ diff --git a/icon-themes/colibre/sd/res/pagobjex.png b/icon-themes/colibre/sd/res/pagobjex.png index 96e31e3b0a4b..84f89c318bb8 100644 Binary files a/icon-themes/colibre/sd/res/pagobjex.png and b/icon-themes/colibre/sd/res/pagobjex.png differ diff --git a/icon-themes/colibre/sw/res/sc20248.png b/icon-themes/colibre/sw/res/sc20248.png index 0cfd3323ec37..4da40ea96cef 100644 Binary files a/icon-themes/colibre/sw/res/sc20248.png and b/icon-themes/colibre/sw/res/sc20248.png differ diff --git a/icon-themes/colibre_svg/dbaccess/res/lc039.svg b/icon-themes/colibre_svg/dbaccess/res/lc039.svg index 9867e7ef3cf9..51bebd1ac2e6 100644 --- a/icon-themes/colibre_svg/dbaccess/res/lc039.svg +++ b/icon-themes/colibre_svg/dbaccess/res/lc039.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/dbaccess/res/sc039.svg b/icon-themes/colibre_svg/dbaccess/res/sc039.svg index d09059c87ba5..14df9c01968f 100644 --- a/icon-themes/colibre_svg/dbaccess/res/sc039.svg +++ b/icon-themes/colibre_svg/dbaccess/res/sc039.svg @@ -1,4 +1,5 @@ http://www.w3.org/2000/svg";> -/&gt; \ No newline at end of file + +/&amp;gt; \ No newline at end of file diff --git a/icon-themes/colibre_svg/sd/res/pagobjex.svg b/icon-themes/colibre_svg/sd/res/pagobjex.svg index ca8df96d5760..4301823d3d6b 100644 --- a/icon-themes/colibre_svg/sd/res/pagobjex.svg +++ b/icon-themes/colibre_svg/sd/res/pagobjex.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/sw/res/sc20248.svg b/icon-themes/colibre_svg/sw/res/sc20248.svg index 7529ef40d616..a97720f96aea 100644 --- a/icon-themes/colibre_svg/sw/res/sc20248.svg +++ b/icon-themes/colibre_svg/sw/res/sc20248.svg @@ -1 +1,2 @@ -http://www.w3.org/2000/svg";>/&gt; \ No newline at end of file +http://www.w3.org/2000/svg";> +/&amp;gt; \ No newline at end of file
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr1.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 4674ff347cd2e71445503efdc0c110d094daa80b Author: Eike Rathke AuthorDate: Sat Dec 25 19:38:14 2021 +0100 Commit: Eike Rathke CommitDate: Sat Dec 25 22:29:25 2021 +0100 Related: tdf#146377 Let AND(), OR(), XOR() propagate the current error, if any ... instead of forcing Err:504 Change-Id: I7e91671ffc61bf82d9095378656b41981040f55e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127492 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index fae8a6eeb222..345ab7115815 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -1342,7 +1342,7 @@ void ScInterpreter::ScAnd() } break; default: -Pop(); +PopError(); SetError( FormulaError::IllegalParameter); } } @@ -1441,7 +1441,7 @@ void ScInterpreter::ScOr() } break; default: -Pop(); +PopError(); SetError( FormulaError::IllegalParameter); } } @@ -1543,7 +1543,7 @@ void ScInterpreter::ScXor() } break; default: -Pop(); +PopError(); SetError( FormulaError::IllegalParameter); } }
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/ar/recsave.png |binary icon-themes/colibre/cmd/32/mailmergesavedocuments.png |binary icon-themes/colibre/cmd/32/recsave.png|binary icon-themes/colibre/cmd/32/save.png |binary icon-themes/colibre/cmd/32/saveacopy.png |binary icon-themes/colibre/cmd/32/saveall.png|binary icon-themes/colibre/cmd/32/saveas.png |binary icon-themes/colibre/cmd/32/saveasremote.png |binary icon-themes/colibre/cmd/32/saveastemplate.png |binary icon-themes/colibre/cmd/32/savebackground.png |binary icon-themes/colibre/cmd/ar/lc_recsave.png |binary icon-themes/colibre/cmd/ar/sc_recsave.png |binary icon-themes/colibre/cmd/lc_mailmergesavedocuments.png |binary icon-themes/colibre/cmd/lc_recsave.png|binary icon-themes/colibre/cmd/lc_save.png |binary icon-themes/colibre/cmd/lc_saveacopy.png |binary icon-themes/colibre/cmd/lc_saveall.png|binary icon-themes/colibre/cmd/lc_saveasremote.png |binary icon-themes/colibre/cmd/lc_saveastemplate.png |binary icon-themes/colibre/cmd/lc_savebackground.png |binary icon-themes/colibre/cmd/sc_mailmergesavedocuments.png |binary icon-themes/colibre/cmd/sc_recsave.png|binary icon-themes/colibre/cmd/sc_save.png |binary icon-themes/colibre/cmd/sc_saveacopy.png |binary icon-themes/colibre/cmd/sc_saveas.png |binary icon-themes/colibre/cmd/sc_saveasremote.png |binary icon-themes/colibre/cmd/sc_saveastemplate.png |binary icon-themes/colibre/cmd/sc_savebackground.png |binary icon-themes/colibre/res/savemodified_extralarge.png |binary icon-themes/colibre/res/savemodified_large.png|binary icon-themes/colibre/res/savemodified_small.png|binary icon-themes/colibre_svg/cmd/32/ar/recsave.svg |2 +- icon-themes/colibre_svg/cmd/32/mailmergesavedocuments.svg |2 +- icon-themes/colibre_svg/cmd/32/recsave.svg|2 +- icon-themes/colibre_svg/cmd/32/save.svg |2 +- icon-themes/colibre_svg/cmd/32/saveacopy.svg |2 +- icon-themes/colibre_svg/cmd/32/saveall.svg|2 +- icon-themes/colibre_svg/cmd/32/saveas.svg |2 +- icon-themes/colibre_svg/cmd/32/saveasremote.svg |2 +- icon-themes/colibre_svg/cmd/32/saveastemplate.svg |2 +- icon-themes/colibre_svg/cmd/32/savebackground.svg |2 +- icon-themes/colibre_svg/cmd/ar/lc_recsave.svg |2 +- icon-themes/colibre_svg/cmd/ar/sc_recsave.svg |3 +-- icon-themes/colibre_svg/cmd/lc_mailmergesavedocuments.svg |2 +- icon-themes/colibre_svg/cmd/lc_recsave.svg|2 +- icon-themes/colibre_svg/cmd/lc_save.svg |2 +- icon-themes/colibre_svg/cmd/lc_saveacopy.svg |2 +- icon-themes/colibre_svg/cmd/lc_saveall.svg|2 +- icon-themes/colibre_svg/cmd/lc_saveasremote.svg |2 +- icon-themes/colibre_svg/cmd/lc_saveastemplate.svg |2 +- icon-themes/colibre_svg/cmd/lc_savebackground.svg |2 +- icon-themes/colibre_svg/cmd/sc_mailmergesavedocuments.svg |2 +- icon-themes/colibre_svg/cmd/sc_recsave.svg|3 +-- icon-themes/colibre_svg/cmd/sc_save.svg |2 +- icon-themes/colibre_svg/cmd/sc_saveacopy.svg |2 +- icon-themes/colibre_svg/cmd/sc_saveas.svg |2 +- icon-themes/colibre_svg/cmd/sc_saveasremote.svg |2 +- icon-themes/colibre_svg/cmd/sc_saveastemplate.svg |3 +-- icon-themes/colibre_svg/cmd/sc_savebackground.svg |3 +-- icon-themes/colibre_svg/res/savemodified_extralarge.svg |2 +- icon-themes/colibre_svg/res/savemodified_large.svg|2 +- icon-themes/colibre_svg/res/savemodified_small.svg|2 +- 62 files changed, 31 insertions(+), 35 deletions(-) New commits: commit b7acac77f5bff97b3d525507a64c3d6bea8b43e1 Author: Rizal Muttaqin AuthorDate: Sat Dec 25 21:07:14 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Dec 25 21:55:57 2021 +0100 Colibre: update Save related icons Change-Id: I01542908edf1d855fe723e0a7818cd05297f49aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127457 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/ar/recsave.png b/icon-themes/colibre/cmd/32/ar/recsave.png index 7389970a1ff3..ecb925d2d1d3 100644 Binary files a/icon-themes/colibre/cmd/32/ar/recsave.png and b/icon-themes/colibre/cmd/32/ar/recsave.png differ diff --git a/icon-themes/colibre/cmd/32/mailme
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/dbaccess/res/lc039.png |binary icon-themes/colibre/dbaccess/res/sc039.png |binary icon-themes/colibre/sd/res/pagobjex.png|binary icon-themes/colibre/sw/res/sc20248.png |binary icon-themes/colibre_svg/dbaccess/res/lc039.svg |2 +- icon-themes/colibre_svg/dbaccess/res/sc039.svg |3 ++- icon-themes/colibre_svg/sd/res/pagobjex.svg|2 +- icon-themes/colibre_svg/sw/res/sc20248.svg |3 ++- 8 files changed, 6 insertions(+), 4 deletions(-) New commits: commit 5e528165e2e6026d2d1ba3386f2b45544c0c6ab1 Author: Rizal Muttaqin AuthorDate: Sat Dec 25 22:14:08 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Dec 25 21:55:37 2021 +0100 Colibre: update Save related icons part II Change-Id: Ic2bbd21ae12d8465cc8ba1f6429e0c516f6dbc59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127458 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/dbaccess/res/lc039.png b/icon-themes/colibre/dbaccess/res/lc039.png index d117989919f5..b9bab570f49c 100644 Binary files a/icon-themes/colibre/dbaccess/res/lc039.png and b/icon-themes/colibre/dbaccess/res/lc039.png differ diff --git a/icon-themes/colibre/dbaccess/res/sc039.png b/icon-themes/colibre/dbaccess/res/sc039.png index 4b1624a98118..36543dd673bd 100644 Binary files a/icon-themes/colibre/dbaccess/res/sc039.png and b/icon-themes/colibre/dbaccess/res/sc039.png differ diff --git a/icon-themes/colibre/sd/res/pagobjex.png b/icon-themes/colibre/sd/res/pagobjex.png index 96e31e3b0a4b..84f89c318bb8 100644 Binary files a/icon-themes/colibre/sd/res/pagobjex.png and b/icon-themes/colibre/sd/res/pagobjex.png differ diff --git a/icon-themes/colibre/sw/res/sc20248.png b/icon-themes/colibre/sw/res/sc20248.png index 0cfd3323ec37..4da40ea96cef 100644 Binary files a/icon-themes/colibre/sw/res/sc20248.png and b/icon-themes/colibre/sw/res/sc20248.png differ diff --git a/icon-themes/colibre_svg/dbaccess/res/lc039.svg b/icon-themes/colibre_svg/dbaccess/res/lc039.svg index 9867e7ef3cf9..51bebd1ac2e6 100644 --- a/icon-themes/colibre_svg/dbaccess/res/lc039.svg +++ b/icon-themes/colibre_svg/dbaccess/res/lc039.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/dbaccess/res/sc039.svg b/icon-themes/colibre_svg/dbaccess/res/sc039.svg index d09059c87ba5..14df9c01968f 100644 --- a/icon-themes/colibre_svg/dbaccess/res/sc039.svg +++ b/icon-themes/colibre_svg/dbaccess/res/sc039.svg @@ -1,4 +1,5 @@ http://www.w3.org/2000/svg";> -/&gt; \ No newline at end of file + +/&amp;gt; \ No newline at end of file diff --git a/icon-themes/colibre_svg/sd/res/pagobjex.svg b/icon-themes/colibre_svg/sd/res/pagobjex.svg index ca8df96d5760..4301823d3d6b 100644 --- a/icon-themes/colibre_svg/sd/res/pagobjex.svg +++ b/icon-themes/colibre_svg/sd/res/pagobjex.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/sw/res/sc20248.svg b/icon-themes/colibre_svg/sw/res/sc20248.svg index 7529ef40d616..a97720f96aea 100644 --- a/icon-themes/colibre_svg/sw/res/sc20248.svg +++ b/icon-themes/colibre_svg/sw/res/sc20248.svg @@ -1 +1,2 @@ -http://www.w3.org/2000/svg";>/&gt; \ No newline at end of file +http://www.w3.org/2000/svg";> +/&amp;gt; \ No newline at end of file
[Libreoffice-commits] core.git: 2 commits - framework/inc framework/source
framework/inc/uielement/menubarmanager.hxx |9 +++---
framework/source/services/ContextChangeEventMultiplexer.cxx | 16 ++--
framework/source/uielement/menubarmanager.cxx | 15 +--
3 files changed, 19 insertions(+), 21 deletions(-)
New commits:
commit d4257daba1155ebccbfebea99bad0e4152ca9b08
Author: Noel Grandin
AuthorDate: Fri Dec 24 20:58:28 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 25 19:34:05 2021 +0100
use comphelper::WeakComponentImplHelper in MenuBarManager
Change-Id: I687f71c5af810618b3ab27b004bf765b53d7b8e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127466
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/inc/uielement/menubarmanager.hxx
b/framework/inc/uielement/menubarmanager.hxx
index a77552a67213..079d127d4d83 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -41,8 +41,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
namespace framework
@@ -56,8 +56,7 @@ struct PopupControllerEntry
typedef std::unordered_map< OUString, PopupControllerEntry >
PopupControllerCache;
class MenuBarManager final :
-protected cppu::BaseMutex,
-public cppu::WeakComponentImplHelper<
+public comphelper::WeakComponentImplHelper<
css::frame::XStatusListener,
css::frame::XFrameActionListener,
css::ui::XUIConfigurationListener,
@@ -121,7 +120,7 @@ class MenuBarManager final :
DECL_LINK( Deactivate, Menu *, bool );
DECL_LINK( AsyncSettingsHdl, Timer *, void );
-void SAL_CALL disposing() override;
+void disposing(std::unique_lock&) override;
void RemoveListener();
void RequestImages();
void RetrieveImageManagers();
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 08998a4b8fe8..7b856a01d43d 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -87,8 +87,7 @@ MenuBarManager::MenuBarManager(
const Reference< XDispatchProvider >& rDispatchProvider,
const OUString& rModuleIdentifier,
Menu* pMenu, bool bDelete, bool bHasMenuBar ):
-WeakComponentImplHelper( m_aMutex )
-, m_bRetrieveImages( false )
+ m_bRetrieveImages( false )
, m_bAcceleratorCfg( false )
, m_bHasMenuBar( bHasMenuBar )
, m_xContext(rxContext)
@@ -104,7 +103,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence<
sal_Int8 >& /*Proces
{
SolarMutexGuard aSolarGuard;
-if ( rBHelper.bDisposed || rBHelper.bInDispose )
+if ( m_bDisposed )
throw css::lang::DisposedException();
Any a;
@@ -141,7 +140,7 @@ void MenuBarManager::Destroy()
{
SolarMutexGuard aGuard;
-if ( rBHelper.bDisposed )
+if ( m_bDisposed )
return;
// stop asynchronous settings timer and
@@ -159,7 +158,7 @@ void MenuBarManager::Destroy()
}
// XComponent
-void SAL_CALL MenuBarManager::disposing()
+void MenuBarManager::disposing(std::unique_lock& )
{
Reference< XComponent > xThis( this );
@@ -202,7 +201,7 @@ void SAL_CALL MenuBarManager::elementInserted( const
css::ui::ConfigurationEvent
SolarMutexGuard g;
/* SAFE AREA
---
*/
-if ( rBHelper.bDisposed || rBHelper.bInDispose )
+if ( m_bDisposed )
return;
sal_Int16 nImageType = sal_Int16();
@@ -225,7 +224,7 @@ void SAL_CALL MenuBarManager::frameAction( const
FrameActionEvent& Action )
{
SolarMutexGuard g;
-if ( rBHelper.bDisposed || rBHelper.bInDispose )
+if ( m_bDisposed )
throw css::lang::DisposedException();
if ( Action.Action != FrameAction_CONTEXT_CHANGED )
@@ -253,7 +252,7 @@ void SAL_CALL MenuBarManager::statusChanged( const
FeatureStateEvent& Event )
SolarMutexGuard aSolarGuard;
{
-if ( rBHelper.bDisposed || rBHelper.bInDispose )
+if ( m_bDisposed )
return;
// We have to check all menu entries as there can be identical entries
in a popup menu.
commit 98dbe250d7d5e3ebe626e8c8650e7fdccd399869
Author: Noel Grandin
AuthorDate: Fri Dec 24 21:01:56 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 25 19:33:53 2021 +0100
use comphelper::WeakComponentImplHelper in ContextChangeEventMultiplexer
Change-Id: I6f8c2be817695e44b25f209a5a56e021cd3e94d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127487
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx
b/framework/source/services/ContextChangeEventMultiplexer.cxx
index 0dea0823c52b..76424b3aea03 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/Contex
[Libreoffice-commits] core.git: i18npool/CustomTarget_localedata.mk
i18npool/CustomTarget_localedata.mk | 27 +++
1 file changed, 11 insertions(+), 16 deletions(-)
New commits:
commit 752052cb1ff82949183cea59ca18683266c7b4ff
Author: Jan-Marek Glogowski
AuthorDate: Wed Dec 22 15:59:49 2021 +0100
Commit: Jan-Marek Glogowski
CommitDate: Sat Dec 25 19:17:48 2021 +0100
Convert i18npool_LD_RULE template to pattern rule
No need for various, evaled custom rules. A normal pattern rule is
sufficent for this task.
Change-Id: I4f7ad0cafb7fe78fc161eab54bb3170003c83ade
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127325
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/i18npool/CustomTarget_localedata.mk
b/i18npool/CustomTarget_localedata.mk
index e4b1d1fb0339..c9fd9c213a95 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -15,24 +15,19 @@ $(eval $(call
gb_CustomTarget_register_targets,i18npool/localedata,\
$(foreach name,$(i18npool_LD_NAMES),localedata_$(name).cxx) \
))
-define i18npool_LD_RULE
-$(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \
- $(SRCDIR)/i18npool/source/localedata/data/$(1).xml \
+$(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_%.cxx : \
+ $(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(call gb_Executable_get_runtime_dependencies,saxparser)
- $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1)
- $$(call gb_Trace_StartRange,$$(subst $(WORKDIR)/,,$$@),SAX)
- TEMPSAX=$$(shell $$(gb_MKTEMP)) && TEMPSED=$$(shell $$(gb_MKTEMP)) && \
- $$(call gb_Helper_abbreviate_dirs, \
- $$(call gb_Helper_print_on_error, \
- $$(call gb_Helper_execute,saxparser) $(1) $$<
{TEMPSAX} \
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
+ $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SAX)
+ TEMPSAX=$(shell $(gb_MKTEMP)) && TEMPSED=$(shell $(gb_MKTEMP)) && \
+ $(call gb_Helper_abbreviate_dirs, \
+ $(call gb_Helper_print_on_error, \
+ $(call gb_Helper_execute,saxparser) $* $< $${TEMPSAX} \
-env:LO_LIB_DIR=$(call
gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER)) \
-env:URE_MORE_SERVICES=$(call
gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser))) && \
- sed 's/\(^.*get[^;]*\)/SAL_DLLPUBLIC_EXPORT \1/'
{TEMPSAX} > {TEMPSED} && \
- rm {TEMPSAX} && $(call
gb_Helper_replace_if_different_and_touch,{TEMPSED},$$@))
- $$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),SAX)
-
-endef
-
-$(foreach name,$(i18npool_LD_NAMES),$(eval $(call i18npool_LD_RULE,$(name
+ sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $${TEMPSAX}
> $${TEMPSED} && \
+ rm $${TEMPSAX} && $(call
gb_Helper_replace_if_different_and_touch,$${TEMPSED},$@))
+ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SAX)
# vim: set noet sw=4 ts=4:
[Libreoffice-commits] core.git: tools/source
tools/source/fsys/urlobj.cxx | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
New commits:
commit be5f70e2b8498345f2301598cba325d5524513f2
Author: Mike Kaganski
AuthorDate: Sat Dec 25 12:51:53 2021 +0300
Commit: Mike Kaganski
CommitDate: Sat Dec 25 18:44:09 2021 +0100
Simplify INetURLObject::parseHostOrNetBiosName a bit more
Change-Id: Ie22e7a142aabd2c0f12c34945ad0858f5bd868a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127451
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 67cb1f1cd024..1d08a5590eaa 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2843,9 +2843,16 @@ bool INetURLObject::parseHostOrNetBiosName(
while (pBegin < pEnd)
{
EscapeType eEscapeType;
-sal_uInt32 nUTF32 = getUTF32(pBegin, pEnd, eMechanism, eCharset,
eEscapeType);
-switch (nUTF32)
+switch (sal_uInt32 nUTF32 = getUTF32(pBegin, pEnd, eMechanism,
eCharset, eEscapeType))
{
+default:
+if (INetMIME::isVisible(nUTF32))
+{
+if (pCanonic)
+appendUCS4(*pCanonic, nUTF32, eEscapeType, PART_URIC,
eCharset, true);
+break;
+}
+[[fallthrough]];
case '"':
case '*':
case '+':
@@ -2865,16 +2872,7 @@ bool INetURLObject::parseHostOrNetBiosName(
if (pCanonic)
pCanonic->setLength(nOriginalCanonicLength);
return false;
-default:
-if (!INetMIME::isVisible(nUTF32))
-{
-if (pCanonic)
-pCanonic->setLength(nOriginalCanonicLength);
-return false;
-}
}
-if (pCanonic)
-appendUCS4(*pCanonic, nUTF32, eEscapeType, PART_URIC, eCharset,
true);
}
return true;
}
[Libreoffice-commits] core.git: framework/source
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 22 ++-
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit a7a1d8647a8e03675746d4cbbcf707422f4db888
Author: Noel Grandin
AuthorDate: Fri Dec 24 20:52:39 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 25 18:14:05 2021 +0100
use comphelper::WeakComponentImplHelper in
ModuleUIConfigurationManagerSupplier
Change-Id: I22164080dd87ab3c3a93b50d06cba8574e00c189
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127464
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index f28c2afedddf..cdbd647c3108 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -31,8 +31,7 @@
#include
#include
-#include
-#include
+#include
#include
#include
@@ -49,13 +48,12 @@ using namespace framework;
namespace {
-typedef cppu::WeakComponentImplHelper<
+typedef comphelper::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::ui::XModuleUIConfigurationManagerSupplier >
ModuleUIConfigurationManagerSupplier_BASE;
-class ModuleUIConfigurationManagerSupplier : private cppu::BaseMutex,
- public
ModuleUIConfigurationManagerSupplier_BASE
+class ModuleUIConfigurationManagerSupplier : public
ModuleUIConfigurationManagerSupplier_BASE
{
public:
explicit ModuleUIConfigurationManagerSupplier( const css::uno::Reference<
css::uno::XComponentContext >& rxContext );
@@ -80,7 +78,7 @@ public:
virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL
getUIConfigurationManager( const OUString& ModuleIdentifier ) override;
private:
-virtual void SAL_CALL disposing() final override;
+virtual void disposing(std::unique_lock&) final override;
typedef std::unordered_map< OUString, css::uno::Reference<
css::ui::XModuleUIConfigurationManager2 > > ModuleToModuleCfgMgr;
@@ -92,8 +90,7 @@ private:
};
ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier(
const Reference< XComponentContext >& xContext ) :
-ModuleUIConfigurationManagerSupplier_BASE(m_aMutex)
-, m_xModuleMgr( ModuleManager::create( xContext ) )
+ m_xModuleMgr( ModuleManager::create( xContext ) )
, m_xContext( xContext )
{
try
@@ -111,13 +108,12 @@
ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons
ModuleUIConfigurationManagerSupplier::~ModuleUIConfigurationManagerSupplier()
{
-disposing();
+std::unique_lock g(m_aMutex);
+disposing(g);
}
-void SAL_CALL ModuleUIConfigurationManagerSupplier::disposing()
+void
ModuleUIConfigurationManagerSupplier::disposing(std::unique_lock&)
{
-osl::MutexGuard g(rBHelper.rMutex);
-
// dispose all our module user interface configuration managers
for (auto const& elem : m_aModuleToModuleUICfgMgrMap)
{
@@ -132,7 +128,7 @@ void SAL_CALL
ModuleUIConfigurationManagerSupplier::disposing()
// XModuleUIConfigurationManagerSupplier
Reference< XUIConfigurationManager > SAL_CALL
ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const
OUString& sModuleIdentifier )
{
-osl::MutexGuard g(rBHelper.rMutex);
+std::unique_lock g(m_aMutex);
/* SAFE AREA
---
*/
ModuleToModuleCfgMgr::iterator pIter = m_aModuleToModuleUICfgMgrMap.find(
sModuleIdentifier );
[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh configure.ac desktop/Module_desktop.mk distro-configs/LibreOfficeOssFuzz.conf Makefile.in smoketest/Module_smoketest.mk vcl/commonfuzzer.mk vcl/Ex
Makefile.in|2 --
bin/oss-fuzz-build.sh |9 +
configure.ac |4 ++--
desktop/Module_desktop.mk |2 ++
distro-configs/LibreOfficeOssFuzz.conf |2 ++
smoketest/Module_smoketest.mk |2 ++
vcl/Executable_docxfuzzer.mk |2 ++
vcl/Executable_fodtfuzzer.mk |2 ++
vcl/Executable_htmlfuzzer.mk |4 +++-
vcl/Module_vcl.mk |3 +--
vcl/commonfuzzer.mk|4 +++-
vcl/workben/docxfuzzer.cxx |5 -
vcl/workben/fodtfuzzer.cxx |5 -
vcl/workben/htmlfuzzer.cxx |2 --
14 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 37106f20bd5cc016a473fbdb2e9e37da096cff5f
Author: Jan-Marek Glogowski
AuthorDate: Sun Dec 12 22:03:49 2021 +0100
Commit: Jan-Marek Glogowski
CommitDate: Sat Dec 25 17:05:08 2021 +0100
oss-fuzz: convert to static cross-build
This way we can get rid of the pre-generated locale data and the
special fuzzers target, which invokes a full gbuild make for
every prereqisite, always parsing the whole tree, taking ages.
This also reverts:
- commit d0780b21cfe235c4446adf649eb690f9c1771dd5 ("fix oss-fuzz
build") by adding epubgen and revenge dependencies.
- commit ff25d6a123beb42476bf42d189b3033a86835b2a ("ofz#41602 fix
more build failure"), which shouldn't happen anymore since
commit d47628f287f4377394c4ff488c433bfe254b6abe ("don't want to
link to system static libs for DISABLE_DYNLOADING")
Change-Id: I3aed9ec62da507254b42e4e7470bae1097b4bc8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127031
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/Makefile.in b/Makefile.in
index 3ac9ce6d3c22..7c30271cffb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -504,8 +504,6 @@ $(BUILDDIR)/vs-code.code-workspace:
$(BUILDDIR)/vs-code.code-workspace.template
@test -e $@ || cp $< $@ && \
cmp -s $@ $< || echo "ATTN: $(@F) differs from $( templateservices.rdb
diff --git a/configure.ac b/configure.ac
index 1ba896d7defb..f85e0b1701f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3799,7 +3799,7 @@ if test -n "$WIN_MULTI_ARCH" -a -n "$WIN_OTHER_ARCH"; then
fi
-if test "$build_cpu" != "$host_cpu" -o \( "$DISABLE_DYNLOADING" = TRUE -a
"$enable_fuzzers" != yes \); then
+if test "$build_cpu" != "$host_cpu" -o "$DISABLE_DYNLOADING" = TRUE; then
# To allow building Windows multi-arch releases without cross-tooling
if test "$DISABLE_DYNLOADING" = TRUE -o \( -z "$WIN_MULTI_ARCH" -a -z
"$WIN_OTHER_ARCH" \); then
cross_compiling="yes"
@@ -9574,7 +9574,7 @@ else
LIBXML_LIBS="${WORKDIR}/UnpackedTarball/libxml2/win32/bin.msvc/libxml2.lib"
else
LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/libxml2/.libs -lxml2"
-if test "$DISABLE_DYNLOADING" = TRUE -a "$ENABLE_FUZZERS" != "TRUE";
then
+if test "$DISABLE_DYNLOADING" = TRUE; then
LIBXML_LIBS="$LIBXML_LIBS -lm"
fi
fi
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a03a552e4271..ce8f254d7af1 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -100,9 +100,11 @@ $(eval $(call gb_Module_add_targets,desktop,\
else ifeq (,$(filter MACOSX ANDROID iOS HAIKU,$(OS)))
+ifeq (,$(filter FUZZERS,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
Executable_oosplash \
))
+endif
endif
diff --git a/distro-configs/LibreOfficeOssFuzz.conf
b/distro-configs/LibreOfficeOssFuzz.conf
index 434452a673f0..5f50f2774bc5 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -8,6 +8,7 @@
--disable-cups
--disable-dbus
--disable-dconf
+--disable-extensions
--disable-firebird-sdbc
--disable-gio
--disable-gtk3
@@ -29,5 +30,6 @@
--with-locales=en
--with-system-lockfile
--without-fonts
+--without-galleries
--without-java
--without-webdav
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 217dbfa6543a..5d66a0daa1e4 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -12,10 +12,12 @@ $(eval $(call gb_Module_Module,smoketest))
ifeq ($(CROSS_COMPILING),)
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,smoketest,\
Library_smoketest \
Zip_smoketestdoc \
))
+endif
ifneq ($(ENABLE_JAVA),)
ifneq ($(filter EXTENSIONS,$(BUILD_TYPE)),)
diff --git a/vcl/Executable_docxfuzzer.mk b/vcl/Executable_docxfuzzer.mk
index fbacbe92fd98..57bc9020713b 100644
--- a/vcl/Executable_docxfuzzer.mk
+++ b/vcl/Executable_docxfuzzer.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_Executable_use_api,docxfuzzer,\
$(eval $(call gb_Executable_use_externals,docxfuzzer,\
$(fuzzer_externals) \
+epubgen \
+revenge \
))
$(eval $
[Libreoffice-commits] core.git: connectivity/source sc/source solenv/bin
connectivity/source/drivers/file/FDatabaseMetaData.cxx |2 ++
connectivity/source/manager/mdrivermanager.cxx | 15 ++-
sc/source/core/data/documen3.cxx |6 +-
solenv/bin/native-code.py |1 +
4 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit fa5db38ae5bbe9abfd41b6765074ca1200b8def2
Author: Jan-Marek Glogowski
AuthorDate: Fri Dec 24 02:37:33 2021 +0100
Commit: Jan-Marek Glogowski
CommitDate: Sat Dec 25 17:04:13 2021 +0100
oss-fuzz: fix some compiler warnings
Some unused functions and variables and many missing
HAVE_FEATURE_NSS warnings, because the native-code.py
stubs were missing the config_crypto.h header.
Change-Id: I88ff7d8f96e7382027a21f205db982fd797bd6af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127392
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index f6480744e665..6d0a4f2fe0b1 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -73,6 +73,7 @@ Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getColumns(
namespace
{
+#if !ENABLE_FUZZERS
sal_Int16 isCaseSensitiveParentFolder( const OUString& _rFolderOrDoc,
std::u16string_view _rDocName )
{
sal_Int16 nIsCS = 1;
@@ -151,6 +152,7 @@ namespace
return nIsCS;
}
+#endif
}
diff --git a/connectivity/source/manager/mdrivermanager.cxx
b/connectivity/source/manager/mdrivermanager.cxx
index 390b6da13e27..c605573b703e 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -102,8 +102,8 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
return makeAny( *m_aPos++ );
}
-namespace {
-
+namespace
+{
/// an STL functor which ensures that a SdbcDriver described by a
DriverAccess is loaded
struct EnsureDriver
{
@@ -174,9 +174,8 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
}
};
-}
-
-static sal_Int32 lcl_getDriverPrecedence( const
Reference& _rContext, Sequence< OUString >& _rPrecedence )
+#if !ENABLE_FUZZERS
+sal_Int32 lcl_getDriverPrecedence( const Reference&
_rContext, Sequence< OUString >& _rPrecedence )
{
_rPrecedence.realloc( 0 );
try
@@ -210,8 +209,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
return _rPrecedence.getLength();
}
-
-namespace {
+#endif
/// an STL algorithm compatible predicate comparing two DriverAccess
instances by their implementation names
struct CompareDriverAccessByName
@@ -234,8 +232,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
return lhs.sImplementationName == m_sImplName;
}
};
-
-}
+}
OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >&
_rxContext )
:OSDBCDriverManager_Base(m_aMutex)
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 163c374b6406..35f1f936392e 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -575,8 +575,11 @@ bool ScDocument::LinkExternalTab( SCTAB& rTab, const
OUString& aDocTab,
}
rTab = 0;
#if ENABLE_FUZZERS
+(void)aDocTab;
+(void)aFileName;
+(void)aTabName;
return false;
-#endif
+#else
OUString aFilterName; // Is filled by the Loader
OUString aOptions; // Filter options
sal_uInt32 nLinkCnt = pExtDocOptions ?
pExtDocOptions->GetDocSettings().mnLinkCnt : 0;
@@ -618,6 +621,7 @@ bool ScDocument::LinkExternalTab( SCTAB& rTab, const
OUString& aDocTab,
pBindings->Invalidate( SID_LINKS );
}
return true;
+#endif
}
ScExternalRefManager* ScDocument::GetExternalRefManager() const
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 7abb6c97ac4d..88d53d320602 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -861,6 +861,7 @@ print ("""/*
* File generated by solenv/bin/native-code.py
*/
+#include
#include
#include
#include
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/valueacc.cxx | 29 +
svtools/source/control/valueimp.hxx | 11 ---
2 files changed, 17 insertions(+), 23 deletions(-)
New commits:
commit 35267be7ce33c5203a76e8023382c287b2e1f180
Author: Noel Grandin
AuthorDate: Fri Dec 24 11:51:29 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 25 16:52:14 2021 +0100
use comphelper::WeakComponentImplHelper in ValueSetAcc
and remove unnecessary use of SolarMutex, the fields
are already protected by mutex and the locked region
doesn't call into vcl.
Change-Id: Ia010674b14fafe2bfac27956af71fb557a4df212
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127408
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svtools/source/control/valueacc.cxx
b/svtools/source/control/valueacc.cxx
index d8f97826499f..23d3dcde9bc6 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -418,7 +418,6 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId,
const uno::Any& rOldValu
}
ValueSetAcc::ValueSetAcc( ValueSet* pParent ) :
-ValueSetAccComponentBase (m_aMutex),
mpParent( pParent ),
mbIsFocused(false)
{
@@ -661,7 +660,7 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale()
void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference<
accessibility::XAccessibleEventListener >& rxListener )
{
ThrowIfDisposed();
-::osl::MutexGuard aGuard (m_aMutex);
+std::unique_lock aGuard (m_aMutex);
if( !rxListener.is() )
return;
@@ -685,7 +684,7 @@ void SAL_CALL ValueSetAcc::addAccessibleEventListener(
const uno::Reference< acc
void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const
uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
{
ThrowIfDisposed();
-::osl::MutexGuard aGuard (m_aMutex);
+std::unique_lock aGuard (m_aMutex);
if( rxListener.is() )
{
@@ -911,21 +910,19 @@ sal_Int64 SAL_CALL ValueSetAcc::getSomething( const
uno::Sequence< sal_Int8 >& r
}
-void SAL_CALL ValueSetAcc::disposing()
+void ValueSetAcc::disposing(std::unique_lock& rGuard)
{
-::std::vector >
aListenerListCopy;
+// Make a copy of the list and clear the original.
+::std::vector >
aListenerListCopy = std::move(mxEventListeners);
-{
-// Make a copy of the list and clear the original.
-const SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard (m_aMutex);
-aListenerListCopy.swap(mxEventListeners);
-
-// Reset the pointer to the parent. It has to be the one who has
-// disposed us because he is dying.
-mpParent = nullptr;
-}
+// Reset the pointer to the parent. It has to be the one who has
+// disposed us because he is dying.
+mpParent = nullptr;
+
+if (aListenerListCopy.empty())
+return;
+rGuard.unlock();
// Inform all listeners that this objects is disposing.
lang::EventObject aEvent (static_cast(this));
for (auto const& listenerCopy : aListenerListCopy)
@@ -974,7 +971,7 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const
void ValueSetAcc::ThrowIfDisposed()
{
-if (rBHelper.bDisposed || rBHelper.bInDispose)
+if (m_bDisposed)
{
SAL_WARN("svx", "Calling disposed object. Throwing exception:");
throw lang::DisposedException (
diff --git a/svtools/source/control/valueimp.hxx
b/svtools/source/control/valueimp.hxx
index ca25ddbc12cf..4f9e9ec9c945 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -23,8 +23,7 @@
#include
#include
#include
-#include
-#include
+#include
#include
#include
#include
@@ -68,7 +67,7 @@ struct ValueSetItem
GetAccessible( bool bIsTransientChildrenDisabled );
};
-typedef ::cppu::WeakComponentImplHelper<
+typedef comphelper::WeakComponentImplHelper<
css::accessibility::XAccessible,
css::accessibility::XAccessibleEventBroadcaster,
css::accessibility::XAccessibleContext,
@@ -77,9 +76,7 @@ typedef ::cppu::WeakComponentImplHelper<
css::lang::XUnoTunnel >
ValueSetAccComponentBase;
-class ValueSetAcc :
-public ::cppu::BaseMutex,
-public ValueSetAccComponentBase
+class ValueSetAcc final : public ValueSetAccComponentBase
{
public:
@@ -156,7 +153,7 @@ private:
/** Tell all listeners that the object is dying. This callback is
usually called from the WeakComponentImplHelper class.
*/
-virtual void SAL_CALL disposing() override;
+virtual void disposing(std::unique_lock&) override;
/** Return the number of items. This takes the None-Item into account.
*/
[Libreoffice-commits] core.git: svx/source
svx/source/table/tabledesign.cxx | 64 ++-
1 file changed, 24 insertions(+), 40 deletions(-)
New commits:
commit eb400749a3c193ff53617aca3cd2baab9a5d0e05
Author: Noel Grandin
AuthorDate: Fri Dec 24 14:43:18 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 25 16:00:49 2021 +0100
use comphelper::WeakComponentImplHelper in TableDesignStyle
and remove some unnecessary use of SolarMutex, when accessing
static data.
Change-Id: I4cd489d89be71df09f34602d05feb40855dc1567
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127433
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index baf2ee21ab2c..d383898adae1 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -32,10 +32,9 @@
#include
#include
-#include
-#include
+#include
+#include
#include
-#include
#include
#include
@@ -56,19 +55,15 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::container;
-using ::osl::MutexGuard;
-using ::osl::ClearableMutexGuard;
-using ::cppu::OInterfaceContainerHelper;
-
namespace sdr::table {
typedef std::map< OUString, sal_Int32 > CellStyleNameMap;
-typedef ::cppu::WeakComponentImplHelper< XStyle, XNameReplace, XServiceInfo,
XIndexAccess, XModifyBroadcaster, XModifyListener > TableDesignStyleBase;
+typedef ::comphelper::WeakComponentImplHelper< XStyle, XNameReplace,
XServiceInfo, XIndexAccess, XModifyBroadcaster, XModifyListener >
TableDesignStyleBase;
namespace {
-class TableDesignStyle : private ::cppu::BaseMutex, public TableDesignStyleBase
+class TableDesignStyle : public TableDesignStyleBase
{
public:
TableDesignStyle();
@@ -115,12 +110,13 @@ public:
void notifyModifyListener();
// this function is called upon disposing the component
-virtual void SAL_CALL disposing() override;
+virtual void disposing(std::unique_lock&) override;
static const CellStyleNameMap& getCellStyleNameMap();
OUString msName;
Reference< XStyle > maCellStyles[style_count];
+comphelper::OInterfaceContainerHelper4 maModifyListeners;
};
}
@@ -185,7 +181,6 @@ public:
}
TableDesignStyle::TableDesignStyle()
-: TableDesignStyleBase(m_aMutex)
{
}
@@ -232,17 +227,13 @@ sal_Bool SAL_CALL TableDesignStyle::isUserDefined()
sal_Bool SAL_CALL TableDesignStyle::isInUse()
{
-ClearableMutexGuard aGuard( rBHelper.rMutex );
-OInterfaceContainerHelper * pContainer = rBHelper.getContainer(
cppu::UnoType::get() );
-if( pContainer )
+std::unique_lock aGuard( m_aMutex );
+if (maModifyListeners.getLength())
{
-Sequence< Reference< XInterface > > aListener(
pContainer->getElements() );
-aGuard.clear();
-
-sal_Int32 nIndex = aListener.getLength();
-while( --nIndex >= 0 )
+comphelper::OInterfaceIteratorHelper4 it(maModifyListeners);
+while ( it.hasMoreElements() )
{
-TableDesignUser* pUser = dynamic_cast< TableDesignUser* >(
aListener[nIndex].get() );
+TableDesignUser* pUser = dynamic_cast< TableDesignUser* >(
it.next().get() );
if( pUser && pUser->isInUse() )
return true;
}
@@ -282,8 +273,6 @@ void SAL_CALL TableDesignStyle::setName( const OUString&
rName )
Any SAL_CALL TableDesignStyle::getByName( const OUString& rName )
{
-SolarMutexGuard aGuard;
-
const CellStyleNameMap& rMap = getCellStyleNameMap();
CellStyleNameMap::const_iterator iter = rMap.find( rName );
@@ -296,16 +285,12 @@ Any SAL_CALL TableDesignStyle::getByName( const OUString&
rName )
Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames()
{
-SolarMutexGuard aGuard;
-
return comphelper::mapKeysToSequence( getCellStyleNameMap() );
}
sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName )
{
-SolarMutexGuard aGuard;
-
const CellStyleNameMap& rMap = getCellStyleNameMap();
CellStyleNameMap::const_iterator iter = rMap.find( rName );
@@ -339,11 +324,10 @@ sal_Int32 SAL_CALL TableDesignStyle::getCount()
Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index )
{
-SolarMutexGuard aGuard;
-
if( (Index < 0) || (Index >= style_count) )
throw IndexOutOfBoundsException();
+std::unique_lock aGuard( m_aMutex );
return Any( maCellStyles[Index] );
}
@@ -353,8 +337,6 @@ Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index )
void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const
Any& aElement )
{
-SolarMutexGuard aGuard;
-
const CellStyleNameMap& rMap = getCellStyleNameMap();
CellStyleNameMap::const_iterator iter = rMap.find( rName );
if( iter == rMap.end() )
@@ -367,6 +349,8 @@ void SAL_CALL TableDesignStyle::replaceByName( const
OUString& rName, cons
[Libreoffice-commits] core.git: vcl/commonfuzzer.mk vcl/Executable_602fuzzer.mk vcl/Executable_bmpfuzzer.mk vcl/Executable_cgmfuzzer.mk vcl/Executable_dbffuzzer.mk vcl/Executable_diffuzzer.mk vcl/Exec
vcl/Executable_602fuzzer.mk |4 +--- vcl/Executable_bmpfuzzer.mk |4 +--- vcl/Executable_cgmfuzzer.mk |4 +--- vcl/Executable_dbffuzzer.mk |4 +--- vcl/Executable_diffuzzer.mk |4 +--- vcl/Executable_docxfuzzer.mk |4 +--- vcl/Executable_dxffuzzer.mk |4 +--- vcl/Executable_epsfuzzer.mk |4 +--- vcl/Executable_fodpfuzzer.mk |4 +--- vcl/Executable_fodsfuzzer.mk |4 +--- vcl/Executable_fodtfuzzer.mk |4 +--- vcl/Executable_giffuzzer.mk |4 +--- vcl/Executable_htmlfuzzer.mk |4 +--- vcl/Executable_hwpfuzzer.mk |4 +--- vcl/Executable_jpgfuzzer.mk |4 +--- vcl/Executable_lwpfuzzer.mk |4 +--- vcl/Executable_metfuzzer.mk |4 +--- vcl/Executable_mmlfuzzer.mk |4 +--- vcl/Executable_mtpfuzzer.mk |4 +--- vcl/Executable_olefuzzer.mk |4 +--- vcl/Executable_pcdfuzzer.mk |4 +--- vcl/Executable_pctfuzzer.mk |4 +--- vcl/Executable_pcxfuzzer.mk |4 +--- vcl/Executable_pngfuzzer.mk |4 +--- vcl/Executable_ppmfuzzer.mk |4 +--- vcl/Executable_pptfuzzer.mk |4 +--- vcl/Executable_pptxfuzzer.mk |4 +--- vcl/Executable_psdfuzzer.mk |4 +--- vcl/Executable_qpwfuzzer.mk |4 +--- vcl/Executable_rasfuzzer.mk |4 +--- vcl/Executable_rtffuzzer.mk |4 +--- vcl/Executable_scrtffuzzer.mk |4 +--- vcl/Executable_sftfuzzer.mk |4 +--- vcl/Executable_slkfuzzer.mk |4 +--- vcl/Executable_svmfuzzer.mk |4 +--- vcl/Executable_tgafuzzer.mk |4 +--- vcl/Executable_tiffuzzer.mk |4 +--- vcl/Executable_wksfuzzer.mk |4 +--- vcl/Executable_wmffuzzer.mk |4 +--- vcl/Executable_ww2fuzzer.mk |4 +--- vcl/Executable_ww6fuzzer.mk |4 +--- vcl/Executable_ww8fuzzer.mk |4 +--- vcl/Executable_xbmfuzzer.mk |4 +--- vcl/Executable_xlsfuzzer.mk |4 +--- vcl/Executable_xlsxfuzzer.mk |4 +--- vcl/Executable_xpmfuzzer.mk |4 +--- vcl/commonfuzzer.mk |5 + 47 files changed, 51 insertions(+), 138 deletions(-) New commits: commit c70271ca5ba26718cfbc621d08c53acb5e1da4b4 Author: Jan-Marek Glogowski AuthorDate: Sat Dec 25 12:11:15 2021 +0100 Commit: Jan-Marek Glogowski CommitDate: Sat Dec 25 15:24:51 2021 +0100 oss-fuzz: use fuzzer_statics for default statics Change-Id: I3616507127e0661635d87ba2b949ddaa13bc898d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127454 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski diff --git a/vcl/Executable_602fuzzer.mk b/vcl/Executable_602fuzzer.mk index 7ad15e87e3be..633e536a41aa 100644 --- a/vcl/Executable_602fuzzer.mk +++ b/vcl/Executable_602fuzzer.mk @@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,602fuzzer,\ )) $(eval $(call gb_Executable_use_static_libraries,602fuzzer,\ -findsofficepath \ -ulingu \ -fuzzerstubs \ +$(fuzzer_statics) \ )) $(eval $(call gb_Executable_add_exception_objects,602fuzzer,\ diff --git a/vcl/Executable_bmpfuzzer.mk b/vcl/Executable_bmpfuzzer.mk index 783bbe66e3c6..64e132ad5464 100644 --- a/vcl/Executable_bmpfuzzer.mk +++ b/vcl/Executable_bmpfuzzer.mk @@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,bmpfuzzer,\ )) $(eval $(call gb_Executable_use_static_libraries,bmpfuzzer,\ -findsofficepath \ -ulingu \ -fuzzerstubs \ +$(fuzzer_statics) \ )) $(eval $(call gb_Executable_add_exception_objects,bmpfuzzer,\ diff --git a/vcl/Executable_cgmfuzzer.mk b/vcl/Executable_cgmfuzzer.mk index dcfab5d515c4..074f18fa4b1c 100644 --- a/vcl/Executable_cgmfuzzer.mk +++ b/vcl/Executable_cgmfuzzer.mk @@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,cgmfuzzer,\ )) $(eval $(call gb_Executable_use_static_libraries,cgmfuzzer,\ -findsofficepath \ -ulingu \ -fuzzerstubs \ +$(fuzzer_statics) \ )) $(eval $(call gb_Executable_add_exception_objects,cgmfuzzer,\ diff --git a/vcl/Executable_dbffuzzer.mk b/vcl/Executable_dbffuzzer.mk index 72478ee2e2ec..64de9072cdcf 100644 --- a/vcl/Executable_dbffuzzer.mk +++ b/vcl/Executable_dbffuzzer.mk @@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,dbffuzzer,\ )) $(eval $(call gb_Executable_use_static_libraries,dbffuzzer,\ -findsofficepath \ -ulingu \ +$(fuzzer_statics) \ fuzzer_calc \ -fuzzerstubs \ )) $(eval $(call gb_Executable_add_exception_objects,dbffuzzer,\ diff --git a/vcl/Executable_diffuzzer.mk b/vcl/Executable_diffuzzer.mk index b9ca63b07b0c..349a41696076 100644 --- a/vcl/Executable_diffuzzer.mk +++ b/vcl/Executable_diffuzzer.mk @@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,diffuzzer,\ )) $(eval $(call gb_Executable_use_static_libraries,diffuzzer,\ -findsofficepath \ -ulingu \ -fuzzerstubs \ +$(fuzzer_statics) \ )) $(eval $(call gb_Executable_add_exception_objects,diffuzzer,\ diff --git a/vcl/Executable_docxfuzzer.mk b/vcl/Executable_docxfuzzer.mk index e33baa829017..fbacbe92f
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/currencyfield.png|binary icon-themes/colibre/cmd/32/definedbname.png |binary icon-themes/colibre/cmd/lc_currencyfield.png|binary icon-themes/colibre/cmd/lc_definedbname.png |binary icon-themes/colibre/cmd/sc_currencyfield.png|binary icon-themes/colibre/cmd/sc_definedbname.png |binary icon-themes/colibre/cmd/sc_presentation.png |binary icon-themes/colibre/cmd/sc_styleapply.png |binary icon-themes/colibre/cmd/sc_textdirectionlefttoright.png |binary icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png |binary icon-themes/colibre_svg/cmd/32/currencyfield.svg|2 icon-themes/colibre_svg/cmd/32/definedbname.svg |2 icon-themes/colibre_svg/cmd/lc_currencyfield.svg| 94 +++- icon-themes/colibre_svg/cmd/lc_definedbname.svg |2 icon-themes/colibre_svg/cmd/sc_currencyfield.svg|2 icon-themes/colibre_svg/cmd/sc_definedbname.svg |2 icon-themes/colibre_svg/cmd/sc_presentation.svg |3 icon-themes/colibre_svg/cmd/sc_styleapply.svg |3 icon-themes/colibre_svg/cmd/sc_textdirectionlefttoright.svg |3 icon-themes/colibre_svg/cmd/sc_textdirectiontoptobottom.svg |3 20 files changed, 106 insertions(+), 10 deletions(-) New commits: commit d16cb4dc76aab319097617ebcfc7874c41734c01 Author: Rizal Muttaqin AuthorDate: Sat Dec 25 19:06:43 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Dec 25 14:54:42 2021 +0100 Colibre: various icon updates Change-Id: I1a0d0d8669597f50c4105b055ad91a1f629484e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127456 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/currencyfield.png b/icon-themes/colibre/cmd/32/currencyfield.png index 6d5964663e69..5a9cede4aaf6 100644 Binary files a/icon-themes/colibre/cmd/32/currencyfield.png and b/icon-themes/colibre/cmd/32/currencyfield.png differ diff --git a/icon-themes/colibre/cmd/32/definedbname.png b/icon-themes/colibre/cmd/32/definedbname.png index e295365856b9..476c9a07b2d7 100644 Binary files a/icon-themes/colibre/cmd/32/definedbname.png and b/icon-themes/colibre/cmd/32/definedbname.png differ diff --git a/icon-themes/colibre/cmd/lc_currencyfield.png b/icon-themes/colibre/cmd/lc_currencyfield.png index f2c08149cbe2..b9f20cba6b10 100644 Binary files a/icon-themes/colibre/cmd/lc_currencyfield.png and b/icon-themes/colibre/cmd/lc_currencyfield.png differ diff --git a/icon-themes/colibre/cmd/lc_definedbname.png b/icon-themes/colibre/cmd/lc_definedbname.png index 5db7572be3f0..3062ab2d4d97 100644 Binary files a/icon-themes/colibre/cmd/lc_definedbname.png and b/icon-themes/colibre/cmd/lc_definedbname.png differ diff --git a/icon-themes/colibre/cmd/sc_currencyfield.png b/icon-themes/colibre/cmd/sc_currencyfield.png index 756f79d10a60..2ad7563bdfd7 100644 Binary files a/icon-themes/colibre/cmd/sc_currencyfield.png and b/icon-themes/colibre/cmd/sc_currencyfield.png differ diff --git a/icon-themes/colibre/cmd/sc_definedbname.png b/icon-themes/colibre/cmd/sc_definedbname.png index dfa02a6b3190..384b0073d742 100644 Binary files a/icon-themes/colibre/cmd/sc_definedbname.png and b/icon-themes/colibre/cmd/sc_definedbname.png differ diff --git a/icon-themes/colibre/cmd/sc_presentation.png b/icon-themes/colibre/cmd/sc_presentation.png index ceb4051b6e30..b047d96e518c 100644 Binary files a/icon-themes/colibre/cmd/sc_presentation.png and b/icon-themes/colibre/cmd/sc_presentation.png differ diff --git a/icon-themes/colibre/cmd/sc_styleapply.png b/icon-themes/colibre/cmd/sc_styleapply.png index 2ae41e278b2c..6ba9b920264a 100644 Binary files a/icon-themes/colibre/cmd/sc_styleapply.png and b/icon-themes/colibre/cmd/sc_styleapply.png differ diff --git a/icon-themes/colibre/cmd/sc_textdirectionlefttoright.png b/icon-themes/colibre/cmd/sc_textdirectionlefttoright.png index ac409fe11ad3..c41030e1bdc1 100644 Binary files a/icon-themes/colibre/cmd/sc_textdirectionlefttoright.png and b/icon-themes/colibre/cmd/sc_textdirectionlefttoright.png differ diff --git a/icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png b/icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png index a27497b723a0..eabf81df1d7c 100644 Binary files a/icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png and b/icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png differ diff --git a/icon-themes/colibre_svg/cmd/32/currencyfield.svg b/icon-themes/colibre_svg/cmd/32/currencyfield.svg index 280ee227b56f..cd923a9aaef1 100644 --- a/icon-themes/colibre_svg/cmd/32/currencyfield.svg +++ b/icon-themes/colibre_svg/cmd/32/currencyfield.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/co
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/currencyfield.png|binary icon-themes/colibre/cmd/32/definedbname.png |binary icon-themes/colibre/cmd/lc_currencyfield.png|binary icon-themes/colibre/cmd/lc_definedbname.png |binary icon-themes/colibre/cmd/sc_currencyfield.png|binary icon-themes/colibre/cmd/sc_definedbname.png |binary icon-themes/colibre/cmd/sc_presentation.png |binary icon-themes/colibre/cmd/sc_styleapply.png |binary icon-themes/colibre/cmd/sc_textdirectionlefttoright.png |binary icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png |binary icon-themes/colibre_svg/cmd/32/currencyfield.svg|2 icon-themes/colibre_svg/cmd/32/definedbname.svg |2 icon-themes/colibre_svg/cmd/lc_currencyfield.svg| 94 +++- icon-themes/colibre_svg/cmd/lc_definedbname.svg |2 icon-themes/colibre_svg/cmd/sc_currencyfield.svg|2 icon-themes/colibre_svg/cmd/sc_definedbname.svg |2 icon-themes/colibre_svg/cmd/sc_presentation.svg |3 icon-themes/colibre_svg/cmd/sc_styleapply.svg |3 icon-themes/colibre_svg/cmd/sc_textdirectionlefttoright.svg |3 icon-themes/colibre_svg/cmd/sc_textdirectiontoptobottom.svg |3 20 files changed, 106 insertions(+), 10 deletions(-) New commits: commit 971e8fa993dc34ad3151b2521f247b985e060e0f Author: Rizal Muttaqin AuthorDate: Sat Dec 25 19:06:43 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Dec 25 14:54:16 2021 +0100 Colibre: various icon updates Change-Id: I1a0d0d8669597f50c4105b055ad91a1f629484e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127472 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/currencyfield.png b/icon-themes/colibre/cmd/32/currencyfield.png index 6d5964663e69..5a9cede4aaf6 100644 Binary files a/icon-themes/colibre/cmd/32/currencyfield.png and b/icon-themes/colibre/cmd/32/currencyfield.png differ diff --git a/icon-themes/colibre/cmd/32/definedbname.png b/icon-themes/colibre/cmd/32/definedbname.png index e295365856b9..476c9a07b2d7 100644 Binary files a/icon-themes/colibre/cmd/32/definedbname.png and b/icon-themes/colibre/cmd/32/definedbname.png differ diff --git a/icon-themes/colibre/cmd/lc_currencyfield.png b/icon-themes/colibre/cmd/lc_currencyfield.png index f2c08149cbe2..b9f20cba6b10 100644 Binary files a/icon-themes/colibre/cmd/lc_currencyfield.png and b/icon-themes/colibre/cmd/lc_currencyfield.png differ diff --git a/icon-themes/colibre/cmd/lc_definedbname.png b/icon-themes/colibre/cmd/lc_definedbname.png index 5db7572be3f0..3062ab2d4d97 100644 Binary files a/icon-themes/colibre/cmd/lc_definedbname.png and b/icon-themes/colibre/cmd/lc_definedbname.png differ diff --git a/icon-themes/colibre/cmd/sc_currencyfield.png b/icon-themes/colibre/cmd/sc_currencyfield.png index 756f79d10a60..2ad7563bdfd7 100644 Binary files a/icon-themes/colibre/cmd/sc_currencyfield.png and b/icon-themes/colibre/cmd/sc_currencyfield.png differ diff --git a/icon-themes/colibre/cmd/sc_definedbname.png b/icon-themes/colibre/cmd/sc_definedbname.png index dfa02a6b3190..384b0073d742 100644 Binary files a/icon-themes/colibre/cmd/sc_definedbname.png and b/icon-themes/colibre/cmd/sc_definedbname.png differ diff --git a/icon-themes/colibre/cmd/sc_presentation.png b/icon-themes/colibre/cmd/sc_presentation.png index ceb4051b6e30..b047d96e518c 100644 Binary files a/icon-themes/colibre/cmd/sc_presentation.png and b/icon-themes/colibre/cmd/sc_presentation.png differ diff --git a/icon-themes/colibre/cmd/sc_styleapply.png b/icon-themes/colibre/cmd/sc_styleapply.png index 2ae41e278b2c..6ba9b920264a 100644 Binary files a/icon-themes/colibre/cmd/sc_styleapply.png and b/icon-themes/colibre/cmd/sc_styleapply.png differ diff --git a/icon-themes/colibre/cmd/sc_textdirectionlefttoright.png b/icon-themes/colibre/cmd/sc_textdirectionlefttoright.png index ac409fe11ad3..c41030e1bdc1 100644 Binary files a/icon-themes/colibre/cmd/sc_textdirectionlefttoright.png and b/icon-themes/colibre/cmd/sc_textdirectionlefttoright.png differ diff --git a/icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png b/icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png index a27497b723a0..eabf81df1d7c 100644 Binary files a/icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png and b/icon-themes/colibre/cmd/sc_textdirectiontoptobottom.png differ diff --git a/icon-themes/colibre_svg/cmd/32/currencyfield.svg b/icon-themes/colibre_svg/cmd/32/currencyfield.svg index 280ee227b56f..cd923a9aaef1 100644 --- a/icon-themes/colibre_svg/cmd/32/currencyfield.svg +++ b/icon-themes/colibre_svg/cmd/32/currencyfield.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/co
[Libreoffice-commits] core.git: accessibility/inc accessibility/source canvas/inc canvas/source comphelper/source include/comphelper svx/source
accessibility/inc/extended/accessibleeditbrowseboxcell.hxx|2 +-
accessibility/source/extended/accessibleeditbrowseboxcell.cxx |2 +-
canvas/inc/parametricpolypolygon.hxx |2 +-
canvas/source/tools/parametricpolypolygon.cxx |2 +-
comphelper/source/misc/compbase.cxx |6 --
include/comphelper/compbase.hxx |7 +--
svx/source/accessibility/ChildrenManagerImpl.cxx |2 +-
svx/source/accessibility/ChildrenManagerImpl.hxx |2 +-
svx/source/table/tabledesign.cxx |2 +-
svx/source/xml/xmlgrhlp.cxx |4 ++--
10 files changed, 18 insertions(+), 13 deletions(-)
New commits:
commit c68c744b68fd50adb6ce725bf9de377a5f915dab
Author: Noel Grandin
AuthorDate: Fri Dec 24 15:58:17 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 25 13:56:27 2021 +0100
pass unique_lock as param in WeakComponentImplHelperBase::disposing
so that subclasses can drop the lock while calling listeners
Change-Id: I6105438110af08f10b0ed50057b28172c3442b95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127434
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index ab45db70af77..ea42155fd0eb 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -120,7 +120,7 @@ namespace accessibility
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
// XComponent/WeakComponentImplHelper
-virtual void disposing() override;
+virtual void disposing(std::unique_lock&) override;
EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) =
delete;
EditBrowseBoxTableCellAccess& operator=( const
EditBrowseBoxTableCellAccess& ) = delete;
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index f9985e48a268..a582defcadd6 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -212,7 +212,7 @@ namespace accessibility
return xMyContext;
}
-void EditBrowseBoxTableCellAccess::disposing()
+void EditBrowseBoxTableCellAccess::disposing(std::unique_lock&)
{
// dispose our context, if it still alive
css::uno::Reference< XComponent > xMyContext( m_aContext.get(),
UNO_QUERY );
diff --git a/canvas/inc/parametricpolypolygon.hxx
b/canvas/inc/parametricpolypolygon.hxx
index 0d39700ff488..303dc5af05fa 100644
--- a/canvas/inc/parametricpolypolygon.hxx
+++ b/canvas/inc/parametricpolypolygon.hxx
@@ -90,7 +90,7 @@ namespace canvas
const css::uno::Sequence< css::uno::Any >& rArgs );
/// Dispose all internal references
-virtual void disposing() override;
+virtual void disposing(std::unique_lock&) override;
// XParametricPolyPolygon2D
virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL
getOutline( double t ) override;
diff --git a/canvas/source/tools/parametricpolypolygon.cxx
b/canvas/source/tools/parametricpolypolygon.cxx
index 870f25f2ddbf..96d8fc7f07da 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -147,7 +147,7 @@ namespace canvas
colors, stops, fAspectRatio );
}
-void ParametricPolyPolygon::disposing()
+void ParametricPolyPolygon::disposing(std::unique_lock&)
{
mxDevice.clear();
}
diff --git a/comphelper/source/misc/compbase.cxx
b/comphelper/source/misc/compbase.cxx
index ecae7108ff90..b8a207ceedb1 100644
--- a/comphelper/source/misc/compbase.cxx
+++ b/comphelper/source/misc/compbase.cxx
@@ -25,12 +25,14 @@ void SAL_CALL WeakComponentImplHelperBase::dispose()
if (m_bDisposed)
return;
m_bDisposed = true;
-disposing();
+disposing(aGuard);
+if (!aGuard.owns_lock())
+aGuard.lock();
css::lang::EventObject aEvt(static_cast(this));
maEventListeners.disposeAndClear(aGuard, aEvt);
}
-void WeakComponentImplHelperBase::disposing() {}
+void WeakComponentImplHelperBase::disposing(std::unique_lock&) {}
void SAL_CALL WeakComponentImplHelperBase::addEventListener(
css::uno::Reference const& rxListener)
diff --git a/include/comphelper/compbase.hxx b/include/comphelper/compbase.hxx
index 9a8ea3bb6a24..ce3e44b3732e 100644
--- a/include/comphelper/compbase.hxx
+++ b/include/comphelper/compbase.hxx
@@ -41,8 +41,11 @@ public:
virtual void SAL_CALL
removeEventListener(css::uno::Reference const&
rxListene
[Libreoffice-commits] core.git: include/comphelper
include/comphelper/compbase.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f0c0c62c10e4ffdb9ce44202e2540d2f39a9fcb5 Author: Noel Grandin AuthorDate: Sat Dec 25 11:43:11 2021 +0200 Commit: Noel Grandin CommitDate: Sat Dec 25 13:56:09 2021 +0100 uninitialised field in comphelper::WeakComponentImplHelperBase Change-Id: I7ab702c0dd61231b334aac647e87233095cc69e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127450 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/comphelper/compbase.hxx b/include/comphelper/compbase.hxx index 6cd969386034..9a8ea3bb6a24 100644 --- a/include/comphelper/compbase.hxx +++ b/include/comphelper/compbase.hxx @@ -47,7 +47,7 @@ public: protected: comphelper::OInterfaceContainerHelper4 maEventListeners; mutable std::mutex m_aMutex; -bool m_bDisposed; +bool m_bDisposed = false; }; template
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/redo.png |binary icon-themes/colibre/cmd/32/undo.png |binary icon-themes/colibre/cmd/ko/sc_resetattributes.png |binary icon-themes/colibre/cmd/lc_redo.png |binary icon-themes/colibre/cmd/lc_undo.png |binary icon-themes/colibre/cmd/sc_autopilotmenu.png|binary icon-themes/colibre/cmd/sc_redo.png |binary icon-themes/colibre/cmd/sc_resetattributes.png |binary icon-themes/colibre/cmd/sc_undo.png |binary icon-themes/colibre/svx/res/doc_modified_yes_14.png |binary icon-themes/colibre_svg/cmd/32/redo.svg |2 +- icon-themes/colibre_svg/cmd/32/undo.svg |2 +- icon-themes/colibre_svg/cmd/ko/sc_resetattributes.svg |2 +- icon-themes/colibre_svg/cmd/lc_redo.svg |2 +- icon-themes/colibre_svg/cmd/lc_undo.svg |2 +- icon-themes/colibre_svg/cmd/sc_autopilotmenu.svg|3 +-- icon-themes/colibre_svg/cmd/sc_redo.svg |3 +-- icon-themes/colibre_svg/cmd/sc_resetattributes.svg |2 +- icon-themes/colibre_svg/cmd/sc_undo.svg |3 +-- icon-themes/colibre_svg/svx/res/doc_modified_yes_14.svg |2 +- 20 files changed, 10 insertions(+), 13 deletions(-) New commits: commit 256f69050407841c097e0ca1f676ab007f692635 Author: Rizal Muttaqin AuthorDate: Sat Dec 25 17:18:17 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Dec 25 13:15:59 2021 +0100 Colibre: update Undo/Redo, adjust Wizard & Clear Direct Formatting icons Change-Id: Idd604c2cb3d80b2e46dab0fa189194372c49f56a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127470 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/redo.png b/icon-themes/colibre/cmd/32/redo.png index e5e673dc37ea..7ac7f21d96d1 100644 Binary files a/icon-themes/colibre/cmd/32/redo.png and b/icon-themes/colibre/cmd/32/redo.png differ diff --git a/icon-themes/colibre/cmd/32/undo.png b/icon-themes/colibre/cmd/32/undo.png index ba2f52ef25a5..7ed197e65381 100644 Binary files a/icon-themes/colibre/cmd/32/undo.png and b/icon-themes/colibre/cmd/32/undo.png differ diff --git a/icon-themes/colibre/cmd/ko/sc_resetattributes.png b/icon-themes/colibre/cmd/ko/sc_resetattributes.png index 32954ebb4256..dff8468da28c 100644 Binary files a/icon-themes/colibre/cmd/ko/sc_resetattributes.png and b/icon-themes/colibre/cmd/ko/sc_resetattributes.png differ diff --git a/icon-themes/colibre/cmd/lc_redo.png b/icon-themes/colibre/cmd/lc_redo.png index ee81734f12ae..58e64257abb9 100644 Binary files a/icon-themes/colibre/cmd/lc_redo.png and b/icon-themes/colibre/cmd/lc_redo.png differ diff --git a/icon-themes/colibre/cmd/lc_undo.png b/icon-themes/colibre/cmd/lc_undo.png index 6dfebe150c44..b4d7eb99d5bd 100644 Binary files a/icon-themes/colibre/cmd/lc_undo.png and b/icon-themes/colibre/cmd/lc_undo.png differ diff --git a/icon-themes/colibre/cmd/sc_autopilotmenu.png b/icon-themes/colibre/cmd/sc_autopilotmenu.png index 5d5fa31962f7..44e9572d9c7a 100644 Binary files a/icon-themes/colibre/cmd/sc_autopilotmenu.png and b/icon-themes/colibre/cmd/sc_autopilotmenu.png differ diff --git a/icon-themes/colibre/cmd/sc_redo.png b/icon-themes/colibre/cmd/sc_redo.png index a934f397b653..98f1cafb9df4 100644 Binary files a/icon-themes/colibre/cmd/sc_redo.png and b/icon-themes/colibre/cmd/sc_redo.png differ diff --git a/icon-themes/colibre/cmd/sc_resetattributes.png b/icon-themes/colibre/cmd/sc_resetattributes.png index f6c167696b9d..c0cf6ee4e063 100644 Binary files a/icon-themes/colibre/cmd/sc_resetattributes.png and b/icon-themes/colibre/cmd/sc_resetattributes.png differ diff --git a/icon-themes/colibre/cmd/sc_undo.png b/icon-themes/colibre/cmd/sc_undo.png index c6f4c883854e..756ead89a67a 100644 Binary files a/icon-themes/colibre/cmd/sc_undo.png and b/icon-themes/colibre/cmd/sc_undo.png differ diff --git a/icon-themes/colibre/svx/res/doc_modified_yes_14.png b/icon-themes/colibre/svx/res/doc_modified_yes_14.png index d60ce0954174..17a9e4ec7ba7 100644 Binary files a/icon-themes/colibre/svx/res/doc_modified_yes_14.png and b/icon-themes/colibre/svx/res/doc_modified_yes_14.png differ diff --git a/icon-themes/colibre_svg/cmd/32/redo.svg b/icon-themes/colibre_svg/cmd/32/redo.svg index d9b3b1b74967..c1728907eef1 100644 --- a/icon-themes/colibre_svg/cmd/32/redo.svg +++ b/icon-themes/colibre_svg/cmd/32/redo.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/undo.svg b/icon-themes/colibre_svg/cmd/32/undo.svg index 811bff92ed26..319ce950812b 100644 --- a/icon-themes/colibre_svg/cmd/32/undo.svg +++ b/icon-themes/colibre_svg/cmd/32/undo.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/redo.png |binary icon-themes/colibre/cmd/32/undo.png |binary icon-themes/colibre/cmd/ko/sc_resetattributes.png |binary icon-themes/colibre/cmd/lc_redo.png |binary icon-themes/colibre/cmd/lc_undo.png |binary icon-themes/colibre/cmd/sc_autopilotmenu.png|binary icon-themes/colibre/cmd/sc_redo.png |binary icon-themes/colibre/cmd/sc_resetattributes.png |binary icon-themes/colibre/cmd/sc_undo.png |binary icon-themes/colibre/svx/res/doc_modified_yes_14.png |binary icon-themes/colibre_svg/cmd/32/redo.svg |2 +- icon-themes/colibre_svg/cmd/32/undo.svg |2 +- icon-themes/colibre_svg/cmd/ko/sc_resetattributes.svg |2 +- icon-themes/colibre_svg/cmd/lc_redo.svg |2 +- icon-themes/colibre_svg/cmd/lc_undo.svg |2 +- icon-themes/colibre_svg/cmd/sc_autopilotmenu.svg|3 +-- icon-themes/colibre_svg/cmd/sc_redo.svg |3 +-- icon-themes/colibre_svg/cmd/sc_resetattributes.svg |2 +- icon-themes/colibre_svg/cmd/sc_undo.svg |3 +-- icon-themes/colibre_svg/svx/res/doc_modified_yes_14.svg |2 +- 20 files changed, 10 insertions(+), 13 deletions(-) New commits: commit 6e968d18951ff0c27d2aa7aa2a34f8d78634023f Author: Rizal Muttaqin AuthorDate: Sat Dec 25 17:18:17 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Dec 25 12:49:37 2021 +0100 Colibre: update Undo/Redo, adjust Wizard & Clear Direct Formatting icons Change-Id: Idd604c2cb3d80b2e46dab0fa189194372c49f56a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127452 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/redo.png b/icon-themes/colibre/cmd/32/redo.png index e5e673dc37ea..7ac7f21d96d1 100644 Binary files a/icon-themes/colibre/cmd/32/redo.png and b/icon-themes/colibre/cmd/32/redo.png differ diff --git a/icon-themes/colibre/cmd/32/undo.png b/icon-themes/colibre/cmd/32/undo.png index ba2f52ef25a5..7ed197e65381 100644 Binary files a/icon-themes/colibre/cmd/32/undo.png and b/icon-themes/colibre/cmd/32/undo.png differ diff --git a/icon-themes/colibre/cmd/ko/sc_resetattributes.png b/icon-themes/colibre/cmd/ko/sc_resetattributes.png index 32954ebb4256..dff8468da28c 100644 Binary files a/icon-themes/colibre/cmd/ko/sc_resetattributes.png and b/icon-themes/colibre/cmd/ko/sc_resetattributes.png differ diff --git a/icon-themes/colibre/cmd/lc_redo.png b/icon-themes/colibre/cmd/lc_redo.png index ee81734f12ae..58e64257abb9 100644 Binary files a/icon-themes/colibre/cmd/lc_redo.png and b/icon-themes/colibre/cmd/lc_redo.png differ diff --git a/icon-themes/colibre/cmd/lc_undo.png b/icon-themes/colibre/cmd/lc_undo.png index 6dfebe150c44..b4d7eb99d5bd 100644 Binary files a/icon-themes/colibre/cmd/lc_undo.png and b/icon-themes/colibre/cmd/lc_undo.png differ diff --git a/icon-themes/colibre/cmd/sc_autopilotmenu.png b/icon-themes/colibre/cmd/sc_autopilotmenu.png index 5d5fa31962f7..44e9572d9c7a 100644 Binary files a/icon-themes/colibre/cmd/sc_autopilotmenu.png and b/icon-themes/colibre/cmd/sc_autopilotmenu.png differ diff --git a/icon-themes/colibre/cmd/sc_redo.png b/icon-themes/colibre/cmd/sc_redo.png index a934f397b653..98f1cafb9df4 100644 Binary files a/icon-themes/colibre/cmd/sc_redo.png and b/icon-themes/colibre/cmd/sc_redo.png differ diff --git a/icon-themes/colibre/cmd/sc_resetattributes.png b/icon-themes/colibre/cmd/sc_resetattributes.png index f6c167696b9d..c0cf6ee4e063 100644 Binary files a/icon-themes/colibre/cmd/sc_resetattributes.png and b/icon-themes/colibre/cmd/sc_resetattributes.png differ diff --git a/icon-themes/colibre/cmd/sc_undo.png b/icon-themes/colibre/cmd/sc_undo.png index c6f4c883854e..756ead89a67a 100644 Binary files a/icon-themes/colibre/cmd/sc_undo.png and b/icon-themes/colibre/cmd/sc_undo.png differ diff --git a/icon-themes/colibre/svx/res/doc_modified_yes_14.png b/icon-themes/colibre/svx/res/doc_modified_yes_14.png index d60ce0954174..17a9e4ec7ba7 100644 Binary files a/icon-themes/colibre/svx/res/doc_modified_yes_14.png and b/icon-themes/colibre/svx/res/doc_modified_yes_14.png differ diff --git a/icon-themes/colibre_svg/cmd/32/redo.svg b/icon-themes/colibre_svg/cmd/32/redo.svg index d9b3b1b74967..c1728907eef1 100644 --- a/icon-themes/colibre_svg/cmd/32/redo.svg +++ b/icon-themes/colibre_svg/cmd/32/redo.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/undo.svg b/icon-themes/colibre_svg/cmd/32/undo.svg index 811bff92ed26..319ce950812b 100644 --- a/icon-themes/colibre_svg/cmd/32/undo.svg +++ b/icon-themes/colibre_svg/cmd/32/undo.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www
[Libreoffice-commits] core.git: comphelper/source include/comphelper
comphelper/source/misc/compbase.cxx |5 +
include/comphelper/compbase.hxx |1 +
2 files changed, 6 insertions(+)
New commits:
commit c1f21a6ce6491ac82a022502c618e2758d3b3a31
Author: Jan-Marek Glogowski
AuthorDate: Sat Dec 25 09:48:04 2021 +0100
Commit: Jan-Marek Glogowski
CommitDate: Sat Dec 25 11:55:20 2021 +0100
Init WeakComponentImplHelperBase::m_bDisposed
From the Jenkins_Linux_Ubsan TB:
/comphelper/source/misc/compbase.cxx:20:9: runtime error: load \
of value 190, which is not a valid value for type ´bool´
... in comphelper::WeakComponentImplHelperBase::dispose() \
/comphelper/source/misc/compbase.cxx:20:9
Maybe also the problem breaking Java for the Jenkins_Linux_Dbg
since the comphelper::WeakComponentImplHelperBase patches
went in.
Regression from commit 252dd254b5b29298457b889623783152e9bed534
("new comphelper::WeakImplComponentHelper").
Change-Id: Idebf6dfcc051f8fcb4cde1fb66d40b38e6f9dddc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127449
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/comphelper/source/misc/compbase.cxx
b/comphelper/source/misc/compbase.cxx
index bd2ff837943f..ecae7108ff90 100644
--- a/comphelper/source/misc/compbase.cxx
+++ b/comphelper/source/misc/compbase.cxx
@@ -11,6 +11,11 @@
namespace comphelper
{
+WeakComponentImplHelperBase::WeakComponentImplHelperBase()
+: m_bDisposed(false)
+{
+}
+
WeakComponentImplHelperBase::~WeakComponentImplHelperBase() {}
// css::lang::XComponent
diff --git a/include/comphelper/compbase.hxx b/include/comphelper/compbase.hxx
index 6143fbb411ac..6cd969386034 100644
--- a/include/comphelper/compbase.hxx
+++ b/include/comphelper/compbase.hxx
@@ -31,6 +31,7 @@ class COMPHELPER_DLLPUBLIC WeakComponentImplHelperBase :
public cppu::OWeakObjec
public
css::lang::XComponent
{
public:
+WeakComponentImplHelperBase();
virtual ~WeakComponentImplHelperBase() override;
// css::lang::XComponent
[Libreoffice-commits] core.git: comphelper/source include/comphelper
comphelper/source/misc/accessiblewrapper.cxx |4 ++--
include/comphelper/accessiblewrapper.hxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3454055d4da3326540905fc69626b934d5aa0744
Author: Noel Grandin
AuthorDate: Fri Dec 24 20:15:53 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 25 09:28:41 2021 +0100
tdf#145090 LO Calc Crash with drop-down-menu
avoid attempting to call into widgets while in the middle of dispose
regression from
commit 8d485ec0cd35ee1ae7684f2b6ca96c0f0c6f9dac
IsDisposed->isDisposed in vcl/../window
Change-Id: If346dc9dc8547f8da28d091bfa20eff39162a0b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127437
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/comphelper/source/misc/accessiblewrapper.cxx
b/comphelper/source/misc/accessiblewrapper.cxx
index 9aa1b48e2f1e..1167f56403c3 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -86,7 +86,7 @@ namespace comphelper
Reference< XAccessible >
OWrappedAccessibleChildrenManager::getAccessibleWrapperFor(
const Reference< XAccessible >& _rxKey )
{
-Reference< XAccessible > xValue;
+rtl::Reference< OAccessibleWrapper > xValue;
if( !_rxKey.is() )
{
@@ -140,7 +140,7 @@ namespace comphelper
Reference< XComponent > xContextComponent;
if( rChild.second.is() )
-xContextComponent.set( rChild.second->getAccessibleContext(),
+xContextComponent.set( rChild.second->getContextNoCreate(),
::css::uno::UNO_QUERY );
if( xContextComponent.is() )
xContextComponent->dispose();
diff --git a/include/comphelper/accessiblewrapper.hxx
b/include/comphelper/accessiblewrapper.hxx
index 2423f2ffc2a2..13fb29bff5c1 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -316,7 +316,7 @@ namespace comphelper
typedef ::std::map < css::uno::Reference<
css::accessibility::XAccessible >
-, css::uno::Reference<
css::accessibility::XAccessible >
+, rtl::Reference< comphelper::OAccessibleWrapper >
> AccessibleMap;
// TODO: think about if we should hold these objects
weak
[Libreoffice-commits] core.git: unotools/source
unotools/source/config/pathoptions.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit f5ba1d0aa5850d5c2a2e267c89ad60885144ae28
Author: Noel Grandin
AuthorDate: Thu Dec 23 19:39:49 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 25 09:28:23 2021 +0100
osl::Mutex->std::mutex in SvtPathOptions
Change-Id: Ibf0aef2116e6ee7ab1cdc0de2b2bb502a8ce05e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127417
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/unotools/source/config/pathoptions.cxx
b/unotools/source/config/pathoptions.cxx
index e7793d07321c..27ddbed79c24 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -434,9 +434,9 @@ SvtPathOptions_Impl::SvtPathOptions_Impl()
namespace
{
-::osl::Mutex& lclMutex()
+std::mutex& lclMutex()
{
-static ::osl::Mutex SINGLETON;
+static std::mutex SINGLETON;
return SINGLETON;
}
}
@@ -444,12 +444,13 @@ namespace
SvtPathOptions::SvtPathOptions()
{
// Global access, must be guarded (multithreading)
-::osl::MutexGuard aGuard( lclMutex() );
+std::unique_lock aGuard( lclMutex() );
pImpl = g_pOptions.lock();
if ( !pImpl )
{
pImpl = std::make_shared();
g_pOptions = pImpl;
+aGuard.unlock(); // because holdConfigItem will call this constructor
ItemHolder1::holdConfigItem(EItem::PathOptions);
}
}
@@ -457,7 +458,7 @@ SvtPathOptions::SvtPathOptions()
SvtPathOptions::~SvtPathOptions()
{
// Global access, must be guarded (multithreading)
-::osl::MutexGuard aGuard( lclMutex() );
+std::unique_lock aGuard( lclMutex() );
pImpl.reset();
}
[Libreoffice-commits] core.git: svx/source
svx/source/table/tabledesign.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit ebdc45cda44618c4f165f01de2a5466ee6fb2242
Author: Noel Grandin
AuthorDate: Fri Dec 24 19:10:44 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 25 09:28:02 2021 +0100
no need to take SolarMutex in TableDesignFamily::createInstance
the constructor doesn't actually do anything other than allocate
memory
Change-Id: Iff437111018a6025d3aa02c350f67983bc64b08e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127435
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index bc14ca71..1694f8b9338d 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -623,8 +623,6 @@ void SAL_CALL TableDesignFamily::replaceByName( const
OUString& rName, const Any
Reference< XInterface > SAL_CALL TableDesignFamily::createInstance()
{
-SolarMutexGuard aGuard;
-
return Reference< XInterface >( static_cast< XStyle* >( new
TableDesignStyle ) );
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/formatpaintbrush.png |binary icon-themes/colibre/cmd/lc_formatpaintbrush.png |binary icon-themes/colibre/cmd/sc_formatpaintbrush.png |binary icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg |2 +- icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg |2 +- icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg |2 +- 6 files changed, 3 insertions(+), 3 deletions(-) New commits: commit e54d756e47e188790d4fec117d1ad1bdc91b38a8 Author: Rizal Muttaqin AuthorDate: Sat Dec 25 14:14:23 2021 +0700 Commit: Adolfo Jayme Barrientos CommitDate: Sat Dec 25 09:25:54 2021 +0100 Colibre: tdf#146410 update Clone Formatting icons Change-Id: Ia331ffb5381a8aa077755a68f74587a6e0105ca7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127468 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/colibre/cmd/32/formatpaintbrush.png b/icon-themes/colibre/cmd/32/formatpaintbrush.png index ea2d441fe1ba..f0bb4e1e1f72 100644 Binary files a/icon-themes/colibre/cmd/32/formatpaintbrush.png and b/icon-themes/colibre/cmd/32/formatpaintbrush.png differ diff --git a/icon-themes/colibre/cmd/lc_formatpaintbrush.png b/icon-themes/colibre/cmd/lc_formatpaintbrush.png index 377a6d9d94e7..3206204da6d5 100644 Binary files a/icon-themes/colibre/cmd/lc_formatpaintbrush.png and b/icon-themes/colibre/cmd/lc_formatpaintbrush.png differ diff --git a/icon-themes/colibre/cmd/sc_formatpaintbrush.png b/icon-themes/colibre/cmd/sc_formatpaintbrush.png index d480903c6402..4232d7319921 100644 Binary files a/icon-themes/colibre/cmd/sc_formatpaintbrush.png and b/icon-themes/colibre/cmd/sc_formatpaintbrush.png differ diff --git a/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg b/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg index a05b24bde9ec..9044c9e106ee 100644 --- a/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg +++ b/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg b/icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg index 3ac0d2c54cff..5473927065ae 100644 --- a/icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg +++ b/icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg b/icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg index 08397828232d..0405060232ae 100644 --- a/icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg +++ b/icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";>/> \ No newline at end of file +http://www.w3.org/2000/svg";>/&gt; \ No newline at end of file
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/formatpaintbrush.png |binary icon-themes/colibre/cmd/lc_formatpaintbrush.png |binary icon-themes/colibre/cmd/sc_formatpaintbrush.png |binary icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg |2 +- icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg |2 +- icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg |2 +- 6 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 9660c79a7933a6ae123d5760c123dd71851b9ff5 Author: Rizal Muttaqin AuthorDate: Sat Dec 25 14:14:23 2021 +0700 Commit: Adolfo Jayme Barrientos CommitDate: Sat Dec 25 09:25:34 2021 +0100 Colibre: tdf#146410 update Clone Formatting icons Change-Id: Ia331ffb5381a8aa077755a68f74587a6e0105ca7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127448 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/colibre/cmd/32/formatpaintbrush.png b/icon-themes/colibre/cmd/32/formatpaintbrush.png index ea2d441fe1ba..f0bb4e1e1f72 100644 Binary files a/icon-themes/colibre/cmd/32/formatpaintbrush.png and b/icon-themes/colibre/cmd/32/formatpaintbrush.png differ diff --git a/icon-themes/colibre/cmd/lc_formatpaintbrush.png b/icon-themes/colibre/cmd/lc_formatpaintbrush.png index 377a6d9d94e7..3206204da6d5 100644 Binary files a/icon-themes/colibre/cmd/lc_formatpaintbrush.png and b/icon-themes/colibre/cmd/lc_formatpaintbrush.png differ diff --git a/icon-themes/colibre/cmd/sc_formatpaintbrush.png b/icon-themes/colibre/cmd/sc_formatpaintbrush.png index d480903c6402..4232d7319921 100644 Binary files a/icon-themes/colibre/cmd/sc_formatpaintbrush.png and b/icon-themes/colibre/cmd/sc_formatpaintbrush.png differ diff --git a/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg b/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg index a05b24bde9ec..9044c9e106ee 100644 --- a/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg +++ b/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg b/icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg index 3ac0d2c54cff..5473927065ae 100644 --- a/icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg +++ b/icon-themes/colibre_svg/cmd/lc_formatpaintbrush.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg b/icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg index 08397828232d..0405060232ae 100644 --- a/icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg +++ b/icon-themes/colibre_svg/cmd/sc_formatpaintbrush.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";>/> \ No newline at end of file +http://www.w3.org/2000/svg";>/&gt; \ No newline at end of file
