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

[Mike Kaganski (via logerrit)]

 desktop/source/app/langselect.cxx |   20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

New commits:
commit cbcec4425e04e3614a2025b49fdc221216ac51d3
Author: Mike Kaganski 
AuthorDate: Fri Feb 12 07:45:22 2021 +0100
Commit: Mike Kaganski 
CommitDate: Mon Feb 15 09:26:00 2021 +0100

tdf#121245: also set ooLocale when language is set by command line

ooLocale is re-written in each invocation of langselect::prepareLocale
from Desktop::Init; previously an exception was when it was set by command
line. This special treatment was from initial '--language' implementation
in commit d47dd2bf33b0a2a9a5251a871bb7fe0573724274.
The problem here is this setting is the fallback for multiple code paths,
so many UI elements got language from old ooLocale data in that case.
This setting is re-written every time the program is started, so it should
be no harm in writing it also in command line case.

Alternatively we could try to fix all places to use configured system UI
language from MsLangId instead, or to create a backend layer for ooLocale
that itself uses that.

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

diff --git a/desktop/source/app/langselect.cxx 
b/desktop/source/app/langselect.cxx
index 711d567d2063..2958ed8786b5 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -93,13 +93,9 @@ bool prepareLocale() {
 }
 }
 }
-bool cmdLanguage = false;
 if (locale.isEmpty()) {
 locale = getInstalledLocaleForLanguage(
 inst, Desktop::GetCommandLineArgs().GetLanguage());
-if (!locale.isEmpty()) {
-cmdLanguage = true;
-}
 }
 if (locale.isEmpty()) {
 locale = getInstalledLocaleForSystemUILanguage(inst, true);
@@ -115,15 +111,13 @@ bool prepareLocale() {
 css::configuration::theDefaultProvider::get(
 comphelper::getProcessComponentContext()),
 css::uno::UNO_QUERY_THROW)->setLocale(tag.getLocale(false));
-if (!cmdLanguage) {
-try {
-std::shared_ptr batch(
-comphelper::ConfigurationChanges::create());
-officecfg::Setup::L10N::ooLocale::set(locale, batch);
-batch->commit();
-} catch (const css::uno::Exception &) {
-TOOLS_WARN_EXCEPTION("desktop.app", "ignoring");
-}
+try {
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Setup::L10N::ooLocale::set(locale, batch);
+batch->commit();
+} catch (const css::uno::Exception &) {
+TOOLS_WARN_EXCEPTION("desktop.app", "ignoring");
 }
 MsLangId::setConfiguredSystemUILanguage(tag.getLanguageType(false));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ww8export2.mk

[Mike Kaganski (via logerrit)]

 sw/CppunitTest_sw_ww8export2.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit d3fdab081863f4a3631319b5af0ca74b98665d4c
Author: Mike Kaganski 
AuthorDate: Mon Feb 15 08:35:41 2021 +0100
Commit: Mike Kaganski 
CommitDate: Mon Feb 15 09:41:54 2021 +0100

Missing dependency

Fixes "GpgME not installed correctly" at
'make CppunitTest_sw_ww8export2' after 'make clean'.
See commit 5b66a038701241e0b9fa3a339acbd74f9ca4cf92.

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

diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk
index a6ecae976280..3737da6e8df7 100644
--- a/sw/CppunitTest_sw_ww8export2.mk
+++ b/sw/CppunitTest_sw_ww8export2.mk
@@ -63,4 +63,11 @@ $(eval $(call 
gb_CppunitTest_use_configuration,sw_ww8export2))
 # TIFFReader from Library_gie, which is loaded dynamically in 
vcl/source/filter/graphicfilter.cxx:
 $(call gb_CppunitTest_get_target,sw_ww8export2): $(call 
gb_Library_get_target,gie)
 
+ifeq ($(OS),WNT)
+# gpgme-w32spawn.exe is needed in workdir/LinkTarget/Executable
+$(eval $(call gb_CppunitTest_use_packages,sw_ww8export2,\
+$(call gb_Helper_optional,GPGMEPP,gpgmepp)\
+))
+endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - vcl/source

[Tomaž Vajngerl (via logerrit)]

 vcl/source/filter/FilterConfigCache.cxx |   30 -
 vcl/source/filter/FilterConfigCache.hxx |3 
 vcl/source/filter/graphicfilter.cxx |  187 
 3 files changed, 220 deletions(-)

New commits:
commit 0c1734d8978601b9b4487e54db36fbc956b26ec4
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 15 17:49:34 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Feb 15 17:49:34 2021 +0900

vcl: clean-up code used for loading of external graphic filters

All graphic filters have been moved into vcl, so there is no need
to load an external library that contained graphic filters, so
this code can be removed.

Change-Id: Iac4f8dd78464e142f50837a55edd2d25720b8c13

diff --git a/vcl/source/filter/FilterConfigCache.cxx 
b/vcl/source/filter/FilterConfigCache.cxx
index 411d44a5801d..40734b33fb64 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -55,11 +55,6 @@ const char* 
FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameL
 IMP_EPS, EXP_EPS, nullptr
 };
 
-const char* 
FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameList[] =
-{
-   nullptr
-};
-
 void FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const 
OUString& rUserDataEntry )
 {
 bIsPixelFormat = bIsInternalFilter = false;
@@ -78,16 +73,6 @@ void 
FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUString
 if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
 bIsInternalFilter = true;
 }
-if ( !bIsInternalFilter )
-{
-for ( pPtr = ExternalPixelFilterNameList; *pPtr && !bIsPixelFormat; 
pPtr++ )
-{
-if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
-bIsPixelFormat = true;
-}
-sExternalFilterName = sFilterName;
-sFilterName = SVLIBRARY("gie");
-}
 }
 
 OUString FilterConfigCache::FilterConfigCacheEntry::GetShortName()
@@ -400,21 +385,6 @@ OUString FilterConfigCache::GetImportFilterTypeName( 
sal_uInt16 nFormat )
 return OUString();
 }
 
-OUString FilterConfigCache::GetExternalFilterName(sal_uInt16 nFormat, bool 
bExport)
-{
-if (bExport)
-{
-if (nFormat < aExport.size())
-return aExport[nFormat].sExternalFilterName;
-}
-else
-{
-if (nFormat < aImport.size())
-return aImport[nFormat].sExternalFilterName;
-}
-return OUString();
-}
-
 OUString FilterConfigCache::GetImportWildcard(sal_uInt16 nFormat, sal_Int32 
nEntry)
 {
 OUString aWildcard( GetImportFormatExtension( nFormat, nEntry ) );
diff --git a/vcl/source/filter/FilterConfigCache.hxx 
b/vcl/source/filter/FilterConfigCache.hxx
index 4860bbc6f38b..40cc82887257 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -32,7 +32,6 @@ class FilterConfigCache
 OUString sType;
 std::vector< OUString > lExtensionList;
 OUString sUIName;
-OUString sExternalFilterName;
 
 OUString sMediaType;
 OUString sFilterType;
@@ -49,7 +48,6 @@ class FilterConfigCache
 
 static const char* InternalPixelFilterNameList[];
 static const char* InternalVectorFilterNameList[];
-static const char* ExternalPixelFilterNameList[];
 };
 
 
@@ -77,7 +75,6 @@ public:
 OUStringGetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
 OUStringGetImportFilterType( sal_uInt16 nFormat );
 OUStringGetImportFilterTypeName( sal_uInt16 nFormat );
-OUStringGetExternalFilterName(sal_uInt16 nFormat, bool bExport);
 
 
 boolIsImportInternalFilter( sal_uInt16 nFormat );
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 43851e9a56b5..55c544b008e6 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -599,131 +599,6 @@ static Graphic ImpGetScaledGraphic( const Graphic& 
rGraphic, FilterConfigItem& r
 return aGraphic;
 }
 
-static OUString ImpCreateFullFilterPath( const OUString& rPath, 
std::u16string_view rFilterName )
-{
-OUString aPathURL;
-
-::osl::FileBase::getFileURLFromSystemPath( rPath, aPathURL );
-aPathURL += "/";
-
-OUString aSystemPath;
-::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath );
-aSystemPath += rFilterName;
-
-return aSystemPath;
-}
-
-namespace {
-
-class ImpFilterLibCache;
-
-struct ImpFilterLibCacheEntry
-{
-ImpFilterLibCacheEntry* mpNext;
-#ifndef DISABLE_DYNLOADING
-osl::Module maLibrary;
-#endif
-OUStringmaFiltername;
-OUStringmaFormatName;
-PFilterCall mpfnImport;
-
-ImpFilterLibCacheEntry(const OUString& rPathname, const OUString& 
rFiltername, const OUString& rFormatName);
-booloperator==( std::u16string_view rFiltername ) 
const { return maFiltername == rFiltername; }
-
- 

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - vcl/source

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit 52284530ca32fb7eb24f30b7beb22f65c711d836
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 15 17:49:34 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Feb 15 18:02:25 2021 +0900

vcl: clean-up code used for loading of external graphic filters

All graphic filters have been moved into vcl, so there is no need
to load an external library that contained graphic filters, so
this code can be removed.

Change-Id: Iac4f8dd78464e142f50837a55edd2d25720b8c13

diff --git a/vcl/source/filter/FilterConfigCache.cxx 
b/vcl/source/filter/FilterConfigCache.cxx
index 411d44a5801d..482b8fed2ca0 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -55,39 +55,18 @@ const char* 
FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameL
 IMP_EPS, EXP_EPS, nullptr
 };
 
-const char* 
FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameList[] =
-{
-   nullptr
-};
-
 void FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const 
OUString& rUserDataEntry )
 {
-bIsPixelFormat = bIsInternalFilter = false;
+bIsPixelFormat = false;
 sFilterName = rUserDataEntry;
 const char** pPtr;
-for ( pPtr = InternalPixelFilterNameList; *pPtr && !bIsInternalFilter; 
pPtr++ )
+for ( pPtr = InternalPixelFilterNameList; *pPtr; pPtr++ )
 {
 if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
 {
-bIsInternalFilter = true;
 bIsPixelFormat = true;
 }
 }
-for ( pPtr = InternalVectorFilterNameList; *pPtr && !bIsInternalFilter; 
pPtr++ )
-{
-if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
-bIsInternalFilter = true;
-}
-if ( !bIsInternalFilter )
-{
-for ( pPtr = ExternalPixelFilterNameList; *pPtr && !bIsPixelFormat; 
pPtr++ )
-{
-if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
-bIsPixelFormat = true;
-}
-sExternalFilterName = sFilterName;
-sFilterName = SVLIBRARY("gie");
-}
 }
 
 OUString FilterConfigCache::FilterConfigCacheEntry::GetShortName()
@@ -400,21 +379,6 @@ OUString FilterConfigCache::GetImportFilterTypeName( 
sal_uInt16 nFormat )
 return OUString();
 }
 
-OUString FilterConfigCache::GetExternalFilterName(sal_uInt16 nFormat, bool 
bExport)
-{
-if (bExport)
-{
-if (nFormat < aExport.size())
-return aExport[nFormat].sExternalFilterName;
-}
-else
-{
-if (nFormat < aImport.size())
-return aImport[nFormat].sExternalFilterName;
-}
-return OUString();
-}
-
 OUString FilterConfigCache::GetImportWildcard(sal_uInt16 nFormat, sal_Int32 
nEntry)
 {
 OUString aWildcard( GetImportFormatExtension( nFormat, nEntry ) );
@@ -423,11 +387,6 @@ OUString FilterConfigCache::GetImportWildcard(sal_uInt16 
nFormat, sal_Int32 nEnt
 return aWildcard;
 }
 
-bool FilterConfigCache::IsImportInternalFilter( sal_uInt16 nFormat )
-{
-return (nFormat < aImport.size()) && aImport[ nFormat ].bIsInternalFilter;
-}
-
 OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat )
 {
 if( nFormat < aExport.size() )
@@ -526,11 +485,6 @@ OUString FilterConfigCache::GetExportWildcard( sal_uInt16 
nFormat, sal_Int32 nEn
 return aWildcard;
 }
 
-bool FilterConfigCache::IsExportInternalFilter( sal_uInt16 nFormat )
-{
-return (nFormat < aExport.size()) && aExport[ nFormat ].bIsInternalFilter;
-}
-
 bool FilterConfigCache::IsExportPixelFormat( sal_uInt16 nFormat )
 {
 return (nFormat < aExport.size()) && aExport[ nFormat ].bIsPixelFormat;
diff --git a/vcl/source/filter/FilterConfigCache.hxx 
b/vcl/source/filter/FilterConfigCache.hxx
index 4860bbc6f38b..e6b0258bf803 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -32,7 +32,6 @@ class FilterConfigCache
 OUString sType;
 std::vector< OUString > lExtensionList;
 OUString sUIName;
-OUString sExternalFilterName;
 
 OUString sMediaType;
 OUString sFilterType;
@@ -41,7 +40,6 @@ class FilterConfigCache
 
 // user data
 OUStringsFilterName;
-boolbIsInternalFilter   : 1;
 boolbIsPixelFormat  : 1;
 
 voidCreateFilterName( const OUString& rUserDataEntry );
@@ -49,7 +47,6 @@ class FilterConfigCache
 
 static const char* InternalPixelFilterNameList[];
 static const char* InternalVectorFilterNameList[];
-static const char* ExternalPixelFilterNameList[];
 };
 
 
@@ -77,7 +74,6 @@ public:
 OUStringGetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
 OUStringGetImportFilterType( sal_uInt16 nFormat );
 OUStringGetImportFilterTypeName( sal_uInt16 nFormat );
-OUStringGetExternalFilterName(sal_uInt16 nFormat, bool bExport);
 
 
 boolIsImport

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - editeng/source

[Julien Nabet (via logerrit)]

 editeng/source/editeng/editview.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit cbb0f58ef18f9a6bc135c4085f519c95e6fb663d
Author: Julien Nabet 
AuthorDate: Sun Feb 14 21:17:10 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Feb 15 10:12:11 2021 +0100

tdf#140414: fix Crash pressing Ctrl-K in input line in Calc

3  0x7ff38b819d73 in vcl::Window::GetPointerPosPixel() (this=0x0) at 
vcl/source/window/mouse.cxx:552
4  0x7ff3925fe7c1 in EditView::GetFieldUnderMousePointer(int&, int&) 
const (this=0x4c37160, nPara=@0x7ffd982b4f44: 0, nPos=@0x7ffd982b4f40: 
57752960) at editeng/source/editeng/editview.cxx:1325
5  0x7ff3925fe74a in EditView::GetFieldUnderMousePointer() const 
(this=0x4c37160) at editeng/source/editeng/editview.cxx:1315
6  0x7ff3925fec4c in EditView::GetFieldAtCursor() const 
(this=0x4c37160) at editeng/source/editeng/editview.cxx:1384
7  0x7ff377f6aa55 in ScEditShell::GetURLField() (this=0x37a31a0) at 
sc/source/ui/view/editsh.cxx:833

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

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 35965e1e276a..8e7c62f224e6 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1273,7 +1273,10 @@ const SvxFieldItem* EditView::GetField( const Point& 
rPos, sal_Int32* pPara, sal
 
 const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_Int32& nPara, 
sal_Int32& nPos ) const
 {
-Point aPos = pImpEditView->GetWindow()->GetPointerPosPixel();
+auto pWin = pImpEditView->GetWindow();
+if (!pWin)
+return nullptr;
+Point aPos = pWin->GetPointerPosPixel();
 aPos = pImpEditView->GetWindow()->PixelToLogic( aPos );
 return GetField( aPos, &nPara, &nPos );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 editeng/source/editeng/editview.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3aad3955650edb543d74a4c1e3ebdb1f4d3940b7
Author: Julien Nabet 
AuthorDate: Sun Feb 14 21:17:10 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Feb 15 10:13:04 2021 +0100

tdf#140414: fix Crash pressing Ctrl-K in input line in Calc

3  0x7ff38b819d73 in vcl::Window::GetPointerPosPixel() (this=0x0) at 
vcl/source/window/mouse.cxx:552
4  0x7ff3925fe7c1 in EditView::GetFieldUnderMousePointer(int&, int&) 
const (this=0x4c37160, nPara=@0x7ffd982b4f44: 0, nPos=@0x7ffd982b4f40: 
57752960) at editeng/source/editeng/editview.cxx:1325
5  0x7ff3925fe74a in EditView::GetFieldUnderMousePointer() const 
(this=0x4c37160) at editeng/source/editeng/editview.cxx:1315
6  0x7ff3925fec4c in EditView::GetFieldAtCursor() const 
(this=0x4c37160) at editeng/source/editeng/editview.cxx:1384
7  0x7ff377f6aa55 in ScEditShell::GetURLField() (this=0x37a31a0) at 
sc/source/ui/view/editsh.cxx:833

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

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 0434b06703b2..1a3f17e61d34 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1322,7 +1322,10 @@ const SvxFieldItem* EditView::GetField( const Point& 
rPos, sal_Int32* pPara, sal
 
 const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_Int32& nPara, 
sal_Int32& nPos ) const
 {
-Point aPos = pImpEditView->GetWindow()->GetPointerPosPixel();
+auto pWin = pImpEditView->GetWindow();
+if (!pWin)
+return nullptr;
+Point aPos = pWin->GetPointerPosPixel();
 aPos = pImpEditView->GetWindow()->PixelToLogic( aPos );
 return GetField( aPos, &nPara, &nPos );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - emfio/qa

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

 emfio/qa/cppunit/emf/EmfImportTest.cxx |   17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

New commits:
commit ed6d37c3a24dd238cbf7fef47068318599fcfcb3
Author: Luboš Luňák 
AuthorDate: Thu Feb 11 16:24:18 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 15 10:17:29 2021 +0100

fix test for tdf#137413

The test tested for the topleft corner to be transparent and not black,
but the bitmap has a black outline, so the corner actually should be
black, unlike the rest of the bitmap. I have no idea how the test
could have possibly passed (and those #if tests indicate that it
correctly failed with most drawing backends). What apparently enabled
this to pass was commit 828504974d70111e, which made the drawing
use DrawTransformedBitmap() implementation in the VCL backends,
and the Cairo one apparently mishandles it. Reverting 828504974d70111e
made the test fail.
This commit fixes (and simplifies) the test.

Change-Id: I1560849d683558abbe0cde816c4505b9824a0692
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110769
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit f52c5bea7775ac07cfacc232f0979a03bbdf9aa7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110778

diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx 
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index e8d4833e6424..e81a37d48487 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -26,7 +26,6 @@
 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -383,19 +382,13 @@ void Test::TestPdfInEmf()
 // height was only 5cm, so it looked blurry.
 CPPUNIT_ASSERT_EQUAL(14321.0, pVectorGraphicData->getSizeHint().getY());
 
-#if !defined(WNT) && !defined(MACOSX)
-// Hmm, manual testing on Windows looks OK.
-BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
-AlphaMask aMask = aBitmapEx.GetAlpha();
-Bitmap::ScopedReadAccess pAccess(aMask);
-Color aColor(pAccess->GetPixel(0, 0));
 // Without the accompanying fix in place, this test would have failed with:
-// - Expected: 220
+// - Expected: 255
 // - Actual  : 0
-// i.e. the pixel at the top left corner was entirely opaque, while it 
should be mostly
-// transparent.
-CPPUNIT_ASSERT_EQUAL(static_cast(220), aColor.GetBlue());
-#endif
+// i.e. the pixel in the center was entirely opaque, while it should be 
transparent.
+BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
+Size size = aBitmapEx.GetSizePixel();
+CPPUNIT_ASSERT_EQUAL(static_cast(255), 
aBitmapEx.GetTransparency(size.Width() / 2, size.Height() / 2));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/xmlsec

[Aron Budea (via logerrit)]

 external/xmlsec/UnpackedTarball_xmlsec.mk |1 +
 external/xmlsec/windows7.patch.1  |   25 +
 2 files changed, 26 insertions(+)

New commits:
commit 9b61c811e43991e61505d32776a59c03c00dc58a
Author: Aron Budea 
AuthorDate: Sat Feb 13 18:08:36 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 15 10:18:19 2021 +0100

tdf#140234: Fix xmlsec on Windows 7

Apply 21bbcb04b62352331a15a0b8463ebb27a9b858bc from upstream
locally.

Change-Id: Icb1ca245ebb6453040fbce6da54d13086970b0e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110846
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk 
b/external/xmlsec/UnpackedTarball_xmlsec.mk
index 3ad978cdb829..412359b6d3fa 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -8,6 +8,7 @@
 #
 
 xmlsec_patches :=
+xmlsec_patches += windows7.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git a/external/xmlsec/windows7.patch.1 b/external/xmlsec/windows7.patch.1
new file mode 100644
index ..ccefc96c1c01
--- /dev/null
+++ b/external/xmlsec/windows7.patch.1
@@ -0,0 +1,25 @@
+From 21bbcb04b62352331a15a0b8463ebb27a9b858bc Mon Sep 17 00:00:00 2001
+From: Aleksey Sanin 
+Date: Thu, 12 Nov 2020 11:17:01 -0800
+Subject: [PATCH] Fix DLL loading on windows
+
+---
+ src/dl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dl.c b/src/dl.c
+index e934fe4e..a511df43 100644
+--- a/src/dl.c
 b/src/dl.c
+@@ -148,7 +148,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) {
+ #endif /* XMLSEC_DL_LIBLTDL */
+ 
+ #ifdef XMLSEC_DL_WIN32
+-#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
+ lib->handle = LoadLibraryA((char*)lib->filename);
+ #else
+ LPWSTR wcLibFilename = xmlSecWin32ConvertUtf8ToUnicode(lib->filename);
+-- 
+2.25.1
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Local LO build on Raspberry pi 4b doesn't launch

[Stephan Bergmann]

On 14/02/2021 17:08, julien2412 wrote:

I tried to build master sources on Raspberry pi 4b and finally succeeded
(after several patches).
I used this autogen.input:
CC=clang
CXX=clang++
--enable-compiler-plugins
--enable-ext-nlpsolver
--enable-ext-ct2n
--enable-ext-numbertext
--enable-ext-wiki-publisher
--enable-dbus
--enable-online-update
--enable-werror
--enable-dependency-tracking
--enable-python=fully-internal
--without-system-mariadb
--enable-bundle-mariadb
--enable-symbols
--enable-avahi
--enable-eot
--enable-odk
--with-lang=en-US fr
--with-myspell-dicts

The pb is I can't launch it, I got:
pi@raspberrypi:~/lo/libreoffice/instdir/program $ ./soffice --safe-mode
Application Error

I attached a bt here:
bt.txt


I hesitated to submit a bugtracker because it's building related. But of
course, no pb to submit one.

Any thoughts?


Looks like there's some issue with running the Python interpreter 
in-process.  And you apparently have some extension using old-style, 
active registration of a Python component, which triggers the issue when 
starting soffice.  If you do not want to debug the issue with the Python 
interpreter, I would suggest you make sure you do not have any 
extensions involving Python (likely one of your --enable-ext-* 
configuration options).


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna (via logerrit)]

 sw/source/core/text/guess.cxx  |  192 -
 sw/source/core/text/guess.hxx  |   36 +++
 sw/source/core/text/porrst.cxx |   26 ++---
 sw/source/core/text/porrst.hxx |   18 +--
 4 files changed, 136 insertions(+), 136 deletions(-)

New commits:
commit 162e2f1433cc60b6b572c5c42c59fc3ba0bdbe0f
Author: Miklos Vajna 
AuthorDate: Mon Feb 15 09:06:33 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 15 10:36:19 2021 +0100

sw: prefix members of SwHangingPortion, SwKernPortion, SwTextGuess and ...

... SwTmpEndPortion

See tdf#94879 for motivation.

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

diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 0118f7479f83..8f7d39566973 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -50,7 +50,7 @@ bool IsBlank(sal_Unicode ch) { return ch == CH_BLANK || ch == 
CH_FULL_BLANK || c
 bool SwTextGuess::Guess( const SwTextPortion& rPor, SwTextFormatInfo &rInf,
 const sal_uInt16 nPorHeight )
 {
-nCutPos = rInf.GetIdx();
+m_nCutPos = rInf.GetIdx();
 
 // Empty strings are always 0
 if( !rInf.GetLen() || rInf.GetText().isEmpty() )
@@ -164,24 +164,24 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo &rInf,
 {
 // call GetTextSize with maximum compression (for kanas)
 rInf.GetTextSize( &rSI, rInf.GetIdx(), nMaxLen,
- nMaxComp, nBreakWidth, nMaxSizeDiff );
+ nMaxComp, m_nBreakWidth, nMaxSizeDiff );
 
-if ( ( nBreakWidth <= nLineWidth ) || ( bUnbreakableNumberings && 
rPor.IsNumberPortion() ) )
+if ( ( m_nBreakWidth <= nLineWidth ) || ( bUnbreakableNumberings && 
rPor.IsNumberPortion() ) )
 {
 // portion fits to line
-nCutPos = rInf.GetIdx() + nMaxLen;
+m_nCutPos = rInf.GetIdx() + nMaxLen;
 if( nItalic &&
-(nCutPos >= TextFrameIndex(rInf.GetText().getLength()) ||
+(m_nCutPos >= TextFrameIndex(rInf.GetText().getLength()) ||
   // #i48035# Needed for CalcFitToContent
   // if first line ends with a manual line break
-  rInf.GetText()[sal_Int32(nCutPos)] == CH_BREAK))
-nBreakWidth = nBreakWidth + nItalic;
+  rInf.GetText()[sal_Int32(m_nCutPos)] == CH_BREAK))
+m_nBreakWidth = m_nBreakWidth + nItalic;
 
 // save maximum width for later use
 if ( nMaxSizeDiff )
 rInf.SetMaxWidthDiff( &rPor, nMaxSizeDiff );
 
-nBreakWidth += nLeftRightBorderSpace;
+m_nBreakWidth += nLeftRightBorderSpace;
 
 return true;
 }
@@ -195,14 +195,14 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo &rInf,
 // considering an additional "-" for hyphenation
 if( bHyph )
 {
-nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, nHyphPos, 
rInf.GetCachedVclData().get() );
+m_nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, 
nHyphPos, rInf.GetCachedVclData().get() );
 
 if ( !nHyphPos && rInf.GetIdx() )
 nHyphPos = rInf.GetIdx() - TextFrameIndex(1);
 }
 else
 {
-nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, 
rInf.GetCachedVclData().get() );
+m_nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, 
rInf.GetCachedVclData().get() );
 
 #if OSL_DEBUG_LEVEL > 1
 if ( TextFrameIndex(COMPLETE_STRING) != nCutPos )
@@ -215,25 +215,25 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo &rInf,
 #endif
 }
 
-if( nCutPos > rInf.GetIdx() + nMaxLen )
+if( m_nCutPos > rInf.GetIdx() + nMaxLen )
 {
 // second check if everything fits to line
-nCutPos = nBreakPos = rInf.GetIdx() + nMaxLen - TextFrameIndex(1);
+m_nCutPos = m_nBreakPos = rInf.GetIdx() + nMaxLen - TextFrameIndex(1);
 rInf.GetTextSize( &rSI, rInf.GetIdx(), nMaxLen, nMaxComp,
- nBreakWidth, nMaxSizeDiff );
+ m_nBreakWidth, nMaxSizeDiff );
 
 // The following comparison should always give true, otherwise
 // there likely has been a pixel rounding error in GetTextBreak
-if ( nBreakWidth <= nLineWidth )
+if ( m_nBreakWidth <= nLineWidth )
 {
-if (nItalic && (nBreakPos + TextFrameIndex(1)) >= 
TextFrameIndex(rInf.GetText().getLength()))
-nBreakWidth = nBreakWidth + nItalic;
+if (nItalic && (m_nBreakPos + TextFrameIndex(1)) >= 
TextFrameIndex(rInf.GetText().getLength()))
+m_nBreakWidth = m_nBreakWidth + nItalic;
 
 // save maximum width for later use

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

[Mike Kaganski (via logerrit)]

 include/o3tl/unit_conversion.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 76483d1348792a3d1c4c995ef0132ac79dfbc90f
Author: Mike Kaganski 
AuthorDate: Mon Feb 15 11:37:34 2021 +0300
Commit: Mike Kaganski 
CommitDate: Mon Feb 15 10:45:49 2021 +0100

Fix comments

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

diff --git a/include/o3tl/unit_conversion.hxx b/include/o3tl/unit_conversion.hxx
index e43ecb557789..f377b16e8b10 100644
--- a/include/o3tl/unit_conversion.hxx
+++ b/include/o3tl/unit_conversion.hxx
@@ -50,8 +50,8 @@ enum class Length
 // If other categories of units would be needed (like time), a separate scoped 
enum
 // should be created, respective conversion array prepared in detail 
namespace, and
 // respective md(NewUnit, NewUnit) overload introduced, which would allow using
-// o3tl::convert() and o3tl::convertSanitize() with the new category in a 
type-safe
-// way, without mixing unrelated units.
+// o3tl::convert(), o3tl::convertSaturate() and o3tl::getConversionMulDiv() 
with the
+// new category in a type-safe way, without mixing unrelated units.
 
 namespace detail
 {
@@ -206,7 +206,7 @@ template  constexpr auto convert(N 
n, U from, U to)
 }
 
 // Returns nDefault if intermediate multiplication overflows sal_Int64 (only 
for integral types).
-// On return, bOverflow indicates if overflow happened.
+// On return, bOverflow indicates if overflow happened. nDefault is returned 
when overflow occurs.
 template 
 constexpr auto convert(N n, U from, U to, bool& bOverflow, sal_Int64 nDefault 
= 0)
 {
@@ -214,7 +214,7 @@ constexpr auto convert(N n, U from, U to, bool& bOverflow, 
sal_Int64 nDefault =
 }
 
 // Conversion with saturation (only for integral types). For too large input 
returns SAL_MAX_INT64.
-// When intermediate multiplication would overflow, but otherwise result in in 
sal_Int64 range, the
+// When intermediate multiplication would overflow, but the end result is in 
sal_Int64 range, the
 // precision is decreased because of inversion of multiplication and division.
 template  constexpr auto convertSaturate(N n, U from, 
U to)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source

[Noel Grandin (via logerrit)]

 sfx2/source/doc/SfxDocumentMetaData.cxx |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 6da480d946a7b881ca0cd482db16d8c32b5380ac
Author: Noel Grandin 
AuthorDate: Sun Feb 14 19:25:40 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 15 10:45:48 2021 +0100

tdf#140308 Crash import old OpenOffice template

regression from
commit cfe5a5044845a3fc90e3634e996edb4d85808d3c
sfx2: use the fastparser API when possible

We end up using the OOo2OasisTransformer filter,
which is not fastparser compatible

Bisected with: bibisect-linux64-7.1

Change-Id: I7bd4191f098096034dc8ff368aba4b1ff313ce18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110883
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 228f43f2e3c2896c227f1ea30c5d16231acf66da)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110866

diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx 
b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 578322556b60..36d8dde0d75c 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1765,13 +1766,19 @@ SfxDocumentMetaData::loadFromStorage(
 xMsf->createInstanceWithArgumentsAndContext(
 OUString::createFromAscii(pServiceName), args, m_xContext);
 assert(xFilter);
-css::uno::Reference xDocHandler(xFilter, 
css::uno::UNO_QUERY);
-assert(xDocHandler);
-css::uno::Reference xImp(xDocHandler, 
css::uno::UNO_QUERY);
-assert(xImp);
+css::uno::Reference xFastParser(xFilter, 
css::uno::UNO_QUERY);
+css::uno::Reference xImp(xFilter, 
css::uno::UNO_QUERY_THROW);
 xImp->setTargetDocument(css::uno::Reference(this));
 try {
-xDocHandler->parseStream(input);
+if (xFastParser)
+xFastParser->parseStream(input);
+else
+{
+css::uno::Reference 
xDocHandler(xFilter, css::uno::UNO_QUERY_THROW);
+css::uno::Reference xParser = 
css::xml::sax::Parser::create(m_xContext);
+xParser->setDocumentHandler(xDocHandler);
+xParser->parseStream(input);
+}
 } catch (const css::xml::sax::SAXException &) {
 throw css::io::WrongFormatException(
 "SfxDocumentMetaData::loadFromStorage:"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/control/tabctrl.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0c5adc7926c771fbed932e02df9d8aefebd02694
Author: Caolán McNamara 
AuthorDate: Wed Feb 10 20:37:41 2021 +
Commit: Michael Stahl 
CommitDate: Mon Feb 15 11:15:52 2021 +0100

ImplGetTabRect(ImplTabItem*) variant always returns 0 with default args

so TabControl::GetPageId(const Point& rPos) doesn't work

since...

commit 6540912ae1a570fd8c2318f77b757e07b87c0707
Date:   Sun Jun 16 21:41:31 2019 +

VCL merge most of NotebookbarTabControlBase

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

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 8f75270c237b..bab7684c2f31 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1787,9 +1787,10 @@ sal_uInt16 TabControl::GetPagePos( sal_uInt16 nPageId ) 
const
 
 sal_uInt16 TabControl::GetPageId( const Point& rPos ) const
 {
+Size winSize = Control::GetOutputSizePixel();
 const auto &rList = mpTabCtrlData->maItemList;
-const auto it = std::find_if(rList.begin(), rList.end(), [&rPos, 
this](const auto &item) {
-return 
const_cast(this)->ImplGetTabRect(&item).IsInside(rPos); });
+const auto it = std::find_if(rList.begin(), rList.end(), [&rPos, &winSize, 
this](const auto &item) {
+return const_cast(this)->ImplGetTabRect(&item, 
winSize.Width(), winSize.Height()).IsInside(rPos); });
 return (it != rList.end()) ? it->id() : 0;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Szűcs (via logerrit)]

 sw/qa/extras/ooxmlimport/data/tdf74367_MarginsZeroed.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   15 ++
 writerfilter/source/dmapper/BorderHandler.hxx |1 
 writerfilter/source/dmapper/PageBordersHandler.cxx|5 +++-
 4 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit b35f48d806f9e5ec689eda3828f1e4503644873b
Author: Attila Szűcs 
AuthorDate: Wed Feb 3 16:50:30 2021 +0100
Commit: László Németh 
CommitDate: Mon Feb 15 11:33:10 2021 +0100

tdf#74367 DOCX: fix page margins imported as border padding

Trying to import non-existing "none" borders of w:pgBorders
zeroed page margins, removing their values to border padding.

Note: according to OOXML standard 2.6.10. pgBorders (Page
Borders), "nil" should be treated the same.

Co-authored-by: Tibor Nagy (NISZ)

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

diff --git a/sw/qa/extras/ooxmlimport/data/tdf74367_MarginsZeroed.docx 
b/sw/qa/extras/ooxmlimport/data/tdf74367_MarginsZeroed.docx
new file mode 100644
index ..9b9eb1c43965
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/tdf74367_MarginsZeroed.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index cf9781f00606..16351d9fcb35 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -459,6 +459,21 @@ DECLARE_OOXMLIMPORT_TEST(testN758883, "n758883.docx")
 CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, 
eAnchorType);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf74367_MarginsZeroed, 
"tdf74367_MarginsZeroed.docx")
+{
+// Do not import page borders with 'None' style, or else it will change 
the page margins.
+uno::Reference 
xPropertySet(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+sal_Int32 nValue = 0;
+xPropertySet->getPropertyValue("TopMargin") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2501), nValue);
+xPropertySet->getPropertyValue("RightMargin") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2501), nValue);
+xPropertySet->getPropertyValue("BottomMargin") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2501), nValue);
+xPropertySet->getPropertyValue("LeftMargin") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2501), nValue);
+}
+
 DECLARE_OOXMLIMPORT_TEST(testBnc773061, "bnc773061.docx")
 {
 uno::Reference< text::XTextRange > paragraph = getParagraph( 1 );
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx 
b/writerfilter/source/dmapper/BorderHandler.hxx
index 9e8aa7a62a90..1261416760b3 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -69,6 +69,7 @@ public:
 PropertyMapPtr  getProperties();
 css::table::BorderLine2 getBorderLine();
 sal_Int32   getLineDistance() const { 
return m_nLineDistance;}
+sal_Int32   getLineType() const { return 
m_nLineType;}
 boolgetShadow() const { return 
m_bShadow;}
 void enableInteropGrabBag(const OUString& aName);
 css::beans::PropertyValue getInteropGrabBag(const OUString& aName = 
OUString());
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx 
b/writerfilter/source/dmapper/PageBordersHandler.cxx
index d6a0fdd1f502..89548eb351ee 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -119,7 +119,10 @@ void PageBordersHandler::lcl_sprm( Sprm& rSprm )
 aPgBorder.m_nDistance = pBorderHandler->getLineDistance( );
 aPgBorder.m_ePos = ePos;
 aPgBorder.m_bShadow = pBorderHandler->getShadow();
-m_aBorders.push_back( aPgBorder );
+if (pBorderHandler->getLineType() != 
NS_ooxml::LN_Value_ST_Border_none)
+{
+m_aBorders.push_back( aPgBorder );
+}
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: scripts/git-cherry-gerrit

[Miklos Vajna (via logerrit)]

 scripts/git-cherry-gerrit |   58 --
 1 file changed, 58 deletions(-)

New commits:
commit 94b6c4581988a8c48c0ea8ef49ad1735cf909b70
Author: Miklos Vajna 
AuthorDate: Mon Feb 15 11:35:12 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 15 11:35:12 2021 +0100

git-cherry-gerrit: remove the old bash version

There is a faster python version, let's delete the bash one before some
parallel development would be needed.

Change-Id: I2343d6ce5a0450576edfd8fbcecac32a3951a31a

diff --git a/scripts/git-cherry-gerrit b/scripts/git-cherry-gerrit
deleted file mode 100755
index 9507de2..000
--- a/scripts/git-cherry-gerrit
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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 https://mozilla.org/MPL/2.0/.
-#
-# A version of 'git cherry' that works with change-ids, so it can pair patches
-# even if their patch id changed.
-#
-
-cherry_from=${1}
-cherry_to=${2}
-
-branch_point=${3}
-
-whitelist_file=${4}
-
-if [ -z "$cherry_from" ] ; then
-echo "Usage: git-cherry-gerrit cherry_from cherry_to [branch_point_from] 
[whitelist_file]"
-exit 1;
-fi
-
-merge_base=$(git merge-base $cherry_from $cherry_to)
-
-if [ -z "$branch_point" ] ; then
-branch_point=${merge_base}
-fi
-
-: > /tmp/tohashes
-to_hashes=$(git rev-list ${merge_base}..${cherry_to})
-for hash in ${to_hashes}
-do
-git cat-file commit $hash |grep Change-Id: >> /tmp/tohashes
-done
-
-from_hashes=$(git rev-list ${branch_point}..${cherry_from})
-for hash in ${from_hashes}
-do
-changeid="$(git cat-file commit $hash |grep Change-Id:)"
-if [ -z "$changeid" ]; then
-pretty=`git --no-pager log -1 
--format='format:%h%x09%an%x09%s%x0a' $hash`
-if [ -z "${whitelist_file}" ] || ! grep -q -F "${pretty}" 
"${whitelist_file}"; then
-echo "WARNING: commit '$pretty' has no Change-Id, assuming it 
has to be cherry-picked."
-fi
-continue
-fi
-
-if ! grep -q "$changeid" /tmp/tohashes; then
-pretty=`git --no-pager log -1 
--format='format:%h%x09%an%x09%s%x0a' $hash`
-if [ -z "${whitelist_file}" ] || ! grep -q -F "${pretty}" 
"${whitelist_file}"; then
-git --no-pager log -1 --format='format:%h%x09%an%x09%s%x0a' 
$hash
-fi
-fi
-done
-
-rm -f /tmp/tohashes
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 dbaccess/source/core/api/RowSet.cxx |4 ++--
 dbaccess/source/core/api/tablecontainer.cxx |2 +-
 dbaccess/source/core/dataaccess/ComponentDefinition.cxx |2 +-
 dbaccess/source/core/dataaccess/ContentHelper.cxx   |2 +-
 dbaccess/source/core/dataaccess/ModelImpl.cxx   |4 ++--
 dbaccess/source/core/dataaccess/connection.cxx  |2 +-
 dbaccess/source/core/dataaccess/databasecontext.cxx |4 ++--
 dbaccess/source/core/dataaccess/datasource.cxx  |2 +-
 dbaccess/source/core/dataaccess/definitioncontainer.cxx |2 +-
 dbaccess/source/core/dataaccess/documentdefinition.cxx  |   12 +---
 dbaccess/source/core/dataaccess/myucp_datasupplier.cxx  |6 +++---
 dbaccess/source/core/misc/sdbcoretools.cxx  |4 ++--
 dbaccess/source/core/recovery/storagexmlstream.cxx  |2 +-
 dbaccess/source/core/recovery/subcomponentrecovery.cxx  |4 ++--
 dbaccess/source/filter/xml/dbloader2.cxx|6 +++---
 dbaccess/source/ui/app/AppController.cxx|6 +++---
 dbaccess/source/ui/app/AppControllerDnD.cxx |4 ++--
 dbaccess/source/ui/app/subcomponentmanager.cxx  |4 ++--
 dbaccess/source/ui/browser/dbloader.cxx |6 +++---
 dbaccess/source/ui/browser/sbagrid.cxx  |6 +++---
 dbaccess/source/ui/browser/unodatbr.cxx |2 +-
 dbaccess/source/ui/control/dbtreelistbox.cxx|2 +-
 dbaccess/source/ui/control/sqledit.cxx  |4 ++--
 dbaccess/source/ui/dlg/DbAdminImpl.cxx  |4 ++--
 dbaccess/source/ui/misc/UITools.cxx |2 +-
 dbaccess/source/ui/misc/WCopyTable.cxx  |8 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx   |2 +-
 dbaccess/source/ui/uno/copytablewizard.cxx  |6 +++---
 28 files changed, 56 insertions(+), 58 deletions(-)

New commits:
commit 24a3d4eee7a01c4296a93708103d267d5473c790
Author: Noel 
AuthorDate: Mon Feb 15 09:40:51 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 15 11:54:15 2021 +0100

loplugin:referencecasting in dbaccess

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

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index 62383ecd5479..80e5206b4dd6 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1504,7 +1504,7 @@ Reference< XIndexAccess > SAL_CALL 
ORowSet::getParameters(  )
 // our caller could change our parameters at any time
 m_bParametersDirty = true;
 
-return m_pParameters.get();
+return m_pParameters;
 }
 
 void ORowSet::approveExecution()
@@ -2404,7 +2404,7 @@ void ORowSet::impl_initParametersContainer_nothrow()
 {
 OSL_PRECOND( !m_pParameters.is(), 
"ORowSet::impl_initParametersContainer_nothrow: already initialized the 
parameters!" );
 
-m_pParameters = new param::ParameterWrapperContainer( m_xComposer.get() );
+m_pParameters = new param::ParameterWrapperContainer( m_xComposer );
 // copy the premature parameters into the final ones
 size_t nParamCount( std::min( m_pParameters->size(), 
m_aPrematureParamValues->size() ) );
 for ( size_t i=0; inotifyElementCreated(_rName,xDest);
 }
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx 
b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index a6110bdb2dab..688f22204c73 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -219,7 +219,7 @@ OColumn* OComponentDefinition::createColumn(const OUString& 
_rName) const
 OComponentDefinition_Impl::const_iterator aFind = rDefinition.find( _rName 
);
 if ( aFind != rDefinition.end() )
 {
-
aFind->second->addPropertyChangeListener(OUString(),m_xColumnPropertyListener.get());
+
aFind->second->addPropertyChangeListener(OUString(),m_xColumnPropertyListener);
 return new OTableColumnWrapper( aFind->second, aFind->second, true );
 }
 OSL_FAIL( "OComponentDefinition::createColumn: is this a valid case?" );
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx 
b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 6e0e17b360ef..e237d8ea3b88 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -475,7 +475,7 @@ Reference< XRow > OContentHelper::getPropertyValues( const 
Sequence< Property >&
 // @@@ Append other properties supported directly.
 }
 
-return Reference< XRow >( xRow.get() );
+return xRow;
 }
 
 void OContentHelper::notifyPropertiesChange( const Sequence< 
PropertyChangeEvent >& evt ) const
diff --git a/dbaccess/source/core/dataaccess/ModelI

[Libreoffice-commits] online.git: 0 commits -

[Tor Lillqvist (via logerrit)]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Added some information about Qt Creator IDE integration to the wiki

[Michael Weghorn]

Hi,

On 12/02/2021 21.53, Hossein Noorikhah wrote:

I went through the sequence, and nothing has changed. It's a question for
me: why do we need a fresh Qt Creator profile? In very rare situations, I had to
clean up this profile. Also, I usually do not re-run ./autogen.sh because I
didn't have any changes in the libs/configurations, and I only pulled the latest
master from the git repository. This time, I re-ran autogen.sh again, and again
nothing has changed.


There's generally no need for a fresh Qt Creator profile. I just did 
that to avoid potential side-effects of an existing profile when 
double-checking it works for me.
There shouldn't be any need to manually re-run autogen.sh either unless 
you change your autogen.input.




But, now I know what you're doing. I thought that only lo.pro is generated, but
now I see that lo.pro.user is also being generated. That didn't help me, because
the used Qt kit was not ok. I saw a manual Qt kit which is used for the
configuration. It was called 'Replacement for "Desktop"', so I removed it and
reconfigured the project using the appropriate kit. In this case, I
had to add the
previously discussed configurations manually.


Can you try what happens if you use that 'Replacement for "Desktop"' kit 
instead? That's what I'm doing and which should contain the settings 
from lo.pro.user (i.e. the build and run configurations).


As far as I can see, the *.pro.user contains settings specific to one 
kit, and those kits have unique UUIDs, i.e. are different for each 
user/profile, which is why that can't be mapped to your existing kit.



To create a viable solution that lasts even when you re-configure the project, I
think it is needed to put all the configuration in .pro files, and not in
.pro.user files, because they can be removed/changed at any time.


I'd generally agree, but currently don't see a way to make this work. 
*.pro files are not files for the Qt Creator IDE in the first place, but 
for the qmake build system (which is one of the build systems that Qt 
Creator supports).


The *.pro.user file is used to store user-specific Qt-Creator-specific 
settings for a project.


When loading a qmake project (using the .pro file) in Qt Creator, it 
tries to automatically derive the corresponding build and run settings, 
which is also why you get the "qmake" build step etc. if you just use 
the *.pro file and not the *.pro.user one.


That's why the *pro.user file is used to set "proper" build steps and 
run configuration for the LO case.
I currently see no way to instead derive those automatically from the 
.pro file only.


In other words: The current way that qtcreator IDE integration works is 
by generating a fake qmake project (using .pro files) for LibreOffice, 
then manually overriding run/build configurations using the .pro.user 
files. This is necessary because LO actually uses its own build system 
(gbuild), for which there is no native support in Qt Creator.


That's a bit of a hack; things would probably be a bit easier if LO 
wasn't using its own build system but one of those natively supported by 
Qt Creator (like CMake, qmake or meson (for which there is experimental 
support)).


Generating the *.pro.user files is actually not ideal and they're not 
really meant to be shared, but it seems to be working well for me in 
practice when I select the 'Replacement for "Desktop"' kit when 
initially loading the project.


In order to directly match an actual kit, one could try to retrieve the 
UUID for a valid kit from the settings in the Qt Creator profile and use 
that one when generating the *.pro.user files, but that's not ideal 
either in my opinion (e.g. one would have to "guess" what kit is the 
right one, rely on a specific Qt Creator profile path,...).


I just recently read about *.pro.shared files [1] which are actually 
meant to share project settings. Those might actually be a better way to 
handle all of this.

I'll probably take a closer look at some point in time.



And for the contents of lo.pro, I still get "." as the first
subdirectory. I have to
manually change it to "../core".


As mentioned in my previous email, I can take a quick look whether I can 
see anything obvious if you upload your generated files somewhere or 
send them by email and tell me the paths used in your case (and whether 
you use a separate build dir).



Michael


[1] https://doc.qt.io/qtcreator/creator-sharing-project-settings.html



Regards,
Hossein
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 15 commits - compilerplugins/clang desktop/source filter/CppunitTest_filter_dxf_test.mk filter/CppunitTest_filter_eps_test.mk filter

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit c10135af29c94bee8bc3199f7b15042be4c4a2af
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 15 17:49:34 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Feb 15 20:52:28 2021 +0900

vcl: clean-up code used for loading of external graphic filters

All graphic filters have been moved into vcl, so there is no need
to load an external library that contained graphic filters, so
this code can be removed.

Change-Id: Iac4f8dd78464e142f50837a55edd2d25720b8c13

diff --git a/vcl/source/filter/FilterConfigCache.cxx 
b/vcl/source/filter/FilterConfigCache.cxx
index 411d44a5801d..482b8fed2ca0 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -55,39 +55,18 @@ const char* 
FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameL
 IMP_EPS, EXP_EPS, nullptr
 };
 
-const char* 
FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameList[] =
-{
-   nullptr
-};
-
 void FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const 
OUString& rUserDataEntry )
 {
-bIsPixelFormat = bIsInternalFilter = false;
+bIsPixelFormat = false;
 sFilterName = rUserDataEntry;
 const char** pPtr;
-for ( pPtr = InternalPixelFilterNameList; *pPtr && !bIsInternalFilter; 
pPtr++ )
+for ( pPtr = InternalPixelFilterNameList; *pPtr; pPtr++ )
 {
 if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
 {
-bIsInternalFilter = true;
 bIsPixelFormat = true;
 }
 }
-for ( pPtr = InternalVectorFilterNameList; *pPtr && !bIsInternalFilter; 
pPtr++ )
-{
-if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
-bIsInternalFilter = true;
-}
-if ( !bIsInternalFilter )
-{
-for ( pPtr = ExternalPixelFilterNameList; *pPtr && !bIsPixelFormat; 
pPtr++ )
-{
-if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
-bIsPixelFormat = true;
-}
-sExternalFilterName = sFilterName;
-sFilterName = SVLIBRARY("gie");
-}
 }
 
 OUString FilterConfigCache::FilterConfigCacheEntry::GetShortName()
@@ -400,21 +379,6 @@ OUString FilterConfigCache::GetImportFilterTypeName( 
sal_uInt16 nFormat )
 return OUString();
 }
 
-OUString FilterConfigCache::GetExternalFilterName(sal_uInt16 nFormat, bool 
bExport)
-{
-if (bExport)
-{
-if (nFormat < aExport.size())
-return aExport[nFormat].sExternalFilterName;
-}
-else
-{
-if (nFormat < aImport.size())
-return aImport[nFormat].sExternalFilterName;
-}
-return OUString();
-}
-
 OUString FilterConfigCache::GetImportWildcard(sal_uInt16 nFormat, sal_Int32 
nEntry)
 {
 OUString aWildcard( GetImportFormatExtension( nFormat, nEntry ) );
@@ -423,11 +387,6 @@ OUString FilterConfigCache::GetImportWildcard(sal_uInt16 
nFormat, sal_Int32 nEnt
 return aWildcard;
 }
 
-bool FilterConfigCache::IsImportInternalFilter( sal_uInt16 nFormat )
-{
-return (nFormat < aImport.size()) && aImport[ nFormat ].bIsInternalFilter;
-}
-
 OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat )
 {
 if( nFormat < aExport.size() )
@@ -526,11 +485,6 @@ OUString FilterConfigCache::GetExportWildcard( sal_uInt16 
nFormat, sal_Int32 nEn
 return aWildcard;
 }
 
-bool FilterConfigCache::IsExportInternalFilter( sal_uInt16 nFormat )
-{
-return (nFormat < aExport.size()) && aExport[ nFormat ].bIsInternalFilter;
-}
-
 bool FilterConfigCache::IsExportPixelFormat( sal_uInt16 nFormat )
 {
 return (nFormat < aExport.size()) && aExport[ nFormat ].bIsPixelFormat;
diff --git a/vcl/source/filter/FilterConfigCache.hxx 
b/vcl/source/filter/FilterConfigCache.hxx
index 4860bbc6f38b..e6b0258bf803 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -32,7 +32,6 @@ class FilterConfigCache
 OUString sType;
 std::vector< OUString > lExtensionList;
 OUString sUIName;
-OUString sExternalFilterName;
 
 OUString sMediaType;
 OUString sFilterType;
@@ -41,7 +40,6 @@ class FilterConfigCache
 
 // user data
 OUStringsFilterName;
-boolbIsInternalFilter   : 1;
 boolbIsPixelFormat  : 1;
 
 voidCreateFilterName( const OUString& rUserDataEntry );
@@ -49,7 +47,6 @@ class FilterConfigCache
 
 static const char* InternalPixelFilterNameList[];
 static const char* InternalVectorFilterNameList[];
-static const char* ExternalPixelFilterNameList[];
 };
 
 
@@ -77,7 +74,6 @@ public:
 OUStringGetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
 OUStringGetImportFilterType( sal_uInt16 nFormat );
 OUStringGetImportFilterTypeName( sal_uInt16 nFormat );
-OUStringGetExternalFilterName(sal_uInt16 nFormat, bool bExport);
 
 
 boolIsImport

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

[Tibor Nagy (via logerrit)]

 sc/qa/unit/data/xlsx/tdf139928.xlsx|binary
 sc/qa/unit/subsequent_export-test.cxx  |4 +--
 sc/qa/unit/subsequent_filters-test.cxx |   40 +++--
 sc/source/filter/inc/extlstcontext.hxx |   12 -
 sc/source/filter/oox/extlstcontext.cxx |   32 +++---
 5 files changed, 74 insertions(+), 14 deletions(-)

New commits:
commit a5513cb45d90e0a1bfa0dfe39c0f090f1cda45de
Author: Tibor Nagy 
AuthorDate: Sun Feb 7 21:24:45 2021 +0100
Commit: László Németh 
CommitDate: Mon Feb 15 13:06:51 2021 +0100

tdf#139928 XLSX import: fix conditional formatting in same cell range

Multiple conditional formatting rules of the same cell range
were imported incorrectly because of missing handling of their
(different) priorities and operators.

Note: older unit tests were modified according to the fixed priorities.

Co-authored-by: Attila Szűcs (NISZ)

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

diff --git a/sc/qa/unit/data/xlsx/tdf139928.xlsx 
b/sc/qa/unit/data/xlsx/tdf139928.xlsx
new file mode 100644
index ..d0bc3067fa34
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf139928.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 746eda5d3437..57d4cc45b53f 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -729,7 +729,7 @@ void ScExportTest::testCondFormatExportCellIs()
 CPPUNIT_ASSERT_EQUAL( ScConditionMode::Equal,  pCondition->GetOperation());
 
 OUString aStr = pCondition->GetExpression(ScAddress(0, 0, 0), 0);
-CPPUNIT_ASSERT_EQUAL( OUString("$Sheet2.$A$1"), aStr );
+CPPUNIT_ASSERT_EQUAL( OUString("$Sheet2.$A$2"), aStr );
 
 pEntry = pFormat->GetEntry(1);
 CPPUNIT_ASSERT(pEntry);
@@ -739,7 +739,7 @@ void ScExportTest::testCondFormatExportCellIs()
 CPPUNIT_ASSERT_EQUAL( ScConditionMode::Equal,  pCondition->GetOperation());
 
 aStr = pCondition->GetExpression(ScAddress(0, 0, 0), 0);
-CPPUNIT_ASSERT_EQUAL( OUString("$Sheet2.$A$2"), aStr );
+CPPUNIT_ASSERT_EQUAL( OUString("$Sheet2.$A$1"), aStr );
 
 xDocSh->DoClose();
 }
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 7e7c62500674..b70777b1c176 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -108,6 +108,7 @@ public:
 virtual void tearDown() override;
 
 //ods, xls, xlsx filter tests
+void testCondFormatOperatorsSameRangeXLSX();
 void testCondFormatFormulaIsXLSX();
 void testCondFormatBeginsAndEndsWithXLSX();
 void testExtCondFormatXLSX();
@@ -307,6 +308,7 @@ public:
 void testTdf129940();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
+CPPUNIT_TEST(testCondFormatOperatorsSameRangeXLSX);
 CPPUNIT_TEST(testCondFormatFormulaIsXLSX);
 CPPUNIT_TEST(testCondFormatBeginsAndEndsWithXLSX);
 CPPUNIT_TEST(testExtCondFormatXLSX);
@@ -551,6 +553,40 @@ void testRangeNameImpl(const ScDocument& rDoc)
 
 }
 
+void ScFiltersTest::testCondFormatOperatorsSameRangeXLSX()
+{
+ScDocShellRef xDocSh = loadDoc(u"tdf139928.", FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load tdf139928.xlsx", xDocSh.is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+
+ScConditionalFormat* pFormat = rDoc.GetCondFormat(0, 0, 0);
+CPPUNIT_ASSERT(pFormat);
+
+const ScFormatEntry* pEntry = pFormat->GetEntry(0);
+CPPUNIT_ASSERT(pEntry);
+CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::ExtCondition, pEntry->GetType());
+
+const ScCondFormatEntry* pCondition = static_cast(pEntry);
+CPPUNIT_ASSERT_EQUAL( ScConditionMode::ContainsText,  
pCondition->GetOperation());
+
+pEntry = pFormat->GetEntry(1);
+CPPUNIT_ASSERT(pEntry);
+CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::ExtCondition, pEntry->GetType());
+
+pCondition = static_cast(pEntry);
+CPPUNIT_ASSERT_EQUAL( ScConditionMode::BeginsWith,  
pCondition->GetOperation());
+
+pEntry = pFormat->GetEntry(2);
+CPPUNIT_ASSERT(pEntry);
+CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::ExtCondition, pEntry->GetType());
+
+pCondition = static_cast(pEntry);
+CPPUNIT_ASSERT_EQUAL( ScConditionMode::EndsWith,  
pCondition->GetOperation());
+
+xDocSh->DoClose();
+}
+
 void ScFiltersTest::testCondFormatFormulaIsXLSX()
 {
 ScDocShellRef xDocSh = loadDoc(u"tdf113013.", FORMAT_XLSX);
@@ -2566,7 +2602,7 @@ void ScFiltersTest::testCondFormatImportCellIs()
 CPPUNIT_ASSERT_EQUAL( ScConditionMode::Equal,  pCondition->GetOperation());
 
 OUString aStr = pCondition->GetExpression(ScAddress(0, 0, 0), 0);
-CPPUNIT_ASSERT_EQUAL( OUString("$Sheet2.$A$1"), aStr );
+CPPUNIT_ASSERT_EQUAL( OUString("$Sheet2.$A$2"), aStr );
 
 pEntry = pFormat->GetEntry(1);
 CPPUNIT_ASSERT(pEnt

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

[Caolán McNamara (via logerrit)]

 editeng/source/rtf/svxrtf.cxx |   48 +++---
 include/editeng/svxrtf.hxx|4 +--
 2 files changed, 15 insertions(+), 37 deletions(-)

New commits:
commit 08b82fa3ee915666ef8b60aeb670c38f64553630
Author: Caolán McNamara 
AuthorDate: Mon Feb 15 10:48:53 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 15 13:18:26 2021 +0100

Revert "ofz#29461 flatten SetAttrSet recursion"

Compress deletes nodes so the flat list becomes invalid

This reverts commit d1b3571fba171279d70ccaa0dfec1871f04439af.

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

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 7c1d885323e3..17ef94553ec5 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -848,42 +848,14 @@ void SvxRTFParser::SetAllAttrOfStk()// end all 
Attr. and set it into doc
 for (size_t n = m_AttrSetList.size(); n; )
 {
 auto const& pStkSet = m_AttrSetList[--n];
-
-/*
-   ofz#29461 SetAttrSet recursively calls SetAttrSet on pStkSet's
-   m_pChildList. The recurse depth can grow sufficiently to trigger
-   asan.
-
-   So breadth-first iterate through the nodes and make a flat vector of
-   them which can be iterated through linearly
-*/
-auto bfs = pStkSet->GetBreadthFirstList();
-for (auto it = bfs.begin(); it != bfs.end(); ++it)
-{
-SvxRTFItemStackType* pNode = *it;
-SetAttrSet(*pNode, false);
-}
-
-/*
-   ofz#13491 SvxRTFItemStackType dtor recursively calls the dtor of its
-   m_pChildList. The recurse depth can grow sufficiently to trigger
-   asan.
-
-   iterate through flat-view of those nodes in order of most distant
-   from root first and release them linearly
-*/
-for (auto it = bfs.rbegin(); it != bfs.rend(); ++it)
-{
-SvxRTFItemStackType* pNode = *it;
-pNode->m_pChildList.reset();
-}
-
+SetAttrSet( *pStkSet );
+pStkSet->DropChildList();
 m_AttrSetList.pop_back();
 }
 }
 
 // sets all the attributes that are different from the current
-void SvxRTFParser::SetAttrSet(SvxRTFItemStackType &rSet, bool bRecurse)
+void SvxRTFParser::SetAttrSet( SvxRTFItemStackType &rSet )
 {
 // Was DefTab never read? then set to default
 if( !bIsSetDfltTab )
@@ -895,7 +867,7 @@ void SvxRTFParser::SetAttrSet(SvxRTFItemStackType &rSet, 
bool bRecurse)
 SetAttrInDoc( rSet );
 
 // then process all the children
-if (bRecurse && rSet.m_pChildList)
+if (rSet.m_pChildList)
 for (size_t n = 0; n < rSet.m_pChildList->size(); ++n)
 SetAttrSet( *(*rSet.m_pChildList)[ n ] );
 }
@@ -991,10 +963,12 @@ SvxRTFItemStackType::SvxRTFItemStackType(
distant from root first and release
their children linearly
 */
-std::vector SvxRTFItemStackType::GetBreadthFirstList()
+void SvxRTFItemStackType::DropChildList()
 {
-std::vector bfs;
+if (!m_pChildList || m_pChildList->empty())
+return;
 
+std::vector bfs;
 std::queue aQueue;
 aQueue.push(this);
 
@@ -1010,7 +984,11 @@ std::vector 
SvxRTFItemStackType::GetBreadthFirstList()
 }
 }
 
-return bfs;
+for (auto it = bfs.rbegin(); it != bfs.rend(); ++it)
+{
+SvxRTFItemStackType* pNode = *it;
+pNode->m_pChildList.reset();
+}
 }
 
 SvxRTFItemStackType::~SvxRTFItemStackType()
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 70e996068459..faff107c1496 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -197,7 +197,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
 void ClearStyleAttr_( SvxRTFItemStackType& rStkType );
 
 // Sets all the attributes that are different from the current
-void SetAttrSet(SvxRTFItemStackType &rSet, bool bRecurse = true);
+void SetAttrSet( SvxRTFItemStackType &rSet );
 void SetDefault( int nToken, int nValue );
 
 // Execute pard / plain
@@ -309,7 +309,7 @@ class SvxRTFItemStackType
 
 void Add(std::unique_ptr);
 void Compress( const SvxRTFParser& );
-std::vector GetBreadthFirstList();
+void DropChildList();
 
 public:
 SvxRTFItemStackType(const SvxRTFItemStackType&, const EditPosition&,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 ucb/source/cacher/dynamicresultsetwrapper.cxx  |2 -
 ucb/source/core/FileAccess.cxx |   32 ++---
 ucb/source/core/ucbcmds.cxx|2 -
 ucb/source/core/ucbstore.cxx   |4 +-
 ucb/source/sorter/sortdynres.cxx   |4 +-
 ucb/source/sorter/sortresult.cxx   |2 -
 ucb/source/ucp/cmis/auth_provider.cxx  |6 +--
 ucb/source/ucp/cmis/certvalidation_handler.cxx |2 -
 ucb/source/ucp/cmis/cmis_content.cxx   |2 -
 ucb/source/ucp/cmis/cmis_provider.cxx  |2 -
 ucb/source/ucp/cmis/cmis_repo_content.cxx  |2 -
 ucb/source/ucp/ext/ucpext_content.cxx  |4 +-
 ucb/source/ucp/ext/ucpext_datasupplier.cxx |4 +-
 ucb/source/ucp/ext/ucpext_provider.cxx |2 -
 ucb/source/ucp/ext/ucpext_resultset.cxx|2 -
 ucb/source/ucp/file/filtask.cxx|6 +--
 ucb/source/ucp/ftp/ftpcontent.cxx  |6 +--
 ucb/source/ucp/ftp/ftpcontentprovider.cxx  |2 -
 ucb/source/ucp/ftp/ftpresultsetI.cxx   |2 -
 ucb/source/ucp/gio/gio_content.cxx |2 -
 ucb/source/ucp/gio/gio_mount.cxx   |2 -
 ucb/source/ucp/gio/gio_provider.cxx|2 -
 ucb/source/ucp/hierarchy/hierarchycontent.cxx  |2 -
 ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx |4 +-
 ucb/source/ucp/hierarchy/hierarchyprovider.cxx |2 -
 ucb/source/ucp/package/pkgcontent.cxx  |8 +
 ucb/source/ucp/package/pkgdatasupplier.cxx |4 +-
 ucb/source/ucp/package/pkgprovider.cxx |4 +-
 ucb/source/ucp/tdoc/tdoc_content.cxx   |6 +--
 ucb/source/ucp/tdoc/tdoc_datasupplier.cxx  |4 +-
 ucb/source/ucp/tdoc/tdoc_docmgr.cxx|6 +--
 ucb/source/ucp/tdoc/tdoc_provider.cxx  |4 +-
 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx   |2 -
 ucb/source/ucp/webdav-neon/NeonSession.cxx |8 ++---
 ucb/source/ucp/webdav-neon/webdavcontent.cxx   |8 ++---
 ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx  |3 -
 ucb/source/ucp/webdav-neon/webdavprovider.cxx  |2 -
 37 files changed, 79 insertions(+), 82 deletions(-)

New commits:
commit 96be489048ca97bfc07d4aa252675b76dfca73a2
Author: Noel 
AuthorDate: Mon Feb 15 09:41:31 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 15 13:36:07 2021 +0100

loplugin:referencecasting in ucb

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

diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx 
b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 3aa765da316a..274aff18dc6a 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -297,7 +297,7 @@ void SAL_CALL DynamicResultSetWrapper::setSource( const 
Reference< XInterface >
 xMyListenerImpl = m_xMyListenerImpl.get();
 }
 if( xListener.is() )
-xSourceDynamic->setListener( m_xMyListenerImpl.get() );
+xSourceDynamic->setListener( m_xMyListenerImpl );
 else if( bStatic )
 {
 Reference< XComponent > xSourceComponent( Source, UNO_QUERY );
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 4a816618471e..139c05cb500a 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -253,8 +253,8 @@ void OFileAccess::transferImpl( const OUString& rSource,
 
 }
 
-ucbhelper::Content aDestPath( aDestURL,   mxEnvironment.get(), 
comphelper::getProcessComponentContext() );
-ucbhelper::Content aSrc ( aSourceURL, mxEnvironment.get(), 
comphelper::getProcessComponentContext() );
+ucbhelper::Content aDestPath( aDestURL,   mxEnvironment, 
comphelper::getProcessComponentContext() );
+ucbhelper::Content aSrc ( aSourceURL, mxEnvironment, 
comphelper::getProcessComponentContext() );
 
 try
 {
@@ -285,7 +285,7 @@ void OFileAccess::kill( const OUString& FileURL )
 {
 // SfxContentHelper::Kill
 INetURLObject aDeleteObj( FileURL, INetProtocol::File );
-ucbhelper::Content aCnt( aDeleteObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), 
comphelper::getProcessComponentContext() );
+ucbhelper::Content aCnt( aDeleteObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ), mxEnvironment, 
comphelper::getProcessComponentContext() );
 try
 {
 aCnt.executeCommand( "delete", makeAny( true ) );
@@ -302,7 +302,7 @@ sal_Bool OFileAccess::isFolder( const OUString& FileURL )
 try
 {
 INetURLObject aURLObj( FileURL, INetProtocol::File );
-ucbhelper::Content aCnt( aURLObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/qa svx/source

[Miklos Vajna (via logerrit)]

 svx/qa/unit/unodraw.cxx |   33 +
 svx/source/unodraw/unoshtxt.cxx |   12 
 2 files changed, 33 insertions(+), 12 deletions(-)

New commits:
commit 41792f205d0de94c81bae511c9707ca0052135f4
Author: Miklos Vajna 
AuthorDate: Fri Feb 12 17:22:57 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 15 14:28:25 2021 +0100

svx: fix import of multiple paragraphs into title shapes

Title shapes try hard to have a single paragraph only, the Impress UI
inserts linebreaks instead of paragraphs breaks in
sd::FuText::KeyInput(), ever since commit
f47a9d9db3d06927380bb79b04bb6d4721a92d2b (initial import, 2000-09-18).
This matches the PowerPoint behavior. This is most visible when the
paragraph has a bullet associated with it.

Interestingly you can still put multiple paragraphs into title shapes
using paste special -> plain text.

In that case, it was inconsistent that we exported these multiple
paragraphs to ODP, but merged them to a single paragraph on import since
commit 0a783c1a041e2b74b7bf238d11ee2c303f6708f4 (#100190# don't allow
more then one paragraph on title text objects, 2002-06-25).

This results in loosing your bullets on save + open, both in the ODP and
PPTX cases, since removeActionLock() on the XShape triggers this tweak.
Also, PowerPoint does not do this merging on import. So fix the problem
by removing the import-time tweak but leave the UI unchanged.

(cherry picked from commit 043690eff82d5798774452a8364e1566b866a320)

Conflicts:
svx/source/unodraw/unoshtxt.cxx

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

diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx
index d31bba03eb77..f4b727e5a938 100644
--- a/svx/qa/unit/unodraw.cxx
+++ b/svx/qa/unit/unodraw.cxx
@@ -18,6 +18,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -177,6 +178,38 @@ CPPUNIT_TEST_FIXTURE(UnodrawTest, testTableShadowDirect)
 // which has no shadow for cell text (only for cell borders and cell 
background).
 assertXPath(pDocument, "//shadow//sdrblocktext", /*nNumberOfNodes=*/0);
 }
+
+CPPUNIT_TEST_FIXTURE(UnodrawTest, testTitleShapeBullets)
+{
+// Create a title shape with 2 paragraphs in it.
+mxComponent = loadFromDesktop("private:factory/simpress",
+  
"com.sun.star.presentation.PresentationDocument");
+uno::Reference xSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xDrawPages = xSupplier->getDrawPages();
+uno::Reference xDrawPage(xDrawPages->getByIndex(0), 
uno::UNO_QUERY);
+// A default document contains a title shape and a text shape on the first 
slide.
+uno::Reference xTitleShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xTitleShapeInfo(xTitleShape, 
uno::UNO_QUERY);
+
CPPUNIT_ASSERT(xTitleShapeInfo->supportsService("com.sun.star.presentation.TitleTextShape"));
+uno::Reference xTitleShapeText(xTitleShape, 
uno::UNO_QUERY);
+uno::Reference xText = xTitleShapeText->getText();
+uno::Reference xCursor = xText->createTextCursor();
+xText->insertString(xCursor, "foo", /*bAbsorb=*/false);
+xText->insertControlCharacter(xCursor, 
text::ControlCharacter::APPEND_PARAGRAPH,
+  /*bAbsorb=*/false);
+xText->insertString(xCursor, "bar", /*bAbsorb=*/false);
+
+// Check that the title shape has 2 paragraphs.
+uno::Reference xTextEA(xText, 
uno::UNO_QUERY);
+uno::Reference xTextE = 
xTextEA->createEnumeration();
+// Has a first paragraph.
+CPPUNIT_ASSERT(xTextE->hasMoreElements());
+xTextE->nextElement();
+// Has a second paragraph.
+// Without the accompanying fix in place, this test would have failed, 
because the 2 paragraphs
+// were merged together (e.g. 1 bullet instead of 2 bullets for bulleted 
paragraphs).
+CPPUNIT_ASSERT(xTextE->hasMoreElements());
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index adabc3c061ec..a8bbece64e65 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -776,18 +776,6 @@ void SvxTextEditSourceImpl::UpdateData()
 {
 if( mpOutliner->GetParagraphCount() != 1 || 
mpOutliner->GetEditEngine().GetTextLen( 0 ) )
 {
-if( mpOutliner->GetParagraphCount() > 1 )
-{
-if (pTextObj->IsTextFrame() && 
pTextObj->GetTextKind() == OBJ_TITLETEXT)
-{
-while( mpOutliner->GetParagraphCount() > 1 )
-{
-ESel

[Libreoffice-commits] core.git: sal/osl

[Mike Kaganski (via logerrit)]

 sal/osl/w32/tempfile.cxx |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 181fc61c4cce5192e57657c313ee7fa4f640fb69
Author: Mike Kaganski 
AuthorDate: Mon Feb 15 12:49:30 2021 +0100
Commit: Mike Kaganski 
CommitDate: Mon Feb 15 14:34:37 2021 +0100

Reuse known length of the temp dir path

And make this code a bit more C++-ish.

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

diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index 5424bfbde077..a4c272e57768 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 
 #include "file-impl.hxx"
 #include "file_error.hxx"
@@ -227,16 +228,12 @@ oslFileError SAL_CALL osl_getTempDirURL(rtl_uString** 
pustrTempDir)
 }
 else if ( nLength )
 {
-rtl_uString *ustrTempPath = nullptr;
-
 if ( '\\' == lpBuffer[nLength-1] )
-lpBuffer[nLength-1] = 0;
-
-rtl_uString_newFromStr( &ustrTempPath, o3tl::toU(lpBuffer) );
+--nLength;
 
-error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
+const OUString ustrTempPath(o3tl::toU(lpBuffer), 
static_cast(nLength));
 
-rtl_uString_release( ustrTempPath );
+error = osl_getFileURLFromSystemPath(ustrTempPath.pData, pustrTempDir);
 }
 else
 error = oslTranslateFileError( GetLastError() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl

[Mike Kaganski (via logerrit)]

 sal/osl/unx/tempfile.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 376101c41cf23852b19db5725b0257069f3abd2e
Author: Mike Kaganski 
AuthorDate: Mon Feb 15 13:40:13 2021 +0300
Commit: Mike Kaganski 
CommitDate: Mon Feb 15 14:34:51 2021 +0100

Do not remove '/' when it's the only character in the path

Follow-up to commit 3380163bc0fb9dab7f289cc36b0eeb0c9b3ddaa9.

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

diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx
index b91d4b6e0ac7..00ae0664b2c0 100644
--- a/sal/osl/unx/tempfile.cxx
+++ b/sal/osl/unx/tempfile.cxx
@@ -51,7 +51,7 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** 
pustrTempDir )
 pValue = "/tmp";
 
 auto nLen = strlen(pValue);
-while (nLen && pValue[nLen - 1] == '/')
+while (nLen > 1 && pValue[nLen - 1] == '/') // Allow path consisting of 
single "/"
 --nLen;
 rtl_string2UString( &ustrTempPath, pValue, nLen, 
osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
 assert(ustrTempPath);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/02/0321.xhp |   25 -
 source/text/swriter/main0215.xhp|   19 ---
 2 files changed, 20 insertions(+), 24 deletions(-)

New commits:
commit a9976d5f4fd4d2c2841e83a4a2cdcaeda4419136
Author: Seth Chaiklin 
AuthorDate: Mon Feb 15 14:24:03 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Mon Feb 15 14:57:47 2021 +0100

update "link" to "link frames"

  ( swriter/02/0321.xhp )
* update command name  from "Link" to "Link Frames"
* rename two German ids
+ add "howtoget" section, with access commands
+ add  section for existing link

  ( swriter/main0215.xhp )
* updated two renamed German ids
* update to ,

Change-Id: I30702c537935eb5624add452e668af70755aaf7e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110913
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/02/0321.xhp 
b/source/text/swriter/02/0321.xhp
index 57fb6f5ff..f3bb78cf5 100644
--- a/source/text/swriter/02/0321.xhp
+++ b/source/text/swriter/02/0321.xhp
@@ -19,7 +19,7 @@
 
 
 
-Link
+Link Frames
 /text/swriter/02/0321.xhp
 
 
@@ -27,30 +27,29 @@
 
 
 
-
-
-  
+
 
-Link
-  Links the selected frame to the 
next frame. The text automatically flows from one frame to 
another.
-  
-  
+Link Frames
+Links the selected frame to the 
next frame. The text automatically flows from one frame to 
another.
+
+
+Choose Format 
- Frame and Object - Link Frames.
+On the 
Format bar, click the Link Frames icon.
+
+  
   
-
-
-
 
  
   Icon Link Frames
-
  
  
   Link 
Frames
  
 
-
   
   
+
   
+
  
 
diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp
index 3dd6d2c1b..626edb9b9 100644
--- a/source/text/swriter/main0215.xhp
+++ b/source/text/swriter/main0215.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
 
 
 
@@ -29,20 +26,20 @@
 
 
 
-Frame Bar
+Frame Bar
 When a frame is selected, the Frame Bar 
provides the most important functions for formatting and positioning the 
frame.
 
 
 
-Wrap Off
+Wrap Off
 
 You can also 
choose this setting on the Wrap tab page.
 
-Wrap On
+Wrap On
 
 This icon 
represents the Page Wrap option on the Wrap tab 
page.
 
-Wrap 
Through
+Wrap Through
 
 You can also 
define this setting on the Wrap tab page.
 
@@ -64,10 +61,10 @@
 
 
 
-Background 
Color
+Background 
Color
 
 
-Frame 
Properties
+Frame 
Properties
 
 
 
@@ -77,8 +74,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 760100d1dfe0df3e67227618013297e5f1f419aa
Author: Seth Chaiklin 
AuthorDate: Mon Feb 15 14:57:47 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Feb 15 14:57:47 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a9976d5f4fd4d2c2841e83a4a2cdcaeda4419136
  - update "link" to "link frames"

  ( swriter/02/0321.xhp )
* update command name  from "Link" to "Link Frames"
* rename two German ids
+ add "howtoget" section, with access commands
+ add  section for existing link

  ( swriter/main0215.xhp )
* updated two renamed German ids
* update to ,

Change-Id: I30702c537935eb5624add452e668af70755aaf7e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110913
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 9f804dbbddf4..a9976d5f4fd4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9f804dbbddf4abdb69009082c7e7d55e58315270
+Subproject commit a9976d5f4fd4d2c2841e83a4a2cdcaeda4419136
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source include/editeng include/svx include/vcl svx/source vcl/inc vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/editview.cxx |   12 +++-
 include/editeng/editview.hxx|3 +++
 include/svx/svdedxv.hxx |1 +
 include/svx/weldeditview.hxx|2 ++
 include/vcl/customweld.hxx  |1 +
 include/vcl/weld.hxx|2 ++
 svx/source/dialog/weldeditview.cxx  |5 +
 svx/source/svdraw/svdedxv.cxx   |2 ++
 vcl/inc/salvtables.hxx  |2 ++
 vcl/source/app/salvtables.cxx   |5 +
 vcl/unx/gtk3/gtk3gtkinst.cxx|   11 +++
 11 files changed, 41 insertions(+), 5 deletions(-)

New commits:
commit 5c89695f3885ec2e7cd00eaf56a46a7f00c44883
Author: Caolán McNamara 
AuthorDate: Mon Feb 15 11:06:33 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 15 15:07:34 2021 +0100

tdf#140414 add getting mouse pos to EditViewCallbacks

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

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 1a3f17e61d34..4849b81b6898 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1322,11 +1322,13 @@ const SvxFieldItem* EditView::GetField( const Point& 
rPos, sal_Int32* pPara, sal
 
 const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_Int32& nPara, 
sal_Int32& nPos ) const
 {
-auto pWin = pImpEditView->GetWindow();
-if (!pWin)
-return nullptr;
-Point aPos = pWin->GetPointerPosPixel();
-aPos = pImpEditView->GetWindow()->PixelToLogic( aPos );
+Point aPos;
+if (EditViewCallbacks* pEditViewCallbacks = 
pImpEditView->getEditViewCallbacks())
+aPos = pEditViewCallbacks->EditViewPointerPosPixel();
+else
+aPos = pImpEditView->GetWindow()->GetPointerPosPixel();
+OutputDevice& rDevice = pImpEditView->GetOutputDevice();
+aPos = rDevice.PixelToLogic(aPos);
 return GetField( aPos, &nPara, &nPos );
 }
 
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 9fdb08ebc1d9..05e59a4753fd 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -114,6 +114,9 @@ public:
 return nullptr;
 }
 
+// return the Mouse Position
+virtual Point EditViewPointerPosPixel() const = 0;
+
 // Triggered to update InputEngine context information
 virtual void EditViewInputContext(const InputContext& rInputContext) = 0;
 
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 36763ea01656..2d50d1f3e6fa 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -68,6 +68,7 @@ class SVXCORE_DLLPUBLIC SdrObjEditView : public 
SdrGlueEditView, public EditView
 virtual void EditViewInvalidate(const tools::Rectangle& rRect) override;
 virtual void EditViewSelectionChange() override;
 virtual OutputDevice& EditViewOutputDevice() const override;
+virtual Point EditViewPointerPosPixel() const override;
 virtual css::uno::Reference 
GetDropTarget() override;
 virtual void EditViewInputContext(const InputContext& rInputContext) 
override;
 virtual void EditViewCursorRect(const tools::Rectangle& rRect, int 
nExtTextInputWidth) override;
diff --git a/include/svx/weldeditview.hxx b/include/svx/weldeditview.hxx
index 930573f97856..d3697ad3ffb0 100644
--- a/include/svx/weldeditview.hxx
+++ b/include/svx/weldeditview.hxx
@@ -78,6 +78,8 @@ protected:
 return GetDrawingArea()->get_ref_device();
 }
 
+virtual Point EditViewPointerPosPixel() const override;
+
 virtual void EditViewInputContext(const InputContext& rInputContext) 
override
 {
 SetInputContext(rInputContext);
diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx
index b19b64bf980e..0bbfd46f4f94 100644
--- a/include/vcl/customweld.hxx
+++ b/include/vcl/customweld.hxx
@@ -90,6 +90,7 @@ public:
 }
 void CaptureMouse() { m_pDrawingArea->grab_add(); }
 bool IsMouseCaptured() const { return m_pDrawingArea->has_grab(); }
+Point GetPointerPosPixel() const { return 
m_pDrawingArea->get_pointer_position(); }
 void EnableRTL(bool bEnable) { m_pDrawingArea->set_direction(bEnable); }
 bool IsRTLEnabled() const { return m_pDrawingArea->get_direction(); }
 void ReleaseMouse() { m_pDrawingArea->grab_remove(); }
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 29f20ffef966..6f734be32b6d 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2180,6 +2180,8 @@ public:
 
 virtual void set_cursor(PointerStyle ePointerStyle) = 0;
 
+virtual Point get_pointer_position() const = 0;
+
 virtual void set_input_context(const InputContext& rInputContext) = 0;
 virtual void im_context_set_cursor_location(const tools::Rectangle& 
rCursorRect,
 int nExtTextInputWidth)
diff --git a/svx/source/dialog/weldeditview.cxx 
b/

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

[Tünde Tóth (via logerrit)]

 sc/qa/unit/uicalc/uicalc.cxx   |   41 +
 sc/source/ui/docshell/dbdocfun.cxx |2 +
 2 files changed, 43 insertions(+)

New commits:
commit 8f4dda644d1ed08ef846b5d09ead365236c57952
Author: Tünde Tóth 
AuthorDate: Wed Feb 10 16:46:12 2021 +0100
Commit: László Németh 
CommitDate: Mon Feb 15 15:11:47 2021 +0100

tdf#123202 calc: fix sorting of autofiltered rows

by keeping the query, when the data range contains
hidden rows.

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

diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index 7335fa01dc22..af82c872a183 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -1196,6 +1196,47 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf81351)
 CPPUNIT_ASSERT_EQUAL(OUString(".uno:Bold"), pDoc->GetString(ScAddress(0, 
4, 0)));
 }
 
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf123202)
+{
+mxComponent = loadFromDesktop("private:factory/scalc");
+ScModelObj* pModelObj = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pModelObj);
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+insertStringToCell(*pModelObj, "A1", "1");
+insertStringToCell(*pModelObj, "A2", "2");
+insertStringToCell(*pModelObj, "A3", "3");
+insertStringToCell(*pModelObj, "A4", "4");
+
+goToCell("A3");
+
+dispatchCommand(mxComponent, ".uno:HideRow", {});
+
+goToCell("A1:A4");
+
+dispatchCommand(mxComponent, ".uno:SortDescending", {});
+
+CPPUNIT_ASSERT_EQUAL(OUString("4"), pDoc->GetString(ScAddress(0, 0, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("3"), pDoc->GetString(ScAddress(0, 1, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("2"), pDoc->GetString(ScAddress(0, 2, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("1"), pDoc->GetString(ScAddress(0, 3, 0)));
+
+// This failed, if the "3" is visible.
+CPPUNIT_ASSERT(pDoc->RowHidden(1, 0));
+CPPUNIT_ASSERT(!pDoc->RowHidden(2, 0));
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+
+CPPUNIT_ASSERT_EQUAL(OUString("1"), pDoc->GetString(ScAddress(0, 0, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("2"), pDoc->GetString(ScAddress(0, 1, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("3"), pDoc->GetString(ScAddress(0, 2, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("4"), pDoc->GetString(ScAddress(0, 3, 0)));
+
+CPPUNIT_ASSERT(!pDoc->RowHidden(1, 0));
+CPPUNIT_ASSERT(pDoc->RowHidden(2, 0));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index 6b10b53beb8f..53492205dbd2 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -574,6 +574,8 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& 
rSortParam,
 ScInputOptions aInputOption = SC_MOD()->GetInputOptions();
 bool bUpdateRefs = aInputOption.GetSortRefUpdate();
 ScProgress aProgress(&rDocShell, ScResId(STR_PROGRESS_SORTING), 0, 
true);
+if (!bRepeatQuery)
+bRepeatQuery = rDoc.HasHiddenRows(aLocalParam.nRow1, 
aLocalParam.nRow2, nTab);
 rDoc.Sort(nTab, aLocalParam, bRepeatQuery, bUpdateRefs, &aProgress, 
&aUndoParam);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: problem with link error in unit test

[Regina Henschel]

Hi Noel,

Noel Grandin schrieb am 14.02.2021 um 06:52:


Hi

You will need to annotate those methods with SC_DLLPUBLIC
to make them visible to the unit tests


OK. That solves the link problem. But I wonder, why it is needed for 
FuConstUnoControl and not needed for FuConstCustomShape.


Kind regards
Regina

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tomaž Vajngerl (via logerrit)]

 include/vcl/graphicfilter.hxx   |   19 +
 vcl/source/filter/graphicfilter.cxx |  511 
 2 files changed, 316 insertions(+), 214 deletions(-)

New commits:
commit 4927883c820d23da797978c270ce684103734399
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 9 19:02:25 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Feb 15 15:25:14 2021 +0100

vcl: split-up GraphicFilter::Import into per-format methods

Change-Id: Idb5f120f47b4374fc709413a615baa606cd9b165
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110896
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 237d3deb9c60..59c7fe9896e9 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -342,6 +342,25 @@ public:
 
 void preload();
 
+static ErrCode readGIF(SvStream& rStream, Graphic& rGraphic, GfxLinkType& 
rLinkType);
+static ErrCode readPNG(SvStream & rStream, Graphic & rGraphic, GfxLinkType 
& rLinkType,
+std::unique_ptr & rpGraphicContent, 
sal_Int32& rGraphicContentSize);
+static ErrCode readJPEG(SvStream & rStream, Graphic & rGraphic, 
GfxLinkType & rLinkType,
+GraphicFilterImportFlags nImportFlags);
+static ErrCode readSVG(SvStream & rStream, Graphic & rGraphic, GfxLinkType 
& rLinkType,
+std::unique_ptr & rpGraphicContent, 
sal_Int32& rGraphicContentSize);
+static ErrCode readXBM(SvStream & rStream, Graphic & rGraphic);
+static ErrCode readXPM(SvStream & rStream, Graphic & rGraphic);
+
+static ErrCode readWMF_EMF(SvStream & rStream, Graphic & rGraphic, 
GfxLinkType & rLinkType,
+WmfExternal const* pExtHeader, VectorGraphicDataType 
eType);
+static ErrCode readWMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType 
& rLinkType, WmfExternal const* pExtHeader);
+static ErrCode readEMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType 
& rLinkType, WmfExternal const* pExtHeader);
+
+static ErrCode readPDF(SvStream & rStream, Graphic & rGraphic, GfxLinkType 
& rLinkType);
+static ErrCode readTIFF(SvStream & rStream, Graphic & rGraphic, 
GfxLinkType & rLinkType);
+static ErrCode readWithTypeSerializer(SvStream & rStream, Graphic & 
rGraphic, GfxLinkType & rLinkType, OUString aFilterName);
+
 private:
 OUStringaFilterPath;
 FilterConfigCache*  pConfig;
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index d6b1f9e5777a..3a2e38ec5b11 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1449,17 +1449,282 @@ void GraphicFilter::preload()
 }
 }
 
+ErrCode GraphicFilter::readGIF(SvStream & rStream, Graphic & rGraphic, 
GfxLinkType & rLinkType)
+{
+if (ImportGIF(rStream, rGraphic))
+{
+rLinkType = GfxLinkType::NativeGif;
+return ERRCODE_NONE;
+}
+else
+return ERRCODE_GRFILTER_FILTERERROR;
+}
+
+ErrCode GraphicFilter::readPNG(SvStream & rStream, Graphic & rGraphic, 
GfxLinkType & rLinkType, std::unique_ptr & rpGraphicContent,
+sal_Int32& rGraphicContentSize)
+{
+ErrCode aReturnCode = ERRCODE_NONE;
+
+vcl::PNGReader aPNGReader(rStream);
+{
+// check if this PNG contains a GIF chunk!
+const std::vector& rChunkData = 
aPNGReader.GetChunks();
+for (auto const& chunk : rChunkData)
+{
+// Microsoft Office is storing Animated GIFs in following chunk
+if (chunk.nType == PMGCHUNG_msOG)
+{
+sal_uInt32 nChunkSize = chunk.aData.size();
+
+if (nChunkSize > 11)
+{
+const std::vector& rData = chunk.aData;
+rGraphicContentSize = nChunkSize - 11;
+SvMemoryStream aIStrm(const_cast(&rData[11]), 
rGraphicContentSize, StreamMode::READ);
+rpGraphicContent.reset(new sal_uInt8[rGraphicContentSize]);
+sal_uInt64 aCurrentPosition = aIStrm.Tell();
+aIStrm.ReadBytes(rpGraphicContent.get(), 
rGraphicContentSize);
+aIStrm.Seek(aCurrentPosition);
+ImportGIF(aIStrm, rGraphic);
+rLinkType = GfxLinkType::NativeGif;
+return aReturnCode;
+}
+}
+}
+}
+
+// PNG has no GIF chunck
+BitmapEx aBitmapEx(aPNGReader.Read());
+if (!aBitmapEx.IsEmpty())
+{
+rGraphic = aBitmapEx;
+rLinkType = GfxLinkType::NativePng;
+}
+else
+aReturnCode = ERRCODE_GRFILTER_FILTERERROR;
+
+return aReturnCode;
+}
+
+ErrCode GraphicFilter::readJPEG(SvStream & rStream, Graphic & rGraphic, 
GfxLinkType & rLinkType, GraphicFilterImportFlags nImportFlags)
+{
+ErrCode aReturnCode = ERRCODE_NONE;
+
+// set LOGSIZE flag always, if not explicitly disabled
+

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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/filter/GraphicFormatDetector.cxx |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 48d655fe12bc2c4c42d6c88b8a43fade1614ee2a
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 15 16:25:56 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Feb 15 15:25:32 2021 +0100

vcl: Detect TGA graphic by inspecting the file footer

Works only with TGA ver.2 files.

Change-Id: I0378a1e03e238cd444175035768cccf491480191
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110898
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/filter/GraphicFormatDetector.cxx 
b/vcl/source/filter/GraphicFormatDetector.cxx
index 56f7a9f2d006..e5a1eb5f9a79 100644
--- a/vcl/source/filter/GraphicFormatDetector.cxx
+++ b/vcl/source/filter/GraphicFormatDetector.cxx
@@ -513,6 +513,24 @@ bool GraphicFormatDetector::checkSVG()
 
 bool GraphicFormatDetector::checkTGA()
 {
+// Check TGA ver.2 footer bytes
+if (mnStreamLength > 18)
+{
+char sFooterBytes[18];
+
+mrStream.Seek(STREAM_SEEK_TO_END);
+mrStream.SeekRel(-18);
+mrStream.ReadBytes(sFooterBytes, 18);
+
+OString aFooterString(sFooterBytes);
+if (aFooterString == "TRUEVISION-XFILE.")
+{
+msDetectedFormat = "TGA";
+return true;
+}
+}
+
+// Fallback to file extension check
 if (maExtension.startsWith("TGA"))
 {
 msDetectedFormat = "TGA";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - filter/qa sfx2/source

[Mike Kaganski (via logerrit)]

 filter/qa/unit/textfilterdetect.cxx |   20 
 sfx2/source/doc/objstor.cxx |6 --
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit c2316601dfab8eaa4708e21f33427cb5e95e0bc1
Author: Mike Kaganski 
AuthorDate: Wed Jan 27 16:05:54 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 15 15:56:42 2021 +0100

tdf#123476 filter: Also handle empty ODF

This builds on top of commit ada07f303e7cd1e39c73abe0741aefe7d9d73a57,
to allow 0-byte ODT, ODS etc.

Possible TODO would be somehow use default template for such empty files,
getting the template name using SfxObjectFactory::GetStandardTemplate.
That would enable using 0-byte ODF files as means to "create new document
at this location from default template" workflow.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109989
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 2854362f429e476d4a1ab4759c6a1f1c04150280)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110061
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

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

diff --git a/filter/qa/unit/data/empty.odp b/filter/qa/unit/data/empty.odp
new file mode 100644
index ..e69de29bb2d1
diff --git a/filter/qa/unit/data/empty.odt b/filter/qa/unit/data/empty.odt
new file mode 100644
index ..e69de29bb2d1
diff --git a/filter/qa/unit/textfilterdetect.cxx 
b/filter/qa/unit/textfilterdetect.cxx
index cc86fe04c3d5..3bd019aa0685 100644
--- a/filter/qa/unit/textfilterdetect.cxx
+++ b/filter/qa/unit/textfilterdetect.cxx
@@ -94,6 +94,26 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile)
 // Without the accompanying fix in place, this test would have failed, as 
it was opened in
 // Writer instead.
 
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument"));
+
+getComponent()->dispose();
+
+// Now also test ODT
+aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "empty.odt";
+getComponent() = loadFromDesktop(aURL);
+xServiceInfo.set(getComponent(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xServiceInfo.is());
+// Make sure it opens in Writer.
+
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextDocument"));
+getComponent()->dispose();
+
+// ... and ODP
+aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "empty.odp";
+getComponent() = loadFromDesktop(aURL);
+xServiceInfo.set(getComponent(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xServiceInfo.is());
+// Without the accompanying fix in place, this test would have failed, as 
it was opened in
+// Writer instead.
+
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument"));
 }
 }
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 50ec51f7e546..d8d0104ac315 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -438,7 +438,7 @@ bool SfxObjectShell::InitNew( const uno::Reference< 
embed::XStorage >& xStorage
 
 bool SfxObjectShell::Load( SfxMedium& rMedium )
 {
-return GeneralInit_Impl( rMedium.GetStorage(), true );
+return GeneralInit_Impl(rMedium.GetStorage(), 
!tools::isEmptyFileUrl(rMedium.GetName()));
 }
 
 void SfxObjectShell::DoInitUnitTest()
@@ -674,7 +674,9 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 bWarnMediaTypeFallback = false;
 }
 
-if ( bWarnMediaTypeFallback || 
!xStorage->getElementNames().getLength() )
+if (bWarnMediaTypeFallback
+|| (!tools::isEmptyFileUrl(pMedium->GetName())
+&& !xStorage->getElementNames().getLength()))
 SetError(ERRCODE_IO_BROKENPACKAGE);
 }
 catch( uno::Exception& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source editeng/source include/editeng include/vcl vcl/inc vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/hangulhanjadlg.cxx |2 +-
 cui/source/dialogs/thesdlg.cxx|2 +-
 cui/source/factory/dlgfact.cxx|4 ++--
 cui/source/factory/dlgfact.hxx|4 ++--
 cui/source/inc/hangulhanjadlg.hxx |2 +-
 cui/source/inc/thesdlg.hxx|2 +-
 editeng/source/editeng/impedit4.cxx   |7 +--
 editeng/source/editeng/textconv.cxx   |2 +-
 editeng/source/editeng/textconv.hxx   |4 ++--
 editeng/source/misc/hangulhanja.cxx   |8 
 include/editeng/edtdlg.hxx|4 ++--
 include/editeng/hangulhanja.hxx   |4 ++--
 include/vcl/weld.hxx  |7 ---
 vcl/inc/salvtables.hxx|4 ++--
 vcl/source/app/salvtables.cxx |   16 
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   33 +
 16 files changed, 55 insertions(+), 50 deletions(-)

New commits:
commit 0880fb5e3e455cbe5279c6f9cdcd0772cff11312
Author: Caolán McNamara 
AuthorDate: Mon Feb 15 11:52:37 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 15 16:59:42 2021 +0100

use GetPopupParent for editeng transient dialogs

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

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx 
b/cui/source/dialogs/hangulhanjadlg.cxx
index b2da62f49bd0..76c6bdd000a7 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -416,7 +416,7 @@ namespace svx
 m_xListBox->set_help_id(HID_HANGULDLG_SUGGESTIONS_LIST);
 }
 
-HangulHanjaConversionDialog::HangulHanjaConversionDialog(weld::Window* 
pParent)
+HangulHanjaConversionDialog::HangulHanjaConversionDialog(weld::Widget* 
pParent)
 : GenericDialogController(pParent, 
"cui/ui/hangulhanjaconversiondialog.ui", "HangulHanjaConversionDialog")
 , m_bDocumentMode( true )
 , m_xFind(m_xBuilder->weld_button("find"))
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 612f5fe019b2..19580b007616 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -234,7 +234,7 @@ IMPL_LINK_NOARG(SvxThesaurusDialog, SelectFirstHdl_Impl, 
void *, void)
 // class SvxThesaurusDialog --
 
 SvxThesaurusDialog::SvxThesaurusDialog(
-weld::Window* pParent,
+weld::Widget* pParent,
 uno::Reference< linguistic2::XThesaurus > const & xThes,
 const OUString &rWord,
 LanguageType nLanguage)
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index d10914440db5..d371224ffa20 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1066,12 +1066,12 @@ VclPtr 
AbstractDialogFactory_Impl::CreateCaptionDialog
 return 
VclPtr::Create(std::make_shared(pParent,
 pView, nAnchorTypes));
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(weld::Window* 
pParent)
+VclPtr 
AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(weld::Widget* 
pParent)
 {
 return 
VclPtr::Create(std::make_unique(pParent));
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateThesaurusDialog(weld::Window* pParent,
+VclPtr 
AbstractDialogFactory_Impl::CreateThesaurusDialog(weld::Widget* pParent,
 
css::uno::Reference xThesaurus,
 const OUString &rWord, LanguageType nLanguage)
 {
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 87ad9730b307..7d97167193b8 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -791,8 +791,8 @@ public:
 virtual VclPtr CreatePasteDialog(weld::Window* 
pParent) override;
 virtual VclPtr CreateLinksDialog(weld::Window* 
pParent, sfx2::LinkManager* pMgr, bool bHTML = false, sfx2::SvBaseLink* 
p=nullptr) override;
 
-virtual VclPtr 
CreateHangulHanjaConversionDialog(weld::Window* pParent) override;
-virtual VclPtr  
CreateThesaurusDialog(weld::Window*,
+virtual VclPtr 
CreateHangulHanjaConversionDialog(weld::Widget* pParent) override;
+virtual VclPtr  
CreateThesaurusDialog(weld::Widget*,
 
css::uno::Reference xThesaurus,
 const OUString &rWord, 
LanguageType nLanguage) override;
 
diff --git a/cui/source/inc/hangulhanjadlg.hxx 
b/cui/source/inc/hangulhanjadlg.hxx
index 61d7f6317246..716efa0827b8 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -118,7 +118,7 @@ namespace svx
 std::unique_ptr m_xHanjaOnly;
 std::unique_ptr m_xReplaceByChar;
 public:
-HangulHanjaConversionDialog(weld::Window* pParent);
+HangulHanjaConversionDialog(weld::Widget* pParent);
 virtual ~HangulHanjaConversionDialog() override;
 
  

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

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/editview.cxx |2 +-
 editeng/source/editeng/impedit.cxx  |6 +++---
 editeng/source/outliner/outlvw.cxx  |8 
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d5670177aacde2d722cfba6fe8083544549533e0
Author: Caolán McNamara 
AuthorDate: Mon Feb 15 11:29:52 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 15 16:59:23 2021 +0100

use GetOutputDevice for PixelToLogic

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

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 4849b81b6898..7f0a0bb7a809 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -190,7 +190,7 @@ tools::Rectangle EditView::GetInvalidateRect() const
 else
 {
 tools::Rectangle aRect( pImpEditView->aOutArea );
-tools::Long nMore = pImpEditView->GetWindow()->PixelToLogic( Size( 
pImpEditView->GetInvalidateMore(), 0 ) ).Width();
+tools::Long nMore = pImpEditView->GetOutputDevice().PixelToLogic( 
Size( pImpEditView->GetInvalidateMore(), 0 ) ).Width();
 aRect.AdjustLeft( -nMore );
 aRect.AdjustRight(nMore );
 aRect.AdjustTop( -nMore );
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 40d551eab27f..ac51af7597ab 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -879,7 +879,7 @@ void ImpEditView::ResetOutputArea( const tools::Rectangle& 
rRect )
 return;
 
 // #i119885# use grown area if needed; do when getting bigger OR smaller
-const sal_Int32 nMore(DoInvalidateMore() ? 
GetWindow()->PixelToLogic(Size(nInvMore, 0)).Width() : 0);
+const sal_Int32 nMore(DoInvalidateMore() ? 
GetOutputDevice().PixelToLogic(Size(nInvMore, 0)).Width() : 0);
 
 if(aOldArea.Left() > aOutArea.Left())
 {
@@ -2192,7 +2192,7 @@ void ImpEditView::dragGestureRecognized(const 
css::datatransfer::dnd::DragGestur
 // Field?!
 sal_Int32 nPara;
 sal_Int32 nPos;
-Point aMousePos = GetWindow()->PixelToLogic( aMousePosPixel );
+Point aMousePos = GetOutputDevice().PixelToLogic( aMousePosPixel );
 const SvxFieldItem* pField = GetField( aMousePos, &nPara, &nPos );
 if ( pField )
 {
@@ -2237,7 +2237,7 @@ void ImpEditView::dragGestureRecognized(const 
css::datatransfer::dnd::DragGestur
 
 // Sensitive area to be scrolled.
 Size aSz( 5, 0 );
-aSz = GetWindow()->PixelToLogic( aSz );
+aSz = GetOutputDevice().PixelToLogic( aSz );
 pDragAndDropInfo->nSensibleRange = static_cast(aSz.Width());
 pDragAndDropInfo->nCursorWidth = static_cast(aSz.Width()) / 2;
 pDragAndDropInfo->aBeginDragSel = pEditEngine->pImpEditEngine->CreateESel( 
aCopySel );
diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index 487431995636..3c5db2437d88 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -243,7 +243,7 @@ sal_Int32 OutlinerView::ImpCheckMousePos(const Point& 
rPosPix, MouseTarget& reTa
 {
 sal_Int32 nPara = EE_PARA_NOT_FOUND;
 
-Point aMousePosWin = pEditView->GetWindow()->PixelToLogic( rPosPix );
+Point aMousePosWin = pEditView->GetOutputDevice().PixelToLogic( rPosPix );
 if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
 {
 reTarget = MouseTarget::Outside;
@@ -287,7 +287,7 @@ bool OutlinerView::MouseMove( const MouseEvent& rMEvt )
 if( ( pOwner->ImplGetOutlinerMode() == OutlinerMode::TextObject ) || 
pEditView->GetEditEngine()->IsInSelectionMode())
 return pEditView->MouseMove( rMEvt );
 
-Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( 
rMEvt.GetPosPixel() ) );
+Point aMousePosWin( pEditView->GetOutputDevice().PixelToLogic( 
rMEvt.GetPosPixel() ) );
 if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
 return false;
 
@@ -302,7 +302,7 @@ bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt 
)
 if ( ( pOwner->ImplGetOutlinerMode() == OutlinerMode::TextObject ) || 
pEditView->GetEditEngine()->IsInSelectionMode() )
 return pEditView->MouseButtonDown( rMEvt );
 
-Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( 
rMEvt.GetPosPixel() ) );
+Point aMousePosWin( pEditView->GetOutputDevice().PixelToLogic( 
rMEvt.GetPosPixel() ) );
 if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
 return false;
 
@@ -350,7 +350,7 @@ bool OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
 if ( ( pOwner->ImplGetOutlinerMode() == OutlinerMode::TextObject ) || 
pEditView->GetEditEngine()->IsInSelectionMode() )
 return pEditView->MouseButtonUp( rMEvt );
 
-Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( 
rMEvt.GetPosPixel() ) );
+Point aMouse

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sd/source

[Gokce Kuler (via logerrit)]

 sd/source/ui/dlg/BulletAndPositionDlg.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 18d22eaf191b854508f4f34b57e931c26d2f34db
Author: Gokce Kuler 
AuthorDate: Sat Feb 13 00:50:33 2021 +0300
Commit: Xisco Fauli 
CommitDate: Mon Feb 15 17:10:48 2021 +0100

tdf#137406 removed Apply to Master button in Slide Master mode

Change-Id: Ic19c38a5e6e561cae45cd0a40cfe56d7002efe9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110835
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
(cherry picked from commit 9887674044e17c4925caa07f197d74233be810d2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110870
Reviewed-by: Xisco Fauli 

diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx 
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index bb67585ce8eb..2cb3e1c84ddb 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define SHOW_NUMBERING 0
 #define SHOW_BULLET 1
@@ -204,6 +205,10 @@ 
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
 m_xApplyToMaster->hide();
 m_xSlideRB->set_label(SdResId(STR_PAGE_NAME));
 }
+// tdf#137406: Crash when clicking "Apply to Master" in Slide Master mode 
on Bullets and Numbering dialog
+EditMode aEditmode = 
static_cast<::sd::DrawViewShell*>(pView->GetViewShell())->GetEditMode();
+if (aDocumentType == DocumentType::Impress && aEditmode == 
EditMode::MasterPage)
+m_xApplyToMaster->hide();
 
 // End PageCreated
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig solenv/sanitizers

[Caolán McNamara (via logerrit)]

 include/sfx2/strings.hrc  |3 ---
 sfx2/source/sidebar/DeckTitleBar.cxx  |   12 +---
 sfx2/source/sidebar/PanelTitleBar.cxx |2 --
 sfx2/uiconfig/ui/decktitlebar.ui  |9 -
 sfx2/uiconfig/ui/paneltitlebar.ui |9 -
 solenv/sanitizers/ui/sfx.suppr|2 --
 6 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 2f80334f1d4fe0d486f858776687c1180077a5fa
Author: Caolán McNamara 
AuthorDate: Mon Feb 15 14:26:44 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 15 17:23:28 2021 +0100

Related: tdf#140387 give toolbuttons a11y names

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

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index ddf2745ebb05..0fc589d8d4a6 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -295,9 +295,6 @@
 
 #define STR_CLOSE_PANE  NC_("STR_CLOSE_PANE", "Close 
Pane")
 
-#define SFX_STR_SIDEBAR_MORE_OPTIONS
NC_("SFX_STR_SIDEBAR_MORE_OPTIONS", "More Options")
-#define SFX_STR_SIDEBAR_CLOSE_DECK  
NC_("SFX_STR_SIDEBAR_CLOSE_DECK", "Close Sidebar Deck")
-
 // Translators: default Impress template names
 #define STR_TEMPLATE_NAME1  NC_("STR_TEMPLATE_NAME1", "")
 #define STR_TEMPLATE_NAME2  NC_("STR_TEMPLATE_NAME2", 
"Beehive")
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx 
b/sfx2/source/sidebar/DeckTitleBar.cxx
index f7e0a8df7b7e..91d95d69f264 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -119,17 +119,7 @@ void DeckTitleBar::SetCloserVisible (const bool 
bIsCloserVisible)
 
 mbIsCloserVisible = bIsCloserVisible;
 
-if (mbIsCloserVisible)
-{
-mxToolBox->set_item_visible("button", true);
-mxToolBox->set_item_icon_name("button", "sfx2/res/closedoc.png");
-mxToolBox->set_item_tooltip_text("button",
-SfxResId(SFX_STR_SIDEBAR_CLOSE_DECK));
-}
-else
-{
-mxToolBox->set_item_visible("button", false);
-}
+mxToolBox->set_item_visible("button", mbIsCloserVisible);
 }
 
 void DeckTitleBar::HandleToolBoxItemClick()
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx 
b/sfx2/source/sidebar/PanelTitleBar.cxx
index a9ddbc79fcb5..7f2ff3214722 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -109,8 +109,6 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& 
rsCommandName,
 *mxToolBox, *m_xBuilder, msMoreOptionsCommand, rxFrame, 
rxController, true);
 
 mxToolBox->set_item_visible(msIdent, true);
-mxToolBox->set_item_icon_name(msIdent, "sfx2/res/symphony/morebutton.png");
-mxToolBox->set_item_tooltip_text(msIdent, 
SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS));
 }
 
 void PanelTitleBar::HandleToolBoxItemClick()
diff --git a/sfx2/uiconfig/ui/decktitlebar.ui b/sfx2/uiconfig/ui/decktitlebar.ui
index 68ecdc6469be..bbfcba7bf69b 100644
--- a/sfx2/uiconfig/ui/decktitlebar.ui
+++ b/sfx2/uiconfig/ui/decktitlebar.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -61,7 +61,14 @@
   
 True
 False
+Close Sidebar Deck
 True
+sfx2/res/closedoc.png
+
+  
+Close Sidebar Deck
+  
+
   
   
 False
diff --git a/sfx2/uiconfig/ui/paneltitlebar.ui 
b/sfx2/uiconfig/ui/paneltitlebar.ui
index 6fd621856b82..2e352bf21a4f 100644
--- a/sfx2/uiconfig/ui/paneltitlebar.ui
+++ b/sfx2/uiconfig/ui/paneltitlebar.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -68,7 +68,14 @@
   
 True
 False
+More Options
 True
+sfx2/res/symphony/morebutton.png
+
+  
+More Options
+  
+
   
   
 False
diff --git a/solenv/sanitizers/ui/sfx.suppr b/solenv/sanitizers/ui/sfx.suppr
index 58a6dc14654f..31def4bb9fb1 100644
--- a/solenv/sanitizers/ui/sfx.suppr
+++ b/solenv/sanitizers/ui/sfx.suppr
@@ -12,7 +12,6 @@ sfx2/uiconfig/ui/custominfopage.ui://GtkLabel[@id='type'] 
orphan-label
 sfx2/uiconfig/ui/custominfopage.ui://GtkLabel[@id='value'] orphan-label
 sfx2/uiconfig/ui/decktitlebar.ui://GtkImage[@id='addonimage'] no-labelled-by
 sfx2/uiconfig/ui/decktitlebar.ui://GtkLabel[@id='label'] orphan-label
-sfx2/uiconfig/ui/decktitlebar.ui://GtkToolButton[@id='button'] button-no-label
 sfx2/uiconfig/ui/documentinfopage.ui://GtkLabel[@id='showcreate'] orphan-label
 sfx2/uiconfig/ui/documentinfopage.ui://GtkLabel[@id='showmodify'] orphan-label
 sfx2/uiconfig/ui/documentinfopage.ui://GtkLabel[@id='showsigned'] orphan-label
@@ -47,7 +46,6 @@ 
sfx2/uiconfig/ui/templatepanel.ui://GtkToggleToolButton[@id='6'] button-n

[Libreoffice-commits] core.git: cui/uiconfig dbaccess/uiconfig solenv/sanitizers vcl/uiconfig

[homeboy445 (via logerrit)]

 cui/uiconfig/ui/assigncomponentdialog.ui  |2 ++
 dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui |2 ++
 solenv/sanitizers/ui/cui.suppr|2 --
 solenv/sanitizers/ui/dbaccess.suppr   |2 --
 solenv/sanitizers/ui/vcl.suppr|2 --
 vcl/uiconfig/ui/printprogressdialog.ui|2 ++
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 046c5daba237f8f9ad510dfa7fad61e7e32d896b
Author: homeboy445 
AuthorDate: Fri Feb 12 15:39:43 2021 +0530
Commit: Caolán McNamara 
CommitDate: Mon Feb 15 17:52:39 2021 +0100

tdf#119931 Fix accessibility warnings

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

diff --git a/cui/uiconfig/ui/assigncomponentdialog.ui 
b/cui/uiconfig/ui/assigncomponentdialog.ui
index b486c6c780fe..6977373adf74 100644
--- a/cui/uiconfig/ui/assigncomponentdialog.ui
+++ b/cui/uiconfig/ui/assigncomponentdialog.ui
@@ -93,6 +93,8 @@
 False
 start
 Component method name:
+True
+methodEntry
   
   
 False
diff --git a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui 
b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui
index 263365fd1153..faca85637f6c 100644
--- a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui
+++ b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui
@@ -79,6 +79,8 @@
 False
 Socket:
 1
+True
+socketEntry
   
   
 0
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index c960dd21b070..f250aa945ab8 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -4,8 +4,6 @@ 
cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='singlestartex'] orphan-lab
 cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='singleendex'] 
orphan-label
 cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='doublestartex'] 
orphan-label
 cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='doubleendex'] 
orphan-label
-cui/uiconfig/ui/assigncomponentdialog.ui://GtkLabel[@id='label1'] orphan-label
-cui/uiconfig/ui/assigncomponentdialog.ui://GtkEntry[@id='methodEntry'] 
no-labelled-by
 cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='SOURCE2'] orphan-label
 cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='TYPE2'] orphan-label
 cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='UPDATE'] orphan-label
diff --git a/solenv/sanitizers/ui/dbaccess.suppr 
b/solenv/sanitizers/ui/dbaccess.suppr
index 3ae066cf4378..42fc1d16202b 100644
--- a/solenv/sanitizers/ui/dbaccess.suppr
+++ b/solenv/sanitizers/ui/dbaccess.suppr
@@ -31,8 +31,6 @@ 
dbaccess/uiconfig/ui/generalpagewizard.ui://GtkLabel[@id='helpText'] orphan-labe
 dbaccess/uiconfig/ui/generalpagewizard.ui://GtkLabel[@id='sourceTypeHeader'] 
orphan-label
 
dbaccess/uiconfig/ui/generalpagewizard.ui://GtkComboBoxText[@id='datasourceType']
 no-labelled-by
 dbaccess/uiconfig/ui/generalpagewizard.ui://GtkLabel[@id='specialMessage'] 
orphan-label
-dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui://GtkLabel[@id='socketLabel']
 orphan-label
-dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui://GtkEntry[@id='socketEntry']
 no-labelled-by
 dbaccess/uiconfig/ui/indexdesigndialog.ui://GtkLabel[@id='DESC_LABEL'] 
orphan-label
 dbaccess/uiconfig/ui/indexdesigndialog.ui://GtkLabel[@id='DESCRIPTION'] 
orphan-label
 dbaccess/uiconfig/ui/indexdesigndialog.ui://GtkLabel[@id='FIELDS_LABEL'] 
orphan-label
diff --git a/solenv/sanitizers/ui/vcl.suppr b/solenv/sanitizers/ui/vcl.suppr
index a1b4ec5e4f98..c053a035fd32 100644
--- a/solenv/sanitizers/ui/vcl.suppr
+++ b/solenv/sanitizers/ui/vcl.suppr
@@ -15,8 +15,6 @@ 
vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='pagemargintxt2'] orphan-label
 vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='sheetmargintxt2'] orphan-label
 vcl/uiconfig/ui/printdialog.ui://GtkComboBoxText[@id='scriptdirection'] 
no-labelled-by
 vcl/uiconfig/ui/printerdevicepage.ui://GtkEntry[@id='custom'] no-labelled-by
-vcl/uiconfig/ui/printprogressdialog.ui://GtkLabel[@id='label'] orphan-label
-vcl/uiconfig/ui/printprogressdialog.ui://GtkProgressBar[@id='progressbar'] 
no-labelled-by
 vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='labelfoo'] orphan-label
 vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label4'] orphan-label
 vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label5'] orphan-label
diff --git a/vcl/uiconfig/ui/printprogressdialog.ui 
b/vcl/uiconfig/ui/printprogressdialog.ui
index d6d3f449484f..fe17fbd3f18b 100644
--- a/vcl/uiconfig/ui/printprogressdialog.ui
+++ b/vcl/uiconfig/ui/printprogressdialog.ui
@@ -53,6 +53,8 @@
 True
 False
 Page %p of %n
+

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

[Caolán McNamara (via logerrit)]

 canvas/source/opengl/ogl_canvashelper.cxx |   88 ++
 1 file changed, 43 insertions(+), 45 deletions(-)

New commits:
commit b7ee599c2ee4287cc39752db3b09444dcb65c0c2
Author: Caolán McNamara 
AuthorDate: Sat Feb 13 21:23:55 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 15 18:21:18 2021 +0100

cid#1292911 experiment to see what the complaint is referring to

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

diff --git a/canvas/source/opengl/ogl_canvashelper.cxx 
b/canvas/source/opengl/ogl_canvashelper.cxx
index d64e1ba1d7f0..4ac30e703ba7 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -69,6 +69,14 @@ namespace oglcanvas
Text: http://www.opengl.org/resources/features/fontsurvey/
  */
 
+typedef std::function< bool (
+const CanvasHelper&,
+const ::basegfx::B2DHomMatrix&,
+GLenum,
+GLenum,
+const rendering::ARGBColor&,
+const ::basegfx::B2DPolyPolygonVector&)> functor;
+
 struct CanvasHelper::Action
 {
 ::basegfx::B2DHomMatrix maTransform;
@@ -77,13 +85,12 @@ namespace oglcanvas
 rendering::ARGBColormaARGBColor;
 ::basegfx::B2DPolyPolygonVector maPolyPolys;
 
-std::function< bool (
-const CanvasHelper&,
-const ::basegfx::B2DHomMatrix&,
-GLenum,
-GLenum,
-const rendering::ARGBColor&,
-const ::basegfx::B2DPolyPolygonVector&)> 
maFunction;
+functor maFunction;
+
+Action(const functor& rFunction)
+: maFunction(rFunction)
+{
+}
 };
 
 namespace
@@ -385,13 +392,13 @@ namespace oglcanvas
 {
 if( mpDevice )
 {
-mpRecordedActions->push_back( Action() );
+mpRecordedActions->push_back(Action(std::bind(lcl_drawLine,
+ std::placeholders::_1, 
std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, 
std::placeholders::_5,
+ aStartPoint, aEndPoint)));
+
 Action& rAct=mpRecordedActions->back();
 
 setupGraphicsState( rAct, viewState, renderState );
-rAct.maFunction = std::bind(&lcl_drawLine,
-  std::placeholders::_1, 
std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, 
std::placeholders::_5,
-  aStartPoint, aEndPoint);
 }
 }
 
@@ -404,18 +411,17 @@ namespace oglcanvas
 if( !mpDevice )
 return;
 
-mpRecordedActions->push_back( Action() );
+// TODO(F2): subdivide&render whole curve
+mpRecordedActions->push_back(Action(std::bind(lcl_drawLine,
+   std::placeholders::_1, 
std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, 
std::placeholders::_5,
+   geometry::RealPoint2D(
+   aBezierSegment.Px,
+   aBezierSegment.Py),
+   aEndPoint)));
+
 Action& rAct=mpRecordedActions->back();
 
 setupGraphicsState( rAct, viewState, renderState );
-
-// TODO(F2): subdivide&render whole curve
-rAct.maFunction = std::bind(&lcl_drawLine,
-std::placeholders::_1, 
std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, 
std::placeholders::_5,
-geometry::RealPoint2D(
-aBezierSegment.Px,
-aBezierSegment.Py),
-aEndPoint);
 }
 
 uno::Reference< rendering::XCachedPrimitive > 
CanvasHelper::drawPolyPolygon( const rendering::XCanvas*
  /*pCanvas*/,
@@ -428,15 +434,13 @@ namespace oglcanvas
 
 if( mpDevice )
 {
-mpRecordedActions->push_back( Action() );
+mpRecordedActions->push_back(Action(lcl_drawPolyPolygon));
 Action& rAct=mpRecordedActions->back();
 
 setupGraphicsState( rAct, viewState, renderState );
 rAct.maPolyPolys.push_back(
 
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon));
 rAct.maPolyPolys.back().makeUnique(); // own copy, for thread 
safety
-
-rAct.maFunction = &lcl_drawPolyPolygon;
 }
 
 // TODO(P1): P

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

[Tünde Tóth (via logerrit)]

 sc/qa/unit/uicalc/uicalc.cxx   |   77 +
 sc/source/ui/docshell/dbdocfun.cxx |2 
 2 files changed, 79 insertions(+)

New commits:
commit e51f4419645305037af92d051b7ca40d77da4678
Author: Tünde Tóth 
AuthorDate: Wed Feb 10 16:46:12 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Feb 15 20:23:24 2021 +0100

tdf#123202 calc: fix sorting of autofiltered rows

by keeping the query, when the data range contains
hidden rows.

Change-Id: Ib3de0c36d53b6fd4541a9cb5e53e018c29bd38c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110715
Tested-by: László Németh 
Reviewed-by: László Németh 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110940
Tested-by: Jenkins

diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index b7581fdb0c37..c744528b8e0e 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -30,6 +30,9 @@ public:
 
 ScModelObj* createDoc(const char* pName);
 void checkCurrentCell(SCCOL nCol, SCROW nRow);
+void goToCell(const OUString& rCell);
+void insertStringToCell(ScModelObj& rModelObj, const OUString& rCell, 
const std::string& rStr,
+bool bIsArray = false);
 
 protected:
 uno::Reference mxComponent;
@@ -56,6 +59,39 @@ void ScUiCalcTest::checkCurrentCell(SCCOL nCol, SCROW nRow)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(nRow), 
ScDocShell::GetViewData()->GetCurY());
 }
 
+void ScUiCalcTest::goToCell(const OUString& rCell)
+{
+uno::Sequence aArgs
+= comphelper::InitPropertySequence({ { "ToPoint", uno::makeAny(rCell) 
} });
+dispatchCommand(mxComponent, ".uno:GoToCell", aArgs);
+}
+
+void ScUiCalcTest::insertStringToCell(ScModelObj& rModelObj, const OUString& 
rCell,
+  const std::string& rStr, bool bIsArray)
+{
+goToCell(rCell);
+
+for (const char c : rStr)
+{
+rModelObj.postKeyEvent(LOK_KEYEVENT_KEYINPUT, c, 0);
+rModelObj.postKeyEvent(LOK_KEYEVENT_KEYUP, c, 0);
+Scheduler::ProcessEventsToIdle();
+}
+
+if (bIsArray)
+{
+rModelObj.postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_MOD1 | KEY_SHIFT 
| awt::Key::RETURN);
+rModelObj.postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_MOD1 | KEY_SHIFT | 
awt::Key::RETURN);
+Scheduler::ProcessEventsToIdle();
+}
+else
+{
+rModelObj.postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN);
+rModelObj.postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN);
+Scheduler::ProcessEventsToIdle();
+}
+}
+
 char const DATA_DIRECTORY[] = "/sc/qa/unit/uicalc/data/";
 
 ScModelObj* ScUiCalcTest::createDoc(const char* pName)
@@ -287,6 +323,47 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf133342)
 CPPUNIT_ASSERT_EQUAL(OUString("12 %"), pDoc->GetString(ScAddress(0, 0, 
0)));
 }
 
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf123202)
+{
+mxComponent = loadFromDesktop("private:factory/scalc");
+ScModelObj* pModelObj = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pModelObj);
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+insertStringToCell(*pModelObj, "A1", "1");
+insertStringToCell(*pModelObj, "A2", "2");
+insertStringToCell(*pModelObj, "A3", "3");
+insertStringToCell(*pModelObj, "A4", "4");
+
+goToCell("A3");
+
+dispatchCommand(mxComponent, ".uno:HideRow", {});
+
+goToCell("A1:A4");
+
+dispatchCommand(mxComponent, ".uno:SortDescending", {});
+
+CPPUNIT_ASSERT_EQUAL(OUString("4"), pDoc->GetString(ScAddress(0, 0, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("3"), pDoc->GetString(ScAddress(0, 1, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("2"), pDoc->GetString(ScAddress(0, 2, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("1"), pDoc->GetString(ScAddress(0, 3, 0)));
+
+// This failed, if the "3" is visible.
+CPPUNIT_ASSERT(pDoc->RowHidden(1, 0));
+CPPUNIT_ASSERT(!pDoc->RowHidden(2, 0));
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+
+CPPUNIT_ASSERT_EQUAL(OUString("1"), pDoc->GetString(ScAddress(0, 0, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("2"), pDoc->GetString(ScAddress(0, 1, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("3"), pDoc->GetString(ScAddress(0, 2, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("4"), pDoc->GetString(ScAddress(0, 3, 0)));
+
+CPPUNIT_ASSERT(!pDoc->RowHidden(1, 0));
+CPPUNIT_ASSERT(pDoc->RowHidden(2, 0));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index e15282480fc0..f18973541fc5 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -574,6 +574,8 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& 
rSortParam,
 ScInputOptions aInputOption = SC_MOD()->GetInputOptions();
 bool bUpdateRefs = aInputOption.GetSortRefUpda

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Widget.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 41cffc379259fec626a282ca243a9750d96d1c63
Author: Jan-Marek Glogowski 
AuthorDate: Mon Feb 15 17:46:37 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Feb 15 20:44:08 2021 +0100

tdf#140207 Qt downscale the ExtTextInputPos

Qt reports the unscaled pixel values to the IM, so simply divide
all values reported by SalEvent::ExtTextInputPos by the window's
scale factor. This correctly positions the IM window on a scaled
LO window.

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

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 68742b07c51e..4608482627be 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -681,10 +681,11 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery 
property) const
 }
 case Qt::ImCursorRectangle:
 {
+const qreal fRatio = m_rFrame.devicePixelRatioF();
 SalExtTextInputPosEvent aPosEvent;
 m_rFrame.CallCallback(SalEvent::ExtTextInputPos, &aPosEvent);
-return QVariant(
-QRect(aPosEvent.mnX, aPosEvent.mnY, aPosEvent.mnWidth, 
aPosEvent.mnHeight));
+return QVariant(QRect(aPosEvent.mnX / fRatio, aPosEvent.mnY / 
fRatio,
+  aPosEvent.mnWidth / fRatio, 
aPosEvent.mnHeight / fRatio));
 }
 case Qt::ImAnchorPosition:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - translations

[Andras Timar (via logerrit)]

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

New commits:
commit fb101fd42a5fdf2d62bc74f16e982c8eb30d0c31
Author: Andras Timar 
AuthorDate: Mon Feb 15 20:51:47 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Feb 15 20:51:47 2021 +0100

Update git submodules

* Update translations from branch 'distro/collabora/cp-6.4'
  to 0c8c6b0d6280466e025e5b5bcfb4d2db1399c871
  - Translation update

Change-Id: I394b633d4357e0e1661f70c457cbde1a15882a1a

diff --git a/translations b/translations
index 2ba607b3f87b..0c8c6b0d6280 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2ba607b3f87ba2e877520034f516499fc12a111d
+Subproject commit 0c8c6b0d6280466e025e5b5bcfb4d2db1399c871
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Widget.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 77f61fe0240b5744043dc216a3c48ef2eaf11ec8
Author: Jan-Marek Glogowski 
AuthorDate: Mon Feb 15 17:55:43 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Feb 15 21:33:30 2021 +0100

Qt don't fallthrough in inputMethodQuery

So my initiak code had a single case with fallthrough to the
default, but that is totally bogus for multiple cases. I honestly
have no idea, if that ever was correct. I also don't know, if
simply returning an empty QVariant is the correct error handling,
but the fallthroughs were definitly wrong.

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

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 4608482627be..a2bf8fe6472d 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -670,14 +670,14 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery 
property) const
 sal_Int32 nCursorPos, nAnchor;
 if (lcl_retrieveSurrounding(nCursorPos, nAnchor, &aText, nullptr))
 return QVariant(aText);
-[[fallthrough]];
+return QVariant();
 }
 case Qt::ImCursorPosition:
 {
 sal_Int32 nCursorPos, nAnchor;
 if (lcl_retrieveSurrounding(nCursorPos, nAnchor, nullptr, nullptr))
 return QVariant(static_cast(nCursorPos));
-[[fallthrough]];
+return QVariant();
 }
 case Qt::ImCursorRectangle:
 {
@@ -692,7 +692,7 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery 
property) const
 sal_Int32 nCursorPos, nAnchor;
 if (lcl_retrieveSurrounding(nCursorPos, nAnchor, nullptr, nullptr))
 return QVariant(static_cast(nAnchor));
-[[fallthrough]];
+return QVariant();
 }
 case Qt::ImCurrentSelection:
 {
@@ -700,13 +700,11 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery 
property) const
 sal_Int32 nCursorPos, nAnchor;
 if (lcl_retrieveSurrounding(nCursorPos, nAnchor, nullptr, 
&aSelection))
 return QVariant(aSelection);
-[[fallthrough]];
+return QVariant();
 }
 default:
 return QWidget::inputMethodQuery(property);
 }
-
-return QVariant();
 }
 
 void Qt5Widget::endExtTextInput()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/00/0406.xhp   |2 +-
 source/text/shared/optionen/01010400.xhp |2 +-
 source/text/shared/optionen/0115.xhp |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d516db9def327573d7fba77cd4f89ddc20236fce
Author: Johnny_M 
AuthorDate: Sun Feb 14 10:45:32 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Feb 15 22:03:16 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/0406.xhp 
b/source/text/shared/00/0406.xhp
index d74102b97..f3f9e4ed4 100644
--- a/source/text/shared/00/0406.xhp
+++ b/source/text/shared/00/0406.xhp
@@ -159,7 +159,7 @@
 Choose %PRODUCTNAME - 
PreferencesTools - 
Options - Language 
Settings.
 Choose %PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings - 
Languages.
 Choose %PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings - 
Languages - Complex Text Layout.
-
+
 Choose 
%PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings - 
Languages.
 
 
diff --git a/source/text/shared/optionen/01010400.xhp 
b/source/text/shared/optionen/01010400.xhp
index 0c72a6783..2b0193e19 100644
--- a/source/text/shared/optionen/01010400.xhp
+++ b/source/text/shared/optionen/01010400.xhp
@@ -26,7 +26,7 @@
 
 
 
-
+
 writing aids options
 custom dictionaries; editing
 user-defined dictionaries; editing
diff --git a/source/text/shared/optionen/0115.xhp 
b/source/text/shared/optionen/0115.xhp
index 95763f9a9..fefd17e91 100644
--- a/source/text/shared/optionen/0115.xhp
+++ b/source/text/shared/optionen/0115.xhp
@@ -38,7 +38,7 @@
   
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit e76da7c98dbe2647373f8197a9453a0710bb1288
Author: Johnny_M 
AuthorDate: Mon Feb 15 22:03:16 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Feb 15 22:03:16 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to d516db9def327573d7fba77cd4f89ddc20236fce
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index a9976d5f4fd4..d516db9def32 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a9976d5f4fd4d2c2841e83a4a2cdcaeda4419136
+Subproject commit d516db9def327573d7fba77cd4f89ddc20236fce
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: problem with link error in unit test

[Regina Henschel]

Hi Noel,

my local build on Windows 10 with VS2019 works, but gerrit_mac and 
gerrit_android_x86_64 complain.

https://gerrit.libreoffice.org/c/core/+/110959

I still need help.

Kind regards
Regina

Noel Grandin schrieb am 14.02.2021 um 06:52:


Hi

You will need to annotate those methods with SC_DLLPUBLIC
to make them visible to the unit tests

-- Noel Grandin


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Johnny_M (via logerrit)]

 source/text/shared/main0208.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d832d9a27e3c8dc15c44f2d85e340583e9f36233
Author: Johnny_M 
AuthorDate: Mon Feb 15 11:44:37 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:13:57 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/main0208.xhp b/source/text/shared/main0208.xhp
index 0b9465663..c75d60e06 100644
--- a/source/text/shared/main0208.xhp
+++ b/source/text/shared/main0208.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 Status Bar in $[officename] Basic Documents
 The 
Status Bar displays information about the current $[officename] 
Basic document.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 18bb6ca330af99ac0c9bc588d79673eabdae0554
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:13:57 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:13:57 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to d832d9a27e3c8dc15c44f2d85e340583e9f36233
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index d516db9def32..d832d9a27e3c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d516db9def327573d7fba77cd4f89ddc20236fce
+Subproject commit d832d9a27e3c8dc15c44f2d85e340583e9f36233
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sdraw/main0100.xhp  |2 +-
 source/text/shared/main0108.xhp |3 ---
 source/text/smath/main0100.xhp  |2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 0d6b658e342a9a56d5ec7db1b76c1378ed03a4bf
Author: Johnny_M 
AuthorDate: Mon Feb 15 11:46:58 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:14:39 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sdraw/main0100.xhp b/source/text/sdraw/main0100.xhp
index b1c9a08ac..316aba79c 100644
--- a/source/text/sdraw/main0100.xhp
+++ b/source/text/sdraw/main0100.xhp
@@ -50,6 +50,6 @@
   
   -->
   
-  
+  
  
 
diff --git a/source/text/shared/main0108.xhp b/source/text/shared/main0108.xhp
index e8f8d4d60..e089ae749 100644
--- a/source/text/shared/main0108.xhp
+++ b/source/text/shared/main0108.xhp
@@ -29,14 +29,11 @@
 
 
 
-
-
 
 
 Help
 The Help menu allows you to start and control the 
$[officename] Help system.
 
-
 
 
 
diff --git a/source/text/smath/main0100.xhp b/source/text/smath/main0100.xhp
index 699ace868..2f1915983 100644
--- a/source/text/smath/main0100.xhp
+++ b/source/text/smath/main0100.xhp
@@ -50,7 +50,7 @@
   
   
   
-  
+  
   
  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 7c533df908f2485c3a285477a38adb55458551cf
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:14:39 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:14:39 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0d6b658e342a9a56d5ec7db1b76c1378ed03a4bf
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index d832d9a27e3c..0d6b658e342a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d832d9a27e3c8dc15c44f2d85e340583e9f36233
+Subproject commit 0d6b658e342a9a56d5ec7db1b76c1378ed03a4bf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/05/0100.xhp |2 +-
 source/text/shared/05/new_help.xhp |2 +-
 source/text/swriter/main.xhp   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d9b55436a388bd655b209ec9344ac41c60aa4421
Author: Johnny_M 
AuthorDate: Mon Feb 15 11:56:57 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:15:20 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/05/0100.xhp 
b/source/text/shared/05/0100.xhp
index 6f6651631..1ae3c7298 100644
--- a/source/text/shared/05/0100.xhp
+++ b/source/text/shared/05/0100.xhp
@@ -25,7 +25,7 @@
   
 
 
-this section is displayed on all module main 
pages above the other "Help about Help" links.
+this section is displayed on all module main pages 
above the other "Help about Help" links.
  The Help 
references the default settings of the program on a system that is set to 
defaults. Descriptions of colors, mouse actions, or other configurable items 
can be different for your program and system.
 
   The 
$[officename] Help system provides easy access to information and 
support. There are several ways to find what you are looking for in the Help 
environment: You can search for a specific keyword in the Index, 
carry out a full-text search under Find, or look through a hierarchical list of 
the Topics.
diff --git a/source/text/shared/05/new_help.xhp 
b/source/text/shared/05/new_help.xhp
index 5c2400b7e..b346ee794 100644
--- a/source/text/shared/05/new_help.xhp
+++ b/source/text/shared/05/new_help.xhp
@@ -28,7 +28,7 @@
 
 
 %PRODUCTNAME Help pages are displayed in your system default 
web browser.
-
+
 The Help system for all versions of the 
software is based on the same source files. Some of the functions described in 
Help may not be included in this particular distribution. Some features 
specific to a distribution may not be mentioned in this Help.
 Provides an overview of the Help 
system.
 Help pages of %PRODUCTNAME Extensions 
still use the old Help system. The old Help system help pages are available from 
here.
diff --git a/source/text/swriter/main.xhp b/source/text/swriter/main.xhp
index 8e271d35d..405fe1b47 100644
--- a/source/text/swriter/main.xhp
+++ b/source/text/swriter/main.xhp
@@ -45,7 +45,7 @@
 
 
 Help 
about the Help
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 7ba187ce3fc261f24bd25b71acff97bbd3f8a5e5
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:15:20 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:15:20 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to d9b55436a388bd655b209ec9344ac41c60aa4421
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 0d6b658e342a..d9b55436a388 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0d6b658e342a9a56d5ec7db1b76c1378ed03a4bf
+Subproject commit d9b55436a388bd655b209ec9344ac41c60aa4421
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/1212.xhp |4 ++--
 source/text/shared/main0212.xhp|4 ++--
 source/text/shared/main0213.xhp|4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 79ed003b367f90e718561eda01affd67330744f3
Author: Johnny_M 
AuthorDate: Mon Feb 15 12:00:54 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:16:04 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/1212.xhp 
b/source/text/shared/02/1212.xhp
index e4fd2faed..fd56ba479 100644
--- a/source/text/shared/02/1212.xhp
+++ b/source/text/shared/02/1212.xhp
@@ -28,12 +28,12 @@
   
 
 
-
+
 
 Apply 
Filter
 Switches between the filtered and 
unfiltered view of the table.
 
-
+
 
   
 
diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp
index b5b627b7a..89a4c2203 100644
--- a/source/text/shared/main0212.xhp
+++ b/source/text/shared/main0212.xhp
@@ -72,8 +72,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
diff --git a/source/text/shared/main0213.xhp b/source/text/shared/main0213.xhp
index b5625fadd..5c476431f 100644
--- a/source/text/shared/main0213.xhp
+++ b/source/text/shared/main0213.xhp
@@ -188,7 +188,7 @@
 
 
 
-
-
+
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 3b480e085ecb8d05e4f4c4946d7a7ab4732da3d3
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:16:04 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:16:04 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 79ed003b367f90e718561eda01affd67330744f3
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index d9b55436a388..79ed003b367f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d9b55436a388bd655b209ec9344ac41c60aa4421
+Subproject commit 79ed003b367f90e718561eda01affd67330744f3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/01170900.xhp |4 ++--
 source/text/shared/02/01170903.xhp |2 +-
 source/text/shared/02/01170904.xhp |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 037c4daa4566e8a57b70dc28ec319bb8dc4f142f
Author: Johnny_M 
AuthorDate: Mon Feb 15 12:02:54 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:16:53 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/01170900.xhp 
b/source/text/shared/02/01170900.xhp
index dd274c985..56b90ab1b 100644
--- a/source/text/shared/02/01170900.xhp
+++ b/source/text/shared/02/01170900.xhp
@@ -52,8 +52,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/shared/02/01170903.xhp 
b/source/text/shared/02/01170903.xhp
index c230e0d52..95a5515a7 100644
--- a/source/text/shared/02/01170903.xhp
+++ b/source/text/shared/02/01170903.xhp
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 List Box 
Wizard: Field Link
diff --git a/source/text/shared/02/01170904.xhp 
b/source/text/shared/02/01170904.xhp
index 2d185e053..cf171216a 100644
--- a/source/text/shared/02/01170904.xhp
+++ b/source/text/shared/02/01170904.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 Combo Box Wizard: Database Field
 With the 
combination fields, you can either save the value of a field in a database or 
display this value in a form.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 25360c2d5a8c131460793c391b1e373937824a9f
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:16:53 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:16:53 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 037c4daa4566e8a57b70dc28ec319bb8dc4f142f
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 79ed003b367f..037c4daa4566 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 79ed003b367f90e718561eda01affd67330744f3
+Subproject commit 037c4daa4566e8a57b70dc28ec319bb8dc4f142f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/2407.xhp |4 ++--
 source/text/shared/02/colortoolbar.xhp |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 09d1cd6729f7371f47190667bc6e45513f9344a3
Author: Johnny_M 
AuthorDate: Mon Feb 15 12:12:10 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:17:25 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/2407.xhp 
b/source/text/shared/02/2407.xhp
index 5a321962a..dbe6c0b5b 100644
--- a/source/text/shared/02/2407.xhp
+++ b/source/text/shared/02/2407.xhp
@@ -28,12 +28,12 @@
   
 
 
-
+
 
 Contrast
 Specifies the contrast for viewing 
the selected graphic image. Values from -100% (no contrast at all) to 
+100% (full contrast) are possible.
 
-
+
 
   
 
diff --git a/source/text/shared/02/colortoolbar.xhp 
b/source/text/shared/02/colortoolbar.xhp
index 6d2937716..89a9f66b7 100644
--- a/source/text/shared/02/colortoolbar.xhp
+++ b/source/text/shared/02/colortoolbar.xhp
@@ -44,8 +44,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit f57fe7140694a923c08ee69f29c7c0fd96e1c6b3
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:17:25 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:17:25 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 09d1cd6729f7371f47190667bc6e45513f9344a3
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 037c4daa4566..09d1cd6729f7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 037c4daa4566e8a57b70dc28ec319bb8dc4f142f
+Subproject commit 09d1cd6729f7371f47190667bc6e45513f9344a3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/1302.xhp |2 +-
 source/text/swriter/main0213.xhp   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7d23998f7362870056ed483c93e352d773b40210
Author: Johnny_M 
AuthorDate: Mon Feb 15 12:15:44 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:17:59 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/1302.xhp 
b/source/text/shared/02/1302.xhp
index cf682bf86..03d38f6d0 100644
--- a/source/text/shared/02/1302.xhp
+++ b/source/text/shared/02/1302.xhp
@@ -28,7 +28,7 @@
   
 
 
-
+
 margins; setting with the 
mouse
 columns; setting with the mouse
 paragraphs; indents, margins and columns
diff --git a/source/text/swriter/main0213.xhp b/source/text/swriter/main0213.xhp
index 8bda1bfaf..f0c0f85eb 100644
--- a/source/text/swriter/main0213.xhp
+++ b/source/text/swriter/main0213.xhp
@@ -38,6 +38,6 @@
   
   By 
double-clicking on the ruler, you can open the Paragraph dialog 
and assign direct paragraph formatting for the current 
paragraph or all selected paragraphs.
   
-  
+  
  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit e696674899ee5bf6f3a216ca2f97de9511e4c544
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:17:59 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:17:59 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7d23998f7362870056ed483c93e352d773b40210
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 09d1cd6729f7..7d23998f7362 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 09d1cd6729f7371f47190667bc6e45513f9344a3
+Subproject commit 7d23998f7362870056ed483c93e352d773b40210
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sdraw/main0101.xhp |2 +-
 source/text/shared/02/0706.xhp |2 --
 source/text/smath/main0101.xhp |2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 31b432160e5b8866dea1ed469764aab8c38fda17
Author: Johnny_M 
AuthorDate: Mon Feb 15 12:17:30 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:18:39 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sdraw/main0101.xhp b/source/text/sdraw/main0101.xhp
index 5a765ad35..9187cfc6e 100644
--- a/source/text/sdraw/main0101.xhp
+++ b/source/text/sdraw/main0101.xhp
@@ -44,7 +44,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/02/0706.xhp 
b/source/text/shared/02/0706.xhp
index 53746d8e3..08d64a67a 100644
--- a/source/text/shared/02/0706.xhp
+++ b/source/text/shared/02/0706.xhp
@@ -29,13 +29,11 @@
 
 
 
-
 reloading; 
documentsdocuments; 
reloadingloading; 
reloading
 
 Reload
 Replaces the current document with the 
last saved version.
 
-
 Any changes 
made after the last save will be lost.
 
   
diff --git a/source/text/smath/main0101.xhp b/source/text/smath/main0101.xhp
index d5ed335af..367cadb11 100644
--- a/source/text/smath/main0101.xhp
+++ b/source/text/smath/main0101.xhp
@@ -42,7 +42,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit c869d91d3d644a0110e2b0aa02e9157912c7c206
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:18:39 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:18:39 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 31b432160e5b8866dea1ed469764aab8c38fda17
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 7d23998f7362..31b432160e5b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7d23998f7362870056ed483c93e352d773b40210
+Subproject commit 31b432160e5b8866dea1ed469764aab8c38fda17
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/scalc/main0112.xhp |2 +-
 source/text/shared/02/1202.xhp |2 +-
 source/text/shared/main0212.xhp|2 +-
 source/text/shared/main0213.xhp|2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3644c0ce61e6b7486be3f64d27139b37011df15a
Author: Johnny_M 
AuthorDate: Mon Feb 15 12:20:34 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:19:31 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/scalc/main0112.xhp b/source/text/scalc/main0112.xhp
index c46aab32c..7c24bee3f 100644
--- a/source/text/scalc/main0112.xhp
+++ b/source/text/scalc/main0112.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/02/1202.xhp 
b/source/text/shared/02/1202.xhp
index e7b80728f..e15cf5871 100644
--- a/source/text/shared/02/1202.xhp
+++ b/source/text/shared/02/1202.xhp
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 Sort Descending
 Sorts the data of the selected field in 
descending order. Text fields are sorted alphabetically, number fields 
are sorted by number.
diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp
index 89a4c2203..410b99a3c 100644
--- a/source/text/shared/main0212.xhp
+++ b/source/text/shared/main0212.xhp
@@ -68,7 +68,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/source/text/shared/main0213.xhp b/source/text/shared/main0213.xhp
index 5c476431f..fca23c525 100644
--- a/source/text/shared/main0213.xhp
+++ b/source/text/shared/main0213.xhp
@@ -175,7 +175,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 685b01e4f90e27a3581b6320a84f8663a4c6edce
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:19:31 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:19:31 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 3644c0ce61e6b7486be3f64d27139b37011df15a
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 31b432160e5b..3644c0ce61e6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 31b432160e5b8866dea1ed469764aab8c38fda17
+Subproject commit 3644c0ce61e6b7486be3f64d27139b37011df15a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/0315.xhp |4 ++--
 source/text/shared/main0204.xhp|4 ++--
 source/text/swriter/main0204.xhp   |4 ++--
 source/text/swriter/main0215.xhp   |4 ++--
 source/text/swriter/main0216.xhp   |4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 097d1cc82b507804eacc675156dd1bb3f6a92a4e
Author: Johnny_M 
AuthorDate: Mon Feb 15 12:09:06 2021 +0100
Commit: Olivier Hallot 
CommitDate: Tue Feb 16 00:20:21 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/0315.xhp 
b/source/text/shared/02/0315.xhp
index 1d9d4aece..f54a3ea30 100644
--- a/source/text/shared/02/0315.xhp
+++ b/source/text/shared/02/0315.xhp
@@ -25,12 +25,12 @@
   
 
 
-
+
 
 Border 
Color
 Click the Line Color (of the border) 
icon to open the Border Color toolbar, which enables you to change 
the border color of an object.
 
-
+
 
   
 
diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp
index 42f4d1487..467f4148c 100644
--- a/source/text/shared/main0204.xhp
+++ b/source/text/shared/main0204.xhp
@@ -36,8 +36,8 @@
 
 
 
-
-
+
+
 
 
 Area Style / 
Filling
diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp
index 4b3318cd7..b96c14e50 100644
--- a/source/text/swriter/main0204.xhp
+++ b/source/text/swriter/main0204.xhp
@@ -36,8 +36,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp
index 626edb9b9..601b230b1 100644
--- a/source/text/swriter/main0215.xhp
+++ b/source/text/swriter/main0215.xhp
@@ -59,8 +59,8 @@
 
 
 
-
-
+
+
 Background 
Color
 
 
diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp
index 7a4347237..50b2b1def 100644
--- a/source/text/swriter/main0216.xhp
+++ b/source/text/swriter/main0216.xhp
@@ -65,8 +65,8 @@
 
 
 
-
-
+
+
 Object 
Properties
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit a0c0cd9e53a0dea115c145b3092eeafbaa06b545
Author: Johnny_M 
AuthorDate: Tue Feb 16 00:20:21 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 16 00:20:21 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 097d1cc82b507804eacc675156dd1bb3f6a92a4e
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 3644c0ce61e6..097d1cc82b50 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3644c0ce61e6b7486be3f64d27139b37011df15a
+Subproject commit 097d1cc82b507804eacc675156dd1bb3f6a92a4e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 15 commits - compilerplugins/clang desktop/source filter/CppunitTest_filter_dxf_test.mk filter/CppunitTest_filter_eps_test.mk filter

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit 3bb155d57c9a443e0e844d2d24ec1fa76917496d
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 16 09:16:55 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Feb 16 09:16:55 2021 +0900

vcl: condense the description and rename the peek format function

remove "Imp" from ImpPeekGraphicFormat function name and condense
the description of the function.

Change-Id: Ie7cc42645318c0035f082ae68087ca3c7077d365

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 782fa735da8a..7ee49825cda1 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -181,34 +181,17 @@ bool isPCT(SvStream& rStream, sal_uLong nStreamPos, 
sal_uLong nStreamLen)
 return false;
 }
 
-/*
- *
- *ImpPeekGraphicFormat()
- *
- *Description:
- *This function is two-fold:
- *1.) Start reading file, determine the file format:
- *Input parameters:
- *  rPath- file path
- *  rFormatExtension - content matter
- *  bTest- set false
- *Output parameters:
- *  Return value - true if success
- *  rFormatExtension - on success: normal file extension in 
capitals
- *2.) Start reading file, verify file format
- *Input parameters:
- *  rPath- file path
- *  rFormatExtension - normal file extension in capitals
- *  bTest- set true
- *Output parameters:
- *  Return value- false, if cannot verify the file type
- *  passed to the function
- * true, when the format is PROBABLY verified 
or
- * WHEN THE FORMAT IS NOT KNOWN!
- *
- */
-
-bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bool 
bTest )
+/***
+ * This function is has two modes:
+ * - determine the file format when bTest = false
+ *   returns true, success
+ *   out rFormatExtension - on success: file format string
+ * - verify file format when bTest = true
+ *   returns false, if file type can't be verified
+ *   true, if the format is PROBABLY verified
+ * or WHEN THE FORMAT IS NOT KNOWN!
+ */
+bool peekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bool 
bTest )
 {
 vcl::GraphicFormatDetector aDetector(rStream, rFormatExtension);
 if (!aDetector.detect())
@@ -468,7 +451,7 @@ ErrCode GraphicFilter::ImpTestOrFindFormat( const OUString& 
rPath, SvStream& rSt
 if( rFormat == GRFILTER_FORMAT_DONTKNOW )
 {
 OUString aFormatExt;
-if( ImpPeekGraphicFormat( rStream, aFormatExt, false ) )
+if( peekGraphicFormat( rStream, aFormatExt, false ) )
 {
 rFormat = pConfig->GetImportFormatNumberForExtension( aFormatExt );
 if( rFormat != GRFILTER_FORMAT_DONTKNOW )
@@ -488,7 +471,7 @@ ErrCode GraphicFilter::ImpTestOrFindFormat( const OUString& 
rPath, SvStream& rSt
 {
 OUString aTmpStr( pConfig->GetImportFormatExtension( rFormat ) );
 aTmpStr = aTmpStr.toAsciiUpperCase();
-if( !ImpPeekGraphicFormat( rStream, aTmpStr, true ) )
+if( !peekGraphicFormat( rStream, aTmpStr, true ) )
 return ERRCODE_GRFILTER_FORMATERROR;
 if ( pConfig->GetImportFormatExtension( rFormat 
).equalsIgnoreAsciiCase( "pcd" ) )
 {
commit b688425ddb34f97fa31012b501506b77ede65d46
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 15 17:49:34 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Feb 15 21:02:31 2021 +0900

vcl: clean-up code used for loading of external graphic filters

All graphic filters have been moved into vcl, so there is no need
to load an external library that contained graphic filters, so
this code can be removed.

Change-Id: Iac4f8dd78464e142f50837a55edd2d25720b8c13

diff --git a/vcl/source/filter/FilterConfigCache.cxx 
b/vcl/source/filter/FilterConfigCache.cxx
index 411d44a5801d..482b8fed2ca0 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -55,39 +55,18 @@ const char* 
FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameL
 IMP_EPS, EXP_EPS, nullptr
 };
 
-const char* 
FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameList[] =
-{
-   nullptr
-};
-
 void FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const 
OUString& rUserDataEntry )
 {
-bIsPixelFormat = bIsInternalFilter = false;
+bIsPixelFormat = false;
 sFilterName = rUserDataEntry;
 const char** pPtr;
-for ( pPtr = InternalPixelFilterNameList; *pPtr && !bIsInternalFilter; 
pPtr++ )
+for ( pPtr = Internal

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 2 commits - vcl/inc vcl/qa vcl/source

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit f239c09c32b73ebb2b40ca041cd28ef6fb39978e
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 16 10:35:11 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Feb 16 10:35:11 2021 +0900

vcl: move def. of peekGraphicFormat into GraphicFormatDetector

Change-Id: I3b89009324f21b54ccf00f16eb47f9967a6b4e1f

diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx 
b/vcl/inc/graphic/GraphicFormatDetector.hxx
index b38561f790c3..c8b075f9037d 100644
--- a/vcl/inc/graphic/GraphicFormatDetector.hxx
+++ b/vcl/inc/graphic/GraphicFormatDetector.hxx
@@ -23,10 +23,20 @@
 #include 
 #include 
 
-VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
-
 namespace vcl
 {
+/***
+ * This function is has two modes:
+ * - determine the file format when bTest = false
+ *   returns true, success
+ *   out rFormatExtension - on success: file format string
+ * - verify file format when bTest = true
+ *   returns false, if file type can't be verified
+ *   true, if the format is PROBABLY verified
+ * or WHEN THE FORMAT IS NOT KNOWN!
+ */
+VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
+
 class VCL_DLLPUBLIC GraphicFormatDetector
 {
 public:
diff --git a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx 
b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
index 1fb2fe0cb4ee..264a0e8cd48d 100644
--- a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
+++ b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
@@ -83,7 +83,7 @@ void GraphicFormatDetectorTest::testDetectMET()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("MET"), rFormatExtension);
 }
 
@@ -98,7 +98,7 @@ void GraphicFormatDetectorTest::testDetectBMP()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("BMP"), rFormatExtension);
 }
 
@@ -113,7 +113,7 @@ void GraphicFormatDetectorTest::testDetectWMF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("WMF"), rFormatExtension);
 }
 
@@ -128,7 +128,7 @@ void GraphicFormatDetectorTest::testDetectPCX()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PCX"), rFormatExtension);
 }
 
@@ -143,7 +143,7 @@ void GraphicFormatDetectorTest::testDetectJPG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("JPG"), rFormatExtension);
 }
 
@@ -158,7 +158,7 @@ void GraphicFormatDetectorTest::testDetectPNG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PNG"), rFormatExtension);
 }
 
@@ -173,7 +173,7 @@ void GraphicFormatDetectorTest::testDetectGIF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("GIF"), rFormatExtension);
 }
 
@@ -188,7 +188,7 @@ void GraphicFormatDetectorTest::testDetectPSD()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PSD"), rFormatExtension);
 }
 
@@ -203,7 +203,7 @@ void GraphicFormatDetectorTest::testDetectTGA()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension("TGA"); // detection is based on extension only
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUS

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

[Tomaž Vajngerl (via logerrit)]

 vcl/qa/cppunit/GraphicTest.cxx |   93 +
 1 file changed, 93 insertions(+)

New commits:
commit 79b4e2b3b18611f2b18508e8cba5f068b4be29ba
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 15 14:30:01 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Feb 16 03:18:35 2021 +0100

vcl: add test to load graphic of some less common formats

Change-Id: Id23d2fc7a57d264b4fda2a2f2c39ab2cbc7cd477
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110897
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
index 2c64ce856692..55858e85ca13 100644
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -71,6 +71,15 @@ private:
 void testSwappingAnimationGraphic_GIF_WithGfxLink();
 void testSwappingAnimationGraphic_GIF_WithoutGfxLink();
 
+void testLoadMET();
+void testLoadBMP();
+void testLoadPSD();
+void testLoadTGA();
+void testLoadXBM();
+void testLoadXPM();
+void testLoadPCX();
+void testLoadEPS();
+
 CPPUNIT_TEST_SUITE(GraphicTest);
 CPPUNIT_TEST(testUnloadedGraphic);
 CPPUNIT_TEST(testUnloadedGraphicLoading);
@@ -95,6 +104,16 @@ private:
 
 CPPUNIT_TEST(testSwappingAnimationGraphic_GIF_WithGfxLink);
 CPPUNIT_TEST(testSwappingAnimationGraphic_GIF_WithoutGfxLink);
+
+CPPUNIT_TEST(testLoadMET);
+CPPUNIT_TEST(testLoadBMP);
+CPPUNIT_TEST(testLoadPSD);
+CPPUNIT_TEST(testLoadTGA);
+CPPUNIT_TEST(testLoadXBM);
+CPPUNIT_TEST(testLoadXPM);
+CPPUNIT_TEST(testLoadPCX);
+CPPUNIT_TEST(testLoadEPS);
+
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -214,6 +233,20 @@ bool checkBitmap(Graphic& rGraphic)
 constexpr OUStringLiteral DATA_DIRECTORY = u"/vcl/qa/cppunit/data/";
 constexpr OUStringLiteral PDFEXPORT_DATA_DIRECTORY = 
u"/vcl/qa/cppunit/pdfexport/data/";
 
+Graphic loadGraphic(std::u16string_view const& rFilename)
+{
+test::Directories aDirectories;
+OUString aFilename = aDirectories.getURLFromSrc(DATA_DIRECTORY) + 
rFilename;
+SvFileStream aFileStream(aFilename, StreamMode::READ);
+GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
+
+Graphic aGraphic;
+CPPUNIT_ASSERT_EQUAL(
+ERRCODE_NONE,
+rGraphicFilter.ImportGraphic(aGraphic, OUString(), aFileStream, 
GRFILTER_FORMAT_DONTKNOW));
+return aGraphic;
+}
+
 void GraphicTest::testUnloadedGraphic()
 {
 // make unloaded test graphic
@@ -1126,6 +1159,66 @@ void 
GraphicTest::testSwappingAnimationGraphic_GIF_WithoutGfxLink()
 CPPUNIT_ASSERT_EQUAL(rByteSize, aGraphic.GetSizeBytes());
 }
 
+void GraphicTest::testLoadMET()
+{
+Graphic aGraphic = loadGraphic(u"TypeDetectionExample.met");
+CPPUNIT_ASSERT_EQUAL(GraphicType::GdiMetafile, aGraphic.GetType());
+}
+
+void GraphicTest::testLoadBMP()
+{
+Graphic aGraphic = loadGraphic(u"TypeDetectionExample.bmp");
+CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Height());
+}
+
+void GraphicTest::testLoadPSD()
+{
+Graphic aGraphic = loadGraphic(u"TypeDetectionExample.psd");
+CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Height());
+}
+
+void GraphicTest::testLoadTGA()
+{
+Graphic aGraphic = loadGraphic(u"TypeDetectionExample.tga");
+CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Height());
+}
+
+void GraphicTest::testLoadXBM()
+{
+Graphic aGraphic = loadGraphic(u"TypeDetectionExample.xbm");
+CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Height());
+}
+
+void GraphicTest::testLoadXPM()
+{
+Graphic aGraphic = loadGraphic(u"TypeDetectionExample.xpm");
+CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Height());
+}
+
+void GraphicTest::testLoadPCX()
+{
+Graphic aGraphic = loadGraphic(u"TypeDetectionExample.pcx");
+CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aGraphic.GetSizePixel().Height());
+}
+
+void GraphicTest::testLoadEPS()
+{
+Graphic aGraphic = loadGraphic(u"TypeDetectionExample.eps");
+CPPUNIT_ASSERT_EQUAL(GraphicType::GdiMetafile, aGraphic.GetTyp

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - vcl/inc vcl/qa vcl/source

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit 2462796087b365d1ab715bcf3c4943444ab4e612
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 16 10:35:11 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Feb 16 10:37:35 2021 +0900

vcl: move def. of peekGraphicFormat into GraphicFormatDetector

Change-Id: I3b89009324f21b54ccf00f16eb47f9967a6b4e1f

diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx 
b/vcl/inc/graphic/GraphicFormatDetector.hxx
index b38561f790c3..f2f0393caeee 100644
--- a/vcl/inc/graphic/GraphicFormatDetector.hxx
+++ b/vcl/inc/graphic/GraphicFormatDetector.hxx
@@ -23,10 +23,19 @@
 #include 
 #include 
 
-VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
-
 namespace vcl
 {
+/***
+ * This function is has two modes:
+ * - determine the file format when bTest = false
+ *   returns true, success
+ *   out rFormatExtension - on success: file format string
+ * - verify file format when bTest = true
+ *   returns false, if file type can't be verified
+ *   true, if the format is verified or the format is not known
+ */
+VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
+
 class VCL_DLLPUBLIC GraphicFormatDetector
 {
 public:
diff --git a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx 
b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
index 1fb2fe0cb4ee..264a0e8cd48d 100644
--- a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
+++ b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
@@ -83,7 +83,7 @@ void GraphicFormatDetectorTest::testDetectMET()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("MET"), rFormatExtension);
 }
 
@@ -98,7 +98,7 @@ void GraphicFormatDetectorTest::testDetectBMP()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("BMP"), rFormatExtension);
 }
 
@@ -113,7 +113,7 @@ void GraphicFormatDetectorTest::testDetectWMF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("WMF"), rFormatExtension);
 }
 
@@ -128,7 +128,7 @@ void GraphicFormatDetectorTest::testDetectPCX()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PCX"), rFormatExtension);
 }
 
@@ -143,7 +143,7 @@ void GraphicFormatDetectorTest::testDetectJPG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("JPG"), rFormatExtension);
 }
 
@@ -158,7 +158,7 @@ void GraphicFormatDetectorTest::testDetectPNG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PNG"), rFormatExtension);
 }
 
@@ -173,7 +173,7 @@ void GraphicFormatDetectorTest::testDetectGIF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("GIF"), rFormatExtension);
 }
 
@@ -188,7 +188,7 @@ void GraphicFormatDetectorTest::testDetectPSD()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PSD"), rFormatExtension);
 }
 
@@ -203,7 +203,7 @@ void GraphicFormatDetectorTest::testDetectTGA()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension("TGA"); // detection is based on extension only
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("TGA"), rFormatExtension);
 }

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ww8export3.mk

[Xisco Fauli (via logerrit)]

 sw/CppunitTest_sw_ww8export3.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit d5bb28663dbca1ce48c22f4e7ac1ee6e7a6f597f
Author: Xisco Fauli 
AuthorDate: Mon Feb 15 17:28:02 2021 +0100
Commit: Mike Kaganski 
CommitDate: Tue Feb 16 06:46:24 2021 +0100

sw_ww8export3: missing dependency

This unit test fails when called after 'make clean':

  > make clean
  > make CppunitTest_sw_ww8export3
  ...
  testdf79553_lineNumbers::Load_Verify_Reload_Verify finished in: 9591ms
  C:/lo/src/core/sw/qa/extras/ww8export/ww8export3.cxx(149) : error : 
Assertion
  Test name: testTdf128501::Load_Verify_Reload_Verify
  equality assertion failed
  - Expected: FrameShape
  - Actual  : com.sun.star.drawing.RectangleShape

  Failures !!!
  Run: 47   Failure total: 1   Failures: 1   Errors: 0

See https://gerrit.libreoffice.org/c/core/+/107003

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

diff --git a/sw/CppunitTest_sw_ww8export3.mk b/sw/CppunitTest_sw_ww8export3.mk
index 46c1cf88b929..6eeb48f3ed3b 100644
--- a/sw/CppunitTest_sw_ww8export3.mk
+++ b/sw/CppunitTest_sw_ww8export3.mk
@@ -65,4 +65,8 @@ endif
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_ww8export3))
 
+$(eval $(call gb_CppunitTest_use_packages,sw_ww8export3,\
+   oox_customshapes \
+))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Widget.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 61bf6b4d90aa1d37009b397e44fe39c9c5b06afd
Author: Jan-Marek Glogowski 
AuthorDate: Mon Feb 15 17:46:37 2021 +0100
Commit: Michael Weghorn 
CommitDate: Tue Feb 16 07:38:10 2021 +0100

tdf#140207 Qt downscale the ExtTextInputPos

Qt reports the unscaled pixel values to the IM, so simply divide
all values reported by SalEvent::ExtTextInputPos by the window's
scale factor. This correctly positions the IM window on a scaled
LO window.

Change-Id: Ia639ee3e5fc0e47f7017896b34730bbda7f06a16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110945
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 41cffc379259fec626a282ca243a9750d96d1c63)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110915
Reviewed-by: Michael Weghorn 

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 40500585e1fe..93c577ce87c2 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -681,10 +681,11 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery 
property) const
 }
 case Qt::ImCursorRectangle:
 {
+const qreal fRatio = m_rFrame.devicePixelRatioF();
 SalExtTextInputPosEvent aPosEvent;
 m_rFrame.CallCallback(SalEvent::ExtTextInputPos, &aPosEvent);
-return QVariant(
-QRect(aPosEvent.mnX, aPosEvent.mnY, aPosEvent.mnWidth, 
aPosEvent.mnHeight));
+return QVariant(QRect(aPosEvent.mnX / fRatio, aPosEvent.mnY / 
fRatio,
+  aPosEvent.mnWidth / fRatio, 
aPosEvent.mnHeight / fRatio));
 }
 case Qt::ImAnchorPosition:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - hwpfilter/source linguistic/source lotuswordpro/source oox/source package/source

[Noel (via logerrit)]

 hwpfilter/source/formula.cxx |   52 +-
 hwpfilter/source/hwpreader.cxx   |  384 +--
 linguistic/source/convdiclist.cxx|2 
 linguistic/source/dlistimp.cxx   |6 
 lotuswordpro/source/filter/lwppara.cxx   |2 
 lotuswordpro/source/filter/lwptablelayout.cxx|6 
 lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx |2 
 oox/source/core/contexthandler2.cxx  |2 
 oox/source/core/recordparser.cxx |5 
 oox/source/core/xmlfilterbase.cxx|   10 
 oox/source/export/drawingml.cxx  |2 
 oox/source/ppt/backgroundproperties.cxx  |2 
 package/source/zipapi/ZipFile.cxx|6 
 package/source/zipapi/blowfishcontext.cxx|2 
 package/source/zipapi/sha1context.cxx|2 
 package/source/zippackage/ZipPackage.cxx |2 
 16 files changed, 242 insertions(+), 245 deletions(-)

New commits:
commit 51558d2215a4cf881e357eda7da20688ac61e780
Author: Noel 
AuthorDate: Mon Feb 15 20:00:01 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 16 07:52:11 2021 +0100

loplugin:referencecasting in hwpfilter..lotuswordpro

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

diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index a5ba8a040854..f9ab458f 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -52,9 +52,9 @@ void Formula::makeMathML(Node *res)
  fprintf(stderr,"http://www.w3.org/1998/Math/MathML\";>\n");
 #else
  padd("xmlns:math", "CDATA", "http://www.w3.org/1998/Math/MathML";);
- rstartEl("math:math", mxList.get());
+ rstartEl("math:math", mxList);
  mxList->clear();
- rstartEl("math:semantics", mxList.get());
+ rstartEl("math:semantics", mxList);
 #endif
  if( tmp->child )
   makeLines( tmp->child );
@@ -92,7 +92,7 @@ void Formula::makeLine(Node *res)
 #ifdef DEBUG
 inds; fprintf(stderr,"\n");
 #else
-rstartEl("math:mrow", mxList.get());
+rstartEl("math:mrow", mxList);
 #endif
 if( res->child )
  makeExprList( res->child );
@@ -131,7 +131,7 @@ void Formula::makeExpr(Node *res)
  inds;
  fprintf(stderr,"\n");
 #else
- rstartEl("math:mrow", mxList.get());
+ rstartEl("math:mrow", mxList);
 #endif
  }
 
@@ -194,7 +194,7 @@ void Formula::makeIdentifier(Node *res)
   fprintf(stderr,"%s\n",tmp->value);
   indo;
 #else
-  rstartEl("math:mi", mxList.get());
+  rstartEl("math:mi", mxList);
   rchars(OUString::createFromAscii(tmp->value));
   rendEl("math:mi");
 #endif
@@ -203,7 +203,7 @@ void Formula::makeIdentifier(Node *res)
   {
 #ifdef DEBUG
 #else
-rstartEl("math:mi", mxList.get());
+rstartEl("math:mi", mxList);
 reucstr(tmp->value, strlen(tmp->value));
 rendEl("math:mi");
 #endif
@@ -216,7 +216,7 @@ void Formula::makeIdentifier(Node *res)
   getMathMLEntity(tmp->value).c_str());
   indo;
 #else
-  rstartEl("math:mi", mxList.get());
+  rstartEl("math:mi", mxList);
   runistr(fromHcharStringToOUString(getMathMLEntity(tmp->value)));
   rendEl("math:mi");
 #endif
@@ -227,7 +227,7 @@ void Formula::makeIdentifier(Node *res)
   fprintf(stderr,"%s\n",tmp->value);
   indo;
 #else
-  rstartEl("math:mn", mxList.get());
+  rstartEl("math:mn", mxList);
   rchars(OUString::createFromAscii(tmp->value));
   rendEl("math:mn");
 #endif
@@ -238,7 +238,7 @@ void Formula::makeIdentifier(Node *res)
 #ifdef DEBUG
   inds; fprintf(stderr,"%s\n",tmp->value); indo;
 #else
-  rstartEl("math:mo", mxList.get());
+  rstartEl("math:mo", mxList);
   runistr(fromHcharStringToOUString(getMathMLEntity(tmp->value)));
   rendEl("math:mo");
 #endif
@@ -278,11 +278,11 @@ void Formula::makeSubSup(Node *res)
   fprintf(stderr,"\n");
 #else
  if( res->id == ID_SUBEXPR )
-  rstartEl("math:msub", mxList.get());
+  rstartEl("math:msub", mxList);
  else if( res->id == ID_SUPEXPR )
-  rstartEl("math:msup", mxList.get());
+  rstartEl("math:msup", mxList);
  else
-  rstartEl("math:msubsup", mxList.get());
+  rstartEl("math:msubsup", mxList);
 #endif
 
  tmp = tmp->child;
@@ -323,7 +323,7 @@ void Formula::makeFraction(Node *res)
  inds;
  fprintf(stderr,"\n");
 #else
- rstartEl("math:mfrac", mxList.get());
+ rstartEl("math:mfrac", mxList);
 #endif
 
  tmp = tmp->child;
@@ -331,7 +331,7 @@ void Formula::make

[Libreoffice-commits] core.git: editeng/source embeddedobj/source extensions/source filter/qa filter/source forms/source fpicker/source framework/qa framework/source

[Noel (via logerrit)]

 editeng/source/accessibility/AccessibleEditableTextPara.cxx |2 +-
 editeng/source/uno/unotext2.cxx |4 ++--
 embeddedobj/source/general/docholder.cxx|2 +-
 extensions/source/bibliography/bibload.cxx  |2 +-
 extensions/source/bibliography/framectr.cxx |8 
 extensions/source/bibliography/general.cxx  |4 ++--
 extensions/source/dbpilots/gridwizard.cxx   |2 +-
 extensions/source/dbpilots/optiongrouplayouter.cxx  |6 +++---
 extensions/source/propctrlr/browserlistbox.cxx  |2 +-
 extensions/source/propctrlr/cellbindinghelper.cxx   |6 +++---
 extensions/source/propctrlr/composeduiupdate.cxx|2 +-
 extensions/source/propctrlr/eventhandler.cxx|2 +-
 extensions/source/propctrlr/formcomponenthandler.cxx|2 +-
 extensions/source/propctrlr/formgeometryhandler.cxx |6 +++---
 extensions/source/propctrlr/handlerhelper.cxx   |4 ++--
 extensions/source/update/feed/updatefeed.cxx|4 ++--
 filter/qa/cppunit/xslt-test.cxx |4 ++--
 filter/source/config/cache/typedetection.cxx|4 ++--
 filter/source/pdf/pdfexport.cxx |2 +-
 forms/source/component/Button.cxx   |4 ++--
 forms/source/component/FormattedFieldWrapper.cxx|9 -
 forms/source/component/clickableimage.hxx   |2 +-
 forms/source/richtext/richtextcontrol.cxx   |4 ++--
 forms/source/solar/component/navbarcontrol.cxx  |4 ++--
 forms/source/xforms/datatyperepository.cxx  |2 +-
 forms/source/xforms/model.cxx   |   10 +-
 fpicker/source/office/fpsmartcontent.cxx|2 +-
 framework/qa/cppunit/dispatchtest.cxx   |3 +--
 framework/source/fwe/dispatch/interaction.cxx   |4 ++--
 framework/source/fwe/xml/menudocumenthandler.cxx|2 +-
 framework/source/fwe/xml/statusbardocumenthandler.cxx   |2 +-
 framework/source/fwe/xml/toolboxdocumenthandler.cxx |2 +-
 framework/source/services/autorecovery.cxx  |8 
 framework/source/uielement/resourcemenucontroller.cxx   |2 +-
 framework/source/xml/imagesdocumenthandler.cxx  |2 +-
 35 files changed, 64 insertions(+), 66 deletions(-)

New commits:
commit 7767ff7b521b7d43a1ea2a4fd19a64bd171da5e0
Author: Noel 
AuthorDate: Mon Feb 15 19:58:15 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 16 07:52:37 2021 +0100

loplugin:referencecasting in editeng..framework

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

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx 
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index ac4bbe1ada4d..a12bfe7232de 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -694,7 +694,7 @@ namespace accessibility
 maImageBullet = aChild;
 }
 
-return aChild.get();
+return aChild;
 }
 
 uno::Reference< XAccessible > SAL_CALL 
AccessibleEditableTextPara::getAccessibleParent()
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 1e61337f5471..04d63ea6b839 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -107,7 +107,7 @@ uno::Any SvxUnoTextContentEnumeration::nextElement()
 if(!hasMoreElements())
 throw container::NoSuchElementException();
 
-uno::Reference< text::XTextContent > xRef( 
maContents.at(mnNextParagraph).get() );
+uno::Reference< text::XTextContent > xRef( maContents.at(mnNextParagraph) 
);
 mnNextParagraph++;
 return uno::makeAny( xRef );
 }
@@ -442,7 +442,7 @@ uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement()
 if( maPortions.empty() || mnNextPortion >= maPortions.size() )
 throw container::NoSuchElementException();
 
-uno::Reference< text::XTextRange > xRange = 
maPortions.at(mnNextPortion).get();
+uno::Reference< text::XTextRange > xRange = maPortions.at(mnNextPortion);
 mnNextPortion++;
 return uno::makeAny( xRange );
 }
diff --git a/embeddedobj/source/general/docholder.cxx 
b/embeddedobj/source/general/docholder.cxx
index 90a04d85e125..66a2290ab639 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -830,7 +830,7 @@ uno::Reference< frame::XFrame > const & 
DocumentHolder::GetDocFrame()
 
 m_xInterceptor = new Interceptor( this );
 
-xIntercep

[Libreoffice-commits] core.git: include/com reportdesign/source

[Noel (via logerrit)]

 include/com/sun/star/uno/Reference.hxx  |2 
 reportdesign/source/core/api/FixedLine.cxx  |2 
 reportdesign/source/core/api/FixedText.cxx  |2 
 reportdesign/source/core/api/FormattedField.cxx |4 -
 reportdesign/source/core/api/ImageControl.cxx   |2 
 reportdesign/source/core/api/ReportDefinition.cxx   |   10 ++--
 reportdesign/source/core/api/Shape.cxx  |2 
 reportdesign/source/core/api/Tools.cxx  |4 -
 reportdesign/source/core/sdr/RptObject.cxx  |   12 ++---
 reportdesign/source/core/sdr/UndoActions.cxx|4 -
 reportdesign/source/core/sdr/UndoEnv.cxx|8 +--
 reportdesign/source/filter/xml/xmlCell.cxx  |   22 +-
 reportdesign/source/filter/xml/xmlExport.cxx|   26 ++--
 reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx |2 
 reportdesign/source/filter/xml/xmlFormatCondition.cxx   |2 
 reportdesign/source/filter/xml/xmlFormattedField.cxx|2 
 reportdesign/source/filter/xml/xmlGroup.cxx |2 
 reportdesign/source/filter/xml/xmlImage.cxx |2 
 reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx |6 +-
 reportdesign/source/filter/xml/xmlReport.cxx|4 -
 reportdesign/source/filter/xml/xmlReportElement.cxx |4 -
 reportdesign/source/filter/xml/xmlReportElementBase.cxx |4 -
 reportdesign/source/filter/xml/xmlSubDocument.cxx   |6 +-
 reportdesign/source/filter/xml/xmlTable.cxx |4 -
 reportdesign/source/filter/xml/xmlfilter.cxx|2 
 reportdesign/source/ui/dlg/AddField.cxx |2 
 reportdesign/source/ui/dlg/CondFormat.cxx   |8 +--
 reportdesign/source/ui/dlg/Condition.cxx|2 
 reportdesign/source/ui/dlg/Formula.cxx  |2 
 reportdesign/source/ui/dlg/GroupsSorting.cxx|8 +--
 reportdesign/source/ui/dlg/Navigator.cxx|6 +-
 reportdesign/source/ui/inspection/DataProviderHandler.cxx   |2 
 reportdesign/source/ui/inspection/GeometryHandler.cxx   |4 -
 reportdesign/source/ui/misc/RptUndo.cxx |2 
 reportdesign/source/ui/misc/UITools.cxx |2 
 reportdesign/source/ui/report/FixedTextColor.cxx|2 
 reportdesign/source/ui/report/FormattedFieldBeautifier.cxx  |2 
 reportdesign/source/ui/report/ReportController.cxx  |   10 ++--
 reportdesign/source/ui/report/ReportControllerObserver.cxx  |4 -
 reportdesign/source/ui/report/ReportSection.cxx |4 -
 reportdesign/source/ui/report/SectionWindow.cxx |6 +-
 reportdesign/source/ui/report/propbrw.cxx   |2 
 42 files changed, 104 insertions(+), 104 deletions(-)

New commits:
commit be92ed5799e7f8dab0d8d1042135afe38b7f258f
Author: Noel 
AuthorDate: Mon Feb 15 09:40:30 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 16 07:52:57 2021 +0100

loplugin:referencecasting in reportdesign

Also, I needed to add
castToXInterface()
to the upcasting Reference::Reference constructor,
to resolve ambiguity in casting to XInterface.

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

diff --git a/include/com/sun/star/uno/Reference.hxx 
b/include/com/sun/star/uno/Reference.hxx
index ee0117bda0fb..7632c55045ca 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -144,7 +144,7 @@ inline Reference< interface_type >::Reference(
 && !std::is_same_v, void *>)
 {
 interface_type * p = rRef.get();
-_pInterface = p;
+_pInterface = castToXInterface(p);
 if (_pInterface)
 _pInterface->acquire();
 }
diff --git a/reportdesign/source/core/api/FixedLine.cxx 
b/reportdesign/source/core/api/FixedLine.cxx
index 42082bfc3e95..6e83c1a25b21 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -330,7 +330,7 @@ uno::Reference< util::XCloneable > SAL_CALL 
OFixedLine::createClone(  )
 {
 uno::Reference< report::XReportComponent> xSource = this;
 uno::Reference< report::XFixedLine> 
xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FIXEDLINE),uno::UNO_QUERY_THROW);
-return xSet.get();
+return xSet;
 }
 
 
diff --git a/reportdesign/source/core/api/FixedText.cxx 
b/reportdesign/source/core/api/FixedText.cxx
index 589d68946406..e77eb4b3aa49 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -184,7 +184,7 @@ uno::Reference< util::XCloneable > SAL_CALL 
OFixedText::creat

Re: problem with link error in unit test

[Noel Grandin]

On 2021/02/16 12:22 am, Regina Henschel wrote:

Hi Noel,

my local build on Windows 10 with VS2019 works, but gerrit_mac and 
gerrit_android_x86_64 complain.
https://gerrit.libreoffice.org/c/core/+/110959



Windows linking is a little more relaxed in this area, which is why problems 
tend to show up on unix systems.

In this case, you will need to add
   #include "scdllapi.h"
to pull in the definition of the SC_DLLPUBLIC  macro

Regards, Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel (via logerrit)]

 basctl/source/basicide/baside2b.cxx |4 ++--
 basic/source/basmgr/basmgr.cxx  |4 ++--
 basic/source/uno/namecont.cxx   |2 +-
 binaryurp/source/bridgefactory.cxx  |2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7874cba9709dd0973a81d5894d6daa9570ac86bf
Author: Noel 
AuthorDate: Tue Feb 16 08:54:57 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 16 08:57:02 2021 +0100

loplugin:referencecasting in basctl..binaryurp

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

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 3bb09f3bb140..4da4b8fc1956 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -257,7 +257,7 @@ EditorWindow::EditorWindow (vcl::Window* pParent, 
ModulWindow* pModulWindow) :
 notifier_ = n;
 }
 const Sequence aPropertyNames{"FontHeight", "FontName"};
-n->addPropertiesChangeListener(aPropertyNames, listener_.get());
+n->addPropertiesChangeListener(aPropertyNames, listener_);
 }
 
 
@@ -280,7 +280,7 @@ void EditorWindow::dispose()
 n = notifier_;
 }
 if (n.is()) {
-n->removePropertiesChangeListener(listener_.get());
+n->removePropertiesChangeListener(listener_);
 }
 
 aSyntaxIdle.Stop();
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 1254768a2b00..881deabd75e1 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -497,7 +497,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const 
OUString& rBaseURL, Star
 
 static void copyToLibraryContainer( StarBASIC* pBasic, const 
LibraryContainerInfo& rInfo )
 {
-uno::Reference< script::XLibraryContainer > xScriptCont( 
rInfo.mxScriptCont.get() );
+uno::Reference< script::XLibraryContainer > xScriptCont( 
rInfo.mxScriptCont );
 if ( !xScriptCont.is() )
 return;
 
@@ -538,7 +538,7 @@ void BasicManager::SetLibraryContainerInfo( const 
LibraryContainerInfo& rInfo )
 {
 mpImpl->maContainerInfo = rInfo;
 
-uno::Reference< script::XLibraryContainer > xScriptCont( 
mpImpl->maContainerInfo.mxScriptCont.get() );
+uno::Reference< script::XLibraryContainer > xScriptCont( 
mpImpl->maContainerInfo.mxScriptCont );
 if( xScriptCont.is() )
 {
 // Register listener for lib container
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 61b62632ef6f..a2b0391f92da 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2681,7 +2681,7 @@ void SfxLibraryContainer::_disposing( const EventObject& 
_rSource )
 void SAL_CALL SfxLibraryContainer::disposing()
 {
 Reference< XModel > xModel = mxOwnerDocument;
-EventObject aEvent( xModel.get() );
+EventObject aEvent( xModel );
 maVBAScriptListeners.disposing( aEvent );
 stopAllComponentListening();
 mxOwnerDocument.clear();
diff --git a/binaryurp/source/bridgefactory.cxx 
b/binaryurp/source/bridgefactory.cxx
index 2178351015c0..803899c8a7e3 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -113,7 +113,7 @@ css::uno::Reference< css::bridge::XBridge > 
BridgeFactory::createBridge(
 }
 }
 b->start();
-return css::uno::Reference< css::bridge::XBridge >(b.get());
+return b;
 }
 
 css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits