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

[Jim Raykowski (via logerrit)]

 reportdesign/source/ui/dlg/dlgpage.cxx  |7 -
 reportdesign/source/ui/misc/UITools.cxx |  152 +---
 reportdesign/uiconfig/dbreport/ui/chardialog.ui |2 
 3 files changed, 113 insertions(+), 48 deletions(-)

New commits:
commit 48e8c03710a540341a0d901273c42acfe0189498
Author: Jim Raykowski 
AuthorDate: Tue Dec 4 12:02:28 2018 -0900
Commit: Mike Kaganski 
CommitDate: Wed Dec 11 08:22:34 2019 +0100

tdf#105225 Use new background tab page in Base:Report Builder

Section Setup, Page Setup, and Character Settings dialogs

Change-Id: I31275ba45f5659fa7fe3988ae0f8ed3978196425
Reviewed-on: https://gerrit.libreoffice.org/64673
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx 
b/reportdesign/source/ui/dlg/dlgpage.cxx
index dd2c5f32b2e1..9a8d3710dba0 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -46,12 +46,12 @@ ORptPageDialog::ORptPageDialog(weld::Window* pParent, const 
SfxItemSet* pAttr, c
 
 if (rDialog == "BackgroundDialog")
 {
-AddTabPage("background", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BACKGROUND ), nullptr );
+AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG 
), nullptr );
 }
 else if (rDialog == "PageDialog")
 {
 AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 
nullptr );
-AddTabPage("background", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BACKGROUND ), nullptr );
+AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG 
), nullptr );
 }
 else if (rDialog == "CharDialog")
 {
@@ -59,7 +59,7 @@ ORptPageDialog::ORptPageDialog(weld::Window* pParent, const 
SfxItemSet* pAttr, c
 AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_CHAR_EFFECTS ), nullptr );
 AddTabPage("position", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_CHAR_POSITION ), nullptr );
 AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_CHAR_TWOLINES ), nullptr );
-AddTabPage("background", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BACKGROUND ), nullptr );
+AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG 
), nullptr );
 AddTabPage("alignment", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_ALIGNMENT ), nullptr );
 }
 else
@@ -75,7 +75,6 @@ void ORptPageDialog::PageCreated(const OString& rId, 
SfxTabPage &rPage)
 SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 if (rId == "background")
 {
-
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)));
 rPage.PageCreated(aSet);
 }
 }
diff --git a/reportdesign/source/ui/misc/UITools.cxx 
b/reportdesign/source/ui/misc/UITools.cxx
index dca6d9210768..b752425b6e94 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -108,46 +108,65 @@
 #include 
 #include 
 
-#define ITEMID_FONT 10
-#define ITEMID_FONTHEIGHT   11
-#define ITEMID_LANGUAGE 12
-
-#define ITEMID_POSTURE  13
-#define ITEMID_WEIGHT   14
-#define ITEMID_SHADOWED 15
-#define ITEMID_WORDLINEMODE 16
-#define ITEMID_CONTOUR  17
-#define ITEMID_CROSSEDOUT   18
-#define ITEMID_UNDERLINE19
-
-#define ITEMID_COLOR20
-#define ITEMID_KERNING  21
-#define ITEMID_CASEMAP  22
-
-#define ITEMID_ESCAPEMENT   23
-#define ITEMID_FONTLIST 24
-#define ITEMID_AUTOKERN 25
-#define ITEMID_COLOR_TABLE  26
-#define ITEMID_BLINK27
-#define ITEMID_EMPHASISMARK 28
-#define ITEMID_TWOLINES 29
-#define ITEMID_CHARROTATE   30
-#define ITEMID_CHARSCALE_W  31
-#define ITEMID_CHARRELIEF   32
-#define ITEMID_CHARHIDDEN   33
-#define ITEMID_BRUSH34
-#define ITEMID_HORJUSTIFY   35
-#define ITEMID_VERJUSTIFY   36
-#define ITEMID_FONT_ASIAN   37
-#define ITEMID_FONTHEIGHT_ASIAN 38
-#define ITEMID_LANGUAGE_ASIAN   39
-#define ITEMID_POSTURE_ASIAN40
-#define ITEMID_WEIGHT_ASIAN 41
-#define ITEMID_FONT_COMPLEX 42
-#define ITEMID_FONTHEIGHT_COMPLEX   43
-#define ITEMID_LANGUAGE_COMPLEX 44
-#define ITEMID_POSTURE_COMPLEX  45
-#define ITEMID_WEIGHT_COMPLEX   46
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#define ITEMID_FONT XATTR_FILL_LAST + 1
+#define ITEMID_FONTHEIGHT   XATTR_FILL_LAST

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

[Noel Grandin (via logerrit)]

 sw/inc/sortopt.hxx|2 +-
 sw/source/core/doc/docsort.cxx|2 +-
 sw/source/core/doc/sortopt.cxx|2 +-
 sw/source/core/unocore/unoobj.cxx |   10 +-
 sw/source/ui/misc/srtdlg.cxx  |6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit e92206270a1c3a63072e813a948297d1f8332609
Author: Noel Grandin 
AuthorDate: Tue Dec 10 11:50:05 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 11 08:15:10 2019 +0100

convert SwSortOrder to scoped enum

Change-Id: I24f982749a94e32d388663cc3a518d919bad96ff
Reviewed-on: https://gerrit.libreoffice.org/84853
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index be697b55e63e..959080b3247e 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.hxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-enum SwSortOrder{ SRT_ASCENDING, SRT_DESCENDING };
+enum class SwSortOrder  { Ascending, Descending };
 enum SwSortDirection{ SRT_COLUMNS, SRT_ROWS };
 
 struct SW_DLLPUBLIC SwSortKey
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 291e734dc747..0565878c36e9 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -123,7 +123,7 @@ int SwSortElement::keycompare(const SwSortElement& rCmp, 
sal_uInt16 nKey) const
 const SwSortElement *pOrig, *pCmp;
 
 const SwSortKey* pSrtKey = pOptions->aKeys[ nKey ].get();
-if( pSrtKey->eSortOrder == SRT_ASCENDING )
+if( pSrtKey->eSortOrder == SwSortOrder::Ascending )
 {
 pOrig = this;
 pCmp = &rCmp;
diff --git a/sw/source/core/doc/sortopt.cxx b/sw/source/core/doc/sortopt.cxx
index 641885269bf0..585a50f818f4 100644
--- a/sw/source/core/doc/sortopt.cxx
+++ b/sw/source/core/doc/sortopt.cxx
@@ -21,7 +21,7 @@
 #include 
 
 SwSortKey::SwSortKey() :
-eSortOrder( SRT_ASCENDING ),
+eSortOrder( SwSortOrder::Ascending ),
 nColumnId( 0 ),
 bIsNumeric( true )
 {
diff --git a/sw/source/core/unocore/unoobj.cxx 
b/sw/source/core/unocore/unoobj.cxx
index 96ab2254b5bc..e1200d0e10dd 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2585,17 +2585,17 @@ bool SwUnoCursorHelper::ConvertSortProperties(
 std::unique_ptr pKey1(new SwSortKey);
 pKey1->nColumnId = USHRT_MAX;
 pKey1->bIsNumeric = true;
-pKey1->eSortOrder = SRT_ASCENDING;
+pKey1->eSortOrder = SwSortOrder::Ascending;
 
 std::unique_ptr pKey2(new SwSortKey);
 pKey2->nColumnId = USHRT_MAX;
 pKey2->bIsNumeric = true;
-pKey2->eSortOrder = SRT_ASCENDING;
+pKey2->eSortOrder = SwSortOrder::Ascending;
 
 std::unique_ptr pKey3(new SwSortKey);
 pKey3->nColumnId = USHRT_MAX;
 pKey3->bIsNumeric = true;
-pKey3->eSortOrder = SRT_ASCENDING;
+pKey3->eSortOrder = SwSortOrder::Ascending;
 SwSortKey* aKeys[3] = {pKey1.get(), pKey2.get(), pKey3.get()};
 
 bool bOldSortdescriptor(false);
@@ -2744,7 +2744,7 @@ bool SwUnoCursorHelper::ConvertSortProperties(
 if (bTemp && nIndex < 3)
 {
 aKeys[nIndex]->eSortOrder = (*bTemp)
-? SRT_ASCENDING : SRT_DESCENDING;
+? SwSortOrder::Ascending : SwSortOrder::Descending;
 }
 else
 {
@@ -2785,7 +2785,7 @@ bool SwUnoCursorHelper::ConvertSortProperties(
 aKeys[i]->bIsNumeric = (pFields[i].FieldType ==
 table::TableSortFieldType_NUMERIC);
 aKeys[i]->eSortOrder = (pFields[i].IsAscending)
-? SRT_ASCENDING : SRT_DESCENDING;
+? SwSortOrder::Ascending : SwSortOrder::Descending;
 }
 }
 else
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index e9a8e715f6a9..6b5c898e20c5 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -269,7 +269,7 @@ void SwSortDlg::Apply()
 
 aOptions.aKeys.push_back(
 std::make_unique( nCol1, sEntry,
-bAsc1 ? SRT_ASCENDING : SRT_DESCENDING ));
+bAsc1 ? SwSortOrder::Ascending : 
SwSortOrder::Descending ));
 }
 
 if( bCheck2 )
@@ -282,7 +282,7 @@ void SwSortDlg::Apply()
 
 aOptions.aKeys.push_back(
 std::make_unique( nCol2, sEntry,
-bAsc2 ? SRT_ASCENDING : SRT_DESCENDING ));
+bAsc2 ? SwSortOrder::Ascending : 
SwSortOrder::Descending ));
 }
 
 if( bCheck3 )
@@ -295,7 +295,7 @@ void SwSortDlg::Apply()
 
 aOptions.aKeys.push_back(
 std::make_unique( nCol3, sEntry,
-bAsc3 ? SRT_ASCENDING : SRT_DESCENDING ));
+bAsc3 ? SwSortOrder::Ascending : 
SwSortOrder::Descending ));

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

[Chris Sherlock (via logerrit)]

 basegfx/source/polygon/b2dlinegeometry.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5c38453d830d9e71bfccea846c8b4e8f76a3cfae
Author: Chris Sherlock 
AuthorDate: Sun Dec 1 05:49:45 2019 +1100
Commit: Noel Grandin 
CommitDate: Wed Dec 11 07:00:02 2019 +0100

basegfx: fix assertion text

Change-Id: Ibfcc30327d2f55b994e3d8aa485bbb5499ed7f22
Reviewed-on: https://gerrit.libreoffice.org/84141
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx 
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 190a413dfd00..007ff8b4811d 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -46,11 +46,11 @@ namespace basegfx
 double fShift)
 {
 B2DPolyPolygon aRetval;
-assert((rCandidate.count() > 1) && 
"createAreaGeometryForLineStartEnd: Line polygon has too less points (!)");
-assert((rArrow.count() > 0) && "createAreaGeometryForLineStartEnd: 
Empty arrow utils::PolyPolygon (!)");
-assert((fWidth > 0.0) && "createAreaGeometryForLineStartEnd: Width 
too small (!)");
+assert((rCandidate.count() > 1) && 
"createAreaGeometryForLineStartEnd: Line polygon has too few points");
+assert((rArrow.count() > 0) && "createAreaGeometryForLineStartEnd: 
Empty arrow utils::PolyPolygon");
+assert((fWidth > 0.0) && "createAreaGeometryForLineStartEnd: Width 
too small");
 assert((fDockingPosition >= 0.0 && fDockingPosition <= 1.0) &&
-"createAreaGeometryForLineStartEnd: fDockingPosition out of 
range [0.0 .. 1.0] (!)");
+"createAreaGeometryForLineStartEnd: fDockingPosition out of 
range [0.0 .. 1.0]");
 
 if(fWidth < 0.0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sw/inc/section.hxx |8 
 sw/source/core/doc/docglbl.cxx |2 +-
 sw/source/core/docnode/ndsect.cxx  |8 
 sw/source/core/docnode/section.cxx |6 +++---
 sw/source/core/undo/unsect.cxx |2 +-
 sw/source/core/unocore/unosect.cxx |4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 544b5bf273b501f9deeed01684ad685e4bac6b55
Author: Noel Grandin 
AuthorDate: Tue Dec 10 11:47:26 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 11 06:57:45 2019 +0100

convert LinkCreateType to scoped enum

Change-Id: Ia31648d2dbd6eb5d878d7dcc904d1b05b6c1619c
Reviewed-on: https://gerrit.libreoffice.org/84852
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 6cb83b9962db..f911923ab41a 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -50,11 +50,11 @@ enum class SectionType { Content,
 FileLink   = OBJECT_CLIENT_FILE
 };
 
-enum LinkCreateType
+enum class LinkCreateType
 {
-CREATE_NONE,// Do nothing.
-CREATE_CONNECT, // Connect created link.
-CREATE_UPDATE   // Connect created link and update it.
+NONE,// Do nothing.
+Connect, // Connect created link.
+Update   // Connect created link and update it.
 };
 
 class SW_DLLPUBLIC SwSectionData
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 48d3854d1598..f3a4eaba8af6 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -475,7 +475,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& 
rPath, bool bOutline,
 }
 // <- #i26762#
 
-pSectNd->GetSection().CreateLink( CREATE_CONNECT );
+pSectNd->GetSection().CreateLink( 
LinkCreateType::Connect );
 }
 break;
 }
diff --git a/sw/source/core/docnode/ndsect.cxx 
b/sw/source/core/docnode/ndsect.cxx
index bcf91b3f1e03..33389bc09b6b 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -369,7 +369,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & 
rNewData,
 
 if (rNewData.IsLinkType())
 {
-pNewSectNode->GetSection().CreateLink( bUpdate ? CREATE_UPDATE : 
CREATE_CONNECT );
+pNewSectNode->GetSection().CreateLink( bUpdate ? 
LinkCreateType::Update : LinkCreateType::Connect );
 }
 
 if( bUpdateFootnote )
@@ -731,7 +731,7 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData 
& rNewData,
 }
 
 if( bUpdate )
-pSection->CreateLink( bPreventLinkUpdate ? CREATE_CONNECT : 
CREATE_UPDATE );
+pSection->CreateLink( bPreventLinkUpdate ? LinkCreateType::Connect : 
LinkCreateType::Update );
 else if( !pSection->IsLinkType() && pSection->IsConnected() )
 {
 pSection->Disconnect();
@@ -1248,7 +1248,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, 
const SwNodeIndex& rIdx ) c
 
 // Copy the Links/Server
 if( pNewSect->IsLinkType() ) // Add the Link
-pNewSect->CreateLink( 
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ? CREATE_CONNECT : 
CREATE_NONE );
+pNewSect->CreateLink( 
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ? 
LinkCreateType::Connect : LinkCreateType::NONE );
 
 // If we copy from the Undo as Server, enter it again
 if (m_pSection->IsServer()
@@ -1330,7 +1330,7 @@ void SwSectionNode::NodesArrChgd()
 OSL_ENSURE( pDoc == GetDoc(),
 "Moving to different Documents?" );
 if( m_pSection->IsLinkType() ) // Remove the Link
-m_pSection->CreateLink( 
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ? CREATE_CONNECT : 
CREATE_NONE );
+m_pSection->CreateLink( 
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ? 
LinkCreateType::Connect : LinkCreateType::NONE );
 
 if (m_pSection->IsServer())
 
pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertServer( 
m_pSection->GetObject() );
diff --git a/sw/source/core/docnode/section.cxx 
b/sw/source/core/docnode/section.cxx
index 56b1ee08cab5..050edf187f36 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1538,14 +1538,14 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
 
 switch( eCreateType )
 {
-case CREATE_CONNECT: // Connect Link right away
+case LinkCreateType::Connect: // Connect Link right away
 pLnk->Connect();
 break;
 
-case CREATE_UPDATE: // Connect Link and update
+case LinkCreateType::Update: // Connect Link and update
 pLnk->Update();
 break;
-case CREATE_NONE: break;
+case LinkCreateType::NONE: break;
 }
 }
 
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cx

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

[Noel Grandin (via logerrit)]

 sw/inc/fmtfsize.hxx |   12 ++---
 sw/inc/section.hxx  |   12 ++---
 sw/qa/extras/layout/layout.cxx  |   10 ++--
 sw/qa/extras/uiwriter/uiwriter.cxx  |2 
 sw/qa/extras/uiwriter/uiwriter2.cxx |6 +-
 sw/source/core/access/accframe.cxx  |4 -
 sw/source/core/crsr/crstrvl.cxx |4 -
 sw/source/core/crsr/swcrsr.cxx  |2 
 sw/source/core/doc/DocumentStylePoolManager.cxx |4 -
 sw/source/core/doc/doccomp.cxx  |   32 +++---
 sw/source/core/doc/docdesc.cxx  |2 
 sw/source/core/doc/docfly.cxx   |4 -
 sw/source/core/doc/docglbl.cxx  |2 
 sw/source/core/doc/doclay.cxx   |8 +--
 sw/source/core/doc/docnew.cxx   |2 
 sw/source/core/doc/doctxm.cxx   |   18 
 sw/source/core/doc/htmltbl.cxx  |6 +-
 sw/source/core/doc/tblrwcl.cxx  |   14 +++---
 sw/source/core/docnode/ndsect.cxx   |   12 ++---
 sw/source/core/docnode/ndtbl.cxx|   28 ++--
 sw/source/core/docnode/ndtbl1.cxx   |2 
 sw/source/core/docnode/section.cxx  |   32 +++---
 sw/source/core/edit/edglbldc.cxx|4 -
 sw/source/core/edit/edsect.cxx  |4 -
 sw/source/core/edit/edtox.cxx   |6 +-
 sw/source/core/frmedt/fefly1.cxx|4 -
 sw/source/core/frmedt/feshview.cxx  |2 
 sw/source/core/frmedt/tblsel.cxx|2 
 sw/source/core/layout/atrfrm.cxx|   14 +++---
 sw/source/core/layout/fly.cxx   |   24 +--
 sw/source/core/layout/flylay.cxx|2 
 sw/source/core/layout/frmtool.cxx   |2 
 sw/source/core/layout/hffrm.cxx |2 
 sw/source/core/layout/paintfrm.cxx  |4 -
 sw/source/core/layout/ssfrm.cxx |4 -
 sw/source/core/layout/tabfrm.cxx|   16 +++
 sw/source/core/layout/wsfrm.cxx |   10 ++--
 sw/source/core/ole/ndole.cxx|2 
 sw/source/core/table/swnewtable.cxx |   12 ++---
 sw/source/core/table/swtable.cxx|4 -
 sw/source/core/text/EnhancedPDFExportHelper.cxx |6 +-
 sw/source/core/text/pormulti.cxx|2 
 sw/source/core/undo/unattr.cxx  |4 -
 sw/source/core/undo/unsect.cxx  |2 
 sw/source/core/unocore/unoidx.cxx   |   14 +++---
 sw/source/core/unocore/unosect.cxx  |   38 -
 sw/source/core/unocore/unostyle.cxx |2 
 sw/source/core/unocore/unotbl.cxx   |6 +-
 sw/source/filter/html/css1atr.cxx   |4 -
 sw/source/filter/html/htmlcss1.cxx  |4 -
 sw/source/filter/html/htmlflywriter.cxx |8 +--
 sw/source/filter/html/htmlgrin.cxx  |2 
 sw/source/filter/html/htmlplug.cxx  |4 -
 sw/source/filter/html/htmlsect.cxx  |6 +-
 sw/source/filter/html/htmltab.cxx   |   10 ++--
 sw/source/filter/html/wrthtml.cxx   |6 +-
 sw/source/filter/ww8/docxattributeoutput.cxx|   10 ++--
 sw/source/filter/ww8/docxexport.cxx |2 
 sw/source/filter/ww8/docxsdrexport.cxx  |3 -
 sw/source/filter/ww8/rtfattributeoutput.cxx |6 +-
 sw/source/filter/ww8/writerwordglue.cxx |2 
 sw/source/filter/ww8/wrtw8nds.cxx   |   10 ++--
 sw/source/filter/ww8/wrtw8sty.cxx   |   10 ++--
 sw/source/filter/ww8/wrtww8.cxx |8 +--
 sw/source/filter/ww8/ww8atr.cxx |8 +--
 sw/source/filter/ww8/ww8graf.cxx|   10 ++--
 sw/source/filter/ww8/ww8graf2.cxx   |4 -
 sw/source/filter/ww8/ww8par.cxx |4 -
 sw/source/filter/ww8/ww8par2.cxx|   16 +++
 sw/source/filter/ww8/ww8par4.cxx|2 
 sw/source/filter/ww8/ww8par5.cxx|2 
 sw/source/filter/ww8/ww8par6.cxx|   24 +--
 sw/source/filter/xml/xmlexpit.cxx   |4 -
 sw/source/filter/xml/xmlimpit.cxx   |   10 ++--
 sw/source/filter/xml/xmltbli.cxx|8 +--
 sw/source/filter/xml/xmltexti.cxx   |2 
 sw/source/ui/dbui/mmlayoutpage.cxx  |2 
 sw/source/ui/dialog/uiregionsw.cxx  |   52 
 sw/source/ui/frmdlg/column.cxx  |6 +-
 sw/source/ui/frmdlg/frmpage.cxx |   16 +++
 sw/source/ui/frmdlg/wrap.cxx|2 
 sw/source/ui/table/rowht.cxx|6 +-
 sw/source/uibase/app/appenv.cxx |4 -
 sw/source/u

Help with a great Application

[Mike Sydwest]

Hi LibreOffice

 I am not trying to get free advertising here, actually we are in lot of
trouble because our developer has run off and left us in a mess.

 The Application we have built is based on LibreOffice open source code.

The App is called Enriched Digital Writer - Windows,
https://www.enriched.online/template-category/products/software-applications
/

 

The application is for many user, as we are trying to help user with small
PC skill to record their life history and many other things, I have put two
years of my time into this great project.

 

The code is in Gitlab - we can give anyone access at any time, this is where
dev suggested to keep it.

 

What we desperately need is help to get back on track, not advertising.

 

Please advise and hopefully show some interest in this industry of Ancestry
and family recording and Genealogy

 

If you want me to push the code to somewhere else I can try to do this.

 

I look forward to your help if at all possible -

 

Michael Wilkinson

PS I am not a technical person please try to understand that.

 

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

Re: Fw: benchmark of Excel, Calc, Google Docs

[Wol]

On 10/12/2019 17:30, Aditya Parameswaran wrote:

Wols,

Thanks for sharing your concerns, replete with quotes from Einstein :-) !

I believe I share those concerns... but there are of course some 
liberties we can take as an academic group that you folks managing a 
popular spreadsheet tool cannot take (e.g., doing a proof of concept as 
opposed to a robust implementation.)   From a research/academic 
standpoint it is valuable to note that something is possible, even if 
the solution is not ideal given other pragmatic considerations.  BTW, I 
don't believe that anything we're doing *requires* a relational database 
-- a NoSQL setup would work just fine.


Bear in mind I'm not a regular developer. My name is on the list of 
credits, and I follow the mailing list, but I'm more one of those 
annoying people who moans about it. However, as they say, "you want 
customers who moan, because they're the people who want your product to 
improve. It's the people who leave without moaning that you should be 
concerned about".


I'd be happy to discuss more.  Our goal is to understand the stumbling 
blocks in translating our work into spreadsheet tools such as Calc and 
see how we can best help with what we've learned.


I'm more in to proving that relational databases are basically rubbish 
(as is the mathematical justification behind them) :-) That said, the 
maths itself is good, provided you don't use it to build a real-world 
database engine!


Okay, to demolish RDBMSs :-) I don't know which rule it is (no 1?) that 
says "Data comes in rows and columns". So your first job in building 
your relational application is to call in a data analyst, to whom you 
give the job of bashing square pegs in to round holes...


To me, data is what the user gives you. metadata is what the analyst 
deduces about the data. AND YOU DON'T MIX THE TWO!!!


Given that an RDBMS stores data as sets, and a lot of data comes as 
lists (which contain a lot of metadata) the only way to store a list in 
an RDBMS is to muddle data and metadata. Put mathematically, if you 
store a list when you want a set, you can just throw away the 
information you don't want (or need). However, once you've thrown that 
information away (ie the order of the items) so you can store your list 
in a set-based RDBMS, *you can't get it back*!


My database of choice is Pick, where the basic unit of storage is the 
object, not the row. And because an object is an n-dimensional array, 
rather than the 1-dimensional row, I can store an entire relational view 
in it. (Which is what you should do, relational maths is okay, RDBMSs 
aren't :-) And because I have an n-dimensional array, I can store lists 
of lists :-)


The problem I have at this point is that I'm now discussing the merit of 
databases. I'm not actually helping you "translate your work into 
spreadsheet tools". It's easy for me to extract a two-dimensional table 
from Pick and, truth be told, I can probably extract it faster 
(including massaging it into shape) from Pick than selecting it from an 
RDBMS! But unless we can find out some way of displaying a 3- or 
4-dimensional array (a relational view) in a spreadsheet that isn't 
horribly confusing, I don't really know what to suggest other than to 
use a SQL query as the layer between the database and the spreadsheet. 
The database may be n-dimensional, but if your spreadsheet only has two, 
you might as well use a 2-dimensional query and let the database handle 
the complexity. It's not that hard.


(I have - personally - managed a ram-starved 32-user Pick system that 
provided perfectly acceptable user response times despite thrashing like 
mad...)


(Oh, and as for pushing calculation into the database, Pick has had 
virtual fields for ages. I can define a field as being a calculation eg 
VAT = PRICE * 20%, so I can "store price, retrieve vat" and it's just 
automagical :-) (I get the impression most users are unaware of similar 
capabilities in RDBMSs)


Cheers,
Wol


Cheers,
Aditya

On Mon, Dec 9, 2019 at 3:37 PM Wols Lists > wrote:


On 09/12/19 19:14, Aditya Parameswaran wrote:
 >            The idea of converting to SQL queries is an
interesting one
 >     but I find
 >     it very hard to believe it would provide any performance
advantage at
 >     the same memory footprint. Furthermore - I'd be interested to
know how
 >     you do other spreadsheet operations: row & column insertion,
addressing,
 >     and dependency work on top of a SQL database with any efficiency.
 >
 >
 > We started by having the relational database be a simple persistent
 > storage layer, when coupled with an index to retrieve data by
position,
 > can allow us to scroll through large datasets of billions of rows at
 > ease. We developed a new positional index to handle insertions and
 > deletions in O(log(n)) -- https://arxiv.org/pdf/1708.06712.pdf. I
agree
   

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

[Henry Castro (via logerrit)]

 include/vcl/window.hxx|1 +
 sfx2/source/view/viewfrm.cxx  |5 +++--
 sfx2/source/view/viewsh.cxx   |   11 ---
 vcl/source/window/window2.cxx |6 ++
 4 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit d5d8fa63282a433da9c49d811f04390b8d6ab9cc
Author: Henry Castro 
AuthorDate: Sat Nov 30 09:36:27 2019 -0400
Commit: Henry Castro 
CommitDate: Wed Dec 11 03:25:57 2019 +0100

lok: fix welded dialogs

In the tiled rendering case the dialogs, run asynchronous due
to multiple user access. In order to send the messages
to the client side, the dialog  has to hook
a LOKNotifier in the constructor of the SfxViewShell.

However, the new weld wrapper classes use the Frame Window,
(i.e. Window::GetFarmeWeld()), as a parent of the dialogs.

On the other hand, in order to avoid getting the interface
implementation inside implementation classes, it has been
created a new method Window::GetFrameWindow(), otherwise
I have to do a bureaucratic conversion between Interfaces
to Implementations ( i.e. UnoWrapperBase::GetUnoWrapper() )

Change-Id: I32c34d82a89211a025250e65a05ce47d30efa0b8
Reviewed-on: https://gerrit.libreoffice.org/84215
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index f090fef97203..8c87a78510cb 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -527,6 +527,7 @@ public:
 
 SAL_DLLPRIVATE vcl::Window* ImplGetFrameWindow() const;
 weld::Window*   GetFrameWeld() const;
+vcl::Window*GetFrameWindow() const;
 SalFrame*   ImplGetFrame() const;
 SAL_DLLPRIVATE ImplFrameData*   ImplGetFrameData();
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 223a02a7a8ab..96bdf69f0c89 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1509,8 +1509,9 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 
 case SfxHintId::Deinitializing:
 {
-if (GetWindow().GetLOKNotifier())
-GetWindow().ReleaseLOKNotifier();
+vcl::Window* pFrameWin = GetWindow().GetFrameWindow();
+if (pFrameWin && pFrameWin->GetLOKNotifier())
+pFrameWin->ReleaseLOKNotifier();
 
 GetFrame().DoClose();
 break;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 126a09e5ecad..baaceb0b6a73 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1096,7 +1096,11 @@ SfxViewShell::SfxViewShell
 rViewArr.push_back(this);
 
 if (comphelper::LibreOfficeKit::isActive())
-pViewFrame->GetWindow().SetLOKNotifier(this, true);
+{
+vcl::Window* pFrameWin = pViewFrame->GetWindow().GetFrameWindow();
+if (pFrameWin)
+pFrameWin->SetLOKNotifier(this, true);
+}
 }
 
 
@@ -1121,8 +1125,9 @@ SfxViewShell::~SfxViewShell()
 pImpl->m_pController.clear();
 }
 
-if (GetViewFrame()->GetWindow().GetLOKNotifier())
-GetViewFrame()->GetWindow().ReleaseLOKNotifier();
+vcl::Window* pFrameWin = GetViewFrame()->GetWindow().GetFrameWindow();
+if (pFrameWin && pFrameWin->GetLOKNotifier())
+pFrameWin->ReleaseLOKNotifier();
 }
 
 bool SfxViewShell::PrepareClose
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 6f32ea52eafd..e3b27653ad8d 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -856,6 +856,12 @@ weld::Window* Window::GetFrameWeld() const
 return pFrame ? pFrame->GetFrameWeld() : nullptr;
 }
 
+vcl::Window* Window::GetFrameWindow() const
+{
+SalFrame* pFrame = ImplGetFrame();
+return pFrame ? pFrame->GetWindow() : nullptr;
+}
+
 vcl::Window* Window::ImplGetParent() const
 {
 return mpWindowImpl ? mpWindowImpl->mpParent.get() : nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 include/vcl/window.hxx |3 +++
 vcl/source/app/svmain.cxx  |3 +++
 vcl/source/window/floatwin.cxx |2 ++
 vcl/source/window/window.cxx   |8 +---
 4 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 3bf5610d14a6dd5f093314016ba25038fe06fdf1
Author: Henry Castro 
AuthorDate: Mon Dec 9 18:49:37 2019 -0400
Commit: Henry Castro 
CommitDate: Wed Dec 11 03:25:39 2019 +0100

lok: evaluate assertion if LOK Windows container is empty

It has defined a map container for every LOK windows assigned
a notifier to the client side. However the map container has elements
with VclPtr (reference counter) and it is a global data, so when global
data are disposing, the VclPtr will destroy the Window when the VCL
framework was destroyed that will lead to undefined behavior.

So this commit adds an assert inside DeInitVCL to ensure, if
someone forgot to Release the LOK Notifier.

Change-Id: Ib7f20751af2931f7b0ba3e3d526e734ffc33f171
Reviewed-on: https://gerrit.libreoffice.org/84792
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/84909
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index c0381b8c75c9..f090fef97203 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1205,6 +1205,9 @@ public:
 /// Find an existing Window based on the LOKWindowId.
 static VclPtr  FindLOKWindow(vcl::LOKWindowId 
nWindowId);
 
+/// check if LOK Window container is empty
+static bool IsLOKWindowsEmpty();
+
 /// Dumps itself and potentially its children to a property tree, to be 
written easily to JSON.
 virtual boost::property_tree::ptree DumpAsPropertyTree();
 
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index cd6f3b781823..333aa19e6ea8 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -408,6 +408,9 @@ VCLUnoWrapperDeleter::disposing(lang::EventObject const& /* 
rSource */)
 
 void DeInitVCL()
 {
+// The LOK Windows map container should be empty
+assert(vcl::Window::IsLOKWindowsEmpty());
+
 //rhbz#137, when using LibreOffice like a library you can't 
realistically
 //tear everything down and recreate them on the next call, there's too many
 //(c++) singletons that point to stuff that gets deleted during shutdown
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 672eb6236fee..e3abe5dcd169 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -202,6 +202,8 @@ FloatingWindow::~FloatingWindow()
 
 void FloatingWindow::dispose()
 {
+ReleaseLOKNotifier();
+
 if (mpImplData)
 {
 if( mbPopupModeCanceled )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 19e2e105a168..b1f0762f01e7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3162,9 +3162,6 @@ namespace {
 
 LOKWindowsMap& GetLOKWindowsMap()
 {
-// never use this in the desktop case
-assert(comphelper::LibreOfficeKit::isActive());
-
 // Map to remember the LOKWindowId <-> Window binding.
 static LOKWindowsMap s_aLOKWindowsMap;
 
@@ -3206,6 +3203,11 @@ VclPtr Window::FindLOKWindow(vcl::LOKWindowId 
nWindowId)
 return VclPtr();
 }
 
+bool Window::IsLOKWindowsEmpty()
+{
+return GetLOKWindowsMap().empty();
+}
+
 void Window::ReleaseLOKNotifier()
 {
 // unregister the LOK window binding
___
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' - vcl/source

[Henry Castro (via logerrit)]

 vcl/source/window/dialog.cxx |   28 ++--
 1 file changed, 18 insertions(+), 10 deletions(-)

New commits:
commit b7e4b1a27b55dff4792ccd32b0c6658956dcf27a
Author: Henry Castro 
AuthorDate: Tue Dec 10 20:34:51 2019 -0400
Commit: Henry Castro 
CommitDate: Wed Dec 11 03:18:24 2019 +0100

lok: dialog: check if exists a LOK Window Notifier

When the dialog is about to show, it requires to
send to client side the "created" message. However,
in the constructor has already assigned a notifier
from the parent window.

Change-Id: I1120ad1c1c70449048d6739b8564d1c1f6b1c7e3
Reviewed-on: https://gerrit.libreoffice.org/84908
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index a8e5240ec68c..d3710414385b 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -752,18 +752,26 @@ void Dialog::StateChanged( StateChangedType nType )
 {
 if (nType == StateChangedType::InitShow)
 {
-if (comphelper::LibreOfficeKit::isActive() && !GetLOKNotifier())
+if (comphelper::LibreOfficeKit::isActive())
 {
-vcl::ILibreOfficeKitNotifier* pViewShell = 
mpDialogImpl->m_aInstallLOKNotifierHdl.Call(nullptr);
-if (pViewShell)
+std::vector aItems;
+aItems.emplace_back("type", "dialog");
+aItems.emplace_back("size", GetSizePixel().toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
+
+if (const vcl::ILibreOfficeKitNotifier* pNotifier = 
GetLOKNotifier())
 {
-SetLOKNotifier(pViewShell);
-std::vector aItems;
-aItems.emplace_back("type", "dialog");
-aItems.emplace_back("size", GetSizePixel().toString());
-if (!GetText().isEmpty())
-aItems.emplace_back("title", GetText().toUtf8());
-pViewShell->notifyWindow(GetLOKWindowId(), "created", aItems);
+pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
+}
+else
+{
+vcl::ILibreOfficeKitNotifier* pViewShell = 
mpDialogImpl->m_aInstallLOKNotifierHdl.Call(nullptr);
+if (pViewShell)
+{
+SetLOKNotifier(pViewShell);
+pViewShell->notifyWindow(GetLOKWindowId(), "created", 
aItems);
+}
 }
 }
 
___
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' - desktop/uiconfig

[andreas kainz (via logerrit)]

 desktop/uiconfig/ui/extensionmanager.ui |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 5fa6e10528105fa15da792cf1fa6cfadd542d7f1
Author: andreas kainz 
AuthorDate: Tue Dec 10 22:26:11 2019 +0100
Commit: andreas_kainz 
CommitDate: Wed Dec 11 00:30:55 2019 +0100

LO extension Dialog fill update

Change-Id: I60c6beb3c0ff869653c21c9d933ea1f449b4318e
Reviewed-on: https://gerrit.libreoffice.org/84904
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 952b47656b3c686d691e1659a046b9ca6f440c7e)
Reviewed-on: https://gerrit.libreoffice.org/84906

diff --git a/desktop/uiconfig/ui/extensionmanager.ui 
b/desktop/uiconfig/ui/extensionmanager.ui
index b749f057d806..bcc1be250dd0 100644
--- a/desktop/uiconfig/ui/extensionmanager.ui
+++ b/desktop/uiconfig/ui/extensionmanager.ui
@@ -193,8 +193,6 @@
   
 True
 False
-False
-True
 1
 6
 12
@@ -202,8 +200,6 @@
   
 True
 False
-True
-True
 12
 
   
@@ -211,7 +207,6 @@
 True
 True
 False
-center
 True
 0
 True
@@ -228,7 +223,6 @@
 True
 True
 False
-start
 True
 0
 True
@@ -245,7 +239,6 @@
 True
 True
 False
-end
 True
 0
 True
___
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' - sc/uiconfig sw/uiconfig

[andreas kainz (via logerrit)]

 sc/uiconfig/scalc/ui/notebookbar.ui   |  167 +-
 sc/uiconfig/scalc/ui/notebookbar_compact.ui   |  165 +
 sw/uiconfig/swriter/ui/notebookbar_compact.ui |4 
 3 files changed, 329 insertions(+), 7 deletions(-)

New commits:
commit 79b02686dee17945751063f3b33fc51ccfe3da41
Author: andreas kainz 
AuthorDate: Tue Dec 10 17:32:47 2019 +0100
Commit: andreas_kainz 
CommitDate: Wed Dec 11 00:25:49 2019 +0100

Calc add Extension support to Tabbed NB

Change-Id: I2a6e17d8c9a126155ec599fe50d6d84d074c8ddc
Reviewed-on: https://gerrit.libreoffice.org/84878
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit bb3865c96f3a12f6b9e9b551e5f68a2731e3deb4)
Reviewed-on: https://gerrit.libreoffice.org/84907

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 59c268c7e9b9..05b05ced70a8 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -3,6 +3,30 @@
 
   
   
+  
+True
+False
+
+  
+True
+False
+AddonCommand
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+  
+
+  
   
 True
 False
@@ -15932,7 +15956,146 @@
   
 
 
-  
+  
+True
+False
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+center
+True
+  
+  
+False
+True
+1
+  
+
+  
+  
+True
+True
+0
+  
+
+
+  
+True
+False
+end
+center
+True
+
+  
+True
+False
+center
+True
+vertical
+
+  
+E_xtension
+True
+True
+False
+False
+end
+center
+True
+none
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+end
+True
+both-horiz
+False
+1
+
+  
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+False
+end
+1
+  
+
+
+  
+True
+False
+end
+5
+5
+vertical
+  
+  
+False
+True
+5
+end
+2
+  
+
+  
+  
+14
+  
+
+
+  
+True
+False
+  

Re: Fw: benchmark of Excel, Calc, Google Docs

[Michael Meeks]

Hi Aditya,

On 08/12/2019 23:14, Aditya Parameswaran wrote:
> I'm Aditya Parameswaran, an assistant professor at UC Berkeley.  Along
> with Prof. Karrie Karahalios at the University of Illinois and many
> Ph.D. student researchers, we've been working on developing a scalable
> spreadsheet system, DataSpread (http://dataspread.github.io), for about
> half a decade now.

Interesting stuff.

> We'd be very keen to collaborate to see if some of the ideas that we've
> developed and opportunities we've identified would make sense in Calc.

Sounds good. Very busy this week, but would yo be up for a conference
(with whomever is interested) sometime in the evening (UK time) of the
17th or 19th ? We could use https://meet.jit.si/CalcChat eg.

> Our ultimate aim is to percolate some of these ideas back into popular
> spreadsheet systems like Calc, so I'm excited to have this opportunity.

Great. Some good ideas to include there, only a chunk of typing is
required =)

> Yes, of course. Sajjadur, with Kelly's help, is looking into packaging
> this and sending it your way.

Excellent; thanks.

> So I am not sure why we concluded outright that none of the spreadsheet
> systems employ a columnar layout -- this is a good catch; we will fix.

=)

> That said, looking at Figure 10, it is surprising that the gains for the
> sequential read are not a lot more;  and the gains should increase
> proportionally.  So something funky is going on. Worth investigating. 

Ah - well ... so ;-) as I said it depends on your data-set, and its
type homogeneity down the column to a degree, and also we can improve
our lookup algorithm there.

> We started by having the relational database be a simple persistent
> storage layer, when coupled with an index to retrieve data by position,
> can allow us to scroll through large datasets of billions of rows at
> ease. We developed a new positional index to handle insertions and
> deletions in O(log(n)) -- https://arxiv.org/pdf/1708.06712.pdf. I agree
> that pushing the computation to the relational database does have
> overheads; but at the same time, it allows for scaling to arbitrarily
> large datasets. 

Ooh - nice paper. Your crawled data-set looks quite interesting too, we
run wide-scale crash-testing on the LibreOffice code-base across ~100k
files and enlarging our corpus there: or better, getting some
statistical view of which OOXML attributes (and thus features) are most
used out there would be extremely useful to us as we develop the core.

I like the data on spreadsheet and formula shape - that is very useful.
Do you have data on the geometry of formulae - as in rows vs. columns ?
[ we switched to columnar storage based mostly on experience rather than
hard data ;-].

It is also interesting to have access to very large (1.3m row)
data-sets that can have useful analysis done on them - would love to see
the source data there.

> Would love to chat and see if any of the work that we're doing can
> translate into Calc, and how we can contribute. 

Great.

> One other project that may be of interest is one where we're trying to
> build a spreadsheet summarization and navigation tool, which can be
> especially helpful on very large
> spreadsheets.  http://srahman7.web.engr.illinois.edu/papers/NOAH.pdf

Sounds good too. Of course, most useful on thee huge corpus of existing
sheets out there in XLS[X] / ODS format.

> Agreed. We started the benchmarking effort a couple years ago, and the
> old version was the new version back then :-) 

Heh ;-)

> Again, happy to share what we know!  Let's find a time to chat.  I see
> that you're in Europe, so mornings for us (PT/CT) may work better? 
> Sajjadur is traveling, so I'm not entirely sure if he's around, but I
> should be able to find time to chat early in the morning any day next week. 

Sounds good, cf. above - if we can't make that - early in the new year
would be great.

I look forward to talking,

Michael.

-- 
michael.me...@collabora.com <><, GM Collabora Productivity
Hangout: mejme...@gmail.com, Skype: mmeeks
(M) +44 7795 666 147 - timezone usually UK / Europe
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tamás Zolnai (via logerrit)]

 vcl/source/window/winproc.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 67ee8818e68a2793d89331dd715989c468fe5680
Author: Tamás Zolnai 
AuthorDate: Mon Jul 22 17:26:38 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Dec 10 23:50:17 2019 +0100

lok: don't show tooltip for popup menus inside dialogs

Check Character Properties dialog -> Font Effects -> Font Color
popup button. Moving the mouse above the colors, a tooltip is shown
with the color name. However when the tooltip window is displayed
LO online closes the popup window unexpectedly.

Change-Id: I4bb8611640e122fc8187271c8c843c9f29fc0ce0
Reviewed-on: https://gerrit.libreoffice.org/84716
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/84802

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 62214fac59e4..6f50e85699e8 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -157,6 +157,16 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, 
const Point& rMousePo
 
 static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& 
rMousePos )
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Ignore tooltips in popup color palettes
+// (e.g. Character Properties dialog -> Font Effects -> Font Color)
+if(pChild->GetType() == WindowType::CONTROL &&
+   pChild->GetParent() && pChild->GetParent()->GetParent() &&
+   pChild->GetParent()->GetParent()->GetType() == 
WindowType::DOCKINGWINDOW)
+return;
+}
+
 ImplSVData* pSVData = ImplGetSVData();
 if ( !pSVData->maHelpData.mpHelpWin ||
  !( pSVData->maHelpData.mpHelpWin->IsWindowOrChild( pChild ) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: chart2.check fails in testAxisTitlePositionDOCX

[Kaganski Mike]

On 11.12.2019 1:32, Luke Benes wrote:
> I bisected this regression to
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=d10db7846602c16701dde019f12f61fd536e9ae4
> 
>  tdf#128133 WIN don't exit after link-output filter

I would assume this not to be a regression from that commit, but rather 
a regression from DPI-dependent unit tests added in the time span 
between an unintended disabled inclusion of the DPI-aware manifest in 
commit 7f791f431c79c6d0a156c4a2726a0dfc5ff40cc1, and this one fixing that.

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: chart2.check fails in testAxisTitlePositionDOCX

[Luke Benes]

I bisected this regression to 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=d10db7846602c16701dde019f12f61fd536e9ae4

tdf#128133 WIN don't exit after link-output filter

Jan-Marek,
Could you please take a look at this? You can reproduce it by setting your 
scale factor to something other than 100%.

Thanks,
-Luke




From: Luke Benes

Sent: Saturday, December 7, 2019 12:47 PM

To: Regina Henschel ; Regina Henschel 
; Libreoffice Dev List 
; Balazs Varga 

Subject: Re: chart2.check fails in testAxisTitlePositionDOCX
 

Regina,


This is not an intermittent failure and not the same error as your gerrit 
failures. Rather it is a yet another Windows HiDPI bug and a recent regression. 
Possibly when these tests were added a month ago:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=9ff954d5f780

 tdf#127908 tdf#128193 Chart OOXML: Fix Custom Y axis title position



You can make the build complete successfully by:

Display Settings -> Scale and Layout -> 100%


This is a recent regression, that I will try to bisect. 


Other examples of HiDPI Windows failures include:

CppunitTest_sw_layoutwriter failing on Windows with HiDPI

http://document-foundation-mail-archive.969070.n3.nabble.com/CppunitTest-sw-layoutwriter-failing-on-Windows-with-HiDPI-tp4266491.html


CppunitTest_starmath_qa_cppunit Failing on Windows with HiDPI

http://document-foundation-mail-archive.969070.n3.nabble.com/CppunitTest-starmath-qa-cppunit-Failing-on-Windows-with-HiDPI-screens-tp4261772.html


-Luke



Build log  with Scale = 125%:


[build CUT] chart2_export

Chart2ImportTest::testAxisTitleRotationXLSX finished in: 536ms

D:/core/chart2/qa/extras/chart2import.cxx:1577:Chart2ImportTest::testAxisTitlePositionDOCX

equality assertion failed

- Expected: 6378

- Actual  : 6571


Chart2ImportTest::testTdf122765 finished in: 647ms

D:/core/chart2/qa/extras/chart2import.cxx(1577) : error : Assertion

Test name: Chart2ImportTest::testAxisTitlePositionDOCX

equality assertion failed

- Expected: 6378

- Actual  : 6571


Failures !!!

Run: 88   Failure total: 1   Failures: 1   Errors: 0



Chart2ExportTest::testAxisTitleRotationXLSX finished in: 560ms

D:/core/chart2/qa/extras/chart2export.cxx:2037:Chart2ExportTest::testAxisTitlePositionDOCX

assertion failed

- Expression: nY > 0.384407 && nY < 0.384408



D:/core/chart2/qa/extras/chart2export.cxx(2037) : error : Assertion

Test name: Chart2ExportTest::testAxisTitlePositionDOCX

assertion failed

- Expression: nY > 0.384407 && nY < 0.384408


Failures !!!

Run: 110   Failure total: 1   Failures: 1   Errors: 0


Error: a unit test failed, please do one of:

make CppunitTest_chart2_export



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

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

[andreas kainz (via logerrit)]

 sc/uiconfig/scalc/ui/notebookbar.ui   |  167 +-
 sc/uiconfig/scalc/ui/notebookbar_compact.ui   |  165 +
 sw/uiconfig/swriter/ui/notebookbar_compact.ui |4 
 3 files changed, 329 insertions(+), 7 deletions(-)

New commits:
commit bb3865c96f3a12f6b9e9b551e5f68a2731e3deb4
Author: andreas kainz 
AuthorDate: Tue Dec 10 17:32:47 2019 +0100
Commit: andreas_kainz 
CommitDate: Tue Dec 10 23:29:28 2019 +0100

Calc add Extension support to Tabbed NB

Change-Id: I2a6e17d8c9a126155ec599fe50d6d84d074c8ddc
Reviewed-on: https://gerrit.libreoffice.org/84878
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 59c268c7e9b9..05b05ced70a8 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -3,6 +3,30 @@
 
   
   
+  
+True
+False
+
+  
+True
+False
+AddonCommand
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+  
+
+  
   
 True
 False
@@ -15932,7 +15956,146 @@
   
 
 
-  
+  
+True
+False
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+center
+True
+  
+  
+False
+True
+1
+  
+
+  
+  
+True
+True
+0
+  
+
+
+  
+True
+False
+end
+center
+True
+
+  
+True
+False
+center
+True
+vertical
+
+  
+E_xtension
+True
+True
+False
+False
+end
+center
+True
+none
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+end
+True
+both-horiz
+False
+1
+
+  
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+False
+end
+1
+  
+
+
+  
+True
+False
+end
+5
+5
+vertical
+  
+  
+False
+True
+5
+end
+2
+  
+
+  
+  
+14
+  
+
+
+  
+True
+False
+E~xtension
+True
+  
+  
+14
+False
+

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

[andreas kainz (via logerrit)]

 desktop/uiconfig/ui/extensionmanager.ui |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 952b47656b3c686d691e1659a046b9ca6f440c7e
Author: andreas kainz 
AuthorDate: Tue Dec 10 22:26:11 2019 +0100
Commit: andreas_kainz 
CommitDate: Tue Dec 10 23:27:40 2019 +0100

LO extension Dialog fill update

Change-Id: I60c6beb3c0ff869653c21c9d933ea1f449b4318e
Reviewed-on: https://gerrit.libreoffice.org/84904
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/desktop/uiconfig/ui/extensionmanager.ui 
b/desktop/uiconfig/ui/extensionmanager.ui
index 58fc091399c7..0bdcdccc530f 100644
--- a/desktop/uiconfig/ui/extensionmanager.ui
+++ b/desktop/uiconfig/ui/extensionmanager.ui
@@ -74,8 +74,6 @@
   
 True
 False
-False
-True
 1
 6
 12
@@ -83,8 +81,6 @@
   
 True
 False
-True
-True
 12
 
   
@@ -92,7 +88,6 @@
 True
 True
 False
-center
 True
 0
 True
@@ -109,7 +104,6 @@
 True
 True
 False
-start
 True
 0
 True
@@ -126,7 +120,6 @@
 True
 True
 False
-end
 True
 0
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |8 
++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 0b90f8cece43e0e209c96750817211b5986fd45d
Author: Jan Holesovsky 
AuthorDate: Tue Dec 10 22:55:36 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 23:05:12 2019 +0100

android: Fix crash when starting a slideshow.

Change-Id: Iff5e4feaf4d1c496713a6401f6f03a17ae326ec5
Reviewed-on: https://gerrit.libreoffice.org/84905
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git 
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java 
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 66dc87497..a9cca125c 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -632,15 +632,11 @@ public class LOActivity extends AppCompatActivity {
 .setView(R.layout.lolib_dialog_loading)
 .create();
 
+slideShowProgress.show();
+
 nativeHandler.post(new Runnable() {
 @Override
 public void run() {
-LOActivity.this.runOnUiThread(new Runnable() {
-@Override
-public void run() {
-slideShowProgress.show();
-}
-});
 Log.v(TAG, "saving svg for slideshow by " + 
Thread.currentThread().getName());
 final String slideShowFileUri = new 
File(LOActivity.this.getCacheDir(), "slideShow.svg").toURI().toString();
 LOActivity.this.saveAs(slideShowFileUri, "svg");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/source/uibase/uiview/view2.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8a3780febe8960ddc85ae1b2a6c4fb68b306a10c
Author: Andrea Gelmini 
AuthorDate: Tue Dec 10 17:27:10 2019 +0100
Commit: Julien Nabet 
CommitDate: Tue Dec 10 22:55:15 2019 +0100

Removed duplicated include

Change-Id: I4db0983e3ab249fbde8c7db0d895ee4e8bb20c7f
Reviewed-on: https://gerrit.libreoffice.org/84877
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 3542ef25a560..117d90931dd9 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -130,7 +130,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/msfilter/escherex.cxx |2 +-
 filter/source/msfilter/msdffimp.cxx |2 +-
 svx/source/sidebar/nbdtmg.cxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a70b4f24043f7251fc2e7d2450ddfc2bd43a3f8f
Author: Andrea Gelmini 
AuthorDate: Tue Dec 10 21:39:21 2019 +0100
Commit: Julien Nabet 
CommitDate: Tue Dec 10 22:52:42 2019 +0100

Fix typos

Change-Id: I73f1f48272a95232658458dff1dc750112a4667e
Reviewed-on: https://gerrit.libreoffice.org/84898
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 69559fbc98b0..3f3c580f9ff1 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -592,7 +592,7 @@ voidEscherPropertyContainer::CreateFillProperties(
 if ( pObj )
 {
 const SfxItemSet& aAttr( pObj->GetMergedItemSet() );
-// tranparency with gradient. Means the third setting in 
transparency page is set
+// transparency with gradient. Means the third setting in 
transparency page is set
 bool bTransparentGradient =  ( aAttr.GetItemState( 
XATTR_FILLFLOATTRANSPARENCE ) == SfxItemState::SET ) &&
 aAttr.Get( XATTR_FILLFLOATTRANSPARENCE ).IsEnabled();
 CreateFillProperties(  rXPropSet, bEdge, bTransparentGradient );
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 01827da5bc14..ff67a560d56d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2956,7 +2956,7 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet& 
aSet,MSO_FillType eMSO_
 aGrad.SetStartIntens( 100 );
 aGrad.SetEndIntens( 100 );
 aSet.Put( XFillGradientItem( OUString(), aGrad ) );
-//Construct tranparency item. This item can coordinate with both solid and 
gradient.
+//Construct transparency item. This item can coordinate with both solid 
and gradient.
 if ( dTrans < 1.0 || dBackTrans < 1.0 )
 {
 sal_uInt8 nStartCol = static_cast( (1 - dTrans )* 255 );
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 0fe474c3784a..b2a7b06793a2 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -194,7 +194,7 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename)
 xIStm->ReadInt32( nNumIndex );
 while (nNumIndex>=0 && nNumIndexhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sc/source/filter/excel/xistyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7063c93572aa8148cbf9662e679e5c1b0f94f3c7
Author: Andrea Gelmini 
AuthorDate: Tue Dec 10 21:35:40 2019 +0100
Commit: Julien Nabet 
CommitDate: Tue Dec 10 22:48:29 2019 +0100

Fix typo

Change-Id: Ie01e25b3fd2eac9b3902febc2b584b9517bd6f3d
Reviewed-on: https://gerrit.libreoffice.org/84897
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sc/source/filter/excel/xistyle.cxx 
b/sc/source/filter/excel/xistyle.cxx
index 52f5d0fffca1..6d97fa2bdbfc 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1075,7 +1075,7 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, 
const XclImpPalette& r
 {
 SvxBrushItem aBrushItem( ATTR_BACKGROUND );
 
-// do not use IsTransparent() - old Calc filter writes tranparency 
with different color indexes
+// do not use IsTransparent() - old Calc filter writes transparency 
with different color indexes
 if( mnPattern == EXC_PATT_NONE )
 {
 aBrushItem.SetColor( COL_TRANSPARENT );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 437074a853c1fa454611a745beccfee9f0e35d8c
Author: Jan Holesovsky 
AuthorDate: Tue Dec 10 22:19:01 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 22:20:49 2019 +0100

android: Iterate according to the provider names again.

After commit 3dce52c307b203a1a255d4e986a62735543e644c, this is the right
thing to do again.

Change-Id: I3c34ee258677af59bfc7a55abcb09c4b7f3611a2
Reviewed-on: https://gerrit.libreoffice.org/84903
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index 4d6512ab7..306b167e3 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -270,7 +270,7 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 );
 
 // Loop through the document providers menu items and check if they 
are available or not
-for (int index = 0; index < navigationDrawer.getMenu().size(); 
++index) {
+for (int index = 0; index < providerNames.size(); ++index) {
 MenuItem item = navigationDrawer.getMenu().getItem(index);
 
item.setVisible(documentProviderFactory.getProvider(index).checkProviderAvailability(this));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

 loleaflet/html/loleaflet.html.m4 |2 ++
 loleaflet/js/global.js   |3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f4dd7ef0dccdb5932a7d6ccaaf99cf85e80cb537
Author: Marco Cecchetti 
AuthorDate: Tue Dec 10 22:05:13 2019 +0100
Commit: Marco Cecchetti 
CommitDate: Tue Dec 10 22:08:01 2019 +0100

fixing 2 minor console errors

Change-Id: Ie2449e33dd47511b2d8a65e1f929e69fece8a567
Reviewed-on: https://gerrit.libreoffice.org/84901
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 6fc5afbfa..7639bf908 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -24,6 +24,8 @@ ifelse(MOBILEAPP,[],
   // result for future
   window.WOPIpostMessageReady = false;
   var PostMessageReadyListener = function(e) {
+if (!(e && e.data))
+return;
 var msg = JSON.parse(e.data);
 if (msg.MessageId === 'Host_PostmessageReady') {
   window.WOPIPostmessageReady = true;
diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index e44d613a6..bb751a76b 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -45,7 +45,8 @@
source: src,
line: row,
column: col
-   }, desc = err.message || {}, stack = err.stack || {};
+   };
+   var desc = err ? err.message || {}: {}, stack = err ? 
err.stack || {}: {};
var log = 'jserror ' + JSON.stringify(data, null, 2) + 
'\n' + desc + '\n' + stack + '\n';
if (window.ThisIsAMobileApp) {
window.postMobileError(log);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Missing charts in reports (tdf#117162 + not so legacy reportdesign)

[julien2412]

Hello,

For quite some time charts haven't appeared in reports (see tdf#117162). I
tried to debug this and it seems datasource information isn't transmitted in
the whole chain of involved elements.
I'm a bit stuck because I'm lost between all of these elements:
- reportdesign
- chart2
- xmloff
- embeddedobj

Also, I see different things like "createInstance",
"createInstanceWithContext", "factories", different "Reference" with
cast/convert "UNO_QUERY" mechanism, interface, it's quite a mess to try to
follow the logic.
It seems there's a lot of polymorphism so when you got a variable, you never
know what's behind.

Each time I think I've got a lead, I'm losing the trace between all these
elements, a real maze here!

Any thoughts?

Julien
PS : contrary to what README indicates, it's not really a legacy. Indeed, I
created brand new odb file with embedded hsqldb, then created a report with
a chart and saw the pb was in reportdesign.



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann (via logerrit)]

 cui/source/options/optgdlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 514be97f4aa94117ca2356843d1fc74e51c41504
Author: Stephan Bergmann 
AuthorDate: Tue Dec 10 15:30:32 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 10 21:43:46 2019 +0100

missing include (Windows --disable-pch; Translate::ExpandVariables)

Change-Id: Iab20b7e8d7975615c128deb8d02940ede1e8ddd7
Reviewed-on: https://gerrit.libreoffice.org/84862
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7a53fb886760..5f5117e24971 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sal/osl/w32/file.cxx |   68 ---
 1 file changed, 38 insertions(+), 30 deletions(-)

New commits:
commit d3cd305d5b83388a9e8567bc0ac736f344bc4188
Author: Stephan Bergmann 
AuthorDate: Tue Dec 10 15:11:37 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 10 21:43:22 2019 +0100

use scoped enum

Change-Id: I70831ca727dbfca2ea77109e119aac9a110ccf45
Reviewed-on: https://gerrit.libreoffice.org/84858
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 3492ce874550..ca31d714dfef 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "file-impl.hxx"
 #include "file_url.hxx"
@@ -43,6 +44,22 @@
 
 namespace {
 
+/** State
+ */
+enum class StateBits
+{
+Seekable  = 1, /*< open() sets, iff regular file */
+Readable  = 2, /*< open() sets, read() requires */
+Writeable = 4, /*< open() sets, write() requires */
+Modified  = 8  /* write() sets, flush() resets */
+};
+
+}
+
+template<> struct o3tl::typed_flags: 
o3tl::is_typed_flags {};
+
+namespace {
+
 /** File handle implementation.
 */
 struct FileHandle_Impl
@@ -50,16 +67,7 @@ struct FileHandle_Impl
 CRITICAL_SECTION m_mutex;
 HANDLE   m_hFile;
 
-/** State
- */
-enum StateBits
-{
-STATE_SEEKABLE  = 1, /*< open() sets, iff regular file */
-STATE_READABLE  = 2, /*< open() sets, read() requires */
-STATE_WRITEABLE = 4, /*< open() sets, write() requires */
-STATE_MODIFIED  = 8  /* write() sets, flush() resets */
-};
-int   m_state;
+StateBits m_state;
 
 sal_uInt64m_size;/*< file size */
 LONGLONG  m_offset;  /*< physical offset from begin of file */
@@ -150,7 +158,7 @@ FileHandle_Impl::Guard::~Guard()
 
 FileHandle_Impl::FileHandle_Impl(HANDLE hFile)
 : m_hFile   (hFile),
-  m_state   (STATE_READABLE | STATE_WRITEABLE),
+  m_state   (StateBits::Readable | StateBits::Writeable),
   m_size(0),
   m_offset  (0),
   m_filepos (0),
@@ -227,12 +235,12 @@ oslFileError FileHandle_Impl::readAt(
 DWORDnBytesRequested,
 sal_uInt64 * pBytesRead)
 {
-SAL_WARN_IF(!(m_state & STATE_SEEKABLE), "sal.osl", 
"FileHandle_Impl::readAt(): not seekable");
-if (!(m_state & STATE_SEEKABLE))
+SAL_WARN_IF(!(m_state & StateBits::Seekable), "sal.osl", 
"FileHandle_Impl::readAt(): not seekable");
+if (!(m_state & StateBits::Seekable))
 return osl_File_E_SPIPE;
 
-SAL_WARN_IF(!(m_state & STATE_READABLE), "sal.osl", 
"FileHandle_Impl::readAt(): not readable");
-if (!(m_state & STATE_READABLE))
+SAL_WARN_IF(!(m_state & StateBits::Readable), "sal.osl", 
"FileHandle_Impl::readAt(): not readable");
+if (!(m_state & StateBits::Readable))
 return osl_File_E_BADF;
 
 if (nOffset != m_offset)
@@ -258,12 +266,12 @@ oslFileError FileHandle_Impl::writeAt(
 DWORDnBytesToWrite,
 sal_uInt64 * pBytesWritten)
 {
-SAL_WARN_IF(!(m_state & STATE_SEEKABLE), "sal.osl", 
"FileHandle_Impl::writeAt(): not seekable");
-if (!(m_state & STATE_SEEKABLE))
+SAL_WARN_IF(!(m_state & StateBits::Seekable), "sal.osl", 
"FileHandle_Impl::writeAt(): not seekable");
+if (!(m_state & StateBits::Seekable))
 return osl_File_E_SPIPE;
 
-SAL_WARN_IF(!(m_state & STATE_WRITEABLE), "sal.osl", 
"FileHandle_Impl::writeAt(): not writeable");
-if (!(m_state & STATE_WRITEABLE))
+SAL_WARN_IF(!(m_state & StateBits::Writeable), "sal.osl", 
"FileHandle_Impl::writeAt(): not writeable");
+if (!(m_state & StateBits::Writeable))
 return osl_File_E_BADF;
 
 if (nOffset != m_offset)
@@ -296,7 +304,7 @@ oslFileError FileHandle_Impl::readFileAt(
 return osl_File_E_OVERFLOW;
 DWORD nBytesRequested = sal::static_int_cast< DWORD >(uBytesRequested);
 
-if ((m_state & STATE_SEEKABLE) == 0)
+if (!(m_state & StateBits::Seekable))
 {
 // not seekable (pipe)
 DWORD dwDone = 0;
@@ -375,7 +383,7 @@ oslFileError FileHandle_Impl::writeFileAt(
 return osl_File_E_OVERFLOW;
 DWORD nBytesToWrite = sal::static_int_cast< DWORD >(uBytesToWrite);
 
-if ((m_state & STATE_SEEKABLE) == 0)
+if (!(m_state & StateBits::Seekable))
 {
 // not seekable (pipe)
 DWORD dwDone = 0;
@@ -436,7 +444,7 @@ oslFileError FileHandle_Impl::writeFileAt(
 nOffset += bytes;
 
 m_buflen = std::max(m_buflen, bufpos + bytes);
-m_state |= STATE_MODIFIED;
+m_state |= StateBits::Modified;
 }
 return osl_File_E_None;
 }
@@ -593,7 +601,7 @@ oslFileError FileHandle_Impl::writeSequence_Impl(
 oslFileError FileHandle_Impl::syncFile()
 {
 oslFileError result = osl_File_E_None;
-if (m_state & STATE_MODIFIED)
+if (m_state & StateBits::Modified)
 {
 s

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

[Caolán McNamara (via logerrit)]

 svx/inc/spacing.hrc  |  101 ---
 svx/source/dialog/spacinglistbox.cxx |   21 -
 sw/inc/pageformatpanel.hrc   |   42 ++-
 sw/source/uibase/sidebar/PageFormatPanel.cxx |   17 
 4 files changed, 117 insertions(+), 64 deletions(-)

New commits:
commit 137c9e826cdce429a004f05bde40d274437d7554
Author: Caolán McNamara 
AuthorDate: Tue Dec 10 09:44:39 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 10 21:28:13 2019 +0100

Related: tdf#129267 format numbers with the UI locale

Change-Id: Ib7712f56140e5ef9a67700c8ea86383adbf2a4fc
Reviewed-on: https://gerrit.libreoffice.org/84800
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
index 82f107fc67db..b8ca2661c528 100644
--- a/svx/inc/spacing.hrc
+++ b/svx/inc/spacing.hrc
@@ -13,60 +13,81 @@
 
 #define NC_(Context, String) reinterpret_cast(Context "\004" 
u8##String)
 
+struct measurement
+{
+const char* key;
+int twips;
+int human;
+};
+
 // To translators: this is a listbox labelled by "Spacing:", inch units
-const std::pair RID_SVXSTRARY_SPACING_INCH[] =
+const measurement RID_SVXSTRARY_SPACING_INCH[] =
 {
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "None"),0 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Small (1/16″)"),   91 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small (1/8″)"), 181 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small Medium (1/4″)"),  363 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium (3/8″)"),539 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium Large (1/2″)"),  720 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Large (3/4″)"),1077 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Large (1″)"),1440 },
-{ nullptr, 0 }
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "None"),   0, 0 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Small (1/16″)"),   91, 0 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small (1/8″)"), 181, 0 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small Medium (1/4″)"),  363, 0 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium (3/8″)"),539, 0 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium Large (1/2″)"),  720, 0 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Large (3/4″)"),1077, 0 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Large (1″)"),1440, 0 },
+{ nullptr, 0, 0 }
 };
 
 // To translators: this is a listbox labelled by "Spacing:", cm units
-const std::pair RID_SVXSTRARY_SPACING_CM[] =
+const measurement RID_SVXSTRARY_SPACING_CM[] =
 {
-{ NC_("RID_SVXSTRARY_SPACING_CM", "None"),0 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Small (0.16 cm)"),   91 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Small (0.32 cm)"),181 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Small Medium (0.64 cm)"), 363 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium (0.95 cm)"),   539 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium Large (1.27 cm)"), 720 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Large (1.9 cm)"),1077 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Large (2.54 cm)"), 1440 },
-{ nullptr, 0 }
+{ NC_("RID_SVXSTRARY_SPACING_CM", "None"),0,   0 },
+// Extra Small (0.16 cm)
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Small (%1)"),   91,  16 },
+// Small (0.32 cm)
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Small (%1)"),181,  32 },
+// Small Medium (0.64 cm)
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Small Medium (%1)"), 363,  64 },
+// Medium (0.95 cm)
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium (%1)"),   539,  95 },
+// Medium Large (1.27 cm)
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium Large (%1)"), 720, 127 },
+// Large (1.9 cm)
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Large (%1)"),   1077, 190 },
+// Extra Large (2.54 cm)
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Large (%1)"), 1440, 254 },
+{ nullptr, 0, 0 }
 };
 
 // To translators: this is a listbox labelled by "Margins:", inch units
-const std::pair RID_SVXSTRARY_MARGINS_INCH[] =
+const measurement RID_SVXSTRARY_MARGINS_INCH[] =
 {
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "None"),0 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Small (1/16″)"),   91 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Small (1/8″)"), 181 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Small Medium (1/4″)"),  363 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium (3/8″)"),539 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium Large (1/2″)"),  720 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Large (3/4″)"),1077 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Large (1″)"),1440 },
-{ nullptr, 0 }
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "None"),   0, 0 },
+{ NC_("RID_SVXSTRARY_MARGINS_

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

[Pranam Lashkari (via logerrit)]

 loleaflet/src/map/Map.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37a47497a3041595cdaa8240cd44d1e0221fdf49
Author: Pranam Lashkari 
AuthorDate: Tue Dec 10 05:06:17 2019 +0530
Commit: Andras Timar 
CommitDate: Tue Dec 10 21:19:38 2019 +0100

Document focus stopped when renaming sheet

while rename sheet popup is focused and same document is opened where else
popup used to lose the focus and document is focused.
So the name used to get typed in document instead of popup

Change-Id: I18aa3ba9d5485fd9f5928635aa611d7db5771495
Reviewed-on: https://gerrit.libreoffice.org/84794
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit c099715fecdc0d43b4175a28e6e6cd988d0a801c)
Reviewed-on: https://gerrit.libreoffice.org/84881
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 1a26c4b2e..a199716c9 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1186,7 +1186,7 @@ L.Map = L.Evented.extend({
}
 
this._startInactiveTimer();
-   if (!L.Browser.mobile) {
+   if (!L.Browser.mobile && !isAnyVexDialogActive()) {
this.focus();
}
return false;
___
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-0' - wsd/LOOLWSD.cpp

[Jan Holesovsky (via logerrit)]

 wsd/LOOLWSD.cpp |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1a402430c6e0cb4657cdac1fc276ac118c8a6246
Author: Jan Holesovsky 
AuthorDate: Mon Dec 9 13:07:25 2019 +0100
Commit: Andras Timar 
CommitDate: Tue Dec 10 21:18:28 2019 +0100

TemplateSaveAs is broken by design, let's disable it.

Change-Id: I67a4c6aed1c66a8350f2b938fff7bcf1dfd84768
Reviewed-on: https://gerrit.libreoffice.org/84740
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit f71522e7ff7c648ed14f1ef18c2c10f8ef12d997)
Reviewed-on: https://gerrit.libreoffice.org/84865

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f76aaabc1..faa399756 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3074,7 +3074,9 @@ private:
 capabilities->set("convert-to", convert_to);
 
 // Supports the TemplateSaveAs in CheckFileInfo?
-capabilities->set("hasTemplateSaveAs", true);
+// TemplateSaveAs is broken by design, disable it everywhere (and
+// remove at some stage too)
+capabilities->set("hasTemplateSaveAs", false);
 
 // Supports the TemplateSource in CheckFileInfo?
 capabilities->set("hasTemplateSource", true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/align.cxx |   13 +
 sc/inc/attrib.hxx |   14 +-
 sc/inc/globstr.hrc|2 ++
 sc/source/core/data/attrib.cxx|   20 
 sc/source/core/data/docpool.cxx   |2 +-
 sc/source/filter/excel/xistyle.cxx|2 +-
 sc/source/filter/oox/stylesbuffer.cxx |2 +-
 7 files changed, 47 insertions(+), 8 deletions(-)

New commits:
commit ca19ae6e0595f8b69fc4929072636bf10ca3027e
Author: Caolán McNamara 
AuthorDate: Tue Dec 10 15:59:43 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 10 21:06:28 2019 +0100

Related: tdf#129300 add ScShrinkToFitCell to provide a description

Change-Id: I628562f1013825e5ba3c0daaf5ee6b098616b6d0
Reviewed-on: https://gerrit.libreoffice.org/84866
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 940f64a1aca3..7e68685beee2 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -237,9 +237,9 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
 const SdrAngleItem* pAngleItem = static_cast(GetOldItem(
 *rSet, SID_ATTR_ALIGN_DEGREES));
 assert(pAngleItem);
-std::unique_ptr 
pNewAngletem(static_cast(pAngleItem->Clone()));
-pNewAngletem->SetValue(m_aCtrlDial.GetRotation());
-rSet->Put(*pNewAngletem);
+std::unique_ptr 
pNewAngleItem(static_cast(pAngleItem->Clone()));
+pNewAngleItem->SetValue(m_aCtrlDial.GetRotation());
+rSet->Put(*pNewAngleItem);
 bChanged = true;
 }
 
@@ -289,7 +289,12 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
 
 if (m_xBtnShrink->get_state_changed_from_saved())
 {
-rSet->Put(SfxBoolItem(GetWhich(SID_ATTR_ALIGN_SHRINKTOFIT), 
m_xBtnShrink->get_active()));
+const SfxBoolItem* pShrinkItem = static_cast(GetOldItem(
+*rSet, 
SID_ATTR_ALIGN_SHRINKTOFIT));
+assert(pShrinkItem);
+std::unique_ptr 
pNewShrinkItem(static_cast(pShrinkItem->Clone()));
+pNewShrinkItem->SetValue(m_xBtnShrink->get_active());
+rSet->Put(*pNewShrinkItem);
 bChanged = true;
 }
 
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 4865e1594250..a19a3ec0952d 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -294,7 +294,19 @@ public:
 virtual bool GetPresentation( SfxItemPresentation ePresentation,
   MapUnit, MapUnit,
   OUString& rText,
-  const IntlWrapper& ) const override;
+  const IntlWrapper& rIntl) const override;
+};
+
+class SC_DLLPUBLIC ScShrinkToFitCell final : public SfxBoolItem
+{
+public:
+ScShrinkToFitCell(bool bShrink = false);
+virtual ScShrinkToFitCell* Clone(SfxItemPool *pPool = nullptr) const 
override;
+virtual bool GetPresentation(SfxItemPresentation ePres,
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText,
+ const IntlWrapper& rIntl) const override;
 };
 
 #endif
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index d9b92b5c7b6d..4582d832cfb2 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -515,6 +515,8 @@
 #define STR_ERR_NAME_INVALID_CELL_REF   
NC_("STR_ERR_NAME_INVALID_CELL_REF", "Invalid name. Reference to a cell, or a 
range of cells not allowed.")
 #define STR_ERR_LONG_LINK_FORMULA_NEEDING_CHECK 
NC_("STR_ERR_LONG_LINK_FORMULA_NEEDING_CHECK", "External content disabled.")
 #define STR_TEXTORIENTANGLE NC_("STR_TEXTORIENTANGLE", 
"Text orientation angle")
+#define STR_SHRINKTOFITCELL_ON  NC_("STR_SHRINKTOFITCELL_ON", 
"Shrink to fit cell: On")
+#define STR_SHRINKTOFITCELL_OFF NC_("STR_SHRINKTOFITCELL_OFF", 
"Shrink to fit cell: Off")
 
 #endif
 
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index bc2271fb56e6..4cbd076b4423 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -748,4 +748,24 @@ bool 
ScRotateValueItem::GetPresentation(SfxItemPresentation ePresentation,
 return bRet;
 }
 
+ScShrinkToFitCell::ScShrinkToFitCell(bool bShrink)
+: SfxBoolItem(ATTR_SHRINKTOFIT, bShrink)
+{
+}
+
+ScShrinkToFitCell* ScShrinkToFitCell::Clone(SfxItemPool*) const
+{
+return new ScShrinkToFitCell(GetValue());
+}
+
+bool ScShrinkToFitCell::GetPresentation(SfxItemPresentation,
+MapUnit, MapUnit,
+OUString& rText,
+const IntlWrapper&) const
+{
+const char* pId = GetValue() ? STR_SHRINKTOFITCELL_

[Libreoffice-commits] core.git: 3 commits - bridges/source shell/source vcl/win

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |2 -
 shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |   32 +---
 vcl/win/gdi/salgdi2.cxx |8 +---
 3 files changed, 14 insertions(+), 28 deletions(-)

New commits:
commit 3e3e2d454ccc907f4a780d7015b6c8941d41648a
Author: Stephan Bergmann 
AuthorDate: Tue Dec 10 15:31:56 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 10 20:51:14 2019 +0100

loplugin:unusedmember (clang-cl)

ColorScanlineConverter::meDestinationFormat was unused ever since the code 
was
introduced in 6b571ae4608ac15256eb7582f442ce69975370f3 "opengl: change from 
BGRA
to  RGBA color arrangement on Windows".

Change-Id: Ieb530e291270d97613176250f126c223aee8faa9
Reviewed-on: https://gerrit.libreoffice.org/84863
Reviewed-by: Tomaž Vajngerl 
Tested-by: Jenkins

diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 9c5c44deb35e..6ccf3140c169 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -72,16 +72,14 @@ class ColorScanlineConverter
 {
 public:
 ScanlineFormat meSourceFormat;
-ScanlineFormat meDestinationFormat;
 
 int mnComponentSize;
 int mnComponentExchangeIndex;
 
 long mnScanlineSize;
 
-ColorScanlineConverter(ScanlineFormat eSourceFormat, ScanlineFormat 
eDestinationFormat, int nComponentSize, long nScanlineSize)
+ColorScanlineConverter(ScanlineFormat eSourceFormat, int nComponentSize, 
long nScanlineSize)
 : meSourceFormat(eSourceFormat)
-, meDestinationFormat(eDestinationFormat)
 , mnComponentSize(nComponentSize)
 , mnComponentExchangeIndex(0)
 , mnScanlineSize(nScanlineSize)
@@ -127,10 +125,10 @@ void convertToWinSalBitmap(SalBitmap& rSalBitmap, 
WinSalBitmap& rWinSalBitmap)
 std::unique_ptr pConverter;
 
 if (pRead->mnFormat == ScanlineFormat::N24BitTcRgb)
-pConverter.reset(new 
ColorScanlineConverter(ScanlineFormat::N24BitTcRgb, ScanlineFormat::N24BitTcBgr,
+pConverter.reset(new 
ColorScanlineConverter(ScanlineFormat::N24BitTcRgb,
 3, pRead->mnScanlineSize));
 else if (pRead->mnFormat == ScanlineFormat::N32BitTcRgba)
-pConverter.reset(new 
ColorScanlineConverter(ScanlineFormat::N32BitTcRgba, 
ScanlineFormat::N32BitTcBgra,
+pConverter.reset(new 
ColorScanlineConverter(ScanlineFormat::N32BitTcRgba,
 4, pRead->mnScanlineSize));
 if (pConverter)
 {
commit 4b0c05f5c15f460118ef28ce5925a1b732e370c3
Author: Stephan Bergmann 
AuthorDate: Tue Dec 10 15:25:34 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 10 20:51:00 2019 +0100

loplugin:unusedmember (clang-cl)

(The struct that is the type of EHExceptionRecord::params does not need a 
name.)

Change-Id: I372630563dce26c3ac190a9492eabfad9a55a943
Reviewed-on: https://gerrit.libreoffice.org/84861
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index c725bca543c8..daa0426a2c17 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -793,7 +793,7 @@ bool DetectRethrow(void* ppExcept)
 struct _EXCEPTION_RECORD* ExceptionRecord;
 PVOID ExceptionAddress;
 DWORD NumberParameters;
-struct alignas(8) EHParameters
+struct alignas(8)
 {
 DWORD magicNumber;
 PVOID pExceptionObject;
commit 7e5de5480255c830ec8ce88b6fcd39e3a36672e8
Author: Stephan Bergmann 
AuthorDate: Tue Dec 10 15:21:04 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 10 20:50:41 2019 +0100

loplugin:unusedmember (clang-cl)

PROPERTYMAP members pszXPathParent and pszValueNodeName were unused ever 
since
85e0cc246d4350122b17fbe2bfd15635a190ad77 "dv17: #i70994#: Use property 
handler
instead of column info for Windows Vista" introduced the code.  (And 
removing
them allowed to simplify the code further in the obvious way.)

Change-Id: Ie1247cbee31a172a15fd57c4b752d74711b1d3a1
Reviewed-on: https://gerrit.libreoffice.org/84860
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx 
b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index ae547afd2973..5b7121bcf333 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -39,28 +39,16 @@
 long g_DllRefCnt = 0;
 static HINSTANCE g_hModule = nullptr;
 
-namespace {
-
-// Map of property keys to the locations of their value(s) in the .??? XML 
schema
-struct PROPERTYMAP
-{
-PROPERTYKEY key;
-PCWSTR pszXPathParent;
-PCWSTR pszValueNodeName;
-};
-
-}

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

[Stephan Bergmann (via logerrit)]

 sal/osl/w32/pipe.cxx |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 9a921327ce3f68596fc77e07050ad8a587b2696e
Author: Stephan Bergmann 
AuthorDate: Tue Dec 10 15:15:11 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 10 20:50:24 2019 +0100

loplugin:unusedmember (clang-cl)

(i.e., all members of the typedef'ed struct oslPipeBuffer are unused 
because the
typedef'ed struct itself is unused ever since at least
9399c662f36c385b0c705eb34e636a9aec450282 "initial import")

Change-Id: If14ea3b0a1c0bc02b6949fead17513cda8107601
Reviewed-on: https://gerrit.libreoffice.org/84859
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sal/osl/w32/pipe.cxx b/sal/osl/w32/pipe.cxx
index 7eef4a99d021..e5f33ff7c191 100644
--- a/sal/osl/w32/pipe.cxx
+++ b/sal/osl/w32/pipe.cxx
@@ -36,19 +36,6 @@
 #define PIPESYSTEM  ".\\pipe\\"
 #define PIPEPREFIX  "OSL_PIPE_"
 
-namespace {
-
-typedef struct
-{
-sal_uInt32   m_Size;
-sal_uInt32   m_ReadPos;
-sal_uInt32   m_WritePos;
-BYTE m_Data[1];
-
-} oslPipeBuffer;
-
-}
-
 struct oslPipeImpl
 {
 oslInterlockedCount  m_Reference;
___
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-0' - debian/changelog

[Andras Timar (via logerrit)]

 debian/changelog |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 030a1f0459eddc8b4a000d07cc17f1a8867122f5
Author: Andras Timar 
AuthorDate: Tue Dec 10 20:47:36 2019 +0100
Commit: Andras Timar 
CommitDate: Tue Dec 10 20:47:36 2019 +0100

add missing debian/changelog

Change-Id: I24f30238aeb5be4cbba8f329f9dcee2b86df4e53

diff --git a/debian/changelog b/debian/changelog
index e69de29bb..6e8a8ec3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+loolwsd (4.2.0-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool420
+
+ -- Andras Timar   Tue, 10 Dec 2019 20:47:00 +0100
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/align.cxx   |   10 --
 sc/inc/attrib.hxx   |   13 +
 sc/inc/globstr.hrc  |1 +
 sc/inc/scitems.hxx  |3 ++-
 sc/source/core/data/attarray.cxx|2 +-
 sc/source/core/data/attrib.cxx  |   21 +
 sc/source/core/data/column2.cxx |2 +-
 sc/source/core/data/docpool.cxx |3 ++-
 sc/source/core/data/document.cxx|2 +-
 sc/source/core/data/patattr.cxx |1 +
 sc/source/core/tool/autoform.cxx|5 +++--
 sc/source/filter/excel/xistyle.cxx  |2 +-
 sc/source/filter/oox/stylesbuffer.cxx   |2 +-
 sc/source/ui/Accessibility/AccessibleCell.cxx   |2 +-
 sc/source/ui/Accessibility/AccessibleText.cxx   |3 ++-
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx |6 --
 sc/source/ui/unoobj/afmtuno.cxx |7 ---
 sc/source/ui/unoobj/cellsuno.cxx|6 +++---
 sc/source/ui/unoobj/styleuno.cxx|6 +++---
 sc/source/ui/view/output2.cxx   |4 ++--
 20 files changed, 75 insertions(+), 26 deletions(-)

New commits:
commit cf84ead0c4d91ce1473682cfe07914e965b68ab2
Author: Caolán McNamara 
AuthorDate: Tue Dec 10 13:15:23 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 10 20:35:53 2019 +0100

Related: tdf#129300 add ScRotateValueItem description in degrees

by inheriting from SdrAngleItem

Change-Id: Ifcaf46b12d685e683984e15ba2264c191c0d1e5f
Reviewed-on: https://gerrit.libreoffice.org/84847
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index c39c0b4bef2e..940f64a1aca3 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -233,7 +234,12 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
 
 if (m_xNfRotate->get_value_changed_from_saved())
 {
-rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_ALIGN_DEGREES), 
m_aCtrlDial.GetRotation()));
+const SdrAngleItem* pAngleItem = static_cast(GetOldItem(
+*rSet, SID_ATTR_ALIGN_DEGREES));
+assert(pAngleItem);
+std::unique_ptr 
pNewAngletem(static_cast(pAngleItem->Clone()));
+pNewAngletem->SetValue(m_aCtrlDial.GetRotation());
+rSet->Put(*pNewAngletem);
 bChanged = true;
 }
 
@@ -483,7 +489,7 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
 case SfxItemState::DEFAULT:
 case SfxItemState::SET:
 {
-const SfxInt32Item& rAlignItem = static_cast(pCoreAttrs->Get(nWhich));
+const SdrAngleItem& rAlignItem = static_cast(pCoreAttrs->Get(nWhich));
 m_aCtrlDial.SetRotation(rAlignItem.GetValue());
 break;
 }
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 7b9944094d04..4865e1594250 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "scdllapi.h"
@@ -284,6 +285,18 @@ private:
 ScCondFormatIndexes maIndex;
 };
 
+class SC_DLLPUBLIC ScRotateValueItem final : public SdrAngleItem
+{
+public:
+ScRotateValueItem(sal_Int32 nAngle);
+virtual ScRotateValueItem* Clone(SfxItemPool* pPool=nullptr) const 
override;
+
+virtual bool GetPresentation( SfxItemPresentation ePresentation,
+  MapUnit, MapUnit,
+  OUString& rText,
+  const IntlWrapper& ) const override;
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 1273baf40238..d9b92b5c7b6d 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -514,6 +514,7 @@
 #define STR_QUERY_PIVOTTABLE_DELTAB 
NC_("STR_QUERY_PIVOTTABLE_DELTAB", "The selected sheet(s) contain source data 
of related pivot tables that will be lost. Are you sure you want to delete the 
selected sheet(s)?")
 #define STR_ERR_NAME_INVALID_CELL_REF   
NC_("STR_ERR_NAME_INVALID_CELL_REF", "Invalid name. Reference to a cell, or a 
range of cells not allowed.")
 #define STR_ERR_LONG_LINK_FORMULA_NEEDING_CHECK 
NC_("STR_ERR_LONG_LINK_FORMULA_NEEDING_CHECK", "External content disabled.")
+#define STR_TEXTORIENTANGLE NC_("STR_TEXTORIENTANGLE", 
"Text orientation angle")
 
 #endif
 
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 0606b39de634..9093d54039c5 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -50,6 +50,7 @@ class SvxVerJustifyItem;
 class SvxBrushItem;
 class SvxBoxItem;
 class ScCondFormatItem;
+class ScRotateVal

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

[Caolán McNamara (via logerrit)]

 editeng/inc/strings.hrc  |   45 +++
 editeng/source/items/justifyitem.cxx |   79 +++
 include/editeng/editrids.hrc |   19 
 include/svx/rotmodit.hxx |2 
 svx/inc/rotationstrings.hrc  |   36 +++
 svx/source/items/rotmodit.cxx|   13 -
 6 files changed, 103 insertions(+), 91 deletions(-)

New commits:
commit e1807c61f1abc6cab74d0fa8ccac7a8ef9114b88
Author: Caolán McNamara 
AuthorDate: Tue Dec 10 12:48:42 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 10 20:35:35 2019 +0100

Related: tdf#129300 rotation reference edge had no real description

Change-Id: I739c577d9a5f98969daa0c8fb3b7a63dea40743c
Reviewed-on: https://gerrit.libreoffice.org/84831
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx
index c76b569a903f..013bf98d1240 100644
--- a/include/svx/rotmodit.hxx
+++ b/include/svx/rotmodit.hxx
@@ -51,6 +51,8 @@ public:
   OUString& rText, const IntlWrapper& ) const 
override;
 virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const override;
 virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8 
nMemberId ) override;
+private:
+static OUString GetValueText(SvxRotateMode nVal);
 };
 
 
diff --git a/svx/inc/rotationstrings.hrc b/svx/inc/rotationstrings.hrc
new file mode 100644
index ..dfc6c7aa7b44
--- /dev/null
+++ b/svx/inc/rotationstrings.hrc
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVX_INC_ROTATIONSTRINGS_HRC
+#define INCLUDED_SVX_INC_ROTATIONSTRINGS_HRC
+
+#define NC_(Context, String) reinterpret_cast(Context "\004" 
u8##String)
+
+const char* RID_SVXITEMS_ROTATE_MODE[] =
+{
+// enum SvxRotateMode 
+NC_("RID_SVXITEMS_ROTATE_MODE_STANDARD", "Rotation only within cell"),
+NC_("RID_SVXITEMS_ROTATE_MODE_TOP", "From upper cell edge"),
+NC_("RID_SVXITEMS_ROTATE_MODE_CENTER", "From vertical middle cell"),
+NC_("RID_SVXITEMS_ROTATE_MODE_BOTTOM", "From lower cell edge"),
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 8b378cdf5cc9..3ec86cc1ab3d 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -31,7 +31,9 @@
 #include 
 #include 
 
+#include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -56,6 +58,12 @@ SvxRotateModeItem::~SvxRotateModeItem()
 {
 }
 
+OUString SvxRotateModeItem::GetValueText(SvxRotateMode nVal)
+{
+assert(nVal <= SVX_ROTATE_MODE_BOTTOM && "enum overflow!");
+return SvxResId(RID_SVXITEMS_ROTATE_MODE[static_cast(nVal)]);
+}
+
 bool SvxRotateModeItem::GetPresentation(
 SfxItemPresentation ePres,
 MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
@@ -66,8 +74,9 @@ bool SvxRotateModeItem::GetPresentation(
 switch ( ePres )
 {
 case SfxItemPresentation::Complete:
-rText += "...: ";
-[[fallthrough]]; // break; // FALL THROUGH!!!
+rText += GetValueText(GetValue());
+return true;
+break;
 
 case SfxItemPresentation::Nameless:
 rText += OUString::number( GetValue() );
commit 837902468522531c8d0ad35612dce53d4facb668
Author: Caolán McNamara 
AuthorDate: Tue Dec 10 11:52:18 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 10 20:35:11 2019 +0100

reorganize enum based translation

Change-Id: I5615b07d6c1280119f52622566a9c60c46cd5f7a
Reviewed-on: https://gerrit.libreoffice.org/84820
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/inc/strings.hrc b/editeng/inc/strings.hrc
new file mode 100644
index ..7982997116b8
--- /dev/null
+++ b/editeng/inc/strings.hrc
@@ -0,0 +1,

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

[Caolán McNamara (via logerrit)]

 editeng/source/items/justifyitem.cxx |3 ++-
 include/editeng/editrids.hrc |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d7e9db93aec2d1c698e01893fbcaadd6d1207167
Author: Caolán McNamara 
AuthorDate: Tue Dec 10 11:49:47 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 10 20:34:49 2019 +0100

Related: tdf#129300 vertical justify had no description

reword the horizontal one and add a vertical one

Change-Id: I56144bdd542166a4a980bc4db03376f6bdd55ffc
Reviewed-on: https://gerrit.libreoffice.org/84815
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/items/justifyitem.cxx 
b/editeng/source/items/justifyitem.cxx
index 976226e97671..4c813a591aa7 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -328,7 +328,8 @@ OUString SvxVerJustifyItem::GetValueText( SvxCellVerJustify 
nVal )
 case SvxCellVerJustify::Bottom:
 sRet = EditResId(RID_SVXITEMS_VERJUST_BOTTOM);
 break;
-default:
+case SvxCellVerJustify::Block:
+sRet = EditResId(RID_SVXITEMS_VERJUST_BLOCK);
 break;
 }
 return sRet;
diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc
index aa95c68f572e..0857da52adff 100644
--- a/include/editeng/editrids.hrc
+++ b/include/editeng/editrids.hrc
@@ -282,7 +282,7 @@
 #define RID_SVXITEMS_HORJUST_LEFT   
NC_("RID_SVXITEMS_HORJUST_LEFT", "Align left")
 #define RID_SVXITEMS_HORJUST_CENTER 
NC_("RID_SVXITEMS_HORJUST_CENTER", "Centered horizontally")
 #define RID_SVXITEMS_HORJUST_RIGHT  
NC_("RID_SVXITEMS_HORJUST_RIGHT", "Align right")
-#define RID_SVXITEMS_HORJUST_BLOCK  
NC_("RID_SVXITEMS_HORJUST_BLOCK", "Justify")
+#define RID_SVXITEMS_HORJUST_BLOCK  
NC_("RID_SVXITEMS_HORJUST_BLOCK", "Justify horizontally")
 #define RID_SVXITEMS_HORJUST_REPEAT 
NC_("RID_SVXITEMS_HORJUST_REPEAT", "Repeat alignment")
 
 // enum SvxCellVerJustify 
@@ -290,6 +290,7 @@
 #define RID_SVXITEMS_VERJUST_TOP
NC_("RID_SVXITEMS_VERJUST_TOP", "Align to top")
 #define RID_SVXITEMS_VERJUST_CENTER 
NC_("RID_SVXITEMS_VERJUST_CENTER", "Centered vertically")
 #define RID_SVXITEMS_VERJUST_BOTTOM 
NC_("RID_SVXITEMS_VERJUST_BOTTOM", "Align to bottom")
+#define RID_SVXITEMS_VERJUST_BLOCK  
NC_("RID_SVXITEMS_HORJUST_BLOCK", "Justify vertically")
 
 // enum SvxCellJustifyMethod 

 #define RID_SVXITEMS_JUSTMETHOD_AUTO
NC_("RID_SVXITEMS_JUSTMETHOD_AUTO", "Automatic")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock (via logerrit)]

 basegfx/source/polygon/b2dlinegeometry.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5291c3ef56948a91166a597033f3e48e00d57403
Author: Chris Sherlock 
AuthorDate: Sun Dec 1 05:41:43 2019 +1100
Commit: Bartosz Kosiorek 
CommitDate: Tue Dec 10 20:25:41 2019 +0100

tdf#43157 basegfx: remove OSL_ENSURE preconditions

The OSL_ENSUREs that I have converted to assert() are all
preconditions - no function should ever have these values passed to it,
so assert if this does happen so we know passed the values.

Change-Id: I11b1141c8cac2fee7ffdd54d177ecc18e96a9620
Reviewed-on: https://gerrit.libreoffice.org/84140
Reviewed-by: Bartosz Kosiorek 
Tested-by: Bartosz Kosiorek 

diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx 
b/basegfx/source/polygon/b2dlinegeometry.cxx
index ee55a0812141..190a413dfd00 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -46,10 +46,10 @@ namespace basegfx
 double fShift)
 {
 B2DPolyPolygon aRetval;
-OSL_ENSURE(rCandidate.count() > 1, 
"createAreaGeometryForLineStartEnd: Line polygon has too less points (!)");
-OSL_ENSURE(rArrow.count() > 0, "createAreaGeometryForLineStartEnd: 
Empty arrow utils::PolyPolygon (!)");
-OSL_ENSURE(fWidth > 0.0, "createAreaGeometryForLineStartEnd: Width 
too small (!)");
-OSL_ENSURE(fDockingPosition >= 0.0 && fDockingPosition <= 1.0,
+assert((rCandidate.count() > 1) && 
"createAreaGeometryForLineStartEnd: Line polygon has too less points (!)");
+assert((rArrow.count() > 0) && "createAreaGeometryForLineStartEnd: 
Empty arrow utils::PolyPolygon (!)");
+assert((fWidth > 0.0) && "createAreaGeometryForLineStartEnd: Width 
too small (!)");
+assert((fDockingPosition >= 0.0 && fDockingPosition <= 1.0) &&
 "createAreaGeometryForLineStartEnd: fDockingPosition out of 
range [0.0 .. 1.0] (!)");
 
 if(fWidth < 0.0)
@@ -698,8 +698,8 @@ namespace basegfx
 double fMiterMinimumAngle,
 basegfx::triangulator::B2DTriangleVector* pTriangles)
 {
-OSL_ENSURE(fHalfLineWidth > 0.0, "createAreaGeometryForJoin: 
LineWidth too small (!)");
-OSL_ENSURE(eJoin != B2DLineJoin::NONE, "createAreaGeometryForJoin: 
B2DLineJoin::NONE not allowed (!)");
+assert((fHalfLineWidth > 0.0) && "createAreaGeometryForJoin: 
LineWidth too small (!)");
+assert((eJoin != B2DLineJoin::NONE) && "createAreaGeometryForJoin: 
B2DLineJoin::NONE not allowed (!)");
 
 // LineJoin from tangent rPerpendPrev to tangent rPerpendEdge in 
rPoint
 B2DPolygon aEdgePolygon;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock (via logerrit)]

 drawinglayer/source/tools/emfphelperdata.cxx |   19 +++
 drawinglayer/source/tools/emfphelperdata.hxx |   10 ++
 2 files changed, 29 insertions(+)

New commits:
commit aead2871f72d7e5d6e99b0f8cfefddcf101706a7
Author: Chris Sherlock 
AuthorDate: Wed Dec 4 03:18:16 2019 +1100
Commit: Bartosz Kosiorek 
CommitDate: Tue Dec 10 20:24:17 2019 +0100

drawinglayer: improve logging of EmfPlusRecordTypeSetAntiAliasMode

Change-Id: I8c2891b13df3989de90ff407896a52ccf5a5208f
Reviewed-on: https://gerrit.libreoffice.org/84451
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek 

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx 
b/drawinglayer/source/tools/emfphelperdata.cxx
index 41995798e4c3..f8bade29f9e6 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -115,6 +115,20 @@ namespace emfplushelper
 return "";
 }
 
+static OUString SmoothingModeToString(sal_uInt16 nSmoothMode)
+{
+switch (nSmoothMode)
+{
+case SmoothingMode::SmoothingModeDefault: return 
"SmoothingModeDefault";
+case SmoothingMode::SmoothingModeHighSpeed: return 
"SmoothModeHighSpeed";
+case SmoothingMode::SmoothingModeHighQuality: return 
"SmoothingModeHighQuality";
+case SmoothingMode::SmoothingModeNone: return "SmoothingModeNone";
+case SmoothingMode::SmoothingModeAntiAlias8x4: return 
"SmoothingModeAntiAlias8x4";
+case SmoothingMode::SmoothingModeAntiAlias8x8: return 
"SmoothingModeAntiAlias8x8";
+}
+return "";
+}
+
 EMFPObject::~EMFPObject()
 {
 }
@@ -1551,6 +1565,11 @@ namespace emfplushelper
 }
 case EmfPlusRecordTypeSetAntiAliasMode:
 {
+bool bUseAntiAlias = (flags & 0x0001);
+sal_uInt8 nSmoothingMode = ((flags & 0xFE00) >> 1);
+SAL_INFO("drawinglayer", "EMF+ 
EmfPlusRecordTypeSetAntiAliasMode");
+SAL_INFO("drawinglayer", "EMF+\t Antialiasing: " << 
(bUseAntiAlias ? "enabled" : "disabled"));
+SAL_INFO("drawinglayer", "EMF+\t Smoothing mode: " << 
SmoothingModeToString(nSmoothingMode));
 SAL_INFO("drawinglayer", "TODO\t EMF+ 
SetAntiAliasMode");
 break;
 }
diff --git a/drawinglayer/source/tools/emfphelperdata.hxx 
b/drawinglayer/source/tools/emfphelperdata.hxx
index 2b96f46cef4e..ba608ed38a2e 100644
--- a/drawinglayer/source/tools/emfphelperdata.hxx
+++ b/drawinglayer/source/tools/emfphelperdata.hxx
@@ -112,6 +112,16 @@ namespace emfplushelper
 PixelOffsetModeHalf = 0x04
 };
 
+enum SmoothingMode
+{
+SmoothingModeDefault = 0x00,
+SmoothingModeHighSpeed = 0x01,
+SmoothingModeHighQuality = 0x02,
+SmoothingModeNone = 0x03,
+SmoothingModeAntiAlias8x4 = 0x04,
+SmoothingModeAntiAlias8x8 = 0x05
+};
+
 enum UnitType
 {
 UnitTypeWorld = 0x00,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock (via logerrit)]

 drawinglayer/source/tools/emfppen.cxx |8 
 drawinglayer/source/tools/emfppen.hxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 87940721921ec04255a5acfcab41fac4053320d0
Author: Chris Sherlock 
AuthorDate: Tue Dec 10 11:42:03 2019 +1100
Commit: Bartosz Kosiorek 
CommitDate: Tue Dec 10 20:22:41 2019 +0100

drawinglayer: fix spelling of mitterLimit - should be miterLimit

Change-Id: Iaa20d1786ae6faac23cd06598da6097f22f0b623
Reviewed-on: https://gerrit.libreoffice.org/84836
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek 

diff --git a/drawinglayer/source/tools/emfppen.cxx 
b/drawinglayer/source/tools/emfppen.cxx
index 85a5e176c1f3..9536a7027615 100644
--- a/drawinglayer/source/tools/emfppen.cxx
+++ b/drawinglayer/source/tools/emfppen.cxx
@@ -57,7 +57,7 @@ namespace emfplushelper
 , startCap(0)
 , endCap(0)
 , lineJoin(0)
-, mitterLimit(0.0)
+, miterLimit(0.0)
 , dashStyle(0)
 , dashCap(0)
 , dashOffset(0.0)
@@ -155,12 +155,12 @@ namespace emfplushelper
 
 if (penDataFlags & PenDataMiterLimit)
 {
-s.ReadFloat(mitterLimit);
-SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataMiterLimit: 0x" << 
std::hex << mitterLimit);
+s.ReadFloat(miterLimit);
+SAL_WARN("drawinglayer", "EMF+\t\tTODO PenDataMiterLimit: " << 
std::dec << miterLimit);
 }
 else
 {
-mitterLimit = 0;
+miterLimit = 0;
 }
 
 if (penDataFlags & PenDataLineStyle)
diff --git a/drawinglayer/source/tools/emfppen.hxx 
b/drawinglayer/source/tools/emfppen.hxx
index a0b8dc457842..7570ee49bb40 100644
--- a/drawinglayer/source/tools/emfppen.hxx
+++ b/drawinglayer/source/tools/emfppen.hxx
@@ -51,7 +51,7 @@ namespace emfplushelper
 sal_Int32 startCap;
 sal_Int32 endCap;
 sal_Int32 lineJoin;
-float mitterLimit;
+float miterLimit;
 sal_Int32 dashStyle;
 sal_Int32 dashCap;
 float dashOffset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4d5a3efb8f7412c7bc5171f75cc5d1a0b0a946a5
Author: Tamás Zolnai 
AuthorDate: Tue Dec 10 18:26:03 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Tue Dec 10 18:46:30 2019 +0100

Mobile: long-press on a selection, should not kill the selection

Don't clear selection unconditionally. _clearSearchResults() method
is called by mouse click and we don't want to clear selection
during opening a context menu.
If there is any search term then we can clear the selection,
otherwise don't change it.

Change-Id: I8f672e4d6d30e9bb3828a39e591a64598a7a8722
Reviewed-on: https://gerrit.libreoffice.org/84885
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 0120036ea..e51b2f755 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1423,11 +1423,13 @@ L.TileLayer = L.GridLayer.extend({
},
 
_clearSearchResults: function() {
+   if (this._searchTerm) {
+   this._selections.clearLayers();
+   }
this._lastSearchResult = null;
this._searchResults = null;
this._searchTerm = null;
this._searchResultsLayer.clearLayers();
-   this._selections.clearLayers();
},
 
_drawSearchResults: function() {
___
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.Toolbar.js |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9cc80474a8d00fcbe21a532b43179c5440fc672e
Author: mert 
AuthorDate: Tue Dec 10 16:01:00 2019 +0300
Commit: Michael Meeks 
CommitDate: Tue Dec 10 18:37:06 2019 +0100

fix Selected language in the bottom status bar

disappears, also fixed language selection
does not work at all

Change-Id: I1349e6ccc786f4c17130f14ff95e44f4ea858550
Reviewed-on: https://gerrit.libreoffice.org/84845
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 86474ddce..1fa5f333d 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1833,15 +1833,13 @@ function onCommandStateChanged(e) {
else if (commandName === '.uno:LanguageStatus') {
var code = state;
var language = _(state);
-
var split = code.split(';');
if (split.length > 1) {
language = _(split[0]);
code = split[1];
}
-   updateToolbarItem(statusbar, 'LanguageStatus', 
$('#LanguageStatus').html(language).parent().html());
w2ui['editbar'].set('languagecode', {text: code});
-   $('#tb_actionbar_item_LanguageStatus table table 
td:first-of-type').html(language+' ');
+   w2ui['actionbar'].set('LanguageStatus', {text: language, 
selected: language});
}
else if (commandName === '.uno:ModifiedStatus') {
if (e.state === 'true') {
@@ -1962,7 +1960,9 @@ function onCommandValues(e) {
for (var lang in languages) {
translated = languages[lang].translated;
neutral = languages[lang].neutral;
-   toolbaritems.push({ id: neutral, text: translated, uno: 
constLang + encodeURIComponent('Default_' + neutral) });
+   var splitTranslated = translated.split(';');
+   var splitNeutral = neutral.split(';');
+   toolbaritems.push({ id: neutral, text: 
splitTranslated[0], uno: constLang + encodeURIComponent('Default_' + 
splitNeutral[0]) });
}
 
toolbaritems.push({ id: 'reset', text: resetLang, uno: 
constLang + constDefault });
___
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-0' - loleaflet/src

[mert (via logerrit)]

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

New commits:
commit b8317170aad2d05b967d284935752c7a0939f7e8
Author: mert 
AuthorDate: Tue Dec 10 16:01:00 2019 +0300
Commit: Michael Meeks 
CommitDate: Tue Dec 10 18:37:23 2019 +0100

fix Selected language in the bottom status bar

disappears, also fixed language selection
does not work at all

Change-Id: I1349e6ccc786f4c17130f14ff95e44f4ea858550
Reviewed-on: https://gerrit.libreoffice.org/84845
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit 9cc80474a8d00fcbe21a532b43179c5440fc672e)
Reviewed-on: https://gerrit.libreoffice.org/84886
Tested-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 5d9de3baf..1537062ce 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1833,15 +1833,13 @@ function onCommandStateChanged(e) {
else if (commandName === '.uno:LanguageStatus') {
var code = state;
var language = _(state);
-
var split = code.split(';');
if (split.length > 1) {
language = _(split[0]);
code = split[1];
}
-   updateToolbarItem(statusbar, 'LanguageStatus', 
$('#LanguageStatus').html(language).parent().html());
w2ui['editbar'].set('languagecode', {text: code});
-   $('#tb_actionbar_item_LanguageStatus table table 
td:first-of-type').html(language+' ');
+   w2ui['actionbar'].set('LanguageStatus', {text: language, 
selected: language});
}
else if (commandName === '.uno:ModifiedStatus') {
if (e.state === 'true') {
@@ -1962,7 +1960,9 @@ function onCommandValues(e) {
for (var lang in languages) {
translated = languages[lang].translated;
neutral = languages[lang].neutral;
-   toolbaritems.push({ id: neutral, text: translated, uno: 
constLang + encodeURIComponent('Default_' + neutral) });
+   var splitTranslated = translated.split(';');
+   var splitNeutral = neutral.split(';');
+   toolbaritems.push({ id: neutral, text: 
splitTranslated[0], uno: constLang + encodeURIComponent('Default_' + 
splitNeutral[0]) });
}
 
toolbaritems.push({ id: 'reset', text: resetLang, uno: 
constLang + constDefault });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fw: benchmark of Excel, Calc, Google Docs

[Aditya Parameswaran]

Wols,

Thanks for sharing your concerns, replete with quotes from Einstein :-) !

I believe I share those concerns... but there are of course some liberties
we can take as an academic group that you folks managing a popular
spreadsheet tool cannot take (e.g., doing a proof of concept as opposed to
a robust implementation.)   From a research/academic standpoint it is
valuable to note that something is possible, even if the solution is not
ideal given other pragmatic considerations.  BTW, I don't believe that
anything we're doing *requires* a relational database -- a NoSQL setup
would work just fine.

I'd be happy to discuss more.  Our goal is to understand the stumbling
blocks in translating our work into spreadsheet tools such as Calc and see
how we can best help with what we've learned.

Cheers,
Aditya

On Mon, Dec 9, 2019 at 3:37 PM Wols Lists  wrote:

> On 09/12/19 19:14, Aditya Parameswaran wrote:
> >The idea of converting to SQL queries is an interesting one
> > but I find
> > it very hard to believe it would provide any performance advantage at
> > the same memory footprint. Furthermore - I'd be interested to know
> how
> > you do other spreadsheet operations: row & column insertion,
> addressing,
> > and dependency work on top of a SQL database with any efficiency.
> >
> >
> > We started by having the relational database be a simple persistent
> > storage layer, when coupled with an index to retrieve data by position,
> > can allow us to scroll through large datasets of billions of rows at
> > ease. We developed a new positional index to handle insertions and
> > deletions in O(log(n)) -- https://arxiv.org/pdf/1708.06712.pdf. I agree
> > that pushing the computation to the relational database does have
> > overheads; but at the same time, it allows for scaling to arbitrarily
> > large datasets.
>
> "the quickest way to optimise database access is to ditch first normal
> form".
>
> A provocative statement I know, but I'm very much in the NoSQL camp. I
> can hunt up the details of a face-off between Oracle and Cache, where
> Oracle had to "cheat" to achieve 100K tpm (things like deferring index
> updates) whereas Cache blasted through 250K barely breaking a sweat ...
> (or it might well have been tps)
>
> The maths supports this ...
>
> That said, a spreadsheet is inherently first normal formal, so tying a
> spreadsheet and a relational database together MAY make sense.
>
> In general though, Einstein said "make things as simple as possible BUT
> NO SIMPLER". Relational oversimplifies the database side, which means
> the application side is over-complex in order to compensate. (Which is
> why Cache blew Oracle out of the water.)
>
> I'm quite happy to wax lyrical, but I'd rather not preach to an audience
> who aren't at least interested. Feel free to ask me to continue on list,
> or contact me privately, and I'll try to prove everything as
> mathematically as I can :-)
>
> > but at the same time, it allows for scaling to arbitrarily
> > large datasets.
>
> At the price of massive unnecessary complexity.
>
> Cheers,
> Wol
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Muhammet Kara (via logerrit)]

 sd/uiconfig/simpress/ui/tabledesignpanel.ui |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 293754a03cab35530abdac56f56d2eae13d14fa8
Author: Muhammet Kara 
AuthorDate: Tue Dec 10 18:59:36 2019 +0300
Commit: Michael Meeks 
CommitDate: Tue Dec 10 18:26:14 2019 +0100

Sidebar: Don't expand table design styles vertically

Otherwise, they become veeery high in Online.

Change-Id: I2572eb6ac94ad5e46aa596095cd718aef63eed6c
Reviewed-on: https://gerrit.libreoffice.org/84867
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/sd/uiconfig/simpress/ui/tabledesignpanel.ui 
b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
index 64aaca03fae4..a51f5511a7a1 100644
--- a/sd/uiconfig/simpress/ui/tabledesignpanel.ui
+++ b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -112,7 +112,6 @@
 True
 False
 True
-True
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Randomnes in LibreOffice Encryption

[Michael Stahl]

On 10.12.19 14:57, Steve Martin wrote:

Hi,

At 
"http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#__RefHeading__752859_826425813"; 
I read:



The defined values for the manifest:key-derivation-name attribute are:

  •PBKDF2: The PBKDF2 key derivation method with HMAC-SHA-1 for the 
Pseudo-Random Function(PRF). See [RFC2898] sections 5.2 and B.1.1.


HMAC-SHA-1 for the Pseudo-Random Function(PRF)? HMAC-SHA-1 is a 
deterministic function. That means I enter a value and get a value out. 
And no matter how many times I call the function with the input value, I 
always get the same output value. So, with HMAC-SHA-1 is no randomnes 
possible. So PRFs exists when PRNG (Pseudo Random Number Generator)s 
exists.


of course, but if you use an *actual* random function to derive the key 
from the salt and the password then you'll have trouble decrypting the 
resulting ciphertext...


I looked at the referenced RFC 2898: "PKCS #5: Password-Based 
Cryptography Specification Version 2.0" 
(https://www.ietf.org/rfc/rfc2898.txt) how this will be made. In RFC 
2898 at the end of page 6 and start of page 7 is written the following:


If a random number generator or pseudorandom generator is not 
available,


LibreOffice requires one.

available, a deterministic alternative for generating the salt (or the 
random part of it) is to apply a password-based key derivation 
function to the password and the message M to be processed. For 
instance, the salt could be computed with a key derivation function as 
S = KDF (P, M). This approach is not recommended if the message M is 
known to belong to a small message space (e.g., "Yes" or "No"), 
however, since then there will only be a small number of possible salts.


My question: Which method is implemented in LibreOffice? Does 
LibreOffice use a PRNG or the method specified in the ODF standard with 
the HMAC-SHA-1() function over the plaintext and (password)/(hash of the 
password))? The second one is a little bit insecure.


both: the method specified in ODF applies the HMAC-SHA1 function to 
generate the key from the salt, not to generate the salt.

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

Re: Randomnes in LibreOffice Encryption

[Alexander Thurgood]

Le 10/12/2019 à 14:57, Steve Martin a écrit :

Steve,

If you haven't already read this, it might be helpful :

http://ringlord.com/dl/Decrypting%20ODF%20Files.odt


Alex

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

Re: Randomnes in LibreOffice Encryption

[Steve Martin]

Thank's for your fast reply.

of course, but if you use an *actual* random function to derive the key 
from the salt and the password then you'll have trouble decrypting the 
resulting ciphertext...


Why should that be problematic? Randomly generated values ​​(for 
example, salt or initialization vector) are known because they are 
included in the unencrypted manifest.xml file. So the decryption 
algorithm (which is complete deterministic) has access to the values and 
there is no randomness in the decryption process.


both: the method specified in ODF applies the HMAC-SHA1 function to 
generate the key from the salt, not to generate the salt.


Ah, by that you mean the PRF, which used in the F()-function defined in 
RFC2898 on page 10, is the HMAC-SHA-1 function.


But how is the salt generated? The PBKDF2 key derivation method needs a 
Salt which is randomly generated:


In password-based encryption, the party encrypting a message can gain 
assurance that these benefits are realized simply by selecting a large 
and sufficiently random salt when deriving an encryption key from a 
password.

(at bottom on Page 5)


I looked at the referenced RFC 2898: "PKCS #5: Password-Based 
Cryptography Specification Version 2.0" 
(https://www.ietf.org/rfc/rfc2898.txt) how this will be made. In RFC 
2898 at the end of page 6 and start of page 7 is written the 
following:


If a random number generator or pseudorandom generator is not 
available,


LibreOffice requires one.

available, a deterministic alternative for generating the salt (or 
the random part of it) is to apply a password-based key derivation 
function to the password and the message M to be processed. For 
instance, the salt could be computed with a key derivation function 
as S = KDF (P, M). This approach is not recommended if the message M 
is known to belong to a small message space (e.g., "Yes" or "No"), 
however, since then there will only be a small number of possible 
salts.


My question: Which method is implemented in LibreOffice? Does 
LibreOffice use a PRNG or the method specified in the ODF standard 
with the HMAC-SHA-1() function over the plaintext and (password)/(hash 
of the password))? The second one is a little bit insecure.


both: the method specified in ODF applies the HMAC-SHA1 function to
generate the key from the salt, not to generate the salt.


Or more precisely, LibreOffice uses a PRNG() to create a random salt. Is 
that correct?

If yes, does LibreOffice use a PRNG provided by the operating system?
If not, how is the salt generated?

Thanks many for your help.

Greetings

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

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

[Pranam Lashkari (via logerrit)]

 loleaflet/src/map/Map.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c099715fecdc0d43b4175a28e6e6cd988d0a801c
Author: Pranam Lashkari 
AuthorDate: Tue Dec 10 05:06:17 2019 +0530
Commit: Michael Meeks 
CommitDate: Tue Dec 10 18:04:05 2019 +0100

Document focus stopped when renaming sheet

while rename sheet popup is focused and same document is opened where else
popup used to lose the focus and document is focused.
So the name used to get typed in document instead of popup

Change-Id: I18aa3ba9d5485fd9f5928635aa611d7db5771495
Reviewed-on: https://gerrit.libreoffice.org/84794
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 1a26c4b2e..a199716c9 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1186,7 +1186,7 @@ L.Map = L.Evented.extend({
}
 
this._startInactiveTimer();
-   if (!L.Browser.mobile) {
+   if (!L.Browser.mobile && !isAnyVexDialogActive()) {
this.focus();
}
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86350c62fe0beb6059bdc276cf9e43bf8c078c5f
Author: Jan Holesovsky 
AuthorDate: Tue Dec 10 17:12:33 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 17:26:45 2019 +0100

android: Cosmetics.

Change-Id: I9bdb97b6620dcecc5fb55a07c30309ceab6a4cc2
Reviewed-on: https://gerrit.libreoffice.org/84875
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
index 4683f81f9..338597615 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
@@ -172,7 +172,7 @@ public class OwnCloudFile implements IFile {
 @Override
 public void saveDocument() {
 if (mCachedFile == null) {
-Log.e(LOGTAG, "Trying to save document that was not created via 
getDocument()(");
+Log.e(LOGTAG, "Trying to save document that was not created via 
getDocument()");
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 android/app/src/main/res/values/strings.xml |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2a1d62c6a76377e893a184bde6ff74808ff8ad69
Author: Jan Holesovsky 
AuthorDate: Tue Dec 10 16:57:10 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 17:25:27 2019 +0100

android: Ultimately we want to have this working for both.

Currently it can open files both from the ownCloud and Nextcloud
storage, but so far it seems that it cannot save back to ownCloud.

Unfortunately both the libraries have the same namespace, so to have
both the ownCloud's and Nextcloud's library in the same .apk, we'll need
to use some additional tricks.

Change-Id: I7fd647a42d3bd90b6268017ae392d61f67f548c0
Reviewed-on: https://gerrit.libreoffice.org/84874
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/android/app/src/main/res/values/strings.xml 
b/android/app/src/main/res/values/strings.xml
index 786b3b59a..8a2aa4d7b 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -76,9 +76,9 @@
 Remote server
 USB connected, configure your 
device.
 
-Cannot connect to ownCloud 
server. Check your configuration.
-Cannot log into ownCloud server. 
Check your configuration.
-Unspecified error connecting to 
ownCloud server. Check your configuration and/or try later.
+Cannot connect to the Cloud 
server. Check your configuration.
+Cannot log into the Cloud server. 
Check your configuration.
+Unspecified error connecting to 
the Cloud server. Check your configuration and/or try later.
 
 Invalid root file. Check your 
sd card configuration.
 Invalid root file. Check your OTG device 
and/or configuration.
@@ -89,13 +89,13 @@
 
 
 Storage provider settings
-ownCloud settings
+Cloud server settings
 Physical storage settings
 External SD path
 OTG device path
 Experimental Feature: Use only if OTG device is 
writable.
 Server URL
-URL and port of the ownCloud 
server.
+URL and port of the Cloud 
server.
 User name
 Password
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 
android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
 |3 +--
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExtsdDocumentsProvider.java
 |5 -
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/OTGDocumentsProvider.java
   |5 -
 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
|2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 3dce52c307b203a1a255d4e986a62735543e644c
Author: Jan Holesovsky 
AuthorDate: Tue Dec 10 16:43:05 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 17:14:43 2019 +0100

android: Completely hide the External SD and OTG.

Many reports said it was broken, so let's disable before anybody
actually tests it & fixes.

Change-Id: I179de3774c0fb4be018e59cd629936a9d565dc15
Reviewed-on: https://gerrit.libreoffice.org/84873
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
index eb4a0ac91..66627c6f0 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
@@ -62,11 +62,10 @@ public final class DocumentProviderFactory {
 instance.providers = new IDocumentProvider[5];
 instance.providers[0] = new LocalDocumentsDirectoryProvider(0);
 instance.providers[1] = new LocalDocumentsProvider(1);
+instance.providers[EXTSD_PROVIDER_INDEX] = new 
ExtsdDocumentsProvider(EXTSD_PROVIDER_INDEX, context);
 instance.providers[OTG_PROVIDER_INDEX] = new 
OTGDocumentsProvider(OTG_PROVIDER_INDEX, context);
 instance.providers[4] = new OwnCloudProvider(4, context);
 
-instance.providers[EXTSD_PROVIDER_INDEX] = new 
ExtsdDocumentsProvider(EXTSD_PROVIDER_INDEX, context);
-
 // initialize document provider names list
 instance.providerNames = new String[instance.providers.length];
 for (int i = 0; i < instance.providers.length; i++) {
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExtsdDocumentsProvider.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExtsdDocumentsProvider.java
index 46dec56f7..2cb8cc72e 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExtsdDocumentsProvider.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExtsdDocumentsProvider.java
@@ -163,7 +163,10 @@ public class ExtsdDocumentsProvider implements 
IExternalDocumentProvider,
 // getExternalStorageState().equals(Environment.MEDIA_MOUNTED) && 
isExternalStorageRemovable()
 // but they refer to the primary external storage anyway, so what 
currently is covered by the
 // "LocalDocumentsProvider"
-return rootPathURI!=null && ContextCompat.checkSelfPermission(context, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) == 
PackageManager.PERMISSION_GRANTED;
+
+// FIXME temporarily disabled for good
+return false;
+//return rootPathURI!=null && 
ContextCompat.checkSelfPermission(context, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) == 
PackageManager.PERMISSION_GRANTED;
 }
 
 @Override
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/external/OTGDocumentsProvider.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/external/OTGDocumentsProvider.java
index 899486c51..5add700b5 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/external/OTGDocumentsProvider.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/external/OTGDocumentsProvider.java
@@ -85,6 +85,9 @@ public class OTGDocumentsProvider implements 
IExternalDocumentProvider,
 @Override
 public boolean checkProviderAvailability(Context context) {
 // check if system supports USB Host
-return rootPathURI.length()>0 && 
context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_USB_HOST);
+
+// FIXME temporarily disabled for good
+return false;
+//return rootPathURI.length()>0 && 
context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_USB_HOST);
 }
 }
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index c21e884f5..4d6512ab7 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -272,7 +272,7 

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

[Jan Holesovsky (via logerrit)]

 
android/app/src/main/java/org/libreoffice/androidapp/storage/IDocumentProvider.java
 |2 
 android/app/src/main/java/org/libreoffice/androidapp/storage/IFile.java
 |4 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExternalFile.java
 |   28 ++-
 
android/app/src/main/java/org/libreoffice/androidapp/storage/local/LocalFile.java
   |2 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
 |   33 +++
 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
  |   83 +-
 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java   
 |   19 ++
 7 files changed, 145 insertions(+), 26 deletions(-)

New commits:
commit 07c3a7bdbbec886dd0d2635090e5bd483286853f
Author: Jan Holesovsky 
AuthorDate: Tue Dec 10 16:12:52 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 17:14:03 2019 +0100

android: Implement uploading back to the cloud storage.

All these cases should be covered:

* user's explicit save via File -> Save
* autosave
* autosave on exit

Implemented via IntentFilter magic, we can call back from one activity
to the other to perform the actual saving in the shell.

Change-Id: I97d6e94028a9600a71f030af7146ee01163d09b8
Reviewed-on: https://gerrit.libreoffice.org/84872
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/IDocumentProvider.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/IDocumentProvider.java
index 474610ab1..a16fb07c7 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/IDocumentProvider.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/IDocumentProvider.java
@@ -68,3 +68,5 @@ public interface IDocumentProvider {
  */
 boolean checkProviderAvailability(Context context);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/IFile.java 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/IFile.java
index da8067bd0..5817f40b2 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/storage/IFile.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/storage/IFile.java
@@ -112,5 +112,7 @@ public interface IFile {
  * @param file
  *A local file pointing to the new version of the document.
  */
-void saveDocument(File file);
+void saveDocument();
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExternalFile.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExternalFile.java
index 6a78f983c..557e7580e 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExternalFile.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExternalFile.java
@@ -34,7 +34,10 @@ public class ExternalFile implements IFile{
 
 private ExtsdDocumentsProvider provider;
 private DocumentFile docFile;
-private File duplicateFile;
+
+/** We create the document just once, cache it for further returning. */
+private File mCachedFile;
+
 private Context context;
 
 public ExternalFile(ExtsdDocumentsProvider provider, DocumentFile docFile, 
Context context) {
@@ -112,12 +115,14 @@ public class ExternalFile implements IFile{
 
 @Override
 public File getDocument() {
-if(isDirectory()) {
+if (mCachedFile != null)
+return mCachedFile;
+
+if (isDirectory())
 return null;
-} else {
-duplicateFile = duplicateInCache();
-return duplicateFile;
-}
+
+mCachedFile = duplicateInCache();
+return mCachedFile;
 }
 
 private File duplicateInCache() {
@@ -138,11 +143,16 @@ public class ExternalFile implements IFile{
 }
 
 @Override
-public void saveDocument(File file) {
+public void saveDocument() {
+if (mCachedFile == null) {
+Log.e(LOGTAG, "Trying to save document that was not created via 
getDocument()(");
+return;
+}
+
 try{
 OutputStream ostream = context.getContentResolver().
 openOutputStream(docFile.getUri());
-InputStream istream = new FileInputStream(file);
+InputStream istream = new FileInputStream(mCachedFile);
 
 IOUtils.copy(istream, ostream);
 
@@ -162,3 +172,5 @@ public class ExternalFile implements IFile{
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/

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

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |   80 
+-
 loleaflet/src/control/Control.Toolbar.js |7 
 2 files changed, 51 insertions(+), 36 deletions(-)

New commits:
commit c6f36965cfc1bd68fdb88b01d493163b5d176bcc
Author: Jan Holesovsky 
AuthorDate: Sat Aug 10 00:21:50 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 17:10:29 2019 +0100

android: Framework to be able to broadcast to another activity.

Change-Id: I24634c5e06223bd1c5cdb8da511159b03ce35719
Reviewed-on: https://gerrit.libreoffice.org/84871
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git 
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java 
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index dbb58d0b0..3fe1c317f 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -528,7 +528,8 @@ public class LOActivity extends AppCompatActivity {
  * return true to pass the message to the native part or false to block 
the message
  */
 boolean interceptMsgFromWebView(String message) {
-switch (message) {
+String[] messageAndParam = message.split(" ", 2); // the command and 
the rest (that can potentially contain spaces too)
+switch (messageAndParam[0]) {
 case "PRINT":
 mainHandler.post(new Runnable() {
 @Override
@@ -540,47 +541,53 @@ public class LOActivity extends AppCompatActivity {
 case "SLIDESHOW":
 initiateSlideShow();
 return false;
-case "uno .uno:Paste":
-clipData = clipboardManager.getPrimaryClip();
-if (clipData != null) {
-if 
(clipData.getDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
-final ClipData.Item clipItem = clipData.getItemAt(0);
+case "SAVE":
+sendBroadcast(messageAndParam[0], messageAndParam[1]);
+return false;
+case "uno":
+switch (messageAndParam[1]) {
+case ".uno:Paste":
+clipData = clipboardManager.getPrimaryClip();
+if (clipData != null) {
+if 
(clipData.getDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
+final ClipData.Item clipItem = 
clipData.getItemAt(0);
+nativeHandler.post(new Runnable() {
+@Override
+public void run() {
+
LOActivity.this.paste("text/plain;charset=utf-16", 
clipItem.getText().toString());
+}
+});
+}
+return false;
+}
+break;
+case ".uno:Copy": {
 nativeHandler.post(new Runnable() {
 @Override
 public void run() {
-
LOActivity.this.paste("text/plain;charset=utf-16", 
clipItem.getText().toString());
+String tempSelectedText = 
LOActivity.this.getTextSelection();
+if (!tempSelectedText.equals("")) {
+clipData = 
ClipData.newPlainText(ClipDescription.MIMETYPE_TEXT_PLAIN, tempSelectedText);
+clipboardManager.setPrimaryClip(clipData);
+}
 }
 });
+break;
 }
-return false;
-}
-break;
-case "uno .uno:Copy": {
-nativeHandler.post(new Runnable() {
-@Override
-public void run() {
-String tempSelectedText = 
LOActivity.this.getTextSelection();
-if (!tempSelectedText.equals("")) {
-clipData = 
ClipData.newPlainText(ClipDescription.MIMETYPE_TEXT_PLAIN, tempSelectedText);
-clipboardManager.setPrimaryClip(clipData);
-}
-}
-});
-break;
-}
-case "uno .uno:Cut": {
-nativeHandler.post(new Runnable() {
-@Override
-public void run() {
-String tempSelectedText = 
LOActivity.this.getTextSelection();
-if (!tempSelectedText.equals("")) {
-clipData = 
ClipData.newPlainT

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

[Jan Holesovsky (via logerrit)]

 android/app/build.gradle   
 |6 +-
 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
 |   29 +-
 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudProvider.java
 |8 +-
 android/app/src/main/res/values/strings.xml
 |2 
 4 files changed, 23 insertions(+), 22 deletions(-)

New commits:
commit 9a6c6f767dc1fdbb2a00f37288a1a1bc5b6d7997
Author: Jan Holesovsky 
AuthorDate: Mon Dec 9 19:32:07 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 17:08:56 2019 +0100

android: Update the library for remote files to nextcloud/android-library.

The library bundled in the LibreOffice sources didn't work for me
neither with ownCloud nor with Nextcloud.

Change-Id: I88ee06bdffeed3229643575ffb274432582eaab8
Reviewed-on: https://gerrit.libreoffice.org/84869
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 98ace7fb8..84f5ef91c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -43,8 +43,8 @@ android {
 }
 
 repositories {
-flatDir {
-dirs 
"${liboWorkdir}/UnpackedTarball/owncloud_android_lib/build/outputs/aar"
+maven {
+url "https://jitpack.io";
 }
 }
 
@@ -54,7 +54,7 @@ dependencies {
 implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 implementation 'androidx.recyclerview:recyclerview:1.0.0'
 implementation 'com.google.android.material:material:1.1.0-alpha04'
-implementation(name: 'owncloud_android_lib', ext: 'aar')
+implementation 'com.github.nextcloud:android-library:-SNAPSHOT'
 
 //before changing the version please see 
https://issuetracker.google.com/issues/111662669
 implementation 'androidx.preference:preference:1.1.0-alpha01'
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
index 21d800234..cc7589fae 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
@@ -14,11 +14,12 @@ import java.util.List;
 import org.libreoffice.androidapp.storage.IFile;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import 
com.owncloud.android.lib.resources.files.ChunkedUploadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
-import com.owncloud.android.lib.resources.files.RemoteFile;
-import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
+import 
com.owncloud.android.lib.resources.files.ChunkedFileUploadRemoteOperation;
+import com.owncloud.android.lib.resources.files.DownloadFileRemoteOperation;
+import com.owncloud.android.lib.resources.files.ReadFolderRemoteOperation;
+import com.owncloud.android.lib.resources.files.model.RemoteFile;
+import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;
+import com.owncloud.android.lib.resources.files.model.RemoteFile;
 
 /**
  * Implementation of IFile for ownCloud servers.
@@ -77,7 +78,7 @@ public class OwnCloudFile implements IFile {
 public List listFiles() {
 List children = new ArrayList();
 if (isDirectory()) {
-ReadRemoteFolderOperation refreshOperation = new 
ReadRemoteFolderOperation(
+ReadFolderRemoteOperation refreshOperation = new 
ReadFolderRemoteOperation(
 file.getRemotePath());
 RemoteOperationResult result = refreshOperation.execute(provider
 .getClient());
@@ -97,7 +98,7 @@ public class OwnCloudFile implements IFile {
 public List listFiles(FileFilter filter) {
 List children = new ArrayList();
 if (isDirectory()) {
-ReadRemoteFolderOperation refreshOperation = new 
ReadRemoteFolderOperation(
+ReadFolderRemoteOperation refreshOperation = new 
ReadFolderRemoteOperation(
 file.getRemotePath());
 RemoteOperationResult result = refreshOperation.execute(provider
 .getClient());
@@ -139,7 +140,7 @@ public class OwnCloudFile implements IFile {
 return null;
 }
 File downFolder = provider.getCacheDir();
-DownloadRemoteFileOperation operation = new 
DownloadRemoteFileOperation(
+DownloadFileRemoteOperation operation = new 
DownloadFileRemoteOperation(
 file.getRemotePath(), downFolder.getAbsolutePath());
 RemoteOperationResult result = operation.execute(provider.getClient());
 if (!result.isSuccess()) {
@@ -160,13 +161,13 @@ public cla

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

[Jan Holesovsky (via logerrit)]

 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 |4 
 android/app/src/main/res/menu/navigation_menu.xml  
|6 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 38b4af6eb524754b4f89c4244ffc5540763ba4d4
Author: Jan Holesovsky 
AuthorDate: Mon Dec 9 19:34:21 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 17:09:31 2019 +0100

android: Enable the Remote server again.

Change-Id: I321a7d7fa03eeb498acd4cf33ceba601f9ad0426
Reviewed-on: https://gerrit.libreoffice.org/84870
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index 7d1983207..037de08ad 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -270,12 +270,10 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 public boolean onNavigationItemSelected(@NonNull MenuItem item) {
 
 switch (item.getItemId()) {
-/* FIXME disabled for the moment, enable when 
menu_provider_owncloud is enabled
 case R.id.menu_storage_preferences: {
 startActivity(new Intent(LibreOfficeUIActivity.this, 
DocumentProviderSettingsActivity.class));
 return true;
 }
-*/
 
 case R.id.menu_provider_documents: {
 
switchToDocumentProvider(documentProviderFactory.getProvider(0));
@@ -292,7 +290,6 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 return true;
 }
 
-/* FIXME disabled for the moment, it's totally untested
 case R.id.menu_provider_otg: {
 
switchToDocumentProvider(documentProviderFactory.getProvider(3));
 return true;
@@ -302,7 +299,6 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 
switchToDocumentProvider(documentProviderFactory.getProvider(4));
 return true;
 }
-*/
 
 default:
 return false;
diff --git a/android/app/src/main/res/menu/navigation_menu.xml 
b/android/app/src/main/res/menu/navigation_menu.xml
index e96c3374d..5d78aaf11 100644
--- a/android/app/src/main/res/menu/navigation_menu.xml
+++ b/android/app/src/main/res/menu/navigation_menu.xml
@@ -16,24 +16,20 @@
 android:title="@string/external_sd_file_system"
 android:icon="@drawable/ic_sd_card_black_24dp"/>
 
-
 
 
 
 
-
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Jan Holesovsky (via logerrit)]

 wsd/LOOLWSD.cpp |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f71522e7ff7c648ed14f1ef18c2c10f8ef12d997
Author: Jan Holesovsky 
AuthorDate: Mon Dec 9 13:07:25 2019 +0100
Commit: Andras Timar 
CommitDate: Tue Dec 10 16:25:47 2019 +0100

TemplateSaveAs is broken by design, let's disable it.

Change-Id: I67a4c6aed1c66a8350f2b938fff7bcf1dfd84768
Reviewed-on: https://gerrit.libreoffice.org/84740
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f76aaabc1..faa399756 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3074,7 +3074,9 @@ private:
 capabilities->set("convert-to", convert_to);
 
 // Supports the TemplateSaveAs in CheckFileInfo?
-capabilities->set("hasTemplateSaveAs", true);
+// TemplateSaveAs is broken by design, disable it everywhere (and
+// remove at some stage too)
+capabilities->set("hasTemplateSaveAs", false);
 
 // Supports the TemplateSource in CheckFileInfo?
 capabilities->set("hasTemplateSource", true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-6-4' - 6 commits - loleaflet/css loleaflet/src net/Socket.hpp net/SslSocket.hpp net/WebSocketHandler.hpp wsd/LOOLWSD.hpp

[Michael Meeks (via logerrit)]

 loleaflet/css/toolbar.css|5 +---
 loleaflet/src/layer/tile/CalcTileLayer.js|5 
 loleaflet/src/layer/tile/GridLayer.js|   29 +++
 loleaflet/src/layer/tile/ImpressTileLayer.js |5 
 loleaflet/src/layer/tile/WriterTileLayer.js  |1 
 net/Socket.hpp   |3 +-
 net/SslSocket.hpp|   21 ++-
 net/WebSocketHandler.hpp |2 -
 wsd/LOOLWSD.hpp  |2 -
 9 files changed, 39 insertions(+), 34 deletions(-)

New commits:
commit 3d330d653f3b8f9795e32313ee27fc1af105320d
Author: Michael Meeks 
AuthorDate: Tue Dec 10 11:11:20 2019 +
Commit: Michael Meeks 
CommitDate: Tue Dec 10 14:07:49 2019 +

tdf#129306 SslSocket: handle EAGAIN properly.

Change-Id: I9fb3323b8d071fdc50399a67eb6b0aaeed9342b0

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 730f7194b..98479841b 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -831,7 +831,8 @@ public:
 
 ~StreamSocket()
 {
-LOG_DBG("StreamSocket dtor #" << getFD());
+LOG_DBG("StreamSocket dtor #" << getFD() << " with pending "
+"write: " << _outBuffer.size() << ", read: " << 
_inBuffer.size());
 
 if (!_closed)
 {
diff --git a/net/SslSocket.hpp b/net/SslSocket.hpp
index de16fdf1d..ba9954f56 100644
--- a/net/SslSocket.hpp
+++ b/net/SslSocket.hpp
@@ -22,28 +22,30 @@ public:
 SslStreamSocket(const int fd, bool isClient,
 std::shared_ptr responseClient) :
 StreamSocket(fd, isClient, std::move(responseClient)),
+_bio(nullptr),
 _ssl(nullptr),
 _sslWantsTo(SslWantsTo::Neither),
 _doHandshake(true)
 {
 LOG_DBG("SslStreamSocket ctor #" << fd);
 
-BIO* bio = BIO_new(BIO_s_socket());
-if (bio == nullptr)
+_bio = BIO_new(BIO_s_socket());
+if (_bio == nullptr)
 {
 throw std::runtime_error("Failed to create SSL BIO.");
 }
 
-BIO_set_fd(bio, fd, BIO_NOCLOSE);
+BIO_set_fd(_bio, fd, BIO_NOCLOSE);
 
 _ssl = SslContext::newSsl();
 if (!_ssl)
 {
-BIO_free(bio);
+BIO_free(_bio);
+_bio = nullptr;
 throw std::runtime_error("Failed to create SSL.");
 }
 
-SSL_set_bio(_ssl, bio, bio);
+SSL_set_bio(_ssl, _bio, _bio);
 
 if (isClient)
 {
@@ -240,6 +242,14 @@ private:
 // Fallthrough...
 default:
 {
+// Effectively an EAGAIN error at the BIO layer
+if (BIO_should_retry(_bio))
+{
+LOG_TRC("Socket #" << getFD() << " BIO asks for retry - 
underlying EAGAIN? " <<
+SSL_get_error(_ssl, rc));
+return -1; // poll is used to detect real errors.
+}
+
 if (sslError == SSL_ERROR_SSL)
 LOG_TRC("Socket #" << getFD() << " SSL error: SSL (" << 
sslError << ").");
 else if (sslError == SSL_ERROR_SYSCALL)
@@ -289,6 +299,7 @@ private:
 }
 
 private:
+BIO* _bio;
 SSL* _ssl;
 /// During handshake SSL might want to read
 /// on write, or write on read.
commit 4937af15f811182291f1e75e21bbf21a6a06b326
Author: Michael Meeks 
AuthorDate: Mon Dec 9 16:37:23 2019 +
Commit: Michael Meeks 
CommitDate: Tue Dec 10 14:07:40 2019 +

prefetch: disable interval timer when we've pre-fetched everything.

Change-Id: I9d3b3819b3d9a960aa31f729686315e9e5d6d8e1

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index d9ff748a3..4db50a473 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -1278,6 +1278,9 @@ L.GridLayer = L.Layer.extend({
var fragment = document.createDocumentFragment();
this._addTiles(finalQueue, fragment);
this._level.el.appendChild(fragment);
+   } else {
+   clearInterval(this._tilesPreFetcher);
+   this._tilesPreFetcher = undefined;
}
},
 
@@ -1285,8 +1288,10 @@ L.GridLayer = L.Layer.extend({
if (!this._map) {
return;
}
-   clearInterval(this._tilesPreFetcher);
-   clearTimeout(this._preFetchIdle);
+   if (this._tilesPreFetcher)
+   clearInterval(this._tilesPreFetcher);
+   if (this._preFetchIdle)
+   clearTimeout(this._preFetchIdle);
if (resetBorder) {
this._preFetchBorder = null;
}
@@ -1295,6 +1300,7 @@ L.GridLayer = L.Layer.extend({
this._preFetchPart = this._selectedPart;
   

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

[Ilhan Yesil (via logerrit)]

 svx/source/dialog/framelinkarray.cxx |   47 +++
 1 file changed, 32 insertions(+), 15 deletions(-)

New commits:
commit c6223e1808f113c6962571bc206c4aecec0c2bd7
Author: Ilhan Yesil 
AuthorDate: Tue Nov 13 11:20:15 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Dec 10 14:59:08 2019 +0100

tdf#116051 Right border visible after hiding neighbour column

Added an else statement to take into account that a hidden column
has a neighboured left column with a right border.

Change-Id: Ia415d422dd2fa305604e48cce55661408b835ea6
Reviewed-on: https://gerrit.libreoffice.org/63326
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 392729c735bb82eecf29bae5527ec786ca293f34)
Reviewed-on: https://gerrit.libreoffice.org/67054
Reviewed-by: Ilhan Yesil 
Tested-by: Ilhan Yesil 
(cherry picked from commit efc741c41483b2402378391b7fba36377c886a8e)
Reviewed-on: https://gerrit.libreoffice.org/84857
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/svx/source/dialog/framelinkarray.cxx 
b/svx/source/dialog/framelinkarray.cxx
index f0934c48dd7c..2afaa3171654 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1103,28 +1103,30 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 basegfx::B2DVector aX(basegfx::utils::getColumn(aCoordinateSystem, 
0));
 basegfx::B2DVector aY(basegfx::utils::getColumn(aCoordinateSystem, 
1));
 
+// get needed local values
+basegfx::B2DPoint 
aOrigin(basegfx::utils::getColumn(aCoordinateSystem, 2));
+const bool bOverlapX(rCell.mbOverlapX);
+const bool bFirstCol(nCol == nFirstCol);
+
+// handle rotation: If cell is rotated, handle lower/right edge 
inside
+// this local geometry due to the created CoordinateSystem already 
representing
+// the needed transformations.
+const bool bRotated(rCell.IsRotated());
+
+// Additionally avoid double-handling by suppressing handling when 
self not rotated,
+// but above/left is rotated and thus already handled. Two 
directly connected
+// rotated will paint/create both edges, they might be rotated 
differently.
+const bool bSupressLeft(!bRotated && nCol > nFirstCol && CELL(nCol 
- 1, nRow).IsRotated());
+const bool bSuppressAbove(!bRotated && nRow > nFirstRow && 
CELL(nCol, nRow - 1).IsRotated());
+
 if(!aX.equalZero() && !aY.equalZero())
 {
-// get needed local values
-basegfx::B2DPoint 
aOrigin(basegfx::utils::getColumn(aCoordinateSystem, 2));
-const bool bOverlapX(rCell.mbOverlapX);
+// additionally needed local values
 const bool bOverlapY(rCell.mbOverlapY);
-const bool bFirstCol(nCol == nFirstCol);
 const bool bLastCol(nCol == nLastCol);
 const bool bFirstRow(nRow == nFirstRow);
 const bool bLastRow(nRow == nLastRow);
 
-// handle rotation: If cell is rotated, handle lower/right 
edge inside
-// this local geometry due to the created CoordinateSystem 
already representing
-// the needed transformations.
-const bool bRotated(rCell.IsRotated());
-
-// Additionally avoid double-handling by suppressing handling 
when self not rotated,
-// but above/left is rotated and thus already handled. Two 
directly connected
-// rotated will paint/create both edges, they might be rotated 
differently.
-const bool bSuppressAbove(!bRotated && nRow > nFirstRow && 
CELL(nCol, nRow - 1).IsRotated());
-const bool bSupressLeft(!bRotated && nCol > nFirstCol && 
CELL(nCol - 1, nRow).IsRotated());
-
 // create upper line for this Cell
 if ((!bOverlapY // true for first line in merged cells 
or cells
 || bFirstRow)   // true for non_Calc usages of this 
tooling
@@ -1281,6 +1283,21 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 }
 }
 }
+else
+{
+// create left line for this Cell
+if ((!bOverlapX // true for first column in merged 
cells or cells
+|| bFirstCol)   // true for non_Calc usages of this 
tooling
+&& !bSupressLeft)   // true when left is not rotated, so 
edge is already handled (see bRotated)
+{
+const Style& rLeft(GetCellStyleLeft(nCol, nRow));
+
+if (rLeft.IsUsed())
+{
+HelperCreateVerticalEntry(*this, rLeft, 

Randomnes in LibreOffice Encryption

[Steve Martin]

Hi,

At 
"http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#__RefHeading__752859_826425813"; 
I read:



The defined values for the manifest:key-derivation-name attribute are:

  •PBKDF2: The PBKDF2 key derivation method with HMAC-SHA-1 for the 
Pseudo-Random Function(PRF). See [RFC2898] sections 5.2 and B.1.1.


HMAC-SHA-1 for the Pseudo-Random Function(PRF)? HMAC-SHA-1 is a 
deterministic function. That means I enter a value and get a value out. 
And no matter how many times I call the function with the input value, I 
always get the same output value. So, with HMAC-SHA-1 is no randomnes 
possible. So PRFs exists when PRNG (Pseudo Random Number Generator)s 
exists.


I looked at the referenced RFC 2898: "PKCS #5: Password-Based 
Cryptography Specification Version 2.0" 
(https://www.ietf.org/rfc/rfc2898.txt) how this will be made. In RFC 
2898 at the end of page 6 and start of page 7 is written the following:


If a random number generator or pseudorandom generator is not 
available, a deterministic alternative for generating the salt (or the 
random part of it) is to apply a password-based key derivation function 
to the password and the message M to be processed. For instance, the 
salt could be computed with a key derivation function as S = KDF (P, 
M). This approach is not recommended if the message M is known to 
belong to a small message space (e.g., "Yes" or "No"), however, since 
then there will only be a small number of possible salts.


My question: Which method is implemented in LibreOffice? Does 
LibreOffice use a PRNG or the method specified in the ODF standard with 
the HMAC-SHA-1() function over the plaintext and (password)/(hash of the 
password))? The second one is a little bit insecure.


Thanks four help.

Greetings

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

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

[Marco Cecchetti (via logerrit)]

 sw/source/uibase/uiview/view2.cxx |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit c715bb4197286ec474e7f9594bdb22935294bab8
Author: Marco Cecchetti 
AuthorDate: Sun Oct 6 22:06:28 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Dec 10 14:52:16 2019 +0100

lok: change-annotation navigation through prev/next command

Change-Id: Id62a84e0db24b4d317a5503d468f2e0caf13424b
Reviewed-on: https://gerrit.libreoffice.org/82008
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 43694ab1239b..3542ef25a560 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -130,6 +130,8 @@
 #include 
 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -785,7 +787,18 @@ void SwView::Execute(SfxRequest &rReq)
 pNext = m_pWrtShell->SelNextRedline();
 
 if (pNext)
+{
+if (comphelper::LibreOfficeKit::isActive())
+{
+OString aPayload(".uno:CurrentTrackedChangeId=");
+sal_uInt32 nRedlineId = pNext->GetId();
+aPayload += OString::number(nRedlineId);
+libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, 
aPayload.getStr());
+}
+
 m_pWrtShell->SetInSelect();
+}
+
 }
 break;
 
@@ -794,7 +807,17 @@ void SwView::Execute(SfxRequest &rReq)
 const SwRangeRedline *pPrev = m_pWrtShell->SelPrevRedline();
 
 if (pPrev)
+{
+if (comphelper::LibreOfficeKit::isActive())
+{
+OString aPayload(".uno:CurrentTrackedChangeId=");
+sal_uInt32 nRedlineId = pPrev->GetId();
+aPayload += OString::number(nRedlineId);
+libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, 
aPayload.getStr());
+}
+
 m_pWrtShell->SetInSelect();
+}
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

 sfx2/source/view/ipclient.cxx |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit c00eda32d18eab7fd88606b1c30bfcf05b7ee0a4
Author: Marco Cecchetti 
AuthorDate: Tue Oct 8 12:09:21 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Dec 10 14:51:11 2019 +0100

lok: re-enabling chart editing on mobile

Change-Id: I0e05cc2c41ba045e62ad87203f7000f2b568add3
Reviewed-on: https://gerrit.libreoffice.org/81916
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index ea73e08b0bfb..289ed49e9194 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -952,17 +952,6 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
 {
 m_xImp->m_xObject->setClientSite( m_xImp->m_xClient );
 
-// Disable embedded object editing (e.g. chart) on mobile
-if ( comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())
-&& m_xImp->m_xObject->getCurrentState() == 
embed::EmbedStates::RUNNING )
-{
-// Also check next state
-// Needs to be embed::EmbedStates::UI_ACTIVE or 
embed::EmbedStates::INPLACE_ACTIVE
-// Conversion table is in 
embeddedobj/source/commonembedding/miscobj.cxx
-if (nVerb != embed::EmbedVerbs::MS_OLEVERB_OPEN && 
nVerb != embed::EmbedVerbs::MS_OLEVERB_HIDE)
-return nError;
-}
-
 m_xImp->m_xObject->doVerb( nVerb );
 }
 catch ( embed::UnreachableStateException& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 sd/source/ui/func/futext.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 481e686a66e550229ec0b600a785452f0d753342
Author: Szymon Kłos 
AuthorDate: Wed Aug 14 18:58:16 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Dec 10 14:49:58 2019 +0100

Set text field modified on edit in Impress

To avoid not saved changes when user enters text field and then closes
the browser.

Change-Id: Iee06392eedcf8c1875017dbfb2059f94bba3
Reviewed-on: https://gerrit.libreoffice.org/77504
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/82086
Tested-by: Jenkins

diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 30aa80e08164..3523a5efef69 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -63,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -194,6 +195,8 @@ void FuText::DoExecute( SfxRequest& )
 SdrViewEvent aVEvt;
 mpView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
 mpView->MarkObj(aVEvt.pRootObj, pPV);
+if (comphelper::LibreOfficeKit::isActive() && mpViewShell && 
mpViewShell->GetDocSh())
+mpViewShell->GetDocSh()->SetModified();
 
 mxTextObj.reset( dynamic_cast< SdrTextObj* >( aVEvt.pObj ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: help3/xhpeditor

[Olivier Hallot (via logerrit)]

 help3/xhpeditor/ed_transform.xsl |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit c1752247133688a07c46382b4e515960fa9945e4
Author: Olivier Hallot 
AuthorDate: Tue Dec 10 10:37:49 2019 -0300
Commit: Olivier Hallot 
CommitDate: Tue Dec 10 14:39:18 2019 +0100

xhpeditor: remove references to online/offline help

Change-Id: I8051258b12d1deafce87cd3b00f68ed801830702
Reviewed-on: https://gerrit.libreoffice.org/84848
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/help3/xhpeditor/ed_transform.xsl b/help3/xhpeditor/ed_transform.xsl
index d97355e..13866db 100644
--- a/help3/xhpeditor/ed_transform.xsl
+++ b/help3/xhpeditor/ed_transform.xsl
@@ -322,14 +322,10 @@
 
 
 
-

-
 
 
-

-
 
 
 
@@ -1218,10 +1214,7 @@
 
 
 
-
-
-
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 editeng/source/items/justifyitem.cxx |   64 +++
 include/editeng/justifyitem.hxx  |2 -
 2 files changed, 59 insertions(+), 7 deletions(-)

New commits:
commit 24c13a0675cd0b6568d2da18293ab16535eec24f
Author: Caolán McNamara 
AuthorDate: Tue Dec 10 11:37:25 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 10 14:20:27 2019 +0100

tdf#129300 alignment enums not translated in organizer

because they used the trick that the original ids
were contiguous integers

Change-Id: I4405100f26241dd84c26155529d3961d5082ee9e
Reviewed-on: https://gerrit.libreoffice.org/84812
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/items/justifyitem.cxx 
b/editeng/source/items/justifyitem.cxx
index 1b9701356bdc..976226e97671 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -57,7 +57,7 @@ bool SvxHorJustifyItem::GetPresentation
 MapUnit /*ePresUnit*/,
 OUString&   rText, const IntlWrapper&)const
 {
-rText = GetValueText( static_cast(GetValue()) );
+rText = GetValueText( GetValue() );
 return true;
 }
 
@@ -159,10 +159,33 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 }
 
 
-OUString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal )
+OUString SvxHorJustifyItem::GetValueText( SvxCellHorJustify nVal )
 {
-DBG_ASSERT( nVal <= sal_uInt16(SvxCellHorJustify::Repeat), "enum 
overflow!" );
-return EditResId(RID_SVXITEMS_HORJUST_STANDARD + nVal);
+DBG_ASSERT( nVal <= SvxCellHorJustify::Repeat, "enum overflow!" );
+
+OUString sRet;
+switch (nVal)
+{
+case SvxCellHorJustify::Standard:
+sRet = EditResId(RID_SVXITEMS_HORJUST_STANDARD);
+break;
+case SvxCellHorJustify::Left:
+sRet = EditResId(RID_SVXITEMS_HORJUST_LEFT);
+break;
+case SvxCellHorJustify::Center:
+sRet = EditResId(RID_SVXITEMS_HORJUST_CENTER);
+break;
+case SvxCellHorJustify::Right:
+sRet = EditResId(RID_SVXITEMS_HORJUST_RIGHT);
+break;
+case SvxCellHorJustify::Block:
+sRet = EditResId(RID_SVXITEMS_HORJUST_BLOCK);
+break;
+case SvxCellHorJustify::Repeat:
+sRet = EditResId(RID_SVXITEMS_HORJUST_REPEAT);
+break;
+}
+return sRet;
 }
 
 
@@ -289,7 +312,26 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 OUString SvxVerJustifyItem::GetValueText( SvxCellVerJustify nVal )
 {
 DBG_ASSERT( nVal <= SvxCellVerJustify::Bottom, "enum overflow!" );
-return EditResId(RID_SVXITEMS_VERJUST_STANDARD + static_cast(nVal));
+
+OUString sRet;
+switch (nVal)
+{
+case SvxCellVerJustify::Standard:
+sRet = EditResId(RID_SVXITEMS_VERJUST_STANDARD);
+break;
+case SvxCellVerJustify::Top:
+sRet = EditResId(RID_SVXITEMS_VERJUST_TOP);
+break;
+case SvxCellVerJustify::Center:
+sRet = EditResId(RID_SVXITEMS_VERJUST_CENTER);
+break;
+case SvxCellVerJustify::Bottom:
+sRet = EditResId(RID_SVXITEMS_VERJUST_BOTTOM);
+break;
+default:
+break;
+}
+return sRet;
 }
 
 
@@ -362,7 +404,17 @@ bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, 
sal_uInt8 /*nMemberId
 
 OUString SvxJustifyMethodItem::GetValueText( SvxCellJustifyMethod nVal )
 {
-return EditResId(RID_SVXITEMS_JUSTMETHOD_AUTO + static_cast(nVal));
+OUString sRet;
+switch (nVal)
+{
+case SvxCellJustifyMethod::Auto:
+sRet = EditResId(RID_SVXITEMS_JUSTMETHOD_AUTO);
+break;
+case SvxCellJustifyMethod::Distribute:
+sRet = EditResId(RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE);
+break;
+}
+return sRet;
 }
 
 
diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index 2d862ff7d35e..e087f85be141 100644
--- a/include/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
@@ -45,7 +45,7 @@ public:
 virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 
nMemberId ) override;
 
 virtual sal_uInt16   GetValueCount() const override;
-static OUString  GetValueText( sal_uInt16 nVal );
+static OUString  GetValueText( SvxCellHorJustify nVal );
 virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const 
override;
 
 SvxHorJustifyItem(SvxHorJustifyItem const &) = default; // SfxPoolItem 
copy function dichotomy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 vcl/source/window/floatwin.cxx |6 +-
 vcl/source/window/winproc.cxx  |3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 63e5dc938e1a907f92b88433d613d50c1573450b
Author: Tamás Zolnai 
AuthorDate: Sat Jul 20 19:17:39 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Dec 10 14:14:04 2019 +0100

lok: show tooltips on dialogs

Change-Id: I40fca6ff13cc41ec9e1ec6bba48dce207e364c79
Reviewed-on: https://gerrit.libreoffice.org/84715
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/84801
Tested-by: Jenkins

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index baa3a46bc978..672eb6236fee 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -651,7 +651,11 @@ void FloatingWindow::StateChanged( StateChangedType nType )
 SetLOKNotifier(pParent->GetLOKNotifier());
 aItems.emplace_back("type", "child");
 aItems.emplace_back("parentId", 
OString::number(pParent->GetLOKWindowId()));
-aItems.emplace_back("position", mpImplData->maPos.toString()); 
// pixels
+if (mbInPopupMode)
+aItems.emplace_back("position", 
mpImplData->maPos.toString()); // pixels
+else // mpImplData->maPos is not set
+aItems.emplace_back("position", GetPosPixel().toString());
+
 }
 aItems.emplace_back("size", GetSizePixel().toString());
 GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", 
aItems);
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ec1228b9fe69..62214fac59e4 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -157,9 +157,6 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, 
const Point& rMousePo
 
 static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& 
rMousePos )
 {
-if (comphelper::LibreOfficeKit::isActive())
-return;
-
 ImplSVData* pSVData = ImplGetSVData();
 if ( !pSVData->maHelpData.mpHelpWin ||
  !( pSVData->maHelpData.mpHelpWin->IsWindowOrChild( pChild ) ||
___
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

[Marco Cecchetti (via logerrit)]

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

New commits:
commit c107d0215142934e270b794da66dc1a467818c56
Author: Marco Cecchetti 
AuthorDate: Tue Dec 10 10:57:32 2019 +0100
Commit: Marco Cecchetti 
CommitDate: Tue Dec 10 13:34:13 2019 +0100

lok: calc: zoomed text entry not rendered

Change-Id: I829966d81bd68571a0651feb458a817587e4d88e

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 91b5415b9510..66a261931216 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -947,8 +947,10 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, 
const ScTableInfo& rTableI
 rDevice.SetMapMode(aDrawMode);
 
 static const double twipFactor = 15 * 1.7639; 
// 26.4585
-aOrigin = Point(aOrigin.getX() * twipFactor,
-aOrigin.getY() * twipFactor);
+// keep into account the zoom factor
+aOrigin = Point((aOrigin.getX() * twipFactor) / 
(double)(aDrawMode.GetScaleX()),
+(aOrigin.getY() * twipFactor) / 
(double)(aDrawMode.GetScaleY()));
+
 MapMode aNew = rDevice.GetMapMode();
 aNew.SetOrigin(aOrigin);
 rDevice.SetMapMode(aNew);
@@ -1019,8 +1021,9 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, 
const ScTableInfo& rTableI
 aOrigin.setX(aOrigin.getX() / TWIPS_PER_PIXEL + nScrX);
 aOrigin.setY(aOrigin.getY() / TWIPS_PER_PIXEL + nScrY);
 static const double twipFactor = 15 * 1.7639; // 26.4585
-aOrigin = Point(aOrigin.getX() * twipFactor,
-aOrigin.getY() * twipFactor);
+// keep into account the zoom factor
+aOrigin = Point((aOrigin.getX() * twipFactor) / 
(double)(aDrawMode.GetScaleX()),
+(aOrigin.getY() * twipFactor) / 
(double)(aDrawMode.GetScaleY()));
 MapMode aNew = rDevice.GetMapMode();
 aNew.SetOrigin(aOrigin);
 rDevice.SetMapMode(aNew);
___
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' - cui/inc

[Seth Chaiklin (via logerrit)]

 cui/inc/tipoftheday.hrc |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 660ffeb073e42ba688c39cd2171900f6874a9055
Author: Seth Chaiklin 
AuthorDate: Fri Dec 6 11:41:05 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Dec 10 13:18:56 2019 +0100

tdf#127294 five new tips

including one from comment #20 and one from comment #34

Change-Id: I7d3ded6d986a548d7a9c88f0036e734b4b5ccb87
Reviewed-on: https://gerrit.libreoffice.org/84604
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 55204db25234e22ea00d9bef2fc1a062e942e84d)
Reviewed-on: https://gerrit.libreoffice.org/84804

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 222ec37a75fe..8c62a80822be 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -48,6 +48,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "To start temporarily with a fresh user 
profile, or to restore a non-working %PRODUCTNAME, use  Help > Restart in Safe 
Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Writing a book? %PRODUCTNAME master 
document lets you manage large documents as a container for individual 
%PRODUCTNAME Writer files."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/globaldoc.html";,
 "tipoftheday_w.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "Create editable Hybrid PDFs with 
%PRODUCTNAME."), 
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF";, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Explore the ten different functions in the 
status bar (at the bottom of the document window). Place the cursor over each 
field for an explanation. If not visible, use View > Status Bar."), "", 
"tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to sum a cell through several sheets? 
Refer to the range of sheets e.g. =SUM(Sheet1.A1:Sheet3.A1)."), "", 
"tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDF's) 
with %PRODUCTNAME."), 
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice";,
 ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Can't see all the text in a cell? Expand 
the input line in the formula bar and you can scroll."), "", 
"tipoftheday_c.png"},
@@ -64,6 +65,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Use View > Value Highlighting to display 
cell contents in colors: Text/black, Formulas/green, Numbers/blue, Protected 
cells/grey background."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/0308.html";,
 "tipoftheday_c.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a 
presentation template: View > Master Slide and Slide > New Master (or per 
toolbar or right click in slide pane)."), "", "tipoftheday_i.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to sort a pivot table? Click on 
drop-list's arrow in the row/col header and select sort method: ascending, 
descending, or custom."), "", "tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Display photos or images with different 
shapes. Insert and select shape, then Insert > Image. To adjust image, 
right-click on selected shape and choose Area."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Use Page/Slide > Properties > 'Fit object 
to paper format' in Draw/Impress to resize the objects so that they fit on your 
chosen paper format."), "", "tipoftheday_d.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Fit the entire page in a Draw window, use * 
on the number pad."), "", "tipoftheday_d.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "In a Draw page, use '-' to zoom out; '+' to 
zoom in."), "", "tipoftheday_d.png"},
@@ -128,6 +130,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Annoyed by the 'marching ants' around cells 
in Calc? Press escape to stop them; the copied content will remain available 
for pasting."), "", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to become a %PRODUCTNAME Ambassador? 
There are certifications for developers, admins, and trainers."), 
"http://www.documentfoundation.org/certification";, ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in 
a Calc spreadsheet by applying different page styles on sheets."), "", 
"tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the 
toolbar to get quick access to favorite and recent characters to insert."), "", 
""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Choose ‘Hierarchical View’ in the Styles 
sidebar to see the relation between styles."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in 
your document consist

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

[Henry Castro (via logerrit)]

 include/vcl/window.hxx|1 +
 sfx2/source/view/viewfrm.cxx  |5 +++--
 sfx2/source/view/viewsh.cxx   |   11 ---
 vcl/source/window/window2.cxx |6 ++
 4 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit 95801714f4159cbbe5fc4249dc6af037fd716f7e
Author: Henry Castro 
AuthorDate: Sat Nov 30 09:36:27 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 13:14:55 2019 +0100

lok: fix welded dialogs

In the tiled rendering case the dialogs, run asynchronous due
to multiple user access. In order to send the messages
to the client side, the dialog  has to hook
a LOKNotifier in the constructor of the SfxViewShell.

However, the new weld wrapper classes use the Frame Window,
(i.e. Window::GetFarmeWeld()), as a parent of the dialogs.

On the other hand, in order to avoid getting the interface
implementation inside implementation classes, it has been
created a new method Window::GetFrameWindow(), otherwise
I have to do a bureaucratic conversion between Interfaces
to Implementations ( i.e. UnoWrapperBase::GetUnoWrapper() )

Change-Id: I32c34d82a89211a025250e65a05ce47d30efa0b8
Reviewed-on: https://gerrit.libreoffice.org/84117
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 39e64ed22aae..f95ad05cef5b 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -556,6 +556,7 @@ public:
 
 SAL_DLLPRIVATE vcl::Window* ImplGetFrameWindow() const;
 weld::Window*   GetFrameWeld() const;
+vcl::Window*GetFrameWindow() const;
 SalFrame*   ImplGetFrame() const;
 SAL_DLLPRIVATE ImplFrameData*   ImplGetFrameData();
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 1f16a65973d3..80573aa61fc8 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1376,8 +1376,9 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 
 case SfxHintId::Deinitializing:
 {
-if (GetWindow().GetLOKNotifier())
-GetWindow().ReleaseLOKNotifier();
+vcl::Window* pFrameWin = GetWindow().GetFrameWindow();
+if (pFrameWin && pFrameWin->GetLOKNotifier())
+pFrameWin->ReleaseLOKNotifier();
 
 GetFrame().DoClose();
 break;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index f8ffb6ddae1c..7e2ec6369e58 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1080,7 +1080,11 @@ SfxViewShell::SfxViewShell
 rViewArr.push_back(this);
 
 if (comphelper::LibreOfficeKit::isActive())
-pViewFrame->GetWindow().SetLOKNotifier(this, true);
+{
+vcl::Window* pFrameWin = pViewFrame->GetWindow().GetFrameWindow();
+if (pFrameWin)
+pFrameWin->SetLOKNotifier(this, true);
+}
 }
 
 
@@ -1105,8 +1109,9 @@ SfxViewShell::~SfxViewShell()
 pImpl->m_pController.clear();
 }
 
-if (GetViewFrame()->GetWindow().GetLOKNotifier())
-GetViewFrame()->GetWindow().ReleaseLOKNotifier();
+vcl::Window* pFrameWin = GetViewFrame()->GetWindow().GetFrameWindow();
+if (pFrameWin && pFrameWin->GetLOKNotifier())
+pFrameWin->ReleaseLOKNotifier();
 }
 
 bool SfxViewShell::PrepareClose
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 74e84ba381fa..3e05a54f0b20 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -869,6 +869,12 @@ weld::Window* Window::GetFrameWeld() const
 return pFrame ? pFrame->GetFrameWeld() : nullptr;
 }
 
+vcl::Window* Window::GetFrameWindow() const
+{
+SalFrame* pFrame = ImplGetFrame();
+return pFrame ? pFrame->GetWindow() : nullptr;
+}
+
 vcl::Window* Window::ImplGetParent() const
 {
 return mpWindowImpl ? mpWindowImpl->mpParent.get() : nullptr;
___
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' - include/vcl vcl/source

[Henry Castro (via logerrit)]

 include/vcl/window.hxx |3 +++
 vcl/source/app/svmain.cxx  |3 +++
 vcl/source/window/floatwin.cxx |2 ++
 vcl/source/window/window.cxx   |8 +---
 4 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 4a437520d6295327d42a586e908c4c6e7b24561e
Author: Henry Castro 
AuthorDate: Mon Dec 9 18:49:37 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Tue Dec 10 13:12:41 2019 +0100

lok: evaluate assertion if LOK Windows container is empty

It has defined a map container for every LOK windows assigned
a notifier to the client side. However the map container has elements
with VclPtr (reference counter) and it is a global data, so when global
data are disposing, the VclPtr will destroy the Window when the VCL
framework was destroyed that will lead to undefined behavior.

So this commit adds an assert inside DeInitVCL to ensure, if
someone forgot to Release the LOK Notifier.

Change-Id: Ib7f20751af2931f7b0ba3e3d526e734ffc33f171
Reviewed-on: https://gerrit.libreoffice.org/84792
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 9f97f915b11c..39e64ed22aae 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1240,6 +1240,9 @@ public:
 /// Find an existing Window based on the LOKWindowId.
 static VclPtr  FindLOKWindow(vcl::LOKWindowId 
nWindowId);
 
+/// check if LOK Window container is empty
+static bool IsLOKWindowsEmpty();
+
 /// Dumps itself and potentially its children to a property tree, to be 
written easily to JSON.
 virtual boost::property_tree::ptree DumpAsPropertyTree();
 
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index f3bcac658e1a..3fd6d86b1bc0 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -416,6 +416,9 @@ VCLUnoWrapperDeleter::disposing(lang::EventObject const& /* 
rSource */)
 
 void DeInitVCL()
 {
+// The LOK Windows map container should be empty
+assert(vcl::Window::IsLOKWindowsEmpty());
+
 //rhbz#137, when using LibreOffice like a library you can't 
realistically
 //tear everything down and recreate them on the next call, there's too many
 //(c++) singletons that point to stuff that gets deleted during shutdown
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 72dff4985c34..8257aeea7d7d 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -202,6 +202,8 @@ FloatingWindow::~FloatingWindow()
 
 void FloatingWindow::dispose()
 {
+ReleaseLOKNotifier();
+
 if (mpImplData)
 {
 if( mbPopupModeCanceled )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 20187261ee22..6d5a73fc8f62 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3178,9 +3178,6 @@ namespace {
 
 LOKWindowsMap& GetLOKWindowsMap()
 {
-// never use this in the desktop case
-assert(comphelper::LibreOfficeKit::isActive());
-
 // Map to remember the LOKWindowId <-> Window binding.
 static std::unique_ptr s_pLOKWindowsMap;
 
@@ -3225,6 +3222,11 @@ VclPtr Window::FindLOKWindow(vcl::LOKWindowId 
nWindowId)
 return VclPtr();
 }
 
+bool Window::IsLOKWindowsEmpty()
+{
+return GetLOKWindowsMap().empty();
+}
+
 void Window::ReleaseLOKNotifier()
 {
 // unregister the LOK window binding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/svx/ctredlin.hxx   |   19 ++-
 svx/source/dialog/ctredlin.cxx |   23 ---
 sw/inc/IDocumentRedlineAccess.hxx  |   16 +---
 sw/source/uibase/misc/redlndlg.cxx |2 ++
 4 files changed, 41 insertions(+), 19 deletions(-)

New commits:
commit e6271a8a4eafcbb357bbd3cf21126f64b45125e9
Author: Caolán McNamara 
AuthorDate: Tue Dec 10 10:40:22 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 10 12:47:48 2019 +0100

Resolves: tdf#129250 move redline type into RedlinData so we can sort on it

Change-Id: Ia8e6744c1679655240a9a9cee9425030e994e16b
Reviewed-on: https://gerrit.libreoffice.org/84805
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 884ce5aeb50c..91c95fa52454 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -46,15 +46,32 @@ enum class SvxRedlinDateMode
 BEFORE, SINCE, EQUAL, NOTEQUAL, BETWEEN, SAVE, NONE
 };
 
+enum class RedlineType : sal_uInt16
+{
+// Range of RedlineTypes is 0 to 127.
+Insert = 0x0,// Content has been inserted.
+Delete = 0x1,// Content has been deleted.
+Format = 0x2,// Attributes have been applied.
+Table = 0x3,// Table structure has been altered.
+FmtColl = 0x4,// Style has been altered (Autoformat!).
+ParagraphFormat = 0x5,// Paragraph attributes have been changed.
+TableRowInsert = 0x6,// Table row has been inserted.
+TableRowDelete = 0x7,// Table row has been deleted.
+TableCellInsert = 0x8,// Table cell has been inserted.
+TableCellDelete = 0x9,// Table cell has been deleted.
+Any = USHRT_MAX // special value to indicate any redline type in some 
method calls
+};
+
 /// Struct for sorting data.
 class SAL_WARN_UNUSED SVX_DLLPUBLIC RedlinData
 {
 public:
 RedlinData();
 virtual ~RedlinData();
-boolbDisabled;
 DateTimeaDateTime;
 void*   pData;
+RedlineType eType;
+boolbDisabled;
 };
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxRedlinTable
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index a045af36efcc..f5defbb30ba8 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -35,10 +35,12 @@
 #define WRITER_DATE 2
 #define CALC_DATE   3
 
-RedlinData::RedlinData() : aDateTime(DateTime::EMPTY)
+RedlinData::RedlinData()
+: aDateTime(DateTime::EMPTY)
+, pData(nullptr)
+, eType(RedlineType::Any)
+, bDisabled(false)
 {
-bDisabled=false;
-pData=nullptr;
 }
 
 RedlinData::~RedlinData()
@@ -128,6 +130,21 @@ int SvxRedlinTable::ColCompare(const weld::TreeIter& 
rLeft, const weld::TreeIter
 
 int nSortCol = pTreeView->get_sort_column();
 
+if (pTreeView == xWriterTreeView.get() && nSortCol == 0)
+{
+RedlinData *pLeftData = 
reinterpret_cast(pTreeView->get_id(rLeft).toInt64());
+RedlinData *pRightData = 
reinterpret_cast(pTreeView->get_id(rRight).toInt64());
+
+if (pLeftData && pRightData)
+{
+if (pLeftData->eType < pRightData->eType)
+nCompare = -1;
+else if (pLeftData->eType > pRightData->eType)
+nCompare = 1;
+return nCompare;
+}
+}
+
 if (nSortCol == nDatePos)
 {
 RedlinData *pLeftData = 
reinterpret_cast(pTreeView->get_id(rLeft).toInt64());
diff --git a/sw/inc/IDocumentRedlineAccess.hxx 
b/sw/inc/IDocumentRedlineAccess.hxx
index 7f96a11e..395fae8d47e2 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -28,6 +28,7 @@
 
 #include 
 #include 
+#include 
 
 #include "docary.hxx"
 
@@ -60,21 +61,6 @@ namespace o3tl
 template<> struct typed_flags : is_typed_flags {};
 }
 
-enum class RedlineType : sal_uInt16
-{
-// Range of RedlineTypes is 0 to 127.
-Insert = 0x0,// Content has been inserted.
-Delete = 0x1,// Content has been deleted.
-Format = 0x2,// Attributes have been applied.
-Table = 0x3,// Table structure has been altered.
-FmtColl = 0x4,// Style has been altered (Autoformat!).
-ParagraphFormat = 0x5,// Paragraph attributes have been changed.
-TableRowInsert = 0x6,// Table row has been inserted.
-TableRowDelete = 0x7,// Table row has been deleted.
-TableCellInsert = 0x8,// Table cell has been inserted.
-TableCellDelete = 0x9,// Table cell has been deleted.
-Any = USHRT_MAX // special value to indicate any redline type in some 
method calls
-};
 inline OUString SwRedlineTypeToOUString(RedlineType eType)
 {
 OUString sRet;
diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index 431441c9f15c..1fc7a359bbf6 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -573,6 +573,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDa

[Libreoffice-commits] online.git: net/Socket.hpp net/SslSocket.hpp

[Michael Meeks (via logerrit)]

 net/Socket.hpp|3 ++-
 net/SslSocket.hpp |   21 -
 2 files changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 1ff820de95b639895e5603a75553d61c79bedc3f
Author: Michael Meeks 
AuthorDate: Tue Dec 10 11:11:20 2019 +
Commit: Michael Meeks 
CommitDate: Tue Dec 10 11:45:13 2019 +

tdf#129306 SslSocket: handle EAGAIN properly.

Change-Id: I9fb3323b8d071fdc50399a67eb6b0aaeed9342b0

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 730f7194b..98479841b 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -831,7 +831,8 @@ public:
 
 ~StreamSocket()
 {
-LOG_DBG("StreamSocket dtor #" << getFD());
+LOG_DBG("StreamSocket dtor #" << getFD() << " with pending "
+"write: " << _outBuffer.size() << ", read: " << 
_inBuffer.size());
 
 if (!_closed)
 {
diff --git a/net/SslSocket.hpp b/net/SslSocket.hpp
index de16fdf1d..ba9954f56 100644
--- a/net/SslSocket.hpp
+++ b/net/SslSocket.hpp
@@ -22,28 +22,30 @@ public:
 SslStreamSocket(const int fd, bool isClient,
 std::shared_ptr responseClient) :
 StreamSocket(fd, isClient, std::move(responseClient)),
+_bio(nullptr),
 _ssl(nullptr),
 _sslWantsTo(SslWantsTo::Neither),
 _doHandshake(true)
 {
 LOG_DBG("SslStreamSocket ctor #" << fd);
 
-BIO* bio = BIO_new(BIO_s_socket());
-if (bio == nullptr)
+_bio = BIO_new(BIO_s_socket());
+if (_bio == nullptr)
 {
 throw std::runtime_error("Failed to create SSL BIO.");
 }
 
-BIO_set_fd(bio, fd, BIO_NOCLOSE);
+BIO_set_fd(_bio, fd, BIO_NOCLOSE);
 
 _ssl = SslContext::newSsl();
 if (!_ssl)
 {
-BIO_free(bio);
+BIO_free(_bio);
+_bio = nullptr;
 throw std::runtime_error("Failed to create SSL.");
 }
 
-SSL_set_bio(_ssl, bio, bio);
+SSL_set_bio(_ssl, _bio, _bio);
 
 if (isClient)
 {
@@ -240,6 +242,14 @@ private:
 // Fallthrough...
 default:
 {
+// Effectively an EAGAIN error at the BIO layer
+if (BIO_should_retry(_bio))
+{
+LOG_TRC("Socket #" << getFD() << " BIO asks for retry - 
underlying EAGAIN? " <<
+SSL_get_error(_ssl, rc));
+return -1; // poll is used to detect real errors.
+}
+
 if (sslError == SSL_ERROR_SSL)
 LOG_TRC("Socket #" << getFD() << " SSL error: SSL (" << 
sslError << ").");
 else if (sslError == SSL_ERROR_SYSCALL)
@@ -289,6 +299,7 @@ private:
 }
 
 private:
+BIO* _bio;
 SSL* _ssl;
 /// During handshake SSL might want to read
 /// on write, or write on read.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects

[Michael Weghorn (via logerrit)]

 bin/check-elf-dynamic-objects |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88ca6e9904e87ae3473a5d8936adb4a2ced8572f
Author: Michael Weghorn 
AuthorDate: Tue Dec 10 10:29:19 2019 +0100
Commit: Michael Weghorn 
CommitDate: Tue Dec 10 12:07:18 2019 +0100

check-elf-dynamic-objects: qt5 needs libxcb-icccm.so.4

... since commit fe2baf9e84e0ca9aeaa683e37076f57fa3f38dca
("Qt5 fix missing XCB_ICCCM_WM_HINT_WINDOW_GROUP").

Change-Id: Idac4ae38cbec3604de358a3b2c77bb26a8115ce0
Reviewed-on: https://gerrit.libreoffice.org/84799
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index b6dc8837f0fd..fae551a38571 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -94,7 +94,7 @@ openglwhitelist="libGL.so.1"
 giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 
libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
 gstreamerwhitelist="libgstaudio-1.0.so.0 libgstpbutils-1.0.so.0 
libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0"
 gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 
libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 
libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 
libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 
libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3 
libharfbuzz.so.0"
-qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 
libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0 
libgobject-2.0.so.0 libxcb.so.1"
+qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 
libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0 
libgobject-2.0.so.0 libxcb.so.1 libxcb-icccm.so.4"
 kf5whitelist="libKF5ConfigCore.so.5 libKF5CoreAddons.so.5 libKF5I18n.so.5 
libKF5KIOCore.so.5 libKF5KIOFileWidgets.so.5 libKF5KIOWidgets.so.5 
libKF5WindowSystem.so.5"
 avahiwhitelist="libdbus-glib-1.so.2 libdbus-1.so.3 libgobject-2.0.so.0 
libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libavahi-common.so.3 
libavahi-client.so.3"
 kerberoswhitelist="libgssapi_krb5.so.2 libcom_err.so.2 libkrb5.so.3"
___
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' - sfx2/source

[Ashod Nakashian (via logerrit)]

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

New commits:
commit 5ddad0c80efa15500e3259839e2eebcba2e8e241
Author: Ashod Nakashian 
AuthorDate: Mon Dec 9 18:38:57 2019 -0500
Commit: Ashod Nakashian 
CommitDate: Tue Dec 10 11:48:10 2019 +0100

sfx2: don't move to allow copy elision on return

Change-Id: Ib9bb512325f7fbccddf1adc456d7fa21a12a49d2
Reviewed-on: https://gerrit.libreoffice.org/84807
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index a43ee91afdcd..4a7942b16453 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1123,7 +1123,7 @@ SidebarController::CreatePopupMenu(const 
::std::vector& rM
 
 pMenu->RemoveDisabledEntries(false);
 
-return std::move(pMenu);
+return pMenu;
 }
 
 IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool)
___
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-0' - loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 668cd8c0bf2eddc6ea8a3be9852ed059b2d3e874
Author: Szymon Kłos 
AuthorDate: Tue Dec 10 10:34:49 2019 +0100
Commit: Szymon Kłos 
CommitDate: Tue Dec 10 10:37:14 2019 +0100

jsdialog: reset current path when switched tab

Change-Id: I01221134c9726a858670584cb308a71ed049321a

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index a66479c33..0a17ac6bf 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -190,7 +190,7 @@ L.Control.MobileWizard = L.Control.extend({
 
selectedTab: function(tabText) {
if (this._currentPath && this._currentPath.length) {
-   this._currentPath[0] = tabText;
+   this._currentPath = [tabText];
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/sdi svx/source sw/source

[Szymon Kłos (via logerrit)]

 include/svx/svxids.hrc  |1 
 include/svx/xgrad.hxx   |1 
 sc/source/ui/drawfunc/drawsh.cxx|   11 ++
 sd/source/ui/view/drviews2.cxx  |   11 ++
 svx/sdi/svx.sdi |2 -
 svx/source/xoutdev/xattr.cxx|   58 
 sw/source/uibase/shells/drawdlg.cxx |   11 ++
 7 files changed, 94 insertions(+), 1 deletion(-)

New commits:
commit 1c04f677b53d6e0731f6401bc4c3a0dfd9e6ed01
Author: Szymon Kłos 
AuthorDate: Mon Dec 9 14:47:09 2019 +0100
Commit: Szymon Kłos 
CommitDate: Tue Dec 10 11:07:51 2019 +0100

jsdialog: apply FillGradient with JSON arg

Change-Id: I0ca53a53ff53e66d2f25ad4eb13305edbc3aaa12
Reviewed-on: https://gerrit.libreoffice.org/84798
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 8d4b16389b5d..f12a326d0d2a 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -327,6 +327,7 @@ class SvxSetItem;
 #define SID_FRAME_LINESTYLE 
TypedWhichId( SID_SVX_START + 201 )
 #define SID_FRAME_LINECOLOR 
TypedWhichId( SID_SVX_START + 202 )
 #define SID_ATTR_LINE_WIDTH_ARG ( SID_SVX_START + 203 )
+#define SID_FILL_GRADIENT_JSON  ( SID_SVX_START + 204 )
 #define SID_SEARCHDLG_SEARCHSTRINGS ( SID_SVX_START + 215 )
 #define SID_SEARCHDLG_REPLACESTRINGS( SID_SVX_START + 216 )
 #define SID_ATTR_TABLE  ( SID_SVX_START + 217 )
diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index 3c9b2b4572a4..8fae7d896c75 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -75,6 +75,7 @@ public:
 sal_uInt16 GetSteps() const { return nStepCount; }
 
 boost::property_tree::ptree dumpAsJSON() const;
+static XGradient fromJSON(const OUString& rJSON);
 };
 
 #endif
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 718e6cce54d5..069642c55268 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 
 SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
 
@@ -104,6 +105,16 @@ namespace
 }
 }
 }
+if (SfxItemState::SET == pArgs->GetItemState(SID_FILL_GRADIENT_JSON, 
false, &pItem))
+{
+const SfxStringItem* pJSON = static_cast(pItem);
+if (pJSON)
+{
+XGradient aGradient = XGradient::fromJSON(pJSON->GetValue());
+XFillGradientItem aItem(aGradient);
+pArgs->Put(aItem);
+}
+}
 }
 }
 
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 12a2b8919be6..3097f9496542 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -89,6 +89,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -578,6 +579,16 @@ public:
 }
 }
 }
+if (SfxItemState::SET == pArgs->GetItemState(SID_FILL_GRADIENT_JSON, 
false, &pItem))
+{
+const SfxStringItem* pJSON = static_cast(pItem);
+if (pJSON)
+{
+XGradient aGradient = XGradient::fromJSON(pJSON->GetValue());
+XFillGradientItem aItem(aGradient);
+pArgs->Put(aItem);
+}
+}
 }
 }
 
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 795d4df6f944..9d1d9cbc8747 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -2649,7 +2649,7 @@ XFillColorItem FillPageColor SID_ATTR_PAGE_COLOR
 ]
 
 XFillGradientItem FillGradient SID_ATTR_FILL_GRADIENT
-
+(SfxStringItem FillGradientJSON SID_FILL_GRADIENT_JSON)
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 2c50c3e6f263..c94fcdea4d93 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -96,6 +96,8 @@
 
 using namespace ::com::sun::star;
 
+typedef std::map StringMap;
+
 static long ScaleMetricValue( long nVal, long nMul, long nDiv )
 {
 BigInt aVal( nVal );
@@ -1975,6 +1977,62 @@ std::string 
XGradient::GradientStyleToString(css::awt::GradientStyle eStyle)
 return "";
 }
 
+namespace
+{
+css::awt::GradientStyle lcl_getStyleFromString(const OUString& rStyle)
+{
+if (rStyle == "LINEAR")
+return css::awt::GradientStyle_LINEAR;
+else if (rStyle == "AXIAL")
+return css::awt::GradientStyle_AXIAL;
+else if (rStyle == "RADIAL")
+return css::awt::GradientStyle_RADIAL;
+else if (rStyle == "ELLIPTICAL")
+return css::awt::GradientStyle_ELLIPTICAL;
+else if (rStyle == "SQUARE")
+return css::awt::GradientStyle_SQUARE;
+else if (rStyle == "RE

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/svx sc/source sd/source svx/sdi svx/source sw/source

[Szymon Kłos (via logerrit)]

 include/svx/svxids.hrc  |1 
 include/svx/xgrad.hxx   |1 
 sc/source/ui/drawfunc/drawsh.cxx|   11 ++
 sd/source/ui/view/drviews2.cxx  |   11 ++
 svx/sdi/svx.sdi |2 -
 svx/source/xoutdev/xattr.cxx|   58 
 sw/source/uibase/shells/drawdlg.cxx |   11 ++
 7 files changed, 94 insertions(+), 1 deletion(-)

New commits:
commit 570834b55ff7303ca977f0e6d6a03f2d8cb4ee68
Author: Szymon Kłos 
AuthorDate: Mon Dec 9 14:47:09 2019 +0100
Commit: Szymon Kłos 
CommitDate: Tue Dec 10 11:07:52 2019 +0100

jsdialog: apply FillGradient with JSON arg

Change-Id: I0ca53a53ff53e66d2f25ad4eb13305edbc3aaa12
Reviewed-on: https://gerrit.libreoffice.org/84749
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 526518d2a144..2924a1bec218 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -327,6 +327,7 @@ class SfxStringItem;
 #define SID_FRAME_LINESTYLE 
TypedWhichId( SID_SVX_START + 201 )
 #define SID_FRAME_LINECOLOR 
TypedWhichId( SID_SVX_START + 202 )
 #define SID_ATTR_LINE_WIDTH_ARG ( SID_SVX_START + 203 )
+#define SID_FILL_GRADIENT_JSON  ( SID_SVX_START + 204 )
 #define SID_SEARCHDLG_SEARCHSTRINGS ( SID_SVX_START + 215 )
 #define SID_SEARCHDLG_REPLACESTRINGS( SID_SVX_START + 216 )
 #define SID_ATTR_TABLE  ( SID_SVX_START + 217 )
diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index ec8941292103..a5f60f831896 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -76,6 +76,7 @@ public:
 sal_uInt16 GetSteps() const { return nStepCount; }
 
 boost::property_tree::ptree dumpAsJSON() const;
+static XGradient fromJSON(const OUString& rJSON);
 };
 
 #endif
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index c8a17511143c..70623818ef29 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -63,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
 
@@ -110,6 +111,16 @@ namespace
 }
 }
 }
+if (SfxItemState::SET == pArgs->GetItemState(SID_FILL_GRADIENT_JSON, 
false, &pItem))
+{
+const SfxStringItem* pJSON = static_cast(pItem);
+if (pJSON)
+{
+XGradient aGradient = XGradient::fromJSON(pJSON->GetValue());
+XFillGradientItem aItem(aGradient);
+pArgs->Put(aItem);
+}
+}
 }
 }
 
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 5b10ea013a04..3945bf1bf550 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -91,6 +91,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -589,6 +590,16 @@ namespace
 }
 }
 }
+if (SfxItemState::SET == pArgs->GetItemState(SID_FILL_GRADIENT_JSON, 
false, &pItem))
+{
+const SfxStringItem* pJSON = static_cast(pItem);
+if (pJSON)
+{
+XGradient aGradient = XGradient::fromJSON(pJSON->GetValue());
+XFillGradientItem aItem(aGradient);
+pArgs->Put(aItem);
+}
+}
 }
 }
 
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 2600e6f13d2c..9429689d8e81 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -2634,7 +2634,7 @@ XFillColorItem FillPageColor SID_ATTR_PAGE_COLOR
 ]
 
 XFillGradientItem FillGradient SID_ATTR_FILL_GRADIENT
-
+(SfxStringItem FillGradientJSON SID_FILL_GRADIENT_JSON)
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 4a898d440fa9..83e052231b58 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -68,6 +68,8 @@
 
 using namespace ::com::sun::star;
 
+typedef std::map StringMap;
+
 static long ScaleMetricValue( long nVal, long nMul, long nDiv )
 {
 BigInt aVal( nVal );
@@ -1980,6 +1982,62 @@ std::string 
XGradient::GradientStyleToString(css::awt::GradientStyle eStyle)
 return "";
 }
 
+namespace
+{
+css::awt::GradientStyle lcl_getStyleFromString(const OUString& rStyle)
+{
+if (rStyle == "LINEAR")
+return css::awt::GradientStyle_LINEAR;
+else if (rStyle == "AXIAL")
+return css::awt::GradientStyle_AXIAL;
+else if (rStyle == "RADIAL")
+return css::awt::GradientStyle_RADIAL;
+else if (rStyle == "ELLIPTICAL")
+return css::awt::GradientStyle_ELLIPTICAL;
+else if (rStyle == "SQUARE")
+return css::awt::GradientStyle_SQUARE;
+

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

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

 canvas/source/cairo/cairo_canvas.cxx |2 ++
 canvas/source/directx/dx_canvas.cxx  |2 ++
 canvas/source/factory/cf_service.cxx |3 +++
 canvas/source/vcl/spritehelper.cxx   |2 ++
 cui/source/options/optgdlg.cxx   |   13 +
 5 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit b4c28826e0f8716583e7663ca2ea7a25079f2583
Author: Luboš Luňák 
AuthorDate: Mon Dec 9 15:47:22 2019 +0100
Commit: Luboš Luňák 
CommitDate: Tue Dec 10 11:04:57 2019 +0100

force vclcanvas use with Skia, like it's with OpenGL (tdf#129076)

Related to tdf#93870.

Change-Id: Ie0cb64c05c0fde6a774ce8558d06943870e775fe
Reviewed-on: https://gerrit.libreoffice.org/84758
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/canvas/source/cairo/cairo_canvas.cxx 
b/canvas/source/cairo/cairo_canvas.cxx
index b53f8bcb0bed..3f6dcaf3d2f9 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "cairo_canvas.hxx"
 
@@ -48,6 +49,7 @@ namespace cairocanvas
 
 // tdf#93870 - force VCL canvas in OpenGL mode for now.
 assert( !OpenGLWrapper::isVCLOpenGLEnabled() );
+assert( !SkiaHelper::isVCLSkiaEnabled() );
 
 /* maArguments:
0: ptr to creating instance (Window or VirtualDevice)
diff --git a/canvas/source/directx/dx_canvas.cxx 
b/canvas/source/directx/dx_canvas.cxx
index 28c73ed50e3c..39a319f31cff 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -85,6 +86,7 @@ namespace dxcanvas
 
 // tdf#93870 - force VCL canvas in OpenGL mode for now.
 assert( !OpenGLWrapper::isVCLOpenGLEnabled() );
+assert( !SkiaHelper::isVCLSkiaEnabled() );
 
 SAL_INFO("canvas.directx", "Canvas::initialize called" );
 
diff --git a/canvas/source/factory/cf_service.cxx 
b/canvas/source/factory/cf_service.cxx
index 0bdacec7b4f7..86dbc2f12aeb 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -40,6 +40,7 @@
 #if HAVE_FEATURE_OPENGL
 #include 
 #endif
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -303,6 +304,8 @@ Reference CanvasFactory::lookupAndUse(
 if( OpenGLWrapper::isVCLOpenGLEnabled() )
 bForceLastEntry = true;
 #endif
+if( SkiaHelper::isVCLSkiaEnabled() )
+bForceLastEntry = true;
 
 // use anti-aliasing canvas, if config flag set (or not existing)
 bool bUseAAEntry(true);
diff --git a/canvas/source/vcl/spritehelper.cxx 
b/canvas/source/vcl/spritehelper.cxx
index 0c721b95a484..29ec50b63ccf 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -187,6 +188,7 @@ namespace vclcanvas
 #if HAVE_FEATURE_UI
 || OpenGLHelper::isVCLOpenGLEnabled()
 #endif
+|| SkiaHelper::isVCLSkiaEnabled()
)
 {
 // "complex" transformation, employ affine
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ae9cf9961ad8..7a53fb886760 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -625,14 +625,19 @@ CanvasSettings::CanvasSettings() :
 
 bool CanvasSettings::IsHardwareAccelerationAvailable() const
 {
+if (SkiaHelper::isVCLSkiaEnabled() && Application::GetToolkitName() != 
"gtk3")
+{
+mbHWAccelAvailable = false;
+return false;
+}
 #if HAVE_FEATURE_OPENGL
-// TODO SKIA
 if (OpenGLWrapper::isVCLOpenGLEnabled() && Application::GetToolkitName() 
!= "gtk3")
+{
 mbHWAccelAvailable = false;
-
-else
+return false;
+}
 #endif
-if( !mbHWAccelChecked )
+if( !mbHWAccelChecked )
 {
 mbHWAccelChecked = true;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 cui/inc/tipoftheday.hrc |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 55204db25234e22ea00d9bef2fc1a062e942e84d
Author: Seth Chaiklin 
AuthorDate: Fri Dec 6 11:41:05 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Dec 10 11:03:41 2019 +0100

tdf#127294 five new tips

including one from comment #20 and one from comment #34

Change-Id: I7d3ded6d986a548d7a9c88f0036e734b4b5ccb87
Reviewed-on: https://gerrit.libreoffice.org/84604
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index ab279e6393ad..4169dcdf9232 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -48,6 +48,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "To start temporarily with a fresh user 
profile, or to restore a non-working %PRODUCTNAME, use  Help > Restart in Safe 
Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Writing a book? %PRODUCTNAME master 
document lets you manage large documents as a container for individual 
%PRODUCTNAME Writer files."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/globaldoc.html";,
 "tipoftheday_w.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "Create editable Hybrid PDFs with 
%PRODUCTNAME."), 
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF";, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Explore the ten different functions in the 
status bar (at the bottom of the document window). Place the cursor over each 
field for an explanation. If not visible, use View > Status Bar."), "", 
"tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to sum a cell through several sheets? 
Refer to the range of sheets e.g. =SUM(Sheet1.A1:Sheet3.A1)."), "", 
"tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDF's) 
with %PRODUCTNAME."), 
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice";,
 ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Can't see all the text in a cell? Expand 
the input line in the formula bar and you can scroll."), "", 
"tipoftheday_c.png"},
@@ -64,6 +65,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Use View > Value Highlighting to display 
cell contents in colors: Text/black, Formulas/green, Numbers/blue, Protected 
cells/grey background."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/0308.html";,
 "tipoftheday_c.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a 
presentation template: View > Master Slide and Slide > New Master (or per 
toolbar or right click in slide pane)."), "", "tipoftheday_i.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to sort a pivot table? Click on 
drop-list's arrow in the row/col header and select sort method: ascending, 
descending, or custom."), "", "tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Display photos or images with different 
shapes. Insert and select shape, then Insert > Image. To adjust image, 
right-click on selected shape and choose Area."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Use Page/Slide > Properties > 'Fit object 
to paper format' in Draw/Impress to resize the objects so that they fit on your 
chosen paper format."), "", "tipoftheday_d.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Fit the entire page in a Draw window, use * 
on the number pad."), "", "tipoftheday_d.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "In a Draw page, use '-' to zoom out; '+' to 
zoom in."), "", "tipoftheday_d.png"},
@@ -128,6 +130,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Annoyed by the 'marching ants' around cells 
in Calc? Press escape to stop them; the copied content will remain available 
for pasting."), "", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to become a %PRODUCTNAME Ambassador? 
There are certifications for developers, admins, and trainers."), 
"http://www.documentfoundation.org/certification";, ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in 
a Calc spreadsheet by applying different page styles on sheets."), "", 
"tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the 
toolbar to get quick access to favorite and recent characters to insert."), "", 
""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Choose ‘Hierarchical View’ in the Styles 
sidebar to see the relation between styles."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in 
your document consistent. Choose one from the predefined per Styles (F11) or  
via Table > AutoFormat."), "", "tipoftheday_w.png"},
  { NC_("RID

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3dafa72a3c9b8ee75f3b21cd18e37b5ca43890e9
Author: Szymon Kłos 
AuthorDate: Tue Dec 10 10:34:49 2019 +0100
Commit: Szymon Kłos 
CommitDate: Tue Dec 10 10:35:00 2019 +0100

jsdialog: reset current path when switched tab

Change-Id: I01221134c9726a858670584cb308a71ed049321a

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index a66479c33..0a17ac6bf 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -190,7 +190,7 @@ L.Control.MobileWizard = L.Control.extend({
 
selectedTab: function(tabText) {
if (this._currentPath && this._currentPath.length) {
-   this._currentPath[0] = tabText;
+   this._currentPath = [tabText];
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Linux daily builds failing

[Michael Weghorn]

On 10/12/2019 08.43, Michael Weghorn wrote:
> That particular failure is because libxcb-icccm is used since commit
> fe2baf9e84e0ca9aeaa683e37076f57fa3f38dca ("Qt5 fix missing
> XCB_ICCCM_WM_HINT_WINDOW_GROUP"). [1]
> 
> I'll submit a patch to fix this.

-> https://gerrit.libreoffice.org/#/c/84799/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara (via logerrit)]

 sd/inc/pageformatpanel.hrc |6 +++---
 svx/inc/spacing.hrc|   28 ++--
 sw/inc/pageformatpanel.hrc |6 +++---
 3 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit af728b8ce5cc7c5b3860282f87ee3dfed79f1fcc
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 19:52:12 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 10 10:15:47 2019 +0100

use double prime for inch symbol

Change-Id: I6a663bcb55155bd2331aa79cebd5b922c2ee7605
Reviewed-on: https://gerrit.libreoffice.org/84787
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc
index ec01fd6ecdb3..732f39e19c53 100644
--- a/sd/inc/pageformatpanel.hrc
+++ b/sd/inc/pageformatpanel.hrc
@@ -21,9 +21,9 @@ const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
 NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "None"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Narrow"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Moderate"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75\")"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1\")"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25\")"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75″)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1″)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25″)"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Wide"),
 };
 
diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
index 445484248a07..82f107fc67db 100644
--- a/svx/inc/spacing.hrc
+++ b/svx/inc/spacing.hrc
@@ -17,13 +17,13 @@
 const std::pair RID_SVXSTRARY_SPACING_INCH[] =
 {
 { NC_("RID_SVXSTRARY_SPACING_INCH", "None"),0 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Small (1/16\")"),   91 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small (1/8\")"), 181 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small Medium (1/4\")"),  363 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium (3/8\")"),539 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium Large (1/2\")"),  720 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Large (3/4\")"),1077 },
-{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Large (1\")"),1440 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Small (1/16″)"),   91 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small (1/8″)"), 181 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small Medium (1/4″)"),  363 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium (3/8″)"),539 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium Large (1/2″)"),  720 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Large (3/4″)"),1077 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Large (1″)"),1440 },
 { nullptr, 0 }
 };
 
@@ -45,13 +45,13 @@ const std::pair 
RID_SVXSTRARY_SPACING_CM[] =
 const std::pair RID_SVXSTRARY_MARGINS_INCH[] =
 {
 { NC_("RID_SVXSTRARY_MARGINS_INCH", "None"),0 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Small (1/16\")"),   91 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Small (1/8\")"), 181 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Small Medium (1/4\")"),  363 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium (3/8\")"),539 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium Large (1/2\")"),  720 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Large (3/4\")"),1077 },
-{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Large (1\")"),1440 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Small (1/16″)"),   91 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Small (1/8″)"), 181 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Small Medium (1/4″)"),  363 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium (3/8″)"),539 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium Large (1/2″)"),  720 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Large (3/4″)"),1077 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Large (1″)"),1440 },
 { nullptr, 0 }
 };
 
diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc
index 3d9e7727efca..ddc82ed620d3 100644
--- a/sw/inc/pageformatpanel.hrc
+++ b/sw/inc/pageformatpanel.hrc
@@ -21,9 +21,9 @@ const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
 NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "None"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Narrow"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Moderate"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75\")"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1\")"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25\")"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75″)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1″)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25″)"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Wide"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Mirrored")
 };

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Ruler.js |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e2e42914a4d026e0af1ec7ac0ba459e4d3048fa2
Author: Tor Lillqvist 
AuthorDate: Tue Dec 10 10:57:30 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 10:57:30 2019 +0200

tdf#128468: Add a clarifying comment

Change-Id: Ia69d3bf94750be07223c5de389167280745f021e

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index bebce5d7e..223f2824c 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -148,6 +148,9 @@ L.Control.Ruler = L.Control.extend({
for (var num = 0; num <= (this.options.pageWidth / 1000) + 1; 
num++) {
 
var marker = L.DomUtil.create('div', 
'loleaflet-ruler-maj', this._rBPContainer);
+
+   // The - 1 is to compensate for the left and right .5px 
borders of
+   // loleaflet-ruler-maj in leaflet.css.
marker.style.width = 
this.options.DraggableConvertRatio*1000 - 1 + 'px';
if (this.options.displayNumber) {
if (numCounter !== 0)
___
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' - dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/core/dataaccess/databasedocument.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a678785337d5caff9354d9d3500bcd09d7a5
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 16:52:54 2019 +
Commit: Xisco Faulí 
CommitDate: Tue Dec 10 09:52:00 2019 +0100

tdf#129210 don't assert with clear on already cleared mutex

reset it after load completes, seeing as the comment suggests
that's why the clear exists in the first place

Change-Id: I3af633c5a1f99b5d0dd754c21e220c6c94b66634
Reviewed-on: https://gerrit.libreoffice.org/84784
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 30ffe0cfadda..d5e9e43e6515 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -685,6 +685,7 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const 
OUString& i_SourceLocati
 
 aGuard.clear(); // (load has an own guarding scheme)
 load( aMediaDescriptor.getPropertyValues() );
+aGuard.reset();
 
 // Without a controller, we are unable to recover the sub components, 
as they're always tied to a controller.
 // So, everything else is done when the first controller is connected.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/core/dataaccess/databasedocument.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 79fdc6e0a3a44642ac8d49225f14241872097fb7
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 16:52:54 2019 +
Commit: Michael Stahl 
CommitDate: Tue Dec 10 09:44:40 2019 +0100

tdf#129210 don't assert with clear on already cleared mutex

reset it after load completes, seeing as the comment suggests
that's why the clear exists in the first place

Change-Id: I3af633c5a1f99b5d0dd754c21e220c6c94b66634
Reviewed-on: https://gerrit.libreoffice.org/84789
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 9f72c08fe95a..9cd69e92ca65 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -685,6 +685,7 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const 
OUString& i_SourceLocati
 
 aGuard.clear(); // (load has an own guarding scheme)
 load( aMediaDescriptor.getPropertyValues() );
+aGuard.reset();
 
 // Without a controller, we are unable to recover the sub components, 
as they're always tied to a controller.
 // So, everything else is done when the first controller is connected.
___
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/Ruler.js |   46 -
 1 file changed, 27 insertions(+), 19 deletions(-)

New commits:
commit 59900d874c58886916ab0e71f522b1eed5cd60b8
Author: Tor Lillqvist 
AuthorDate: Thu Dec 5 17:32:35 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 09:38:03 2019 +0100

tdf#128468: Tweak the ruler tick and tab stop positions to be just right

Gosh that was painful. But now they seem to be correct.

Some other clarifications and improvements. Also start trying to
handle touch device dragging in the tab stop area, but that handler
doesn't get invoked yet, and anyway any code to actually move the
nearest tab stop is missing.

Change-Id: I187bca84da70f03f5dcf032b997e43b5e54d7879
Reviewed-on: https://gerrit.libreoffice.org/84574
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 4b48ee682cf65fb3a7024e9a6e2cebe046847194)
Reviewed-on: https://gerrit.libreoffice.org/84797
Tested-by: Jenkins CollaboraOffice 

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index d2ca25ef4..bebce5d7e 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -74,6 +74,7 @@ L.Control.Ruler = L.Control.extend({
// Tab stops
this._rTSWrapper = L.DomUtil.create('div', 
'loleaflet-ruler-tabstopwrapper', this._rFace);
this._rTSContainer = L.DomUtil.create('div', 
'loleaflet-ruler-tabstopcontainer', this._rTSWrapper);
+   L.DomEvent.on(this._rTSContainer, 'touchstart', 
this._initiateTabstopDrag, this);
 
return this._rWrapper;
},
@@ -113,7 +114,7 @@ L.Control.Ruler = L.Control.extend({
|| !this.options.marginSet)
this.options.extraSize = 0;
 
-   var DraggableConvertRatio, lMargin, rMargin, wPixel, scale;
+   var lMargin, rMargin, wPixel, scale;
 
lMargin = this.options.nullOffset;
 
@@ -130,9 +131,9 @@ L.Control.Ruler = L.Control.extend({
 
this._fixOffset();
 
-   DraggableConvertRatio = this.options.DraggableConvertRatio = 
wPixel / this.options.pageWidth;
+   this.options.DraggableConvertRatio = wPixel / 
this.options.pageWidth;
this._rFace.style.width = wPixel + 'px';
-   this._rBPContainer.style.marginLeft = (-1 * 
(DraggableConvertRatio * (500 - (lMargin % 1000))) + 1) + 'px';
+   this._rBPContainer.style.marginLeft = (-1 * 
(this.options.DraggableConvertRatio * (500 - (lMargin % 1000))) + 1) + 'px';
 
var numCounter = -1 * parseInt(lMargin / 1000);
 
@@ -147,7 +148,7 @@ L.Control.Ruler = L.Control.extend({
for (var num = 0; num <= (this.options.pageWidth / 1000) + 1; 
num++) {
 
var marker = L.DomUtil.create('div', 
'loleaflet-ruler-maj', this._rBPContainer);
-   marker.style.width = DraggableConvertRatio*1000 - 2 + 
'px';
+   marker.style.width = 
this.options.DraggableConvertRatio*1000 - 1 + 'px';
if (this.options.displayNumber) {
if (numCounter !== 0)
marker.innerText = 
Math.abs(numCounter++);
@@ -161,25 +162,15 @@ L.Control.Ruler = L.Control.extend({
 
$('.loleaflet-ruler-tabstop').remove();
 
-   // First an empty space
-   marker = L.DomUtil.create('div', 'loleaflet-ruler-tabstop', 
this._rTSContainer);
-   marker.style.marginLeft = (DraggableConvertRatio * lMargin) + 
'px';
-
-   // Make its triangle invisible and truly zero width
-   marker.style.borderLeft = '0px';
-   marker.style.borderRight = '0px';
-   marker.style.borderBottom = '0px';
-
-   // Then the visible tab stops
var pxPerMm100 = this._map._docLayer._docPixelSize.x / 
(this._map._docLayer._docWidthTwips * 2540/1440);
var tabStopWidthAccum = 0;
// Reduce their widths by the border
-   var tabstopBorder = getComputedStyle(marker, 
null).getPropertyValue('--loleaflet-ruler-tabstop-border');
for (num = 0; num < this.options.tabs.length; num++) {
if (this.options.tabs[num].style >= 4)
break;
marker = L.DomUtil.create('div', 
'loleaflet-ruler-tabstop', this._rTSContainer);
var thisWidth = this.options.tabs[num].position - 
tabStopWidthAccum;
+   var tabstopBorder = getComputedStyle(marker, 
null).getPropertyValue('--loleaflet-ruler-tabstop-border');
marker.style.marginLeft = (pxPerMm100 * thisWidth - 
tabstopBorder) + 'px';
tabStopWidthAccum += thisWidth;
}
@@ 

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

[Samuel Mehrbrodt (via logerrit)]

 include/editeng/eeitem.hxx |   42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit b802c11396f2d3538f97e128b3ddeceb399438a4
Author: Samuel Mehrbrodt 
AuthorDate: Fri Dec 6 12:11:11 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Tue Dec 10 09:32:46 2019 +0100

Use EE_PARA_START to count para items

Change-Id: I936c1cddb8777fa01ecafe9cd6fef8cd47ad65cd
Reviewed-on: https://gerrit.libreoffice.org/84616
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx
index 9c746ee55b05..060fa9a6f1a2 100644
--- a/include/editeng/eeitem.hxx
+++ b/include/editeng/eeitem.hxx
@@ -69,29 +69,29 @@ class SvxNumBulletItem;
 
 // Paragraph attributes:
 #define EE_PARA_START   (EE_ITEMS_START+0)
-#define EE_PARA_WRITINGDIR  
TypedWhichId(EE_ITEMS_START+0)
-#define EE_PARA_XMLATTRIBS  
TypedWhichId(EE_ITEMS_START+1)
-#define EE_PARA_HANGINGPUNCTUATION  
TypedWhichId(EE_ITEMS_START+2)
-#define EE_PARA_FORBIDDENRULES  
TypedWhichId(EE_ITEMS_START+3)
-#define EE_PARA_ASIANCJKSPACING 
TypedWhichId(EE_ITEMS_START+4)
-#define EE_PARA_NUMBULLET   
TypedWhichId(EE_ITEMS_START+5)
-#define EE_PARA_HYPHENATE   TypedWhichId(EE_ITEMS_START+6)
-#define EE_PARA_HYPHENATE_NO_CAPS   TypedWhichId(EE_ITEMS_START+7)
-#define EE_PARA_BULLETSTATE TypedWhichId(EE_ITEMS_START+8)
-#define EE_PARA_OUTLLRSPACE 
TypedWhichId(EE_ITEMS_START+9)
-#define EE_PARA_OUTLLEVEL   
TypedWhichId(EE_ITEMS_START+10)
-#define EE_PARA_BULLET  
TypedWhichId(EE_ITEMS_START+11)
-#define EE_PARA_LRSPACE 
TypedWhichId(EE_ITEMS_START+12)
-#define EE_PARA_ULSPACE 
TypedWhichId(EE_ITEMS_START+13)
-#define EE_PARA_SBL 
TypedWhichId(EE_ITEMS_START+14)
-#define EE_PARA_JUST
TypedWhichId(EE_ITEMS_START+15)
-#define EE_PARA_TABS
TypedWhichId(EE_ITEMS_START+16)
-#define EE_PARA_JUST_METHOD 
TypedWhichId(EE_ITEMS_START+17)
-#define EE_PARA_VER_JUST
TypedWhichId(EE_ITEMS_START+18)
-#define EE_PARA_END (EE_ITEMS_START+18)
+#define EE_PARA_WRITINGDIR  
TypedWhichId(EE_PARA_START+0)
+#define EE_PARA_XMLATTRIBS  
TypedWhichId(EE_PARA_START+1)
+#define EE_PARA_HANGINGPUNCTUATION  
TypedWhichId(EE_PARA_START+2)
+#define EE_PARA_FORBIDDENRULES  
TypedWhichId(EE_PARA_START+3)
+#define EE_PARA_ASIANCJKSPACING 
TypedWhichId(EE_PARA_START+4)
+#define EE_PARA_NUMBULLET   
TypedWhichId(EE_PARA_START+5)
+#define EE_PARA_HYPHENATE   TypedWhichId(EE_PARA_START+6)
+#define EE_PARA_HYPHENATE_NO_CAPS   TypedWhichId(EE_PARA_START+7)
+#define EE_PARA_BULLETSTATE TypedWhichId(EE_PARA_START+8)
+#define EE_PARA_OUTLLRSPACE 
TypedWhichId(EE_PARA_START+9)
+#define EE_PARA_OUTLLEVEL   
TypedWhichId(EE_PARA_START+10)
+#define EE_PARA_BULLET  
TypedWhichId(EE_PARA_START+11)
+#define EE_PARA_LRSPACE 
TypedWhichId(EE_PARA_START+12)
+#define EE_PARA_ULSPACE 
TypedWhichId(EE_PARA_START+13)
+#define EE_PARA_SBL 
TypedWhichId(EE_PARA_START+14)
+#define EE_PARA_JUST
TypedWhichId(EE_PARA_START+15)
+#define EE_PARA_TABS
TypedWhichId(EE_PARA_START+16)
+#define EE_PARA_JUST_METHOD 
TypedWhichId(EE_PARA_START+17)
+#define EE_PARA_VER_JUST
TypedWhichId(EE_PARA_START+18)
+#define EE_PARA_END (EE_PARA_START+18)
 
 // Character attributes:
-#define EE_CHAR_START   (EE_ITEMS_START+19)
+#define EE_CHAR_START   (EE_PARA_END+1)
 #define EE_CHAR_COLOR   TypedWhichId(EE_CHAR_START+0)
 #define EE_CHAR_FONTINFOTypedWhichId(EE_CHAR_START+1)
 #define EE_CHAR_FONTHEIGHT  
TypedWhichId(EE_CHAR_START+2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/css/leaflet.css  |   32 
 loleaflet/src/control/Ruler.js |   65 +++--
 2 files changed, 95 insertions(+), 2 deletions(-)

New commits:
commit 18ac05024001d7117a6f398aae59cd221b408176
Author: Tor Lillqvist 
AuthorDate: Thu Dec 5 02:18:32 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 09:23:20 2019 +0100

tdf#128468: Draw the tab stops

Draw only the user-edited/able ones. Draw all four kinds (left, right,
center, and decimal) the same for now, as a small triangle pointing
up. (Drawn using a CSS trick to get a triangle.) The tab stop
positions aren't actually editable yet, nor is there a way to add a
new tab stop or delete one. Later.

The code uses a CSS custom property, yay, to avoid duplication of a
magic value for the half-width of the triangle.

Change-Id: I862b09091bad03ad63425cc6e6759f3f13174579
Reviewed-on: https://gerrit.libreoffice.org/84474
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 5e6976f6eb23d742db7e8f9b334b521a299f2418)
Reviewed-on: https://gerrit.libreoffice.org/84764
Tested-by: Jenkins CollaboraOffice 

diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index aa7872dfa..a24ce7ef5 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -839,6 +839,11 @@ input.clipboard {
position: absolute;
}
 
+.loleaflet-ruler-tabstopcontainer {
+   height: 100%;
+   position: absolute;
+   }
+
 .loleaflet-ruler-marginwrapper {
height: 100%;
position: absolute;
@@ -854,6 +859,14 @@ input.clipboard {
z-index: 10;
}
 
+.loleaflet-ruler-tabstopwrapper {
+   position: absolute;
+   height: 100%;
+   overflow: hidden;
+   width: inherit;
+   z-index: 10;
+   }
+
 .loleaflet-ruler-face {
height: 100%;
background-color: white;
@@ -871,6 +884,25 @@ input.clipboard {
line-height: 7px;
}
 
+/* A triangle pointing up */
+.loleaflet-ruler-tabstop {
+   width: 0;
+   height: 0;
+   vertical-align: bottom;
+   display: inline-block;
+   /* So that we hardcode this in just one place */
+   --loleaflet-ruler-tabstop-border: 8;
+   border-top: calc(var(--loleaflet-ruler-tabstop-border) * 1px) solid 
transparent;
+   border-left: calc(var(--loleaflet-ruler-tabstop-border) * 1px) solid 
transparent;
+   /* Offset the left border with left margin to make this really take 
zero horizontal space until the JS code bumps the marginLeft */
+   margin-left: calc(-1 * var(--loleaflet-ruler-tabstop-border) * 1px);
+   border-right: calc(var(--loleaflet-ruler-tabstop-border) * 1px) solid 
transparent;
+   /* Ditto for the right border, this is left as is */
+   margin-right: calc(-1 * var(--loleaflet-ruler-tabstop-border) * 1px);
+   border-bottom: calc(var(--loleaflet-ruler-tabstop-border) * 1px) solid 
black;
+   margin-bottom: calc(-1 * var(--loleaflet-ruler-tabstop-border) * 1px / 
2);
+}
+
 .loleaflet-ruler-margin {
height: 100%;
background-color: #efefef;
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index ac26fa342..d2ca25ef4 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -1,4 +1,4 @@
-/* -*- js-indent-level: 8 -*- */
+/* -*- js-indent-level: 8; fill-column: 100 -*- */
 /*
  * Ruler Handler
  */
@@ -9,13 +9,14 @@ L.Control.Ruler = L.Control.extend({
interactive: true,
marginSet: false,
displayNumber: true,
-   tileMargin: 18,
+   tileMargin: 18, // No idea what this means and where it comes 
from
extraSize: 0,
margin1: null,
margin2: null,
nullOffset: null,
pageOffset: null,
pageWidth: null,
+   tabs: [],
unit: null,
DraggableConvertRatio: null,
timer: null
@@ -70,14 +71,31 @@ L.Control.Ruler = L.Control.extend({
this._rBPWrapper = L.DomUtil.create('div', 
'loleaflet-ruler-breakwrapper', this._rFace);
this._rBPContainer = L.DomUtil.create('div', 
'loleaflet-ruler-breakcontainer', this._rBPWrapper);
 
+   // Tab stops
+   this._rTSWrapper = L.DomUtil.create('div', 
'loleaflet-ruler-tabstopwrapper', this._rFace);
+   this._rTSContainer = L.DomUtil.create('div', 
'loleaflet-ruler-tabstopcontainer', this._rTSWrapper);
+
return this._rWrapper;
},
 
_updateOptions: function(obj) {
+   // Note that the values for margin1, margin2, and leftOffset 
are not in any sane
+   // units. See the comment in 
SwCommentRuler::CreateJsonNotification(). The values
+   // are pixels for some virtual device in