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

2020-09-19 Thread Andrea Gelmini (via logerrit) 
 0 files changed

New commits:
commit b7d5031b1c4cdc5388d73aa745f27ca03fdd4eeb
Author: Andrea Gelmini 
AuthorDate: Sat Sep 19 23:56:07 2020 +0200
Commit: Julien Nabet 
CommitDate: Sun Sep 20 08:39:07 2020 +0200

Removed executable bits from source file

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

diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-19 Thread Jim Raykowski (via logerrit) 
 include/svl/hint.hxx   |3 +
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |6 ++
 sw/inc/crsrsh.hxx  |2 
 sw/source/core/crsr/crstrvl.cxx|4 -
 sw/source/uibase/inc/conttree.hxx  |2 
 sw/source/uibase/uiview/viewsrch.cxx   |5 +
 sw/source/uibase/utlui/content.cxx |   68 +
 7 files changed, 87 insertions(+), 3 deletions(-)

New commits:
commit 6f7f5f280abaf4ee84472359acd4952b2eea40a4
Author: Jim Raykowski 
AuthorDate: Tue Apr 21 01:49:36 2020 -0800
Commit: Jim Raykowski 
CommitDate: Sun Sep 20 08:25:24 2020 +0200

tdf#132366 Writer enhancement that highlights search results

This enhancement selects outline headings in the Writer Navigator
content tree according to 'Find All' search results. It does this when
the content navigation view is set to show headings content only.

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

diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 708986e31631..77e838a5d21c 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -112,6 +112,7 @@ enum class SfxHintId {
 SwDrawViewsCreated,
 SwSplitNodeOperation,
 SwSectionFrameMoveAndDelete,
+SwNavigatorSelectOutlinesWithSelections,
 
 ThisIsAnSdrHint // used to avoid dynamic_cast
 };
@@ -192,6 +193,8 @@ inline std::basic_ostream & operator <<(
 case SfxHintId::SwDrawViewsCreated: return stream << "SwDrawViewsCreated";
 case SfxHintId::SwSplitNodeOperation: return stream << 
"SwSplitNodeOperation";
 case SfxHintId::SwSectionFrameMoveAndDelete: return stream << 
"SwSectionFrameMoveAndDelete";
+case SfxHintId::SwNavigatorSelectOutlinesWithSelections:
+return stream << "SwNavigatorSelectOutlinesWithSelections";
 case SfxHintId::ThisIsAnSdrHint: return stream << "SdrHint";
 default: return stream << "unk(" << std::to_string(int(id)) << ")";
 }
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx 
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 8372d7876c9b..a86739988185 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -141,7 +141,13 @@ void impl_executeSearch( const css::uno::Reference< 
css::uno::XComponentContext
 {
 FindTextFieldControl* pItemWin = 
static_cast(pToolBox->GetItemWindow(id));
 if (pItemWin)
+{
 sFindText = pItemWin->get_active_text();
+if (aFindAll)
+pItemWin->GrabFocus();
+else
+pItemWin->GrabFocusToDocument();
+}
 } else if ( sItemCommand == COMMAND_MATCHCASE )
 {
 CheckButtonItemWindow* pItemWin = 
static_cast(pToolBox->GetItemWindow(id));
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 78b32299ff31..d6888bcac2cb 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -610,7 +610,7 @@ public:
 // to the next/previous or the given OutlineNode
 void GotoOutline( SwOutlineNodes::size_type nIdx );
 // find the "outline position" in the nodes array of the current chapter
-SwOutlineNodes::size_type GetOutlinePos( sal_uInt8 nLevel = UCHAR_MAX );
+SwOutlineNodes::size_type GetOutlinePos(sal_uInt8 nLevel = UCHAR_MAX, 
SwPaM* pPaM = nullptr);
 // select the given range of OutlineNodes. Optionally including the 
children
 // the sal_uInt16s are the positions in OutlineNodes-Array (EditShell)
 bool MakeOutlineSel(SwOutlineNodes::size_type nSttPos, 
SwOutlineNodes::size_type nEndPos,
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 11589b8e4181..38676f772659 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1132,9 +1132,9 @@ bool SwCursorShell::GotoPrevOutline()
 }
 
 /// search "outline position" before previous outline node at given level
-SwOutlineNodes::size_type SwCursorShell::GetOutlinePos( sal_uInt8 nLevel )
+SwOutlineNodes::size_type SwCursorShell::GetOutlinePos(sal_uInt8 nLevel, 
SwPaM* pPaM)
 {
-SwPaM* pCursor = getShellCursor( true );
+SwPaM* pCursor = pPaM ? pPaM : getShellCursor(true);
 const SwNodes& rNds = GetDoc()->GetNodes();
 
 SwNode* pNd = &(pCursor->GetNode());
diff --git a/sw/source/uibase/inc/conttree.hxx 
b/sw/source/uibase/inc/conttree.hxx
index 282a714d5634..80b9d8d69bbe 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -225,6 +225,8 @@ public:
 
 void Select();
 
+void SelectOutlinesWithSelection();
+
 // return true if it has any children
 bool RequestingChildren(const weld::TreeIter& rParent);
 
diff --git a/sw/source/uibase/uiview/viewsrch

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

2020-09-19 Thread Aron Budea (via logerrit) 
 sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit c6b6995004d34cadaec68e2b6e17667d43f9995e
Author: Aron Budea 
AuthorDate: Sat Sep 19 15:58:32 2020 +0200
Commit: Mike Kaganski 
CommitDate: Sat Sep 19 23:24:23 2020 +0200

tdf#136596: show document language (char locale) in the inspector

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

diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx 
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index 589cec4a967c..d7b3990aa5e3 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -350,6 +350,20 @@ static svx::sidebar::TreeNode BorderToTreeNode(const 
OUString& rName, const css:
 return aCurNode;
 }
 
+static svx::sidebar::TreeNode LocaleToTreeNode(const OUString& rName, const 
css::uno::Any& rVal)
+{
+svx::sidebar::TreeNode aCurNode;
+aCurNode.sNodeName = PropertyNametoRID(rName);
+lang::Locale aLocale;
+rVal >>= aLocale;
+OUString aLocaleText(aLocale.Language + "-" + aLocale.Country);
+if (!aLocale.Variant.isEmpty())
+aLocaleText += " (" + aLocale.Variant + ")";
+aCurNode.aValue <<= aLocaleText;
+
+return aCurNode;
+}
+
 static svx::sidebar::TreeNode
 PropertyToTreeNode(const css::beans::Property& rProperty,
const uno::Reference& xPropertiesSet, 
const bool& rIsGrey)
@@ -367,6 +381,10 @@ PropertyToTreeNode(const css::beans::Property& rProperty,
 {
 aCurNode = BorderToTreeNode(rPropName, aAny);
 }
+else if (rPropName == "CharLocale")
+{
+aCurNode = LocaleToTreeNode(rPropName, aAny);
+}
 else
 aCurNode = SimplePropToTreeNode(rPropName, aAny);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-19 Thread Aron Budea (via logerrit) 
 sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |   31 ++
 1 file changed, 25 insertions(+), 6 deletions(-)

New commits:
commit bb369dd4f372f606a9a63ecefbd1c7d3b725cd02
Author: Aron Budea 
AuthorDate: Sat Sep 19 02:11:25 2020 +0200
Commit: Mike Kaganski 
CommitDate: Sat Sep 19 23:00:09 2020 +0200

tdf#135115: show paragraph direct formatting in Styles Inspector

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

diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx 
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index 8ea4fda5e213..589cec4a967c 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -425,25 +425,35 @@ static void UpdateTree(SwDocShell* pDocSh, 
std::vector&
 svx::sidebar::TreeNode aDFNode;
 svx::sidebar::TreeNode aCharNode;
 svx::sidebar::TreeNode aParaNode;
+svx::sidebar::TreeNode aParaDFNode;
 
 aDFNode.sNodeName = "Direct Formatting";
 aCharNode.sNodeName = "Character Styles";
 aParaNode.sNodeName = "Paragraph Styles";
+aParaDFNode.sNodeName = "Paragraph Direct Formatting";
 aDFNode.NodeType = svx::sidebar::TreeNode::Category;
 aCharNode.NodeType = svx::sidebar::TreeNode::Category;
 aParaNode.NodeType = svx::sidebar::TreeNode::Category;
+aParaDFNode.NodeType = svx::sidebar::TreeNode::Category;
 
 uno::Reference xRange(
 SwXTextRange::CreateXTextRange(*pDoc, *pCursor->GetPoint(), nullptr));
 uno::Reference xPropertiesSet(xRange, 
uno::UNO_QUERY_THROW);
 std::unordered_map aIsDefined;
 
-InsertValues(xRange, aIsDefined, aDFNode, false,
- { UNO_NAME_RSID, UNO_NAME_PARA_IS_NUMBERING_RESTART, 
UNO_NAME_PARA_STYLE_NAME,
-   UNO_NAME_PARA_CONDITIONAL_STYLE_NAME, 
UNO_NAME_PAGE_STYLE_NAME,
-   UNO_NAME_NUMBERING_START_VALUE, 
UNO_NAME_NUMBERING_IS_NUMBER,
-   UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE, 
UNO_NAME_CHAR_STYLE_NAME,
-   UNO_NAME_NUMBERING_LEVEL });
+const std::vector aHiddenProperties{ UNO_NAME_RSID,
+   
UNO_NAME_PARA_IS_NUMBERING_RESTART,
+   UNO_NAME_PARA_STYLE_NAME,
+   
UNO_NAME_PARA_CONDITIONAL_STYLE_NAME,
+   UNO_NAME_PAGE_STYLE_NAME,
+   
UNO_NAME_NUMBERING_START_VALUE,
+   
UNO_NAME_NUMBERING_IS_NUMBER,
+   
UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE,
+   UNO_NAME_CHAR_STYLE_NAME,
+   UNO_NAME_NUMBERING_LEVEL,
+   UNO_NAME_PARRSID };
+
+InsertValues(xRange, aIsDefined, aDFNode, false, aHiddenProperties);
 
 uno::Reference 
xStyleFamiliesSupplier(pDocSh->GetBaseModel(),
  
uno::UNO_QUERY);
@@ -469,6 +479,13 @@ static void UpdateTree(SwDocShell* pDocSh, 
std::vector&
 aCharNode.children.push_back(aCurrentChild);
 }
 
+// Collect paragraph direct formatting
+uno::Reference xParaEnumAccess(xRange, 
uno::UNO_QUERY_THROW);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference 
xThisParagraphRange(xParaEnum->nextElement(),
+ uno::UNO_QUERY_THROW);
+InsertValues(xThisParagraphRange, aIsDefined, aParaDFNode, false, 
aHiddenProperties);
+
 xStyleFamily.set(xStyleFamilies->getByName("ParagraphStyles"), 
uno::UNO_QUERY_THROW);
 
 while (!sCurrentParaStyle.isEmpty())
@@ -494,10 +511,12 @@ static void UpdateTree(SwDocShell* pDocSh, 
std::vector&
 /*
 Display Order :-
 PARAGRAPH STYLE
+PARAGRAPH DIRECT FORMATTING
 CHARACTER STYLE
 DIRECT FORMATTING
 */
 aStore.push_back(aParaNode);
+aStore.push_back(aParaDFNode);
 aStore.push_back(aCharNode);
 aStore.push_back(aDFNode);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-19 Thread Noel Grandin (via logerrit) 
 vcl/source/filter/ipdf/pdfread.cxx   |2 +-
 xmlsecurity/source/pdfio/pdfdocument.cxx |   12 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 5f3f17a9c64e33fb787a79dc94d902147da77d71
Author: Noel Grandin 
AuthorDate: Sat Sep 19 20:38:29 2020 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 19 22:20:57 2020 +0200

fix non-pdfium build

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

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 39c2933be8d5..a9b079a75bc3 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -220,7 +220,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, 
std::vector& rBi
 (void)rBitmaps;
 (void)nFirstPage;
 (void)nPages;
-(void)fResolutionDPI;
+(void)pSizeHint;
 return 0;
 #endif // HAVE_FEATURE_PDFIUM
 }
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 8561c481170b..b2c1cc0db77a 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -137,10 +137,10 @@ bool IsCompleteSignature(SvStream& rStream, 
vcl::filter::PDFDocument& rDocument,
 return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != 
rAllEOFs.end();
 }
 
+#if HAVE_FEATURE_PDFIUM
 /// Collects the checksum of each page of one version of the PDF.
 void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vector& rPageChecksums)
 {
-#if HAVE_FEATURE_PDFIUM
 auto pPdfium = vcl::pdf::PDFiumLibrary::get();
 vcl::pdf::PDFiumDocument aPdfDocument(
 FPDF_LoadMemDocument(rStream.GetData(), rStream.GetSize(), 
/*password=*/nullptr));
@@ -157,11 +157,8 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vectorgetChecksum();
 rPageChecksums.push_back(nPageChecksum);
 }
-#else
-(void)rStream;
-(void)rPageChecksums;
-#endif
 }
+#endif
 
 /**
  * Checks if incremental updates after singing performed valid modifications 
only.
@@ -175,6 +172,7 @@ bool IsValidSignature(SvStream& rStream, 
vcl::filter::PDFObjectElement* pSignatu
 return false;
 }
 
+#if HAVE_FEATURE_PDFIUM
 SvMemoryStream aSignatureStream;
 sal_uInt64 nPos = rStream.Tell();
 rStream.Seek(0);
@@ -196,6 +194,10 @@ bool IsValidSignature(SvStream& rStream, 
vcl::filter::PDFObjectElement* pSignatu
 // Fail if any page looks different after signing and at the end. 
Annotations/commenting doesn't
 // count, though.
 return aSignedPages == aAllPages;
+#else
+(void)rStream;
+return true;
+#endif
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 13 commits - basic/qa basic/source cui/source formula/source include/vcl sc/inc sc/qa sc/source sw/source vcl/source vcl/unx

2020-09-19 Thread Caolán McNamara (via logerrit) 
 basic/qa/cppunit/test_scanner.cxx  |   17 +++
 basic/source/comp/scanner.cxx  |3 
 basic/source/runtime/methods.cxx   |3 
 cui/source/inc/numpages.hxx|1 
 cui/source/options/optjava.cxx |   19 +++-
 cui/source/options/optjava.hxx |1 
 cui/source/tabpages/numpages.cxx   |7 +
 formula/source/core/api/FormulaCompiler.cxx|7 +
 include/vcl/vclenum.hxx|3 
 sc/inc/clipparam.hxx   |2 
 sc/inc/dbdata.hxx  |4 
 sc/inc/document.hxx|8 -
 sc/qa/unit/data/ods/tdf95640.ods   |binary
 sc/qa/unit/data/ods/tdf95640_standard_list.ods |binary
 sc/qa/unit/data/ods/validation-copypaste.ods   |binary
 sc/qa/unit/data/xlsx/tdf95640.xlsx |binary
 sc/qa/unit/subsequent_export-test.cxx  |  102 +
 sc/source/core/data/table2.cxx |5 -
 sc/source/core/data/table3.cxx |4 
 sc/source/core/tool/compiler.cxx   |   19 
 sc/source/filter/excel/excrecds.cxx|   64 +
 sc/source/filter/inc/autofilterbuffer.hxx  |   30 ++
 sc/source/filter/inc/autofiltercontext.hxx |   39 
 sc/source/filter/inc/excrecds.hxx  |3 
 sc/source/filter/oox/autofilterbuffer.cxx  |  116 +++--
 sc/source/filter/oox/autofiltercontext.cxx |   68 ++
 sc/source/filter/oox/tablebuffer.cxx   |2 
 sw/source/core/doc/doclay.cxx  |8 -
 sw/source/filter/basflt/shellio.cxx|1 
 sw/source/uibase/uiview/view2.cxx  |9 +
 vcl/source/window/layout.cxx   |9 +
 vcl/source/window/printdlg.cxx |   24 +++--
 vcl/unx/gtk3/gtk3gtkinst.cxx   |3 
 33 files changed, 528 insertions(+), 53 deletions(-)

New commits:
commit ab9d80265a3c7628f22f7ab4d1e7b4daecc22ba0
Author: Caolán McNamara 
AuthorDate: Mon Sep 14 14:44:25 2020 +0100
Commit: Andras Timar 
CommitDate: Sat Sep 19 21:11:54 2020 +0200

rhbz#1878275 should use value_changed for spinbutton changes

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

diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index d03f44a868e2..8b45dc53205b 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -273,6 +273,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
 DECL_LINK(CharFmtHdl_Impl, weld::ComboBox&, void);
 DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void);
 DECL_LINK(EditListBoxHdl_Impl, weld::ComboBox&, void);
+DECL_LINK(SpinModifyHdl_Impl, weld::SpinButton&, void);
 DECL_LINK(AllLevelHdl_Impl, weld::SpinButton&, void);
 DECL_LINK(OrientHdl_Impl, weld::ComboBox&, void);
 DECL_LINK(SameLevelHdl_Impl, weld::ToggleButton&, void);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index fdbeb6f7cb4b..5692dd73aefe 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1072,7 +1072,7 @@ 
SvxNumOptionsTabPage::SvxNumOptionsTabPage(weld::Container* pPage, weld::DialogC
 m_xWidthMF->connect_value_changed(LINK(this, SvxNumOptionsTabPage, 
SizeHdl_Impl));
 m_xHeightMF->connect_value_changed(LINK(this, SvxNumOptionsTabPage, 
SizeHdl_Impl));
 m_xRatioCB->connect_toggled(LINK(this, SvxNumOptionsTabPage, 
RatioHdl_Impl));
-m_xStartED->connect_changed(LINK(this, SvxNumOptionsTabPage, 
EditModifyHdl_Impl));
+m_xStartED->connect_value_changed(LINK(this, SvxNumOptionsTabPage, 
SpinModifyHdl_Impl));
 m_xPrefixED->connect_changed(LINK(this, SvxNumOptionsTabPage, 
EditModifyHdl_Impl));
 m_xSuffixED->connect_changed(LINK(this, SvxNumOptionsTabPage, 
EditModifyHdl_Impl));
 m_xAllLevelNF->connect_value_changed(LINK(this,SvxNumOptionsTabPage, 
AllLevelHdl_Impl));
@@ -2098,6 +2098,11 @@ IMPL_LINK(SvxNumOptionsTabPage, EditModifyHdl_Impl, 
weld::Entry&, rEdit, void)
 EditModifyHdl_Impl(&rEdit);
 }
 
+IMPL_LINK(SvxNumOptionsTabPage, SpinModifyHdl_Impl, weld::SpinButton&, 
rSpinButton, void)
+{
+EditModifyHdl_Impl(&rSpinButton);
+}
+
 void SvxNumOptionsTabPage::EditModifyHdl_Impl(const weld::Entry* pEdit)
 {
 bool bPrefix = pEdit == m_xPrefixED.get();
commit 700df0490e4e674b0bc22d165ff0614fd8e610ae
Author: Vasily Melenchuk 
AuthorDate: Fri Sep 11 14:06:23 2020 +0300
Commit: Andras Timar 
CommitDate: Sat Sep 19 21:11:48 2020 +0200

tdf#135623: modified generation of unique fly name

Modified lcl_GetUniqueFlyName() is right now always marks
current fly format name number as used. Yes, this can
lead to some gaps in numbering is some cases, but meanwhile
gua

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

2020-09-19 Thread Caolán McNamara (via logerrit) 
 solenv/sanitizers/ui/modules/scalc.suppr |   21 -
 1 file changed, 21 deletions(-)

New commits:
commit 6a59a8397ccef5dce5efe5022d84e7b89fd68375
Author: Caolán McNamara 
AuthorDate: Sat Sep 19 16:13:15 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 19 20:30:59 2020 +0200

drop some unused suppressions

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

diff --git a/solenv/sanitizers/ui/modules/scalc.suppr 
b/solenv/sanitizers/ui/modules/scalc.suppr
index ab929a9ee22a..5b29f5340017 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -1,4 +1,3 @@
-sc/uiconfig/scalc/ui/advancedfilterdialog.ui://GtkEntry[@id='edfilterarea'] 
no-labelled-by
 sc/uiconfig/scalc/ui/advancedfilterdialog.ui://GtkLabel[@id='dbarealabel'] 
orphan-label
 sc/uiconfig/scalc/ui/advancedfilterdialog.ui://GtkLabel[@id='dbarea'] 
orphan-label
 
sc/uiconfig/scalc/ui/aggregatefunctionentry.ui:GtkGrid[@id='grid']/GtkBox/GtkLabel
 orphan-label
@@ -24,8 +23,6 @@ 
sc/uiconfig/scalc/ui/conditionaliconset.ui://GtkEntry[@id='entry'] no-labelled-b
 sc/uiconfig/scalc/ui/conditionaliconset.ui://GtkComboBoxText[@id='listbox'] 
no-labelled-by
 sc/uiconfig/scalc/ui/conditionaliconset.ui://GtkImage[@id='icon'] 
no-labelled-by
 sc/uiconfig/scalc/ui/conflictsdialog.ui://GtkLabel[@id='label1'] orphan-label
-sc/uiconfig/scalc/ui/consolidatedialog.ui://GtkEntry[@id='eddataarea'] 
no-labelled-by
-sc/uiconfig/scalc/ui/consolidatedialog.ui://GtkEntry[@id='eddestarea'] 
no-labelled-by
 sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label2'] orphan-label
 sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label3'] orphan-label
 sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label4'] orphan-label
@@ -55,17 +52,13 @@ 
sc/uiconfig/scalc/ui/dataproviderentry.ui:GtkGrid[@id='grid']/GtkLabel orphan-la
 sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='Source'] 
orphan-label
 sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='Operations'] 
orphan-label
 sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='invalid'] 
orphan-label
-sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkEntry[@id='entry'] 
no-labelled-by
 sc/uiconfig/scalc/ui/definename.ui://GtkLabel[@id='label'] orphan-label
 sc/uiconfig/scalc/ui/deletecolumnentry.ui:GtkGrid[@id='grid']/GtkBox/GtkLabel 
orphan-label
 
sc/uiconfig/scalc/ui/deletecolumnentry.ui:GtkGrid[@id='grid']/GtkBox/GtkGrid[@id='grid_details']/GtkLabel
 orphan-label
 sc/uiconfig/scalc/ui/deletecolumnentry.ui://GtkEntry[@id='ed_columns'] 
no-labelled-by
 sc/uiconfig/scalc/ui/doubledialog.ui://GtkEntry[@id='value'] no-labelled-by
-sc/uiconfig/scalc/ui/externaldata.ui://GtkTreeView[@id='ranges'] no-labelled-by
 sc/uiconfig/scalc/ui/externaldata.ui://GtkLabel[@id='secondsft'] orphan-label
 sc/uiconfig/scalc/ui/fourieranalysisdialog.ui://GtkLabel[@id='error-message'] 
orphan-label
-sc/uiconfig/scalc/ui/functionpanel.ui://GtkComboBoxText[@id='category'] 
no-labelled-by
-sc/uiconfig/scalc/ui/functionpanel.ui://GtkTreeView[@id='funclist'] 
no-labelled-by
 sc/uiconfig/scalc/ui/functionpanel.ui://GtkLabel[@id='funcdesc'] orphan-label
 sc/uiconfig/scalc/ui/groupbynumber.ui://GtkEntry[@id='edit_by'] no-labelled-by
 sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_H_CUSTOM'] 
orphan-label
@@ -81,7 +74,6 @@ 
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelSTR_HF_OF'] orp
 sc/uiconfig/scalc/ui/imoptdialog.ui://GtkLabel[@id='charsetft'] orphan-label
 sc/uiconfig/scalc/ui/insertsheet.ui://GtkLabel[@id='path'] orphan-label
 sc/uiconfig/scalc/ui/integerdialog.ui://GtkSpinButton[@id='value'] 
no-labelled-by
-sc/uiconfig/scalc/ui/namerangesdialog.ui://GtkEntry[@id='edassign'] 
no-labelled-by
 sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='filegrouplabel'] 
orphan-label
 
sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='clipboardgrouplabel']
 orphan-label
 sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='formatgrouplabel'] 
orphan-label
@@ -90,7 +82,6 @@ 
sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='insertgrouplabel'] or
 sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='imagegrouplabel'] 
orphan-label
 sc/uiconfig/scalc/ui/managenamesdialog.ui://GtkLabel[@id='info'] orphan-label
 sc/uiconfig/scalc/ui/managenamesdialog.ui://GtkLabel[@id='label2'] orphan-label
-sc/uiconfig/scalc/ui/managenamesdialog.ui://GtkEntry[@id='name'] no-labelled-by
 sc/uiconfig/scalc/ui/mergecellsdialog.ui://GtkLabel[@id='label'] orphan-label
 sc/uiconfig/scalc/ui/mergecellsdialog.ui://GtkImage[@id='imMergeFirstCell'] 
no-labelled-by
 sc/uiconfig/scalc/ui/mergecellsdialog.ui://GtkImage[@id='imMergeKeepHidden'] 
no-labelled-by
@@ -114,7 +105,6 @@ 
sc/uiconfig/scalc/ui/passfragment.ui://GtkButton[@id='butto

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

2020-09-19 Thread Tor Lillqvist (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51be8b178576b492f2cfa6fbbf9870a9cf1c5172
Author: Tor Lillqvist 
AuthorDate: Wed Sep 9 10:18:04 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sat Sep 19 17:42:02 2020 +0200

It presumably is $LIBO_VERSION_SUFFIX that we want here

Not $LIBO_VERSION_SUFFIX_SUFFIX. Follow-up to
271297d4fa4a8e045b6dc04942966a1058bed45c.

Change-Id: I6356c84355e0ceac6e0ff492596e30a641935633
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102283
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index bacae1c9a9b3..30a2f3c13d36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,7 +234,7 @@ if test "$enable_macosx_sandbox" = yes; then
 MACOSX_BUNDLE_VERSION=$MACOSX_BUNDLE_SHORTVERSION
 else
 
MACOSX_BUNDLE_SHORTVERSION=$LIBO_VERSION_MAJOR.$LIBO_VERSION_MINOR.$LIBO_VERSION_MICRO.$LIBO_VERSION_PATCH
-
MACOSX_BUNDLE_VERSION=$MACOSX_BUNDLE_SHORTVERSION$LIBO_VERSION_SUFFIX_SUFFIX
+MACOSX_BUNDLE_VERSION=$MACOSX_BUNDLE_SHORTVERSION$LIBO_VERSION_SUFFIX
 fi
 
 AC_SUBST(LIBO_VERSION_MAJOR)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-19 Thread Regina Henschel (via logerrit) 
 chart2/qa/extras/chart2geometry.cxx   |   56 +++
 chart2/qa/extras/data/odt/tdf135366_data_label_export.odt |binary
 chart2/qa/extras/data/pptx/tdf135366_CustomLabelText.pptx |binary
 xmloff/source/chart/SchXMLExport.cxx  |  210 +++---
 4 files changed, 235 insertions(+), 31 deletions(-)

New commits:
commit 6d7a72ab1c044f7e1f30f7c4133dafdb214dfcbf
Author: Regina Henschel 
AuthorDate: Thu Sep 10 14:42:55 2020 +0200
Commit: Regina Henschel 
CommitDate: Sat Sep 19 14:27:24 2020 +0200

tdf#135366 Save line and fill of data labels to ODF

LibreOffice has line and fill properties of data labels in charts
as loext attributes in the style of the  or
 element. For ODF there has to be a
 element with line and fill properties in its
style.

This patch adds the needed  elements and their
associated  elements.

The element  exists in ODF since version 1.2.
The solution requires no extended namespace. The check is adapted
in lcl_getCustomLabelField.

Import was already done in commit
87d1ebeb11a00301745ee3c3c03fffb7033ab59d

Change-Id: I829dae5433e8257c775aa4f08e511d514df4e936
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102381
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/chart2/qa/extras/chart2geometry.cxx 
b/chart2/qa/extras/chart2geometry.cxx
index b3f537c372e0..be6d842d7780 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -21,6 +21,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
@@ -52,6 +53,8 @@ public:
 void testTdf128345Legend_CS_TG_axial_import();
 void testTdf135366LabelOnSeries();
 void testTdf135366LabelOnPoint();
+void testTdf135366LabelExport();
+void testTdf135366_CustomLabelText();
 
 CPPUNIT_TEST_SUITE(Chart2GeometryTest);
 CPPUNIT_TEST(testTdf135184RoundLineCap);
@@ -66,6 +69,8 @@ public:
 CPPUNIT_TEST(testTdf128345Legend_CS_TG_axial_import);
 CPPUNIT_TEST(testTdf135366LabelOnSeries);
 CPPUNIT_TEST(testTdf135366LabelOnPoint);
+CPPUNIT_TEST(testTdf135366LabelExport);
+CPPUNIT_TEST(testTdf135366_CustomLabelText);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -502,6 +507,57 @@ void Chart2GeometryTest::testTdf135366LabelOnPoint()
  nFillColor);
 }
 
+void Chart2GeometryTest::testTdf135366LabelExport()
+{
+// Error was, that line and fill properties were not exported as
+// graphic-properties of a  element, but only
+// as loext chart-properties of the  element.
+load("/chart2/qa/extras/data/odt/", "tdf135366_data_label_export.odt");
+xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "writer8");
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Find label style
+const OString sLabelPath(
+
"//office:document-content/office:body/office:chart/chart:chart/chart:plot-area"
+
"/chart:series/chart:data-point[1]/chart:data-label/@chart:style-name");
+const OUString sOULabelStyleName = getXPathContent(pXmlDoc, sLabelPath);
+
+// Verify content of graphic properties of label style
+const OString sStylePath(
+
"//office:document-content/office:automatic-styles/style:style[@style:name='"
++ OU2O(sOULabelStyleName) + "']/style:graphic-properties");
+assertXPath(pXmlDoc, sStylePath, 1);
+assertXPath(pXmlDoc, sStylePath + "[@draw:fill='solid']");
+assertXPath(pXmlDoc, sStylePath + "[@draw:fill-color='#5050a0']");
+assertXPath(pXmlDoc, sStylePath + "[@draw:stroke='solid']");
+assertXPath(pXmlDoc, sStylePath + "[@svg:stroke-width='0.254cm']");
+assertXPath(pXmlDoc, sStylePath + "[@svg:stroke-color='#00']");
+}
+
+void Chart2GeometryTest::testTdf135366_CustomLabelText()
+{
+// Error was, that custom text in a data label was only exported in ODF 
extended,
+// although the used  element exists since ODF 1.2.
+SvtSaveOptions aSaveOpt;
+const SvtSaveOptions::ODFDefaultVersion 
nCurrentODFVersion(aSaveOpt.GetODFDefaultVersion());
+aSaveOpt.SetODFDefaultVersion(SvtSaveOptions::ODFVER_012);
+load("/chart2/qa/extras/data/pptx/", "tdf135366_CustomLabelText.pptx");
+xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Find custom text. As of version 7.0 it is in a  element.
+const OString sCustomTextPath(
+
"//office:document-content/office:body/office:chart/chart:chart/chart:plot-area"
+"/chart:series/chart:data-point[2]/chart:data-label/text:p/text:span");
+assertXPath(pXmlDoc, sCustomTextPath, 1);
+
+// Verify text content
+const OUString sOUTextContent = getXPathContent(pXmlDoc, sCustomTextPath);
+CPPUNIT_ASSERT_EQUAL(OUString("Custom"), sOUTextContent);
+
+aSaveOpt.SetODFDefaultVersion(nCurrentODFVersion);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2GeometryTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/

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

2020-09-19 Thread Jan-Marek Glogowski (via logerrit) 
 vcl/source/font/fontcharmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bf4c5ac49b73cc2a8c89a87ff87238c061a579d
Author: Jan-Marek Glogowski 
AuthorDate: Sat Sep 19 11:53:27 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Sep 19 13:26:36 2020 +0200

Fix crash from broken font CMAP subtable

ParseCMAP crashes on a broken CMAP subtable of a font used by the
bugdoc of tdf#119074, which returns a negative offset (technically
it's large positive offset turning into a wrong negative integer,
which is still out of bounds of the CMAP overall size - you get
the point). This simply ignores that broken subtable, checking for
other existing ones.

Regressed-by: c7482bc2904401e7d975b5721ec861b8589253f9
Change-Id: I95820fe3bb6bd2fe2e0cf9d4c3536abce31fd497
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103033
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
index c66ddea45ea7..f7db9fd65ead 100644
--- a/vcl/source/font/fontcharmap.cxx
+++ b/vcl/source/font/fontcharmap.cxx
@@ -152,7 +152,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult& rResult )
 
 int nTmpOffset = GetUInt( p+4 );
 
-if (nTmpOffset + 2 > nLength)
+if (nTmpOffset + 2 > nLength || nTmpOffset < 0)
 continue;
 
 int nTmpFormat = GetUShort( pCmap + nTmpOffset );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-19 Thread Aron Budea (via logerrit) 
 sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit d7e5d79db4c447cab87a44c3f80e503463e5dec6
Author: Aron Budea 
AuthorDate: Sat Sep 19 09:16:15 2020 +0200
Commit: Mike Kaganski 
CommitDate: Sat Sep 19 13:19:47 2020 +0200

tdf#135674: initialize Styles Inspector on start

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

diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx 
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index 4fa626d3cebf..8ea4fda5e213 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -41,6 +41,8 @@
 
 namespace sw::sidebar
 {
+static void UpdateTree(SwDocShell* pDocSh, 
std::vector& aStore);
+
 VclPtr WriterInspectorTextPanel::Create(vcl::Window* pParent,
  const 
uno::Reference& rxFrame)
 {
@@ -65,6 +67,12 @@ 
WriterInspectorTextPanel::WriterInspectorTextPanel(vcl::Window* pParent,
 m_oldLink = m_pShell->GetChgLnk();
 m_pShell->SetChgLnk(LINK(this, WriterInspectorTextPanel, 
AttrChangedNotify));
 }
+
+// Update panel on start
+std::vector aStore;
+if (pDocSh->GetDoc()->GetEditShell()->GetCursor()->GetNode().GetTextNode())
+UpdateTree(pDocSh, aStore);
+updateEntries(aStore);
 }
 
 WriterInspectorTextPanel::~WriterInspectorTextPanel() { disposeOnce(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-19 Thread Caolán McNamara (via logerrit) 
 sc/source/ui/cctrl/checklistmenu.cxx |   42 +++
 sc/source/ui/inc/checklistmenu.hxx   |4 +--
 2 files changed, 25 insertions(+), 21 deletions(-)

New commits:
commit 798ee4543a91f16340f9962b36bccd1446ccdb7f
Author: Caolán McNamara 
AuthorDate: Fri Sep 18 19:54:27 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 19 13:17:50 2020 +0200

tdf#136559 use freeze+all_foreach for performance

doesn't do much for the gtk case due to
https://gitlab.gnome.org/GNOME/gtk/-/issues/2693
but has an impact on the vcl case

CheckAllChildren is then never called with a null pParent
so simplify it based on that

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

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 9a9259f9f796..57167b5bbe95 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -579,7 +579,12 @@ void ScCheckListMenuControl::prepWindow()
 
 void ScCheckListMenuControl::setAllMemberState(bool bSet)
 {
-CheckAllChildren(nullptr, bSet);
+mxChecks->freeze();
+mxChecks->all_foreach([this, bSet](weld::TreeIter& rEntry){
+mxChecks->set_toggle(rEntry, bSet ? TRISTATE_TRUE : TRISTATE_FALSE);
+return false;
+});
+mxChecks->thaw();
 
 if (!maConfig.mbAllowEmptySet)
 {
@@ -747,7 +752,7 @@ IMPL_LINK( ScCheckListMenuControl, CheckHdl, const 
weld::TreeView::iter_col&, rR
 void ScCheckListMenuControl::Check(const weld::TreeIter* pEntry)
 {
 if (pEntry)
-CheckEntry(pEntry,  mxChecks->get_toggle(*pEntry) == TRISTATE_TRUE);
+CheckEntry(*pEntry, mxChecks->get_toggle(*pEntry) == TRISTATE_TRUE);
 size_t nNumChecked = GetCheckedEntryCount();
 if (nNumChecked == maMembers.size())
 // all members visible
@@ -987,33 +992,32 @@ void ScCheckListMenuControl::CheckEntry(const OUString& 
sName, const weld::TreeI
 {
 std::unique_ptr xEntry = FindEntry(pParent, sName);
 if (xEntry)
-CheckEntry(xEntry.get(), bCheck);
+CheckEntry(*xEntry, bCheck);
 }
 
-// Recursively check all children of pParent
-void ScCheckListMenuControl::CheckAllChildren(const weld::TreeIter* pParent, 
bool bCheck)
+// Recursively check all children of rParent
+void ScCheckListMenuControl::CheckAllChildren(const weld::TreeIter& rParent, 
bool bCheck)
 {
-if (pParent)
-mxChecks->set_toggle(*pParent, bCheck ? TRISTATE_TRUE : 
TRISTATE_FALSE);
-std::unique_ptr xEntry = mxChecks->make_iterator(pParent);
-bool bEntry = pParent ? mxChecks->iter_children(*xEntry) : 
mxChecks->get_iter_first(*xEntry);
+mxChecks->set_toggle(rParent, bCheck ? TRISTATE_TRUE : TRISTATE_FALSE);
+std::unique_ptr xEntry = mxChecks->make_iterator(&rParent);
+bool bEntry = mxChecks->iter_children(*xEntry);
 while (bEntry)
 {
-CheckAllChildren(xEntry.get(), bCheck);
+CheckAllChildren(*xEntry, bCheck);
 bEntry = mxChecks->iter_next_sibling(*xEntry);
 }
 }
 
-void ScCheckListMenuControl::CheckEntry(const weld::TreeIter* pParent, bool 
bCheck)
+void ScCheckListMenuControl::CheckEntry(const weld::TreeIter& rParent, bool 
bCheck)
 {
-// recursively check all items below pParent
-CheckAllChildren(pParent, bCheck);
-// checking pParent can affect ancestors, e.g. if ancestor is unchecked 
and pParent is
+// recursively check all items below rParent
+CheckAllChildren(rParent, bCheck);
+// checking rParent can affect ancestors, e.g. if ancestor is unchecked 
and rParent is
 // now checked then the ancestor needs to be checked also
-if (!(pParent && mxChecks->get_iter_depth(*pParent)))
+if (!mxChecks->get_iter_depth(rParent))
 return;
 
-std::unique_ptr 
xAncestor(mxChecks->make_iterator(pParent));
+std::unique_ptr 
xAncestor(mxChecks->make_iterator(&rParent));
 bool bAncestor = mxChecks->iter_parent(*xAncestor);
 while (bAncestor)
 {
@@ -1086,7 +1090,7 @@ std::unique_ptr 
ScCheckListMenuControl::ShowCheckEntry(const OUS
 mxChecks->set_text(*xEntry, sName, 0);
 }
 else
-CheckEntry(xEntry.get(), bCheck);
+CheckEntry(*xEntry, bCheck);
 }
 else if (xEntry)
 {
@@ -1130,7 +1134,7 @@ IMPL_LINK(ScCheckListMenuControl, KeyInputHdl, const 
KeyEvent&, rKEvt, bool)
 if (bEntry)
 {
 bool bOldCheck = mxChecks->get_toggle(*xEntry) == TRISTATE_TRUE;
-CheckEntry(xEntry.get(), !bOldCheck);
+CheckEntry(*xEntry, !bOldCheck);
 bool bNewCheck = mxChecks->get_toggle(*xEntry) == TRISTATE_TRUE;
 if (bOldCheck != bNewCheck)
 Check(xEntry.get());
@@ -1193,7 +1197,7 @@ size_t ScCheckListMenuControl::initMembers(int 
nMaxMemberWidth)
 {

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

2020-09-19 Thread Caolán McNamara (via logerrit) 
 cui/uiconfig/ui/paratabspage.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3b99840fde960b68c53308a56b05ad713e632b5b
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 20:44:41 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 19 13:17:32 2020 +0200

tdf#136705 give tab stop treeview a small height request

so its natural height has no influence on the overall dialog height
and it will take whatever height the dialog ends up at

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

diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
index 1d6691758b63..93f66ca6e82e 100644
--- a/cui/uiconfig/ui/paratabspage.ui
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -47,6 +47,7 @@
 3
 
   
+42
 True
 False
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-19 Thread Julien Nabet (via logerrit) 
 sd/qa/unit/import-tests.cxx |   38 +-
 1 file changed, 17 insertions(+), 21 deletions(-)

New commits:
commit 49c03a624084a63b4cb7f6a23dd803ea66e4bb33
Author: Julien Nabet 
AuthorDate: Sat Sep 19 12:08:20 2020 +0200
Commit: Julien Nabet 
CommitDate: Sat Sep 19 13:02:45 2020 +0200

Remove commented parts + reindent

Code commented since initial adding of the test:
author  Muthu Subramanian 2012-08-14 17:04:40 +0530
committer   Muthu Subramanian 2012-08-14 17:04:40 
+0530
commit  3ccb8dac1405dc4ffa0ca3c45bd0724cc339d8ad (patch)
tree1fe5ae808b41458624624a9cd29502aa5bb290ad
parent  e3acf19c0502b0758359b56abda81e504d167630 (diff)
Adding unit test case for n#759180

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

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index b9e549ab0ea4..70f1ceb38e4b 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -448,28 +448,24 @@ void SdImportTest::testN759180()
 
 const SdrPage *pPage = GetPage( 1, xDocShRef );
 
-//sal_uIntPtr nObjs = pPage->GetObjCount();
-//for (sal_uIntPtr i = 0; i < nObjs; i++)
+// Get the object
+SdrObject *pObj = pPage->GetObj(0);
+SdrTextObj *pTxtObj = dynamic_cast( pObj );
+CPPUNIT_ASSERT(pTxtObj);
+std::vector rLst;
+const EditTextObject& aEdit = 
pTxtObj->GetOutlinerParaObject()->GetTextObject();
+const SvxULSpaceItem *pULSpace = 
aEdit.GetParaAttribs(0).GetItem(EE_PARA_ULSPACE);
+CPPUNIT_ASSERT(pULSpace);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Para bottom spacing is wrong!", 
static_cast(0), pULSpace->GetLower());
+aEdit.GetCharAttribs(1, rLst);
+auto it = std::find_if(rLst.rbegin(), rLst.rend(),
+[](const EECharAttrib& rCharAttr) { return dynamic_cast(rCharAttr.pAttr) != nullptr; });
+if (it != rLst.rend())
 {
-// Get the object
-SdrObject *pObj = pPage->GetObj(0);
-SdrTextObj *pTxtObj = dynamic_cast( pObj );
-CPPUNIT_ASSERT(pTxtObj);
-std::vector rLst;
-const EditTextObject& aEdit = 
pTxtObj->GetOutlinerParaObject()->GetTextObject();
-const SvxULSpaceItem *pULSpace = 
aEdit.GetParaAttribs(0).GetItem(EE_PARA_ULSPACE);
-CPPUNIT_ASSERT(pULSpace);
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "Para bottom spacing is wrong!", 
static_cast(0), pULSpace->GetLower());
-aEdit.GetCharAttribs(1, rLst);
-auto it = std::find_if(rLst.rbegin(), rLst.rend(),
-[](const EECharAttrib& rCharAttr) { return dynamic_cast(rCharAttr.pAttr) != nullptr; });
-if (it != rLst.rend())
-{
-const SvxFontHeightItem * pFontHeight = dynamic_cast((*it).pAttr);
-// nStart == 9
-// font height = 5 => 5*2540/72
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "Font height is wrong", 
static_cast(176), pFontHeight->GetHeight() );
-}
+const SvxFontHeightItem * pFontHeight = dynamic_cast((*it).pAttr);
+// nStart == 9
+// font height = 5 => 5*2540/72
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Font height is wrong", 
static_cast(176), pFontHeight->GetHeight() );
 }
 
 xDocShRef->DoClose();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

2020-09-19 Thread Jan-Marek Glogowski 
Am 19.09.20 um 10:49 schrieb crashtest:
> New crashtest update available at 
> https://dev-builds.libreoffice.org/crashtest/cb15d181b6446003ddc5a13eff9dfb14fc5a8179/

Fix for ParseCMAP crash: https://gerrit.libreoffice.org/c/core/+/103033
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-09-19 Thread Tor Lillqvist (via logerrit) 
 solenv/gbuild/UnpackedTarball.mk |2 
 solenv/gbuild/config.guess   | 1476 ---
 solenv/gbuild/config.sub | 1836 ---
 3 files changed, 1 insertion(+), 3313 deletions(-)

New commits:
commit 1f07c2e440326f2b2c8ffbb53c91570e6cfcd74d
Author: Tor Lillqvist 
AuthorDate: Fri Sep 18 23:06:07 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sat Sep 19 09:08:38 2020 +0200

The config.{guess,sub} in $SRCDIR is good for external projects, too

No need for the older second copies in solenv/gbuild.

Change-Id: I088f7d06b0727d1b336e3ba314b5c874d8ce3776
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103027
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index d177ed43503e..fb574f6a95f1 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -144,7 +144,7 @@ $(call gb_Helper_abbreviate_dirs,\
) \
$(foreach file,$(UNPACKED_FIX_EOL),$(call 
gb_UnpackedTarball_CONVERTTODOS,$(file)) && ) \
$(foreach confdir,$(UNPACKED_CONFIG_DIRS),\
-   cp -f $(gb_UnpackedTarball_CONFIGDIR)/config.guess 
$(gb_UnpackedTarball_CONFIGDIR)/config.sub $(confdir) && \
+   cp -f $(SRCDIR)/config.guess $(SRCDIR)/config.sub 
$(confdir) && \
) \
$(if $(UNPACKED_POST_ACTION),\
$(UNPACKED_POST_ACTION) && \
diff --git a/solenv/gbuild/config.guess b/solenv/gbuild/config.guess
deleted file mode 100755
index 61b5c7b0f3f7..
--- a/solenv/gbuild/config.guess
+++ /dev/null
@@ -1,1476 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2017 Free Software Foundation, Inc.
-
-timestamp='2017-08-08'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-#
-# Please send patches to .
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version  print version number, then exit
-
-Report bugs and patches to ."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
---time-stamp | --time* | -t )
-   echo "$timestamp" ; exit ;;
---version | -v )
-   echo "$version" ; exit ;;
---help | --h* | -h )
-   echo "$usage"; exit ;;
--- ) # Stop option processing
-   shift; break ;;
-- )# Use stdin as input.
-   break ;;
--* )
-   echo "$me: invalid option $1$help" >&2
-   exit 1 ;;
-* )
-   break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$