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

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

 vcl/skia/gdiimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 600ff56010f5297cab7faf4bc44ae29dfb404d2f
Author: Luboš Luňák 
AuthorDate: Thu Aug 20 16:25:00 2020 +0200
Commit: Luboš Luňák 
CommitDate: Fri Aug 21 09:54:45 2020 +0200

fix setting clip region for new Skia graphics objects (tdf#135487)

Set the clip region only after possibly creating the surface, because
creating the surface sets the default clip region.

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

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index f522e5b6a857..52ce4cc2b96f 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -414,8 +414,8 @@ bool SkiaSalGraphicsImpl::setClipRegion(const vcl::Region& 
region)
 return true;
 SkiaZone zone;
 checkPendingDrawing();
-mClipRegion = region;
 checkSurface();
+mClipRegion = region;
 SAL_INFO("vcl.skia.trace", "setclipregion(" << this << "): " << region);
 SkCanvas* canvas = mSurface->getCanvas();
 // SkCanvas::clipRegion() can only further reduce the clip region,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 oox/source/ole/vbaexport.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0142da25dd57b4538d2a7cf19124796bd7a91dfe
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:19:19 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 09:55:36 2020 +0200

Fix typo in code

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

diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index 306e1753c82a..7833beae83cd 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -1150,9 +1150,9 @@ bool VbaExport::containsVBAProject()
 if (!xVbaCompatibility.is())
 return false;
 
-bool bVBACompatibilty = xVbaCompatibility->getVBACompatibilityMode();
+bool bVBACompatibility = xVbaCompatibility->getVBACompatibilityMode();
 
-return bVBACompatibilty;
+return bVBACompatibility;
 }
 
 OUString VbaExport::getProjectName() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sfx2/source/sidebar/DeckLayouter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a40549e51aa8d82c3cf0c923369959e1e27954a1
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:12:18 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 09:56:01 2020 +0200

Fix typo in code

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

diff --git a/sfx2/source/sidebar/DeckLayouter.cxx 
b/sfx2/source/sidebar/DeckLayouter.cxx
index 0dcc3a688511..42f707a3db5c 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -94,7 +94,7 @@ namespace {
 const LayoutMode eMode,
 vcl::Window& rScrollContainer);
 tools::Rectangle PlaceDeckTitle (
-vcl::Window& rTittleBar,
+vcl::Window& rTitleBar,
 const tools::Rectangle& rAvailableSpace);
 tools::Rectangle PlaceVerticalScrollBar (
 ScrollBar& rVerticalScrollBar,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/com

[Andrea Gelmini (via logerrit)]

 wizards/com/sun/star/wizards/query/QueryWizard.java |2 +-
 wizards/com/sun/star/wizards/ui/FieldSelection.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1ea59a67ddd368c34e38f0a0e293050cd25fd5a4
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:03:19 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 09:58:33 2020 +0200

Fix typo in code

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

diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java 
b/wizards/com/sun/star/wizards/query/QueryWizard.java
index e67310d96d11..6c6683a6dffb 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -361,7 +361,7 @@ public class QueryWizard extends DatabaseObjectWizard
 {
 m_DBMetaData.setNonAggregateFieldNames();
 
m_groupFieldSelection.initialize(m_DBMetaData.getUniqueAggregateFieldNames(), 
false, m_DBMetaData.xDBMetaData.getMaxColumnsInGroupBy());
-
m_groupFieldSelection.intializeSelectedFields(m_DBMetaData.NonAggregateFieldNames);
+
m_groupFieldSelection.initializeSelectedFields(m_DBMetaData.NonAggregateFieldNames);
 m_groupFieldSelection.setMultipleMode(false);
 setStepEnabled(SOGROUPFILTER_PAGE, 
m_aggregateComponent.isGroupingpossible() && 
m_DBMetaData.NonAggregateFieldNames.length > 0);
 }
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java 
b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 1f2179f08fb4..2c192ca6f4aa 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -474,7 +474,7 @@ public class FieldSelection
 
 
 
-public void intializeSelectedFields(String[] _SelectedFieldNames)
+public void initializeSelectedFields(String[] _SelectedFieldNames)
 {
 xSelectedFieldsListBox.addItems(_SelectedFieldNames, 
xSelectedFieldsListBox.getItemCount());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/win/gdi/salprn.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10c65afcdad46ed02e377824bc43dbc384d52340
Author: Stephan Bergmann 
AuthorDate: Fri Aug 21 09:19:00 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 21 10:24:33 2020 +0200

loplugin:simplifybool (clang-cl)

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

diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 053c503b1671..3f27d999d845 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -1470,7 +1470,7 @@ bool WinSalPrinter::StartJob( const OUString* pFileName,
 
 // bring up a file chooser if printing to file port but no file name given
 OUString aOutFileName;
-if( mpInfoPrinter->maPortName.equalsIgnoreAsciiCase( "FILE:" ) && 
!(pFileName && !pFileName->isEmpty()) )
+if( mpInfoPrinter->maPortName.equalsIgnoreAsciiCase( "FILE:" ) && 
(!pFileName || pFileName->isEmpty()) )
 {
 
 uno::Reference< uno::XComponentContext > xContext( 
::comphelper::getProcessComponentContext() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - bridges/Library_cpp_uno.mk

[Stephan Bergmann (via logerrit)]

 bridges/Library_cpp_uno.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fe5b6ed3fc5d6f4317542ec5237a78d7f735f0b8
Author: Stephan Bergmann 
AuthorDate: Thu Aug 20 14:54:31 2020 +0200
Commit: Michael Stahl 
CommitDate: Fri Aug 21 10:35:59 2020 +0200

Pass -fno-lto unconditionally

At least when building the libreoffice rpm on Fedora 33, the relevant 
-flto...
flags are passed in via the global CFLAGS/CXXFLAGS, and no --enable-lto
configure option is given.  That caused this library to be built with LTO 
there,
which in turn caused at least aarch64 to fail the %check step with

> ### unexpected exception content! failed
> ### unexpected exception content! failed
> ### unexpected exception content! failed
> exception test failed
> oneway exception test failed
> exception occurred: error: test failed! 
testtools/source/bridgetest/bridgetest.cxx:1176
>
> > error: error: test failed! 
testtools/source/bridgetest/bridgetest.cxx:1176
> > dying...make[1]: *** [testtools/CustomTarget_uno_test.mk:25: 
workdir/CustomTarget/testtools/uno_test.done] Error 1
> make: *** [Makefile:166: CustomTarget_testtools/uno_test] Error 2

The easiest fix appears to pass -fno-lto unconditionally:  For one, both 
GCC and
Clang appear to support it since before our baseline versions (GCC: baseline
7.0.0, presumably supported since 
 "Merge lto branch into trunk" in
releases/gcc-4.5; Clang: baseline 5.0.2 (at least on Linux), presumably
supported since  "Driver: Support -fno-lto" in
releases/3.0.x).  For another, the other (few) places in the code that check
ENABLE_LTO appear not to be relevant at least for that Fedora 33 rpm build, 
so
there appears to be no incentive to make that build configure --enable-lto 
as an
alternative to this fix.

Change-Id: I4735403660e57ef73b99d6a8cc5945c6d8e2af73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101129
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 7b0ab85b4042cb38221ca5c9794b70c87443181f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101064
Reviewed-by: Michael Stahl 

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index adb404244319..40c47d6bdc17 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -206,7 +206,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
$(if $(filter 
armeabi-v7a,$(ANDROID_APP_ABI)),-I$(ANDROID_BINUTILS_PREBUILT_ROOT)/lib/gcc/arm-linux-androideabi/4.9.x/include)
 \
-fno-omit-frame-pointer \
-fno-strict-aliasing \
-   $(if $(filter TRUE,$(ENABLE_LTO)),-fno-lto) \
+   -fno-lto \
$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 drawinglayer/source/primitive2d/textlayoutdevice.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a879b15d59618e73797ad779666f72cd040ff99a
Author: Stephan Bergmann 
AuthorDate: Fri Aug 21 09:20:11 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 21 10:39:17 2020 +0200

-Werror,-Wunused-variable (clang-cl)

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

diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx 
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index de2f76cb74f6..fe541c04a9b3 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -369,8 +369,6 @@ namespace drawinglayer::primitive2d
 {
 // detect FontScaling
 const sal_uInt32 nHeight(basegfx::fround(fabs(fFontScaleY)));
-const sal_uInt32 nWidth(basegfx::fround(fabs(fFontScaleX)));
-const bool bFontIsScaled(nHeight != nWidth);
 
 #ifdef _WIN32
 // for WIN32 systems, start with creating an unscaled font. If 
FontScaling
@@ -380,12 +378,15 @@ namespace drawinglayer::primitive2d
 rFontAttribute.getFamilyName(),
 rFontAttribute.getStyleName(),
 Size(0, nHeight));
+(void)fFontScaleX;
 #else
 // for non-WIN32 systems things are easier since these accept a 
Font creation
 // with initially nWidth != nHeight for FontScaling. Despite that, 
use zero for
 // FontWidth when no scaling is used to explicitly have that zero 
when e.g. the
 // Font would be recorded in a MetaFile (The MetaFile FontAction 
WILL record a
 // set FontWidth; import that in a WIN32 system, and trouble is 
there)
+const sal_uInt32 nWidth(basegfx::fround(fabs(fFontScaleX)));
+const bool bFontIsScaled(nHeight != nWidth);
 vcl::Font aRetval(
 rFontAttribute.getFamilyName(),
 rFontAttribute.getStyleName(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/escherex.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9482c42adfab31b176a9f283e6af9d453ced4521
Author: Caolán McNamara 
AuthorDate: Thu Aug 20 20:20:23 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 11:03:19 2020 +0200

cid#1466204 silence Unchecked return value

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

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 7bb27d496f3b..ec48fbbe3eec 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -694,7 +694,7 @@ void EscherPropertyContainer::CreateTextProperties(
 
 uno::Any aTextWrap;
 
-EscherPropertyValueHelper::GetPropertyValue(aTextWrap, rXPropSet, 
"TextWrap", true);
+(void)EscherPropertyValueHelper::GetPropertyValue(aTextWrap, rXPropSet, 
"TextWrap", true);
 
 if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
"TextWritingMode", true ) )
 aAny >>= eWM;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/fontsubset/sft.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02826dea6ca842a4df58b77ad9a86394ca729c1f
Author: Caolán McNamara 
AuthorDate: Thu Aug 20 20:22:16 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 11:03:48 2020 +0200

cid#1466207 doc as false rather than intentional

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

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 3f7d96945873..30a6e37d1745 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -411,7 +411,7 @@ static int GetSimpleTTOutline(AbstractTrueTypeFont const 
*ttf, sal_uInt32 glyphI
 pa[i++].flags = static_cast(flag);
 if (flag & 8) { /*- repeat flag */
 n = *p++;
-// coverity[tainted_data] - i > lastPoint extra checks the n loop 
bound
+// coverity[tainted_data : FALSE] - i > lastPoint extra checks the 
n loop bound
 for (j=0; j lastPoint) {/*- if the font is 
really broken */
 free(pa);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/drawfunc/fuins1.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 414b93285f081cd1a0bfb0847fbd3943bf50093a
Author: Caolán McNamara 
AuthorDate: Thu Aug 20 20:32:35 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 11:04:08 2020 +0200

cid#1466205 Logically dead code

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

diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 686e00e596a4..2a17b04b582f 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -392,11 +392,12 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell&   rViewSh,
 }
 
 bool bLink(true);
-if (!bAPI
+bool bInsertMedia = bAPI;
 #if HAVE_FEATURE_AVMEDIA
-|| !::avmedia::MediaWindow::executeMediaURLDialog(pWin ? 
pWin->GetFrameWeld() : nullptr, aURL, &bLink)
+if (!bInsertMedia)
+bInsertMedia = ::avmedia::MediaWindow::executeMediaURLDialog(pWin ? 
pWin->GetFrameWeld() : nullptr, aURL, &bLink);
 #endif
-   )
+if (!bInsertMedia)
 return;
 
 Size aPrefSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dtrans/source embedserv/source fpicker/source sal/osl shell/source

[Stephan Bergmann (via logerrit)]

 dtrans/source/win32/dtobj/DataFmtTransl.cxx  |   14 ++--
 dtrans/source/win32/ftransl/ftransl.cxx  |2 -
 embedserv/source/embed/ed_ipersiststr.cxx|   28 -
 fpicker/source/win32/WinImplHelper.cxx   |6 +--
 sal/osl/w32/path_helper.cxx  |4 +-
 shell/source/win32/simplemail/smplmailclient.cxx |   37 +++
 6 files changed, 35 insertions(+), 56 deletions(-)

New commits:
commit 13ae66c0eb0ab03ac4a43c52dd2359fbaa7f5867
Author: Stephan Bergmann 
AuthorDate: Fri Aug 21 09:39:16 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 21 11:05:28 2020 +0200

loplugin:stringstatic (clang-cl)

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

diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx 
b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index b8513c6e75d4..f0a1601f8dfb 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -47,12 +47,6 @@ const Type   CPPUTYPE_OUSTRING   = 
cppu::UnoType::get();
 const Type   CPPUTYPE_SEQSALINT8 = cppu::UnoType>::get();
 const sal_Int32  MAX_CLIPFORMAT_NAME = 256;
 
-const OUString TEXT_PLAIN_CHARSET   ("text/plain;charset=");
-const OUString HPNAME_OEM_ANSI_TEXT ("OEM/ANSI Text");
-
-const OUString HTML_FORMAT_NAME_WINDOWS ("HTML Format");
-const OUString HTML_FORMAT_NAME_SOFFICE ("HTML (HyperText Markup Language)");
-
 CDataFormatTranslator::CDataFormatTranslator( const Reference< 
XComponentContext >& rxContext )
 {
 m_XDataFormatTranslator = DataFormatTranslator::create( rxContext );
@@ -111,10 +105,10 @@ DataFlavor 
CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& a
 
 if ( isOemOrAnsiTextFormat( aClipformat ) )
 {
-aFlavor.MimeType = TEXT_PLAIN_CHARSET;
+aFlavor.MimeType = "text/plain;charset=";
 aFlavor.MimeType+= getTextCharsetFromLCID( lcid, 
aClipformat );
 
-aFlavor.HumanPresentableName = HPNAME_OEM_ANSI_TEXT;
+aFlavor.HumanPresentableName = "OEM/ANSI Text";
 aFlavor.DataType = CPPUTYPE_SEQSALINT8;
 }
 else if ( CF_INVALID != aClipformat )
@@ -222,13 +216,13 @@ bool CDataFormatTranslator::isTextFormat( CLIPFORMAT cf )
 bool CDataFormatTranslator::isHTMLFormat( CLIPFORMAT cf )
 {
 OUString clipFormatName = getClipboardFormatName( cf );
-return ( clipFormatName == HTML_FORMAT_NAME_WINDOWS );
+return ( clipFormatName == "HTML Format" );
 }
 
 bool CDataFormatTranslator::isTextHtmlFormat( CLIPFORMAT cf )
 {
 OUString clipFormatName = getClipboardFormatName( cf );
-return clipFormatName.equalsIgnoreAsciiCase( HTML_FORMAT_NAME_SOFFICE );
+return clipFormatName.equalsIgnoreAsciiCase( "HTML (HyperText Markup 
Language)" );
 }
 
 OUString CDataFormatTranslator::getTextCharsetFromLCID( LCID lcid, CLIPFORMAT 
aClipformat )
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx 
b/dtrans/source/win32/ftransl/ftransl.cxx
index 991bc2d2c10f..0a40a5b75b72 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -34,7 +34,7 @@
 #define CPPUTYPE_SEQSALINT8   cppu::UnoType>::get()
 #define CPPUTYPE_DEFAULT  CPPUTYPE_SEQSALINT8
 
-const OUString Windows_FormatName ("windows_formatname");
+const char Windows_FormatName[] = "windows_formatname";
 const css::uno::Type CppuType_ByteSequence = 
cppu::UnoType>::get();
 const css::uno::Type CppuType_String   = ::cppu::UnoType::get();
 
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx 
b/embedserv/source/embed/ed_ipersiststr.cxx
index 905055cc9513..2302bc2380ce 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -56,8 +56,8 @@ const sal_Int32 nConstBufferSize = 32000;
 
 using namespace ::com::sun::star;
 
-const OUString aOfficeEmbedStreamName( "package_stream" );
-const OUString aExtentStreamName( "properties_stream" );
+const wchar_t aOfficeEmbedStreamName[] = L"package_stream";
+const wchar_t aExtentStreamName[] = L"properties_stream";
 
 static uno::Reference< io::XInputStream > createTempXInStreamFromIStream(
 uno::Reference< 
lang::XMultiServiceFactory > const & xFactory,
@@ -430,7 +430,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
EmbedDocument_Impl::InitNew( IStorage *pStg )
 
 if ( hr == S_OK )
 {
-hr = pStg->CreateStream( 
o3tl::toW(aOfficeEmbedStreamName.getStr()),
+hr = pStg->CreateStream( aOfficeEmbedStreamName,
  STGM_CREATE | ( nStreamMode & 
0x73 ),
  0,
   

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac

[Thorsten Behrens (via logerrit)]

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

New commits:
commit a6d45b40e8e9b068bd1eb8cdf16a2c4fd3ba54da
Author: Thorsten Behrens 
AuthorDate: Fri Aug 21 11:25:38 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Aug 21 11:25:38 2020 +0200

Bump version to 6.1.7.17

Change-Id: I0cc2b799a9620c8f7b6e9bd0c77f1e139710bf5f

diff --git a/configure.ac b/configure.ac
index 41023489ba9b..d73f45de05f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice powered by 
CIB],[6.1.7.16],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by 
CIB],[6.1.7.17],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-documentation] What is data hierarchy in pivot table data field options?

[Steve (GMail)]

Hi Celia,

Just for information, anything you attach to your email will be stripped 
off again by this mailing list; we can't see your screenshot.


Nevertheless I fully understand your question. Unfortunately I do not 
recall ever seeing the Hierarchy drop-down on the Data Field Options 
dialog in any state other than grayed. I don't know what circumstances 
might lead to it becoming available - maybe one of the developers could 
have a look at the code to see? (email copied to Developers mailing 
list)


I'll update the source material in the 7.0 Calc Guide if we can find the 
answer.


Regards,

Steve Fanning



-- Original Message --
From: "Celia Palacios" 
To: documentat...@global.libreoffice.org
Sent: 21/08/2020 02:03:17
Subject: [libreoffice-documentation] What is data hierarchy in pivot 
table data field options?



(I forgot to attach the screenshot in previous message. Here it is.)

Hi, everybody.

I a member of the Spanish Documentation team. I am currently helping in 
translation of Calc Guide to Spanish. I am checking the Pivot Tables chapter, 
and I also have done my reasearch online (and on other LibreOffice channels) 
trying to understand a concept:

What is data hierarchy in pivot tables?

As I said, working on pivot tables chapter there is an option about hierarchy 
(Jerarquía) that we do not understand (me and someone else) completely. 
Attached's the screenshot of Data field options dialog in Spanish.

The Calc guide uses this explanation, which is kind of a circular concept ;D:

Hierarchy. Select the hierarchy to use. The pivot table must be based on 
external source data that contains data hierarchies.

This is a question for concept: What is a data hierarchy in this option dialog? 
And more, when/how do I use it?


I would very much appreciate your help. Thanks.


Celia Palacios
LobaLuna

-- Ego sum in porta limine.

-- To unsubscribe e-mail to: documentation+unsubscr...@global.libreoffice.org
Problems? https://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: https://wiki.documentfoundation.org/Netiquette
List archive: https://listarchives.libreoffice.org/global/documentation/
Privacy Policy: https://www.documentfoundation.org/privacy


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

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

[Caolán McNamara (via logerrit)]

 include/xmloff/unointerfacetouniqueidentifiermapper.hxx |   21 +-
 sd/qa/unit/data/odg/rhbz1870501.odg |binary
 sd/qa/unit/export-tests.cxx |9 +
 xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx |   97 +++-
 xmloff/source/draw/ximpshap.cxx |9 -
 5 files changed, 88 insertions(+), 48 deletions(-)

New commits:
commit 3c230d608b766e573eeca66e203114b262478230
Author: Caolán McNamara 
AuthorDate: Thu Aug 20 12:56:36 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 11:36:05 2020 +0200

rhbz#1870501 crash on reexport of odg

where SdrObjects in a list have no navigation position set

a regression from

450cd772aa734cfcb989c8cedd3c0a454db74a34

Fix fdo#64512 Handle xml:id correctly on multi-image draw:frames

this just reverts that and adds the test case that crashed

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

diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx 
b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index a78713f85d13..332005e720ac 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -35,6 +36,8 @@ typedef ::std::map< OUString, css::uno::Reference< 
css::uno::XInterface > > IdMa
 
 class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper
 {
+typedef std::deque< OUString > Reserved_t;
+
 public:
 UnoInterfaceToUniqueIdentifierMapper();
 
@@ -50,12 +53,16 @@ public:
 */
 bool registerReference( const OUString& rIdentifier, const 
css::uno::Reference< css::uno::XInterface >& rInterface );
 
-/** always registers the given uno object with the given identifier.
+/** reserves an identifier for later registration.
 
-In contrast to registerReference(), this here overwrites any
-earlier registration of the same identifier
-*/
-void registerReferenceAlways( const OUString& rIdentifier, const 
css::uno::Reference< css::uno::XInterface >& rInterface );
+@returns
+false, if the identifier already exists
+  */
+bool reserveIdentifier( const OUString& rIdentifier );
+
+/** registers the given uno object with reserved identifier.
+  */
+bool registerReservedReference( const OUString& rIdentifier, const 
css::uno::Reference< css::uno::XInterface >& rInterface );
 
 /** @returns
 the identifier for the given uno object. If this uno object is not 
already
@@ -72,10 +79,12 @@ public:
 private:
 bool findReference( const css::uno::Reference< css::uno::XInterface >& 
rInterface, IdMap_t::const_iterator& rIter ) const;
 bool findIdentifier( const OUString& rIdentifier, IdMap_t::const_iterator& 
rIter ) const;
-void insertReference( const OUString& rIdentifier, const 
css::uno::Reference< css::uno::XInterface >& rInterface );
+bool findReserved( const OUString& rIdentifier ) const;
+bool findReserved( const OUString& rIdentifier, 
Reserved_t::const_iterator& rIter ) const;
 
 IdMap_t maEntries;
 sal_uInt32 mnNextId;
+Reserved_t maReserved;
 };
 
 }
diff --git a/sd/qa/unit/data/odg/rhbz1870501.odg 
b/sd/qa/unit/data/odg/rhbz1870501.odg
new file mode 100644
index ..cc4bcef193c2
Binary files /dev/null and b/sd/qa/unit/data/odg/rhbz1870501.odg differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index eb97da60fd1f..1acda7b2712f 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -81,6 +81,7 @@ public:
 void testSoftEdges();
 void testShadowBlur();
 void testTdf115753();
+void testRhbz1870501();
 
 CPPUNIT_TEST_SUITE(SdExportTest);
 
@@ -119,6 +120,7 @@ public:
 CPPUNIT_TEST(testSoftEdges);
 CPPUNIT_TEST(testShadowBlur);
 CPPUNIT_TEST(testTdf115753);
+CPPUNIT_TEST(testRhbz1870501);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1377,6 +1379,13 @@ void SdExportTest::testShadowBlur()
 xDocShRef->DoClose();
 }
 
+void SdExportTest::testRhbz1870501()
+{
+//Without the fix in place, it would crash at export time
+::sd::DrawDocShellRef xDocShRef = loadURL( 
m_directories.getURLFromSrc("/sd/qa/unit/data/odg/rhbz1870501.odg"), ODG);
+xDocShRef = saveAndReload( xDocShRef.get(), ODG );
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx 
b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index d2e29422ae1c..ce54fe971d44 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -21,6 +21,7 @@
 
 #i

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

[Noel Grandin (via logerrit)]

 filter/source/pdf/pdfdecomposer.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 17798a503bc67f2a38f4b558e37447d1ea8f4623
Author: Noel Grandin 
AuthorDate: Thu Aug 20 21:54:25 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 21 11:38:22 2020 +0200

fix unit-test with non-pdfium build

otherwise testSwappingPageNumber will crash accessing out of
bounds element in vector.

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

diff --git a/filter/source/pdf/pdfdecomposer.cxx 
b/filter/source/pdf/pdfdecomposer.cxx
index b2f572fe6c6f..a7f11cc6588e 100644
--- a/filter/source/pdf/pdfdecomposer.cxx
+++ b/filter/source/pdf/pdfdecomposer.cxx
@@ -68,7 +68,10 @@ uno::Sequence> 
SAL_CALL XPdfDecomposer::ge
 nPageIndex = 0;
 
 std::vector aBitmaps;
-vcl::RenderPDFBitmaps(xPdfData.getConstArray(), xPdfData.getLength(), 
aBitmaps, nPageIndex, 1);
+int rv = vcl::RenderPDFBitmaps(xPdfData.getConstArray(), 
xPdfData.getLength(), aBitmaps,
+   nPageIndex, 1);
+if (rv == 0)
+return {}; // happens if we do not have PDFium
 
 BitmapEx aReplacement(aBitmaps[0]);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/stringstatic.cxx  |   28 
 compilerplugins/clang/test/stringstatic.cxx |6 ++
 compilerplugins/clang/test/stringstatic.hxx |   23 +++
 3 files changed, 57 insertions(+)

New commits:
commit a8ab80c58a1330672d7a8eefd73b2eb9cb6c134c
Author: Stephan Bergmann 
AuthorDate: Fri Aug 21 09:26:43 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 21 12:07:30 2020 +0200

Silence some clang-cl loplugin:stringstatic

For one, do not warn about global declarations in included files, as 
generally
not all uses of the variable are seen to decided whether it would be good to
replace.  That covers cases like

> In file included from dtrans/source/win32/dtobj/DataFmtTransl.cxx:26:
> dtrans/source/win32/dtobj/MimeAttrib.hxx(29,16): error: rather declare 
this using OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]
> const OUString CHARSET_UTF16("utf-16");
> ~~~^~~

For another, do not warn about variables whose pData member is used. That 
covers
cases like

> sal/osl/w32/procimpl.cxx(347,20): error: rather declare this using 
OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]
> const OUString ENV_COMSPEC ("COMSPEC");
> ~~~^~~

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

diff --git a/compilerplugins/clang/stringstatic.cxx 
b/compilerplugins/clang/stringstatic.cxx
index 6f2c38dfc748..61dfb584ddf5 100644
--- a/compilerplugins/clang/stringstatic.cxx
+++ b/compilerplugins/clang/stringstatic.cxx
@@ -38,6 +38,7 @@ public:
 bool VisitVarDecl(VarDecl const*);
 bool VisitReturnStmt(ReturnStmt const*);
 bool VisitDeclRefExpr(DeclRefExpr const*);
+bool VisitMemberExpr(MemberExpr const*);
 
 private:
 std::unordered_set potentialVars;
@@ -83,6 +84,13 @@ bool StringStatic::VisitVarDecl(VarDecl const* varDecl)
 QualType qt = varDecl->getType();
 if (!varDecl->hasGlobalStorage())
 return true;
+if (varDecl->hasGlobalStorage() && !varDecl->isStaticLocal()) {
+//TODO: For a non-public static member variable from an included file, 
we could still
+// examine it further if all its uses must be seen in that included 
file:
+if (!compiler.getSourceManager().isInMainFile(varDecl->getLocation())) 
{
+return true;
+}
+}
 if (!varDecl->isThisDeclarationADefinition()
 || !qt.isConstQualified())
 return true;
@@ -166,6 +174,26 @@ bool StringStatic::VisitDeclRefExpr(DeclRefExpr const * 
declRef)
 return true;
 }
 
+bool StringStatic::VisitMemberExpr(MemberExpr const * expr)
+{
+if (ignoreLocation(expr))
+return true;
+auto const declRef = dyn_cast(expr->getBase());
+if (declRef == nullptr) {
+return true;
+}
+VarDecl const * varDecl = dyn_cast(declRef->getDecl());
+if (!varDecl)
+return true;
+if (potentialVars.count(varDecl) == 0)
+return true;
+if (expr->getMemberDecl()->getName() != "pData") {
+return true;
+}
+excludeVars.insert(varDecl);
+return true;
+}
+
 loplugin::Plugin::Registration stringstatic("stringstatic");
 
 } // namespace
diff --git a/compilerplugins/clang/test/stringstatic.cxx 
b/compilerplugins/clang/test/stringstatic.cxx
index 7d8522ecd13b..3c26d961c6a8 100644
--- a/compilerplugins/clang/test/stringstatic.cxx
+++ b/compilerplugins/clang/test/stringstatic.cxx
@@ -9,9 +9,13 @@
 
 #include 
 
+#include "stringstatic.hxx"
+
 // expected-error@+1 {{rather declare this using 
OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
 static const OUString TEST1 = "xxx";
 
+void f(rtl_uString const*);
+
 void test2()
 {
 // expected-error@+1 {{rather declare this using 
OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
@@ -20,4 +24,6 @@ void test2()
 static const OUString XXX2 = "xxx";
 (void)XXX;
 (void)XXX2;
+static const OUString DATA = "xxx";
+f(DATA.pData);
 }
diff --git a/compilerplugins/clang/test/stringstatic.hxx 
b/compilerplugins/clang/test/stringstatic.hxx
new file mode 100644
index ..ec82a8bf5deb
--- /dev/null
+++ b/compilerplugins/clang/test/stringstatic.hxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "sal/config.h"
+
+#include "rtl/ustring.hxx"
+
+OUString const INCLUDED = "xxx";
+
+inline void f()
+{
+// expected-error@+

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

[Andras Timar (via logerrit)]

 sc/source/filter/oox/worksheetbuffer.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 29d1e35efe9fde52d2d1911597b490d81d6ffb8d
Author: Andras Timar 
AuthorDate: Fri Aug 21 11:36:39 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Aug 21 12:13:34 2020 +0200

Use localized default sheet name, if sheet name is missing in xlsx file

Change-Id: I8a4708437c41374f67e60d22f56d374c39b4ad3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101137
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sc/source/filter/oox/worksheetbuffer.cxx 
b/sc/source/filter/oox/worksheetbuffer.cxx
index 12c2c618b9bb..71baa97ec646 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -32,6 +32,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 namespace oox {
 namespace xls {
@@ -187,7 +189,7 @@ WorksheetBuffer::IndexNamePair 
WorksheetBuffer::createSheet( const OUString& rPr
 Reference< XSpreadsheets > xSheets( getDocument()->getSheets(), 
UNO_SET_THROW );
 Reference< XIndexAccess > xSheetsIA( xSheets, UNO_QUERY_THROW );
 sal_Int16 nCalcSheet = -1;
-OUString aSheetName = rPreferredName.isEmpty() ? "Sheet" : 
rPreferredName;
+OUString aSheetName = rPreferredName.isEmpty() ? 
ScResId(STR_TABLE_DEF) : rPreferredName;
 if( nSheetPos < xSheetsIA->getCount() )
 {
 nCalcSheet = static_cast< sal_Int16 >( nSheetPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 shell/source/win32/shlxthandler/ooofilt/propspec.cxx |2 +-
 shell/source/win32/shlxthandler/ooofilt/propspec.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eab5ce4647ee76d9eae73008a6db76a35ce9066c
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:11:39 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:22:56 2020 +0200

Fix typo

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

diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx 
b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index bfb924803a1f..dd83326f5e2c 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
@@ -36,7 +36,7 @@
 
 //refer to ms-help://MS.VSCC/MS.MSDNVS.2052/com/stgasstg_7agk.htm
 //FMTID_SummaryInformation
-//GUID CLSID_SummaryInforation = {
+//GUID CLSID_SummaryInformation = {
 //0xF29F85E0,
 //0x4FF9,
 //0x1068,
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx 
b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
index aa14257d779d..f9e1fc289757 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
@@ -31,7 +31,7 @@
 #include 
 #include 
 //+-
-//  Declare:CLSID_SummaryInforation, GUID
+//  Declare:CLSID_SummaryInformation, GUID
 //  CLSID_Storage, GUID
 //  Contents:   Definitions of OpenOffice.org Document properties
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/inc/fldbas.hxx  |2 +-
 sw/source/core/text/txtfld.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aa68d029fcbafc2beed6ea4e99f5ac41ec8869d9
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:07:50 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:24:26 2020 +0200

Fix typo in code

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

diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index c3b252f7c3b3..24c5c9ae3093 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -145,7 +145,7 @@ enum SwAttrFieldType {
 ATTR_DATEFLD,
 ATTR_TIMEFLD,
 ATTR_PAGENUMBERFLD,
-ATTR_PAGECOOUNTFLD,
+ATTR_PAGECOUNTFLD,
 ATTR_BOOKMARKFLD,
 ATTR_SETREFATTRFLD
 };
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index c4a98b71a1c9..18cd5e627286 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -148,7 +148,7 @@ SwExpandPortion *SwTextFormatter::NewFieldPortion( 
SwTextFormatInfo &rInf,
 : pField->ExpandField(bInClipboard, 
pFrame->getRootFrame()) );
 pRet = new SwFieldPortion( aStr );
 }
-static_cast(pRet)->m_nAttrFieldType= 
ATTR_PAGECOOUNTFLD;
+static_cast(pRet)->m_nAttrFieldType= 
ATTR_PAGECOUNTFLD;
 break;
 
 case SwFieldIds::PageNumber:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f14977fa86487fbfb170e84ea7794529560eecca
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:10:07 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:25:18 2020 +0200

Fix typo in code

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 3a522bc84891..c5d81fba9c5b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1188,8 +1188,8 @@ DECLARE_OOXMLEXPORT_TEST(tdf122201_editUnprotectedText, 
"tdf122201_editUnprotect
 SwNodeIndex aDocStart(*aDocEnd.GetNode().StartOfSectionNode(), 3);
 
 // check protected area
-SwPaM aPaMPortected(aDocStart);
-CPPUNIT_ASSERT(aPaMPortected.HasReadonlySel(false));
+SwPaM aPaMProtected(aDocStart);
+CPPUNIT_ASSERT(aPaMProtected.HasReadonlySel(false));
 
 // check unprotected area
 SwPaM aPaMUnprotected(aDocEnd);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d30e628a90e576a11fe96f5455c1912aff99d046
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:17:34 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:26:22 2020 +0200

Fix typo in code

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

diff --git 
a/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx 
b/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx
index fd8cd5d8ef43..710493cbb74c 100644
--- a/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx
@@ -82,7 +82,7 @@ uno::Reference 
ScIndexEnumeration_TableConditionalEntryEnumerat
 aConditions[2].Value <<= OUString("");
 aConditions[3].Name = "Operator";
 aConditions[3].Value <<= sheet::ConditionOperator_EQUAL;
-aConditions[4].Name = "SoucePosition";
+aConditions[4].Name = "SourcePosition";
 aConditions[4].Value <<= table::CellAddress(0, 1, 5);
 
 uno::Reference xPropertySet(xSheet0, 
uno::UNO_QUERY_THROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sc/source/filter/oox/pivotcachebuffer.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 16c4cdd988ea8a5d5dfaa3c24e532a6f75ccb181
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:14:09 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:31:46 2020 +0200

Fix typo in code

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

diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx 
b/sc/source/filter/oox/pivotcachebuffer.cxx
index cd72bb418b83..a6d9302cfbdd 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -93,7 +93,7 @@ const sal_uInt8 BIFF12_PCDEFINITION_OPTIMIZEMEMORY  = 0x08;
 const sal_uInt8 BIFF12_PCDEFINITION_ENABLEREFRESH   = 0x10;
 const sal_uInt8 BIFF12_PCDEFINITION_BACKGROUNDQUERY = 0x20;
 const sal_uInt8 BIFF12_PCDEFINITION_UPGRADEONREFR   = 0x40;
-const sal_uInt8 BIFF12_PCDEFINITION_TUPELCACHE  = 0x80;
+const sal_uInt8 BIFF12_PCDEFINITION_TUPLECACHE  = 0x80;
 
 const sal_uInt8 BIFF12_PCDEFINITION_HASUSERNAME = 0x01;
 const sal_uInt8 BIFF12_PCDEFINITION_HASRELID= 0x02;
@@ -935,7 +935,7 @@ void PivotCache::importPCDefinition( SequenceInputStream& 
rStrm )
 maDefModel.mbEnableRefresh= getFlag( nFlags1, 
BIFF12_PCDEFINITION_ENABLEREFRESH );
 maDefModel.mbBackgroundQuery  = getFlag( nFlags1, 
BIFF12_PCDEFINITION_BACKGROUNDQUERY );
 maDefModel.mbUpgradeOnRefresh = getFlag( nFlags1, 
BIFF12_PCDEFINITION_UPGRADEONREFR );
-maDefModel.mbTupleCache   = getFlag( nFlags1, 
BIFF12_PCDEFINITION_TUPELCACHE );
+maDefModel.mbTupleCache   = getFlag( nFlags1, 
BIFF12_PCDEFINITION_TUPLECACHE );
 maDefModel.mbSupportSubquery  = getFlag( nFlags2, 
BIFF12_PCDEFINITION_SUPPORTSUBQUERY );
 maDefModel.mbSupportDrill = getFlag( nFlags2, 
BIFF12_PCDEFINITION_SUPPORTDRILL );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests

[Andrea Gelmini (via logerrit)]

 qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b683d68a09d9f85f9fc06d9582964c72d73a5ab
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:17:44 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:32:28 2020 +0200

Fix typo in code

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

diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java 
b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java
index fee7668c7917..c3417118e2b2 100644
--- a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java
+++ b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java
@@ -164,7 +164,7 @@ public class _XDocumentInsertable extends MultiMethodTest {
 if (result) {
 try {
 PropertyValue [] szEmptyArgs = new PropertyValue [0];
-String docURL = "file:///c:/ThisIsAnInvaldURL";
+String docURL = "file:///c:/ThisIsAnInvalidURL";
 log.println("Inserting document from URL '" + docURL + "'");
 oObj.insertDocumentFromURL(docURL, szEmptyArgs);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 slideshow/source/engine/animationnodes/basenode.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c64a07b5861108c9095cc9cfc14616c9e238456
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:10:53 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:36:16 2020 +0200

Fix typo in code

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

diff --git a/slideshow/source/engine/animationnodes/basenode.cxx 
b/slideshow/source/engine/animationnodes/basenode.cxx
index 1b8a6d7fde02..cf732f89701f 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -633,8 +633,8 @@ void BaseNode::notifyDeactivating( const 
AnimationNodeSharedPtr& rNotifier )
 void BaseNode::notifyEndListeners() const
 {
 // notify all listeners
-for( const auto& rListner : maDeactivatingListeners )
-rListner->notifyDeactivating( mpSelf );
+for( const auto& rListener : maDeactivatingListeners )
+rListener->notifyDeactivating( mpSelf );
 
 // notify state change
 maContext.mrEventMultiplexer.notifyAnimationEnd( mpSelf );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 vcl/source/gdi/TypeSerializer.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8ffb4cabd9ceac529f1c2d02bd1fdeb50bd2988b
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:04:38 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:37:02 2020 +0200

Fix typo in code

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

diff --git a/vcl/source/gdi/TypeSerializer.cxx 
b/vcl/source/gdi/TypeSerializer.cxx
index e2f399f2d76a..ad5f3e3a6dc2 100644
--- a/vcl/source/gdi/TypeSerializer.cxx
+++ b/vcl/source/gdi/TypeSerializer.cxx
@@ -220,11 +220,11 @@ void TypeSerializer::readGraphic(Graphic& rGraphic)
 {
 sal_uInt32 nMagic1 = 0;
 sal_uInt32 nMagic2 = 0;
-sal_uInt64 nBeginPoisition = mrStream.Tell();
+sal_uInt64 nBeginPosition = mrStream.Tell();
 
 mrStream.ReadUInt32(nMagic1);
 mrStream.ReadUInt32(nMagic2);
-mrStream.Seek(nBeginPoisition);
+mrStream.Seek(nBeginPosition);
 
 if (!mrStream.GetError())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source ucbhelper/source ucb/qa ucb/source uitest/libreoffice unodevtools/source

[Andrea Gelmini (via logerrit)]

 sw/source/core/SwNumberTree/SwNumberTree.cxx  |2 +-
 sw/source/core/doc/docnew.cxx |2 +-
 sw/source/core/edit/edsect.cxx|2 +-
 sw/source/core/unocore/unoobj2.cxx|2 +-
 sw/source/core/unocore/unotbl.cxx |2 +-
 sw/source/uibase/dbui/README  |2 +-
 sw/source/uibase/uno/unotxdoc.cxx |4 ++--
 ucb/qa/complex/tdoc/_XCommandProcessor.java   |2 +-
 ucb/source/ucp/ftp/ftpurl.hxx |2 +-
 ucbhelper/source/client/commandenvironment.cxx|2 +-
 uitest/libreoffice/uno/propertyvalue.py   |2 +-
 unodevtools/source/skeletonmaker/javacompskeleton.cxx |2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 3c6e41f806309c2ba1f1336baa8db715ca492959
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 12:54:08 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:38:30 2020 +0200

Fix typos

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

diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx 
b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index ab78733da94c..ba15af2c0f90 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -535,7 +535,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
 break;
 }
 }
-// assure that unnessary created phantoms at  are 
deleted.
+// assure that unnecessary created phantoms at  are 
deleted.
 pChild->ClearObsoletePhantoms();
 
 if ((*aPredIt)->IsValid())
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 24f5a218048e..70961797a7e6 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1029,7 +1029,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, 
sal_uInt16 const nStartPageNu
 {
 // #i72517# put the styles to the target document
 // if the source uses headers or footers the target document
-// needs inidividual page styles
+// needs individual page styles
 const SwWrtShell *pSourceShell = 
rSource.GetDocShell()->GetWrtShell();
 const SwPageDesc& rSourcePageDesc = pSourceShell->GetPageDesc(
 
pSourceShell->GetCurPageDesc());
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index 1eba3f95eb4c..662293a8d5c8 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -306,7 +306,7 @@ static const SwNode* lcl_SpecialInsertNode(const 
SwPosition* pCurrentPos)
 const SwNode& rCurrentNode = pCurrentPos->nNode.GetNode();
 
 // find innermost section or table.  At the end of this scope,
-// pInntermostNode contain the section/table before/after which we should
+// pInnermostNode contains the section/table before/after which we should
 // insert our empty paragraph, or it will be NULL if none is found.
 const SwNode* pInnermostNode = nullptr;
 {
diff --git a/sw/source/core/unocore/unoobj2.cxx 
b/sw/source/core/unocore/unoobj2.cxx
index 4f280beb94cc..58cf18b9cea0 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -502,7 +502,7 @@ lcl_CursorIsInSection(
 bool SwXParagraphEnumerationImpl::IgnoreLastElement(SwUnoCursor& rCursor, bool 
bMovedFromTable)
 {
 // Ignore the last element of a selection enumeration if this is a stub
-// paragraph (directly after table, selection ends at paragaph start).
+// paragraph (directly after table, selection ends at paragraph start).
 
 if (rCursor.Start()->nNode.GetIndex() != m_nEndIndex)
 return false;
diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 22ea0bf07d4f..fe79c13a4482 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3054,7 +3054,7 @@ void SwXTextTable::setName(const OUString& rName)
 static_cast(pNd)->SetChartTableName( rName );
 
 SwTable* pTable = SwTable::FindTable( pFormat );
-//TL_CHART2: chart needs to be notfied about name changes
+//TL_CHART2: chart needs to be notified about name changes
 pFormat->GetDoc()->UpdateCharts( 
pTable->GetFrameFormat()->GetName() );
 }
 aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
diff --git a/sw/source/uibase/dbui/README b/sw/source/uibase/dbui/README
index 7af8c114f0e0..ba9745c7773e 100644
--- a/sw/source/uibase/dbui/README
+++ b/sw/source/uibase/dbui/README
@@ -3,7 +3,7 @@ user via different GUIs. The modes are:
 

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

[Andrea Gelmini (via logerrit)]

 sc/inc/subtotalparam.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b33413cc4cee45e7a7710901e50f46ccf3338144
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:17:20 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 12:38:51 2020 +0200

Fix typo in code

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

diff --git a/sc/inc/subtotalparam.hxx b/sc/inc/subtotalparam.hxx
index b22d1ad9809b..e67feb85e71c 100644
--- a/sc/inc/subtotalparam.hxx
+++ b/sc/inc/subtotalparam.hxx
@@ -41,7 +41,7 @@ struct SC_DLLPUBLIC ScSubTotalParam
 void Clear();
 void SetSubTotals( sal_uInt16 nGroup,
const SCCOL* ptrSubTotals,
-   const ScSubTotalFunc* ptrFuncions,
+   const ScSubTotalFunc* ptrFunctions,
sal_uInt16 nCount );
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/txtnode/atrfld.cxx |2 +-
 sw/source/core/undo/undobj.cxx|4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 8f563f83a1cad52ba397fd7386690736fb891db6
Author: Michael Stahl 
AuthorDate: Fri Aug 14 16:35:32 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Aug 21 12:55:25 2020 +0200

tdf#135457 sw: fix invalidation of SwXTextField

This was supposed to happen from SwNodes::ChgNode() when moving to the
undo nodes array.

There are fields with a range that contains other fields, when the outer
field's range is deleted, the contained field moves to the undo array
and its position is no longer valid to be given out by
SwXTextField::getAnchor().

(regression from c73b5e969b2f9abdb2b9191938ca30bec5af725d
 ERR no, actually more likely from e18359445fabad9ba1a704600e9ee327112cc6ae)

Change-Id: I38c8b3393a777ca8dc8739b5ca4233a7f124961e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100749
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 14fd4b54113f884cfd6871aeff693734fc06224b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100705
Reviewed-by: Caolán McNamara 
(cherry picked from commit 27e9ead64d4e3a3f3b3d1203f7b9fee50eb0d04d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100987
Tested-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/txtnode/atrfld.cxx 
b/sw/source/core/txtnode/atrfld.cxx
index fba15a6107f9..ebcdced03c52 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -217,7 +217,7 @@ void SwFormatField::InvalidateField()
 {
 SwPtrMsgPoolItem const item(RES_REMOVE_UNO_OBJECT,
 &static_cast(*this)); // cast to base class (void*)
-NotifyClients(&item, &item);
+CallSwClientNotify(sw::LegacyModifyHint{ &item, &item });
 }
 
 void SwFormatField::SwClientNotify( const SwModify& rModify, const SfxHint& 
rHint )
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index bfea81a886b6..fa86072a3008 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -849,6 +849,10 @@ void SwUndoSaveContent::DelContentIndex( const SwPosition& 
rMark,
 
 SwDoc* pDoc = rMark.nNode.GetNode().GetDoc();
 
+// if it's not in the doc array, probably missing some invalidation 
somewhere
+assert(&rPoint.nNode.GetNodes() == &pDoc->GetNodes());
+assert(&rMark.nNode.GetNodes() == &pDoc->GetNodes());
+
 ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
 
 // 1. Footnotes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sarper Akdemir (via logerrit)]

 slideshow/source/engine/animationfactory.cxx |2 -
 slideshow/source/engine/box2dtools.cxx   |   36 +--
 slideshow/source/inc/box2dtools.hxx  |   13 +
 3 files changed, 26 insertions(+), 25 deletions(-)

New commits:
commit 7de41aa023408873c69d6d232ceee56a0f2f9aa5
Author: Sarper Akdemir 
AuthorDate: Fri Aug 21 10:12:25 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Aug 21 13:05:51 2020 +0200

box2dtools renaming some for clarity

Change-Id: Idd872213ee3140e82fbd6e8e8bd1ebff78dfdc18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101132
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/slideshow/source/engine/animationfactory.cxx 
b/slideshow/source/engine/animationfactory.cxx
index 7f5910cfb992..efc4587356dd 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -323,7 +323,7 @@ namespace slideshow::internal
 {
 mpShapeManager->notifyShapeUpdate( mpShape );
 if ( mpBox2DWorld->isInitialized() )
-mpBox2DWorld->queuePositionUpdate( 
mpShape->getXShape(), rOutPos );
+mpBox2DWorld->queueDynamicPositionUpdate( 
mpShape->getXShape(), rOutPos );
 }
 
 return true;
diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index 6fa427c15c9a..f99e03bcd893 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -205,7 +205,7 @@ box2DWorld::box2DWorld(const ::basegfx::B2DVector& 
rSlideSize)
 , mbShapesInitialized(false)
 , mbHasWorldStepper(false)
 , mpXShapeToBodyMap()
-, maShapeUpdateQueue()
+, maShapeParallelUpdateQueue()
 {
 }
 
@@ -307,9 +307,9 @@ void box2DWorld::setShapeCollision(
 
 void box2DWorld::processUpdateQueue(const double fPassedTime)
 {
-while (!maShapeUpdateQueue.empty())
+while (!maShapeParallelUpdateQueue.empty())
 {
-Box2DShapeUpdateInformation& aQueueElement = 
maShapeUpdateQueue.front();
+Box2DDynamicUpdateInformation& aQueueElement = 
maShapeParallelUpdateQueue.front();
 
 if (aQueueElement.mnDelayForSteps > 0)
 {
@@ -340,7 +340,7 @@ void box2DWorld::processUpdateQueue(const double 
fPassedTime)
 case BOX2D_UPDATE_ANGULAR_VELOCITY:
 setShapeAngularVelocity(aQueueElement.mxShape, 
aQueueElement.mfAngularVelocity);
 }
-maShapeUpdateQueue.pop();
+maShapeParallelUpdateQueue.pop();
 }
 }
 }
@@ -378,47 +378,47 @@ void box2DWorld::setHasWorldStepper(const bool 
bHasWorldStepper)
 mbHasWorldStepper = bHasWorldStepper;
 }
 
-void box2DWorld::queuePositionUpdate(
+void box2DWorld::queueDynamicPositionUpdate(
 const css::uno::Reference& xShape,
 const basegfx::B2DPoint& rOutPos)
 {
-Box2DShapeUpdateInformation aQueueElement = { xShape, {}, 
BOX2D_UPDATE_POSITION };
+Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, 
BOX2D_UPDATE_POSITION };
 aQueueElement.maPosition = rOutPos;
-maShapeUpdateQueue.push(aQueueElement);
+maShapeParallelUpdateQueue.push(aQueueElement);
 }
 
 void box2DWorld::queueLinearVelocityUpdate(
 const css::uno::Reference& xShape,
 const basegfx::B2DVector& rVelocity)
 {
-Box2DShapeUpdateInformation aQueueElement = { xShape, {}, 
BOX2D_UPDATE_LINEAR_VELOCITY, 1 };
+Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, 
BOX2D_UPDATE_LINEAR_VELOCITY, 1 };
 aQueueElement.maVelocity = rVelocity;
-maShapeUpdateQueue.push(aQueueElement);
+maShapeParallelUpdateQueue.push(aQueueElement);
 }
 
-void box2DWorld::queueRotationUpdate(
+void box2DWorld::queueDynamicRotationUpdate(
 const css::uno::Reference& xShape, const 
double fAngle)
 {
-Box2DShapeUpdateInformation aQueueElement = { xShape, {}, 
BOX2D_UPDATE_ANGLE };
+Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, 
BOX2D_UPDATE_ANGLE };
 aQueueElement.mfAngle = fAngle;
-maShapeUpdateQueue.push(aQueueElement);
+maShapeParallelUpdateQueue.push(aQueueElement);
 }
 
 void box2DWorld::queueAngularVelocityUpdate(
 const css::uno::Reference& xShape,
 const double fAngularVelocity)
 {
-Box2DShapeUpdateInformation aQueueElement = { xShape, {}, 
BOX2D_UPDATE_ANGULAR_VELOCITY, 1 };
+Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, 
BOX2D_UPDATE_ANGULAR_VELOCITY, 1 };
 aQueueElement.mfAngularVelocity = fAngularVelocity;
-maShapeUpdateQueue.push(aQueueElement);
+maShapeParallelUpdateQueue.push(aQueueElement);
 }
 
 void box2DWorld::queueShapeVisibilityUpdate(
 const css::uno::Reference& xShape, const 
bool bVisibility)
 {
-Box2DShapeUpdateInformation aQueueElement = { xShape, {}, 
BOX2D_UPDATE_VISIBILITY };
+Box2DDynamicUpdateInformation aQueueElement

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

[Eike Rathke (via logerrit)]

 i18npool/Library_localedata_others.mk |1 
 i18npool/source/localedata/data/en_HK.xml |   34 ++
 i18npool/source/localedata/localedata.cxx |1 
 3 files changed, 36 insertions(+)

New commits:
commit 5dffb7ba361ad76aa249d6c93fd87fff67362726
Author: Eike Rathke 
AuthorDate: Fri Aug 21 11:51:44 2020 +0200
Commit: Eike Rathke 
CommitDate: Fri Aug 21 13:23:52 2020 +0200

Resolves: tdf#135518 Add English (Hong Kong) [en-HK] locale data

Inherited from en-GB, zh-HK

Change-Id: I966d19cfa2da26d3d882af35afe79a2f77eaffa8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101139
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index 62436f1a817d..a6246b8b24c2 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -50,6 +50,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_dz_BT \
CustomTarget/i18npool/localedata/localedata_ebo_CG \
CustomTarget/i18npool/localedata/localedata_ee_GH \
+   CustomTarget/i18npool/localedata/localedata_en_HK \
CustomTarget/i18npool/localedata/localedata_en_IN \
CustomTarget/i18npool/localedata/localedata_en_MY \
CustomTarget/i18npool/localedata/localedata_eo \
diff --git a/i18npool/source/localedata/data/en_HK.xml 
b/i18npool/source/localedata/data/en_HK.xml
new file mode 100644
index ..e0d913b912ac
--- /dev/null
+++ b/i18npool/source/localedata/data/en_HK.xml
@@ -0,0 +1,34 @@
+
+
+
+
+  
+
+  en
+  English
+
+
+  HK
+  Hong Kong
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 5d3a0af75db3..f4dbd04dc56e 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -201,6 +201,7 @@ const struct {
 { "zh_SG",  lcl_DATA_OTHERS },
 { "zh_TW",  lcl_DATA_OTHERS },
 { "zh_MO",  lcl_DATA_OTHERS },
+{ "en_HK",  lcl_DATA_OTHERS },  // needs to be in OTHERS instead of EN 
because currency inherited from zh_HK
 
 { "ar_EG",  lcl_DATA_OTHERS },
 { "ar_DZ",  lcl_DATA_OTHERS },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 include/xmloff/txtparae.hxx |2 +
 sw/qa/extras/odfexport/data/nestedTableInFooter.odt |binary
 sw/qa/extras/odfexport/odfexport.cxx|   13 
 sw/source/filter/xml/xmltble.cxx|   21 +++-
 xmloff/source/text/txtparae.cxx |2 +
 5 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit f0286ad82465152b29bba01ab2edeb97291397fa
Author: Mike Kaganski 
AuthorDate: Fri Aug 21 00:15:29 2020 +0300
Commit: Mike Kaganski 
CommitDate: Fri Aug 21 14:18:35 2020 +0200

tdf#135942: avoid collecting autostyles during writing them

This modifies the container over which iteration is performed.
Additionally, make sure that all nested table autostyles are
collected on the first phase.

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

diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 5c09d2a782be..50e65990362b 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -365,6 +365,8 @@ protected:
 const css::uno::Reference< css::beans::XPropertySet> & i_xPortion,
 bool i_bAutoStyles, bool i_isProgress, bool & rPrevCharIsSpace);
 
+bool isAutoStylesCollected() const { return mbCollected; }
+
 virtual void exportTableAutoStyles();
 
 public:
diff --git a/sw/qa/extras/odfexport/data/nestedTableInFooter.odt 
b/sw/qa/extras/odfexport/data/nestedTableInFooter.odt
new file mode 100644
index ..0356f04ee14e
Binary files /dev/null and 
b/sw/qa/extras/odfexport/data/nestedTableInFooter.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index e28ae2515f0b..ee25f99822fe 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -2585,5 +2585,18 @@ DECLARE_ODFEXPORT_TEST(tdf124470, 
"tdf124470TableAndEmbeddedUsedFonts.odt")
 assertXPath(pXmlDoc, 
"/office:document-content/office:automatic-styles/style:style[@style:family='paragraph']",
 1);
 }
 
+DECLARE_ODFEXPORT_TEST(tdf135942, "nestedTableInFooter.odt")
+{
+// All table autostyles should be collected, including nested, and must 
not crash.
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+xmlDocUniquePtr pXmlDoc = parseExport("styles.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc, 
"/office:document-styles/office:automatic-styles/style:style[@style:family='table']",
 2);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 506c4fb2e22a..68dbde33016d 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -1199,8 +1199,27 @@ void SwXMLTextParagraphExport::exportTable(
 // During the flat XML export (used e.g. by .sdw-export)
 // ALL flags are set at the same time.
 const bool bExportStyles = bool( GetExport().getExportFlags() 
& SvXMLExportFlags::STYLES );
-if ( bExportStyles || !pFormat->GetDoc()->IsInHeaderFooter( 
aIdx ) )
+if (!isAutoStylesCollected()
+&& (bExportStyles || 
!pFormat->GetDoc()->IsInHeaderFooter(aIdx)))
+{
 maTableNodes.push_back(pTableNd);
+// Collect all tables inside cells of this table, too
+const auto aCellNames = pXTable->getCellNames();
+for (const OUString& rCellName : aCellNames)
+{
+
css::uno::Reference xCell(
+pXTable->getCellByName(rCellName), 
css::uno::UNO_QUERY);
+if (!xCell)
+continue;
+auto xEnumeration = xCell->createEnumeration();
+while (xEnumeration->hasMoreElements())
+{
+if (css::uno::Reference 
xInnerTable{
+xEnumeration->nextElement(), 
css::uno::UNO_QUERY })
+exportTable(xInnerTable, bAutoStyles, 
_bProgress);
+}
+}
+}
 }
 else
 {
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index a9354c0057c7..eead9e4f55e7 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3709,6 +3709,8 @@ void XMLTextParagraphExport::exportTableAutoStyles() {}
 
 void XMLTextParagraphExport::exportTextAutoStyles()
 {
+// tdf#135942: do not collect styles during their export: this may modify 
iterated containers
+mbCollected = true;
 exportTableAutoStyles();
 
 GetAutoStylePool().exportXML( Xm

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

[Andras Timar (via logerrit)]

 sc/source/filter/oox/worksheetbuffer.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ba34f7a04addba42b9c6f46d6be7243bbbf2bab6
Author: Andras Timar 
AuthorDate: Fri Aug 21 11:36:39 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Aug 21 14:19:13 2020 +0200

Use localized default sheet name, if sheet name is missing in xlsx file

Change-Id: I8a4708437c41374f67e60d22f56d374c39b4ad3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101066
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sc/source/filter/oox/worksheetbuffer.cxx 
b/sc/source/filter/oox/worksheetbuffer.cxx
index bb4f156aaba7..31040f4f6984 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -32,6 +32,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 namespace oox::xls {
 
@@ -186,7 +188,7 @@ WorksheetBuffer::IndexNamePair 
WorksheetBuffer::createSheet( const OUString& rPr
 Reference< XSpreadsheets > xSheets( getDocument()->getSheets(), 
UNO_SET_THROW );
 Reference< XIndexAccess > xSheetsIA( xSheets, UNO_QUERY_THROW );
 sal_Int16 nCalcSheet = -1;
-OUString aSheetName = rPreferredName.isEmpty() ? "Sheet" : 
rPreferredName;
+OUString aSheetName = rPreferredName.isEmpty() ? 
ScResId(STR_TABLE_DEF) : rPreferredName;
 if( nSheetPos < xSheetsIA->getCount() )
 {
 nCalcSheet = static_cast< sal_Int16 >( nSheetPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'feature/calc-canvas'

[Michael Meeks (via logerrit)]

New branch 'feature/calc-canvas' available with the following commits:
commit 7f387d4130dfce48568f1bad74282fd48895cd3e
Author: Michael Meeks 
Date:   Wed Aug 19 18:27:14 2020 +0100

Render at 1:1 whatever the browser zoom ;-)

Change-Id: I3984cbb859e5f29fa819b242501cd2191528bca3

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 vbahelper/source/vbahelper/vbaapplicationbase.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 857c09a250c39185ea9138d3a5b3bac7dc899091
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:05:32 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 15:23:16 2020 +0200

Fix typo in code

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

diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx 
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 286b38bd4b88..924396a962da 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -82,7 +82,7 @@ public:
 return static_cast(nDiffDays) + 
static_cast(nDiffSeconds)/double(24*3600);
 }
 
-static sal_Int32 GetTimerMiliseconds( double nFrom, double nTo )
+static sal_Int32 GetTimerMilliseconds( double nFrom, double nTo )
 {
 double nResult = nTo - nFrom;
 if ( nResult > 0 )
@@ -101,7 +101,7 @@ public:
 m_xBase = xBase;
 m_aTimerInfo = VbaTimerInfo( aFunction, ::std::pair< double, double >( 
nFrom, nTo ) );
 m_aTimer.SetInvokeHandler( LINK( this, VbaTimer, MacroCallHdl ) );
-m_aTimer.SetTimeout( GetTimerMiliseconds( GetNow(), nFrom ) );
+m_aTimer.SetTimeout( GetTimerMilliseconds( GetNow(), nFrom ) );
 m_aTimer.Start();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/source/filter/xml/XMLRedlineImportHelper.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7fef4817e96ca3e804e4a2c7d65afaf4c522f97f
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:07:04 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 15:24:17 2020 +0200

Fix typo in code

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

diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 43bcdd5a92a8..4a479a9cc38e 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -96,7 +96,7 @@ public:
 css::uno::Reference const & rRange, // the 
actual XTextRange
 // text range is (from an XML view) outside of a paragraph
 // (i.e. before a table)
-bool bIsOusideOfParagraph);
+bool bIsOutsideOfParagraph);
 
 /**
  * Adjust the start (end) position for a redline that begins in a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-documentation] What is data hierarchy in pivot table data field options?

[Kohei Yoshida]

Hi Steve and Celia,

On 21.08.2020 05:31, Steve (GMail) wrote:


Just for information, anything you attach to your email will be
stripped off again by this mailing list; we can't see your screenshot.



I'm assuming we are talking about the dialog that is described here?

https://help.libreoffice.org/7.0/en-US/text/scalc/01/12090106.html



Nevertheless I fully understand your question. Unfortunately I do not
recall ever seeing the Hierarchy drop-down on the Data Field Options
dialog in any state other than grayed. I don't know what circumstances
might lead to it becoming available - maybe one of the developers
could have a look at the code to see? (email copied to Developers
mailing list)


I provided my own explanation below.


What is data hierarchy in pivot tables?


Data hierarchy in a pivot table is an additional layer of grouping 
applied to the source values of a field.  I will explain this concept as 
follows.


First, when you initially create a pivot table with source data within 
your Calc document, the table output is created with however many fields 
you may have in the source data.  Let's say you have the following field 
values:


Field1
1
2
3
4
5
6
7
8
9
10

then the pivot table will create a field for this Field1, initially with 
no hierarchy i.e. the raw values will get shown.


You can assign grouping to this field, by moving the cell cursor to 
where this field data is displayed within pivot table, and either press 
F12, or select Data -> Group and Outline -> Group from the menu.  For 
this set of values, you can only create a numeric range group, to group 
the values in some specific intervals.  If you have a set of date 
values, you can also apply date-based grouping i.e. years, quarter, 
months, days, and so on.


This grouping is what is referred to as hierarchy.  The two are 
interchangeable, but in the source code, this is referred to as 
hierarchy pretty much exclusively.


Under normal circumstances, each field can have only one hierarchy, or 
none at all, as far as I know.  Someone please correct me please if this 
is not accurate, but I'm certain this is the case.


This is a question for concept: What is a data hierarchy in this 
option dialog? And more, when/how do I use it?


As Steve said, this option is always grayed, because it will get active 
only when the field has more than one hierarchies, which, as I said 
above, almost never happens under normal circumstances.


Having said this, here is a scenario where that option may become 
active, but it needs a bit of an explanation.


Calc's pivot table implementation is split into two parts.  You can 
refer to them as the front end and back end portions.  Some people may 
hate these terms, but I don't care.  The back-end part takes care of 
defining the structure of the source data, in terms of fields (or 
dimensions as they are referred to in the code) and the structure of 
each field.  Each field consists of three layers - first layer is 
hierarchies, the second layer is levels, and the last layer is members.  
A hierarchy is the type of grouping applied (i.e. value range, years, 
quarters etc), a level is a specific bucket within the defined hierarchy 
i.e. range 1-4, year 1980, month of August etc.  A member is an original 
value.


The front-end part receives this structure provided by the back-end, and 
displays it in sheets, or recently in charts, and/or provides various 
dialogs for tweaking the parameters.


The back-end part is implemented as a UNO component, and in theory it 
can be swapped with one implemented by an extension.  But when your data 
source is Calc's own sheet, you are using Calc's own back-end 
implementation, and this one does not allow multiple hierarchies in a 
field.  This is why that hierarchy option is always grayed out.


Because the UNO API itself allows each field (or dimension) to have 
multiple hierarchies to be defined, in theory if you use an pivot table 
data source extension, that extension can define multiple hierarchies 
for some fields, and then that option will become active.  Having said 
that, I have never seen any pivot table extension in existence, so I 
have never seen it active myself.  At one point I almost wrote a pivot 
table data source extension myself as an experiment, but I never got to 
finish it up to see the light of day.


Does this explanation help?

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

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

[Noel Grandin (via logerrit)]

 xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx |   11 --
 xmloff/source/style/xmlstyle.cxx|   15 ++-
 xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx |   47 
--
 3 files changed, 34 insertions(+), 39 deletions(-)

New commits:
commit ee9f2f58a5a54f994ef055edf0dd675f81bbd8ae
Author: Noel Grandin 
AuthorDate: Fri Aug 21 09:32:23 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 21 16:01:41 2020 +0200

use fast-parser in XMLIndexBibliographyConfigurationContext

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

diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx 
b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index e2f67f9ad495..4efc71336502 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -56,9 +56,8 @@ public:
 
 XMLIndexBibliographyConfigurationContext(
 SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList);
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList> & 
xAttrList);
 
 virtual ~XMLIndexBibliographyConfigurationContext() override;
 
@@ -70,10 +69,8 @@ private:
 
 virtual void CreateAndInsert( bool bOverwrite ) override;
 
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList 
) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& AttrList ) override;
 };
 
 #endif
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 03ac41d85077..d91180681e89 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -410,6 +410,16 @@ SvXMLStyleContext 
*SvXMLStylesContext::CreateStyleChildContext(
 {
 pStyle = 
GetImport().GetDataStylesImport()->CreateChildContext(GetImport(), nElement,
xAttrList, *this);
+if (pStyle)
+return pStyle;
+}
+
+switch (nElement)
+{
+case XML_ELEMENT(TEXT, XML_BIBLIOGRAPHY_CONFIGURATION):
+pStyle = new XMLIndexBibliographyConfigurationContext(
+GetImport(), nElement, xAttrList);
+break;
 }
 
 return pStyle;
@@ -478,11 +488,6 @@ SvXMLStyleContext 
*SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr
xAttrList);
 break;
 
-case XML_TOK_TEXT_BIBLIOGRAPHY_CONFIG:
-pStyle = new XMLIndexBibliographyConfigurationContext(
-GetImport(), p_nPrefix, rLocalName, xAttrList);
-break;
-
 case XML_TOK_TEXT_LINENUMBERING_CONFIG:
 pStyle = new XMLLineNumberingImportContext(
 GetImport(), p_nPrefix, rLocalName, xAttrList);
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx 
b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 1046e8153318..c9937f562e6a 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -38,6 +39,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::xmloff::token;
 
 using ::com::sun::star::xml::sax::XAttributeList;
+using ::com::sun::star::xml::sax::XFastAttributeList;
 using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::lang::XMultiServiceFactory;
@@ -56,10 +58,9 @@ const OUStringLiteral gsLocale("Locale");
 
 
XMLIndexBibliographyConfigurationContext::XMLIndexBibliographyConfigurationContext(
 SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLocalName,
-const Reference & xAttrList) :
-SvXMLStyleContext(rImport, nPrfx, rLocalName, xAttrList, 
XmlStyleFamily::TEXT_BIBLIOGRAPHYCONFIG),
+sal_Int32 nElement,
+const Reference & xAttrList) :
+SvXMLStyleContext(rImport, nElement, xAttrList, 
XmlStyleFamily::TEXT_BIBLIOGRAPHYCONFIG),
 sSuffix(),
 sPrefix(),
 sAlgorithm(),
@@ -133,41 +134,33 @@ void 
XMLIndexBibliographyConfigurationContext::SetAttribute(
 }
 }
 
-SvXMLImportContextRef 
XMLIndexBibliographyConfigurationContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
- 

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

[Noel Grandin (via logerrit)]

 sw/source/filter/xml/xmlfmt.cxx  |4 
 xmloff/source/draw/ximpstyl.cxx  |8 
 xmloff/source/style/XMLFontStylesContext.cxx |4 ++--
 xmloff/source/style/prstylei.cxx |4 
 xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx |   11 +--
 xmloff/source/text/XMLTextMasterPageContext.cxx  |5 -
 6 files changed, 3 insertions(+), 33 deletions(-)

New commits:
commit 48291e148c97cf48d25425e81b045e7feddd5b50
Author: Noel Grandin 
AuthorDate: Fri Aug 21 09:46:48 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 21 16:01:58 2020 +0200

no need to call superclass here

there is no CreateChildContext in the superclass
(and the next implementation of that method that is actually called is
not going to do anything useful here)

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

diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 5bd4debc2d27..49e1224cdb83 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -651,10 +651,6 @@ SvXMLImportContextRef 
SwXMLItemSetStyleContext_Impl::CreateChildContext(
 }
 }
 
-if (!xContext)
-xContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName,
-  xAttrList );
-
 return xContext;
 }
 
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 6aee9df7f8ac..4e638adc1c5b 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -430,10 +430,6 @@ SvXMLImportContextRef 
SdXMLPageMasterContext::CreateChildContext(
 xContext = mxPageMasterStyle.get();
 }
 
-// call base class
-if (!xContext)
-xContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, 
xAttrList);
-
 return xContext;
 }
 
@@ -467,10 +463,6 @@ SvXMLImportContextRef 
SdXMLPresentationPageLayoutContext::CreateChildContext(
 maList.push_back(xLclContext);
 }
 
-// call base class
-if (!xContext)
-xContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, 
xAttrList);
-
 return xContext;
 }
 
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx 
b/xmloff/source/style/XMLFontStylesContext.cxx
index 450525fe795c..e17b79bd6ecb 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -179,11 +179,11 @@ void XMLFontStyleContextFontFace::FillProperties(
 SvXMLImportContextRef XMLFontStyleContextFontFace::CreateChildContext(
 sal_uInt16 nPrefix,
 const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList 
)
+const css::uno::Reference< css::xml::sax::XAttributeList > &  )
 {
 if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, 
XML_FONT_FACE_SRC ))
 return new XMLFontStyleContextFontFaceSrc( GetImport(), nPrefix, 
rLocalName, *this );
-return SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName, 
xAttrList );
+return nullptr;
 }
 
 OUString XMLFontStyleContextFontFace::familyName() const
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 1222fbd50ca7..02362142ee41 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -220,10 +220,6 @@ SvXMLImportContextRef 
XMLPropStyleContext::CreateChildContext(
 xImpPrMap );
 }
 
-if (!xContext)
-xContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName,
-  xAttrList );
-
 return xContext;
 }
 
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx 
b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 7897ce908e20..ea03a0589969 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -277,7 +277,7 @@ void XMLFootnoteConfigurationImportContext::SetAttribute( 
sal_uInt16 nPrefixKey,
 SvXMLImportContextRef 
XMLFootnoteConfigurationImportContext::CreateChildContext(
 sal_uInt16 nPrefix,
 const OUString& rLocalName,
-const Reference & xAttrList )
+const Reference &  )
 {
 SvXMLImportContextRef xContext;
 
@@ -303,15 +303,6 @@ SvXMLImportContextRef 
XMLFootnoteConfigurationImportContext::CreateChildContext(
 }
 // else: unknown namespace -> default context
 }
-// else: endnote -> default context
-
-if (!xContext)
-{
-// default: delegate to super class
-xContext = SvXMLStyleContext::CreateChildContext(nPrefix,
- 

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

[Andrea Gelmini (via logerrit)]

 winaccessibility/source/UAccCOMIDL/ia2_api_all.idl |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f3272cd389d66e249d189b1810dbf685b14a00ba
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:04:01 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 16:07:02 2020 +0200

Fix typo

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

diff --git a/winaccessibility/source/UAccCOMIDL/ia2_api_all.idl 
b/winaccessibility/source/UAccCOMIDL/ia2_api_all.idl
index 1dce1785c802..95a3a42dbaa8 100644
--- a/winaccessibility/source/UAccCOMIDL/ia2_api_all.idl
+++ b/winaccessibility/source/UAccCOMIDL/ia2_api_all.idl
@@ -1351,7 +1351,7 @@ IA2_STATE_PINNED =  0x8
  @ref _indexes\n
  @ref _enumBase\n
  @ref _specialOffsets\n
- @ref _dicoveringInterfaces\n
+ @ref _discoveringInterfaces\n
  @ref _changingInterfaces\n
  @ref _applicationInfo\n
  @ref _childIDs\n
@@ -1441,7 +1441,7 @@ IA2_STATE_PINNED =  0x8
Since the same offset is associated with two different lines a special 
means is needed
to fetch text from the line where the caret is physically located.
 
- @section _dicoveringInterfaces Discovery of Interfaces
+ @section _discoveringInterfaces Discovery of Interfaces
   In general AT (Assistive Technology) should try IAccessible2 interfaces, 
followed by using
   the MSAA (Microsoft® Active Accessibility®) interfaces.  (In cases 
where the an application
   is known to have custom interfaces which provide information not supplied by 
IAccessible2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/html

[thais-dev (via logerrit)]

 loleaflet/html/loleaflet.html.m4 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 43904d459853461b362760b1c2a48c70540b85e8
Author: thais-dev 
AuthorDate: Fri Aug 21 09:36:34 2020 -0300
Commit: Tor Lillqvist 
CommitDate: Fri Aug 21 16:12:06 2020 +0200

Fix comment syntax.

Change-Id: Ia726b1b46c1aa2ca7d2757441e6699956313b924
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101142
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 4d357ff5c..1b55d0b9d 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -267,7 +267,7 @@ m4_ifelse(MOBILEAPP,[true],
   window.tileSize = 256;])
 m4_syscmd([cat ]GLOBAL_JS)m4_dnl
 
-
+// Dynamically load the appropriate *-mobile.css, *-tablet.css or 
*-desktop.css 
 var link = document.createElement('link');
 link.setAttribute("rel", "stylesheet");
 link.setAttribute("type", "text/css");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re[2]: [libreoffice-documentation] What is data hierarchy in pivot table data field options?

[Steve (GMail)]

Kohei,

Many thanks for that insight.

In terms of the Calc Guide, I'm not keen to fully explain a feature that 
doesn't exist without using an extension! Would you be happy with the 
following note?
"For the majority of users, Calc does not provide multiple hierarchies 
for a single field and so this option is normally grayed. If you use a 
pivot table data source extension, that extension could define multiple 
hierarchies for some fields and then the option could become available. 
See the documentation supplied with that extension for more details".


Regards,

Steve


-- Original Message --
From: "Kohei Yoshida" 
To: "Steve (GMail)" 
Cc: "Documentation Team" ; 
"LibreOffice Developers" 

Sent: 21/08/2020 14:33:56
Subject: Re: [libreoffice-documentation] What is data hierarchy in pivot 
table data field options?



Hi Steve and Celia,

On 21.08.2020 05:31, Steve (GMail) wrote:


Just for information, anything you attach to your email will be
stripped off again by this mailing list; we can't see your screenshot.



I'm assuming we are talking about the dialog that is described here?

https://help.libreoffice.org/7.0/en-US/text/scalc/01/12090106.html



Nevertheless I fully understand your question. Unfortunately I do not
recall ever seeing the Hierarchy drop-down on the Data Field Options
dialog in any state other than grayed. I don't know what circumstances
might lead to it becoming available - maybe one of the developers
could have a look at the code to see? (email copied to Developers
mailing list)


I provided my own explanation below.


What is data hierarchy in pivot tables?


Data hierarchy in a pivot table is an additional layer of grouping applied to 
the source values of a field.  I will explain this concept as follows.

First, when you initially create a pivot table with source data within your 
Calc document, the table output is created with however many fields you may 
have in the source data.  Let's say you have the following field values:

Field1
1
2
3
4
5
6
7
8
9
10

then the pivot table will create a field for this Field1, initially with no 
hierarchy i.e. the raw values will get shown.

You can assign grouping to this field, by moving the cell cursor to where this field 
data is displayed within pivot table, and either press F12, or select Data -> 
Group and Outline -> Group from the menu.  For this set of values, you can only 
create a numeric range group, to group the values in some specific intervals.  If you 
have a set of date values, you can also apply date-based grouping i.e. years, 
quarter, months, days, and so on.

This grouping is what is referred to as hierarchy.  The two are 
interchangeable, but in the source code, this is referred to as hierarchy 
pretty much exclusively.

Under normal circumstances, each field can have only one hierarchy, or none at 
all, as far as I know.  Someone please correct me please if this is not 
accurate, but I'm certain this is the case.


This is a question for concept: What is a data hierarchy in this option dialog? 
And more, when/how do I use it?


As Steve said, this option is always grayed, because it will get active only 
when the field has more than one hierarchies, which, as I said above, almost 
never happens under normal circumstances.

Having said this, here is a scenario where that option may become active, but 
it needs a bit of an explanation.

Calc's pivot table implementation is split into two parts.  You can refer to 
them as the front end and back end portions.  Some people may hate these terms, 
but I don't care.  The back-end part takes care of defining the structure of 
the source data, in terms of fields (or dimensions as they are referred to in 
the code) and the structure of each field.  Each field consists of three layers 
- first layer is hierarchies, the second layer is levels, and the last layer is 
members.  A hierarchy is the type of grouping applied (i.e. value range, years, 
quarters etc), a level is a specific bucket within the defined hierarchy i.e. 
range 1-4, year 1980, month of August etc.  A member is an original value.

The front-end part receives this structure provided by the back-end, and 
displays it in sheets, or recently in charts, and/or provides various dialogs 
for tweaking the parameters.

The back-end part is implemented as a UNO component, and in theory it can be 
swapped with one implemented by an extension.  But when your data source is 
Calc's own sheet, you are using Calc's own back-end implementation, and this 
one does not allow multiple hierarchies in a field.  This is why that hierarchy 
option is always grayed out.

Because the UNO API itself allows each field (or dimension) to have multiple 
hierarchies to be defined, in theory if you use an pivot table data source 
extension, that extension can define multiple hierarchies for some fields, and 
then that option will become active.  Having said that, I have never seen any 
pivot table extension in existence, so I have never

Re: [libreoffice-documentation] What is data hierarchy in pivot table data field options?

[Kohei Yoshida]

On 21.08.2020 10:12, Steve (GMail) wrote:

Kohei,

Many thanks for that insight.

In terms of the Calc Guide, I'm not keen to fully explain a feature
that doesn't exist without using an extension! Would you be happy with
the following note?

* "For the majority of users, Calc does not provide multiple
hierarchies for a single field and so this option is normally grayed.
If you use a pivot table data source extension, that extension could
define multiple hierarchies for some fields and then the option could
become available. See the documentation supplied with that extension
for more details".


That sounds good to me.

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

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

[Sarper Akdemir (via logerrit)]

 slideshow/source/engine/activitiesqueue.cxx |   23 
++
 slideshow/source/engine/animationnodes/animationbasenode.cxx|   11 +++-
 slideshow/source/engine/animationnodes/animationbasenode.hxx|5 +-
 slideshow/source/engine/animationnodes/animationphysicsnode.cxx |5 ++
 slideshow/source/engine/animationnodes/animationphysicsnode.hxx |1 
 slideshow/source/inc/activitiesqueue.hxx|7 +++
 6 files changed, 48 insertions(+), 4 deletions(-)

New commits:
commit 76f3218b32acbc1b67bd291ac84067c83f6e3c2f
Author: Sarper Akdemir 
AuthorDate: Thu Aug 6 10:32:55 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Aug 21 16:31:52 2020 +0200

make physics animation effects always processed last

Makes it possible to add activities that will be processed last in the 
queue.

Makes physics animation effects queued this way.

And fixes the bug that makes physics animation effects appear
out of sync for a frame with the shapes that other in parallel
animation effects control.

Change-Id: I92d436aced6ef3ee2c8b0bf0167c1f7e642ba3b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100713
Reviewed-by: Thorsten Behrens 
Tested-by: Jenkins

diff --git a/slideshow/source/engine/activitiesqueue.cxx 
b/slideshow/source/engine/activitiesqueue.cxx
index ba982385356e..2e3b29d9dbc7 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -50,6 +50,8 @@ namespace slideshow::internal
 {
 for( const auto& pActivity : maCurrentActivitiesWaiting )
 pActivity->dispose();
+for( const auto& pActivity : maCurrentTailActivitiesWaiting )
+pActivity->dispose();
 for( const auto& pActivity : maCurrentActivitiesReinsert )
 pActivity->dispose();
 }
@@ -72,10 +74,31 @@ namespace slideshow::internal
 return true;
 }
 
+bool ActivitiesQueue::addTailActivity(const ActivitySharedPtr 
&pActivity)
+{
+OSL_ENSURE( pActivity, "ActivitiesQueue::addTailActivity: activity 
ptr NULL" );
+
+if( !pActivity )
+return false;
+
+// Activities that should be processed last are kept in a different
+// ActivityQueue, and later appended to the end of the 
maCurrentActivitiesWaiting
+// on the beginning of ActivitiesQueue::process()
+maCurrentTailActivitiesWaiting.push_back( pActivity );
+
+return true;
+}
+
 void ActivitiesQueue::process()
 {
 SAL_INFO("slideshow.verbose", "ActivitiesQueue: outer loop 
heartbeat" );
 
+// If there are activities to be processed last append them to the 
end of the ActivitiesQueue
+maCurrentActivitiesWaiting.insert( 
maCurrentActivitiesWaiting.end(),
+   
maCurrentTailActivitiesWaiting.begin(),
+   
maCurrentTailActivitiesWaiting.end() );
+maCurrentTailActivitiesWaiting.clear();
+
 // accumulate time lag for all activities, and lag time
 // base if necessary:
 double fLag = 0.0;
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx 
b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 4dcb640795aa..1a15bf2de843 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -45,12 +45,12 @@ AnimationBaseNode::AnimationBaseNode(
   mxAnimateNode( xNode, uno::UNO_QUERY_THROW ),
   maAttributeLayerHolder(),
   maSlideSize( rContext.maSlideSize ),
-  mpActivity(),
   mpShape(),
   mpShapeSubset(),
   mpSubsetManager(rContext.maContext.mpSubsettableShapeManager),
   mbPreservedVisibility(true),
-  mbIsIndependentSubset( rContext.mbIsIndependentSubset )
+  mbIsIndependentSubset( rContext.mbIsIndependentSubset ),
+  mpActivity()
 {
 // extract native node targets
 // ===
@@ -294,7 +294,7 @@ void AnimationBaseNode::activate_st()
 mpActivity->setTargets( getShape(), maAttributeLayerHolder.get() );
 
 // add to activities queue
-getContext().mrActivitiesQueue.addActivity( mpActivity );
+enqueueActivity();
 }
 else {
 // Actually, DO generate the event for empty activity,
@@ -372,6 +372,11 @@ bool AnimationBaseNode::hasPendingAnimation() const
 return true;
 }
 
+bool AnimationBaseNode::enqueueActivity() const
+{
+return getContext().mrActivitiesQueue.addActivity( mpActivity );
+}
+
 #if defined(DBG_UTIL)
 void AnimationBaseNode::showState() const
 {
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx 
b/slideshow/source/engine/animationnodes/a

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

[Sarper Akdemir (via logerrit)]

 slideshow/source/engine/animationfactory.cxx |4 
 slideshow/source/engine/box2dtools.cxx   |  181 +--
 slideshow/source/inc/box2dtools.hxx  |   33 
 3 files changed, 175 insertions(+), 43 deletions(-)

New commits:
commit b240db92100aec92e0e659c6b404ed1cd0ffcbc3
Author: Sarper Akdemir 
AuthorDate: Thu Aug 13 03:40:25 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Aug 21 16:32:14 2020 +0200

make physics animations handle sequential animations correctly

fixes a bug where if there is a sequence of animations between
two physics animations that change the position, rotation or visibility
of a shape - changes are not picked up by the latter physics animation.

Change-Id: Ie8bb8b32588f4c7bf16317b5229adc5b0334d192
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100715
Reviewed-by: Thorsten Behrens 
Tested-by: Jenkins

diff --git a/slideshow/source/engine/animationfactory.cxx 
b/slideshow/source/engine/animationfactory.cxx
index efc4587356dd..8f6534a30539 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -323,7 +323,9 @@ namespace slideshow::internal
 {
 mpShapeManager->notifyShapeUpdate( mpShape );
 if ( mpBox2DWorld->isInitialized() )
-mpBox2DWorld->queueDynamicPositionUpdate( 
mpShape->getXShape(), rOutPos );
+{
+mpBox2DWorld->queueShapePathAnimationUpdate( 
mpShape->getXShape(), mpAttrLayer );
+}
 }
 
 return true;
diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index f99e03bcd893..bdeabc12e985 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -206,6 +206,7 @@ box2DWorld::box2DWorld(const ::basegfx::B2DVector& 
rSlideSize)
 , mbHasWorldStepper(false)
 , mpXShapeToBodyMap()
 , maShapeParallelUpdateQueue()
+, maShapeSequentialUpdate()
 {
 }
 
@@ -255,6 +256,13 @@ void box2DWorld::createStaticFrameAroundSlide(const 
::basegfx::B2DVector& rSlide
 pStaticBody->CreateFixture(&aFixtureDef);
 }
 
+void box2DWorld::setShapePosition(const 
css::uno::Reference xShape,
+  const basegfx::B2DPoint& rOutPos)
+{
+Box2DBodySharedPtr pBox2DBody = mpXShapeToBodyMap.find(xShape)->second;
+pBox2DBody->setPosition(rOutPos);
+}
+
 void box2DWorld::setShapePositionByLinearVelocity(
 const css::uno::Reference xShape,
 const basegfx::B2DPoint& rOutPos, const double fPassedTime)
@@ -276,6 +284,13 @@ void box2DWorld::setShapeLinearVelocity(
 pBox2DBody->setLinearVelocity(rVelocity);
 }
 
+void box2DWorld::setShapeAngle(const 
css::uno::Reference xShape,
+   const double fAngle)
+{
+Box2DBodySharedPtr pBox2DBody = mpXShapeToBodyMap.find(xShape)->second;
+pBox2DBody->setAngle(fAngle);
+}
+
 void box2DWorld::setShapeAngleByAngularVelocity(
 const css::uno::Reference xShape, const 
double fAngle,
 const double fPassedTime)
@@ -307,41 +322,75 @@ void box2DWorld::setShapeCollision(
 
 void box2DWorld::processUpdateQueue(const double fPassedTime)
 {
-while (!maShapeParallelUpdateQueue.empty())
+if (maShapeSequentialUpdate.empty())
 {
-Box2DDynamicUpdateInformation& aQueueElement = 
maShapeParallelUpdateQueue.front();
-
-if (aQueueElement.mnDelayForSteps > 0)
+while (!maShapeParallelUpdateQueue.empty())
 {
-// it was queued as a delayed action, skip it, don't pop
-aQueueElement.mnDelayForSteps--;
+Box2DDynamicUpdateInformation& aQueueElement = 
maShapeParallelUpdateQueue.front();
+
+if (aQueueElement.mnDelayForSteps > 0)
+{
+// it was queued as a delayed action, skip it, don't pop
+aQueueElement.mnDelayForSteps--;
+}
+else
+{
+switch (aQueueElement.meUpdateType)
+{
+default:
+case BOX2D_UPDATE_POSITION:
+setShapePositionByLinearVelocity(aQueueElement.mxShape,
+ 
aQueueElement.maPosition, fPassedTime);
+break;
+case BOX2D_UPDATE_ANGLE:
+setShapeAngleByAngularVelocity(aQueueElement.mxShape, 
aQueueElement.mfAngle,
+   fPassedTime);
+break;
+case BOX2D_UPDATE_SIZE:
+break;
+case BOX2D_UPDATE_VISIBILITY:
+setShapeCollision(aQueueElement.mxShape, 
aQueueElement.mbVisibility);
+break;
+

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/skia

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

 vcl/skia/gdiimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 67f96e7e43725b44643ce241c472742bb1dc18e8
Author: Luboš Luňák 
AuthorDate: Thu Aug 20 16:25:00 2020 +0200
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 16:42:09 2020 +0200

fix setting clip region for new Skia graphics objects (tdf#135487)

Set the clip region only after possibly creating the surface, because
creating the surface sets the default clip region.

Change-Id: I2c344397336fa487f3f49e40704ef05b2100
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101077
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 600ff56010f5297cab7faf4bc44ae29dfb404d2f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101065
Reviewed-by: Caolán McNamara 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index b27ef0c7f488..5efab1faaf3d 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -406,8 +406,8 @@ bool SkiaSalGraphicsImpl::setClipRegion(const vcl::Region& 
region)
 return true;
 SkiaZone zone;
 checkPendingDrawing();
-mClipRegion = region;
 checkSurface();
+mClipRegion = region;
 SAL_INFO("vcl.skia.trace", "setclipregion(" << this << "): " << region);
 SkCanvas* canvas = mSurface->getCanvas();
 // SkCanvas::clipRegion() can only further reduce the clip region,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sc/qa/unit/data/functions/mathematical/fods/mod.fods |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4847b3e76177c247f7aadf0e97e81920f21575c5
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:17:26 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 16:45:05 2020 +0200

Fix typo in code

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

diff --git a/sc/qa/unit/data/functions/mathematical/fods/mod.fods 
b/sc/qa/unit/data/functions/mathematical/fods/mod.fods
index 262f4fff02f9..5a4370f6eb84 100644
--- a/sc/qa/unit/data/functions/mathematical/fods/mod.fods
+++ b/sc/qa/unit/data/functions/mathematical/fods/mod.fods
@@ -3677,7 +3677,7 @@
  
  
  
-  Non-exaustive list…
+  Non-exhaustive list…
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/source/core/layout/sectfrm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 576c30a643c288f64b8b66e87ba18091622ef35f
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:08:15 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 16:45:34 2020 +0200

Fix typo in code

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

diff --git a/sw/source/core/layout/sectfrm.cxx 
b/sw/source/core/layout/sectfrm.cxx
index 6a3cd158dde2..2e5ebf3f1c29 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2764,7 +2764,7 @@ SwFootnoteContFrame* 
SwSectionFrame::ContainsFootnoteCont( const SwFootnoteContF
 if( pCont )
 {
 pLay = pCont->FindFootnoteBossFrame();
-OSL_ENSURE( IsAnLower( pLay ), "ConatainsFootnoteCont: Wrong 
FootnoteContainer" );
+OSL_ENSURE( IsAnLower( pLay ), "ContainsFootnoteCont: Wrong 
FootnoteContainer" );
 pLay = static_cast(pLay->GetNext());
 }
 else if( Lower() && Lower()->IsColumnFrame() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - loleaflet/src

[Michael Meeks (via logerrit)]

Rebased ref, commits from common ancestor:
commit 3804c5387e3302837d0616e86e262d99d5c32b5c
Author: Michael Meeks 
AuthorDate: Fri Aug 21 15:47:58 2020 +0100
Commit: Michael Meeks 
CommitDate: Fri Aug 21 15:47:58 2020 +0100

calc tiles: remove partial re-rendering for now.

Drops _shiftAndPaint and _paintRects, blits are fast.

Change-Id: I64779f1037784f4efbe74cdf564b5f09e13b3316

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index f6c29d57a..5881803c8 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -236,7 +236,6 @@ L.CanvasTilePainter = L.Class.extend({
var resizeCanvas = !newSize.equals(this._lastSize);
 
var topLeftChanged = this._topLeft === undefined || 
!newTopLeft.equals(this._topLeft);
-
var splitPosChanged = !newSplitPos.equals(this._splitPos);
 
var skipUpdate = (
@@ -247,9 +246,9 @@ L.CanvasTilePainter = L.Class.extend({
!splitPosChanged &&
!scaleChanged);
 
-   if (skipUpdate) {
+   if (skipUpdate)
return;
-   }
+
if (scaleChanged)
this._dpiScale = L.getDpiScaleFactor();
 
@@ -261,130 +260,20 @@ L.CanvasTilePainter = L.Class.extend({
this.clear();
}
 
-   if (mapSizeChanged) {
+   if (mapSizeChanged)
this._lastMapSize = newMapSize;
-   }
 
-   if (splitPosChanged) {
+   if (splitPosChanged)
this._splitPos = newSplitPos;
-   }
-
-   // TODO: fix _shiftAndPaint for high DPI.
-   var shiftPaintDisabled = true;
-   var fullRepaintNeeded = zoomChanged || partChanged || 
resizeCanvas ||
-   shiftPaintDisabled || scaleChanged;
 
this._lastZoom = zoom;
this._lastPart = part;
 
-   if (fullRepaintNeeded) {
-
-   this._topLeft = newTopLeft;
-   this._paintWholeCanvas();
-
-   if (this.options.debug) {
-   this._drawSplits();
-   }
-
-   return;
-   }
-
-   this._shiftAndPaint(newTopLeft);
-   },
-
-   _shiftAndPaint: function (newTopLeft) {
-
-   console.assert(!this._layer.getSplitPanesContext(), 
'_shiftAndPaint is broken for split-panes.');
-   var offset = new L.Point(this._width - 1, this._height - 1);
-
-   var dx = newTopLeft.x - this._topLeft.x;
-   var dy = newTopLeft.y - this._topLeft.y;
-   if (!dx && !dy) {
-   return;
-   }
-
-   // Determine the area that needs to be painted as max. two 
disjoint rectangles.
-   var rectsToPaint = [];
-   this._inMove = true;
-   var oldTopLeft = this._topLeft;
-   var oldBottomRight = oldTopLeft.add(offset);
-   var newBottomRight = newTopLeft.add(offset);
-
-   if (Math.abs(dx) < this._width && Math.abs(dy) < this._height) {
-
-   this._canvasCtx.save();
-   this._canvasCtx.scale(this._dpiScale, this._dpiScale);
-   this._canvasCtx.globalCompositeOperation = 'copy';
-   this._canvasCtx.drawImage(this._canvas, -dx, -dy);
-   this._canvasCtx.globalCompositeOperation = 
'source-over';
-   this._canvasCtx.restore();
-
-   var xstart = newTopLeft.x, xend = newBottomRight.x;
-   var ystart = newTopLeft.y, yend = newBottomRight.y;
-   if (dx) {
-   xstart = dx > 0 ? oldBottomRight.x + 1 : 
newTopLeft.x;
-   xend   = xstart + Math.abs(dx) - 1;
-   }
-
-   if (dy) {
-   ystart = dy > 0 ? oldBottomRight.y + 1 : 
newTopLeft.y;
-   yend   = ystart + Math.abs(dy) - 1;
-   }
-
-   // rectangle including the x-range that needs painting 
with full y-range.
-   // This will take care of simultaneous non-zero dx and 
dy.
-   if (dx) {
-   rectsToPaint.push(new L.Bounds(
-   new L.Point(xstart, newTopLeft.y),
-   new L.Point(xend,   newBottomRight.y)
-   ));
-   }
-
-   // rectangle excluding the x-range that needs painting 
+ needed y-range.
-   if (dy

[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CanvasTileLayer.js |   68 +---
 1 file changed, 33 insertions(+), 35 deletions(-)

New commits:
commit a486bd5bfd98c33f093567edbbe6a88160a38050
Author: Michael Meeks 
AuthorDate: Fri Aug 21 15:54:50 2020 +0100
Commit: Michael Meeks 
CommitDate: Fri Aug 21 16:06:18 2020 +0100

calc tiles: share code for building bounds and panes.

Avoid duplication between tileReady and paint.

Change-Id: Ic3d1c22a1dbeffe1abfffd35ea0d7fbcfd5c1ccc

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 5881803c8..244dfe1d4 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -140,38 +140,43 @@ L.CanvasTilePainter = L.Class.extend({
this._canvasCtx.restore();
},
 
-   paint: function (tile, viewBounds, paneBoundsList) {
+   // Details of tile areas to render
+   _paintContext: function() {
+   var tileSize = new L.Point(this._tileSizeCSSPx, 
this._tileSizeCSSPx);
+
+   var viewBounds = this._map.getPixelBounds();
+   var splitPanesContext = this._layer.getSplitPanesContext();
+   var paneBoundsList = splitPanesContext ?
+   splitPanesContext.getPxBoundList(viewBounds) :
+   [viewBounds];
+
+   return { tileSize: tileSize,
+viewBounds: viewBounds,
+paneBoundsList: paneBoundsList };
+   },
+
+   paint: function (tile, ctx) {
 
-   if (this._tileSizeCSSPx === undefined) {
+   if (this._tileSizeCSSPx === undefined)
this._tileSizeCSSPx = this._layer._getTileSize();
-   }
+
+   if (!ctx)
+   ctx = this._paintContext();
 
var tileTopLeft = tile.coords.getPos();
-   var tileSize = new L.Point(this._tileSizeCSSPx, 
this._tileSizeCSSPx);
-   var tileBounds = new L.Bounds(tileTopLeft, 
tileTopLeft.add(tileSize));
+   var tileBounds = new L.Bounds(tileTopLeft, 
tileTopLeft.add(ctx.tileSize));
 
-   viewBounds = viewBounds || this._map.getPixelBounds();
-   var splitPanesContext = this._layer.getSplitPanesContext();
-   paneBoundsList = paneBoundsList || (
-   splitPanesContext ?
-   splitPanesContext.getPxBoundList(viewBounds) :
-   [viewBounds]
-   );
+   for (var i = 0; i < ctx.paneBoundsList.length; ++i) {
+   var paneBounds = ctx.paneBoundsList[i];
 
-   for (var i = 0; i < paneBoundsList.length; ++i) {
-   var paneBounds = paneBoundsList[i];
-   if (!paneBounds.intersects(tileBounds)) {
+   if (!paneBounds.intersects(tileBounds))
continue;
-   }
 
var topLeft = paneBounds.getTopLeft();
-   if (topLeft.x) {
-   topLeft.x = viewBounds.min.x;
-   }
-
-   if (topLeft.y) {
-   topLeft.y = viewBounds.min.y;
-   }
+   if (topLeft.x)
+   topLeft.x = ctx.viewBounds.min.x;
+   if (topLeft.y)
+   topLeft.y = ctx.viewBounds.min.y;
 
this._canvasCtx.save();
this._canvasCtx.scale(this._dpiScale, this._dpiScale);
@@ -280,24 +285,17 @@ L.CanvasTilePainter = L.Class.extend({
var zoom = this._lastZoom || Math.round(this._map.getZoom());
var part = this._lastPart || this._layer._selectedPart;
 
-   var viewSize = new L.Point(this._width, this._height);
-   var viewBounds = new L.Bounds(this._topLeft, 
this._topLeft.add(viewSize));
-
-   var splitPanesContext = this._layer.getSplitPanesContext();
// Calculate all this here intead of doing it per tile.
-   var paneBoundsList = splitPanesContext ?
-   splitPanesContext.getPxBoundList(viewBounds) : 
[viewBounds];
-   var tileRanges = 
paneBoundsList.map(this._layer._pxBoundsToTileRange, this._layer);
-
-   var tileSize = this._tileSizeCSSPx || 
this._layer._getTileSize();
+   var ctx = this._paintContext();
+   var tileRanges = 
ctx.paneBoundsList.map(this._layer._pxBoundsToTileRange, this._layer);
 
for (var rangeIdx = 0; rangeIdx < tileRanges.length; 
++rangeIdx) {
var tileRange = tileRanges[rangeIdx];
for (var j = tileRange.min.y; j <= tileRange.max.y; 
++j) {
for (var i = tileRange

[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - loleaflet/src

[Michael Meeks (via logerrit)]

Rebased ref, commits from common ancestor:
commit 2a8d58eba975e833802c625a4a9a48a476795b21
Author: Michael Meeks 
AuthorDate: Fri Aug 21 15:54:50 2020 +0100
Commit: Michael Meeks 
CommitDate: Fri Aug 21 16:17:17 2020 +0100

calc tiles: share code for building bounds and panes.

Avoid duplication between tileReady and paint.

Change-Id: Ic3d1c22a1dbeffe1abfffd35ea0d7fbcfd5c1ccc

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 5881803c8..5829239fa 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -63,8 +63,6 @@ L.CanvasTilePainter = L.Class.extend({
var splitPanesContext = this._layer.getSplitPanesContext();
this._splitPos = splitPanesContext ?
splitPanesContext.getSplitPos() : new L.Point(0, 0);
-
-   this._tileSizeCSSPx = undefined;
this._updatesRunning = false;
},
 
@@ -140,38 +138,40 @@ L.CanvasTilePainter = L.Class.extend({
this._canvasCtx.restore();
},
 
-   paint: function (tile, viewBounds, paneBoundsList) {
+   // Details of tile areas to render
+   _paintContext: function() {
+   var tileSize = new L.Point(this._layer._getTileSize(), 
this._layer._getTileSize());
 
-   if (this._tileSizeCSSPx === undefined) {
-   this._tileSizeCSSPx = this._layer._getTileSize();
-   }
+   var viewBounds = this._map.getPixelBounds();
+   var splitPanesContext = this._layer.getSplitPanesContext();
+   var paneBoundsList = splitPanesContext ?
+   splitPanesContext.getPxBoundList(viewBounds) :
+   [viewBounds];
+
+   return { tileSize: tileSize,
+viewBounds: viewBounds,
+paneBoundsList: paneBoundsList };
+   },
+
+   paint: function (tile, ctx) {
+
+   if (!ctx)
+   ctx = this._paintContext();
 
var tileTopLeft = tile.coords.getPos();
-   var tileSize = new L.Point(this._tileSizeCSSPx, 
this._tileSizeCSSPx);
-   var tileBounds = new L.Bounds(tileTopLeft, 
tileTopLeft.add(tileSize));
+   var tileBounds = new L.Bounds(tileTopLeft, 
tileTopLeft.add(ctx.tileSize));
 
-   viewBounds = viewBounds || this._map.getPixelBounds();
-   var splitPanesContext = this._layer.getSplitPanesContext();
-   paneBoundsList = paneBoundsList || (
-   splitPanesContext ?
-   splitPanesContext.getPxBoundList(viewBounds) :
-   [viewBounds]
-   );
+   for (var i = 0; i < ctx.paneBoundsList.length; ++i) {
+   var paneBounds = ctx.paneBoundsList[i];
 
-   for (var i = 0; i < paneBoundsList.length; ++i) {
-   var paneBounds = paneBoundsList[i];
-   if (!paneBounds.intersects(tileBounds)) {
+   if (!paneBounds.intersects(tileBounds))
continue;
-   }
 
var topLeft = paneBounds.getTopLeft();
-   if (topLeft.x) {
-   topLeft.x = viewBounds.min.x;
-   }
-
-   if (topLeft.y) {
-   topLeft.y = viewBounds.min.y;
-   }
+   if (topLeft.x)
+   topLeft.x = ctx.viewBounds.min.x;
+   if (topLeft.y)
+   topLeft.y = ctx.viewBounds.min.y;
 
this._canvasCtx.save();
this._canvasCtx.scale(this._dpiScale, this._dpiScale);
@@ -185,7 +185,7 @@ L.CanvasTilePainter = L.Class.extend({
 
if (this._dpiScale !== 1) {
// FIXME: avoid this scaling when possible 
(dpiScale = 2).
-   this._canvasCtx.drawImage(tile.el, 
tile.coords.x, tile.coords.y, this._tileSizeCSSPx, this._tileSizeCSSPx);
+   this._canvasCtx.drawImage(tile.el, 
tile.coords.x, tile.coords.y, ctx.tileSize.x, ctx.tileSize.y);
}
else {
this._canvasCtx.drawImage(tile.el, 
tile.coords.x, tile.coords.y);
@@ -280,24 +280,17 @@ L.CanvasTilePainter = L.Class.extend({
var zoom = this._lastZoom || Math.round(this._map.getZoom());
var part = this._lastPart || this._layer._selectedPart;
 
-   var viewSize = new L.Point(this._width, this._height);
-   var viewBounds = new L.Bounds(this._topLeft, 
this._topLeft.add(viewSize));
-
-   var splitPanesContext = this._layer.getS

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

[Andras Timar (via logerrit)]

 sc/source/filter/oox/worksheetbuffer.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 484c933a9a6a77f7b713a674b6a139fb6362acb1
Author: Andras Timar 
AuthorDate: Fri Aug 21 11:36:39 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Aug 21 17:24:08 2020 +0200

Use localized default sheet name, if sheet name is missing in xlsx file

Change-Id: I8a4708437c41374f67e60d22f56d374c39b4ad3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101068
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sc/source/filter/oox/worksheetbuffer.cxx 
b/sc/source/filter/oox/worksheetbuffer.cxx
index 23630400dfda..d6ba2f0ff30a 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -36,6 +36,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 namespace oox {
 namespace xls {
@@ -191,7 +193,7 @@ WorksheetBuffer::IndexNamePair 
WorksheetBuffer::createSheet( const OUString& rPr
 Reference< XSpreadsheets > xSheets( getDocument()->getSheets(), 
UNO_QUERY_THROW );
 Reference< XIndexAccess > xSheetsIA( xSheets, UNO_QUERY_THROW );
 sal_Int16 nCalcSheet = -1;
-OUString aSheetName = rPreferredName.isEmpty() ? "Sheet" : 
rPreferredName;
+OUString aSheetName = rPreferredName.isEmpty() ? 
ScResId(STR_TABLE_DEF) : rPreferredName;
 if( nSheetPos < xSheetsIA->getCount() )
 {
 nCalcSheet = static_cast< sal_Int16 >( nSheetPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/uiconfig starmath/uiconfig

[Olivier Hallot (via logerrit)]

 cui/uiconfig/ui/optfontspage.ui   |   52 
 starmath/uiconfig/smath/ui/alignmentdialog.ui |   29 -
 starmath/uiconfig/smath/ui/catalogdialog.ui   |   19 +-
 starmath/uiconfig/smath/ui/fontdialog.ui  |   28 +++--
 starmath/uiconfig/smath/ui/fontsizedialog.ui  |   44 +-
 starmath/uiconfig/smath/ui/fonttypedialog.ui  |   80 +-
 starmath/uiconfig/smath/ui/symdefinedialog.ui |   63 +++-
 7 files changed, 285 insertions(+), 30 deletions(-)

New commits:
commit fa096736c01e2556d7454b2b55ca19689da1e8d4
Author: Olivier Hallot 
AuthorDate: Wed Aug 12 14:49:13 2020 -0300
Commit: Christian Lohmaier 
CommitDate: Fri Aug 21 18:01:49 2020 +0200

tdf#118148 Extended tips from smath/01 Help pages

Collected all extended tips for smath/01 pages and added as
acessibility-description of widgets in dialogs.

Use Glade 3.36 to perserve accessible-description contents. Glade 2.22
is buggy and swallows acessible-description.

Change-Id: Ia50b84f008ab90e53a77a1a745b9e10ec0b9d41a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100616
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/starmath/uiconfig/smath/ui/alignmentdialog.ui 
b/starmath/uiconfig/smath/ui/alignmentdialog.ui
index de1e9c4627af..c1ab17b6b30c 100644
--- a/starmath/uiconfig/smath/ui/alignmentdialog.ui
+++ b/starmath/uiconfig/smath/ui/alignmentdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -25,6 +25,11 @@
 True
 True
 True
+
+  
+Click here to 
save your changes as the default settings for new formulas.
+  
+
   
   
 False
@@ -117,6 +122,11 @@
 0
 True
 True
+
+  
+Aligns the 
selected elements of a formula to the left.
+  
+
   
   
 False
@@ -134,6 +144,11 @@
 0
 True
 left
+
+  
+Aligns the 
elements of a formula to the center.
+  
+
   
   
 False
@@ -151,6 +166,11 @@
 0
 True
 left
+
+  
+Aligns the 
elements of a formula to the right.
+  
+
   
   
 False
@@ -187,8 +207,13 @@
   cancel
   help
 
-
+
   
 
+
+  
+You can define the 
alignment of multi-line formulas as well as formulas with several elements in 
one line.
+  
+
   
 
diff --git a/starmath/uiconfig/smath/ui/catalogdialog.ui 
b/starmath/uiconfig/smath/ui/catalogdialog.ui
index 21524bccc0f9..26679acfbe85 100644
--- a/starmath/uiconfig/smath/ui/catalogdialog.ui
+++ b/starmath/uiconfig/smath/ui/catalogdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -26,6 +26,11 @@
 True
 True
 True
+
+  
+Click here to open 
the Edit Symbols dialog.
+  
+
   
   
 False
@@ -114,6 +119,11 @@
 True
 False
 6
+
+  
+All symbols 
are organized into symbol sets. Select the desired symbol set from the list 
box. The corresponding group of symbols appear in the field below.
+  
+
   
   
 0
@@ -218,8 +228,13 @@
   close
   help
 
-
+
   
 
+
+  
+Opens the Symbols dialog, in 
which you can select a symbol to insert in the formula.
+  
+
   
 
diff --git a/starmath/uiconfig/smath/ui/fontdialog.ui 
b/starmath/uiconfig/smath/ui/fontdialog.ui
index ba58c625040f..d80d18fcb78a 100644
--- a/starmath/uiconfig/smath/ui/fontdialog.ui
+++ b/starmath/uiconfig/smath/ui/fontdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -16,9 +16,6 @@
 Fonts
 True
 dialog
-
-  
-
 
   
 False
@@ -155,6 +152,11 @@
 True
 True
 True
+
+  
+Select a font from the list.
+  
+  

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

[Olivier Hallot (via logerrit)]

 cui/uiconfig/ui/optgeneralpage.ui |   29 +++--
 1 file changed, 27 insertions(+), 2 deletions(-)

New commits:
commit bcf5469ee5aa74434aa5763059a78807e5e4c54f
Author: Olivier Hallot 
AuthorDate: Wed Jul 29 18:54:14 2020 -0300
Commit: Christian Lohmaier 
CommitDate: Fri Aug 21 18:01:20 2020 +0200

tdf#118148 Extended tips for optgeneralpage.ui

help file extracted: shared/text/optionen/01010600.xhp

relevant translation hooks (parid's):

--8< --


  cui/ui/optgeneralpage/OptGeneralPage
  cui/ui/optgeneralpage/@@nowidget@@
  
par_id3150085
cui/ui/optgeneralpage/OptGeneralPage
Specifies the general settings for %PRODUCTNAME.
  
  cui/ui/optgeneralpage/exthelp
  
par_idN106FA
cui/ui/optgeneralpage/exthelp
Displays a help text when you rest the cursor on an icon, a 
menu command, or a control on a dialog.
  
  cui/ui/optgeneralpage/docstatus
  
par_id3145800
cui/ui/optgeneralpage/docstatus
Specifies whether the printing of the document counts as a 
modification.
  
  cui/ui/optgeneralpage/year
  
par_id3147530
cui/ui/optgeneralpage/year
Defines a date range, within which the system recognizes a 
two-digit year.
  
  
par_id3167530
cui/ui/optgeneralpage/collectusageinfo
Send usage data to help The Document Foundation improve the 
software usability.
  

---8<---

Change-Id: I83dfa9ed7e7905529bff317b2e4657ea2150a5b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99754
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index b4c01cdbf9a9..8cdbb1436fb2 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -39,6 +39,11 @@
 True
 0
 True
+
+  
+Displays a help text when 
you rest the cursor on an icon, a menu command, or a control on a 
dialog.
+  
+
   
   
 0
@@ -221,6 +226,11 @@
 True
 0
 True
+
+  
+Specifies whether the 
printing of the document counts as a modification.
+  
+
   
 
   
@@ -278,6 +288,11 @@
 True
 True
 adjustment1
+
+  
+Defines a date range, within 
which the system recognizes a two-digit year.
+  
+
   
   
 1
@@ -341,6 +356,11 @@
 True
 0
 True
+
+  
+Send usage data to 
help The Document Foundation improve the software usability.
+  
+
   
   
 0
@@ -468,8 +488,8 @@
 6
 
   
-True
 Windows Default apps
+True
 True
 False
 True
@@ -500,5 +520,10 @@
 7
   
 
+
+  
+Specifies the general settings for 
%PRODUCTNAME.
+  
+
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - chart2/uiconfig cui/uiconfig sc/uiconfig sd/uiconfig sfx2/uiconfig starmath/uiconfig svx/uiconfig sw/uiconfig uui/uiconfig xmlsecurity/uiconfig

[Olivier Hallot (via logerrit)]

 chart2/uiconfig/ui/chartdatadialog.ui  |   58 ++-
 chart2/uiconfig/ui/dlg_DataLabel.ui|   73 -
 chart2/uiconfig/ui/dlg_InsertErrorBars.ui  |   88 ++-
 chart2/uiconfig/ui/insertaxisdlg.ui|   38 
 chart2/uiconfig/ui/insertgriddlg.ui|   43 -
 chart2/uiconfig/ui/inserttitledlg.ui   |   48 +-
 chart2/uiconfig/ui/smoothlinesdlg.ui   |   28 +++
 chart2/uiconfig/ui/steppedlinesdlg.ui  |   28 +++
 chart2/uiconfig/ui/titlerotationtabpage.ui |   22 ++
 chart2/uiconfig/ui/tp_3D_SceneAppearance.ui|   20 ++
 chart2/uiconfig/ui/tp_3D_SceneGeometry.ui  |   28 +++
 chart2/uiconfig/ui/tp_3D_SceneIllumination.ui  |   69 
 chart2/uiconfig/ui/tp_AxisPositions.ui |   57 +++
 chart2/uiconfig/ui/tp_ChartType.ui |   62 +++
 chart2/uiconfig/ui/tp_DataLabel.ui |   62 +++
 chart2/uiconfig/ui/tp_DataPointOption.ui   |7 
 chart2/uiconfig/ui/tp_DataSource.ui|   64 ++--
 chart2/uiconfig/ui/tp_ErrorBars.ui |   82 ++
 chart2/uiconfig/ui/tp_LegendPosition.ui|   32 +++-
 chart2/uiconfig/ui/tp_PolarOptions.ui  |   17 ++
 chart2/uiconfig/ui/tp_RangeChooser.ui  |   32 +++-
 chart2/uiconfig/ui/tp_Scale.ui |   67 
 chart2/uiconfig/ui/tp_SeriesToAxis.ui  |   57 +++
 chart2/uiconfig/ui/tp_Trendline.ui |  112 ++
 chart2/uiconfig/ui/tp_axisLabel.ui |   57 +++
 chart2/uiconfig/ui/wizelementspage.ui  |   72 +
 cui/uiconfig/ui/aboutconfigdialog.ui   |   34 +++-
 cui/uiconfig/ui/connpooloptions.ui |   17 ++
 cui/uiconfig/ui/databaselinkdialog.ui  |   23 ++
 cui/uiconfig/ui/dbregisterpage.ui  |   17 ++
 cui/uiconfig/ui/javaclasspathdialog.ui |   29 +++
 cui/uiconfig/ui/javastartparametersdialog.ui   |   33 +++-
 cui/uiconfig/ui/optaccessibilitypage.ui|   42 +
 cui/uiconfig/ui/optadvancedpage.ui |   47 +
 cui/uiconfig/ui/optappearancepage.ui   |   27 +++
 cui/uiconfig/ui/optasianpage.ui|   47 +
 cui/uiconfig/ui/optbasicidepage.ui |   34 
 cui/uiconfig/ui/optchartcolorspage.ui  |   20 ++
 cui/uiconfig/ui/optctlpage.ui  |   32 +++-
 cui/uiconfig/ui/optemailpage.ui|   17 ++
 cui/uiconfig/ui/optfltrembedpage.ui|   27 +++
 cui/uiconfig/ui/optfltrpage.ui |   62 +--
 cui/uiconfig/ui/opthtmlpage.ui |   82 ++
 cui/uiconfig/ui/optjsearchpage.ui  |  134 -
 cui/uiconfig/ui/optlanguagespage.ui|   67 
 cui/uiconfig/ui/optonlineupdatepage.ui |   60 ++-
 cui/uiconfig/ui/optproxypage.ui|   47 +
 cui/uiconfig/ui/optsecuritypage.ui |   42 +
 cui/uiconfig/ui/optviewpage.ui |   62 +++
 cui/uiconfig/ui/securityoptionsdialog.ui   |   49 +-
 sc/uiconfig/scalc/ui/colorrowdialog.ui |   23 ++
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui  |   11 +
 sc/uiconfig/scalc/ui/optcalculatepage.ui   |   77 +
 sc/uiconfig/scalc/ui/optchangespage.ui |   55 +-
 sc/uiconfig/scalc/ui/optcompatibilitypage.ui   |7 
 sc/uiconfig/scalc/ui/optdefaultpage.ui |9 -
 sc/uiconfig/scalc/ui/optdlg.ui |   26 ++-
 sc/uiconfig/scalc/ui/optformula.ui |7 
 sc/uiconfig/scalc/ui/optsortlists.ui   |   37 
 sc/uiconfig/scalc/ui/scgeneralpage.ui  |   63 +++
 sc/uiconfig/scalc/ui/tpviewpage.ui |  108 +
 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui   |   76 +
 sd/uiconfig/simpress/ui/prntopts.ui|   77 +
 sd/uiconfig/simpress/ui/sdviewpage.ui  |   27 +++
 sfx2/uiconfig/ui/optprintpage.ui   |  107 +
 starmath/uiconfig/smath/ui/smathsettings.ui|   47 +
 svx/uiconfig/ui/optgridpage.ui |   96 +++-
 sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui |   59 +++
 sw/uiconfig/swriter/ui/mailconfigpage.ui   |   52 ++
 sw/uiconfig/swriter/ui/optcaptionpage.ui   |   52 ++
 sw/uiconfig/swriter/ui/optcompatpage.ui|   12 +
 sw/uiconfig/swriter/ui/optfonttabpage.ui   |  

[Libreoffice-commits] core.git: qadevOOo/tests

[Andrea Gelmini (via logerrit)]

 qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1622014ebf7ce46b4cea02e44c7d5de06d8e3662
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:18:33 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 18:17:47 2020 +0200

Fix typo in code

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

diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java 
b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java
index 4e4e3ae7f1f8..3226f392a835 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java
@@ -29,7 +29,7 @@ import util.utils;
 *   Border
 *   HelpText
 *   HelpURL
-*   FontEmphsisMark
+*   FontEmphasisMark
 *   FontRelief
 *   Enabled
 *   FontDescriptor
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sdext/source/presenter/PresenterPaneContainer.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0d87244eefc19e6ea6762a029b6ced036faec90
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:12:51 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 18:18:12 2020 +0200

Fix typo in code

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

diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx 
b/sdext/source/presenter/PresenterPaneContainer.hxx
index 65c6bddb7e0b..136c25690b16 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -100,7 +100,7 @@ public:
 const OUString& rsTitle,
 const OUString& rsAccessibleTitle,
 const bool bIsOpaque,
-const ViewInitializationFunction& rViewIntialization);
+const ViewInitializationFunction& rViewInitialization);
 
 SharedPaneDescriptor StorePane (
 const rtl::Reference& rxPane);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: lotuswordpro/inc odk/examples odk/source offapi/com oox/source pyuno/IwyuFilter_pyuno.yaml qadevOOo/tests ridljar/com sc/inc stoc/source svtools/source svx/source sw/qa

[Andrea Gelmini (via logerrit)]

 lotuswordpro/inc/xfilter/xfpadding.hxx 
   |2 +-
 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile
 |2 +-
 odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java 
   |2 +-
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile 
   |2 +-
 odk/source/com/sun/star/lib/loader/InstallationFinder.java 
   |2 +-
 offapi/com/sun/star/chart2/Symbol.idl  
   |2 +-
 offapi/com/sun/star/deployment/XPackageRegistry.idl
   |2 +-
 offapi/com/sun/star/security/ExtAltNameType.idl
   |2 +-
 offapi/com/sun/star/xml/sax/InputSource.idl
   |2 +-
 oox/source/export/drawingml.cxx
   |2 +-
 oox/source/ole/axcontrol.cxx   
   |2 +-
 pyuno/IwyuFilter_pyuno.yaml
   |2 +-
 qadevOOo/tests/java/ifc/sdbc/_XCloseable.java  
   |2 +-
 qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
   |2 +-
 qadevOOo/tests/java/mod/_svx/SvxUnoText.java   
   |2 +-
 ridljar/com/sun/star/lib/util/DisposeListener.java 
   |2 +-
 sc/inc/funcdesc.hxx
   |2 +-
 stoc/source/servicemanager/servicemanager.cxx  
   |4 ++--
 svtools/source/config/apearcfg.cxx 
   |8 
 svtools/source/config/menuoptions.cxx  
   |2 +-
 svx/source/fmcomp/gridcell.cxx 
   |2 +-
 svx/source/xoutdev/_xpoly.cxx  
   |4 ++--
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
   |2 +-
 23 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit a33a8f221626bb833cae5c916f096c12a4226f77
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 12:50:00 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 18:18:36 2020 +0200

Fix typos

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

diff --git a/lotuswordpro/inc/xfilter/xfpadding.hxx 
b/lotuswordpro/inc/xfilter/xfpadding.hxx
index 69e30723b822..6276a8623de7 100644
--- a/lotuswordpro/inc/xfilter/xfpadding.hxx
+++ b/lotuswordpro/inc/xfilter/xfpadding.hxx
@@ -70,7 +70,7 @@
 
 /**
  * @brief
- * Padings for paragraph,frame,...
+ * Paddings for paragraph,frame, ...
  */
 class XFPadding
 {
diff --git 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile
 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile
index e85570b49555..fb1edb6b8fbb 100644
--- 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile
+++ 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile
@@ -32,7 +32,7 @@
 # 
 #**
 
-# Builds the ProtoclHandlerAddon Java component example of the SDK.
+# Builds the ProtocolHandlerAddon Java component example of the SDK.
 
 PRJ=../../../../..
 SETTINGS=$(PRJ)/settings
diff --git a/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java 
b/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java
index b2108db18deb..5061a4b3668f 100644
--- a/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java
+++ b/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java
@@ -126,7 +126,7 @@ public class ControlAndSelectDemo
 XController xController = xModel.getCurrentController();
 XSelectionSupplier xSelectionSupplier =UnoRuntime.queryInterface( 
XSelectionSupplier.class, xController );
 // take care to use the global service factory only and not the one
-// that is provided by the component if you create the 
ShapeColletion
+// that is provided by the component if you create the 
ShapeCollection
 XShapes xSelection = UnoRuntime.queryInterface( XShapes.class,
 xOfficeContext.getServiceManager().createInstanceWithContext(
 "com.sun.star.drawing.ShapeCollection", xOfficeContext ) );
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
index b4179de724b2..5b0462b25e05 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
+++ b/odk/

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

[Eike Rathke (via logerrit)]

 svtools/inc/langtab.hrc |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ca21731d2f050d709107d1c5c1ebd59a72dc84eb
Author: Eike Rathke 
AuthorDate: Fri Aug 21 11:56:22 2020 +0200
Commit: Eike Rathke 
CommitDate: Fri Aug 21 18:26:31 2020 +0200

Related: tdf#135518 Add English (Hong Kong) [en-HK] to language list

As a separate commit so the locale data can be backported to 7-0
without introducing a new UI string.

Change-Id: I00379e326e7b7e89abba990908155f4d8a8c8c36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101140
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 5242b7ec116f..7af85b0c6cd5 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -425,7 +425,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Guadeloupean Creole French") , 
LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ligurian") , LANGUAGE_USER_LIGURIAN },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Minangkabau") , 
LANGUAGE_USER_MINANGKABAU },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sundanese") , LANGUAGE_USER_SUNDANESE 
}
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sundanese") , LANGUAGE_USER_SUNDANESE 
},
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Hong Kong)") , 
LANGUAGE_ENGLISH_HONG_KONG_SAR }
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit a6a619cd23406ff596ba01f647f5a89ebeb06bf0
Author: Christian Lohmaier 
AuthorDate: Fri Aug 21 18:39:20 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Aug 21 18:39:20 2020 +0200

Update git submodules

* Update translations from branch 'master'
  to 5632692504d455d87c83b863fffcf7baf2820c49
  - update translations for master

and force-fix errors using pocheck

Change-Id: I3c00491e0ea0ac65e61a006108fd80d6188b16d0

diff --git a/translations b/translations
index e8c9e70e057a..5632692504d4 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit e8c9e70e057aec51c783b7230f1995020374d06f
+Subproject commit 5632692504d455d87c83b863fffcf7baf2820c49
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 xmloff/inc/XMLFootnoteConfigurationImportContext.hxx |   11 -
 xmloff/source/style/xmlstyle.cxx |   10 -
 xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx |   75 +++
 3 files changed, 35 insertions(+), 61 deletions(-)

New commits:
commit 6dcdf182e773d11f959c5dca1c5a6b9d8205bdee
Author: Noel Grandin 
AuthorDate: Fri Aug 21 09:55:25 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 21 18:52:38 2020 +0200

use fast-parser in XMLFootnoteConfigurationImportContext

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

diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx 
b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index 5cbae1fda6d6..04cc2c8bc17a 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -60,17 +60,14 @@ public:
 
 XMLFootnoteConfigurationImportContext(
 SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLName,
-const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList);
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList> & 
xAttrList);
 
 virtual ~XMLFootnoteConfigurationImportContext() override;
 
 /// for footnotes, also parse begin and end notices
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList 
) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& AttrList ) override;
 
 /// get token map for attributes
 const SvXMLTokenMap& GetFtnConfigAttrTokenMap();
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index d91180681e89..2a98fbfaf509 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -420,6 +420,10 @@ SvXMLStyleContext 
*SvXMLStylesContext::CreateStyleChildContext(
 pStyle = new XMLIndexBibliographyConfigurationContext(
 GetImport(), nElement, xAttrList);
 break;
+case XML_ELEMENT(TEXT, XML_NOTES_CONFIGURATION):
+pStyle = new XMLFootnoteConfigurationImportContext(
+GetImport(), nElement, xAttrList);
+break;
 }
 
 return pStyle;
@@ -481,12 +485,6 @@ SvXMLStyleContext 
*SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr
 pStyle = new SvxXMLListStyleContext( GetImport(), p_nPrefix,
 rLocalName, xAttrList, 
true );
 break;
-case XML_TOK_TEXT_NOTE_CONFIG:
-pStyle = new XMLFootnoteConfigurationImportContext(GetImport(),
-   p_nPrefix,
-   rLocalName,
-   xAttrList);
-break;
 
 case XML_TOK_TEXT_LINENUMBERING_CONFIG:
 pStyle = new XMLLineNumberingImportContext(
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx 
b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index ea03a0589969..ad96aee7976d 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -65,32 +65,30 @@ public:
 
 XMLFootnoteConfigHelper(
 SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLName,
 XMLFootnoteConfigurationImportContext& rConfigImport,
 bool bBegin);
 
-virtual void EndElement() override;
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) 
override {}
+virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
-virtual void Characters( const OUString& rChars ) override;
+virtual void SAL_CALL characters( const OUString& rChars ) override;
 };
 
 }
 
 XMLFootnoteConfigHelper::XMLFootnoteConfigHelper(
 SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLName,
 XMLFootnoteConfigurationImportContext& rConfigImport,
 bool bBegin)
-:   SvXMLImportContext(rImport, nPrfx, rLName)
+:   SvXMLImportContext(rImport)
 ,   sBuffer()
 ,   rConfig(rConfigImport)
 ,   bIsBegin(bBegin)
 {
 }
 
-void XMLFootnoteConfigHelper::EndElement()
+void XMLFootnoteConfigHelper::endFastElement(sal_Int32 )
 {
 if (bIsBegin)
 {
@@ -103,7 +101,7 @@ void XMLFootnoteConfigHelper::EndElement()
 //  rConfig = NU

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

[Noel Grandin (via logerrit)]

 xmloff/inc/XMLLineNumberingImportContext.hxx  |   11 +---
 xmloff/source/style/xmlstyle.cxx  |   10 +--
 xmloff/source/text/XMLLineNumberingImportContext.cxx  |   24 +++--
 xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx |   26 +++---
 xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx |   11 +---
 5 files changed, 31 insertions(+), 51 deletions(-)

New commits:
commit 6e64e2e2d23e8a776f6e7fe53f45f18145f80bda
Author: Noel Grandin 
AuthorDate: Fri Aug 21 10:07:14 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 21 19:03:51 2020 +0200

use fastparser in XMLLineNumberingImportContext

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

diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx 
b/xmloff/inc/XMLLineNumberingImportContext.hxx
index 90f7831b672e..852f3076d574 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -68,9 +68,8 @@ public:
 
 XMLLineNumberingImportContext(
 SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLocalName,
-const css::uno::Reference & xAttrList);
+sal_Int32 nElement,
+const css::uno::Reference & 
xAttrList);
 
 virtual ~XMLLineNumberingImportContext() override;
 
@@ -86,10 +85,8 @@ private:
 
 virtual void CreateAndInsert(bool bOverwrite) override;
 
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference & xAttrList ) 
override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& AttrList ) override;
 };
 
 #endif
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 2a98fbfaf509..a4e3d158ccea 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -424,6 +424,11 @@ SvXMLStyleContext 
*SvXMLStylesContext::CreateStyleChildContext(
 pStyle = new XMLFootnoteConfigurationImportContext(
 GetImport(), nElement, xAttrList);
 break;
+case XML_ELEMENT(TEXT, XML_LINENUMBERING_CONFIGURATION):
+pStyle = new XMLLineNumberingImportContext(
+GetImport(), nElement, xAttrList);
+break;
+
 }
 
 return pStyle;
@@ -486,11 +491,6 @@ SvXMLStyleContext 
*SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr
 rLocalName, xAttrList, 
true );
 break;
 
-case XML_TOK_TEXT_LINENUMBERING_CONFIG:
-pStyle = new XMLLineNumberingImportContext(
-GetImport(), p_nPrefix, rLocalName, xAttrList);
-break;
-
 
 // FillStyles
 
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx 
b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 3c272c25214a..09de0382b780 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -40,6 +40,7 @@ using namespace ::xmloff::token;
 
 using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::xml::sax::XAttributeList;
+using ::com::sun::star::xml::sax::XFastAttributeList;
 using ::com::sun::star::text::XLineNumberingProperties;
 
 
@@ -57,10 +58,9 @@ const OUStringLiteral 
gsSeparatorInterval("SeparatorInterval");
 
 XMLLineNumberingImportContext::XMLLineNumberingImportContext(
 SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLocalName,
-const Reference & xAttrList)
-:   SvXMLStyleContext(rImport, nPrfx, rLocalName, xAttrList, 
XmlStyleFamily::TEXT_LINENUMBERINGCONFIG)
+sal_Int32 nElement,
+const Reference & xAttrList)
+:   SvXMLStyleContext(rImport, nElement, xAttrList, 
XmlStyleFamily::TEXT_LINENUMBERINGCONFIG)
 ,   sNumFormat(GetXMLToken(XML_1))
 ,   sNumLetterSync(GetXMLToken(XML_FALSE))
 ,   nOffset(-1)
@@ -244,18 +244,12 @@ void XMLLineNumberingImportContext::CreateAndInsert(bool)
 xLineNumbering->setPropertyValue(gsNumberingType, Any(nNumType));
 }
 
-SvXMLImportContextRef XMLLineNumberingImportContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const Reference & /*xAttrList*/ )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLLineNumberingImportContext::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >&  )
 {
-if ( (nPrefix == XML_NAMESPACE_TEXT) &&
- IsXMLToken(rLocalName, XML_LINENUMBERING_SEPARATOR) )
-{
-return new XMLLineNumberingSeparatorImportContext(GetImport(),
-   

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

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/border.cxx |   56 -
 1 file changed, 22 insertions(+), 34 deletions(-)

New commits:
commit d2e57b17af2fb5719009c290db3fd9ef81e78c67
Author: Caolán McNamara 
AuthorDate: Fri Aug 21 15:18:13 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 19:31:38 2020 +0200

Resolves: tdf#135128 should get the old attr, not the default attr

so we retain the original shadow distance if its not changed but
the color is. Use GetOldAttr which is intended for that.

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

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index eb72e3417a42..8dc87e8409bd 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -846,59 +846,45 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* 
rCoreAttrs )
 
 if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::TLBR))
 {
-sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_TLBR);
-if (const SfxPoolItem* pItem = rCoreAttrs->GetItem(nBorderDiagId))
-{
-SvxLineItem aLineItem(*static_cast(pItem));
-
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::TLBR));
-rCoreAttrs->Put(aLineItem);
-bAttrsChanged = true;
-}
+SvxLineItem aLineItem(*static_cast(GetOldItem(*rCoreAttrs, SID_ATTR_BORDER_DIAG_TLBR)));
+
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::TLBR));
+rCoreAttrs->Put(aLineItem);
+bAttrsChanged = true;
 }
 
 if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR))
 {
-sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_BLTR);
-if (const SfxPoolItem* pItem = rCoreAttrs->GetItem(nBorderDiagId))
-{
-SvxLineItem aLineItem(*static_cast(pItem));
-
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::BLTR));
-rCoreAttrs->Put(aLineItem);
-bAttrsChanged = true;
-}
+SvxLineItem aLineItem(*static_cast(GetOldItem(*rCoreAttrs, SID_ATTR_BORDER_DIAG_BLTR)));
+
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::BLTR));
+rCoreAttrs->Put(aLineItem);
+bAttrsChanged = true;
 }
 
 if (m_xShadowControls && m_xShadowControls->get_value_changed_from_saved())
 {
-sal_uInt16 nShadowId = pPool->GetWhich(mnShadowSlot);
-if (const SfxPoolItem* pItem = rCoreAttrs->GetItem(nShadowId))
-{
-const SvxShadowItem& rOldShadowItem = *static_cast(pItem);
-
rCoreAttrs->Put(m_xShadowControls->GetControlValue(rOldShadowItem));
-bAttrsChanged = true;
-}
+const SvxShadowItem& rOldShadowItem = *static_cast(GetOldItem(*rCoreAttrs, mnShadowSlot));
+rCoreAttrs->Put(m_xShadowControls->GetControlValue(rOldShadowItem));
+bAttrsChanged = true;
 }
 
 if (m_xMarginControls && m_xMarginControls->get_value_changed_from_saved())
 {
-sal_uInt16 nAlignMarginId = pPool->GetWhich(SID_ATTR_ALIGN_MARGIN);
-if (const SfxPoolItem* pItem = rCoreAttrs->GetItem(nAlignMarginId))
-{
-const SvxMarginItem& rOldMarginItem = *static_cast(pItem);
-
rCoreAttrs->Put(m_xMarginControls->GetControlValue(rOldMarginItem));
-bAttrsChanged = true;
-}
+const SvxMarginItem& rOldMarginItem = *static_cast(GetOldItem(*rCoreAttrs, SID_ATTR_ALIGN_MARGIN));
+rCoreAttrs->Put(m_xMarginControls->GetControlValue(rOldMarginItem));
+bAttrsChanged = true;
 }
 
 if (m_xMergeAdjacentBordersCB->get_state_changed_from_saved())
 {
-sal_uInt16 nMergeAdjacentBordersId = 
pPool->GetWhich(SID_SW_COLLAPSING_BORDERS);
 auto nState = m_xMergeAdjacentBordersCB->get_state();
 if (nState == TRISTATE_INDET)
+{
+sal_uInt16 nMergeAdjacentBordersId = 
pPool->GetWhich(SID_SW_COLLAPSING_BORDERS);
 rCoreAttrs->ClearItem(nMergeAdjacentBordersId);
+}
 else
 {
-std::unique_ptr 
xNewItem(static_cast(rCoreAttrs->Get(nMergeAdjacentBordersId).Clone()));
+std::unique_ptr 
xNewItem(static_cast(GetOldItem(*rCoreAttrs, 
SID_SW_COLLAPSING_BORDERS)->Clone()));
 xNewItem->SetValue(static_cast(nState));
 rCoreAttrs->Put(std::move(xNewItem));
 }
@@ -907,13 +893,15 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* 
rCoreAttrs )
 
 if (m_xMergeWithNextCB->get_state_changed_from_saved())
 {
-sal_uInt16 nMergeWithNextId = pPool->GetWhich(SID_ATTR_BORDER_CONNECT);
 auto nState = m_xMergeWithNextCB->get_state();
 if (nState == TRISTATE_INDET)
+{
+sal_uInt16 nMe

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

[Caolán McNamara (via logerrit)]

 framework/source/uielement/edittoolbarcontroller.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2ded9c20f56aa23ac50c894bab6e001fc3cc0d5d
Author: Caolán McNamara 
AuthorDate: Fri Aug 21 14:26:46 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 19:32:53 2020 +0200

Resolves: tdf#135965 blank helpids for EditControl children

so the helpid of the EditControl itself is chosen and LibreLogo's
help can be shown with F1

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

diff --git a/framework/source/uielement/edittoolbarcontroller.cxx 
b/framework/source/uielement/edittoolbarcontroller.cxx
index 152b0336347c..3bbb3f9755cc 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -66,6 +66,10 @@ EditControl::EditControl(vcl::Window* pParent, 
EditToolbarController* pEditToolb
 , m_xWidget(m_xBuilder->weld_entry("entry"))
 , m_pEditToolbarController(pEditToolbarController)
 {
+OString sEmpty;
+m_xWidget->set_help_id(sEmpty);
+m_xContainer->set_help_id(sEmpty);
+
 InitControlBase(m_xWidget.get());
 
 m_xWidget->connect_focus_in(LINK(this, EditControl, FocusInHdl));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/inc/unx/gtk/gtkframe.hxx  |2 +
 vcl/unx/gtk3/gtk3gtkframe.cxx |6 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   66 +-
 3 files changed, 73 insertions(+), 1 deletion(-)

New commits:
commit c2f03b1f5d2579b33140cd910115f76c4f9e
Author: Caolán McNamara 
AuthorDate: Fri Aug 21 14:25:03 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 19:32:37 2020 +0200

tdf#135965 let F1 in gtk widgets embedded in a GtkSalFrame call help

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

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 3d4c803ff5be..3b82be6f4f7d 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -521,6 +521,8 @@ public:
 static sal_uInt16   GetKeyModCode(guint nState);
 static GdkEvent*makeFakeKeyPress(GtkWidget* pWidget);
 static SalWheelMouseEvent   GetWheelEvent(GdkEventScroll& rEvent);
+static void NativeWidgetHelpPressed(GtkAccelGroup*, 
GObject*, guint,
+GdkModifierType, gpointer pFrame);
 };
 
 #define OOO_TYPE_FIXED ooo_fixed_get_type()
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 48e8f56230b4..b4ddd142ca1d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1040,6 +1040,12 @@ void GtkSalFrame::Init( SalFrame* pParent, 
SalFrameStyleFlags nStyle )
 else
 {
 m_pWindow = gtk_window_new(eWinType);
+
+// hook up F1 to show help for embedded native gtk widgets
+GtkAccelGroup *pGroup = gtk_accel_group_new();
+GClosure* closure = 
g_cclosure_new(G_CALLBACK(GtkSalFrame::NativeWidgetHelpPressed), 
GTK_WINDOW(m_pWindow), nullptr);
+gtk_accel_group_connect(pGroup, GDK_KEY_F1, 
static_cast(0), GTK_ACCEL_LOCKED, closure);
+gtk_window_add_accel_group(GTK_WINDOW(m_pWindow), pGroup);
 }
 
 g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b2b5d59fcc46..671938d721c9 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -15777,6 +15777,12 @@ public:
 g_slist_foreach(m_pObjectList, postprocess, this);
 
 GenerateMissingMnemonics();
+
+if (m_xInterimGlue)
+{
+assert(m_pParentWidget);
+g_object_set_data(G_OBJECT(m_pParentWidget), "InterimWindowGlue", 
m_xInterimGlue.get());
+}
 }
 
 void GenerateMissingMnemonics()
@@ -15836,7 +15842,13 @@ public:
 {
 g_slist_free(m_pObjectList);
 g_object_unref(m_pBuilder);
-m_xInterimGlue.disposeAndClear();
+
+if (m_xInterimGlue)
+{
+assert(m_pParentWidget);
+g_object_set_data(G_OBJECT(m_pParentWidget), "InterimWindowGlue", 
nullptr);
+m_xInterimGlue.disposeAndClear();
+}
 }
 
 //ideally we would have/use weld::Container add and explicitly
@@ -16328,6 +16340,58 @@ weld::Builder* 
GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
 return new GtkInstanceBuilder(pBuilderParent, rUIRoot, rUIFile, nullptr);
 }
 
+// tdf#135965 for the case of native widgets inside a GtkSalFrame and F1 
pressed, run help
+// on gtk widget help ids until we hit a vcl parent and then use vcl window 
help ids
+void GtkSalFrame::NativeWidgetHelpPressed(GtkAccelGroup*, GObject*, guint, 
GdkModifierType, gpointer pFrame)
+{
+Help* pHelp = Application::GetHelp();
+if (!pHelp)
+return;
+
+GtkWindow* pWindow = static_cast(pFrame);
+
+vcl::Window* pChildWindow = nullptr;
+
+//show help for widget with keyboard focus
+GtkWidget* pWidget = gtk_window_get_focus(pWindow);
+if (!pWidget)
+pWidget = GTK_WIDGET(pWindow);
+OString sHelpId = ::get_help_id(pWidget);
+while (sHelpId.isEmpty())
+{
+pWidget = gtk_widget_get_parent(pWidget);
+if (!pWidget)
+break;
+pChildWindow = 
static_cast(g_object_get_data(G_OBJECT(pWidget), 
"InterimWindowGlue"));
+if (pChildWindow)
+{
+sHelpId = pChildWindow->GetHelpId();
+break;
+}
+sHelpId = ::get_help_id(pWidget);
+}
+
+if (pChildWindow)
+{
+while (sHelpId.isEmpty())
+{
+pChildWindow = pChildWindow->GetParent();
+if (!pChildWindow)
+break;
+sHelpId = pChildWindow->GetHelpId();
+}
+if (!pChildWindow)
+return;
+pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), 
pChildWindow);
+return;
+}
+
+if (!pWidget)
+return;
+std::unique_ptr xTemp(new GtkInstanceWidget(pWidget, 
nullptr, false));
+pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENC

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

[Caolán McNamara (via logerrit)]

 vcl/workben/scrtffuzzer.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ec9d6f6f5e2c3b6cd0350867d527e95e939557c9
Author: Caolán McNamara 
AuthorDate: Fri Aug 21 18:38:15 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 19:41:46 2020 +0200

ofz#25117 missing constructor

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

diff --git a/vcl/workben/scrtffuzzer.cxx b/vcl/workben/scrtffuzzer.cxx
index 779519f34336..56c0cddd7ade 100644
--- a/vcl/workben/scrtffuzzer.cxx
+++ b/vcl/workben/scrtffuzzer.cxx
@@ -25,6 +25,7 @@ void* 
com_sun_star_i18n_CharacterClassification_get_implementation(void*, void*)
 void* com_sun_star_i18n_NativeNumberSupplier_get_implementation(void*, void*);
 void* com_sun_star_i18n_NumberFormatCodeMapper_get_implementation(void*, 
void*);
 void* com_sun_star_i18n_Transliteration_get_implementation(void*, void*);
+void* i18npool_CalendarImpl_get_implementation(void*, void*);
 }
 
 const lib_to_factory_mapping* lo_get_factory_map(void)
@@ -56,6 +57,8 @@ const lib_to_constructor_mapping* lo_get_constructor_map(void)
   com_sun_star_i18n_NumberFormatCodeMapper_get_implementation },
 { "com_sun_star_i18n_Transliteration_get_implementation",
   com_sun_star_i18n_Transliteration_get_implementation },
+{ "i18npool_CalendarImpl_get_implementation",
+  i18npool_CalendarImpl_get_implementation },
 { 0, 0 } };
 
 return map;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sfx2/source/control/thumbnailview.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 21e04507fac395c3efa290a4a1972cbff316ea3b
Author: Caolán McNamara 
AuthorDate: Thu Aug 20 17:20:55 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 19:44:26 2020 +0200

grab focus on mouse button down

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

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index f0eae308158f..902f62857765 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -1830,6 +1830,8 @@ void SfxThumbnailView::MakeItemVisible( sal_uInt16 
nItemId )
 
 bool SfxThumbnailView::MouseButtonDown( const MouseEvent& rMEvt )
 {
+GrabFocus();
+
 if (!rMEvt.IsLeft())
 {
 return CustomWidgetController::MouseButtonDown( rMEvt );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests

[Andrea Gelmini (via logerrit)]

 qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fcb9e950fb65923e362cf8b2d3382ce39bb94e06
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 13:18:06 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 19:50:04 2020 +0200

Fix typo in code

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

diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java 
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
index d9ab32613249..b72874768ab2 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
@@ -127,7 +127,7 @@ public class _XAccessibleValue extends MultiMethodTest {
 String noMax = "com.sun.star.comp.toolkit.AccessibleScrollBar";
 String implName = util.utils.getImplName(oObj);
 
-if (tEnv.getObjRelation("ValueNotPersitent")!=null) {
+if (tEnv.getObjRelation("ValueNotPersistent")!=null) {
 log.println("Excluded since it works like AccessibleAction");
 tRes.tested("setCurrentValue()",Status.skipped(true));
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 xmloff/source/text/XMLTextNumRuleInfo.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00a9debfcfd12f04030f0369f7eaf5688ebbf194
Author: Andrea Gelmini 
AuthorDate: Thu Aug 20 12:57:05 2020 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 21 19:50:30 2020 +0200

Fix typo in code

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

diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx 
b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 28555f88af26..498b53ed2d7d 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -64,7 +64,7 @@ public:
 
 inline XMLTextNumRuleInfo& operator=( const XMLTextNumRuleInfo& rInfo );
 
-void Set( const css::uno::Reference < css::text::XTextContent > & 
rTextContnt,
+void Set( const css::uno::Reference < css::text::XTextContent > & 
rTextContent,
   const bool bOutlineStyleAsNormalListStyle,
   const XMLTextListAutoStylePool& rListAutoPool,
   const bool bExportTextNumberElement );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/xmloff sw/qa sw/source xmloff/source

[Mike Kaganski (via logerrit)]

 include/xmloff/txtparae.hxx |2 +
 sw/qa/extras/odfexport/data/nestedTableInFooter.odt |binary
 sw/qa/extras/odfexport/odfexport.cxx|   13 
 sw/source/filter/xml/xmltble.cxx|   21 +++-
 xmloff/source/text/txtparae.cxx |2 +
 5 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit 0273675e7dde577077ccca17571846a0942f2630
Author: Mike Kaganski 
AuthorDate: Fri Aug 21 00:15:29 2020 +0300
Commit: Caolán McNamara 
CommitDate: Fri Aug 21 19:57:45 2020 +0200

tdf#135942: avoid collecting autostyles during writing them

This modifies the container over which iteration is performed.
Additionally, make sure that all nested table autostyles are
collected on the first phase.

Change-Id: I74c0bb1aaacad095226c21e6bf51cc8668133bb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101096
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit f0286ad82465152b29bba01ab2edeb97291397fa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101069
Reviewed-by: Caolán McNamara 

diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 44c15512cd70..e280db9fd4af 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -365,6 +365,8 @@ protected:
 const css::uno::Reference< css::beans::XPropertySet> & i_xPortion,
 bool i_bAutoStyles, bool i_isProgress, bool & rPrevCharIsSpace);
 
+bool isAutoStylesCollected() const { return mbCollected; }
+
 virtual void exportTableAutoStyles();
 
 public:
diff --git a/sw/qa/extras/odfexport/data/nestedTableInFooter.odt 
b/sw/qa/extras/odfexport/data/nestedTableInFooter.odt
new file mode 100644
index ..0356f04ee14e
Binary files /dev/null and 
b/sw/qa/extras/odfexport/data/nestedTableInFooter.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index d41ce2037d5e..6554b6abc38b 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -2538,5 +2538,18 @@ DECLARE_ODFEXPORT_TEST(tdf124470, 
"tdf124470TableAndEmbeddedUsedFonts.odt")
 assertXPath(pXmlDoc, 
"/office:document-content/office:automatic-styles/style:style[@style:family='paragraph']",
 1);
 }
 
+DECLARE_ODFEXPORT_TEST(tdf135942, "nestedTableInFooter.odt")
+{
+// All table autostyles should be collected, including nested, and must 
not crash.
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+xmlDocUniquePtr pXmlDoc = parseExport("styles.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc, 
"/office:document-styles/office:automatic-styles/style:style[@style:family='table']",
 2);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 0d91074bd91b..fcc386c8c110 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -1199,8 +1199,27 @@ void SwXMLTextParagraphExport::exportTable(
 // During the flat XML export (used e.g. by .sdw-export)
 // ALL flags are set at the same time.
 const bool bExportStyles = bool( GetExport().getExportFlags() 
& SvXMLExportFlags::STYLES );
-if ( bExportStyles || !pFormat->GetDoc()->IsInHeaderFooter( 
aIdx ) )
+if (!isAutoStylesCollected()
+&& (bExportStyles || 
!pFormat->GetDoc()->IsInHeaderFooter(aIdx)))
+{
 maTableNodes.push_back(pTableNd);
+// Collect all tables inside cells of this table, too
+const auto aCellNames = pXTable->getCellNames();
+for (const OUString& rCellName : aCellNames)
+{
+
css::uno::Reference xCell(
+pXTable->getCellByName(rCellName), 
css::uno::UNO_QUERY);
+if (!xCell)
+continue;
+auto xEnumeration = xCell->createEnumeration();
+while (xEnumeration->hasMoreElements())
+{
+if (css::uno::Reference 
xInnerTable{
+xEnumeration->nextElement(), 
css::uno::UNO_QUERY })
+exportTable(xInnerTable, bAutoStyles, 
_bProgress);
+}
+}
+}
 }
 else
 {
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index d0c067ac7ed3..7da33fb3a686 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3696,6 +3696,8 @@ void XMLTextParagraphExport::exportTableAutoStyles() {}
 
 void XMLTextParagraphExport::exportTextAutoStyles()
 {
+// tdf#135942: d

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

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/wrtw8nds.cxx |   20 ++--
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit a663bcda493b7d412e3837a4df38ca3d015a6ec5
Author: Justin Luth 
AuthorDate: Fri Aug 7 14:28:07 2020 +0300
Commit: Justin Luth 
CommitDate: Fri Aug 21 20:30:11 2020 +0200

NFC sw MS export: flatten useless aTmpFlyIter loop

The loop did nothing, since aTmpFlyIter was never used.
IsAnchorLinkedToThisNode() is only called in one place
to test whether to bPostponeWritingText.

One option would have been to actually use aTmpFlyIter
instead of maFlyIter, which would seem to make the most sense,
and was likely @synerzip's original intention.
(And in that case, it should return false as soon as
nNodePos < nAnchorPos since this is a sorted list.)

However, this whole concept of PostponeWritingText is ripe
for regressions etc. I don't want to introduce an even
larger number of postponed cases, so instead I chose to do
option two, which is to just re-write the function in the
way that it actually operated. So this is supposed to
be in a No-Functional-Change cleanup.

Change-Id: I227e2ecd2aca82b03b54ae3924db91933ca2c930
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100374
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index e9a830d55ce4..9817e562e379 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -610,21 +610,13 @@ bool SwWW8AttrIter::IsWatermarkFrame()
 
 bool SwWW8AttrIter::IsAnchorLinkedToThisNode( sal_uLong nNodePos )
 {
-ww8::FrameIter aTmpFlyIter = maFlyIter ;
-
-while ( aTmpFlyIter != maFlyFrames.end() )
-{
-const SwPosition &rAnchor  = maFlyIter->GetPosition();
-sal_uLong nAnchorPos = rAnchor.nNode.GetIndex();
-/* if current node position and the anchor position are the same
-   then the frame anchor is linked to this node
-*/
-if ( nAnchorPos == nNodePos )
-return true ;
+if ( maFlyIter == maFlyFrames.end() )
+return false;
 
-++aTmpFlyIter;
-}
-return false ;
+/* if current node position and the anchor position are the same
+then the frame anchor is linked to this node
+*/
+return nNodePos == maFlyIter->GetPosition().nNode.GetIndex();
 }
 
 bool SwWW8AttrIter::HasFlysAt(sal_Int32 nSwPos) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - 2 commits - loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CanvasTileLayer.js |   51 +---
 1 file changed, 24 insertions(+), 27 deletions(-)

New commits:
commit 1f51dc50f43a70edd30d54d67e0856d56170f3d9
Author: Michael Meeks 
AuthorDate: Fri Aug 21 20:43:47 2020 +0100
Commit: Michael Meeks 
CommitDate: Fri Aug 21 20:43:47 2020 +0100

Don't merge - grim hack try to get 1:1 pixels in canvas.

Change-Id: I8ff3f157112295e0c6ef6743de3c878329b98adb

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 9f3b6e02f..94937e047 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -40,22 +40,15 @@ L.CanvasTilePainter = L.Class.extend({
debug: true,
},
 
-   initialize: function (layer, enableImageSmoothing) {
+   initialize: function (layer) {
this._layer = layer;
this._canvas = this._layer._canvas;
 
var dpiScale = L.getDpiScaleFactor();
-   if (dpiScale === 1 || dpiScale === 2) {
-   enableImageSmoothing = (enableImageSmoothing === true);
-   }
-   else {
-   enableImageSmoothing = (enableImageSmoothing === 
undefined || enableImageSmoothing);
-   }
-
this._dpiScale = dpiScale;
 
this._map = this._layer._map;
-   this._setupCanvas(enableImageSmoothing);
+   this._setupCanvas();
 
this._topLeft = undefined;
this._lastZoom = undefined;
@@ -95,15 +88,11 @@ L.CanvasTilePainter = L.Class.extend({
this.stopUpdates();
},
 
-   setImageSmoothing: function (enable) {
-   this._canvasCtx.imageSmoothingEnabled = enable;
-   this._canvasCtx.msImageSmoothingEnabled = enable;
-   },
-
-   _setupCanvas: function (enableImageSmoothing) {
+   _setupCanvas: function () {
console.assert(this._canvas, 'no canvas element');
this._canvasCtx = this._canvas.getContext('2d', { alpha: false 
});
-   this.setImageSmoothing(enableImageSmoothing);
+   this._canvasCtx.imageSmoothingEnabled = false;
+   this._canvasCtx.msImageSmoothingEnabled = false;
var mapSize = this._map.getPixelBounds().getSize();
this._lastSize = mapSize;
this._lastMapSize = mapSize;
@@ -132,7 +121,7 @@ L.CanvasTilePainter = L.Class.extend({
 
clear: function () {
this._canvasCtx.save();
-   this._canvasCtx.scale(this._dpiScale, this._dpiScale);
+   this._canvasCtx.scale(1, 1);
if (this.options.debug)
this._canvasCtx.fillStyle = 'red';
else
@@ -177,7 +166,7 @@ L.CanvasTilePainter = L.Class.extend({
topLeft.y = ctx.viewBounds.min.y;
 
this._canvasCtx.save();
-   this._canvasCtx.scale(this._dpiScale, this._dpiScale);
+   this._canvasCtx.scale(1, 1);
this._canvasCtx.translate(-topLeft.x, -topLeft.y);
 
// create a clip for the pane/view.
@@ -186,12 +175,11 @@ L.CanvasTilePainter = L.Class.extend({
this._canvasCtx.rect(paneBounds.min.x, 
paneBounds.min.y, paneSize.x + 1, paneSize.y + 1);
this._canvasCtx.clip();
 
-   if (this._dpiScale !== 1) {
-   // FIXME: avoid this scaling when possible 
(dpiScale = 2).
-   this._canvasCtx.drawImage(tile.el, 
tile.coords.x, tile.coords.y, ctx.tileSize.x, ctx.tileSize.y);
-   }
-   else {
-   this._canvasCtx.drawImage(tile.el, 
tile.coords.x, tile.coords.y);
+   this._canvasCtx.drawImage(tile.el, tile.coords.x, 
tile.coords.y);
+   if (this.options.debug)
+   {
+   this._canvasCtx.strokeStyle = 'red';
+   this._canvasCtx.strokeRect(tile.coords.x, 
tile.coords.y, 256, 256);
}
this._canvasCtx.restore();
}
@@ -204,7 +192,7 @@ L.CanvasTilePainter = L.Class.extend({
}
var splitPos = splitPanesContext.getSplitPos();
this._canvasCtx.save();
-   this._canvasCtx.scale(this._dpiScale, this._dpiScale);
+   this._canvasCtx.scale(1, 1);
this._canvasCtx.strokeStyle = 'red';
this._canvasCtx.strokeRect(0, 0, splitPos.x, splitPos.y);
this._canvasCtx.restore();
@@ -249,6 +237,8 @@ L.CanvasTilePainter = L.Class.extend({
!splitPosChanged &&
  

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

[Ahmed ElShreif (via logerrit)]

 sw/qa/uitest/writer_tests2/fontworks.py |   42 
 1 file changed, 42 insertions(+)

New commits:
commit 7c91a8ea96f5192fbde9443147297226a7b7ac58
Author: Ahmed ElShreif 
AuthorDate: Wed Aug 12 21:00:56 2020 +0200
Commit: Ahmed ElShreif 
CommitDate: Fri Aug 21 23:05:32 2020 +0200

Add demo for FontWork Selector

As this selector is a ValueSet object so the support is added in this patch 
:
https://gerrit.libreoffice.org/c/core/+/100373

The test case just test the selector by selecting different items .

Change-Id: I0590c9b853572894130f17a05c0178e04b0fec41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100628
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests2/fontworks.py 
b/sw/qa/uitest/writer_tests2/fontworks.py
new file mode 100644
index ..df72f5ed67a4
--- /dev/null
+++ b/sw/qa/uitest/writer_tests2/fontworks.py
@@ -0,0 +1,42 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict, type_text
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+#test FontWorks dialog
+class fontWorksDialog(UITestCase):
+
+def test_fontwork_selector(self):
+self.ui_test.create_doc_in_start_center("writer")
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+
self.ui_test.execute_dialog_through_command(".uno:FontworkGalleryFloater")
+xDialog = self.xUITest.getTopFocusWindow()
+
+FontWorkSelector = xDialog.getChild("ctlFavorites")
+# Select element with id (3)
+FontWorkSelector.executeAction("SELECT", mkPropertyValues({"POS": 
"3"}))
+
self.assertEqual(get_state_as_dict(FontWorkSelector)["SelectedItemPos"], "2")
+
self.assertEqual(get_state_as_dict(FontWorkSelector)["SelectedItemId"], "3")
+self.assertEqual(get_state_as_dict(FontWorkSelector)["ItemsCount"], 
"36")
+
+# Select element with id (7)
+FontWorkSelector.executeAction("SELECT", mkPropertyValues({"POS": 
"7"}))
+
self.assertEqual(get_state_as_dict(FontWorkSelector)["SelectedItemPos"], "6")
+
self.assertEqual(get_state_as_dict(FontWorkSelector)["SelectedItemId"], "7")
+
+xCloseBtn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCloseBtn)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ahmed ElShreif (via logerrit)]

 sc/source/ui/view/gridwin.cxx|7 ---
 uitest/ui_logger_dsl/Special_commands.tx |   26 +++---
 uitest/ui_logger_dsl/dsl_core.py |   20 
 vcl/source/uitest/logger.cxx |7 +--
 4 files changed, 44 insertions(+), 16 deletions(-)

New commits:
commit ea94295b70b5e9703a54645e73aeda2eba7297fa
Author: Ahmed ElShreif 
AuthorDate: Tue Aug 18 21:57:45 2020 +0200
Commit: Ahmed ElShreif 
CommitDate: Fri Aug 21 23:06:22 2020 +0200

uilogger : Add support in the Logger and DSL for the LAUNCHMENU in CALC

The support is tested on some random test cases.

For example the DSL syntax will be:
>>"Launch SELECTMENU from Col 3 and Row 5"

Change-Id: Ic5b29ad8b377eed5c38aa1d0f680cbfb979763e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100958
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 887903286ca3..296873a2ef76 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -630,12 +630,12 @@ public:
 }
 };
 
-void collectUIInformation(const OUString& aRow, const OUString& aCol)
+void collectUIInformation(const OUString& aRow, const OUString& aCol , const 
OUString& aevent)
 {
 EventDescription aDescription;
 aDescription.aAction = "LAUNCH";
 aDescription.aID = "grid_window";
-aDescription.aParameters = {{"AUTOFILTER", ""},
+aDescription.aParameters = {{aevent, ""},
 {"ROW", aRow}, {"COL", aCol}};
 aDescription.aParent = "MainWindow";
 aDescription.aKeyWord = "ScGridWinUIObject";
@@ -751,7 +751,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 // remember filter rules before modification
 rControl.getResult(aSaveAutoFilterResult);
 
-collectUIInformation(OUString::number(nRow), OUString::number(nCol));
+collectUIInformation(OUString::number(nRow), 
OUString::number(nCol),"AUTOFILTER");
 }
 
 void ScGridWindow::RefreshAutoFilterButton(const ScAddress& rPos)
@@ -1222,6 +1222,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 
 mpFilterBox->EndInit();
 }
+collectUIInformation(OUString::number(nRow), 
OUString::number(nCol),"SELECTMENU");
 }
 
 void ScGridWindow::FilterSelect( sal_uLong nSel )
diff --git a/uitest/ui_logger_dsl/Special_commands.tx 
b/uitest/ui_logger_dsl/Special_commands.tx
index 071cfb9dcbbb..601a600f4bdb 100644
--- a/uitest/ui_logger_dsl/Special_commands.tx
+++ b/uitest/ui_logger_dsl/Special_commands.tx
@@ -60,22 +60,23 @@ writer_Insert_BreakPage:
 1)  select sheet
 2)  Select cell or range
 3)  launch AutoFill
-4)  Delete Cells
-5)  Remove Content of a cell
-6)  Insert new Cells
-7)  Cut Cells
-8)  Copy Cells
-9)  Paste Cells
-10) Merge Cells
-11) Unmerge Cells
+4)  launch SELECTMENU
+5)  Delete Cells
+6)  Remove Content of a cell
+7)  Insert new Cells
+8)  Cut Cells
+9)  Copy Cells
+10)  Paste Cells
+11) Merge Cells
+12) Unmerge Cells
 
   then we can add whatever we need in the future
 */
 calc_command:
   calc_Type_command | calc_switch_sheet | calc_Select_cell | 
calc_AutoFill_filter |
-  calc_Delete_Cells | calc_Remove_Content | calc_insert_cells | calc_Cut_Cells 
| 
-  calc_Copy_Cells | calc_Paste_Cells | calc_UNMerge_Cells | calc_Merge_Cells |
-  calc_Rename_Sheet | calc_Insert_sheet
+  calc_SelectMenu_filter | calc_Delete_Cells | calc_Remove_Content | 
calc_insert_cells |
+  calc_Cut_Cells | calc_Copy_Cells | calc_Paste_Cells | calc_UNMerge_Cells | 
+  calc_Merge_Cells | calc_Rename_Sheet | calc_Insert_sheet
 ;
 calc_Type_command:
   'Type on current cell' what_to_type=Type_options
@@ -89,6 +90,9 @@ calc_Select_cell:
 calc_AutoFill_filter:
   'Launch AutoFilter from Col' col_num=INT 'and Row' row_num=INT
 ;
+calc_SelectMenu_filter:
+  'Launch SELECTMENU from Col' col_num=INT 'and Row' row_num=INT
+;
 range_of_cells:
 '{' '"RANGE":' input_range=STRING '}'
 ;
diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index 644fc06e73dd..ebe936bba76a 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -110,6 +110,7 @@ class ul_Compiler:
 "calc_switch_sheet": self.handle_calc_switch_sheet,
 "calc_Type_command": self.handle_calc_Type_command,
 "calc_AutoFill_filter": self.handle_calc_AutoFill_filter,
+"calc_SelectMenu_filter": self.handle_calc_SelectMenu_filter,
 "impress_Type_command": self.handle_impress_Type_command,
 "math_element_selector": self.handle_math_element_selector,
 "math_Type_command": self.handle_math_Type_command,
@@ -726,6 +727,25 @@ class ul_Compiler:
 self.variables.append(line)
 self.prev_command = calc_AutoFill_filter
 
+def handle_calc_SelectMenu_fil

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

[Vasily Melenchuk (via logerrit)]

 sw/source/core/doc/DocumentLayoutManager.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit a6c2a87612a10d55fc59fa01e44d67d95505834f
Author: Vasily Melenchuk 
AuthorDate: Thu Aug 20 12:06:03 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Aug 21 23:44:01 2020 +0200

tdf#133490: set name for pasted frame format

In some copy/paste operations resulting frame format name can
be empty. This can lead to problems with udo/redo which relies
on format names.

Change-Id: I3cb542321d37cc00e2dee83d0f667164d83ead78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101042
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx 
b/sw/source/core/doc/DocumentLayoutManager.cxx
index a582fddaa1cb..7df5d2871f91 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -485,6 +486,14 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
 pDestTextBox->SetOtherTextBoxFormat(pDest);
 }
 
+if (pDest->GetName().isEmpty())
+{
+// Format name should have unique name. Let's use object name as a 
fallback
+SdrObject *pObj = pDest->FindSdrObject();
+if (pObj)
+pDest->SetName(pObj->GetName());
+}
+
 return pDest;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vasily Melenchuk (via logerrit)]

 sw/source/core/docnode/ndsect.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5f23f241704f798164df498e24dbf6b0daf27c44
Author: Vasily Melenchuk 
AuthorDate: Thu Aug 20 12:09:49 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Aug 21 23:43:13 2020 +0200

sw: set name for section format on creation

Section format is derived from frame format and better to
have own unique name for undo/redo work.

Change-Id: If41890443c2d71886164e0b94721b92bc2e9573a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101043
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/docnode/ndsect.cxx 
b/sw/source/core/docnode/ndsect.cxx
index a8658f99cf7b..7865ae68e33f 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -191,6 +191,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & 
rNewData,
 }
 
 SwSectionFormat* const pFormat = MakeSectionFormat();
+pFormat->SetName(rNewData.GetSectionName());
 if ( pAttr )
 {
 pFormat->SetFormatAttr( *pAttr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Bakos (via logerrit)]

 sw/inc/anchoredobject.hxx   |6 ++
 sw/qa/extras/layout/data/tdf106153.docx |binary
 sw/qa/extras/layout/layout.cxx  |   29 +
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx   |   11 ---
 sw/source/core/draw/dflyobj.cxx |2 
 sw/source/core/layout/anchoredobject.cxx|9 +++
 sw/source/core/layout/flylay.cxx|2 
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |   36 ++--
 8 files changed, 54 insertions(+), 41 deletions(-)

New commits:
commit b6850bbe95418ecfde404be1696548f18d200c9b
Author: Attila Bakos 
AuthorDate: Thu Aug 6 13:49:43 2020 +0200
Commit: László Németh 
CommitDate: Fri Aug 21 23:48:33 2020 +0200

tdf#106153 sw compatibility: fix textboxes exceeding the page

In compatibility mode DISABLE_OFF_PAGE_POSITIONING, textboxes
fell apart by exceeding the page. Now text content stay inside
the textboxes instead of the page area.

Main Developer: Dániel Arató (NISZ).

Commit a4dee94afed9ade6ac50237c8d99a6e49d3bebc1 (tdf#91260: allow
textboxes extending beyond the page bottom) is reverted partially,
according to this and the following commits:

Commit 8d62b79f168180c6992eb483ec864d473050635f
(tdf#112443 disable off-page content positioning) and
commit ee6cd34eb3a2bd1f1340063ee4b90a72ff0c9532
(tdf#123621 sw: fix textbox position according to DOCX).

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

diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 0c5c2495092a..bb65029c97f2 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -408,6 +408,12 @@ class SW_DLLPUBLIC SwAnchoredObject
 */
 virtual bool IsFormatPossible() const;
 
+/** method to determine if dragging objects off page is allowed
+
+Returns true if editor objects can be dragged off page, false 
otherwise
+*/
+static bool IsDraggingOffPageAllowed(const SwFrameFormat*);
+
 // accessors to member 
 void SetTmpConsiderWrapInfluence( const bool 
_bTmpConsiderWrapInfluence );
 bool IsTmpConsiderWrapInfluence() const { return 
mbTmpConsiderWrapInfluence;}
diff --git a/sw/qa/extras/layout/data/tdf106153.docx 
b/sw/qa/extras/layout/data/tdf106153.docx
new file mode 100644
index ..cba072360d4c
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf106153.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 0ce860834445..438a60bc633a 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -1239,6 +1239,35 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testNoLineBreakAtSlash)
 assertXPath(pLayout, "/root/page[1]/body/txt[1]/Text[3]", "Portion", 
"13/c/2, etc.");
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf106153)
+{
+load(DATA_DIRECTORY, "tdf106153.docx");
+xmlDocUniquePtr pDump = parseLayoutDump();
+
+const sal_Int64 nPageValLeft = getXPath(pDump, "/root/page/infos/bounds", 
"left").toInt64();
+const sal_Int64 nPageValTop = getXPath(pDump, "/root/page/infos/bounds", 
"top").toInt64();
+const sal_Int64 nPageValRight = getXPath(pDump, "/root/page/infos/bounds", 
"right").toInt64();
+const sal_Int64 nPageValBottom = getXPath(pDump, 
"/root/page/infos/bounds", "bottom").toInt64();
+
+const sal_Int64 nShape1ValTop
+= getXPath(pDump, "/root/page/body/txt/anchored/fly[1]/infos/bounds", 
"top").toInt64();
+const sal_Int64 nShape2ValLeft
+= getXPath(pDump, "/root/page/body/txt/anchored/fly[2]/infos/bounds", 
"left").toInt64();
+const sal_Int64 nShape3ValRight
+= getXPath(pDump, "/root/page/body/txt/anchored/fly[3]/infos/bounds", 
"right").toInt64();
+const sal_Int64 nShape4ValBottom
+= getXPath(pDump, "/root/page/body/txt/anchored/fly[4]/infos/bounds", 
"bottom").toInt64();
+
+CPPUNIT_ASSERT_MESSAGE("The whole top textbox is inside the page!",
+   nPageValTop > nShape1ValTop);
+CPPUNIT_ASSERT_MESSAGE("The whole left textbox is inside the page!",
+   nPageValLeft > nShape2ValLeft);
+CPPUNIT_ASSERT_MESSAGE("The whole right textbox is inside the page!",
+   nPageValRight < nShape3ValRight);
+CPPUNIT_ASSERT_MESSAGE("The whole bottom textbox is inside the page!",
+   nPageValBottom < nShape4ValBottom);
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInFlys)
 {
 loadURL("private:factory/swriter", nullptr);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index a5e11ec83484..7d7d5c02f6e8 100644
--- a/sw/qa/extras/o

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 814416d20f913bb823ba2348d2a9a76e7eaa7d76
Author: Caolán McNamara 
AuthorDate: Sun Aug 16 21:04:45 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 22 04:20:58 2020 +0200

tdf#135743 ignore size-allocations triggered by an embedded SalObject

getting configured, we already ignored them for painting, do the
same for the size-requests it output from our internal configuring

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

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index b4757b39023c..5b85c5a78f05 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2928,13 +2928,16 @@ gboolean GtkSalFrame::signalDraw(GtkWidget*, cairo_t 
*cr, gpointer frame)
 void GtkSalFrame::sizeAllocated(GtkWidget* pWidget, GdkRectangle *pAllocation, 
gpointer frame)
 {
 GtkSalFrame* pThis = static_cast(frame);
+// ignore size-allocations that occur during configuring an embedded 
SalObject
+if (pThis->m_bSalObjectSetPosSize)
+return;
 pThis->maGeometry.nWidth = pAllocation->width;
 pThis->maGeometry.nHeight = pAllocation->height;
 bool bRealized = gtk_widget_get_realized(pWidget);
 if (bRealized)
 pThis->AllocateFrame();
 pThis->CallCallbackExc( SalEvent::Resize, nullptr );
-if (bRealized && !pThis->m_bSalObjectSetPosSize)
+if (bRealized)
 pThis->TriggerPaintEvent();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e08e75a7dac629c67c35945d23d5356d40e98c1f
Author: Caolán McNamara 
AuthorDate: Sun Aug 16 21:09:43 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 22 04:22:20 2020 +0200

tdf#135743 only overwrite our geometry with the valid entries

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

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5b85c5a78f05..c5e475fb1555 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1526,13 +1526,15 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long 
nWidth, long nHeight, sal_u
 nY += m_pParent->maGeometry.nY;
 }
 
-maGeometry.nX = nX;
-maGeometry.nY = nY;
+if (nFlags & SAL_FRAME_POSSIZE_X)
+maGeometry.nX = nX;
+if (nFlags & SAL_FRAME_POSSIZE_Y)
+maGeometry.nY = nY;
 m_bGeometryIsProvisional = true;
 
 m_bDefaultPos = false;
 
-moveWindow(nX, nY);
+moveWindow(maGeometry.nX, maGeometry.nY);
 
 updateScreenNumber();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   24 +++-
 1 file changed, 7 insertions(+), 17 deletions(-)

New commits:
commit 4ec79a49b2885d4d5074c87cbb15f2d3c207ccf4
Author: Caolán McNamara 
AuthorDate: Fri Aug 14 20:05:06 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 22 04:23:52 2020 +0200

Related: tdf#135743 position combobox dropdowns correctly for RTL

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 5ac1ec88fc10..986cf4d23bc1 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1700,7 +1700,6 @@ static MouseEventModifiers 
ImplGetMouseMoveMode(sal_uInt16 nCode)
 
 namespace
 {
-#if GTK_CHECK_VERSION(3,22,0)
 bool SwapForRTL(GtkWidget* pWidget)
 {
 GtkTextDirection eDir = gtk_widget_get_direction(pWidget);
@@ -1710,7 +1709,6 @@ namespace
 return false;
 return AllSettings::GetLayoutRTL();
 }
-#endif
 
 void replaceWidget(GtkWidget* pWidget, GtkWidget* pReplacement)
 {
@@ -1968,12 +1966,7 @@ protected:
 
 bool SwapForRTL() const
 {
-GtkTextDirection eDir = gtk_widget_get_direction(m_pWidget);
-if (eDir == GTK_TEXT_DIR_RTL)
-return true;
-if (eDir == GTK_TEXT_DIR_LTR)
-return false;
-return AllSettings::GetLayoutRTL();
+return ::SwapForRTL(m_pWidget);
 }
 
 void do_enable_drag_source(rtl::Reference& rHelper, 
sal_uInt8 eDNDConstants)
@@ -7056,17 +7049,14 @@ bool show_menu_newer_gtk(GtkWidget* pComboBox, 
GtkWindow* pMenu)
 gtk_window_group_add_window(gtk_window_get_group(GTK_WINDOW(pToplevel)), 
pMenu);
 gtk_window_set_transient_for(pMenu, GTK_WINDOW(pToplevel));
 
-GtkRequisition req;
-gtk_widget_get_preferred_size(GTK_WIDGET(pMenu), nullptr, &req);
-gint nMenuWidth = req.width;
+gint nComboWidth = gtk_widget_get_allocated_width(pComboBox);
+gint nComboHeight = gtk_widget_get_allocated_height(pComboBox);
 
-gint nButtonHeight = gtk_widget_get_allocated_height(pComboBox);
+bool bSwapForRTL = SwapForRTL(GTK_WIDGET(pComboBox));
 
-GdkGravity rect_anchor = GDK_GRAVITY_SOUTH, menu_anchor = 
GDK_GRAVITY_NORTH;
-GdkRectangle rect {static_cast(x),
-   static_cast(y),
-   static_cast(nMenuWidth),
-   static_cast(nButtonHeight) };
+GdkGravity rect_anchor = !bSwapForRTL ? GDK_GRAVITY_SOUTH_WEST : 
GDK_GRAVITY_SOUTH_EAST;
+GdkGravity menu_anchor = !bSwapForRTL ? GDK_GRAVITY_NORTH_WEST : 
GDK_GRAVITY_NORTH_EAST;
+GdkRectangle rect {x, y, nComboWidth, nComboHeight };
 GdkWindow* toplevel = gtk_widget_get_window(GTK_WIDGET(pMenu));
 
 window_move_to_rect(toplevel, &rect, rect_anchor, menu_anchor,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/border.cxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit ce595857702734203a498fe4754ce990b17c5cb0
Author: Caolán McNamara 
AuthorDate: Fri Aug 21 15:18:13 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 22 04:30:28 2020 +0200

Resolves: tdf#135128 should get the old attr, not the default attr

so we retain the original shadow distance if its not changed but
the color is. Use GetOldAttr which is intended for that.

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

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 82f9b6c3e0ab..8dc87e8409bd 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -846,8 +846,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
 
 if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::TLBR))
 {
-sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_TLBR);
-SvxLineItem aLineItem(*static_cast(rCoreAttrs->GetItem(nBorderDiagId)));
+SvxLineItem aLineItem(*static_cast(GetOldItem(*rCoreAttrs, SID_ATTR_BORDER_DIAG_TLBR)));
 
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::TLBR));
 rCoreAttrs->Put(aLineItem);
 bAttrsChanged = true;
@@ -855,8 +854,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
 
 if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR))
 {
-sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_BLTR);
-SvxLineItem aLineItem(*static_cast(rCoreAttrs->GetItem(nBorderDiagId)));
+SvxLineItem aLineItem(*static_cast(GetOldItem(*rCoreAttrs, SID_ATTR_BORDER_DIAG_BLTR)));
 
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::BLTR));
 rCoreAttrs->Put(aLineItem);
 bAttrsChanged = true;
@@ -864,29 +862,29 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* 
rCoreAttrs )
 
 if (m_xShadowControls && m_xShadowControls->get_value_changed_from_saved())
 {
-sal_uInt16 nShadowId = pPool->GetWhich(mnShadowSlot);
-const SvxShadowItem& rOldShadowItem = *static_cast(rCoreAttrs->GetItem(nShadowId));
+const SvxShadowItem& rOldShadowItem = *static_cast(GetOldItem(*rCoreAttrs, mnShadowSlot));
 rCoreAttrs->Put(m_xShadowControls->GetControlValue(rOldShadowItem));
 bAttrsChanged = true;
 }
 
 if (m_xMarginControls && m_xMarginControls->get_value_changed_from_saved())
 {
-sal_uInt16 nAlignMarginId = pPool->GetWhich(SID_ATTR_ALIGN_MARGIN);
-const SvxMarginItem& rOldMarginItem = *static_cast(rCoreAttrs->GetItem(nAlignMarginId));
+const SvxMarginItem& rOldMarginItem = *static_cast(GetOldItem(*rCoreAttrs, SID_ATTR_ALIGN_MARGIN));
 rCoreAttrs->Put(m_xMarginControls->GetControlValue(rOldMarginItem));
 bAttrsChanged = true;
 }
 
 if (m_xMergeAdjacentBordersCB->get_state_changed_from_saved())
 {
-sal_uInt16 nMergeAdjacentBordersId = 
pPool->GetWhich(SID_SW_COLLAPSING_BORDERS);
 auto nState = m_xMergeAdjacentBordersCB->get_state();
 if (nState == TRISTATE_INDET)
+{
+sal_uInt16 nMergeAdjacentBordersId = 
pPool->GetWhich(SID_SW_COLLAPSING_BORDERS);
 rCoreAttrs->ClearItem(nMergeAdjacentBordersId);
+}
 else
 {
-std::unique_ptr 
xNewItem(static_cast(rCoreAttrs->Get(nMergeAdjacentBordersId).Clone()));
+std::unique_ptr 
xNewItem(static_cast(GetOldItem(*rCoreAttrs, 
SID_SW_COLLAPSING_BORDERS)->Clone()));
 xNewItem->SetValue(static_cast(nState));
 rCoreAttrs->Put(std::move(xNewItem));
 }
@@ -895,13 +893,15 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* 
rCoreAttrs )
 
 if (m_xMergeWithNextCB->get_state_changed_from_saved())
 {
-sal_uInt16 nMergeWithNextId = pPool->GetWhich(SID_ATTR_BORDER_CONNECT);
 auto nState = m_xMergeWithNextCB->get_state();
 if (nState == TRISTATE_INDET)
+{
+sal_uInt16 nMergeWithNextId = 
pPool->GetWhich(SID_ATTR_BORDER_CONNECT);
 rCoreAttrs->ClearItem(nMergeWithNextId);
+}
 else
 {
-std::unique_ptr 
xNewItem(static_cast(rCoreAttrs->Get(nMergeWithNextId).Clone()));
+std::unique_ptr 
xNewItem(static_cast(GetOldItem(*rCoreAttrs, 
SID_ATTR_BORDER_CONNECT)->Clone()));
 xNewItem->SetValue(static_cast(nState));
 rCoreAttrs->Put(std::move(xNewItem));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/dlg/directsql.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit a1fcdd52ff55d8564ccc174b765dd4f38a785223
Author: Caolán McNamara 
AuthorDate: Tue Aug 18 21:09:18 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 22 04:34:20 2020 +0200

don't include syntax highlighting in undo/redo

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

diff --git a/dbaccess/source/ui/dlg/directsql.cxx 
b/dbaccess/source/ui/dlg/directsql.cxx
index 5e7b579df72e..8cb2a2e2ac0a 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -77,6 +77,9 @@ namespace dbaui
 if (nChar == -1)
 return;
 
+bool bUndoEnabled = m_xEditEngine->IsUndoEnabled();
+m_xEditEngine->EnableUndo(false);
+
 sal_uInt32 nPara = nStartPara;
 do
 {
@@ -111,6 +114,8 @@ namespace dbaui
 ++nCount;
 }
 } while (nPara--);
+
+m_xEditEngine->EnableUndo(bUndoEnabled);
 }
 
 bool SQLEditView::KeyInput(const KeyEvent& rKEvt)
@@ -461,6 +466,10 @@ namespace dbaui
 {
 m_bInUpdate = true;
 EditEngine& rEditEngine = m_xSQL->GetEditEngine();
+
+bool bUndoEnabled = rEditEngine.IsUndoEnabled();
+rEditEngine.EnableUndo(false);
+
 // syntax highlighting
 bool bOrigModified = rEditEngine.IsModified();
 for (sal_Int32 nLine=0; nLine < rEditEngine.GetParagraphCount(); 
++nLine)
@@ -484,6 +493,9 @@ namespace dbaui
 }
 if (!bOrigModified)
 rEditEngine.ClearModifyFlag();
+
+rEditEngine.EnableUndo(bUndoEnabled);
+
 m_bInUpdate = false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - canvas/source

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

 canvas/source/vcl/canvashelper.cxx |   44 ++---
 1 file changed, 27 insertions(+), 17 deletions(-)

New commits:
commit 1ed6a0c86a8b3d35425500021fe763ad311f24d4
Author: Luboš Luňák 
AuthorDate: Wed Aug 19 11:10:12 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 22 04:46:21 2020 +0200

don't split polypolygon in canvas if not needed (tdf#135395)

Those polygons will be merged back in Skia because of
12147e0322e0fdd1b561c94e7ebd3fdd69ceaac0, which is costly with
tdf#135395. And if the only reason for the splitting is that
the polygon requires a winding rule but DrawPolyPolygon() uses
evenodd rule, then simply convert the polygon to the evenodd rule.

Change-Id: Iba5ec31d6d6407f734b20badc80c846071068d40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100976
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit b0788ff11481568b413ff6e4c3ea4871984af974)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100946
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/canvas/source/vcl/canvashelper.cxx 
b/canvas/source/vcl/canvashelper.cxx
index 0b3f49d38d9b..7d67876487f4 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -394,24 +395,33 @@ namespace vclcanvas
 // user coordinates.
 aStrokedPolyPoly.transform( aMatrix );
 
-// TODO(F2): When using alpha here, must handle that via
-// temporary surface or somesuch.
-
-// Note: the generated stroke poly-polygon is NOT free of
-// self-intersections. Therefore, if we would render it
-// via OutDev::DrawPolyPolygon(), on/off fill would
-// generate off areas on those self-intersections.
-for( sal_uInt32 i=0; igetOutDev().DrawPolygon( polygon );
-if( mp2ndOutDevProvider )
-mp2ndOutDevProvider->getOutDev().DrawPolygon( polygon 
);
-} else {
-mpOutDevProvider->getOutDev().DrawPolyLine( polygon );
-if( mp2ndOutDevProvider )
-mp2ndOutDevProvider->getOutDev().DrawPolyLine( polygon 
);
+// Note: the generated stroke poly-polygon is NOT free of
+// self-intersections. Therefore, if we would render it
+// directly via OutDev::DrawPolyPolygon(), on/off fill would
+// generate off areas on those self-intersections.
+aStrokedPolyPoly = basegfx::utils::createNonzeroConform( 
aStrokedPolyPoly );
+mpOutDevProvider->getOutDev().DrawPolyPolygon( 
aStrokedPolyPoly );
+if( mp2ndOutDevProvider )
+mp2ndOutDevProvider->getOutDev().DrawPolyPolygon( 
aStrokedPolyPoly );
+}
+else
+{
+// TODO(F2): When using alpha here, must handle that via
+// temporary surface or somesuch.
+for( sal_uInt32 i=0; igetOutDev().DrawPolygon( polygon );
+if( mp2ndOutDevProvider )
+mp2ndOutDevProvider->getOutDev().DrawPolygon( 
polygon );
+} else {
+mpOutDevProvider->getOutDev().DrawPolyLine( polygon );
+if( mp2ndOutDevProvider )
+mp2ndOutDevProvider->getOutDev().DrawPolyLine( 
polygon );
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/shared/00/0001.xhp   |4 ++--
 source/text/shared/06/sc_screenshots.xhp |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3f692971e566b7445ceb42aab88fc48d49370b89
Author: Olivier Hallot 
AuthorDate: Fri Aug 21 13:32:35 2020 -0300
Commit: Olivier Hallot 
CommitDate: Sat Aug 22 05:52:26 2020 +0200

Typos and udates in contents

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

diff --git a/source/text/shared/00/0001.xhp 
b/source/text/shared/00/0001.xhp
index 6c83e692d..661e79dba 100644
--- a/source/text/shared/00/0001.xhp
+++ b/source/text/shared/00/0001.xhp
@@ -84,9 +84,9 @@
 
 
 
-
+
 
-
+
 
 
 
diff --git a/source/text/shared/06/sc_screenshots.xhp 
b/source/text/shared/06/sc_screenshots.xhp
index 50befbbf5..0505be0e6 100644
--- a/source/text/shared/06/sc_screenshots.xhp
+++ b/source/text/shared/06/sc_screenshots.xhp
@@ -10,8 +10,8 @@
 -->
 
 
-  
-page_title
+  
+Calc Screenshots
 /text/shared/06/sc_screenshots.xhp
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit beed9abb626d6e077df7383497bf644a500423b6
Author: Olivier Hallot 
AuthorDate: Sat Aug 22 00:52:26 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Sat Aug 22 05:52:26 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 3f692971e566b7445ceb42aab88fc48d49370b89
  - Typos and udates in contents

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

diff --git a/helpcontent2 b/helpcontent2
index d36d5b43e727..3f692971e566 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d36d5b43e7274f678ce5fad89b42495fa6aed7e7
+Subproject commit 3f692971e566b7445ceb42aab88fc48d49370b89
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/l10n loleaflet/src

[Andras Timar (via logerrit)]

 loleaflet/l10n/uno/ab.json   |1 +
 loleaflet/l10n/uno/af.json   |1 +
 loleaflet/l10n/uno/am.json   |1 +
 loleaflet/l10n/uno/ar.json   |1 +
 loleaflet/l10n/uno/as.json   |1 +
 loleaflet/l10n/uno/ast.json  |1 +
 loleaflet/l10n/uno/be.json   |1 +
 loleaflet/l10n/uno/bg.json   |1 +
 loleaflet/l10n/uno/bn-IN.json|1 +
 loleaflet/l10n/uno/bn.json   |1 +
 loleaflet/l10n/uno/br.json   |1 +
 loleaflet/l10n/uno/brx.json  |1 +
 loleaflet/l10n/uno/bs.json   |1 +
 loleaflet/l10n/uno/ca-valencia.json  |1 +
 loleaflet/l10n/uno/ca.json   |1 +
 loleaflet/l10n/uno/cs.json   |1 +
 loleaflet/l10n/uno/cy.json   |1 +
 loleaflet/l10n/uno/da.json   |1 +
 loleaflet/l10n/uno/de.json   |1 +
 loleaflet/l10n/uno/dgo.json  |1 +
 loleaflet/l10n/uno/dsb.json  |1 +
 loleaflet/l10n/uno/el.json   |1 +
 loleaflet/l10n/uno/en-GB.json|1 +
 loleaflet/l10n/uno/en-ZA.json|1 +
 loleaflet/l10n/uno/eo.json   |1 +
 loleaflet/l10n/uno/es.json   |1 +
 loleaflet/l10n/uno/et.json   |1 +
 loleaflet/l10n/uno/eu.json   |1 +
 loleaflet/l10n/uno/fa.json   |1 +
 loleaflet/l10n/uno/fi.json   |1 +
 loleaflet/l10n/uno/fr.json   |1 +
 loleaflet/l10n/uno/fy.json   |1 +
 loleaflet/l10n/uno/ga.json   |1 +
 loleaflet/l10n/uno/gd.json   |1 +
 loleaflet/l10n/uno/gl.json   |1 +
 loleaflet/l10n/uno/gu.json   |1 +
 loleaflet/l10n/uno/gug.json  |1 +
 loleaflet/l10n/uno/he.json   |1 +
 loleaflet/l10n/uno/hi.json   |1 +
 loleaflet/l10n/uno/hr.json   |1 +
 loleaflet/l10n/uno/hsb.json  |1 +
 loleaflet/l10n/uno/hu.json   |1 +
 loleaflet/l10n/uno/id.json   |1 +
 loleaflet/l10n/uno/is.json   |1 +
 loleaflet/l10n/uno/it.json   |1 +
 loleaflet/l10n/uno/ja.json   |1 +
 loleaflet/l10n/uno/ka.json   |1 +
 loleaflet/l10n/uno/kab.json  |1 +
 loleaflet/l10n/uno/kk.json   |1 +
 loleaflet/l10n/uno/km.json   |1 +
 loleaflet/l10n/uno/kmr-Latn.json |1 +
 loleaflet/l10n/uno/kn.json   |1 +
 loleaflet/l10n/uno/ko.json   |1 +
 loleaflet/l10n/uno/kok.json  |1 +
 loleaflet/l10n/uno/ks.json   |1 +
 loleaflet/l10n/uno/lo.json   |1 +
 loleaflet/l10n/uno/lt.json   |1 +
 loleaflet/l10n/uno/lv.json   |1 +
 loleaflet/l10n/uno/mai.json  |1 +
 loleaflet/l10n/uno/mk.json   |1 +
 loleaflet/l10n/uno/ml.json   |1 +
 loleaflet/l10n/uno/mn.json   |1 +
 loleaflet/l10n/uno/mni.json  |1 +
 loleaflet/l10n/uno/mr.json   |1 +
 loleaflet/l10n/uno/my.json   |1 +
 loleaflet/l10n/uno/nb.json   |1 +
 loleaflet/l10n/uno/ne.json   |1 +
 loleaflet/l10n/uno/nl.json   |1 +
 loleaflet/l10n/uno/nn.json   |1 +
 loleaflet/l10n/uno/oc.json   |1 +
 loleaflet/l10n/uno/om.json   |1 +
 loleaflet/l10n/uno/or.json   |1 +
 loleaflet/l10n/uno/pa-IN.json|1 +
 loleaflet/l10n/uno/pl.json   |1 +
 loleaflet/l10n/uno/pt-BR.json|1 +
 loleaflet/l10n/uno/pt.json   |1 +
 loleaflet/l10n/uno/ro.json   |1 +
 loleaflet/l10n/uno/ru.json   |1 +
 loleaflet/l10n/uno/rw.json   |1 +
 loleaflet/l10n/uno/sa-IN.json|1 +
 loleaflet/l10n/uno/sat.json  |1 +
 loleaflet/l10n/uno/sd.json   |1 +
 loleaflet/l10n/uno/si.json   |1 +
 loleaflet/l10n/uno/sid.json  |1 +
 loleaflet/l10n/uno/sk.json   |1 +
 loleaflet/l10n/uno/sl.json   |1 +
 loleaflet/l10n/uno/sq.json   |1 +
 loleaflet/l10n/uno/sv.json   |1 +
 loleaflet/l10n/uno/sw-TZ.json|1 +
 loleaflet/l10n/uno/ta.json   |1 +
 loleaflet/l10n/uno/te.json   |  

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/l10n loleaflet/src

[Andras Timar (via logerrit)]

 loleaflet/l10n/uno/ab.json   |1 +
 loleaflet/l10n/uno/af.json   |1 +
 loleaflet/l10n/uno/am.json   |1 +
 loleaflet/l10n/uno/ar.json   |1 +
 loleaflet/l10n/uno/as.json   |1 +
 loleaflet/l10n/uno/ast.json  |1 +
 loleaflet/l10n/uno/be.json   |1 +
 loleaflet/l10n/uno/bg.json   |1 +
 loleaflet/l10n/uno/bn-IN.json|1 +
 loleaflet/l10n/uno/bn.json   |1 +
 loleaflet/l10n/uno/br.json   |1 +
 loleaflet/l10n/uno/brx.json  |1 +
 loleaflet/l10n/uno/bs.json   |1 +
 loleaflet/l10n/uno/ca-valencia.json  |1 +
 loleaflet/l10n/uno/ca.json   |1 +
 loleaflet/l10n/uno/cs.json   |1 +
 loleaflet/l10n/uno/cy.json   |1 +
 loleaflet/l10n/uno/da.json   |1 +
 loleaflet/l10n/uno/de.json   |1 +
 loleaflet/l10n/uno/dgo.json  |1 +
 loleaflet/l10n/uno/dsb.json  |1 +
 loleaflet/l10n/uno/el.json   |1 +
 loleaflet/l10n/uno/en-GB.json|1 +
 loleaflet/l10n/uno/en-ZA.json|1 +
 loleaflet/l10n/uno/eo.json   |1 +
 loleaflet/l10n/uno/es.json   |1 +
 loleaflet/l10n/uno/et.json   |1 +
 loleaflet/l10n/uno/eu.json   |1 +
 loleaflet/l10n/uno/fa.json   |1 +
 loleaflet/l10n/uno/fi.json   |1 +
 loleaflet/l10n/uno/fr.json   |1 +
 loleaflet/l10n/uno/fy.json   |1 +
 loleaflet/l10n/uno/ga.json   |1 +
 loleaflet/l10n/uno/gd.json   |1 +
 loleaflet/l10n/uno/gl.json   |1 +
 loleaflet/l10n/uno/gu.json   |1 +
 loleaflet/l10n/uno/gug.json  |1 +
 loleaflet/l10n/uno/he.json   |1 +
 loleaflet/l10n/uno/hi.json   |1 +
 loleaflet/l10n/uno/hr.json   |1 +
 loleaflet/l10n/uno/hsb.json  |1 +
 loleaflet/l10n/uno/hu.json   |1 +
 loleaflet/l10n/uno/id.json   |1 +
 loleaflet/l10n/uno/is.json   |1 +
 loleaflet/l10n/uno/it.json   |1 +
 loleaflet/l10n/uno/ja.json   |1 +
 loleaflet/l10n/uno/ka.json   |1 +
 loleaflet/l10n/uno/kab.json  |1 +
 loleaflet/l10n/uno/kk.json   |1 +
 loleaflet/l10n/uno/km.json   |1 +
 loleaflet/l10n/uno/kmr-Latn.json |1 +
 loleaflet/l10n/uno/kn.json   |1 +
 loleaflet/l10n/uno/ko.json   |1 +
 loleaflet/l10n/uno/kok.json  |1 +
 loleaflet/l10n/uno/ks.json   |1 +
 loleaflet/l10n/uno/lo.json   |1 +
 loleaflet/l10n/uno/lt.json   |1 +
 loleaflet/l10n/uno/lv.json   |1 +
 loleaflet/l10n/uno/mai.json  |1 +
 loleaflet/l10n/uno/mk.json   |1 +
 loleaflet/l10n/uno/ml.json   |1 +
 loleaflet/l10n/uno/mn.json   |1 +
 loleaflet/l10n/uno/mni.json  |1 +
 loleaflet/l10n/uno/mr.json   |1 +
 loleaflet/l10n/uno/my.json   |1 +
 loleaflet/l10n/uno/nb.json   |1 +
 loleaflet/l10n/uno/ne.json   |1 +
 loleaflet/l10n/uno/nl.json   |1 +
 loleaflet/l10n/uno/nn.json   |1 +
 loleaflet/l10n/uno/oc.json   |1 +
 loleaflet/l10n/uno/om.json   |1 +
 loleaflet/l10n/uno/or.json   |1 +
 loleaflet/l10n/uno/pa-IN.json|1 +
 loleaflet/l10n/uno/pl.json   |1 +
 loleaflet/l10n/uno/pt-BR.json|1 +
 loleaflet/l10n/uno/pt.json   |1 +
 loleaflet/l10n/uno/ro.json   |1 +
 loleaflet/l10n/uno/ru.json   |1 +
 loleaflet/l10n/uno/rw.json   |1 +
 loleaflet/l10n/uno/sa-IN.json|1 +
 loleaflet/l10n/uno/sat.json  |1 +
 loleaflet/l10n/uno/sd.json   |1 +
 loleaflet/l10n/uno/si.json   |1 +
 loleaflet/l10n/uno/sid.json  |1 +
 loleaflet/l10n/uno/sk.json   |1 +
 loleaflet/l10n/uno/sl.json   |1 +
 loleaflet/l10n/uno/sq.json   |1 +
 loleaflet/l10n/uno/sv.json   |1 +
 loleaflet/l10n/uno/sw-TZ.json|1 +
 loleaflet/l10n/uno/ta.json   |1 +
 loleaflet/l10n/uno/te.json   |  

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

[tgds03 (via logerrit)]

 extras/source/autocorr/lang/ko/DocumentList.xml |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6c2911a483dd28b2006eb2579d7922f78c774577
Author: tgds03 
AuthorDate: Sun Aug 16 17:47:23 2020 +0900
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 22 08:30:34 2020 +0200

tdf#135727 add Korean Autocorrect list

Add Korean Auto Correct list
명중율 -> 명중률
합격율 -> 합격률

Change-Id: I9f843bc8e0b08e8ba5118ad2a5703c8d8e4539c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100813
Tested-by: Jenkins
Reviewed-by: DaeHyun Sung 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/autocorr/lang/ko/DocumentList.xml 
b/extras/source/autocorr/lang/ko/DocumentList.xml
index e472c1553f1a..0ddef9c7bcc4 100644
--- a/extras/source/autocorr/lang/ko/DocumentList.xml
+++ b/extras/source/autocorr/lang/ko/DocumentList.xml
@@ -2350,6 +2350,7 @@
   
   
   
+  
   
   
   
@@ -2377,6 +2378,7 @@
   
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[ramtk6726 (via logerrit)]

 extras/source/autocorr/lang/ko/DocumentList.xml |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8a360d04e43410e729c0ee270be5447ce6c1cd03
Author: ramtk6726 
AuthorDate: Sun Aug 16 18:05:33 2020 +0900
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 22 08:31:11 2020 +0200

tdf#135727 add korean autocorrect list

Add Korean Auto Correst list
성공율 -> 성공률
외형율 -> 외형률

Change-Id: I3eb667cae7ffe0e7466f3eae6f587ba21424b9ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100814
Tested-by: Jenkins
Reviewed-by: DaeHyun Sung 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/autocorr/lang/ko/DocumentList.xml 
b/extras/source/autocorr/lang/ko/DocumentList.xml
index 0ddef9c7bcc4..9fc6e94a19cc 100644
--- a/extras/source/autocorr/lang/ko/DocumentList.xml
+++ b/extras/source/autocorr/lang/ko/DocumentList.xml
@@ -2359,6 +2359,7 @@
   
   
   
+  
   
   
   
@@ -2374,6 +2375,7 @@
   
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-1' - solenv/flatpak-manifest.in

[Stephan Bergmann (via logerrit)]

 solenv/flatpak-manifest.in |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ae50bc355729d3261cbcf8c98ea2d3cd59b2b818
Author: Stephan Bergmann 
AuthorDate: Mon Aug 17 10:31:00 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 22 08:32:11 2020 +0200

solenv/flatpak-manifest.in: Merge "Clean krb5 module"




Change-Id: Ib7aa25f6296a49d3ffaa7055d4d5c055ce6dacbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100849
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 931e923cdcf5eeac3ad2880c01d25456d9549dc8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100797
Reviewed-by: Caolán McNamara 
(cherry picked from commit 9e5510c24044b0e47027b2ee1134db22faaa01e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100799
Reviewed-by: Michael Stahl 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7b2cc92c2ffe..5854efae89eb 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -37,7 +37,13 @@
 "subdir": "src",
 "config-opts": [
 "--disable-static",
-"--disable-rpath"
+"--disable-rpath",
+"--sbindir=/app/bin"
+],
+"cleanup": [
+"/include",
+"/lib/pkgconfig",
+"/var"
 ],
 "sources": [
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits