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

[Heiko Tietze (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit c32994e22ff291b0227ed74de6d0d050cf0901c8
Author: Heiko Tietze 
AuthorDate: Mon Jan 10 13:08:47 2022 +0100
Commit: Heiko Tietze 
CommitDate: Mon Jan 17 08:45:52 2022 +0100

Resolves tdf#143733 - Make selection border wider

Border width and handle size follow the zoom factor now
Border is drawn evenly inside and outside the rectangle

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

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 543a60abb673..2404ea47dd29 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6475,9 +6475,15 @@ void ScGridWindow::UpdateCursorOverlay()
 std::vector< basegfx::B2DRange > aRanges;
 const basegfx::B2DHomMatrix 
aTransform(GetOutDev()->GetInverseViewTransformation());
 
+// tdf#143733, tdf#145080 - improve border visibility
+// constants picked for maximum consistency at 100% and 
adequate response on zoom
+// line width = 1.5 at 100% (0.75 left +/- 0.75 right), 50% = 
1, 200% = 1.25, 400% = 2.25
+const double MinSize = 0.25 * GetDPIScaleFactor();
+double fZoom(mrViewData.GetZoomX() * 0.5);
 for(const tools::Rectangle & rRA : aPixelRects)
 {
-basegfx::B2DRange aRB(rRA.Left(), rRA.Top(), rRA.Right() + 
1, rRA.Bottom() + 1);
+basegfx::B2DRange aRB(rRA.Left() - MinSize - fZoom, 
rRA.Top() - MinSize - fZoom,
+  rRA.Right() + MinSize + fZoom, 
rRA.Bottom() + MinSize + fZoom);
 aRB.transform(aTransform);
 aRanges.push_back(aRB);
 }
@@ -6632,9 +6638,13 @@ void ScGridWindow::UpdateAutoFillOverlay()
 ScDocument& rDoc = mrViewData.GetDocument();
 bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
 
-float fScaleFactor = GetDPIScaleFactor();
+   // tdf#143733 tdf#145080 - improve border visibility
+   // constants picked for maximum consistency at 100%
+   // size = 6 at 100% (as before), 50% = 4.5, 200% = 9, 400% = 15
+const float fScaleFactor = 3 * GetDPIScaleFactor();
+const double fZoom(3 * mrViewData.GetZoomX());
 // Size should be even
-Size aFillHandleSize(6 * fScaleFactor, 6 * fScaleFactor);
+Size aFillHandleSize(fZoom + fScaleFactor, fZoom + fScaleFactor);
 
 Point aFillPos = mrViewData.GetScrPos( nX, nY, eWhich, true );
 tools::Long nSizeXPix;

Re: Problems with lighting of extruded custom-shapes

[Miklos Vajna]

Hi Regina,

On Fri, Jan 07, 2022 at 07:22:19PM +0100, Regina Henschel 
 wrote:
> > I assume doing that would be the scope of
> > .
> > 
> 
> Yes, but the Budget2022 proposal has import of text in addition, which can
> be included in the object rotation in MSO.
> 
> However, the suggestion text is not clear. It can be interpreted as using
> "SdrObjCustomShape" or as using "E3dScene".

I think the proposal is to add MSO-compatible 3D effects, so extend
SdrObjCustomShape with properties that allow importing and rendering
these 3D properties.

My understanding is that E3dScene is nice, but it doesn't preserve
editable text, and in general not a 1:1 match to MSO's 3D approach,
which is just a set of additional properties on (2D) shapes.

> The "E3dScene" has no corresponding shape type in OOXML and not in binary MS
> format.

Good, that matches the above. :-)

> MS goes a different way and has introduced "3D Model". That is a GLB media
> file, which is inserted as w:graphic and uses the object rotation and camera
> from OOXML.

I assume those 3d models are less interesting to you. It's somewhat
ironic that we had GLTF models and it was removed as nobody bothered to
keep the feature... :-)

> I'll write a bug report for RTF import.

Thanks, got it. I'm interested to take a look once you're happy with the
binary filters (so I can use that behavior as reference).

Regards,

Miklos

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

[Dhiraj Holden (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 
 sw/source/uibase/config/usrpref.cxx|7 ++--
 sw/source/uibase/uiview/view.cxx   |   22 -
 3 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit 5b07acbf3345918f450fccf7ee243ad5bcb3fd67
Author: Dhiraj Holden 
AuthorDate: Tue Dec 7 08:16:59 2021 -0500
Commit: Mike Kaganski 
CommitDate: Mon Jan 17 07:33:18 2022 +0100

tdf#142450 add code to store showing whitespace

I have put in code to store the option to show whitespace.
This option is stored at the document level like the other
layout options.

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index af944c23c03f..c68dac23d988 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1618,6 +1618,14 @@
   
   false
 
+
+  
+  
+Specifies whether to hide whitespace.
+View Layout Hide Whitespace
+  
+  false
+
   
 
 
diff --git a/sw/source/uibase/config/usrpref.cxx 
b/sw/source/uibase/config/usrpref.cxx
index e0949660471d..ed33926492eb 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -271,9 +271,10 @@ Sequence SwLayoutViewConfig::GetPropertyNames() 
const
 "ViewLayout/BookMode",  //17
 "Other/IsSquaredPageMode",  //18
 "Other/ApplyCharUnit",  //19
-"Window/ShowScrollBarTips"  //20
+"Window/ShowScrollBarTips", //20
+"ViewLayout/HideWhitespace",//21
 };
-const int nCount = m_bWeb ? 14 : 21;
+const int nCount = m_bWeb ? 14 : 22;
 Sequence aNames(nCount);
 OUString* pNames = aNames.getArray();
 for(int i = 0; i < nCount; i++)
@@ -336,6 +337,7 @@ void SwLayoutViewConfig::ImplCommit()
 case 18: rVal <<= m_rParent.IsSquaredPageMode(); break;
   // "Other/IsSquaredPageMode",
 case 19: rVal <<= m_rParent.IsApplyCharUnit(); break;  
   // "Other/ApplyCharUnit",
 case 20: rVal <<= m_rParent.IsShowScrollBarTips(); break;  
   // "Window/ShowScrollBarTips",
+case 21: rVal <<= m_rParent.IsHideWhitespaceMode(); break; 
   // "ViewLayout/HideWhitespace"
 }
 }
 PutProperties(aNames, aValues);
@@ -392,6 +394,7 @@ void SwLayoutViewConfig::Load()
 case 18: m_rParent.SetDefaultPageMode(bSet,true); break;// 
"Other/IsSquaredPageMode",
 case 19: m_rParent.SetApplyCharUnit(bSet, true); break;// 
"Other/ApplyUserChar"
 case 20: m_rParent.SetShowScrollBarTips(bSet); break;// 
"Window/ShowScrollBarTips",
+case 21: m_rParent.SetHideWhitespaceMode(bSet); break;// 
"ViewLayout/HideWhitespace"
 }
 }
 }
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index aa0a4738ee55..7500f740369b 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1318,6 +1318,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < 
beans::PropertyValue >
 sal_Int16 nZoomFactor = static_cast < sal_Int16 > (pVOpt->GetZoom());
 bool bViewLayoutBookMode = pVOpt->IsViewLayoutBookMode();
 sal_Int16 nViewLayoutColumns = pVOpt->GetViewLayoutColumns();
+bool bHideWhitespace = pVOpt->IsHideWhitespaceMode();
 
 bool bSelectedFrame = ( m_pWrtShell->GetSelFrameType() != 
FrameTypeFlags::NONE ),
  bGotVisibleLeft = false,
@@ -1325,6 +1326,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < 
beans::PropertyValue >
  bGotVisibleBottom = false, bGotZoomType = false,
  bGotZoomFactor = false, bGotIsSelectedFrame = false,
  bGotViewLayoutColumns = false, bGotViewLayoutBookMode = false,
+ bGotHideWhitespace = false,
  bBrowseMode = false, bGotBrowseMode = false;
 bool bKeepRatio = pVOpt->IsKeepRatio();
 bool bGotKeepRatio = false;
@@ -1400,6 +1402,11 @@ void SwView::ReadUserDataSequence ( const uno::Sequence 
< beans::PropertyValue >
 rValue.Value >>= bKeepRatio;
 bGotKeepRatio = true;
 }
+else if (rValue.Name == "HideWhitespace")
+{
+rValue.Value >>= bHideWhitespace;
+bGotHideWhitespace = true;
+}
 // Fallback to common SdrModel processing
 else

GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->ReadUser

[Libreoffice-commits] core.git: editeng/inc editeng/IwyuFilter_editeng.yaml editeng/qa editeng/source embeddedobj/source emfio/inc emfio/qa emfio/source extensions/inc extensions/IwyuFilter_extensions

[Gabor Kelemen (via logerrit)]

 editeng/IwyuFilter_editeng.yaml |3 +++
 editeng/inc/strings.hrc |2 ++
 editeng/qa/unit/core-test.cxx   |3 ---
 editeng/source/editeng/editobj.cxx  |2 --
 editeng/source/editeng/editview.cxx |4 
 editeng/source/editeng/eerdll.cxx   |1 -
 editeng/source/editeng/impedit4.cxx |3 +--
 editeng/source/items/numitem.cxx|1 -
 editeng/source/items/xmlcnitm.cxx   |1 -
 editeng/source/misc/svxacorr.cxx|1 -
 editeng/source/uno/unofored_internal.hxx|1 +
 editeng/source/uno/unonrule.cxx |1 -
 embeddedobj/source/commonembedding/miscobj.cxx  |1 -
 embeddedobj/source/commonembedding/persistence.cxx  |1 -
 embeddedobj/source/msole/olepersist.cxx |1 -
 embeddedobj/source/msole/olevisual.cxx  |2 ++
 embeddedobj/source/msole/ownview.cxx|1 -
 emfio/inc/mtftools.hxx  |3 +--
 emfio/qa/cppunit/emf/EmfImportTest.cxx  |3 ---
 emfio/source/emfuno/xemfparser.cxx  |2 --
 extensions/IwyuFilter_extensions.yaml   |6 ++
 extensions/inc/helpids.h|2 ++
 extensions/inc/propctrlr.h  |2 ++
 extensions/inc/showhide.hrc |2 ++
 extensions/inc/stringarrays.hrc |2 ++
 extensions/source/bibliography/bibview.cxx  |2 --
 extensions/source/bibliography/general.cxx  |   10 +-
 extensions/source/bibliography/general.hxx  |8 
 extensions/source/bibliography/toolbar.cxx  |2 --
 extensions/source/logging/logger.cxx|1 -
 extensions/source/logging/simpletextformatter.cxx   |2 --
 extensions/source/propctrlr/controlfontdialog.cxx   |1 -
 extensions/source/propctrlr/eformshelper.cxx|1 -
 extensions/source/propctrlr/pcrcommon.hxx   |3 ---
 extensions/source/propctrlr/pcrstrings.hxx  |1 +
 extensions/source/propctrlr/propertyinfo.hxx|1 -
 extensions/source/propctrlr/selectlabeldialog.cxx   |3 ---
 extensions/source/update/ui/updatecheckui.cxx   |2 --
 filter/inc/strings.hxx  |2 ++
 filter/source/config/cache/cacheitem.hxx|1 -
 filter/source/config/cache/configflush.hxx  |1 -
 filter/source/config/cache/constant.hxx |2 ++
 filter/source/graphicfilter/icgm/bundles.cxx|1 -
 filter/source/msfilter/eschesdo.cxx |7 +++
 filter/source/msfilter/eschesdo.hxx |1 -
 filter/source/msfilter/msvbahelper.cxx  |1 -
 filter/source/msfilter/svdfppt.cxx  |2 --
 filter/source/svg/svgexport.cxx |3 ---
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx   |1 -
 filter/source/xsltfilter/LibXSLTTransformer.cxx |1 -
 filter/source/xsltfilter/OleHandler.cxx |1 -
 filter/source/xsltfilter/XSLTFilter.cxx |1 -
 forms/IwyuFilter_forms.yaml |6 --
 forms/source/component/Button.cxx   |1 +
 forms/source/component/CheckBox.cxx |2 ++
 forms/source/component/Columns.cxx  |1 +
 forms/source/component/ComboBox.cxx |2 +-
 forms/source/component/Currency.cxx |2 ++
 forms/source/component/DatabaseForm.cxx |1 +
 forms/source/component/Date.cxx |2 ++
 forms/source/component/Edit.cxx |2 ++
 forms/source/component/File.cxx |1 +
 forms/source/component/Filter.cxx   |2 --
 forms/source/component/FormComponent.cxx|2 +-
 forms/source/component/FormattedField.cxx   |2 +-
 forms/source/component/Grid.cxx |2 ++
 forms/source/component/Hidden.cxx   |1 +
 forms/source/component/ImageButton.cxx  |2 ++
 forms/source/component/ImageControl.cxx |1 +
 forms/source/component/ListBox.cxx  |1 +
 forms/source/component

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

[Julien Nabet (via logerrit)]

 connectivity/Library_mysqlc.mk|2 
 connectivity/source/drivers/mysqlc/mysqlc_catalog.cxx |   16 +-
 connectivity/source/drivers/mysqlc/mysqlc_view.cxx|  113 ++
 connectivity/source/drivers/mysqlc/mysqlc_view.hxx|   72 +
 connectivity/source/drivers/mysqlc/mysqlc_views.cxx   |  140 ++
 connectivity/source/drivers/mysqlc/mysqlc_views.hxx   |   53 ++
 6 files changed, 394 insertions(+), 2 deletions(-)

New commits:
commit 52443996eff721e612ac4afc1eb1a53bb8a3e06f
Author: Julien Nabet 
AuthorDate: Sun Jan 16 17:42:31 2022 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 16 23:38:25 2022 +0100

Mysql/MariaDB: implement edit VIEW with GUI or SQL

Delete View works (and the list is updated)
Modifying View works

But, there are at least 2 things to fix:
- adding a view still works but the list isn't updated without manual 
refresh)
- renaming view doesn't work (a popup error message appear)

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

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index 467562c066f7..af46fb9ba137 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -69,6 +69,8 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\
connectivity/source/drivers/mysqlc/mysqlc_types \
connectivity/source/drivers/mysqlc/mysqlc_user \
connectivity/source/drivers/mysqlc/mysqlc_users \
+   connectivity/source/drivers/mysqlc/mysqlc_view \
+   connectivity/source/drivers/mysqlc/mysqlc_views \
 ))
 
 $(eval $(call 
gb_Library_set_componentfile,mysqlc,connectivity/source/drivers/mysqlc/mysqlc,services))
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_catalog.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_catalog.cxx
index e9b7569fb1aa..035c7761f5e3 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_catalog.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_catalog.cxx
@@ -9,6 +9,7 @@
 
 #include "mysqlc_catalog.hxx"
 #include "mysqlc_tables.hxx"
+#include "mysqlc_views.hxx"
 #include "mysqlc_users.hxx"
 
 #include 
@@ -44,8 +45,19 @@ void Catalog::refreshTables()
 
 void Catalog::refreshViews()
 {
-// TODO: implement me.
-// Sets m_pViews (OCatalog)
+uno::Reference xViews = m_xMetaData->getTables(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/mysqlc/mysqlc_view.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_view.cxx
new file mode 100644
index ..a586e20a9a13
--- /dev/null
+++ b/connectivity/source/drivers/mysqlc/mysqlc_view.cxx
@@ -0,0 +1,113 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "mysqlc_view.hxx"
+
+#include 
+
+#include 
+#include 
+#include 
+
+namespace connectivity::mysqlc
+{
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::UNO_QUERY_THROW;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::RuntimeException;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::sdbc::SQLException;
+using ::com::sun::star::sdbc::XConnection;
+using ::com::sun::star::lang::WrappedTargetException;
+using ::com::sun::star::sdbc::XResultSet;
+using ::com::sun::star::sdbc::XStatement;
+using ::com::sun::star::lang::DisposedException;
+using ::com::sun::star::sdbc::XRow;
+
+View::View(const Reference& _rxConnection, bool _bCaseSensitive,
+   const OUString& _rSchemaName, const OUString& _rName)
+: View_Base(_bCaseSensitive, _rName, _rxConnection->getMetaData(), 
OUString(), _rSchemaName,
+OUString())
+, m_xConnection(_rxConnection)
+{
+}
+
+View:

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

[andreas kainz (via logerrit)]

 sc/uiconfig/scalc/ui/sidebaralignment.ui |  204 +--
 1 file changed, 113 insertions(+), 91 deletions(-)

New commits:
commit 7a2042dc00c72ac074a21c2c324ace5eac89a5f0
Author: andreas kainz 
AuthorDate: Sat Dec 11 19:11:18 2021 +0100
Commit: Andreas Kainz 
CommitDate: Sun Jan 16 22:34:58 2022 +0100

tdf#146421 Calc Sidebar Alignment Section follow arrangement guideline

Change-Id: If1ffb50743292f3cc0c3271646d0538337977762
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126688
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui 
b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index d5057bbd63c2..ec153ce81a4b 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -32,14 +32,13 @@
 True
 False
 
-  
-  
+  
 True
 False
 True
 6
-3
-6
+vertical
+3
 
   
 True
@@ -187,109 +186,128 @@
 
   
   
-0
-0
-2
+False
+True
+0
   
 
 
-  
+  
 True
-True
-Select the angle for 
rotation.
-end
-adjustmentSpinDegrees
-True
-True
-
-  
-Text 
Orientation
+False
+6
+
+  
+True
+True
+icons
+False
+2
+
+  
+True
+False
+True
+  
+  
+False
+False
+  
+
+
+  
+True
+False
+True
+  
+  
+False
+False
+  
+
   
+  
+False
+True
+0
+  
 
-  
-  
-1
-4
-  
-
-
-  
-True
-True
-Indents from the left 
edge.
-end
-center
-adjustmentIndent
-True
-
-  
-Left Indent
+
+  
+True
+True
+Indents from the left 
edge.
+end
+center
+True
+True
+adjustmentIndent
+
+  
+Left 
Indent
+  
+
   
+  
+False
+True
+1
+  
 
   
   
-1
-1
+False
+True
+1
   
 
 
-  
+  
 True
-True
-icons
-False
-2
+False
+6
 
-  
+  
 True
+False
+Text _orientation:
 True
+orientationdegrees
+0
   
   
 False
-False
+True
+0
   
 
 
-  
+  
 True
-True
+True
+Select the angle for 
rotation.
+end
+True
+True
+adjustmentSpinDegrees
+True
+
+  
+Text 
Orientation
+  
+
   
   
 False
-False
+True
+1
   
 
   
   
-0
-1
-  
-
-
-  
-True
-False
-3
-3
-  
-  
-0
-3
-2
-  
-
-
-  
-True
-False
-Text _orientation:
-True
-orientationdegrees
-0
-  
-  
-0
-4
+False
+True
+2
   
 
 
@@ -303,6 +321,7 @@
 True
 True
 False
+start
 True
  

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |  118 -
 1 file changed, 54 insertions(+), 64 deletions(-)

New commits:
commit bf28e1df0a04cf6a06d9c4cf591e238a45a34ec1
Author: Jim Raykowski 
AuthorDate: Thu Dec 30 20:25:05 2021 -0900
Commit: Jim Raykowski 
CommitDate: Sun Jan 16 22:15:34 2022 +0100

SwNavigator: use one loop instead of two to fill fields member list

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 0a796d77711e..9f8cfca2e0a2 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -412,14 +412,11 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 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);
-for (SwFormatField* pFormatField: vFields)
-{
-SwField* pField = pFormatField->GetField();
-if (pField && pField->GetTypeId() != 
SwFieldTypesEnum::Postit)
-m_nMemberCount++;
-}
+m_nMemberCount += vFields.size();
 }
 }
 break;
@@ -791,82 +788,75 @@ void SwContentType::FillMemberList(bool* 
pbLevelOrVisibilityChanged)
 break;
 case ContentTypeId::TEXTFIELD:
 {
-// sorted list of all fields - meaning in the order they are in 
the document model
-SetGetExpFields aSrtLst;
 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);
-for (SwFormatField* pFormatField: vFields)
+std::vector aSubTypesList;
+if (pFieldType->Which() == SwFieldIds::DocStat && 
!vFields.empty())
 {
-SwTextField* pTextField = pFormatField->GetTextField();
-SwField* pField = pFormatField->GetField();
-if (pTextField && pField && pField->GetTypeId() != 
SwFieldTypesEnum::Postit)
-{
-const SwTextNode& rTextNode = 
pTextField->GetTextNode();
-std::unique_ptr
-pNew(new 
SetGetExpField(SwNodeIndex(rTextNode), pTextField));
-aSrtLst.insert(std::move(pNew));
-}
-}
-}
-for (size_t i = 0; i < aSrtLst.size(); ++i)
-{
-const SwTextField* pTextField = aSrtLst[i]->GetTextField();
-const SwFormatField& rFormatField = 
pTextField->GetFormatField();
-const SwField* pField = rFormatField.GetField();
-OUString sExpandedField(pField->ExpandField(true, 
m_pWrtShell->GetLayout()));
-if (!sExpandedField.isEmpty())
-sExpandedField = u" - " + sExpandedField;
-OUString sText = pField->GetDescription() + u" - " + 
pField->GetFieldName()
-+ sExpandedField;
-if (pField->GetTypeId() == 
SwFieldTypesEnum::DocumentStatistics)
-{
-SwFieldMgr aFieldMgr(m_pWrtShell);
-std::vector aLst;
-
aFieldMgr.GetSubTypes(SwFieldTypesEnum::DocumentStatistics, aLst);
-OUString sSubType;
-if (pField->GetSubType() < aLst.size())
-sSubType = u" - " + aLst[pField->GetSubType()];
-sText = pField->GetDescription() + u" - " + 
pField->GetFieldName() + sSubType
-+ sExpandedField;
+
SwFieldMgr(m_pWrtShell).GetSubTypes(SwFieldTypesEnum::DocumentStatistics,
+aSubTypesList);
 }
-else if (pField->GetTypeId() == SwFieldTypesEnum::GetRef)
+for (SwFormatField* pFormatField: vFields)
 {
-OUString sExpandedTextOfReferencedTextNode;
-if (const SwGetRefField* pRefField(dynamic_cast(pField));
-pRefField)
+if (SwTextField* 

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 9631d9758bc293a9ae2d5f3457674d8a239cf362
Author: Stephan Bergmann 
AuthorDate: Thu Jan 13 10:49:37 2022 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 16 22:08:46 2022 +0100

Sync flatpak-manifest.in with Flathub

...including


"Merge pull request #174 from vroger11/patch-1:  Add global-menu support 
for KDE
and unity"

Change-Id: Id9c9c9d63303fc7de12b47e12b1e32f6556f1f02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128368
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 18220ad65bb989fdbfe73fa36ae03ef6466d7ee5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128338
Reviewed-by: Xisco Fauli 
(cherry picked from commit f90618d38cc33c511f921aa940c0d65908146fef)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128343
Reviewed-by: Michael Stahl 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 87bb0b6c23fd..4c7ca2825162 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -727,6 +727,7 @@
 "--env=JAVA_HOME=/app/jre",
 "--env=LIBO_FLATPAK=1",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
-"--talk-name=org.gtk.vfs.*"
+"--talk-name=org.gtk.vfs.*",
+"--talk-name=com.canonical.AppMenu.Registrar"
 ]
 }

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

[Caolán McNamara (via logerrit)]

 vcl/source/text/ImplLayoutArgs.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 8728cebf75b127e5a0d6a043bbed40a1c9e34641
Author: Caolán McNamara 
AuthorDate: Sun Jan 16 17:34:12 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Jan 16 22:00:57 2022 +0100

dump AltNaturalDXArray if present

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

diff --git a/vcl/source/text/ImplLayoutArgs.cxx 
b/vcl/source/text/ImplLayoutArgs.cxx
index a5b0ebb0a39f..55e01d2737b8 100644
--- a/vcl/source/text/ImplLayoutArgs.cxx
+++ b/vcl/source/text/ImplLayoutArgs.cxx
@@ -310,7 +310,7 @@ std::ostream& operator<<(std::ostream& s, 
vcl::text::ImplLayoutArgs const& rArgs
 s << "\"";
 
 s << ",DXArray=";
-if (rArgs.mpDXArray)
+if (rArgs.mpDXArray || rArgs.mpAltNaturalDXArray)
 {
 s << "[";
 int count = rArgs.mnEndCharPos - rArgs.mnMinCharPos;
@@ -319,7 +319,10 @@ std::ostream& operator<<(std::ostream& s, 
vcl::text::ImplLayoutArgs const& rArgs
 lim = 7;
 for (int i = 0; i < lim; i++)
 {
-s << rArgs.mpDXArray[i];
+if (rArgs.mpDXArray)
+s << rArgs.mpDXArray[i];
+else
+s << rArgs.mpAltNaturalDXArray[i];
 if (i < lim - 1)
 s << ",";
 }
@@ -327,7 +330,10 @@ std::ostream& operator<<(std::ostream& s, 
vcl::text::ImplLayoutArgs const& rArgs
 {
 if (count > lim + 1)
 s << "...";
-s << rArgs.mpDXArray[count - 1];
+if (rArgs.mpDXArray)
+s << rArgs.mpDXArray[count - 1];
+else
+s << rArgs.mpAltNaturalDXArray[count - 1];
 }
 s << "]";
 }

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 2e02d78f92b06c72d515240cf83e1a8f224b0ae3
Author: Caolán McNamara 
AuthorDate: Fri Jan 14 12:50:15 2022 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 16 22:01:06 2022 +0100

tdf#136481 show the focus rect for the case nothing is yet selected

but the cursor is at pos 0

Change-Id: I7c94480bffdced23fe89d4e3ba0e729742247130
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128414
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 4bdf28b404f90236d93ce207671f755a71f28496)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128430
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ab7ed3fe45cf..e42a6eac94b8 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1296,12 +1296,16 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 {
 rFilterBox.grab_focus();
 
+if (rFilterBox.n_children())
+{
+if (nSelPos != -1)
+rFilterBox.set_cursor(nSelPos);
+else
+rFilterBox.set_cursor(0);
+}
 // Select only after GrabFocus, so that the focus rectangle gets 
correct
 if (nSelPos != -1)
-{
-rFilterBox.set_cursor(nSelPos);
 rFilterBox.select(nSelPos);
-}
 else
 rFilterBox.unselect_all();
 

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 773cc6b9ad92f28405ca204f1fa475e33f15132b
Author: Caolán McNamara 
AuthorDate: Fri Jan 14 12:50:15 2022 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 16 22:00:21 2022 +0100

tdf#136481 show the focus rect for the case nothing is yet selected

but the cursor is at pos 0

Change-Id: I7c94480bffdced23fe89d4e3ba0e729742247130
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128414
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 4bdf28b404f90236d93ce207671f755a71f28496)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128429
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 14e3b53aa9c9..42b02d4b9743 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1465,12 +1465,16 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 {
 rFilterBox.grab_focus();
 
+if (rFilterBox.n_children())
+{
+if (nSelPos != -1)
+rFilterBox.set_cursor(nSelPos);
+else
+rFilterBox.set_cursor(0);
+}
 // Select only after GrabFocus, so that the focus rectangle gets 
correct
 if (nSelPos != -1)
-{
-rFilterBox.set_cursor(nSelPos);
 rFilterBox.select(nSelPos);
-}
 else
 rFilterBox.unselect_all();
 

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

[Andras Timar (via logerrit)]

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

New commits:
commit 8ad6f05095ec5de6f444bcc2265ae3748d9e34d1
Author: Andras Timar 
AuthorDate: Sun Jan 16 21:19:36 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Jan 16 21:19:36 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to 01fad3f3f64f74bf3ee4fb884a6a6bd4013ede74
  - fix: source/ar/sd/messages.po:4281: end-of-line within string

Change-Id: I4a19ef59b6595ea7305b95920a9e2567465ac5ed

diff --git a/translations b/translations
index 16814729583b..01fad3f3f64f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 16814729583b6d0179eca9e520ce09c24cbbaf15
+Subproject commit 01fad3f3f64f74bf3ee4fb884a6a6bd4013ede74

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ar

[Andras Timar (via logerrit)]

 source/ar/sd/messages.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01fad3f3f64f74bf3ee4fb884a6a6bd4013ede74
Author: Andras Timar 
AuthorDate: Sun Jan 16 21:19:32 2022 +0100
Commit: Andras Timar 
CommitDate: Sun Jan 16 21:19:32 2022 +0100

fix: source/ar/sd/messages.po:4281: end-of-line within string

Change-Id: I4a19ef59b6595ea7305b95920a9e2567465ac5ed

diff --git a/source/ar/sd/messages.po b/source/ar/sd/messages.po
index b5577bd3e6b..45d03cb776a 100644
--- a/source/ar/sd/messages.po
+++ b/source/ar/sd/messages.po
@@ -4277,7 +4277,7 @@ msgstr ""
 #: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5969
 msgctxt "draw_notebookbar_groupedbar_compact|rowscolumnst"
 msgid "_Table"
-msgstr "جدول""
+msgstr "جدول"
 
 #. QzCG4
 #: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:6656

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 4e25b621f224315149cc78787d27d478f033091f
Author: Andras Timar 
AuthorDate: Sun Jan 16 21:06:24 2022 +0100
Commit: Andras Timar 
CommitDate: Sun Jan 16 21:06:24 2022 +0100

Bump version to 21.06.13.1

Change-Id: I5b98d1236285f0e2837dc442353cc413db7b9e67

diff --git a/configure.ac b/configure.ac
index 6b5f48c47aca..35e6c39ed3fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.12.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.13.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

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

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/effectspage.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e8b45704fc8d41a42d2272cb14bb40ee59516768
Author: Caolán McNamara 
AuthorDate: Sun Jan 16 15:37:04 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Jan 16 20:23:30 2022 +0100

add missing placeholder labels

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

diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index d5c5b082be9d..527d8d8e5eeb 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -458,6 +458,7 @@
 start
 0
 True
+
 
   
 
@@ -480,6 +481,7 @@
 start
 0
 True
+
 
   
 
@@ -597,6 +599,7 @@
 False
 0
 True
+
 
   
 

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

[Caolán McNamara (via logerrit)]

 lotuswordpro/source/filter/lwpdrawobj.cxx |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 3fcfa152c5a12f549aed9d6c8261017f2ad75df3
Author: Caolán McNamara 
AuthorDate: Sun Jan 16 14:30:15 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Jan 16 20:23:08 2022 +0100

ofz: Use-of-uninitialized-value

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

diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 0e78359fa0c6..808edae43e68 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -498,7 +498,7 @@ void LwpDrawPolyLine::Read()
 m_pStream->ReadUChar( m_aPolyLineRec.aPenColor.unused );
 m_pStream->ReadUInt16( m_aPolyLineRec.nNumPoints );
 
-if (m_aPolyLineRec.nNumPoints > m_pStream->remainingSize() / 4)
+if (!m_pStream->good() || m_aPolyLineRec.nNumPoints > 
m_pStream->remainingSize() / 4)
 throw BadRead();
 
 m_pVector.reset( new SdwPoint[m_aPolyLineRec.nNumPoints] );
@@ -578,7 +578,7 @@ void LwpDrawPolygon::Read()
 ReadClosedObjStyle();
 m_pStream->ReadUInt16( m_nNumPoints );
 
-if (m_nNumPoints > m_pStream->remainingSize() / 4)
+if (!m_pStream->good() || m_nNumPoints > m_pStream->remainingSize() / 4)
 throw BadRead();
 
 m_pVector.reset( new SdwPoint[m_nNumPoints] );
@@ -1043,6 +1043,9 @@ void LwpDrawTextBox::Read()
 m_pStream->ReadInt16( m_aTextRec.nTextRotation );
 m_pStream->ReadInt16( m_aTextRec.nTextExtraSpacing );
 
+if (!m_pStream->good())
+throw BadRead();
+
 // some draw files in version 1.2 have an extra byte following '\0'.
 // can't rely on that, so read in the whole string into memory.
 
@@ -1188,17 +1191,17 @@ void LwpDrawTextArt::Read()
 m_pStream->ReadInt16( m_aTextArtRec.nRotation );
 
 sal_uInt16 nPointNumber;
-sal_Int16 nX, nY;
 m_pStream->ReadUInt16( nPointNumber );
 
 size_t nPoints = nPointNumber*3+1;
-if (nPoints > m_pStream->remainingSize() / 4)
+if (!m_pStream->good() || nPoints > m_pStream->remainingSize() / 4)
 throw BadRead();
 
 m_aTextArtRec.aPath[0].n = nPointNumber;
 m_aTextArtRec.aPath[0].aPts.resize(nPoints);
 for (size_t nPt = 0; nPt < nPoints; ++nPt)
 {
+sal_Int16 nX, nY;
 m_pStream->ReadInt16( nX );
 m_pStream->ReadInt16( nY );
 m_aTextArtRec.aPath[0].aPts[nPt].x = nX;
@@ -1208,13 +1211,14 @@ void LwpDrawTextArt::Read()
 m_pStream->ReadUInt16( nPointNumber );
 
 nPoints = nPointNumber*3+1;
-if (nPoints > m_pStream->remainingSize() / 4)
+if (!m_pStream->good() || nPoints > m_pStream->remainingSize() / 4)
 throw BadRead();
 
 m_aTextArtRec.aPath[1].n = nPointNumber;
 m_aTextArtRec.aPath[1].aPts.resize(nPoints);
 for (size_t nPt = 0; nPt < nPoints; ++nPt)
 {
+sal_Int16 nX, nY;
 m_pStream->ReadInt16( nX );
 m_pStream->ReadInt16( nY );
 m_aTextArtRec.aPath[1].aPts[nPt].x = nX;
@@ -1243,7 +1247,7 @@ void LwpDrawTextArt::Read()
 - 
(m_aTextArtRec.aPath[1].n*3 + 1)*4;
 
 
-if (m_aTextArtRec.nTextLen > m_pStream->remainingSize())
+if (!m_pStream->good() || m_aTextArtRec.nTextLen > 
m_pStream->remainingSize())
 throw BadRead();
 
 m_aTextArtRec.pTextString = new sal_uInt8 [m_aTextArtRec.nTextLen];
@@ -1383,7 +1387,7 @@ void LwpDrawBitmap::Read()
 m_pStream->ReadUInt16( aInfoHeader2.nPlanes );
 m_pStream->ReadUInt16( aInfoHeader2.nBitCount );
 
-if (!IsValid(aInfoHeader2))
+if (!m_pStream->good() || !IsValid(aInfoHeader2))
 throw BadRead();
 
 N = aInfoHeader2.nPlanes * aInfoHeader2.nBitCount;
@@ -1403,7 +1407,7 @@ void LwpDrawBitmap::Read()
 m_pStream->ReadUInt16( aInfoHeader2.nPlanes );
 m_pStream->ReadUInt16( aInfoHeader2.nBitCount );
 
-if (!IsValid(aInfoHeader2))
+if (!m_pStream->good() || !IsValid(aInfoHeader2))
 throw BadRead();
 
 N = aInfoHeader2.nPlanes * aInfoHeader2.nBitCount;

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

[Caolán McNamara (via logerrit)]

 include/vcl/outdev.hxx |4 ++--
 vcl/source/outdev/map.cxx  |   17 ++---
 vcl/source/outdev/text.cxx |   11 ++-
 3 files changed, 18 insertions(+), 14 deletions(-)

New commits:
commit 95ade11df658d73e90d196f041d0839895aca3f0
Author: Caolán McNamara 
AuthorDate: Sun Jan 16 17:27:26 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Jan 16 20:22:45 2022 +0100

tdf#146453 retain precise vertical base pos with ResolutionIndependentLayout

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 4b9d1e7e626a..7e1a0fad7dcd 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1685,6 +1685,7 @@ public:
  @returns Physical point on the device.
  */
 SAL_DLLPRIVATE PointImplLogicToDevicePixel( const Point& rLogicPt 
) const;
+SAL_DLLPRIVATE DevicePoint  ImplLogicToDeviceFontCoordinate(const Point& 
rLogicPt) const;
 
 /** Convert a logical width to a width in units of device pixels.
 
@@ -1697,9 +1698,9 @@ public:
  @returns Width in units of device pixels.
  */
 SAL_DLLPRIVATE tools::Long ImplLogicWidthToDevicePixel( 
tools::Long nWidth ) const;
+SAL_DLLPRIVATE double  
ImplLogicWidthToDeviceFontWidth(tools::Long nWidth) const;
 
 SAL_DLLPRIVATE DeviceCoordinate LogicWidthToDeviceCoordinate( tools::Long 
nWidth ) const;
-SAL_DLLPRIVATE double LogicWidthToDeviceFontCoordinate( tools::Long nWidth 
) const;
 
 /** Convert a logical X coordinate to a device pixel's X coordinate.
 
@@ -1713,7 +1714,6 @@ public:
  @returns Device's X pixel coordinate
  */
 SAL_DLLPRIVATE tools::Long ImplLogicXToDevicePixel( tools::Long nX 
) const;
-SAL_DLLPRIVATE double LogicXToDeviceFontCoordinate( tools::Long nWidth ) 
const;
 
 /** Convert a logical Y coordinate to a device pixel's Y coordinate.
 
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 5144f0f89f9f..918d8a5a77df 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1830,7 +1830,7 @@ DeviceCoordinate 
OutputDevice::LogicWidthToDeviceCoordinate( tools::Long nWidth
 #endif
 }
 
-double OutputDevice::LogicWidthToDeviceFontCoordinate(tools::Long nWidth) const
+double OutputDevice::ImplLogicWidthToDeviceFontWidth(tools::Long nWidth) const
 {
 if (!mbMap)
 return nWidth;
@@ -1839,14 +1839,17 @@ double 
OutputDevice::LogicWidthToDeviceFontCoordinate(tools::Long nWidth) const
 maMapRes.mnMapScNumX, maMapRes.mnMapScDenomX);
 }
 
-double OutputDevice::LogicXToDeviceFontCoordinate(tools::Long nX) const
+DevicePoint OutputDevice::ImplLogicToDeviceFontCoordinate(const Point& rPoint) 
const
 {
 if (!mbMap)
-return nX + mnOutOffX;
-
-return ImplLogicToPixel(static_cast(nX + maMapRes.mnMapOfsX), 
mnDPIX,
-maMapRes.mnMapScNumX, maMapRes.mnMapScDenomX)
-+ mnOutOffX + mnOutOffOrigX;
+return DevicePoint(rPoint.X() + mnOutOffX, rPoint.Y() + mnOutOffY);
+
+return DevicePoint(ImplLogicToPixel(static_cast(rPoint.X() + 
maMapRes.mnMapOfsX), mnDPIX,
+maMapRes.mnMapScNumX, 
maMapRes.mnMapScDenomX)
++ mnOutOffX + mnOutOffOrigX,
+   ImplLogicToPixel(static_cast(rPoint.Y() + 
maMapRes.mnMapOfsY), mnDPIY,
+maMapRes.mnMapScNumY, 
maMapRes.mnMapScDenomY)
++ mnOutOffY + mnOutOffOrigY);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 49ca790b8aec..3d773e56d488 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1359,7 +1359,7 @@ std::unique_ptr OutputDevice::ImplLayout(const 
OUString& rOrigStr,
 xNaturalDXPixelArray.reset(new double[nLen]);
 
 for (int i = 0; i < nLen; ++i)
-xNaturalDXPixelArray[i] = 
LogicWidthToDeviceFontCoordinate(pDXArray[i]);
+xNaturalDXPixelArray[i] = 
ImplLogicWidthToDeviceFontWidth(pDXArray[i]);
 
 aLayoutArgs.SetAltNaturalDXArray(xNaturalDXPixelArray.get());
 nEndGlyphCoord = std::lround(xNaturalDXPixelArray[nLen - 1]);
@@ -1426,12 +1426,13 @@ std::unique_ptr 
OutputDevice::ImplLayout(const OUString& rOrigStr,
 // position, justify, etc. the layout
 pSalLayout->AdjustLayout( aLayoutArgs );
 
-Point aDevicePos = ImplLogicToDevicePixel(rLogicalPos);
 if (bTextRenderModeForResolutionIndependentLayout)
-
pSalLayout->DrawBase().setX(LogicXToDeviceFontCoordinate(rLogicalPos.X()));
+pSalLayout->DrawBase() = ImplLogicToDeviceFontCoordinate(rLogicalPos);
 

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

[Caolán McNamara (via logerrit)]

 include/vcl/vcllayout.hxx|7 +++
 vcl/source/gdi/sallayout.cxx |   18 ++
 vcl/source/outdev/text.cxx   |2 ++
 3 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 99460be87a11a404ce6c055fc540ec7ece404fb6
Author: Caolán McNamara 
AuthorDate: Sun Jan 16 17:24:08 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Jan 16 20:22:22 2022 +0100

Related: tdf#146453 retain accurate positioning in rotated text rendering

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

diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index b766a0b4ccd6..87d9345f4b9b 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -82,6 +82,11 @@ public:
 int GetUnitsPerPixel() const{ return 
mnUnitsPerPixel; }
 Degree10GetOrientation() const  { return 
mnOrientation; }
 
+voidSetTextRenderModeForResolutionIndependentLayout(bool 
bTextRenderModeForResolutionIndependentLayout)
+{
+mbTextRenderModeForResolutionIndependentLayout = 
bTextRenderModeForResolutionIndependentLayout;
+}
+
 // methods using string indexing
 virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, 
DeviceCoordinate nCharExtra, int nFactor) const = 0;
 virtual DeviceCoordinate FillDXArray( std::vector* 
pDXArray ) const = 0;
@@ -115,6 +120,8 @@ protected:
 
 mutable Point   maDrawOffset;
 DevicePoint maDrawBase;
+
+boolmbTextRenderModeForResolutionIndependentLayout;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 64b1d22480e5..be020c2f11ae 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -135,7 +135,8 @@ SalLayout::SalLayout()
 mnEndCharPos( -1 ),
 mnUnitsPerPixel( 1 ),
 mnOrientation( 0 ),
-maDrawOffset( 0, 0 )
+maDrawOffset( 0, 0 ),
+mbTextRenderModeForResolutionIndependentLayout(false)
 {}
 
 SalLayout::~SalLayout()
@@ -171,9 +172,18 @@ DevicePoint SalLayout::GetDrawPosition(const DevicePoint& 
rRelative) const
 
 double fX = aOfs.getX();
 double fY = aOfs.getY();
-tools::Long nX = static_cast( +fCos * fX + fSin * fY );
-tools::Long nY = static_cast( +fCos * fY - fSin * fX );
-aPos += DevicePoint(nX, nY);
+if (mbTextRenderModeForResolutionIndependentLayout)
+{
+double nX = +fCos * fX + fSin * fY;
+double nY = +fCos * fY - fSin * fX;
+aPos += DevicePoint(nX, nY);
+}
+else
+{
+tools::Long nX = static_cast( +fCos * fX + fSin * fY 
);
+tools::Long nY = static_cast( +fCos * fY - fSin * fX 
);
+aPos += DevicePoint(nX, nY);
+}
 }
 
 return aPos;
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index f9f0fd54b673..49ca790b8aec 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1411,6 +1411,8 @@ std::unique_ptr OutputDevice::ImplLayout(const 
OUString& rOrigStr,
 if( !pSalLayout )
 return nullptr;
 
+
pSalLayout->SetTextRenderModeForResolutionIndependentLayout(bTextRenderModeForResolutionIndependentLayout);
+
 // do glyph fallback if needed
 // #105768# avoid fallback for very small font sizes
 if (aLayoutArgs.HasFallbackRun() && 
mpFontInstance->GetFontSelectPattern().mnHeight >= 3)

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

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/firebird/Tables.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 276258618b9ab548927a6c5df0cadba11994b70b
Author: Julien Nabet 
AuthorDate: Sun Jan 16 19:07:19 2022 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 16 20:14:29 2022 +0100

Firebird: missing space in DROP command

It's more to have something clean.
Indeed there wasn't impact on Firebird since the table name is surrounded 
by quotes,
eg: DROP TABLE"TableTest"

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

diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index 8337949b3d80..b686f66ecb9c 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -201,7 +201,7 @@ void Tables::dropObject(sal_Int32 nPosition, const 
OUString& sName)
 const OUString sQuoteString = m_xMetaData->getIdentifierQuoteString();
 
 m_xMetaData->getConnection()->createStatement()->execute(
-"DROP " + sType + ::dbtools::quoteName(sQuoteString,sName));
+"DROP " + sType + " " + ::dbtools::quoteName(sQuoteString,sName));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */

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

[Andras Timar (via logerrit)]

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

New commits:
commit 13dcef949020bbd4e8db31fc394a10bb02da7467
Author: Andras Timar 
AuthorDate: Sun Jan 16 19:58:41 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Jan 16 19:58:41 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to 16814729583b6d0179eca9e520ce09c24cbbaf15
  - Updated Arabic translation

Change-Id: I7af3893248270bd9241ed34efe291e5daa9ea9c7

diff --git a/translations b/translations
index d76f14f896fc..16814729583b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d76f14f896fc608ae1c1d427d9ab5ed6d77cedc8
+Subproject commit 16814729583b6d0179eca9e520ce09c24cbbaf15

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ar

[Andras Timar (via logerrit)]

 source/ar/cui/messages.po |   10 -
 source/ar/extensions/messages.po  |2 
 source/ar/formula/messages.po |2 
 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po |   44 +++
 source/ar/reportdesign/messages.po|2 
 source/ar/sc/messages.po  |   42 +++---
 source/ar/sd/messages.po  |   32 ++---
 source/ar/sfx2/messages.po|2 
 source/ar/starmath/messages.po|2 
 source/ar/svtools/messages.po |4 
 source/ar/svx/messages.po |   61 +-
 source/ar/sw/messages.po  |   50 
 source/ar/vcl/messages.po |4 
 source/ar/xmlsecurity/messages.po |2 
 14 files changed, 130 insertions(+), 129 deletions(-)

New commits:
commit 16814729583b6d0179eca9e520ce09c24cbbaf15
Author: Andras Timar 
AuthorDate: Sun Jan 16 19:58:30 2022 +0100
Commit: Andras Timar 
CommitDate: Sun Jan 16 19:58:30 2022 +0100

Updated Arabic translation

Change-Id: I7af3893248270bd9241ed34efe291e5daa9ea9c7

diff --git a/source/ar/cui/messages.po b/source/ar/cui/messages.po
index a0b1659ab14..9128b964c1c 100644
--- a/source/ar/cui/messages.po
+++ b/source/ar/cui/messages.po
@@ -5054,7 +5054,7 @@ msgstr ""
 #: cui/uiconfig/ui/areatabpage.ui:34
 msgctxt "areatabpage|tablelb"
 msgid "Row"
-msgstr ""
+msgstr "صف"
 
 #. sEdWf
 #: cui/uiconfig/ui/areatabpage.ui:35
@@ -5852,7 +5852,7 @@ msgstr ""
 #: cui/uiconfig/ui/bulletandposition.ui:342
 msgctxt "bulletandposition|bullet"
 msgid "Select..."
-msgstr ""
+msgstr "تحديد..."
 
 #. oJgFH
 #: cui/uiconfig/ui/bulletandposition.ui:354
@@ -5918,7 +5918,7 @@ msgstr ""
 #: cui/uiconfig/ui/bulletandposition.ui:668
 msgctxt "bulletandposition|keepratio"
 msgid "Keep ratio"
-msgstr ""
+msgstr "أبقِ التناسب"
 
 #. EhFU7
 #: cui/uiconfig/ui/bulletandposition.ui:706
@@ -5966,7 +5966,7 @@ msgstr ""
 #: cui/uiconfig/ui/bulletandposition.ui:885
 msgctxt "bulletandposition|position"
 msgid "Position"
-msgstr ""
+msgstr "الموضع"
 
 #. MSmfX
 #: cui/uiconfig/ui/bulletandposition.ui:919
@@ -6902,7 +6902,7 @@ msgstr ""
 #: cui/uiconfig/ui/colorconfigwin.ui:1100
 msgctxt "colorconfigwin|text"
 msgid "Text"
-msgstr ""
+msgstr "النص"
 
 #. ZCYmf
 #: cui/uiconfig/ui/colorconfigwin.ui:1130
diff --git a/source/ar/extensions/messages.po b/source/ar/extensions/messages.po
index 602fbd0aaa8..c48d9f39cbc 100644
--- a/source/ar/extensions/messages.po
+++ b/source/ar/extensions/messages.po
@@ -3642,7 +3642,7 @@ msgstr "المدخلة"
 #: extensions/uiconfig/sbibliography/ui/combobox.ui:16
 msgctxt "combobox|TBC_FT_SOURCE"
 msgid "Table"
-msgstr ""
+msgstr "جدول"
 
 #. HWJFh
 #: extensions/uiconfig/sbibliography/ui/editbox.ui:14
diff --git a/source/ar/formula/messages.po b/source/ar/formula/messages.po
index 8830780331f..44dd27d8c4c 100644
--- a/source/ar/formula/messages.po
+++ b/source/ar/formula/messages.po
@@ -2484,7 +2484,7 @@ msgstr ""
 #: formula/inc/core_resource.hrc:2701
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COLOR"
-msgstr ""
+msgstr "اللون"
 
 #. ufFAa
 #: formula/inc/core_resource.hrc:2702
diff --git a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
index d9bc263b7e6..4ecfa316c2f 100644
--- a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -1124,7 +1124,7 @@ msgctxt ""
 "PopupLabel\n"
 "value.text"
 msgid "~Properties..."
-msgstr ""
+msgstr "ال~خصائص..."
 
 #. kvbcj
 #: CalcCommands.xcu
@@ -2634,7 +2634,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Columns ~Before"
-msgstr ""
+msgstr "أعمدة قبل"
 
 #. AhNfD
 #: CalcCommands.xcu
@@ -2694,7 +2694,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Columns ~After"
-msgstr ""
+msgstr "أعمدة بعد"
 
 #. Q6qKb
 #: CalcCommands.xcu
@@ -4594,7 +4594,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Default"
-msgstr ""
+msgstr "المبدئي"
 
 #. uh4sC
 #: CalcCommands.xcu
@@ -8810,7 +8810,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Page Properties..."
-msgstr ""
+msgstr "خصائص الصفحة..."
 
 #. W6trc
 #: DrawImpressCommands.xcu
@@ -8830,7 +8830,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Slide Properties..."
-msgstr ""
+msgstr "خصائص الشريحة..."
 
 #. bhvTx
 #: DrawImpressCommands.xcu
@@ -10706,7 +10706,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "~Properties..."
-msgstr ""
+msgstr "ال~خصائص..."
 
 #. pnSEw
 #: DrawImpressCommands.xcu
@@ -10716,7 +10716,7 @@ msgctxt ""
 "PopupLabel\n"
 "value.text"
 msgid "Ta~ble Properties..."
-msgstr ""
+msgstr "خصائ~ص الجدول..."
 
 #. 2HACZ
 #: DrawImpre

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/QtInstance.hxx |8 
 vcl/qt5/QtInstance.cxx |   36 
 2 files changed, 44 insertions(+)

New commits:
commit e49d774fd2bb5ddf35a47368f36980d5e0d32ad3
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jan 16 10:14:47 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sun Jan 16 18:22:44 2022 +0100

Qt notify LO of many QScreen related events

LO just has a single display event, SalEvent::DisplayChanged, Qt
has a multitude. So this will generate multiple LO notifications.
I don't see any reasonable way to prevent that. Doesn't seem a
problem here.

Change-Id: I2f11e53765869a4ca292a1d337347e4e7470e3c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128474
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit ced4cde59eb51e4364daf69520a184b55c2c54db)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128434
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/inc/qt5/QtInstance.hxx b/vcl/inc/qt5/QtInstance.hxx
index 009b9ae8c312..9a9853a7a2ce 100644
--- a/vcl/inc/qt5/QtInstance.hxx
+++ b/vcl/inc/qt5/QtInstance.hxx
@@ -75,6 +75,12 @@ private Q_SLOTS:
 static void deleteObjectLater(QObject* pObject);
 static void localeChanged();
 
+void orientationChanged(Qt::ScreenOrientation);
+void primaryScreenChanged(QScreen*);
+void screenAdded(QScreen*);
+void screenRemoved(QScreen*);
+void virtualGeometryChanged(const QRect&);
+
 Q_SIGNALS:
 bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents);
 void deleteObjectLaterSignal(QObject* pObject);
@@ -86,6 +92,8 @@ protected:
 bool useCairo() const { return m_bUseCairo; }
 // encodes cairo usage and Qt platform name into the ToolkitName
 OUString constructToolkitID(std::u16string_view sTKname);
+void connectQScreenSignals(const QScreen*);
+void notifyDisplayChanged();
 
 public:
 explicit QtInstance(std::unique_ptr& pQApp, bool bUseCairo = 
false);
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index 29a7d0e4ddf7..d252109e122a 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -40,6 +40,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -248,6 +249,12 @@ QtInstance::QtInstance(std::unique_ptr& 
pQApp, bool bUseCairo)
 connect(QGuiApplication::inputMethod(), &QInputMethod::localeChanged, this,
 &QtInstance::localeChanged);
 
+for (const QScreen* pCurScreen : QApplication::screens())
+connectQScreenSignals(pCurScreen);
+connect(qApp, &QGuiApplication::primaryScreenChanged, this, 
&QtInstance::primaryScreenChanged);
+connect(qApp, &QGuiApplication::screenAdded, this, 
&QtInstance::screenAdded);
+connect(qApp, &QGuiApplication::screenRemoved, this, 
&QtInstance::screenRemoved);
+
 #ifndef EMSCRIPTEN
 m_bSupportsOpenGL = true;
 #endif
@@ -602,6 +609,35 @@ void* QtInstance::CreateGStreamerSink(const 
SystemChildWindow* pWindow)
 #endif
 }
 
+void QtInstance::connectQScreenSignals(const QScreen* pScreen)
+{
+connect(pScreen, &QScreen::orientationChanged, this, 
&QtInstance::orientationChanged);
+connect(pScreen, &QScreen::virtualGeometryChanged, this, 
&QtInstance::virtualGeometryChanged);
+}
+
+void QtInstance::notifyDisplayChanged()
+{
+SolarMutexGuard aGuard;
+SalFrame* pAnyFrame = anyFrame();
+if (pAnyFrame)
+pAnyFrame->CallCallback(SalEvent::DisplayChanged, nullptr);
+}
+
+void QtInstance::orientationChanged(Qt::ScreenOrientation) { 
notifyDisplayChanged(); }
+
+void QtInstance::primaryScreenChanged(QScreen*) { notifyDisplayChanged(); }
+
+void QtInstance::screenAdded(QScreen* pScreen)
+{
+connectQScreenSignals(pScreen);
+if (QApplication::screens().size() == 1)
+notifyDisplayChanged();
+}
+
+void QtInstance::screenRemoved(QScreen*) { notifyDisplayChanged(); }
+
+void QtInstance::virtualGeometryChanged(const QRect&) { 
notifyDisplayChanged(); }
+
 void QtInstance::AllocFakeCmdlineArgs(std::unique_ptr& rFakeArgv,
   std::unique_ptr& rFakeArgc,
   std::vector& 
rFakeArgvFreeable)

Re: How to start contributing?

[Ilmari Lauhakangas]

On 16.1.2022 15.39, ISHA DESAI wrote:

Respected Sir/ Madam
I am Isha Desai, a computer science student studying in VESIT, Mumbai, 
India. I am quite familiar with python, java and c++, but am not very 
well acquainted with open source contributions. I wish to be a part of 
the Google Summer of Code to broaden my horizons, to learn as well as 
contribute to the organization.

Will you please guide me regarding the procedure to apply for GSoC?


I have invited you to an interview.

Ilmari

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

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/charnamepage.ui |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ffb5915c08314f1ec1b71f28b108060771a0a545
Author: Caolán McNamara 
AuthorDate: Sun Jan 16 14:51:14 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Jan 16 17:23:11 2022 +0100

restore the explicit translatable="no" for some labels

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

diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 27be5657a856..6f865e3122aa 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -175,7 +175,7 @@
   
 True
 False
-Family:
+Family:
   
 
   
@@ -265,7 +265,7 @@
   
 True
 False
-Style:
+Style:
   
 
   
@@ -498,7 +498,7 @@
   
 True
 False
-Family:
+Family:
 True
 westfontnamelb-cjk
 0
@@ -564,7 +564,7 @@
   
 True
 False
-Style:
+Style:
 True
 weststylelb-cjk
 0
@@ -680,7 +680,7 @@
   
 True
 False
-Family:
+Family:
 True
 eastfontnamelb
 0
@@ -800,7 +800,7 @@
   
 True
 False
-Style:
+Style:
 True
 eaststylelb
 0
@@ -872,7 +872,7 @@
   
 True
 False
-Family:
+Family:
 True
 ctlfontnamelb
 0
@@ -886,7 +886,7 @@
   
 True
 False
-Style:
+Style:
 True
 ctlstylelb
 0

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

[Caolán McNamara (via logerrit)]

 lotuswordpro/inc/xfilter/xfdrawgroup.hxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit aa460a757431afc7408d08569142e6c0e3f6f301
Author: Caolán McNamara 
AuthorDate: Sun Jan 16 14:21:09 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Jan 16 16:41:26 2022 +0100

ofz#43689 Null-dereference

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

diff --git a/lotuswordpro/inc/xfilter/xfdrawgroup.hxx 
b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
index 81f7f8cc781a..b5e1f367c837 100644
--- a/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
@@ -72,7 +72,10 @@
 class XFDrawGroup : public XFDrawObject
 {
 public:
-XFDrawGroup() {}
+XFDrawGroup()
+: m_aChildren(new XFContentContainer)
+{
+}
 
 public:
 using XFDrawObject::Add;

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/QtInstance.hxx |8 
 vcl/qt5/QtInstance.cxx |   36 
 2 files changed, 44 insertions(+)

New commits:
commit ced4cde59eb51e4364daf69520a184b55c2c54db
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jan 16 10:14:47 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Sun Jan 16 14:42:31 2022 +0100

Qt notify LO of many QScreen related events

LO just has a single display event, SalEvent::DisplayChanged, Qt
has a multitude. So this will generate multiple LO notifications.
I don't see any reasonable way to prevent that. Doesn't seem a
problem here.

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

diff --git a/vcl/inc/qt5/QtInstance.hxx b/vcl/inc/qt5/QtInstance.hxx
index 24629a36af8c..1511996c0ce0 100644
--- a/vcl/inc/qt5/QtInstance.hxx
+++ b/vcl/inc/qt5/QtInstance.hxx
@@ -75,6 +75,12 @@ private Q_SLOTS:
 static void deleteObjectLater(QObject* pObject);
 static void localeChanged();
 
+void orientationChanged(Qt::ScreenOrientation);
+void primaryScreenChanged(QScreen*);
+void screenAdded(QScreen*);
+void screenRemoved(QScreen*);
+void virtualGeometryChanged(const QRect&);
+
 Q_SIGNALS:
 bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents);
 void deleteObjectLaterSignal(QObject* pObject);
@@ -86,6 +92,8 @@ protected:
 bool useCairo() const { return m_bUseCairo; }
 // encodes cairo usage and Qt platform name into the ToolkitName
 OUString constructToolkitID(std::u16string_view sTKname);
+void connectQScreenSignals(const QScreen*);
+void notifyDisplayChanged();
 
 public:
 explicit QtInstance(std::unique_ptr& pQApp, bool bUseCairo = 
false);
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index bb7e98c051cd..9629532f824b 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -40,6 +40,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -250,6 +251,12 @@ QtInstance::QtInstance(std::unique_ptr& 
pQApp, bool bUseCairo)
 connect(QGuiApplication::inputMethod(), &QInputMethod::localeChanged, this,
 &QtInstance::localeChanged);
 
+for (const QScreen* pCurScreen : QApplication::screens())
+connectQScreenSignals(pCurScreen);
+connect(qApp, &QGuiApplication::primaryScreenChanged, this, 
&QtInstance::primaryScreenChanged);
+connect(qApp, &QGuiApplication::screenAdded, this, 
&QtInstance::screenAdded);
+connect(qApp, &QGuiApplication::screenRemoved, this, 
&QtInstance::screenRemoved);
+
 #ifndef EMSCRIPTEN
 m_bSupportsOpenGL = true;
 #endif
@@ -604,6 +611,35 @@ void* QtInstance::CreateGStreamerSink(const 
SystemChildWindow* pWindow)
 #endif
 }
 
+void QtInstance::connectQScreenSignals(const QScreen* pScreen)
+{
+connect(pScreen, &QScreen::orientationChanged, this, 
&QtInstance::orientationChanged);
+connect(pScreen, &QScreen::virtualGeometryChanged, this, 
&QtInstance::virtualGeometryChanged);
+}
+
+void QtInstance::notifyDisplayChanged()
+{
+SolarMutexGuard aGuard;
+SalFrame* pAnyFrame = anyFrame();
+if (pAnyFrame)
+pAnyFrame->CallCallback(SalEvent::DisplayChanged, nullptr);
+}
+
+void QtInstance::orientationChanged(Qt::ScreenOrientation) { 
notifyDisplayChanged(); }
+
+void QtInstance::primaryScreenChanged(QScreen*) { notifyDisplayChanged(); }
+
+void QtInstance::screenAdded(QScreen* pScreen)
+{
+connectQScreenSignals(pScreen);
+if (QApplication::screens().size() == 1)
+notifyDisplayChanged();
+}
+
+void QtInstance::screenRemoved(QScreen*) { notifyDisplayChanged(); }
+
+void QtInstance::virtualGeometryChanged(const QRect&) { 
notifyDisplayChanged(); }
+
 void QtInstance::AllocFakeCmdlineArgs(std::unique_ptr& rFakeArgv,
   std::unique_ptr& rFakeArgc,
   std::vector& 
rFakeArgvFreeable)

How to start contributing?

[ISHA DESAI]

Respected Sir/ Madam
I am Isha Desai, a computer science student studying in VESIT, Mumbai,
India. I am quite familiar with python, java and c++, but am not very well
acquainted with open source contributions. I wish to be a part of the
Google Summer of Code to broaden my horizons, to learn as well as
contribute to the organization.
Will you please guide me regarding the procedure to apply for GSoC?
Regards.
Isha Desai.

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

[Noel Grandin (via logerrit)]

 chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
|   11 +-
 chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
|4 +--
 
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
 |1 
 chart2/source/inc/chartview/ExplicitValueProvider.hxx  
|2 -
 chart2/source/view/main/ChartView.cxx  
|4 +--
 5 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit c592574948b0a28bac965b508bc260aaa6c365d3
Author: Noel Grandin 
AuthorDate: Sun Jan 16 12:25:49 2022 +0200
Commit: Noel Grandin 
CommitDate: Sun Jan 16 12:55:26 2022 +0100

use more concrete types in chart2, ChartView

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

diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx 
b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 9ce03b9cc8a7..88f362070795 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -98,14 +99,14 @@ rtl::Reference< ::chart::Diagram > 
Chart2ModelContact::getDiagram() const
 return nullptr;
 }
 
-uno::Reference< lang::XUnoTunnel > const & Chart2ModelContact::getChartView() 
const
+rtl::Reference< ::chart::ChartView > const & 
Chart2ModelContact::getChartView() const
 {
 if(!m_xChartView.is())
 {
 // get the chart view
 rtl::Reference xChartModel( m_xChartModel );
 if( xChartModel )
-m_xChartView.set( xChartModel->createInstance( 
CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
+m_xChartView = xChartModel->getChartView(); // will create if 
necessary
 }
 return m_xChartView;
 }
@@ -115,7 +116,7 @@ ExplicitValueProvider* 
Chart2ModelContact::getExplicitValueProvider() const
 getChartView();
 
 //obtain the ExplicitValueProvider from the chart view
-return comphelper::getFromUnoTunnel(m_xChartView);
+return m_xChartView.get();
 }
 
 rtl::Reference Chart2ModelContact::getDrawPage() const
@@ -168,7 +169,7 @@ awt::Size Chart2ModelContact::GetPageSize() const
 awt::Rectangle Chart2ModelContact::SubstractAxisTitleSizes( const 
awt::Rectangle& rPositionRect )
 {
 awt::Rectangle aRect = ExplicitValueProvider::AddSubtractAxisTitleSizes(
-*m_xChartModel.get(), getChartView(), rPositionRect, true );
+*m_xChartModel.get(), getChartView().get(), rPositionRect, true );
 return aRect;
 }
 
@@ -178,7 +179,7 @@ awt::Rectangle 
Chart2ModelContact::GetDiagramRectangleIncludingTitle() const
 
 //add axis title sizes to the diagram size
 aRect = ExplicitValueProvider::AddSubtractAxisTitleSizes(
-*m_xChartModel.get(), getChartView(), aRect, false );
+*m_xChartModel.get(), getChartView().get(), aRect, false );
 
 return aRect;
 }
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx 
b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index c0f7185fe4ed..837c09341fd3 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -131,7 +131,7 @@ public:
 
 private: //methods
 ExplicitValueProvider* getExplicitValueProvider() const;
-css::uno::Reference< css::lang::XUnoTunnel > const & getChartView() const;
+rtl::Reference< ChartView > const & getChartView() const;
 
 public: //member
 css::uno::Reference< css::uno::XComponentContext >  m_xContext;
@@ -139,7 +139,7 @@ public: //member
 private: //member
 unotools::WeakReference< ChartModel >   m_xChartModel;
 
-mutable css::uno::Reference< css::lang::XUnoTunnel > m_xChartView;
+mutable rtl::Reference< ChartView > m_xChartView;
 
 std::map< OUString, css::uno::Reference< css::container::XNameContainer > 
> m_aTableMap;
 };
diff --git 
a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
 
b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index a02ff69f2cc8..4895e1c40b9d 100644
--- 
a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ 
b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -29,6 +29,7 @@
 #include 
 #include "Chart2ModelContact.hxx"
 #include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx 
b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 12047a5b9515..f367271e3b80 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.h

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

[Noel Grandin (via logerrit)]

 chart2/inc/ChartModel.hxx  
|6 -
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx   
|2 
 chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
|   15 ++-
 chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
|3 
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
|8 -
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
|   46 --
 chart2/source/controller/chartapiwrapper/GridWrapper.cxx   
|2 
 chart2/source/controller/chartapiwrapper/LegendWrapper.cxx 
|2 
 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx 
|4 
 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx  
|4 
 chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx  
|2 
 
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
 |8 -
 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx   
|4 
 chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx  
|4 
 chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
|4 
 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx   
|4 
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
|6 -
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx   
|2 
 chart2/source/inc/Diagram.hxx  
|   10 +-
 chart2/source/model/main/ChartModel.cxx
|   20 ++--
 solenv/clang-format/excludelist
|2 
 21 files changed, 88 insertions(+), 70 deletions(-)

New commits:
commit 5a4b75dcb5abc2e925870614a28e1c2876df8ed9
Author: Noel Grandin 
AuthorDate: Sat Jan 15 22:03:55 2022 +0200
Commit: Noel Grandin 
CommitDate: Sun Jan 16 12:29:27 2022 +0100

use more concrete types in chart2, Diagram

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

diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index b3d1d3f42ce9..4717b30a9cbe 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -69,6 +69,7 @@ class SvNumberFormatter;
 
 namespace chart
 {
+class Diagram;
 
 namespace impl
 {
@@ -158,8 +159,7 @@ private:
 m_xChartTypeManager;
 
 // Diagram Access
-css::uno::Reference< css::chart2::XDiagram >
-m_xDiagram;
+rtl::Reference< ::chart::Diagram > m_xDiagram;
 
 css::uno::Reference< css::chart2::XTitle >
   m_xTitle;
@@ -456,6 +456,8 @@ public:
 
 ChartView* getChartView() const;
 
+const rtl::Reference< ::chart::Diagram > & getFirstChartDiagram() { return 
m_xDiagram; }
+
 bool isTimeBased() const { return mbTimeBased;}
 
 void setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd);
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 37835448d14e..db3e413ba919 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -581,7 +581,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
 bool  bMainAxis = true;
 AxisWrapper::getDimensionAndMainAxisBool( m_eType, nDimensionIndex, 
bMainAxis );
 
-Reference< XDiagram > xDiagram( 
m_spChart2ModelContact->getChart2Diagram() );
+rtl::Reference< Diagram > xDiagram( 
m_spChart2ModelContact->getDiagram() );
 xAxis = AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram );
 if( !xAxis.is() )
 {
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx 
b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 8759cc6f54b7..9ce03b9cc8a7 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -31,6 +31,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -82,9 +83,19 @@ rtl::Reference< ChartModel > 
Chart2ModelContact::getDocumentModel() const
 return m_xChartModel;
 }
 
-Reference< chart2::XDiagram > Chart2ModelContact::getChart2Diagram() const
+rtl::Reference< ::chart::Diagram > Chart2ModelContact::getDiagram() const
 {
-return ChartModelHelper::findDiagram( 
uno::Reference(m_xChartModel.get()) );
+try
+{
+rtl::Reference xChartModel = getDocumentModel

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

[Caolán McNamara (via logerrit)]

 include/vcl/outdev.hxx|1 
 include/vcl/vcllayout.hxx |6 +--
 vcl/source/gdi/pdfwriter_impl.cxx |4 +-
 vcl/source/gdi/sallayout.cxx  |6 +--
 vcl/source/outdev/font.cxx|2 -
 vcl/source/outdev/map.cxx |   13 +++-
 vcl/source/outdev/text.cxx|   59 ++
 vcl/source/outdev/textline.cxx|   12 +++
 8 files changed, 63 insertions(+), 40 deletions(-)

New commits:
commit dab0d4e1f36faace21145a51733bd3a946992624
Author: Caolán McNamara 
AuthorDate: Sat Jan 15 21:47:02 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Jan 16 12:23:29 2022 +0100

tdf#146439 retain precise base start pos when using 
ResolutionIndependentLayout

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 0282ea8458b5..4b9d1e7e626a 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1713,6 +1713,7 @@ public:
  @returns Device's X pixel coordinate
  */
 SAL_DLLPRIVATE tools::Long ImplLogicXToDevicePixel( tools::Long nX 
) const;
+SAL_DLLPRIVATE double LogicXToDeviceFontCoordinate( tools::Long nWidth ) 
const;
 
 /** Convert a logical Y coordinate to a device pixel's Y coordinate.
 
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index 957d18cebd95..b766a0b4ccd6 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -68,8 +68,8 @@ class VCL_DLLPUBLIC SalLayout
 public:
 virtual ~SalLayout();
 // used by upper layers
-Point&  DrawBase()  { return 
maDrawBase; }
-const Point&DrawBase() const{ return 
maDrawBase; }
+DevicePoint&DrawBase()  { return 
maDrawBase; }
+const DevicePoint& DrawBase() const { return 
maDrawBase; }
 Point&  DrawOffset(){ return 
maDrawOffset; }
 const Point&DrawOffset() const  { return 
maDrawOffset; }
 DevicePoint GetDrawPosition( const DevicePoint& rRelative = 
DevicePoint(0,0) ) const;
@@ -114,7 +114,7 @@ protected:
 Degree10mnOrientation;
 
 mutable Point   maDrawOffset;
-Point   maDrawBase;
+DevicePoint maDrawBase;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index b85592e8fa51..0af6cc78f221 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5804,9 +5804,9 @@ void PDFWriterImpl::drawShadow( SalLayout& rLayout, const 
OUString& rText, bool
 tools::Long nOff = 1 + ((GetFontInstance()->mnLineHeight-24)/24);
 if( rFont.IsOutline() )
 nOff++;
-rLayout.DrawBase() += Point( nOff, nOff );
+rLayout.DrawBase() += DevicePoint(nOff, nOff);
 drawLayout( rLayout, rText, bTextLines );
-rLayout.DrawBase() -= Point( nOff, nOff );
+rLayout.DrawBase() -= DevicePoint(nOff, nOff);
 
 setFont( aSaveFont );
 setTextLineColor( aSaveTextLineColor );
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 8c7542a3b79f..64b1d22480e5 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -150,7 +150,7 @@ void SalLayout::AdjustLayout( vcl::text::ImplLayoutArgs& 
rArgs )
 
 DevicePoint SalLayout::GetDrawPosition(const DevicePoint& rRelative) const
 {
-DevicePoint aPos(maDrawBase.X(), maDrawBase.Y());
+DevicePoint aPos(maDrawBase);
 DevicePoint aOfs(rRelative.getX() + maDrawOffset.X(),
  rRelative.getY() + maDrawOffset.Y());
 
@@ -1124,8 +1124,8 @@ bool MultiSalLayout::GetNextGlyph(const GlyphItem** 
pGlyph,
 nStart |= nFontTag;
 if (pFallbackFont)
 *pFallbackFont = pFontFace;
-rPos.adjustX(maDrawBase.X() + maDrawOffset.X());
-rPos.adjustY(maDrawBase.Y() + maDrawOffset.Y());
+rPos.adjustX(maDrawBase.getX() + maDrawOffset.X());
+rPos.adjustY(maDrawBase.getY() + maDrawOffset.Y());
 return true;
 }
 }
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 1182ac96a6b9..71e4091e754e 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1138,7 +1138,7 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& 
rSalLayout )
 }
 aOutPoint.adjustX(aAdjPoint.X() - nEmphasisWidth2);
 aOutPoint.adjustY(aAdjPoint.Y() - nEmphasisHeight2);
-ImplDrawEmphasisMark( rSalLayout.DrawBase().X(),
+ImplDrawEmphasisMark( rSalLayout.DrawBase().getX(),
   aOutPoint.getX(), aOutPoint.getY(),
  

Re: How to get started with contribution

[Heiko Tietze]

On 16.01.22 05:52, Ilmari Lauhakangas wrote:
I don't see C++ in the list of langs, so not inviting to interview. If someone 
else has ideas, feel free.


QA (unit test) and extension development come in mind for Python and Javascript.


OpenPGP_signature
Description: OpenPGP digital signature