[Libreoffice-commits] core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/bastyp/init.cxx|6 ++
 sw/source/core/docnode/swthreadjoiner.cxx |8 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 8b1399cbb76b2f8b1722cb6a4a77b391f5af0862
Author: Noel Grandin 
AuthorDate: Thu Nov 18 20:44:33 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 19 08:50:02 2021 +0100

rtl::Static->thread-safe static in sw

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

diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 0ab9a5c8ae84..8a82d99fc4b2 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -114,7 +114,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -779,13 +778,12 @@ namespace
 return *m_xTransWrp;
 }
 };
-
-class theTransWrp : public rtl::Static {};
 }
 
 const ::utl::TransliterationWrapper& GetAppCmpStrIgnore()
 {
-return theTransWrp::get().getTransliterationWrapper();
+static TransWrp theTransWrp;
+return theTransWrp.getTransliterationWrapper();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx 
b/sw/source/core/docnode/swthreadjoiner.cxx
index d13540d33ff8..d506bb7f115b 100644
--- a/sw/source/core/docnode/swthreadjoiner.cxx
+++ b/sw/source/core/docnode/swthreadjoiner.cxx
@@ -21,7 +21,6 @@
 #include 
 #include 
 #include 
-#include 
 
 // Testing
 
@@ -29,16 +28,13 @@ using namespace ::com::sun::star;
 
 namespace
 {
-class theJoinerMutex : public rtl::Static
-{
-};
-
 uno::Reference pThreadJoiner;
 }
 
 uno::Reference& SwThreadJoiner::GetThreadJoiner()
 {
-osl::MutexGuard aGuard(theJoinerMutex::get());
+static osl::Mutex theJoinerMutex;
+osl::MutexGuard aGuard(theJoinerMutex);
 
 if (!pThreadJoiner.is())
 {

[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/filter/xml/XMLRedlineImportHelper.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 339405818c9c31a3ba29f406afca36568c378fb2
Author: Miklos Vajna 
AuthorDate: Thu Nov 18 20:16:46 2021 +0100
Commit: Miklos Vajna 
CommitDate: Fri Nov 19 08:05:18 2021 +0100

sw: enable warning in XMLRedlineImportHelper::InsertIntoDocument()

This one looks useful, so why hide it behind dbglevel=2.

Change-Id: I424808ae8ccd2ab7edcd1a75cd7c4479a0ec3b13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125501
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 575c822ceb87..5e289bb7648f 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -667,10 +667,8 @@ void 
XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
 if( nPoint < pRedlineInfo->pContentIndex->GetIndex() ||
 nPoint > 
pRedlineInfo->pContentIndex->GetNode().EndOfSectionIndex() )
 pRedline->SetContentIdx(pRedlineInfo->pContentIndex);
-#if OSL_DEBUG_LEVEL > 1
 else
-OSL_FAIL( "Recursive change tracking" );
-#endif
+SAL_WARN("sw", "Recursive change tracking");
 }
 
 // set redline mode (without doing the associated book-keeping)

[Libreoffice-commits] core.git: unotools/source

[Noel Grandin (via logerrit)]

 unotools/source/config/bootstrap.cxx|   11 ++---
 unotools/source/config/cmdoptions.cxx   |9 +--
 unotools/source/config/configmgr.cxx|8 +--
 unotools/source/config/fontcfg.cxx  |   24 +++--
 unotools/source/config/lingucfg.cxx |   32 ++--
 unotools/source/config/moduleoptions.cxx|1 
 unotools/source/config/pathoptions.cxx  |   14 
 unotools/source/config/syslocaleoptions.cxx |   10 +++-
 unotools/source/i18n/textsearch.cxx |1 
 unotools/source/ucbhelper/tempfile.cxx  |2 -
 10 files changed, 47 insertions(+), 65 deletions(-)

New commits:
commit f7a8c3cc4dc9a316b39e8680a2af330d8f8ba296
Author: Noel Grandin 
AuthorDate: Thu Nov 18 20:24:57 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 19 07:33:34 2021 +0100

rtl::Static->thread-safe static in unotools

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

diff --git a/unotools/source/config/bootstrap.cxx 
b/unotools/source/config/bootstrap.cxx
index 51d3625e4af0..09c52157024b 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -32,7 +32,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 // #define this to true, if remembering defaults is not supported properly
@@ -112,12 +111,16 @@ private: // implementation
 
 namespace
 {
-class theImpl : public rtl::Static {};
+Bootstrap::Impl& theImpl()
+{
+static Bootstrap::Impl SINGLETON;
+return SINGLETON;
+}
 }
 
 const Bootstrap::Impl& Bootstrap::data()
 {
-return theImpl::get();
+return theImpl();
 }
 
 bool Bootstrap::getProcessWorkingDir(OUString &rUrl)
@@ -146,7 +149,7 @@ bool Bootstrap::getProcessWorkingDir(OUString &rUrl)
 
 void Bootstrap::reloadData()
 {
-theImpl::get().initialize();
+theImpl().initialize();
 }
 
 // helper
diff --git a/unotools/source/config/cmdoptions.cxx 
b/unotools/source/config/cmdoptions.cxx
index b61e49840390..d9e061224a4a 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -27,7 +27,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "itemholder1.hxx"
 
@@ -340,16 +339,12 @@ void SvtCommandOptions::EstablishFrameCallback(const 
css::uno::Reference< css::f
 m_pImpl->EstablishFrameCallback(xFrame);
 }
 
-namespace
-{
-class theCommandOptionsMutex : public rtl::Static{};
-}
-
 //  private method
 
 Mutex& SvtCommandOptions::GetOwnStaticMutex()
 {
-return theCommandOptionsMutex::get();
+static osl::Mutex theCommandOptionsMutex;
+return theCommandOptionsMutex;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/configmgr.cxx 
b/unotools/source/config/configmgr.cxx
index 84ab42cc795d..5b109788d2cd 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -67,10 +66,6 @@ getConfigurationProvider() {
 return css::configuration::theDefaultProvider::get( 
comphelper::getProcessComponentContext() );
 }
 
-struct theConfigManager:
-public rtl::Static< utl::ConfigManager, theConfigManager >
-{};
-
 }
 
 OUString utl::ConfigManager::getAboutBoxProductVersion() {
@@ -114,7 +109,8 @@ void utl::ConfigManager::storeConfigItems() {
 }
 
 utl::ConfigManager & utl::ConfigManager::getConfigManager() {
-return theConfigManager::get();
+static utl::ConfigManager theConfigManager;
+return theConfigManager;
 }
 
 css::uno::Reference< css::container::XHierarchicalNameAccess >
diff --git a/unotools/source/config/fontcfg.cxx 
b/unotools/source/config/fontcfg.cxx
index cfa6705a41c6..ef94981d7746 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -31,7 +31,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -83,18 +82,10 @@ static const char* getKeyType( DefaultFontType nKeyType )
 }
 }
 
-namespace
-{
-class theDefaultFontConfiguration
-: public rtl::Static
-{
-};
-}
-
 DefaultFontConfiguration& DefaultFontConfiguration::get()
 {
-return theDefaultFontConfiguration::get();
+static DefaultFontConfiguration theDefaultFontConfiguration;
+return theDefaultFontConfiguration;
 }
 
 DefaultFontConfiguration::DefaultFontConfiguration()
@@ -297,17 +288,10 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( 
const LanguageTag& rLan
  *  FontSubstConfigItem::get
  */
 
-namespace
-{
-class theFontSubstConfiguration
-: public rtl::Static
-{
-};
-}
-
 FontSubstConfiguration& FontSubstConfiguration::get()
 {
-return theFontSubstConfiguration::get();
+static FontSubstConfiguration theFontSubstConfiguration;
+return theFontSubstConfigurat

[Libreoffice-commits] core.git: tools/source

[Noel Grandin (via logerrit)]

 tools/source/stream/strmunx.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 4d3e4c1cf3f117b8abd8dd67843864bb4c2e5a2f
Author: Noel Grandin 
AuthorDate: Thu Nov 18 20:13:51 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 19 07:33:15 2021 +0100

rtl::Static->thread-safe static in tools

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

diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 6743993f112e..853389266ac3 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -30,7 +30,6 @@
 
 #include 
 #include 
-#include 
 
 using namespace osl;
 
@@ -38,7 +37,11 @@ using namespace osl;
 
 namespace {
 
-struct LockMutex : public rtl::Static< osl::Mutex, LockMutex > {};
+osl::Mutex& LockMutex()
+{
+static osl::Mutex SINGLETON;
+return SINGLETON;
+}
 
 std::map gLocks;
 
@@ -60,7 +63,7 @@ bool lockFile( const SvFileStream* pStream )
 if( aStatus.getFileType() == osl::FileStatus::Directory )
 return true;
 
-osl::MutexGuard aGuard( LockMutex::get() );
+osl::MutexGuard aGuard( LockMutex() );
 for( const auto& [rLockStream, rLockItem] : gLocks )
 {
 if( aItem.isIdenticalTo( rLockItem ) )
@@ -83,7 +86,7 @@ bool lockFile( const SvFileStream* pStream )
 
 void unlockFile( SvFileStream const * pStream )
 {
-osl::MutexGuard aGuard( LockMutex::get() );
+osl::MutexGuard aGuard( LockMutex() );
 gLocks.erase(pStream);
 }
 

[Libreoffice-commits] core.git: svx/source

[Noel Grandin (via logerrit)]

 svx/source/gallery2/galexpl.cxx  |   11 +++
 svx/source/items/svxerr.cxx  |9 +
 svx/source/sdr/attribute/sdrformtextattribute.cxx|   12 +++-
 svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx |   12 +++-
 svx/source/sdr/attribute/sdrtextattribute.cxx|   12 +++-
 5 files changed, 29 insertions(+), 27 deletions(-)

New commits:
commit 6f3c6b12eaf0466827c9ec6b84c2516e38061b04
Author: Noel Grandin 
AuthorDate: Thu Nov 18 20:08:38 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 19 07:33:00 2021 +0100

rtl::Static->thread-safe static in svx

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

diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 83dc3b1688dd..c155f4f14613 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include 
 #include 
 #include 
 #include 
@@ -26,7 +25,11 @@
 
 namespace
 {
-class theLockListener : public rtl::Static< SfxListener, theLockListener > 
{};
+SfxListener& theLockListener()
+{
+static SfxListener SINGLETON;
+return SINGLETON;
+}
 }
 
 
@@ -240,7 +243,7 @@ bool GalleryExplorer::BeginLocking( std::u16string_view 
rThemeName )
 
 if( pGal )
 {
-GalleryTheme* pTheme = pGal->AcquireTheme( rThemeName, 
theLockListener::get() );
+GalleryTheme* pTheme = pGal->AcquireTheme( rThemeName, 
theLockListener() );
 
 if( pTheme )
 {
@@ -278,7 +281,7 @@ bool GalleryExplorer::EndLocking( std::u16string_view 
rThemeName )
 if( bReleaseLockedTheme )
 {
 // release locked theme
-pGal->ReleaseTheme( pTheme, theLockListener::get() );
+pGal->ReleaseTheme( pTheme, theLockListener() );
 bRet = true;
 }
 }
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index 4fd503c388d0..24efadda459e 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -19,7 +19,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 SvxErrorHandler::SvxErrorHandler() :
@@ -28,16 +27,10 @@ SvxErrorHandler::SvxErrorHandler() :
 {
 }
 
-namespace
-{
-class theSvxErrorHandler
-: public rtl::Static {};
-}
-
 void SvxErrorHandler::ensure()
 {
+static SvxErrorHandler SINGLETON;
 // coverity[side_effect_free : FALSE] - not actually side-effect-free
-theSvxErrorHandler::get();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx 
b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index cdec873b0d26..69fff8a8d724 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -45,7 +45,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 // helper to get line, stroke and transparence attributes from SfxItemSet
@@ -251,8 +250,11 @@ namespace drawinglayer::attribute
 
 namespace
 {
-struct theGlobalDefault :
-public rtl::Static< SdrFormTextAttribute::ImplType, 
theGlobalDefault > {};
+SdrFormTextAttribute::ImplType& theGlobalDefault()
+{
+static SdrFormTextAttribute::ImplType SINGLETON;
+return SINGLETON;
+}
 }
 
 SdrFormTextAttribute::SdrFormTextAttribute(const SfxItemSet& rSet)
@@ -261,7 +263,7 @@ namespace drawinglayer::attribute
 }
 
 SdrFormTextAttribute::SdrFormTextAttribute()
-:   mpSdrFormTextAttribute(theGlobalDefault::get())
+:   mpSdrFormTextAttribute(theGlobalDefault())
 {
 }
 
@@ -281,7 +283,7 @@ namespace drawinglayer::attribute
 
 bool SdrFormTextAttribute::isDefault() const
 {
-return mpSdrFormTextAttribute.same_object(theGlobalDefault::get());
+return mpSdrFormTextAttribute.same_object(theGlobalDefault());
 }
 
 SdrFormTextAttribute& SdrFormTextAttribute::operator=(const 
SdrFormTextAttribute& rCandidate)
diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx 
b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
index 180f9bbfc928..ec97cf04429d 100644
--- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
@@ -21,7 +21,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 namespace drawinglayer::attribute
@@ -65,8 +64,11 @@ namespace drawinglayer::attribute
 
 namespace
 {
-struct theGlobalDefault :
-public rtl::Static< SdrFormTextOutlineAttribute::ImplType, 
theGlobalDefault > {};
+SdrFormTextOutlineAttribute::ImplType& theGlobalDef

[Libreoffice-commits] core.git: svtools/source

[Noel Grandin (via logerrit)]

 svtools/source/config/accessibilityoptions.cxx |   12 +++-
 svtools/source/config/colorcfg.cxx |   12 +++-
 svtools/source/config/extcolorcfg.cxx  |   12 +++-
 svtools/source/config/miscopt.cxx  |   10 ++
 svtools/source/config/slidesorterbaropt.cxx|   10 ++
 svtools/source/control/inettbc.cxx |   14 --
 6 files changed, 33 insertions(+), 37 deletions(-)

New commits:
commit 79db82976e3070b7889d2ec350dde3eff703ebe4
Author: Noel Grandin 
AuthorDate: Thu Nov 18 19:53:25 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 19 07:32:43 2021 +0100

rtl::Static->thread-safe static in svtools

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

diff --git a/svtools/source/config/accessibilityoptions.cxx 
b/svtools/source/config/accessibilityoptions.cxx
index 7debdf47327e..05c113478402 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -30,7 +30,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include "itemholder2.hxx"
@@ -71,8 +70,11 @@ sal_Int32 
SvtAccessibilityOptions::sm_nAccessibilityRefCount
 
 namespace
 {
-struct SingletonMutex
-: public rtl::Static< ::osl::Mutex, SingletonMutex > {};
+::osl::Mutex& SingletonMutex()
+{
+static ::osl::Mutex SINGLETON;
+return SINGLETON;
+}
 }
 
 
@@ -335,7 +337,7 @@ SvtAccessibilityOptions::SvtAccessibilityOptions()
 {
 if (!utl::ConfigManager::IsFuzzing())
 {
-::osl::MutexGuard aGuard( SingletonMutex::get() );
+::osl::MutexGuard aGuard( SingletonMutex() );
 if(!sm_pSingleImplConfig)
 {
 sm_pSingleImplConfig = new SvtAccessibilityOptions_Impl;
@@ -349,7 +351,7 @@ SvtAccessibilityOptions::SvtAccessibilityOptions()
 SvtAccessibilityOptions::~SvtAccessibilityOptions()
 {
 //EndListening( *sm_pSingleImplConfig, sal_True );
-::osl::MutexGuard aGuard( SingletonMutex::get() );
+::osl::MutexGuard aGuard( SingletonMutex() );
 if( !--sm_nAccessibilityRefCount )
 {
 //if( sm_pSingleImplConfig->IsModified() )
diff --git a/svtools/source/config/colorcfg.cxx 
b/svtools/source/config/colorcfg.cxx
index ec918014e98f..f72736afe6cb 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 using namespace utl;
@@ -54,8 +53,11 @@ namespace svtools
 static sal_Int32nColorRefCount_Impl = 0;
 namespace
 {
-struct ColorMutex_Impl
-: public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
+::osl::Mutex& ColorMutex_Impl()
+{
+static ::osl::Mutex SINGLETON;
+return SINGLETON;
+}
 }
 
 ColorConfig_Impl*ColorConfig::m_pImpl = nullptr;
@@ -376,7 +378,7 @@ ColorConfig::ColorConfig()
 {
 if (utl::ConfigManager::IsFuzzing())
 return;
-::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
+::osl::MutexGuard aGuard( ColorMutex_Impl() );
 if ( !m_pImpl )
 {
 m_pImpl = new ColorConfig_Impl;
@@ -390,7 +392,7 @@ ColorConfig::~ColorConfig()
 {
 if (utl::ConfigManager::IsFuzzing())
 return;
-::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
+::osl::MutexGuard aGuard( ColorMutex_Impl() );
 m_pImpl->RemoveListener(this);
 if(!--nColorRefCount_Impl)
 {
diff --git a/svtools/source/config/extcolorcfg.cxx 
b/svtools/source/config/extcolorcfg.cxx
index e5767b0b1453..bdeda2d4e8b9 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -38,7 +38,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 using namespace utl;
@@ -51,8 +50,11 @@ namespace svtools
 static sal_Int32nExtendedColorRefCount_Impl = 0;
 namespace
 {
-struct ColorMutex_Impl
-: public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
+::osl::Mutex& ColorMutex_Impl()
+{
+static ::osl::Mutex SINGLETON;
+return SINGLETON;
+}
 }
 
 ExtendedColorConfig_Impl*ExtendedColorConfig::m_pImpl = nullptr;
@@ -506,7 +508,7 @@ IMPL_LINK( ExtendedColorConfig_Impl, 
DataChangedEventListener, VclSimpleEvent&,
 
 ExtendedColorConfig::ExtendedColorConfig()
 {
-::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
+::osl::MutexGuard aGuard( ColorMutex_Impl() );
 if ( !m_pImpl )
 m_pImpl = new ExtendedColorConfig_Impl;
 ++nExtendedColorRefCount_Impl;
@@ -515,7 +517,7 @@ ExtendedColorConfig::ExtendedColorConfig()
 
 ExtendedColorConfig::~ExtendedColorConfig()
 {
-::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
+::osl::MutexGuard aGuard( ColorMutex_Impl() );
 EndListening( *m_pImpl);
 if(!--nExtendedColorRefCount_Impl)
 {
diff --git a/svtools/source/config/miscopt.cxx 
b/svtools

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - svl/source

[Michael Stahl (via logerrit)]

 svl/source/passwordcontainer/passwordcontainer.component |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 67d8c6ecb3873a8dfc789221764d7688596f09cc
Author: Michael Stahl 
AuthorDate: Thu Nov 18 17:53:46 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Nov 19 04:52:34 2021 +0100

tdf#140086 svl: restore PasswordContainer to single-instance

(regression from 7256ff08bc46840bb85fa255ace6541dca91329e)

Change-Id: Ib640dea001fc787279761ca72bbc3db46d0102c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125485
Reviewed-by: Noel Grandin 
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
(cherry picked from commit dd43c74ee5778109f860e18419fc37fd9ab1c7dd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125453
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svl/source/passwordcontainer/passwordcontainer.component 
b/svl/source/passwordcontainer/passwordcontainer.component
index e928461fa96b..109f45c5021c 100644
--- a/svl/source/passwordcontainer/passwordcontainer.component
+++ b/svl/source/passwordcontainer/passwordcontainer.component
@@ -20,6 +20,7 @@
 http://openoffice.org/2010/uno-components";>
   
 
   

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8443576d96346b63e3c2f11f258d2b89c3538f9e
Author: Caolán McNamara 
AuthorDate: Thu Nov 18 15:31:34 2021 +
Commit: Xisco Fauli 
CommitDate: Thu Nov 18 22:14:25 2021 +0100

crashes seen in WriterInspectorTextPanel ctor

null DocSh is likely

Change-Id: I5aeb81ef01795b896ad594d7eb7f0cd657f5a690
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125451
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx 
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index a59143ba8d48..5d55176be2da 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -62,7 +62,7 @@ 
WriterInspectorTextPanel::WriterInspectorTextPanel(weld::Widget* pParent)
 : InspectorTextPanel(pParent)
 {
 SwDocShell* pDocSh = static_cast(SfxObjectShell::Current());
-m_pShell = pDocSh->GetWrtShell();
+m_pShell = pDocSh ? pDocSh->GetWrtShell() : nullptr;
 if (m_pShell)
 {
 m_oldLink = m_pShell->GetChgLnk();
@@ -71,7 +71,7 @@ 
WriterInspectorTextPanel::WriterInspectorTextPanel(weld::Widget* pParent)
 
 // Update panel on start
 std::vector aStore;
-if (pDocSh->GetDoc()->GetEditShell()->GetCursor()->GetNode().GetTextNode())
+if (pDocSh && 
pDocSh->GetDoc()->GetEditShell()->GetCursor()->GetNode().GetTextNode())
 UpdateTree(pDocSh, aStore);
 updateEntries(aStore);
 }

[Libreoffice-commits] core.git: sd/qa

[Xisco Fauli (via logerrit)]

 sd/qa/uitest/impress_tests/tdf137637.py |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 11800469cc7b3a40c42410be93a12e5107db0efb
Author: Xisco Fauli 
AuthorDate: Thu Nov 18 21:22:10 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 18 22:12:56 2021 +0100

uitest: sd: the redo action fails at times ...

... to add back the animation to the list in the sidebar,
and thus the test fails.
Remove it for now. At least the undo part of tdf#135033
is still tested

Change-Id: I7dc416645db53ec3f08376d04de9be036ce53fdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125505
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sd/qa/uitest/impress_tests/tdf137637.py 
b/sd/qa/uitest/impress_tests/tdf137637.py
index 11e948eb654f..9b642bee5155 100644
--- a/sd/qa/uitest/impress_tests/tdf137637.py
+++ b/sd/qa/uitest/impress_tests/tdf137637.py
@@ -33,10 +33,12 @@ class Tdf137637(UITestCase):
 # AttributeError: 'NoneType' object has no attribute 
'getImplementationName'
 self.assertEqual("com.sun.star.drawing.SvxShapeCollection", 
document.CurrentSelection.getImplementationName())
 
+xAnimationList = xImpressDoc.getChild("custom_animation_list")
+self.assertEqual('0', 
get_state_as_dict(xAnimationList)['Children'])
+
 xAddBtn = xImpressDoc.getChild("add_effect")
 xAddBtn.executeAction("CLICK", tuple())
 
-xAnimationList = xImpressDoc.getChild("custom_animation_list")
 self.assertEqual('1', 
get_state_as_dict(xAnimationList)['Children'])
 
 self.xUITest.executeCommand(".uno:Undo")
@@ -45,7 +47,3 @@ class Tdf137637(UITestCase):
 # AssertionError: '0' != '1'
 self.assertEqual('0', 
get_state_as_dict(xAnimationList)['Children'])
 
-self.xUITest.executeCommand(".uno:Redo")
-
-self.assertEqual('1', 
get_state_as_dict(xAnimationList)['Children'])
-

Re: FYI: ccache for MSVC/Windows

[Luboš Luňák]

On Wednesday 17 of November 2021, Thorsten Behrens wrote:
> Note that ccache performs surprisingly poor on io-starved Windows
> setups [1], which possibly is true for the Jenkins VMs.

 If I run 'CCACHE_DEBUG=1 make -C starmath -j8 -rs Library_sm', most of the 
ccache log files claim the full ccache invocation took roughly 50ms. With ~50 
source files in Library_sm that should be ~2.5s CPU time, and if we count 
only non-HT cores, that should take less than a second. Yet the time spent by 
building .cxx files is roughly 3 seconds. So I wouldn't be that certain in 
claiming it's about ccache performing poorly, maybe it's gbuild or poor 
Windows performance when invoking executables or whatever.

 And if I run the above with GBUILD_TRACE set, I get what's attached. 
Apparently even outputting those log 109 lines pretty much doubles the CXX 
time, for whatever strange reason, and there are quite some empty spaces 
between the compilations (they are also in a log created on linux, but there 
they are tiny). I guess that's the reason why we used to have a gmake version 
patched for Windows.

> Along the same line, I've also recently added support for sccache, but
> YMMV there, too (I'd choose ccache over sccache for local caches any
> time). Might be interesting for our dev mentoring team though, since
> sccache enables sharing of cache content via hyperscaler blob storage
> [2].

 Recent ccache versions have support for shared remote storage too, although 
I've never tried it. I've never tried sccache either, but just from looking 
at it ccache seems generally superior, for example sccache can't handle PCHs, 
so it's basically trading one speedup for another.

-- 
 Luboš Luňák
 l.lu...@collabora.com

[Libreoffice-commits] core.git: vcl/qt5

[Armin Le Grand (Allotropia) (via logerrit)]

 vcl/qt5/QtFont.cxx |   57 -
 1 file changed, 56 insertions(+), 1 deletion(-)

New commits:
commit 7bcc18ac67181d10d3479b3100647aceddd86750
Author: Armin Le Grand (Allotropia) 
AuthorDate: Thu Nov 18 18:06:39 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Nov 18 22:02:18 2021 +0100

Qt implement QtFont::GetGlyphOutline

Fixes FontWork with QFont based rendering.

Change-Id: I294fe89d2753b6e82a559ff847b44126f9ea3bfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125500
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/qt5/QtFont.cxx b/vcl/qt5/QtFont.cxx
index a9d84e897c1b..07bf9f541f0b 100644
--- a/vcl/qt5/QtFont.cxx
+++ b/vcl/qt5/QtFont.cxx
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 
 static inline void applyWeight(QtFont& rFont, FontWeight eWeight)
 {
@@ -151,7 +152,61 @@ hb_font_t* QtFont::ImplInitHbFont()
 return InitHbFont(hb_face_create_for_tables(getFontTable, this, nullptr));
 }
 
-bool QtFont::GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) 
const { return false; }
+bool QtFont::GetGlyphOutline(sal_GlyphId nId, basegfx::B2DPolyPolygon& 
rB2DPolyPoly, bool) const
+{
+rB2DPolyPoly.clear();
+basegfx::B2DPolygon aPart;
+QRawFont aRawFont(QRawFont::fromFont(*this));
+QPainterPath aQPath = aRawFont.pathForGlyph(nId);
+
+for (int a(0); a < aQPath.elementCount(); a++)
+{
+const QPainterPath::Element aQElement = aQPath.elementAt(a);
+
+switch (aQElement.type)
+{
+case QPainterPath::MoveToElement:
+{
+if (aPart.count())
+{
+aPart.setClosed(true);
+rB2DPolyPoly.append(aPart);
+aPart.clear();
+}
+
+aPart.append(basegfx::B2DPoint(aQElement.x, aQElement.y));
+break;
+}
+case QPainterPath::LineToElement:
+{
+aPart.append(basegfx::B2DPoint(aQElement.x, aQElement.y));
+break;
+}
+case QPainterPath::CurveToElement:
+{
+const QPainterPath::Element aQ2 = aQPath.elementAt(++a);
+const QPainterPath::Element aQ3 = aQPath.elementAt(++a);
+aPart.appendBezierSegment(basegfx::B2DPoint(aQElement.x, 
aQElement.y),
+  basegfx::B2DPoint(aQ2.x, aQ2.y),
+  basegfx::B2DPoint(aQ3.x, aQ3.y));
+break;
+}
+case QPainterPath::CurveToDataElement:
+{
+break;
+}
+}
+}
+
+if (aPart.count())
+{
+aPart.setClosed(true);
+rB2DPolyPoly.append(aPart);
+aPart.clear();
+}
+
+return true;
+}
 
 bool QtFont::ImplGetGlyphBoundRect(sal_GlyphId nId, tools::Rectangle& rRect, 
bool) const
 {

[Libreoffice-commits] core.git: include/basegfx vcl/source

[Mike Kaganski (via logerrit)]

 include/basegfx/numeric/ftools.hxx |3 ---
 vcl/source/outdev/textline.cxx |3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit b8ef63c9fb3a1d4fb4a5549d28067cde07a8ab13
Author: Mike Kaganski 
AuthorDate: Thu Nov 18 16:29:19 2021 +0200
Commit: Mike Kaganski 
CommitDate: Thu Nov 18 21:19:30 2021 +0100

Drop F_PI180

Change-Id: I36783d6fd6f439a71bc46959cd859b48d65ee30f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125449
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/basegfx/numeric/ftools.hxx 
b/include/basegfx/numeric/ftools.hxx
index 6009e839b11b..102e3b324942 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -36,9 +36,6 @@
 #ifndef F_PI4
 #define F_PI4   M_PI_4
 #endif
-#ifndef F_PI180
-#define F_PI180 (M_PI/180.0)
-#endif
 #ifndef F_PI1800
 #define F_PI1800(M_PI/1800.0)
 #endif
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 7015d768986c..5fe1538f37f4 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -1002,8 +1002,7 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos, 
const Point& rEndPos, to
 // handle rotation
 if (nStartY != nEndY || nStartX > nEndX)
 {
-fOrientation = std::atan2(nStartY - nEndY, nEndX - nStartX);
-fOrientation /= F_PI180;
+fOrientation = basegfx::rad2deg(std::atan2(nStartY - nEndY, nEndX - 
nStartX));
 // un-rotate the end point
 aStartPt.RotateAround(nEndX, nEndY, 
Degree10(static_cast(-fOrientation * 10.0)));
 }

[Libreoffice-commits] core.git: include/basegfx

[Mike Kaganski (via logerrit)]

 include/basegfx/numeric/ftools.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit ca476ce3bc76b9a6073bcd587eceb30115ce103f
Author: Mike Kaganski 
AuthorDate: Thu Nov 18 16:17:55 2021 +0200
Commit: Mike Kaganski 
CommitDate: Thu Nov 18 21:19:13 2021 +0100

Drop obsolete comment

Change-Id: Iee729890771376192c547b96c59f5e0086782219
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125448
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/basegfx/numeric/ftools.hxx 
b/include/basegfx/numeric/ftools.hxx
index 31d3e585cedd..6009e839b11b 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 
-// standard PI defines from solar.h, but we do not want to link against tools
 
 #ifndef F_PI
 #define F_PIM_PI

[Libreoffice-commits] core.git: svl/source

[Michael Stahl (via logerrit)]

 svl/source/passwordcontainer/passwordcontainer.component |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dd43c74ee5778109f860e18419fc37fd9ab1c7dd
Author: Michael Stahl 
AuthorDate: Thu Nov 18 17:53:46 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 18 21:12:59 2021 +0100

tdf#140086 svl: restore PasswordContainer to single-instance

(regression from 7256ff08bc46840bb85fa255ace6541dca91329e)

Change-Id: Ib640dea001fc787279761ca72bbc3db46d0102c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125485
Reviewed-by: Noel Grandin 
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/svl/source/passwordcontainer/passwordcontainer.component 
b/svl/source/passwordcontainer/passwordcontainer.component
index e928461fa96b..109f45c5021c 100644
--- a/svl/source/passwordcontainer/passwordcontainer.component
+++ b/svl/source/passwordcontainer/passwordcontainer.component
@@ -20,6 +20,7 @@
 http://openoffice.org/2010/uno-components";>
   
 
   

[Libreoffice-commits] core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/navipi/content.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 966c9af081d1c8296026c1ca3564869362de45ab
Author: Caolán McNamara 
AuthorDate: Thu Nov 18 16:45:35 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 18 20:48:20 2021 +0100

drop unnecessary TODO

Change-Id: Id906f7a6bf806d5c102f8653b1174aaa47e8bb7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125488
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 7d8e4c61ff98..c19c6b87a6fd 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -556,7 +556,6 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&, 
rCEvt, bool)
 
 //  displayed document
 std::unique_ptr 
xDocMenu(xBuilder->weld_menu("displaymenu"));
-//TODOaDocMenu->SetMenuFlags( aDocMenu->GetMenuFlags() | 
MenuFlags::NoAutoMnemonics );
 sal_uInt16 i=0;
 OUString sActive;
 OUString sId;

[Libreoffice-commits] core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/sort/tdf91305.py |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit badbacff3e124d6dcb2e656c97dc25a3d9ae5761
Author: Xisco Fauli 
AuthorDate: Thu Nov 18 18:51:36 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 18 20:02:04 2021 +0100

uitest: sc: remove duplicated test with the same name

In the file, there are two test_tdf91305_sort_text_cells_rows
so this one is never executed.

Just remove it because it's quite a basic test

Change-Id: I255b4202359e20744845fbdcbf963e74b9ee0710
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125490
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/sort/tdf91305.py b/sc/qa/uitest/sort/tdf91305.py
index 73213db22eee..0f1d5d8d769f 100644
--- a/sc/qa/uitest/sort/tdf91305.py
+++ b/sc/qa/uitest/sort/tdf91305.py
@@ -17,28 +17,6 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
 
 class tdf91305(UITestCase):
 
-def test_tdf91305_sort_text_cells_rows(self):
-with self.ui_test.create_doc_in_start_center("calc") as document:
-xCalcDoc = self.xUITest.getTopFocusWindow()
-gridwin = xCalcDoc.getChild("grid_window")
-#In column A enter texts
-enter_text_to_cell(gridwin, "A1", "cc")
-enter_text_to_cell(gridwin, "A2", "ff")
-enter_text_to_cell(gridwin, "A3", "aa")
-
-gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"A1:A3"}))
-#Press toolbarbutton for ascending sorting .uno:SortAsc
-self.xUITest.executeCommand(".uno:SortAscending")
-#verify
-self.assertEqual(get_cell_by_position(document, 0, 0, 
0).getString(), "aa")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
1).getString(), "cc")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
2).getString(), "ff")
-#Press toolbarbutton for descending sorting .uno:SortDescending
-self.xUITest.executeCommand(".uno:SortDescending")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
0).getString(), "ff")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
1).getString(), "cc")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
2).getString(), "aa")
-
 def test_tdf91305_sort_text_cells_columns(self):
 with self.ui_test.create_doc_in_start_center("calc") as document:
 xCalcDoc = self.xUITest.getTopFocusWindow()

[Libreoffice-commits] core.git: basctl/inc basctl/source

[Noel Grandin (via logerrit)]

 basctl/inc/bitmaps.hlst |   28 ++--
 basctl/inc/helpids.h|   26 ++
 basctl/inc/strings.hxx  |   50 ++--
 basctl/source/basicide/baside2.cxx  |2 -
 basctl/source/basicide/baside2.hxx  |2 -
 basctl/source/basicide/baside2b.cxx |2 -
 basctl/source/basicide/baside3.cxx  |2 -
 basctl/source/basicide/bastype2.cxx |4 +-
 basctl/source/basicide/bastype3.cxx |4 +-
 basctl/source/basicide/moduldl2.cxx |4 +-
 basctl/source/inc/baside3.hxx   |2 -
 basctl/source/inc/bastypes.hxx  |2 -
 basctl/source/inc/dlgeddef.hxx  |   24 -
 13 files changed, 77 insertions(+), 75 deletions(-)

New commits:
commit 0011ed25344673d441e2ac59f455428b27fea9d3
Author: Noel Grandin 
AuthorDate: Thu Nov 18 14:01:23 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 18 19:46:19 2021 +0100

loplugin:stringliteraldefine in basctl

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

diff --git a/basctl/inc/bitmaps.hlst b/basctl/inc/bitmaps.hlst
index 11d35b289d58..b316a2450a39 100644
--- a/basctl/inc/bitmaps.hlst
+++ b/basctl/inc/bitmaps.hlst
@@ -9,19 +9,19 @@
 
 #pragma once
 
-#define RID_BMP_BRKENABLED  "res/im30838.png"
-#define RID_BMP_BRKDISABLED "res/im30839.png"
-#define RID_BMP_STEPMARKER  "res/im30840.png"
-#define RID_BMP_ERRORMARKER "res/im30841.png"
-#define RID_BMP_LOCKED  "res/lock.png"
-#define RID_BMP_INSTALLATION"res/harddisk_16.png"
-#define RID_BMP_DOCUMENT"res/im30826.png"
-#define RID_BMP_MODLIB  "res/im30820.png"
-#define RID_BMP_MODLIBNOTLOADED "res/im30827.png"
-#define RID_BMP_MODULE  "res/im30821.png"
-#define RID_BMP_MACRO   "res/im30822.png"
-#define RID_BMP_DLGLIB  "res/dialogfolder_16.png"
-#define RID_BMP_DLGLIBNOTLOADED "res/dialogfoldernot_16.png"
-#define RID_BMP_DIALOG  "res/im30823.png"
+inline constexpr OUStringLiteral RID_BMP_BRKENABLED = u"res/im30838.png";
+inline constexpr OUStringLiteral RID_BMP_BRKDISABLED = u"res/im30839.png";
+inline constexpr OUStringLiteral RID_BMP_STEPMARKER = u"res/im30840.png";
+inline constexpr OUStringLiteral RID_BMP_ERRORMARKER = u"res/im30841.png";
+inline constexpr OUStringLiteral RID_BMP_LOCKED = u"res/lock.png";
+inline constexpr OUStringLiteral RID_BMP_INSTALLATION = u"res/harddisk_16.png";
+inline constexpr OUStringLiteral RID_BMP_DOCUMENT = u"res/im30826.png";
+inline constexpr OUStringLiteral RID_BMP_MODLIB = u"res/im30820.png";
+inline constexpr OUStringLiteral RID_BMP_MODLIBNOTLOADED = u"res/im30827.png";
+inline constexpr OUStringLiteral RID_BMP_MODULE = u"res/im30821.png";
+inline constexpr OUStringLiteral RID_BMP_MACRO = u"res/im30822.png";
+inline constexpr OUStringLiteral RID_BMP_DLGLIB = u"res/dialogfolder_16.png";
+inline constexpr OUStringLiteral RID_BMP_DLGLIBNOTLOADED = 
u"res/dialogfoldernot_16.png";
+inline constexpr OUStringLiteral RID_BMP_DIALOG = u"res/im30823.png";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/basctl/inc/helpids.h b/basctl/inc/helpids.h
index 13e59eb7ef88..28b855ffb602 100644
--- a/basctl/inc/helpids.h
+++ b/basctl/inc/helpids.h
@@ -18,20 +18,22 @@
  */
 #pragma once
 
-#define HID_BASICIDE_OBJECTCAT
"BASCTL_HID_BASICIDE_OBJECTCAT"
+#include 
 
-#define HID_BASICIDE_REMOVEWATCH  
"BASCTL_HID_BASICIDE_REMOVEWATCH"
+inline constexpr OStringLiteral HID_BASICIDE_OBJECTCAT = 
"BASCTL_HID_BASICIDE_OBJECTCAT";
 
-#define HID_BASICIDE_MODULWINDOW  
"BASCTL_HID_BASICIDE_MODULWINDOW"
-#define HID_BASICIDE_DIALOGWINDOW 
"BASCTL_HID_BASICIDE_DIALOGWINDOW"
+inline constexpr OStringLiteral HID_BASICIDE_REMOVEWATCH = 
"BASCTL_HID_BASICIDE_REMOVEWATCH";
 
-#define HID_BASICIDE_EDITORWINDOW 
"BASCTL_HID_BASICIDE_EDITORWINDOW"
-#define HID_BASICIDE_BREAKPOINTWINDOW 
"BASCTL_HID_BASICIDE_BREAKPOINTWINDOW"
-#define HID_BASICIDE_WATCHWINDOW  
"BASCTL_HID_BASICIDE_WATCHWINDOW"
-#define HID_BASICIDE_STACKWINDOW  
"BASCTL_HID_BASICIDE_STACKWINDOW"
-#define HID_BASICIDE_TABBAR   
"BASCTL_HID_BASICIDE_TABBAR"
-#define HID_BASICIDE_WATCHWINDOW_EDIT 
"BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT"
-#define HID_BASICIDE_WATCHWINDOW_LIST 
"BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"
-#define HID_BASICIDE_STACKWINDOW_LIST 
"BASCTL_HID_BASICIDE_STACKWINDOW_LIST"
+inline constexpr OStringLiteral HID_BASICIDE_MODULWINDOW = 
"BASCTL_HID_BASICIDE_MODULWINDOW";
+inline constexpr OStringLiteral HID_BASICIDE_DIALOGWINDOW = 
"BASCTL_HID_BASICIDE_DIALOGWINDOW";
+
+inline cons

[Libreoffice-commits] core.git: sw/source

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |   68 ++---
 1 file changed, 34 insertions(+), 34 deletions(-)

New commits:
commit a1b1f5a472497e04d315323e429f06fa55c19c71
Author: Jim Raykowski 
AuthorDate: Wed Nov 17 22:39:52 2021 -0900
Commit: Jim Raykowski 
CommitDate: Thu Nov 18 19:38:36 2021 +0100

SwNavigator: Track drawing objects before other content

Do this to prevent other trackable content from being tracked before
drawing objects when Navigator is used to go to drawing objects.

Change-Id: Ib9d322208a2e358140bfb8c80ad94b4e0084f06a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125437
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 2227cb04f4c8..8b5c13ffb088 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3717,6 +3717,40 @@ void SwContentTree::UpdateTracking()
 return;
 }
 }
+// drawing
+if ((m_pActiveShell->GetSelectionType() & (SelectionType::DrawObject |
+   
SelectionType::DrawObjectEditMode |
+   SelectionType::DbForm)) &&
+!(m_bIsRoot && m_nRootType != ContentTypeId::DRAWOBJECT))
+{
+if (m_bDrawingObjectTracking)
+{
+// Multiple selection is possible when in root content 
navigation view so unselect all
+// selected entries before reselecting. This causes a bit of 
an annoyance when the treeview
+// scroll bar is used and focus is in the document by causing 
the last selected entry to
+// scroll back into view.
+if (m_bIsRoot)
+m_xTreeView->unselect_all();
+SdrView* pSdrView = m_pActiveShell->GetDrawView();
+if (pSdrView)
+{
+for (size_t nIdx(0); nIdx < 
pSdrView->GetMarkedObjectCount(); nIdx++)
+{
+SdrObject* pSelected = 
pSdrView->GetMarkedObjectByIndex(nIdx);
+OUString aName(pSelected->GetName());
+if (!aName.isEmpty())
+lcl_SelectDrawObjectByName(*m_xTreeView, aName);
+}
+}
+else
+{
+// clear treeview selections
+m_xTreeView->unselect_all();
+}
+Select();
+}
+return;
+}
 // footnotes and endnotes
 if (SwContentAtPos aContentAtPos(IsAttrAtPos::Ftn);
 
m_pActiveShell->GetContentAtPos(m_pActiveShell->GetCursorDocPos(), 
aContentAtPos) &&
@@ -3809,40 +3843,6 @@ void SwContentTree::UpdateTracking()
 }
 return;
 }
-// drawing
-if ((m_pActiveShell->GetSelectionType() & (SelectionType::DrawObject |
-   
SelectionType::DrawObjectEditMode |
-   SelectionType::DbForm)) &&
-!(m_bIsRoot && m_nRootType != ContentTypeId::DRAWOBJECT))
-{
-if (m_bDrawingObjectTracking)
-{
-// Multiple selection is possible when in root content 
navigation view so unselect all
-// selected entries before reselecting. This causes a bit of 
an annoyance when the treeview
-// scroll bar is used and focus is in the document by causing 
the last selected entry to
-// scroll back into view.
-if (m_bIsRoot)
-m_xTreeView->unselect_all();
-SdrView* pSdrView = m_pActiveShell->GetDrawView();
-if (pSdrView)
-{
-for (size_t nIdx(0); nIdx < 
pSdrView->GetMarkedObjectCount(); nIdx++)
-{
-SdrObject* pSelected = 
pSdrView->GetMarkedObjectByIndex(nIdx);
-OUString aName(pSelected->GetName());
-if (!aName.isEmpty())
-lcl_SelectDrawObjectByName(*m_xTreeView, aName);
-}
-}
-else
-{
-// clear treeview selections
-m_xTreeView->unselect_all();
-}
-Select();
-}
-return;
-}
 // table
 if (m_pActiveShell->IsCursorInTable() &&
 !(m_bIsRoot && m_nRootType != ContentTypeId::TABLE))

[Libreoffice-commits] core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/unit/ucalc.cxx |   32 
 1 file changed, 32 insertions(+)

New commits:
commit 7f326714ffbed94a4107b1e896898c1be89ca938
Author: Xisco Fauli 
AuthorDate: Thu Nov 18 18:19:47 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 18 19:23:53 2021 +0100

tdf#76836: sc_ucalc: Add unittest

Change-Id: I62d4325dcaee19188529bb749801dc945c060572
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125487
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index cc101bfe2253..32a53aa25649 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -169,6 +169,7 @@ public:
 void testDataArea();
 void testAutofilter();
 void testAutoFilterTimeValue();
+void testTdf76836();
 void testTdf76441();
 void testTdf142186();
 void testTdf137063();
@@ -292,6 +293,7 @@ public:
 CPPUNIT_TEST(testToggleRefFlag);
 CPPUNIT_TEST(testAutofilter);
 CPPUNIT_TEST(testAutoFilterTimeValue);
+CPPUNIT_TEST(testTdf76836);
 CPPUNIT_TEST(testTdf76441);
 CPPUNIT_TEST(testTdf142186);
 CPPUNIT_TEST(testTdf137063);
@@ -3579,6 +3581,36 @@ void Test::testTdf76441()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testTdf76836()
+{
+m_pDoc->InsertTab(0, "Test");
+
+OUString aCode = "\"192.168.0.\"@";
+sal_Int32 nCheckPos;
+SvNumFormatType nType;
+sal_uInt32 nFormat;
+SvNumberFormatter* pFormatter = m_pDoc->GetFormatTable();
+pFormatter->PutEntry( aCode, nCheckPos, nType, nFormat );
+
+ScPatternAttr aNewAttrs(m_pDoc->GetPool());
+SfxItemSet& rSet = aNewAttrs.GetItemSet();
+rSet.Put(SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat));
+
+m_pDoc->ApplyPattern(0, 0, 0, aNewAttrs);
+m_pDoc->SetValue(0,0,0, 10.0);
+
+// Without the fix in place, this test would have failed with
+// - Expected: 10
+// - Actual  : 192.168.0.10
+CPPUNIT_ASSERT_EQUAL(OUString("10"), m_pDoc->GetString(ScAddress(0,0,0)));
+
+m_pDoc->ApplyPattern(0, 1, 0, aNewAttrs);
+m_pDoc->SetString(ScAddress(0,1,0), "10");
+CPPUNIT_ASSERT_EQUAL(OUString("192.168.0.10"), 
m_pDoc->GetString(ScAddress(0,1,0)));
+
+m_pDoc->DeleteTab(0);
+}
+
 void Test::testTdf142186()
 {
 m_pDoc->InsertTab(0, "Test");

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99e860b5231f86600ebb63b73d6ee557acc44ac8
Author: Olivier Hallot 
AuthorDate: Thu Nov 18 15:18:42 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Nov 18 19:18:42 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 04bef9c48889b4da6f332b1b31a9b45227b52c32
  - Refactor database help files

Change-Id: Ie8f983d2c49f61084c456f8c7e91b41a6b5ac22a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/125491
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 3c580a172f69..04bef9c48889 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3c580a172f699ab665b609896ac7c12a8990ee5b
+Subproject commit 04bef9c48889b4da6f332b1b31a9b45227b52c32

[Libreoffice-commits] help.git: AllLangHelp_sdatabase.mk AllLangHelp_shared.mk source/text

[Olivier Hallot (via logerrit)]

 AllLangHelp_sdatabase.mk   |5 +++
 AllLangHelp_shared.mk  |5 ---
 source/text/sdatabase/dabawiz02.xhp|2 -
 source/text/sdatabase/tablewizard00.xhp|   20 +++
 source/text/sdatabase/tablewizard01.xhp|   20 +++
 source/text/sdatabase/tablewizard02.xhp|   37 -
 source/text/sdatabase/tablewizard03.xhp|   27 -
 source/text/sdatabase/tablewizard04.xhp|   21 +++-
 source/text/shared/guide/data_new.xhp  |2 -
 source/text/shared/guide/data_tables.xhp   |2 -
 source/text/shared/guide/database_main.xhp |2 -
 source/text/shared/guide/main.xhp  |2 -
 12 files changed, 66 insertions(+), 79 deletions(-)

New commits:
commit 04bef9c48889b4da6f332b1b31a9b45227b52c32
Author: Olivier Hallot 
AuthorDate: Thu Nov 18 15:11:55 2021 -0300
Commit: Olivier Hallot 
CommitDate: Thu Nov 18 19:18:39 2021 +0100

Refactor database help files

Change-Id: Ie8f983d2c49f61084c456f8c7e91b41a6b5ac22a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/125491
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index a2ad6311e..a83735de4 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -73,6 +73,11 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/menuinsert \
 helpcontent2/source/text/sdatabase/menutools \
 helpcontent2/source/text/sdatabase/menuview \
+helpcontent2/source/text/sdatabase/tablewizard00 \
+helpcontent2/source/text/sdatabase/tablewizard01 \
+helpcontent2/source/text/sdatabase/tablewizard02 \
+helpcontent2/source/text/sdatabase/tablewizard03 \
+helpcontent2/source/text/sdatabase/tablewizard04 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index e758a8330..2642366a7 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -888,11 +888,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/explorer/database/rep_pagenumbers \
 helpcontent2/source/text/shared/explorer/database/rep_prop \
 helpcontent2/source/text/shared/explorer/database/rep_sort \
-helpcontent2/source/text/shared/explorer/database/tablewizard00 \
-helpcontent2/source/text/shared/explorer/database/tablewizard01 \
-helpcontent2/source/text/shared/explorer/database/tablewizard02 \
-helpcontent2/source/text/shared/explorer/database/tablewizard03 \
-helpcontent2/source/text/shared/explorer/database/tablewizard04 \
 ,shared/explorer/database))
 
 # vim: set noet sw=4 ts=4:
diff --git a/source/text/sdatabase/dabawiz02.xhp 
b/source/text/sdatabase/dabawiz02.xhp
index 4bb8556ae..368bf6a15 100644
--- a/source/text/sdatabase/dabawiz02.xhp
+++ b/source/text/sdatabase/dabawiz02.xhp
@@ -36,7 +36,7 @@
 Open the database for editing
 Select to display the database file, where you can edit the database 
structure.
 Create tables using 
the table wizard
-Select to call the Table Wizard 
after the Database Wizard is finished.
+Select to call the Table 
Wizard after the Database Wizard is finished.
 
 
 
diff --git a/source/text/shared/explorer/database/tablewizard00.xhp 
b/source/text/sdatabase/tablewizard00.xhp
similarity index 73%
rename from source/text/shared/explorer/database/tablewizard00.xhp
rename to source/text/sdatabase/tablewizard00.xhp
index 767b2d0af..fd8c0b9eb 100644
--- a/source/text/shared/explorer/database/tablewizard00.xhp
+++ b/source/text/sdatabase/tablewizard00.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Table Wizard
-/text/shared/explorer/database/tablewizard00.xhp
+/text/sdatabase/tablewizard00.xhp
 
 
 
@@ -32,17 +32,17 @@
 Table Wizard (Base)
 mw added "(Base)" to all entries
 
-Table 
Wizard
+Table 
Wizard
 The Table Wizard helps you to create a database 
table.
 
-
-
-
-
+
+
+
+
 
 
 
 
-Table Wizard - Select fields
+Table Wizard - Select fields
 
 
diff --git a/source/text/shared/explorer/database/tablewizard01.xhp 
b/source/text/sdatabase/tablewizard01.xhp
similarity index 78%
rename from source/text/shared/explorer/database/tablewizard01.xhp
rename to source/text/sdatabase/tablewizard01.xhp
index 6f02a3373..d039a58e7 100644
--- a/source/text/shared/explorer/database/tablewizard01.xhp
+++ b/source/text/sdatabase/tablewizard01.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Table Wizard - Select Fields
-/text/shared/explorer/database/tablewizard01.xhp
+/text/sdatabase/tablewizard01.xhp
 
 
 
 
-Table Wizard - Select 
Fields
+Table 
Wizard - Select Fields
 Select fields 
from the provided sample tables as a starting point to create your own 
table.
 
 
-Business
+Business
 Select the business category to see only business sample 
tables.
 
-Private
+Private
 Select the private category to see only private sample 
tables.
 
-Sample 
tables
+

[Libreoffice-commits] core.git: ucb/source

[Michael Stahl (via logerrit)]

 ucb/source/ucp/webdav-curl/CurlSession.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92dbabbafb25b24bc8c621d4fc516eadb53ff5c9
Author: Michael Stahl 
AuthorDate: Thu Nov 18 17:34:00 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 18 18:34:50 2021 +0100

ucb: webdav-curl: don't assert on valid URL

If you put an URL into the host field of the remote files dialog,
it will gladly create silly urls that start with "https://https://";
- these are syntactically valid because ":" may occur without port
number path segment may be empty, so don't assert.

Change-Id: I29b6317daeb76d8f2fd4a22c0908ad2366c36297
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125484
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx 
b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index 16cd1c0a6081..e1cfd2c3f79f 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -782,7 +782,7 @@ auto CurlProcessor::URIReferenceToURI(CurlSession& 
rSession, OUString const& rUR
 }
 else
 {
-assert(rURIReference.startsWith("/") && 
!rURIReference.startsWith("//"));
+assert(rURIReference.startsWith("/"));
 return rSession.m_URI.CloneWithRelativeRefPathAbsolute(rURIReference);
 }
 }

[Libreoffice-commits] core.git: Branch 'feature/wasm' - svx/source vcl/qt5 xmloff/Library_xo.mk

[Armin Le Grand (Allotropia) (via logerrit)]

 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |   40 ++
 vcl/qt5/QtFont.cxx  |   59 +++-
 xmloff/Library_xo.mk|2 
 3 files changed, 99 insertions(+), 2 deletions(-)

New commits:
commit 88817d984e31bc5be9580b57ac1c4aeee2b1503a
Author: Armin Le Grand (Allotropia) 
AuthorDate: Thu Nov 18 18:06:39 2021 +0100
Commit: Armin Le Grand (Allotropia) 
CommitDate: Thu Nov 18 18:06:39 2021 +0100

WASM: Impl GetGlyphOutline for Qt, make insert from Gallery functional

Change-Id: I294fe89d2753b6e82a559ff847b44126f9ea3bfc

diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx 
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index e5756f8ef37d..1284b11e4c65 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -374,6 +374,46 @@ static void GetTextAreaOutline(
 FWCharacterData aCharacterData;
 if ( pVirDev->GetTextOutlines( aCharacterData.vOutlines, 
rText, 0, 0, -1, nWidth, aDXArry ) )
 {
+rParagraph.vCharacters.push_back( aCharacterData );
+}
+else
+{
+// GetTextOutlines failed what usually means that it is
+// not implemented. To make FontWork not fail (it is
+// dependent of graphic content to get a Range) create
+// a rectangle substitution for now
+pVirDev->GetTextArray( rText, &aDXArry);
+aCharacterData.vOutlines.clear();
+
+if(aDXArry.size())
+{
+for(size_t a(0); a < aDXArry.size(); a++)
+{
+const basegfx::B2DPolygon aPolygon(
+basegfx::utils::createPolygonFromRect(
+basegfx::B2DRange(
+0 == a ? 0 : aDXArry[a - 1],
+0,
+aDXArry[a],
+aFont.GetFontHeight()
+)));
+
aCharacterData.vOutlines.push_back(tools::PolyPolygon(tools::Polygon(aPolygon)));
+}
+}
+else
+{
+const basegfx::B2DPolygon aPolygon(
+basegfx::utils::createPolygonFromRect(
+basegfx::B2DRange(
+0,
+0,
+aDXArry.empty() ? 10 : aDXArry.back(),
+aFont.GetFontHeight()
+)));
+
aCharacterData.vOutlines.push_back(tools::PolyPolygon(tools::Polygon(aPolygon)));
+}
+
+
 rParagraph.vCharacters.push_back( aCharacterData );
 }
 }
diff --git a/vcl/qt5/QtFont.cxx b/vcl/qt5/QtFont.cxx
index a9d84e897c1b..24bfcb616365 100644
--- a/vcl/qt5/QtFont.cxx
+++ b/vcl/qt5/QtFont.cxx
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 
 static inline void applyWeight(QtFont& rFont, FontWeight eWeight)
 {
@@ -151,7 +152,63 @@ hb_font_t* QtFont::ImplInitHbFont()
 return InitHbFont(hb_face_create_for_tables(getFontTable, this, nullptr));
 }
 
-bool QtFont::GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) 
const { return false; }
+// Implemented, need this for WASM undr Qt to make e.g. FontWork functional
+bool QtFont::GetGlyphOutline(sal_GlyphId nId, basegfx::B2DPolyPolygon& 
rB2DPolyPoly, bool) const
+{
+rB2DPolyPoly.clear();
+basegfx::B2DPolygon aPart;
+QRawFont aRawFont(QRawFont::fromFont(*this));
+QPainterPath aQPath = aRawFont.pathForGlyph(nId);
+
+for(int a(0); a < aQPath.elementCount(); a++)
+{
+const QPainterPath::Element aQElement = aQPath.elementAt(a);
+
+switch(aQElement.type)
+{
+case QPainterPath::MoveToElement:
+{
+if(aPart.count())
+{
+aPart.setClosed(true);
+rB2DPolyPoly.append(aPart);
+aPart.clear();
+}
+
+aPart.append(basegfx::B2DPoint(aQElement.x, aQElement.y));
+break;
+}
+case QPainterPath::LineToElement:
+{
+aPart.append(basegfx::B2DPoint(aQElement.x, aQElement.y));
+break;
+}
+case QPainterPath::CurveToElement:
+{
+const QPainterPath::Element aQ2 = aQPath.elementAt(++a);
+const QPainterPath::Element aQ3 = aQPath.elementAt(++a);
+aPart.appendBezierSeg

[Libreoffice-commits] core.git: chart2/inc

[Noel Grandin (via logerrit)]

 chart2/inc/bitmaps.hlst |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 7ea765fd2f9a357ffb95c4e5e7826426614d0670
Author: Noel Grandin 
AuthorDate: Thu Nov 18 15:39:38 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 18 17:53:43 2021 +0100

remove some unused defines

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

diff --git a/chart2/inc/bitmaps.hlst b/chart2/inc/bitmaps.hlst
index fee0c98ace1e..0f4512e8bc2c 100644
--- a/chart2/inc/bitmaps.hlst
+++ b/chart2/inc/bitmaps.hlst
@@ -129,7 +129,4 @@ inline constexpr OUStringLiteral BMP_REGRESSION_POWER = 
u"chart2/res/regpow.png"
 inline constexpr OUStringLiteral BMP_REGRESSION_POLYNOMIAL = 
u"chart2/res/regpoly.png";
 inline constexpr OUStringLiteral BMP_REGRESSION_MOVING_AVERAGE = 
u"chart2/res/regavg.png";
 
-#define RID_SVXBMP_LAMP_ON  "svx/res/lighton.png"
-#define RID_SVXBMP_LAMP_OFF "svx/res/light.png"
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */

[Libreoffice-commits] core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/gridwin.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9ef696ff1594a2e3c6ef2185b27c8e67f6592b33
Author: Caolán McNamara 
AuthorDate: Thu Nov 18 09:19:46 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 18 17:37:18 2021 +0100

when color menu popdowns only popdown the autofilter if something was 
selected

so the color menu can be dismissed without dismissing the autofilter

Change-Id: Idb44f40a599382f86ffa9519910c37e64a56820c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125439
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 33ea3fe045b8..5b203addbb12 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -978,11 +978,12 @@ void 
ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode)
 
 sal_Int32 nSelected = rControl.ExecuteMenu(*xColorMenu);
 xColorMenu.reset();
-rControl.terminateAllPopupMenus();
 
 if (nSelected == 0)
 return;
 
+rControl.terminateAllPopupMenus();
+
 // Disable color filter when active color was selected
 if (nSelected == nActive)
 {

[Libreoffice-commits] core.git: include/oox include/svx oox/source sd/source svx/source

[Sarper Akdemir (via logerrit)]

 include/oox/drawingml/theme.hxx|5 
 include/svx/svdpage.hxx|5 
 oox/source/drawingml/theme.cxx |   15 +
 oox/source/drawingml/themefragmenthandler.cxx  |6 -
 oox/source/ppt/presentationfragmenthandler.cxx |6 +
 sd/source/ui/unoidl/unopage.cxx|   27 -
 svx/source/svdraw/svdpage.cxx  |3 ++
 7 files changed, 65 insertions(+), 2 deletions(-)

New commits:
commit 6ce8066af743b172d36046a8dc8b17ebe010b6cf
Author: Sarper Akdemir 
AuthorDate: Mon Sep 13 09:47:11 2021 +0300
Commit: Miklos Vajna 
CommitDate: Thu Nov 18 17:17:43 2021 +0100

import pptx color schemes as color sets

initial import work for color sets.
Themes (which we get the color schemes from) in MSO can
be different for each master - will need to support that too.

[ Miklos: actually added that per-master-page support. ]

(cherry picked from commit 3b21d166f585dcdf8d576d166aeff3cfd4694aab,
from the feature/themesupport2 branch)

Change-Id: Ia06d2645018e6bfa70817bbddba2374641ae13dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125477
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index 944e58b6e79c..6222a4264451 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -32,6 +32,7 @@
 #include 
 
 namespace com::sun::star {
+namespace drawing { class XDrawPage; }
 namespace xml::dom { class XDocument; }
 }
 
@@ -57,6 +58,7 @@ class OOX_DLLPUBLIC Theme
 {
 public:
 void setStyleName( const OUString& rStyleName ) { 
maStyleName = rStyleName; }
+void setThemeName(const OUString& rThemeName) { maThemeName = rThemeName; }
 
 ClrScheme&   getClrScheme() { return maClrScheme; }
 const ClrScheme& getClrScheme() const { return maClrScheme; }
@@ -96,8 +98,11 @@ public:
 const css::uno::Reference& getFragment() const { 
return mxFragment; }
 void setFragment( const css::uno::Reference< 
css::xml::dom::XDocument>& xRef ) { mxFragment=xRef; }
 
+void addTheme(const css::uno::Reference& 
xDrawPage) const;
+
 private:
 OUStringmaStyleName;
+OUStringmaThemeName;
 ClrScheme   maClrScheme;
 FillStyleList   maFillStyleList;
 FillStyleList   maBgFillStyleList;
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index eaadcde330c0..540002eb7d14 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -312,6 +313,7 @@ private:
 // data
 SdrPage*mpSdrPage;
 SfxStyleSheet*  mpStyleSheet;
+std::unique_ptr mpTheme;
 SfxItemSet  maProperties;
 
 // internal helpers
@@ -339,6 +341,9 @@ public:
 // StyleSheet access
 void SetStyleSheet(SfxStyleSheet* pStyleSheet);
 SfxStyleSheet* GetStyleSheet() const { return mpStyleSheet;}
+
+void SetTheme(std::unique_ptr pTheme);
+svx::Theme* GetTheme();
 };
 
 
diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx
index 036779d21711..be9f199ff8f8 100644
--- a/oox/source/drawingml/theme.cxx
+++ b/oox/source/drawingml/theme.cxx
@@ -20,6 +20,12 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace com::sun::star;
 
 namespace oox::drawingml {
 
@@ -97,6 +103,15 @@ const TextFont* Theme::resolveFont( const OUString& rName ) 
const
 return nullptr;
 }
 
+void Theme::addTheme(const css::uno::Reference& 
xDrawPage) const
+{
+beans::PropertyValues aValues = {
+comphelper::makePropertyValue("Name", maThemeName),
+};
+uno::Reference xPropertySet(xDrawPage, 
uno::UNO_QUERY);
+xPropertySet->setPropertyValue("Theme", uno::makeAny(aValues));
+}
+
 } // namespace oox::drawingml
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/themefragmenthandler.cxx 
b/oox/source/drawingml/themefragmenthandler.cxx
index 5c5d4a6ab07a..5ab0ee1e6b21 100644
--- a/oox/source/drawingml/themefragmenthandler.cxx
+++ b/oox/source/drawingml/themefragmenthandler.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::oox::core;
@@ -37,7 +38,7 @@ ThemeFragmentHandler::~ThemeFragmentHandler()
 {
 }
 
-ContextHandlerRef ThemeFragmentHandler::onCreateContext( sal_Int32 nElement, 
const AttributeList& )
+ContextHandlerRef ThemeFragmentHandler::onCreateContext( sal_Int32 nElement, 
const AttributeList& rAttribs)
 {
 // CT_OfficeStyleSheet
 switch( getCurrentElement() )
@@ -46,7 +47,10 @@ ContextHandlerRef ThemeFragmentHandler::onCreateContext( 
sal_Int32 nElement, con
 switch( nElement )
 {

[Libreoffice-commits] core.git: distro-configs/Jenkins

[Luboš Luňák (via logerrit)]

 distro-configs/Jenkins/MacOSX_dev_master.conf |2 +-
 distro-configs/Jenkins/Win32_dev_master.conf  |2 +-
 distro-configs/Jenkins/Win64_dev_master.conf  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f4d59ec73682f06fff9f718b3347726f1d53d263
Author: Luboš Luňák 
AuthorDate: Wed Nov 17 11:55:12 2021 +0100
Commit: Luboš Luňák 
CommitDate: Thu Nov 18 16:46:18 2021 +0100

make Jenkins dev builds use --enable-dbgutil, not just debug

It's the "more debug" option that each developer ideally should
use unless binary compatibility is wanted. Jenkins builds done
with these settings are reportedly not published, so this is
just tinderbox builds, and there's it's better to verify
the extra dbgutil stuff too.

Change-Id: Ia2f86ff9394e155b247a6e5e1583d0681399b99b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125381
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/distro-configs/Jenkins/MacOSX_dev_master.conf 
b/distro-configs/Jenkins/MacOSX_dev_master.conf
index 1718b7fd3439..3960c4e5bf23 100644
--- a/distro-configs/Jenkins/MacOSX_dev_master.conf
+++ b/distro-configs/Jenkins/MacOSX_dev_master.conf
@@ -1,3 +1,3 @@
---enable-debug
+--enable-dbgutil
 --enable-odk
 --disable-online-update
diff --git a/distro-configs/Jenkins/Win32_dev_master.conf 
b/distro-configs/Jenkins/Win32_dev_master.conf
index e81e0cfef628..7ccda1beb829 100644
--- a/distro-configs/Jenkins/Win32_dev_master.conf
+++ b/distro-configs/Jenkins/Win32_dev_master.conf
@@ -1,4 +1,4 @@
 --host=i686-pc-cygwin
---enable-debug
+--enable-dbgutil
 --enable-odk
 --disable-online-update
diff --git a/distro-configs/Jenkins/Win64_dev_master.conf 
b/distro-configs/Jenkins/Win64_dev_master.conf
index 1718b7fd3439..3960c4e5bf23 100644
--- a/distro-configs/Jenkins/Win64_dev_master.conf
+++ b/distro-configs/Jenkins/Win64_dev_master.conf
@@ -1,3 +1,3 @@
---enable-debug
+--enable-dbgutil
 --enable-odk
 --disable-online-update

[Libreoffice-commits] core.git: vcl/source

[Luboš Luňák (via logerrit)]

 vcl/source/window/decoview.cxx |  294 +++--
 1 file changed, 138 insertions(+), 156 deletions(-)

New commits:
commit a7a700de4b6191d97c9addf528dce218b237e868
Author: Luboš Luňák 
AuthorDate: Thu Nov 18 14:49:01 2021 +0100
Commit: Luboš Luňák 
CommitDate: Thu Nov 18 16:44:46 2021 +0100

draw symbols using polygons instead of raster of lines

On HiDPI those lines become obvious.

Change-Id: I2b0cce3950abb4d06a56ba022100bc74026b5de7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125481
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index f9ccb59f6ee1..71481200d9f0 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -72,86 +72,98 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle 
nRect, const SymbolTyp
 switch ( eType )
 {
 case SymbolType::ARROW_UP:
-pDev->DrawPixel( Point( aCenter.X(), nRect.Top() ) );
-for ( tools::Long i=1; i <= n2; ++i )
-{
-nRect.AdjustTop( 1 );
-pDev->DrawLine( Point( aCenter.X()-i, nRect.Top() ),
-Point( aCenter.X()+i, nRect.Top() ) );
-pDev->DrawPixel( Point( aCenter.X()-i, nRect.Top() ) );
-pDev->DrawPixel( Point( aCenter.X()+i, nRect.Top() ) );
-}
-pDev->DrawRect( tools::Rectangle( aCenter.X()-n8, nRect.Top()+1,
-   aCenter.X()+n8, nRect.Bottom() ) );
+{
+tools::Polygon arrow(7);
+arrow.SetPoint( Point( aCenter.X(), nRect.Top()), 0 );
+arrow.SetPoint( Point( aCenter.X() - n2, nRect.Top() + n2 ), 1 );
+arrow.SetPoint( Point( aCenter.X() - n8, nRect.Top() + n2 ), 2 );
+arrow.SetPoint( Point( aCenter.X() - n8, nRect.Bottom()), 3 );
+arrow.SetPoint( Point( aCenter.X() + n8, nRect.Bottom()), 4 );
+arrow.SetPoint( Point( aCenter.X() + n8, nRect.Top() + n2 ), 5 );
+arrow.SetPoint( Point( aCenter.X() + n2, nRect.Top() + n2 ), 6 );
+pDev->Push(vcl::PushFlags::LINECOLOR);
+pDev->SetLineColor();
+pDev->DrawPolygon( arrow );
+pDev->Pop();
 break;
+}
 
 case SymbolType::ARROW_DOWN:
-pDev->DrawPixel( Point( aCenter.X(), nRect.Bottom() ) );
-for ( tools::Long i=1; i <= n2; ++i )
-{
-nRect.AdjustBottom( -1 );
-pDev->DrawLine( Point( aCenter.X()-i, nRect.Bottom() ),
-Point( aCenter.X()+i, nRect.Bottom() ) );
-pDev->DrawPixel( Point( aCenter.X()-i, nRect.Bottom() ) );
-pDev->DrawPixel( Point( aCenter.X()+i, nRect.Bottom() ) );
-}
-pDev->DrawRect( tools::Rectangle( aCenter.X()-n8, nRect.Top(),
-   aCenter.X()+n8, nRect.Bottom()-1 ) );
+{
+tools::Polygon arrow(7);
+arrow.SetPoint( Point( aCenter.X(), nRect.Bottom()), 0 );
+arrow.SetPoint( Point( aCenter.X() - n2, nRect.Bottom() - n2 ), 1 
);
+arrow.SetPoint( Point( aCenter.X() - n8, nRect.Bottom() - n2 ), 2 
);
+arrow.SetPoint( Point( aCenter.X() - n8, nRect.Top()), 3 );
+arrow.SetPoint( Point( aCenter.X() + n8, nRect.Top()), 4 );
+arrow.SetPoint( Point( aCenter.X() + n8, nRect.Bottom() - n2 ), 5 
);
+arrow.SetPoint( Point( aCenter.X() + n2, nRect.Bottom() - n2 ), 6 
);
+pDev->Push(vcl::PushFlags::LINECOLOR);
+pDev->SetLineColor();
+pDev->DrawPolygon( arrow );
+pDev->Pop();
 break;
+}
 
 case SymbolType::ARROW_LEFT:
-pDev->DrawPixel( Point( nRect.Left(), aCenter.Y() ) );
-for ( tools::Long i=1; i <= n2; ++i )
-{
-nRect.AdjustLeft( 1 );
-pDev->DrawLine( Point( nRect.Left(), aCenter.Y()-i ),
-Point( nRect.Left(), aCenter.Y()+i ) );
-pDev->DrawPixel( Point( nRect.Left(), aCenter.Y()-i ) );
-pDev->DrawPixel( Point( nRect.Left(), aCenter.Y()+i ) );
-}
-pDev->DrawRect( tools::Rectangle( nRect.Left()+1, aCenter.Y()-n8,
-   nRect.Right(), aCenter.Y()+n8 ) );
+{
+tools::Polygon arrow(7);
+arrow.SetPoint( Point( nRect.Left(), aCenter.Y()), 0 );
+arrow.SetPoint( Point( nRect.Left() + n2, aCenter.Y() - n2 ), 1 );
+arrow.SetPoint( Point( nRect.Left() + n2, aCenter.Y() - n8 ), 2 );
+arrow.SetPoint( Point( nRect.Right(), aCenter.Y() - n8 ), 3 );
+arrow.SetPoint( Point( nRect.Right(), aCenter.Y() + n8 ), 4 );
+arrow.SetPoint( Point( nRect.Left()

[Libreoffice-commits] core.git: 2 commits - vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/skia/osx/gdiimpl.cxx |   33 +++--
 1 file changed, 27 insertions(+), 6 deletions(-)

New commits:
commit 899deee84589306764a19383e3518e66714ca5e5
Author: Luboš Luňák 
AuthorDate: Thu Nov 18 12:23:11 2021 +0100
Commit: Luboš Luňák 
CommitDate: Thu Nov 18 16:44:18 2021 +0100

add an extra margin to native control drawing on Skia/Mac

Some controls draw outside of their given area, which would get cropped
when first drawing to a temporary context limited to just that size.
I haven't managed to find a way to calculate the proper marging, so
just add something that's hopefully enough but not too big.

Change-Id: I1a15a3ab8cbd26cbe4fb52628b300ee70c8d51ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125469
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx
index 58e03e16f3be..126f43bb6ac3 100644
--- a/vcl/skia/osx/gdiimpl.cxx
+++ b/vcl/skia/osx/gdiimpl.cxx
@@ -187,9 +187,19 @@ bool 
AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n
 const tools::Rectangle& 
rControlRegion,
 ControlState nState, const 
ImplControlValue& aValue)
 {
+// rControlRegion is not the whole area that the control should be painted 
to (e.g. highlight
+// around focused lineedit is outside of it). Since we draw to a temporary 
bitmap, we need tofind out
+// the real size. Using getNativeControlRegion() might seem like the 
function to call, but we need
+// the other direction - what is called rControlRegion here is 
rNativeContentRegion in that function
+// what's called rControlRegion there is what we need here. Moreover 
getNativeControlRegion()
+// in some cases returns a fixed size that does not depend on its input, 
so we have no way to
+// actually find out what the original size was (or maybe the function is 
kind of broken, I don't know).
+// So, add a generous margin and hope it's enough.
+tools::Rectangle boundingRegion(rControlRegion);
+boundingRegion.expand(50 * mScaling);
 // Do a scaled bitmap in HiDPI in order not to lose precision.
-const tools::Long width = rControlRegion.GetWidth() * mScaling;
-const tools::Long height = rControlRegion.GetHeight() * mScaling;
+const tools::Long width = boundingRegion.GetWidth() * mScaling;
+const tools::Long height = boundingRegion.GetHeight() * mScaling;
 const size_t bytes = width * height * 4;
 std::unique_ptr data(new sal_uInt8[bytes]);
 memset(data.get(), 0, bytes);
@@ -211,7 +221,9 @@ bool AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType 
nType, ControlPart n
 CGContextSetRGBFillColor(context, fillColor.GetRed(), 
fillColor.GetGreen(), fillColor.GetBlue(),
  fillColor.GetAlpha());
 // Adjust for our drawn-to coordinates in the bitmap.
-tools::Rectangle movedRegion(Point(0, 0), rControlRegion.GetSize());
+tools::Rectangle movedRegion(Point(rControlRegion.getX() - 
boundingRegion.getX(),
+   rControlRegion.getY() - 
boundingRegion.getY()),
+ rControlRegion.GetSize());
 // Flip drawing upside down.
 CGContextTranslateCTM(context, 0, height);
 CGContextScaleCTM(context, 1, -1);
@@ -232,15 +244,15 @@ bool 
AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n
 preDraw();
 SAL_INFO("vcl.skia.trace", "drawnativecontrol(" << this << "): " << 
rControlRegion << ":"
 << int(nType) << "/" 
<< int(nPart));
-tools::Rectangle updateRect = rControlRegion;
+tools::Rectangle updateRect = boundingRegion;
 // For background update only part that is not clipped, the same
 // as in AquaGraphicsBackend::drawNativeControl().
 if (nType == ControlType::WindowBackground)
 updateRect.Intersection(mClipRegion.GetBoundRect());
 addUpdateRegion(SkRect::MakeXYWH(updateRect.getX(), updateRect.getY(),
  updateRect.GetWidth(), 
updateRect.GetHeight()));
-SkRect drawRect = SkRect::MakeXYWH(rControlRegion.getX(), 
rControlRegion.getY(),
-   rControlRegion.GetWidth(), 
rControlRegion.GetHeight());
+SkRect drawRect = SkRect::MakeXYWH(boundingRegion.getX(), 
boundingRegion.getY(),
+   boundingRegion.GetWidth(), 
boundingRegion.GetHeight());
 assert(drawRect.width() * mScaling == bitmap.width()); // no scaling 
should be needed
 getDrawCanvas()->drawImageRect(bitmap.asImage(), drawRect, 
SkSamplingOptions());
 ++mPendingOperationsToFlush; // tdf#136369
commit 5a76ae27a90fcb7e170a1cdd822a4bfd260e03a3
Author: Luboš Luňák 
AuthorDate: Thu Nov 18

[Libreoffice-commits] core.git: vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/skia/osx/gdiimpl.cxx |   25 +
 1 file changed, 17 insertions(+), 8 deletions(-)

New commits:
commit 07a9d2f60dabac5b8f9d10acb73a8eade1593aae
Author: Luboš Luňák 
AuthorDate: Thu Nov 18 10:17:54 2021 +0100
Commit: Luboš Luňák 
CommitDate: Thu Nov 18 16:43:46 2021 +0100

draw Mac widget controls at proper size when HiDPI

This code was drawing them at non-HiDPI size and then scaling up.

Change-Id: I90abfd36adaff4e7c4929cd28d0aa50d919449a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125467
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx
index 73e5e09d20d0..0f451f8916df 100644
--- a/vcl/skia/osx/gdiimpl.cxx
+++ b/vcl/skia/osx/gdiimpl.cxx
@@ -187,21 +187,27 @@ bool 
AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n
 const tools::Rectangle& 
rControlRegion,
 ControlState nState, const 
ImplControlValue& aValue)
 {
-const tools::Long width = rControlRegion.GetWidth();
-const tools::Long height = rControlRegion.GetHeight();
+// Do a scaled bitmap in HiDPI in order not to lose precision.
+const tools::Long width = rControlRegion.GetWidth() * mScaling;
+const tools::Long height = rControlRegion.GetHeight() * mScaling;
 const size_t bytes = width * height * 4;
 std::unique_ptr data(new sal_uInt8[bytes]);
 memset(data.get(), 0, bytes);
 CGContextRef context = CGBitmapContextCreate(
 data.get(), width, height, 8, width * 4, GetSalData()->mxRGBSpace,
 toCGBitmapType(mSurface->imageInfo().colorType(), 
kPremul_SkAlphaType));
-assert(context); // TODO
-// Flip upside down.
+if (!context)
+{
+SAL_WARN("vcl.skia", "drawNativeControl(): Failed to allocate bitmap 
context");
+return false;
+}
+// Adjust for our drawn-to coordinates in the bitmap.
+tools::Rectangle movedRegion(Point(0, 0), rControlRegion.GetSize());
+// Flip drawing upside down.
 CGContextTranslateCTM(context, 0, height);
 CGContextScaleCTM(context, 1, -1);
-// Adjust for our drawn-to coordinates in the bitmap.
-tools::Rectangle movedRegion = rControlRegion;
-movedRegion.SetPos(Point(0, 0));
+// And possibly scale the native drawing.
+CGContextScaleCTM(context, mScaling, mScaling);
 bool bOK = performDrawNativeControl(nType, nPart, movedRegion, nState, 
aValue, context,
 mrShared.mpFrame);
 CGContextRelease(context);
@@ -224,7 +230,10 @@ bool 
AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n
 updateRect.Intersection(mClipRegion.GetBoundRect());
 addUpdateRegion(SkRect::MakeXYWH(updateRect.getX(), updateRect.getY(),
  updateRect.GetWidth(), 
updateRect.GetHeight()));
-getDrawCanvas()->drawImage(bitmap.asImage(), rControlRegion.getX(), 
rControlRegion.getY());
+SkRect drawRect = SkRect::MakeXYWH(rControlRegion.getX(), 
rControlRegion.getY(),
+   rControlRegion.GetWidth(), 
rControlRegion.GetHeight());
+assert(drawRect.width() * mScaling == bitmap.width()); // no scaling 
should be needed
+getDrawCanvas()->drawImageRect(bitmap.asImage(), drawRect, 
SkSamplingOptions());
 ++mPendingOperationsToFlush; // tdf#136369
 postDraw();
 }

ESC meeting minutes: 2021-11-18

[Miklos Vajna]

* Present:
+ Heiko, Hossein, Caolan, Kendy, Michael W, Michael S, Olivier, Stephan, 
Sophie, Xisco, Miklos, Cloph, Eike

* Completed Action Items:
+ None
* Pending Action Items:
+ None

* Release Engineering update (Cloph)
+ 7.2 status: 7.2.3 rc2 has been tagged today, builds are running
+ 7.3 status: beta1 next week
  + late feature: curl based webdav possibly (Thorsten)
+ disabled on master by default currently
+ does it mean no UI changes? (Cloph)
  + then it could be enabled later, but sooner is the better
+ Remotes: Android (has new translations, though), iOS
+ Android viewer

* Documentation (Olivier)
+ Helpcontents2
+ Refactoring by Johnny_M and ohallot
+ Updated by LibreOfficiant, ohallot, flywire
+ Special thanks to Mike Kaganski for very precise bug reports
+ Guides
+ Impress Guide 7.2 is ready and will be published soon
+ Calc guide 7.2 almost ready
+ Planning new easy hack: code snippets in offapi comments

+ Bugzilla Documentation statistics
250(250) bugs open
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
   created 10(2) 33(-3)   119(2)  331(-9)
 commented 40(7)100(18)   452(7) 1702(10)
  resolved  2(-5)15(-2)56(0)  202(-8)
+ top 10 contributors:
  Olivier Hallot made 30 changes in 1 month, and 474 changes in 1 year
  Dieter made 6 changes in 1 month, and 134 changes in 1 year
  David Mark made 4 changes in 1 month, and 4 changes in 1 year
  Seth Chaiklin made 4 changes in 1 month, and 404 changes in 1 year
  Radish made 3 changes in 1 month, and 3 changes in 1 year
  Tomoyuki Kubota made 3 changes in 1 month, and 25 changes in 1 year
  Ilmari Lauhakangas made 3 changes in 1 month, and 87 changes in 1 year
  Roman Kuznetsov made 2 changes in 1 month, and 34 changes in 1 year
  Alex Sims made 2 changes in 1 month, and 6 changes in 1 year
  Adolfo Jayme Barrientos made 2 changes in 1 month, and 27 changes in 
1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
256(256) (topicUI) bugs open, 161(161) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
 added  8(3) 14(-5)31(-5)  95(-3)
 commented 91(28)   180(-7)   576(-38)   3147(-11)
   removed  2(2)  4(2)  6(0)   38(2)
  resolved 10(4) 21(0) 71(-2) 451(-1)
+ top 10 contributors:
  Heiko Tietze made 112 changes in 1 month, and 2162 changes in 1 year
  Foote, V Stuart made 59 changes in 1 month, and 593 changes in 1 year
  Telesto made 30 changes in 1 month, and 606 changes in 1 year
  Roman Kuznetsov made 25 changes in 1 month, and 240 changes in 1 year
  Ilmari Lauhakangas made 20 changes in 1 month, and 383 changes in 1 
year
  Dieter made 16 changes in 1 month, and 290 changes in 1 year
  Ming Hua made 14 changes in 1 month, and 53 changes in 1 year
  Kaganski, Mike made 12 changes in 1 month, and 172 changes in 1 year
  Adolfo Jayme Barrientos made 11 changes in 1 month, and 59 changes in 
1 year
  Weghorn, Michael made 10 changes in 1 month, and 10 changes in 1 year

+ 20 New tickets with needsUXEval Nov/11-18
[Bug 145745] Create a "Duplicate sheet" option in LO Calc
[Bug 145744] Improve cell selection outline for better visibility
[Bug 145739] Column tab of Table Properties dialog is confusing and 
frustrating
[Bug 145738] Column width dialog doesn't allow setting width of all columns 
at once
[Bug 145728] "Insert > Object > Bar Code..." menu should be "QR and 
Barcode..."
 -> [Bug 136123] No way for Glow and Soft Edge settings in drawing styles and
 in any dialogs
+ the feature is not in ODF at the moment
[Bug 145696] UI: Glow and soft edge effects has no tab on any dialog; 
apparently
 only accessible from sidebar
[Bug 145673] UI: comment box doesn't expand while typing instead)
[Bug 145684] UI: Image deck is below 'effect' and shadow in draw
[Bug 145682] UI: Maybe rename "Area" deck to "Area fill" and effect deck to 
'glow
 and soft edge effect'
[Bug 145681] UI: shadow not available in as deck in Writer sidebar
[Bug 145678] UI: Draw sidebar decks show Character and paragraph deck too;
 writer doesn't
 -> [Bug 145674] UI: Image transparency not in image properties dialog
[Bug 134293] Inconsistent double-click AutoFill behavior
[Bug 139031] Some dropdowns in the PDF export dialog should be aligned 
better (kf5)
[Bug 142519] Cannot set Impress comment directionality

   -> * Writer table cells have address scheme that differs from Calc,
"A-Z,a-z,AB-AZ

[Libreoffice-commits] core.git: sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf145731.odt |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx  |   24 
 2 files changed, 24 insertions(+)

New commits:
commit 23ad6c5d98e47310703de69506afe89883a75818
Author: Xisco Fauli 
AuthorDate: Thu Nov 18 12:35:48 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 18 16:38:02 2021 +0100

tdf#145731: sw_uiwriter3: Add unittest

Change-Id: Id605ebee7145eaeb9ec5a533b7e72a0378d6bb7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125470
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/data/tdf145731.odt 
b/sw/qa/extras/uiwriter/data/tdf145731.odt
new file mode 100644
index ..312de88c598c
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf145731.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 23e8113f63dc..c86fb182c07e 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -58,6 +58,30 @@ class SwUiWriterTest3 : public SwModelTestBase
 {
 };
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf145731)
+{
+createSwDoc(DATA_DIRECTORY, "tdf145731.odt");
+
+CPPUNIT_ASSERT_EQUAL(9, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+Scheduler::ProcessEventsToIdle();
+
+dispatchCommand(mxComponent, ".uno:Cut", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(9, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf129382)
 {
 SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf129382.docx");

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16031da61bdd7cc9b29e47bf98c6e411175afc7f
Author: Olivier Hallot 
AuthorDate: Thu Nov 18 11:32:02 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Nov 18 15:32:02 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 3c580a172f699ab665b609896ac7c12a8990ee5b
  - Use embeded contents for experimental features.

Change-Id: I3a02faeb85a9739a2ea425c8f3c4159b64df0ec0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/125478
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 5ce3e1b6c32f..3c580a172f69 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5ce3e1b6c32f59175c76e6dbadb871cba0068262
+Subproject commit 3c580a172f699ab665b609896ac7c12a8990ee5b

[Libreoffice-commits] help.git: source/text

[Olivier Hallot (via logerrit)]

 source/text/scalc/01/live_data_stream.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c580a172f699ab665b609896ac7c12a8990ee5b
Author: Olivier Hallot 
AuthorDate: Thu Nov 18 10:29:19 2021 -0300
Commit: Olivier Hallot 
CommitDate: Thu Nov 18 15:32:00 2021 +0100

Use embeded contents for experimental features.

Change-Id: I3a02faeb85a9739a2ea425c8f3c4159b64df0ec0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/125478
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/live_data_stream.xhp 
b/source/text/scalc/01/live_data_stream.xhp
index 66c9531a6..5f44ab42c 100644
--- a/source/text/scalc/01/live_data_stream.xhp
+++ b/source/text/scalc/01/live_data_stream.xhp
@@ -37,7 +37,7 @@
   
 Menu 
Data – Streams...
   
-  This is an experimental feature and is 
disabled by default. To enable it, go to %PRODUCTNAME - 
PreferencesTools - 
Options – %PRODUCTNAME – 
Advanced and check the option Enable experimental features 
(may be unstable).
+  
   
 
 

[Libreoffice-commits] core.git: sc/uiconfig

[Caolán McNamara (via logerrit)]

 sc/uiconfig/scalc/ui/filterdropdown.ui |  126 -
 1 file changed, 63 insertions(+), 63 deletions(-)

New commits:
commit c548e149d776d84ab480766f4664155ca1a7b526
Author: Caolán McNamara 
AuthorDate: Thu Nov 18 13:19:09 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 18 15:30:50 2021 +0100

resave with latest glade

Change-Id: I151ae11d722881b21aeb9b88716c8be963e43056
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125476
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/uiconfig/scalc/ui/filterdropdown.ui 
b/sc/uiconfig/scalc/ui/filterdropdown.ui
index fccc56e8b5b3..17bca296d8ef 100644
--- a/sc/uiconfig/scalc/ui/filterdropdown.ui
+++ b/sc/uiconfig/scalc/ui/filterdropdown.ui
@@ -1,16 +1,16 @@
 
-
+
 
   
   
 True
-False
-sc/res/popup_select_current.png
+False
+sc/res/popup_select_current.png
   
   
 True
-False
-sc/res/popup_unselect_current.png
+False
+sc/res/popup_unselect_current.png
   
   
 
@@ -52,14 +52,14 @@
   
   
 True
-False
+False
 True
 True
 vertical
 
   
 True
-False
+False
 True
 True
 vertical
@@ -67,21 +67,21 @@
 
   
 True
-True
-never
-never
-in
+True
+never
+never
+in
 
   
 True
-True
+True
 liststore1
-False
-False
-0
-True
-False
-True
+False
+False
+0
+True
+False
+True
 
   
 
@@ -116,12 +116,12 @@
 
 
   
-True
-True
-Search items...
-True
+True
+True
+Search items...
+True
 True
-Search items...
+Search items...
   
   
 False
@@ -131,15 +131,15 @@
 
 
   
-False
-True
+False
+True
 True
 True
 vertical
 
   
 True
-False
+False
   
   
 False
@@ -150,18 +150,18 @@
 
   
 True
-False
-3
+False
+3
 6
 
   
 All
 True
-True
-False
+True
+False
 True
-True
-True
+True
+True
   
   
 False
@@ -172,11 +172,11 @@
 
   
 True
-True
-True
-Show only the current 
item.
+True
+True
+Show only the current 
item.
 image1
-True
+True
   
   
 False
@@ -187,11 +187,11 @@
 
   
 True
-True
-True
-Hide only the current 
item.
+True
+True
+Hide only the current 
item.
 image2
-True
+True
   
   
 False
@@ -209,25 +209,25 @@
 
   
 True
-False
+False
 True
 True
 
   
-True
+True
 True
 True
-in
+in
 
   
-True
+True
 True
 True
 liststore2
-False
-False
-1
-False
+False
+False
+1
+False
 
   
 
@@ -263,21 +263,21 @@
 
   
 True
-T

[Libreoffice-commits] core.git: helpcontent2

[Rafael Lima (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25cb40bd7a0e02adb1a1f219662242e104f9abfd
Author: Rafael Lima 
AuthorDate: Thu Nov 18 16:30:13 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Nov 18 15:30:13 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5ce3e1b6c32f59175c76e6dbadb871cba0068262
  - Create PopupMenu service documentation

Change-Id: I511221e68e9504a5c9e5e6c00bb31047a6ccf11b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/124982
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/helpcontent2 b/helpcontent2
index 890b11c7e389..5ce3e1b6c32f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 890b11c7e389bff4b177beaf79461a6d6cc8ba1c
+Subproject commit 5ce3e1b6c32f59175c76e6dbadb871cba0068262

[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/auxiliary source/text

[Rafael Lima (via logerrit)]

 AllLangHelp_sbasic.mk|1 
 source/auxiliary/sbasic.tree |1 
 source/text/sbasic/shared/03/lib_ScriptForge.xhp |   10 
 source/text/sbasic/shared/03/sf_popupmenu.xhp|  330 +++
 4 files changed, 339 insertions(+), 3 deletions(-)

New commits:
commit 5ce3e1b6c32f59175c76e6dbadb871cba0068262
Author: Rafael Lima 
AuthorDate: Fri Nov 12 16:34:01 2021 +0200
Commit: Rafael Lima 
CommitDate: Thu Nov 18 15:30:10 2021 +0100

Create PopupMenu service documentation

Change-Id: I511221e68e9504a5c9e5e6c00bb31047a6ccf11b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/124982
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index f154d1de6..d941abf42 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03/sf_l10n \
 helpcontent2/source/text/sbasic/shared/03/sf_methods \
 helpcontent2/source/text/sbasic/shared/03/sf_platform \
+helpcontent2/source/text/sbasic/shared/03/sf_popupmenu \
 helpcontent2/source/text/sbasic/shared/03/sf_session \
 helpcontent2/source/text/sbasic/shared/03/sf_services \
 helpcontent2/source/text/sbasic/shared/03/sf_string \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 562abdbda..7b5675ca2 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -354,6 +354,7 @@
 FormControl service
 L10N service
 Platform service
+PopupMenu service
 Services service
 Session service
 String service
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp 
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index 17cbac0d8..60a102659 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -97,13 +97,14 @@
  
Dialog
DialogControl
-   UI
+   Form
  


  
-   Form
-   FormControl
+   FormControl
+   PopupMenu
+   UI
  

 
@@ -175,6 +176,9 @@
 
   
 
+
+  
+
 
   
 
diff --git a/source/text/sbasic/shared/03/sf_popupmenu.xhp 
b/source/text/sbasic/shared/03/sf_popupmenu.xhp
new file mode 100644
index 0..7c50ff0ad
--- /dev/null
+++ b/source/text/sbasic/shared/03/sf_popupmenu.xhp
@@ -0,0 +1,330 @@
+
+
+
+
+  
+ScriptForge.PopupMenu service
+/text/sbasic/shared/03/sf_popupmenu.xhp
+  
+
+
+  
+
+  PopupMenu service
+
+  
+  
+ScriptForge.PopupMenu 
service
+The 
PopupMenu service can be used to create popup menus that can 
be associated with events or executed by scripts. This service provides the 
following capabilities:
+
+  
+Creation of 
popup menus with custom entries, checkboxes and radio buttons.
+  
+  
+Decoration of 
menu items with icons and tooltips.
+  
+
+  
+
+  Service invocation
+  
+  The 
PopupMenu service can be instantiated in multiple ways. The 
example below creates a popup menu without associating it with a mouse or 
application event.
+  
+Sub 
ShowPopup
+
GlobalScope.BasicLibraries.loadLibrary("ScriptForge")
+
Dim myPopup As Object
+
Set myPopup = CreateScriptService("SFWidgets.PopupMenu", , 300, 300)
+
myPopup.AddItem("Item ~A")
+
myPopup.AddItem("Item ~B")
+
vResponse = myPopup.Execute()
+MsgBox("Selected 
item ID: " & vResponse)
+
myPopup.Dispose()
+End 
Sub
+  
+  Running the 
Sub defined above will create a popup menu with two entries 
in the position X=300 and Y=300 on the screen.
+  The prefix SFWidgets can 
be suppressed while invoking the PopupMenu service.
+  The following example 
defines a Sub that can be associated with a mouse 
event:
+  
+Sub 
MyPopupClick(Optional poMouseEvent as Object)
+
Dim myPopup As Object
+
Set myPopup = CreateScriptService("PopupMenu", poMouseEvent)
+' Populate 
popupmenu with items
+
Dim vResponse As Variant
+
vResponse = myPopup.Execute(False)
+' Do something 
based on vResponse
+
' ...
+
myPopup.Dispose()
+End 
Sub
+  
+  Use the Dispose method to 
free resources after executing the popup menu.
+  It is also possible 
to associate a popup menu with events triggered by %PRODUCTNAME applications, 
form and dialog controls. Events such as "Mouse button pressed" and "Mouse 
button released" are commonly associated with popup menus.
+  
+Sub 
MyPopupClick(Optional poEvent as Object)
+
Dim myPopup As Object
+
Set myPopup = CreateScriptService("PopupMenu"

[Libreoffice-commits] core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/cctrl/checklistmenu.cxx |5 +
 sc/source/ui/inc/checklistmenu.hxx   |1 +
 sc/source/ui/view/gridwin.cxx|3 +--
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 5bc345a1624315c55b8ed1316d530d3943f96227
Author: Caolán McNamara 
AuthorDate: Thu Nov 18 12:38:32 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 18 15:11:44 2021 +0100

menu placement is a little off

its relative to the treeview, not the floating window

Change-Id: I70c15231eb61d5b8da3bbf473db39489b4544f0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125473
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 328c51718364..7dfb572d0182 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -290,6 +290,11 @@ tools::Rectangle 
ScCheckListMenuControl::GetSubMenuParentRect()
 return mxMenu->get_row_area(*mxScratchIter);
 }
 
+sal_Int32 ScCheckListMenuControl::ExecuteMenu(weld::Menu& rMenu)
+{
+return rMenu.popup_at_rect(mxMenu.get(), GetSubMenuParentRect(), 
weld::Placement::End).toInt32();
+}
+
 void ScCheckListMenuControl::launchSubMenu(bool bSetMenuPos)
 {
 ScCheckListMenuWindow* pSubMenu = maOpenTimer.mpSubMenu;
diff --git a/sc/source/ui/inc/checklistmenu.hxx 
b/sc/source/ui/inc/checklistmenu.hxx
index cb78bf226a45..c9ca6466dff7 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -182,6 +182,7 @@ public:
  * argument for Executing a popup
 */
 tools::Rectangle GetSubMenuParentRect();
+sal_Int32 ExecuteMenu(weld::Menu& rMenu);
 private:
 
 std::vector maMenuItems;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index acd2973075c1..33ea3fe045b8 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -976,8 +976,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode 
eMode)
 i++;
 }
 
-tools::Rectangle aRect = rControl.GetSubMenuParentRect();
-sal_Int32 nSelected = xColorMenu->popup_at_rect(pPopupParent, 
aRect, weld::Placement::End).toInt32();
+sal_Int32 nSelected = rControl.ExecuteMenu(*xColorMenu);
 xColorMenu.reset();
 rControl.terminateAllPopupMenus();
 

[Libreoffice-commits] core.git: vcl/skia wizards/source

[Andrea Gelmini (via logerrit)]

 vcl/skia/gdiimpl.cxx   |2 +-
 wizards/source/sfdocuments/SF_DocumentListener.xba |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 187b28063fa9b908f5324ed345ba223d8f6168a2
Author: Andrea Gelmini 
AuthorDate: Tue Nov 16 22:46:06 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 18 15:02:31 2021 +0100

Fix typos

Change-Id: Idd21ee0026d8a36653f0fb25b350dae37315f603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125336
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index f15954f95117..81f581d6ff78 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -884,7 +884,7 @@ void SkiaSalGraphicsImpl::privateDrawAlphaRect(tools::Long 
nX, tools::Long nY, t
 paint.setStyle(SkPaint::kStroke_Style);
 if (mScaling != 1 && isUnitTestRunning())
 {
-// On HiDPI displays, do not draw just a harline but instead a 
full-width "pixel" when running unittests,
+// On HiDPI displays, do not draw just a hairline but instead a 
full-width "pixel" when running unittests,
 // since tests often require precise pixel drawing.
 paint.setStrokeWidth(1); // this will be scaled by mScaling
 paint.setStrokeCap(SkPaint::kSquare_Cap);
diff --git a/wizards/source/sfdocuments/SF_DocumentListener.xba 
b/wizards/source/sfdocuments/SF_DocumentListener.xba
index 9ccc04f62d19..fbb0271bbc38 100644
--- a/wizards/source/sfdocuments/SF_DocumentListener.xba
+++ b/wizards/source/sfdocuments/SF_DocumentListener.xba
@@ -64,7 +64,7 @@ Try:
_RangeSelectionFinished = False
oController.startRangeSelection(pvPropertyValues)
 
-   '  Dummy thread synchonization
+   '  Dummy thread synchronization
lCountLoops = 0
Do While Not _RangeSelectionFinished And lCountLoops < cstMaxSleep
Wait(cstSleep)

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/qa sw/source writerfilter/source

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf81507.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx   |   22 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   58 ---
 sw/source/filter/ww8/docxattributeoutput.hxx |3 +
 writerfilter/source/dmapper/DomainMapper.cxx |3 +
 writerfilter/source/ooxml/model.xml  |5 +-
 6 files changed, 84 insertions(+), 7 deletions(-)

New commits:
commit 48e947333b51b3834eec21ccb0793bd7f5d589d7
Author: Vasily Melenchuk 
AuthorDate: Thu Nov 11 10:39:32 2021 +0300
Commit: Vasily Melenchuk 
CommitDate: Thu Nov 18 15:02:58 2021 +0100

tdf#81507: word content control support for w:multiLine

 is now supported for import/export
to DOCX. Like other content control items it is stored in
grabbag.

Change-Id: Id6f1aa0072dc5db980d0fa43cab4b38a0aa047fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125024
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 1d9ab91901398126caf61e6234d782885bda6e27)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125362
Reviewed-by: Vasily Melenchuk 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf81507.docx 
b/sw/qa/extras/ooxmlexport/data/tdf81507.docx
new file mode 100644
index ..2c00ee44cb24
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf81507.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index 900952f90322..f1726052ca02 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -71,6 +71,28 @@ DECLARE_OOXMLEXPORT_TEST(testTdf142407, "tdf142407.docx")
 CPPUNIT_ASSERT_EQUAL( sal_Int16(36), nGridLines);   // was 23, left large 
space before text.
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf81507, "tdf81507.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+   return; // initial import, no futher checks
+
+// Ensure that we have 
+CPPUNIT_ASSERT_EQUAL(OUString("1"), getXPath(pXmlDoc, 
"/w:document/w:body/w:sdt[1]/w:sdtPr/w:text", "multiLine"));
+
+// Ensure that we have 
+CPPUNIT_ASSERT_EQUAL(OUString("0"), getXPath(pXmlDoc, 
"/w:document/w:body/w:sdt[2]/w:sdtPr/w:text", "multiLine"));
+
+// Ensure that we have 
+getXPath(pXmlDoc, "/w:document/w:body/w:sdt[3]/w:sdtPr/w:text", "");
+
+// Ensure that we have no  (not quite correct case, but to ensure 
import/export are okay)
+xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, 
"/w:document/w:body/w:sdt[4]/w:sdtPr/w:text");
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
+   
static_cast(xmlXPathNodeSetGetLength(pXmlObj->nodesetval)));
+xmlXPathFreeObject(pXmlObj);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf144668, "tdf144668.odt")
 {
 uno::Reference xPara1(getParagraph(1, u"level1"), 
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 02da5d32096f..0c83a6a728bd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -579,12 +579,18 @@ static OString convertToOOXMLHoriOrientRel(sal_Int16 
nOrientRel)
 }
 }
 
-static void lcl_deleteAndResetTheLists( 
rtl::Reference& pSdtPrTokenChildren, 
rtl::Reference& pSdtPrDataBindingAttrs, 
OUString& rSdtPrAlias)
+static void lcl_deleteAndResetTheLists(
+rtl::Reference& pSdtPrTokenChildren,
+rtl::Reference& pSdtPrDataBindingAttrs,
+rtl::Reference& pSdtPrTextAttrs,
+OUString& rSdtPrAlias)
 {
 if( pSdtPrTokenChildren.is() )
 pSdtPrTokenChildren.clear();
 if( pSdtPrDataBindingAttrs.is() )
 pSdtPrDataBindingAttrs.clear();
+if (pSdtPrTextAttrs.is())
+pSdtPrTextAttrs.clear();
 if (!rSdtPrAlias.isEmpty())
 rSdtPrAlias.clear();
 }
@@ -793,14 +799,14 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 m_pSerializer->endElementNS( XML_w, XML_p );
 // on export sdt blocks are never nested ATM
 if( !m_bAnchorLinkedToNode && !m_bStartedParaSdt )
-WriteSdtBlock( m_nParagraphSdtPrToken, m_pParagraphSdtPrTokenChildren, 
m_pParagraphSdtPrTokenAttributes, m_pParagraphSdtPrDataBindingAttrs, 
m_aParagraphSdtPrAlias, /*bPara=*/true );
+WriteSdtBlock( m_nParagraphSdtPrToken, m_pParagraphSdtPrTokenChildren, 
m_pParagraphSdtPrTokenAttributes, m_pParagraphSdtPrDataBindingAttrs, 
m_pParagraphSdtPrTextAttrs, m_aParagraphSdtPrAlias, /*bPara=*/true );
 else
 {
 //These should be written out to the actual Node and not to the anchor.
 //Clear them as they will be repopulated when the node is processed.
 m_nParagraphSdtPrToken = 0;
 m_bParagraphSdtHasId = false;
-lcl_deleteAndResetTheLists( m_pParagraphSdtPrTokenChildren, 
m_pParagraphSdtPrDataBindingAttrs, m_aParagraphSdtPrAlias );
+lcl_deleteAndResetTheLists( m

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - jvmfwk/plugins

[Stephan Bergmann (via logerrit)]

 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a7e36439bc79580b92e4b2636a831b1b0e64c6e8
Author: Stephan Bergmann 
AuthorDate: Wed Nov 17 14:01:55 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 18 15:00:37 2021 +0100

tdf#144695 VendorBase::isValidArch also for macOS

Lets extend it only to macOS (where there is some confusion now with 
Rosetta-
translated vs. native processes on Apple M1 machines), not to all Unix-like 
OSs:
The comment that it "is not defined what the exact [os.arch] values are" is
still relevant.  At least for OpenJDK, while Windows has a hardcoded list of
possible values in GetJavaProperties at

,
the corresponding non-Windows code in GetJavaProperties at


uses ARCHPROPNAME which, via

> -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'

at

,
appears to somehow come out of Autoconf at

,
so probably can show some variance in actual values being used.

Change-Id: I16725cd9365f6bd034372c653aa43ab84d487b98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125401
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit f05a42ef8c8192186f91a169047742e5c3ae9b9e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125363
Reviewed-by: Michael Stahl 

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 4bfc1fd90af0..1f2a5f756280 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -176,10 +176,12 @@ bool VendorBase::isValidArch() const
 // It is not defined what the exact values are.
 // Oracle JRE 8 has "x86" and "amd64", the others were found at 
http://lopica.sourceforge.net/os.html .
 // There might still be missing some options; we need to extend the check 
once we find out.
-#if defined _WIN64
+#if defined _WIN64 || (defined MACOSX && defined __x86_64__)
 return m_sArch == "amd64" || m_sArch == "x86_64";
 #elif defined _WIN32
 return m_sArch == "x86" || m_sArch == "i386" || m_sArch == "i686";
+#elif defined MACOSX && defined __aarch64__
+return m_sArch == "aarch64";
 #else
 (void)this;
 return true;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - jvmfwk/source

[Stephan Bergmann (via logerrit)]

 jvmfwk/source/framework.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7153209d9aa34d92141ae29afa98ad5262da5d9c
Author: Stephan Bergmann 
AuthorDate: Wed Nov 17 13:36:19 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 18 14:59:30 2021 +0100

Don't fail jfw_findAllJREs for just one JRE of WrongArch

...otherwise if one such JRE had found its way into a user's configuration,
"Tools - Options... - LibreOffice - Advanced" would no longer show *any* 
JREs.

Regression introduced with 9143dd4ebe37b608e43d04434cf831624bf55b65 "Related
tdf#54443 List only matching JREs", which added WrongArch to the 
javaPluginError
enum.

Change-Id: I51fd47e585c6686be7a9282615c0978e4f6c460b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125396
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b9ecede5762831ff590a33cd04dc7cb381307000)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125366
Reviewed-by: Michael Stahl 

diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 5a7cef449b78..e478f80105ee 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -99,6 +99,8 @@ javaFrameworkError 
jfw_findAllJREs(std::vector> *pparI
 continue;
 if (plerr == javaPluginError::FailedVersion)
 continue;
+if (plerr == javaPluginError::WrongArch)
+continue;
 else if (plerr != javaPluginError::NONE)
 return JFW_E_ERROR;
 

Minutes from the UX/design meeting 2021-Nov-18

[Heiko Tietze]

Present: Heiko
Comments: Mike, Stuart, Adolfo

Tickets/Topics

 * Image deck is below 'effect' and shadow in draw
   + https://bugs.documentfoundation.org/show_bug.cgi?id=145684
   + agree to sort decks in a more natural way (Heiko)
   => easyhack

 * Maybe rename "Area" deck to "Area fill" and effect deck
   to 'glow and soft edge effect'
   + https://bugs.documentfoundation.org/show_bug.cgi?id=145682
   + Area was Background in the past, renaming should be done
 consistently across the UI; Effects is a deck for more features
 such as Shadow, wouldn't rename (Mike)
   + "Effects" should remain and changing Area to Area Fill is not
 worth the trouble to find all places in the UI and results in
 some effort for the l10n team (Heiko)
   => resolve WF/NAB

 * Access to image colorization commands from sidebar deck
   + https://bugs.documentfoundation.org/show_bug.cgi?id=143761
   + provide ColorSettings via the deck title menu icon (Stuart)
   + don't run random functions from the deck title (Heiko)
   => controversial positions, no further input = keep the ticket
 open but remove needsUXEval

 * Image transparency not in image properties dialog
   + https://bugs.documentfoundation.org/show_bug.cgi?id=145674
   + colorization and transparency could be seen as kind of a filter (Heiko)
 + by that logic, flip or rotate would not belong there too (Stuart)
   + Image tab of the properties dialog has room for Transparency (Stuart)
   => controversial positions, no further input = keep the ticket
 open but remove needsUXEval

 * Execute jump to cross-reference target in second window
   + https://bugs.documentfoundation.org/show_bug.cgi?id=144733
   + besides improvements to the navigator, how about to open a second
 window per ctrl+click and jump there to the target?
   => no objection, do it

 * In Options – LibreOffice – Application Colors, the "On" label is confusing
   + https://bugs.documentfoundation.org/show_bug.cgi?id=145625
   + a) WF/NAB or b) change to Active, Enabled etc. with the drawback of
 a larger column width or c) have an empty string?
   + position/alignment issue (at gtk3) (Adolfo)
 + also relevant for the second column header when we remove the label
   => remove the "On" and fix the issue


OpenPGP_signature
Description: OpenPGP digital signature

[Libreoffice-commits] core.git: sd/qa

[Xisco Fauli (via logerrit)]

 sd/qa/uitest/impress_tests/tdf137637.py |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 6e04ef6eda7d632ad39b3938ab864417303c8368
Author: Xisco Fauli 
AuthorDate: Thu Nov 18 12:07:13 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 18 14:34:32 2021 +0100

tdf#135033: sd: Add UItest

Change-Id: Idc3cb84972d01496e378e224d65cd4db71648c40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125446
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sd/qa/uitest/impress_tests/tdf137637.py 
b/sd/qa/uitest/impress_tests/tdf137637.py
index a76c0c970b29..11e948eb654f 100644
--- a/sd/qa/uitest/impress_tests/tdf137637.py
+++ b/sd/qa/uitest/impress_tests/tdf137637.py
@@ -6,6 +6,7 @@
 
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
 
 class Tdf137637(UITestCase):
 
@@ -32,3 +33,19 @@ class Tdf137637(UITestCase):
 # AttributeError: 'NoneType' object has no attribute 
'getImplementationName'
 self.assertEqual("com.sun.star.drawing.SvxShapeCollection", 
document.CurrentSelection.getImplementationName())
 
+xAddBtn = xImpressDoc.getChild("add_effect")
+xAddBtn.executeAction("CLICK", tuple())
+
+xAnimationList = xImpressDoc.getChild("custom_animation_list")
+self.assertEqual('1', 
get_state_as_dict(xAnimationList)['Children'])
+
+self.xUITest.executeCommand(".uno:Undo")
+
+# tdf#135033: Without the fix in place, this test would have 
failed with
+# AssertionError: '0' != '1'
+self.assertEqual('0', 
get_state_as_dict(xAnimationList)['Children'])
+
+self.xUITest.executeCommand(".uno:Redo")
+
+self.assertEqual('1', 
get_state_as_dict(xAnimationList)['Children'])
+

[Libreoffice-commits] core.git: 2 commits - sot/source svl/source svl/unx

[Noel Grandin (via logerrit)]

 sot/source/base/exchange.cxx  |  326 --
 svl/source/config/ctloptions.cxx  |   27 +-
 svl/source/config/languageoptions.cxx |1 
 svl/source/misc/urihelper.cxx |1 
 svl/source/numbers/zforlist.cxx   |   27 +-
 svl/unx/source/svdde/ddedummy.cxx |   10 -
 6 files changed, 191 insertions(+), 201 deletions(-)

New commits:
commit ed6651ec3b5dafed759cb602ad25e150592693a9
Author: Noel Grandin 
AuthorDate: Wed Nov 17 20:42:45 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 18 14:17:21 2021 +0100

rtl::Static->thread-safe static in svl

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

diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 0723f47ac1a1..38544f758a3a 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 #include "itemholder2.hxx"
 
 using namespace ::com::sun::star;
@@ -84,8 +83,11 @@ public:
 };
 namespace
 {
-struct PropertyNames
-: public rtl::Static< Sequence< OUString >, PropertyNames > {};
+Sequence & PropertyNames()
+{
+static Sequence SINGLETON;
+return SINGLETON;
+}
 }
 bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const
 {
@@ -135,7 +137,7 @@ void SvtCTLOptions_Impl::Notify( const Sequence< OUString 
>& )
 
 void SvtCTLOptions_Impl::ImplCommit()
 {
-Sequence< OUString > &rPropertyNames = PropertyNames::get();
+Sequence< OUString > &rPropertyNames = PropertyNames();
 OUString* pOrgNames = rPropertyNames.getArray();
 sal_Int32 nOrgCount = rPropertyNames.getLength();
 
@@ -225,17 +227,16 @@ void SvtCTLOptions_Impl::ImplCommit()
 
 void SvtCTLOptions_Impl::Load()
 {
-Sequence< OUString >& rPropertyNames = PropertyNames::get();
+Sequence< OUString >& rPropertyNames = PropertyNames();
 if ( !rPropertyNames.hasElements() )
 {
-rPropertyNames.realloc(6);
-OUString* pNames = rPropertyNames.getArray();
-pNames[0] = "CTLFont";
-pNames[1] = "CTLSequenceChecking";
-pNames[2] = "CTLCursorMovement";
-pNames[3] = "CTLTextNumerals";
-pNames[4] = "CTLSequenceCheckingRestricted";
-pNames[5] = "CTLSequenceCheckingTypeAndReplace";
+rPropertyNames = {
+"CTLFont",
+"CTLSequenceChecking",
+"CTLCursorMovement",
+"CTLTextNumerals",
+"CTLSequenceCheckingRestricted",
+"CTLSequenceCheckingTypeAndReplace" };
 EnableNotification( rPropertyNames );
 }
 Sequence< Any > aValues = GetProperties( rPropertyNames );
diff --git a/svl/source/config/languageoptions.cxx 
b/svl/source/config/languageoptions.cxx
index 2e7550b98758..b7159fd2c063 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index c945c1f2e3e5..6792fc1d77f7 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -44,7 +44,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8e90067a47b8..fbd05a481df9 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -48,7 +48,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -248,11 +247,17 @@ SvNumberFormatterRegistry_Impl* 
SvNumberFormatter::pFormatterRegistry = nullptr;
 volatile bool SvNumberFormatter::bCurrencyTableInitialized = false;
 namespace
 {
-struct theCurrencyTable :
-public rtl::Static< NfCurrencyTable, theCurrencyTable > {};
+NfCurrencyTable& theCurrencyTable()
+{
+static NfCurrencyTable SINGLETON;
+return SINGLETON;
+}
 
-struct theLegacyOnlyCurrencyTable :
-public rtl::Static< NfCurrencyTable, theLegacyOnlyCurrencyTable > {};
+NfCurrencyTable& theLegacyOnlyCurrencyTable()
+{
+static NfCurrencyTable SINGLETON;
+return SINGLETON;
+}
 
 /** THE set of installed locales. */
 std::set< LanguageType > theInstalledLocales;
@@ -3633,7 +3638,7 @@ const NfCurrencyTable& 
SvNumberFormatter::GetTheCurrencyTable()
 {
 while ( !bCurrencyTableInitialized )
 ImpInitCurrencyTable();
-return theCurrencyTable::get();
+return theCurrencyTable();
 }
 
 
@@ -3692,7 +3697,7 @@ const NfCurrencyEntry* 
SvNumberFormatter::GetLegacyOnlyCurrencyEntry( std::u16st
   
std::u16string_view rAbbrev )
 {
 GetTheCurrencyTable();  // just for initialization
-const NfCurrencyTabl

[Libreoffice-commits] core.git: sfx2/source

[Noel Grandin (via logerrit)]

 sfx2/source/appl/app.cxx |   11 +++
 sfx2/source/appl/sfxpicklist.cxx |9 -
 sfx2/source/bastyp/fltfnc.cxx|9 +
 sfx2/source/doc/objxtor.cxx  |1 -
 4 files changed, 4 insertions(+), 26 deletions(-)

New commits:
commit 4d45eacd5485a756584fc7edecce8c821d4b7123
Author: Noel Grandin 
AuthorDate: Wed Nov 17 20:27:00 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 18 14:16:40 2021 +0100

rtl::Static->thread-safe static in sfx2

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

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 83c59e708872..42144afc33e8 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -54,7 +54,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -70,12 +69,6 @@ static SfxApplication* g_pSfxApplication = nullptr;
 static SfxHelp*pSfxHelp = nullptr;
 #endif
 
-namespace
-{
-class theApplicationMutex
-: public rtl::Static {};
-}
-
 SfxApplication* SfxApplication::Get()
 {
 return g_pSfxApplication;
@@ -107,8 +100,10 @@ namespace {
 
 SfxApplication* SfxApplication::GetOrCreate()
 {
+static osl::Mutex theApplicationMutex;
+
 // SFX on demand
-::osl::MutexGuard aGuard(theApplicationMutex::get());
+::osl::MutexGuard aGuard(theApplicationMutex);
 if (!g_pSfxApplication)
 {
 SAL_INFO( "sfx.appl", "SfxApplication::SetApp" );
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index ea7f460fc403..83834597aff0 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -40,20 +40,11 @@
 #include 
 #include 
 
-#include 
-
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 
-
-namespace
-{
-class thePickListMutex
-: public rtl::Static {};
-}
-
 class SfxPickListImpl : public SfxListener
 {
 /**
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 5aa4cb57a688..fd2e7c2df31d 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -47,8 +47,6 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 
@@ -72,11 +70,6 @@ unsigned SfxStack::nLevel = 0;
 
 using namespace com::sun::star;
 
-namespace
-{
-class theSfxFilterListener : public rtl::Static {};
-}
-
 static SfxFilterList_Impl* pFilterArr = nullptr;
 static bool bFirstRead = true;
 
@@ -84,7 +77,7 @@ static void CreateFilterArr()
 {
 static SfxFilterList_Impl theSfxFilterArray;
 pFilterArr = &theSfxFilterArray;
-theSfxFilterListener::get();
+static SfxFilterListener theSfxFilterListener;
 }
 
 static OUString ToUpper_Impl( const OUString &rStr )
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 73ab44f1da9f..fb6cca399cec 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

[Libreoffice-commits] core.git: sw/inc sw/source

[László Németh (via logerrit)]

 sw/inc/bitmaps.hlst|2 ++
 sw/source/uibase/misc/redlndlg.cxx |8 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit a478ac0f0a1eda92d35477462f70412bc65f9d36
Author: László Németh 
AuthorDate: Thu Nov 18 11:39:42 2021 +0100
Commit: László Németh 
CommitDate: Thu Nov 18 13:46:06 2021 +0100

tdf#145721 sw: add 'moved text' icons to Manage Changes

For Moved (deletion) and Moved (insertion) text changes,
add new Action icons to Manage Changes dialog window
(Edit->Track Changes->Manage...), re-using existing
Cut and Paste icons.

Follow-up to commit 970f8ec7c8eb6007181ce55d885eef771dd49cc6
"tdf#145721 sw track changes: sign text moving in redline tooltips".

Change-Id: Ic202538ec31963e5e27170c7e5ea819a7f2bde9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125445
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/inc/bitmaps.hlst b/sw/inc/bitmaps.hlst
index b3353862bee0..2a7495d70896 100644
--- a/sw/inc/bitmaps.hlst
+++ b/sw/inc/bitmaps.hlst
@@ -26,6 +26,8 @@
 #define BMP_REDLINE_FORMATTED   "sw/res/redline_formatted.png"
 #define BMP_REDLINE_TABLECHG"sw/res/redline_tablechg.png"
 #define BMP_REDLINE_FMTCOLLSET  "sw/res/redline_fmtcollset.png"
+#define BMP_REDLINE_MOVED_INSERTION "cmd/sc_paste.png"
+#define BMP_REDLINE_MOVED_DELETION  "cmd/sc_cut.png"
 
 #define RID_BMP_COLLAPSE"res/sx18002.png"
 #define RID_BMP_EXPAND  "res/sx18003.png"
diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index 5a53a7472fe0..e27a0a7d4c9b 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -305,8 +305,12 @@ OUString SwRedlineAcceptDlg::GetActionImage(const 
SwRangeRedline& rRedln, sal_uI
 {
 switch (rRedln.GetType(nStack))
 {
-case RedlineType::Insert:  return BMP_REDLINE_INSERTED;
-case RedlineType::Delete:  return BMP_REDLINE_DELETED;
+case RedlineType::Insert:  return rRedln.IsMoved()
+? OUString(BMP_REDLINE_MOVED_INSERTION)
+: OUString(BMP_REDLINE_INSERTED);
+case RedlineType::Delete:  return rRedln.IsMoved()
+? OUString(BMP_REDLINE_MOVED_DELETION)
+: OUString(BMP_REDLINE_DELETED);
 case RedlineType::Format:  return BMP_REDLINE_FORMATTED;
 case RedlineType::ParagraphFormat: return BMP_REDLINE_FORMATTED;
 case RedlineType::Table:   return BMP_REDLINE_TABLECHG;

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/menu.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 06f36cc7ca8fc056dd8cf4d8cdbe682f9a003cef
Author: Caolán McNamara 
AuthorDate: Thu Nov 18 10:19:33 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 18 13:16:56 2021 +0100

allow vcl gen menus to have non-square images

for the color menu in the calc autofilter

Change-Id: I90a4ccefa9c44f5c9d0b0e49dd8c254d13be0fe1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125444
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 4a497b84b02c..96797979558c 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1421,6 +1421,8 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel )
 }
 }
 
+constexpr int ImageBorder = 4;
+
 Size Menu::ImplCalcSize( vcl::Window* pWin )
 {
 // | Check/Radio/Image| Text| Accel/Popup|
@@ -1487,8 +1489,8 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
 {
 Size aImgSz = pData->aImage.GetSizePixel();
 
-aImgSz.AdjustHeight(4 ); // add a border for native marks
-aImgSz.AdjustWidth(4 ); // add a border for native marks
+aImgSz.AdjustHeight(ImageBorder); // add a border for native 
marks
+aImgSz.AdjustWidth(ImageBorder); // add a border for native 
marks
 if ( aImgSz.Width() > aMaxImgSz.Width() )
 aMaxImgSz.setWidth( aImgSz.Width() );
 if ( aImgSz.Height() > aMaxImgSz.Height() )
@@ -1920,12 +1922,16 @@ void Menu::ImplPaint(vcl::RenderContext& 
rRenderContext, Size const & rSize,
 // Image:
 if (!bLayout && !IsMenuBar() && ((pData->eType == 
MenuItemType::IMAGE) || (pData->eType == MenuItemType::STRINGIMAGE)))
 {
+Image aImage = pData->aImage;
+
+auto nImgWidth = aImage.GetSizePixel().Width() + 
ImageBorder;
+if (nImgWidth > aOuterCheckRect.GetWidth())
+aOuterCheckRect.setWidth(nImgWidth);
+
 // Don't render an image for a check thing
 if (pData->bChecked)
 ImplPaintCheckBackground(rRenderContext, *pWindow, 
aOuterCheckRect, pThisItemOnly && bHighlighted);
 
-Image aImage = pData->aImage;
-
 aTmpPos = aOuterCheckRect.TopLeft();
 aTmpPos.AdjustX((aOuterCheckRect.GetWidth() - 
aImage.GetSizePixel().Width()) / 2 );
 aTmpPos.AdjustY((aOuterCheckRect.GetHeight() - 
aImage.GetSizePixel().Height()) / 2 );

[Libreoffice-commits] core.git: basic/source

[Mike Kaganski (via logerrit)]

 basic/source/runtime/methods.cxx  |   15 +++
 basic/source/runtime/methods1.cxx |   10 ++
 2 files changed, 5 insertions(+), 20 deletions(-)

New commits:
commit fffc6b40b933f640a412233988bbb74bf6138af4
Author: Mike Kaganski 
AuthorDate: Thu Nov 18 12:18:25 2021 +0200
Commit: Mike Kaganski 
CommitDate: Thu Nov 18 13:05:44 2021 +0100

Drop unused argument names, and (void) noise

Change-Id: I75f313924db7d6a0658f9d7cc1d571767cec3144
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125364
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 7dfde6184b0d..7e9a1adcccd7 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -389,11 +389,8 @@ extern "C" void invalidParameterHandler(
 
 #endif
 
-void SbRtl_CurDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
+void SbRtl_CurDir(StarBASIC *, SbxArray & rPar, bool)
 {
-(void)pBasic;
-(void)bWrite;
-
 // #57064 Although this function doesn't work with DirEntry, it isn't 
touched
 // by the adjustment to virtual URLs, as, using the DirEntry-functionality,
 // there's no possibility to detect the current one in a way that a 
virtual URL
@@ -1651,11 +1648,8 @@ void SbRtl_UCase(StarBASIC *, SbxArray & rPar, bool)
 }
 
 
-void SbRtl_Val(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
+void SbRtl_Val(StarBASIC *, SbxArray & rPar, bool)
 {
-(void)pBasic;
-(void)bWrite;
-
 if (rPar.Count() < 2)
 {
 StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2920,11 +2914,8 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool)
 }
 
 
-void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
+void SbRtl_GetAttr(StarBASIC *, SbxArray & rPar, bool)
 {
-(void)pBasic;
-(void)bWrite;
-
 if (rPar.Count() == 2)
 {
 sal_Int16 nFlags = 0;
diff --git a/basic/source/runtime/methods1.cxx 
b/basic/source/runtime/methods1.cxx
index a7212fc13151..117e84d73000 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -254,11 +254,8 @@ void SbRtl_CCur(StarBASIC *, SbxArray & rPar, bool)
 rPar.Get(0)->PutCurrency(nCur);
 }
 
-void SbRtl_CDec(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
+void SbRtl_CDec(StarBASIC *, SbxArray & rPar, bool)
 {
-(void)pBasic;
-(void)bWrite;
-
 #ifdef _WIN32
 SbxDecimal* pDec = nullptr;
 if (rPar.Count() == 2)
@@ -458,11 +455,8 @@ void SbRtl_GetSystemType(StarBASIC *, SbxArray & rPar, 
bool)
 }
 }
 
-void SbRtl_GetGUIType(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
+void SbRtl_GetGUIType(StarBASIC *, SbxArray & rPar, bool)
 {
-(void)pBasic;
-(void)bWrite;
-
 if (rPar.Count() != 1)
 {
 StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );

[Libreoffice-commits] core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/extras/scpdfexport.cxx|   43 
 sc/qa/extras/testdocuments/tdf78897.xls |binary
 2 files changed, 43 insertions(+)

New commits:
commit e634c893fbe388ad397800db7fe0df280078
Author: Xisco Fauli 
AuthorDate: Thu Nov 18 11:36:48 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 18 12:51:37 2021 +0100

tdf#78897: sc_pdf_export: Add unittest

Change-Id: I943f6ee26101006c128dfd78c8915d73a4911e15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125443
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/extras/scpdfexport.cxx b/sc/qa/extras/scpdfexport.cxx
index a85e0d24..61c9376d5ac2 100644
--- a/sc/qa/extras/scpdfexport.cxx
+++ b/sc/qa/extras/scpdfexport.cxx
@@ -71,6 +71,7 @@ public:
 void testTdf64703_hiddenPageBreak();
 void testTdf143978();
 void testTdf84012();
+void testTdf78897();
 
 CPPUNIT_TEST_SUITE(ScPDFExportTest);
 CPPUNIT_TEST(testExportRange_Tdf120161);
@@ -79,6 +80,7 @@ public:
 CPPUNIT_TEST(testTdf64703_hiddenPageBreak);
 CPPUNIT_TEST(testTdf143978);
 CPPUNIT_TEST(testTdf84012);
+CPPUNIT_TEST(testTdf78897);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -545,6 +547,47 @@ void ScPDFExportTest::testTdf84012()
 CPPUNIT_ASSERT_EQUAL(OUString("Blah blah (blah, blah)"), aActualText);
 }
 
+void ScPDFExportTest::testTdf78897()
+{
+std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get();
+if (!pPDFium)
+{
+return;
+}
+
+mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY) 
+ "tdf78897.xls",
+  "com.sun.star.sheet.SpreadsheetDocument");
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+
+// C3:D3
+ScRange range1(2, 2, 0, 3, 2, 0);
+std::shared_ptr pPDFFile = exportToPDF(xModel, range1);
+// Parse the export result with pdfium.
+SvFileStream aFile(pPDFFile->GetURL(), StreamMode::READ);
+SvMemoryStream aMemory;
+aMemory.WriteStream(aFile);
+std::unique_ptr pPdfDocument
+= pPDFium->openDocument(aMemory.GetData(), aMemory.GetSize());
+CPPUNIT_ASSERT(pPdfDocument);
+CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount());
+
+// Get the first page
+std::unique_ptr pPdfPage = 
pPdfDocument->openPage(/*nIndex=*/0);
+CPPUNIT_ASSERT(pPdfPage);
+std::unique_ptr pTextPage = 
pPdfPage->getTextPage();
+
+int nChars = pTextPage->countChars();
+std::vector aChars(nChars);
+for (int i = 0; i < nChars; i++)
+aChars[i] = pTextPage->getUnicode(i);
+OUString aActualText(aChars.data(), aChars.size());
+
+// Without the fix in place, this test would have failed with
+// - Expected:  11.00 11.00
+// - Actual  :  11.00 ###
+CPPUNIT_ASSERT_EQUAL(OUString(" 11.00 11.00 "), aActualText);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScPDFExportTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sc/qa/extras/testdocuments/tdf78897.xls 
b/sc/qa/extras/testdocuments/tdf78897.xls
new file mode 100644
index ..e2177fc785aa
Binary files /dev/null and b/sc/qa/extras/testdocuments/tdf78897.xls differ

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.2.3.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.2.3.2' created by Christian Lohmaier 
 at 2021-11-18 11:33 +

Tag libreoffice-7.2.3.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGWOhYACgkQ9DSh76/u
rqPjCxAA0Dz1KCpje9V9jcpxxg2pwvZuv7sfxizjxtTktZ6MUk5E5Ism+dFYtHaT
aaytokG1++lK2aqvwr9av2prggkDXCa3g7WsAbGv61RVlwAsiqGKMBQQ1+/00ka9
MctJ5qAIjWVhQRz1ovyar0Sv6WBR1U+8shQNtwPsB3MFcK87qMrZy7L5Q3lKsohG
DE3XFVVD9rH4pvG1LzJxdB0NAXvRYcLwRByr2hj6s3MEg9Uho0fgt2B6ZGDA3vV5
6HgvPqLbLO0ug25NgqySAwqC0FGyaueieZG2CHove1y5rUH6H4Ftp4VohsVtz3RC
nj/nddtYQ58JiA4AJlm84azQDWeJdd0aEg5IbfTx1QiuK7MqTnTScgJELHzLatZc
5SpcGzVipYQ772kSMtqwAYW7DN7EToImdP9TQwXrG7E01UDzZ3eJJgk8nurWHj0E
EISjLuckHWxWqFjr+jTnXbCyoZhQ/qHRRpophNNtOEx/JcEkWP+3EOTMA3XbIvKK
xrMew5BUCLaEJcOiLVmW5Ma8Hzd6SbJtTzroXEVFbh7q0xTxPnMGMDhpnAlpVS1W
YqW2kjEqj3dgvO/LpeF2EhPcDp3rZip+mXtwPOIZJuUKy3m2k2g+NpWfZ/78KCJQ
5XWNVB+CoKvkOFk+qa7tcPqYZMpLgb2/fl42ppi2L2u8Y2+957k=
=klM3
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-717:
---
 0 files changed
---

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.2.3.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.2.3.2' created by Christian Lohmaier 
 at 2021-11-18 11:33 +

Tag libreoffice-7.2.3.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGWOhYACgkQ9DSh76/u
rqORTA/9GpLh+Ne3sJGyC3QJ7hQyge6EXbwgEsiev3blBZDurMjfglfYW14JQcn5
ca8wMT57Qnfvyjsj3GGrefuQjb2tz/VOQ46KjvPxbLc5tDKvW0BBwt6K4dI+qHel
cTJJvbm/JCC3Z2HFpHFW5FqL/9i8YRwBjiPtdTXmDwGF90O/hi/q4lGPpN6YbTmI
bZ2scym9Y+9IcsSBOd7N04vNa+F69mNchpUOep3RS66SM9kJCwW+jbur2MiuYwki
men5X1nWCXP0KGKSVNujhkO7libHgtKlxKgOYChVa/Um28px49ANbAJ7/LqSTvi3
uu1S+Op/7B9Zq4L9wgwoIJrSkW9l36YV7SlFBEuoy28MFO+vRR92xAUQyXHkwtm/
SJYtvuBnZM+0VqH0OlXxfTDvtIii104GvH5/1XHfksl4hCWm2cMRxQdvBcN+sfAG
xozdjbGXHpTUmhrMI9dd0zQfhupgnd0yq+MykacJ7j7hQZpfdAHgDMNqb9vLhi6Y
jbuj0HUBdEP8H6vIfGy9iP1TJEOttsEAejPoVv6XHCHOzt0wiBkTVzPbycEXoCKX
IgvobnetlTZSPLPBONC5jcDCs+DqhtLy1Jug5cJSAPWRnCxEdTdXIs+X9rt73se7
cXRtPL06qcvjsK85Md2LbU85isLnKElhO7CVNJxU1aCtSFIlwx4=
=o2xX
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-17:
---
 0 files changed
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.2.3.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.2.3.2' created by Christian Lohmaier 
 at 2021-11-18 11:33 +

Tag libreoffice-7.2.3.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGWOhYACgkQ9DSh76/u
rqMHDw//Wp5v8D9ldtH+CmJwrMZLTAG4BzSvVhchMs3pojHxuQgnieAjrea9OqXO
7rm8BxjNzPWipFFeJ5pPNdl7E3LVUWGbRUgF6F4E2Rq3KmnTkCRYJu8JJPZxPVDa
sPYEJCScCUAvPtOfJAY2B2hqneUk0yJqq2x45q+/clvbg3aVbVx4XPg1aE4ZxQhL
xapS5zBJpvet1te5CLDvpaZNKtJLrWWhC2De774hMgGVPYd1PVr93cl8qFwRWKAF
euljkn9v1yiwfD4S535g+Z4MBOx1y+Wl1sboq6xItA9PlqAZAgKOhMOf1wSrqu8N
vkF8waDfwiPavieenx/eWZgRWFb2AaL8DxlO2ZMsRXdCbnTB0bcUe+A30gvNvY31
27uRBNop1/+97ToBEI3nXTXB720OsPS/BwHxy2FCstDvvICxhSGqVhQ288qOz+2i
N9wlATB/HJMGDX2E6AbHa8zxcJ8phthDowYTk5WjgmdcbiHV56dwTObUNbhXgD/Q
XOlGVCESyFjEoEuAVdF2H5pqeRESsr9tcWNSFsjzHVTYVkuuTwvBi4aMa9LHdYsy
ZHNBQe1/XlmhVLwviTts5LKS6p6tc3LPApzOO4dN31xAaRW9Gm8tlkNi5OALTAkU
jAJ9wCRj041h4Hy5HcgUXdf0CYEE9FuyGP7vnX1EAcZBSSJhWF8=
=XHwd
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-14:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7.2.3.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.2.3.2' created by Christian Lohmaier 
 at 2021-11-18 11:33 +

Tag libreoffice-7.2.3.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGWOhMACgkQ9DSh76/u
rqMorBAAksF1aiLHo3BNupnlIFzrZRCQm8f9bvGQ1lAaMB0fi1SXtJ+x1+ZKe84m
1aNSQ8kPWlRvCYnuAfcD5Ptg/b/gn0orfhzJx/hrYN0SZb03GJs+meeFtj/dcQh7
0j3Bg29QouCXf8HmyS6tUA5wTnsGhHXbGe8+nZnF290USpMhH4MpD2rAI2zEDN35
Os47MMmzmJkonxPBej13JAkcXcCF9XAO6C8PalC/u//Kid3G+c10WKEvlFhxXJmz
sJ9iPmnUi2jn+Xdh1uYlZLIJ7f5+fdRHDnZBu9POe7fLJIxZpHj86sUazV84OBnQ
ew8iLvIni3MxtvrhzakUC1GPvK6JrLkcK/vLcMom9d0kLhpKwisHI5YjHRuTfdRP
uHaY2zlgvdWN/FjEDwWmWY5Whp4BDTHtVd2ctq6bJKkQYAfq5AJ7w23ixpuO7Ez1
1UK4KoLyWwpXOGhvhAB/AsaCc14sELwuOpnEFrFq/kj7StK0/v7nT+g56UUJok2x
0f6KMZL8+JOXLvfLzQZ/Pj93j17BQHwJsAss1lQzQwgIET7jz4swfm02ONwcdWNc
4S6+5UNXbfZDmG2XYy4IqJAcLbhUlxyFvIdrZMb1dMVM0BR6roXydnCrCaMUxj5I
PcBpl8NH7Ifu4NxZFS3iD4yyWNA6ocV7PFMfKcSzFj/+kDYmJ0c=
=LwY5
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-12:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dcb4d326de8ce80f3fd22017e0b1646d78883eb4
Author: Christian Lohmaier 
AuthorDate: Thu Nov 18 12:34:04 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Nov 18 12:34:04 2021 +0100

bump product version to 7.2.3.2.0+

Change-Id: If321e9be4c0367a07e1e129048ec50bb5aa50f60

diff --git a/configure.ac b/configure.ac
index 7c211590f7e8..46125fca9b8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.3.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.3.2.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - svtools/source

[Mike Kaganski (via logerrit)]

 svtools/source/misc/unitconv.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0c0a1f201b51509f888a31b16f6449cc9fc6ea73
Author: Mike Kaganski 
AuthorDate: Tue Nov 9 09:22:43 2021 +0300
Commit: Christian Lohmaier 
CommitDate: Thu Nov 18 12:33:58 2021 +0100

tdf#145158: pre-multiply the value by factor before conversion

Otherwise it is rounded before multiplying. Prior to the regressing
commit cfff893b9c82843a90aac4ecdb3a3936721b74a0, it was calculating
in twips, and was only converted to points by dividing by 20 in the
end, which allowed to keep some precision.

Change-Id: I142371dc630584f3fe64b5bfd5b592d46226ce32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124895
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit d55b2631342bc7babf3709f2f83e0e502ebe4014)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124856
Reviewed-by: Xisco Fauli 
(cherry picked from commit fc8e53e48e1c690de4aa4dce0fee385b1f7adf73)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124859
Reviewed-by: Eike Rathke 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index bdff583182b5..5e316c5adf46 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -186,8 +186,8 @@ tools::Long CalcToPoint( tools::Long nIn, MapUnit eUnit, 
sal_uInt16 nFactor )
 eUnit == MapUnit::MapMM ||
 eUnit == MapUnit::MapCM, "this unit is not implemented" );
 
-if (const auto eTo = MapToO3tlLength(eUnit); eTo != o3tl::Length::invalid)
-return o3tl::convert(nIn, eTo, o3tl::Length::pt) * nFactor;
+if (const auto eFrom = MapToO3tlLength(eUnit); eFrom != 
o3tl::Length::invalid)
+return o3tl::convert(nIn * static_cast(nFactor), eFrom, 
o3tl::Length::pt);
 return 0;
 }
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - sc/source

[Heiko Tietze (via logerrit)]

 sc/source/ui/view/cellsh3.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit b9a3b141d09450a94d601d60f139d17b2ae07040
Author: Heiko Tietze 
AuthorDate: Tue Oct 19 10:40:41 2021 +0200
Commit: Caolán McNamara 
CommitDate: Thu Nov 18 12:16:15 2021 +0100

Resolves tdf#144247 - Change display precision of row height / column width

Use 2 digits by default but 4 in case of user-defined values
for row height and column width.

This partially reverts ad8edac43e73555bc2055514300c5b81a1bb04ea
as the optimal width is back to 2 digits

Change-Id: I4cb53071783c76d9fbea0cc2feaa0b860c73c647
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123802
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit e396017b598e6ef161e71f18638b4d94cd92e6ee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125349
Reviewed-by: Xisco Fauli 
(cherry picked from commit c6fb8ffc6a35d94002a2c5b5b36c228c161cde85)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125358
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index b98440d9e552..0bf79d6d108b 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -699,7 +699,9 @@ void ScCellShell::Execute( SfxRequest& rReq )
 ScopedVclPtr 
pDlg(pFact->CreateScMetricInputDlg(
 pTabViewShell->GetFrameWeld(), "RowHeightDialog",
 nCurHeight, ScGlobal::nStdRowHeight,
-eMetric, 4, MAX_ROW_HEIGHT));
+eMetric,
+nCurHeight == ScGlobal::nStdRowHeight ? 2 : 4, //use 4 
digits for user-defined values
+MAX_ROW_HEIGHT));
 
 if ( pDlg->Execute() == RET_OK )
 {
@@ -736,7 +738,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
 ScAbstractDialogFactory* pFact = 
ScAbstractDialogFactory::Create();
 ScopedVclPtr 
pDlg(pFact->CreateScMetricInputDlg(
 pTabViewShell->GetFrameWeld(), 
"OptimalRowHeightDialog",
-ScGlobal::nLastRowHeightExtra, 0, eMetric, 4, 
MAX_EXTRA_HEIGHT));
+ScGlobal::nLastRowHeightExtra, 0, eMetric, 2, 
MAX_EXTRA_HEIGHT));
 if ( pDlg->Execute() == RET_OK )
 {
 tools::Long nVal = pDlg->GetInputValue();
@@ -797,7 +799,9 @@ void ScCellShell::Execute( SfxRequest& rReq )
 ScAbstractDialogFactory* pFact = 
ScAbstractDialogFactory::Create();
 ScopedVclPtr 
pDlg(pFact->CreateScMetricInputDlg(
 pTabViewShell->GetFrameWeld(), "ColWidthDialog", 
nCurHeight,
-STD_COL_WIDTH, eMetric, 4, MAX_COL_WIDTH));
+STD_COL_WIDTH, eMetric,
+nCurHeight == STD_COL_WIDTH ? 2 : 4, //use 4 digits 
for user-defined values
+MAX_COL_WIDTH));
 if ( pDlg->Execute() == RET_OK )
 {
 tools::Long nVal = pDlg->GetInputValue();
@@ -833,7 +837,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
 ScAbstractDialogFactory* pFact = 
ScAbstractDialogFactory::Create();
 ScopedVclPtr 
pDlg(pFact->CreateScMetricInputDlg(
 pTabViewShell->GetFrameWeld(), "OptimalColWidthDialog",
-ScGlobal::nLastColWidthExtra, STD_EXTRA_WIDTH, 
eMetric, 4, MAX_EXTRA_WIDTH));
+ScGlobal::nLastColWidthExtra, STD_EXTRA_WIDTH, 
eMetric, 2, MAX_EXTRA_WIDTH));
 if ( pDlg->Execute() == RET_OK )
 {
 tools::Long nVal = pDlg->GetInputValue();

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/cctrl/checklistmenu.cxx |4 +++-
 sc/source/ui/inc/checklistmenu.hxx   |3 ++-
 sc/source/ui/view/gridwin.cxx|8 ++--
 sc/source/ui/view/gridwin2.cxx   |6 --
 4 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 27b11edf8050fa6edf0c42a28a5e438038a5f8ff
Author: Caolán McNamara 
AuthorDate: Fri Nov 12 15:39:49 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 18 12:15:15 2021 +0100

Resolves: tdf#145645 pivot table popups don't dismiss when item activated

Change-Id: I5a68a08600b7792d924ec77694a60651df5d9c83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124983
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit ecb15ba80cd85e40da5d2d48a394d4cbc9a43bba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125136
Reviewed-by: Xisco Fauli 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 123c76fdc293..7e4f1b9fbfdc 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -197,7 +197,9 @@ void ScCheckListMenuControl::executeMenuItem(size_t nPos)
 // no action is defined.
 return;
 
-maMenuItems[nPos].mxAction->execute();
+const bool bClosePopup = maMenuItems[nPos].mxAction->execute();
+if (bClosePopup)
+terminateAllPopupMenus();
 }
 
 void ScCheckListMenuControl::setSelectedMenuItem(size_t nPos, bool 
bSubMenuTimer)
diff --git a/sc/source/ui/inc/checklistmenu.hxx 
b/sc/source/ui/inc/checklistmenu.hxx
index b0ddc9188bd2..427f29c3f7d3 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -63,7 +63,8 @@ public:
 {
 public:
 virtual ~Action() {}
-virtual void execute() = 0;
+// return true to dismiss the popup
+virtual bool execute() = 0;
 };
 
 struct ResultEntry
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 242ca40b3530..05d75755aecb 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -509,9 +509,12 @@ class AutoFilterAction : public 
ScCheckListMenuControl::Action
 public:
 AutoFilterAction(ScGridWindow* p, ScGridWindow::AutoFilterMode eMode) :
 mpWindow(p), meMode(eMode) {}
-virtual void execute() override
+virtual bool execute() override
 {
 mpWindow->UpdateAutoFilterFromMenu(meMode);
+// RefreshAutoFilterButton manually closes the popup so return
+// false to not attempt a second close
+return false;
 }
 };
 
@@ -522,9 +525,10 @@ class AutoFilterPopupEndAction : public 
ScCheckListMenuControl::Action
 public:
 AutoFilterPopupEndAction(ScGridWindow* p, const ScAddress& rPos) :
 mpWindow(p), maPos(rPos) {}
-virtual void execute() override
+virtual bool execute() override
 {
 mpWindow->RefreshAutoFilterButton(maPos);
+return false; // this is called after the popup has been closed
 }
 };
 
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index bf1b7597b185..ffe76e677349 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -383,9 +383,10 @@ public:
 explicit DPFieldPopupOKAction(ScGridWindow* p) :
 mpGridWindow(p) {}
 
-virtual void execute() override
+virtual bool execute() override
 {
 mpGridWindow->UpdateDPFromFieldPopupMenu();
+return true;
 }
 private:
 VclPtr mpGridWindow;
@@ -405,7 +406,7 @@ public:
 , mpViewShell(pViewShell)
 {}
 
-virtual void execute() override
+virtual bool execute() override
 {
 switch (meType)
 {
@@ -421,6 +422,7 @@ public:
 default:
 ;
 }
+return true;
 }
 
 private:

[Libreoffice-commits] core.git: chart2/inc chart2/source

[Noel Grandin (via logerrit)]

 chart2/inc/bitmaps.hlst   |  238 +-
 chart2/inc/unonames.hxx   |   46 ++---
 chart2/source/controller/inc/helpids.h|8 
 chart2/source/inc/servicenames.hxx|   49 +++--
 chart2/source/inc/servicenames_charttypes.hxx |   34 ++-
 chart2/source/inc/servicenames_coosystems.hxx |9 
 6 files changed, 199 insertions(+), 185 deletions(-)

New commits:
commit f95bdd424760f759dcc7197d004d98bf20f056d3
Author: Noel Grandin 
AuthorDate: Thu Nov 18 09:23:40 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 18 12:15:20 2021 +0100

loplugin:stringliteraldefine in chart2

and drop namespace declarations that were surrounding the #define
- namespace decls have no affect on #defines

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

diff --git a/chart2/inc/bitmaps.hlst b/chart2/inc/bitmaps.hlst
index 35ef79e510d3..fee0c98ace1e 100644
--- a/chart2/inc/bitmaps.hlst
+++ b/chart2/inc/bitmaps.hlst
@@ -9,125 +9,125 @@
 
 #pragma once
 
-#define BMP_TYPE_COLUMN "chart2/res/typecolumn_16.png"
-#define BMP_TYPE_BAR"chart2/res/typebar_16.png"
-#define BMP_TYPE_PIE"chart2/res/typepie_16.png"
-#define BMP_TYPE_LINE   "chart2/res/typepointline_16.png"
-#define BMP_TYPE_XY "chart2/res/typexy_16.png"
-#define BMP_TYPE_AREA   "chart2/res/typearea_16.png"
-#define BMP_TYPE_NET"chart2/res/typenet_16.png"
-#define BMP_TYPE_STOCK  "chart2/res/typestock_16.png"
-#define BMP_TYPE_COLUMN_LINE"chart2/res/typecolumnline_16.png"
-#define BMP_TYPE_BUBBLE "chart2/res/typebubble_16.png"
-#define BMP_BUBBLE_1"chart2/res/bubble_52x60.png"
-#define BMP_AREAS_2D"chart2/res/areas_52x60.png"
-#define BMP_AREAS_2D_1  "chart2/res/areaspiled_52x60.png"
-#define BMP_AREAS_2D_3  "chart2/res/areasfull_52x60.png"
-#define BMP_AREAS_3D"chart2/res/areaspiled3d_52x60.png"
-#define BMP_AREAS_3D_1  "chart2/res/areas3d_52x60.png"
-#define BMP_AREAS_3D_2  "chart2/res/areasfull3d_52x60.png"
-#define BMP_BARS_2D_1   "chart2/res/bar_52x60.png"
-#define BMP_BARS_2D_2   "chart2/res/barstack_52x60.png"
-#define BMP_BARS_2D_3   "chart2/res/barpercent_52x60.png"
-#define BMP_BARS_3D "chart2/res/bar3ddeep_52x60.png"
-#define BMP_BARS_3D_1   "chart2/res/bar3d_52x60.png"
-#define BMP_BARS_3D_2   "chart2/res/barstack3d_52x60.png"
-#define BMP_BARS_3D_3   "chart2/res/barpercent3d_52x60.png"
-#define BMP_CIRCLES_2D  "chart2/res/pie_52x60.png"
-#define BMP_CIRCLES_2D_EXPLODED "chart2/res/pieexploded_52x60.png"
-#define BMP_CIRCLES_3D  "chart2/res/pie3d_52x60.png"
-#define BMP_CIRCLES_3D_EXPLODED "chart2/res/pie3dexploded_52x60.png"
-#define BMP_DONUT_2D"chart2/res/donut_52x60.png"
-#define BMP_DONUT_2D_EXPLODED   "chart2/res/donutexploded_52x60.png"
-#define BMP_DONUT_3D"chart2/res/donut3d_52x60.png"
-#define BMP_DONUT_3D_EXPLODED   "chart2/res/donut3dexploded_52x60.png"
-#define BMP_COLUMNS_2D_1"chart2/res/columns_52x60.png"
-#define BMP_COLUMNS_2D_2"chart2/res/columnstack_52x60.png"
-#define BMP_COLUMNS_2D_3"chart2/res/columnpercent_52x60.png"
-#define BMP_COLUMN_LINE "chart2/res/columnline_52x60.png"
-#define BMP_COLUMN_LINE_STACKED "chart2/res/columnstackline_52x60.png"
-#define BMP_COLUMNS_3D  "chart2/res/columns3ddeep_52x60.png"
-#define BMP_COLUMNS_3D_1"chart2/res/columns3d_52x60.png"
-#define BMP_COLUMNS_3D_2"chart2/res/columnstack3d_52x60.png"
-#define BMP_COLUMNS_3D_3"chart2/res/columnpercent3d_52x60.png"
-#define BMP_KEGELQ_3D_1 "chart2/res/conehori_52x60.png"
-#define BMP_KEGELQ_3D_2 "chart2/res/conehoristack_52x60.png"
-#define BMP_KEGELQ_3D_3 "chart2/res/conehoripercent_52x60.png"
-#define BMP_KEGELQ_3D_4 "chart2/res/conehorideep_52x60.png"
-#define BMP_KEGEL_3D_1  "chart2/res/cone_52x60.png"
-#define BMP_KEGEL_3D_2  "chart2/res/conestack_52x60.png"
-#define BMP_KEGEL_3D_3  "chart2/res/conepercent_52x60.png"
-#define BMP_KEGEL_3D_4  "chart2/res/conedeep_52x60.png"
-#define BMP_POINTS_XVALUES  
"chart2/res/valueaxisdirectpoints_52x60.png"
-#define BMP_POINTS_XCATEGORY
"chart2/res/nostackdirectpoints_52x60.png"
-#define BMP_POINTS_STACKED  

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/cctrl/checklistmenu.cxx |9 -
 sc/source/ui/inc/checklistmenu.hxx   |5 +
 sc/source/ui/view/gridwin.cxx|6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 6bd1cb73480d2b20926f964b8db8c31a522c5ec3
Author: Caolán McNamara 
AuthorDate: Wed Nov 17 15:20:33 2021 +
Commit: Eike Rathke 
CommitDate: Thu Nov 18 12:10:14 2021 +0100

tdf#142420 color menu should be a child of the autofilter, not a sibling

which is why it doesn't appear at all under wayland. This should also
get it positioned better rather than using a fixed pixel offset.

Change-Id: I9a4193c27b4172469cea3d980c86cff9ca701ca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125361
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Samuel Mehrbrodt 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 95ab21cb74ae..123c76fdc293 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -276,6 +276,13 @@ void ScCheckListMenuControl::queueCloseSubMenu()
 maCloseTimer.maTimer.Start();
 }
 
+tools::Rectangle ScCheckListMenuControl::GetSubMenuParentRect()
+{
+if (!mxMenu->get_selected(mxScratchIter.get()))
+return tools::Rectangle();
+return mxMenu->get_row_area(*mxScratchIter);
+}
+
 void ScCheckListMenuControl::launchSubMenu(bool bSetMenuPos)
 {
 ScCheckListMenuWindow* pSubMenu = maOpenTimer.mpSubMenu;
@@ -285,7 +292,7 @@ void ScCheckListMenuControl::launchSubMenu(bool bSetMenuPos)
 if (!mxMenu->get_selected(mxScratchIter.get()))
 return;
 
-tools::Rectangle aRect = mxMenu->get_row_area(*mxScratchIter);
+tools::Rectangle aRect = GetSubMenuParentRect();
 ScCheckListMenuControl& rSubMenuControl = pSubMenu->get_widget();
 rSubMenuControl.StartPopupMode(aRect, FloatWinPopupFlags::Right);
 if (bSetMenuPos)
diff --git a/sc/source/ui/inc/checklistmenu.hxx 
b/sc/source/ui/inc/checklistmenu.hxx
index 7ebb95fb0caf..b0ddc9188bd2 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -177,6 +177,11 @@ public:
  */
 void terminateAllPopupMenus();
 
+/**
+ * Get the area of the active row. Suitable as the parent rectangle
+ * argument for Executing a popup
+*/
+tools::Rectangle GetSubMenuParentRect();
 private:
 
 std::vector maMenuItems;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c5382ef2747b..242ca40b3530 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -957,9 +957,9 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode 
eMode)
 }
 i++;
 }
-Point pos(mpAutoFilterPopup->GetPosPixel());
-pos.Move(150, 0);
-sal_uInt16 nSelected = pColorMenu->Execute(this, pos);
+
+tools::Rectangle aRect = rControl.GetSubMenuParentRect();
+sal_uInt16 nSelected = pColorMenu->Execute(mpAutoFilterPopup, 
aRect, PopupMenuFlags::ExecuteRight);
 pColorMenu.disposeAndClear();
 rControl.terminateAllPopupMenus();
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - download.lst

[Michael Stahl (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4536167756d97053ff4f50036ddb73b1bb68be9
Author: Michael Stahl 
AuthorDate: Tue Nov 16 14:41:57 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Nov 18 12:09:44 2021 +0100

postgresql: upgrade to release 13.5

Fixes CVE-2021-23222.

Change-Id: I4e16fcc60c634382a864f66b211d0e0170a06db0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125308
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 71b9369f1cc40143108e3f2189d96e402895e315)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125146
Reviewed-by: Xisco Fauli 
(cherry picked from commit c49613bde900d2c15dfea1fe24bdf74a3cc26ad2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125356
Reviewed-by: Stephan Bergmann 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index cfdcdb1cf7fd..43f3a941 100644
--- a/download.lst
+++ b/download.lst
@@ -218,8 +218,8 @@ export POPPLER_SHA256SUM := 
016dde34e5f868ea98a32ca99b643325a9682281500942b7113f
 export POPPLER_TARBALL := poppler-21.01.0.tar.xz
 export POPPLER_DATA_SHA256SUM := 
6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30
 export POPPLER_DATA_TARBALL := poppler-data-0.4.10.tar.gz
-export POSTGRESQL_SHA256SUM := 
12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
-export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
+export POSTGRESQL_SHA256SUM := 
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
+export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
 export PYTHON_SHA256SUM := 
6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9
 export PYTHON_TARBALL := Python-3.8.10.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - external/libjpeg-turbo

[Michael Stahl (via logerrit)]

 external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk |1 
 external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1 |   38 
++
 2 files changed, 39 insertions(+)

New commits:
commit e56568836048ee78cc641e107ebc694244af4d35
Author: Michael Stahl 
AuthorDate: Fri Nov 5 19:40:49 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 18 12:07:02 2021 +0100

libjpeg-turbo: add patch for CVE-2020-17541

Change-Id: Ie3fe30bea6a62e7cafeaed957d6ef6aeb879047b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124778
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit ebd556220a5045c1c81891b712648d220a168c70)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125353
Reviewed-by: Xisco Fauli 
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk 
b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
index a99df67bb011..5440d16ecfc1 100644
--- a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libjpeg-turbo,\
external/libjpeg-turbo/jpeg-turbo.build.patch.1 \
$(if $(filter 
WNT,$(OS)),external/libjpeg-turbo/jpeg-turbo.win_build.patch.1) \
external/libjpeg-turbo/ubsan.patch \
+   external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1 
\
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git 
a/external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1 
b/external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1
new file mode 100644
index ..cc3da737e7b0
--- /dev/null
+++ b/external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1
@@ -0,0 +1,38 @@
+From c76f4a08263b0cea40d2967560ac7c21f6959079 Mon Sep 17 00:00:00 2001
+From: DRC 
+Date: Thu, 5 Dec 2019 13:12:28 -0600
+Subject: [PATCH] Huffman enc.: Fix very rare local buffer overrun
+
+... detected by ASan.  This is a similar issue to the issue that was
+fixed with 402a715f82313384ef4606660c32d8678c79f197.  Apparently it is
+possible to create a malformed JPEG image that exceeds the Huffman
+encoder's 256-byte local buffer when attempting to losslessly tranform
+the image.  That makes sense, given that it was necessary to extend the
+Huffman decoder's local buffer to 512 bytes in order to handle all
+pathological cases (refer to 0463f7c9aad060fcd56e98d025ce16185279e2bc.)
+
+Since this issue affected only lossless transformation, a workflow that
+isn't generally exposed to arbitrary data exploits, and since the
+overrun did not overflow the stack (i.e. it did not result in a segfault
+or other user-visible issue, and valgrind didn't even detect it), it did
+not likely pose a security risk.
+
+Fixes #392
+---
+ ChangeLog.md | 10 ++
+ jchuff.c |  2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/jchuff.c b/jchuff.c
+index 206958e2f..cb05055d9 100644
+--- a/jchuff.c
 b/jchuff.c
+@@ -432,7 +432,7 @@ dump_buffer(working_state *state)
+  * scanning order-- 1, 8, 16, etc.), then this will produce an encoded block
+  * larger than 200 bytes.
+  */
+-#define BUFSIZE (DCTSIZE2 * 4)
++#define BUFSIZE (DCTSIZE2 * 8)
+ 
+ #define LOAD_BUFFER() { \
+   if (state->free_in_buffer < BUFSIZE) { \

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - external/icu

[Michael Stahl (via logerrit)]

 external/icu/UnpackedTarball_icu.mk   |1 
 external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 |  106 ++
 2 files changed, 107 insertions(+)

New commits:
commit e36aee9dc9ac97dec1fbaa78eaf5a68c27c96a62
Author: Michael Stahl 
AuthorDate: Fri Nov 5 18:33:07 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 18 12:06:08 2021 +0100

icu: add patch for CVE-2021-30535

Change-Id: I398596f77aa47ab6d4db01b94422262048cffd3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124779
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 35eef8ec9b122a761400f3c6590ca1f9a187d772)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124701
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 105c258fcdd69f617de64b780ffcdb8304ff262c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125354
Reviewed-by: Xisco Fauli 
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 2e455a7dcc24..b47d519b1ae2 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
+   external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 
b/external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2
new file mode 100644
index ..d23605807f14
--- /dev/null
+++ b/external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2
@@ -0,0 +1,106 @@
+From e450fa50fc242282551f56b941dc93b9a8a0bcbb Mon Sep 17 00:00:00 2001
+From: Frank Tang 
+Date: Tue, 13 Apr 2021 15:16:50 -0700
+Subject: [PATCH] ICU-21587 Fix memory bug w/ baseName
+
+Edge cases not fixed in assign and move assign operator
+while the locale is long and call setKeywordValue with incorrect
+keyword/values.
+---
+ icu4c/source/common/locid.cpp  | 11 +--
+ icu4c/source/test/intltest/loctest.cpp | 26 ++
+ icu4c/source/test/intltest/loctest.h   |  2 ++
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp
+index 02cd82a7b8e..3c6e5b06690 100644
+--- a/icu4c/source/common/locid.cpp
 b/icu4c/source/common/locid.cpp
+@@ -469,14 +469,18 @@ Locale& Locale::operator=(Locale&& other) U_NOEXCEPT {
+ if ((baseName != fullName) && (baseName != fullNameBuffer)) 
uprv_free(baseName);
+ if (fullName != fullNameBuffer) uprv_free(fullName);
+ 
+-if (other.fullName == other.fullNameBuffer) {
++if (other.fullName == other.fullNameBuffer || other.baseName == 
other.fullNameBuffer) {
+ uprv_strcpy(fullNameBuffer, other.fullNameBuffer);
++}
++if (other.fullName == other.fullNameBuffer) {
+ fullName = fullNameBuffer;
+ } else {
+ fullName = other.fullName;
+ }
+ 
+-if (other.baseName == other.fullName) {
++if (other.baseName == other.fullNameBuffer) {
++baseName = fullNameBuffer;
++} else if (other.baseName == other.fullName) {
+ baseName = fullName;
+ } else {
+ baseName = other.baseName;
+@@ -2681,6 +2685,9 @@ Locale::setKeywordValue(const char* keywordName, const 
char* keywordValue, UErro
+ if (fullName != fullNameBuffer) {
+ // if full Name is already on the heap, need to free it.
+ uprv_free(fullName);
++if (baseName == fullName) {
++baseName = newFullName; // baseName should not point to freed 
memory.
++}
+ }
+ fullName = newFullName;
+ status = U_ZERO_ERROR;
+diff --git a/icu4c/source/test/intltest/loctest.cpp 
b/icu4c/source/test/intltest/loctest.cpp
+index ce41a4c00e7..5503b008b0c 100644
+--- a/icu4c/source/test/intltest/loctest.cpp
 b/icu4c/source/test/intltest/loctest.cpp
+@@ -284,6 +284,8 @@ void LocaleTest::runIndexedTest( int32_t index, UBool 
exec, const char* &name, c
+ TESTCASE_AUTO(TestSetUnicodeKeywordValueNullInLongLocale);
+ TESTCASE_AUTO(TestCanonicalize);
+ TESTCASE_AUTO(TestLeak21419);
++TESTCASE_AUTO(TestLongLocaleSetKeywordAssign);
++TESTCASE_AUTO(TestLongLocaleSetKeywordMoveAssign);
+ TESTCASE_AUTO_END;
+ }
+ 
+@@ -6520,6 +6522,30 @@ void 
LocaleTest::TestSetUnicodeKeywordValueInLongLocale() {
+ }
+ }
+ 
++void LocaleTest::TestLongLocaleSetKeywordAssign() {
++IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordAssign");
++// A long base name, with an illegal keyword 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - download.lst

[Michael Stahl (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4fe3866a2480dcc53252253c681ecb9b0cdc3d3b
Author: Michael Stahl 
AuthorDate: Tue Nov 9 12:35:04 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 18 12:04:43 2021 +0100

openldap: upgrade to release 2.4.59

Fixes CVE-2020-36230 and CVE-2020-36229 in libldap, plus lots of
other CVEs that affect only the server.

Unfortunately it looks like NSS support was removed in release 2.5.0.

Change-Id: Ie43d7da1b9e92b5712f9cd22c4613648394c696f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124914
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 9393325c1db9fa25037d208607b71adb567a8bbc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124860
Reviewed-by: Caolán McNamara 
(cherry picked from commit b7c670984e4af1c73fa05731ca8029cec487bd52)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125355
Reviewed-by: Xisco Fauli 
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index 23acc03b2b65..cfdcdb1cf7fd 100644
--- a/download.lst
+++ b/download.lst
@@ -200,8 +200,8 @@ export ODFVALIDATOR_SHA256SUM := 
d55495ab3a86544650587de2a72180ddf8bfc6376d14ddf
 export ODFVALIDATOR_JAR := 
odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
 export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
-export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
-export OPENLDAP_TARBALL := openldap-2.4.45.tgz
+export OPENLDAP_SHA256SUM := 
99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34
+export OPENLDAP_TARBALL := openldap-2.4.59.tgz
 export OPENSSL_SHA256SUM := 
0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
 export OPENSSL_TARBALL := openssl-1.1.1l.tar.gz
 export ORCUS_SHA256SUM := 
c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - download.lst

[Michael Stahl (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3c3971aeba753035bc97351749a31dcb1d4c91a8
Author: Michael Stahl 
AuthorDate: Fri Nov 5 14:03:05 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 18 12:03:19 2021 +0100

bzip2: upgrade to release 1.0.8

Fixes CVE-2019-12900

Change-Id: If3fcfff78a61c60014ba6d96f1ee0c432ccc52a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124758
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 1289125532a029dc80e4ee3d0a49dca253f51888)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124762
Reviewed-by: Caolán McNamara 
(cherry picked from commit 7208197a4ac718411fa6e3b4c770fdec8c67557d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125352
Reviewed-by: Xisco Fauli 
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index 34bb426c8021..23acc03b2b65 100644
--- a/download.lst
+++ b/download.lst
@@ -18,8 +18,8 @@ export BREAKPAD_SHA256SUM := 
c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91
 export BREAKPAD_TARBALL := 
breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz
 export BSH_SHA256SUM := 
9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96
 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
-export BZIP2_SHA256SUM := 
a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
-export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
+export BZIP2_SHA256SUM := 
ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
+export BZIP2_TARBALL := bzip2-1.0.8.tar.gz
 export CAIRO_SHA256SUM := 
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
 export CAIRO_VERSION_MICRO := 0
 export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz

[Libreoffice-commits] core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/ods/tdf139612.ods   |binary
 sc/qa/unit/subsequent_filters_test2.cxx |   18 ++
 2 files changed, 18 insertions(+)

New commits:
commit 258dc1f332155cd565d34b1ce3b51edc3c2fbf64
Author: Xisco Fauli 
AuthorDate: Thu Nov 18 10:17:29 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 18 11:28:25 2021 +0100

tdf#139612: sc_subsequent_filters_test2: Add unittest

Change-Id: Ic1467cfc50ce40951677a73ab3c43df6c33467fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125440
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/unit/data/ods/tdf139612.ods 
b/sc/qa/unit/data/ods/tdf139612.ods
new file mode 100644
index ..34acfe3263c5
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf139612.ods differ
diff --git a/sc/qa/unit/subsequent_filters_test2.cxx 
b/sc/qa/unit/subsequent_filters_test2.cxx
index f10474d17172..87186e3443e8 100644
--- a/sc/qa/unit/subsequent_filters_test2.cxx
+++ b/sc/qa/unit/subsequent_filters_test2.cxx
@@ -203,6 +203,7 @@ public:
 void testDrawCircleInMergeCells();
 void testDeleteCirclesInRowAndCol();
 void testTdf129940();
+void testTdf139612();
 void testTdf144740();
 void testTdf139763ShapeAnchor();
 void testAutofilterNamedRangesXLSX();
@@ -309,6 +310,7 @@ public:
 CPPUNIT_TEST(testDrawCircleInMergeCells);
 CPPUNIT_TEST(testDeleteCirclesInRowAndCol);
 CPPUNIT_TEST(testTdf129940);
+CPPUNIT_TEST(testTdf139612);
 CPPUNIT_TEST(testTdf144740);
 CPPUNIT_TEST(testTdf139763ShapeAnchor);
 CPPUNIT_TEST(testAutofilterNamedRangesXLSX);
@@ -2836,6 +2838,22 @@ void ScFiltersTest2::testTdf129940()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest2::testTdf139612()
+{
+ScDocShellRef xDocSh = loadDoc(u"tdf139612.", FORMAT_ODS);
+CPPUNIT_ASSERT_MESSAGE("Failed to load tdf139612.ods", xDocSh.is());
+ScDocument& rDoc = xDocSh->GetDocument();
+
+xDocSh->DoHardRecalc();
+
+// Without the fix in place, this test would have failed with
+// - Expected: 1
+// - Actual  : 0
+CPPUNIT_ASSERT_EQUAL(1.0, rDoc.GetValue(ScAddress(1, 15, 0)));
+
+xDocSh->DoClose();
+}
+
 void ScFiltersTest2::testTdf144740()
 {
 ScDocShellRef xDocSh = loadDoc(u"tdf144740.", FORMAT_ODS);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-3' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/docnode/ndnum.cxx |2 ++
 sw/source/core/docnode/nodes.cxx |   18 --
 2 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit f7a148cf13cab1505e0ca8229f6cb334662ef20b
Author: Michael Stahl 
AuthorDate: Mon Nov 15 17:29:59 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Nov 18 10:49:57 2021 +0100

tdf#121546 sw: don't use undo array's m_pOutlineNodes

It's pointless.

Change-Id: I304c123bffc16e6133d2953bc9a4f7a3afad14ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124999
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125260
(cherry picked from commit 74ff78e1e21dc83099d0dfcedba780c176c8fb3f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125143
Reviewed-by: Xisco Fauli 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index b3d66affa66e..a7b898ee5f0a 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -38,6 +38,8 @@ bool SwOutlineNodes::Seek_Entry(SwNode* rP, size_type* pnPos) 
const
 
 void SwNodes::UpdateOutlineNode(SwNode & rNd)
 {
+assert(IsDocNodes()); // no point in m_pOutlineNodes for undo nodes
+
 SwTextNode * pTextNd = rNd.GetTextNode();
 
 if (!(pTextNd && pTextNd->IsOutlineStateChanged()))
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index da593261074b..e7af18a1c16a 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -110,6 +110,16 @@ SwNodes::~SwNodes()
 m_pEndOfContent.reset();
 }
 
+static bool IsInsertOutline(SwNodes const& rNodes, sal_uLong const nIndex)
+{
+if (!rNodes.IsDocNodes())
+{
+return false;
+}
+return nIndex < rNodes.GetEndOfRedlines().StartOfSectionNode()->GetIndex()
+|| rNodes.GetEndOfRedlines().GetIndex() < nIndex;
+}
+
 void SwNodes::ChgNode( SwNodeIndex const & rDelPos, sal_uLong nSz,
 SwNodeIndex& rInsPos, bool bNewFrames )
 {
@@ -125,9 +135,7 @@ void SwNodes::ChgNode( SwNodeIndex const & rDelPos, 
sal_uLong nSz,
 
 // NEVER include nodes from the RedLineArea
 sal_uLong nNd = rInsPos.GetIndex();
-bool bInsOutlineIdx = (
-rNds.GetEndOfRedlines().StartOfSectionNode()->GetIndex() >= nNd ||
-nNd >= rNds.GetEndOfRedlines().GetIndex() );
+bool const bInsOutlineIdx = IsInsertOutline(rNds, nNd);
 
 if( &rNds == this ) // if in the same node array -> move
 {
@@ -484,9 +492,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes 
& rNodes,
 
 // NEVER include nodes from the RedLineArea
 sal_uLong nNd = aIdx.GetIndex();
-bool bInsOutlineIdx = ( rNodes.GetEndOfRedlines().
-StartOfSectionNode()->GetIndex() >= nNd ||
-nNd >= rNodes.GetEndOfRedlines().GetIndex() );
+bool const bInsOutlineIdx = IsInsertOutline(rNodes, nNd);
 
 if( bNewFrames )
 // delete all frames

[Libreoffice-commits] core.git: connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_general.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6bb6e59ca2b40958504ac176cab448de3fe0a2a9
Author: Julien Nabet 
AuthorDate: Wed Nov 17 22:03:24 2021 +0100
Commit: Lionel Mamane 
CommitDate: Thu Nov 18 10:47:43 2021 +0100

tdf#145205: Mysql/MariaDB, display BIT instead of DATE when its a BIT field

Beware, we just want to display the right info here, BIT management in 
Mysql/MariaDB
needs some work

There are 2 parts in this patch:
1)
-if (sType.equalsIgnoreAsciiCase("bit") || 
sType.equalsIgnoreAsciiCase("bool")
-|| sType.equalsIgnoreAsciiCase("boolean"))
+if (sType.equalsIgnoreAsciiCase("bit"))
+return css::sdbc::DataType::BIT;
+if (sType.equalsIgnoreAsciiCase("bool") || 
sType.equalsIgnoreAsciiCase("boolean"))
allows to display BIT instead of DATE when editing the table

2)
-return css::sdbc::DataType::VARCHAR;
+return css::sdbc::DataType::BIT;
allows to show a checkbox instead of a field where you can type anything 
when opening the table

Change-Id: Id50882bfab97cc43a1904bfc6eb7256904732bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125429
Tested-by: Jenkins
Reviewed-by: Lionel Mamane 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index 878efdc3be24..e4b9040b8a1e 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
@@ -125,7 +125,7 @@ sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept
 switch (eType)
 {
 case MYSQL_TYPE_BIT:
-return css::sdbc::DataType::VARCHAR;
+return css::sdbc::DataType::BIT;
 
 case MYSQL_TYPE_TINY:
 return css::sdbc::DataType::TINYINT;
@@ -226,8 +226,9 @@ sal_Int32 mysqlStrToOOOType(const OUString& sType)
 return css::sdbc::DataType::REAL;
 if (sType.equalsIgnoreAsciiCase("double"))
 return css::sdbc::DataType::DOUBLE;
-if (sType.equalsIgnoreAsciiCase("bit") || 
sType.equalsIgnoreAsciiCase("bool")
-|| sType.equalsIgnoreAsciiCase("boolean"))
+if (sType.equalsIgnoreAsciiCase("bit"))
+return css::sdbc::DataType::BIT;
+if (sType.equalsIgnoreAsciiCase("bool") || 
sType.equalsIgnoreAsciiCase("boolean"))
 return css::sdbc::DataType::BOOLEAN;
 OSL_FAIL("Unknown type name from string, failing back to varchar.");
 return css::sdbc::DataType::VARCHAR;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - framework/source offapi/com offapi/UnoApi_offapi.mk sfx2/source uui/inc uui/Library_uui.mk uui/source

[Matt K (via logerrit)]

 framework/source/interaction/quietinteraction.cxx|   15 -
 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/document/ReadOnlyOpenRequest.idl |   51 ---
 sfx2/source/doc/docfile.cxx  |   44 
 uui/Library_uui.mk   |1 
 uui/inc/strings.hrc  |5 -
 uui/source/iahndl-locking.cxx|   50 --
 uui/source/iahndl.cxx|3 -
 uui/source/iahndl.hxx|3 -
 uui/source/readonlyopen.cxx  |   38 --
 uui/source/readonlyopen.hxx  |   35 -
 11 files changed, 1 insertion(+), 245 deletions(-)

New commits:
commit 63cb67f9e7a1920b43510df8f222c88a56fdf82d
Author: Matt K 
AuthorDate: Sun Nov 14 15:33:43 2021 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Nov 18 10:37:57 2021 +0100

tdf#143971 Removes pop-up dialog for read-only documents

No longer does the user get a pop-up dialog when opening
documents that are read-only, asking whether they want to be
notified when the document becomes editable.  The change
removes some of the functionality introduced in commit
95eb088802562b75f8b299908160145c7e88d763 "tdf#47065 Add new
file open UI options and implement a new thread".

Change-Id: Ic25e8e293e7224fb5086249a9d4814914fa961d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125340
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125398
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/framework/source/interaction/quietinteraction.cxx 
b/framework/source/interaction/quietinteraction.cxx
index 3719e00dc3ec..b6f3495fff09 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -78,7 +77,6 @@ void SAL_CALL QuietInteraction::handle( const 
css::uno::Reference< css::task::XI
 css::task::ErrorCodeRequest  aErrorCodeRequest;
 css::document::LockedDocumentRequest aLockedDocumentRequest;
 css::document::FilterOptionsRequest  aFilterOptionsRequest;
-css::document::ReadOnlyOpenRequest   aReadOnlyOpenRequest;
 
 if( aRequest >>= aErrorCodeRequest )
 {
@@ -111,19 +109,6 @@ void SAL_CALL QuietInteraction::handle( const 
css::uno::Reference< css::task::XI
 }
 }
 else
-if (aRequest >>= aReadOnlyOpenRequest)
-{
-// allow unit tests to run on read-only SRCDIR
-if (xApprove.is())
-{
-xApprove->select();
-}
-else if (xAbort.is())
-{
-xAbort->select();
-}
-}
-else
 if (xAbort.is())
 xAbort->select();
 }
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 01dd48280fea..2260be2bda38 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2211,7 +2211,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/document,\
NoSuchFilterRequest \
OwnLockOnDocumentRequest \
PrinterIndependentLayout \
-   ReadOnlyOpenRequest \
RedlineDisplayType \
ReloadEditableRequest \
UndoContextNotClosedException \
diff --git a/offapi/com/sun/star/document/ReadOnlyOpenRequest.idl 
b/offapi/com/sun/star/document/ReadOnlyOpenRequest.idl
deleted file mode 100644
index 49a82b7016f9..
--- a/offapi/com/sun/star/document/ReadOnlyOpenRequest.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_document_ReadOnlyOpenRequest_idl__
-#define __com_sun_star_document_ReadOnlyOpenRequest_idl__
-
-#include 
-
-module com
-{
-module sun
-{
-module star
-{
-module document
-{
-/**

[Libreoffice-commits] core.git: i18npool/inc i18npool/source

[Hossein (via logerrit)]

 i18npool/inc/calendar_hijri.hxx |3 ---
 i18npool/source/calendar/calendar_hijri.cxx |9 -
 2 files changed, 12 deletions(-)

New commits:
commit dd8b064af0b4cb44575eb4f3482db18485bfc8d3
Author: Hossein 
AuthorDate: Thu Nov 18 02:25:20 2021 +0100
Commit: Hossein 
CommitDate: Thu Nov 18 10:03:35 2021 +0100

Cleanup Calendar_hijri

* Removed the static member variable SA_TimeZone, which is not used
  elsewhere
  * It is write-only according to the clang compilerplugins output:
compilerplugins/clang/unusedvarsglobal.writeonly.results
  * Time zone should not be allocated as a constant
* Removed unused local variables commented out 15 years ago to avoid
  warnings in: 4170cbdbdfc9ceb282d25e1e19cd7b4d178436bf

Change-Id: Ifc24651ae0aee33dd6a01c77c919ce0cb0426366
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125432
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index 9732ca373155..c11a507bb420 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.hxx
@@ -49,9 +49,6 @@ private:
 static const sal_Int32 SynRef;
 static const sal_Int32 GregRef;
 
-// Local time (Saudi Arabia)
-static const double SA_TimeZone;// Time Zone
-
 // Period between 1.30pm - 6:30pm
 static const double EveningPeriod;
 
diff --git a/i18npool/source/calendar/calendar_hijri.cxx 
b/i18npool/source/calendar/calendar_hijri.cxx
index 3bc6ccfa841d..2944f455bb37 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.cxx
@@ -34,9 +34,6 @@ using namespace ::com::sun::star::i18n;
 
 namespace i18npool {
 
-// not used
-//static UErrorCode status; // status is shared in all calls to Calendar, it 
has to be reset for each call.
-
 // Synodic Period (mean time between 2 successive new moon: 29d, 12 hr, 44min, 
3sec
 const double Calendar_hijri::SynPeriod  = 29.53058868;
 const double Calendar_hijri::SynMonth   = 365.25/29.53058868;   // Solar 
days in a year/SynPeriod
@@ -48,9 +45,6 @@ const double Calendar_hijri::jd1900 = 2415020.75933;
 const sal_Int32 Calendar_hijri::SynRef  = 1252;
 const sal_Int32 Calendar_hijri::GregRef = 1422;
 
-// Local time specific to Saudi Arabia
-const double Calendar_hijri::SA_TimeZone= 3.0;
-
 const double Calendar_hijri::EveningPeriod  = 6.0;
 
 const sal_Int32 Calendar_hijri::LeapYear[] = {
@@ -173,7 +167,6 @@ void
 Calendar_hijri::getHijri(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year)
 {
 double prevday;
-//  double dayfraction;
 sal_Int32 syndiff;
 sal_Int32 newsyn;
 double newjd;
@@ -221,9 +214,7 @@ void
 Calendar_hijri::ToGregorian(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year)
 {
 sal_Int32 nmonth;
-//double dayfraction;
 double jday;
-//sal_Int32 dayint;
 
 if ( *year < 0 ) (*year)++;
 

[Libreoffice-commits] core.git: basic/source

[Julien Nabet (via logerrit)]

 basic/source/runtime/methods.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit ccfeef1a48f5add83e443afd6664f40df59381b4
Author: Julien Nabet 
AuthorDate: Wed Nov 17 22:19:58 2021 +0100
Commit: Julien Nabet 
CommitDate: Thu Nov 18 10:01:11 2021 +0100

tdf#145725: document about VBASupport+RGB (no bug here)

Change-Id: I1a90509b7e5481bcf811f19889688c767c32e46b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125430
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index b98615cb66a6..7dfde6184b0d 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4072,6 +4072,11 @@ void SbRtl_RGB(StarBASIC *, SbxArray & rPar, bool)
 
 SbiInstance* pInst = GetSbData()->pInst;
 bool bCompatibility = ( pInst && pInst->IsCompatibility() );
+// See discussion in tdf#145725, here's the quotation from a link 
indicated in the bugtracker
+// which explains why we need to manage RGB differently according to VB 
compatibility
+// "In other words, the individual color components are stored in the 
opposite order one would expect.
+//  VB stores the red color component in the low-order byte of the long 
integer's low-order word,
+//  the green color in the high-order byte of the low-order word, and the 
blue color in the low-order byte of the high-order word"
 if( bCompatibility )
 {
 nRGB   = (nBlue << 16) | (nGreen << 8) | nRed;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/cctrl/checklistmenu.cxx |9 -
 sc/source/ui/inc/checklistmenu.hxx   |5 +
 sc/source/ui/view/gridwin.cxx|6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit f0e816412c386de976228b2232c23c31fd7f2d2c
Author: Caolán McNamara 
AuthorDate: Wed Nov 17 15:20:33 2021 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Nov 18 09:59:10 2021 +0100

tdf#142420 color menu should be a child of the autofilter, not a sibling

which is why it doesn't appear at all under wayland. This should also
get it positioned better rather than using a fixed pixel offset.

Change-Id: I9a4193c27b4172469cea3d980c86cff9ca701ca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125360
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 9be4712ce2e0..7e4f1b9fbfdc 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -278,6 +278,13 @@ void ScCheckListMenuControl::queueCloseSubMenu()
 maCloseTimer.maTimer.Start();
 }
 
+tools::Rectangle ScCheckListMenuControl::GetSubMenuParentRect()
+{
+if (!mxMenu->get_selected(mxScratchIter.get()))
+return tools::Rectangle();
+return mxMenu->get_row_area(*mxScratchIter);
+}
+
 void ScCheckListMenuControl::launchSubMenu(bool bSetMenuPos)
 {
 ScCheckListMenuWindow* pSubMenu = maOpenTimer.mpSubMenu;
@@ -287,7 +294,7 @@ void ScCheckListMenuControl::launchSubMenu(bool bSetMenuPos)
 if (!mxMenu->get_selected(mxScratchIter.get()))
 return;
 
-tools::Rectangle aRect = mxMenu->get_row_area(*mxScratchIter);
+tools::Rectangle aRect = GetSubMenuParentRect();
 ScCheckListMenuControl& rSubMenuControl = pSubMenu->get_widget();
 rSubMenuControl.StartPopupMode(aRect, FloatWinPopupFlags::Right);
 if (bSetMenuPos)
diff --git a/sc/source/ui/inc/checklistmenu.hxx 
b/sc/source/ui/inc/checklistmenu.hxx
index 5bddd4490ae8..427f29c3f7d3 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -178,6 +178,11 @@ public:
  */
 void terminateAllPopupMenus();
 
+/**
+ * Get the area of the active row. Suitable as the parent rectangle
+ * argument for Executing a popup
+*/
+tools::Rectangle GetSubMenuParentRect();
 private:
 
 std::vector maMenuItems;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index e9f963dcaa06..05d75755aecb 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -961,9 +961,9 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode 
eMode)
 }
 i++;
 }
-Point pos(mpAutoFilterPopup->GetPosPixel());
-pos.Move(150, 0);
-sal_uInt16 nSelected = pColorMenu->Execute(this, pos);
+
+tools::Rectangle aRect = rControl.GetSubMenuParentRect();
+sal_uInt16 nSelected = pColorMenu->Execute(mpAutoFilterPopup, 
aRect, PopupMenuFlags::ExecuteRight);
 pColorMenu.disposeAndClear();
 rControl.terminateAllPopupMenus();
 

[Libreoffice-commits] core.git: jvmfwk/distributions jvmfwk/plugins

[Stephan Bergmann (via logerrit)]

 jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml |3 ---
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml   |3 ---
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml  |3 ---
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml |3 ---
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |3 ---
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx   |1 -
 6 files changed, 16 deletions(-)

New commits:
commit af9ae2d6a968656208528144e5f01b17b383126c
Author: Stephan Bergmann 
AuthorDate: Wed Nov 17 15:03:56 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 18 09:48:53 2021 +0100

There was a typo in the AdoptOpenJDK java.vendor property value

...ever since 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support 
AdoptOpenJDK":
At least the old AdoptOpenJDK 1.8.0_275 I had lying around on macOS 
reported it
as "AdoptOpenJDK", not "AdoptOpenJdk".  But instead of fixing all 
occurences of
"AdoptOpenJdk", we can just as well get rid of that vendor listing 
completely
now after 3d27b2fa9c5a03f78e5145377402f8a88e3da1be "tdf#124503: Support JRE
installations with unknown java.vendor property" and
3460c16d7f749d8d2a59d8b927df5ec31f64a083 "Make getVersionInformation always
return a VersionInfo ...even for JREs not listed in javavendors.xml, making 
it
default to a VersionInfo with sMinVersion = "1.8.0".  (For a rationale for 
not
updating the  elements of the modified
jvmfwk/distributions/OpenOfficeorg/javavendors_*.xml see the commit message 
of
95c38f6d77f1cb6ff3dc229c5e7130b2e732891d "Drop support for dead GNU Java".)

Change-Id: Iea34914201f604a0665a86dd07724628fa021c90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125402
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 0b41b60a9cab..b7776db5886b 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -28,8 +28,5 @@
 
   1.8.0
 
-
-  1.8.0
-
   
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 22f73a7dc6bb..09fcf373329e 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -37,9 +37,6 @@
 
   1.8.0
 
-
-  1.8.0
-
 
   1.8.0
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 23d6485105c8..a10e366f5598 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -31,9 +31,6 @@
 
   1.8.0
 
-
-  1.8.0
-
 
   1.8.0
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 4e721521b2df..9eab9d832a8f 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -25,8 +25,5 @@
 
   1.8.0
 
-
-  1.8.0
-
   
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 1e2e1f060c5d..d37db0a16544 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -31,9 +31,6 @@
 
   1.8.0
 
-
-  1.8.0
-
 
   1.8.0
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 380a98f8e6cb..96cc051675f9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -37,7 +37,6 @@ VendorSupportMapEntry const gVendorMap[] ={
 #endif
 VENDOR_MAP_ENTRY("Sun Microsystems Inc."),
 VENDOR_MAP_ENTRY("Oracle Corporation"),
-VENDOR_MAP_ENTRY("AdoptOpenJdk"),
 VENDOR_MAP_ENTRY("Amazon.com Inc."),
 VENDOR_MAP_ENTRY("Azul Systems, Inc."),
 #ifndef MACOSX

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/qa sc/source

[Luboš Luňák (via logerrit)]

 sc/qa/unit/data/functions/spreadsheet/fods/vlookup2.fods |   22 +++
 sc/source/core/data/table3.cxx   |9 --
 2 files changed, 11 insertions(+), 20 deletions(-)

New commits:
commit 4967ac966be3bc84e5db210f6d5d96d45c877db7
Author: Luboš Luňák 
AuthorDate: Tue Nov 16 01:30:24 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 18 09:48:56 2021 +0100

revert "vlookup - optimize SC_EQUAL and NOT_EQUAL." (tdf#139612)

That commit breaks lookup when the  "Search criteria = and <> must
apply to whole cells" option is disabled, as it enforces whole cell
checking regardless of the option. Given that the option is enabled
by default in LO ('SearchCriteria' in Calc.xcs) and it's what
MSOffice does as well, and this default gives good performance
regardless of the option, I don't understand the purpose
of the commit. Possibly it was based on a document where somebody
disabled the option and then indeed got worse performance.
Solution: Don't do that :).

This reverts the code parts of a953fa1c0f6a40a08859570516c511f3a841 .
The test I've kept but switched to ensure that partial matching
does work if the option to match whole cells is disabled. I've
also changed the tooltip for the option to mention performance
and not suggest that off is the default.

7.2: UI string change not included.

Change-Id: I56d7b6e7b8e9f0622f7ad6d447daf56c3b705a7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125267
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-by: Luboš Luňák 
(cherry picked from commit 8dec2a98ce29251936cd45ebf864a89ff767ee50)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125350
Tested-by: Luboš Luňák 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/unit/data/functions/spreadsheet/fods/vlookup2.fods 
b/sc/qa/unit/data/functions/spreadsheet/fods/vlookup2.fods
index d47779d928a1..fd228881a7cb 100644
--- a/sc/qa/unit/data/functions/spreadsheet/fods/vlookup2.fods
+++ b/sc/qa/unit/data/functions/spreadsheet/fods/vlookup2.fods
@@ -1017,14 +1017,14 @@
   TRUE
  
  
-  VLOOKUP tests that ensure there is no partial matching of cell 
contents
+  VLOOKUP tests that ensure there is partial matching of cell 
contents
  
 
 
  
  
  
-  even though the document option of “search on whole cell” is 
turned off.
+  when the document option of “search on whole cell” is turned 
off.
  
 
 
@@ -1095,10 +1095,10 @@
  
   #N/A
  
- 
-  #N/A
+ 
+  2
  
- 
+ 
   TRUE
  
  
@@ -1122,10 +1122,10 @@
  
   #N/A
  
- 
-  #N/A
+ 
+  2
  
- 
+ 
   TRUE
  
  
@@ -1149,10 +1149,10 @@
  
   #N/A
  
- 
-  #N/A
+ 
+  2
  
- 
+ 
   TRUE
  
  
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index d315de4768cb..d57f405111a8 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2761,11 +2761,6 @@ public:
 
 if (nIndex < 0)
 nStrPos = -1;
-else if (rEntry.eOp == SC_EQUAL ||
- rEntry.eOp == SC_NOT_EQUAL)
-{
-nStrPos = pCellStr == pQuer ? 0 : -1;
-}
 else
 { // OUString::indexOf
 nStrPos = rtl_ustr_indexOfStr_WithLength(
@@ -2797,14 +2792,10 @@ public:
 switch (rEntry.eOp)
 {
 case SC_EQUAL:
-bOk = ( nStrPos == 0 );
-break;
 case SC_CONTAINS:
 bOk = ( nStrPos != -1 );
 break;
 case SC_NOT_EQUAL:
-bOk = ( nStrPos != 0 );
-break;
 case SC_DOES_NOT_CONTAIN:
 bOk = ( nStrPos == -1 );
 break;

[Libreoffice-commits] core.git: include/svx sd/source svx/source

[Sarper Akdemir (via logerrit)]

 include/svx/ColorSets.hxx|4 
 sd/source/ui/inc/unokywds.hxx|1 +
 sd/source/ui/unoidl/unomodel.cxx |   25 +
 svx/source/styles/ColorSets.cxx  |   32 
 4 files changed, 62 insertions(+)

New commits:
commit cd5c8e5a99f56d5af53b69dcb925f3aed77a815d
Author: Sarper Akdemir 
AuthorDate: Tue Sep 7 10:14:52 2021 +0300
Commit: Miklos Vajna 
CommitDate: Thu Nov 18 09:00:59 2021 +0100

introduce XColorSetsManager interface

[ Miklos: rather go with a beans::PropertyValues-based interface to
allow extending this incrementally, without an API change. This allows
getting / setting a per-document theme via the UNO API, but the concept
from the original commit is unchanged. ]

(cherry picked from commit 3f1bca8b4f451fa30bf341116390738c456d651f,
from the feature/themesupport2 branch)

Change-Id: I24be34a5a7b68549b21a6cd55144901d4fe2c5f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125436
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index eee992da94b5..e6c9f1b4e7ee 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -85,6 +85,10 @@ public:
 const OUString& GetName() const;
 
 void dumpAsXml(xmlTextWriterPtr pWriter) const;
+
+void ToAny(css::uno::Any& rVal) const;
+
+static std::unique_ptr FromAny(const css::uno::Any& rVal);
 };
 
 } // end of namespace svx
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 13a4cd4dd258..7b078c11410b 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -59,6 +59,7 @@ inline constexpr OUStringLiteral sUNO_Prop_BookmarkURL = 
u"BookmarkURL";
 inline constexpr OUStringLiteral sUNO_Prop_RuntimeUID = u"RuntimeUID";
 inline constexpr OUStringLiteral sUNO_Prop_HasValidSignatures = 
u"HasValidSignatures";
 inline constexpr OUStringLiteral sUNO_Prop_InteropGrabBag = u"InteropGrabBag";
+inline constexpr OUStringLiteral sUNO_Prop_Theme = u"Theme";
 
 // view settings
 inline constexpr OUStringLiteral sUNO_View_ViewId = u"ViewId";
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index d4304815519f..e4b11eea33b5 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -125,6 +125,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::cppu;
 using namespace ::com::sun::star;
@@ -197,6 +198,7 @@ const sal_uInt16 WID_MODEL_HASVALIDSIGNATURES = 11;
 const sal_uInt16 WID_MODEL_DIALOGLIBS = 12;
 const sal_uInt16 WID_MODEL_FONTS  = 13;
 const sal_uInt16 WID_MODEL_INTEROPGRABBAG = 14;
+const sal_uInt16 WID_MODEL_THEME = 15;
 
 static const SvxItemPropertySet* ImplGetDrawModelPropertySet()
 {
@@ -217,6 +219,7 @@ static const SvxItemPropertySet* 
ImplGetDrawModelPropertySet()
 { sUNO_Prop_HasValidSignatures,   WID_MODEL_HASVALIDSIGNATURES, 
::cppu::UnoType::get(),  
beans::PropertyAttribute::READONLY, 0},
 { u"Fonts",WID_MODEL_FONTS,  
cppu::UnoType>::get(), 
beans::PropertyAttribute::READONLY, 0},
 { sUNO_Prop_InteropGrabBag,   WID_MODEL_INTEROPGRABBAG, 
cppu::UnoType>::get(),   0, 0},
+{ sUNO_Prop_Theme,WID_MODEL_THEME,  
cppu::UnoType>::get(),   0, 0},
 { u"", 0, css::uno::Type(), 0, 0 }
 };
 static SvxItemPropertySet aDrawModelPropertySet_Impl( 
aDrawModelPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
@@ -1248,6 +1251,13 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( 
const OUString& aPropertyNam
 case WID_MODEL_INTEROPGRABBAG:
 setGrabBagItem(aValue);
 break;
+case WID_MODEL_THEME:
+{
+SdrModel& rModel = getSdrModelFromUnoModel();
+std::unique_ptr pTheme = 
svx::Theme::FromAny(aValue);
+rModel.SetTheme(std::move(pTheme));
+}
+break;
 default:
 throw beans::UnknownPropertyException( aPropertyName, 
static_cast(this));
 }
@@ -1368,6 +1378,21 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( 
const OUString& Property
 case WID_MODEL_INTEROPGRABBAG:
 getGrabBagItem(aAny);
 break;
+case WID_MODEL_THEME:
+{
+SdrModel& rModel = getSdrModelFromUnoModel();
+svx::Theme* pTheme = rModel.GetTheme();
+if (pTheme)
+{
+pTheme->ToAny(aAny);
+}
+else
+{
+beans::PropertyValues aValues;
+aAny <<= aValues;
+}
+break;
+}
 default:
 throw beans::UnknownPropertyException( PropertyName, 
static_