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

[Noel Grandin (via logerrit)]

 chart2/source/controller/main/ChartController_Position.cxx |   13 +---
 cui/source/dialogs/zoom.cxx|7 +-
 cui/source/tabpages/swpossizetabpage.cxx   |   18 +++---
 cui/source/tabpages/transfrm.cxx   |   36 ++---
 sw/source/ui/frmdlg/frmpage.cxx|2 
 5 files changed, 35 insertions(+), 41 deletions(-)

New commits:
commit 4abb554b164ae537a9854c40ab347d5cbfb125f5
Author: Noel Grandin 
AuthorDate: Thu Jan 27 19:21:39 2022 +0200
Commit: Noel Grandin 
CommitDate: Fri Jan 28 08:28:31 2022 +0100

no need to call GetWhich on these SID_ values

none of them are remapped (via the SfxItemEntryInfo stuff in the pool)

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

diff --git a/chart2/source/controller/main/ChartController_Position.cxx 
b/chart2/source/controller/main/ChartController_Position.cxx
index f57a3b8e8f96..3482196b1616 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -150,26 +150,21 @@ void 
ChartController::executeDispatch_PositionAndSize(const ::css::uno::Sequence
 if (!pPool)
 return;
 
-sal_uInt16 nWhich;
 for (const auto& aProp: *pArgs)
 {
 sal_Int32 nValue = 0;
 aProp.Value >>= nValue;
 if (aProp.Name == "TransformPosX") {
-nWhich = pPool->GetWhich(SID_ATTR_TRANSFORM_POS_X);
-aItemSet.Put(SfxInt32Item(nWhich, nValue));
+aItemSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_POS_X, 
nValue));
 }
 else if (aProp.Name == "TransformPosY") {
-nWhich = pPool->GetWhich(SID_ATTR_TRANSFORM_POS_Y);
-aItemSet.Put(SfxInt32Item(nWhich, nValue));
+aItemSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_POS_Y, 
nValue));
 }
 else if (aProp.Name == "TransformWidth") {
-nWhich = pPool->GetWhich(SID_ATTR_TRANSFORM_WIDTH);
-aItemSet.Put(SfxUInt32Item(nWhich, 
static_cast(nValue)));
+aItemSet.Put(SfxUInt32Item(SID_ATTR_TRANSFORM_WIDTH, 
static_cast(nValue)));
 }
 else if (aProp.Name == "TransformHeight") {
-nWhich = pPool->GetWhich(SID_ATTR_TRANSFORM_HEIGHT);
-aItemSet.Put(SfxUInt32Item(nWhich, 
static_cast(nValue)));
+aItemSet.Put(SfxUInt32Item(SID_ATTR_TRANSFORM_HEIGHT, 
static_cast(nValue)));
 }
 }
 }
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 90999d96798a..c1e56d28647d 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -185,7 +185,7 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const 
SfxItemSet& rCoreSet)
 SetLimits(nMin, nMax);
 m_xUserEdit->set_value(nValue, FieldUnit::PERCENT);
 
-const SfxPoolItem& rItem = 
m_rSet.Get(m_rSet.GetPool()->GetWhich(SID_ATTR_ZOOM));
+const SfxPoolItem& rItem = m_rSet.Get(SID_ATTR_ZOOM);
 
 if (auto pZoomItem = dynamic_cast(&rItem))
 {
@@ -344,9 +344,8 @@ IMPL_LINK_NOARG(SvxZoomDialog, OKHdl, weld::Button&, void)
 {
 if (m_bModified)
 {
-SvxZoomItem aZoomItem(SvxZoomType::PERCENT, 0, 
m_rSet.GetPool()->GetWhich(SID_ATTR_ZOOM));
-SvxViewLayoutItem aViewLayoutItem(0, false,
-  
m_rSet.GetPool()->GetWhich(SID_ATTR_VIEWLAYOUT));
+SvxZoomItem aZoomItem(SvxZoomType::PERCENT, 0, SID_ATTR_ZOOM);
+SvxViewLayoutItem aViewLayoutItem(0, false, SID_ATTR_VIEWLAYOUT);
 
 sal_uInt16 nFactor = GetFactor();
 
diff --git a/cui/source/tabpages/swpossizetabpage.cxx 
b/cui/source/tabpages/swpossizetabpage.cxx
index fe1d46a4d0c8..0d1475193610 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -748,7 +748,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
 rSet->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS );
 else
 rSet->Put(
-SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ),
+SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_POS,
 m_xPositionCB->get_state() == TRISTATE_TRUE ) );
 bModified = true;
 }
@@ -759,7 +759,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
 rSet->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE );
 else
 rSet->Put(
-SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ),
+SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_SIZE,
 m_xSizeCB->get_state() == TRISTATE_TRU

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

[Miklos Vajna (via logerrit)]

 sw/source/filter/ww8/rtfexport.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 7875b1d4dab504d3b8a8632a1d8fd0afe910d7c3
Author: Miklos Vajna 
AuthorDate: Thu Jan 27 20:23:39 2022 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jan 28 08:21:43 2022 +0100

sw: remove unused include in rtfexport

It was the only '#if OSL_DEBUG_LEVEL > 1' in this file, so the include
is definitely not used.

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

diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index 795f6c46b6de..acfca6354c43 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -59,9 +59,6 @@
 #include 
 #include 
 #include 
-#if OSL_DEBUG_LEVEL > 1
-#include 
-#endif
 #include 
 #include 
 #include 

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

[Noel Grandin (via logerrit)]

 chart2/source/controller/main/ElementSelector.cxx |2 +-
 chart2/source/inc/DataSeriesHelper.hxx|4 ++--
 chart2/source/tools/DataSeriesHelper.cxx  |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 59b6ffb3812fee3ed3d92602c31bc836efbee319
Author: Noel Grandin 
AuthorDate: Wed Jan 26 20:41:50 2022 +0200
Commit: Noel Grandin 
CommitDate: Fri Jan 28 08:20:14 2022 +0100

use more concrete types in chart2, BaseCoordinateSystem

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

diff --git a/chart2/source/controller/main/ElementSelector.cxx 
b/chart2/source/controller/main/ElementSelector.cxx
index e56da4fc6173..b4488295ebd9 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -288,7 +288,7 @@ void SAL_CALL 
ElementSelectorToolbarController::statusChanged( const frame::Feat
 Reference< frame::XController > xChartController;
 rEvent.State >>= xChartController;
 ::chart::ChartController* pController = 
dynamic_cast<::chart::ChartController*>(xChartController.get());
-assert(pController);
+assert(!xChartController || pController);
 m_apSelectorListBox->SetChartController( pController );
 m_apSelectorListBox->UpdateChartElementsListAndSelection();
 }
diff --git a/chart2/source/inc/DataSeriesHelper.hxx 
b/chart2/source/inc/DataSeriesHelper.hxx
index 866fa7c54e9f..8d2e7e3d5672 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -104,7 +104,7 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString 
getLabelForLabeledDataSequence(
 
 OOO_DLLPUBLIC_CHARTTOOLS void setStackModeAtSeries(
 const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > 
> & aSeries,
-const css::uno::Reference< css::chart2::XCoordinateSystem > & 
xCorrespondingCoordinateSystem,
+const rtl::Reference< ::chart::BaseCoordinateSystem > & 
xCorrespondingCoordinateSystem,
 StackMode eStackMode );
 
 OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getAttachedAxisIndex(
@@ -113,7 +113,7 @@ OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getAttachedAxisIndex(
 /// @param nAxisIndex, if -1 it is determined by the given data series via 
getAttachedAxisIndex
 OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getNumberFormatKeyFromAxis(
 const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
-const css::uno::Reference< css::chart2::XCoordinateSystem > & 
xCorrespondingCoordinateSystem,
+const rtl::Reference< ::chart::BaseCoordinateSystem > & 
xCorrespondingCoordinateSystem,
 sal_Int32 nDimensionIndex,
 sal_Int32 nAxisIndex = -1 );
 
diff --git a/chart2/source/tools/DataSeriesHelper.cxx 
b/chart2/source/tools/DataSeriesHelper.cxx
index a4b626830d1e..bdf391bf5922 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -378,7 +378,7 @@ OUString getDataSeriesLabel(
 
 void setStackModeAtSeries(
 const Sequence< Reference< chart2::XDataSeries > > & aSeries,
-const Reference< chart2::XCoordinateSystem > & 
xCorrespondingCoordinateSystem,
+const rtl::Reference< BaseCoordinateSystem > & 
xCorrespondingCoordinateSystem,
 StackMode eStackMode )
 {
 const uno::Any aPropValue(
@@ -460,7 +460,7 @@ sal_Int32 getAttachedAxisIndex( const Reference< 
chart2::XDataSeries > & xSeries
 
 sal_Int32 getNumberFormatKeyFromAxis(
 const Reference< chart2::XDataSeries > & xSeries,
-const Reference< chart2::XCoordinateSystem > & 
xCorrespondingCoordinateSystem,
+const rtl::Reference< BaseCoordinateSystem > & 
xCorrespondingCoordinateSystem,
 sal_Int32 nDimensionIndex,
 sal_Int32 nAxisIndex /* = -1 */ )
 {

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

[Justin Luth (via logerrit)]

 sw/sdi/drwtxtsh.sdi  |5 +
 sw/source/uibase/shells/drwtxtex.cxx |9 +
 2 files changed, 14 insertions(+)

New commits:
commit bb183ef3734cc3ccad81bd1ca1309f726c279870
Author: Justin Luth 
AuthorDate: Thu Jan 27 15:08:21 2022 +0200
Commit: Justin Luth 
CommitDate: Fri Jan 28 07:16:50 2022 +0100

related tdf#111733 TextCharacterSpacingControl sw draw: goto position tab

The kerning button on the sidebar very unhelpfully
did nothing at all in draw text (like textboxes).
It should have brought the user directly to the "position" tab
where the kerning property can be found.

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

diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index c9e76ab9fbfb..3acf703d75e8 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -393,6 +393,11 @@ interface TextDrawText
 StateMethod = GetState ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
+SID_CHAR_DLG_POSITION
+[
+ExecMethod = Execute ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
 SID_CHAR_DLG_FOR_PARAGRAPH
 [
 ExecMethod = Execute ;
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 068a9be9feca..502fd7a6fa09 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -353,6 +353,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 break;
 
 case SID_CHAR_DLG_EFFECT:
+case SID_CHAR_DLG_POSITION:
 case SID_CHAR_DLG:
 case SID_CHAR_DLG_FOR_PARAGRAPH:
 {
@@ -386,6 +387,10 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 {
 pDlg->SetCurPageId("fonteffects");
 }
+else if (nSlot == SID_CHAR_DLG_POSITION)
+{
+pDlg->SetCurPageId("position");
+}
 else if (nSlot == SID_CHAR_DLG_FOR_PARAGRAPH)
 {
 pDlg->SetCurPageId("font");
@@ -640,6 +645,10 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 {
 
GetView().GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_EFFECT);
 }
+else if (nEEWhich == EE_CHAR_KERNING)
+{
+
GetView().GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_POSITION);
+}
 
 
 SetAttrToMarked(aNewAttr);

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

[Justin Luth (via logerrit)]

 sw/sdi/_annotsh.sdi |7 +++
 sw/source/uibase/shells/annotsh.cxx |   10 ++
 2 files changed, 17 insertions(+)

New commits:
commit e1f82fec6262db708f7911d20b62b74a4b4feab2
Author: Justin Luth 
AuthorDate: Thu Jan 27 15:21:37 2022 +0200
Commit: Justin Luth 
CommitDate: Fri Jan 28 05:58:09 2022 +0100

related tdf#11173 TextCharacterSpacingControl sw annot: goto position tab

The kerning button on the sidebar very unhelpfully
did nothing at all in draw text (like textboxes).
It should have brought the user directly to the "position" tab
where the kerning property can be found.

Change-Id: I83687c732cc45bb28a835e878d0c91f10fb713ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129046
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 

diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index b335fb9e0676..ff720d238226 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -326,6 +326,13 @@ interface _Annotation
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
+SID_CHAR_DLG_POSITION
+[
+ExecMethod = Exec ;
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
 SID_ATTR_CHAR_WEIGHT // api:
 [
 ExecMethod = Exec ;
diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index 61b665058381..95880f303579 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -449,6 +449,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
 break;
 }
 case SID_CHAR_DLG_EFFECT:
+case SID_CHAR_DLG_POSITION:
 case SID_CHAR_DLG:
 {
 const SfxItemSet* pArgs = rReq.GetArgs();
@@ -474,6 +475,10 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
 {
 pDlg->SetCurPageId("fonteffects");
 }
+if (nSlot == SID_CHAR_DLG_POSITION)
+{
+pDlg->SetCurPageId("position");
+}
 else if (pItem)
 {
 pDlg->SetCurPageId(OUStringToOString(pItem->GetValue(), 
RTL_TEXTENCODING_UTF8));
@@ -582,6 +587,11 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
 {
 m_rView.GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_EFFECT);
 }
+else if (nEEWhich == EE_CHAR_KERNING)
+{
+
m_rView.GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_POSITION);
+}
+
 
 tools::Rectangle aOutRect = pOLV->GetOutputArea();
 if (tools::Rectangle() != aOutRect && aNewAttr.Count())

[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - connectivity/source

[Stephan Bergmann (via logerrit)]

 connectivity/source/parse/sqlbison.y |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b4413bebfa8383520bfbc4ab5ee4f4ebbced56e9
Author: Stephan Bergmann 
AuthorDate: Tue Sep 14 12:20:48 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Jan 28 01:01:24 2022 +0100

Adapt to Bison 3.8 internal yyn -> yyrule rename

see


"glr2.cc: log the execution of deferred actions" including "Rename argument 
yyn
as yyrule for clarity."

YYBISON was defined as 1 rather than as a representation of the Bison 
version
prior to


"yacc.c: provide the Bison version as an integral macro", which shouldn't 
be a
problem here.  And YYBISON is apparently completely undefined with
/usr/bin/bison on macOS.

(The preceding comment always mentioned "yyi" and "yyrmap" in apparent 
mismatch
with the actually used "yyn" and "yyr1" ever since
c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
untouched.)

Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197)

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index a93f3401cabc..0d2853e73105 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const 
OUString& _newValue,
 
 // yyi is the internal number of the rule that is currently being reduced
 // This can be mapped to external rule number via the yyrmap.
+#if defined YYBISON && YYBISON >= 30800
+#define SQL_NEW_RULE   newNode("", SQLNodeType::Rule, 
yyr1[yyrule])
+#define SQL_NEW_LISTRULE   newNode("", SQLNodeType::ListRule, 
yyr1[yyrule])
+#define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, 
yyr1[yyrule])
+#else
 #define SQL_NEW_RULE   newNode("", SQLNodeType::Rule, 
yyr1[yyn])
 #define SQL_NEW_LISTRULE   newNode("", SQLNodeType::ListRule, 
yyr1[yyn])
 #define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, 
yyr1[yyn])
+#endif
 
 
 extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;

[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 3 commits - config_host.mk.in configure.ac external/gpgmepp external/libassuan external/libgpg-error solenv/gbuild

[Thorsten Behrens (via logerrit)]

 config_host.mk.in |1 -
 configure.ac  |1 -
 external/gpgmepp/ExternalProject_gpgmepp.mk   |2 +-
 external/libassuan/ExternalProject_libassuan.mk   |3 ++-
 external/libgpg-error/ExternalProject_libgpg-error.mk |2 +-
 solenv/gbuild/platform/com_MSC_class.mk   |4 
 solenv/gbuild/platform/com_MSC_defs.mk|   16 
 7 files changed, 4 insertions(+), 25 deletions(-)

New commits:
commit c5891e585112b20a5132da25342a6bda119254e8
Author: Thorsten Behrens 
AuthorDate: Tue Jun 15 18:03:27 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jan 27 22:39:53 2022 +0100

avoid windres preprocessor quoting-messups with current cygwin

apparently fresh installs of cygwin behave differently with the windres
command's quoting and treats --preprocessor='cpp foo bar' as a single file
"cpp foo bar" to run instead of running "cpp" with the arguments "foo"
and "bar".
(-D and -I options are passed to the preprocessor automatically, so no
need to prefix those with --preprocessor-arg)

Conflicts:
 - solenv/gbuild/platform/com_MSC_defs.mk

Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965
Tested-by: Jenkins
Reviewed-by: Georgy Litvinov 
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 9b120ad2773676c5445d4664e9c7007c575249a4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127097
Tested-by: Vasily Melenchuk 
Reviewed-by: Vasily Melenchuk 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 9fafa67c9bc85d9e5a13d18b7b7ecbc8de700c04)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127058

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk 
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 452f922750d6..dac2fad1361b 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): 
$(call gb_Executable_
$(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
$(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
--host=$(gb_ExternalProject_gpgmepp_host) \
-  RC='windres -O COFF 
--target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+  RC='windres -O COFF 
--target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call 
gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED 
-DWINAPI_FAMILY=0 $(SOLARINC)' \
   MAKE=$(MAKE) \
&& $(MAKE) \
)
diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index f137452ed35a..9237c35a5d31 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): 
$(call gb_Executabl
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
 --host=$(gb_ExternalProject_libassuan_host) \
-   RC='windres -O COFF 
--target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+   RC='windres -O COFF 
--target=$(gb_ExternalProject_libassuan_target) --preprocessor=$(call 
gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED 
-DWINAPI_FAMILY=0 $(SOLARINC)' \
MAKE=$(MAKE) \
  && $(MAKE) \
)
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk 
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index 1fcd63180e20..e5155aad94c1 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -28,7 +28,7 @@ $(call 
gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut
--disable-doc \
--disable-tests \
--host=$(gb_ExternalProject_libgpg-error_host) \
-   RC='windres -O COFF 
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+   RC='windres -O COFF 
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call 
gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED 
-DWINAPI_FAMILY=0 $(SOLARINC)' \
&& $(MAKE) \
)
 else
commit 65413a0a3dbdff3ea1147916ecb58c757f498bab
Author: Thorsten Behrens 
AuthorDate: Tue Dec 28 17:22:29 2021 +0100
Commit:   

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 25aecb05a9835742266d216a0be6859c835d4415
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jan 27 22:43:26 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jan 27 21:43:26 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to d16329383f7ff6ce14d00dec6670de29343bae26
  - Remove max-width from menus

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

diff --git a/helpcontent2 b/helpcontent2
index 714b152de6a3..d16329383f7f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 714b152de6a39ced79cc88ef17e51ef7efec5abc
+Subproject commit d16329383f7ff6ce14d00dec6670de29343bae26

[Libreoffice-commits] help.git: help3xsl/default.css

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |2 --
 1 file changed, 2 deletions(-)

New commits:
commit d16329383f7ff6ce14d00dec6670de29343bae26
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jan 27 19:27:20 2022 +0200
Commit: Olivier Hallot 
CommitDate: Thu Jan 27 21:43:23 2022 +0100

Remove max-width from menus

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

diff --git a/help3xsl/default.css b/help3xsl/default.css
index a90644025..085d323a9 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -780,8 +780,6 @@ li.disabled a {
 display: flex;
 flex-direction: column;
 overflow-y: auto;
-overflow-x: hidden;
-max-width: 160px;
 max-height: 480px;
 position: absolute;
 }

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/inc/content.hxx   |2 
 sw/source/uibase/utlui/content.cxx |  221 ++---
 2 files changed, 15 insertions(+), 208 deletions(-)

New commits:
commit 3771a81060f9e1f60ada37c3b7fa0a51b3042952
Author: Jim Raykowski 
AuthorDate: Sat Jan 22 13:43:08 2022 -0900
Commit: Jim Raykowski 
CommitDate: Thu Jan 27 21:36:02 2022 +0100

SwNavigator: move content type init into SwContentType constructor

With commit 7270ed7b81c12c8ba2e57b1a0d2ae084f8489d61 the Init function
is no longer needed to help determine if content has changed. It's
other duty of setting wheather content type can be edited or deleted or
both, and if it has attachment for URL are moved to the constructor.

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

diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 38d2d9cdbf1c..dd60c0fae9c5 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -188,8 +188,6 @@ public:
 SwContentType(SwWrtShell* pParent, ContentTypeId nType, sal_uInt8 
nLevel );
 virtual ~SwContentType() override;
 
-voidInit(bool* pbInvalidateWindow = nullptr);
-
 /** Fill the List of contents */
 voidFillMemberList(bool* pbLevelChanged = nullptr);
 size_t  GetMemberCount() const
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index cd8ead85fee6..3a0611152894 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -347,257 +347,69 @@ SwContentType::SwContentType(SwWrtShell* pShell, 
ContentTypeId nType, sal_uInt8
 m_bEdit(false),
 m_bDelete(true)
 {
-Init();
-}
-
-void SwContentType::Init(bool* pbInvalidateWindow)
-{
-// if the MemberCount is changing ...
-size_t nOldMemberCount = m_nMemberCount;
-m_nMemberCount = 0;
 switch(m_nContentType)
 {
-case ContentTypeId::OUTLINE   :
-{
+case ContentTypeId::OUTLINE:
 m_sTypeToken = "outline";
-m_nMemberCount = 
m_pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount();
-if (m_nOutlineLevel < MAXLEVEL)
-{
-const size_t nOutlineCount = m_nMemberCount;
-for(size_t j = 0; j < nOutlineCount; ++j)
-{
-if 
(m_pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineLevel(j) > 
m_nOutlineLevel
-|| 
!m_pWrtShell->getIDocumentOutlineNodesAccess()->isOutlineInLayout(j, 
*m_pWrtShell->GetLayout()))
-{
-m_nMemberCount --;
-}
-}
-}
-}
 break;
-
-case ContentTypeId::TABLE :
+case ContentTypeId::TABLE:
 m_sTypeToken = "table";
-m_nMemberCount = m_pWrtShell->GetTableFrameFormatCount(true);
 m_bEdit = true;
 break;
-
-case ContentTypeId::FRAME :
-case ContentTypeId::GRAPHIC   :
-case ContentTypeId::OLE   :
-{
-FlyCntType eType = FLYCNTTYPE_FRM;
+case ContentTypeId::FRAME:
 m_sTypeToken = "frame";
-if(m_nContentType == ContentTypeId::OLE)
-{
-eType = FLYCNTTYPE_OLE;
-m_sTypeToken = "ole";
-}
-else if(m_nContentType == ContentTypeId::GRAPHIC)
-{
-eType = FLYCNTTYPE_GRF;
-m_sTypeToken = "graphic";
-}
-m_nMemberCount = m_pWrtShell->GetFlyCount(eType, 
/*bIgnoreTextBoxes=*/true);
 m_bEdit = true;
-}
+break;
+case ContentTypeId::GRAPHIC:
+m_sTypeToken = "graphic";
+m_bEdit = true;
+break;
+case ContentTypeId::OLE:
+m_sTypeToken = "ole";
+m_bEdit = true;
 break;
 case ContentTypeId::TEXTFIELD:
-{
-m_sTypeToken.clear();
 m_bEdit = true;
 m_bDelete = true;
-const SwFieldTypes& rFieldTypes = 
*m_pWrtShell->GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
-const size_t nSize = rFieldTypes.size();
-for (size_t i = 0; i < nSize; ++i)
-{
-const SwFieldType* pFieldType = rFieldTypes[i].get();
-if (pFieldType->Which() == SwFieldIds::Postit)
-continue;
-std::vector vFields;
-pFieldType->GatherFields(vFields);
-m_nMemberCount += vFields.size();
-}
-}
 break;
 case ContentTypeId::FOOTNOTE:
-{
-m_sTypeToken.clear();
 m_bEdit = true;

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/inc sw/source

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

 sw/inc/unochart.hxx |3 ++-
 sw/source/core/doc/docchart.cxx |   23 ++-
 sw/source/core/unocore/unochart.cxx |6 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit ce1a5de2a22ca9bea599cecfa4015ac84fe2c39e
Author: Armin Le Grand (Allotropia) 
AuthorDate: Tue Jan 18 17:43:16 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 27 21:22:04 2022 +0100

tdf#122995 Trigger Chart refresh directly in UpdateCharts for SW

For OLE/Charts in SW we do not (yet) have a refresh
mechanism or embedding of the primitive represetation, so this
needs to be done locally here (simple solution).
To have the Chart already invalidated at the next repaint,
I needed to add a 'immediate' mode to InvalidateTable.

Note: The text there claiming that the framework should do this
is correct, but as long as the mechanism is incomplete (VC/VOC/OC
in SW) direct refresh is needed.

Had to correct one vairable name in SwChartDataProvider.

Change-Id: I3c845b3ec46fbb494e7bce163cfe105145421450
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128572
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128725
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 4790ddc8e25b..7a7ea7be53ce 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -175,7 +175,8 @@ public:
 voidRemoveDataSequence( const SwTable &rTable, 
css::uno::Reference< css::chart2::data::XDataSequence > const &rxDataSequence );
 
 // will send modified events for all data-sequences of the table
-voidInvalidateTable( const SwTable *pTable );
+// tdf#122995 added Immediate-Mode to allow non-timer-delayed Chart 
invalidation
+voidInvalidateTable( const SwTable *pTable, bool bImmediate = 
false );
 voidDeleteBox( const SwTable *pTable, const SwTableBox &rBox );
 voidDisposeAllDataSequences( const SwTable *pTable );
 
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index b602c92afd14..f31dd1f73088 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -110,9 +110,30 @@ void SwDoc::UpdateCharts_( const SwTable& rTable, 
SwViewShell const & rVSh ) con
 aName == pONd->GetChartTableName() &&
 pONd->getLayoutFrame( rVSh.GetLayout() ) )
 {
+// tdf#122995 for OLE/Charts in SW we do not (yet) have a refresh
+// mechanism or embedding of the primitive representation, so this
+// needs to be done locally here (simplest solution).
+bool bImmediateMode(false);
+
+if(pONd->IsChart())
+{
+// refresh to trigger repaint
+const SwRect aChartRect(pONd->FindLayoutRect());
+if(!aChartRect.IsEmpty())
+const_cast(rVSh).InvalidateWindows(aChartRect);
+
+// forced refresh of the chart's primitive representation
+pONd->GetOLEObj().resetBufferedData();
+
+// InvalidateTable using the Immediate-Mode, else the chart 
will
+// not yet know that it is invalidated at the next repaint and 
create
+// the same graphical representation again
+bImmediateMode = true;
+}
+
 SwChartDataProvider *pPCD = 
getIDocumentChartDataProviderAccess().GetChartDataProvider();
 if (pPCD)
-pPCD->InvalidateTable( &rTable );
+pPCD->InvalidateTable( &rTable, bImmediateMode );
 // following this the framework will now take care of repainting
 // the chart or it's replacement image...
 }
diff --git a/sw/source/core/unocore/unochart.cxx 
b/sw/source/core/unocore/unochart.cxx
index 38241c451a67..bb43665ec6a2 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1427,7 +1427,7 @@ void SwChartDataProvider::RemoveDataSequence( const 
SwTable &rTable, uno::Refere
 aDataSequences[ &rTable ].erase( rxDataSequence );
 }
 
-void SwChartDataProvider::InvalidateTable( const SwTable *pTable )
+void SwChartDataProvider::InvalidateTable( const SwTable *pTable, bool 
bImmediate )
 {
 OSL_ENSURE( pTable, "table pointer is NULL" );
 if (pTable)
@@ -1447,6 +1447,10 @@ void SwChartDataProvider::InvalidateTable( const SwTable 
*pTable )
 }
 }
 }
+
+// tdf#122995 added Immediate-mode to allow non-timer-delayed Chart 
invalidation
+if (bImmediate && !bDisposed)
+   
pTable->GetFrameFormat()->GetDoc()->getIDocumentChartDataProviderAccess().GetChartControllerHelper().Disconnect();
 }
 
 void SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox 
&rBox )

[Libreoffice-commits] core.git: cui/source desktop/source include/sfx2 sc/source sd/source sfx2/source starmath/source sw/source

[Noel Grandin (via logerrit)]

 cui/source/customize/SvxToolbarConfigPage.cxx |2 
 cui/source/customize/cfg.cxx  |3 
 cui/source/dialogs/cuicharmap.cxx |4 
 cui/source/options/optgenrl.cxx   |6 -
 cui/source/options/optlingu.cxx   |3 
 cui/source/options/optsave.cxx|   17 +---
 cui/source/options/treeopt.cxx|6 -
 desktop/source/app/app.cxx|2 
 include/sfx2/app.hxx  |2 
 sc/source/ui/drawfunc/drtxtob.cxx |2 
 sc/source/ui/inc/tpcalc.hxx   |1 
 sc/source/ui/optdlg/tpcalc.cxx|8 -
 sc/source/ui/optdlg/tpformula.cxx |2 
 sc/source/ui/view/cellsh1.cxx |2 
 sc/source/ui/view/editsh.cxx  |2 
 sd/source/ui/func/fubullet.cxx|2 
 sd/source/ui/view/drviews3.cxx|3 
 sfx2/source/appl/appcfg.cxx   |  106 --
 sfx2/source/appl/appserv.cxx  |3 
 sfx2/source/view/viewprn.cxx  |3 
 starmath/source/cfgitem.cxx   |   24 ++---
 starmath/source/dialog.cxx|   32 +++
 sw/source/uibase/docvw/PageBreakWin.cxx   |2 
 sw/source/uibase/shells/annotsh.cxx   |4 
 sw/source/uibase/shells/drwtxtsh.cxx  |4 
 sw/source/uibase/shells/textsh.cxx|4 
 26 files changed, 117 insertions(+), 132 deletions(-)

New commits:
commit 12be8dadfad2167ff4317935d30782626afa3eaf
Author: Noel Grandin 
AuthorDate: Thu Jan 27 14:56:31 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 27 20:05:46 2022 +0100

no need to call GetWhich on these SID_ values

none of them are remapped (via the SfxItemEntryInfo stuff in the pool)

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

diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx 
b/cui/source/customize/SvxToolbarConfigPage.cxx
index 7ba649d010ff..9b24588cfa64 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -106,7 +106,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* 
pPage,
 m_aURLToSelect = ITEM_TOOLBAR_URL;
 m_aURLToSelect += "standardbar";
 
-const SfxPoolItem* pItem = 
rSet.GetItem(rSet.GetPool()->GetWhich(SID_CONFIG));
+const SfxPoolItem* pItem = rSet.GetItem(SID_CONFIG);
 
 if (pItem)
 {
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 8531907e805c..dc4788b7a983 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -214,8 +214,7 @@ SvxConfigDialog::SvxConfigDialog(weld::Window * pParent, 
const SfxItemSet* pInSe
 AddTabPage("keyboard", CreateKeyboardConfigPage, nullptr);
 AddTabPage("events", CreateSvxEventConfigPage, nullptr);
 
-const SfxPoolItem* pItem =
-pInSet->GetItem( pInSet->GetPool()->GetWhich( SID_CONFIG ) );
+const SfxPoolItem* pItem = pInSet->GetItem( SID_CONFIG );
 
 if ( pItem )
 {
diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 860c53f99d8c..2a2129a6d162 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -653,10 +653,10 @@ void SvxCharacterMap::insertCharToDoc(const OUString& 
sGlyph)
 } else {
 sal_UCS4 cChar = 
sGlyph.iterateCodePoints(&o3tl::temporary(sal_Int32(0)));
 const SfxItemPool* pPool = m_xOutputSet->GetPool();
-m_xOutputSet->Put( SfxStringItem( pPool->GetWhich(SID_CHARMAP), sGlyph 
) );
+m_xOutputSet->Put( SfxStringItem( SID_CHARMAP, sGlyph ) );
 m_xOutputSet->Put( SvxFontItem( aFont.GetFamilyType(), 
aFont.GetFamilyName(),
 aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), 
pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
-m_xOutputSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), 
aFont.GetFamilyName() ) );
+m_xOutputSet->Put( SfxStringItem( SID_FONT_NAME, aFont.GetFamilyName() 
) );
 m_xOutputSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), cChar 
) );
 }
 }
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 91e8cf911e99..ed7d9fecbfad 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -363,11 +363,9 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
 {
 SetData_Impl();
 
-sal_uInt16 const nWhich = GetWhich(SID_FIELD_GRABFOCUS);
-
-if (rSet->GetItemState(nWhich) == SfxItemState::SET)
+if (rSet->GetItemState(SID_FIELD_GRABFOCUS) == SfxItemState::SET)
 {
-EditPosition nField = static_cast(static_cast(rSet->Get(nWhich)).GetValue());
+EditPosition nField = static_cast(static_cast(rSet->Get(SID_FIELD_GRABFOCUS)).

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

[Noel Grandin (via logerrit)]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx |2 -
 chart2/source/inc/DiagramHelper.hxx |9 ---
 chart2/source/inc/ExplicitCategoriesProvider.hxx|9 ---
 chart2/source/tools/AxisHelper.cxx  |2 -
 chart2/source/tools/ChartTypeHelper.cxx |1 
 chart2/source/tools/DiagramHelper.cxx   |   19 ++--
 chart2/source/tools/ExplicitCategoriesProvider.cxx  |   10 
 7 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 0e570fafd319c6567d798ff9e5530099c53312ee
Author: Noel Grandin 
AuthorDate: Wed Jan 26 19:22:07 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 27 19:45:48 2022 +0100

use more concrete types in chart2, BaseCoordinateSystem

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

diff --git a/chart2/source/inc/DiagramHelper.hxx 
b/chart2/source/inc/DiagramHelper.hxx
index 9f40c536e241..6da483d2f39e 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -42,6 +42,7 @@ namespace com::sun::star::util { class 
XNumberFormatsSupplier; }
 
 namespace chart
 {
+class BaseCoordinateSystem;
 class ChartType;
 class ChartTypeManager;
 class ChartTypeTemplate;
@@ -119,7 +120,7 @@ public:
 static StackMode getStackModeFromChartType(
 const rtl::Reference< ::chart::ChartType > & xChartType,
 bool& rbFound, bool& rbAmbiguous,
-const css::uno::Reference< css::chart2::XCoordinateSystem > & 
xCorrespondingCoordinateSystem
+const rtl::Reference< ::chart::BaseCoordinateSystem > & 
xCorrespondingCoordinateSystem
 );
 
 /** Returns the dimension found for all chart types in the tree.  If the
@@ -144,8 +145,8 @@ public:
  */
 SAL_DLLPRIVATE static void replaceCoordinateSystem(
 const rtl::Reference< ::chart::Diagram > & xDiagram,
-const css::uno::Reference< css::chart2::XCoordinateSystem > & 
xCooSysToReplace,
-const css::uno::Reference< css::chart2::XCoordinateSystem > & 
xReplacement );
+const rtl::Reference< ::chart::BaseCoordinateSystem > & 
xCooSysToReplace,
+const rtl::Reference< ::chart::BaseCoordinateSystem > & xReplacement );
 
 static bool isSeriesAttachedToMainAxis(
 const css::uno::Reference< css::chart2::XDataSeries >& xDataSeries );
@@ -195,7 +196,7 @@ public:
 
 SAL_DLLPRIVATE static css::uno::Sequence< OUString >
 generateAutomaticCategoriesFromCooSys(
-const css::uno::Reference< css::chart2::XCoordinateSystem > & 
xCooSys );
+const rtl::Reference< ::chart::BaseCoordinateSystem > & xCooSys );
 
 static void switchToDateCategories(
 const rtl::Reference<::chart::ChartModel> & xChartDoc );
diff --git a/chart2/source/tools/ChartTypeHelper.cxx 
b/chart2/source/tools/ChartTypeHelper.cxx
index 0942953be7ce..289d7adf150d 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/chart2/source/tools/DiagramHelper.cxx 
b/chart2/source/tools/DiagramHelper.cxx
index 99618fdd44d2..04c049dc2228 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -325,7 +325,7 @@ StackMode DiagramHelper::getStackMode( const 
rtl::Reference< Diagram > & xDiagra
 StackMode DiagramHelper::getStackModeFromChartType(
 const rtl::Reference< ChartType > & xChartType,
 bool& rbFound, bool& rbAmbiguous,
-const Reference< XCoordinateSystem > & xCorrespondingCoordinateSystem )
+const rtl::Reference< BaseCoordinateSystem > & 
xCorrespondingCoordinateSystem )
 {
 StackMode eStackMode = StackMode::NONE;
 rbFound = false;
@@ -485,8 +485,8 @@ void DiagramHelper::setDimension(
 
 void DiagramHelper::replaceCoordinateSystem(
 const rtl::Reference< Diagram > & xDiagram,
-const Reference< XCoordinateSystem > & xCooSysToReplace,
-const Reference< XCoordinateSystem > & xReplacement )
+const rtl::Reference< BaseCoordinateSystem > & xCooSysToReplace,
+const rtl::Reference< BaseCoordinateSystem > & xReplacement )
 {
 OSL_ASSERT( xDiagram.is());
 if( ! xDiagram.is())
@@ -499,9 +499,7 @@ void DiagramHelper::replaceCoordinateSystem(
 Reference< chart2::data::XLabeledDataSequence > xCategories = 
DiagramHelper::getCategoriesFromDiagram( xDiagram );
 
 // move chart types of xCooSysToReplace to xReplacement
-Reference< XChartTypeContainer > xCTCntCooSys( xCooSysToReplace, 
uno::UNO_QUERY_THROW );
-Reference< XChartTypeContainer > xCTCntReplacement( xReplacement, 
uno::UNO_QUERY_THROW );
-xCTCntReplacement->setChartTypes( xCTCntCooSys->getChartTypes());
+xReplacement->setChartTypes( xCooSysToReplace->getChartTypes())

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

[Justin Luth (via logerrit)]

 sw/source/uibase/shells/annotsh.cxx  |5 +
 sw/source/uibase/shells/basesh.cxx   |2 ++
 sw/source/uibase/shells/drwtxtex.cxx |5 +
 3 files changed, 12 insertions(+)

New commits:
commit 7bd5f80185a349e3660d19b4b4a5d4dd1e2208e3
Author: Justin Luth 
AuthorDate: Thu Jan 27 14:33:56 2022 +0200
Commit: Justin Luth 
CommitDate: Thu Jan 27 19:39:31 2022 +0100

sw uno:Color: directly goto CHAR_DLG fonteffects tab

.uno:Color started the character properties dialog,
but opened whatever tab was last opened,
and not the font-effects tab where color settings are found.

This is related to tdf#111733.

In terms of draw text (like textboxes) and comments
it did nothing at all, so I fixed that too.

I found this looking for other possible uses
for CHAR_DLG_POSITION or CHAR_DLG_EFFECTS.

I didn't find any pre-defined menu where this could
be seen, but a customized menu adding the right
"Font Color" (uno:Color) demonstrates the difference.
There might be more EFFECTS, but this was the only one I found.

Change-Id: If80f14e00d1a2ebae850a885df06fc556f77903a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129044
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 

diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index b05fedf7c5ae..dd5a01adb62f 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -577,6 +578,10 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
 {
 aNewAttr.Put(pNewAttrs->Get(nWhich).CloneSetWhich(nEEWhich));
 }
+else if (nEEWhich == EE_CHAR_COLOR)
+{
+m_rView.GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_EFFECT);
+}
 
 tools::Rectangle aOutRect = pOLV->GetOutputArea();
 if (tools::Rectangle() != aOutRect && aNewAttr.Count())
diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index b2f8abd694fb..15780ee57c6e 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2295,6 +2295,8 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
 {
 if (nSlot == SID_ATTR_CHAR_KERNING)
 
GetView().GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_POSITION);
+else if (nSlot == SID_ATTR_CHAR_COLOR)
+
GetView().GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_EFFECT);
 else
 GetView().GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG);
 }
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index e94dbae0b0b8..068a9be9feca 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -636,6 +636,11 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 
 aNewAttr.Put(pNewAttrs->Get(nWhich).CloneSetWhich(nEEWhich));
 }
+else if (nEEWhich == EE_CHAR_COLOR)
+{
+
GetView().GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_EFFECT);
+}
+
 
 SetAttrToMarked(aNewAttr);
 

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter4.cxx |  546 +---
 1 file changed, 148 insertions(+), 398 deletions(-)

New commits:
commit 6c28ad0863a8ee1467280d7150e4b5642641a953
Author: Xisco Fauli 
AuthorDate: Thu Jan 27 17:00:00 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jan 27 19:28:46 2022 +0100

CppunitTest_sw_uiwriter4: use CPPUNIT_TEST_FIXTURE

there are two reason why i'm doing this:
1. Use the same way to define tests as CppunitTest_sw_uiwriter2
and CppunitTest_sw_uiwriter3
2. Over time, these files grow quite large, it's easier
to split them when they use CPPUNIT_TEST_FIXTURE

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

diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx 
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index 52a4dcbe8489..b523ddaf3db7 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -162,271 +162,44 @@ sal_Int32 lcl_getAttributeIDFromHints(const SwpHints& 
hints)
 }
 return -1;
 }
+
+void lcl_selectCharacters(SwPaM& rPaM, sal_Int32 first, sal_Int32 end)
+{
+rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), first);
+rPaM.SetMark();
+rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), end);
 }
+} //namespace
 
 class SwUiWriterTest4 : public SwModelTestBase, public HtmlTestTools
 {
 public:
-void testTdf96515();
-void testTdf49033();
-void testTdf96943();
-void testTdf96536();
-void testTdf96479();
-void testBookmarkCollapsed();
-void testRemoveBookmarkText();
-void testRemoveBookmarkTextAndAddNew();
-void testRemoveBookmarkTextAndAddNewAfterReload();
-void testTdf96961();
-void testTdf88453();
-void testTdf88453Table();
-void testClassificationPaste();
-void testSmallCaps();
-void testTdf98987();
-void testTdf99004();
-void testTdf84695();
-void testTdf84695NormalChar();
-void testTdf84695Tab();
-void testTableStyleUndo();
-void testRedlineCopyPaste();
-void testTdf135260();
-void testRedlineParam();
-void testRedlineViewAuthor();
-void testTdf91292();
-void testTdf78727();
-void testRedlineTimestamp();
-void testCursorWindows();
-void testLandscape();
-void testTdf95699();
-void testTdf104032();
-void testTdf104440();
-void testTdf104425();
-void testTdf104814();
-void testTableRedlineRedoCrash();
-void testTableRemoveHasTextChangesOnly();
-void testTableRemoveHasTextChangesOnly2();
-void testTdf66405();
-void testTdf35021_tabOverMarginDemo();
-void testTdf106701_tabOverMarginAutotab();
-void testTdf104492();
-void testTdf107025();
-void testTdf107362();
-void testTdf105417();
-void testTdf105625();
-void testTdf125151_protected();
-void testTdf125151_protectedB();
-void testTdf106736();
-void testTdf58604();
-void testTdf112025();
-void testTdf72942();
-
 void mergeDocs(const char* aDestDoc, const char* aInsertDoc);
-void testTdf113877();
-void testTdf113877NoMerge();
-void testTdf113877_default_style();
-void testTdf113877_Standard_style();
-void testTdf113877_blank_bold_on();
-void testTdf113877_blank_bold_off();
-
-void testMsWordCompTrailingBlanks();
-void testCreateDocxAnnotation();
-void testTdf107976();
-void testTdf142157();
-void testTdf116640();
-void testTdf108524();
-void testRhbz1810732();
-void testTableInSection();
-void testTableInNestedSection();
-void testTableInSectionInTable();
-void testSectionInTableInTable();
-void testSectionInTableInTable2();
-void testSectionInTableInTable3();
-void testSectionInTableInTable4();
-void testTdf112160();
-void testLinesMoveBackwardsInSectionInTable();
-void testTdf112741();
-void testTdf112860();
-void testTdf113287();
-void testTdf113445();
-void testTdf113686();
-void testFontEmbedding();
-void testLinesInSectionInTable();
-void testParagraphOfTextRange();
-void testTdf99689TableOfContents();
-void testTdf99689TableOfFigures();
-void testTdf99689TableOfTables();
-void testTdf112448();
-void testTdf113790();
-void testTdf108048();
-void testTdf114306();
-void testTdf114306_2();
-void testTdf113481();
-void testTdf115013();
-void testTdf114536();
-void testTdf115065();
-void testTdf115132();
-void testXDrawPagesSupplier();
-void testTdf116403();
-void testHtmlCopyImages();
-void testTdf116789();
-void testTdf91801();
-void testTdf51223();
-void testTdf108423();
-void testTdf106164();
-void testTdf54409();
-void testTdf38394();
-void testTdf59666();
-void testTdf133524();
-void testTdf133524_Romanian();
-void testTdf128860();
-void testTdf12

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |5 ---
 sw/source/filter/ww8/wrtw8nds.cxx |   40 --
 sw/source/filter/ww8/wrtww8.hxx   |2 -
 3 files changed, 19 insertions(+), 28 deletions(-)

New commits:
commit 46b62fc6acdc2c94dc4b2ab79d38a10c49f9
Author: Justin Luth 
AuthorDate: Thu Jan 20 13:33:15 2022 +0200
Commit: Justin Luth 
CommitDate: Thu Jan 27 19:13:45 2022 +0100

v2 tdf#134951 docxexport: don't lose postponed comment

This patch basically reverts and re-writes the original fix.

Prior to mstahl's 7.4 commit f261fae4af72b1328bc3e93fc52a9a24ce0975b3
   tdf#143039 tdf#143106 sw: DOCX export: don't export duplicate flys
ooxmlexport5's comment would only last for one or two round-trips,
and then be lost after that. It kept moving around into things
like the fly itself, or the footnote.
With mstahl's commit, it was lost immediately (same as Word 2016),
and so the ooxmlexport5 unit test that broke was commented out.

Change-Id: Ia7e881143f1243a3ab81bb94c02b57189f3730f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128703
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 327e7e88569e..8decd30c3781 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -130,18 +130,15 @@ CPPUNIT_TEST_FIXTURE(Test, testNoDuplicateAttributeExport)
 
 CPPUNIT_TEST_FIXTURE(Test, testfdo79008)
 {
-loadAndSave("fdo79008.docx");
+loadAndReload("fdo79008.docx");
 /* File crashing while saving in LO.
  * Check if document.xml file is created after fix
  */
 parseExport("word/document.xml");
 
-#if 0
-// TODO: jluth says this test case needs more work
 // tdf#134951: there is only one comment
 xmlDocUniquePtr pXmlSettings = parseExport("word/comments.xml");
 assertXPath(pXmlSettings, "/w:comments/w:comment", 1);
-#endif
 
 // Read-only is set, but it is not enforced, so it should be off...
 SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index f092b8f6f1d0..6a84f77c5f5e 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -394,7 +394,7 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos )
 return nMinPos;
 }
 
-void SwWW8AttrIter::OutAttr(sal_Int32 nSwPos, bool bWriteCombChars, bool 
bPostponeSingleUse)
+void SwWW8AttrIter::OutAttr(sal_Int32 nSwPos, bool bWriteCombChars)
 {
 m_rExport.AttrOutput().RTLAndCJKState( mbCharIsRTL, GetScript() );
 
@@ -458,13 +458,6 @@ void SwWW8AttrIter::OutAttr(sal_Int32 nSwPos, bool 
bWriteCombChars, bool bPostpo
 nWhichId = aIter.NextWhich();
 }
 }
-else if (bPostponeSingleUse &&
- (nWhich == RES_TXTATR_FTN || nWhich == 
RES_TXTATR_ANNOTATION || nWhich == RES_TXTATR_FIELD))
-{
-// Do not duplicate these multiple times when the 
character run is split.
-// Skip this time - it will be attempted later.
-// ?? also RES_TXTATR_REFMARK: RES_TXTATR_TOXMARK: 
RES_TXTATR_META: RES_TXTATR_METAFIELD: ??
-}
 else
 aRangeItems[nWhich] = (&(pHt->GetAttr()));
 }
@@ -2388,6 +2381,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
 
 const SwRedlineData* pRedlineData = aAttrIter.GetRunLevelRedline( 
nCurrentPos );
 bool bPostponeWritingText= false ;
+bool bStartedPostponedRunProperties = false;
 OUString aSavedSnippet ;
 
 sal_Int32 nNextAttr = GetNextPos( &aAttrIter, rNode, nCurrentPos );
@@ -2655,8 +2649,9 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
 {
 // Output the character attributes
 // #i51277# do this before writing flys at end of paragraph
+bStartedPostponedRunProperties = true;
 AttrOutput().StartRunProperties();
-aAttrIter.OutAttr(nCurrentPos, false, bPostponeWritingText);
+aAttrIter.OutAttr(nCurrentPos, false);
 AttrOutput().EndRunProperties( pRedlineData );
 }
 
@@ -2758,29 +2753,28 @@ void MSWordExportBase::OutputTextNode( SwTextNode& 
rNode )
 
 AttrOutput().WritePostitFieldReference();
 
-if (bPostponeWritingText
-&& (FLY_PROCESSED == nStateOfFlyFrame || FLY_NONE == 
nStateOfFlyFrame))
+if (bPostponeWritingText)
 {
-AttrOutput().EndRun(&rNode, nCurrentPos, nNextAttr == nEnd);
-//write the postponed text run
-AttrOutput().S

[Libreoffice-commits] cppunit.git: configure.ac

[Libreoffice Gerrit user]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d69305b4bdc66e0592af45d4243f483ca446d7a3
Author: David Tardon 
AuthorDate: Thu Jan 27 18:52:17 2022 +0100
Commit: David Tardon 
CommitDate: Thu Jan 27 18:52:17 2022 +0100

Do not turn on --enable-werror by default

The help string for the option already says that it is "useful for
development", which implies it is not a good default.

Change-Id: Ic0f3bb0eaefd146ad0e5e87ff97abd821462f1a5

diff --git a/configure.ac b/configure.ac
index a591f45..6a933b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,9 +87,9 @@ AS_IF([test "x$enable_debug" != "xno"], [
 ])
 
 AC_ARG_ENABLE([werror],
-   [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, 
useful for development])],
+   [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, 
useful for development])],
[enable_werror="$enableval"],
-   [enable_werror=yes]
+   [enable_werror=no]
 )
 AS_IF([test x"$enable_werror" != "xno"], [
CFLAGS="$CFLAGS -Werror"

[Libreoffice-commits] core.git: helpcompiler/source i18npool/inc i18npool/source i18nutil/source idl/inc idl/IwyuFilter_idl.yaml idl/source io/source javaunohelper/source jvmfwk/inc jvmfwk/plugins jvm

[Gabor Kelemen (via logerrit)]

 helpcompiler/source/HelpLinker_main.cxx  |1 
 i18npool/inc/bullet.h|4 +++
 i18npool/inc/characterclassificationImpl.hxx |1 
 i18npool/inc/collatorImpl.hxx|1 
 i18npool/inc/inputsequencechecker.hxx|1 
 i18npool/inc/localedata.hxx  |1 
 i18npool/inc/wtt.h   |2 +
 i18npool/source/nativenumber/data/numberchar.h   |2 +
 i18nutil/source/utility/paper.cxx|1 
 idl/IwyuFilter_idl.yaml  |2 +
 idl/inc/basobj.hxx   |1 
 idl/inc/bastype.hxx  |2 -
 idl/inc/hash.hxx |3 --
 idl/inc/module.hxx   |1 
 idl/inc/object.hxx   |4 ++-
 idl/inc/slot.hxx |3 +-
 idl/inc/types.hxx|1 
 idl/source/cmptools/hash.cxx |5 ---
 idl/source/objects/basobj.cxx|2 -
 idl/source/objects/bastype.cxx   |3 --
 idl/source/objects/module.cxx|2 -
 idl/source/objects/object.cxx|2 -
 idl/source/objects/slot.cxx  |1 
 idl/source/prj/command.cxx   |1 
 idl/source/prj/database.cxx  |3 +-
 idl/source/prj/globals.cxx   |2 -
 idl/source/prj/parser.cxx|1 
 idl/source/prj/svidl.cxx |2 -
 io/source/acceptor/acc_pipe.cxx  |1 
 io/source/acceptor/acc_socket.cxx|1 
 io/source/connector/ctr_socket.cxx   |1 
 javaunohelper/source/vm.cxx  |1 
 jvmfwk/inc/fwkutil.hxx   |1 
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx |1 
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx |2 -
 jvmfwk/source/framework.cxx  |2 +
 l10ntools/IwyuFilter_l10ntools.yaml  |9 ++
 l10ntools/inc/cfgmerge.hxx   |1 
 l10ntools/inc/common.hxx |1 
 l10ntools/inc/export.hxx |   12 -
 l10ntools/inc/helper.hxx |5 ---
 l10ntools/inc/helpmerge.hxx  |6 ++--
 l10ntools/inc/lngmerge.hxx   |3 --
 l10ntools/inc/treemerge.hxx  |1 
 l10ntools/inc/xmlparse.hxx   |4 ---
 l10ntools/inc/xrmmerge.hxx   |5 +++
 l10ntools/source/cfgmerge.cxx|3 --
 l10ntools/source/common.cxx  |2 +
 l10ntools/source/helper.cxx  |3 ++
 l10ntools/source/helpex.cxx  |1 
 l10ntools/source/helpmerge.cxx   |9 --
 l10ntools/source/lngex.cxx   |2 +
 l10ntools/source/lngmerge.cxx|4 +--
 l10ntools/source/localize.cxx|1 
 l10ntools/source/po.cxx  |1 
 l10ntools/source/propmerge.cxx   |3 +-
 l10ntools/source/treemerge.cxx   |2 -
 l10ntools/source/xmlparse.cxx|6 +---
 l10ntools/source/xrmmerge.cxx|3 --
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx  |1 
 libreofficekit/qa/unit/checkapi.cxx  |5 +--
 libreofficekit/qa/unit/test.h|2 +
 lingucomponent/IwyuFilter_lingucomponent.yaml|   20 +++
 lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx|5 ---
 lingucomponent/source/languageguessing/guess.cxx |1 
 lingucomponent/source/languageguessing/guesslang.cxx |1 
 lingucomponent/source/languageguessing/simpleguesser.cxx |4 ---
 lingucomponent/source/languageguessing/simpleguesser.hxx |2 -
 lingucomponent/source/lingutil/lingutil.hxx  |2 -
 lingucomponent/source/numbertext/numbertext.cxx  |5 ---
 lingucomponent/source/spellcheck/spell/sspellimp.cxx |7 -
 lingucomponent/source/spellcheck/spell/sspellimp.hxx |9 ++
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx  |6 
 linguistic/IwyuFilter_linguistic.yaml

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - sc/inc sc/qa sc/source

[Samuel Mehrbrodt (via logerrit)]

 sc/inc/dbdata.hxx  |2 +
 sc/inc/document.hxx|2 -
 sc/qa/unit/data/xlsx/tdf145054.xlsx|binary
 sc/qa/unit/subsequent_filters-test.cxx |   15 ++
 sc/source/core/data/documen2.cxx   |1 
 sc/source/core/tool/dbdata.cxx |   49 +
 6 files changed, 68 insertions(+), 1 deletion(-)

New commits:
commit 9e12573119080e151020e470efd8082ec5a3d016
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jan 27 09:05:35 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 27 18:50:15 2022 +0100

Fix copying named DB when it doesn't contain a '_'

Follow-up for d9472a5284fde7bb96823655efcb6eb31f405493

Change-Id: Ib97d2c81159ddcf60604558f38e87af59cef86dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129023
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 26d7f3440a0c9dd179ad407d48ce747699d678dd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129051
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index ebe9a237de3d..405473960eca 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -1001,7 +1001,9 @@ OUString 
lcl_IncrementNumberInNamedRange(ScDBCollection::NamedDBs& namedDBs,
  const OUString& sOldName,bool 
bIsUpperName)
 {
 sal_Int32 lastIndex = sOldName.lastIndexOf('_');
-sal_Int32 nOldNumber = OUString(sOldName.copy(lastIndex)).toInt32();
+sal_Int32 nOldNumber = 0;
+if (lastIndex >= 0)
+nOldNumber = OUString(sOldName.copy(lastIndex)).toInt32();
 OUString sNewName;
 do
 {
commit df14a02746b7c3791db6f2ab461d73fe22b230d5
Author: Samuel Mehrbrodt 
AuthorDate: Thu Dec 16 11:50:01 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 27 18:50:00 2022 +0100

tdf#145054 Copy named DBs too when copying sheet

Change-Id: I5bf75a7188532776e70c7af64e88371638d76335
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126916
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit d9472a5284fde7bb96823655efcb6eb31f405493)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129050
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index b000af812045..f7c4f3d810a1 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -257,6 +257,7 @@ public:
 ScDBData* findByIndex(sal_uInt16 nIndex);
 ScDBData* findByUpperName(const OUString& rName);
 iterator findByUpperName2(const OUString& rName);
+ScDBData* findByName(const OUString& rName);
 
 /** Takes ownership of p and attempts to insert it into the collection.
 Deletes p if it could not be inserted, i.e. duplicate name.
@@ -333,6 +334,7 @@ public:
 SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
 SCCOL nDx, SCROW nDy, SCTAB nDz);
 voidUpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos );
+voidCopyToTable(SCTAB nOldPos, SCTAB nNewPos);
 
 voidSetRefreshHandler( const Link& rLink )
 { aRefreshHandler = rLink; }
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 8091f7e2ffb9..f505f06114a9 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -930,7 +930,7 @@ public:
 SC_DLLPUBLIC bool   RenameTab( SCTAB nTab, const OUString& rName,
bool bExternalDocument = false );
 boolMoveTab( SCTAB nOldPos, SCTAB nNewPos, 
ScProgress* pProgress = nullptr );
-boolCopyTab( SCTAB nOldPos, SCTAB nNewPos,
+SC_DLLPUBLIC bool   CopyTab( SCTAB nOldPos, SCTAB nNewPos,
  const ScMarkData* pOnlyMarked = 
nullptr );
 SC_DLLPUBLIC sal_uLong  TransferTab(ScDocument* pSrcDoc, SCTAB 
nSrcPos, SCTAB nDestPos,
 bool bInsertNew = true,
diff --git a/sc/qa/unit/data/xlsx/tdf145054.xlsx 
b/sc/qa/unit/data/xlsx/tdf145054.xlsx
new file mode 100644
index ..8360ec7e92be
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf145054.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index e005b258d979..07257ff38a56 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -123,6 +123,7 @@ public:
 void testMatrixODS();
 void testMatrixXLS();
 void testDoubleThinBorder();
+void testTdf145054();
 void testBorderODS();
 void testBordersOoo33();
 void testBugFixesODS();
@@ -276,6 +277,7 @@ public:
 CPPUNIT_TEST(testMatrixODS);
 CPPUNIT_TEST(testMatrixXLS);
 CPPUNI

Re: Peter K. Zacharias (Pennsylvania Dutch Education Corporation) license statement

[Eike Rathke]

Hi Peter,

On Thursday, 2022-01-27 00:07:43 -0500, Peter K. Zacharias wrote:

> I am providing the following license statement:
> 
> All of my past & future contributions to LibreOffice may be licensed under 
> the MPLv2/LGPLv3+ dual license.

Thanks! Put on file at
https://wiki.documentfoundation.org/Development/Developers#Z
https://wiki.documentfoundation.org/index.php?title=Development/Developers&oldid=442486

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


signature.asc
Description: PGP signature

[Libreoffice-commits] core.git: include/svx officecfg/registry svx/sdi sw/sdi sw/source

[Justin Luth (via logerrit)]

 include/svx/svxids.hrc   |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 ++
 svx/sdi/svx.sdi  |   19 
++
 sw/sdi/_textsh.sdi   |5 ++
 sw/source/uibase/shells/basesh.cxx   |9 
+++-
 sw/source/uibase/shells/textsh1.cxx  |3 +
 6 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit c73670326ce5b571c31d43721729a05a11563b01
Author: Justin Luth 
AuthorDate: Thu Jan 27 13:15:15 2022 +0200
Commit: Justin Luth 
CommitDate: Thu Jan 27 18:34:37 2022 +0100

related tdf#111733 TextCharacterSpacingControl sw: goto position tab

The kerning button on the sidebar very unhelpfully launches
the character properties dialog at the last-used tab,
instead of bringing the user directly to the "position" tab
where the kerning (.uno:Spacing) property can be found.

Notes:
-sw draw text (eg. textbox) does nothing - no dialog at all
-sw comments also do nothing
-sc does nothing
-sd does nothing

Somehow the sidebar is calling SID_ATTR_CHAR_KERNING,
but I can't find out where. In any case, I have to change
this SID_ATTR_CHAR_KERNING into SID_CHAR_DLG_POSITION
for these "do nothing" situations. That can happen in
separate commits for each situation.

I basically copied SID_CHAR_DLG_EFFECTS which is
explicitly called in underline's "more options",
so it is used a bit differently.

Change-Id: I833d54da3664b9c01325130a2c36bbbe90b2b878
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129043
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 467a96ef421a..f4623b6e0e77 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -958,6 +958,7 @@ class SvxViewLayoutItem;
 
 #define SID_CELL_FORMAT_BORDER  ( SID_SVX_START + 1132 
)
 #define SID_CHAR_DLG_EFFECT ( SID_SVX_START + 1133 
)
+#define SID_CHAR_DLG_POSITION   ( SID_SVX_START + 1134 
)
 
 #define FN_SVX_SET_NUMBER   ( SID_SVX_START + 1136 
)
 #define FN_SVX_SET_BULLET   ( SID_SVX_START + 1137 
)
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index d97996d34f44..9cea6ad4deef 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6676,6 +6676,11 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   Character Font Effects...
 
   
+  
+
+  Character Font Position...
+
+  
   
 
   F~ormat
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 84f959fc4e1b..2ea903df9edf 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -3008,6 +3008,25 @@ SfxVoidItem FontEffectsDialog SID_CHAR_DLG_EFFECT
 ]
 
 
+SfxVoidItem FontPositionDialog SID_CHAR_DLG_POSITION
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerItem;
+Asynchron;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Format;
+]
+
+
 SvxFontHeightItem  FontHeight SID_ATTR_CHAR_FONTHEIGHT
 
 [
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 38359c593471..c30d3b2057ea 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1531,6 +1531,11 @@ interface BaseText
 ExecMethod = Execute ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
+SID_CHAR_DLG_POSITION
+[
+ExecMethod = Execute ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
 SID_CHAR_DLG_FOR_PARAGRAPH
 [
 ExecMethod = Execute ;
diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 3e13df5ec568..b2f8abd694fb 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2173,12 +2173,12 @@ SwBaseShell::~SwBaseShell()
 void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
 {
 const SfxItemSet *pArgs = rReq.GetArgs();
+const sal_uInt16 nSlot = rReq.GetSlot();
 
 if( pArgs)
 {
 SwWrtShell &rSh = GetShell();
 std::unique_ptr pSSetItem;
-sal_uInt16 nSlot = rReq.GetSlot();
 SfxItemPool& rPool = rSh.GetAttrPool();
 sal_uInt16 nWhich = rPool.GetWhich( nSlot );
 SvtScriptType nScripts = SvtScriptType::LATIN | SvtScriptType::ASIAN | 
SvtScriptType::COMPLEX;
@@ -2292,7 +2292,12 @@ void SwBaseShell::ExecTextCt

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

[Caolán McNamara (via logerrit)]

 chart2/source/controller/main/ChartController_Window.cxx |3 
 include/sfx2/dispatch.hxx|4 
 sfx2/source/control/dispatch.cxx |  199 +++
 sw/source/uibase/uiview/viewling.cxx |2 
 4 files changed, 108 insertions(+), 100 deletions(-)

New commits:
commit a951590bfb8d161096d87dbc953552f653318e92
Author: Caolán McNamara 
AuthorDate: Thu Jan 27 14:49:29 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 27 18:26:32 2022 +0100

let SfxDispatcher::fillPopupMenu operate on css::awt::XPopupMenu

rather than need to be passed its internal PopupMenu

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

diff --git a/chart2/source/controller/main/ChartController_Window.cxx 
b/chart2/source/controller/main/ChartController_Window.cxx
index 9d5a703b27a4..c63a01b337fc 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1302,8 +1302,7 @@ void ChartController::execute_Command( const 
CommandEvent& rCEvt )
 }
 }
 
-Menu* pPopupMenu = 
comphelper::getFromUnoTunnel(xPopupMenu)->GetMenu();
-boost::property_tree::ptree aMenu = 
SfxDispatcher::fillPopupMenu(pPopupMenu);
+boost::property_tree::ptree aMenu = 
SfxDispatcher::fillPopupMenu(xPopupMenu);
 boost::property_tree::ptree aRoot;
 aRoot.add_child("menu", aMenu);
 
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 6e87c89217f4..7b5e3611546e 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 
-class Menu;
 class SfxSlotServer;
 class SfxRequest;
 class SfxViewFrame;
@@ -41,6 +40,7 @@ class SfxModule;
 class Point;
 struct SfxDispatcher_Impl;
 
+namespace com::sun::star::awt { class XPopupMenu; }
 namespace vcl { class Window; }
 
 enum class SfxDispatcherPopFlags
@@ -171,7 +171,7 @@ public:
 SAL_DLLPRIVATE void DoDeactivate_Impl( bool bMDI, SfxViewFrame const * 
pNew );
 SAL_DLLPRIVATE void InvalidateBindings_Impl(bool);
 
-static boost::property_tree::ptree fillPopupMenu(Menu* pMenu);
+static boost::property_tree::ptree 
fillPopupMenu(css::uno::Reference& rMenu);
 };
 
 #endif
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index b0eee6eefb22..71f01cd76968 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1705,6 +1705,109 @@ void SfxDispatcher::ExecutePopup( vcl::Window *pWin, 
const Point *pPos )
 }
 }
 
+namespace {
+
+boost::property_tree::ptree fillPopupMenu(Menu* pMenu)
+{
+// Activate this menu first
+pMenu->HandleMenuActivateEvent(pMenu);
+pMenu->HandleMenuDeActivateEvent(pMenu);
+
+boost::property_tree::ptree aTree;
+// If last item inserted is some valid text
+bool bIsLastItemText = false;
+sal_uInt16 nCount = pMenu->GetItemCount();
+for (sal_uInt16 nPos = 0; nPos < nCount; nPos++)
+{
+boost::property_tree::ptree aItemTree;
+const MenuItemType aItemType = pMenu->GetItemType(nPos);
+
+if (aItemType == MenuItemType::DONTKNOW)
+continue;
+
+if (aItemType == MenuItemType::SEPARATOR)
+{
+if (bIsLastItemText)
+aItemTree.put("type", "separator");
+bIsLastItemText = false;
+}
+else
+{
+const sal_uInt16 nItemId = pMenu->GetItemId(nPos);
+OUString aCommandURL = pMenu->GetItemCommand(nItemId);
+
+if (aCommandURL.isEmpty())
+{
+const SfxSlot *pSlot = SFX_SLOTPOOL().GetSlot(nItemId);
+if (pSlot)
+aCommandURL = pSlot->GetCommandString();
+}
+
+const OUString aItemText = pMenu->GetItemText(nItemId);
+Menu* pPopupSubmenu = pMenu->GetPopupMenu(nItemId);
+
+if (!aItemText.isEmpty())
+aItemTree.put("text", aItemText.toUtf8().getStr());
+
+if (pPopupSubmenu)
+{
+boost::property_tree::ptree aSubmenu = 
::fillPopupMenu(pPopupSubmenu);
+if (aSubmenu.empty())
+continue;
+
+aItemTree.put("type", "menu");
+if (!aCommandURL.isEmpty())
+aItemTree.put("command", aCommandURL.toUtf8().getStr());
+aItemTree.push_back(std::make_pair("menu", aSubmenu));
+}
+else
+{
+// no point in exposing choices that don't have the .uno:
+// command
+if (aCommandURL.isEmpty())
+continue;
+
+aItemTree.put("type", "command");
+  

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

[Caolán McNamara (via logerrit)]

 vcl/source/window/layout.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 40456ff3d26c7edc2eb49c14077b2cbfa492af3c
Author: Caolán McNamara 
AuthorDate: Thu Jan 27 10:45:08 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 27 18:24:37 2022 +0100

tdf#144166 use border drawing style for VclScrolledWindow

to avoid rounded rectangles on Windows.

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

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 91dcc41c5a01..da259ec40c63 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1815,7 +1815,7 @@ VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent)
 : VclBin(pParent, WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | 
WB_AUTOVSCROLL | WB_TABSTOP)
 , m_bUserManagedScrolling(false)
 , m_eDrawFrameStyle(DrawFrameStyle::NONE)
-, m_eDrawFrameFlags(DrawFrameFlags::NONE)
+, m_eDrawFrameFlags(DrawFrameFlags::WindowBorder)
 , m_pVScroll(VclPtr::Create(this, WB_HIDE | WB_VERT))
 , m_pHScroll(VclPtr::Create(this, WB_HIDE | WB_HORZ))
 , m_aScrollBarBox(VclPtr::Create(this, WB_HIDE))
@@ -2066,7 +2066,9 @@ bool VclScrolledWindow::set_property(const OString &rKey, 
const OUString &rValue
 }
 else if (rKey == "name")
 {
-m_eDrawFrameFlags = rValue == "monoborder" ? DrawFrameFlags::Mono 
: DrawFrameFlags::NONE;
+m_eDrawFrameFlags = DrawFrameFlags::WindowBorder;
+if (rValue == "monoborder")
+m_eDrawFrameFlags |= DrawFrameFlags::Mono;
 }
 
 auto nBorderWidth = CalcBorderWidth();

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

[Noel Grandin (via logerrit)]

 include/svx/svxids.hrc |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 53b979fc1fff8a1e16cc84b956b022cc2672de2f
Author: Noel Grandin 
AuthorDate: Thu Jan 27 13:18:04 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 27 18:20:54 2022 +0100

fix some TypedWhichId

regression from
commit 956dd4a202a0897b7ca1f8abd285af2cad47abb2
Date:   Wed Dec 20 15:53:37 2017 +0200
TypedWhichId in svx part 2

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

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index e222697abbbd..467a96ef421a 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -39,6 +39,7 @@ class SvxBrushItem;
 class SvxChartColorTableItem;
 class SvxColorItem;
 class SvxColorListItem;
+class SvxColumnItem;
 class SvxDashListItem;
 class SvxGradientListItem;
 class SvxGridItem;
@@ -48,7 +49,9 @@ class SvxLineItem;
 class SvxLongLRSpaceItem;
 class SvxLongULSpaceItem;
 class SvxNumberInfoItem;
+class SvxObjectItem;
 class SvxPageItem;
+class SvxPagePosSizeItem;
 class SvxPatternListItem;
 class SvxPostItAuthorItem;
 class SvxPostItDateItem;
@@ -59,6 +62,7 @@ class SvxSetItem;
 class SvxSizeItem;
 class SvxViewLayoutItem;
 
+
 // member IDs
 
 #define MID_INTER_LINESPACE 0x36
@@ -230,9 +234,9 @@ class SvxViewLayoutItem;
 
 #define SID_RULER_CHANGE_STATE  ( SID_SVX_START + 78 )
 #define SID_RULER_NULL_OFFSET   
TypedWhichId( SID_SVX_START + 79 )
-#define SID_RULER_BORDERS   
TypedWhichId( SID_SVX_START + 80 )
-#define SID_RULER_OBJECT
TypedWhichId( SID_SVX_START + 81 )
-#define SID_RULER_PAGE_POS  
TypedWhichId( SID_SVX_START + 82 )
+#define SID_RULER_BORDERS   
TypedWhichId( SID_SVX_START + 80 )
+#define SID_RULER_OBJECT
TypedWhichId( SID_SVX_START + 81 )
+#define SID_RULER_PAGE_POS  
TypedWhichId( SID_SVX_START + 82 )
 #define SID_RULER_ACT_LINE_ONLY 
TypedWhichId( SID_SVX_START + 83 )
 #define SID_RULER_LR_MIN_MAX
TypedWhichId( SID_SVX_START + 84 )
 #define SID_ATTR_NUMBERFORMAT_VALUE 
TypedWhichId( SID_SVX_START + 85 )

[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/pdc_US.xml |  189 +
 i18npool/source/localedata/localedata.cxx  |3 
 3 files changed, 192 insertions(+), 1 deletion(-)

New commits:
commit 3480a1812d28c5d7e60bbec43f22af823234866a
Author: Eike Rathke 
AuthorDate: Wed Jan 26 17:24:30 2022 +0100
Commit: Eike Rathke 
CommitDate: Thu Jan 27 18:19:38 2022 +0100

Resolves: tdf#146602 Add Pennsylvania Dutch {pdc-US} locale data

Co-authored-by: i...@padutchdictionary.com
Change-Id: I420847e2cfe1adc8fec6e30392557c1bc8b21ac5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128998
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index 5b2fa2c89e56..a10914a2e3b6 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -112,6 +112,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_pa_IN \
CustomTarget/i18npool/localedata/localedata_pap_BQ \
CustomTarget/i18npool/localedata/localedata_pap_CW \
+   CustomTarget/i18npool/localedata/localedata_pdc_US \
CustomTarget/i18npool/localedata/localedata_plt_MG \
CustomTarget/i18npool/localedata/localedata_pjt_AU \
CustomTarget/i18npool/localedata/localedata_pt_AO \
diff --git a/i18npool/source/localedata/data/pdc_US.xml 
b/i18npool/source/localedata/data/pdc_US.xml
new file mode 100644
index ..a2d03cf49c98
--- /dev/null
+++ b/i18npool/source/localedata/data/pdc_US.xml
@@ -0,0 +1,189 @@
+
+
+
+
+  
+
+  pdc
+  Pennsylvania Dutch
+
+
+  US
+  United States
+
+  
+  
+  
+  
+  
+  
+A-Z
+0
+1
+ f.
+ ff.
+  
+  
+
+  
+
+  sun
+  Sunn
+  Sunndaag
+
+
+  mon
+  Muun
+  Muundaag
+
+
+  tue
+  Din
+  Dinschdaag
+
+
+  wed
+  Mitt
+  Mittwoch
+
+
+  thu
+  Dunn
+  Dunnerschdaag
+
+
+  fri
+  Frei
+  Freidaag
+
+
+  sat
+  Sam
+  Samschdaag
+
+  
+  
+
+  jan
+  Yenn
+  Yenner
+
+
+  feb
+  Hann
+  Hanning
+
+
+  mar
+  Mat
+  Matz
+
+
+  apr
+  Apr
+  Aprill
+
+
+  may
+  Moi
+  Moi
+
+
+  jun
+  Yun
+  Yuni
+
+
+  jul
+  Yul
+  Yuli
+
+
+  aug
+  Aag
+  Aaguscht
+
+
+  sep
+  Sept
+  September
+
+
+  oct
+  Okt
+  Oktower
+
+
+  nov
+  Now
+  Nowember
+
+
+  dec
+  Dies
+  Diesember
+
+  
+  
+
+  bc
+  BC
+  BC
+
+
+  ad
+  AD
+  AD
+
+  
+  
+sun
+  
+  1
+
+  
+  
+
+  USD
+  $
+  USD
+  US Daaler
+  2
+
+  
+  
+  
+
+  waahr
+  falsch
+  1scht Vaddel
+  2tt Vaddel
+  3tt Vaddel
+  4rt Vaddel
+  drowwe
+  drunne
+  V1
+  V2
+  V3
+  V4
+
+  
+  
+  
+
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index acb0f781f863..234fe77e7e9d 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -330,7 +330,8 @@ const struct {
 { "ha_Latn_NG",  lcl_DATA_OTHERS },
 { "min_ID", lcl_DATA_OTHERS },
 { "sun_ID", lcl_DATA_OTHERS },
-{ "en_IL",  lcl_DATA_OTHERS }   // needs to be in OTHERS instead of EN 
because inherits from he_IL
+{ "en_IL",  lcl_DATA_OTHERS },  // needs to be in OTHERS instead of EN 
because inherits from he_IL
+{ "pdc_US", lcl_DATA_OTHERS }
 };
 
 #else

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

[Julien Nabet (via logerrit)]

 connectivity/Library_firebird_sdbc.mk|2 
 connectivity/source/drivers/firebird/Catalog.cxx |   17 +++
 connectivity/source/drivers/firebird/Catalog.hxx |2 
 connectivity/source/drivers/firebird/Tables.cxx  |   14 ++
 connectivity/source/drivers/firebird/Tables.hxx  |2 
 connectivity/source/drivers/firebird/View.cxx|   90 ++
 connectivity/source/drivers/firebird/View.hxx|   60 
 connectivity/source/drivers/firebird/Views.cxx   |  112 +++
 connectivity/source/drivers/firebird/Views.hxx   |   42 
 9 files changed, 339 insertions(+), 2 deletions(-)

New commits:
commit 0adff3f2476f797843fb62d6810de90bfb333e10
Author: Julien Nabet 
AuthorDate: Wed Jan 26 23:09:40 2022 +0100
Commit: Julien Nabet 
CommitDate: Thu Jan 27 17:35:20 2022 +0100

tdf#126960, tdf#131330: FB make views editable+refresh auto after creation

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

diff --git a/connectivity/Library_firebird_sdbc.mk 
b/connectivity/Library_firebird_sdbc.mk
index ce0dbe6902ed..720dfeb878f7 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -61,6 +61,8 @@ $(eval $(call gb_Library_add_exception_objects,firebird_sdbc,\
 connectivity/source/drivers/firebird/User \
 connectivity/source/drivers/firebird/Users \
 connectivity/source/drivers/firebird/Util \
+connectivity/source/drivers/firebird/View \
+connectivity/source/drivers/firebird/Views \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/source/drivers/firebird/Catalog.cxx 
b/connectivity/source/drivers/firebird/Catalog.cxx
index c743b42cc75f..2ef4f514b12a 100644
--- a/connectivity/source/drivers/firebird/Catalog.cxx
+++ b/connectivity/source/drivers/firebird/Catalog.cxx
@@ -10,6 +10,7 @@
 #include "Catalog.hxx"
 #include "Tables.hxx"
 #include "Users.hxx"
+#include "Views.hxx"
 
 #include 
 
@@ -53,8 +54,20 @@ void Catalog::refreshTables()
 
 void Catalog::refreshViews()
 {
-// TODO: implement me.
-// Sets m_pViews (OCatalog)
+css::uno::Reference xViews
+= m_xMetaData->getTables(css::uno::Any(), "%", "%", { "VIEW" });
+
+if (!xViews.is())
+return;
+
+::std::vector aViewNames;
+
+fillNames(xViews, aViewNames);
+
+if (!m_pViews)
+m_pViews.reset(new Views(m_xConnection, *this, m_aMutex, aViewNames));
+else
+m_pViews->reFill(aViewNames);
 }
 
 //- IRefreshableGroups ---
diff --git a/connectivity/source/drivers/firebird/Catalog.hxx 
b/connectivity/source/drivers/firebird/Catalog.hxx
index 4a562e22a26e..b6bf02f6b69d 100644
--- a/connectivity/source/drivers/firebird/Catalog.hxx
+++ b/connectivity/source/drivers/firebird/Catalog.hxx
@@ -30,6 +30,8 @@ namespace connectivity::firebird
 
 // IRefreshableUsers
 virtual void refreshUsers() override;
+
+sdbcx::OCollection* getPrivateTables() const { return 
m_pTables.get(); }
 };
 
 } // namespace connectivity::firebird
diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index b686f66ecb9c..9c59f65f436c 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -204,4 +204,18 @@ void Tables::dropObject(sal_Int32 nPosition, const 
OUString& sName)
 "DROP " + sType + " " + ::dbtools::quoteName(sQuoteString,sName));
 }
 
+void connectivity::firebird::Tables::appendNew(const OUString& _rsNewTable)
+{
+insertElement(_rsNewTable, nullptr);
+
+// notify our container listeners
+css::container::ContainerEvent aEvent(static_cast(this),
+  css::uno::makeAny(_rsNewTable), 
css::uno::Any(),
+  css::uno::Any());
+comphelper::OInterfaceIteratorHelper3 aListenerLoop(m_aContainerListeners);
+while (aListenerLoop.hasMoreElements())
+aListenerLoop.next()->elementInserted(aEvent);
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/firebird/Tables.hxx 
b/connectivity/source/drivers/firebird/Tables.hxx
index d7fe019ef2a6..7d84edb2084a 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -51,6 +51,8 @@ namespace connectivity::firebird
 // XDrop
 virtual void dropObject(sal_Int32 nPosition, const OUString& 
rName) override;
 
+void appendNew(const OUString& _rsNewTable);
+
 };
 
 } // namespace connectivity::firebird
diff --git a/connectivity/source/drivers/firebird/View.cxx 
b/connectivity/source/drivers/firebird/View.cxx
new file mode 100644
index ..506c

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

[Tor Lillqvist (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
 writerfilter/source/dmapper/GraphicImport.cxx |5 +
 writerfilter/source/dmapper/GraphicImport.hxx |2 ++
 3 files changed, 8 insertions(+)

New commits:
commit 0453a2ff5d51181dd3036b10a4a2d2eeef7981be
Author: Tor Lillqvist 
AuthorDate: Mon Jan 24 16:48:04 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jan 27 17:09:49 2022 +0100

Take layoutInCell into consideration when placing graphic in table

Set our IsFollowingTextFlow property accordingly.

Thanks to Miklos for doing most of the work.

Change-Id: I67d214d6ed41c19dcb2f3ad2db9be94ca77c5842
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128880
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
(cherry picked from commit 9aa90da7e03b4b0806b27451665b7c41b8836bc0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128966
Reviewed-by: Xisco Fauli 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 19868ae74d78..fd4a720bb656 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -7390,6 +7390,7 @@ void  DomainMapper_Impl::ImportGraphic(const 
writerfilter::Reference< Properties
 {
 uno::Reference xEmbeddedProps(m_xEmbedded, 
uno::UNO_QUERY);
 xEmbeddedProps->setPropertyValue("AnchorType", 
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xEmbeddedProps->setPropertyValue("IsFollowingTextFlow", 
uno::makeAny(m_pGraphicImport->GetLayoutInCell()));
 uno::Reference xShapeProps(xShape, 
uno::UNO_QUERY);
 xEmbeddedProps->setPropertyValue("HoriOrient", 
xShapeProps->getPropertyValue("HoriOrient"));
 xEmbeddedProps->setPropertyValue("HoriOrientPosition", 
xShapeProps->getPropertyValue("HoriOrientPosition"));
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index bb3b2077e4aa..4fe5712b591f 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -474,6 +474,11 @@ com::sun::star::awt::Point 
GraphicImport::GetGraphicObjectPosition() const
 return (com::sun::star::awt::Point(m_pImpl->nLeftPosition, 
m_pImpl->nTopPosition));
 }
 
+bool GraphicImport::GetLayoutInCell() const
+{
+return m_pImpl->bLayoutInCell;
+}
+
 void GraphicImport::handleWrapTextValue(sal_uInt32 nVal)
 {
 switch (nVal)
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx 
b/writerfilter/source/dmapper/GraphicImport.hxx
index 7ca4e09ed30d..3ff83de5b713 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -100,6 +100,8 @@ public:
 
 com::sun::star::awt::Point GetGraphicObjectPosition() const;
 
+bool GetLayoutInCell() const;
+
  private:
 // Properties
 virtual void lcl_attribute(Id Name, Value & val) override;

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Weghorn (via logerrit)]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ba67202007f37d228a813c0915fd630bc2ff177b
Author: Michael Weghorn 
AuthorDate: Thu Jan 27 15:16:47 2022 +0100
Commit: Julien Nabet 
CommitDate: Thu Jan 27 16:58:20 2022 +0100

Fix up "Fix gtk3_kde5 build when qt5/kf5 VCL plugins are not built"

commit 5801b9fc65508391e130670f79a9af51f18d4e96
Author: Michael Weghorn 
Date:   Thu Jan 27 08:17:54 2022 +

Fix gtk3_kde5 build when qt5/kf5 VCL plugins are not built

was missing the spaces for the 'filter' function, resulting
in an '--enable-kf5 --enable-gtk3-kde5' build failing because
"TRUETRUE" doesn't match "TRUE".

Change-Id: I6dca8fb4cd9f58077ce08f51e003f3539f368f77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129047
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2962679864fd..6ba871409779 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2979,7 +2979,7 @@ endef # gb_LinkTarget__use_postgresql
 
 endif # !SYSTEM_POSTGRESQL
 
-ifneq (,$(filter TRUE,$(ENABLE_KF5)$(ENABLE_GTK3_KDE5)))
+ifneq (,$(filter TRUE,$(ENABLE_KF5) $(ENABLE_GTK3_KDE5)))
 
 define gb_LinkTarget__use_kf5
 $(call gb_LinkTarget_set_include,$(1),\
@@ -3007,7 +3007,7 @@ endif # ENABLE_KF5
 
 
 
-ifneq (,$(filter TRUE,$(ENABLE_QT5)$(ENABLE_GTK3_KDE5)))
+ifneq (,$(filter TRUE,$(ENABLE_QT5) $(ENABLE_GTK3_KDE5)))
 
 define gb_LinkTarget__use_qt5
 $(call gb_LinkTarget_set_include,$(1),\

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx |  552 ++---
 1 file changed, 156 insertions(+), 396 deletions(-)

New commits:
commit b5dd694e75c6eba1bbb33c64b41d82abf422530d
Author: Xisco Fauli 
AuthorDate: Thu Jan 27 14:16:34 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jan 27 16:45:14 2022 +0100

CppunitTest_sw_uiwriter: use CPPUNIT_TEST_FIXTURE

there are two reason why i'm doing this:
1. Use the same way to define tests as CppunitTest_sw_uiwriter2
and CppunitTest_sw_uiwriter3
2. Over the time, these files grow quite large, it's easier
to split them when they use CPPUNIT_TEST_FIXTURE

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

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 9eb628549a79..aa58f31d425c 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -162,256 +162,21 @@ int CountFilesInDirectory(const OUString &rURL)
 
 return nRet;
 }
+
+void lcl_selectCharacters(SwPaM& rPaM, sal_Int32 first, sal_Int32 end)
+{
+rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), first);
+rPaM.SetMark();
+rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), end);
 }
+} //namespace
 
 class SwUiWriterTest : public SwModelTestBase, public HtmlTestTools
 {
-
 public:
-void testReplaceForward();
-//Regression test of fdo#70143
-//EDITING: undo search&replace corrupt text when searching backward
-void testReplaceBackward();
-void testRedlineFrame(char const*const file);
-void testRedlineFrameAtCharStartOutside0();
-void testRedlineFrameAtCharStartOutside();
-void testRedlineFrameAtCharStartInside();
-void testRedlineFrameAtParaStartOutside();
-void testRedlineFrameAtParaEndInside();
-void testRedlineFrameAtParaOneParagraph();
-void testRedlineFrameAtPara2ndParagraph();
-void testThreadedException();
-void testBookmarkCopy();
-void testFdo69893();
-void testFdo70807();
-void testImportRTF();
-void testExportRTF();
-void testDOCXAutoTextEmpty();
-void testDOCXAutoTextMultiple();
-void testDOTMAutoText();
-void testDOCXAutoTextGallery();
-void testWatermarkDOCX();
-void testWatermarkPosition();
-void testTdf67238();
-void testFdo75110();
-void testFdo75898();
-void testFdo74981();
-void testTdf98512();
-void testShapeTextboxSelect();
-void testShapeTextboxDelete();
-void testAnchorChangeSelection();
-void testCp171();
-void testShapeTextboxVertadjust();
-void testShapeTextboxAutosize();
-void testFdo82191();
-void testCommentedWord();
-void testTextFieldGetAnchorGetTextInFooter();
-void testChineseConversionBlank();
-void testChineseConversionNonChineseText();
-void testChineseConversionTraditionalToSimplified();
-void testChineseConversionSimplifiedToTraditional();
-void testFdo85554();
-void testAutoCorr();
-void testTdf83260();
-void testTdf130274();
-void testMergeDoc();
-void testCreatePortions();
-void testBookmarkUndo();
-void testFdo85876();
-void testCaretPositionMovingUp();
-void testTdf93441();
-void testTdf81226();
-void testTdf137532();
-void testFdo87448();
-void testTextCursorInvalidation();
-void testTdf68183();
-void testCp1000115();
-void testTdf63214();
-void testTdf90003();
-void testTdf51741();
-void testDefaultsOfOutlineNumbering();
-void testDeleteTableRedlines();
-void testXFlatParagraph();
-void testTdf81995();
-void testExportToPicture();
-void testTdf77340();
-void testTdf79236();
-void testTextSearch();
-void testTdf69282();
-void testTdf69282WithMirror();
-void testTdf78742();
-void testUnoParagraph();
-void testTdf72788();
-void testTdf60967();
-void testSearchWithTransliterate();
-void testTdf73660();
-void testNewDocModifiedState();
-void testTdf77342();
-void testTdf63553();
-void testTdf74230();
-void testTdf74363();
-void testTdf80663();
-void testTdf57197();
-void testTdf131990();
-void testTdf90808();
-void testTdf97601();
-void testTdf75137();
-void testTdf83798();
-void testTdf89714();
-void testTdf130287();
-void testPropertyDefaults();
-void testTableBackgroundColor();
-void testTdf88899();
-void testTdf90362();
-void testUndoDelAsCharTdf107512();
-void testUndoCharAttribute();
-void testUndoDelAsChar();
-void testTdf86639();
-void testTdf90883TableBoxGetCoordinates();
-void testEmbeddedDataSource();
-void testUnoCursorPointer();
-void testUnicodeNotationToggle();
-void testTextTableCellNames();
-void testShapeAnchorUndo();
-void testTdf127635();
-void testDde();
-

ESC meeting minutes: 2022-01-27

[Miklos Vajna]

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

* Completed Action Items:
+ Reach out to potential GSoC mentors to review their ideas, in terms of 
project size (Ilmari)
+ wasm tinderbox to guard master, not feature/wasm (Cloph)

* Pending Action Items:
+ None

* Release Engineering update (Cloph)
+ 7.3 status: 7.3.0 rc3 was tagged yesterday, builds are in progress
  + 7.3.1 rc1 in 2 weeks
+ 7.2 status: 7.2.6 rc1 in 3 weeks
+ Remotes: Android, iOS
+ Android viewer

* Documentation (Olivier)
+ New Help
   + Fixes and improvements (Ilmari)
+ Helpcontents2
   + Bug squash/fixes (R. Lima, A. Romedenne, A Barrientos, S. Chaiklin,
   eRack, Caolán, Jeff Huang, ohallot, ...)
   + several fixes after translation round.
   + Refactor for maintenability (Johnny_m)
   + Base Help pages
  + many outdated pages, re: connectors
  + What is the status of Firebird?
 + What can be documented for FB?
 + can have it as an embedded DB, also connect to it (Caolan)
 + it's what you get as the embedded DB if you don't have Java 
(Miklos)
+ Guides
+ Activity in Base Guide 7.3 (S. Fanning, V. Naranayan)
+ formatting and editing of original German book
+ also triggering QA activity, which is probably good (Xisco)
+ Update of Getting Started 7.3 (K Kriek, J. Weber)

+ Bugzilla Documentation statistics
238(238) bugs open
+ Updates:
BZ changes   1 week1 month   3 months   12 months
   created 12(-19)66(-3)   113(3)  333(2)
 commented 59(-2)226(47)   451(39)1702(17)
  resolved  5(-5) 27(-1)58(3)  201(2)
+ top 10 contributors:
  Rafael Lima made 101 changes in 1 month, and 364 changes in 1 year
  Olivier Hallot made 60 changes in 1 month, and 528 changes in 1 year
  Ilmari Lauhakangas made 39 changes in 1 month, and 115 changes in 1 
year
  gmarco made 19 changes in 1 month, and 26 changes in 1 year
  Seth Chaiklin made 17 changes in 1 month, and 199 changes in 1 year
  Nabet, Julien made 16 changes in 1 month, and 62 changes in 1 year
  Heiko Tietze made 14 changes in 1 month, and 90 changes in 1 year
  Dieter made 13 changes in 1 month, and 117 changes in 1 year
  Kaganski, Mike made 9 changes in 1 month, and 95 changes in 1 year
  Nucleos made 8 changes in 1 month, and 8 changes in 1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
258(258) (topicUI) bugs open, 141(141) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
 added  9(5) 11(6) 23(5)   75(3)
 commented 83(25)   209(31)   648(31)2897(-16)
   removed  2(1)  3(2)  9(1)   36(-1)
  resolved  6(-8)33(2) 88(1)  399(-10)
+ top 10 contributors:
  Heiko Tietze made 174 changes in 1 month, and 1959 changes in 1 year
  Foote, V Stuart made 54 changes in 1 month, and 521 changes in 1 year
  Seth Chaiklin made 25 changes in 1 month, and 137 changes in 1 year
  Kaganski, Mike made 20 changes in 1 month, and 167 changes in 1 year
  Timur made 19 changes in 1 month, and 122 changes in 1 year
  Dieter made 15 changes in 1 month, and 267 changes in 1 year
  Telesto made 15 changes in 1 month, and 298 changes in 1 year
  MarjaE made 13 changes in 1 month, and 20 changes in 1 year
  Lucas J made 8 changes in 1 month, and 8 changes in 1 year
  BogdanB made 7 changes in 1 month, and 101 changes in 1 year
+ 9 new tickets with needsUXEval Jan/20-27
  + [Bug 146968] Prototype UI for new Inking feature
  ->  + [Bug 146762] Should Tab and Shift-Tab change list level for first list 
item?
+ change tab at first list entry to not indent but also demote and 
introduce
  a new shortcut to indent everywhere
+ a bit concerned that the current behavior is matching Word (Miklos)
  + good to not break that
  ->  + [Bug 146910] [UI Enhance] ease to use the same font for Western and 
Asian
+ controversial discussion whether or not to drop CJK font option, 
likely WF
  ->  + [Bug 146937] Is the "refresh" command needed in the Template Manager?
+ no Refresh needed
  + [Bug 146892] Special fields appears correctly only without "outline 1" 
style
  + [Bug 134882] Calc: PageStyle: Fit print range to width/height is
 not expanding to the margins
  ->  + [Bug 146884] Export Paths should be saved in the Document
+ handle export path differently to where the document is saved last
  + [Bug 146872] Separator label in Bullets and Numberin

Re: About removing Beanshell/Javascript (Rhino) ?

[Thorsten Behrens]

Stephan Bergmann wrote:
> You mean the BeanShell scripting, with an editor window (with a
> "Run" button) via "Tools - Macros - Organize Macros - BeanShell... -
> Edit"?  Removal of which is what this thread is about.
>
Aye.

> Someone would need to create such an extension, then.  (Assuming
> that it's actually possible to provide such scripting backends
> through extensions, but I strongly assume it is.)
>
Right. I mean, removing the stuff is also work, that someone's gotta
do.

It's possible that its not worth it; what I would still suggest is to
look at the area (developer/power user/automation stories) a bit more
holistically. Beyond Basic, our dev story for integrating & scripting
is not great, and it ain't getting better by removing options.

Cheers,

-- Thorsten


signature.asc
Description: PGP signature

[Libreoffice-commits] core.git: osx/soffice.xcodeproj

[Tor Lillqvist (via logerrit)]

 osx/soffice.xcodeproj/project.pbxproj |  188 +-
 1 file changed, 187 insertions(+), 1 deletion(-)

New commits:
commit f343d3ac4abcf974d2223b866aae17e7fe2f416a
Author: Tor Lillqvist 
AuthorDate: Thu Jan 27 16:16:23 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Jan 27 15:54:35 2022 +0100

Add more source files for debugging convenience

Change-Id: I2b4cc77d1d7a873c3a3549a8132fd8a1d90525cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129048
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/osx/soffice.xcodeproj/project.pbxproj 
b/osx/soffice.xcodeproj/project.pbxproj
index 0bfa12dbbf0f..dd1708e0f94a 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -774,6 +774,79 @@
BEB0734B27A2948900F75C00 /* fuolbull.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuolbull.cxx; 
path = ../sd/source/ui/func/fuolbull.cxx; sourceTree = ""; };
BEB0734C27A2948900F75C00 /* fudspord.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fudspord.cxx; 
path = ../sd/source/ui/func/fudspord.cxx; sourceTree = ""; };
BEB0734D27A2948900F75C00 /* futxtatt.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = futxtatt.cxx; 
path = ../sd/source/ui/func/futxtatt.cxx; sourceTree = ""; };
+   BEB0735027A2B98200F75C00 /* IndexedPropertyValuesContainer.cxx 
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
IndexedPropertyValuesContainer.cxx; path = 
../../../comphelper/source/container/IndexedPropertyValuesContainer.cxx; 
sourceTree = ""; };
+   BEB0735127A2B98200F75C00 /* containermultiplexer.cxx */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
containermultiplexer.cxx; path = 
../../../comphelper/source/container/containermultiplexer.cxx; sourceTree = 
""; };
+   BEB0735227A2B98200F75C00 /* interfacecontainer2.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
interfacecontainer2.cxx; path = 
../../../comphelper/source/container/interfacecontainer2.cxx; sourceTree = 
""; };
+   BEB0735327A2B98200F75C00 /* namecontainer.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
namecontainer.cxx; path = 
../../../comphelper/source/container/namecontainer.cxx; sourceTree = ""; 
};
+   BEB0735427A2B98200F75C00 /* embeddedobjectcontainer.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
embeddedobjectcontainer.cxx; path = 
../../../comphelper/source/container/embeddedobjectcontainer.cxx; sourceTree = 
""; };
+   BEB0735527A2B98200F75C00 /* enumhelper.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
enumhelper.cxx; path = ../../../comphelper/source/container/enumhelper.cxx; 
sourceTree = ""; };
+   BEB0735627A2B98200F75C00 /* NamedPropertyValuesContainer.cxx */ 
= {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
NamedPropertyValuesContainer.cxx; path = 
../../../comphelper/source/container/NamedPropertyValuesContainer.cxx; 
sourceTree = ""; };
+   BEB0735727A2B98200F75C00 /* enumerablemap.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
enumerablemap.cxx; path = 
../../../comphelper/source/container/enumerablemap.cxx; sourceTree = ""; 
};
+   BEB0735827A2B98200F75C00 /* container.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = container.cxx; 
path = ../../../comphelper/source/container/container.cxx; sourceTree = 
""; };
+   BEB0735A27A2BAC900F75C00 /* xmleohlp.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmleohlp.cxx; 
path = ../svx/source/xml/xmleohlp.cxx; sourceTree = ""; };
+   BEB0735B27A2BAC900F75C00 /* xmlexport.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlexport.cxx; 
path = ../svx/source/xml/xmlexport.cxx; sourceTree = ""; };
+   BEB0735C27A2BAC900F75C00 /* xmlxtimp.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlxtimp.cxx; 
path = ../svx/source/xml/xmlxtimp.cxx; sourceTree = ""; };
+   BEB0735D27A2BAC900F75C00 /* xmlgrhlp.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlgrhlp.cxx; 
path = ../svx/source/xml/xmlgrhlp.cxx; sourceTree = ""; };
+   BEB0735E27A2BAC900F75C00 /* xmlxtexp.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlxtexp.cxx; 
path = ../svx/source/xml/xmlxtexp.cxx; sourceTree = ""; };
+   BEB0736227A2BDAC00F75C00 /* ximplink.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ximplink.cxx; 
pa

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

[Mike Kaganski (via logerrit)]

 chart2/qa/extras/xshape/data/reference/tdf90839-1.xml |  116 -
 chart2/qa/extras/xshape/data/reference/tdf90839-2.xml |  120 +-
 chart2/qa/extras/xshape/data/reference/tdf90839-3.xml |  120 +-
 sc/qa/unit/subsequent_filters_test2.cxx   |   24 +--
 sc/qa/unit/uicalc/uicalc.cxx  |4 
 sc/source/filter/excel/xetable.cxx|2 
 sc/source/filter/inc/unitconverter.hxx|   13 -
 sc/source/filter/oox/drawingbase.cxx  |4 
 sc/source/filter/oox/drawingfragment.cxx  |2 
 sc/source/filter/oox/pagesettings.cxx |   13 -
 sc/source/filter/oox/unitconverter.cxx|   33 +---
 sc/source/filter/oox/worksheethelper.cxx  |   25 +--
 12 files changed, 228 insertions(+), 248 deletions(-)

New commits:
commit 75036ee916046b9d1bfd705b368ffe94cc7cfa79
Author: Mike Kaganski 
AuthorDate: Thu Jan 27 09:18:41 2022 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jan 27 15:12:48 2022 +0100

Simplify oox::xls::UnitConverter and its uses

Use o3tl::convert where it was used to convert between two fixed units.
Simplify cases where several conversions were performed in a row.
Use EMUs as UnitConverter base unit, to have simplest quotients and
increase accuracy.

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

diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
index eb48c3f7293d..b2dc41548810 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
@@ -1,6 +1,6 @@
 
 
- 
+ 
   
   
   
@@ -9,14 +9,14 @@
   
   
   
-   
+   


   
  
- 
+ 
   
-   
+   
 
 
 
@@ -25,12 +25,12 @@
 
 
 
- 
+ 
  
  
 

-   
+   
 
 
 
@@ -39,18 +39,18 @@
 
 
 
- 
+ 
  
  
 

-   
+   
 
- 
+ 
   
-   
+   
 
- 
+ 
   
   
   
@@ -59,25 +59,25 @@
   
   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 

-   
+   
 
- 
+ 
   
-   
+   
 
- 
+ 
   
   
   
@@ -86,12 +86,12 @@
   
   
   
-   
+   


   
  
- 
+ 
   
   
   
@@ -100,12 +100,12 @@
   
   
   
-   
+   


   
  
- 
+ 
   
   
   
@@ -114,12 +114,12 @@
   
   
   
-   
+   


   
  
- 
+ 
   
   
   
@@ -128,12 +128,12 @@
   
   
   
-   
+   


   
  
- 
+ 
   
   
   
@@ -142,48 +142,48 @@
   
   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 

   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 

   
   
-   
+   


   
  
- 
+ 
   
-   
+   
 
- 
+ 
   
-   
+   
 
- 
+ 
   
   
   
@@ -192,21 +192,21 @@
   
   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -215,21 +215,21 @@
   
   
   
-   
+   


   
  
 
 
-

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

[Caolán McNamara (via logerrit)]

 include/vcl/syswin.hxx   |1 +
 vcl/source/window/syswin.cxx |   16 
 2 files changed, 17 insertions(+)

New commits:
commit 5d388b94735e34ba445d65e1d5030a646aad7dbe
Author: Caolán McNamara 
AuthorDate: Thu Jan 27 12:17:48 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 27 15:03:53 2022 +0100

Related: tdf#146648 let SetWindowState size trump the initial layout pref 
size

so a size can be restored from config and overrule the initial layout
size which is calculated on first show.

for existing cases, this changes behaviour if a dialog is shown,
hidden, layout changed and then reshown and the new layout is smaller
than the old layout. But that should align the behaviour of vcl
layout-enabled widgets with gtk ones.

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

diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 0c35073aec09..71661908fd86 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -103,6 +103,7 @@ private:
 boolmbHideBtn;
 boolmbSysChild;
 boolmbIsCalculatingInitialLayoutSize;
+boolmbInitialLayoutSizeCalculated;
 boolmbPaintComplete;
 MenuBarMode mnMenuBarMode;
 sal_uInt16  mnIcon;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index c624c373aa77..f691f62dfda3 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -70,6 +70,7 @@ SystemWindow::SystemWindow(WindowType nType, const char* 
pIdleDebugName)
 , mbHideBtn(false)
 , mbSysChild(false)
 , mbIsCalculatingInitialLayoutSize(false)
+, mbInitialLayoutSizeCalculated(false)
 , mbPaintComplete(false)
 , mnMenuBarMode(MenuBarMode::Normal)
 , mnIcon(0)
@@ -746,6 +747,11 @@ void SystemWindow::SetWindowStateData( const 
WindowStateData& rData )
 nY = rGeom.nHeight - nHeight;
 setPosSizePixel( nX, nY, nWidth, nHeight, nPosSize );
 }
+
+// tdf#146648 if an explicit size state was set, then use it as the 
preferred
+// size for layout
+if (nValidMask & WindowStateMask::Size)
+mbInitialLayoutSizeCalculated = true;
 }
 
 void SystemWindow::GetWindowStateData( WindowStateData& rData ) const
@@ -1081,6 +1087,16 @@ void SystemWindow::setOptimalLayoutSize()
 aSize.setHeight( std::min(aMax.Height(), aSize.Height()) );
 
 SetMinOutputSizePixel(aSize);
+
+if (!mbInitialLayoutSizeCalculated)
+mbInitialLayoutSizeCalculated = true;
+else
+{
+Size aCurrentSize = GetSizePixel();
+aSize.setWidth(std::max(aSize.Width(), aCurrentSize.Width()));
+aSize.setHeight(std::max(aSize.Height(), aCurrentSize.Height()));
+}
+
 SetSizePixel(aSize);
 setPosSizeOnContainee(aSize, *pBox);
 }

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

[Xisco Fauli (via logerrit)]

 dev/null|binary
 sc/source/ui/view/gridwin4.cxx  |3 -
 sw/qa/extras/uiwriter/uiwriter4.cxx |   84 +---
 3 files changed, 15 insertions(+), 72 deletions(-)

New commits:
commit 4bd1cf9c1aece1bb405c157e6e6b2444517a27ae
Author: Xisco Fauli 
AuthorDate: Thu Jan 27 13:16:02 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jan 27 15:03:45 2022 +0100

CppunitTest_sw_uiwriter4: remove duplicated code

No need to have blank file either, just pass nullptr to
createSwDoc and it will create an empty file

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

diff --git a/sw/qa/extras/uiwriter/data/tdf113877_blank.odt 
b/sw/qa/extras/uiwriter/data/tdf113877_blank.odt
deleted file mode 100644
index 741d7d5e6d0a..
Binary files a/sw/qa/extras/uiwriter/data/tdf113877_blank.odt and /dev/null 
differ
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx 
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index 3ad3f9f08382..52a4dcbe8489 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -219,7 +219,7 @@ public:
 void testTdf112025();
 void testTdf72942();
 
-void testTdf113877_mergeDocs(const char* aDestDoc, const char* aInsertDoc);
+void mergeDocs(const char* aDestDoc, const char* aInsertDoc);
 void testTdf113877();
 void testTdf113877NoMerge();
 void testTdf113877_default_style();
@@ -2144,24 +2144,9 @@ void SwUiWriterTest4::testTdf58604()
 
 void SwUiWriterTest4::testTdf112025()
 {
-createSwDoc(DATA_DIRECTORY, "fdo112025.odt");
-const int numberOfParagraphs = getParagraphs();
-CPPUNIT_ASSERT_EQUAL(1, numberOfParagraphs);
+mergeDocs("fdo112025.odt", "fdo112025-insert.docx");
 
-// get a page cursor
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference xTextViewCursorSupplier(
-xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(),
-  uno::UNO_QUERY);
-xCursor->jumpToEndOfPage();
-
-OUString insertFileid = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"fdo112025-insert.docx";
-uno::Sequence aPropertyValues(
-comphelper::InitPropertySequence({ { "Name", 
uno::makeAny(insertFileid) } }));
-dispatchCommand(mxComponent, ".uno:InsertDoc", aPropertyValues);
-// something has been inserted + an additional paragraph
-CPPUNIT_ASSERT_GREATER(numberOfParagraphs, getParagraphs());
+CPPUNIT_ASSERT_EQUAL(3, getParagraphs());
 
 uno::Reference 
xStyle(getStyles("PageStyles")->getByName("Standard"),
uno::UNO_QUERY);
@@ -2170,20 +2155,7 @@ void SwUiWriterTest4::testTdf112025()
 
 void SwUiWriterTest4::testTdf72942()
 {
-createSwDoc(DATA_DIRECTORY, "fdo72942.docx");
-
-// get a page cursor
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference xTextViewCursorSupplier(
-xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(),
-  uno::UNO_QUERY);
-xCursor->jumpToEndOfPage();
-
-OUString insertFileid = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"fdo72942-insert.docx";
-uno::Sequence aPropertyValues(
-comphelper::InitPropertySequence({ { "Name", 
uno::makeAny(insertFileid) } }));
-dispatchCommand(mxComponent, ".uno:InsertDoc", aPropertyValues);
+mergeDocs("fdo72942.docx", "fdo72942-insert.docx");
 
 // check styles of paragraphs added from [fdo72942.docx]
 const uno::Reference xRun1 = getRun(getParagraph(1), 1);
@@ -2232,7 +2204,7 @@ void SwUiWriterTest4::testTdf114306_2()
 CPPUNIT_ASSERT_EQUAL(4, getPages());
 }
 
-void SwUiWriterTest4::testTdf113877_mergeDocs(const char* aDestDoc, const 
char* aInsertDoc)
+void SwUiWriterTest4::mergeDocs(const char* aDestDoc, const char* aInsertDoc)
 {
 createSwDoc(DATA_DIRECTORY, aDestDoc);
 
@@ -2258,8 +2230,7 @@ void SwUiWriterTest4::testTdf113877_mergeDocs(const char* 
aDestDoc, const char*
 // we should merge both lists into one, when they have the same list properties
 void SwUiWriterTest4::testTdf113877()
 {
-testTdf113877_mergeDocs("tdf113877_insert_numbered_list.odt",
-"tdf113877_insert_numbered_list.odt");
+mergeDocs("tdf113877_insert_numbered_list.odt", 
"tdf113877_insert_numbered_list.odt");
 
 const OUString listId1 = getProperty(getParagraph(1), "ListId");
 const OUString listId4 = getProperty(getParagraph(4), "ListId");
@@ -2279,8 +2250,7 @@ void SwUiWriterTest4::testTdf113877()
 // The same test as testTdf113877() but merging of two list should not be 
performed.
 void SwUiWriterTest4::testTdf113877NoMerge()
 {
-testTdf113877_mergeDocs("

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |  870 -
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |  973 +
 2 files changed, 973 insertions(+), 870 deletions(-)

New commits:
commit a161aa6234c8fb356dc23f8a52493a33d7865c53
Author: Xisco Fauli 
AuthorDate: Thu Jan 27 12:12:55 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jan 27 15:01:25 2022 +0100

sw_ooxmlexport: distribute the num of tests more equally

Num of tests before:
- ooxmlexport11: 124
- ooxmlexport12: 25

Num of tester after:
- ooxmlexport11: 68
- ooxmlexport12: 81

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index a0960ae35c7f..42bd3c032fef 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -862,876 +862,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104348_contextMargin, 
"tdf104348_contextMargin.d
 CPPUNIT_ASSERT_EQUAL(nMargin, getProperty(getParagraph(2), 
"ParaBottomMargin"));
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf118521_marginsLR, "tdf118521_marginsLR.docx")
-{
-// tdf#118521 paragraphs with direct formatting of only some of left, 
right, or first margins have
-// lost the other unset margins coming from paragraph style, getting a bad 
margin from the default style instead
-
-uno::Reference 
xMyStyle(getStyles("ParagraphStyles")->getByName("MyStyle"), uno::UNO_QUERY);
-// from paragraph style - this is what direct formatting should equal
-sal_Int32 nMargin = getProperty(xMyStyle, "ParaLeftMargin");
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nMargin);
-// from direct formatting
-CPPUNIT_ASSERT_EQUAL(nMargin, getProperty(getParagraph(1), 
"ParaLeftMargin"));
-
-nMargin = getProperty(xMyStyle, "ParaRightMargin");
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1900), nMargin);
-CPPUNIT_ASSERT_EQUAL(nMargin, getProperty(getParagraph(2), 
"ParaRightMargin"));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(882), 
getProperty(getParagraph(2), "ParaFirstLineIndent"));
-}
-
-DECLARE_OOXMLEXPORT_TEST(testTdf104797, "tdf104797.docx")
-{
-// check moveFrom and moveTo
-CPPUNIT_ASSERT_EQUAL( OUString( "Will this sentence be duplicated?" ), 
getParagraph( 1 )->getString());
-CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 1 ), 1 
)->getString());
-CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(1), 3), "RedlineType"));
-
CPPUNIT_ASSERT_EQUAL(OUString("Delete"),getProperty(getRun(getParagraph(1),
 3), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL(true,getProperty(getRun(getParagraph(1), 3), 
"IsStart"));
-CPPUNIT_ASSERT_EQUAL( OUString( "This is a filler sentence. Will this 
sentence be duplicated ADDED STUFF?" ),
-getParagraph( 2 )->getString());
-CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 2 ), 1 
)->getString());
-CPPUNIT_ASSERT_EQUAL( OUString( "This is a filler sentence." ), getRun( 
getParagraph( 2 ), 2 )->getString());
-CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 2 ), 3 
)->getString());
-CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(2), 3), "RedlineType"));
-
CPPUNIT_ASSERT_EQUAL(OUString("Insert"),getProperty(getRun(getParagraph(2),
 3), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL(true,getProperty(getRun(getParagraph(2), 3), 
"IsStart"));
-
-CPPUNIT_ASSERT_EQUAL( OUString( " " ), getRun( getParagraph( 2 ), 4 
)->getString());
-CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 2 ), 5 
)->getString());
-CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(2), 6), "RedlineType"));
-
CPPUNIT_ASSERT_EQUAL(OUString("Insert"),getProperty(getRun(getParagraph(2),
 6), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 2 ), 7 
)->getString());
-CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(2), 7), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL(true,getProperty(getRun(getParagraph(2), 7), 
"IsStart"));
-CPPUNIT_ASSERT_EQUAL( OUString( "Will this sentence be duplicated" ), 
getRun( getParagraph( 2 ), 8 )->getString());
-CPPUNIT_ASSERT_EQUAL( OUString( " ADDED STUFF" ), getRun( getParagraph( 2 
), 11 )->getString());
-CPPUNIT_ASSERT_EQUAL( OUString( "?" ), getRun( getParagraph( 2 ), 14 
)->getString());
-}
-
-DECLARE_OOXMLEXPORT_TEST(testTdf145720, "tdf104797.docx")
-{
-// check moveFromRangeStart/End and moveToRangeStart/End (to keep tracked 
text moving)
-xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
-if (mbExported)
-{
-// These were 0 (missing move*FromRange* elements)
-assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:moveFrom/w:moveFromRangeStart", 1);
-assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:moveFromRangeEnd", 
1);
-assertXPath(pXmlDoc,

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

[Caolán McNamara (via logerrit)]

 sc/uiconfig/scalc/ui/filtersubdropdown.ui |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit ce7519272269b7e9cc62342bdb48f395223e7bf9
Author: Caolán McNamara 
AuthorDate: Wed Jan 26 14:51:58 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 27 14:43:48 2022 +0100

toggle no-show-all on so the widgets don't appear despite visible off

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

diff --git a/sc/uiconfig/scalc/ui/filtersubdropdown.ui 
b/sc/uiconfig/scalc/ui/filtersubdropdown.ui
index 7e57c1801d62..d2e3c4a01dd9 100644
--- a/sc/uiconfig/scalc/ui/filtersubdropdown.ui
+++ b/sc/uiconfig/scalc/ui/filtersubdropdown.ui
@@ -65,6 +65,7 @@
   
 True
 True
+True
 center
 True
 never
@@ -73,6 +74,7 @@
   
 True
 True
+True
 center
 True
 liststore1
@@ -121,6 +123,7 @@
   
 True
 True
+True
 center
 True
 never
@@ -128,6 +131,7 @@
   
 True
 True
+True
 center
 True
 liststore2
@@ -176,6 +180,7 @@
   
 True
 True
+True
 center
 True
 never
@@ -183,6 +188,7 @@
   
 True
 True
+True
 center
 True
 liststore3

Re: About removing Beanshell/Javascript (Rhino) ?

[Stephan Bergmann]

On 24/01/2022 10:00, Thorsten Behrens wrote:

FWIW, I find this Java REPL thingit very useful (is it called Groovy?)
for rapid prototyping of Java code. There's a (very basic) editor for
that buried in the macro dialog.


You mean the BeanShell scripting, with an editor window (with a "Run" 
button) via "Tools - Macros - Organize Macros - BeanShell... - Edit"? 
Removal of which is what this thread is about.



Whether that's something that needs to remain in core, or can be just
shunted into an extension, I've got no strong opinions on.


Someone would need to create such an extension, then.  (Assuming that 
it's actually possible to provide such scripting backends through 
extensions, but I strongly assume it is.)

[Libreoffice-commits] core.git: ucb/README.md

[Andrea Gelmini (via logerrit)]

 ucb/README.md |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 06dbd2f50662d04d03140458afdff4501ea5827e
Author: Andrea Gelmini 
AuthorDate: Thu Jan 27 14:16:54 2022 +0100
Commit: Julien Nabet 
CommitDate: Thu Jan 27 14:36:18 2022 +0100

Fix typos

Change-Id: I49d514a5977ef46a4ade52d53a9a47d56c718052
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129041
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/ucb/README.md b/ucb/README.md
index 4d31280779a1..5cdaff115233 100644
--- a/ucb/README.md
+++ b/ucb/README.md
@@ -53,9 +53,9 @@ server idiosyncrasies:
 To a first approximation, there are 3 parts involved in the UCP:
 
 * The upper layer implements the UNO API which is called by LibreOffice, and
-  translates the calls from generic sequence-of-any stringly typed abstractness
+  translates the calls from generic sequence-of-any strongly typed abstractness
   into HTTP or WebDAV protocol calls, and does some high level protocol
-  handling to figure out what the server supports and so on. This is is
+  handling to figure out what the server supports and so on. This is
   independent of the low-level library.
 * Then there is the lower layer of the UCP, which translates the generic HTTP
   or WebDAV protocol calls to something that the particular third-party library

Minutes from the UX/design meeting 2022-Jan-27

[Heiko Tietze]

Present: Heiko
Comments: Seth, Dieter, Timur, Jean-Baptiste, Stuart, Ian, Samuel, Bogdan, 
Csongor, Timur


Tickets/Topics

 * Zoom lost when window resized narrowly
   + https://bugs.documentfoundation.org/show_bug.cgi?id=146840
   + make Word/Character Count and/or Style pane non-mandatory
 to show the zoom slider for smaller sizes
   + replace by abbreviated versions or icons is an option but
 agree on WF since Writer that small is not usable (Csongor)
   + zoom is important on very small sizes (Timur)
   => no good solution possible, WF

 * Separator label in Bullets and Numbering Customize tab should be bold
   + https://bugs.documentfoundation.org/show_bug.cgi?id=146872
   + a) make it bold, b) introduce a GtkFrame, c) have controls in one line
   + a): simple, b): ugly, c): false radio button impression (Seth)
   + prefer c), variant a) gives false impression of a section (Heiko)
   => keep open for further input

 * Cut, copy, paste and drag operations for folded outlines: include
   folded content
   + https://bugs.documentfoundation.org/show_bug.cgi?id=142447
 + Copy/Paste: Works as expected (Jean-Baptiste / Dieter)
   Doesn't work as expected (Timur)
 + Drag / Drop: Works as expected (Dieter)
 + Cut / Paste: Not possible at the moment (Message pops up).
   Warning is expected and useful, but question is, if there should
   be an option to ignore it.
 + move: inconsistent (Heiko)
   => improve warning message and make move consistent

 * Is the "refresh" command needed in the Template Manager?
   + https://bugs.documentfoundation.org/show_bug.cgi?id=146937
   + no need for Refresh (Heiko)
   + not working (Bogdan)
   => kill it with fire

 * Export Paths should be saved in the Document
   + https://bugs.documentfoundation.org/show_bug.cgi?id=146884
   + opposite to bug 126665 (Stuart), not because of export (Ian)
   + export deserves a special handling (Samuel)
   => follow Samuel's suggestion

 * Should Tab and Shift-Tab change list level for first list item?
   + https://bugs.documentfoundation.org/show_bug.cgi?id=146762
   + use shift+ctrl+tab or the like to indent paragraph and demote
 the level on all items per tab (Seth)
   => implement Seth's suggestion

 * Calc: PageStyle: Fit print range to width/height is not
   expanding to the margins
   + https://bugs.documentfoundation.org/show_bug.cgi?id=134882
   + Like before, but replacing Fit with shrink (Bogdan, Heiko)
   => rename Fit to Shrink


OpenPGP_signature
Description: OpenPGP digital signature

[Libreoffice-commits] core.git: chart2/source cui/source editeng/source idl/source include/editeng include/sfx2 include/svx sc/source sd/source starmath/source svx/source sw/source

[Noel Grandin (via logerrit)]

 chart2/source/inc/chartview/ChartSfxItemIds.hxx |2 
 cui/source/options/optgdlg.cxx  |2 
 editeng/source/rtf/svxrtf.cxx   |7 
 idl/source/prj/database.cxx |   15 +-
 include/editeng/editids.hrc |6 
 include/sfx2/sfxsids.hrc|  176 
 include/svx/svxids.hrc  |   90 ++--
 sc/source/filter/xml/xmlwrap.cxx|8 -
 sd/source/filter/sdfilter.cxx   |4 
 sd/source/filter/xml/sdxmlwrp.cxx   |   11 -
 sd/source/ui/app/sdmod1.cxx |4 
 starmath/source/mathml/export.cxx   |9 -
 starmath/source/mathml/import.cxx   |7 
 starmath/source/mathml/mathmlexport.cxx |7 
 starmath/source/mathml/mathmlimport.cxx |7 
 svx/source/svdraw/svdedtv1.cxx  |2 
 svx/source/tbxctrls/grafctrl.cxx|2 
 sw/source/filter/xml/swxml.cxx  |8 -
 sw/source/filter/xml/wrtxml.cxx |8 -
 19 files changed, 202 insertions(+), 173 deletions(-)

New commits:
commit 8fed86b3ebb52cbf28ba2a561e67108e3a05a206
Author: Noel Grandin 
AuthorDate: Thu Jan 27 11:15:12 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 27 14:10:25 2022 +0100

add some more TypeWhichId annotations

and update the idl compiler to cope with namespaced class names

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

diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx 
b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
index 55fec55872f3..45773344f873 100644
--- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx
+++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
@@ -163,7 +163,7 @@ constexpr TypedWhichId   
SCHATTR_NUM_OF_LINES_FOR_BAR
 constexpr TypedWhichId   SCHATTR_SPLINE_ORDER
   (SCHATTR_CHARTTYPE_START + 4);
 constexpr TypedWhichId   SCHATTR_SPLINE_RESOLUTION   
   (SCHATTR_CHARTTYPE_START + 5);
 constexpr TypedWhichIdSCHATTR_GROUP_BARS_PER_AXIS 
   (SCHATTR_CHARTTYPE_START + 6);
-constexpr TypedWhichId   SCHATTR_STARTING_ANGLE  
   (SCHATTR_CHARTTYPE_START + 7);
+constexpr TypedWhichId   SCHATTR_STARTING_ANGLE  
   (SCHATTR_CHARTTYPE_START + 7);
 constexpr TypedWhichIdSCHATTR_CLOCKWISE   
   (SCHATTR_CHARTTYPE_START + 8);
 constexpr TypedWhichId   SCHATTR_MISSING_VALUE_TREATMENT 
   (SCHATTR_CHARTTYPE_START + 9);
 constexpr TypedWhichId 
SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 10);
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e0b0bfdf8c5d..f31044aeaaff 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -244,7 +244,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
 bModified = true;
 }
 
-const SfxUInt16Item* pUInt16Item = dynamic_cast< const SfxUInt16Item* >( 
GetOldItem( *rSet, SID_ATTR_YEAR2000 ) );
+const SfxUInt16Item* pUInt16Item = GetOldItem( *rSet, SID_ATTR_YEAR2000 );
 sal_uInt16 nNum = 
static_cast(m_xYearValueField->get_text().toInt32());
 if ( pUInt16Item && pUInt16Item->GetValue() != nNum )
 {
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 02772c7b2920..0822b3522817 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -929,19 +929,20 @@ void SvxRTFParser::BuildWhichTable()
 // Here are the IDs for all character attributes, which can be detected by
 // SvxParser and can be set in a SfxItemSet. The IDs are set correctly 
through
 // the SlotIds from POOL.
-for (sal_uInt16 nWid : {
+constexpr sal_uInt16 WIDS[] {
  SID_ATTR_CHAR_CASEMAP,SID_ATTR_BRUSH_CHAR,
SID_ATTR_CHAR_COLOR,
  SID_ATTR_CHAR_CONTOUR,SID_ATTR_CHAR_STRIKEOUT,
SID_ATTR_CHAR_ESCAPEMENT,
  SID_ATTR_CHAR_FONT,   SID_ATTR_CHAR_FONTHEIGHT,   
SID_ATTR_CHAR_KERNING,
  SID_ATTR_CHAR_LANGUAGE,   SID_ATTR_CHAR_POSTURE,  
SID_ATTR_CHAR_SHADOWED,
  SID_ATTR_CHAR_UNDERLINE,  SID_ATTR_CHAR_OVERLINE, 
SID_ATTR_CHAR_WEIGHT,
  SID_ATTR_CHAR_WORDLINEMODE,   SID_ATTR_CHAR_AUTOKERN, 
SID_ATTR_CHAR_CJK_FONT,
- SID_ATTR_CHAR_CJK_FONTHEIGHT, SID_ATTR_CHAR_CJK_LANGUAGE, 
SID_ATTR_CHAR_CJK_POSTURE,
+ SID_ATTR_CHAR_CJK_FONTHEIGHT, 
sal_uInt16(SID_ATTR_CHAR_CJK_LANGUAGE), SID_ATTR_CHAR_CJK_POSTURE,
  SID_ATTR_CHAR_CJK_WEIGHT, SID_ATTR_CHAR_CTL_FONT, 
SID_ATTR_CHAR_CTL_FONTHEIGHT,
  SID_ATTR_CHAR_CTL_LANGUAGE,   SID_ATTR_CHAR_CTL_POSTURE,  
SID_ATTR_CHAR_CTL_WEIGHT,
 

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

[Kevin Suo (via logerrit)]

 i18npool/inc/bullet.h |   32 +++-
 1 file changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 7e380a76e1f0faa90fdf8f0575053d4a1ca6e1de
Author: Kevin Suo 
AuthorDate: Thu Jan 27 10:28:10 2022 +0800
Commit: Eike Rathke 
CommitDate: Thu Jan 27 14:00:51 2022 +0100

Add CIRCLED NUMBER TWENTY ONE through CIRCLED NUMBER FIFTY to numbring list

Previously we only supported CIRCLED NUMBER ONE through CIRCLED NUMBER 
TWENTY.
Unicode aready has CIRCLED NUMBER TWENTY ONE through CIRCLED NUMBER FIFTY.
This improves Circled Numbering, especially for CJK.
E.g. ➀, ➁, ➂, ... ㉑, ㉒, ㉓, ... ㊽, ㊾, ㊿.

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

diff --git a/i18npool/inc/bullet.h b/i18npool/inc/bullet.h
index 67ea0f7d2600..403d197d2c88 100644
--- a/i18npool/inc/bullet.h
+++ b/i18npool/inc/bullet.h
@@ -239,7 +239,37 @@ const sal_Unicode table_CircledNumber[] = {
 0x2470, // CIRCLED NUMBER SEVENTEEN
 0x2471, // CIRCLED NUMBER EIGHTEEN
 0x2472, // CIRCLED NUMBER NINETEEN
-0x2473  // CIRCLED NUMBER TWENTY
+0x2473, // CIRCLED NUMBER TWENTY
+0x3251, // CIRCLED NUMBER TWENTY ONE
+0x3252, // CIRCLED NUMBER TWENTY TWO
+0x3253, // CIRCLED NUMBER TWENTY THREE
+0x3254, // CIRCLED NUMBER TWENTY FOUR
+0x3255, // CIRCLED NUMBER TWENTY FIVE
+0x3256, // CIRCLED NUMBER TWENTY SIX
+0x3257, // CIRCLED NUMBER TWENTY SEVEN
+0x3258, // CIRCLED NUMBER TWENTY EIGHT
+0x3259, // CIRCLED NUMBER TWENTY NINE
+0x325A, // CIRCLED NUMBER THIRTY
+0x325B, // CIRCLED NUMBER THIRTY ONE
+0x325C, // CIRCLED NUMBER THIRTY TWO
+0x325D, // CIRCLED NUMBER THIRTY THREE
+0x325E, // CIRCLED NUMBER THIRTY FOUR
+0x325F, // CIRCLED NUMBER THIRTY FIVE
+0x32B1, // CIRCLED NUMBER THIRTY SIX
+0x32B2, // CIRCLED NUMBER THIRTY SEVEN
+0x32B3, // CIRCLED NUMBER THIRTY EIGHT
+0x32B4, // CIRCLED NUMBER THIRTY NINE
+0x32B5, // CIRCLED NUMBER FORTY
+0x32B6, // CIRCLED NUMBER FORTY ONE
+0x32B7, // CIRCLED NUMBER FORTY TWO
+0x32B8, // CIRCLED NUMBER FORTY THREE
+0x32B9, // CIRCLED NUMBER FORTY FOUR
+0x32BA, // CIRCLED NUMBER FORTY FIVE
+0x32BB, // CIRCLED NUMBER FORTY SIX
+0x32BC, // CIRCLED NUMBER FORTY SEVEN
+0x32BD, // CIRCLED NUMBER FORTY EIGHT
+0x32BE, // CIRCLED NUMBER FORTY NINE
+0x32BF // CIRCLED NUMBER FIFTY
 };
 
 const sal_Unicode table_HangulJamo_ko[] = {

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 2 commits - configure.ac external/neon

[Jan-Marek Glogowski (via logerrit)]

 configure.ac  |2 ++
 external/neon/Library_neon.mk |6 ++
 2 files changed, 8 insertions(+)

New commits:
commit 1ed0feb0f1afbdc0d449a18883f505ee5c4de4a0
Author: Jan-Marek Glogowski 
AuthorDate: Fri Feb 7 10:05:27 2020 +
Commit: Michael Stahl 
CommitDate: Thu Jan 27 13:27:03 2022 +0100

neon: enable NE_DEBUG support for gb_ENABLE_DBGUTIL

This builds NEON with its debugging / logging facility, if
gb_ENABLE_DBGUTIL is set. This still has to be enabled in code by
calling something like ne_debug_init(stderr, NE_DBG_XML) to enable
and ne_debug_init(NULL, 0) to disable it again.

Change-Id: I85ea1cb2bd9586072d5a12a1cb809dd8c76b37d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88171
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 5c89198f69f4487b1c872269ec6f2931490b3d02)

diff --git a/external/neon/Library_neon.mk b/external/neon/Library_neon.mk
index 0afd6f4eff81..4c034a3178fb 100644
--- a/external/neon/Library_neon.mk
+++ b/external/neon/Library_neon.mk
@@ -91,4 +91,10 @@ $(eval $(call gb_Library_add_libs,neon,\
 ))
 endif
 
+ifneq (,$(gb_ENABLE_DBGUTIL))
+$(eval $(call gb_Library_add_cflags,neon,\
+-DNE_DEBUGGING \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
commit 1d4d8e2d7ef01f0d7057e3fe32f936553c268663
Author: Stephan Bergmann 
AuthorDate: Mon May 31 13:30:37 2021 +0200
Commit: Michael Stahl 
CommitDate: Thu Jan 27 13:26:55 2022 +0100

Adapt to hamcrest-2.2-3.fc35.noarch.rpm

Change-Id: Ibddfc30a5f0828ab77235ec1155f1c2e1eef24ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116506
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit e6c25186c8584f68b5f8074004556bd855200fff)

diff --git a/configure.ac b/configure.ac
index 970b5b7ab0f0..d6f1b0b055ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12067,6 +12067,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; 
then
 HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
 elif test -e /usr/share/java/hamcrest/core.jar; then
 HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
+elif test -e /usr/share/java/hamcrest/hamcrest.jar; then
+HAMCREST_JAR=/usr/share/java/hamcrest/hamcrest.jar
 else
 HAMCREST_JAR=/usr/share/java/hamcrest.jar
 fi

[Libreoffice-commits] core.git: osx/soffice.xcodeproj

[Tor Lillqvist (via logerrit)]

 osx/soffice.xcodeproj/project.pbxproj |  146 ++
 1 file changed, 146 insertions(+)

New commits:
commit 0b18b6b85de4088280f0be88016424562b207c9d
Author: Tor Lillqvist 
AuthorDate: Thu Jan 27 11:38:28 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Jan 27 13:15:39 2022 +0100

Add more source files for debugging convenience

Change-Id: If2f1d379e8e8694a3519d20eb3f425c0bbd381e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129032
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/osx/soffice.xcodeproj/project.pbxproj 
b/osx/soffice.xcodeproj/project.pbxproj
index 7c38c37538f7..0bfa12dbbf0f 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -713,6 +713,67 @@
BEACEEE1257FC853001BAABA /* StylesPreviewWindow.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
StylesPreviewWindow.cxx; path = ../svx/source/tbxctrls/StylesPreviewWindow.cxx; 
sourceTree = ""; };
BEACEEE2257FC853001BAABA /* fontworkgallery.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
fontworkgallery.cxx; path = ../svx/source/tbxctrls/fontworkgallery.cxx; 
sourceTree = ""; };
BEACEEE3257FC853001BAABA /* tbxcolor.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxcolor.cxx; 
path = ../svx/source/tbxctrls/tbxcolor.cxx; sourceTree = ""; };
+   BEB0730F27A1A29800F75C00 /* pdfdocument.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
pdfdocument.cxx; path = ../vcl/source/filter/ipdf/pdfdocument.cxx; sourceTree = 
""; };
+   BEB0731027A1A29800F75C00 /* pdfread.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfread.cxx; 
path = ../vcl/source/filter/ipdf/pdfread.cxx; sourceTree = ""; };
+   BEB0731327A2948700F75C00 /* fupoor.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fupoor.cxx; 
path = ../sd/source/ui/func/fupoor.cxx; sourceTree = ""; };
+   BEB0731427A2948700F75C00 /* undopage.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = undopage.cxx; 
path = ../sd/source/ui/func/undopage.cxx; sourceTree = ""; };
+   BEB0731527A2948700F75C00 /* fuscale.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuscale.cxx; 
path = ../sd/source/ui/func/fuscale.cxx; sourceTree = ""; };
+   BEB0731627A2948700F75C00 /* fuconuno.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuconuno.cxx; 
path = ../sd/source/ui/func/fuconuno.cxx; sourceTree = ""; };
+   BEB0731727A2948700F75C00 /* fusldlg.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fusldlg.cxx; 
path = ../sd/source/ui/func/fusldlg.cxx; sourceTree = ""; };
+   BEB0731827A2948700F75C00 /* futransf.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = futransf.cxx; 
path = ../sd/source/ui/func/futransf.cxx; sourceTree = ""; };
+   BEB0731927A2948700F75C00 /* fuexecuteinteraction.cxx */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
fuexecuteinteraction.cxx; path = ../sd/source/ui/func/fuexecuteinteraction.cxx; 
sourceTree = ""; };
+   BEB0731A27A2948700F75C00 /* fuconcs.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuconcs.cxx; 
path = ../sd/source/ui/func/fuconcs.cxx; sourceTree = ""; };
+   BEB0731B27A2948700F75C00 /* fuchar.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuchar.cxx; 
path = ../sd/source/ui/func/fuchar.cxx; sourceTree = ""; };
+   BEB0731C27A2948700F75C00 /* futext.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = futext.cxx; 
path = ../sd/source/ui/func/futext.cxx; sourceTree = ""; };
+   BEB0731D27A2948700F75C00 /* fumeasur.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fumeasur.cxx; 
path = ../sd/source/ui/func/fumeasur.cxx; sourceTree = ""; };
+   BEB0731E27A2948800F75C00 /* fuzoom.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuzoom.cxx; 
path = ../sd/source/ui/func/fuzoom.cxx; sourceTree = ""; };
+   BEB0731F27A2948800F75C00 /* fuhhconv.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuhhconv.cxx; 
path = ../sd/source/ui/func/fuhhconv.cxx; sourceTree = ""; };
+   BEB0732027A2948800F75C00 /* fucon3d.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fucon3d.cxx; 
path = ../sd/source/ui/func/fucon3d.cxx; sourceTree = ""; };
+   BEB0732127A2948800F75C00 /* fuprobjs.cxx */ = {isa = 
PBXFileReference; la

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

[Tor Lillqvist (via logerrit)]

 vcl/osx/OSXTransferable.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9a828b4d1fcd5bfa471df404dc40fe3ddfccfbb9
Author: Tor Lillqvist 
AuthorDate: Thu Jan 27 11:37:47 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Jan 27 13:14:26 2022 +0100

Add a SAL_INFO listing types on pasteboard

Change-Id: I6b1fa8da47f1140fc42287b05ee8d2afe5ee5d68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129031
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index f3ed1ec83fae..493d5b44cc9a 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -19,6 +19,7 @@
 
 #include 
 
+#include 
 #include 
 
 #include 
@@ -30,7 +31,8 @@
 
 #include "DataFlavorMapping.hxx"
 
-using namespace osl;
+#include 
+
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::datatransfer;
@@ -161,6 +163,9 @@ void OSXTransferable::initClipboardItemList()
  static_cast(this));
   }
 
+  SAL_INFO("vcl.macos.clipboard", "Types on pasteboard: " << 
NSStringArrayToOUString(pboardFormats));
+
+
   mFlavorList = mDataFlavorMapper->typesArrayToFlavorSequence(pboardFormats);
 }
 

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

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_views.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 4fa33b05e8128ced16240b663c1d3a487afb3f1d
Author: Julien Nabet 
AuthorDate: Thu Jan 27 13:07:55 2022 +0100
Commit: Julien Nabet 
CommitDate: Thu Jan 27 13:10:38 2022 +0100

Mysql/MariaDB: remove obsolete comment in views

Obsolete after eb69767d7c1bb8e6e780fd9503f08c9d7f5ecb45
Mysql/MariaDB: after creating a view then refresh, make it appear as a view
For this, I took example on hsqldb part this time (instead of Firebird 
which is uncomplete).

Also, deleting a brand new created table works now.

Of course, there are still pb with schema containing special characters 
like "`"

In fact, the description of the previous commit was wrong since renaming a 
view
still shows the table icon instead of view icon.
You must reopen the file so the icon is ok.

Change-Id: I2d27107db672e02af74e34a692309844ac310004
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129035
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_views.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
index f1b7eb3895be..c9bf0658652d 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
@@ -111,7 +111,6 @@ void connectivity::mysqlc::Views::createView(
 xStmt->execute(aSql);
 ::comphelper::disposeComponent(xStmt);
 }
-//  TODO find a way to refresh view to make the new one appear right away
 connectivity::mysqlc::Tables* pTables = 
static_cast(
 
static_cast(m_rParent).getPrivateTables());
 if (pTables)

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

[Caolán McNamara (via logerrit)]

 vcl/source/window/layout.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 8b58fb610e08b4d1ec11440e24207eaba345fe66
Author: Caolán McNamara 
AuthorDate: Thu Jan 27 10:45:08 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 27 13:10:23 2022 +0100

tdf#144166 use border drawing style for VclScrolledWindow

to avoid rounded rectangles on Windows.

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

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 91dcc41c5a01..da259ec40c63 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1815,7 +1815,7 @@ VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent)
 : VclBin(pParent, WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | 
WB_AUTOVSCROLL | WB_TABSTOP)
 , m_bUserManagedScrolling(false)
 , m_eDrawFrameStyle(DrawFrameStyle::NONE)
-, m_eDrawFrameFlags(DrawFrameFlags::NONE)
+, m_eDrawFrameFlags(DrawFrameFlags::WindowBorder)
 , m_pVScroll(VclPtr::Create(this, WB_HIDE | WB_VERT))
 , m_pHScroll(VclPtr::Create(this, WB_HIDE | WB_HORZ))
 , m_aScrollBarBox(VclPtr::Create(this, WB_HIDE))
@@ -2066,7 +2066,9 @@ bool VclScrolledWindow::set_property(const OString &rKey, 
const OUString &rValue
 }
 else if (rKey == "name")
 {
-m_eDrawFrameFlags = rValue == "monoborder" ? DrawFrameFlags::Mono 
: DrawFrameFlags::NONE;
+m_eDrawFrameFlags = DrawFrameFlags::WindowBorder;
+if (rValue == "monoborder")
+m_eDrawFrameFlags |= DrawFrameFlags::Mono;
 }
 
 auto nBorderWidth = CalcBorderWidth();

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

[Jan-Marek Glogowski (via logerrit)]

 configure.ac  |2 ++
 external/neon/Library_neon.mk |6 ++
 2 files changed, 8 insertions(+)

New commits:
commit bfd905f9ccd8ffe630ad03040fb22ec44f57148f
Author: Jan-Marek Glogowski 
AuthorDate: Fri Feb 7 10:05:27 2020 +
Commit: Michael Stahl 
CommitDate: Wed Jan 26 17:40:29 2022 +0100

neon: enable NE_DEBUG support for gb_ENABLE_DBGUTIL

This builds NEON with its debugging / logging facility, if
gb_ENABLE_DBGUTIL is set. This still has to be enabled in code by
calling something like ne_debug_init(stderr, NE_DBG_XML) to enable
and ne_debug_init(NULL, 0) to disable it again.

Change-Id: I85ea1cb2bd9586072d5a12a1cb809dd8c76b37d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88171
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 5c89198f69f4487b1c872269ec6f2931490b3d02)

diff --git a/external/neon/Library_neon.mk b/external/neon/Library_neon.mk
index 2698fe8aeff0..43ee401d93fd 100644
--- a/external/neon/Library_neon.mk
+++ b/external/neon/Library_neon.mk
@@ -97,4 +97,10 @@ $(eval $(call gb_Library_add_libs,neon,\
 ))
 endif
 
+ifneq (,$(gb_ENABLE_DBGUTIL))
+$(eval $(call gb_Library_add_cflags,neon,\
+-DNE_DEBUGGING \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
commit 3f335f68f33dd57d4588aca85a5ee67c85e8e06a
Author: Stephan Bergmann 
AuthorDate: Mon May 31 13:30:37 2021 +0200
Commit: Michael Stahl 
CommitDate: Wed Jan 26 17:40:29 2022 +0100

Adapt to hamcrest-2.2-3.fc35.noarch.rpm

Change-Id: Ibddfc30a5f0828ab77235ec1155f1c2e1eef24ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116506
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit e6c25186c8584f68b5f8074004556bd855200fff)

diff --git a/configure.ac b/configure.ac
index 627e5ddba650..c50eabb784c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11815,6 +11815,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; 
then
 HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
 elif test -e /usr/share/java/hamcrest/core.jar; then
 HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
+elif test -e /usr/share/java/hamcrest/hamcrest.jar; then
+HAMCREST_JAR=/usr/share/java/hamcrest/hamcrest.jar
 else
 HAMCREST_JAR=/usr/share/java/hamcrest.jar
 fi

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Weghorn (via logerrit)]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5801b9fc65508391e130670f79a9af51f18d4e96
Author: Michael Weghorn 
AuthorDate: Thu Jan 27 08:17:54 2022 +
Commit: Michael Weghorn 
CommitDate: Thu Jan 27 12:04:24 2022 +0100

Fix gtk3_kde5 build when qt5/kf5 VCL plugins are not built

Since

commit 894450d6ebbb2d5e063d72b971580d1b8c10a5e3
Author: Michael Weghorn 
Date:   Tue Sep 28 08:36:44 2021 +0200

Unify how Qt/KF build flags/libs are set

the qt5/kf5 externals are used to set includes and
compiler/linker flags for the gtk3_kde5 VCL plugin
as well.

However, the relevant link targets were only actually
defined as needed when building the qt5 and kf5 VCL plugins
was enabled as well.
Adapt that so that building the gtk3_kde5 VCL plugin
but not the qt5 and kf5 ones also works again
(e.g. '--enable-gtk3-kde5 --disable-qt5 --disable-kf5').

Change-Id: I65b75d7c2ccab71eade01aa2529fb45174056701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129022
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index fc18d0562277..2962679864fd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2979,7 +2979,7 @@ endef # gb_LinkTarget__use_postgresql
 
 endif # !SYSTEM_POSTGRESQL
 
-ifeq ($(ENABLE_KF5),TRUE)
+ifneq (,$(filter TRUE,$(ENABLE_KF5)$(ENABLE_GTK3_KDE5)))
 
 define gb_LinkTarget__use_kf5
 $(call gb_LinkTarget_set_include,$(1),\
@@ -3007,7 +3007,7 @@ endif # ENABLE_KF5
 
 
 
-ifeq ($(ENABLE_QT5),TRUE)
+ifneq (,$(filter TRUE,$(ENABLE_QT5)$(ENABLE_GTK3_KDE5)))
 
 define gb_LinkTarget__use_qt5
 $(call gb_LinkTarget_set_include,$(1),\

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

[Tor Lillqvist (via logerrit)]

 writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx  |   18 
++
 writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx |binary
 2 files changed, 18 insertions(+)

New commits:
commit 0101c7918bb735d796bc1bc0d1705f995e41ee98
Author: Tor Lillqvist 
AuthorDate: Wed Jan 26 13:02:06 2022 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jan 27 11:53:52 2022 +0100

Add simple unit test for recent fix to take layoutInCell into consideration

... when a graphic is in table row.

The test just checks that the IsFollowingTextFlow property gets set as
true, it doesn't check that the table row height actually is correct
or that the result looks correct.

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

diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx 
b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
index 2f9faefab55f..a20c8490501b 100644
--- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
@@ -388,6 +388,24 @@ CPPUNIT_TEST_FIXTURE(Test, testLayoutInCellWrapnoneColumn)
 CPPUNIT_ASSERT(xShape->getPropertyValue("IsFollowingTextFlow") >>= 
bFollowingTextFlow);
 CPPUNIT_ASSERT(!bFollowingTextFlow);
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testLayoutInCellOfHraphics)
+{
+// Given a file with a table, then a shape anchored inside the cell:
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"layout-in-cell-2.docx";
+
+// When loading that document:
+getComponent() = loadFromDesktop(aURL);
+
+// Then make sure the cell obeys the layoutInCell:
+uno::Reference 
xDrawPageSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+uno::Reference xShape(xDrawPage->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xNamedShape(xShape, uno::UNO_QUERY);
+bool bFollowingTextFlow = false;
+CPPUNIT_ASSERT(xShape->getPropertyValue("IsFollowingTextFlow") >>= 
bFollowingTextFlow);
+CPPUNIT_ASSERT(bFollowingTextFlow);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx 
b/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx
new file mode 100644
index ..5b6926460c80
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx differ

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

[Caolán McNamara (via logerrit)]

 chart2/source/tools/InternalDataProvider.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e0d6f0f9334e368ac45c68a41a736bb34fb31222
Author: Caolán McNamara 
AuthorDate: Thu Jan 27 09:18:50 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 27 11:52:07 2022 +0100

cid#1158096 silence Unchecked dynamic_cast

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

diff --git a/chart2/source/tools/InternalDataProvider.cxx 
b/chart2/source/tools/InternalDataProvider.cxx
index e2ecab399685..7a2fdb3aed84 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -314,10 +314,12 @@ InternalDataProvider::InternalDataProvider(
 bool bDefaultDataInColumns)
 :   m_bDataInColumns( bDefaultDataInColumns )
 {
+if (!xChartDoc.is())
+return;
 try
 {
 auto pModel = dynamic_cast(xChartDoc.get());
-assert(!xChartDoc || pModel);
+assert(pModel);
 rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram( 
pModel ) );
 if( xDiagram.is())
 {

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

[Caolán McNamara (via logerrit)]

 lotuswordpro/source/filter/lwpdrawobj.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f4209871f1054ac7dcc5d4b90ce8fc2087288c2b
Author: Caolán McNamara 
AuthorDate: Wed Jan 26 11:57:13 2022 +
Commit: Xisco Fauli 
CommitDate: Thu Jan 27 11:49:51 2022 +0100

ofz#44080 throw exception on a negative length

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

diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index dbd906a5c0bd..79707ebdad6b 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -1094,6 +1094,9 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& 
rStyleName )
 aEncoding = LwpCharSetMgr::GetTextCharEncoding();
 }
 
+if (TextLength < 2)
+throw BadRead();
+
 XFParagraph* pXFPara = new XFParagraph();
 pXFPara->Add(OUString(reinterpret_cast(m_aTextRec.pTextString), 
(TextLength-2), aEncoding));
 pXFPara->SetStyleName(rStyleName);

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

[Caolán McNamara (via logerrit)]

 lotuswordpro/source/filter/lwpdrawobj.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit af8709defeb90464c8724d3fe5fb8cbbf6efc2b8
Author: Caolán McNamara 
AuthorDate: Wed Jan 26 11:57:13 2022 +
Commit: Xisco Fauli 
CommitDate: Thu Jan 27 11:50:05 2022 +0100

ofz#44080 throw exception on a negative length

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

diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index a697b6b0de48..5de7ae30894d 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -1093,6 +1093,9 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& 
rStyleName )
 aEncoding = LwpCharSetMgr::GetTextCharEncoding();
 }
 
+if (TextLength < 2)
+throw BadRead();
+
 XFParagraph* pXFPara = new XFParagraph();
 pXFPara->Add(OUString(reinterpret_cast(m_aTextRec.pTextString), 
(TextLength-2), aEncoding));
 pXFPara->SetStyleName(rStyleName);

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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |   23 +++
 vcl/unx/gtk3/gtkinst.cxx  |   27 +++
 2 files changed, 22 insertions(+), 28 deletions(-)

New commits:
commit 0c7c475080a8d941db74060428a4a607e1a39b33
Author: Caolán McNamara 
AuthorDate: Thu Jan 27 09:01:08 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 27 11:44:25 2022 +0100

cid#1497856 Unchecked dynamic_cast

and

cid#1497857 Unchecked dynamic_cast
cid#1497858 Unchecked dynamic_cast
cid#1497859 Unchecked dynamic_cast
cid#1497860 Unchecked dynamic_cast
cid#1497861 Unchecked dynamic_cast

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 00039eb34c34..61789796f473 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1507,24 +1507,23 @@ void 
SalInstanceWindow::recursively_unset_default_buttons() { implResetDefault(m
 
 void SalInstanceWindow::change_default_widget(weld::Widget* pOld, 
weld::Widget* pNew)
 {
-if (!pOld)
-recursively_unset_default_buttons();
+SalInstanceWidget* pVclNew = dynamic_cast(pNew);
+vcl::Window* pWidgetNew = pVclNew ? pVclNew->getWidget() : nullptr;
+SalInstanceWidget* pVclOld = dynamic_cast(pOld);
+vcl::Window* pWidgetOld = pVclOld ? pVclOld->getWidget() : nullptr;
+if (pWidgetOld)
+pWidgetOld->set_property("has-default", OUString::boolean(false));
 else
-{
-SalInstanceWidget* pVclOld = dynamic_cast(pOld);
-pVclOld->getWidget()->set_property("has-default", 
OUString::boolean(false));
-}
-if (pNew)
-{
-SalInstanceWidget* pVclNew = dynamic_cast(pNew);
-pVclNew->getWidget()->set_property("has-default", 
OUString::boolean(true));
-}
+recursively_unset_default_buttons();
+if (pWidgetNew)
+pWidgetNew->set_property("has-default", OUString::boolean(true));
 }
 
 bool SalInstanceWindow::is_default_widget(const weld::Widget* pCandidate) const
 {
 const SalInstanceWidget* pVclCandidate = dynamic_cast(pCandidate);
-return pVclCandidate->getWidget()->GetStyle() & WB_DEFBUTTON;
+vcl::Window* pWidget = pVclCandidate ? pVclCandidate->getWidget() : 
nullptr;
+return pWidget && pWidget->GetStyle() & WB_DEFBUTTON;
 }
 
 void SalInstanceWindow::set_window_state(const OString& rStr)
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 5d681cf6cd23..e2801448ac73 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -6199,38 +6199,33 @@ public:
 
 virtual void change_default_widget(weld::Widget* pOld, weld::Widget* pNew) 
override
 {
-#if GTK_CHECK_VERSION(4, 0, 0)
 GtkInstanceWidget* pGtkNew = dynamic_cast(pNew);
 GtkWidget* pWidgetNew = pGtkNew ? pGtkNew->getWidget() : nullptr;
+#if GTK_CHECK_VERSION(4, 0, 0)
 gtk_window_set_default_widget(m_pWindow, pWidgetNew);
 (void)pOld;
 #else
-if (!pOld)
-recursively_unset_default_buttons();
-else
-{
-GtkInstanceWidget* pGtkOld = 
dynamic_cast(pOld);
-GtkWidget* pWidgetOld = pGtkOld->getWidget();
+GtkInstanceWidget* pGtkOld = dynamic_cast(pOld);
+GtkWidget* pWidgetOld = pGtkOld ? pGtkOld->getWidget() : nullptr;
+if (pWidgetOld)
 g_object_set(G_OBJECT(pWidgetOld), "has-default", false, nullptr);
-}
-if (pNew)
-{
-GtkInstanceWidget* pGtkNew = 
dynamic_cast(pNew);
-GtkWidget* pWidgetNew = pGtkNew->getWidget();
+else
+recursively_unset_default_buttons();
+if (pWidgetNew)
 g_object_set(G_OBJECT(pWidgetNew), "has-default", true, nullptr);
-}
 #endif
 }
 
 virtual bool is_default_widget(const weld::Widget* pCandidate) const 
override
 {
 const GtkInstanceWidget* pGtkCandidate = dynamic_cast(pCandidate);
-GtkWidget* pWidget = pGtkCandidate->getWidget();
+GtkWidget* pWidget = pGtkCandidate ? pGtkCandidate->getWidget() : 
nullptr;
 #if GTK_CHECK_VERSION(4, 0, 0)
-return gtk_window_get_default_widget(m_pWindow) == pWidget;
+return pWidget && gtk_window_get_default_widget(m_pWindow) == pWidget;
 #else
 gboolean has_default(false);
-g_object_get(G_OBJECT(pWidget), "has-default", &has_default, nullptr);
+if (pWidget)
+g_object_get(G_OBJECT(pWidget), "has-default", &has_default, 
nullptr);
 return has_default;
 #endif
 }

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

[Dennis Francis (via logerrit)]

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

New commits:
commit 6db8c9c40bbeb8c4c4601d0a05151754727a2dc6
Author: Dennis Francis 
AuthorDate: Thu Nov 18 12:32:26 2021 +0530
Commit: Dennis Francis 
CommitDate: Thu Jan 27 11:25:39 2022 +0100

lokCalcRTL: incorrect invalidation rectangle for...

cell properties change. LOK client expects invalidation rectangle in
document coordinates so ensure we don't mirror the x coordinate.

Change-Id: I27bdd29a0d56c7a7b838b7669e3edde805dd1504
(cherry picked from commit d819e543c13f85bd9c18fbe61c7983efab9d21c5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128895
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index d1543b22cfe6..123c34d93ed7 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2375,10 +2375,11 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SCRO
 continue;
 
 bool bLayoutRTL = aViewData.GetDocument().IsLayoutRTL( 
aViewData.GetTabNo() );
-tools::Long nLayoutSign = bLayoutRTL ? -1 : 1;
+tools::Long nLayoutSign = (!bIsTiledRendering && bLayoutRTL) ? -1 : 1;
 
 Point aStart = aViewData.GetScrPos( nCol1, nRow1, 
static_cast(i) );
 Point aEnd   = aViewData.GetScrPos( nCol2+1, nRow2+1, 
static_cast(i) );
+
 if ( eMode == ScUpdateMode::All )
 {
 if (bIsTiledRendering)
@@ -2390,11 +2391,11 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SCRO
 // Remember that wsd expects int and that aEnd.X() is
 // in pixels and will be converted in twips, before performing
 // the lok callback, so we need to avoid that an overflow 
occurs.
-aEnd.setX( bLayoutRTL ? 0 : std::numeric_limits::max() / 
1000 );
+aEnd.setX( (!bIsTiledRendering && bLayoutRTL) ? 0 : 
std::numeric_limits::max() / 1000 );
 }
 else
 {
-aEnd.setX( bLayoutRTL ? 0 : 
pGridWin[i]->GetOutputSizePixel().Width() );
+aEnd.setX( (!bIsTiledRendering && bLayoutRTL) ? 0 : 
pGridWin[i]->GetOutputSizePixel().Width() );
 }
 }
 aEnd.AdjustX( -nLayoutSign );

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

[Dennis Francis (via logerrit)]

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

New commits:
commit 2cb7c14eff5c4b2051c7039ba31239ee6a2a68f0
Author: Dennis Francis 
AuthorDate: Wed Nov 17 17:13:16 2021 +0530
Commit: Dennis Francis 
CommitDate: Thu Jan 27 11:22:26 2022 +0100

lokCalcRTL: selections: lokclients need exact document coordinates

so do not do horizontal mirroring.

Change-Id: I93432002810dacfeb609268f436bdf2cfecb3a60
(cherry picked from commit 241909beda0d8985667435127e16bdf902850932)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128894
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 1dc1bab5e5f7..febc8a0e3b8b 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -2194,7 +2194,8 @@ void ScGridWindow::GetRectsAnyFor(const ScMarkData 
&rMarkData,
 double nPPTX = mrViewData.GetPPTX();
 double nPPTY = mrViewData.GetPPTY();
 bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
-tools::Long nLayoutSign = bLayoutRTL ? -1 : 1;
+// LOK clients needs exact document coordinates, so don't horizontally 
mirror them.
+tools::Long nLayoutSign = (!comphelper::LibreOfficeKit::isActive() && 
bLayoutRTL) ? -1 : 1;
 
 ScMarkData aMultiMark( rMarkData );
 aMultiMark.SetMarking( false );

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

[Samuel Mehrbrodt (via logerrit)]

 sc/source/core/tool/dbdata.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 26d7f3440a0c9dd179ad407d48ce747699d678dd
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jan 27 09:05:35 2022 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jan 27 11:06:18 2022 +0100

Fix copying named DB when it doesn't contain a '_'

Follow-up for d9472a5284fde7bb96823655efcb6eb31f405493

Change-Id: Ib97d2c81159ddcf60604558f38e87af59cef86dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129023
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index b87e388e79fc..25dc833e3732 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -998,7 +998,9 @@ OUString 
lcl_IncrementNumberInNamedRange(ScDBCollection::NamedDBs& namedDBs,
  const OUString& sOldName,bool 
bIsUpperName)
 {
 sal_Int32 lastIndex = sOldName.lastIndexOf('_');
-sal_Int32 nOldNumber = OUString(sOldName.subView(lastIndex)).toInt32();
+sal_Int32 nOldNumber = 0;
+if (lastIndex >= 0)
+nOldNumber = OUString(sOldName.subView(lastIndex)).toInt32();
 OUString sNewName;
 do
 {

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

[Caolán McNamara (via logerrit)]

 sfx2/source/appl/childwin.cxx   |4 ++--
 sfx2/source/dialog/basedlgs.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a714dfbfb266839633156ef02669ee2c919d1615
Author: Caolán McNamara 
AuthorDate: Thu Jan 27 08:52:01 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 27 10:51:54 2022 +0100

use WindowStateMask::Size

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

diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index ae8e7c35ad71..2eb6bdc0652d 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -313,7 +313,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
 aInfo.aSize = pDialog->get_size();
 WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
 if (pDialog->get_resizable())
-nMask |= WindowStateMask::Width | WindowStateMask::Height;
+nMask |= WindowStateMask::Size;
 aInfo.aWinState = pDialog->get_window_state(nMask);
 }
 else if (pWindow)
@@ -324,7 +324,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
 {
 WindowStateMask nMask = WindowStateMask::Pos | 
WindowStateMask::State;
 if ( pWindow->GetStyle() & WB_SIZEABLE )
-nMask |= WindowStateMask::Width | WindowStateMask::Height;
+nMask |= WindowStateMask::Size;
 aInfo.aWinState = 
static_cast(pWindow.get())->GetWindowState( nMask );
 }
 else if (DockingWindow* pDockingWindow = 
dynamic_cast(pWindow.get()))
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 2fefb02ff125..362d2d3c6961 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -175,7 +175,7 @@ void SfxModelessDialogController::ChildWinDispose()
 {
 WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
 if (m_xDialog->get_resizable())
-nMask |= WindowStateMask::Width | WindowStateMask::Height;
+nMask |= WindowStateMask::Size;
 m_xImpl->aWinState = m_xDialog->get_window_state(nMask);
 GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( 
SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, 
m_xImpl->pMgr->GetType() );
 }

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

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf139737.fodt   |  306 
 sw/qa/extras/uiwriter/uiwriter3.cxx |   24 ++
 writerfilter/source/dmapper/PropertyMap.cxx |   13 -
 writerfilter/source/dmapper/PropertyMap.hxx |3 
 4 files changed, 341 insertions(+), 5 deletions(-)

New commits:
commit 938a6a01168c6e091cea6735b1e4037c075dbabb
Author: Michael Stahl 
AuthorDate: Wed Jan 26 16:54:54 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jan 27 10:40:53 2022 +0100

tdf#139737 sw_fieldmarkhide: add unit test

Change-Id: I4adfed97a00db71d42bbc4771221f5ebde43197c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128997
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit cd62fa66a7b57c1cdcbf7cdbdf155edf8e40c9fc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128961
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/data/tdf139737.fodt 
b/sw/qa/extras/uiwriter/data/tdf139737.fodt
new file mode 100644
index ..ff9fcfe2105e
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf139737.fodt
@@ -0,0 +1,306 @@
+
+http://openoffice.org/2009/office"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
xiscoxisco112020-05-29T10:25:002020-05-29T10:32:00PT7MLibreOfficeDev/7.3.1.0.0$Linux_X86_64
 
LibreOffice_project/54cda94175f372695c55576817e3ae14655598ea14.
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+   
+   
+  
+  
+   
+  
+  
+   
+
+ 
+ 
+
+   
+  
+  
+   
+  
+  
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+  
+  
+  
+  
+  
+   
+  
+ 
+ 
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+   
+   
+
+   
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+
+   
+   
+   
+
+   
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+ 
+ 
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+  
+ 
+  
+   
+
+
+
+
+
+   
+   
+   
+x
+
+x
+
+
+
+
+
+
+
+
+
+
+
+x
+
+
+
+
+
+
+
+
+
+
+
+
+
+x
+
+
+
+   
+  
+ 

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

[Rash419 (via logerrit)]

 filter/qa/unit/data/attributeRedefinedTest.odp |binary
 filter/qa/unit/svg.cxx |   42 +
 filter/source/svg/svgwriter.cxx|   14 +++-
 3 files changed, 55 insertions(+), 1 deletion(-)

New commits:
commit 0b5c5a4691cdfeeac3d00a74dd7d7e1fe0af5fb6
Author: Rash419 
AuthorDate: Mon Jan 24 15:56:15 2022 +0530
Commit: Andras Timar 
CommitDate: Thu Jan 27 10:32:40 2022 +0100

svgexport: fix: attribute id redefined

If there is a id for empty paragraph exist we need to create a empty
text paragraph to accomodate the id if we don't do that then we
get multiple id attribute on same element for example:


Change-Id: I41c21dc94deef93e423aaff2248f6931fa6ca8de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128856
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128924
Tested-by: Jenkins
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128954

diff --git a/filter/qa/unit/data/attributeRedefinedTest.odp 
b/filter/qa/unit/data/attributeRedefinedTest.odp
new file mode 100644
index ..dfb814bfb9ec
Binary files /dev/null and b/filter/qa/unit/data/attributeRedefinedTest.odp 
differ
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index 3e3508fd52ca..a93d92c7d1ea 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -209,6 +209,48 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testCustomBullet)
 CPPUNIT_ASSERT(!getXPath(pXmlDoc, 
"//svg:g[@class='BulletChars']//svg:path", "d").isEmpty());
 }
 
+CPPUNIT_TEST_FIXTURE(SvgFilterTest, attributeRedefinedTest)
+{
+// Load document containing empty paragraphs with ids.
+load(u"attributeRedefinedTest.odp");
+
+// Export to SVG.
+uno::Reference xStorable(getComponent(), 
uno::UNO_QUERY_THROW);
+SvMemoryStream aStream;
+uno::Reference xOut = new 
utl::OOutputStreamWrapper(aStream);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("impress_svg_Export");
+aMediaDescriptor["OutputStream"] <<= xOut;
+xStorable->storeToURL("private:stream", 
aMediaDescriptor.getAsConstPropertyValueList());
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aStream);
+
+// We expect four paragraph
+// 2 empty paragraphs with ids
+// 2 paragraphs with text
+// Without the accompanying fix the test would have failed with
+// Expected : 4
+// Actual : 2
+// i.e. 2 of the empty paragraph do not get generated even if there
+// is id imported for the paragraphs
+// If we don't create the empty paragraphs the id attribute attribute gets 
redefined like this:
+// 
+
+OString xPath = 
"//svg:g[@class='TextShape']//svg:text[@class='SVGTextShape']//"
+"svg:tspan[@class='TextParagraph']";
+assertXPath(pXmlDoc, xPath, 4);
+
+//assert that each tspan element with TextParagraph class has id and the 
tspan element of
+//each empty paragraph doesnot contain tspan element with class 
TextPosition
+assertXPath(pXmlDoc, xPath + "[1]", "id", "id4");
+assertXPath(pXmlDoc, xPath + "[2]", "id", "id5");
+assertXPath(pXmlDoc, xPath + "[2]//svg:tspan[@class='TextPosition']", 0);
+assertXPath(pXmlDoc, xPath + "[3]", "id", "id6");
+assertXPath(pXmlDoc, xPath + "[3]//svg:tspan[@class='TextPosition']", 0);
+assertXPath(pXmlDoc, xPath + "[4]", "id", "id7");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 159ae1b9a9c2..10d4982bee80 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1098,7 +1098,19 @@ bool SVGTextWriter::nextParagraph()
 const OUString& rParagraphId = implGetValidIDFromInterface( 
Reference(xTextContent, UNO_QUERY) );
 if( !rParagraphId.isEmpty() )
 {
-mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId );
+// if there is id for empty paragraph we need to create a empty 
text paragraph
+Reference < XTextRange > xRange( xTextContent, UNO_QUERY_THROW );
+if ( xRange.is() && xRange->getString().isEmpty() )
+{
+endTextParagraph();
+mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", 
"TextParagraph" );
+mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId 
);
+mpTextParagraphElem.reset(new SvXMLElementExport( mrExport, 
XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ));
+}
+else
+{
+mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId 
);
+}
 }
 return true;
 }

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svtools officecfg/registry sc/source svtools/source

[Heiko Tietze (via logerrit)]

 cui/source/options/optcolor.cxx|1 
 cui/uiconfig/ui/colorconfigwin.ui  |   77 +
 include/svtools/colorcfg.hxx   |1 
 officecfg/registry/data/org/openoffice/Office/UI.xcu   |   16 +++
 officecfg/registry/schema/org/openoffice/Office/UI.xcs |   16 +++
 sc/source/ui/inc/gridwin.hxx   |1 
 sc/source/ui/view/gridwin4.cxx |   38 
 svtools/source/config/colorcfg.cxx |2 
 8 files changed, 135 insertions(+), 17 deletions(-)

New commits:
commit ba0100be03c6bbc5ae10201bae340b3f7b7c4500
Author: Heiko Tietze 
AuthorDate: Tue Jan 18 12:20:57 2022 +0100
Commit: Heiko Tietze 
CommitDate: Thu Jan 27 10:31:52 2022 +0100

Resolves tdf#128258 - Draw a dotted line before hidden columns/rows

Color and on/off configurable via Tools > Options > Application Colors

Change-Id: Ia4b1e1c86f36d1b0f508a5b3e866a79418f16c5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128553
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 81030a79e9c8..0bf654b3e031 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -127,6 +127,7 @@ const vEntryInfo[] =
 { Group_Calc,IDS(brk) },
 { Group_Calc,IDS(brkmanual) },
 { Group_Calc,IDS(brkauto) },
+{ Group_Calc,IDS_CB(hiddencolrow) },
 { Group_Calc,IDS(det) },
 { Group_Calc,IDS(deterror) },
 { Group_Calc,IDS(ref) },
diff --git a/cui/uiconfig/ui/colorconfigwin.ui 
b/cui/uiconfig/ui/colorconfigwin.ui
index c25ddba4cf7d..319ac0e483ec 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -795,7 +795,7 @@
 0
 none
 
-  
+  
   
 True
 False
@@ -944,7 +944,7 @@
   
   
 0
-4
+5
   
 
 
@@ -961,7 +961,7 @@
   
   
 1
-4
+5
   
 
 
@@ -978,7 +978,7 @@
   
   
 1
-5
+6
   
 
 
@@ -993,7 +993,7 @@
   
   
 0
-5
+6
   
 
 
@@ -1010,7 +1010,7 @@
   
   
 1
-6
+7
   
 
 
@@ -1025,7 +1025,7 @@
   
   
 0
-6
+7
   
 
 
@@ -1042,7 +1042,7 @@
   
   
 1
-7
+8
   
 
 
@@ -1057,7 +1057,7 @@
   
   
 0
-7
+8
   
 
 
@@ -1074,7 +1074,7 @@
   
   
 1
-8
+9
   
 
 
@@ -1089,7 +1089,7 @@
   
   
 0
-8
+9
   
 
 
@@ -1106,7 +1106,7 @@
   
   
 1
-9
+10
   
 
 
@@ -1121,7 +1121,7 @@
   
   
 0
-9
+10
   
 
 
@@ -1138,7 +1138,7 @@
   
   
 1
-10
+11
   
 
 
@@ -1153,7 +1153,7 @@
   
   
 0
-10
+11
   
 
 
@@ -1170,7 +1170,7 @@
   
   
 1
-11
+12
   
 
 
@@ -1185,7 +1185,50 @@
   
   
 0
-11
+12
+  
+
+
+  
+Hidden columns/rows
+True
+True
+False
+start
+center
+True
+
+  
+
+  
+  
+0
+4
+  
+
+
+  
+True
+True
+False
+end
+True
+
+
+  
+   

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

[Caolán McNamara (via logerrit)]

 include/vcl/vclenum.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2f4f4cbeb8e50081d607b86b0475b93971c40ab8
Author: Caolán McNamara 
AuthorDate: Wed Jan 26 17:00:08 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 27 09:46:43 2022 +0100

add WindowStateMask::Size for convenience

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

diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index eebefc92ce1b..6e0359fa2699 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -131,6 +131,7 @@ enum class WindowStateMask {
 MaximizedWidth   = 0x0400,
 MaximizedHeight  = 0x0800,
 Pos  = X | Y,
+Size = Width | Height,
 All  = X | Y | Width | Height | MaximizedX | MaximizedY | 
MaximizedWidth | MaximizedHeight | State | Minimized
 };
 namespace o3tl

Re: GSoC ideas wiki page gardening

[Ilmari Lauhakangas]

On 27.1.2022 7.18, Tomaž Vajngerl wrote:

Hi Ilmari,

On Tue, Jan 25, 2022 at 2:40 AM Ilmari Lauhakangas 
> wrote:


We need some medium ones as well, so please consider either adding new
ideas or splitting old ones (can be 175 + 350 split, if you rethink the
scope).


Any suggestions on how to present a splitted idea in the idea page? 
Would it be good to just define "medium size" to include these goals, 
and "large size" additionally includes those goals? And say under Size 
"medium or large"?


That's a good question. I had thought to just have them as separate 
ideas that can be worked on in parallel, but I guess you could define 
them as you say.


The project list guide does say this about defining different scopes for 
a project:


"Projects should take ~175 hours or ~350 hours for GSoC contributors to 
complete. We understand some GSoC contributors will take less time (if 
they have more knowledge of the topic or codebase) while others could 
spend more time. It is also possible that a given project idea could be 
175 hours or 350 hours depending on the scope of the idea. If the GSoC 
contributor proposes to do a smaller scope of the idea then it might be 
a 175 hr project versus if they propose doing more work with their 
proposal it could be a 350 hour project."


https://google.github.io/gsocguides/mentor/defining-a-project-ideas-list

Ilmari

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - writerfilter/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
|   23 ++
 writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx 
|binary
 writerfilter/source/dmapper/GraphicImport.cxx 
|7 +++
 3 files changed, 30 insertions(+)

New commits:
commit a43cd444b6c1b22e22eaf9279d8eb19de0f8ec5a
Author: Miklos Vajna 
AuthorDate: Mon Jan 24 12:53:25 2022 +0100
Commit: Mike Kaganski 
CommitDate: Thu Jan 27 09:19:37 2022 +0100

DOCX import: fix  with 

If wrap is set to none ("in front of text"), then  ignores layoutInCell="1" in Word. But in case
relativeFrom is something else (e.g. page) or wrap is not none, then the
old behavior is OK.

Adjust our import so that Writer's layout also allows this shape to
leave the cell.

(cherry picked from commit e993638d5ecd33783f2eebdccfa87a81e5a8a2c5)

Conflicts:
writerfilter/source/dmapper/GraphicImport.cxx

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

diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx 
b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
index 0d0cd12c8c1c..a0286ac96a2b 100644
--- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
@@ -275,6 +275,29 @@ CPPUNIT_TEST_FIXTURE(Test, testTextboxTextlineTop)
 sal_Int16 nExpectedOrient = text::VertOrientation::BOTTOM;
 CPPUNIT_ASSERT_EQUAL(nExpectedOrient, nActualOrient);
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testLayoutInCellWrapnoneColumn)
+{
+// Given a file with a table, then a shape anchored inside the cell:
+OUString aURL
+= m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"layout-in-cell-wrapnone-column.docx";
+
+// When loading that document:
+getComponent() = loadFromDesktop(aURL);
+
+// Then make sure the shape can leave the cell:
+uno::Reference 
xDrawPageSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+uno::Reference xShape(xDrawPage->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xNamedShape(xShape, uno::UNO_QUERY);
+// Not "Frame".
+CPPUNIT_ASSERT(xNamedShape->getName().startsWith("Text Box"));
+bool bFollowingTextFlow = true;
+// Without the accompanying fix in place, this test would have failed, the 
shape was not allowed
+// to leave the cell, leading to incorrect layout.
+CPPUNIT_ASSERT(xShape->getPropertyValue("IsFollowingTextFlow") >>= 
bFollowingTextFlow);
+CPPUNIT_ASSERT(!bFollowingTextFlow);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git 
a/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx 
b/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
new file mode 100644
index ..d88761421154
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx 
differ
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 07669e8e66b5..23aa3cc36ac3 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -986,6 +986,13 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
 // But they aren't Writer pictures, either (which are 
already handled above).
 uno::Reference< beans::XPropertySet > 
xShapeProps(m_xShape, uno::UNO_QUERY_THROW);
 
+if (m_pImpl->nWrap == text::WrapTextMode_THROUGH && 
m_pImpl->nHoriRelation == text::RelOrientation::FRAME)
+{
+// text::RelOrientation::FRAME is OOXML's 
"column", which behaves as if
+// layout-in-cell would be always off.
+m_pImpl->bLayoutInCell = false;
+}
+
 // Anchored: Word only supports at-char in that case.
 text::TextContentAnchorType eAnchorType = 
text::TextContentAnchorType_AT_CHARACTER;
 

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

[Noel Grandin (via logerrit)]

 sw/source/uibase/dochdl/swdtflvr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9c3e9bbe780a394e43bf380cdedb6f2c9c8d8ac
Author: Noel Grandin 
AuthorDate: Thu Jan 27 09:12:29 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 27 09:06:14 2022 +0100

fix ubsan downcast of SfxInt16Item

source seems to be
commit 0c8b1efbad48fa9697c0b1afbe4753bbbc3c4c5c
Date:   Fri Oct 25 15:02:26 2019 +0200
tdf#127759 Writer: add table row/column insert mode

/sw/source/uibase/shells/tabsh.cxx:872:26: runtime error: downcast of
address 0x60300137c2f0 which does not point to an object of type 'const
SfxInt16Item'
0x60300137c2f0: note: object is of type 'SfxUInt16Item'
83 25 00 34  d0 ad 9b bc d1 2a 00 00  01 00 00 00 1f 50 00 be  03 00 be
be be be be be  00 00 00 00
  ^~~
  vptr for 'SfxUInt16Item'
/sw/source/uibase/shells/tabsh.cxx:872:26
SfxRequest&) /workdir/SdiTarget/sw/sdi/swslots.hxx:12197:1
const&, SfxRequest&, bool) /sfx2/source/control/dispatch.cxx:254:9
const&, SfxRequest&, SfxCallMode)
/sfx2/source/control/dispatch.cxx:753:9

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

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 65fefd68804b..8d8c5baf5d6a 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1610,7 +1610,7 @@ bool SwTransferable::Paste(SwWrtShell& rSh, 
TransferableDataHelper& rData, RndSt
 // add the other new empty rows/columns after the actual table 
row/column
 if ( nSelectedRowsOrCols > 1 )
 {
-SfxUInt16Item aCountItem( nDispatchSlot, nSelectedRowsOrCols-1 
);
+SfxInt16Item aCountItem( nDispatchSlot, nSelectedRowsOrCols-1 
);
 SfxBoolItem aAfter( FN_PARAM_INSERT_AFTER, true );
 pDispatch->ExecuteList(nDispatchSlot,
 SfxCallMode::SYNCHRON|SfxCallMode::RECORD,