[Libreoffice-commits] online.git: loleaflet/.gitignore loleaflet/Makefile.am loleaflet/README loleaflet/spec

[Tor Lillqvist (via logerrit)]

 dev/null   |binary
 loleaflet/.gitignore   |1 
 loleaflet/Makefile.am  |   20 
 loleaflet/README   |   19 
 loleaflet/spec/.eslintrc   |   38 
 loleaflet/spec/after.js|3 
 loleaflet/spec/expect.js   | 1254 ---
 loleaflet/spec/headlessLoadTest.js |  188 
 loleaflet/spec/index.html  |   91 
 loleaflet/spec/karma.conf.js   |   71 
 loleaflet/spec/loadtest.html   |   60 
 loleaflet/spec/loadtest/LoadTestSpec.js|   82 
 loleaflet/spec/loleaflet.html  |   46 
 loleaflet/spec/loleaflet/control/PartsSpec.js  |  153 
 loleaflet/spec/loleaflet/control/PermissionSpec.js |  130 
 loleaflet/spec/loleaflet/control/SearchSpec.js |  139 
 loleaflet/spec/loleaflet/control/ToolbarSpec.js|   62 
 loleaflet/spec/runLoadTest.sh  |   20 
 loleaflet/spec/sinon.js| 4224 -
 loleaflet/spec/spec.hintrc.js  |   26 
 loleaflet/spec/suites/SpecHelper.js|   43 
 loleaflet/spec/suites/control/Control.AttributionSpec.js   |   69 
 loleaflet/spec/suites/control/Control.LayersSpec.js|   68 
 loleaflet/spec/suites/control/Control.ScaleSpec.js |7 
 loleaflet/spec/suites/control/ControlSpec.js   |   52 
 loleaflet/spec/suites/core/ClassSpec.js|  178 
 loleaflet/spec/suites/core/EventsSpec.js   |  417 -
 loleaflet/spec/suites/core/UtilSpec.js |  239 
 loleaflet/spec/suites/dom/DomEventSpec.js  |  103 
 loleaflet/spec/suites/dom/DomUtilSpec.js   |   60 
 loleaflet/spec/suites/geo/CRSSpec.js   |  152 
 loleaflet/spec/suites/geo/LatLngBoundsSpec.js  |  149 
 loleaflet/spec/suites/geo/LatLngSpec.js|  120 
 loleaflet/spec/suites/geo/ProjectionSpec.js|   97 
 loleaflet/spec/suites/geometry/BoundsSpec.js   |   88 
 loleaflet/spec/suites/geometry/LineUtilSpec.js |   91 
 loleaflet/spec/suites/geometry/PointSpec.js|  105 
 loleaflet/spec/suites/geometry/PolyUtilSpec.js |   43 
 loleaflet/spec/suites/geometry/TransformationSpec.js   |   32 
 loleaflet/spec/suites/layer/FeatureGroupSpec.js|   87 
 loleaflet/spec/suites/layer/GeoJSONSpec.js |  326 -
 loleaflet/spec/suites/layer/ImageOverlaySpec.js|9 
 loleaflet/spec/suites/layer/LayerGroupSpec.js  |   72 
 loleaflet/spec/suites/layer/PopupSpec.js   |  203 
 loleaflet/spec/suites/layer/marker/MarkerSpec.js   |  171 
 loleaflet/spec/suites/layer/tile/GridLayerSpec.js  |  135 
 loleaflet/spec/suites/layer/tile/TileLayerSpec.js  |1 
 loleaflet/spec/suites/layer/vector/CircleMarkerSpec.js |   54 
 loleaflet/spec/suites/layer/vector/CircleSpec.js   |   19 
 loleaflet/spec/suites/layer/vector/PathSpec.js |   16 
 loleaflet/spec/suites/layer/vector/PolygonSpec.js  |   97 
 loleaflet/spec/suites/layer/vector/PolylineGeometrySpec.js |   36 
 loleaflet/spec/suites/layer/vector/PolylineSpec.js |   56 
 loleaflet/spec/suites/map/MapSpec.js   |  574 -
 loleaflet/spec/suites/map/handler/Map.DragSpec.js  |   39 
 loleaflet/spec/tilebench.html  |   44 
 loleaflet/spec/tilebench/TileBenchSpec.js  |  392 -
 57 files changed, 11071 deletions(-)

New commits:
commit 2c7b1a6919cdfa3d2ef79d10c77cfeffd185cb84
Author: Tor Lillqvist 
AuthorDate: Wed Apr 15 11:51:32 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 16 08:22:50 2020 +0200

Remove loleaflet/spec which probably hasn't been maintained anyway

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

diff --git a/loleaflet/.gitignore b/loleaflet/.gitignore
index 79e5206f4..18e91cc81 100644
--- a/loleaflet/.gitignore
+++ b/loleaflet/.gitignore
@@ -20,7 +20,6 @@ plugins/draw-0.2.4/dist/*.js
 plugins/draw-0.2.4/npm-debug.log
 coverage/
 /load_test_out
-/spec/data/load_test
 *.tar.gz
 dist/l10n/ui-*json
 dist/l10n/help-*.json
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 385bb96a6..8375354e0 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -571,25 +571,5 @@ clean-local:
rm -rf $(builddir)/dist
rm -rf $(builddir)/build/dist
 
-spec/da

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

[Julien Nabet (via logerrit)]

 sc/source/core/data/table6.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2670e980c7dbadbdc20ff23d57ad892951edc254
Author: Julien Nabet 
AuthorDate: Tue Apr 14 14:28:55 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 16 08:21:40 2020 +0200

tdf#132097: fix Find Previous with direction columns crashes in specific 
case

See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=159553

nBlockPos vector is created with nLastCol + 1 elements,
so if we click on a cell in a column which is after last value,
the search will crash

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

diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 4769a78b2a77..a66822fcb9da 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -339,8 +339,8 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, 
SCCOL& rCol, SCROW& rRow,
 bool bSkipFiltered = !rSearchItem.IsSearchFiltered();
 bool bSearchNotes = (rSearchItem.GetCellType() == SvxSearchCellType::NOTE);
 // We need to cache sc::ColumnBlockConstPosition per each column.
-std::vector< sc::ColumnBlockConstPosition > blockPos( nLastCol + 1 );
-for( SCCOL i = 0; i <= nLastCol; ++i )
+std::vector< sc::ColumnBlockConstPosition > blockPos( nLastCol + 2 );
+for( SCCOL i = 0; i <= nLastCol+1; ++i )
 aCol[ i ].InitBlockPosition( blockPos[ i ] );
 if (!bAll && rSearchItem.GetBackward())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 svtools/source/dialogs/insdlg.cxx|   97 +--
 svtools/source/hatchwindow/ipwin.cxx |2 
 svtools/source/svhtml/htmlsupp.cxx   |   38 ++---
 svtools/source/svhtml/parhtml.cxx|   34 +++-
 svx/source/dialog/hyperdlg.cxx   |   33 ++-
 svx/source/dialog/imapwnd.cxx|   28 ++
 svx/source/dialog/srchdlg.cxx|   19 +++---
 svx/source/form/fmshimp.cxx  |   12 ++--
 svx/source/gallery2/gallery1.cxx |9 ++-
 svx/source/gallery2/galtheme.cxx |8 +-
 10 files changed, 162 insertions(+), 118 deletions(-)

New commits:
commit f98b3b5b9f1b05259405833e6e528e734ded4512
Author: Noel Grandin 
AuthorDate: Wed Apr 15 19:37:27 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 16 08:16:13 2020 +0200

loplugin:buriedassign in svtools..svx

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

diff --git a/svtools/source/dialogs/insdlg.cxx 
b/svtools/source/dialogs/insdlg.cxx
index 9696a958f18d..4c0701406ed8 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -279,59 +279,60 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( 
SotClipboardFormatId nId )
 
 bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, 
OUString& _rName, OUString& _rSource, SotClipboardFormatId const & _nFormat)
 {
-bool bRet = false;
-if( _nFormat == SotClipboardFormatId::EMBED_SOURCE_OLE || _nFormat == 
SotClipboardFormatId::EMBEDDED_OBJ_OLE )
-{
-datatransfer::DataFlavor aFlavor;
-SotExchange::GetFormatDataFlavor( 
SotClipboardFormatId::OBJECTDESCRIPTOR_OLE, aFlavor );
+if( _nFormat != SotClipboardFormatId::EMBED_SOURCE_OLE && _nFormat != 
SotClipboardFormatId::EMBEDDED_OBJ_OLE )
+return false;
 
-uno::Any aAny;
-if( rData.HasFormat( aFlavor ) &&
-( aAny = rData.GetAny(aFlavor, OUString()) ).hasValue() )
-{
-uno::Sequence< sal_Int8 > anySequence;
-aAny >>= anySequence;
+datatransfer::DataFlavor aFlavor;
+SotExchange::GetFormatDataFlavor( 
SotClipboardFormatId::OBJECTDESCRIPTOR_OLE, aFlavor );
 
-OleObjectDescriptor* pOleObjDescr =
-reinterpret_cast< OleObjectDescriptor* >( 
anySequence.getArray( ) );
+if( !rData.HasFormat( aFlavor ) )
+return false;
 
-// determine the user friendly description of the embedded object
-if ( pOleObjDescr->dwFullUserTypeName )
-{
-// we set the pointer to the start of user friendly description
-// string. it starts  at &OleObjectDescriptor + 
dwFullUserTypeName.
-// dwFullUserTypeName is the offset in bytes.
-// the user friendly description string is '\0' terminated.
-const sal_Unicode* pUserTypeName =
-reinterpret_cast< sal_Unicode* >(
-reinterpret_cast< char* >( pOleObjDescr ) +
-pOleObjDescr->dwFullUserTypeName );
-
-_rName += pUserTypeName;
-// the following statement was here for historical reasons, it 
is commented out since it causes bug i49460
-// _nFormat = SotClipboardFormatId::EMBED_SOURCE_OLE;
-}
+uno::Any aAny = rData.GetAny(aFlavor, OUString());
+if (!aAny.hasValue())
+return false;
 
-// determine the source of the embedded object
-if ( pOleObjDescr->dwSrcOfCopy )
-{
-// we set the pointer to the start of source string
-// it starts  at &OleObjectDescriptor + dwSrcOfCopy.
-// dwSrcOfCopy is the offset in bytes.
-// the source string is '\0' terminated.
-const sal_Unicode* pSrcOfCopy =
-reinterpret_cast< sal_Unicode* >(
-reinterpret_cast< char* >( pOleObjDescr ) +
-pOleObjDescr->dwSrcOfCopy );
-
-_rSource += pSrcOfCopy;
-}
-else
-_rSource = SvtResId(STR_UNKNOWN_SOURCE);
-}
-bRet = true;
+uno::Sequence< sal_Int8 > anySequence;
+aAny >>= anySequence;
+
+OleObjectDescriptor* pOleObjDescr =
+reinterpret_cast< OleObjectDescriptor* >( anySequence.getArray( ) 
);
+
+// determine the user friendly description of the embedded object
+if ( pOleObjDescr->dwFullUserTypeName )
+{
+// we set the pointer to the start of user friendly description
+// string. it starts  at &OleObjectDescriptor + dwFullUserTypeName.
+// dwFullUserTypeName is the offset in bytes.
+// the user friendly description string is '\0' terminated.
+const sal_Unicode* pUserTypeName =
+reinterpret

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

[Noel Grandin (via logerrit)]

 starmath/inc/utility.hxx  |3 +--
 starmath/source/ElementsDockingWindow.cxx |   20 
 starmath/source/mathmlexport.cxx  |5 -
 starmath/source/mathtype.cxx  |7 ++-
 starmath/source/node.cxx  |   30 +-
 starmath/source/parse.cxx |8 ++--
 starmath/source/view.cxx  |6 --
 stoc/source/corereflection/crefl.cxx  |6 --
 stoc/source/typeconv/convert.cxx  |3 ++-
 svl/source/items/itemset.cxx  |   16 
 svl/source/numbers/zforfind.cxx   |   19 ++-
 svl/source/numbers/zformat.cxx|   16 
 12 files changed, 98 insertions(+), 41 deletions(-)

New commits:
commit cd7471335a05e7dd7eca16ac0b181d96cfa7912b
Author: Noel Grandin 
AuthorDate: Wed Apr 15 19:33:03 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 16 08:15:54 2020 +0200

loplugin:buriedassign in starmath..svl

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

diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 0ce2ff346079..2a462b98d727 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -46,8 +46,7 @@ inline Fraction Sm100th_mmToPts(long nNum100th_mm)
 // 'nNum100th_mm' (in 100th of mm).
 {
 SAL_WARN_IF( nNum100th_mm < 0, "starmath", "Ooops..." );
-Fraction  aTmp (7227L, 254000L);
-return aTmp *= Fraction(nNum100th_mm);
+return Fraction(7227L, 254000L) * Fraction(nNum100th_mm);
 }
 
 
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 8eca86c24077..ebaa6b9e4fdd 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -1016,7 +1016,10 @@ FactoryFunction SmElementsControl::GetUITestFactory() 
const
 
 bool SmElementsControl::itemIsSeparator(sal_uInt16 nPos) const
 {
-if (nPos < m_nCurrentOffset || (nPos -= m_nCurrentOffset) >= 
maElementList.size())
+if (nPos < m_nCurrentOffset)
+return true;
+nPos -= m_nCurrentOffset;
+if (nPos >= maElementList.size())
 return true;
 return maElementList[nPos]->isSeparator();
 }
@@ -1033,7 +1036,10 @@ css::uno::Reference 
SmElementsControl::CreateAc
 
 bool SmElementsControl::itemTrigger(sal_uInt16 nPos)
 {
-if (nPos < m_nCurrentOffset || (nPos -= m_nCurrentOffset) >= 
maElementList.size())
+if (nPos < m_nCurrentOffset)
+return false;
+nPos -= m_nCurrentOffset;
+if (nPos >= maElementList.size())
 return false;
 
 maSelectHdlLink.Call(*maElementList[nPos]);
@@ -1043,7 +1049,10 @@ bool SmElementsControl::itemTrigger(sal_uInt16 nPos)
 
 tools::Rectangle SmElementsControl::itemPosRect(sal_uInt16 nPos) const
 {
-if (nPos < m_nCurrentOffset || (nPos -= m_nCurrentOffset) >= 
maElementList.size())
+if (nPos < m_nCurrentOffset)
+return tools::Rectangle();
+nPos -= m_nCurrentOffset;
+if (nPos >= maElementList.size())
 return tools::Rectangle();
 
 SmElement* pItem = maElementList[nPos].get();
@@ -1080,7 +1089,10 @@ void SmElementsControl::setItemHighlighted(sal_uInt16 
nPos)
 
 OUString SmElementsControl::itemName(sal_uInt16 nPos) const
 {
-if (nPos < m_nCurrentOffset || (nPos -= m_nCurrentOffset) >= 
maElementList.size())
+if (nPos < m_nCurrentOffset)
+return OUString();
+nPos -= m_nCurrentOffset;
+if (nPos >= maElementList.size())
 return OUString();
 
 return maElementList[nPos]->getHelpText();
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 7fc7243d7e19..c619f22f4dc1 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1139,8 +1139,11 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int 
nLevel)
 int nItalic = -1;   // for the following variables: -1 = yet undefined; 0 
= false; 1 = true;
 int nSansSerifFixed   = -1;
 SmTokenType eNodeType = TUNKNOWN;
-while (lcl_HasEffectOnMathvariant( (eNodeType = pNode->GetToken().eType) ))
+for (;;)
 {
+eNodeType = pNode->GetToken().eType;
+if (!lcl_HasEffectOnMathvariant(eNodeType))
+break;
 switch (eNodeType)
 {
 case TBOLD  : nBold   = 1; break;
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 06655e112597..d0889ce393d8 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -684,8 +684,13 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 
nSelector,
 {
 sal_Unicode cChar = 0;
 sal_Int32 nI = rRet.getLength()-1;
-while (nI && ((cChar = rRet[nI]) == ' '))
+while (nI)
+{
+   

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

[Mike Kaganski (via logerrit)]

 vcl/inc/svimpbox.hxx|1 -
 vcl/source/treelist/treelistbox.cxx |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit eca8526607d8e5b883989adf480780661380b12e
Author: Mike Kaganski 
AuthorDate: Thu Apr 16 08:11:53 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu Apr 16 08:13:31 2020 +0200

Drop redundant member function

SvImpLBox::GetCurrentEntry was identical to GetCurEntry

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

diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index e62177571c74..df7d5724663f 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -272,7 +272,6 @@ public:
 voidSetDragDropMode( DragDropMode eDDMode );
 voidSetSelectionMode( SelectionMode eSelMode  );
 
-SvTreeListEntry*GetCurrentEntry() const { return m_pCursor; }
 virtual boolIsEntryInView( SvTreeListEntry* pEntry ) const;
 virtual SvTreeListEntry*GetEntry( const Point& rPos ) const;
 // returns last entry, if Pos below last entry
diff --git a/vcl/source/treelist/treelistbox.cxx 
b/vcl/source/treelist/treelistbox.cxx
index 22c67368c52d..9358fb830654 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -1945,7 +1945,7 @@ void SvTreeListBox::GetFocus()
 SvTreeListEntry* pEntry = FirstSelected();
 if ( !pEntry )
 {
-pEntry = pImpl->GetCurrentEntry();
+pEntry = pImpl->GetCurEntry();
 }
 if (pImpl->m_pCursor)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sd/source/filter/html/pubdlg.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d44dba1a56052e87b879ac986ad14a63bbca357d
Author: Caolán McNamara 
AuthorDate: Thu Apr 9 11:46:05 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Apr 16 07:22:00 2020 +0200

Resolves: tdf#131996 set_sensitive should be set_active

search and replace went wrong in:

commit b94214350e6e3d0252c09f203a3ce7807a179f90
Date:   Thu Jul 25 14:09:09 2019 +0100

weld SdPublishingDlg

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

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 7623d34a115d..3a31202e5e71 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -644,7 +644,7 @@ void SdPublishingDlg::SetDefaults()
 SetDesign(&aDefault);
 
 m_xPage1_NewDesign->set_active(true);
-m_xPage1_OldDesign->set_sensitive(false);
+m_xPage1_OldDesign->set_active(false);
 UpdatePage();
 }
 
@@ -828,7 +828,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, weld::Button&, 
rButton, void )
 if (&rButton == m_xPage1_NewDesign.get())
 {
 m_xPage1_NewDesign->set_active(true); // because of DesignDeleteHdl
-m_xPage1_OldDesign->set_sensitive(false);
+m_xPage1_OldDesign->set_active(false);
 m_xPage1_Designs->set_sensitive(false);
 m_xPage1_DelDesign->set_sensitive(false);
 m_pDesign = nullptr;
@@ -838,7 +838,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, weld::Button&, 
rButton, void )
 }
 else
 {
-m_xPage1_NewDesign->set_sensitive(false);
+m_xPage1_NewDesign->set_active(false);
 m_xPage1_Designs->set_sensitive(true);
 m_xPage1_DelDesign->set_sensitive(true);
 
@@ -946,7 +946,7 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, weld::Button&, 
rButton, void )
 IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl, SvtValueSet*, void)
 {
 // if one bitmap-button is chosen, then disable TextOnly
-m_xPage5_TextOnly->set_sensitive(false);
+m_xPage5_TextOnly->set_active(false);
 }
 
 // Fill the SfxItemSet with the settings of the dialog
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/sfxbasemodel.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit dafa1bbf09e1df38cc0758b9f4c8a0ca186b31d2
Author: Caolán McNamara 
AuthorDate: Wed Apr 15 16:09:09 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Apr 16 07:20:14 2020 +0200

tdf#126828 don't crash fetching cmis properties from disposed SfxBaseModel

Change-Id: Ie064632667b40201e0d266c64e3068c4d1983c7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92283
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit db677c854a37031235b0f42b4f4f48560149754f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92289
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index a136f74f2886..9849ac86d642 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2458,8 +2458,10 @@ void SAL_CALL SfxBaseModel::notifyDocumentEvent( const 
OUString&, const Referenc
 throw lang::NoSupportException("SfxBaseModel controls all the sent 
notifications itself!" );
 }
 
-Sequence< document::CmisProperty > SAL_CALL SfxBaseModel::getCmisProperties()
+Sequence SAL_CALL SfxBaseModel::getCmisProperties()
 {
+if (impl_isDisposed())
+return Sequence();
 return m_pData->m_cmisProperties;
 }
 
@@ -2597,7 +2599,9 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, 
const OUString& rMessage
 
 uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( )
 {
-uno::Sequence< document::CmisVersion > aVersions;
+uno::Sequence aVersions;
+if (impl_isDisposed())
+return aVersions;
 SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
 if ( pMedium )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |   35 +--
 loleaflet/src/map/Map.js |7 +-
 2 files changed, 30 insertions(+), 12 deletions(-)

New commits:
commit b8d1f08e588a57439fcc2494bf44c8a07f7adc33
Author: Tor Lillqvist 
AuthorDate: Wed Apr 15 13:30:45 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Apr 16 06:53:06 2020 +0200

tdf#128507: Increase max zoom to 400%

Also add rounded-to-five labels for the already previously possible
two smallest zoom levels (35% and 40%).

Change-Id: I8c7293093e8fe70a4b50081a0a3ac4f96c8486ba
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92259
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92324
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 7af0f6ce2..be55cdf34 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1143,6 +1143,8 @@ function initNormalToolbar() {
selected: 'zoom100',
mobile: false,
items: [
+   { id: 'zoom35', text: '35', 
scale: 4},
+   { id: 'zoom40', text: '40', 
scale: 5},
{ id: 'zoom50', text: '50', 
scale: 6},
{ id: 'zoom60', text: '60', 
scale: 7},
{ id: 'zoom70', text: '70', 
scale: 8},
@@ -1151,7 +1153,11 @@ function initNormalToolbar() {
{ id: 'zoom120', text: '120', 
scale: 11},
{ id: 'zoom150', text: '150', 
scale: 12},
{ id: 'zoom175', text: '175', 
scale: 13},
-   { id: 'zoom200', text: '200', 
scale: 14}
+   { id: 'zoom200', text: '200', 
scale: 14},
+   { id: 'zoom235', text: '235', 
scale: 15},
+   { id: 'zoom280', text: '280', 
scale: 16},
+   { id: 'zoom335', text: '335', 
scale: 17},
+   { id: 'zoom400', text: '400', 
scale: 18},
]
},
{type: 'button',  id: 'zoomin', img: 'zoomin', 
hint: _UNO('.uno:ZoomPlus')}
@@ -2603,18 +2609,25 @@ function setupToolbar(e) {
var zoomPercent = 100;
var zoomSelected = null;
switch (map.getZoom()) {
-   case 6:  zoomPercent =  50; zoomSelected = 'zoom50'; break;
-   case 7:  zoomPercent =  60; zoomSelected = 'zoom60'; break;
-   case 8:  zoomPercent =  70; zoomSelected = 'zoom70'; break;
-   case 9:  zoomPercent =  85; zoomSelected = 'zoom85'; break;
-   case 10: zoomPercent = 100; zoomSelected = 'zoom100'; break;
-   case 11: zoomPercent = 120; zoomSelected = 'zoom120'; break;
-   case 12: zoomPercent = 150; zoomSelected = 'zoom150'; break;
-   case 13: zoomPercent = 175; zoomSelected = 'zoom175'; break;
-   case 14: zoomPercent = 200; zoomSelected = 'zoom200'; break;
+   case 4:  zoomPercent =  35; zoomSelected = 'zoom35'; break;  // 
0.3535
+   case 5:  zoomPercent =  40; zoomSelected = 'zoom40'; break;  // 
0.4204
+   case 6:  zoomPercent =  50; zoomSelected = 'zoom50'; break;  // 
0.5
+   case 7:  zoomPercent =  60; zoomSelected = 'zoom60'; break;  // 
0.5946
+   case 8:  zoomPercent =  70; zoomSelected = 'zoom70'; break;  // 
0.7071
+   case 9:  zoomPercent =  85; zoomSelected = 'zoom85'; break;  // 
0.8409
+   case 10: zoomPercent = 100; zoomSelected = 'zoom100'; break; // 
1
+   case 11: zoomPercent = 120; zoomSelected = 'zoom120'; break; // 
1.1892
+   // Why do we call this 150% even if it is actually closer to 
140%
+   case 12: zoomPercent = 150; zoomSelected = 'zoom150'; break; // 
1.4142
+   case 13: zoomPercent = 170; zoomSelected = 'zoom170'; break; // 
1.6818
+   case 14: zoomPercent = 200; zoomSelected = 'zoom200'; break; // 
2
+   case 15: zoomPercent = 235; zoomSelected = 'zoom235'; break; // 
2.3784
+   case 16: zoomPercent = 280; zoomSelected = 'zoom280'; break; // 
2.8284
+   case 17: zoomPercent = 335; zoomSelected = 'zoom335'; break; // 
3.3636
+ 

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

[mert (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |  113 ++-
 1 file changed, 89 insertions(+), 24 deletions(-)

New commits:
commit a87c98688f173b12b6259a756e2bb4028cfb4a77
Author: mert 
AuthorDate: Tue Apr 14 18:10:47 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Apr 16 06:52:47 2020 +0200

mobilewizard: fix inconsistent state of items on Number Format

implemented listbox updates for numberformatcombobox and
fontsizecombobox to apply changes without reopening the
mobile wizard. This patch also fixes the update problem of
the checkbox items on number format page

Change-Id: Ib330531f766e5d1ff0744585f324a235f5ae3121
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92204
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit db26ae326c0ba5c2cddcb1585ff7af1b139be842)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92295

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 8727e065c..8162c5283 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -242,6 +242,46 @@ L.Control.JSDialogBuilder = L.Control.extend({
return true;
},
 
+   _getListBoxUpdateType: function(id) {
+   if (id) {
+   if (id === 'numberformatcombobox')
+   return 'index';
+   else if (id === 'fontsizecombobox')
+   return 'value';
+   }
+   return false;
+   },
+
+   _updateListBox: function(builder, contentDiv, contentNode, 
sectionTitle, data, state) {
+   if ($(sectionTitle).find('.entry-value')[0])
+   sectionTitle = 
$($(sectionTitle).find('.entry-value')).get(0);
+   else
+   sectionTitle = 
$(sectionTitle).find('.ui-header-left').find('span')[0];
+
+   if (!sectionTitle)
+   return;
+
+   $(contentDiv).find('.selected').removeClass('selected');
+
+   var hasChildren = $(contentDiv).children().length > 0 && 
contentNode.children && contentNode.children.length > 0;
+   var updateBy = builder._getListBoxUpdateType(data.id);
+   if (updateBy === 'index') {
+   sectionTitle.innerHTML = data.entries[state];
+   data.selectedEntries[0] = state;
+   contentDiv.title = data.entries[state];
+   if (hasChildren) {
+   
$($(contentDiv).children().get(state)).addClass('selected');
+   }
+   } else if (updateBy === 'value') {
+   sectionTitle.innerHTML = state;
+   if (hasChildren) {
+   $(contentDiv).find('p').filter(function() {
+   return $(this).text() === state;
+   }).addClass('selected');
+   }
+   }
+   },
+
_explorableEntry: function(parentContainer, data, contentNode, builder, 
valueNode, iconPath, updateCallback) {
var sectionTitle = L.DomUtil.create('div', 'ui-header level-' + 
builder._currentDepth + ' mobile-wizard ui-widget', parentContainer);
$(sectionTitle).css('justify-content', 'space-between');
@@ -270,28 +310,6 @@ L.Control.JSDialogBuilder = L.Control.extend({
var arrowSpan = L.DomUtil.create('span', 'sub-menu-arrow', 
rightDiv);
arrowSpan.innerHTML = '>';
 
-   var updateFunction = function(titleSpan) {
-   var state = null;
-   if (data.id)
-   state = builder._getUnoStateForItemId(data.id, 
builder);
-
-   if (state) {
-   titleSpan.innerHTML = state;
-   } else {
-   titleSpan.innerHTML = data.text;
-   }
-   };
-
-   updateCallback ? updateCallback(titleSpan) : 
updateFunction(titleSpan);
-
-   builder.map.on('commandstatechanged', function(e) {
-   if (e.commandName === data.command || e.commandName === 
builder._mapWindowIdToUnoCommand(data.id))
-   if (updateCallback)
-   updateCallback(titleSpan);
-   else
-   updateFunction(titleSpan);
-   }, this);
-
var contentDiv = L.DomUtil.create('div', 'ui-content level-' + 
builder._currentDepth + ' mobile-wizard', parentContainer);
contentDiv.title = data.text;
 
@@ -314,6 +332,33 @@ L.Control.JSDialogBuilder = L.Control

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/images/lc_group.svg|   19 ++-
 loleaflet/images/lc_groupoutlinemenu.svg |   19 ++-
 loleaflet/images/lc_ungroup.svg  |   19 ++-
 3 files changed, 54 insertions(+), 3 deletions(-)

New commits:
commit 2dde0c4b3e19aba5e529d8d10e04e3245bcffc12
Author: Pedro Pinto Silva 
AuthorDate: Tue Apr 14 13:02:11 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Apr 16 06:51:39 2020 +0200

Mobile: Calc: Hamburger menu: Data: Group and outline: fix group and 
ungroup svg

Change-Id: I0f7e993c40563a9644dd040fc3913613d4482a7f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92163
Tested-by: Pedro Pinto da Silva 
Reviewed-by: Pedro Pinto da Silva 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92325
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/images/lc_group.svg b/loleaflet/images/lc_group.svg
index a8bd1bf35..44b06f42f 100644
--- a/loleaflet/images/lc_group.svg
+++ b/loleaflet/images/lc_group.svg
@@ -1 +1,18 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+  
+  
+  
+  
+
diff --git a/loleaflet/images/lc_groupoutlinemenu.svg 
b/loleaflet/images/lc_groupoutlinemenu.svg
index a8bd1bf35..44b06f42f 100644
--- a/loleaflet/images/lc_groupoutlinemenu.svg
+++ b/loleaflet/images/lc_groupoutlinemenu.svg
@@ -1 +1,18 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+  
+  
+  
+  
+
diff --git a/loleaflet/images/lc_ungroup.svg b/loleaflet/images/lc_ungroup.svg
index f3c40f107..7b51cd2b9 100644
--- a/loleaflet/images/lc_ungroup.svg
+++ b/loleaflet/images/lc_ungroup.svg
@@ -1 +1,18 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+  
+  
+  
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranam Lashkari (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |4 
 1 file changed, 4 insertions(+)

New commits:
commit b6e7d963318bd38cfc0a0300e338276481e0800a
Author: Pranam Lashkari 
AuthorDate: Mon Apr 13 14:59:15 2020 +0530
Commit: Andras Timar 
CommitDate: Thu Apr 16 06:50:08 2020 +0200

leaflet: show checked status for Track changes

show ticks for record and show option in mobile wizard

Change-Id: I8146a5d484ea7e7304c22e77a642d0b46f00bd91
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92108
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92326

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 1f397748c..919a4ab3f 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1549,6 +1549,10 @@ L.Control.Menubar = L.Control.extend({
if (state && state[style]) {
menuStructure['checked'] = true;
}
+   } else if (item.uno === '.uno:TrackChanges' || item.uno === 
'.uno:ShowTrackedChanges') {
+   if 
(this._map['stateChangeHandler'].getItemValue(item.uno) === 'true') {
+   menuStructure['checked'] = true;
+   }
}
 
if (item.menu)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[mert (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |  113 ++-
 1 file changed, 89 insertions(+), 24 deletions(-)

New commits:
commit db26ae326c0ba5c2cddcb1585ff7af1b139be842
Author: mert 
AuthorDate: Tue Apr 14 18:10:47 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Apr 15 23:38:22 2020 +0200

mobilewizard: fix inconsistent state of items on Number Format

implemented listbox updates for numberformatcombobox and
fontsizecombobox to apply changes without reopening the
mobile wizard. This patch also fixes the update problem of
the checkbox items on number format page

Change-Id: Ib330531f766e5d1ff0744585f324a235f5ae3121
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92204
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 7ff08ce86..6d54c071f 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -242,6 +242,46 @@ L.Control.JSDialogBuilder = L.Control.extend({
return true;
},
 
+   _getListBoxUpdateType: function(id) {
+   if (id) {
+   if (id === 'numberformatcombobox')
+   return 'index';
+   else if (id === 'fontsizecombobox')
+   return 'value';
+   }
+   return false;
+   },
+
+   _updateListBox: function(builder, contentDiv, contentNode, 
sectionTitle, data, state) {
+   if ($(sectionTitle).find('.entry-value')[0])
+   sectionTitle = 
$($(sectionTitle).find('.entry-value')).get(0);
+   else
+   sectionTitle = 
$(sectionTitle).find('.ui-header-left').find('span')[0];
+
+   if (!sectionTitle)
+   return;
+
+   $(contentDiv).find('.selected').removeClass('selected');
+
+   var hasChildren = $(contentDiv).children().length > 0 && 
contentNode.children && contentNode.children.length > 0;
+   var updateBy = builder._getListBoxUpdateType(data.id);
+   if (updateBy === 'index') {
+   sectionTitle.innerHTML = data.entries[state];
+   data.selectedEntries[0] = state;
+   contentDiv.title = data.entries[state];
+   if (hasChildren) {
+   
$($(contentDiv).children().get(state)).addClass('selected');
+   }
+   } else if (updateBy === 'value') {
+   sectionTitle.innerHTML = state;
+   if (hasChildren) {
+   $(contentDiv).find('p').filter(function() {
+   return $(this).text() === state;
+   }).addClass('selected');
+   }
+   }
+   },
+
_explorableEntry: function(parentContainer, data, contentNode, builder, 
valueNode, iconPath, updateCallback) {
var sectionTitle = L.DomUtil.create('div', 'ui-header level-' + 
builder._currentDepth + ' mobile-wizard ui-widget', parentContainer);
$(sectionTitle).css('justify-content', 'space-between');
@@ -270,28 +310,6 @@ L.Control.JSDialogBuilder = L.Control.extend({
var arrowSpan = L.DomUtil.create('span', 'sub-menu-arrow', 
rightDiv);
arrowSpan.innerHTML = '>';
 
-   var updateFunction = function(titleSpan) {
-   var state = null;
-   if (data.id)
-   state = builder._getUnoStateForItemId(data.id, 
builder);
-
-   if (state) {
-   titleSpan.innerHTML = state;
-   } else {
-   titleSpan.innerHTML = data.text;
-   }
-   };
-
-   updateCallback ? updateCallback(titleSpan) : 
updateFunction(titleSpan);
-
-   builder.map.on('commandstatechanged', function(e) {
-   if (e.commandName === data.command || e.commandName === 
builder._mapWindowIdToUnoCommand(data.id))
-   if (updateCallback)
-   updateCallback(titleSpan);
-   else
-   updateFunction(titleSpan);
-   }, this);
-
var contentDiv = L.DomUtil.create('div', 'ui-content level-' + 
builder._currentDepth + ' mobile-wizard', parentContainer);
contentDiv.title = data.text;
 
@@ -314,6 +332,33 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
else
$(sectionTitle).hide();
+
+   var updateFunction = fu

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

[Andrea Gelmini (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf536201ae83e7ca6a565eb8ff0dbc0e4e887d64
Author: Andrea Gelmini 
AuthorDate: Wed Apr 15 20:30:23 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 15 23:22:00 2020 +0200

Fix typo

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

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 10afeb9fd918..3e574e5bcc59 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3770,7 +3770,7 @@ sal_Int32 lcl_getWordCompatibilityMode( const SwDoc& rDoc 
)
 }
 }
 
-// TODO: this is duplicative, better store it in DocxExport member?
+// TODO: this is duplicated, better store it in DocxExport member?
 if 
(!rDoc.getIDocumentSettingAccess().get(DocumentSettingId::ADD_EXT_LEADING))
 {
 if (nWordCompatibilityMode == -1 || 14 < nWordCompatibilityMode)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit f7ffda6d14ac67a37cb61ef0fff4ceef88632c3e
Author: Andrea Gelmini 
AuthorDate: Wed Apr 15 20:30:25 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 15 23:21:17 2020 +0200

Fix typo

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

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 79d26bfe3217..99a2c9bcfde7 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -523,7 +523,7 @@ void OutputDevice::DrawDeviceBitmap( const Point& rDestPt, 
const Size& rDestSize
 
 if (bTryDirectPaint && mpGraphics->DrawAlphaBitmap(aPosAry, 
*pSalSrcBmp, *xMaskBmp, this))
 {
-// tried to paint as alpha directly. If tis worked, we are 
done (except
+// tried to paint as alpha directly. If this worked, we 
are done (except
 // alpha, see below)
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit df619066c1c20d757cb6d2a5b29a566787b9173f
Author: Mert Tumer 
AuthorDate: Tue Apr 14 18:19:09 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Apr 15 23:20:06 2020 +0200

send state changes of .uno:NumberFormatDecimal command to LOK

Change-Id: I7872c0a0c123865c77d3aa8937775116368f1ffa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92203
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 2f6cbb67099edde535a81e7b0a32c1418805d6d6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92290
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8f42bd2883a4..b8228bfe8639 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2647,6 +2647,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:ToggleMergeCells"),
 OUString(".uno:NumberFormatCurrency"),
 OUString(".uno:NumberFormatPercent"),
+OUString(".uno:NumberFormatDecimal"),
 OUString(".uno:NumberFormatDate"),
 OUString(".uno:FrameLineColor"),
 OUString(".uno:SortAscending"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index d6e6c8673e38..9d4bc6612be0 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1153,6 +1153,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "WrapText" ||
  aEvent.FeatureURL.Path == "NumberFormatCurrency" ||
  aEvent.FeatureURL.Path == "NumberFormatPercent" ||
+ aEvent.FeatureURL.Path == "NumberFormatDecimal" ||
  aEvent.FeatureURL.Path == "NumberFormatDate")
 {
 bool aBool;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 9a4c6a61e47703a91165805208ca026c49063698
Author: Tor Lillqvist 
AuthorDate: Wed Apr 15 18:09:39 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 15 23:19:04 2020 +0200

Make the "X" closebutton work also in the mobile apps

In normal cases it will not show up, but due to what is arguably a
bug, it sometimes shows up anyway. For instance, when you use the app
in split view on a tablet. So make the button work also in a mobile
app by posting the same 'BYE' message as done for the "<" closemobile
button.

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

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index b546c7011..428b4c74b 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1713,10 +1713,14 @@ function setupToolbar(e) {
}
 
$('#closebutton').click(function() {
-   map.fire('postMessage', {msgId: 'close', args: {EverModified: 
map._everModified, Deprecated: true}});
-   map.fire('postMessage', {msgId: 'UI_Close', args: 
{EverModified: map._everModified}});
-   if (!map._disableDefaultAction['UI_Close']) {
-   map.remove();
+   if (window.ThisIsAMobileApp) {
+   window.postMobileMessage('BYE');
+   } else {
+   map.fire('postMessage', {msgId: 'close', args: 
{EverModified: map._everModified, Deprecated: true}});
+   map.fire('postMessage', {msgId: 'UI_Close', args: 
{EverModified: map._everModified}});
+   if (!map._disableDefaultAction['UI_Close']) {
+   map.remove();
+   }
}
});
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/data cypress_test/integration_tests loleaflet/src

[Szymon Kłos (via logerrit)]

 cypress_test/data/desktop/focus.odp |binary
 cypress_test/integration_tests/desktop/slide_operations_spec.js |   60 
++
 loleaflet/src/control/Control.PartsPreview.js   |3 
 3 files changed, 62 insertions(+), 1 deletion(-)

New commits:
commit 12ba5a3004549f739b576605ce7088be52264bc6
Author: Szymon Kłos 
AuthorDate: Wed Apr 15 17:04:47 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 15 22:45:39 2020 +0200

Add cypress test for slide operations

Change-Id: I08d1c1f2fc6e6b1dab84040ce235dfbd6bbb59ec
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92280
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/data/desktop/focus.odp 
b/cypress_test/data/desktop/focus.odp
new file mode 100644
index 0..ffefc9e64
Binary files /dev/null and b/cypress_test/data/desktop/focus.odp differ
diff --git a/cypress_test/integration_tests/desktop/slide_operations_spec.js 
b/cypress_test/integration_tests/desktop/slide_operations_spec.js
new file mode 100644
index 0..3b135d44b
--- /dev/null
+++ b/cypress_test/integration_tests/desktop/slide_operations_spec.js
@@ -0,0 +1,60 @@
+/* global describe it cy require afterEach*/
+
+var helper = require('../common/helper');
+
+describe('Slide operations', function() {
+
+   afterEach(function() {
+   helper.afterAll('focus.odp');
+   });
+
+   function assertNumberOfSlides(slides) {
+   cy.get('.preview-frame')
+   .should('have.length', slides + 1);
+   }
+
+   it('Add slides', function() {
+   helper.loadTestDoc('focus.odp');
+
+   cy.get('#tb_presentation-toolbar_item_insertpage')
+   .should('not.have.class', 'disabled')
+   .click();
+
+   assertNumberOfSlides(2);
+   });
+
+   it('Remove slides', function() {
+   helper.loadTestDoc('focus.odp');
+
+   // Add slides
+   cy.get('#tb_presentation-toolbar_item_insertpage')
+   .should('not.have.class', 'disabled')
+   .click();
+
+   assertNumberOfSlides(2);
+
+   // Remove Slides
+   cy.get('#tb_presentation-toolbar_item_deletepage')
+   .should('not.have.class', 'disabled')
+   .click();
+
+   cy.get('.vex-dialog-button-primary').click();
+
+   cy.get('#tb_presentation-toolbar_item_deletepage')
+   .should('have.class', 'disabled');
+
+   assertNumberOfSlides(1);
+
+   });
+
+   it('Duplicate slide', function() {
+   helper.loadTestDoc('focus.odp');
+
+   cy.get('#tb_presentation-toolbar_item_duplicatepage')
+   .should('not.have.class', 'disabled')
+   .click();
+
+   assertNumberOfSlides(2);
+
+   });
+});
diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index fb794fe32..045b9b01f 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -387,7 +387,8 @@ L.Control.PartsPreview = L.Control.extend({
if (this._map.getDocType() === 'presentation' || 
this._map.getDocType() === 'drawing') {
if (!this._previewInitialized)
return;
-   this._previewTiles[e.id].src = e.tile;
+   if (this._previewTiles[e.id])
+   this._previewTiles[e.id].src = e.tile;
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 65474ce8869da250c7e1ac5aa96e2ae12eed4a23
Author: Caolán McNamara 
AuthorDate: Wed Apr 15 19:18:49 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 15 21:32:07 2020 +0200

GdkAnchorHints isn't available < gtk 3.22

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

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 18db569607ee..84de83107190 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2926,6 +2926,21 @@ void swapDirection(GdkGravity& gravity)
 
 }
 
+#if !GTK_CHECK_VERSION(3, 22, 0)
+enum GdkAnchorHints
+{
+  GDK_ANCHOR_FLIP_X   = 1 << 0,
+  GDK_ANCHOR_FLIP_Y   = 1 << 1,
+  GDK_ANCHOR_SLIDE_X  = 1 << 2,
+  GDK_ANCHOR_SLIDE_Y  = 1 << 3,
+  GDK_ANCHOR_RESIZE_X = 1 << 4,
+  GDK_ANCHOR_RESIZE_Y = 1 << 5,
+  GDK_ANCHOR_FLIP = GDK_ANCHOR_FLIP_X | GDK_ANCHOR_FLIP_Y,
+  GDK_ANCHOR_SLIDE= GDK_ANCHOR_SLIDE_X | GDK_ANCHOR_SLIDE_Y,
+  GDK_ANCHOR_RESIZE   = GDK_ANCHOR_RESIZE_X | GDK_ANCHOR_RESIZE_Y
+}
+#endif
+
 void GtkSalFrame::signalRealize(GtkWidget*, gpointer frame)
 {
 GtkSalFrame* pThis = static_cast(frame);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the UX/design meeting 2020-Apr-15

[Heiko Tietze]

Present: John, Cor, (Subline,) Heiko
Comments: many people

Tickets/Topic

 * Default insert image anchor, wrapping, and spacing
   + https://bugs.documentfoundation.org/show_bug.cgi?id=87720
   + comment 43 summarizes the discussion
   + 1) tdf#87719: does not apply for _to_ character but _as_ (Cor) 
 => resolve as WF / by design
   + 2) fix tdf#102011 (easyhack, some UI tests fail) and tdf#87742 (has been 
discussed before)
   + 3) store the last choice (and maybe other settings too) 
 + is it really desirable to remember the last anchroing across documents 
and sessions,
   eg. user changes just one image (Cor)
 + tools > option > formatting aids is the alternative, bloats the options 
and is not so easy to find (Heiko)
 => do it as an explicite option
 + "hijack" tdf#99646 to and resolve this ticket as fixed
 => agreed
+ 4) solve tdf#82873 / tdf#82873 per style and make one a duplicate of the 
other

 * FORMATTING: Allow more options for Allow all users when the sheet is protect
   + https://bugs.documentfoundation.org/show_bug.cgi?id=57091
   + what options should be added to the sheet protection
   + no idea here (Roman)
   + print, recalculate, update external data sources (Heiko)
 + Size (tdf#67352: Editing: Permit to change cell width/height on 
protected cell)
 + Formatting (tdf#57086: FORMATTING: in a spreadsheet with partial 
protection: allow modifying cell styles that are not used on a protected sheet)
   => look into tickets and postpone for next meeting

 * ENHANCEMENT: Some easy way to access skia.log/opengl.log
   + https://bugs.documentfoundation.org/show_bug.cgi?id=132096
   + log file at /skia.log
   + access via Help > Log files > Skia (and OpenGL, Core, Extensions etc) or 
 create a wiki/documentation page how to find the log file or
 provide a button with "Show log files" to access the 
   + Add button "Copy important LibreOffice info into clipboard" to About 
dialog (Roman)
   => ticket was resolved by OP as invalid meanwhile (favoring the wiki page 
solution)

 * Set a shape as default
   + https://bugs.documentfoundation.org/show_bug.cgi?id=132014
   + shape type is stored in the picker and appearance can be changed by 
drawing styles
   + default Tango Blue for shapes has a ticket (tdf#112541)
   => resolve as WFM

 * Introduce new open-source Impress templates
   + https://bugs.documentfoundation.org/show_bug.cgi?id=132019
   + feels to me we change the templates too often (Heiko)
   + make them available as extension (Cor)
   => resolve as WFM



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/column.cxx   |   12 +-
 sc/source/core/data/column3.cxx  |   13 +-
 sc/source/core/data/dociter.cxx  |5 
 sc/source/core/data/documen4.cxx |   13 +-
 sc/source/core/data/formulacell.cxx  |   53 +---
 sc/source/core/data/global2.cxx  |4 
 sc/source/core/data/table6.cxx   |  207 ++-
 sc/source/core/data/validat.cxx  |   41 +++---
 sc/source/core/tool/chartpos.cxx |   24 ++--
 sc/source/core/tool/chgtrack.cxx |   31 +++--
 sc/source/core/tool/compiler.cxx |   20 ++-
 sc/source/core/tool/interpr1.cxx |4 
 sc/source/core/tool/interpr4.cxx |   64 ++
 sc/source/core/tool/token.cxx|   63 +-
 sc/source/filter/excel/xeformula.cxx |   67 ---
 sc/source/filter/excel/xetable.cxx   |4 
 sc/source/filter/html/htmlpars.cxx   |   17 ++
 sc/source/filter/oox/formulabase.cxx |2 
 sc/source/ui/app/drwtrans.cxx|   19 +--
 sc/source/ui/app/inputhdl.cxx|   11 +
 sc/source/ui/app/seltrans.cxx|   19 +--
 sc/source/ui/dbgui/csvgrid.cxx   |8 +
 sc/source/ui/dbgui/validate.cxx  |3 
 sc/source/ui/docshell/docsh8.cxx |6 -
 sc/source/ui/miscdlgs/anyrefdg.cxx   |3 
 sc/source/ui/view/dbfunc3.cxx|   21 ++-
 sc/source/ui/view/gridwin.cxx|   52 
 sc/source/ui/view/viewfun2.cxx   |   24 ++--
 28 files changed, 480 insertions(+), 330 deletions(-)

New commits:
commit 61d8db6b1a2026a29f61eaa691beb3c6cf05de5c
Author: Noel Grandin 
AuthorDate: Wed Apr 15 09:25:22 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 15 20:59:31 2020 +0200

loplugin:buriedassign in sc

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

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 9388e01ee1f0..a223352b8dd3 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -627,9 +627,11 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const 
ScMarkData& rMark, bool&
 ScAttrIterator aAttrIter( pAttrArray.get(), nTop, nBottom, 
pDocument->GetDefPattern() );
 SCROW nRow;
 SCROW nDummy;
-const ScPatternAttr* pPattern;
-while (bEqual && ( pPattern = aAttrIter.Next( nRow, nDummy ) ) != 
nullptr)
+while (bEqual)
 {
+const ScPatternAttr* pPattern = aAttrIter.Next( nRow, nDummy );
+if (!pPattern)
+break;
 pNewStyle = pPattern->GetStyleSheet();
 rFound = true;
 if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
@@ -653,9 +655,11 @@ const ScStyleSheet* ScColumn::GetAreaStyle( bool& rFound, 
SCROW nRow1, SCROW nRo
 ScAttrIterator aAttrIter( pAttrArray.get(), nRow1, nRow2, 
GetDoc()->GetDefPattern() );
 SCROW nRow;
 SCROW nDummy;
-const ScPatternAttr* pPattern;
-while (bEqual && ( pPattern = aAttrIter.Next( nRow, nDummy ) ) != nullptr)
+while (bEqual)
 {
+const ScPatternAttr* pPattern = aAttrIter.Next( nRow, nDummy );
+if (!pPattern)
+break;
 pNewStyle = pPattern->GetStyleSheet();
 rFound = true;
 if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 2f3869db93c0..88ed96df0f3c 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1965,16 +1965,17 @@ bool ScColumn::ParseString(
 sal_uInt32 nIndex = 0;
 sal_uInt32 nOldIndex = 0;
 SvNumFormatType eNumFormatType = SvNumFormatType::ALL;
-sal_Unicode cFirstChar;
 if (!aParam.mpNumFormatter)
 aParam.mpNumFormatter = GetDoc()->GetFormatTable();
 
+sal_Unicode cFirstChar = 0; // Text
 nIndex = nOldIndex = GetNumberFormat( GetDoc()->GetNonThreadedContext(), 
nRow );
-if ( rString.getLength() > 1
-&& (eNumFormatType = aParam.mpNumFormatter->GetType(nIndex)) != 
SvNumFormatType::TEXT )
-cFirstChar = rString[0];
-else
-cFirstChar = 0; // Text
+if ( rString.getLength() > 1 )
+{
+eNumFormatType = aParam.mpNumFormatter->GetType(nIndex);
+if ( eNumFormatType != SvNumFormatType::TEXT )
+cFirstChar = rString[0];
+}
 
 svl::SharedStringPool& rPool = GetDoc()->GetSharedStringPool();
 
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 604cbbf361b0..85be65c5c17d 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1312,8 +1312,11 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange( 
SCCOL& nFoundCol,
 nFoundCol = GetCol();
 nFoundRow = GetRow();
 aPosSave = maCurPos;
+if (IsEqualConditionFulfilled())
+break;
+bNext = GetNext();

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

[Noel Grandin (via logerrit)]

 sfx2/source/appl/linkmgr2.cxx|9 +
 sfx2/source/appl/opengrf.cxx |3 ++-
 sfx2/source/dialog/mailmodel.cxx |4 ++--
 soltools/cpp/_cpp.c  |3 ++-
 soltools/cpp/_eval.c |   18 --
 soltools/cpp/_lex.c  |   10 +++---
 soltools/cpp/_unix.c |   14 --
 sot/source/sdstor/stg.cxx|5 -
 sot/source/sdstor/stgdir.cxx |3 ++-
 9 files changed, 48 insertions(+), 21 deletions(-)

New commits:
commit a2362e0ff5a7cec16e888502a3c16fe2fa7ba0fe
Author: Noel Grandin 
AuthorDate: Wed Apr 15 19:32:09 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 15 20:58:44 2020 +0200

loplugin:buriedassign in sfx2..sot

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

diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index ca9cde51e17f..4c5af8b85cda 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -476,15 +476,16 @@ void LinkManager::InsertFileLink(
 // (for now this is only of interest for the file links!)
 void LinkManager::CancelTransfers()
 {
-SvFileObject* pFileObj;
 
 const sfx2::SvBaseLinks& rLnks = GetLinks();
 for( size_t n = rLnks.size(); n; )
 {
 const sfx2::SvBaseLink& rLnk = *rLnks[--n];
-if (isClientFileType(rLnk.GetObjType())
-&& nullptr != (pFileObj = 
static_cast(rLnk.GetObj(
-pFileObj->CancelTransfers();
+if (isClientFileType(rLnk.GetObjType()))
+{
+if (SvFileObject* pFileObj = 
static_cast(rLnk.GetObj()))
+pFileObj->CancelTransfers();
+}
 }
 }
 
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 02b44545bf73..6ef8ecdf4b61 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -138,7 +138,8 @@ ErrCode SvxOpenGraphicDialog::Execute()
 }
 else
 {
-if( (nImpRet=rFilter.CanImportGraphic( aObj, nFormatNum, 
&nRetFormat )) != ERRCODE_NONE )
+nImpRet = rFilter.CanImportGraphic( aObj, nFormatNum, 
&nRetFormat );
+if( nImpRet != ERRCODE_NONE )
 nImpRet = rFilter.CanImportGraphic( aObj, 
GRFILTER_FORMAT_DONTKNOW, &nRetFormat );
 }
 
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 5aad8f3698a3..63e29270d6c2 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -498,8 +498,8 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
 xPrepareDispatch.set( 
xDispatchProvider->queryDispatch( aPrepareURL, OUString(), 0 ));
 if ( xPrepareDispatch.is() )
 {
-PrepareListener_Impl* pPrepareListener;
-uno::Reference< css::frame::XStatusListener > 
xStatusListener = pPrepareListener = new PrepareListener_Impl;
+PrepareListener_Impl* pPrepareListener = new 
PrepareListener_Impl;
+uno::Reference< css::frame::XStatusListener > 
xStatusListener = pPrepareListener;
 xPrepareDispatch->addStatusListener( 
xStatusListener, aPrepareURL );
 bNeedsPreparation = pPrepareListener->IsSet();
 xPrepareDispatch->removeStatusListener( 
xStatusListener, aPrepareURL );
diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c
index 003611c3f53b..77a7193477c9 100644
--- a/soltools/cpp/_cpp.c
+++ b/soltools/cpp/_cpp.c
@@ -129,7 +129,8 @@ void
 error(ERROR, "Unidentifiable control line");
 return; /* else empty line */
 }
-if ((np = lookup(tp, 0)) == NULL || ((np->flag & ISKW) == 0 && !skipping))
+np = lookup(tp, 0);
+if (np == NULL || ((np->flag & ISKW) == 0 && !skipping))
 {
 error(WARNING, "Unknown preprocessor control %t", tp);
 return;
diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c
index 7efdd82715d9..e8b679ea93e1 100644
--- a/soltools/cpp/_eval.c
+++ b/soltools/cpp/_eval.c
@@ -633,12 +633,14 @@ struct value
 break;
 
 case NAME1:
-if ((np = lookup(tp, 0)) != NULL && np->flag & (ISDEFINED | ISMAC))
+np = lookup(tp, 0);
+if (np != NULL && np->flag & (ISDEFINED | ISMAC))
 v.val = 1;
 break;
 
 case NAME2:
-if ((np = lookup(tp, 0)) != NULL && np->flag & (ISARCHITECTURE))
+np = lookup(tp, 0);
+if (np != NULL && np->flag & (ISARCHITECTURE))
 v.val = 1;
 break;
 
@@ -700,16 +702,19 @@ struct value
 if (*p == '\\')
 {
 

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

[Noel Grandin (via logerrit)]

 scaddins/source/datefunc/datefunc.cxx |   15 +-
 sd/source/ui/animations/CustomAnimationDialog.cxx |   10 ++--
 sd/source/ui/func/fuinsert.cxx|   15 --
 sd/source/ui/func/fupoor.cxx  |4 -
 sd/source/ui/remotecontrol/BluetoothServer.cxx|5 --
 sd/source/ui/view/drviews2.cxx|5 +-
 sd/source/ui/view/sdview3.cxx |   49 +++---
 sdext/source/pdfimport/pdfparse/pdfparse.cxx  |   43 ++-
 sdext/source/pdfimport/wrapper/wrapper.cxx|   21 ++---
 9 files changed, 98 insertions(+), 69 deletions(-)

New commits:
commit 7baa60a5e9a8c48829f47db8cd98d0f05a30e235
Author: Noel Grandin 
AuthorDate: Wed Apr 15 19:31:24 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 15 20:59:10 2020 +0200

loplugin:buriedassign in scaddins..sdext

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

diff --git a/scaddins/source/datefunc/datefunc.cxx 
b/scaddins/source/datefunc/datefunc.cxx
index b924908a2ec6..f47b9b74a3dd 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -735,9 +735,18 @@ OUString SAL_CALL ScaDateAddIn::getRot13( const OUString& 
aSrcString )
 for( sal_Int32 nIndex = 0; nIndex < aBuffer.getLength(); nIndex++ )
 {
 sal_Unicode cChar = aBuffer[nIndex];
-if( ((cChar >= 'a') && (cChar <= 'z') && ((cChar += 13) > 'z')) ||
-((cChar >= 'A') && (cChar <= 'Z') && ((cChar += 13) > 'Z')) )
-cChar -= 26;
+if( (cChar >= 'a') && (cChar <= 'z'))
+{
+cChar += 13;
+if (cChar > 'z')
+cChar -= 26;
+}
+else if( (cChar >= 'A') && (cChar <= 'Z') )
+{
+cChar += 13;
+if (cChar > 'Z')
+cChar -= 26;
+}
 aBuffer[nIndex] = cChar;
 }
 return aBuffer.makeStringAndClear();
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx 
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 9c5f2a699608..b19e76350c70 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -265,13 +265,15 @@ SdFontPropertyBox::SdFontPropertyBox(weld::Label* pLabel, 
weld::Container* pPare
 pLabel->set_mnemonic_widget(mxControl.get());
 
 SfxObjectShell* pDocSh = SfxObjectShell::Current();
-const SfxPoolItem* pItem;
-
 const FontList* pFontList = nullptr;
 bool bMustDelete = false;
 
-if (pDocSh && ( (pItem = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST ) ) != 
nullptr))
-pFontList = static_cast(pItem)->GetFontList();
+if (pDocSh)
+{
+auto pItem = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST );
+if (pItem)
+pFontList = static_cast(pItem)->GetFontList();
+}
 
 if (!pFontList)
 {
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 970076977ec2..be254381b54f 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -159,13 +159,16 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq )
 if( dynamic_cast< DrawViewShell *>( mpViewShell ) )
 {
 sal_Int8nAction = DND_ACTION_COPY;
-SdrObject* pPickObj;
-
-if( ( ( pPickObj = mpView->GetSelectedSingleObject( 
mpView->GetPage() ) ) && mbReplaceExistingImage ) || (pPickObj = 
mpView->GetEmptyPresentationObject( PresObjKind::Graphic ) ) )
-{
+SdrObject* pPickObj = nullptr;
+if (mbReplaceExistingImage)
+pPickObj = mpView->GetSelectedSingleObject( mpView->GetPage() 
);
+if (pPickObj)
 nAction = DND_ACTION_LINK;
-} else {
-pPickObj = nullptr;
+else
+{
+pPickObj = mpView->GetEmptyPresentationObject( 
PresObjKind::Graphic );
+if (pPickObj)
+nAction = DND_ACTION_LINK;
 }
 
 Point aPos = mpWindow->GetVisibleCenter();
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 86d7233d69ea..aa76f72ff3e7 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -970,8 +970,8 @@ bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt)
 SetMouseButtonCode(rMEvt.GetButtons());
 
 aDelayToScrollTimer.Stop ();
-return bScrollable  =
-bDelayActive = false;
+bScrollable = bDelayActive = false;
+return bScrollable;
 }
 
 bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 16113f5f709f..0a6d198f1d0b 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/

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

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/macrodlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cac8694feab1ccb422294ed3e2f8b682e15835fb
Author: Caolán McNamara 
AuthorDate: Wed Apr 15 16:57:19 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 15 20:13:48 2020 +0200

tdf#126828 hide macro organize dialog before launching macro editing

so the macro editor isn't forced behind the window with an active dialog

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

diff --git a/basctl/source/basicide/macrodlg.cxx 
b/basctl/source/basicide/macrodlg.cxx
index 0fcc033ca827..2101a22efb5a 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -631,6 +631,8 @@ IMPL_LINK(MacroChooser, ButtonHdl, weld::Button&, rButton, 
void)
 if (m_xMacroBox->get_selected(m_xMacroBoxIter.get()))
 aInfoItem.SetMethod(m_xMacroBox->get_text(*m_xMacroBoxIter));
 StoreMacroDescription();
+m_xDialog->hide(); // tdf#126828 dismiss dialog before opening new 
window
+
 SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
 SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, 
aArgs );
 SfxGetpApp()->ExecuteSlot( aRequest );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit ff8288b98f6975c7fc9f36155d26a44e8c625f94
Author: Caolán McNamara 
AuthorDate: Wed Apr 15 16:32:50 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 15 20:13:25 2020 +0200

tdf#126828 skip "on-demand" entries

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 070958751aed..f21de3229b21 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -9423,6 +9423,9 @@ private:
 if (gtk_tree_model_iter_next(pModel, &tmp))
 {
 rGtkIter.iter = tmp;
+//on-demand dummy entry doesn't count
+if (get_text(rGtkIter, -1) == "")
+return iter_next(rGtkIter, bOnlyExpanded);
 return true;
 }
 // Move up level(s) until we find the level where the next node exists.
@@ -9432,6 +9435,9 @@ private:
 if (gtk_tree_model_iter_next(pModel, &tmp))
 {
 rGtkIter.iter = tmp;
+//on-demand dummy entry doesn't count
+if (get_text(rGtkIter, -1) == "")
+return iter_next(rGtkIter, bOnlyExpanded);
 return true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer (via logerrit)]

 sc/source/ui/drawfunc/fudraw.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 2e6753fc764c9c5f36c623e4bdf0f3dfc7229391
Author: Mert Tumer 
AuthorDate: Thu Apr 9 19:36:53 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Apr 15 20:05:05 2020 +0200

mobile: fix double tap on chart doesn't get into editmode

Sometimes double tapping on a chart when it is not selected
in the beginning, starts the input mode instead of chart
editing.

Change-Id: Iee2a01c1ac909ac4060e91cdacfa9161dc4f1c3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91992
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit d09a35bc10251ef0b66e06c6ffbb2d16332b318b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92291
Tested-by: Jenkins

diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index bd6ac3c96c09..eb05faccc730 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -34,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // base class for draw module specific functions
 FuDraw::FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
@@ -244,6 +246,15 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
 if( !pView->IsTextEdit() && 1 == rMarkList.GetMarkCount() )
 {
 SdrObject* pObj = rMarkList.GetMark( 0 
)->GetMarkedSdrObj();
+bool isMobilePhone = 
comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobilePhone(SfxLokHelper::getView());
+// Double tapping on charts on phone may result in 
activating the edit mode which is not wanted.
+// It happens due to the delay of selection message of the 
object from kit to javascript
+// in that case F2 is sent instead of double click
+if (isMobilePhone && ScDocument::IsChart(pObj))
+{
+rViewShell.ActivateObject( static_cast< SdrOle2Obj* >( 
pObj ), 0 );
+break;
+}
 if ( lcl_KeyEditMode( pObj, rViewShell, nullptr ) )
// start text edit for suitable object
 bReturn = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/crsr/swcrsr.cxx |   22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 1c94842e053a20a739a181d38a35c324df3e62a7
Author: Michael Stahl 
AuthorDate: Wed Apr 15 16:58:55 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 15 19:59:33 2020 +0200

tdf#132091 sw: fix fieldmark mess in SwCursor::SelectWordWT()

The problem is that it selects both the field instruction and the field
result; in the typical case where the instruction is empty, the
separator won't be deleted (due to CalcBreaks) but the problem is
that the cursor ends up before the separator, not after it.

Also remove some silly defensive programming.

(regression from ffb26b81e1c7ff1d64959200247bb2edd5a569da)

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

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index d4bfe66b05d9..9881a260f382 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1407,23 +1408,20 @@ bool SwCursor::SelectWordWT( SwViewShell const * 
pViewShell, sal_Int16 nWordType
 {
 // Should we select the whole fieldmark?
 const IDocumentMarkAccess* pMarksAccess = 
GetDoc()->getIDocumentMarkAccess( );
-sw::mark::IMark* pMark = GetPoint() ? pMarksAccess->getFieldmarkFor( 
*GetPoint( ) ) : nullptr;
+sw::mark::IFieldmark const*const 
pMark(pMarksAccess->getFieldmarkFor(*GetPoint()));
 if ( pMark )
 {
-const SwPosition& rStart = pMark->GetMarkStart();
-GetPoint()->nNode = rStart.nNode;
-GetPoint()->nContent = rStart.nContent;
-++GetPoint()->nContent; // Don't select the start delimiter
+*GetPoint() = sw::mark::FindFieldSep(*pMark);
+++GetPoint()->nContent; // Don't select the separator
 
 const SwPosition& rEnd = pMark->GetMarkEnd();
 
-if ( rStart != rEnd )
-{
-SetMark();
-GetMark()->nNode = rEnd.nNode;
-GetMark()->nContent = rEnd.nContent;
---GetMark()->nContent; //Don't select the end delimiter
-}
+assert(pMark->GetMarkEnd() != *GetPoint());
+SetMark();
+GetMark()->nNode = rEnd.nNode;
+GetMark()->nContent = rEnd.nContent;
+--GetMark()->nContent; // Don't select the end delimiter
+
 bRet = true;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Help files editing: Direct editing in Gerrit

[Olivier Hallot]

Hello

For those who wants to edit the Help Files directly in Gerrit, I have
updated the tutorial with the current version of Gerrit used by TDF.

The wiki page is
https://wiki.documentfoundation.org/Documentation/GerritEditing

Kind regards

-- 
Olivier Hallot
LibreOffice Documentation Coordinator
Comunidade LibreOffice
Rio de Janeiro - Brasil - Local Time: UTC-03:00
http://tdf.io/joinus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[LibreOfficiant (via logerrit)]

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

New commits:
commit 54c94ddff2664bc378a4298ee4d6948b7f32e595
Author: LibreOfficiant 
AuthorDate: Wed Apr 15 18:40:54 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Apr 15 19:40:54 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 82bb6643f1050a9ec83e39150a54e98d9ce81433
  - Basic Table of content alphebetical ordering

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

diff --git a/helpcontent2 b/helpcontent2
index 9426fd84810a..82bb6643f105 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9426fd84810a8d785d896f008be8515ed94c7028
+Subproject commit 82bb6643f1050a9ec83e39150a54e98d9ce81433
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[LibreOfficiant (via logerrit)]

 source/auxiliary/sbasic.tree |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 82bb6643f1050a9ec83e39150a54e98d9ce81433
Author: LibreOfficiant 
AuthorDate: Wed Apr 15 09:48:08 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Apr 15 19:40:54 2020 +0200

Basic Table of content alphebetical ordering

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

diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index c9fe8eaf1..c4012f039 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -241,20 +241,20 @@
 PV 
Function [VBA]
 QBColor 
Function
 Rate 
Function [VBA]
-Resume 
Statement
-RGB 
Function
-RSet 
Statement
-RTrim 
Function
 Randomize Statement
 ReDim 
Statement
 Red 
Function
 Rem 
Statement
 Replace 
Function
 Reset 
Statement
+Resume 
Statement
+RGB 
Function
 Right 
Function
 RmDir 
Statement
 Rnd 
Function
 Round 
Function [VBA]
+RSet 
Statement
+RTrim 
Function
 Second 
Function
 Seek 
Function
 Seek 
Statement
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/scalc/01/func_ceiling.xhp |   11 +--
 source/text/scalc/01/func_floor.xhp   |   12 +++-
 2 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 9426fd84810a8d785d896f008be8515ed94c7028
Author: Olivier Hallot 
AuthorDate: Wed Apr 15 18:13:46 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Apr 15 19:39:59 2020 +0200

Typos and correction in page

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

diff --git a/source/text/scalc/01/func_ceiling.xhp 
b/source/text/scalc/01/func_ceiling.xhp
index 206ea0244..858fb4881 100644
--- a/source/text/scalc/01/func_ceiling.xhp
+++ b/source/text/scalc/01/func_ceiling.xhp
@@ -24,9 +24,9 @@
 mw added one entry
 
 CEILING
-Rounds a number up to the nearest multiple of s 
significance value.
+Rounds a number to the nearest multiple of a 
significance value.
 For a positive 
number and a positive significance value, the function rounds up (away from 
zero). For a negative number and a negative significance value, the direction 
of rounding is determined by the value of a mode parameter. The function 
returns an error if the number and significance values have opposite 
signs.
-If the spreadsheet is exported to 
Microsoft Excel, the CEILING function is exported as the equivalent 
CEILING.MATH function that exists since Excel 2013. If you plan to use the 
spreadsheet with earlier Excel versions, use either CEILING.PRECISE that exists 
since Excel 2010, or CEILING.XCL that is exported as the CEILING function 
compatible with all Excel versions. Note that CEILING.XCL always rounds away 
from zero.
+If the spreadsheet is exported to 
Microsoft Excel, the CEILING function is exported as the equivalent 
CEILING.MATH function that has existed since Excel 2013. If you plan to use the 
spreadsheet with earlier Excel versions, use either CEILING.PRECISE that has 
existed since Excel 2010, or CEILING.XCL that is exported as the CEILING 
function compatible with all Excel versions.
 
 CEILING(Number[; Significance[; Mode]])
 
@@ -59,7 +59,6 @@
 CEILING.PRECISE(Number[; Significance])
 
 Significance (optional) is the value, or a 
reference to a cell containing the value, to whose multiple Number 
is to be rounded. It defaults to 1.
-This function calculates identical 
results to the ISO.CEILING function
 
 =CEILING.PRECISE(3.45) returns 
4.
 =CEILING.PRECISE(-45.67,2) returns 
-44.
@@ -75,12 +74,12 @@
 Rounds a number to the nearest 
multiple of a significance value.
 For a positive 
number the function rounds up (away from zero). For a negative number, the 
direction of rounding is determined by the value of a mode parameter. The sign 
of the significance value is ignored.
 
-
+  This function exists for 
interoperability with Microsoft Excel 2013 or newer.  
+  
 CEILING.MATH(Number[; Significance[; Mode]])
 
 Significance (optional) is the value, or a 
reference to a cell containing the value, to whose multiple Number 
is to be rounded. It defaults to 1.
 Mode (optional) is a number, or a reference to a 
cell containing a number. If Mode is given and not equal to zero, 
a negative Number is rounded down (away from zero). If 
Mode is equal to zero or is not given, a negative 
Number is rounded up (towards zero).
-This function exists for 
interoperability with Microsoft Excel 2013 or newer.
 
 =CEILING.MATH(3.45) returns 
4.
 =CEILING.MATH(3.45,-3) returns 
6.
@@ -125,7 +124,7 @@
 Significance (optional) is the value, or a 
reference to a cell containing the value, to whose multiple Number 
is to be rounded. It defaults to 1.
 
 =ISO.CEILING(3.45) returns 
4.
-=ISO.CEILING(-45.67,2) returns 
44.
+=ISO.CEILING(-45.67,2) returns 
-44.
 see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND, 
ROUNDDOWN, ROUNDUP
 
 
diff --git a/source/text/scalc/01/func_floor.xhp 
b/source/text/scalc/01/func_floor.xhp
index 3d7e738e5..922bad335 100644
--- a/source/text/scalc/01/func_floor.xhp
+++ b/source/text/scalc/01/func_floor.xhp
@@ -26,16 +26,17 @@
 FLOOR
 Rounds a number to the nearest multiple of a 
significance value.
 For a positive 
number and a positive significance value, the function rounds down (towards 
zero). For a negative number and a negative significance value, the direction 
of rounding is determined by the value of a mode parameter. The function 
returns an error if the number and significance values have opposite 
signs.
-
+
+If the spreadsheet is exported to 
Microsoft Excel, the FLOOR function is exported as the equivalent FLOOR.MATH 
function that 

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 4a268ceb4a54c4fbc8d249c820489cad3e8502e5
Author: Olivier Hallot 
AuthorDate: Wed Apr 15 18:39:59 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Apr 15 19:39:59 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9426fd84810a8d785d896f008be8515ed94c7028
  - Typos and correction in page

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

diff --git a/helpcontent2 b/helpcontent2
index f8cd9798934f..9426fd84810a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f8cd9798934f2cb336b09990c6d2f84a6cadcc36
+Subproject commit 9426fd84810a8d785d896f008be8515ed94c7028
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 l10ntools/source/merge.cxx|6 --
 linguistic/source/dicimp.cxx  |   10 --
 linguistic/source/hyphdsp.hxx |   10 ++
 linguistic/source/misc.cxx|8 +++-
 linguistic/source/spelldsp.hxx|   10 ++
 linguistic/source/thesdsp.hxx |5 +++--
 oox/source/dump/dumperbase.cxx|4 +++-
 package/source/zipapi/XUnbufferedStream.cxx   |7 ---
 package/source/zippackage/ZipPackageEntry.cxx |6 --
 9 files changed, 41 insertions(+), 25 deletions(-)

New commits:
commit 076fa17b5c04dc7afe593132c00ad9e57dd486f8
Author: Noel Grandin 
AuthorDate: Wed Apr 15 09:11:54 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 15 19:25:53 2020 +0200

loplugin:buriedassign in l,o,p*

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

diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 60d88b927c1b..75afdf77b9a6 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -196,8 +196,10 @@ MergeDataFile::MergeDataFile(
 bSkipCurrentPOFile = true;
 break;
 }
-} while( !aPoInput.eof() &&
-( bInSameComp = PoEntry::IsInSameComp(aActPo, aNextPo) ) );
+if (aPoInput.eof())
+break;
+bInSameComp = PoEntry::IsInSameComp(aActPo, aNextPo);
+} while( bInSameComp );
 
 InsertEntry(
 aActPo.getResourceType(), aActPo.getGroupId(),
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index cae5f9871858..de8d5326c22a 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -542,8 +542,11 @@ int DictionaryNeo::cmpDicEntry(const OUString& rWord1,
 {
 // skip chars to be ignored
 IgnState = false;
-while (nIdx1 < nLen1  &&  ((cChar1 = rWord1[ nIdx1 ]) == cIgnChar || 
cChar1 == cIgnBeg || IgnState ))
+while (nIdx1 < nLen1)
 {
+cChar1 = rWord1[ nIdx1 ];
+if (cChar1 != cIgnChar && cChar1 != cIgnBeg && !IgnState )
+break;
 if ( cChar1 == cIgnBeg )
 IgnState = true;
 else if (cChar1 == cIgnEnd)
@@ -552,8 +555,11 @@ int DictionaryNeo::cmpDicEntry(const OUString& rWord1,
 nNumIgnChar1++;
 }
 IgnState = false;
-while (nIdx2 < nLen2  &&  ((cChar2 = rWord2[ nIdx2 ]) == cIgnChar || 
cChar2 == cIgnBeg || IgnState ))
+while (nIdx2 < nLen2)
 {
+cChar2 = rWord2[ nIdx2 ];
+if (cChar2 != cIgnChar && cChar2 != cIgnBeg && !IgnState )
+break;
 if ( cChar2 == cIgnBeg )
 IgnState = true;
 else if (cChar2 == cIgnEnd)
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index 938ab2758597..0061e9255401 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -111,16 +111,18 @@ public:
 inline css::uno::Reference< css::linguistic2::XLinguProperties >
 HyphenatorDispatcher::GetPropSet()
 {
-return xPropSet.is() ?
-xPropSet : xPropSet = ::linguistic::GetLinguProperties();
+if (!xPropSet.is())
+xPropSet = ::linguistic::GetLinguProperties();
+return xPropSet;
 }
 
 
 inline css::uno::Reference< css::linguistic2::XSearchableDictionaryList >
 HyphenatorDispatcher::GetDicList()
 {
-return xDicList.is() ?
-xDicList : xDicList = ::linguistic::GetDictionaryList();
+if (!xDicList.is())
+xDicList = ::linguistic::GetDictionaryList();
+return xDicList;
 }
 
 
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index eb10b709e21d..87cdb02721c7 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -290,11 +290,9 @@ uno::Reference< XDictionaryEntry > SearchDicList(
 if (   (!bSearchPosDics  &&  eType == DictionaryType_NEGATIVE)
 || ( bSearchPosDics  &&  eType == DictionaryType_POSITIVE))
 {
-if ( (xEntry = axDic->getEntry( rWord )).is() )
-{
-if (bSearchSpellEntry || lcl_HasHyphInfo( xEntry ))
-break;
-}
+xEntry = axDic->getEntry( rWord );
+if ( xEntry.is() && (bSearchSpellEntry || lcl_HasHyphInfo( 
xEntry )) )
+break;
 xEntry = nullptr;
 }
 }
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index f9a30634d9ef..492321527595 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -121,16 +121,18 @@ inline linguistic::SpellCache & 
SpellCheckerDi

[Libreoffice-commits] core.git: filter/source formula/source framework/source hwpfilter/source i18npool/source i18nutil/source idlc/source

[Noel Grandin (via logerrit)]

 filter/source/svg/svgwriter.cxx   |6 +
 formula/source/core/api/FormulaCompiler.cxx   |   16 ++---
 formula/source/core/api/token.cxx |   16 +++--
 framework/source/uielement/popuptoolbarcontroller.cxx |   44 +++---
 hwpfilter/source/hiodev.cxx   |5 +
 hwpfilter/source/hwpeq.cxx|   37 +---
 hwpfilter/source/hwpfile.cxx  |8 +-
 i18npool/source/breakiterator/breakiteratorImpl.cxx   |   55 +++---
 i18npool/source/localedata/LocaleNode.cxx |   16 ++---
 i18nutil/source/utility/casefolding.cxx   |7 +-
 i18nutil/source/utility/unicode.cxx   |   14 ++--
 idlc/source/idlccompile.cxx   |4 -
 idlc/source/parser.y  |   34 ++-
 13 files changed, 172 insertions(+), 90 deletions(-)

New commits:
commit 4cc702a7055c0e12c7cbf5e5e359e7cbc8b88020
Author: Noel Grandin 
AuthorDate: Wed Apr 15 09:04:38 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 15 19:25:23 2020 +0200

loplugin:buriedassign in f,h,i*

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

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index a55dec5b07f2..9493174a4edd 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1727,13 +1727,15 @@ long SVGActionWriter::ImplMap( sal_Int32 nVal ) const
 
 Point& SVGActionWriter::ImplMap( const Point& rPt, Point& rDstPt ) const
 {
-return( rDstPt = OutputDevice::LogicToLogic( rPt, mpVDev->GetMapMode(), 
maTargetMapMode ) );
+rDstPt = OutputDevice::LogicToLogic( rPt, mpVDev->GetMapMode(), 
maTargetMapMode );
+return rDstPt;
 }
 
 
 Size& SVGActionWriter::ImplMap( const Size& rSz, Size& rDstSz ) const
 {
-return( rDstSz = OutputDevice::LogicToLogic( rSz, mpVDev->GetMapMode(), 
maTargetMapMode ) );
+rDstSz = OutputDevice::LogicToLogic( rSz, mpVDev->GetMapMode(), 
maTargetMapMode );
+return rDstSz;
 }
 
 
diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index e8c92c990509..f6f7e4876eb0 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1396,17 +1396,19 @@ void FormulaCompiler::Factor()
 eOp = Expression();
 // Do not ignore error here, regardless of mbStopOnError, to not
 // change the formula expression in case of an unexpected state.
-if (pArr->GetCodeError() == FormulaError::NONE)
+if (pArr->GetCodeError() == FormulaError::NONE && pc >= 2)
 {
 // Left and right operands must be reference or function
 // returning reference to form a range list.
-const FormulaToken* p;
-if (pc >= 2
-&& ((p = pCode[-2]) != nullptr) && 
isPotentialRangeType( p, true, false)
-&& ((p = pCode[-1]) != nullptr) && 
isPotentialRangeType( p, true, true))
+const FormulaToken* p = pCode[-2];
+if (p && isPotentialRangeType( p, true, false))
 {
-pFacToken->NewOpCode( ocUnion, 
FormulaToken::PrivateAccess());
-PutCode( pFacToken);
+p = pCode[-1];
+if (p && isPotentialRangeType( p, true, true))
+{
+pFacToken->NewOpCode( ocUnion, 
FormulaToken::PrivateAccess());
+PutCode( pFacToken);
+}
 }
 }
 }
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 54d0b52eb4b5..0b8b373a9de3 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1392,9 +1392,12 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( 
const MissingConvention &
 OpCode eOp;
 if (rConv.isPODF() && pCtx[ nFn ].mpFunc && pCtx[ nFn 
].mpFunc->GetOpCode() == ocAddress)
 pOcas[ nOcas++ ] = nFn; // entering ADDRESS() if 
PODF
-else if ((rConv.isODFF() || rConv.isOOXML()) && pCtx[ nFn 
].mpFunc &&
-((eOp = pCtx[ nFn ].mpFunc->GetOpCode()) == 
ocDBCount || eOp == ocDBCount2))
-pOcds[ nOcds++ ] = nFn; // entering DCOUNT() or 
DCOUNTA() if ODFF or OOXML
+else if ((rConv.isODFF() || rConv.isOOXML()) && pCtx[ nFn 
].mpFunc)
+{
+eOp = pCtx[ nFn ].mpFunc->GetOpCode();
+if (eOp == ocDBCount || eOp == ocDBCount2)
+pOcds[ nOcds++ ] = nFn; 

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 393aa2b3dee9cca84a215635060b369a962ab179
Author: Andrea Gelmini 
AuthorDate: Wed Apr 8 16:35:19 2020 +0200
Commit: Eike Rathke 
CommitDate: Wed Apr 15 18:54:16 2020 +0200

Fix typo

Change-Id: I4ddc0ea4dea4b374104e2a3100858c225409e2e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91929
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-by: Eike Rathke 

diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx
index 97d28ede388f..2e86c1270246 100644
--- a/sc/source/ui/inc/editable.hxx
+++ b/sc/source/ui/inc/editable.hxx
@@ -43,7 +43,7 @@ public:
 // calls TestBlock
 /** @param  bNoMatrixAtAll
 TRUE if there must not be any matrix, not even entirely
-containted; for example in sorting. */
+contained; for example in sorting. */
 ScEditableTester( const ScDocument* pDoc, SCTAB nTab,
 SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW 
nEndRow,
 bool bNoMatrixAtAll = false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Sachin Vilas Nagane license statement

[SACHIN VILAS NAGANE URK17CS291]

All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Stahl (via logerrit)]

 sw/qa/extras/unowriter/unowriter.cxx |   51 +++
 sw/source/core/undo/undobj.cxx   |4 +-
 2 files changed, 53 insertions(+), 2 deletions(-)

New commits:
commit 2dfd8f48d11b05243b9b4b315be94f86e09480df
Author: Michael Stahl 
AuthorDate: Thu Apr 9 18:31:50 2020 +0200
Commit: Caolán McNamara 
CommitDate: Wed Apr 15 18:27:33 2020 +0200

sw: fix fly at-char deletion API behaviour change

28b77c89dfcafae82cf2a6d85731b643ff9290e5 changed at-char anchored fly
selection.

WollMux calls setString("") to remove one character in the first
paragraph and a fly anchored at the start of the body text is deleted
due to the new IsAtStartOfSection() check.

It would be possible to treat deletion via API differently than via UI,
as there is already a flag ExcludeFlyAtStartEnd but it would require
passing the flag through 10 functions and also to store it in
SwUndoDelete...

The main intent of the IsAtStartOfSection() check was that Ctrl+A should
delete every fly; this can be achieved by checking that everything was
selected, so that selections only inside the first/last paragraph don't
delete the flys at the edges.

Change-Id: Id62e7d99a10b42eaecea5564372d29b6c43e3f7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91993
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 971205dc2110c1c23ff1db1fc4041e2babf6fa9f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92169
Reviewed-by: Caolán McNamara 

diff --git a/sw/qa/extras/unowriter/unowriter.cxx 
b/sw/qa/extras/unowriter/unowriter.cxx
index 788acffbef7e..a265bb29e728 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -453,6 +454,56 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testSetPagePrintSettings)
 CPPUNIT_ASSERT_EQUAL(true, aMap.getValue("IsLandscape").get());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUnoWriter, testDeleteFlyAtCharAtStart)
+{
+loadURL("private:factory/swriter", nullptr);
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwWrtShell* const pWrtShell(pTextDoc->GetDocShell()->GetWrtShell());
+SwDoc* const pDoc(pWrtShell->GetDoc());
+
+// insert some text
+IDocumentContentOperations& rIDCO(pDoc->getIDocumentContentOperations());
+rIDCO.InsertString(*pWrtShell->GetCursor(), "foo bar baz");
+
+// insert fly anchored at start of body text
+pWrtShell->ClearMark();
+pWrtShell->SttEndDoc(true);
+SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items{});
+SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items{});
+SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
+frameSet.Put(anchor);
+GraphicObject grf;
+CPPUNIT_ASSERT(rIDCO.InsertGraphicObject(*pWrtShell->GetCursor(), grf, 
&frameSet, &grfSet));
+
+// check fly
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+uno::Reference const xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+// anchored at start of body text?
+uno::Reference const xText(pTextDoc->getText());
+uno::Reference const xTextRC(xText, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0),
+ xTextRC->compareRegionStarts(xText->getStart(), 
xShape->getAnchor()));
+
+// delete 1st character
+uno::Reference const xCursor(xText->createTextCursor());
+xCursor->goRight(1, true);
+xCursor->setString("");
+
+// there is exactly one fly
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+
+// select entire body text
+xCursor->gotoStart(true);
+xCursor->gotoEnd(true);
+xCursor->setString("");
+
+// there is no fly
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xDrawPage->getCount());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUnoWriter, testSelectionInTableEnum)
 {
 load(mpTestDocumentPath, "selection-in-table-enum.odt");
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 3b3f8f2fd583..a73ceeb9f048 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1568,14 +1568,14 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const & 
rAnchorPos,
 && ((rStart.nNode != rEnd.nNode && rStart.nContent == 0
 // but not if the selection is backspace/delete!
 && IsNotBackspaceHeuristic(rStart, rEnd))
-|| IsAtStartOfSection(rAnchorPos
+|| (IsAtStartOfSection(rAnchorPos) && 
IsAtEndOfSection(rEnd)
 && ((rAnchorPos < rEnd)
 || (rAnchorPos == rEnd
 && !(nDelContentType & DelContentType::ExcludeFlyAtStartEnd)
 // special case: fu

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js |5 
+++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit aeed1138d54fdc017ec1ecdc98dc4f05c5a77e94
Author: Tamás Zolnai 
AuthorDate: Wed Apr 15 18:13:03 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 15 18:13:54 2020 +0200

cypress: disable this checkbox related snippet.

Checkboxes have wierd flickering on mobile wizard.

Change-Id: Ie9756f5dc7213a113ea6d05c7c02594a5d1eb1a3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92308
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git 
a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js 
b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 613e24611..a8c7dd0f5 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -130,8 +130,9 @@ describe('Change shape properties via mobile wizard.', 
function() {
cy.get('#ratio #ratio')
.click();
 
-   cy.get('#ratio #ratio')
-   .should('have.attr', 'checked', 'checked');
+   // TODO: unreliable
+   //cy.get('#ratio #ratio')
+   //  .should('have.attr', 'checked', 'checked');
 
// Change height
cy.get('#selectheight .spinfield')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/sfxbasemodel.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit db677c854a37031235b0f42b4f4f48560149754f
Author: Caolán McNamara 
AuthorDate: Wed Apr 15 16:09:09 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 15 18:06:56 2020 +0200

tdf#126828 don't crash fetching cmis properties from disposed SfxBaseModel

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

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5868deb290f6..36ec8cb7adc4 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2460,8 +2460,10 @@ void SAL_CALL SfxBaseModel::notifyDocumentEvent( const 
OUString&, const Referenc
 throw lang::NoSupportException("SfxBaseModel controls all the sent 
notifications itself!" );
 }
 
-Sequence< document::CmisProperty > SAL_CALL SfxBaseModel::getCmisProperties()
+Sequence SAL_CALL SfxBaseModel::getCmisProperties()
 {
+if (impl_isDisposed())
+return Sequence();
 return m_pData->m_cmisProperties;
 }
 
@@ -2599,7 +2601,9 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, 
const OUString& rMessage
 
 uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( )
 {
-uno::Sequence< document::CmisVersion > aVersions;
+uno::Sequence aVersions;
+if (impl_isDisposed())
+return aVersions;
 SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
 if ( pMedium )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/IDEComboBox.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit e58edeb2aab087ec13c6d8fd19e91320a9073a92
Author: Caolán McNamara 
AuthorDate: Wed Apr 15 16:03:06 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 15 17:58:46 2020 +0200

set cursor after thawed

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

diff --git a/basctl/source/basicide/IDEComboBox.cxx 
b/basctl/source/basicide/IDEComboBox.cxx
index 1a3837091ec0..621a60d97b0b 100644
--- a/basctl/source/basicide/IDEComboBox.cxx
+++ b/basctl/source/basicide/IDEComboBox.cxx
@@ -408,6 +408,8 @@ void LanguageBox::FillBox()
 msCurrentText = m_xWidget->get_active_text();
 ClearBox();
 
+sal_Int32 nSelPos = -1;
+
 std::shared_ptr 
pCurMgr(GetShell()->GetCurLocalizationMgr());
 if (pCurMgr->isLibraryLocalized())
 {
@@ -417,7 +419,6 @@ void LanguageBox::FillBox()
 Sequence aLocaleSeq = 
pCurMgr->getStringResourceManager()->getLocales();
 const Locale* pLocale = aLocaleSeq.getConstArray();
 sal_Int32 i, nCount = aLocaleSeq.getLength();
-sal_Int32 nSelPos = -1;
 for (i = 0; i < nCount; ++i)
 {
 bool bIsDefault = localesAreEqual(aDefaultLocale, pLocale[i]);
@@ -437,19 +438,17 @@ void LanguageBox::FillBox()
 }
 
 if (nSelPos != -1)
-{
-m_xWidget->set_active(nSelPos);
-msCurrentText = m_xWidget->get_active_text();
-}
+msCurrentText = m_xWidget->get_text(nSelPos);
 }
 else
 {
 m_xWidget->append_text(msNotLocalizedStr);
-m_xWidget->set_active(0);
+nSelPos = 0;
 set_sensitive(false);
 }
 
 m_xWidget->thaw();
+m_xWidget->set_active(nSelPos);
 mbIgnoreSelect = false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/utlui/navipi.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit ada385f1cba427416c1e8517cb6a45b61ceff7b0
Author: Caolán McNamara 
AuthorDate: Wed Apr 15 15:34:06 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 15 17:58:26 2020 +0200

navigator pane is grabbing focus away from document when its created

so only grab that focus when its a floating navigator

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

diff --git a/sw/source/uibase/utlui/navipi.cxx 
b/sw/source/uibase/utlui/navipi.cxx
index 2a0d30610c26..62cae46965d7 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -582,10 +582,12 @@ SwNavigationPI::SwNavigationPI(vcl::Window* pParent,
 
 m_aStatusArr[3] = SwResId(STR_ACTIVE_VIEW);
 
+bool bFloatingNavigator = 
SfxChildWindowContext::GetFloatingWindow(GetParent()) != nullptr;
+
 m_xContentTree->set_selection_mode(SelectionMode::Single);
 m_xContentTree->ShowTree();
 m_xContent3ToolBox->set_item_active("listbox", true);
-m_xContent3ToolBox->set_item_sensitive("listbox", 
SfxChildWindowContext::GetFloatingWindow(GetParent()) != nullptr);
+m_xContent3ToolBox->set_item_sensitive("listbox", bFloatingNavigator);
 
 //  TreeListBox for global document
 m_xGlobalTree->set_selection_mode(SelectionMode::Multiple);
@@ -622,9 +624,10 @@ SwNavigationPI::SwNavigationPI(vcl::Window* pParent,
 pActView->GetWrtShellPtr()->IsGlblDocSaveLinks());
 if (m_pConfig->IsGlobalActive())
 ToggleTree();
-m_xGlobalTree->grab_focus();
+if (bFloatingNavigator)
+m_xGlobalTree->grab_focus();
 }
-else
+else if (bFloatingNavigator)
 m_xContentTree->grab_focus();
 UsePage();
 m_aPageChgIdle.SetInvokeHandler(LINK(this, SwNavigationPI, ChangePageHdl));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/check-missing-unittests.py

[Xisco Fauli (via logerrit)]

 bin/check-missing-unittests.py |  119 +
 1 file changed, 119 insertions(+)

New commits:
commit d77d4a8138861f7f574452f7e4d1673329d54136
Author: Xisco Fauli 
AuthorDate: Wed Apr 8 13:58:30 2020 +0200
Commit: Xisco Faulí 
CommitDate: Wed Apr 15 17:54:14 2020 +0200

bin: Add script to find missing unittests based on git log

First iteration: look for docx, xlsx and pptx export commits

print to wiki format
Change-Id: I05770b096c55b6faa39d34a8fd39768a4d7fe5b1

Change-Id: I0f19a73183b482bf0e19af0314c72f2ea9f25544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91910
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/bin/check-missing-unittests.py b/bin/check-missing-unittests.py
new file mode 100755
index ..0e27243b6cde
--- /dev/null
+++ b/bin/check-missing-unittests.py
@@ -0,0 +1,119 @@
+#!/usr/bin/env python3
+
+# 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/.
+
+import os
+import datetime
+import subprocess
+import sys
+
+def main(ignoredBugs):
+results = {
+'export': {
+'docx': {},
+'pptx': {},
+'xlsx': {}
+}
+}
+hasTestSet = set()
+
+repoPath = os.path.dirname(os.path.abspath(__file__)) + '/..'
+branch = subprocess.check_output(
+['git', '-C', repoPath, 'rev-parse', '--abbrev-ref', 'HEAD'],
+stderr=subprocess.DEVNULL)
+last_hash = subprocess.check_output(
+['git', '-C', repoPath, 'rev-parse', 'HEAD'],
+stderr=subprocess.DEVNULL)
+output = subprocess.check_output(
+['git', '-C', repoPath, 'log', '--since="2012-01-01', 
'--name-only' ,'--pretty=format:"%s"'],
+stderr=subprocess.DEVNULL)
+commits = output.decode('utf-8', 'ignore').split('\n\n')
+
+for commit in reversed(commits):
+
+summary = commit.split('\n', 1)[0].lower()
+
+#Check summary has a bug id
+if 'tdf#' in summary or 'fdo#' in summary:
+
+isIgnored = False
+for i in ignoredBugs:
+if i in summary:
+isIgnored = True
+if isIgnored:
+continue
+
+if 'tdf#' in summary:
+if not summary.split('tdf#')[1][0].isdigit():
+continue
+bugId = ''.join(filter(str.isdigit, 
summary.split('tdf#')[1].split(' ')[0]))
+elif 'fdo#' in summary:
+if not summary.split('fdo#')[1][0].isdigit():
+continue
+bugId = ''.join(filter(str.isdigit, 
summary.split('fdo#')[1].split(' ')[0]))
+
+
+if bugId in hasTestSet:
+continue
+
+changedFiles = commit.split('\n', 1)[1]
+if 'qa' in changedFiles:
+hasTestSet.add(bugId)
+continue
+elif 'sw/source/filter/ww8/docx' in changedFiles:
+results['export']['docx'][bugId] = summary
+elif 'sc/source/filter/excel/xe' in changedFiles:
+results['export']['xlsx'][bugId] = summary
+elif 'oox/source/export/' in changedFiles:
+results['export']['pptx'][bugId] = summary
+# Add others here
+
+print()
+print('{{TopMenu}}')
+print('{{Menu}}')
+print('{{Menu.Development}}')
+print()
+print('Date: ' + str(datetime.datetime.now()))
+print()
+print('Commits: ' + str(len(commits)))
+print()
+print('Branch: ' + branch.decode().strip())
+print()
+print('Hash: ' + str(last_hash.decode().strip()))
+for k,v in results.items():
+print('\n== ' + k + ' ==')
+for k1, v1 in v.items():
+print('\n=== ' + k1 + ' ===')
+for bugId, summary in v1.items():
+if bugId not in hasTestSet:
+print(
+"* {} - 
[https://bugs.documentfoundation.org/show_bug.cgi?id={} tdf#{}]".format(
+summary, bugId, bugId))
+print('\n== ignored bugs ==')
+print(' '.join(ignoredBugs))
+print()
+print('[[Category:QA]][[Category:Development]]')
+
+def usage():
+message = """usage: {program} [bugs to ignore (each one is one argument)]
+
+Sample: {program} 1 10001 10002"""
+print(message.format(program = os.path.basename(sys.argv[0])))
+
+if __name__ == '__main__':
+
+args = set()
+if len(sys.argv) > 1:
+arg1 = sys.argv[1]
+if arg1 == '-h' or arg1 == "--help":
+usage()
+sys.exit(1)
+for i in sys.argv:
+if i.isdigit():
+args.add(i)
+
+main(sorted(args))
___
Libreoffice-commits mailing list
li

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.2-10'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-10' created by Andras Timar  at 
2020-04-15 15:43 +

cp-6.2-10

Changes since CP-Android-iOS-4.2.0:
Andras Timar (1):
  tdf#130999 fix registration of Greek dictionary

---
 el_GR/META-INF/manifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.2-10'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-10' created by Andras Timar  at 
2020-04-15 15:43 +

cp-6.2-10

Changes since CP-Android-iOS-4.2.0-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.2-10'

[Pedro Silva (via logerrit)]

Tag 'cp-6.2-10' created by Andras Timar  at 
2020-04-15 15:43 +

cp-6.2-10

Changes since co-6.2-2:
Pedro Silva (1):
  [cp] Update CSS for Search button

---
 help3xsl/default.css |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.2-10'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-10' created by Andras Timar  at 
2020-04-15 15:43 +

cp-6.2-10

Changes since cp-6.2-9-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

Rebased ref, commits from common ancestor:
commit 0f626e17710d7d9da9fc1b4c0592a6907dd0cb96
Author: Andras Timar 
AuthorDate: Wed Apr 15 17:41:59 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 15 17:42:19 2020 +0200

Bump version to 6.2-10

Change-Id: Icc37cafb66db8cb8a8eb1713cb330db15c3cf42b

diff --git a/configure.ac b/configure.ac
index 6ee3a993d14d..658a72b7e783 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],[6.2.10.9],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.10],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

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

New commits:
commit fbc378a5d83086cc98c5dd2caf91659e775b06cb
Author: Andras Timar 
AuthorDate: Wed Apr 15 17:41:59 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 15 17:41:59 2020 +0200

Bumpr version to 6.2-10

Change-Id: Icc37cafb66db8cb8a8eb1713cb330db15c3cf42b

diff --git a/configure.ac b/configure.ac
index 6ee3a993d14d..658a72b7e783 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],[6.2.10.9],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.10],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gla11y compilerplugins/clang configure.ac cui/inc cui/source cui/uiconfig icon-themes/colibre icon-themes/karasa_jaga icon-themes/sukapura icon-themes/tango include

[Heiko Tietze (via logerrit)]

 bin/gla11y   |1 
 compilerplugins/clang/constantparam.booleans.results |8 
 configure.ac |6 
 cui/inc/strings.hrc  |3 
 cui/source/dialogs/about.cxx |  446 -
 cui/source/factory/dlgfact.cxx   |   19 
 cui/source/factory/dlgfact.hxx   |   19 
 cui/source/inc/about.hxx |   28 
 cui/uiconfig/ui/aboutdialog.ui   |  205 
 dev/null |binary
 icon-themes/colibre/brand/flat_logo.svg  | 1188 +++
 icon-themes/colibre/brand/shell/about.svg| 6417 ++-
 icon-themes/colibre/brand/shell/logo.svg |  271 
 icon-themes/colibre/brand/shell/logo_inverted.svg|  271 
 include/sfx2/sfxdlg.hxx  |1 
 include/vcl/abstdlg.hxx  |   10 
 include/vcl/weld.hxx |3 
 sc/qa/uitest/calc_tests7/tdf106667.py|2 
 sfx2/inc/bitmaps.hlst|1 
 sfx2/inc/recentdocsview.hxx  |2 
 sfx2/source/appl/appmisc.cxx |   31 
 sfx2/source/appl/appserv.cxx |2 
 sfx2/source/control/recentdocsview.cxx   |   11 
 solenv/sanitizers/ui/cui.suppr   |5 
 sw/qa/uitest/writer_tests5/about_test.py |2 
 uitest/calc_tests/about_test.py  |2 
 uitest/demo_ui/hierarchy.py  |2 
 vcl/inc/salvtables.hxx   |3 
 vcl/source/app/salvtables.cxx|   57 
 vcl/source/window/builder.cxx|4 
 vcl/unx/gtk3/gtk3gtkinst.cxx |  124 
 31 files changed, 8609 insertions(+), 535 deletions(-)

New commits:
commit 9b1c9ac6edcdeae431d6104c586ca7feffbb6483
Author: Heiko Tietze 
AuthorDate: Wed Apr 8 12:58:34 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Apr 15 17:35:44 2020 +0200

Related tdf#130778: New About dialog

More flexible dialog
logo & about images as SVGs

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

diff --git a/bin/gla11y b/bin/gla11y
index 1ae67b173959..b1d98c7c0fb8 100755
--- a/bin/gla11y
+++ b/bin/gla11y
@@ -47,7 +47,6 @@ widgets_toplevel = [
 'GtkOffscreenWindow',
 'GtkApplicationWindow',
 'GtkDialog',
-'GtkAboutDialog',
 'GtkFileChooserDialog',
 'GtkColorChooserDialog',
 'GtkFontChooserDialog',
diff --git a/compilerplugins/clang/constantparam.booleans.results 
b/compilerplugins/clang/constantparam.booleans.results
index ec68cb590a62..9c78e715448a 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -1778,10 +1778,6 @@ include/vcl/weld.hxx:2102
 class std::unique_ptr > weld::Builder::weld_dialog(const class rtl::OString &,_Bool)
 _Bool bTakeOwnership
 1
-include/vcl/weld.hxx:2103
-class std::unique_ptr > 
weld::Builder::weld_about_dialog(const class rtl::OString &,_Bool)
-_Bool bTakeOwnership
-1
 include/vcl/weld.hxx:2106
 class std::unique_ptr > 
weld::Builder::weld_assistant(const class rtl::OString &,_Bool)
 _Bool bTakeOwnership
@@ -4210,10 +4206,6 @@ vcl/qa/cppunit/BitmapTest.cxx:68
 void assertColorsAreSimilar(int,const class 
std::__cxx11::basic_string, class 
std::allocator > &,const class BitmapColor &,const class BitmapColor &)
 int maxDifference
 1
-vcl/source/app/salvtables.cxx:1624
-void (anonymous 
namespace)::SalInstanceAboutDialog::SalInstanceAboutDialog(class 
vcl::AboutDialog *,class SalInstanceBuilder *,_Bool)
-_Bool bTakeOwnership
-0
 vcl/source/app/salvtables.cxx:1694
 void (anonymous 
namespace)::SalInstanceAssistant::SalInstanceAssistant(class vcl::RoadmapWizard 
*,class SalInstanceBuilder *,_Bool)
 _Bool bTakeOwnership
diff --git a/configure.ac b/configure.ac
index b8b40177e98e..f1539c699b1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2186,7 +2186,7 @@ AC_ARG_WITH(branding,
 AS_HELP_STRING([--with-branding=/path/to/images],
 [Use given path to retrieve branding images set.])
 [
-  Search for intro.png about.svg and flat_logo.svg.
+  Search for intro.png about.svg and logo.svg.
   If any is missing, default ones will be used instead.
 
   Search also progress.conf for progress
@@ -12553,8 +12553,8 @@ dnl branding
 dnl ===
 AC_MSG_CHECKING([for alternative branding images directory])
 # initialize m

[Libreoffice-commits] core.git: icon-themes/colibre instsetoo_native/CustomTarget_setup.mk

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/intro.png |binary
 icon-themes/colibre/brand_dev/intro.png |binary
 instsetoo_native/CustomTarget_setup.mk  |6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0db34d1c5dd7d06435c5a5d58a42da2cbe007006
Author: Heiko Tietze 
AuthorDate: Wed Apr 15 13:27:00 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Apr 15 17:35:28 2020 +0200

Related tdf#130778: New images for splash screen

Taken from the proposal at the BZ ticket; hires missing

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

diff --git a/icon-themes/colibre/brand/intro.png 
b/icon-themes/colibre/brand/intro.png
index f60a408353dd..23ead5c5fda1 100644
Binary files a/icon-themes/colibre/brand/intro.png and 
b/icon-themes/colibre/brand/intro.png differ
diff --git a/icon-themes/colibre/brand_dev/intro.png 
b/icon-themes/colibre/brand_dev/intro.png
index 29755ea5268d..db8139e52abf 100644
Binary files a/icon-themes/colibre/brand_dev/intro.png and 
b/icon-themes/colibre/brand_dev/intro.png differ
diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 9757f435dc91..d9f0d6d51ac4 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -136,11 +136,11 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'NativeProgress=false' \
&& echo 'ProgressBarColor=0,0,0' \
&& echo 'ProgressFrameColor=102,102,102' \
-   && echo 'ProgressPosition=35,153' \
-   && echo 'ProgressSize=444,8' \
+   && echo 'ProgressPosition=30,145' \
+   && echo 'ProgressSize=265,8' \
&& echo 'ProgressPositionHigh=46,212' \
&& echo 'ProgressSizeHigh=617,12' \
-   && echo 'ProgressTextBaseline=145' \
+   && echo 'ProgressTextBaseline=160' \
&& echo 'ProgressTextColor=0,0,0' \
&& echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: uicheck

[Heiko Tietze]

On 15.04.20 11:24, Stephan Bergmann wrote:
> * If you develop on Linux, run `make check` (but you should have done so 
> before submitting the change to Gerrit anyway).  If it hangs, debug to find 
> out why and fix.

"ps ax | grep done.log" helped me to find the log file that in return revealed 
the failing unit test.



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.FormulaBar.js |   41 
 loleaflet/src/control/Control.Toolbar.js|   23 ---
 2 files changed, 64 deletions(-)

New commits:
commit 6aff5967da51546331060225e342a08ef5d9fee6
Author: Szymon Kłos 
AuthorDate: Wed Apr 15 13:49:15 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 17:07:34 2020 +0200

Remove unused formula bar code

Code is unused due to formulabar tunneling
b7743930cde9b9583490bbdc6d7b6b09d32cdccd

Change-Id: Ie8d51f48669e111bb8006fd8afafaa1eeaba52e2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92270
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.FormulaBar.js 
b/loleaflet/src/control/Control.FormulaBar.js
index e90e3f141..fe7d8f838 100644
--- a/loleaflet/src/control/Control.FormulaBar.js
+++ b/loleaflet/src/control/Control.FormulaBar.js
@@ -119,47 +119,6 @@ L.Control.FormulaBar = L.Control.extend({
}
},
 
-   onFormulaInput: function(e) {
-   // keycode = 13 is 'enter'
-   if (e.keyCode === 13) {
-   // formula bar should not have focus anymore
-   this.map.focus();
-
-   // forward the 'enter' keystroke to map to deal with 
the formula entered
-   var data = {
-   originalEvent: e
-   };
-   this.map.fire('keypress', data);
-   } else if (e.keyCode === 27) { // 27 = esc key
-   this.map.sendUnoCommand('.uno:Cancel');
-   this.map.focus();
-   } else {
-   
this.map.cellEnterString(L.DomUtil.get('formulaInput').value);
-   }
-   },
-
-   onFormulaBarFocus: function() {
-   var formulabar = w2ui.formulabar;
-   formulabar.hide('sum');
-   formulabar.hide('function');
-   formulabar.show('cancelformula');
-   formulabar.show('acceptformula');
-   },
-
-   onFormulaBarBlur: function() {
-   // The timeout is needed because we want 'click' event on 
'cancel',
-   // 'accept' button to act before we hide these buttons because
-   // once hidden, click event won't be processed.
-   // TODO: Some better way to do it ?
-   setTimeout(function() {
-   var formulabar = w2ui.formulabar;
-   formulabar.show('sum');
-   formulabar.show('function');
-   formulabar.hide('cancelformula');
-   formulabar.hide('acceptformula');
-   }, 250);
-   },
-
onAddressInput: function(e) {
if (e.keyCode === 13) {
// address control should not have focus anymore
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index df1822d26..b546c7011 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -169,29 +169,6 @@ function onClick(e, id, item) {
else if (id === 'backgroundcolor' && typeof e.color !== 'undefined') {
onColorPick(id, e.color);
}
-   else if (id === 'sum') {
-   map.sendUnoCommand('.uno:AutoSum');
-   }
-   else if (id === 'function') {
-   L.DomUtil.get('formulaInput').value = '=';
-   L.DomUtil.get('formulaInput').focus();
-   map.cellEnterString(L.DomUtil.get('formulaInput').value);
-   }
-   else if (id === 'cancelformula') {
-   map.sendUnoCommand('.uno:Cancel');
-   w2ui['formulabar'].hide('acceptformula', 'cancelformula');
-   w2ui['formulabar'].show('sum', 'function');
-   }
-   else if (id === 'acceptformula') {
-   // focus on map, and press enter
-   map.focus();
-   map._docLayer.postKeyboardEvent('input',
-map.keyboard.keyCodes.enter,
-
map.keyboard._toUNOKeyCode(map.keyboard.keyCodes.enter));
-
-   w2ui['formulabar'].hide('acceptformula', 'cancelformula');
-   w2ui['formulabar'].show('sum', 'function');
-   }
else if (id === 'fold' || id === 'hamburger-tablet') {
map.toggleMenubar();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/Makefile.am|1 
 loleaflet/src/control/Control.PresentationBar.js |  156 +++
 loleaflet/src/control/Control.Toolbar.js |  100 --
 loleaflet/src/layer/tile/ImpressTileLayer.js |8 -
 4 files changed, 158 insertions(+), 107 deletions(-)

New commits:
commit 2f57f0c34eacbba7bd897713a74e1ccc73c095f4
Author: Szymon Kłos 
AuthorDate: Wed Apr 15 15:25:22 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 16:52:51 2020 +0200

Move presentation toolbar to separate file

Change-Id: I47faf807bbbd79e27c9eb5156fc24dc4bc053aab
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92272
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 2a6355431..385bb96a6 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -269,6 +269,7 @@ LOLEAFLET_JS =\
src/control/Control.UserList.js \
src/control/Control.FormulaBar.js \
src/control/Control.SheetsBar.js \
+   src/control/Control.PresentationBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.PresentationBar.js 
b/loleaflet/src/control/Control.PresentationBar.js
new file mode 100644
index 0..9cf159bd5
--- /dev/null
+++ b/loleaflet/src/control/Control.PresentationBar.js
@@ -0,0 +1,156 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.PresentationBar
+ */
+
+/* global $ w2ui _ _UNO vex */
+L.Control.PresentationBar = L.Control.extend({
+   options: {
+   shownavigation: true
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+
+   map.on('wopiprops', this.onWopiProps, this);
+   map.on('doclayerinit', this.onDocLayerInit, this);
+   map.on('updatepermission', this.onUpdatePermission, this);
+   },
+
+   create: function() {
+   var that = this;
+   var toolbar = $('#presentation-toolbar');
+   toolbar.w2toolbar({
+   name: 'presentation-toolbar',
+   tooltip: 'bottom',
+   hidden: true,
+   items: [
+   {type: 'html',  id: 'left'},
+   {type: 'button',  id: 'presentation', img: 
'presentation', hidden:true, hint: _('Fullscreen presentation')},
+   {type: 'break', id: 'presentationbreak', 
hidden:true},
+   {type: 'button',  id: 'insertpage', img: 
'insertpage', hint: _UNO('.uno:TaskPaneInsertPage', 'presentation')},
+   {type: 'button',  id: 'duplicatepage', img: 
'duplicatepage', hint: _UNO('.uno:DuplicateSlide', 'presentation')},
+   {type: 'button',  id: 'deletepage', img: 
'deletepage', hint: _UNO('.uno:DeleteSlide', 'presentation')},
+   {type: 'html',  id: 'right'}
+   ],
+   onClick: function (e) {
+   that.onClick(e, e.target);
+   window.hideTooltip(this, e.target);
+   }
+   });
+   toolbar.bind('touchstart', function() {
+   w2ui['presentation-toolbar'].touchStarted = true;
+   });
+   },
+
+   onDelete: function(e) {
+   if (e !== false) {
+   this.map.deletePage();
+   }
+   },
+
+   onClick: function(e, id, item) {
+   if ('presentation-toolbar' in w2ui && 
w2ui['presentation-toolbar'].get(id) !== null) {
+   var toolbar = w2ui['presentation-toolbar'];
+   item = toolbar.get(id);
+   }
+
+   // In the iOS app we don't want clicking on the toolbar to pop 
up the keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 
'zoomout' && id !== 'mobile_wizard' && id !== 'insertion_mobile_wizard') {
+   this.map.focus(this.map.canAcceptKeyboardInput()); // 
Maintain same keyboard state.
+   }
+
+   if (item.disabled) {
+   return;
+   }
+
+   if ((id === 'presentation') && this.map.getDocType() === 
'presentation') {
+   this.map.fire('fullscreen');
+   }
+   else if (id === 'insertpage') {
+   this.map.insertPage();
+   }
+   else if (id === 'duplicatepage') {
+   this.map.duplicatePage();
+   }
+   else if (id === 'deletepage') {
+   vex.dialog.confirm({
+   message: _('Are you sure you want to delete 
this 

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

[Szymon Kłos (via logerrit)]

 loleaflet/Makefile.am  |1 
 loleaflet/src/control/Control.SheetsBar.js |  123 +
 loleaflet/src/control/Control.Toolbar.js   |   74 -
 loleaflet/src/layer/tile/CalcTileLayer.js  |   22 -
 4 files changed, 127 insertions(+), 93 deletions(-)

New commits:
commit fe2743233fe644dfb7ea7e3e78f2ae4274b2ada7
Author: Szymon Kłos 
AuthorDate: Wed Apr 15 14:15:22 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 16:52:35 2020 +0200

Move sheets bar to separate file

Change-Id: Id2cdfdd50e178e4de54a41fa1926e94def9a43f5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92271
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index c5693d351..2a6355431 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -268,6 +268,7 @@ LOLEAFLET_JS =\
src/control/Control.MobileBottomBar.js \
src/control/Control.UserList.js \
src/control/Control.FormulaBar.js \
+   src/control/Control.SheetsBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.SheetsBar.js 
b/loleaflet/src/control/Control.SheetsBar.js
new file mode 100644
index 0..1a9696a09
--- /dev/null
+++ b/loleaflet/src/control/Control.SheetsBar.js
@@ -0,0 +1,123 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.SheetsBar
+ */
+
+/* global $ w2ui _ */
+L.Control.SheetsBar = L.Control.extend({
+   options: {
+   shownavigation: true
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+
+   map.on('doclayerinit', this.onDocLayerInit, this);
+   map.on('updatepermission', this.onUpdatePermission, this);
+   },
+
+   create: function() {
+   var that = this;
+   var toolbar = $('#spreadsheet-toolbar');
+   toolbar.w2toolbar({
+   name: 'spreadsheet-toolbar',
+   tooltip: 'bottom',
+   hidden: true,
+   items: [
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'firstrecord',  img: 'firstrecord', hint: 
_('First sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'prevrecord',  img: 'prevrecord', hint: 
_('Previous sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'nextrecord',  img: 'nextrecord', hint: 
_('Next sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'lastrecord',  img: 'lastrecord', hint: 
_('Last sheet')},
+   {type: 'button',  id: 'insertsheet', img: 
'insertsheet', hint: _('Insert sheet')}
+   ],
+   onClick: function (e) {
+   that.onClick(e, e.target);
+   window.hideTooltip(this, e.target);
+   }
+   });
+   toolbar.bind('touchstart', function(e) {
+   w2ui['spreadsheet-toolbar'].touchStarted = true;
+   var touchEvent = e.originalEvent;
+   if (touchEvent && touchEvent.touches.length > 1) {
+   L.DomEvent.preventDefault(e);
+   }
+   });
+   toolbar.show();
+   },
+
+   onClick: function(e, id, item) {
+   if ('spreadsheet-toolbar' in w2ui && 
w2ui['spreadsheet-toolbar'].get(id) !== null) {
+   var toolbar = w2ui['spreadsheet-toolbar'];
+   item = toolbar.get(id);
+   }
+
+   // In the iOS app we don't want clicking on the toolbar to pop 
up the keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 
'zoomout' && id !== 'mobile_wizard' && id !== 'insertion_mobile_wizard') {
+   this.map.focus(this.map.canAcceptKeyboardInput()); // 
Maintain same keyboard state.
+   }
+
+   if (item.disabled) {
+   return;
+   }
+
+   if (id === 'insertsheet') {
+   var nPos = 
$('#spreadsheet-tab-scroll')[0].childElementCount;
+   this.map.insertPage(nPos);
+   this.map.insertPage.scrollToEnd = true;
+   }
+   else if (id === 'firstrecord') {
+   $('#spreadsheet-tab-scroll').scrollLeft(0);
+   }
+   // TODO: We should get visible tab's width instead of 60px
+   else if (id === 'nextrecord') {
+   
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft()
 + 60);
+

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

[Szymon Kłos (via logerrit)]

 loleaflet/Makefile.am   |1 
 loleaflet/src/control/Control.FormulaBar.js |  185 
 loleaflet/src/control/Control.Toolbar.js|  133 
 loleaflet/src/layer/tile/CalcTileLayer.js   |   33 
 4 files changed, 189 insertions(+), 163 deletions(-)

New commits:
commit cca7a440093237af0bdcb87d44a77f383324c4bc
Author: Szymon Kłos 
AuthorDate: Wed Apr 15 13:38:46 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 16:52:12 2020 +0200

Move formula bar to separate file

Change-Id: If380e8bc8091151872a728cc632313aa3f4cfda1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92269
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 0cb94a244..c5693d351 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -267,6 +267,7 @@ LOLEAFLET_JS =\
src/control/Control.MobileTopBar.js \
src/control/Control.MobileBottomBar.js \
src/control/Control.UserList.js \
+   src/control/Control.FormulaBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.FormulaBar.js 
b/loleaflet/src/control/Control.FormulaBar.js
new file mode 100644
index 0..e90e3f141
--- /dev/null
+++ b/loleaflet/src/control/Control.FormulaBar.js
@@ -0,0 +1,185 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.FormulaBar
+ */
+
+/* global $ w2ui _ */
+L.Control.FormulaBar = L.Control.extend({
+   options: {
+   showfunctionwizard: true
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+
+   map.on('doclayerinit', this.onDocLayerInit, this);
+   map.on('updatepermission', this.onUpdatePermission, this);
+
+   map.on('celladdress', function (e) {
+   if (document.activeElement !== 
L.DomUtil.get('addressInput')) {
+   // if the user is not editing the address field
+   L.DomUtil.get('addressInput').value = e.address;
+   }
+   });
+   },
+
+   create: function() {
+   var that = this;
+   var toolbar = $('#formulabar');
+   toolbar.w2toolbar({
+   name: 'formulabar',
+   tooltip: 'bottom',
+   hidden: true,
+   items: [
+   {type: 'html',  id: 'left'},
+   {type: 'html', id: 'address', html: ''},
+   {type: 'break', hidden: 
!this.options.showfunctionwizard},
+   {type: 'button', hidden: 
!this.options.showfunctionwizard, id: 'functiondialog', img: 'functiondialog', 
hint: _('Function Wizard'), uno: '.uno:FunctionDialog'},
+   {type: 'html', id: 'formula', html: ''}
+   ],
+   onClick: function (e) {
+   that.onClick(e, e.target);
+   window.hideTooltip(this, e.target);
+   },
+   onRefresh: function() {
+   $('#addressInput').off('keyup', 
this.onAddressInput, this).on('keyup', this.onAddressInput, this);
+   }
+   });
+   toolbar.bind('touchstart', function(e) {
+   w2ui['formulabar'].touchStarted = true;
+   var touchEvent = e.originalEvent;
+   if (touchEvent && touchEvent.touches.length > 1) {
+   L.DomEvent.preventDefault(e);
+   }
+   });
+
+   $(w2ui.formulabar.box).find('.w2ui-scroll-left, 
.w2ui-scroll-right').hide();
+   w2ui.formulabar.on('resize', function(target, e) {
+   e.isCancelled = true;
+   });
+   },
+
+   onClick: function(e, id, item) {
+   if ('formulabar' in w2ui && w2ui['formulabar'].get(id) !== 
null) {
+   var toolbar = w2ui['formulabar'];
+   item = toolbar.get(id);
+   }
+
+   // In the iOS app we don't want clicking on the toolbar to pop 
up the keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 
'zoomout' && id !== 'mobile_wizard' && id !== 'insertion_mobile_wizard') {
+   this.map.focus(this.map.canAcceptKeyboardInput()); // 
Maintain same keyboard state.
+   }
+
+   if (item.disabled) {
+   return;
+   }
+
+   if (item.uno) {
+   if (item.unosheet && this.map.getDocType() === 
'spreadsheet') {
+   th

[Libreoffice-commits] online.git: loleaflet/css loleaflet/Makefile.am loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/Makefile.am |1 
 loleaflet/css/device-mobile.css   |   39 
 loleaflet/src/control/Control.MobileTopBar.js |   38 ---
 loleaflet/src/control/Control.StatusBar.js|  187 ---
 loleaflet/src/control/Control.Toolbar.js  |   39 
 loleaflet/src/control/Control.UserList.js |  252 ++
 loleaflet/src/main.js |1 
 7 files changed, 305 insertions(+), 252 deletions(-)

New commits:
commit 610e2dbd583da4537e8cdef7f10318dc43e8c269
Author: Szymon Kłos 
AuthorDate: Tue Apr 14 18:07:25 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 16:51:48 2020 +0200

Move user list to a separate file

Change-Id: I1cd8881d8ea342b96bd5ea5bd4972f971c89881d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92210
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index a57e9ebd4..0cb94a244 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -266,6 +266,7 @@ LOLEAFLET_JS =\
src/control/Control.SearchBar.js \
src/control/Control.MobileTopBar.js \
src/control/Control.MobileBottomBar.js \
+   src/control/Control.UserList.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 161686840..3f795fa53 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -23,6 +23,45 @@ input#follow-checkbox {
border: 2px solid #aaa;
outline: none;
box-shadow: #0015 0px 0px 2px 1px;
+   margin: 0px !important;
+}
+#follow-container {
+   display: block;
+   position: relative;
+   font-size: 22px;
+   -webkit-user-select: none;
+   -moz-user-select: none;
+   -ms-user-select: none;
+   user-select: none;
+  }
+.checkmark {
+   position: absolute;
+   top: 0;
+   left: 0;
+   height: 25px;
+   width: 25px;
+}
+.checkmark:after {
+   content: "";
+   position: absolute;
+   display: none;
+}
+.checkmark:after {
+   left: 9px;
+   top: 5px;
+   width: 5px;
+   height: 10px;
+   border: solid white;
+   border-width: 0 3px 3px 0;
+   -webkit-transform: rotate(45deg);
+   -ms-transform: rotate(45deg);
+   transform: rotate(45deg);
+  }
+input#follow-checkbox:checked ~ .checkmark:after {
+   display: block;
+}
+input#follow-checkbox:checked ~ .checkmark {
+   background-color: #0b87e7;
 }
 #userlist_table + hr { display: none;}
 div#w2ui-overlay-actionbar.w2ui-overlay{
diff --git a/loleaflet/src/control/Control.MobileTopBar.js 
b/loleaflet/src/control/Control.MobileTopBar.js
index 2d4a917f3..76874fb9c 100644
--- a/loleaflet/src/control/Control.MobileTopBar.js
+++ b/loleaflet/src/control/Control.MobileTopBar.js
@@ -3,7 +3,7 @@
  * L.Control.SearchBar
  */
 
-/* global $ w2ui _ _UNO */
+/* global $ w2ui _UNO */
 L.Control.MobileTopBar = L.Control.extend({
 
options: {
@@ -32,16 +32,7 @@ L.Control.MobileTopBar = L.Control.extend({
{type: 'button',  id: 
'insertion_mobile_wizard', img: 'insertion_mobile_wizard', disabled: true},
{type: 'button',  id: 'insertcomment', img: 
'insertcomment', disabled: true},
{type: 'button',  id: 'fullscreen', img: 
'fullscreen', hint: _UNO('.uno:FullScreen', 'text')},
-   {type: 'drop', id: 'userlist', img: 'users', 
html: '' +
-   '' +
-   '' +
-   '' +
-   '' + _('Always follow the editor') 
+ '' +
-   '' +
-   '' +
-   '' + _('Current') 
+ ' - ' +
-   ''
-   },
+   {type: 'drop', id: 'userlist', img: 'users', 
html: L.control.createUserListWidget()},
];
} else if (docType == 'spreadsheet') {
return [
@@ -53,16 +44,7 @@ L.Control.MobileTopBar = L.Control.extend({
{type: 'button',  id: 
'insertion_mobile_wizard', img: 'insertion_mobile_wizard', disabled: true},
 // {type: 'button',  id: 'insertcomment', img: 
'insertcomment', disabled: true},
{type: 'button',  id: 'fullscreen', img: 
'fullscreen', hint: _UNO('.uno:FullScreen', 'text')},
-   {type: 'drop', id: 'userlist', img: 'users', 
html: '' +
-   '' +
-   '' +
-   

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

[Miklos Vajna (via logerrit)]

 xmloff/source/core/xmlimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c1ca2ce0b84ee62165999e1eb79b4073f599ff7
Author: Miklos Vajna 
AuthorDate: Wed Apr 15 15:28:05 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 15 16:16:19 2020 +0200

xmloff: turn this warning into an info

 noelgrandin: is there some way i can silence this 
"warn:xmloff.core:30241:30241:xmloff/source/core/xmlimp.cxx:739: 
SvXMLImport::startElement: missing context for element
  draw:color" warning? i get it 120 times when i do a hello-world 
odg->pdf conversion :)
 vmiklos, hmmm. I think just turn it off for now.

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

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 2470d054e355..9dae9839b519 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -736,7 +736,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& 
rName,
 }
 
 if ( !xContext.is() )
-SAL_WARN_IF( !xContext.is(), "xmloff.core", 
"SvXMLImport::startElement: missing context for element " << rName );
+SAL_INFO_IF( !xContext.is(), "xmloff.core", 
"SvXMLImport::startElement: missing context for element " << rName );
 
 if( !xContext.is() )
 xContext.set(new SvXMLImportContext( *this, nPrefix, aLocalName ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 reportdesign/uiconfig/dbreport/ui/floatingfield.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2d08e053f256bddeea9b96dbd73637ce360c32bf
Author: Julien Nabet 
AuthorDate: Tue Apr 14 21:07:46 2020 +0200
Commit: Julien Nabet 
CommitDate: Wed Apr 15 16:09:12 2020 +0200

tdf#91565: Report builder, missing insert field icon

in Add Field dialog.
Since 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=50cacaea4d8f2a27ea4d9e626dbb518a57eb9ffc,
author  Caolán McNamara 2016-09-27 09:47:00 +0100
committer   Caolán McNamara 2016-09-27 10:43:36 
+0100
commit  50cacaea4d8f2a27ea4d9e626dbb518a57eb9ffc (patch)
treea2cf1d1fb28231a6594e03e17c5e9ffe8748a655
parent  e6fc195ae8a59d665395149ea5f06749c4c6a596 (diff)
convert floating add field to .ui format
Change-Id: Ica9adc19f370d6340d2f5fac552cf1b995b390e0

it was easier to analyze the problem.

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

diff --git a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui 
b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui
index 65ac5bdc19c2..18c190d3e87c 100644
--- a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui
+++ b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui
@@ -110,6 +110,7 @@
 False
 Insert
 True
+cmd/sc_insert.png
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source cui/source filter/source framework/source include/tools reportdesign/source sc/source sd/source sfx2/source starmath/source svtools/source svx/source sw/

[Noel Grandin (via logerrit)]

 avmedia/source/viewer/mediawindow_impl.cxx  |2 +-
 cui/source/tabpages/tpbitmap.cxx|4 ++--
 filter/source/graphicfilter/ipict/ipict.cxx |2 +-
 filter/source/msfilter/msdffimp.cxx |3 +--
 framework/source/fwe/classes/addonsoptions.cxx  |2 +-
 framework/source/layoutmanager/layoutmanager.cxx|2 +-
 framework/source/layoutmanager/toolbarlayoutmanager.cxx |2 +-
 framework/source/uielement/imagebuttontoolbarcontroller.cxx |2 +-
 include/tools/gen.hxx   |2 ++
 reportdesign/source/ui/report/ScrollHelper.cxx  |2 +-
 sc/source/core/data/table5.cxx  |2 +-
 sc/source/filter/excel/xechart.cxx  |2 +-
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx |2 +-
 sc/source/ui/app/inputwin.cxx   |2 +-
 sc/source/ui/cctrl/cbuttonw.cxx |2 +-
 sc/source/ui/drawfunc/fuins2.cxx|6 +++---
 sc/source/ui/view/tabvwsh4.cxx  |4 ++--
 sc/source/ui/view/viewfun7.cxx  |2 +-
 sd/source/filter/eppt/epptso.cxx|2 +-
 sd/source/ui/func/fuinsert.cxx  |4 ++--
 sd/source/ui/sidebar/MasterPageContainer.cxx|2 +-
 sd/source/ui/sidebar/PreviewValueSet.cxx|2 +-
 sd/source/ui/slideshow/slideshowviewimpl.cxx|2 +-
 sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx  |2 +-
 sd/source/ui/slidesorter/view/SlideSorterView.cxx   |2 +-
 sd/source/ui/slidesorter/view/SlsLayouter.cxx   |4 ++--
 sd/source/ui/tools/PreviewRenderer.cxx  |2 +-
 sd/source/ui/view/ViewShellBase.cxx |2 +-
 sd/source/ui/view/drviewse.cxx  |2 +-
 sd/source/ui/view/viewshel.cxx  |2 +-
 sfx2/source/control/thumbnailview.cxx   |4 ++--
 sfx2/source/doc/new.cxx |2 +-
 sfx2/source/doc/objcont.cxx |2 +-
 starmath/source/unomodel.cxx|4 ++--
 starmath/source/view.cxx|6 +++---
 starmath/source/visitors.cxx|3 +--
 svtools/source/brwbox/brwbox1.cxx   |3 +--
 svtools/source/filter/DocumentToGraphicRenderer.cxx |3 +--
 svx/source/dialog/hyperdlg.cxx  |3 +--
 svx/source/gallery2/galobj.cxx  |2 +-
 svx/source/sidebar/nbdtmg.cxx   |   10 --
 svx/source/svdraw/svdedxv.cxx   |2 +-
 svx/source/svdraw/svdoashp.cxx  |2 +-
 svx/source/svdraw/svdograf.cxx  |2 +-
 svx/source/svdraw/svdomedia.cxx |2 +-
 svx/source/svdraw/svdovirt.cxx  |2 +-
 svx/source/svdraw/svdpntv.cxx   |2 +-
 svx/source/tbxctrls/itemwin.cxx |2 +-
 svx/source/unodraw/UnoGraphicExporter.cxx   |2 +-
 sw/source/core/draw/dflyobj.cxx |2 +-
 sw/source/core/frmedt/fefly1.cxx|2 +-
 sw/source/core/frmedt/fews.cxx  |3 +--
 sw/source/core/layout/atrfrm.cxx|2 +-
 sw/source/core/layout/layact.cxx|8 
 sw/source/core/layout/virtoutp.cxx  |2 +-
 sw/source/core/text/txtfly.cxx  |2 +-
 sw/source/core/view/pagepreviewlayout.cxx   |2 +-
 sw/source/filter/html/htmlflywriter.cxx |6 ++
 sw/source/filter/ww8/wrtww8gr.cxx   |4 ++--
 sw/source/uibase/table/chartins.cxx |2 +-
 sw/source/uibase/uiview/pview.cxx   |2 +-
 sw/source/uibase/uiview/viewport.cxx|7 +++
 vcl/skia/x11/cairotextrender.cxx|2 +-
 vcl/source/bitmap/BitmapTools.cxx   |2 +-
 vcl/source/filter/png/pngread.cxx   |2 +-
 vcl/source/gdi/graph.cxx|6 ++
 vcl/source/graphic/GraphicObject.cxx|4 ++--
 vcl/source/outdev/bitmap.cxx|2 +-
 vcl/source/treelist/svimpbox.cxx|2 +-
 vcl/source/window/paint.cxx   

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/tiledrendering/data/fieldmark.docx |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx  |9 -
 sw/source/core/crsr/viscrs.cxx  |2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 77870621351acdeb116f7213bf8a6b064f422590
Author: Miklos Vajna 
AuthorDate: Wed Apr 15 12:27:55 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 15 15:50:07 2020 +0200

sw: avoid calling SwView::GetWrtShell() unconditionally from the SwView ctor

Regression from commit dfcfdf47b5da6a11b2c3118a0f63cc48c10c2cd7 (lok:
get spelling context menu on long press, 2019-10-20), the problem was
that GetWrtShell() returns a reference, and the underlying pointer can
be nullptr till the SwView ctor is in progress.

Fix the problem by not caring about spelling till the initial view is
ready, that still provides the cursor position.

(cherry picked from commit ae3342857350c805f536c1af2f560a117be12da8)

Conflicts:
sw/qa/extras/tiledrendering/tiledrendering.cxx

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

diff --git a/sw/qa/extras/tiledrendering/data/fieldmark.docx 
b/sw/qa/extras/tiledrendering/data/fieldmark.docx
new file mode 100644
index ..02748bb7e182
Binary files /dev/null and b/sw/qa/extras/tiledrendering/data/fieldmark.docx 
differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index e1fdbcc4b97b..2771b76fda79 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -122,6 +122,7 @@ public:
 void testDeselectCustomShape();
 void testHyperlink();
 void testRedlineNotificationDuringSave();
+void testFieldmark();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -185,6 +186,7 @@ public:
 CPPUNIT_TEST(testDeselectCustomShape);
 CPPUNIT_TEST(testHyperlink);
 CPPUNIT_TEST(testRedlineNotificationDuringSave);
+CPPUNIT_TEST(testFieldmark);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2489,7 +2491,6 @@ void SwTiledRenderingTest::testHyperlink()
 CPPUNIT_ASSERT_EQUAL(OString("http://example.com/";), m_sHyperlinkLink);
 }
 
-
 void SwTiledRenderingTest::testRedlineNotificationDuringSave()
 {
 // Load a document with redlines which are hidden at a layout level.
@@ -2508,6 +2509,12 @@ void 
SwTiledRenderingTest::testRedlineNotificationDuringSave()
 xStorable->storeToURL(maTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
 }
 
+void SwTiledRenderingTest::testFieldmark()
+{
+// Without the accompanying fix in place, this crashed on load.
+createDoc("fieldmark.docx");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 62f7f033da63..6161c1994822 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -232,7 +232,7 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell const * 
pViewShell)
 
 // is cursor at a mispelled word ?
 bool bIsWrong = false;
-if (pView)
+if (pView && pView->GetWrtShellPtr())
 {
 const SwViewOption* pVOpt = pView->GetWrtShell().GetViewOptions();
 if(pVOpt && pVOpt->IsOnlineSpell())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - 2 commits - common/FileUtil.cpp loleaflet/admin

[Michael Meeks (via logerrit)]

 common/FileUtil.cpp |3 ++-
 loleaflet/admin/src/Util.js |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cf28e81312813698c9048a020c5d74b008d1fc84
Author: Michael Meeks 
AuthorDate: Tue Apr 14 22:09:54 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Apr 15 15:46:20 2020 +0200

Log exception on recursive file removal failure.

Change-Id: Ie810f23af48877bbfe9dff7da8eee709186e108e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92231
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit 70201b743016fa73d02d793edae6b8974d05cc6f)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92286
Reviewed-by: Andras Timar 

diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp
index 701ab28ec..8f98a76b8 100644
--- a/common/FileUtil.cpp
+++ b/common/FileUtil.cpp
@@ -281,9 +281,10 @@ namespace FileUtil
 nftw(path.c_str(), nftw_cb, 128, FTW_DEPTH | FTW_PHYS);
 }
 }
-catch (const std::exception&)
+catch (const std::exception&e)
 {
 // Already removed or we don't care about failures.
+LOG_DBG("Exception removing " << path << " " << recursive << " : " 
<< e.what());
 }
 #endif
 }
commit 17065bdf85d655012d6a067a89e84bfb4b830d91
Author: Michael Meeks 
AuthorDate: Tue Apr 14 22:09:14 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Apr 15 15:46:07 2020 +0200

admin: don't allow excessive precision in humanized strings.

Change-Id: Ia5e4af2618c174c5eff3696bf36c8b4fbe0a94c2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92230
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit 26632c2cf4839e193b3309096e319763f762a463)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92185
Reviewed-by: Andras Timar 

diff --git a/loleaflet/admin/src/Util.js b/loleaflet/admin/src/Util.js
index 6671ed458..9d8e2b179 100644
--- a/loleaflet/admin/src/Util.js
+++ b/loleaflet/admin/src/Util.js
@@ -16,7 +16,7 @@ var Util = Base.extend({
kbytes /= unit;
}
 
-   return kbytes + ' ' + units[i];
+   return kbytes.toFixed(1) + ' ' + units[i];
},
 
humanizeSecs: function(secs) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - android/app android/lib loleaflet/po

[Weblate (via logerrit)]

 android/app/src/main/res/values-en-rGB/strings.xml |2 
 android/app/src/main/res/values-it/strings.xml |2 
 android/app/src/main/res/values-kab/strings.xml|  105 +++
 android/app/src/main/res/values-nb-rNO/strings.xml |   23 +
 android/app/src/main/res/values-pl/strings.xml |2 
 android/lib/src/main/res/values-kab/strings.xml|   15 +
 android/lib/src/main/res/values-nb-rNO/strings.xml |5 
 loleaflet/po/help-ca.po|   26 -
 loleaflet/po/help-kab.po   |  290 +
 loleaflet/po/help-nb.po|   39 +-
 loleaflet/po/help-sl.po|   36 +-
 loleaflet/po/help-uk.po|   10 
 loleaflet/po/ios-en_GB.po  |   15 -
 loleaflet/po/ios-it.po |   15 -
 loleaflet/po/ios-kab.po|   19 -
 loleaflet/po/ios-pt.po |   11 
 loleaflet/po/ios-sl.po |   10 
 loleaflet/po/ui-ast.po |   14 -
 loleaflet/po/ui-en_GB.po   |8 
 loleaflet/po/ui-es.po  |4 
 loleaflet/po/ui-it.po  |8 
 loleaflet/po/ui-kab.po |  187 ++---
 loleaflet/po/ui-nb.po  |  166 +---
 loleaflet/po/ui-pt.po  |8 
 loleaflet/po/ui-sl.po  |8 
 loleaflet/po/ui-ug.po  |   29 +-
 26 files changed, 582 insertions(+), 475 deletions(-)

New commits:
commit 7f3f3fd7d242a0cc51c5a378d365a8f4bdd576e4
Author: Weblate 
AuthorDate: Tue Apr 14 20:36:43 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 15 15:45:45 2020 +0200

update translations

LibreOffice Online/loleaflet-help (Catalan)
Currently translated at 83.7% (348 of 416 strings)

Change-Id: I3ad0b027f015027cabc7d498f37d384ddd19350e

update translations

LibreOffice Online/loleaflet-help (Ukrainian)
Currently translated at 61.5% (256 of 416 strings)

Change-Id: I6f4aa96b26b6af6ff02eff00a40fe3a8133c45be

update translations

LibreOffice Online/ios (Portuguese)
Currently translated at 60.0% (3 of 5 strings)

Change-Id: I2b844c4b059e3dd728df5912650e60f65f7053be

update translations

LibreOffice Online/loleaflet-ui (Uyghur)
Currently translated at 33.6% (98 of 292 strings)

Change-Id: I46dc25d98d561f6709b237f0a84b3f1e1da68e08

update translations

LibreOffice Online/loleaflet-ui (Portuguese)
Currently translated at 100.0% (292 of 292 strings)

Change-Id: I851ff8f304149b96b6ed48244f1030a5175359ac

update translations

LibreOffice Online/ios (Slovenian)
Currently translated at 100.0% (5 of 5 strings)

Change-Id: I849d9be6f25338a466effef314e42bf37d147027

update translations

LibreOffice Online/loleaflet-help (Slovenian)
Currently translated at 100.0% (416 of 416 strings)

Change-Id: I4b1c0b76463911999063976975d4892f0210197e

update translations

LibreOffice Online/loleaflet-help (Kabyle)
Currently translated at 34.4% (143 of 416 strings)

Change-Id: I1d5925357b4cea2e8e9722fa6998c3d3c380a843

update translations

LibreOffice Online/loleaflet-ui (Slovenian)
Currently translated at 100.0% (292 of 292 strings)

Change-Id: I91b8a732bd2d0a2a7d212f6c0a47a21031eb44a5

update translations

LibreOffice Online/loleaflet-help (Kabyle)
Currently translated at 32.7% (136 of 416 strings)

Change-Id: Ib992b2f62569331988f33391f31dca9cf8905f0c

update translations

LibreOffice Online/loleaflet-help (Kabyle)
Currently translated at 13.9% (58 of 416 strings)

Change-Id: I744b65c54cf12a90a9e57054c38d0d89ced4a6df

update translations

LibreOffice Online/android-app (Italian)
Currently translated at 100.0% (102 of 102 strings)

Change-Id: I4c1469053eb748b6bc8a4e670596558c879a5d28

update translations

LibreOffice Online/android-app (Polish)
Currently translated at 100.0% (102 of 102 strings)

Change-Id: I870403d3085537585989f10d472b412727b87308

update translations

LibreOffice Online/ios (Italian)
Currently translated at 100.0% (5 of 5 strings)

Change-Id: I0bf80f893ec4c040d655e18779c82c5736dcfc8b

update translations

LibreOffice Online/loleaflet-ui (Italian)
Currently translated at 100.0% (292 of 292 strings)

Change-Id: Ic091131c12bffe52d6a69e50ead294e8b9f63b70

update translations

LibreOffice Online/loleaflet-help (Catalan)
Currently translated at 82.9% (345 of 416 strings)

Change-Id: I6663593ad7a6e4b2a7552d9e71a9

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

[Aron Budea (via logerrit)]

 sd/source/filter/eppt/epptso.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit b267650fd097f16d1b31c87a11a497294ad4ee42
Author: Aron Budea 
AuthorDate: Mon Apr 13 05:14:13 2020 +0200
Commit: Mike Kaganski 
CommitDate: Wed Apr 15 15:44:01 2020 +0200

tdf#131193: MSO PP complains about an ODP saved as PPT

pPara was supposed to be the first paragraph, as before the
below commit.

Regression from d458adeed0c34fae26fe7f3d6ecc9b75b431922f

Change-Id: I50b993ff8f37fd5572d60fe5d103c3cf5e636a6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92105
Reviewed-by: Arkadiy Illarionov 
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 0f5abc02cfbf..b56f82c13051 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1170,9 +1170,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, 
int nTextInstance, sal_u
 pPara = aTextObj.GetParagraph(0);
 sal_uInt32  nParaFlags = 0x1f;
 sal_Int16   nMask, nNumberingRule[ 10 ];
-sal_uInt32  nTextOfs = pPara->nTextOfs;
-sal_uInt32  nTabs = pPara->maTabStop.getLength();
-const css::style::TabStop* pTabStop = pPara->maTabStop.getConstArray();
+const sal_uInt32  nTextOfs = pPara->nTextOfs;
+const sal_uInt32  nTabs = pPara->maTabStop.getLength();
+const auto& rTabStops = pPara->maTabStop;
 
 for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount(); ++i )
 {
@@ -1209,7 +1209,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, 
int nTextInstance, sal_u
 const sal_uInt32 nDefaultTabSize = MapSize( awt::Size( 
nDefaultTabSizeSrc, 1 ) ).Width;
 sal_uInt32  nDefaultTabs = std::abs( maRect.GetWidth() ) / 
nDefaultTabSize;
 if ( nTabs )
-nDefaultTabs -= static_cast( ( ( pTabStop[ nTabs - 1 
].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize );
+nDefaultTabs -= static_cast( ( ( rTabStops[ nTabs - 1 
].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize );
 if ( static_cast(nDefaultTabs) < 0 )
 nDefaultTabs = 0;
 
@@ -1236,7 +1236,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, 
int nTextInstance, sal_u
 if ( nTextRulerAtomFlags & 4 )
 {
 pRuleOut->WriteUInt16( nTabCount );
-for ( const css::style::TabStop& rTabStop : 
std::as_const(pPara->maTabStop) )
+for ( const css::style::TabStop& rTabStop : rTabStops )
 {
 sal_uInt16 nPosition = static_cast( ( 
rTabStop.Position / 4.40972 ) + nTextOfs );
 sal_uInt16 nType;
@@ -1255,7 +1255,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, 
int nTextInstance, sal_u
 
 sal_uInt32 nWidth = 1;
 if ( nTabs )
-nWidth += static_cast( ( pTabStop[ nTabs - 1 
].Position / 4.40972 + nTextOfs ) / nDefaultTabSize );
+nWidth += static_cast( ( rTabStops[ nTabs - 1 
].Position / 4.40972 + nTextOfs ) / nDefaultTabSize );
 nWidth *= nDefaultTabSize;
 for ( i = 0; i < nDefaultTabs; i++, nWidth += nDefaultTabSize )
 pRuleOut->WriteUInt32( nWidth );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer (via logerrit)]

 sc/source/ui/drawfunc/fudraw.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit d09a35bc10251ef0b66e06c6ffbb2d16332b318b
Author: Mert Tumer 
AuthorDate: Thu Apr 9 19:36:53 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Apr 15 15:37:42 2020 +0200

mobile: fix double tap on chart doesn't get into editmode

Sometimes double tapping on a chart when it is not selected
in the beginning, starts the input mode instead of chart
editing.

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

diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 65a3f0b843da..c60890c23c15 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -38,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // base class for draw module specific functions
 FuDraw::FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
@@ -248,6 +250,15 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
 if( !pView->IsTextEdit() && 1 == rMarkList.GetMarkCount() )
 {
 SdrObject* pObj = rMarkList.GetMark( 0 
)->GetMarkedSdrObj();
+bool isMobilePhone = 
comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobilePhone(SfxLokHelper::getView());
+// Double tapping on charts on phone may result in 
activating the edit mode which is not wanted.
+// It happens due to the delay of selection message of the 
object from kit to javascript
+// in that case F2 is sent instead of double click
+if (isMobilePhone && ScDocument::IsChart(pObj))
+{
+rViewShell.ActivateObject( static_cast< SdrOle2Obj* >( 
pObj ), 0 );
+break;
+}
 if ( lcl_KeyEditMode( pObj, rViewShell, nullptr ) )
// start text edit for suitable object
 bReturn = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/Makefile.am|1 
 loleaflet/src/control/Control.MobileBottomBar.js |  137 +++
 loleaflet/src/layer/tile/CalcTileLayer.js|   53 
 loleaflet/src/layer/tile/ImpressTileLayer.js |   48 
 loleaflet/src/layer/tile/WriterTileLayer.js  |   55 -
 5 files changed, 144 insertions(+), 150 deletions(-)

New commits:
commit a4201e929e9d75ff746492f57e619798a31e8b40
Author: Szymon Kłos 
AuthorDate: Fri Apr 10 19:44:21 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 15:27:09 2020 +0200

Move bottom mobile toolbar to separate file

Change-Id: I32e8fe251fcabd5d1c5af19cd7a72f60250c2851
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92159
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 303e53d6b..a57e9ebd4 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -265,6 +265,7 @@ LOLEAFLET_JS =\
src/control/Control.StatusBar.js \
src/control/Control.SearchBar.js \
src/control/Control.MobileTopBar.js \
+   src/control/Control.MobileBottomBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.MobileBottomBar.js 
b/loleaflet/src/control/Control.MobileBottomBar.js
new file mode 100644
index 0..078e8d880
--- /dev/null
+++ b/loleaflet/src/control/Control.MobileBottomBar.js
@@ -0,0 +1,137 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.MobileBottomBar
+ */
+
+/* global $ w2ui _ _UNO */
+L.Control.MobileBottomBar = L.Control.extend({
+
+   options: {
+   doctype: 'text'
+   },
+
+   initialize: function (docType) {
+   L.setOptions(this, {docType: docType});
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+   },
+
+   getToolItems: function(docType) {
+   if (docType == 'text') {
+   return [
+   {type: 'button',  id: 'showsearchbar',  img: 
'search', hint: _('Show the search bar')},
+   {type: 'break'},
+   {type: 'button',  id: 'bold',  img: 'bold', 
hint: _UNO('.uno:Bold'), uno: 'Bold'},
+   {type: 'button',  id: 'italic', img: 'italic', 
hint: _UNO('.uno:Italic'), uno: 'Italic'},
+   {type: 'button',  id: 'underline',  img: 
'underline', hint: _UNO('.uno:Underline'), uno: 'Underline'},
+   {type: 'button',  id: 'strikeout', img: 
'strikeout', hint: _UNO('.uno:Strikeout'), uno: 'Strikeout'},
+   {type: 'break'},
+   {type: 'button',  id: 'fontcolor', img: 
'textcolor', hint: _UNO('.uno:FontColor')},
+   {type: 'button',  id: 'backcolor', img: 
'backcolor', hint: _UNO('.uno:BackgroundColor')},
+   {type: 'button',  id: 'leftpara',  img: 
'alignleft', hint: _UNO('.uno:LeftPara', '', true),
+   uno: {textCommand: 'LeftPara', 
objectCommand: 'ObjectAlignLeft'},
+   unosheet: 'AlignLeft', disabled: true},
+   {type: 'button',  id: 'centerpara',  img: 
'alignhorizontal', hint: _UNO('.uno:CenterPara', '', true),
+   uno: {textCommand: 'CenterPara', 
objectCommand: 'AlignCenter'},
+   unosheet: 'AlignHorizontalCenter', 
disabled: true},
+   {type: 'button',  id: 'rightpara',  img: 
'alignright', hint: _UNO('.uno:RightPara', '', true),
+   uno: {textCommand: 'RightPara', 
objectCommand: 'ObjectAlignRight'},
+   unosheet: 'AlignRight', disabled: true},
+   {type: 'button',  id: 'justifypara',  img: 
'alignblock', hint: _UNO('.uno:JustifyPara', '', true), uno: 'JustifyPara', 
unosheet: '', disabled: true},
+   {type: 'break', id: 'breakspacing'},
+   {type: 'button',  id: 'defaultnumbering',  img: 
'numbering', hint: _UNO('.uno:DefaultNumbering', '', true),uno: 
'DefaultNumbering', disabled: true},
+   {type: 'button',  id: 'defaultbullet',  img: 
'bullet', hint: _UNO('.uno:DefaultBullet', '', true), uno: 'DefaultBullet', 
disabled: true},
+   {type: 'break', id: 'breakbullet', hidden: 
true},
+   {type: 'button',  id: 'incrementindent',  img: 
'incrementindent', hint: _UNO('.uno:IncrementIndent', '', true), uno: 
'IncrementIndent', disabled: true},
+   {type: 'button',  id: 'decrementindent',  img:

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

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

 vcl/skia/win/gdiimpl.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2ddfa9918352a082990ba189d094bae838f82190
Author: Luboš Luňák 
AuthorDate: Wed Apr 15 13:08:02 2020 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 15 15:11:04 2020 +0200

fix Skia glyph orientation with DirectWrite (tdf#132084)

LOGFONT includes info about whether a glyph should be rotated, so
we don't need to do it explicitly, but with DirectWrite apparently
this information doesn't carry over.

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

diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index fd796794464e..2de81c7d8f16 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -172,8 +172,12 @@ bool WinSkiaSalGraphicsImpl::DrawTextLayout(const 
GenericSalLayout& rLayout)
 return false;
 }
 sk_sp typeface = createDirectWriteTypeface(logFont);
+GlyphOrientation glyphOrientation = GlyphOrientation::Apply;
 if (!typeface) // fall back to GDI text rendering
+{
 typeface.reset(SkCreateTypefaceFromLOGFONT(logFont));
+glyphOrientation = GlyphOrientation::Ignore;
+}
 // lfHeight actually depends on DPI, so it's not really font height as 
such,
 // but for LOGFONT-based typefaces Skia simply sets lfHeight back to this 
value
 // directly.
@@ -187,7 +191,7 @@ bool WinSkiaSalGraphicsImpl::DrawTextLayout(const 
GenericSalLayout& rLayout)
 COLORREF color = ::GetTextColor(mWinParent.getHDC());
 Color salColor(GetRValue(color), GetGValue(color), GetBValue(color));
 // The font already is set up to have glyphs rotated as needed.
-impl->drawGenericLayout(rLayout, salColor, font, 
SkiaSalGraphicsImpl::GlyphOrientation::Ignore);
+impl->drawGenericLayout(rLayout, salColor, font, glyphOrientation);
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 vcl/skia/gdiimpl.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit c3b044abc2906bbb56a0f359f89ee7c1eb400c93
Author: Luboš Luňák 
AuthorDate: Wed Apr 15 12:33:17 2020 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 15 15:10:21 2020 +0200

keep old contents of resized windows with Skia (tdf#131952)

It seems this is necessary in rare cases.

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

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 6f7c2b70b1df..e20d63018747 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -432,7 +432,22 @@ void SkiaSalGraphicsImpl::checkSurface()
 if (!avoidRecreateByResize())
 {
 Size oldSize(mSurface->width(), mSurface->height());
+// Recreating a surface means that the old SkSurface contents will 
be lost.
+// But if a window has been resized the windowing system may send 
repaint events
+// only for changed parts and VCL would not repaint the whole 
area, assuming
+// that some parts have not changed (this is what seems to cause 
tdf#131952).
+// So carry over the old contents for windows, even though 
generally everything
+// will be usually repainted anyway.
+sk_sp snapshot;
+if (!isOffscreen())
+snapshot = mSurface->makeImageSnapshot();
 recreateSurface();
+if (snapshot)
+{
+SkPaint paint;
+paint.setBlendMode(SkBlendMode::kSrc); // copy as is
+mSurface->getCanvas()->drawImage(snapshot, 0, 0, &paint);
+}
 SAL_INFO("vcl.skia.trace", "recreate(" << this << "): old " << 
oldSize << " new "
<< Size(mSurface->width(), 
mSurface->height())
<< " requested "
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/breeze/cmd/32/ko/bold.png  |binary
 icon-themes/breeze/cmd/32/ko/charfontname.png  |binary
 icon-themes/breeze/cmd/32/ko/color.png |binary
 icon-themes/breeze/cmd/32/ko/fontdialog.png|binary
 icon-themes/breeze/cmd/32/ko/italic.png|binary
 icon-themes/breeze/cmd/32/ko/outlinefont.png   |binary
 icon-themes/breeze/cmd/32/ko/overline.png  |binary
 icon-themes/breeze/cmd/32/ko/scaletext.png |binary
 icon-themes/breeze/cmd/32/ko/shadowed.png  |binary
 icon-themes/breeze/cmd/32/ko/sortascending.png |binary
 icon-themes/breeze/cmd/32/ko/sortdescending.png|binary
 icon-themes/breeze/cmd/32/ko/strikeout.png |binary
 icon-themes/breeze/cmd/32/ko/text.png  |binary
 icon-themes/breeze/cmd/32/ko/text_marquee.png  |binary
 icon-themes/breeze/cmd/32/ko/textdirectionlefttoright.png  |binary
 icon-themes/breeze/cmd/32/ko/textdirectiontoptobottom.png  |binary
 icon-themes/breeze/cmd/32/ko/underline.png |binary
 icon-themes/breeze/cmd/32/ko/underlinedouble.png   |binary
 icon-themes/breeze/cmd/32/ko/verticaltext.png  |binary
 icon-themes/breeze/cmd/ko/lc_bold.png  |binary
 icon-themes/breeze/cmd/ko/lc_charfontname.png  |binary
 icon-themes/breeze/cmd/ko/lc_color.png |binary
 icon-themes/breeze/cmd/ko/lc_fontdialog.png|binary
 icon-themes/breeze/cmd/ko/lc_italic.png|binary
 icon-themes/breeze/cmd/ko/lc_outlinefont.png   |binary
 icon-themes/breeze/cmd/ko/lc_overline.png  |binary
 icon-themes/breeze/cmd/ko/lc_scaletext.png |binary
 icon-themes/breeze/cmd/ko/lc_shadowed.png  |binary
 icon-themes/breeze/cmd/ko/lc_sortascending.png |binary
 icon-themes/breeze/cmd/ko/lc_sortdescending.png|binary
 icon-themes/breeze/cmd/ko/lc_strikeout.png |binary
 icon-themes/breeze/cmd/ko/lc_text.png  |binary
 icon-themes/breeze/cmd/ko/lc_text_marquee.png  |binary
 icon-themes/breeze/cmd/ko/lc_textdirectionlefttoright.png  |binary
 icon-themes/breeze/cmd/ko/lc_textdirectiontoptobottom.png  |binary
 icon-themes/breeze/cmd/ko/lc_underline.png |binary
 icon-themes/breeze/cmd/ko/lc_underlinedouble.png   |binary
 icon-themes/breeze/cmd/ko/lc_verticaltext.png  |binary
 icon-themes/breeze/cmd/ko/sc_bold.png  |binary
 icon-themes/breeze/cmd/ko/sc_charfontname.png  |binary
 icon-themes/breeze/cmd/ko/sc_color.png |binary
 icon-themes/breeze/cmd/ko/sc_fontdialog.png|binary
 icon-themes/breeze/cmd/ko/sc_italic.png|binary
 icon-themes/breeze/cmd/ko/sc_outlinefont.png   |binary
 icon-themes/breeze/cmd/ko/sc_overline.png  |binary
 icon-themes/breeze/cmd/ko/sc_scaletext.png |binary
 icon-themes/breeze/cmd/ko/sc_shadowed.png  |binary
 icon-themes/breeze/cmd/ko/sc_sortascending.png |binary
 icon-themes/breeze/cmd/ko/sc_sortdescending.png|binary
 icon-themes/breeze/cmd/ko/sc_strikeout.png |binary
 icon-themes/breeze/cmd/ko/sc_text.png  |binary
 icon-themes/breeze/cmd/ko/sc_text_marquee.png  |binary
 icon-themes/breeze/cmd/ko/sc_textdirectionlefttoright.png  |binary
 icon-themes/breeze/cmd/ko/sc_textdirectiontoptobottom.png  |binary
 icon-themes/breeze/cmd/ko/sc_underline.png |binary
 icon-themes/breeze/cmd/ko/sc_underlinedouble.png   |binary
 icon-themes/breeze/cmd/ko/sc_verticaltext.png  |binary
 icon-themes/breeze/links.txt   |   33 
++
 icon-themes/breeze_dark/cmd/32/ko/bold.png |binary
 icon-themes/breeze_dark/cmd/32/ko/charfontname.png |binary
 icon-themes/breeze_dark/cmd/32/ko/color.png|binary
 icon-themes/breeze_dark/cmd/32/ko/fontdialog.png   |binary
 icon-themes/breeze_dark/cmd/32/ko/italic.png   |binary
 icon-themes/breeze_dark/cmd/32/ko/outlinefont.png  |binary
 icon-themes/breeze_dark/cmd/32/ko/overline.png |binary
 icon-themes/breeze_dark/cmd/32/ko/scaletext.png

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/breeze/cmd/32/ko/bold.png  |binary
 icon-themes/breeze/cmd/32/ko/charfontname.png  |binary
 icon-themes/breeze/cmd/32/ko/color.png |binary
 icon-themes/breeze/cmd/32/ko/fontdialog.png|binary
 icon-themes/breeze/cmd/32/ko/italic.png|binary
 icon-themes/breeze/cmd/32/ko/outlinefont.png   |binary
 icon-themes/breeze/cmd/32/ko/overline.png  |binary
 icon-themes/breeze/cmd/32/ko/scaletext.png |binary
 icon-themes/breeze/cmd/32/ko/shadowed.png  |binary
 icon-themes/breeze/cmd/32/ko/sortascending.png |binary
 icon-themes/breeze/cmd/32/ko/sortdescending.png|binary
 icon-themes/breeze/cmd/32/ko/strikeout.png |binary
 icon-themes/breeze/cmd/32/ko/text.png  |binary
 icon-themes/breeze/cmd/32/ko/text_marquee.png  |binary
 icon-themes/breeze/cmd/32/ko/textdirectionlefttoright.png  |binary
 icon-themes/breeze/cmd/32/ko/textdirectiontoptobottom.png  |binary
 icon-themes/breeze/cmd/32/ko/underline.png |binary
 icon-themes/breeze/cmd/32/ko/underlinedouble.png   |binary
 icon-themes/breeze/cmd/32/ko/verticaltext.png  |binary
 icon-themes/breeze/cmd/ko/lc_bold.png  |binary
 icon-themes/breeze/cmd/ko/lc_charfontname.png  |binary
 icon-themes/breeze/cmd/ko/lc_color.png |binary
 icon-themes/breeze/cmd/ko/lc_fontdialog.png|binary
 icon-themes/breeze/cmd/ko/lc_italic.png|binary
 icon-themes/breeze/cmd/ko/lc_outlinefont.png   |binary
 icon-themes/breeze/cmd/ko/lc_overline.png  |binary
 icon-themes/breeze/cmd/ko/lc_scaletext.png |binary
 icon-themes/breeze/cmd/ko/lc_shadowed.png  |binary
 icon-themes/breeze/cmd/ko/lc_sortascending.png |binary
 icon-themes/breeze/cmd/ko/lc_sortdescending.png|binary
 icon-themes/breeze/cmd/ko/lc_strikeout.png |binary
 icon-themes/breeze/cmd/ko/lc_text.png  |binary
 icon-themes/breeze/cmd/ko/lc_text_marquee.png  |binary
 icon-themes/breeze/cmd/ko/lc_textdirectionlefttoright.png  |binary
 icon-themes/breeze/cmd/ko/lc_textdirectiontoptobottom.png  |binary
 icon-themes/breeze/cmd/ko/lc_underline.png |binary
 icon-themes/breeze/cmd/ko/lc_underlinedouble.png   |binary
 icon-themes/breeze/cmd/ko/lc_verticaltext.png  |binary
 icon-themes/breeze/cmd/ko/sc_bold.png  |binary
 icon-themes/breeze/cmd/ko/sc_charfontname.png  |binary
 icon-themes/breeze/cmd/ko/sc_color.png |binary
 icon-themes/breeze/cmd/ko/sc_fontdialog.png|binary
 icon-themes/breeze/cmd/ko/sc_italic.png|binary
 icon-themes/breeze/cmd/ko/sc_outlinefont.png   |binary
 icon-themes/breeze/cmd/ko/sc_overline.png  |binary
 icon-themes/breeze/cmd/ko/sc_scaletext.png |binary
 icon-themes/breeze/cmd/ko/sc_shadowed.png  |binary
 icon-themes/breeze/cmd/ko/sc_sortascending.png |binary
 icon-themes/breeze/cmd/ko/sc_sortdescending.png|binary
 icon-themes/breeze/cmd/ko/sc_strikeout.png |binary
 icon-themes/breeze/cmd/ko/sc_text.png  |binary
 icon-themes/breeze/cmd/ko/sc_text_marquee.png  |binary
 icon-themes/breeze/cmd/ko/sc_textdirectionlefttoright.png  |binary
 icon-themes/breeze/cmd/ko/sc_textdirectiontoptobottom.png  |binary
 icon-themes/breeze/cmd/ko/sc_underline.png |binary
 icon-themes/breeze/cmd/ko/sc_underlinedouble.png   |binary
 icon-themes/breeze/cmd/ko/sc_verticaltext.png  |binary
 icon-themes/breeze/links.txt   |   33 
++
 icon-themes/breeze_dark/cmd/32/ko/bold.png |binary
 icon-themes/breeze_dark/cmd/32/ko/charfontname.png |binary
 icon-themes/breeze_dark/cmd/32/ko/color.png|binary
 icon-themes/breeze_dark/cmd/32/ko/fontdialog.png   |binary
 icon-themes/breeze_dark/cmd/32/ko/italic.png   |binary
 icon-themes/breeze_dark/cmd/32/ko/outlinefont.png  |binary
 icon-themes/breeze_dark/cmd/32/ko/overline.png |binary
 icon-themes/breeze_dark/cmd/32/ko/scaletext.png

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests4/trackedChanges.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b3d0b943283ff0b4ce1de5a05efc338e467a7a1
Author: Xisco Fauli 
AuthorDate: Wed Apr 15 13:26:17 2020 +0200
Commit: Xisco Faulí 
CommitDate: Wed Apr 15 14:39:40 2020 +0200

uitest: wrong filename

Change-Id: I06b3586519b8b58410ffb4e08822af53e252ecbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92262
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sc/qa/uitest/calc_tests/data/tdf130960.odt 
b/sc/qa/uitest/calc_tests/data/tdf131907.odt
similarity index 100%
rename from sc/qa/uitest/calc_tests/data/tdf130960.odt
rename to sc/qa/uitest/calc_tests/data/tdf131907.odt
diff --git a/sc/qa/uitest/calc_tests4/trackedChanges.py 
b/sc/qa/uitest/calc_tests4/trackedChanges.py
index ca446e66d0a2..72bfa89cf40c 100644
--- a/sc/qa/uitest/calc_tests4/trackedChanges.py
+++ b/sc/qa/uitest/calc_tests4/trackedChanges.py
@@ -21,7 +21,7 @@ def get_url_for_data_file(file_name):
 class CalcTrackedChanges(UITestCase):
 
 def test_tdf131907(self):
-calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf130960.odt"))
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf131907.odt"))
 xCalcDoc = self.xUITest.getTopFocusWindow()
 
self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptChanges")
 xTrackDlg = self.xUITest.getTopFocusWindow()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests

[mert (via logerrit)]

 cypress_test/integration_tests/mobile/calc/number_format_spec.js |   16 
+-
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 744b1ced2a90d319474d198a9a4eed5e821be912
Author: mert 
AuthorDate: Wed Apr 15 15:08:30 2020 +0300
Commit: Tamás Zolnai 
CommitDate: Wed Apr 15 14:32:51 2020 +0200

fix cypress failure due to id change of element

Change-Id: I1df07e10c4b3c5bdc88417eb785dc711fc6dd0e2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92265
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/calc/number_format_spec.js 
b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
index 79cb17cc0..dbf8f7ddc 100644
--- a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
@@ -22,7 +22,7 @@ describe('Apply number formatting.', function() {
cy.get('#ScNumberFormatPropertyPanel')
.click();
 
-   cy.get('#category')
+   cy.get('#numberformatcombobox')
.should('be.visible');
});
 
@@ -32,14 +32,14 @@ describe('Apply number formatting.', function() {
 
function selectFormatting(formattingString) {
// Select formatting list
-   cy.get('#category')
+   cy.get('#numberformatcombobox')
.click();
 
cy.contains('.mobile-wizard.ui-combobox-text', formattingString)
.click();
 
// Combobox entry contains the selected format
-   cy.get('#category .ui-header-left')
+   cy.get('#numberformatcombobox .ui-header-left')
.should('have.text', formattingString);
}
 
@@ -82,7 +82,7 @@ describe('Apply number formatting.', function() {
.should('have.class', 'selected');
 
// TODO: combobox entry is not updated
-   //cy.get('#category .ui-header-left')
+   //cy.get('#numberformatcombobox .ui-header-left')
//  .should('have.text', 'Percent');
 
// Decimal and leading zeros are changed.
@@ -140,7 +140,7 @@ describe('Apply number formatting.', function() {
.should('have.class', 'selected');
 
// TODO: combobox entry is not updated
-   //cy.get('#category .ui-header-left')
+   //cy.get('#numberformatcombobox .ui-header-left')
//  .should('have.text', 'Currency');
 
// Decimal and leading zeros are changed.
@@ -207,7 +207,7 @@ describe('Apply number formatting.', function() {
//  .should('have.class', 'selected');
 
// TODO: combobox entry is not updated
-   //cy.get('#category .ui-header-left')
+   //cy.get('#numberformatcombobox .ui-header-left')
//  .should('have.text', 'Number');
 
calcHelper.copyContentToClipboard();
@@ -218,14 +218,14 @@ describe('Apply number formatting.', function() {
 
it('Select date format from list.', function() {
// Change to date
-   cy.get('#category')
+   cy.get('#numberformatcombobox')
.click();
 
cy.contains('.mobile-wizard.ui-combobox-text', 'Date')
.click();
 
// Combobox entry contains the selected format
-   cy.get('#category .ui-header-left')
+   cy.get('#numberformatcombobox .ui-header-left')
.should('have.text', 'Date ');
 
// Decimal and leading zeros are changed.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit eda7a2309848083cdbbbcdd193dbe5ac4a692360
Author: Christian Lohmaier 
AuthorDate: Wed Apr 15 14:14:07 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Apr 15 14:14:07 2020 +0200

Update git submodules

* Update translations from branch 'master'
  to 1cf550347fdb87391903b533dd1c47135875a9d7
  - update translations for master

and force-fix errors using pocheck

Change-Id: I9f37f1bad2c1005d8b63991fb1a66cd2f14e259b

diff --git a/translations b/translations
index 0a73e51795ef..1cf550347fdb 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0a73e51795ef412006c59d3723f265fed445dea1
+Subproject commit 1cf550347fdb87391903b533dd1c47135875a9d7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_dialogs/openDialogs.py   |3 +
 sc/qa/uitest/calc_tests/data/tdf131170.ods |binary
 sc/qa/uitest/calc_tests4/tdf131170.py  |   58 +
 3 files changed, 60 insertions(+), 1 deletion(-)

New commits:
commit 32c5832dfccc2f40370c2795b44adaf3b357d603
Author: Xisco Fauli 
AuthorDate: Wed Apr 15 13:19:21 2020 +0200
Commit: Xisco Faulí 
CommitDate: Wed Apr 15 14:08:26 2020 +0200

tdf#131170: Add UItest

Change-Id: I3d881803014d80cd3e8b3ed2f3cc2e84fdc1b3b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92261
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sc/qa/uitest/calc_dialogs/openDialogs.py 
b/sc/qa/uitest/calc_dialogs/openDialogs.py
index d49701aae5f4..db37d38bc918 100644
--- a/sc/qa/uitest/calc_dialogs/openDialogs.py
+++ b/sc/qa/uitest/calc_dialogs/openDialogs.py
@@ -79,7 +79,8 @@ dialogs = [
 # dialog does not open
 {"command": ".uno:CreateNames", "closeButton": "cancel", "skipTestOK": 
True},
 # OK button triggers a new dialog
-{"command": ".uno:DefineLabelRange", "closeButton": "cancel"},
+#{"command": ".uno:DefineLabelRange", "closeButton": "cancel"},
+# tested in sc/qa/uitest/calc_tests4/tdf131170.py
 # {"command": ".uno:RenameTable", "closeButton": "cancel"},
 # tested in sc/qa/uitest/calc_tests/sheetRename.py
 # {"command": ".uno:Move", "closeButton": "cancel"},
diff --git a/sc/qa/uitest/calc_tests/data/tdf131170.ods 
b/sc/qa/uitest/calc_tests/data/tdf131170.ods
new file mode 100644
index ..09d74a4a2660
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf131170.ods differ
diff --git a/sc/qa/uitest/calc_tests4/tdf131170.py 
b/sc/qa/uitest/calc_tests4/tdf131170.py
new file mode 100644
index ..726796936270
--- /dev/null
+++ b/sc/qa/uitest/calc_tests4/tdf131170.py
@@ -0,0 +1,58 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.path import get_srcdir_url
+
+def get_url_for_data_file(file_name):
+return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+
+class tdf131170(UITestCase):
+def test_DefineLabelRange(self):
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf131170.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+self.ui_test.execute_dialog_through_command(".uno:DefineLabelRange")
+xDialog = self.xUITest.getTopFocusWindow()
+
+xRange = xDialog.getChild("range")
+self.assertEqual(4, len(xRange.getChildren()))
+
self.assertEqual(get_state_as_dict(xRange.getChild('0'))["Text"].strip(), "--- 
Column ---")
+
self.assertEqual(get_state_as_dict(xRange.getChild('1'))["Text"].strip(), 
"$Sheet1.$I$6:$K$6 [AA, BB, CC]")
+
self.assertEqual(get_state_as_dict(xRange.getChild('2'))["Text"].strip(), "--- 
Row ---")
+
self.assertEqual(get_state_as_dict(xRange.getChild('3'))["Text"].strip(), 
"$Sheet1.$H$7:$H$9 [X, Y, Z]")
+
+def handle_confirmation_dlg(dialog2):
+xOKBtn2 = dialog2.getChild("yes")
+self.ui_test.close_dialog_through_button(xOKBtn2)
+
+xDeleteBtn = xDialog.getChild("delete")
+
+xRange.getChild('1').executeAction("SELECT", tuple())
+self.ui_test.execute_blocking_action(xDeleteBtn.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_confirmation_dlg)
+
+self.assertEqual(3, len(xRange.getChildren()))
+
self.assertEqual(get_state_as_dict(xRange.getChild('0'))["Text"].strip(), "--- 
Column ---")
+
self.assertEqual(get_state_as_dict(xRange.getChild('1'))["Text"].strip(), "--- 
Row ---")
+
self.assertEqual(get_state_as_dict(xRange.getChild('2'))["Text"].strip(), 
"$Sheet1.$H$7:$H$9 [X, Y, Z]")
+
+xRange.getChild('2').executeAction("SELECT", tuple())
+self.ui_test.execute_blocking_action(xDeleteBtn.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_confirmation_dlg)
+
+self.assertEqual(2, len(xRange.getChildren()))
+
self.assertEqual(get_state_as_dict(xRange.getChild('0'))["Text"].strip(), "--- 
Column ---")
+
self.assertEqual(get_state_as_dict(xRange.getChild('1'))["Text"].strip(), "--- 
Row ---")
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreo

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.StatusBar.js |   35 +++--
 loleaflet/src/map/Map.js   |7 -
 2 files changed, 30 insertions(+), 12 deletions(-)

New commits:
commit 8c70e6a8f6fb8a36ade74ab4c6b4e5044e09064d
Author: Tor Lillqvist 
AuthorDate: Wed Apr 15 13:30:45 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 15 14:05:58 2020 +0200

tdf#128507: Increase max zoom to 400%

Also add rounded-to-five labels for the already previously possible
two smallest zoom levels (35% and 40%).

Change-Id: I8c7293093e8fe70a4b50081a0a3ac4f96c8486ba
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92259
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/loleaflet/src/control/Control.StatusBar.js 
b/loleaflet/src/control/Control.StatusBar.js
index 544302d2d..bfe2866ae 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -266,6 +266,8 @@ L.Control.StatusBar = L.Control.extend({
selected: 'zoom100',
mobile: false,
items: [
+   { id: 'zoom35', text: 
'35', scale: 4},
+   { id: 'zoom40', text: 
'40', scale: 5},
{ id: 'zoom50', text: 
'50', scale: 6},
{ id: 'zoom60', text: 
'60', scale: 7},
{ id: 'zoom70', text: 
'70', scale: 8},
@@ -274,7 +276,11 @@ L.Control.StatusBar = L.Control.extend({
{ id: 'zoom120', text: 
'120', scale: 11},
{ id: 'zoom150', text: 
'150', scale: 12},
{ id: 'zoom175', text: 
'175', scale: 13},
-   { id: 'zoom200', text: 
'200', scale: 14}
+   { id: 'zoom200', text: 
'200', scale: 14},
+   { id: 'zoom235', text: 
'235', scale: 15},
+   { id: 'zoom280', text: 
'280', scale: 16},
+   { id: 'zoom335', text: 
'335', scale: 17},
+   { id: 'zoom400', text: 
'400', scale: 18},
]
},
{type: 'button',  id: 'zoomin', img: 
'zoomin', hint: _UNO('.uno:ZoomPlus')}
@@ -344,18 +350,25 @@ L.Control.StatusBar = L.Control.extend({
var zoomPercent = 100;
var zoomSelected = null;
switch (that.map.getZoom()) {
-   case 6:  zoomPercent =  50; zoomSelected = 'zoom50'; 
break;
-   case 7:  zoomPercent =  60; zoomSelected = 'zoom60'; 
break;
-   case 8:  zoomPercent =  70; zoomSelected = 'zoom70'; 
break;
-   case 9:  zoomPercent =  85; zoomSelected = 'zoom85'; 
break;
-   case 10: zoomPercent = 100; zoomSelected = 'zoom100'; 
break;
-   case 11: zoomPercent = 120; zoomSelected = 'zoom120'; 
break;
-   case 12: zoomPercent = 150; zoomSelected = 'zoom150'; 
break;
-   case 13: zoomPercent = 175; zoomSelected = 'zoom175'; 
break;
-   case 14: zoomPercent = 200; zoomSelected = 'zoom200'; 
break;
+   case 4:  zoomPercent =  35; zoomSelected = 'zoom35'; 
break;  // 0.3535
+   case 5:  zoomPercent =  40; zoomSelected = 'zoom40'; 
break;  // 0.4204
+   case 6:  zoomPercent =  50; zoomSelected = 'zoom50'; 
break;  // 0.5
+   case 7:  zoomPercent =  60; zoomSelected = 'zoom60'; 
break;  // 0.5946
+   case 8:  zoomPercent =  70; zoomSelected = 'zoom70'; 
break;  // 0.7071
+   case 9:  zoomPercent =  85; zoomSelected = 'zoom85'; 
break;  // 0.8409
+   case 10: zoomPercent = 100; zoomSelected = 'zoom100'; 
break; // 1
+   case 11: zoomPercent = 120; zoomSelected = 'zoom120'; 
break; // 1.1892
+   // Why do we call this 150% even if it is actually 
closer to 140%
+   case 12: zoomPercent = 150; zoomSelected = 'zoom150'; 
break; // 1.4142
+   case 13: zoomPercent = 170; zoomSelected = 'zoom170'; 
break; // 1.6818
+   case 14: zoomPercent = 200; zoomSelected = 'zoom200'; 
break; // 2
+ 

VENTILATORS REQUIREMENT IN BULK QUANTITY

[Brooklyn]

Dear  


We need ventilators in bulk quantity as we all aware about outbreak of COVID-19 in different countries, we as engineering trading company located in UAE and our associated offices are located in KSA, BAHRAIN, UAE & PAKISTAN. Following enquiry in our regions Pakistan, there are requirement in in bulk quantity, kindly arrange to provide your best competitive quote with product data sheet and approval certificate from approval bodies. 

Product description:

1)    ICU Ventilator Invasive.   SH 300. ( Eternity brand or equivalent).   30 units required 

2)    ICU ventilator invasive  VG- 70 (AEONMED or equivalent).20 pcs required. 
Also find attached files for Ventilator specification and technical sheet.
 

Terms & condition:

(a) FOB, EXW or CIF unit Price and Total Value.

(b) Estimated Air freight.

(c) Country of Origin.

(d) Minimum delivery period.

(e) Port of shipment.

(f) Gross weight of consignment.

(g) Validity of offer (at least 10 days from due date).

(h) Payment will be made through irrevocable Letter of Credit OR according to choice of manufacturer.

(i)  Provide HS-Code of quoted products.

   &n
bsp;  

Your immediate response will be highly appreciated!!
 

Loredana ReCustomer Service Development Manager



Office # M,07  Karachi Darbar Restaurant Building20Hor Al Anz Deira DubaiP.O BOX 85156 Deiar DubaiTel: +971 02 6605 8033

it.rs-online.com

RS Components GmbH

Firmensitz: Mainzer Landstraße 180, 60327 Frankfurt am Main

Registergericht: Amtsgericht Darmstadt, HRB 53277

Geschäftsführer: David Egan, Jürgen Hebebrand, Jürgen Lampert,Gerrit Lucas, Holger Schmitt

 

VENTILATOR VG- 70 TECH. SHEET.XLSX
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin (via logerrit)]

 editeng/source/editeng/editdoc.cxx |5 -
 editeng/source/editeng/eehtml.cxx  |5 -
 editeng/source/items/numitem.cxx   |   19 ++-
 editeng/source/misc/svxacorr.cxx   |   30 --
 editeng/source/rtf/svxrtf.cxx  |5 -
 extensions/source/scanner/sane.cxx |   12 
 6 files changed, 50 insertions(+), 26 deletions(-)

New commits:
commit 52528a42892dbe7da7aad3bcf52971e02ec55999
Author: Noel Grandin 
AuthorDate: Wed Apr 15 09:02:32 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 15 14:01:15 2020 +0200

loplugin:buriedassign in e*

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

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 6fa39bbddaf4..ebc55808da25 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -665,7 +665,10 @@ sal_Int32 FastGetPos(const Array& rArray, const Val* p, 
sal_Int32& rLastPos)
 // The world's lamest linear search from svarray...
 for (sal_Int32 nIdx = 0; nIdx < nArrayLen; ++nIdx)
 if (rArray.at(nIdx).get() == p)
-return rLastPos = nIdx;
+{
+rLastPos = nIdx;
+return rLastPos;
+}
 
 // XXX "not found" condition for sal_Int32 indexes
 return EE_PARA_NOT_FOUND;
diff --git a/editeng/source/editeng/eehtml.cxx 
b/editeng/source/editeng/eehtml.cxx
index ff84bfe4a260..ce5721787ef3 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -669,8 +669,11 @@ void EditHTMLParser::SkipGroup( HtmlTokenId nEndToken )
 // for example:lacks a closing 
 sal_uInt8 nCellLevel = nInCell;
 HtmlTokenId nToken;
-while( nCellLevel <= nInCell && ( (nToken = GetNextToken() ) != nEndToken 
) && nToken != HtmlTokenId::NONE )
+while( nCellLevel <= nInCell )
 {
+nToken = GetNextToken();
+if (nToken == nEndToken || nToken == HtmlTokenId::NONE)
+break;
 switch ( nToken )
 {
 case HtmlTokenId::TABLEHEADER_ON:
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index ca26e800f9f0..7f76e830ff25 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -894,16 +894,17 @@ void SvxNumRule::UnLinkGraphics()
 const SvxBrushItem* pBrush = aFmt.GetBrush();
 if(SVX_NUM_BITMAP == aFmt.GetNumberingType())
 {
-const Graphic* pGraphic = nullptr;
-if(pBrush &&
-!pBrush->GetGraphicLink().isEmpty() &&
-nullptr != (pGraphic = pBrush->GetGraphic()))
+if(pBrush && !pBrush->GetGraphicLink().isEmpty())
 {
-SvxBrushItem aTempItem(*pBrush);
-aTempItem.SetGraphicLink("");
-aTempItem.SetGraphic(*pGraphic);
-sal_Int16eOrient = aFmt.GetVertOrient();
-aFmt.SetGraphicBrush( &aTempItem, &aFmt.GetGraphicSize(), 
&eOrient );
+const Graphic* pGraphic = pBrush->GetGraphic();
+if (pGraphic)
+{
+SvxBrushItem aTempItem(*pBrush);
+aTempItem.SetGraphicLink("");
+aTempItem.SetGraphic(*pGraphic);
+sal_Int16eOrient = aFmt.GetVertOrient();
+aFmt.SetGraphicBrush( &aTempItem, &aFmt.GetGraphicSize(), 
&eOrient );
+}
 }
 }
 else if((SVX_NUM_BITMAP|LINK_TOKEN) == 
static_cast(aFmt.GetNumberingType()))
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 4ea7eb901a97..4fcdb4d37b8d 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -661,8 +661,12 @@ bool SvxAutoCorrect::FnAddNonBrkSpace(
 // Get the last word delimiter position
 sal_Int32 nSttWdPos = nEndPos;
 bool bWasWordDelim = false;
-while( nSttWdPos && !(bWasWordDelim = IsWordDelim( rTxt[ 
--nSttWdPos ])))
-;
+while( nSttWdPos )
+{
+bWasWordDelim = IsWordDelim( rTxt[ --nSttWdPos ]);
+if (bWasWordDelim)
+break;
+}
 
 //See if the text is the start of a protocol string, e.g. have 
text of
 //"http" see if it is the start of "http:" and if so leave it alone
@@ -898,8 +902,12 @@ void SvxAutoCorrect::FnCapitalStartSentence( 
SvxAutoCorrDoc& rDoc,
 {
 if (NonFieldWordDelim(*pStr))
 {
-while (!(bAtStart = (pStart == pStr--)) && 
NonFieldWordDelim(*pStr))
-;
+for (;;)
+{
+bAtStart = (pStart == pStr--);
+if (bAtStart || !NonFieldWordDelim(*pStr))
+   

Re: uicheck

[Miklos Vajna]

Hi Stephan,

On Wed, Apr 15, 2020 at 11:24:03AM +0200, Stephan Bergmann 
 wrote:
> *** It appears to be unreliable when run with a build parallelism > 1. So if
> you configure --without-parallelism, pass -j1 or no -j at all to `make
> uicheck`.  I have no idea what you need to do if you use the implicit,
> unhelpful --with-parallelism, though.

make uicheck PARALLELISM=1

should do the trick, I think.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/tiledrendering/data/fieldmark.docx |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx  |8 
 sw/source/core/crsr/viscrs.cxx  |2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit ae3342857350c805f536c1af2f560a117be12da8
Author: Miklos Vajna 
AuthorDate: Wed Apr 15 12:27:55 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 15 13:27:05 2020 +0200

sw: avoid calling SwView::GetWrtShell() unconditionally from the SwView ctor

Regression from commit dfcfdf47b5da6a11b2c3118a0f63cc48c10c2cd7 (lok:
get spelling context menu on long press, 2019-10-20), the problem was
that GetWrtShell() returns a reference, and the underlying pointer can
be nullptr till the SwView ctor is in progress.

Fix the problem by not caring about spelling till the initial view is
ready, that still provides the cursor position.

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

diff --git a/sw/qa/extras/tiledrendering/data/fieldmark.docx 
b/sw/qa/extras/tiledrendering/data/fieldmark.docx
new file mode 100644
index ..02748bb7e182
Binary files /dev/null and b/sw/qa/extras/tiledrendering/data/fieldmark.docx 
differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index ab92e84b672c..441c06271d52 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -126,6 +126,7 @@ public:
 void testLanguageStatus();
 void testRedlineNotificationDuringSave();
 void testHyperlink();
+void testFieldmark();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -190,6 +191,7 @@ public:
 CPPUNIT_TEST(testLanguageStatus);
 CPPUNIT_TEST(testRedlineNotificationDuringSave);
 CPPUNIT_TEST(testHyperlink);
+CPPUNIT_TEST(testFieldmark);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2502,6 +2504,12 @@ void SwTiledRenderingTest::testHyperlink()
 CPPUNIT_ASSERT_EQUAL(OString("http://example.com/";), m_sHyperlinkLink);
 }
 
+void SwTiledRenderingTest::testFieldmark()
+{
+// Without the accompanying fix in place, this crashed on load.
+createDoc("fieldmark.docx");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index bf764a12db94..d51471057b4e 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -230,7 +230,7 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell const * 
pViewShell)
 
 // is cursor at a misspelled word ?
 bool bIsWrong = false;
-if (pView)
+if (pView && pView->GetWrtShellPtr())
 {
 const SwViewOption* pVOpt = pView->GetWrtShell().GetViewOptions();
 if(pVOpt && pVOpt->IsOnlineSpell())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sfx2/source/appl/getbasctlfunction.cxx |2 ++
 sfx2/source/appl/getbasctlfunction.hxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 98f8e3a94a1b0346311dbd5eb1d0d6206eaa13e7
Author: Caolán McNamara 
AuthorDate: Wed Apr 15 11:10:26 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 15 13:20:16 2020 +0200

ofz#21701 fix DISABLE_DYNLOADING case

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

diff --git a/sfx2/source/appl/getbasctlfunction.cxx 
b/sfx2/source/appl/getbasctlfunction.cxx
index 4f272919174a..fd7f4873017e 100644
--- a/sfx2/source/appl/getbasctlfunction.cxx
+++ b/sfx2/source/appl/getbasctlfunction.cxx
@@ -30,6 +30,7 @@
 #include "getbasctlfunction.hxx"
 
 #if HAVE_FEATURE_SCRIPTING
+#ifndef DISABLE_DYNLOADING
 
 extern "C" { static void thisModule() {} }
 
@@ -57,6 +58,7 @@ oslGenericFunction sfx2::getBasctlFunction(char const* name)
 return pSymbol;
 }
 
+#endif
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sfx2/source/appl/getbasctlfunction.hxx 
b/sfx2/source/appl/getbasctlfunction.hxx
index 98f9db47a929..5fa4bc557094 100644
--- a/sfx2/source/appl/getbasctlfunction.hxx
+++ b/sfx2/source/appl/getbasctlfunction.hxx
@@ -24,6 +24,7 @@
 
 #include 
 
+#ifndef DISABLE_DYNLOADING
 #if HAVE_FEATURE_SCRIPTING
 
 namespace sfx2
@@ -31,6 +32,7 @@ namespace sfx2
 oslGenericFunction getBasctlFunction(char const* name);
 }
 
+#endif
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - common/FileUtil.cpp loleaflet/admin

[Michael Meeks (via logerrit)]

 common/FileUtil.cpp |3 ++-
 loleaflet/admin/src/Util.js |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 70201b743016fa73d02d793edae6b8974d05cc6f
Author: Michael Meeks 
AuthorDate: Tue Apr 14 22:09:54 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 15 12:31:27 2020 +0200

Log exception on recursive file removal failure.

Change-Id: Ie810f23af48877bbfe9dff7da8eee709186e108e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92231
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp
index 701ab28ec..8f98a76b8 100644
--- a/common/FileUtil.cpp
+++ b/common/FileUtil.cpp
@@ -281,9 +281,10 @@ namespace FileUtil
 nftw(path.c_str(), nftw_cb, 128, FTW_DEPTH | FTW_PHYS);
 }
 }
-catch (const std::exception&)
+catch (const std::exception&e)
 {
 // Already removed or we don't care about failures.
+LOG_DBG("Exception removing " << path << " " << recursive << " : " 
<< e.what());
 }
 #endif
 }
commit 26632c2cf4839e193b3309096e319763f762a463
Author: Michael Meeks 
AuthorDate: Tue Apr 14 22:09:14 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 15 12:31:16 2020 +0200

admin: don't allow excessive precision in humanized strings.

Change-Id: Ia5e4af2618c174c5eff3696bf36c8b4fbe0a94c2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92230
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/admin/src/Util.js b/loleaflet/admin/src/Util.js
index 6671ed458..9d8e2b179 100644
--- a/loleaflet/admin/src/Util.js
+++ b/loleaflet/admin/src/Util.js
@@ -16,7 +16,7 @@ var Util = Base.extend({
kbytes /= unit;
}
 
-   return kbytes + ' ' + units[i];
+   return kbytes.toFixed(1) + ' ' + units[i];
},
 
humanizeSecs: function(secs) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/app android/lib loleaflet/po

[Weblate (via logerrit)]

 android/app/src/main/res/values-en-rGB/strings.xml |2 
 android/app/src/main/res/values-it/strings.xml |2 
 android/app/src/main/res/values-kab/strings.xml|  105 +++
 android/app/src/main/res/values-nb-rNO/strings.xml |   23 +
 android/app/src/main/res/values-pl/strings.xml |2 
 android/lib/src/main/res/values-kab/strings.xml|   15 +
 android/lib/src/main/res/values-nb-rNO/strings.xml |5 
 loleaflet/po/help-ca.po|   26 -
 loleaflet/po/help-kab.po   |  290 +
 loleaflet/po/help-nb.po|   39 +-
 loleaflet/po/help-sl.po|   36 +-
 loleaflet/po/help-uk.po|   10 
 loleaflet/po/ios-en_GB.po  |   15 -
 loleaflet/po/ios-it.po |   15 -
 loleaflet/po/ios-kab.po|   19 -
 loleaflet/po/ios-pt.po |   11 
 loleaflet/po/ios-sl.po |   10 
 loleaflet/po/ui-ast.po |   14 -
 loleaflet/po/ui-en_GB.po   |8 
 loleaflet/po/ui-es.po  |4 
 loleaflet/po/ui-it.po  |8 
 loleaflet/po/ui-kab.po |  187 ++---
 loleaflet/po/ui-nb.po  |  166 +---
 loleaflet/po/ui-pt.po  |8 
 loleaflet/po/ui-sl.po  |8 
 loleaflet/po/ui-ug.po  |   29 +-
 26 files changed, 582 insertions(+), 475 deletions(-)

New commits:
commit ef25b5abc9aae813a449e0df88d8868b6af66fca
Author: Weblate 
AuthorDate: Tue Apr 14 20:36:43 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 15 11:45:08 2020 +0200

update translations

LibreOffice Online/loleaflet-help (Catalan)
Currently translated at 83.7% (348 of 416 strings)

Change-Id: I3ad0b027f015027cabc7d498f37d384ddd19350e

update translations

LibreOffice Online/loleaflet-help (Ukrainian)
Currently translated at 61.5% (256 of 416 strings)

Change-Id: I6f4aa96b26b6af6ff02eff00a40fe3a8133c45be

update translations

LibreOffice Online/ios (Portuguese)
Currently translated at 60.0% (3 of 5 strings)

Change-Id: I2b844c4b059e3dd728df5912650e60f65f7053be

update translations

LibreOffice Online/loleaflet-ui (Uyghur)
Currently translated at 33.6% (98 of 292 strings)

Change-Id: I46dc25d98d561f6709b237f0a84b3f1e1da68e08

update translations

LibreOffice Online/loleaflet-ui (Portuguese)
Currently translated at 100.0% (292 of 292 strings)

Change-Id: I851ff8f304149b96b6ed48244f1030a5175359ac

update translations

LibreOffice Online/ios (Slovenian)
Currently translated at 100.0% (5 of 5 strings)

Change-Id: I849d9be6f25338a466effef314e42bf37d147027

update translations

LibreOffice Online/loleaflet-help (Slovenian)
Currently translated at 100.0% (416 of 416 strings)

Change-Id: I4b1c0b76463911999063976975d4892f0210197e

update translations

LibreOffice Online/loleaflet-help (Kabyle)
Currently translated at 34.4% (143 of 416 strings)

Change-Id: I1d5925357b4cea2e8e9722fa6998c3d3c380a843

update translations

LibreOffice Online/loleaflet-ui (Slovenian)
Currently translated at 100.0% (292 of 292 strings)

Change-Id: I91b8a732bd2d0a2a7d212f6c0a47a21031eb44a5

update translations

LibreOffice Online/loleaflet-help (Kabyle)
Currently translated at 32.7% (136 of 416 strings)

Change-Id: Ib992b2f62569331988f33391f31dca9cf8905f0c

update translations

LibreOffice Online/loleaflet-help (Kabyle)
Currently translated at 13.9% (58 of 416 strings)

Change-Id: I744b65c54cf12a90a9e57054c38d0d89ced4a6df

update translations

LibreOffice Online/android-app (Italian)
Currently translated at 100.0% (102 of 102 strings)

Change-Id: I4c1469053eb748b6bc8a4e670596558c879a5d28

update translations

LibreOffice Online/android-app (Polish)
Currently translated at 100.0% (102 of 102 strings)

Change-Id: I870403d3085537585989f10d472b412727b87308

update translations

LibreOffice Online/ios (Italian)
Currently translated at 100.0% (5 of 5 strings)

Change-Id: I0bf80f893ec4c040d655e18779c82c5736dcfc8b

update translations

LibreOffice Online/loleaflet-ui (Italian)
Currently translated at 100.0% (292 of 292 strings)

Change-Id: Ic091131c12bffe52d6a69e50ead294e8b9f63b70

update translations

LibreOffice Online/loleaflet-help (Catalan)
Currently translated at 82.9% (345 of 416 strings)

Change-Id: I6663593ad7a6e4b2a7552d9e71a9

[Libreoffice-commits] core.git: solenv/bin

[Jussi Pakkanen (via logerrit)]

 solenv/bin/desktop-translate.py |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f516f6753d87d963c06953c60e6ad56112c191be
Author: Jussi Pakkanen 
AuthorDate: Fri Apr 10 20:37:22 2020 +0300
Commit: Samuel Mehrbrodt 
CommitDate: Wed Apr 15 11:44:35 2020 +0200

Handle desktop files with multiline entries.

This fixes a regression mentioned e.g. here:

https://bugs.documentfoundation.org/show_bug.cgi?id=130911#c6

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

diff --git a/solenv/bin/desktop-translate.py b/solenv/bin/desktop-translate.py
index 3ae49ae576ee..6d5c074de7b0 100644
--- a/solenv/bin/desktop-translate.py
+++ b/solenv/bin/desktop-translate.py
@@ -74,13 +74,15 @@ for line in source:
 
 if locale != line:
 # replace en-US with en
-locale.replace('en-US', 'en')
+locale = locale.replace('en-US', 'en')
 
 # use just anything inside the ""
-value = value.strip()
 assert(value[0] == '"')
-assert(value[-1] == '"')
-value = value[1:-1]
+# Some entries span multiple lines.
+# An entry will always end on a double quote.
+while not value.endswith('"\n'):
+value += source.readline()
+value = value[1:-2]
 
 # replace resource placeholder
 value = value.replace('%PRODUCTNAME', o.productname)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer (via logerrit)]

 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3d407fff18e6c612fe4f63559a600ddcce7c3e94
Author: Mert Tumer 
AuthorDate: Tue Apr 14 18:15:59 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Apr 15 11:44:03 2020 +0200

Added unique id for number format combobox

This will allow us to control it for the mobilewizard
easily rather than using the id of 'category' which is
not unique.

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

diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx 
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 28eb0ab05ffc..ec4da5d0823f 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -91,6 +91,7 @@ void NumberFormatPropertyPanel::Initialize()
 mpLbCategory->SetSelectHdl ( LINK(this, NumberFormatPropertyPanel, 
NumFormatSelectHdl) );
 mpLbCategory->SelectEntryPos(0);
 mpLbCategory->SetDropDownLineCount(mpLbCategory->GetEntryCount());
+mpLbCategory->set_id("numberformatcombobox");
 
 Link aLink = LINK(this, NumberFormatPropertyPanel, 
NumFormatValueHdl);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 2f6cbb67099edde535a81e7b0a32c1418805d6d6
Author: Mert Tumer 
AuthorDate: Tue Apr 14 18:19:09 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Apr 15 11:44:20 2020 +0200

send state changes of .uno:NumberFormatDecimal command to LOK

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 612b6a51ceac..146f65889a1a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2648,6 +2648,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:ToggleMergeCells"),
 OUString(".uno:NumberFormatCurrency"),
 OUString(".uno:NumberFormatPercent"),
+OUString(".uno:NumberFormatDecimal"),
 OUString(".uno:NumberFormatDate"),
 OUString(".uno:FrameLineColor"),
 OUString(".uno:SortAscending"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 3f84d441562a..cedf079234ff 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1152,6 +1152,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "WrapText" ||
  aEvent.FeatureURL.Path == "NumberFormatCurrency" ||
  aEvent.FeatureURL.Path == "NumberFormatPercent" ||
+ aEvent.FeatureURL.Path == "NumberFormatDecimal" ||
  aEvent.FeatureURL.Path == "NumberFormatDate")
 {
 bool aBool;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/Makefile.am|1 
 loleaflet/src/control/Control.JSDialogBuilder.js |4 
 loleaflet/src/control/Control.MobileTopBar.js|  216 +++
 loleaflet/src/control/Control.StatusBar.js   |   21 --
 loleaflet/src/control/Control.Toolbar.js |   44 
 loleaflet/src/layer/tile/CalcTileLayer.js|   39 
 loleaflet/src/layer/tile/ImpressTileLayer.js |   39 
 loleaflet/src/layer/tile/WriterTileLayer.js  |   41 
 8 files changed, 227 insertions(+), 178 deletions(-)

New commits:
commit 651a7bba1c6ce68bfbd54f7cc8c9622b4d036af0
Author: Szymon Kłos 
AuthorDate: Fri Apr 10 17:36:40 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 11:43:09 2020 +0200

Move mobile top bar to separate file

Change-Id: I26fc5be1b73b4ff68be00c21a6691c7712d08c1e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92158
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index cef67ce69..303e53d6b 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -264,6 +264,7 @@ LOLEAFLET_JS =\
src/control/Control.Scale.js \
src/control/Control.StatusBar.js \
src/control/Control.SearchBar.js \
+   src/control/Control.MobileTopBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 8727e065c..7ff08ce86 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -4,7 +4,7 @@
  * from the JSON description provided by the server.
  */
 
-/* global $ _ _UNO */
+/* global $ w2ui _ _UNO */
 
 L.Control.JSDialogBuilder = L.Control.extend({
 
@@ -1570,7 +1570,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (builder.wizard) {
$(menuEntry).click(function() {
if (window.insertionMobileWizard)
-   window.onClick(null, 
'insertion_mobile_wizard');
+   
w2ui['actionbar'].click('insertion_mobile_wizard');
else if (window.mobileMenuWizard)
$('#main-menu-state').click();
else if (window.contextMenuWizard) {
diff --git a/loleaflet/src/control/Control.MobileTopBar.js 
b/loleaflet/src/control/Control.MobileTopBar.js
new file mode 100644
index 0..2d4a917f3
--- /dev/null
+++ b/loleaflet/src/control/Control.MobileTopBar.js
@@ -0,0 +1,216 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.SearchBar
+ */
+
+/* global $ w2ui _ _UNO */
+L.Control.MobileTopBar = L.Control.extend({
+
+   options: {
+   doctype: 'text'
+   },
+
+   initialize: function (docType) {
+   L.setOptions(this, {docType: docType});
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+
+   map.on('updatepermission', this.onUpdatePermission, this);
+   },
+
+   getToolItems: function(docType) {
+   if (docType == 'text') {
+   return [
+   {type: 'button',  id: 'closemobile',  img: 
'closemobile'},
+   {type: 'spacer'},
+   {type: 'button',  id: 'undo',  img: 'undo', 
hint: _UNO('.uno:Undo'), uno: 'Undo', disabled: true},
+   {type: 'button',  id: 'redo',  img: 'redo', 
hint: _UNO('.uno:Redo'), uno: 'Redo', disabled: true},
+   {type: 'button',  id: 'mobile_wizard', img: 
'mobile_wizard', disabled: true},
+   {type: 'button',  id: 
'insertion_mobile_wizard', img: 'insertion_mobile_wizard', disabled: true},
+   {type: 'button',  id: 'insertcomment', img: 
'insertcomment', disabled: true},
+   {type: 'button',  id: 'fullscreen', img: 
'fullscreen', hint: _UNO('.uno:FullScreen', 'text')},
+   {type: 'drop', id: 'userlist', img: 'users', 
html: '' +
+   '' +
+   '' +
+   '' +
+   '' + _('Always follow the editor') 
+ '' +
+   '' +
+   '' +
+   '' + _('Current') 
+ ' - ' +
+   ''
+   },
+   ];
+   } else if (docType == 'spreadsheet') {
+   return [
+   {type: 'button',  id: 'closemobile',  img: 
'

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/mobilewizard.css|4 
 loleaflet/images/lc_denominatorplaces.svg |   14 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 17a301a1c037e1c91c451a8e0af1912887a6a7bb
Author: Pedro Pinto Silva 
AuthorDate: Wed Apr 15 10:26:19 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 15 11:32:20 2020 +0200

Mobile: Calc: remove display rule for denominator places and add 
corresponding asset

Change-Id: I278c4ae9ca474cfaa622b22553888aaa26d86da6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92245
Tested-by: Jenkins CollaboraOffice 
Tested-by: Pedro Pinto da Silva 
Reviewed-by: Pedro Pinto da Silva 
(cherry picked from commit 4e78ccb523d529a72412f153cdf79c8faee35bc6)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92179
Reviewed-by: Andras Timar 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 3c3c8ec6b..70fc8ba97 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -39,10 +39,6 @@ span#main-menu-btn-icon {
filter: none !important;
 }
 
-#denominatorplaces .spinfieldimage{
-   display: none;
-}
-
 .ui-header.level-1.mobile-wizard.ui-widget 
img[src='images/lc_downloadas-pdf.svg']{
visibility: visible;
 }
diff --git a/loleaflet/images/lc_denominatorplaces.svg 
b/loleaflet/images/lc_denominatorplaces.svg
index 6df498a3c..bf056224b 100644
--- a/loleaflet/images/lc_denominatorplaces.svg
+++ b/loleaflet/images/lc_denominatorplaces.svg
@@ -1 +1,13 @@
-http://www.w3.org/2000/svg"; 
width="1" height="1"/>
+http://www.w3.org/2000/svg"; 
xmlns:cc="http://creativecommons.org/ns#"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+ 
+  
+   
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"/>
+
+   
+  
+ 
+ 
+ 
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sifr/cmd/32/ko/bold.png  |binary
 icon-themes/sifr/cmd/32/ko/charfontname.png  |binary
 icon-themes/sifr/cmd/32/ko/color.png |binary
 icon-themes/sifr/cmd/32/ko/fontdialog.png|binary
 icon-themes/sifr/cmd/32/ko/insertfixedtext.png   |binary
 icon-themes/sifr/cmd/32/ko/italic.png|binary
 icon-themes/sifr/cmd/32/ko/outlinefont.png   |binary
 icon-themes/sifr/cmd/32/ko/overline.png  |binary
 icon-themes/sifr/cmd/32/ko/scaletext.png |binary
 icon-themes/sifr/cmd/32/ko/shadowed.png  |binary
 icon-themes/sifr/cmd/32/ko/strikeout.png |binary
 icon-themes/sifr/cmd/32/ko/textdirectionlefttoright.png  |binary
 icon-themes/sifr/cmd/32/ko/textdirectiontoptobottom.png  |binary
 icon-themes/sifr/cmd/32/ko/underline.png |binary
 icon-themes/sifr/cmd/32/ko/underlinedouble.png   |binary
 icon-themes/sifr/cmd/ko/lc_bold.png  |binary
 icon-themes/sifr/cmd/ko/lc_charfontname.png  |binary
 icon-themes/sifr/cmd/ko/lc_color.png |binary
 icon-themes/sifr/cmd/ko/lc_fontdialog.png|binary
 icon-themes/sifr/cmd/ko/lc_insertfixedtext.png   |binary
 icon-themes/sifr/cmd/ko/lc_italic.png|binary
 icon-themes/sifr/cmd/ko/lc_outlinefont.png   |binary
 icon-themes/sifr/cmd/ko/lc_overline.png  |binary
 icon-themes/sifr/cmd/ko/lc_scaletext.png |binary
 icon-themes/sifr/cmd/ko/lc_shadowed.png  |binary
 icon-themes/sifr/cmd/ko/lc_strikeout.png |binary
 icon-themes/sifr/cmd/ko/lc_textdirectionlefttoright.png  |binary
 icon-themes/sifr/cmd/ko/lc_textdirectiontoptobottom.png  |binary
 icon-themes/sifr/cmd/ko/lc_underline.png |binary
 icon-themes/sifr/cmd/ko/lc_underlinedouble.png   |binary
 icon-themes/sifr/cmd/ko/sc_bold.png  |binary
 icon-themes/sifr/cmd/ko/sc_charfontname.png  |binary
 icon-themes/sifr/cmd/ko/sc_color.png |binary
 icon-themes/sifr/cmd/ko/sc_fontdialog.png|binary
 icon-themes/sifr/cmd/ko/sc_insertfixedtext.png   |binary
 icon-themes/sifr/cmd/ko/sc_italic.png|binary
 icon-themes/sifr/cmd/ko/sc_outlinefont.png   |binary
 icon-themes/sifr/cmd/ko/sc_overline.png  |binary
 icon-themes/sifr/cmd/ko/sc_scaletext.png |binary
 icon-themes/sifr/cmd/ko/sc_shadowed.png  |binary
 icon-themes/sifr/cmd/ko/sc_strikeout.png |binary
 icon-themes/sifr/cmd/ko/sc_textdirectionlefttoright.png  |binary
 icon-themes/sifr/cmd/ko/sc_textdirectiontoptobottom.png  |binary
 icon-themes/sifr/cmd/ko/sc_underline.png |binary
 icon-themes/sifr/cmd/ko/sc_underlinedouble.png   |binary
 icon-themes/sifr_dark/cmd/32/ko/bold.png |binary
 icon-themes/sifr_dark/cmd/32/ko/charfontname.png |binary
 icon-themes/sifr_dark/cmd/32/ko/color.png|binary
 icon-themes/sifr_dark/cmd/32/ko/fontdialog.png   |binary
 icon-themes/sifr_dark/cmd/32/ko/insertfixedtext.png  |binary
 icon-themes/sifr_dark/cmd/32/ko/italic.png   |binary
 icon-themes/sifr_dark/cmd/32/ko/outlinefont.png  |binary
 icon-themes/sifr_dark/cmd/32/ko/overline.png |binary
 icon-themes/sifr_dark/cmd/32/ko/scaletext.png|binary
 icon-themes/sifr_dark/cmd/32/ko/shadowed.png |binary
 icon-themes/sifr_dark/cmd/32/ko/strikeout.png|binary
 icon-themes/sifr_dark/cmd/32/ko/textdirectionlefttoright.png |binary
 icon-themes/sifr_dark/cmd/32/ko/textdirectiontoptobottom.png |binary
 icon-themes/sifr_dark/cmd/32/ko/underline.png|binary
 icon-themes/sifr_dark/cmd/32/ko/underlinedouble.png  |binary
 icon-themes/sifr_dark/cmd/ko/lc_bold.png |binary
 icon-themes/sifr_dark/cmd/ko/lc_charfontname.png |binary
 icon-themes/sifr_dark/cmd/ko/lc_color.png|binary
 icon-themes/sifr_dark/cmd/ko/lc_fontdialog.png   |binary
 icon-themes/sifr_dark/cmd/ko/lc_insertfixedtext.png  |binary
 icon-themes/sifr_dark/cmd/ko/lc_italic.png   |binary
 icon-themes/sifr_dark/cmd/ko/lc_outlinefont.png  |binary
 icon-themes/sifr_dark/cmd/ko/lc_overline

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

[Michael Stahl (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |5 +--
 sw/source/filter/ww8/docxattributeoutput.cxx  |9 +
 sw/source/filter/ww8/docxexport.cxx   |   34 --
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 ++
 writerfilter/source/dmapper/SettingsTable.cxx |9 +
 writerfilter/source/dmapper/SettingsTable.hxx |1 
 6 files changed, 51 insertions(+), 11 deletions(-)

New commits:
commit 3cd3ae30217a80449799d7d9426c3756c572712e
Author: Michael Stahl 
AuthorDate: Tue Apr 14 18:10:53 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 15 11:29:25 2020 +0200

writerfilter: DOCX import: import w:noLeading as AddExternalLeading

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1e7f8a99e663..010cb3e3fe21 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6654,6 +6654,10 @@ void DomainMapper_Impl::ApplySettingsTable()
 if( m_pSettingsTable->GetEmbedSystemFonts())
 xSettings->setPropertyValue( getPropertyName( 
PROP_EMBED_SYSTEM_FONTS ), uno::makeAny(true) );
 xSettings->setPropertyValue("AddParaTableSpacing", 
uno::makeAny(m_pSettingsTable->GetDoNotUseHTMLParagraphAutoSpacing()));
+if (m_pSettingsTable->GetNoLeading())
+{
+xSettings->setPropertyValue("AddExternalLeading", 
uno::makeAny(!m_pSettingsTable->GetNoLeading()));
+}
 if( m_pSettingsTable->GetProtectForm() )
 xSettings->setPropertyValue("ProtectForm", uno::makeAny( true 
));
 if( m_pSettingsTable->GetReadOnly() )
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx 
b/writerfilter/source/dmapper/SettingsTable.cxx
index 303de47c8f71..81fadad6ac40 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -263,6 +263,7 @@ struct SettingsTable_Impl
 OUStringm_sRedlineProtectionKey;
 boolm_bReadOnly;
 boolm_bDisplayBackgroundShape;
+boolm_bNoLeading = false;
 
 uno::Sequence m_pThemeFontLangProps;
 
@@ -575,6 +576,9 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
 case NS_ooxml::LN_CT_Settings_displayBackgroundShape:
 m_pImpl->m_bDisplayBackgroundShape = nIntValue;
 break;
+case NS_ooxml::LN_CT_Compat_noLeading:
+m_pImpl->m_bNoLeading = nIntValue != 0;
+break;
 default:
 {
 #ifdef DBG_UTIL
@@ -851,6 +855,11 @@ bool SettingsTable::GetLongerSpaceSequence() const
 return m_pImpl->m_bLongerSpaceSequence;
 }
 
+bool SettingsTable::GetNoLeading() const
+{
+return m_pImpl->m_bNoLeading;
+}
+
 }//namespace dmapper
 } //namespace writerfilter
 
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx 
b/writerfilter/source/dmapper/SettingsTable.hxx
index e8cbe8abaf6e..e058420c27db 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -77,6 +77,7 @@ class SettingsTable : public LoggedProperties, public 
LoggedTable
 bool GetProtectForm() const;
 bool GetReadOnly() const;
 bool GetLongerSpaceSequence() const;
+bool GetNoLeading() const;
 bool GetNoHyphenateCaps() const;
 sal_Int16 GetHypenationZone() const;
 
commit 968a7e3247169489d29cc7de0079eea12a663870
Author: Michael Stahl 
AuthorDate: Tue Apr 14 17:42:06 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 15 11:29:15 2020 +0200

sw: DOCX export: export AddExternalLeading as w:noLeading

For 11pt Arial, can fit 59 paragraphs on a page vs. 57...

This is annoyingly complicated by the fact that Word 2013 ignores
w:noLeading element if compatibilityMode is 15.

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 95fcebbf9c42..ee4b35698533 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1119,10 +1119,11 @@ DECLARE_OOXMLEXPORT_TEST(tdf106843, "tdf106843.fodt")
 assertXPath(pXmlSettings, "/w:settings/w:documentProtection", "edit",  
 "trackedChanges");
 assertXPath(pXmlSettings, "/w:settings/w:documentProtection", 
"enforcement","1");
 
-// LO intends to export a .docx format that is natively compatible 
with 2013.
+// LO intends to export a .docx format that is natively compatible 
with 2013
+// but this document has an implicitly a

Need Help: Libre Office crashes on opening a JFXPanel

[Harish Kumar]

Hi Team,

I'm having trouble working with JavaFX inside Libre Office. When i launch a
JavaFX Panel from button click of my Libre Office extension the whole Libre
Office crashes.
If i launch LibreOffice from terminal , i see the following message.
Please advise.

[image: image.png]

-- 
Best Regards,
Harish Kumar.B
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/dialog/watermarkdialog.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 903070a573b87714458c3cb3d18635f5eda6aa15
Author: Caolán McNamara 
AuthorDate: Tue Apr 14 15:51:07 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 15 11:27:10 2020 +0200

explicitly set the correct index if the font is in the list

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

diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx 
b/sw/source/uibase/dialog/watermarkdialog.cxx
index 26589813ec18..d558d0c6de8f 100644
--- a/sw/source/uibase/dialog/watermarkdialog.cxx
+++ b/sw/source/uibase/dialog/watermarkdialog.cxx
@@ -74,7 +74,12 @@ void SwWatermarkDialog::InitFields()
 const SfxWatermarkItem* pWatermark = static_cast( pItem );
 const OUString& sText = pWatermark->GetText();
 m_xTextInput->set_text(sText);
-m_xFont->set_entry_text(pWatermark->GetFont());
+OUString sFontName = pWatermark->GetFont();
+int nFontIndex = m_xFont->find_text(sFontName);
+if (nFontIndex != -1)
+m_xFont->set_active(nFontIndex);
+else
+m_xFont->set_entry_text(sFontName);
 m_xAngle->set_value(pWatermark->GetAngle(), FieldUnit::DEGREE);
 m_xColor->SelectEntry( pWatermark->GetColor() );
 m_xTransparency->set_value(pWatermark->GetTransparency(), 
FieldUnit::PERCENT);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 reportdesign/source/core/api/ReportDefinition.cxx  |7 ---
 reportdesign/source/ui/misc/UITools.cxx|   12 
 reportdesign/source/ui/report/ReportController.cxx |   12 
 reportdesign/source/ui/report/dlgedfunc.cxx|6 --
 4 files changed, 24 insertions(+), 13 deletions(-)

New commits:
commit cf3cd2d064fe83190eef997e3069d1c35afca0b1
Author: Noel Grandin 
AuthorDate: Wed Apr 15 09:13:14 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 15 11:24:38 2020 +0200

loplugin:buriedassign in reportdesign

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

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 900fbd88c18d..fe91c466c337 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1173,10 +1173,11 @@ void SAL_CALL OReportDefinition::connectController( 
const uno::Reference< frame:
 ::osl::MutexGuard aGuard(m_aMutex);
 ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
 m_pImpl->m_aControllers.push_back(_xController);
-sal_Int32 nCount;
-if ( _xController.is() && m_pImpl->m_xViewData.is() && ( nCount = 
m_pImpl->m_xViewData->getCount()) != 0)
+if ( _xController.is() && m_pImpl->m_xViewData.is() )
 {
-_xController->restoreViewData(m_pImpl->m_xViewData->getByIndex(nCount 
- 1));
+sal_Int32 nCount = m_pImpl->m_xViewData->getCount();
+if (nCount)
+
_xController->restoreViewData(m_pImpl->m_xViewData->getByIndex(nCount - 1));
 }
 }
 
diff --git a/reportdesign/source/ui/misc/UITools.cxx 
b/reportdesign/source/ui/misc/UITools.cxx
index 2361f0d8cb1d..1d9cdd4c31a8 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -903,10 +903,12 @@ SdrObject* isOver(const tools::Rectangle& _rRect, SdrPage 
const & _rPage, SdrVie
 {
 SdrObject* pOverlappedObj = nullptr;
 SdrObjListIter aIter(&_rPage,SdrIterMode::DeepNoGroups);
-SdrObject* pObjIter = nullptr;
 
-while( !pOverlappedObj && (pObjIter = aIter.Next()) != nullptr )
+while( !pOverlappedObj )
 {
+SdrObject* pObjIter = aIter.Next();
+if( !pObjIter )
+break;
 if ( _pIgnore != pObjIter
 && (_bAllObjects || !_rView.IsObjMarked(pObjIter))
 && (dynamic_cast(pObjIter) != nullptr || 
dynamic_cast(pObjIter) != nullptr))
@@ -944,10 +946,12 @@ SdrObject* isOver(const tools::Rectangle& _rRect,SdrPage 
const & _rPage,SdrView
 {
 SdrObject* pOverlappedObj = nullptr;
 SdrObjListIter aIter(&_rPage,SdrIterMode::DeepNoGroups);
-SdrObject* pObjIter = nullptr;
 
-while( !pOverlappedObj && (pObjIter = aIter.Next()) != nullptr )
+while( !pOverlappedObj )
 {
+SdrObject* pObjIter = aIter.Next();
+if( !pObjIter )
+break;
 if (checkArrayForOccurrence(pObjIter, _pIgnoreList, 
_nIgnoreListLength))
 {
 continue;
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index ee1e90d4cf83..bf61da78c8d2 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1189,16 +1189,20 @@ void OReportController::Execute(sal_uInt16 _nId, const 
Sequence< PropertyValue >
 
executeMethodWithUndo(RID_STR_UNDO_REMOVE_SELECTION,::std::mem_fn(&ODesignView::Delete));
 break;
 case SID_GRID_USE:
-getDesignView()->setGridSnap(m_bGridUse = !m_bGridUse);
+m_bGridUse = !m_bGridUse;
+getDesignView()->setGridSnap(m_bGridUse);
 break;
 case SID_HELPLINES_MOVE:
-getDesignView()->setDragStripes(m_bHelplinesMove = 
!m_bHelplinesMove);
+m_bHelplinesMove = !m_bHelplinesMove;
+getDesignView()->setDragStripes(m_bHelplinesMove);
 break;
 case SID_GRID_VISIBLE:
-getDesignView()->toggleGrid(m_bGridVisible = !m_bGridVisible);
+m_bGridVisible = !m_bGridVisible;
+getDesignView()->toggleGrid(m_bGridVisible);
 break;
 case SID_RULER:
-getDesignView()->showRuler(m_bShowRuler = !m_bShowRuler);
+m_bShowRuler = !m_bShowRuler;
+getDesignView()->showRuler(m_bShowRuler);
 break;
 case SID_OBJECT_SELECT:
 getDesignView()->SetMode(DlgEdMode::Select);
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx 
b/reportdesign/source/ui/report/dlgedfunc.cxx
index a7f82f7c5bb8..3eaa42d6ab5b 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -568,10 +568,12 @@ bool DlgEdFunc::isRectang

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

[Noel Grandin (via logerrit)]

 include/osl/profile.hxx |   14 --
 include/osl/socket.hxx  |3 ++-
 sal/osl/unx/profile.cxx |   14 --
 sal/rtl/math.cxx|   16 +++-
 sal/rtl/strtmpl.cxx |8 +---
 sal/rtl/ustring.cxx |   16 ++--
 6 files changed, 48 insertions(+), 23 deletions(-)

New commits:
commit 72d8f2961fd7f5670fe2564eeb3aa14a6eaf0d8d
Author: Noel Grandin 
AuthorDate: Wed Apr 15 09:13:58 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 15 11:24:09 2020 +0200

loplugin:buriedassign in sal

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

diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index b62ea0628ca7..0ce69a8aea3b 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -160,8 +160,13 @@ namespace osl {
 sal_Char* pBuf = new sal_Char[ n+1 ];
 osl_getProfileSectionEntries( profile, rSection.getStr(), 
pBuf, n+1 );
 size_t nLen;
-for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
+for( n = 0; ; n += nLen+1 )
+{
+nLen = strlen( pBuf+n );
+if (!nLen)
+break;
 aEntries.push_back( rtl::OString( pBuf+n ) );
+}
 delete[] pBuf;
 }
 
@@ -182,8 +187,13 @@ namespace osl {
 sal_Char* pBuf = new sal_Char[ n+1 ];
 osl_getProfileSections( profile, pBuf, n+1 );
 size_t nLen;
-for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
+for( n = 0; ; n += nLen+1 )
+{
+nLen = strlen( pBuf+n );
+if (!nLen)
+break;
 aSections.push_back( rtl::OString( pBuf+n ) );
+}
 delete[] pBuf;
 }
 
diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index 640880144177..2ea81fcfd3e0 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.hxx
@@ -242,7 +242,8 @@ namespace osl
 
 inline Socket&  Socket::operator= (const Socket& sock)
 {
-return (*this) = sock.getHandle();
+*this = sock.getHandle();
+return *this;
 }
 
 
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index edb76019ff5d..ce3742bc8a10 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -391,8 +391,8 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
 
 if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
 {
-osl_TProfileSection* pSec;
-if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != 
nullptr) &&
+osl_TProfileSection* pSec = findEntry(pProfile, pszSection, pszEntry, 
&NoEntry);
+if ((pSec != nullptr) &&
 (NoEntry < pSec->m_NoEntries) &&
 ((pStr = strchr(pProfile->m_Lines[pSec->m_Entries[NoEntry].m_Line],
 '=')) != nullptr))
@@ -535,7 +535,8 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
 Line[1 + strlen(pszSection)] = ']';
 Line[2 + strlen(pszSection)] = '\0';
 
-if (((pStr = addLine(pProfile, Line)) == nullptr) ||
+pStr = addLine(pProfile, Line);
+if ((pStr == nullptr) ||
 (! addSection(pProfile, pProfile->m_NoLines - 1, &pStr[1], 
strlen(pszSection
 {
 bRet=releaseProfile(pProfile);
@@ -563,7 +564,8 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
 else
 i = pSec->m_Line + 1;
 
-if (((pStr = insertLine(pProfile, Line, i)) == nullptr) ||
+pStr = insertLine(pProfile, Line, i);
+if ((pStr == nullptr) ||
 (! addEntry(pProfile, pSec, i, pStr, strlen(pszEntry
 {
 bRet=releaseProfile(pProfile);
@@ -675,8 +677,8 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
 
 if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
 {
-osl_TProfileSection* pSec;
-if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != 
nullptr) &&
+osl_TProfileSection* pSec = findEntry(pProfile, pszSection, pszEntry, 
&NoEntry);
+if ((pSec != nullptr) &&
 (NoEntry < pSec->m_NoEntries))
 {
 removeLine(pProfile, pSec->m_Entries[NoEntry].m_Line);
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 135035e01138..099cd3d60578 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -172,9 +172,10 @@ bool isRepresentableInteger(double fAbsValue)
 // XXX loplugin:fpcomparison complains about floating-point comparison
 // for static_cast(nInt) == fAbsValue, though we actually want
 // this here.
-

uicheck

[Stephan Bergmann]

Of the four  buildsteps 
(i.e., the Jenkins bots that check your Gerrit changes), only 
gerrit_linux_clang_dbgutil runs uicheck (i.e., executing the various 
UITests).  Unfortunately, those UITests have a tendency to hang if they 
fail, causing a Gerrit change's gerrit_linux_clang_dbgutil build to 
abort.  (Unfortunately, again, without much indication of what failed, 
see 
.)


So if Jenkins fails for one of your Gerrit changes with an aborted 
gerrit_linux_clang_dbgutil, chances are high that that is due to some 
failed UITest.  To verify that locally:


* If you develop on Linux, run `make check` (but you should have done so 
before submitting the change to Gerrit anyway).  If it hangs, debug to 
find out why and fix.


* If you develop on Windows:

** First run `make check` to find out whether it could be anything other 
than a UITest that hung the Jenkins build ("check" includes "uicheck" 
only on Linux, not on other platforms like Windows, and only 
gerrit_linux_clang_dbgutil runs a full "check"; and you should have run 
`make check` locally before submitting the change to Gerrit anyway).


** Since 
 
"Handle more Windows \r\n vs. \n differences in UITests", you should be 
able to run `make uicheck` on Windows, with the following caveats:


*** It does not run headless, so pops up windows on your machine. 
Better stay away from the machine while the build runs.


*** It appears to be unreliable when run with a build parallelism > 1. 
So if you configure --without-parallelism, pass -j1 or no -j at all to 
`make uicheck`.  I have no idea what you need to do if you use the 
implicit, unhelpful --with-parallelism, though.  (And I didn't bother to 
check what causes the unreliability.  One source most likely are the 
dubious UITests that use the clipboard, see the email thread starting at 
 
"Linux SAL_USE_VCLPLUGIN=svp and the clipboard".)


** Again, if it hangs, debug to find out why and fix.

* If you develop on macOS (or anything else), you're likely lost for now.

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

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

[Caolán McNamara (via logerrit)]

 ucb/source/ucp/gio/gio_content.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 47a54c397cc70247b562aa360e42afe611c77fb5
Author: Caolán McNamara 
AuthorDate: Tue Apr 14 13:46:44 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Apr 15 11:20:19 2020 +0200

"General Internet Error" dialog appearing on gio mount

we get a GError of G_IO_ERROR_FAILED_HANDLED which is documented
as "Operation failed and a helper program has already interacted with the 
user.
Do not display any error dialog." PENDING seems to describe this state
better than a generic error case and results in no error dialog.

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

diff --git a/ucb/source/ucp/gio/gio_content.cxx 
b/ucb/source/ucp/gio/gio_content.cxx
index 05c26c42760f..640f3750aa99 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -196,6 +196,9 @@ css::uno::Any convertToException(GError *pError, const 
css::uno::Reference< css:
 css::task::InteractionClassification_ERROR, 
css::ucb::IOErrorCode_NAME_TOO_LONG, aArgs);
   EXCEPT(aExcept); }
 break;
+case G_IO_ERROR_FAILED_HANDLED: /* Operation failed and a helper 
program
+   has already interacted with the 
user. Do not display any error
+   dialog */
 case G_IO_ERROR_PENDING:
 { css::ucb::InteractiveAugmentedIOException aExcept(sMessage, 
rContext,
 css::task::InteractionClassification_ERROR, 
css::ucb::IOErrorCode_PENDING, aArgs);
@@ -257,7 +260,6 @@ css::uno::Any convertToException(GError *pError, const 
css::uno::Reference< css:
 case G_IO_ERROR_NOT_EMPTY:
 case G_IO_ERROR_NOT_SYMBOLIC_LINK:
 case G_IO_ERROR_NOT_MOUNTABLE_FILE:
-case G_IO_ERROR_FAILED_HANDLED:
 { css::ucb::InteractiveNetworkGeneralException aExcept(sMessage, 
rContext,
 css::task::InteractionClassification_ERROR);
   EXCEPT(aExcept);}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|1 +
 2 files changed, 7 insertions(+)

New commits:
commit 7965bb9a1d8b29778c6eac279537952e6a9e9502
Author: Justin Luth 
AuthorDate: Sat Apr 11 14:07:02 2020 +0300
Commit: Michael Stahl 
CommitDate: Wed Apr 15 11:18:49 2020 +0200

Revert "NFC writerfilter: remove pointless asserts"

This reverts commit 708f95b87410c640f0e9e22892f4a71194631cd9.

Stephan said I have it all backwards.

Asserts are primarily "documentation", and there is no point
in asserting something if you aren't going to accept it as true,
at least not without any other qualifying remarks etc. So a
simple "assert(p)" should never be followed by "if(p)".
These asserts basically show that "yes, I'm using this pointer
without checking on purpose, and not as an oversight."

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6428155d85ce..1e7f8a99e663 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1989,6 +1989,7 @@ void DomainMapper_Impl::appendTextPortion( const 
OUString& rString, const Proper
 {
 m_bStartedTOC = true;
 uno::Reference< text::XTextCursor > xTOCTextCursor = 
xTextAppend->getEnd()->getText( )->createTextCursor( );
+assert(xTOCTextCursor.is());
 xTOCTextCursor->gotoEnd(false);
 if (m_nStartGenericField != 0)
 {
@@ -4292,6 +4293,7 @@ DomainMapper_Impl::StartIndexSectionChecked(const 
OUString& sServiceName)
 m_bStartedTOC = true;
 uno::Reference xTOCTextCursor
 = xTextRange->getText()->createTextCursor();
+assert(xTOCTextCursor.is());
 xTOCTextCursor->gotoEnd(false);
 m_aTextAppendStack.push(TextAppendContext(xTextAppend, 
xTOCTextCursor));
 }
@@ -6528,6 +6530,7 @@ void DomainMapper_Impl::SetCurrentRedlineIsRead()
 
 sal_Int32 DomainMapper_Impl::GetCurrentRedlineToken(  ) const
 {
+assert(m_currentRedline.get());
 return m_currentRedline->m_nToken;
 }
 
@@ -6580,11 +6583,13 @@ void DomainMapper_Impl::SetCurrentRedlineId( sal_Int32 
sId )
 
 void DomainMapper_Impl::SetCurrentRedlineToken( sal_Int32 nToken )
 {
+assert(m_currentRedline.get());
 m_currentRedline->m_nToken = nToken;
 }
 
 void DomainMapper_Impl::SetCurrentRedlineRevertProperties( const 
uno::Sequence& aProperties )
 {
+assert(m_currentRedline.get());
 m_currentRedline->m_aRevertProperties = aProperties;
 }
 
@@ -6805,6 +6810,7 @@ sal_Int32 DomainMapper_Impl::getNumberingProperty(const 
sal_Int32 nListId, sal_I
 nNumberingLevel = 0;
 
 auto const pList(GetListTable()->GetList(nListId));
+assert(pList);
 const OUString aListName = pList->GetStyleName();
 const uno::Reference< style::XStyleFamiliesSupplier > 
xStylesSupplier(GetTextDocument(), uno::UNO_QUERY_THROW);
 const uno::Reference< container::XNameAccess > xStyleFamilies = 
xStylesSupplier->getStyleFamilies();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5429489304f6..3de574e75c12 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2113,6 +2113,7 @@ RTFReferenceTable::Entries_t 
RTFDocumentImpl::deduplicateStyleTable()
 auto const pStyleType(
 
static_cast(*pStyle).getAttributes().find(
 NS_ooxml::LN_CT_Style_type));
+assert(pStyleType);
 int const nStyleType(pStyleType->getInt());
 RTFSprms const sprms(
 
static_cast(*pStyle).getSprms().cloneAndDeduplicate(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/Makefile.am|1 
 loleaflet/src/control/Control.SearchBar.js   |  111 +++
 loleaflet/src/control/Control.Toolbar.js |   17 
 loleaflet/src/layer/tile/CalcTileLayer.js|   40 -
 loleaflet/src/layer/tile/ImpressTileLayer.js |   40 -
 loleaflet/src/layer/tile/WriterTileLayer.js  |   40 -
 6 files changed, 115 insertions(+), 134 deletions(-)

New commits:
commit b0be9c7b35049c6ca94702392f59322f3f49e2a0
Author: Szymon Kłos 
AuthorDate: Fri Apr 10 15:19:56 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 11:19:19 2020 +0200

Move SearchBar to separate file

Change-Id: I6db64d35f40f3a762f50df010ead9395a873fb20
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92037
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 89d4952d2..cef67ce69 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -263,6 +263,7 @@ LOLEAFLET_JS =\
src/control/Control.MobileSlide.js \
src/control/Control.Scale.js \
src/control/Control.StatusBar.js \
+   src/control/Control.SearchBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.SearchBar.js 
b/loleaflet/src/control/Control.SearchBar.js
new file mode 100644
index 0..d6714002a
--- /dev/null
+++ b/loleaflet/src/control/Control.SearchBar.js
@@ -0,0 +1,111 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.SearchBar
+ */
+
+/* global $ w2ui _ _UNO */
+L.Control.SearchBar = L.Control.extend({
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+   },
+
+   create: function() {
+   var that = this;
+   var toolbar = $('#toolbar-search');
+   toolbar.w2toolbar({
+   name: 'searchbar',
+   tooltip: 'top',
+   items: [
+   {
+   type: 'html', id: 'search',
+   html: '' +
+   'Search:' +
+   '' +
+   ''
+   },
+   {type: 'button', id: 'searchprev', img: 'prev', 
hint: _UNO('.uno:UpSearch'), disabled: true},
+   {type: 'button', id: 'searchnext', img: 'next', 
hint: _UNO('.uno:DownSearch'), disabled: true},
+   {type: 'button', id: 'cancelsearch', img: 
'cancel', hint: _('Clear the search field'), hidden: true},
+   {type: 'html', id: 'left'},
+   {type: 'button', id: 'hidesearchbar', img: 
'unfold', hint: _('Hide the search bar')}
+   ],
+   onClick: function (e) {
+   that.onClick(e, e.target, e.item, e.subItem);
+   },
+   onRefresh: function () {
+   window.setupSearchInput();
+   }
+   });
+
+   toolbar.bind('touchstart', function(e) {
+   w2ui['searchbar'].touchStarted = true;
+   var touchEvent = e.originalEvent;
+   if (touchEvent && touchEvent.touches.length > 1) {
+   L.DomEvent.preventDefault(e);
+   }
+   });
+
+   $(w2ui.searchbar.box).find('.w2ui-scroll-left, 
.w2ui-scroll-right').hide();
+   w2ui.searchbar.on('resize', function(target, e) {
+   e.isCancelled = true;
+   });
+   },
+
+   onClick: function(e, id, item) {
+   if (w2ui['searchbar'].get(id) !== null) {
+   var toolbar = w2ui['searchbar'];
+   item = toolbar.get(id);
+   }
+
+   // In the iOS app we don't want clicking on the toolbar to pop 
up the keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 
'zoomout' && id !== 'mobile_wizard' && id !== 'insertion_mobile_wizard') {
+   this.map.focus(this.map.canAcceptKeyboardInput()); // 
Maintain same keyboard state.
+   }
+
+   if (item.disabled) {
+   return;
+   }
+
+   if (id === 'searchprev') {
+   this.map.search(L.DomUtil.get('search-input').value, 
true);
+   }
+   else if (id === 'searchnext') {
+   this.map.search(L.DomUtil.get('search-input').value);
+   }
+   else if (id === 'cancelsearch') {
+   thi

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

[Szymon Kłos (via logerrit)]

 loleaflet/Makefile.am  |1 
 loleaflet/src/control/Control.StatusBar.js |  721 +
 loleaflet/src/control/Control.Toolbar.js   |  571 --
 loleaflet/src/main.js  |3 
 4 files changed, 726 insertions(+), 570 deletions(-)

New commits:
commit 615f5212bf68240c41ebd21fe051b97d6d171d4c
Author: Szymon Kłos 
AuthorDate: Fri Apr 10 11:29:52 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 11:03:21 2020 +0200

Move statusbar code to separate file

Change-Id: Ia4940b1725bbc4326dfeb520a6bcb6423b9a25b9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92036
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1422de467..89d4952d2 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -262,6 +262,7 @@ LOLEAFLET_JS =\
src/control/Control.Attribution.js \
src/control/Control.MobileSlide.js \
src/control/Control.Scale.js \
+   src/control/Control.StatusBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.StatusBar.js 
b/loleaflet/src/control/Control.StatusBar.js
new file mode 100644
index 0..a46ab6604
--- /dev/null
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -0,0 +1,721 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.StatusBar
+ */
+
+/* global $ w2ui w2utils _ _UNO */
+L.Control.StatusBar = L.Control.extend({
+   options: {
+   userPopupTimeout: null,
+   userJoinedPopupMessage: '' + _('%user has joined') + 
'',
+   userLeftPopupMessage: '' + _('%user has left') + '',
+   nUsers: undefined,
+   oneUser: undefined,
+   noUser: undefined
+   },
+
+   initialize: function () {
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+
+   map.on('doclayerinit', this.onDocLayerInit, this);
+   map.on('addview', this.onAddView, this);
+   map.on('removeview', this.onRemoveView, this);
+   map.on('commandvalues', this.onCommandValues, this);
+   map.on('commandstatechanged', this.onCommandStateChanged, this);
+   map.on('deselectuser', this.deselectUser, this);
+   map.on('updatepermission', this.onUpdatePermission, this);
+
+   },
+
+   hideTooltip: function(toolbar, id) {
+   if (toolbar.touchStarted) {
+   setTimeout(function() {
+   toolbar.tooltipHide(id, {});
+   }, 5000);
+   toolbar.touchStarted = false;
+   }
+   },
+
+   updateToolbarItem: function(toolbar, id, html) {
+   var item = toolbar.get(id);
+   if (item) {
+   item.html = html;
+   }
+   },
+
+   localizeStateTableCell: function(text) {
+   var stateArray = text.split(';');
+   var stateArrayLength = stateArray.length;
+   var localizedText = '';
+   for (var i = 0; i < stateArrayLength; i++) {
+   var labelValuePair = stateArray[i].split(':');
+   localizedText += _(labelValuePair[0].trim()) + ':' + 
labelValuePair[1];
+   if (stateArrayLength > 1 && i < stateArrayLength - 1) {
+   localizedText += '; ';
+   }
+   }
+   return localizedText;
+   },
+
+   toLocalePattern: function(pattern, regex, text, sub1, sub2) {
+   var matches = new RegExp(regex, 'g').exec(text);
+   if (matches) {
+   text = pattern.toLocaleString().replace(sub1, 
parseInt(matches[1].replace(',','')).toLocaleString(String.locale)).replace(sub2,
 parseInt(matches[2].replace(',','')).toLocaleString(String.locale));
+   }
+   return text;
+   },
+
+   escapeHtml: function(input) {
+   return $('').text(input).html();
+   },
+
+   getUserItem: function(viewId, userName, extraInfo, color) {
+   var html = '' +
+'';
+   if (extraInfo !== undefined && extraInfo.avatar !== undefined) {
+   html += '';
+   } else {
+   html += '';
+   }
+   
+   // TODO: Add mail and other links as sub-menu.
+   html += '' +
+'' + 
userName + '' +
+   '';
+   
+   return html;
+   },
+
+   _updateVisibilityForToolbar: function(toolbar) {
+   if (!toolbar)
+   return;
+   
+   var toShow = [];
+   var toHide 

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

[Michael Stahl (via logerrit)]

 sw/source/core/undo/undel.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 283f36ab037c78c81392153288a554d486d57c98
Author: Michael Stahl 
AuthorDate: Tue Apr 7 18:33:34 2020 +0200
Commit: Xisco Faulí 
CommitDate: Wed Apr 15 11:01:26 2020 +0200

tdf#131684 sw_redlinehide: fix SwUndoDelete for entire doc in section

The problem is that in SwUndoDelete::UndoImpl(), at the start there is
only one content node with a frame in the layout, and there is a special
case with m_nReplaceDummy being set so this SwTextFrame gets deleted by
the MoveNodes() call in line 969 that moves it into the newly inserted
section.

As a result of that, MakeFrames() won't do anything because it can't
find an existing frame in the same section.

In this case, MoveNodes() should leave the frame alone, as it is beyond
the end of the deletion and excluded from MakeFrames() - if it wasn't
merged before then it doesn't need action, if it was merged before (in a
different document maybe) the RecreateStartTextFrames() ought to fix it.

(regression from 723728cd358693b8f4bc9d913541aa4479f2bd48
 which disabled immediate creation of frames in Copy_())

Change-Id: Iabe2fb1810b0df898b1f57b3d850c3503c79c5d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91842
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 6c7245e789f973cf6dad03f7008ab3f9d12d350c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91886
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 5e2fc4864a5ed4c8361863ba7fa8e83d1c768638)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92176
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index a53458952594..cf4731cc3421 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -968,7 +968,8 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 SwNodeIndex aMvIdx(rDoc.GetNodes(), nMoveIndex);
 SwNodeRange aRg( aPos.nNode, 0, aPos.nNode, 1 );
 pMovedNode = &aPos.nNode.GetNode();
-rDoc.GetNodes().MoveNodes(aRg, rDoc.GetNodes(), aMvIdx);
+// tdf#131684 without deleting frames
+rDoc.GetNodes().MoveNodes(aRg, rDoc.GetNodes(), aMvIdx, false);
 rDoc.GetNodes().Delete( aMvIdx);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sw/qa/uitest/librelogo/run.py   |2 +-
 sw/qa/uitest/table/tableToText.py   |6 +++---
 sw/qa/uitest/writer_tests6/tdf125104.py |   20 
 sw/qa/uitest/writer_tests6/tdf126017.py |2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit 24e1563b5db3de5abac0d4fd0f737ec319e703e8
Author: Stephan Bergmann 
AuthorDate: Wed Apr 15 09:23:36 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 15 10:58:14 2020 +0200

Handle more Windows \r\n vs. \n differences in UITests

...similar to e22a3f596ce50b5166063e217d96ef674a54d380 "UITest: fix
spellDialog.SpellingAndGrammarDialog.test_tdf46852" and
e3d130fbdf061da36b317a5b610eef4b4cc51732 "Handle some Windows \r or \r\n 
vs. \n
differences in UITests".

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

diff --git a/sw/qa/uitest/librelogo/run.py b/sw/qa/uitest/librelogo/run.py
index 5d64e1bea152..7b243f00b952 100644
--- a/sw/qa/uitest/librelogo/run.py
+++ b/sw/qa/uitest/librelogo/run.py
@@ -64,7 +64,7 @@ class LibreLogoTest(UITestCase):
 self.logo("__translate__")
 # a) check expansion of abbreviated commands : fd -> FORWARD, rt -> 
RIGHT,
 # b) check line breaking (fix for tdf#100941: new line instead of the 
text "\" and "n")
-self.assertEqual(document.Text.String, "\nFORWARD 100 RIGHT 45 FORWARD 
100")
+self.assertEqual(document.Text.String.replace('\r\n', '\n'), 
"\nFORWARD 100 RIGHT 45 FORWARD 100")
 # c) check usage of real paragraphs instead of line break (tdf#120422)
 # first paragraph is empty (for working page break)
 
self.assertEqual(document.Text.createEnumeration().nextElement().String, "")
diff --git a/sw/qa/uitest/table/tableToText.py 
b/sw/qa/uitest/table/tableToText.py
index 5985519f8088..f47f2d52 100644
--- a/sw/qa/uitest/table/tableToText.py
+++ b/sw/qa/uitest/table/tableToText.py
@@ -46,7 +46,7 @@ class tableToText(UITestCase):
 xOKBtn = xDialog.getChild("ok")
 self.ui_test.close_dialog_through_button(xOKBtn)
 #verify
-self.assertEqual(document.Text.String[0:4], "a\na\n")
+self.assertEqual(document.Text.String.replace('\r\n', '\n')[0:4], 
"a\na\n")
 self.assertEqual(document.TextTables.getCount(), 0)
 #undo
 self.xUITest.executeCommand(".uno:Undo")
@@ -60,7 +60,7 @@ class tableToText(UITestCase):
 xOKBtn = xDialog.getChild("ok")
 self.ui_test.close_dialog_through_button(xOKBtn)
 #verify
-self.assertEqual(document.Text.String[0:6], "a;a\n;\n")
+self.assertEqual(document.Text.String.replace('\r\n', '\n')[0:6], 
"a;a\n;\n")
 self.assertEqual(document.TextTables.getCount(), 0)
 #undo
 self.xUITest.executeCommand(".uno:Undo")
@@ -78,7 +78,7 @@ class tableToText(UITestCase):
 xOKBtn = xDialog.getChild("ok")
 self.ui_test.close_dialog_through_button(xOKBtn)
 #verify
-self.assertEqual(document.Text.String[0:6], "a:a\n:\n")
+self.assertEqual(document.Text.String.replace('\r\n', '\n')[0:6], 
"a:a\n:\n")
 self.assertEqual(document.TextTables.getCount(), 0)
 #undo
 self.xUITest.executeCommand(".uno:Undo")
diff --git a/sw/qa/uitest/writer_tests6/tdf125104.py 
b/sw/qa/uitest/writer_tests6/tdf125104.py
index cf38208c0fd8..b711b01caefe 100644
--- a/sw/qa/uitest/writer_tests6/tdf125104.py
+++ b/sw/qa/uitest/writer_tests6/tdf125104.py
@@ -33,13 +33,15 @@ class tdf125104(UITestCase):
 self.xUITest.executeCommand(".uno:InsertPageNumberField")
 self.xUITest.executeCommand(".uno:InsertPagebreak")
 self.xUITest.executeCommand(".uno:InsertPageNumberField")
-self.assertEqual(document.Text.String[0:1], "1")
-self.assertEqual(document.Text.String[2:3], "2")
+text = document.Text.String.replace('\r\n', '\n')
+self.assertEqual(text[0:1], "1")
+self.assertEqual(text[2:3], "2")
 
 # Bug 125104 - Changing page numbering to "1st, 2nd, 3rd,..." causes 
crashes when trying to change Page settings later
 self.set_combo_layout_format(self.open_page_style_dialog(), "1st, 2nd, 
3rd, ...")
-self.assertEqual(document.Text.String[0:3], "1st")
-self.assertEqual(document.Text.String[4:7], "2nd")
+text = document.Text.String.replace('\r\n', '\n')
+self.assertEqual(text[0:3], "1st")
+self.assertEqual(text[4:7], "2nd")
 
 xDialog = self.open_page_style_dialog()
 comboLayoutFormat = xDialog.getChild("comboLayoutFormat")
@@ -49,13 +51,15 @@ class tdf125104(UITestCase):
 
 # change to devanagari alphabet format
 self.set_combo_layout_format(self.open_page_style_dialog(), "क, ख, ग, 
...")
-self.assertEqual(document.Text.String[0:1], "क")
-self.assertEqu

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

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

 vcl/skia/gdiimpl.cxx |8 ++--
 vcl/skia/win/gdiimpl.cxx |4 
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7d7a3eba57338925d1e9604db2455b0a3484b1b3
Author: Luboš Luňák 
AuthorDate: Tue Apr 14 15:21:26 2020 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 15 10:49:19 2020 +0200

do not create empty Skia surface (tdf#131939)

Apparently SalGraphics may be occassionally of size (0,0), such as
in this case where clipboard cleanup happens on exit. Just create
a tiny surface in that case.

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

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index b9d6d3575c85..6f7c2b70b1df 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -266,13 +266,17 @@ void SkiaSalGraphicsImpl::createOffscreenSurface()
 assert(isOffscreen());
 assert(!mSurface);
 assert(!mWindowContext);
+// When created (especially on Windows), Init() gets called with size 
(0,0), which is invalid size
+// for Skia. May happen also in rare cases such as shutting down 
(tdf#131939).
+int width = std::max(1, GetWidth());
+int height = std::max(1, GetHeight());
 switch (SkiaHelper::renderMethodToUse())
 {
 case SkiaHelper::RenderVulkan:
 {
 if (SkiaHelper::getSharedGrContext())
 {
-mSurface = SkiaHelper::createSkSurface(GetWidth(), 
GetHeight());
+mSurface = SkiaHelper::createSkSurface(width, height);
 assert(mSurface);
 assert(mSurface->getCanvas()->getGrContext()); // is GPU-backed
 mIsGPU = true;
@@ -286,7 +290,7 @@ void SkiaSalGraphicsImpl::createOffscreenSurface()
 break;
 }
 // Create raster surface as a fallback.
-mSurface = SkiaHelper::createSkSurface(GetWidth(), GetHeight());
+mSurface = SkiaHelper::createSkSurface(width, height);
 assert(mSurface);
 assert(!mSurface->getCanvas()->getGrContext()); // is not GPU-backed
 mIsGPU = false;
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index 70ac8496ef83..fd796794464e 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -38,10 +38,6 @@ 
WinSkiaSalGraphicsImpl::WinSkiaSalGraphicsImpl(WinSalGraphics& rGraphics,
 void WinSkiaSalGraphicsImpl::createWindowContext()
 {
 SkiaZone zone;
-// When created, Init() gets called with size (0,0), which is invalid size
-// for Skia. Creating the actual surface is delayed, so the size should be 
always
-// valid here, but better check.
-assert((GetWidth() != 0 && GetHeight() != 0) || isOffscreen());
 sk_app::DisplayParams displayParams;
 switch (SkiaHelper::renderMethodToUse())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/css loleaflet/images

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/mobilewizard.css|4 
 loleaflet/images/lc_denominatorplaces.svg |   14 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 4e78ccb523d529a72412f153cdf79c8faee35bc6
Author: Pedro Pinto Silva 
AuthorDate: Wed Apr 15 10:26:19 2020 +0200
Commit: Pedro Pinto da Silva 
CommitDate: Wed Apr 15 10:40:04 2020 +0200

Mobile: Calc: remove display rule for denominator places and add 
corresponding asset

Change-Id: I278c4ae9ca474cfaa622b22553888aaa26d86da6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92245
Tested-by: Jenkins CollaboraOffice 
Tested-by: Pedro Pinto da Silva 
Reviewed-by: Pedro Pinto da Silva 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 3c3c8ec6b..70fc8ba97 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -39,10 +39,6 @@ span#main-menu-btn-icon {
filter: none !important;
 }
 
-#denominatorplaces .spinfieldimage{
-   display: none;
-}
-
 .ui-header.level-1.mobile-wizard.ui-widget 
img[src='images/lc_downloadas-pdf.svg']{
visibility: visible;
 }
diff --git a/loleaflet/images/lc_denominatorplaces.svg 
b/loleaflet/images/lc_denominatorplaces.svg
index 6df498a3c..bf056224b 100644
--- a/loleaflet/images/lc_denominatorplaces.svg
+++ b/loleaflet/images/lc_denominatorplaces.svg
@@ -1 +1,13 @@
-http://www.w3.org/2000/svg"; 
width="1" height="1"/>
+http://www.w3.org/2000/svg"; 
xmlns:cc="http://creativecommons.org/ns#"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+ 
+  
+   
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"/>
+
+   
+  
+ 
+ 
+ 
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits