date:20210402

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

New commits:
commit 0e1be4bb636623f4c921b2e7f38b05bb4125c93a
Author: Pranam Lashkari 
AuthorDate: Tue Mar 30 21:52:13 2021 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:49:27 2021 +0200

LOK: getPartInfo now returns master page count

master page count will be used when switching to master view
to know how many slide previews to be shown

Change-Id: I11735797d16538a9f667a85b90a86b1e6cf9b5aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113358
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 3c49a3be592eb515bba100b4a17617136fabbcba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113537
Tested-by: Pranam Lashkari 

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 2ffc5acc0664..5310c120bf51 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2283,11 +2283,14 @@ OUString SdXImpressDocument::getPartInfo(int nPart)
 
 const bool bIsVisible = pViewSh->IsVisible(nPart);
 const bool bIsSelected = pViewSh->IsSelected(nPart);
+const sal_Int16 nMasterPageCount= 
pViewSh->GetDoc()->GetMasterSdPageCount(pViewSh->GetPageKind());
 
 OUString aPartInfo = "{ \"visible\": \"" +
 OUString::number(static_cast(bIsVisible)) +
 "\", \"selected\": \"" +
 OUString::number(static_cast(bIsSelected)) +
+"\", \"masterPageCount\": \"" +
+OUString::number(nMasterPageCount) +
 "\" }";
 return aPartInfo;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - editeng/source include/editeng sc/source

 editeng/source/editeng/editview.cxx |9 ++---
 include/editeng/editview.hxx|2 +-
 sc/source/ui/app/inputhdl.cxx   |7 +--
 3 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit c488acfc2d163b421e07518597668d18c7b88a67
Author: Pranam Lashkari 
AuthorDate: Wed Feb 24 00:59:17 2021 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:49:03 2021 +0200

avoid LOK text selection update when reference cell is in different tab

Change-Id: I511b9c5a27f97b6e14e9a844179c27a96997abe1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111315
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 01f86c59531b29cd06dd53a7a6e4556fb97cbb24)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113536
Tested-by: Pranam Lashkari 

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 8e7c62f224e6..82cb86add8dd 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -415,11 +415,13 @@ vcl::Cursor* EditView::GetCursor() const
 return pImpEditView->pCursor.get();
 }
 
-void EditView::InsertText( const OUString& rStr, bool bSelect )
+void EditView::InsertText( const OUString& rStr, bool bSelect, bool 
bLOKShowSelect )
 {
 
 EditEngine* pEE = pImpEditView->pEditEngine;
-pImpEditView->DrawSelectionXOR();
+
+if (bLOKShowSelect)
+pImpEditView->DrawSelectionXOR();
 
 EditPaM aPaM1;
 if ( bSelect )
@@ -441,7 +443,8 @@ void EditView::InsertText( const OUString& rStr, bool 
bSelect )
 else
 pImpEditView->SetEditSelection( EditSelection( aPaM2, aPaM2 ) );
 
-pEE->FormatAndUpdate( this );
+if (bLOKShowSelect)
+pEE->FormatAndUpdate( this );
 }
 
 bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window const * 
pFrameWin )
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index e89cd356be72..fdd80b38a926 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -212,7 +212,7 @@ public:
 
 vcl::Cursor*GetCursor() const;
 
-voidInsertText( const OUString& rNew, bool bSelect = false );
+voidInsertText( const OUString& rNew, bool bSelect = false , 
bool bLOKShowSelect = true);
 voidInsertParaBreak();
 
 boolPostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window const 
* pFrameWin = nullptr );
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 96f90e672afe..e2ba9874 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3474,13 +3474,16 @@ void ScInputHandler::SetReference( const ScRange& rRef, 
const ScDocument& rDoc )
 else
 aRefStr = rRef.Format(rDoc, ScRefFlags::VALID, aAddrDetails);
 }
+bool bLOKShowSelect = true;
+if(comphelper::LibreOfficeKit::isActive() && 
pRefViewSh->GetViewData().GetRefTabNo() != pRefViewSh->GetViewData().GetTabNo())
+bLOKShowSelect = false;
 
 if (pTableView || pTopView)
 {
 if (pTableView)
-pTableView->InsertText( aRefStr, true );
+pTableView->InsertText( aRefStr, true, bLOKShowSelect );
 if (pTopView)
-pTopView->InsertText( aRefStr, true );
+pTopView->InsertText( aRefStr, true, bLOKShowSelect );
 
 DataChanged();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/app/inputhdl.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 79b29984a114b6eca76c49ef7b9841a5b5de74f4
Author: Pranam Lashkari 
AuthorDate: Tue Feb 23 20:35:34 2021 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:48:36 2021 +0200

show reference range specific to only selected calc sheet

Problem:
when switching tab in online reference range would not change according to 
tabs
this would show incorrect reference range

Change-Id: I07e072a74b2925a25b7a4a50ce0c238308d99ebf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111409
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit d03f4f5838093013ddb201e352f0cb726453)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113535
Tested-by: Pranam Lashkari 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 277bc2d53406..96f90e672afe 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -503,7 +503,10 @@ void ScInputHandler::UpdateLokReferenceMarks()
 tools::Long nX2 = rViewData.GetRefEndX();
 tools::Long nY1 = rViewData.GetRefStartY();
 tools::Long nY2 = rViewData.GetRefEndY();
-tools::Long nTab = rViewData.GetTabNo();
+tools::Long nTab = rViewData.GetRefStartZ();
+
+if (rViewData.GetRefEndZ() == rViewData.GetTabNo())
+nTab = rViewData.GetRefEndZ();
 
 PutInOrder(nX1, nX2);
 PutInOrder(nY1, nY2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/view/viewdata.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit d67b74d29e840074e24372e8be9e0c53035f1c6c
Author: Pranam Lashkari 
AuthorDate: Thu Feb 25 03:40:27 2021 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:48:00 2021 +0200

online: fixed freeze pane not writing correct data on file save

problem:
when we save the file after setting freeze panes in online,
opening same file in Desktop libreoffice will show incorrect view,
each freeze view would start from A1

this patch ensures that we write correct starting cell pos for each freeze 
view

Change-Id: Ic8ccd5fb5cbedf2ea4f0e9376f0cfdd530e32d6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111505
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit e469c262e289ad86e3e2fa2857f8388b7b16df47)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113534
Tested-by: Pranam Lashkari 

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 2d30a3504f75..c389c6d34f2b 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -4206,7 +4206,10 @@ void ScViewData::OverrideWithLOKFreeze(ScSplitMode& 
eExHSplitMode, ScSplitMode&
 eExHSplitMode = SC_SPLIT_FIX;
 
 if (eExHSplitMode == SC_SPLIT_FIX)
+{
 nExFixPosX = nFreezeCol;
+pThisTab->nPosX[SC_SPLIT_RIGHT] = nFreezeCol;
+}
 else
 bConvertToScrPosX = true;
 }
@@ -4217,7 +4220,10 @@ void ScViewData::OverrideWithLOKFreeze(ScSplitMode& 
eExHSplitMode, ScSplitMode&
 eExVSplitMode = SC_SPLIT_FIX;
 
 if (eExVSplitMode == SC_SPLIT_FIX)
+{
 nExFixPosY = nFreezeRow;
+pThisTab->nPosY[SC_SPLIT_BOTTOM] = nFreezeRow;
+}
 else
 bConvertToScrPosY = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/inc/select.hxx   |1 +
 sc/source/ui/view/gridwin.cxx |   15 +++
 sc/source/ui/view/select.cxx  |   13 -
 3 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit 4f5a71397dec1dbe5f711b1be67d1ee50e3bfd5e
Author: Pranam Lashkari 
AuthorDate: Fri Feb 5 15:00:31 2021 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:47:27 2021 +0200

prevent reference range resetting on panning in mobile

Change-Id: Ic6cabe1d4e5a1e7c4d42294550d654e38e27db22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110458
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 72fa32f6d9ad2c0fe8aa03f60797aa13c11e2085)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113533
Tested-by: Pranam Lashkari 

diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx
index d1da97b13137..55b1572aaa35 100644
--- a/sc/source/ui/inc/select.hxx
+++ b/sc/source/ui/inc/select.hxx
@@ -70,6 +70,7 @@ public:
 virtual voidDeselectAll() override;
 
 boolSetCursorAtCell( SCCOL nPosX, SCROW nPosY, bool bScroll );
+boolCheckRefBounds(SCCOL nPosX, SCROW nPosY);
 };
 
 class ScHeaderFunctionSet : public FunctionSet  // Column / row headers
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index cf781d0319b4..b27d3e35e877 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1396,6 +1396,21 @@ void ScGridWindow::LogicMouseMove(const MouseEvent& 
rMouseEvent)
 
 void ScGridWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
+if (SfxLokHelper::getDeviceFormFactor() == LOKDeviceFormFactor::MOBILE)
+{
+ScViewFunc* pView = mrViewData.GetView();
+ScTabViewShell* pViewShell = mrViewData.GetViewShell();
+bool bRefMode = pViewShell && pViewShell->IsRefInputMode();
+
+Point aPos(rMEvt.GetPosPixel());
+SCCOL nPosX;
+SCROW nPosY;
+mrViewData.GetPosFromPixel(aPos.X(), aPos.Y(), eWhich, nPosX, nPosY);
+
+if (bRefMode && pView->GetFunctionSet().CheckRefBounds(nPosX, nPosY))
+return;
+}
+
 nNestedButtonState = ScNestedButtonState::Down;
 
 MouseEventState aState;
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 1a51dd50d9fc..9f5e2a139abe 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -415,6 +415,17 @@ void ScViewFunctionSet::SetCursorAtPoint( const Point& 
rPointPixel, bool /* bDon
 SetCursorAtCell( nPosX, nPosY, bScroll );
 }
 
+bool ScViewFunctionSet::CheckRefBounds(SCCOL nPosX, SCROW nPosY)
+{
+SCCOL startX = pViewData->GetRefStartX();
+SCROW startY = pViewData->GetRefStartY();
+
+SCCOL endX = pViewData->GetRefEndX();
+SCROW endY = pViewData->GetRefEndY();
+
+return nPosX >= startX && nPosX <= endX && nPosY >= startY && nPosY <= 
endY;
+}
+
 bool ScViewFunctionSet::SetCursorAtCell( SCCOL nPosX, SCROW nPosY, bool 
bScroll )
 {
 ScTabView* pView = pViewData->GetView();
@@ -466,7 +477,7 @@ bool ScViewFunctionSet::SetCursorAtCell( SCCOL nPosX, SCROW 
nPosY, bool bScroll
 if (bRefMode)
 {
 // if no input is possible from this doc, don't move the reference 
cursor around
-if ( !pScMod->IsModalMode(pViewData->GetSfxDocShell()) )
+if ( !pScMod->IsModalMode(pViewData->GetSfxDocShell()) && 
(!CheckRefBounds(nPosX, nPosY) || SfxLokHelper::getDeviceFormFactor() != 
LOKDeviceFormFactor::MOBILE))
 {
 if (!bAnchor)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 editeng/source/editeng/impedit.cxx |2 +-
 sw/source/core/crsr/crstrvl.cxx|7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d53112eea7be0fae8224125c921c825932030671
Author: Pranam Lashkari 
AuthorDate: Mon Feb 1 22:18:01 2021 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:46:58 2021 +0200

enable hyperlink to be detected at the end of text

now in online hyperlink popup will appear
even when the cursor is at the end of hyperlink text

Change-Id: I80a1a093afa11e39236693f8a2639741f74c9876
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110227
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 3233db0913193855285e1f56492d4617368441b6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113532
Tested-by: Pranam Lashkari 

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index f226f983f593..28c98f4b84b2 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1803,7 +1803,7 @@ const SvxFieldItem* ImpEditView::GetField( const Point& 
rPos, sal_Int32* pPara,
 for (size_t nAttr = rAttrs.size(); nAttr; )
 {
 const EditCharAttrib& rAttr = *rAttrs[--nAttr];
-if (rAttr.GetStart() == nXPos)
+if (rAttr.GetStart() == nXPos || rAttr.GetEnd() == nXPos)
 {
 if (rAttr.Which() == EE_FEATURE_FIELD)
 {
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7e27e1ee899a..4216a470ebc5 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1567,8 +1567,11 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
  && IsAttrAtPos::InetAttr & rContentAtPos.eContentAtPos
  && !aTmpState.m_bFootnoteNoInfo )
 {
-pTextAttr = pTextNd->GetTextAttrAt(
-aPos.nContent.GetIndex(), RES_TXTATR_INETFMT);
+sal_Int32 index = aPos.nContent.GetIndex();
+pTextAttr = pTextNd->GetTextAttrAt(index, 
RES_TXTATR_INETFMT);
+
+if(!pTextAttr && index > 0)
+pTextAttr = pTextNd->GetTextAttrAt(index - 1, 
RES_TXTATR_INETFMT);
 // "detect" only INetAttrs with URLs
 if( pTextAttr && 
!pTextAttr->GetINetFormat().GetValue().isEmpty() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 desktop/source/lib/init.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2dd50a40fa295ed75ad16e379e3781cf5e31f21b
Author: Pranam Lashkari 
AuthorDate: Wed Jan 20 14:30:14 2021 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:45:41 2021 +0200

Do not skip cursor invalidation if hyperlink in payload

Change-Id: Iba08f9a52a282bdab890eeb4194222d0b576d64b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109664
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit f7b31b02f2fe28f75d2a70c0261897aba4a7b72d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109676
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 1a13ba5927e5f2fdd8f1461bae568b48dd4abe0b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113491
Tested-by: Pranam Lashkari 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5f1c413090c3..a302b5d46f76 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1429,7 +1429,9 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 
 // Suppress invalid payloads.
 if (type == LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR &&
-payload.find(", 0, 0, ") != std::string::npos)
+payload.find(", 0, 0, ") != std::string::npos &&
+payload.find("\"hyperlink\":\"\"") == std::string::npos &&
+payload.find("\"hyperlink\": {}") == std::string::npos)
 {
 // The cursor position is often the relative coordinates of the widget
 // issuing it, instead of the absolute one that we expect.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/view/select.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 35d13f5daa86fbe2074982a7f7e87d91b74187d0
Author: Pranam Lashkari 
AuthorDate: Sat Jan 9 20:01:27 2021 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:45:07 2021 +0200

LOK: stop range selection with mouse/touch move in mobile

Change-Id: I0a7b3a5fc89bcbced4acee18415308ed8aa57ba2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109035
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 408e59359b5b67af119059a5d3f47bc807f81300)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110434
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 3b7cd120472368730bcdb98d79baf76c9740d16d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113490
Tested-by: Pranam Lashkari 

diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 0ef0e2059b2b..1a51dd50d9fc 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if defined(_WIN32)
 #define SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN 65
@@ -473,7 +474,9 @@ bool ScViewFunctionSet::SetCursorAtCell( SCCOL nPosX, SCROW 
nPosY, bool bScroll
 pView->InitRefMode( nPosX, nPosY, pViewData->GetTabNo(), 
SC_REFTYPE_REF );
 }
 
-pView->UpdateRef( nPosX, nPosY, pViewData->GetTabNo() );
+if(SfxLokHelper::getDeviceFormFactor() != 
LOKDeviceFormFactor::MOBILE)
+pView->UpdateRef( nPosX, nPosY, pViewData->GetTabNo() );
+
 pView->SelectionChanged();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/inc sc/sdi sc/source

 sc/inc/sc.hrc |2 +-
 sc/sdi/cellsh.sdi |1 +
 sc/sdi/scalc.sdi  |   17 +
 sc/source/ui/view/cellsh1.cxx |   34 ++
 4 files changed, 53 insertions(+), 1 deletion(-)

New commits:
commit a92f42d85458996bc6c9393e6b3a53df417bc2f8
Author: Pranam Lashkari 
AuthorDate: Tue Jan 5 20:43:57 2021 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:44:26 2021 +0200

Added uno command for formula range selection

Change-Id: I01cd06ed51197ffe21102fb1fd0fcdce88ab333b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108810
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit e8a9157878f156e599e66349d7fb60ca39e62514)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109746
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 820984cdd2bc8f1bd8675606ec92eb42e01fff75)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109796
Tested-by: Jenkins
(cherry picked from commit 163fbf7231b26ec645365020cbef829a027e020a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113489
Tested-by: Pranam Lashkari 

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e80825624dea..59dba747d648 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -604,7 +604,7 @@
 #define FID_DELETE_ALL_NOTES(SID_NEW_SLOTS+104)
 #define SID_SCATTR_CELLPROTECTION(SID_NEW_SLOTS+105)
 #define SID_SELECT_UNPROTECTED_CELLS (SID_NEW_SLOTS+106)
-
+#define SID_CURRENT_FORMULA_RANGE  (SID_NEW_SLOTS+107)
 // idl parameter
 
 #define SID_SORT_BYROW  (SC_PARAM_START)
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 902cf8a639e9..de9f537de767 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -230,6 +230,7 @@ interface CellSelection
 SID_DEC_INDENT  [ ExecMethod = ExecuteEdit; 
StateMethod = GetState; ]
 SID_INC_INDENT  [ ExecMethod = ExecuteEdit; 
StateMethod = GetState; ]
 SID_SELECT_UNPROTECTED_CELLS[ ExecMethod = ExecuteEdit;]
+SID_CURRENT_FORMULA_RANGE   [ ExecMethod = ExecuteEdit;]
 
 SID_THESAURUS   [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
 SID_SPELL_DIALOG [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index a85957b245e7..47b429465197 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -4453,6 +4453,23 @@ SfxVoidItem SelectUnprotectedCells 
SID_SELECT_UNPROTECTED_CELLS
 GroupId = SfxGroupId::Edit;
 ]
 
+SfxVoidItem CurrentFormulaRange SID_CURRENT_FORMULA_RANGE
+(SfxInt32Item StartCol FN_PARAM_1,SfxInt32Item StartRow 
FN_PARAM_2,SfxInt32Item EndCol FN_PARAM_3,SfxInt32Item EndRow FN_PARAM_4, 
SfxInt32Item Table FN_PARAM_5)
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = SfxGroupId::Edit;
+]
+
 SfxVoidItem SelectOLE SID_OLE_SELECT
 ()
 [
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 1da99b474f0a..73080c8409bd 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2771,6 +2771,40 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 }
 break;
 
+case SID_CURRENT_FORMULA_RANGE:
+{
+const SfxInt32Item* param1 = 
rReq.GetArg(FN_PARAM_1);
+SCCOL colStart = param1 ? param1->GetValue() : 0;
+
+const SfxInt32Item* param2 = 
rReq.GetArg(FN_PARAM_2);
+SCROW rowStart = param2 ? param2->GetValue() : 0;
+
+const SfxInt32Item* param3 = 
rReq.GetArg(FN_PARAM_3);
+SCCOL colEnd = param3 ? param3->GetValue() : 0;
+
+const SfxInt32Item* param4 = 
rReq.GetArg(FN_PARAM_4);
+SCROW rowEnd = param4 ? param4->GetValue() : 0;
+
+const SfxInt32Item* param5 = 
rReq.GetArg(FN_PARAM_5);
+SCROW table = param5 ? param5->GetValue() : 0;
+
+ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
+
+if(param3 && param4 && pInputHdl && pTabViewShell)
+{
+ScViewData& rData = pTabViewShell->GetViewData();
+ScTabView* pTabView = dynamic_cast< ScTabView* >( 
rData.GetView() );
+
+if (param1 && param2)
+rData.SetRefStart(colStart, rowStart, table);
+
+pTabView->UpdateRef( colEnd, rowEnd, table ); // setup the 
end & refresh formula
+
+pInputHdl->UpdateLokReferenceMarks();
+}
+}
+break;
+
 default:
 OSL_FAIL("incorrect slot in ExecuteEdit");
 break;
__

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

 sd/source/ui/sidebar/SlideBackground.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 04c8aec283e951377829f4e31423f08d04b73aa1
Author: Pranam Lashkari 
AuthorDate: Fri Nov 20 09:44:25 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:43:51 2021 +0200

hide background options in master slide view in sidebar

Change-Id: Idecf4c849f9f5ac338ea24ca04cbbf9afe5cad5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106213
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 962bd10e456d95c7579ffb380b3e69f67cf5ea11)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109401
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111680
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 32596c77bba254a9762295d1c92fbbe26bbe68f0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113488
Tested-by: Pranam Lashkari 

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 28c560fa14be..c4a13fff4f13 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -309,6 +309,11 @@ void SlideBackground::HandleContextChange(
 mxFillStyle->hide();
 mxBackgroundLabel->hide();
 mxInsertImage->show();
+
+mxFillLB->hide();
+mxFillAttr->hide();
+mxFillGrad1->hide();
+mxFillGrad2->hide();
 }
 else if ( maContext == maImpressHandoutContext  || maContext == 
maImpressNotesContext )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/sdi/scalc.sdi   |2 +-
 sc/source/ui/view/tabvwshf.cxx |   11 +--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit c5da42c7169e30f4a4765d221263b8535106ec27
Author: Pranam Lashkari 
AuthorDate: Tue Nov 24 13:14:50 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:42:57 2021 +0200

added new parameter in uno:Move

new parameter UseCurrentDocument forces to use the correct document
for moving/copying sheet tabs around

When this parameter is true first parameter DocName will be ignored

Change-Id: I207966af5e11fdaaa0bdd91c07e1923399680395
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106478
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
(cherry picked from commit 7e21086c2903d19ec0981d09d63d8f7c4e078242)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106515
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit e2af5a1a0aa05884dc93775f0a5864dbb9a94f81)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113487
Tested-by: Pranam Lashkari 

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 57f97d8e90d8..a85957b245e7 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -3412,7 +3412,7 @@ SfxVoidItem Mirror SID_OBJECT_MIRROR
 
 
 SfxVoidItem Move FID_TAB_MOVE
-(SfxStringItem DocName FID_TAB_MOVE,SfxUInt16Item Index FN_PARAM_1,SfxBoolItem 
Copy FN_PARAM_2)
+(SfxStringItem DocName FID_TAB_MOVE,SfxUInt16Item Index FN_PARAM_1,SfxBoolItem 
Copy FN_PARAM_2,SfxBoolItem UseCurrentDocument FN_PARAM_3)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 98ce2db58fa7..40f78b7fc85b 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -464,7 +464,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 bool   bDoIt = false;
 sal_uInt16 nDoc = 0;
 SCTAB nTab = rViewData.GetTabNo();
-bool   bCpy = false;
+bool bCpy = false, bUseCurrentDocument = false;
 OUString aDocName;
 OUString aTabName;
 
@@ -473,8 +473,15 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 SCTAB nTableCount = rDoc.GetTableCount();
 const SfxPoolItem* pItem;
 
-if( pReqArgs->HasItem( FID_TAB_MOVE, &pItem ) )
+// if UseCurrentDocument(FN_PARAM_3) is true ignore the 
document name provided and use current document
+if( pReqArgs->HasItem( FN_PARAM_3, &pItem ) )
+bUseCurrentDocument = static_cast(pItem)->GetValue();
+
+if (bUseCurrentDocument)
+aDocName = GetViewData().GetDocShell()->GetTitle();
+else if(pReqArgs->HasItem( FID_TAB_MOVE, &pItem ))
 aDocName = static_cast(pItem)->GetValue();
+
 if( pReqArgs->HasItem( FN_PARAM_1, &pItem ) )
 {
 //  table is 1-based
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/sdi/scalc.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 972cf1d1e8180e30bad50f9a8f2cf4e6313d62ce
Author: Pranam Lashkari 
AuthorDate: Sun Nov 8 13:13:22 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:42:15 2021 +0200

added parameter to SheetRightToLeft command

Change-Id: Ib809e0e1686f83fa1412587eea47c4a4f8c94448
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105438
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
(cherry picked from commit 34be951bde599906d829c8dc676523845c9cb280)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106749
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 836b9c08b11f386e243a5a074a169b2cb2c2b93e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113486
Tested-by: Pranam Lashkari 

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 077fa4adf9d9..57f97d8e90d8 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -6043,7 +6043,7 @@ SfxVoidItem SelectArrayFormula SID_MARKARRAYFORMULA
 
 
 SfxBoolItem SheetRightToLeft FID_TAB_RTL
-
+(SfxBoolItem RightToLeft FID_TAB_RTL)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 291b3433921f094203de794c87e73a137c7656b7
Author: Pranam Lashkari 
AuthorDate: Sat Nov 7 12:29:33 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 2 19:40:44 2021 +0200

LOK: send state of SheetRightToLeft

Change-Id: I4b58ab74003065a63e4274293b868c909f4f583f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105428
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit cc7bf1755c31fcd4c388f25e642c37d0e2fd758a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106810
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 218b61fd1b2c7e614a877bb38f92affc6915c3fd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113485
Tested-by: Pranam Lashkari 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2c2fbfa0be36..5f1c413090c3 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2838,7 +2838,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:FreezePanes"),
 OUString(".uno:FreezePanesColumn"),
 OUString(".uno:FreezePanesRow"),
-OUString(".uno:Sidebar")
+OUString(".uno:Sidebar"),
+OUString(".uno:SheetRightToLeft")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e291eb472a25..9c78b4c693ce 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1019,7 +1019,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "TraceChangeMode" ||
 aEvent.FeatureURL.Path == "FormatPaintbrush" ||
 aEvent.FeatureURL.Path == "FreezePanes" ||
-aEvent.FeatureURL.Path == "Sidebar")
+aEvent.FeatureURL.Path == "Sidebar" ||
+aEvent.FeatureURL.Path == "SheetRightToLeft")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/neon solenv/flatpak-manifest.in solenv/README.md

2021-04-02 Thread Jan-Marek Glogowski (via logerrit)

 configure.ac   |4 ++--
 download.lst   |4 ++--
 external/neon/configs/config.h |   10 +-
 solenv/README.md   |7 +++
 solenv/flatpak-manifest.in |6 +++---
 5 files changed, 19 insertions(+), 12 deletions(-)

New commits:
commit c974b23ff78dbe11a7b23f7317fdd096ab8cb282
Author: Jan-Marek Glogowski 
AuthorDate: Fri Apr 2 02:20:57 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Apr 2 19:35:07 2021 +0200

tdf#140229 neon: update to release 0.31.2

I didn't check all commits, but the most likely fix was "Fix hang
on SSL connection close with IIS (issue #11)". The server from
this bug report is a "Microsoft-IIS/10.0", according to the output
from "curl --dump-header".

Not sure this bug is critical enough to bump the neon dependency
in configure.

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

diff --git a/configure.ac b/configure.ac
index 92aa16f13ef3..d8d336860b29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10607,11 +10607,11 @@ serf)
 neon)
 AC_MSG_RESULT([neon])
 # Check for system neon
-libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.31.1])
+libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.31.2])
 if test "$with_system_neon" = "yes"; then
 NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
 else
-NEON_VERSION=0311
+NEON_VERSION=0312
 fi
 AC_SUBST(NEON_VERSION)
 ;;
diff --git a/download.lst b/download.lst
index adf73ca23d30..3c3462552d74 100644
--- a/download.lst
+++ b/download.lst
@@ -191,8 +191,8 @@ export MWAW_VERSION_MICRO := 17
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
-export NEON_SHA256SUM := 
c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d
-export NEON_TARBALL := neon-0.31.1.tar.gz
+export NEON_SHA256SUM := 
cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
+export NEON_TARBALL := neon-0.31.2.tar.gz
 export NSS_SHA256SUM := 
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
 export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
 export ODFGEN_SHA256SUM := 
55200027fd46623b9b38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h
index 3f93d1e68132..af8408ad9ad3 100644
--- a/external/neon/configs/config.h
+++ b/external/neon/configs/config.h
@@ -1,4 +1,4 @@
-/* Contents kept in sync with config.h.in from neon 0.31.1 */
+/* Contents kept in sync with config.h.in from neon 0.31.2 */
 
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
@@ -370,7 +370,7 @@
 #define NEON_IS_LIBRARY 1
 
 /* Define to be the neon version string */
-#define NEON_VERSION "0.31.1"
+#define NEON_VERSION "0.31.2"
 
 /* Define to enable debugging */
 /* #undef NE_DEBUGGING */
@@ -435,7 +435,7 @@
 #define NE_VERSION_MINOR (31)
 
 /* Define to be neon library patch version */
-#define NE_VERSION_PATCH (1)
+#define NE_VERSION_PATCH (2)
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "n...@webdav.org"
@@ -444,13 +444,13 @@
 #define PACKAGE_NAME "neon"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "neon 0.31.1"
+#define PACKAGE_STRING "neon 0.31.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "neon"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.31.1"
+#define PACKAGE_VERSION "0.31.2"
 
 /* The size of `int', as computed by sizeof. */
 #define SIZEOF_INT 4
diff --git a/solenv/README.md b/solenv/README.md
index 68e58e8bc774..b5a730746674 100644
--- a/solenv/README.md
+++ b/solenv/README.md
@@ -32,3 +32,10 @@ src/
 useful standard / re-usable component map files for components
 which shouldn't export anything more than a few registration
 symbols.
+
+flatpak-manifest.in
+This file is used by flatpak/build.sh from the LO dev-tools
+repository to generate the flatpak package. download.lst is
+a Makefile snippet, so there seems to be no easy way to use
+download.lst for the manifest generation (build.sh uses sed),
+and its information must be kept in sync manually.
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c86fc663388f..152c3775828f 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -357,10 +357,10 @@
 "dest-filename": "external/tarballs/mdds-1.7.0.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/neon-0.31.1

Re: Problem with make

2021-04-02 Thread Jan-Marek Glogowski


Hi Andrew,

Am 02.04.21 um 16:31 schrieb Andrew Hany:
I've tried over 4 times to run the "make" command after installing all 
dependencies and following the instructions on 
https://wiki.documentfoundation.org/Development/BuildingOnWindows 

However, it always gets stuck for hours at some point in the make 
process after it keeps running normally for 6-7 hours. So I've been 
unable to finish the make process.

P.s: I make sure my anti-virus software is turned off at that time.


Did you check 
https://wiki.documentfoundation.org/Development/BuildingOnWindows#Known_Problems?


- I've also tried running the Linux build instructions through a virtual 
machine but still with no luck. Any suggestions on what I could do?


Without any error log and info about your setup, there is no way to help 
with this problem.


But my general suggestion is to go to IRC #libreoffice-dev @ freenode, 
as this likely can be solved much easier interactively using the chat.


HTH

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

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 3f17b3881117a8f45709a21bd52ebbb448dc0bae
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:23:33 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:23:33 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0e9713375f42fe2323f54294086999dc58659a8d
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index a30c5ceb57cc..0e9713375f42 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a30c5ceb57cc32d01b46897a0cd4e24df2d869ec
+Subproject commit 0e9713375f42fe2323f54294086999dc58659a8d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/00040501.xhp |   10 +-
 source/text/shared/02/0117.xhp |2 +-
 source/text/shared/02/01170100.xhp |2 +-
 source/text/shared/02/01170101.xhp |2 +-
 source/text/shared/02/01170102.xhp |2 +-
 source/text/shared/02/01170103.xhp |2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 0e9713375f42fe2323f54294086999dc58659a8d
Author: Johnny_M 
AuthorDate: Fri Apr 2 12:35:33 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:23:33 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/00040501.xhp 
b/source/text/shared/00/00040501.xhp
index 8e533fbd1..1a5a6532a 100644
--- a/source/text/shared/00/00040501.xhp
+++ b/source/text/shared/00/00040501.xhp
@@ -77,9 +77,9 @@
 Open context menu of a 
selected form element - choose Form Properties - Events 
tab.
 Open Form 
Design toolbar, click Form Properties icon - 
Events tab.
 
-
+
 Open context menu of a 
selected form element - choose Control 
Properties.
-
+
 
 
 
@@ -92,15 +92,15 @@
 
 
 
-
+
 Open context menu of a 
selected form element - choose Control Properties - 
General tab.
 Open Form 
Design toolbar, click Control icon - 
General tab.
 
-
+
 Open context menu of a 
selected form element - choose Control Properties - Data 
tab.
 Open Form 
Design toolbar, click Control icon - 
Data tab.
 
-
+
 Open context menu of a 
selected form element - choose Control Properties - Events 
tab.
 Open Form 
Design toolbar, click Control Properties icon - 
Events tab.
 
diff --git a/source/text/shared/02/0117.xhp 
b/source/text/shared/02/0117.xhp
index 7da60477b..3e5dbcb6f 100644
--- a/source/text/shared/02/0117.xhp
+++ b/source/text/shared/02/0117.xhp
@@ -107,7 +107,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/02/01170100.xhp 
b/source/text/shared/02/01170100.xhp
index 4ef8cc49c..d6961c522 100644
--- a/source/text/shared/02/01170100.xhp
+++ b/source/text/shared/02/01170100.xhp
@@ -38,7 +38,7 @@
   Opens a dialog for editing the properties of a 
selected control.
 
 
-  
+  
 
 You can only call the Properties dialog when in the 
Design mode with a control selected.
 
diff --git a/source/text/shared/02/01170101.xhp 
b/source/text/shared/02/01170101.xhp
index 21f1b04f7..199e3cda3 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -30,7 +30,7 @@
   This 
General tab enables you to define the general properties of a form 
control. These properties differ, depending on the control type. Not all of the 
following properties are available for every control.
 
 
-  
+  
 
 If you export the 
current form document to HTML format, the default control values are exported, 
not the current control values. Default values are determined - depending on 
the type of control - by the properties' Default value (for 
example, in text fields), Default status (for check boxes and 
option fields), and Default selection (for list boxes).
 
diff --git a/source/text/shared/02/01170102.xhp 
b/source/text/shared/02/01170102.xhp
index b59f8936a..70e04f129 100644
--- a/source/text/shared/02/01170102.xhp
+++ b/source/text/shared/02/01170102.xhp
@@ -38,7 +38,7 @@
 The 
Data tab page allows you to assign a data source to the selected 
control.
 
 
-  
+  
 
 For forms with 
database links, the associated database is defined in the Form 
Properties. You will find the functions for this on the Data tab 
page.
 The possible 
settings of the Data tab page of a control depend on the 
respective control. You will only see the options that are available for the 
current control and context.The following fields are available:
diff --git a/source/text/shared/02/01170103.xhp 
b/source/text/shared/02/01170103.xhp
index 24a83972e..4994301db 100644
--- a/source/text/shared/02/01170103.xhp
+++ b/source/text/shared/02/01170103.xhp
@@ -36,7 +36,7 @@
 
 When the event 
occurs, the linked macro will be called. To assign a macro to an event, press 
the ... button. The Assign Action dialog opens.
 
-  
+  
 
 Depending on 
the control, different events are available. Only the available events for the 
selected control and context are listed on the Events tab 
page.The following events are defined:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit b80729e6db5c688d7a1a7641117b5112529d6289
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:22:43 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:22:43 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a30c5ceb57cc32d01b46897a0cd4e24df2d869ec
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 4de112ee5dc8..a30c5ceb57cc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4de112ee5dc856cd3ddd9ccdafaa611f9b9c8951
+Subproject commit a30c5ceb57cc32d01b46897a0cd4e24df2d869ec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/00040501.xhp |6 +++---
 source/text/shared/02/01170201.xhp |2 +-
 source/text/shared/02/01170202.xhp |2 +-
 source/text/shared/02/01170203.xhp |2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a30c5ceb57cc32d01b46897a0cd4e24df2d869ec
Author: Johnny_M 
AuthorDate: Fri Apr 2 12:28:39 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:22:43 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/00040501.xhp 
b/source/text/shared/00/00040501.xhp
index 0753fdabc..8e533fbd1 100644
--- a/source/text/shared/00/00040501.xhp
+++ b/source/text/shared/00/00040501.xhp
@@ -61,11 +61,11 @@
 
 
 
-
+
 Open context menu of a 
selected form element - choose Form Properties - General 
tab.
 Open Form 
Design toolbar, click Form Properties icon - 
General tab.
 
-
+
 Open context menu of a 
selected form element - choose Form Properties - Data 
tab.
 Open Form 
Design toolbar, click Form Properties icon - 
Data tab.
 
@@ -73,7 +73,7 @@
 Open context menu of a 
selected control on an XML Form document, choose Control 
Properties - Data tab.
 Open Form 
Controls toolbar of an XML Form document, click 
Control icon - Data tab.
 
-
+
 Open context menu of a 
selected form element - choose Form Properties - Events 
tab.
 Open Form 
Design toolbar, click Form Properties icon - 
Events tab.
 
diff --git a/source/text/shared/02/01170201.xhp 
b/source/text/shared/02/01170201.xhp
index 5f6d00b05..17a2dcf1e 100644
--- a/source/text/shared/02/01170201.xhp
+++ b/source/text/shared/02/01170201.xhp
@@ -38,7 +38,7 @@
 General
 
 
-  
+  
 
 A form is a 
text document or spreadsheet with different form controls. If you create a form 
for a Web page, the user can enter data into it to send over the Internet. The 
data from the form controls of a form is transmitted to a server by specifying 
a URL and can be processed on the server.
 Name
diff --git a/source/text/shared/02/01170202.xhp 
b/source/text/shared/02/01170202.xhp
index dd5533faf..ab815a4ff 100644
--- a/source/text/shared/02/01170202.xhp
+++ b/source/text/shared/02/01170202.xhp
@@ -36,7 +36,7 @@
  The Events tab page, allows you to assign a macro 
to certain events which occur in a database form.
   
   
- 
+ 
   
   To link 
an event with a macro, first write a macro that contains all the commands to be 
executed when the event happens. Then assign this macro to the respective event 
by clicking the ... button beside the corresponding event. 
The Assign Macro dialog opens, where you can select the 
macro.
   The 
following actions can be configured individually, meaning that you can use your 
own dialogs to depict an action:
diff --git a/source/text/shared/02/01170203.xhp 
b/source/text/shared/02/01170203.xhp
index bb9cc85e6..b83304db5 100644
--- a/source/text/shared/02/01170203.xhp
+++ b/source/text/shared/02/01170203.xhp
@@ -40,7 +40,7 @@
 
 Defines the 
data source on which the form is based, or specifies whether the data can be 
edited by the user. Apart from the sort and filter functions, you will also 
find all the necessary properties to create a subform.
 
-  
+  
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit d0382a03d33aead6f4f97d1d8f604947d5316a92
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:21:31 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:21:31 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 4de112ee5dc856cd3ddd9ccdafaa611f9b9c8951
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 036bafec0b90..4de112ee5dc8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 036bafec0b9053d93d55c4f94f03123b557efd21
+Subproject commit 4de112ee5dc856cd3ddd9ccdafaa611f9b9c8951
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/00040501.xhp |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 4de112ee5dc856cd3ddd9ccdafaa611f9b9c8951
Author: Johnny_M 
AuthorDate: Fri Apr 2 12:21:40 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:21:31 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/00040501.xhp 
b/source/text/shared/00/00040501.xhp
index fa4408c71..0753fdabc 100644
--- a/source/text/shared/00/00040501.xhp
+++ b/source/text/shared/00/00040501.xhp
@@ -35,7 +35,6 @@
 Open Form Controls toolbar, click Combo 
Box or List Box icon and drag mouse to generate field. 
Database connection must exist in the form: Wizard - Page 
2.
 Open Form Controls toolbar, click List 
Box icon and drag mouse to generate field. Database connection must 
exist in the form: Wizard - Page 3.
 Open Form Controls toolbar, click Combo 
Box icon and drag mouse to generate field. Database connection must 
exist in the form: Wizard - Page 3.
-
 Open 
Toolbox bar in Basic dialog editor, click
 
 
@@ -47,7 +46,6 @@
 
 
 
-
 
 Open context menu of a 
selected form element - choose Form Properties.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 551a32d9fc969aa5da26f608649642327a61902e
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:20:34 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:20:34 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 036bafec0b9053d93d55c4f94f03123b557efd21
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index f8bcea937921..036bafec0b90 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f8bcea937921b3bece4ffd2a17fd265689f69e09
+Subproject commit 036bafec0b9053d93d55c4f94f03123b557efd21
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/0401.xhp |2 +-
 source/text/shared/main0201.xhp|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 036bafec0b9053d93d55c4f94f03123b557efd21
Author: Johnny_M 
AuthorDate: Fri Apr 2 12:13:51 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:20:34 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index 8a467c67a..d3e623a45 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -199,7 +199,7 @@
 Choose File - Properties - Font 
tab.
 
 Menu 
File - Print Preview.
-
+
 
 
 
diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp
index 5fcecec41..aa6b26a99 100644
--- a/source/text/shared/main0201.xhp
+++ b/source/text/shared/main0201.xhp
@@ -50,10 +50,10 @@
 
 
 
-
+
 
 
-
+
 
 
 Spelling
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 9a939f7e35cdc53321e854b11c735f5f6572c797
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:20:00 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:20:00 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to f8bcea937921b3bece4ffd2a17fd265689f69e09
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index cf74fe9c3acb..f8bcea937921 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cf74fe9c3acb09978ed9866bd0e3e9aa34fd4de0
+Subproject commit f8bcea937921b3bece4ffd2a17fd265689f69e09
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/0401.xhp |2 +-
 source/text/shared/01/01020001.xhp |2 +-
 source/text/shared/main0201.xhp|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f8bcea937921b3bece4ffd2a17fd265689f69e09
Author: Johnny_M 
AuthorDate: Fri Apr 2 12:09:49 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:20:00 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index 1b8fe15a7..8a467c67a 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -70,7 +70,7 @@
 Choose 
File - Open.
 CommandCtrl+O
 On the 
Standard bar, click
-
+
 
 
 
diff --git a/source/text/shared/01/01020001.xhp 
b/source/text/shared/01/01020001.xhp
index 9624caaae..cdfa8ae21 100644
--- a/source/text/shared/01/01020001.xhp
+++ b/source/text/shared/01/01020001.xhp
@@ -29,7 +29,7 @@
   Choose File - Open 
Remote.
   Click the Remote Files button in the Start 
Center.
   Long-click the Open icon and select Open 
Remote File.
-
+
 
   A 
remote file server is a web service that stores 
documents with or without checkin, checkout, version controls and 
backups.
 
diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp
index 5a7ec5ede..5fcecec41 100644
--- a/source/text/shared/main0201.xhp
+++ b/source/text/shared/main0201.xhp
@@ -32,7 +32,7 @@
 
 Open File
 
-
+
 
 
 Save 
As
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Problem with make

2021-04-02 Thread Andrew Hany

I've tried over 4 times to run the "make" command after installing all
dependencies and following the instructions on
https://wiki.documentfoundation.org/Development/BuildingOnWindows
However, it always gets stuck for hours at some point in the make process
after it keeps running normally for 6-7 hours. So I've been unable to
finish the make process.
P.s: I make sure my anti-virus software is turned off at that time.
- I've also tried running the Linux build instructions through a virtual
machine but still with no luck. Any suggestions on what I could do?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 2b9d0fa3b416a8488304d0f9cb975a5caa95a4c9
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:16:59 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:16:59 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to cf74fe9c3acb09978ed9866bd0e3e9aa34fd4de0
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 46dc7f4b3c7f..cf74fe9c3acb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 46dc7f4b3c7f347ec78763a29a2ac0b9ecf7b0db
+Subproject commit cf74fe9c3acb09978ed9866bd0e3e9aa34fd4de0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/0401.xhp |2 +-
 source/text/shared/01/01010203.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cf74fe9c3acb09978ed9866bd0e3e9aa34fd4de0
Author: Johnny_M 
AuthorDate: Fri Apr 2 12:07:17 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:16:59 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index 6ab0d19cc..1b8fe15a7 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -57,7 +57,7 @@
 Choose 
File - New - Labels - Format tab.
 Choose 
File - New - Business Cards - Format tab.
 
-
+
 Choose 
File - New - Labels - Options tab.
 Choose 
File - New - Business Cards - Options tab.
 
diff --git a/source/text/shared/01/01010203.xhp 
b/source/text/shared/01/01010203.xhp
index da3df738a..8e347ced5 100644
--- a/source/text/shared/01/01010203.xhp
+++ b/source/text/shared/01/01010203.xhp
@@ -35,7 +35,7 @@
   Sets additional options for your labels or business cards, 
including text synchronization and printer settings.
 
 
-  
+  
 
 
 Entire 
Page
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 37d8a9bb37122943121d061150685265a327a146
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:16:18 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:16:18 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 46dc7f4b3c7f347ec78763a29a2ac0b9ecf7b0db
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index dd47b9adb92f..46dc7f4b3c7f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dd47b9adb92fa879a6daf3a9db2d350e906e226c
+Subproject commit 46dc7f4b3c7f347ec78763a29a2ac0b9ecf7b0db
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/0401.xhp |2 +-
 source/text/shared/01/01010202.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 46dc7f4b3c7f347ec78763a29a2ac0b9ecf7b0db
Author: Johnny_M 
AuthorDate: Fri Apr 2 12:05:34 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:16:18 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index 773b19e5d..6ab0d19cc 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -53,7 +53,7 @@
 Key 
Shift+CommandCtrl+N
 Choose File - New - Labels.
 Choose File - New - Labels - Labels 
tab.
-
+
 Choose 
File - New - Labels - Format tab.
 Choose 
File - New - Business Cards - Format tab.
 
diff --git a/source/text/shared/01/01010202.xhp 
b/source/text/shared/01/01010202.xhp
index 7212b53c4..7a57c37c4 100644
--- a/source/text/shared/01/01010202.xhp
+++ b/source/text/shared/01/01010202.xhp
@@ -35,7 +35,7 @@
   Set paper formatting 
options.
 
 
-  
+  
 
 
 Horizontal pitch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit d6edbea3d55ac97a13da3bf0585d83e0e9e68131
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:15:41 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:15:41 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to dd47b9adb92fa879a6daf3a9db2d350e906e226c
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 69e8a855c7a8..dd47b9adb92f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 69e8a855c7a8006cfce05aa7cfda30a0cd6ffec3
+Subproject commit dd47b9adb92fa879a6daf3a9db2d350e906e226c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 17954feded0b90ac5c559b46bc93b0892c0d6afa
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:15:08 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:15:08 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 69e8a855c7a8006cfce05aa7cfda30a0cd6ffec3
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 7ea20bbe0dfb..69e8a855c7a8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7ea20bbe0dfb5167588afc792d0bfca3e8d1a803
+Subproject commit 69e8a855c7a8006cfce05aa7cfda30a0cd6ffec3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/0401.xhp |2 --
 1 file changed, 2 deletions(-)

New commits:
commit dd47b9adb92fa879a6daf3a9db2d350e906e226c
Author: Johnny_M 
AuthorDate: Fri Apr 2 12:02:38 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:15:41 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index 9d1fb9304..773b19e5d 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -49,10 +49,8 @@
 
 Key 
CommandCtrl+N
 
-
 Menu 
File - New - Templates.
 Key 
Shift+CommandCtrl+N
-
 Choose File - New - Labels.
 Choose File - New - Labels - Labels 
tab.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/0401.xhp |2 +-
 source/text/shared/main0201.xhp|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 69e8a855c7a8006cfce05aa7cfda30a0cd6ffec3
Author: Johnny_M 
AuthorDate: Fri Apr 2 12:00:41 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:15:08 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index 212d32c51..9d1fb9304 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -33,7 +33,7 @@
 Choose 
File - New.
 
 New icon on the Standard bar (the icon shows the 
type of the new document).
-
+
 
 
 
diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp
index 3912bd0a7..5a7ec5ede 100644
--- a/source/text/shared/main0201.xhp
+++ b/source/text/shared/main0201.xhp
@@ -29,7 +29,7 @@
 The Standard bar is available in every 
$[officename] application.
 
 
-
+
 Open File
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit bbc449c9a363fec2bbd99f583e226ff36aad175f
Author: Johnny_M 
AuthorDate: Fri Apr 2 18:14:38 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 2 18:14:38 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7ea20bbe0dfb5167588afc792d0bfca3e8d1a803
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index c48d8ad018db..7ea20bbe0dfb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c48d8ad018dbe18632e3b0454874d4e0b4fb1757
+Subproject commit 7ea20bbe0dfb5167588afc792d0bfca3e8d1a803
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/scalc/02/1801.xhp|2 +-
 source/text/sdraw/main0210.xhp   |2 +-
 source/text/shared/00/0404.xhp   |4 ++--
 source/text/shared/01/0414.xhp   |2 +-
 source/text/shared/02/0114.xhp   |2 +-
 source/text/simpress/02/1011.xhp |2 +-
 source/text/simpress/main0210.xhp|2 +-
 source/text/swriter/01/0506.xhp  |2 +-
 source/text/swriter/01/05060300.xhp  |2 +-
 source/text/swriter/02/1801.xhp  |2 +-
 source/text/swriter/02/1903.xhp  |2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 7ea20bbe0dfb5167588afc792d0bfca3e8d1a803
Author: Johnny_M 
AuthorDate: Fri Apr 2 11:47:19 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Apr 2 18:14:38 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/scalc/02/1801.xhp 
b/source/text/scalc/02/1801.xhp
index d4dfc6cb6..f6c5fb777 100644
--- a/source/text/scalc/02/1801.xhp
+++ b/source/text/scalc/02/1801.xhp
@@ -60,7 +60,7 @@
 
 From File
 
-
+
 
 
 Formula
diff --git a/source/text/sdraw/main0210.xhp b/source/text/sdraw/main0210.xhp
index b66d03ade..55eb29a72 100644
--- a/source/text/sdraw/main0210.xhp
+++ b/source/text/sdraw/main0210.xhp
@@ -72,7 +72,7 @@
 
 From File
 
-
+
 
 
 Form Controls
diff --git a/source/text/shared/00/0404.xhp 
b/source/text/shared/00/0404.xhp
index 9ef32cc0c..1f9d23c59 100644
--- a/source/text/shared/00/0404.xhp
+++ b/source/text/shared/00/0404.xhp
@@ -133,10 +133,10 @@
 
 
 
-
+
 Choose 
Insert - Image.
 On the 
Standard bar, click bar or toolbar?
-
+
 
 
 
diff --git a/source/text/shared/01/0414.xhp 
b/source/text/shared/01/0414.xhp
index a7477d691..59a3503fa 100644
--- a/source/text/shared/01/0414.xhp
+++ b/source/text/shared/01/0414.xhp
@@ -35,7 +35,7 @@
 centered on the page or 
slide.
 
 
-
+
 
 
 
diff --git a/source/text/shared/02/0114.xhp 
b/source/text/shared/02/0114.xhp
index 27948c800..8842c8ba2 100644
--- a/source/text/shared/02/0114.xhp
+++ b/source/text/shared/02/0114.xhp
@@ -245,7 +245,7 @@
 
 From File
 
-
+
 Extrusion On/Off
 Switches the 3D 
effects on and off for the selected objects.
 
diff --git a/source/text/simpress/02/1011.xhp 
b/source/text/simpress/02/1011.xhp
index 0ae5e1a59..ccdaaa408 100644
--- a/source/text/simpress/02/1011.xhp
+++ b/source/text/simpress/02/1011.xhp
@@ -58,7 +58,7 @@
 
 From File
 
-
+
 
 
 Formula
diff --git a/source/text/simpress/main0210.xhp 
b/source/text/simpress/main0210.xhp
index a3df9abff..a791e5365 100644
--- a/source/text/simpress/main0210.xhp
+++ b/source/text/simpress/main0210.xhp
@@ -78,7 +78,7 @@
 
 From File
 
-
+
 
 
 Rotate
diff --git a/source/text/swriter/01/0506.xhp 
b/source/text/swriter/01/0506.xhp
index a5cb35fe0..e608eb8d2 100644
--- a/source/text/swriter/01/0506.xhp
+++ b/source/text/swriter/01/0506.xhp
@@ -41,7 +41,7 @@
 Wrap
 
 
-
+
 
 
 
diff --git a/source/text/swriter/01/05060300.xhp 
b/source/text/swriter/01/05060300.xhp
index 43e20edee..c9b349a91 100644
--- a/source/text/swriter/01/05060300.xhp
+++ b/source/text/swriter/01/05060300.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 Image
diff --git a/source/text/swriter/02/1801.xhp 
b/source/text/swriter/02/1801.xhp
index f6786ab42..a9962fc56 100644
--- a/source/text/swriter/02/1801.xhp
+++ b/source/text/swriter/02/1801.xhp
@@ -73,7 +73,7 @@
 
 From File
 
-
+
 
 
 Formula
diff --git a/source/text/swriter/02/1903.xhp 
b/source/text/swriter/02/1903.xhp
index eaa40c85d..61c544269 100644
--- a/source/text/swriter/02/1903.xhp
+++ b/source/text/swriter/02/1903.xhp
@@ -53,7 +53,7 @@
 
 From File
 
-
+
 Insert 
Table
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-04-02 Thread Caolán McNamara (via logerrit)

 vcl/source/window/syswin.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a80fdc6894b81b7cd35fcf2c23079497daa66f89
Author: Caolán McNamara 
AuthorDate: Fri Apr 2 15:05:48 2021 +0100
Commit: Caolán McNamara 
CommitDate: Fri Apr 2 17:46:54 2021 +0200

tdf#141318 Dialog::GetOptimalSize not including border if called before Show

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

diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 64dd582f1277..ecba89c0aac1 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -1018,7 +1018,10 @@ Size SystemWindow::GetOptimalSize() const
 if (!isLayoutEnabled())
 return Window::GetOptimalSize();
 
-Size aSize = 
VclContainer::getLayoutRequisition(*GetWindow(GetWindowType::FirstChild));
+Window *pBox = GetWindow(GetWindowType::FirstChild);
+// tdf#141318 Do the same as SystemWindow::setOptimalLayoutSize in case 
we're called before initial layout
+const_cast(this)->settingOptimalLayoutSize(pBox);
+Size aSize = VclContainer::getLayoutRequisition(*pBox);
 
 sal_Int32 nBorderWidth = get_border_width();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-04-02 Thread Caolán McNamara (via logerrit)

 sc/source/core/tool/compiler.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8de38977838d5a044271cb170730e3d557659f17
Author: Caolán McNamara 
AuthorDate: Fri Apr 2 14:28:37 2021 +0100
Commit: Caolán McNamara 
CommitDate: Fri Apr 2 17:46:26 2021 +0200

ofz: Segv on unknown address

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

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 250e816a2e5e..faf5d587de42 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2638,7 +2638,14 @@ Label_MaskStateMachine:
 if (eState != ssSkipReference)
 {
 *pSym++ = c;
-*pSym++ = *pSrc++;
+
+if( pSym == &cSymbol[ MAXSTRLEN ] )
+{
+SetError( 
FormulaError::StringOverflow);
+eState = ssStop;
+}
+else
+*pSym++ = *pSrc++;
 }
 bAddToSymbol = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-04-02 Thread Justin Luth (via logerrit)

 filter/source/msfilter/eschesdo.cxx  |   20 ++--
 filter/source/msfilter/eschesdo.hxx  |4 ++--
 include/filter/msfilter/escherex.hxx |4 ++--
 sc/source/filter/excel/xeescher.cxx  |4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit a3c5c0f7ce73001adab7475fde1f8ffec4eef48b
Author: Justin Luth 
AuthorDate: Wed Mar 31 09:21:45 2021 +0200
Commit: Justin Luth 
CommitDate: Fri Apr 2 17:28:54 2021 +0200

tdf#139786 partial revert tdf#106181 XLSX export: output form controls

Not every export is going to be to OOXML format,
so don't just set ooxmlexport to true
and remove the "if" clause (especially when
leaving the comment that this is for DOCX only).

This is a partial revert to 7.1 (and backported to 6.4.5)
commit 577dd32b1c4eb0a4cff574fbabca987cb52b831b.

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

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index 7df0a58f7aa4..d5d49f1d2f30 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -421,8 +421,8 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject& rObj,
 {
 const Reference< XPropertySet > xPropSet = rObj.mXPropSet;
 const Reference xPropInfo = xPropSet.is() ? 
xPropSet->getPropertySetInfo() : Reference();
-// This code is expected to be called only for DOCX format.
-if (xPropInfo.is())
+// This code is expected to be called only for DOCX/XLSX formats.
+if (xPropInfo.is() && bOOxmlExport)
 {
 bool bInline = false;
 if (xPropInfo->hasPropertyByName("AnchorType"))
@@ -834,7 +834,7 @@ void ImplEESdrWriter::ImplInitPageValues()
 }
 
 void ImplEESdrWriter::ImplWritePage(
-EscherSolverContainer& rSolverContainer )
+EscherSolverContainer& rSolverContainer, bool ooxmlExport )
 {
 ImplInitPageValues();
 
@@ -845,7 +845,7 @@ void ImplEESdrWriter::ImplWritePage(
 mXShapes->getByIndex( n )) );
 if( aObj.IsValid() )
 {
-ImplWriteShape( aObj, rSolverContainer, true );
+ImplWriteShape( aObj, rSolverContainer, ooxmlExport );
 }
 }
 }
@@ -924,10 +924,10 @@ void ImplEESdrWriter::ImplFlushSolverContainer()
 }
 }
 
-void ImplEESdrWriter::ImplWriteCurrentPage()
+void ImplEESdrWriter::ImplWriteCurrentPage(bool ooxmlExport)
 {
 assert(mpSolverContainer && "ImplEESdrWriter::ImplWriteCurrentPage: no 
SolverContainer");
-ImplWritePage( *mpSolverContainer );
+ImplWritePage( *mpSolverContainer, ooxmlExport );
 ImplExitPage();
 }
 
@@ -937,16 +937,16 @@ sal_uInt32 ImplEESdrWriter::ImplWriteTheShape( 
ImplEESdrObject& rObj , bool ooxm
 return ImplWriteShape( rObj, *mpSolverContainer, ooxmlExport );
 }
 
-void EscherEx::AddSdrPage( const SdrPage& rPage )
+void EscherEx::AddSdrPage( const SdrPage& rPage, bool ooxmlExport )
 {
 if ( mpImplEESdrWriter->ImplInitPage( rPage ) )
-mpImplEESdrWriter->ImplWriteCurrentPage();
+mpImplEESdrWriter->ImplWriteCurrentPage(ooxmlExport);
 }
 
-void EscherEx::AddUnoShapes( const Reference< XShapes >& rxShapes )
+void EscherEx::AddUnoShapes( const Reference< XShapes >& rxShapes, bool 
ooxmlExport )
 {
 if ( mpImplEESdrWriter->ImplInitUnoShapes( rxShapes ) )
-mpImplEESdrWriter->ImplWriteCurrentPage();
+mpImplEESdrWriter->ImplWriteCurrentPage(ooxmlExport);
 }
 
 sal_uInt32 EscherEx::AddSdrObject( const SdrObject& rObj, bool ooxmlExport )
diff --git a/filter/source/msfilter/eschesdo.hxx 
b/filter/source/msfilter/eschesdo.hxx
index 2ca7ab467b6f..114efca4092f 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -112,7 +112,7 @@ class ImplEESdrWriter
 std::unique_ptr mpSolverContainer;
 
 voidImplInitPageValues();
-voidImplWritePage( EscherSolverContainer& rSolver );
+voidImplWritePage( EscherSolverContainer& rSolver, bool 
ooxmlExport );
 sal_uInt32  ImplWriteShape( ImplEESdrObject& rObj,
 EscherSolverContainer& rSolver,
 const bool bOOxmlExport = false );  // returns 
ShapeID
@@ -132,7 +132,7 @@ public:
 EscherExHostAppData* ImplGetHostData() { return mpHostAppData; }
 boolImplInitPage( const SdrPage& rPage );
 boolImplInitUnoShapes( const css::uno::Reference< 
css::drawing::XShapes >& rxShapes );
-voidImplWriteCurrentPage();
+voidImplWriteCurrentPage( bool ooxmlExport );
 sal_uInt32  ImplWriteTheShape( ImplEESdrObject& rObj, bool 
ooxmlExport );
 voidImplExitPag

[Libreoffice-commits] core.git: basctl/source basic/source comphelper/source connectivity/source desktop/source sc/source sfx2/source

2021-04-02 Thread Mike Kaganski (via logerrit)

 basctl/source/dlged/dlgedfac.cxx   |   13 +
 basic/source/classes/sbunoobj.cxx  |   14 +-
 basic/source/runtime/iosys.cxx |   14 +-
 basic/source/runtime/methods1.cxx  |   17 +
 comphelper/source/misc/lok.cxx |   14 ++
 connectivity/source/drivers/file/fcomp.cxx |4 +---
 desktop/source/app/crashreport.cxx |   10 +-
 sc/source/ui/unoobj/textuno.cxx|   28 +---
 sfx2/source/appl/appinit.cxx   |   22 ++
 9 files changed, 51 insertions(+), 85 deletions(-)

New commits:
commit 86d298f87f00fe70d31a65b7e98f9b17fa80cb6b
Author: Mike Kaganski 
AuthorDate: Fri Apr 2 15:12:00 2021 +0300
Commit: Mike Kaganski 
CommitDate: Fri Apr 2 17:22:21 2021 +0200

Simplify some static variable initializations

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

diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 38c8dc0d1a9c..98c0f260b0f9 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -46,20 +46,17 @@ DlgEdFactory::~DlgEdFactory() COVERITY_NOEXCEPT_FALSE
 
 IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
 {
-static bool bNeedsInit = true;
-static uno::Reference< lang::XMultiServiceFactory > xDialogSFact;
-
-if( bNeedsInit )
-{
+static const uno::Reference xDialogSFact = [] {
+uno::Reference xFact;
 uno::Reference< uno::XComponentContext> xContext = 
::comphelper::getProcessComponentContext();
 uno::Reference< container::XNameContainer > xC( 
xContext->getServiceManager()->createInstanceWithContext( 
"com.sun.star.awt.UnoControlDialogModel", xContext ), uno::UNO_QUERY );
 if( xC.is() )
 {
 uno::Reference< lang::XMultiServiceFactory > xModFact( xC, 
uno::UNO_QUERY );
-xDialogSFact = xModFact;
+xFact = xModFact;
 }
-bNeedsInit = false;
-}
+return xFact;
+}();
 
 SdrObject* pNewObj = nullptr;
 if( (aParams.nInventor == SdrInventor::BasicDialog) &&
diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 9f00a8f231c9..fcd491462528 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -233,22 +233,18 @@ static Reference< XTypeConverter > const & 
getTypeConverter_Impl()
 // #111851 factory function to create an OLE object
 SbUnoObject* createOLEObject_Impl( const OUString& aType )
 {
-static Reference< XMultiServiceFactory > xOLEFactory;
-static bool bNeedsInit = true;
-
-if( bNeedsInit )
-{
-bNeedsInit = false;
-
+static const Reference xOLEFactory = [] {
+Reference xFactory;
 Reference< XComponentContext > xContext( 
comphelper::getProcessComponentContext() );
 if( xContext.is() )
 {
 Reference xSMgr = 
xContext->getServiceManager();
-xOLEFactory.set(
+xFactory.set(
 xSMgr->createInstanceWithContext( 
"com.sun.star.bridge.OleObjectFactory", xContext ),
 UNO_QUERY );
 }
-}
+return xFactory;
+}();
 
 SbUnoObject* pUnoObj = nullptr;
 if( xOLEFactory.is() )
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 4c991c6676c7..0cf83c509a39 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -133,17 +133,12 @@ void SbiStream::MapError()
 // #89378 New semantic: Don't just ask for UNO but for UCB
 bool hasUno()
 {
-static bool bNeedInit = true;
-static bool bRetVal = true;
-
-if( bNeedInit )
-{
-bNeedInit = false;
+static const bool bRetVal = [] {
 Reference< XComponentContext > xContext = 
comphelper::getProcessComponentContext();
 if( !xContext.is() )
 {
 // No service manager at all
-bRetVal = false;
+return false;
 }
 else
 {
@@ -152,10 +147,11 @@ bool hasUno()
 if ( !( xManager->queryContentProvider( "file:///" ).is() ) )
 {
 // No UCB
-bRetVal = false;
+return false;
 }
 }
-}
+return true;
+}();
 return bRetVal;
 }
 
diff --git a/basic/source/runtime/methods1.cxx 
b/basic/source/runtime/methods1.cxx
index 2f89a90a8149..9addf7140adf 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -71,23 +71,16 @@ static Reference< XCalendar4 > const & getLocaleCalendar()
 {
 static Reference< XCalendar4 > xCalendar = 
LocaleCalendar2::create(getProcessComponentContext());
 static css::lang::Locale aLastLocale;
-static bool

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/sukapura icon-themes/sukapura_svg

2021-04-02 Thread Rizal Muttaqin (via logerrit)

 icon-themes/sukapura/cmd/sc_paralefttoright.png |binary
 icon-themes/sukapura/cmd/sc_pararighttoleft.png |binary
 icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg |6 --
 icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg |6 --
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit db654436bd5242bfbdff8ee2b52b12eb752fead4
Author: Rizal Muttaqin 
AuthorDate: Thu Apr 1 11:32:45 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Fri Apr 2 16:03:41 2021 +0200

Sukapura: Improve sharpness of small Left To Right &
Right To Left icons

Change-Id: Id3ea8f601acfd01bef46e32079ff4dadba3654c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113436
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit fba6c9b7b0c50a8f33ef71424cdce2ae0ea9cceb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113480

diff --git a/icon-themes/sukapura/cmd/sc_paralefttoright.png 
b/icon-themes/sukapura/cmd/sc_paralefttoright.png
index 87a901aef6a9..f9669c7896e9 100644
Binary files a/icon-themes/sukapura/cmd/sc_paralefttoright.png and 
b/icon-themes/sukapura/cmd/sc_paralefttoright.png differ
diff --git a/icon-themes/sukapura/cmd/sc_pararighttoleft.png 
b/icon-themes/sukapura/cmd/sc_pararighttoleft.png
index e94f0e9f9ec5..e791888a2e45 100644
Binary files a/icon-themes/sukapura/cmd/sc_pararighttoleft.png and 
b/icon-themes/sukapura/cmd/sc_pararighttoleft.png differ
diff --git a/icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg 
b/icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg
index 02857d82f3b8..3ad9f54a5c6c 100644
--- a/icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg
+++ b/icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg
@@ -1,4 +1,6 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
 
-/&amp;amp;gt;
\ No newline at end of file
+
+
+/&amp;amp;amp;amp;gt;
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg 
b/icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg
index 373986b0a318..94b69ee00a36 100644
--- a/icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg
+++ b/icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg
@@ -1,4 +1,6 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
 
-/&amp;amp;gt;
\ No newline at end of file
+
+
+/&amp;amp;amp;amp;gt;
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/tools/GenericTypeSerializer.hxx |4 ++
 include/tools/fract.hxx |9 +++--
 tools/qa/cppunit/test_GenericTypeSerializer.cxx |   43 
 tools/source/generic/fract.cxx  |   33 --
 tools/source/stream/GenericTypeSerializer.cxx   |   30 +++-
 vcl/source/gdi/TypeSerializer.cxx   |8 ++--
 6 files changed, 85 insertions(+), 42 deletions(-)

New commits:
commit 711ec7b6c71410b850cdf6d1411d054ca34ec5a0
Author: Tomaž Vajngerl 
AuthorDate: Fri Apr 2 11:37:42 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Apr 2 15:23:26 2021 +0200

vcl: move Fraction reading/writing to GenericTypeSerializer

Change-Id: Iccacaa7fd9cffe1d99f76def854c2150bb4d94f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113499
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/tools/GenericTypeSerializer.hxx 
b/include/tools/GenericTypeSerializer.hxx
index cb54e693c118..f67d92c845c5 100644
--- a/include/tools/GenericTypeSerializer.hxx
+++ b/include/tools/GenericTypeSerializer.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace tools
 {
@@ -47,6 +48,9 @@ public:
 
 void readRectangle(Rectangle& rRectangle);
 void writeRectangle(const Rectangle& rRectangle);
+
+void readFraction(Fraction& rFraction);
+void writeFraction(Fraction const& rFraction);
 };
 
 } // end namespace tools
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index c37859d7c17a..73d22fcaf430 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -33,7 +33,6 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Fraction final
 sal_Int32   mnNumerator = 0;
 sal_Int32   mnDenominator = 1;
 boolmbValid = true;
-
 public:
 Fraction() = default;
 Fraction( const Fraction & rFrac ) = default;
@@ -85,8 +84,12 @@ public:
 TOOLS_DLLPUBLIC friend bool operator<=( const Fraction& rVal1, const 
Fraction& rVal2 );
 TOOLS_DLLPUBLIC friend bool operator>=( const Fraction& rVal1, const 
Fraction& rVal2 );
 
-TOOLS_DLLPUBLIC friend SvStream& ReadFraction( SvStream& rIStream, 
Fraction & rFract );
-TOOLS_DLLPUBLIC friend SvStream& WriteFraction( SvStream& rOStream, const 
Fraction& rFract );
+static Fraction createInvalid()
+{
+Fraction aFraction;
+aFraction.mbValid = false;
+return aFraction;
+}
 };
 
 TOOLS_DLLPUBLIC Fraction operator+( const Fraction& rVal1, const Fraction& 
rVal2 );
diff --git a/tools/qa/cppunit/test_GenericTypeSerializer.cxx 
b/tools/qa/cppunit/test_GenericTypeSerializer.cxx
index 24d1497f92d2..d378dd7c304d 100644
--- a/tools/qa/cppunit/test_GenericTypeSerializer.cxx
+++ b/tools/qa/cppunit/test_GenericTypeSerializer.cxx
@@ -87,10 +87,53 @@ public:
 }
 }
 
+void testRoundtripFraction()
+{
+{
+Fraction aFraction(2, 5);
+CPPUNIT_ASSERT_EQUAL(true, aFraction.IsValid());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aFraction.GetNumerator());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aFraction.GetDenominator());
+
+SvMemoryStream aStream;
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+GenericTypeSerializer aSerializer(aStream);
+aSerializer.writeFraction(aFraction);
+
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+Fraction aReadFraction(1, 2);
+aSerializer.readFraction(aReadFraction);
+CPPUNIT_ASSERT_EQUAL(true, aReadFraction.IsValid());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aReadFraction.GetNumerator());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aReadFraction.GetDenominator());
+}
+{
+Fraction aFraction(1, 0);
+CPPUNIT_ASSERT_EQUAL(false, aFraction.IsValid());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aFraction.GetNumerator());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aFraction.GetDenominator());
+
+SvMemoryStream aStream;
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+GenericTypeSerializer aSerializer(aStream);
+aSerializer.writeFraction(aFraction);
+
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+Fraction aReadFraction(1, 2);
+aSerializer.readFraction(aReadFraction);
+CPPUNIT_ASSERT_EQUAL(false, aReadFraction.IsValid());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aReadFraction.GetNumerator());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), 
aReadFraction.GetDenominator());
+}
+}
+
 CPPUNIT_TEST_SUITE(GenericTypeSerializerTest);
 CPPUNIT_TEST(testRoundtripPoint);
 CPPUNIT_TEST(testRoundtripSize);
 CPPUNIT_TEST(testRoundtripRectangle);
+CPPUNIT_TEST(testRoundtripFraction);
 CPPUNIT_TEST_SUITE_END();
 };
 
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 448a7

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

2021-04-02 Thread Gülşah Köse (via logerrit)

 sw/source/ui/dbui/mailmergewizard.cxx  |9 +
 sw/source/ui/dbui/mmdocselectpage.cxx  |   17 +++--
 sw/source/ui/dbui/mmdocselectpage.hxx  |1 +
 sw/uiconfig/swriter/ui/mmselectpage.ui |   17 -
 4 files changed, 41 insertions(+), 3 deletions(-)

New commits:
commit d7d487875246ba00d5be7e4fb0fd82b78fea5205
Author: Gülşah Köse 
AuthorDate: Wed Mar 31 22:48:03 2021 +0300
Commit: Gülşah Köse 
CommitDate: Fri Apr 2 14:10:39 2021 +0200

tdf#139906 Prevent to use the Mail Merge wizard without data source.

When the file has a data source but that data source is not available in
LibreOffice we shouldn't let user continue mail merging.

Change-Id: Ic28101a12b2e33e78fd9b478fc41707786344e52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113432
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/sw/source/ui/dbui/mailmergewizard.cxx 
b/sw/source/ui/dbui/mailmergewizard.cxx
index bb10a2a9a0da..87116262facf 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -142,7 +142,16 @@ void SwMailMergeWizard::enterState( WizardState _nState )
 switch(_nState)
 {
 case MM_DOCUMENTSELECTPAGE:
+{
 bEnablePrev = false; // the first page
+
+OUString sDataSourceName = GetSwView()->GetDataSourceName();
+if(!sDataSourceName.isEmpty() &&
+   !SwView::IsDataSourceAvailable(sDataSourceName))
+{
+bEnableNext = false;
+}
+}
 break;
 case MM_ADDRESSBLOCKPAGE  :
 bEnableNext = m_xConfigItem->GetResultSet().is();
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx 
b/sw/source/ui/dbui/mmdocselectpage.cxx
index f19089126a03..a83a7e727f7b 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -49,6 +49,7 @@ 
SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(weld::Container* pPage, SwMai
 , m_xBrowseDocPB(m_xBuilder->weld_button("browsedoc"))
 , m_xBrowseTemplatePB(m_xBuilder->weld_button("browsetemplate"))
 , m_xRecentDocLB(m_xBuilder->weld_combo_box("recentdoclb"))
+, m_xDataSourceWarningFT(m_xBuilder->weld_label("datasourcewarning"))
 {
 m_xCurrentDocRB->set_active(true);
 DocSelectHdl(*m_xNewDocRB);
@@ -84,9 +85,21 @@ SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage()
 IMPL_LINK_NOARG(SwMailMergeDocSelectPage, DocSelectHdl, weld::ToggleButton&, 
void)
 {
 m_xRecentDocLB->set_sensitive(m_xRecentDocRB->get_active());
-
 m_pWizard->UpdateRoadmap();
-m_pWizard->enableButtons(WizardButtonFlags::NEXT, 
m_pWizard->isStateEnabled(MM_OUTPUTTYPETPAGE));
+OUString sDataSourceName = m_pWizard->GetSwView()->GetDataSourceName();
+
+if(m_xCurrentDocRB->get_active() &&
+   !sDataSourceName.isEmpty() &&
+   !SwView::IsDataSourceAvailable(sDataSourceName))
+{
+m_xDataSourceWarningFT->show();
+m_pWizard->enableButtons(WizardButtonFlags::NEXT, false);
+}
+else
+{
+m_xDataSourceWarningFT->hide();
+m_pWizard->enableButtons(WizardButtonFlags::NEXT, 
m_pWizard->isStateEnabled(MM_OUTPUTTYPETPAGE));
+}
 }
 
 IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, weld::Button&, rButton, 
void)
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx 
b/sw/source/ui/dbui/mmdocselectpage.hxx
index 88ac9e40dc8d..67cea59b6450 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -39,6 +39,7 @@ class SwMailMergeDocSelectPage : public vcl::OWizardPage
 std::unique_ptr m_xBrowseDocPB;
 std::unique_ptr m_xBrowseTemplatePB;
 std::unique_ptr m_xRecentDocLB;
+std::unique_ptr m_xDataSourceWarningFT;
 
 DECL_LINK(DocSelectHdl, weld::ToggleButton&, void);
 DECL_LINK(FileSelectHdl, weld::Button&, void);
diff --git a/sw/uiconfig/swriter/ui/mmselectpage.ui 
b/sw/uiconfig/swriter/ui/mmselectpage.ui
index eba9c227e7c3..ee125d0e4af6 100644
--- a/sw/uiconfig/swriter/ui/mmselectpage.ui
+++ b/sw/uiconfig/swriter/ui/mmselectpage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -181,6 +181,21 @@
 5
   
 
+
+  
+True
+False
+start
+Data source of the 
current document is not registered.
+
+  
+
+  
+  
+0
+8
+  
+
   
 
 
___
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

2021-04-02 Thread Gülşah Köse (via logerrit)

 sw/inc/strings.hrc   |3 +
 sw/inc/view.hxx  |6 +++
 sw/source/uibase/uiview/view.cxx |   65 ++-
 3 files changed, 73 insertions(+), 1 deletion(-)

New commits:
commit e64dc07ca8300a997d6d3eebfc3e198ae55d290d
Author: Gülşah Köse 
AuthorDate: Mon Mar 29 11:52:05 2021 +0300
Commit: Gülşah Köse 
CommitDate: Fri Apr 2 14:10:19 2021 +0200

tdf#139906 Show warning message when data source is not avaible.

CurrentDatabaseDataSource config item holds a database name for a
specific file. When document has CurrentDatabaseDataSource config
item but LibreOffice doesn't have in registered databases we should
notify the user at load time and put a button to fix the problem.

Change-Id: Ia0a6fd53985fc2fb82ce37d3962b3f479c20a647
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113296
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 3d28229a8e1b..b4017a06cc80 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1402,6 +1402,9 @@
 #define STR_AUTOMARK_NO NC_("createautomarkdialog|no", 
"No")
 
 #define STR_WRAP_PANEL_CUSTOM_STR   NC_("sidebarwrap|customlabel", 
"Custom")
+#define STR_DATASOURCE_NOT_AVAILABLE
NC_("STR_DATASOURCE_NOT_AVAILABLE", "Data source is not available. Mail merge 
wizard will not work properly.")
+#define STR_EXCHANGE_DATABASE   NC_("STR_EXCHANGE_DATABASE", 
"Exchange Database")
+
 
 #endif
 
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 2b7fe95094ec..4232d315478a 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -555,6 +555,8 @@ public:
 // form control has been activated
 DECL_LINK( FormControlActivated, LinkParamNone*, void );
 
+DECL_LINK( ExchangeDatabaseHandler, weld::Button&, void);
+
 // edit links
 voidEditLinkDlg();
 voidAutoCaption(const sal_uInt16 nType, const SvGlobalName 
*pOleId = nullptr);
@@ -624,6 +626,10 @@ public:
 std::shared_ptr const & GetMailMergeConfigItem() 
const;
 std::shared_ptr EnsureMailMergeConfigItem(const 
SfxItemSet* pArgs = nullptr);
 
+OUString GetDataSourceName() const;
+static bool IsDataSourceAvailable(const OUString sDataSourceName);
+void AppendDataSourceInfobar();
+
 void ExecFormatPaintbrush(SfxRequest const &);
 void StateFormatPaintbrush(SfxItemSet &);
 
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 97ae1d94010e..fc63c5568e42 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -34,6 +34,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -66,6 +68,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -84,6 +87,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -105,6 +112,8 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::scanner;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
 
 #define SWVIEWFLAGS SfxViewShellFlags::HAS_PRINTOPTIONS
 
@@ -203,6 +212,11 @@ IMPL_LINK_NOARG(SwView, FormControlActivated, 
LinkParamNone*, void)
 }
 }
 
+IMPL_LINK_NOARG(SwView, ExchangeDatabaseHandler, weld::Button&, void)
+{
+GetDispatcher().Execute(FN_CHANGE_DBFIELD);
+}
+
 namespace
 {
 uno::Reference getLayoutManager(const SfxViewFrame& 
rViewFrame)
@@ -1629,7 +1643,25 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& 
rHint )
 }
 else
 {
+if (auto pSfxEventHint = dynamic_cast(&rHint))
+{
+switch( pSfxEventHint->GetEventId() )
+{
+case SfxEventHintId::CreateDoc:
+case SfxEventHintId::OpenDoc:
+{
+OUString sDataSourceName = GetDataSourceName();
+if ( !sDataSourceName.isEmpty() && 
!IsDataSourceAvailable(sDataSourceName))
+AppendDataSourceInfobar();
+}
+break;
+default:
+break;
+}
+}
+
 SfxHintId nId = rHint.GetId();
+
 switch ( nId )
 {
 // sub shells will be destroyed by the
@@ -1710,7 +1742,6 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& 
rHint )
 GetViewFrame()->GetBindings().Invalidate(aSlotRedLine);
 }
 break;
-
 default: break;
 }
 }
@@ -1873,6 +1904,38 @@ tools::Rectangle SwView::getLOKVisibleArea() const
 return tools::Rectangle();
 }
 
+OUString SwView::GetDataSourceName() const
+{
+uno::Reference 
xFactory(GetDocShell()->GetModel(), uno::UNO_QUERY);
+uno::Reference xSettings(
+

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

 include/vcl/TypeSerializer.hxx|3 ++
 include/vcl/mapmod.hxx|   12 +-
 vcl/qa/cppunit/TypeSerializerTest.cxx |   39 ++
 vcl/source/filter/graphicfilter2.cxx  |3 --
 vcl/source/gdi/TypeSerializer.cxx |   38 +++--
 vcl/source/gdi/gdimtf.cxx |4 +--
 vcl/source/gdi/mapmod.cxx |   32 ---
 vcl/source/gdi/metaact.cxx|6 +++--
 8 files changed, 91 insertions(+), 46 deletions(-)

New commits:
commit 2c64c4ac72ec5ec70ed3ded444f3b1006d116d60
Author: Tomaž Vajngerl 
AuthorDate: Wed Mar 31 19:13:17 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Apr 2 12:57:35 2021 +0200

vcl: move MapMode reading and writing to TypeSerializer

remove usage of ReadMapMode and WriteMapMode and add tests

Change-Id: I40e1da8aea5c2171d9dbb6343fbf61912e5b3367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113498
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/TypeSerializer.hxx b/include/vcl/TypeSerializer.hxx
index 7be2f54198e7..e85b25b1cfe3 100644
--- a/include/vcl/TypeSerializer.hxx
+++ b/include/vcl/TypeSerializer.hxx
@@ -50,6 +50,9 @@ public:
 
 void readGraphic(Graphic& rGraphic);
 void writeGraphic(const Graphic& rGraphic);
+
+void readMapMode(MapMode& rMapMode);
+void writeMapMode(MapMode const& rMapMode);
 };
 
 #endif
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index e6c96048c90c..9af61f8b7e69 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -59,20 +59,20 @@ public:
 MapMode&operator=( MapMode&& rMapMode );
 booloperator==( const MapMode& rMapMode ) const;
 booloperator!=( const MapMode& rMapMode ) const
-{ return !(MapMode::operator==( rMapMode )); }
+{
+return !(MapMode::operator==( rMapMode ));
+}
 boolIsDefault() const;
 
-friend SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode );
-friend SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode );
-
 // tdf#117984 needs to be thread-safe due to being used e.g. in Bitmaps
 // vcl::ScopedBitmapAccess in parallelized 3D renderer
 typedef o3tl::cow_wrapper< ImplMapMode, o3tl::ThreadSafeRefCountingPolicy 
> ImplType;
 
+// If only the map unit is set.
+bool IsSimple() const;
+
 private:
 ImplTypempImplMapMode;
-
-SAL_DLLPRIVATE bool IsSimple() const;
 };
 
 template
diff --git a/vcl/qa/cppunit/TypeSerializerTest.cxx 
b/vcl/qa/cppunit/TypeSerializerTest.cxx
index f8de4e9ce3a2..5d7b72b0f560 100644
--- a/vcl/qa/cppunit/TypeSerializerTest.cxx
+++ b/vcl/qa/cppunit/TypeSerializerTest.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -67,6 +68,7 @@ private:
 void testGraphic_Bitmap_NoGfxLink();
 void testGraphic_Animation();
 void testGraphic_GDIMetaFile();
+void testMapMode();
 
 CPPUNIT_TEST_SUITE(TypeSerializerTest);
 CPPUNIT_TEST(testGradient);
@@ -74,6 +76,7 @@ private:
 CPPUNIT_TEST(testGraphic_Bitmap_NoGfxLink);
 CPPUNIT_TEST(testGraphic_Animation);
 CPPUNIT_TEST(testGraphic_GDIMetaFile);
+CPPUNIT_TEST(testMapMode);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -345,6 +348,42 @@ void TypeSerializerTest::testGraphic_GDIMetaFile()
 }
 }
 
+void TypeSerializerTest::testMapMode()
+{
+{ // "simple" case - only map unit is set, IsSimple = true
+MapMode aMapMode(MapUnit::Map100thMM);
+
+SvMemoryStream aStream;
+TypeSerializer aSerializer(aStream);
+aSerializer.writeMapMode(aMapMode);
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+MapMode aReadMapMode;
+aSerializer.readMapMode(aReadMapMode);
+CPPUNIT_ASSERT_EQUAL(MapUnit::Map100thMM, aReadMapMode.GetMapUnit());
+CPPUNIT_ASSERT_EQUAL(true, aReadMapMode.IsSimple());
+}
+{ // "complex" case - map unit, origin and scale are set, IsSimple = false
+MapMode aMapMode(MapUnit::MapTwip, Point(5, 10), Fraction(1, 2), 
Fraction(2, 3));
+
+SvMemoryStream aStream;
+TypeSerializer aSerializer(aStream);
+aSerializer.writeMapMode(aMapMode);
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+MapMode aReadMapMode;
+aSerializer.readMapMode(aReadMapMode);
+CPPUNIT_ASSERT_EQUAL(MapUnit::MapTwip, aReadMapMode.GetMapUnit());
+CPPUNIT_ASSERT_EQUAL(tools::Long(5), aReadMapMode.GetOrigin().X());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aReadMapMode.GetOrigin().Y());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), 
aReadMapMode.GetScaleX().GetNumerator());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), 
aReadMapMode.GetScaleX().GetDenominator());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), 
aReadMapMode.GetScaleY().GetNumerator());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), 
aReadMapMode.GetScaleY().Ge

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

2021-04-02 Thread David Blatter (via logerrit)

 package/source/zipapi/ZipFile.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 24fad8bf168beb56855d97ede2d4a1dec2a46220
Author: David Blatter 
AuthorDate: Wed Mar 31 15:57:44 2021 +0200
Commit: Michael Stahl 
CommitDate: Fri Apr 2 12:51:29 2021 +0200

fix detection of encrypted zip entries

if a zip entry is encrypted, bit 1 of the flags field is set. previously
bit 1 of the version field was checked. a valid zip with a required version
of e.g. 45 generated a 'file is corrupt' error

see: https://pkware.cachefly.net/webdocs/APPNOTE/APPNOTE-6.3.3.TXT
(sections 4.4.3 and 4.4.4)

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

diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 6ee7bdc0d43d..fb90ef02e4e1 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -921,11 +921,11 @@ sal_Int32 ZipFile::readCEN()
 
 aMemGrabber.skipBytes ( 2 );
 aEntry.nVersion = aMemGrabber.ReadInt16();
+aEntry.nFlag = aMemGrabber.ReadInt16();
 
-if ( ( aEntry.nVersion & 1 ) == 1 )
+if ( ( aEntry.nFlag & 1 ) == 1 )
 throw ZipException("Invalid CEN header (encrypted entry)" );
 
-aEntry.nFlag = aMemGrabber.ReadInt16();
 aEntry.nMethod = aMemGrabber.ReadInt16();
 
 if ( aEntry.nMethod != STORED && aEntry.nMethod != DEFLATED)
@@ -1025,9 +1025,10 @@ void ZipFile::recover()
 MemoryByteGrabber aMemGrabber(aTmpBuffer);
 
 aEntry.nVersion = aMemGrabber.ReadInt16();
-if ( ( aEntry.nVersion & 1 ) != 1 )
+aEntry.nFlag = aMemGrabber.ReadInt16();
+
+if ( ( aEntry.nFlag & 1 ) != 1 )
 {
-aEntry.nFlag = aMemGrabber.ReadInt16();
 aEntry.nMethod = aMemGrabber.ReadInt16();
 
 if ( aEntry.nMethod == STORED || aEntry.nMethod == 
DEFLATED )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-04-02 Thread Tomoyuki Kubota (via logerrit)

 sfx2/source/sidebar/PanelTitleBar.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 4ff64681820d1b9c5b38015ecb42cba2e56800c3
Author: Tomoyuki Kubota 
AuthorDate: Thu Apr 1 23:17:29 2021 +0200
Commit: Caolán McNamara 
CommitDate: Fri Apr 2 11:09:50 2021 +0200

TitleBar is no longer InterimItemWindow

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

diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx 
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 47de8e405584..c99672a0f1c5 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -46,9 +46,6 @@ PanelTitleBar::PanelTitleBar(const OUString& rsTitle,
 
 UpdateExpandedState();
 
-#ifdef DEBUG
-SetText(OUString("PanelTitleBar"));
-#endif
 }
 
 void PanelTitleBar::SetTitle(const OUString& rsTitle)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-04-02 Thread Tomoyuki Kubota (via logerrit)

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

New commits:
commit a44eb7f8013f1e3f2165ee8295059bc1e75297a5
Author: Tomoyuki Kubota 
AuthorDate: Thu Apr 1 23:09:04 2021 +0200
Commit: Caolán McNamara 
CommitDate: Fri Apr 2 11:09:24 2021 +0200

welding the sidebar deck too for DEBUG mode

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

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index e278ded14849..dded59176dd3 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -878,7 +878,7 @@ void SidebarController::SwitchToDeck (
 
 #ifdef DEBUG
 // Show the context name in the deck title bar.
-VclPtr pDebugTitleBar = mpCurrentDeck->GetTitleBar();
+DeckTitleBar* pDebugTitleBar = mpCurrentDeck->GetTitleBar();
 if (pDebugTitleBar)
 pDebugTitleBar->SetTitle(rDeckDescriptor.msTitle + " (" + 
maCurrentContext.msContext + ")");
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-04-02 Thread Caolán McNamara (via logerrit)

 vcl/source/filter/ipdf/pdfread.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d7a62c1105742e5717cdd90934b75f3957b31bc6
Author: Caolán McNamara 
AuthorDate: Thu Apr 1 21:25:10 2021 +0100
Commit: Caolán McNamara 
CommitDate: Fri Apr 2 11:08:35 2021 +0200

ofz#32796: no pdfium during wmf fuzzing

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

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 86adec409f90..9cdb10070ef6 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -66,6 +66,8 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& 
rOutStream)
 {
 // Downconvert to PDF-1.6.
 auto pPdfium = vcl::pdf::PDFiumLibrary::get();
+if (!pPdfium)
+return false;
 
 // Read input into a buffer.
 SvMemoryStream aInBuffer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

2021-04-02 Thread Eike Rathke

Hi,

On Monday, 2021-03-29 15:14:46 +0100, Caolán McNamara wrote:

> One of these is an apparent threaded calc related assert/crash
> https://dev-builds.libreoffice.org/crashtest/f96004096268f5e71120678e32fc8c74055819aa/backtraces/task714-core.backtrace.txt

Fixed with
https://git.libreoffice.org/core/+/465b8b0e9ad4b0c9c7701dee2820a99c5d00b5bf%5E%21/

  Eike

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


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

MacUpdate - your app listing has been updated

2021-04-02 Thread MacUpdate

Title: Untitled Document

App Listing Updated
Hi The Document Foundation, We have updated your application listing for LibreOffice 7.1.2.2 on MacUpdate.com. Please take a moment to review your application's information to make sure that everything is correct.

View your updated app listing

You can login to your Developer Account to reply to comments and view stats, or submit new updates and changes to your app listing.

Desktop Install Compatibility
MacUpdate Desktop 6 is helping developers make it easier for users to fully install and use their apps. Download Desktop 6 and to ensure your app works with the “Install” link on our download pages.

Advertise With MacUpdate
The best Mac devs advertise their apps on MacUpdate.com because it’s the most targeted, highly performing Mac app advertising you can find on the web. Contact a...@macupdate.com to guarantee your annual ad campaigns get booked and expand your app’s audience.

Learn more

Questions? Contact our Content Update Team upda...@macupdate.com.

You are receiving this offer because you have an app listed on MacUpdate.com. Add us to your address book or white list to ensure reliable delivery.

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

[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg

2021-04-02 Thread Rizal Muttaqin (via logerrit)

 icon-themes/sukapura/cmd/sc_paralefttoright.png |binary
 icon-themes/sukapura/cmd/sc_pararighttoleft.png |binary
 icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg |6 --
 icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg |6 --
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit fba6c9b7b0c50a8f33ef71424cdce2ae0ea9cceb
Author: Rizal Muttaqin 
AuthorDate: Thu Apr 1 11:32:45 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Fri Apr 2 09:22:24 2021 +0200

Sukapura: Improve sharpness of small Left To Right &
Right To Left icons

Change-Id: Id3ea8f601acfd01bef46e32079ff4dadba3654c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113436
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sukapura/cmd/sc_paralefttoright.png 
b/icon-themes/sukapura/cmd/sc_paralefttoright.png
index 87a901aef6a9..f9669c7896e9 100644
Binary files a/icon-themes/sukapura/cmd/sc_paralefttoright.png and 
b/icon-themes/sukapura/cmd/sc_paralefttoright.png differ
diff --git a/icon-themes/sukapura/cmd/sc_pararighttoleft.png 
b/icon-themes/sukapura/cmd/sc_pararighttoleft.png
index e94f0e9f9ec5..e791888a2e45 100644
Binary files a/icon-themes/sukapura/cmd/sc_pararighttoleft.png and 
b/icon-themes/sukapura/cmd/sc_pararighttoleft.png differ
diff --git a/icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg 
b/icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg
index 02857d82f3b8..3ad9f54a5c6c 100644
--- a/icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg
+++ b/icon-themes/sukapura_svg/cmd/sc_paralefttoright.svg
@@ -1,4 +1,6 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
 
-/&amp;amp;gt;
\ No newline at end of file
+
+
+/&amp;amp;amp;amp;gt;
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg 
b/icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg
index 373986b0a318..94b69ee00a36 100644
--- a/icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg
+++ b/icon-themes/sukapura_svg/cmd/sc_pararighttoleft.svg
@@ -1,4 +1,6 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
 
-/&amp;amp;gt;
\ No newline at end of file
+
+
+/&amp;amp;amp;amp;gt;
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 1715 commits - accessibility/inc accessibility/README accessibility/README.md accessibility/source android/README android/README.md

Rebased ref, commits from common ancestor:
commit f52c86ee26ce072bc49d54baa25cfb8521396158
Author: Tomaž Vajngerl 
AuthorDate: Fri Apr 2 16:11:50 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Apr 2 16:21:29 2021 +0900

drawinglayer: ITextLayouter and use it as a VisitingParameter

Change-Id: I04aa42716c2bde4a2652d10892b6b2392a20fb3b

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 8359969ae80c..957f1b45ac08 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
 basegfx/source/vector/b2dvector \
 basegfx/source/vector/b2ivector \
 basegfx/source/vector/b3dvector \
+basegfx/source/text/UnoTextLayouter \
 ))
 
 
diff --git a/basegfx/source/text/UnoTextLayouter.cxx 
b/basegfx/source/text/UnoTextLayouter.cxx
new file mode 100644
index ..e3f48264c624
--- /dev/null
+++ b/basegfx/source/text/UnoTextLayouter.cxx
@@ -0,0 +1,33 @@
+/* -*- 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/.
+ *
+ */
+
+#include 
+#include 
+
+using namespace css;
+
+namespace gfx
+{
+// css::lang::XUnoTunnel
+UNO3_GETIMPLEMENTATION_IMPL(UnoTextLayouter);
+
+std::shared_ptr
+getTextLayouterFromUno(uno::Reference const& 
xTextLayouter)
+{
+gfx::UnoTextLayouter* pUnoTextLayouter
+= 
comphelper::getUnoTunnelImplementation(xTextLayouter);
+if (pUnoTextLayouter)
+return pUnoTextLayouter->getTextLayouter();
+
+return std::shared_ptr();
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/fontattribute.cxx 
b/drawinglayer/source/attribute/fontattribute.cxx
index e423b8367f1c..b14397fe9d87 100644
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
@@ -112,15 +112,31 @@ FontAttribute::FontAttribute()
 {
 }
 
-FontAttribute::FontAttribute(const FontAttribute&) = default;
+FontAttribute::FontAttribute(const FontAttribute& rOther)
+: mpFontAttribute(rOther.mpFontAttribute)
+{
+}
+
+FontAttribute::FontAttribute(FontAttribute&& rOther) noexcept
+: mpFontAttribute(std::move(rOther.mpFontAttribute))
+{
+}
 
-FontAttribute::FontAttribute(FontAttribute&&) = default;
+FontAttribute::~FontAttribute() {}
 
-FontAttribute::~FontAttribute() = default;
+FontAttribute& FontAttribute::operator=(const FontAttribute& rOther)
+{
+mpFontAttribute = rOther.mpFontAttribute;
 
-FontAttribute& FontAttribute::operator=(const FontAttribute&) = default;
+return *this;
+}
 
-FontAttribute& FontAttribute::operator=(FontAttribute&&) = default;
+FontAttribute& FontAttribute::operator=(FontAttribute&& rOther) noexcept
+{
+mpFontAttribute = std::move(rOther.mpFontAttribute);
+
+return *this;
+}
 
 bool FontAttribute::operator==(const FontAttribute& rCandidate) const
 {
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx 
b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 37fa2a2a477f..b424e1a5be13 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -107,7 +108,8 @@ namespace drawinglayer::unorenderer
 }
 
 const geometry::ViewInformation2D 
aViewInformation2D(aViewInformationSequence);
-primitive2d::VisitingParameters 
aVisitingParameters(aViewInformation2D);
+auto pTextLayouter = 
std::make_shared();
+primitive2d::VisitingParameters 
aVisitingParameters(aViewInformation2D, pTextLayouter);
 
 const double fFactor100th_mmToInch(1.0 / (2.54 * 1000.0));
 const sal_uInt32 nDiscreteWidth(basegfx::fround((fWidth * 
fFactor100th_mmToInch) * DPI_X));
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx 
b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index b809574116cd..aa1c5fd4808a 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -23,7 +23,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
 
 using namespace css;
 
@@ -85,12 +88,39 @@ void 
BasePrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& /*rVis
 {
 }
 
+namespace
+{
+std::shared_ptr
+getTextLayouter(const uno::Sequence& rProperties)
+{
+std::shared_ptr pTextLayouter;
+
+if (!rProperties.hasElements())
+return pTextLayouter;
+
+for (const beans::PropertyValue& rProperty : rProperties)
+{
+if (rProperty.Name == "

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 3 commits - basegfx/Library_basegfx.mk basegfx/source drawinglayer/inc drawinglayer/Library_drawinglayer.mk drawinglayer/qa drawingl