date:20171123

[Libreoffice-commits] core.git: external/libassuan

2017-11-23 Thread Stephan Bergmann

 external/libassuan/ExternalProject_libassuan.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e8e5bd65d31a60712afcab17d2e5f77c3322f86f
Author: Stephan Bergmann 
Date:   Thu Nov 23 18:08:56 2017 +0100

Pass $(MAKE) into external/libassuan

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

diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index e796f16bf017..9f0bccdbf64a 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
--host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+   MAKE=$(MAKE) \
  && $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

unrestricted access

2017-11-23 Thread Valerii Goncharuk

Hi,

Can I get unrestricted commit access?
My patches are
https://gerrit.libreoffice.org/gitweb?p=core.git;a=search;h=014a3ab73683f4e190f5e2dd26788ee1a3a0d683;s=lera.goncha...@gmail.com;st=author

Thank you in advance,
Lera
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-11-23 Thread Tomaž Vajngerl

 include/svx/ClassificationDialog.hxx |3 +
 include/svx/strings.hrc  |3 -
 svx/source/dialog/ClassificationDialog.cxx   |   51 ++---
 svx/source/dialog/ClassificationEditView.cxx |9 ++-
 svx/uiconfig/ui/classificationdialog.ui  |   65 +++
 5 files changed, 82 insertions(+), 49 deletions(-)

New commits:
commit 66076a431e5db967eeeb3ba8004a06a1e54d9fac
Author: TomaÅ¾ Vajngerl 
Date:   Thu Nov 23 23:00:55 2017 +0900

TSCP: Advanced dialog UI improvements

- Change the height of TextEdit to ~5 lines (100px)
- IPPart: single to double-click to add
- IPPartNumber: change to ListBox, same behavior as IPPart
- Markings: add on focus change
- Category: remove messagebox when the category changed

Change-Id: I9e695abc7caa702b2150a96ae15e6ce19fc2458a
Reviewed-on: https://gerrit.libreoffice.org/45149
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/include/svx/ClassificationDialog.hxx 
b/include/svx/ClassificationDialog.hxx
index d98f516d2015..a9ec24c99d45 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -60,11 +60,13 @@ private:
 const std::function m_aParagraphSignHandler;
 
 sal_Int32 m_nCurrentSelectedCategory;
+sal_Int16 m_nInsertMarkings;
 
 DECL_LINK(ButtonClicked, Button*, void);
 DECL_LINK(SelectToolboxHdl, ToolBox*, void);
 DECL_LINK(SelectClassificationHdl, ListBox&, void);
 DECL_LINK(SelectMarkingHdl, ListBox&, void);
+DECL_LINK(LoseFocusMarkingHdl, Control&, void);
 DECL_LINK(SelectIPPartNumbersHdl, ListBox&, void);
 DECL_LINK(SelectRecentlyUsedHdl, ListBox&, void);
 DECL_LINK(SelectIPPartHdl, ListBox&, void);
@@ -72,6 +74,7 @@ private:
 DECL_LINK(ExpandedHdl, VclExpander&, void);
 
 void insertField(ClassificationType eType, OUString const & rString, 
OUString const & rFullString, OUString const & rIdentifier = OUString());
+void insertCategoryField(sal_Int32 nID);
 
 std::vector> 
m_aRecentlyUsedValuesCollection;
 std::vector m_aInitialValues;
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index e4859d9ecd72..048cdc6c681e 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1653,9 +1653,6 @@
 #define RID_SUBSETSTR_SYRIAC_SUPPLEMENT 
NC_("RID_SUBSETMAP", "Syriac Supplement")
 #define RID_SUBSETSTR_ZANABAZAR_SQUARE  
NC_("RID_SUBSETMAP", "Zanabazar Square")
 
-// TSCP Classification
-#define RID_CLASSIFICATION_CHANGE_CATEGORY  
NC_("RID_CLASSIFICATION_CHANGE_CATEGORY", "Do you really want to change the 
classification category?")
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index 6ff28786ea50..a7b1469100f5 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -170,6 +170,7 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 , m_bPerParagraph(bPerParagraph)
 , m_aParagraphSignHandler(rParagraphSignHandler)
 , m_nCurrentSelectedCategory(-1)
+, m_nInsertMarkings(-1)
 {
 get(m_pOkButton, "ok");
 get(m_pEditWindow, "classificationEditWindow");
@@ -180,11 +181,10 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 get(m_pInternationalClassificationListBox, 
"internationalClassificationCB");
 get(m_pMarkingLabel, "markingLabel");
 get(m_pMarkingListBox, "markingCB");
-get(m_pIntellectualPropertyPartNumberListBox, 
"intellectualPropertyPartNumberCB");
+get(m_pIntellectualPropertyPartNumberListBox, 
"intellectualPropertyPartNumberLB");
 get(m_pIntellectualPropertyPartListBox, "intellectualPropertyPartLB");
 get(m_pIntellectualPropertyPartAddButton, 
"intellectualPropertyPartAddButton");
 get(m_pIntellectualPropertyPartEdit, "intellectualPropertyPartEntry");
-
 get(m_pIntellectualPropertyExpander, "intellectualPropertyExpander");
 
 m_pSignButton->SetClickHdl(LINK(this, ClassificationDialog, 
ButtonClicked));
@@ -197,19 +197,18 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 m_pClassificationListBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectClassificationHdl));
 for (const OUString& rName : maHelper.GetBACNames())
 m_pClassificationListBox->InsertEntry(rName);
-m_pClassificationListBox->EnableAutoSize(true);
 
 m_pInternationalClassificationListBox->SetSelectHdl(LINK(this, 
ClassificationDialog, SelectClassificationHdl));
 for (const OUString& rName : maInternationalHelper.GetBACNames())
 m_pInternationalClassificationListBox->InsertEntry(rName);
-m_pInternationalClassificationListBox->EnableAutoSize(true);
 
 if (!maHelper.GetMarkings().empty())
 {
 m_pMarkingListBox

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

2017-11-23 Thread Noel Grandin

 sc/inc/cellform.hxx  |6 +++---
 sc/inc/conditio.hxx  |2 +-
 sc/inc/dociter.hxx   |   14 +++---
 sc/inc/document.hxx  |4 ++--
 sc/inc/dpgroup.hxx   |2 +-
 sc/inc/dpshttab.hxx  |2 +-
 sc/inc/dptabdat.hxx  |2 +-
 sc/inc/global.hxx|2 +-
 sc/inc/patattr.hxx   |6 +++---
 sc/source/core/data/column2.cxx  |2 +-
 sc/source/core/data/column3.cxx  |8 
 sc/source/core/data/column4.cxx  |2 +-
 sc/source/core/data/conditio.cxx |2 +-
 sc/source/core/data/dociter.cxx  |   10 +-
 sc/source/core/data/documen6.cxx |4 ++--
 sc/source/core/data/document.cxx |2 +-
 sc/source/core/data/dpgroup.cxx  |2 +-
 sc/source/core/data/dpshttab.cxx |2 +-
 sc/source/core/data/dptabdat.cxx |2 +-
 sc/source/core/data/dputil.cxx   |4 ++--
 sc/source/core/data/formulacell.cxx  |2 +-
 sc/source/core/data/global2.cxx  |2 +-
 sc/source/core/data/patattr.cxx  |8 
 sc/source/core/data/stlsheet.cxx |2 +-
 sc/source/core/data/table3.cxx   |2 +-
 sc/source/core/data/table4.cxx   |4 ++--
 sc/source/core/inc/interpre.hxx  |   20 ++--
 sc/source/core/tool/cellform.cxx |8 
 sc/source/core/tool/chgtrack.cxx |2 +-
 sc/source/core/tool/interpr1.cxx |6 +++---
 sc/source/core/tool/interpr4.cxx |   16 
 sc/source/core/tool/interpr5.cxx |6 +++---
 sc/source/core/tool/interpr6.cxx |2 +-
 sc/source/core/tool/scmatrix.cxx |8 
 sc/source/filter/excel/xestyle.cxx   |   16 
 sc/source/filter/excel/xicontent.cxx |2 +-
 sc/source/filter/excel/xistyle.cxx   |6 +++---
 sc/source/filter/html/htmlexp.cxx|2 +-
 sc/source/filter/inc/numberformatsbuffer.hxx |   12 ++--
 sc/source/filter/inc/stylesbuffer.hxx|4 ++--
 sc/source/filter/inc/xestyle.hxx |   14 +++---
 sc/source/filter/inc/xistyle.hxx |4 ++--
 sc/source/filter/inc/xlstyle.hxx |4 ++--
 sc/source/filter/oox/numberformatsbuffer.cxx |   25 +++--
 sc/source/filter/oox/stylesbuffer.cxx|2 +-
 sc/source/filter/rtf/rtfexp.cxx  |2 +-
 sc/source/filter/xml/xmlcelli.cxx|2 +-
 sc/source/filter/xml/xmlexprt.cxx|2 +-
 sc/source/ui/app/transobj.cxx|2 +-
 sc/source/ui/docshell/impex.cxx  |2 +-
 sc/source/ui/unoobj/chart2uno.cxx|4 ++--
 sc/source/ui/unoobj/textuno.cxx  |2 +-
 sc/source/ui/view/cellsh1.cxx|2 +-
 sc/source/ui/view/cellsh2.cxx|2 +-
 sc/source/ui/view/output2.cxx|4 ++--
 sc/source/ui/view/spelleng.cxx   |2 +-
 56 files changed, 141 insertions(+), 144 deletions(-)

New commits:
commit a1c0e999b271ac4c6ecb163a1cd2a310b87e9dec
Author: Noel Grandin 
Date:   Thu Nov 23 17:30:42 2017 +0200

consistently use sal_uInt32 for number formats in sc

instead of a mix of short/sal_uLong/sal_uInt32

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

diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index ff2bb8ae328b..37a2cebea216 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -35,17 +35,17 @@ class SC_DLLPUBLIC ScCellFormat
 public:
 
 static void GetString(
-ScRefCellValue& rCell, sal_uLong nFormat, OUString& rString,
+ScRefCellValue& rCell, sal_uInt32 nFormat, OUString& rString,
 Color** ppColor, SvNumberFormatter& rFormatter, const ScDocument* 
pDoc, bool bNullVals = true,
 bool bFormula  = false, bool bUseStarFormat = false );
 
 static OUString GetString(
-ScDocument& rDoc, const ScAddress& rPos, sal_uLong nFormat,
+ScDocument& rDoc, const ScAddress& rPos, sal_uInt32 nFormat,
 Color** ppColor, SvNumberFormatter& rFormatter, bool bNullVals = true,
 bool bFormula  = false );
 
 static void GetInputString(
-ScRefCellValue& rCell, sal_uLong nFormat, OUString& rString, 
SvNumberFormatter& rFormatter,
+ScRefCellValue& rCell, sal_uInt32 nFormat, OUString& rString, 
SvNumberFormatter& rFormatter,
 const ScDocument* pDoc );
 
 static OUString GetOutputString(
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 27acc6e0d668..

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

2017-11-23 Thread Noel Grandin

 sw/inc/charatr.hxx   |   68 +-
 sw/inc/hintids.hxx   |   98 +--
 sw/qa/extras/uiwriter/uiwriter.cxx   |   18 ++--
 sw/source/core/doc/dbgoutsw.cxx  |1 
 sw/source/core/doc/fmtcol.cxx|6 -
 sw/source/core/doc/tblafmt.cxx   |   36 -
 sw/source/core/text/txtdrop.cxx  |4 -
 sw/source/core/text/txtfrm.cxx   |1 
 sw/source/core/txtnode/fntcache.cxx  |2 
 sw/source/core/txtnode/ndhints.cxx   |1 
 sw/source/core/txtnode/thints.cxx|1 
 sw/source/core/unocore/unomap.cxx|   11 +++
 sw/source/core/unocore/unomap1.cxx   |   27 +++
 sw/source/filter/html/wrthtml.cxx|3 
 sw/source/filter/ww8/docxattributeoutput.cxx |2 
 sw/source/filter/ww8/rtfattributeoutput.cxx  |3 
 sw/source/filter/ww8/rtfexport.cxx   |   25 +-
 sw/source/filter/ww8/wrtw8num.cxx|2 
 sw/source/filter/ww8/wrtw8sty.cxx|2 
 sw/source/filter/ww8/ww8par5.cxx |4 -
 sw/source/ui/config/optpage.cxx  |   16 ++--
 sw/source/ui/misc/insfnote.cxx   |6 -
 sw/source/uibase/lingu/hhcwrp.cxx|2 
 sw/source/uibase/shells/basesh.cxx   |6 -
 sw/source/uibase/shells/textsh1.cxx  |6 -
 sw/source/uibase/shells/txtattr.cxx  |   13 +--
 26 files changed, 195 insertions(+), 169 deletions(-)

New commits:
commit 35f5274ece0fcbb70753a71619b526ed0d4cbd6b
Author: Noel Grandin 
Date:   Thu Nov 23 15:27:13 2017 +0200

TypedWhichId for RES_CHRATR constants

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

diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index ebc3f7de8892..3516772c2d82 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -52,73 +52,73 @@
 // implementation of the character attribute methods of SwAttrSet
 
 inline const SvxPostureItem  &SwAttrSet::GetPosture(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_POSTURE,bInP)); }
+{   return Get( RES_CHRATR_POSTURE,bInP); }
 inline const SvxPostureItem  &SwAttrSet::GetCJKPosture(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_CJK_POSTURE,bInP)); }
+{   return Get( RES_CHRATR_CJK_POSTURE,bInP); }
 inline const SvxPostureItem  &SwAttrSet::GetCTLPosture(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_CTL_POSTURE,bInP)); }
+{   return Get( RES_CHRATR_CTL_POSTURE,bInP); }
 inline const SvxWeightItem   &SwAttrSet::GetWeight(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_WEIGHT,bInP)); }
+{   return Get( RES_CHRATR_WEIGHT,bInP); }
 inline const SvxWeightItem   &SwAttrSet::GetCJKWeight(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_CJK_WEIGHT,bInP)); }
+{   return Get( RES_CHRATR_CJK_WEIGHT,bInP); }
 inline const SvxWeightItem   &SwAttrSet::GetCTLWeight(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_CTL_WEIGHT,bInP)); }
+{   return Get( RES_CHRATR_CTL_WEIGHT,bInP); }
 inline const SvxShadowedItem &SwAttrSet::GetShadowed(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_SHADOWED,bInP)); }
+{   return Get( RES_CHRATR_SHADOWED,bInP); }
 inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_AUTOKERN,bInP)); }
+{   return Get( RES_CHRATR_AUTOKERN,bInP); }
 inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_WORDLINEMODE,bInP)); }
+{   return Get( RES_CHRATR_WORDLINEMODE,bInP); }
 inline const SvxContourItem  &SwAttrSet::GetContour(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_CONTOUR,bInP)); }
+{   return Get( RES_CHRATR_CONTOUR,bInP); }
 inline const SvxKerningItem  &SwAttrSet::GetKerning(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_KERNING,bInP)); }
+{   return Get( RES_CHRATR_KERNING,bInP); }
 inline const SvxUnderlineItem&SwAttrSet::GetUnderline(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_UNDERLINE,bInP)); }
+{   return Get( RES_CHRATR_UNDERLINE,bInP); }
 inline const SvxOverlineItem &SwAttrSet::GetOverline(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_OVERLINE,bInP)); }
+{   return Get( RES_CHRATR_OVERLINE,bInP); }
 inline const SvxCrossedOutItem   &SwAttrSet::GetCrossedOut(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_CROSSEDOUT,bInP)); }
+{   return Get( RES_CHRATR_CROSSEDOUT,bInP); }
 inline const SvxFontHeightItem   &SwAttrSet::GetSize(bool bInP) const
-{   return static_cast(Get( 
RES_CHRATR_FONTSIZE,bInP)); }
+{   return Get( RES_CHRATR_FONTSIZE,bInP); }
 inline const SvxFon

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - common/Seccomp.cpp

2017-11-23 Thread Aron Budea

 common/Seccomp.cpp |  105 ++---
 1 file changed, 37 insertions(+), 68 deletions(-)

New commits:
commit b656cc160073893bc6c1d4898b9943e538e2a411
Author: Aron Budea 
Date:   Tue Nov 14 18:26:33 2017 +0100

rlimits: Friendlier and more precise logging of numbers

Unlimited settings were logged as huge numbers.
In two cases settings were logged via LOG_SYS (and as errors)
instead of LOG_INF.

Change-Id: I1da493c0126ecf9d2382956ac1e60e57988696ee
Reviewed-on: https://gerrit.libreoffice.org/44731
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit f6ec965dffdab41df9fb58d58661026b5fd406f0)
Reviewed-on: https://gerrit.libreoffice.org/45174
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index 09a53cdc..e49c4d5e 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -228,91 +228,60 @@ bool lockdown(Type type)
 
 namespace Rlimit {
 
+void setRLimit(rlim_t confLim, int resource, const std::string &resourceText, 
const std::string &unitText)
+{
+rlim_t lim = confLim;
+if (lim <= 0)
+lim = RLIM_INFINITY;
+const std::string limTextWithUnit((lim == RLIM_INFINITY) ? "unlimited" : 
std::to_string(lim) + " " + unitText);
+if (resource != RLIMIT_FSIZE && resource != RLIMIT_NOFILE)
+{
+/* FIXME Currently the RLIMIT_FSIZE handling is non-ideal, and can
+ * lead to crashes of the kit processes due to not handling signal
+ * 25 gracefully.  Let's disable for now before there's a more
+ * concrete plan.
+ * Similar issues with RLIMIT_NOFILE
+ */
+rlimit rlim = { lim, lim };
+if (setrlimit(resource, &rlim) != 0)
+LOG_SYS("Failed to set " << resourceText << " to " << 
limTextWithUnit << ".");
+if (getrlimit(resource, &rlim) == 0)
+{
+const std::string setLimTextWithUnit((rlim.rlim_max == 
RLIM_INFINITY) ? "unlimited" : std::to_string(rlim.rlim_max) + " " + unitText);
+LOG_INF(resourceText << " is " << setLimTextWithUnit << " after 
setting it to " << limTextWithUnit << ".");
+}
+else
+LOG_SYS("Failed to get " << resourceText << ".");
+}
+else
+LOG_INF("Ignored setting " << resourceText << " to " << 
limTextWithUnit << ".");
+}
+
 bool handleSetrlimitCommand(const std::vector& tokens)
 {
 if (tokens.size() == 3 && tokens[0] == "setconfig")
 {
 if (tokens[1] == "limit_virt_mem_mb")
 {
-rlim_t lim = std::stoi(tokens[2]) * 1024 * 1024;
-if (lim <= 0)
-lim = RLIM_INFINITY;
-
-rlimit rlim = { lim, lim };
-if (setrlimit(RLIMIT_AS, &rlim) != 0)
-LOG_SYS("Failed to set RLIMIT_AS to " << lim << " bytes.");
-
-if (getrlimit(RLIMIT_AS, &rlim) == 0)
-LOG_INF("RLIMIT_AS is " << rlim.rlim_max << " bytes after 
setting it to " << lim << " bytes.");
-else
-LOG_SYS("Failed to get RLIMIT_AS.");
-
-return true;
+setRLimit(std::stoi(tokens[2]) * 1024 * 1024, RLIMIT_AS, 
"RLIMIT_AS", "bytes");
 }
 else if (tokens[1] == "limit_stack_mem_kb")
 {
-rlim_t lim = std::stoi(tokens[2]) * 1024;
-if (lim <= 0)
-lim = RLIM_INFINITY;
-
-rlimit rlim = { lim, lim };
-if (setrlimit(RLIMIT_STACK, &rlim) != 0)
-LOG_SYS("Failed to set RLIMIT_STACK to " << lim << " bytes.");
-
-if (getrlimit(RLIMIT_STACK, &rlim) == 0)
-LOG_INF("RLIMIT_STACK is " << rlim.rlim_max << " bytes after 
setting it to " << lim << " bytes.");
-else
-LOG_SYS("Failed to get RLIMIT_STACK.");
-
-return true;
+setRLimit(std::stoi(tokens[2]) * 1024, RLIMIT_STACK, 
"RLIMIT_STACK", "bytes");
 }
 else if (tokens[1] == "limit_file_size_mb")
 {
-rlim_t lim = std::stoi(tokens[2]) * 1024 * 1024;
-if (lim <= 0)
-lim = RLIM_INFINITY;
-
-/* FIXME Currently the RLIMIT_FSIZE handling is non-ideal, and can
- * lead to crashes of the kit processes due to not handling signal
- * 25 gracefully.  Let's disable for now before there's a more
- * concrete plan.
-rlimit rlim = { lim, lim };
-if (setrlimit(RLIMIT_FSIZE, &rlim) != 0)
-LOG_SYS("Failed to set RLIMIT_FSIZE to " << lim << " bytes.");
-
-if (getrlimit(RLIMIT_FSIZE, &rlim) == 0)
-LOG_INF("RLIMIT_FSIZE is " << rlim.rlim_max << " bytes after 
setting it to " << lim << " bytes.");
-else
-LOG_SYS("Failed to get RLIMIT_FSIZE.");
-*/
-LOG_SYS("Ignored setting RLIMIT_FSIZE to " << lim << " bytes.");
-
-

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

2017-11-23 Thread Szymon Kłos

 sw/qa/extras/ooxmlexport/data/tdf65955.odt   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx   |   18 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   49 ++-
 sw/source/filter/ww8/docxattributeoutput.hxx |9 +++-
 sw/source/filter/ww8/docxexport.cxx  |   10 -
 5 files changed, 75 insertions(+), 11 deletions(-)

New commits:
commit 50915bababcf6b645fe3b57c265560a3cd0c6224
Author: Szymon KÅos 
Date:   Thu Nov 23 16:56:38 2017 +0100

tdf#65955 DOCX: bookmarks at the end of paragraph

End of line handling was incorrect and all bookmark
tags placed at the end were exported before last text.
I added additional collection to separate final marks
and export them after last piece of text.

Change-Id: Icc8f89164619c85405a846fda9871430c91dcbe1
Reviewed-on: https://gerrit.libreoffice.org/45168
Tested-by: Jenkins 
Reviewed-by: Szymon KÅos 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf65955.odt 
b/sw/qa/extras/ooxmlexport/data/tdf65955.odt
new file mode 100755
index ..e133938e0383
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf65955.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 725209aab686..199aac5398a4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -741,6 +741,24 @@ DECLARE_OOXMLEXPORT_TEST(testFdo85542, "fdo85542.docx")
 CPPUNIT_ASSERT_EQUAL(xTextNeighborhood->getString(), OUString("AB"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf65955, "tdf65955.odt")
+{
+uno::Reference xBookmarksSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(xBookmarksByIdx->getCount(), 
static_cast(2));
+uno::Reference 
xBookmarksByName(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xBookmarksByName->hasByName("a"));
+CPPUNIT_ASSERT(xBookmarksByName->hasByName("b"));
+// a
+uno::Reference 
xContent3(xBookmarksByName->getByName("a"), uno::UNO_QUERY);
+uno::Reference xRange3(xContent3->getAnchor(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(xRange3->getString(), OUString());
+// b
+uno::Reference 
xContent2(xBookmarksByName->getByName("b"), uno::UNO_QUERY);
+uno::Reference xRange2(xContent2->getAnchor(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("r"), xRange2->getString());
+}
+
 DECLARE_OOXMLEXPORT_TEST(testChtOutlineNumberingOoxml, "chtoutline.docx")
 {
 const sal_Unicode aExpectedPrefix[2] = { 0x7b2c, 0x0020 };
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6a0f2adec4ee..9bb78246e2a6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1242,8 +1242,8 @@ void DocxAttributeOutput::EndRun(const SwTextNode* pNode, 
sal_Int32 nPos, bool /
 // XML_r node should be surrounded with bookmark-begin and bookmark-end 
nodes if it has bookmarks.
 // The same is applied for permission ranges.
 // But due to unit test "testFdo85542" let's output bookmark-begin with 
bookmark-end.
-DoWriteBookmarksStart();
-DoWriteBookmarksEnd();
+DoWriteBookmarksStart(m_rBookmarksStart);
+DoWriteBookmarksEnd(m_rBookmarksEnd);
 DoWritePermissionsStart();
 DoWriteAnnotationMarks();
 
@@ -1384,6 +1384,8 @@ void DocxAttributeOutput::EndRun(const SwTextNode* pNode, 
sal_Int32 nPos, bool /
 m_nFieldsInHyperlink = 0;
 }
 
+DoWriteBookmarksStart(m_rFinalBookmarksStart);
+DoWriteBookmarksEnd(m_rFinalBookmarksEnd);
 DoWriteBookmarkEndIfExist(nPos);
 }
 
@@ -1441,9 +1443,9 @@ void 
DocxAttributeOutput::DoWriteBookmarkEndIfExist(sal_Int32 nRunPos)
 }
 
 /// Write the start bookmarks
-void DocxAttributeOutput::DoWriteBookmarksStart()
+void DocxAttributeOutput::DoWriteBookmarksStart(std::vector& rStarts)
 {
-for (const OUString & bookmarkName : m_rBookmarksStart)
+for (const OUString & bookmarkName : rStarts)
 {
 // Output the bookmark
 DoWriteBookmarkTagStart(bookmarkName);
@@ -1452,13 +1454,13 @@ void DocxAttributeOutput::DoWriteBookmarksStart()
 m_sLastOpenedBookmark = 
OUStringToOString(BookmarkToWord(bookmarkName), RTL_TEXTENCODING_UTF8).getStr();
 m_nNextBookmarkId++;
 }
-m_rBookmarksStart.clear();
+rStarts.clear();
 }
 
 /// export the end bookmarks
-void DocxAttributeOutput::DoWriteBookmarksEnd()
+void DocxAttributeOutput::DoWriteBookmarksEnd(std::vector& rEnds)
 {
-for (const OUString & bookmarkName : m_rBookmarksEnd)
+for (const OUString & bookmarkName : rEnds)
 {
 // Get the id of the bookmark
 auto pPos = m_rOpenedBookmarksIds.find(bookmarkName);
@@ -1470,7 +1472,7 @@ void DocxAttributeOutput::DoWriteBookmarksEnd()
 m_rOpenedBookmarksIds.erase(bookmarkName);

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

2017-11-23 Thread Julien Nabet

 vcl/source/gdi/pdfwriter_impl.cxx |  298 ++
 1 file changed, 143 insertions(+), 155 deletions(-)

New commits:
commit ad83b67128fbfeee20d80889dac432c686bb2cbb
Author: Julien Nabet 
Date:   Thu Nov 23 20:52:46 2017 +0100

Modernize pdfwriter_impl by using for-range loops (vcl)

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

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index e6bd9760c9d4..e6ad03b44940 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1078,14 +1078,14 @@ static void appendResourceMap( OStringBuffer& rBuf, 
const char* pPrefix, const P
 rBuf.append( pPrefix );
 rBuf.append( "<<" );
 int ni = 0;
-for( PDFWriterImpl::ResourceMap::const_iterator it = rList.begin(); it != 
rList.end(); ++it )
+for (auto const& item : rList)
 {
-if( !it->first.isEmpty() && it->second > 0 )
+if( !item.first.isEmpty() && item.second > 0 )
 {
 rBuf.append( '/' );
-rBuf.append( it->first );
+rBuf.append( item.first );
 rBuf.append( ' ' );
-rBuf.append( it->second );
+rBuf.append( item.second );
 rBuf.append( " 0 R" );
 if( ((++ni) & 7) == 0 )
 rBuf.append( '\n' );
@@ -2284,13 +2284,12 @@ void PDFWriterImpl::endPage()
 m_aCurrentPDFState = m_aGraphicsStack.front();
 m_aGraphicsStack.front().m_aFont =  aFont;
 
-for( std::list::iterator it = m_aBitmaps.begin();
- it != m_aBitmaps.end(); ++it )
+for (auto & bitmap : m_aBitmaps)
 {
-if( ! it->m_aBitmap.IsEmpty() )
+if( ! bitmap.m_aBitmap.IsEmpty() )
 {
-writeBitmapObject( *it );
-it->m_aBitmap = BitmapEx();
+writeBitmapObject(bitmap);
+bitmap.m_aBitmap = BitmapEx();
 }
 }
 for (auto & jpeg : m_aJPGs)
@@ -2302,14 +2301,13 @@ void PDFWriterImpl::endPage()
 jpeg.m_aMask = Bitmap();
 }
 }
-for( std::list::iterator t = 
m_aTransparentObjects.begin();
- t != m_aTransparentObjects.end(); ++t )
+for (auto & item : m_aTransparentObjects)
 {
-if( t->m_pContentStream )
+if( item.m_pContentStream )
 {
-writeTransparentObject( *t );
-delete t->m_pContentStream;
-t->m_pContentStream = nullptr;
+writeTransparentObject(item);
+delete item.m_pContentStream;
+item.m_pContentStream = nullptr;
 }
 }
 
@@ -2470,17 +2468,16 @@ OString PDFWriterImpl::emitStructureAttributes( 
PDFStructureElement& i_rEle )
 {
 // create layout, list and table attribute sets
 OStringBuffer aLayout(256), aList(64), aTable(64);
-for( PDFStructAttributes::const_iterator it = i_rEle.m_aAttributes.begin();
- it != i_rEle.m_aAttributes.end(); ++it )
+for (auto const& attribute : i_rEle.m_aAttributes)
 {
-if( it->first == PDFWriter::ListNumbering )
-appendStructureAttributeLine( it->first, it->second, aList, true );
-else if( it->first == PDFWriter::RowSpan ||
- it->first == PDFWriter::ColSpan )
-appendStructureAttributeLine( it->first, it->second, aTable, false 
);
-else if( it->first == PDFWriter::LinkAnnotation )
+if( attribute.first == PDFWriter::ListNumbering )
+appendStructureAttributeLine( attribute.first, attribute.second, 
aList, true );
+else if( attribute.first == PDFWriter::RowSpan ||
+ attribute.first == PDFWriter::ColSpan )
+appendStructureAttributeLine( attribute.first, attribute.second, 
aTable, false );
+else if( attribute.first == PDFWriter::LinkAnnotation )
 {
-sal_Int32 nLink = it->second.nValue;
+sal_Int32 nLink = attribute.second.nValue;
 std::map< sal_Int32, sal_Int32 >::const_iterator link_it =
 m_aLinkPropertyMap.find( nLink );
 if( link_it != m_aLinkPropertyMap.end() )
@@ -2524,7 +2521,7 @@ OString PDFWriterImpl::emitStructureAttributes( 
PDFStructureElement& i_rEle )
 }
 }
 else
-appendStructureAttributeLine( it->first, it->second, aLayout, true 
);
+appendStructureAttributeLine( attribute.first, attribute.second, 
aLayout, true );
 }
 if( ! i_rEle.m_aBBox.IsEmpty() )
 {
@@ -2586,11 +2583,10 @@ OString PDFWriterImpl::emitStructureAttributes( 
PDFStructureElement& i_rEle )
 OStringBuffer aRet( 64 );
 if( aAttribObjects.size() > 1 )
 aRet.append( " [" );
-for( std::vector< sal_Int32 >::const_iterator at_it = 
aAttribObjects.begin();
- at_it != aAttribObjects.end(); ++at_it )
+for (auto const& attrib : aAttribObjects)

LibreOffice 6.0: Android version?

2017-11-23 Thread Mike Saunders

Hi everyone,

Looking at this page:

https://wiki.documentfoundation.org/ReleaseNotes/6.0#Android

Various new features have been added to the Android app, which is
awesome, but do we know if there'll be a new version on the Play Store
with these features in time for the release of LibreOffice 6.0?

Obviously the Android app uses a different versioning scheme, but if a
new release is planned, it's something we can talk about in our
marketing materials. Thanks!

-- 
Mike Saunders, Marketing & PR
The Document Foundation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-11-23 Thread Henry Castro

 loleaflet/dist/loleaflet.html |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd2e4df6835e465d13514c607b38555bab96312e
Author: Henry Castro 
Date:   Thu Nov 23 20:53:08 2017 -0400

loleaflet: fix text selectable in version dialog

Change-Id: Ia1f8aa5fc1a03d0ee39e663a7bbd865ba301b38c

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index f24f58e4..83c93898 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -75,7 +75,7 @@
 
 
 
-
+
   LibreOffice Online
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre2' - 5 commits - comphelper/Library_comphelper.mk comphelper/source offapi/com package/inc package/source sfx2/source xmlsecurity/source

2017-11-23 Thread Thorsten Behrens

Rebased ref, commits from common ancestor:
commit fe67612f8d40dd76b7bec105e8abd1704885a50c
Author: Thorsten Behrens 
Date:   Thu Nov 23 22:18:09 2017 +0100

gpg4libre: find keymanager executable on Windows

Change-Id: If93c06ad90d708b0fbaf476bda6fdb902bd77b1e

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index ba726e04d0a5..42ca15d05faf 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -468,9 +468,17 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl, 
Button*, void)
 
 IMPL_STATIC_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, Button*, 
void)
 {
-const OUString aGUIServers[] = {  OUString("kleopatra"), 
OUString("seahorse"),  OUString("gpa"), OUString("kgpg") };
-// FIXME: the same for Windows + registry search for gpg4win
+#ifdef _WIN32
+// FIXME: call GpgME::dirInfo("bindir") somewhere in
+// SecurityEnvironmentGpg or whatnot
+// FIXME: perhaps poke GpgME for uiserver, and hope it returns something 
useful?
+const OUString aGUIServers[] = { OUString("kleopatra.exe"), 
OUString("launch-gpa.exe"), OUString("gpa.exe"),
+ OUString("bin\\kleopatra.exe"), 
OUString("bin\\launch-gpa.exe"), OUString("bin\\gpa.exe") };
+const char* cPath = "C:\\Program Files (x86)\\GNU\\GnuPG";
+#else
+const OUString aGUIServers[] = { OUString("kleopatra"), 
OUString("seahorse"),  OUString("gpa"), OUString("kgpg") };
 const char* cPath = getenv("PATH");
+#endif
 
 if (cPath)
 {
commit f7eb83dda30a81e12e4220f231882a3a1ad4f9af
Author: Thorsten Behrens 
Date:   Mon Aug 21 09:24:32 2017 +0200

demo hack: list all certificates

Change-Id: Ibc678cf9c0c8a0a8e8198516b8cbdebcc977c185

diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx 
b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 2bbcf8ddf79b..ba21794097d5 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -119,7 +119,7 @@ Reference< XCertificate > 
SecurityEnvironmentGpg::getCertificate( const OUString
 if(xmlSecBase64Decode(strKeyId, const_cast(strKeyId), 
xmlStrlen(strKeyId)) < 0)
 throw RuntimeException("Base64 decode failed");
 
-m_ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
+m_ctx->addKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
 GpgME::Error err = m_ctx->startKeyListing("", false);
 while (!err) {
 GpgME::Key k = m_ctx->nextKey(err);
commit c40ea03a18d875f031c7662f64516eaad9e68b99
Author: Thorsten Behrens 
Date:   Sun Aug 20 03:43:20 2017 +0200

gpg4libre: pass down OpenPGP encryption info to package code

Change-Id: Ie67c9927efdad4a027b14ed6a37a188b85eaf077

diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx
index df7bebcf6bd4..78736736d05a 100644
--- a/package/inc/PackageConstants.hxx
+++ b/package/inc/PackageConstants.hxx
@@ -34,6 +34,10 @@ const sal_Int32 n_ConstDigestDecrypt = 1056; // 1024 + 32
 #define PKG_MNFST_VERSION 1 //Version
 #define PKG_MNFST_MEDIATYPE   2 //MediaType
 
+#define PKG_MNFST_KEYID   3 //PGP Key ID
+#define PKG_MNFST_KEYPACKET   4 //PGP Key packet
+#define PKG_MNFST_CIPHERVAL   5 //PGP session key cipher value
+
 #define PKG_MNFST_INIVECTOR   3 //InitialisationVector
 #define PKG_MNFST_SALT4 //Salt
 #define PKG_MNFST_ITERATION   5 //IterationCount
@@ -44,13 +48,15 @@ const sal_Int32 n_ConstDigestDecrypt = 1056; // 1024 + 32
 #define PKG_MNFST_DIGESTALG  10 //DigestAlgorithm
 #define PKG_MNFST_DERKEYSIZE 11 //DerivedKeySize
 
-#define PKG_SIZE_NOENCR_MNFST 3
-#define PKG_SIZE_ENCR_MNFST   12
+#define PKG_SIZE_NOENCR_MNFST3
+#define PKG_SIZE_GPG_ENCR_MNFST  6
+#define PKG_SIZE_ENCR_MNFST  12
 
 // the properties related constants
 #define ENCRYPTION_KEY_PROPERTY "EncryptionKey"
 #define STORAGE_ENCRYPTION_KEYS_PROPERTY "StorageEncryptionKeys"
 #define ENCRYPTION_ALGORITHMS_PROPERTY "EncryptionAlgorithms"
+#define ENCRYPTION_GPG_PROPERTIES "EncryptionGpGProperties"
 #define HAS_ENCRYPTED_ENTRIES_PROPERTY "HasEncryptedEntries"
 #define HAS_NONENCRYPTED_ENTRIES_PROPERTY "HasNonEncryptedEntries"
 #define IS_INCONSISTENT_PROPERTY "IsInconsistent"
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 61b0fc883575..6409769d175a 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -72,6 +72,7 @@ class ZipPackage final : public cppu::WeakImplHelper
 
 css::uno::Sequence< css::beans::NamedValue > m_aStorageEncryptionKeys;
 css::uno::Sequence< sal_Int8 > m_aEncryptionKey;
+css::uno::Sequence< css::beans::NamedValue > m_aGpgProps;
 
 FolderHashm_aRecent;
 OUString   m_aURL;
diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index 9bdd03d7cfd1..a93cf0d730b5 100644
--- a/package/source/zippackag

[Libreoffice-commits] core.git: 3 commits - cli_ure/CliLibrary_cli_basetypes.mk cli_ure/CliLibrary_cli_ure.mk cli_ure/CliNativeLibrary_cli_cppuhelper.mk cli_ure/CliUnoApi_cli_uretypes.mk solenv/bin so

2017-11-23 Thread Michael Stahl

 cli_ure/CliLibrary_cli_basetypes.mk|2 
 cli_ure/CliLibrary_cli_ure.mk  |2 
 cli_ure/CliNativeLibrary_cli_cppuhelper.mk |2 
 cli_ure/CliUnoApi_cli_uretypes.mk  |2 
 solenv/bin/concat-deps.c   |5 ++
 solenv/gbuild/CliAssembly.mk   |   17 +++
 solenv/gbuild/CliLibrary.mk|2 
 solenv/gbuild/CliNativeLibrary.mk  |2 
 solenv/gbuild/CliUnoApi.mk |2 
 solenv/gbuild/Library.mk   |1 
 solenv/gbuild/LinkTarget.mk|   63 -
 solenv/gbuild/TargetLocations.mk   |2 
 solenv/gbuild/platform/com_MSC_class.mk|1 
 unoil/CliUnoApi_oootypes.mk|2 
 14 files changed, 86 insertions(+), 19 deletions(-)

New commits:
commit bb9413907cd7bea0feadb7e4e3d44d5078fe5a26
Author: Michael Stahl 
Date:   Fri Nov 24 01:09:58 2017 +0100

tdf#113787: gbuild: fix the version of cli_cppuhelper assembly

There is one usage of gb_Library_add_generated_cxxclrobjects in
the entire repo, and regrettably generated C++/CLR objects
weren't actually implemented in the new build system, so the
assembly.cxx with its generated version number was simply ignored.

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 5b9fb4ea7dd1..b815cad29b67 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1074,6 +1074,11 @@ off_t size;
 created_line = generate_phony_line(src_relative, "o");
 rc = generate_phony_file(fn, created_line);
 }
+else if(strncmp(src_relative, "GenCxxClrObject/", 16) == 0)
+{
+created_line = generate_phony_line(src_relative, "o");
+rc = generate_phony_file(fn, created_line);
+}
 else
 {
 fprintf(stderr, "no magic for %s(%s) in %s\n", fn, 
src_relative, work_dir);
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 18b62f2342bd..5166dbe6c390 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -182,6 +182,7 @@ gb_Library_add_objcxxobject = $(call 
gb_Library__forward_to_Linktarget,$(subst g
 gb_Library_add_objcxxobjects = $(call 
gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
 gb_Library_add_cxxclrobject = $(call gb_Library__forward_to_Linktarget,$(subst 
gb_Library_,,$(0)),$(1),$(2),$(3))
 gb_Library_add_cxxclrobjects = $(call 
gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
+gb_Library_add_generated_cxxclrobjects = $(call 
gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
 gb_Library_add_asmobject = $(call gb_Library__forward_to_Linktarget,$(subst 
gb_Library_,,$(0)),$(1),$(2),$(3))
 gb_Library_add_asmobjects = $(call gb_Library__forward_to_Linktarget,$(subst 
gb_Library_,,$(0)),$(1),$(2),$(3))
 gb_Library_add_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 6c7bfa09d1f1..cbc9499d6eb8 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -173,9 +173,9 @@ endef
 # Overview of dependencies and tasks of LinkTarget
 #
 # target  task depends on
-# LinkTarget  linking  AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject CxxClrObject
+# LinkTarget  linking  AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject CxxClrObject 
GenCxxClrObject
 #  LinkTarget/headers
-# LinkTarget/dep  joined dep file  AsmObject/dep 
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep 
ObjCxxObject/dep CxxClrObject/dep
+# LinkTarget/dep  joined dep file  AsmObject/dep 
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep 
ObjCxxObject/dep CxxClrObject/dep GenCxxClrObject/dep
 #  | LinkTarget/headers
 # LinkTarget/headers  all headers available
 # including own generated
@@ -189,6 +189,8 @@ endef
 # ObjCObject  objective c compile  | LinkTarget/headers
 # ObjCxxObjectobjective c++ compile| LinkTarget/headers
 # CxxClrObjectC++ CLR compile  | LinkTarget/headers
+# GenCxxClrObject C++ CLR compile from | LinkTarget/headers
+#  generated source
 #
 # AsmObject   asm compile  | LinkTarget
 #
@@ -199,6 +201,7 @@ endef
 # ObjCObject/depdependencies
 # ObjCxxObject/

Omer Zak license statement

2017-11-23 Thread Omer Zak

All of my past & future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.

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

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

2017-11-23 Thread Tomaž Vajngerl

 svx/source/dialog/ClassificationDialog.cxx |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit d47aa694d0c6d10d52b7474b15e75a9462e991ff
Author: TomaÅ¾ Vajngerl 
Date:   Mon Nov 20 17:53:34 2017 +0900

TSCP: remove character limitation of recently used pop-up

Change-Id: I886fe180e73aea9685e647aaa3283f707344f69f
Reviewed-on: https://gerrit.libreoffice.org/44947
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index 55dc11c86a50..6ff28786ea50 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -276,14 +276,9 @@ short ClassificationDialog::Execute()
 for (std::vector const & rResults : 
m_aRecentlyUsedValuesCollection)
 {
 OUString rContentRepresentation = 
svx::classification::convertClassificationResultToString(rResults);
-OUString rDescription = OUString::number(nNumber) + ": ";
+OUString rDescription = OUString::number(nNumber) + ": " + 
rContentRepresentation;
 nNumber++;
 
-if (rContentRepresentation.getLength() >= 18)
-rDescription += rContentRepresentation.copy(0, 17) + "...";
-else
-rDescription += rContentRepresentation;
-
 m_pRecentlyUsedListBox->InsertEntry(rDescription);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/thb/gpg4libre2'

2017-11-23 Thread Thorsten Behrens

New branch 'private/thb/gpg4libre2' available with the following commits:
commit a6cba580f327ca09780b2c425c5926b8ad5f6147
Author: Thorsten Behrens 
Date:   Thu Nov 23 22:18:09 2017 +0100

gpg4libre: find keymanager executable on Windows

Change-Id: If93c06ad90d708b0fbaf476bda6fdb902bd77b1e

commit a08ce96eafe91cf30854473c5184e85da2fd
Author: Thorsten Behrens 
Date:   Thu Oct 12 11:42:03 2017 +0200

Fix build

Change-Id: I6b457704bbe3ebbe5548e1d84fad92569dbecc4a

commit 35ae3305e9ba2d63eba19b77c89b2fb5d23f275e
Author: Thorsten Behrens 
Date:   Mon Aug 21 09:24:32 2017 +0200

demo hack: list all certificates

Change-Id: Ibc678cf9c0c8a0a8e8198516b8cbdebcc977c185

commit a19a9e5b5248d3bf4a9c0da6b7583f966be0be6a
Author: Thorsten Behrens 
Date:   Mon Aug 21 09:22:49 2017 +0200

Make encrypt manifest writing actually work

Change-Id: I65c05c62d507c0ba781520885f4d36a9b6313f8e

commit 79766ddea9f62d3e2a2fef10b318abb3e8b5897b
Author: Thorsten Behrens 
Date:   Sun Aug 20 03:43:20 2017 +0200

gpg4libre: pass down OpenPGP encryption info to package code

Change-Id: Ie67c9927efdad4a027b14ed6a37a188b85eaf077

commit 803a2e6f01cf0239353eb08064afae66e8a2b6a1
Author: Thorsten Behrens 
Date:   Sun Aug 20 03:42:47 2017 +0200

fixup add manifest entries for gpg encruption

Change-Id: Ic14b603d33e87bb839d1a533eec59993da70a60e

commit c5d260e2a05843102726ef557d4242308dbc8a45
Author: Thorsten Behrens 
Date:   Sun Aug 20 03:38:05 2017 +0200

comphelper: add storage helper for GPG encryption data

gpg4libre needs to pass down slightly different meta data
to package / zip storage.

Change-Id: Idba9ad7a821cb33070cf5e5a0f79ae55db99b276

commit f2f315e6f354498f36265d9edf6236c8e5938cc7
Author: Thorsten Behrens 
Date:   Sat Aug 19 22:27:36 2017 +0200

fixup bubli ui patches

Change-Id: I8bc092fa286c2ab7c941e0fe5d2c014636b0c759

commit 14d2e40eeca2e11ba1a8ab26d51198cd60a63b01
Author: Katarina Behrens 
Date:   Fri Aug 18 15:51:38 2017 +0200

gpg4libre: Encrypt with GPG checkbox in SaveAs file dialog, 1st stab

LibO's own file dialog only so far

Change-Id: Ic5f6c180afb5d4e0fc151ad57d769b99ad7fbdf3

commit 0750d4ad33b1d3bed1626635bd2d7ea734ec2fad
Author: Thorsten Behrens 
Date:   Fri Aug 18 21:34:11 2017 +0200

add manifest entries for gpg encruption

Change-Id: I71bd7e2c6c73d997fa1ed5bb36fdc2873daca10c

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Michael Meeks

 sc/inc/document.hxx |   79 
 sc/source/core/data/documen2.cxx|5 +-
 sc/source/core/data/document.cxx|   27 
 sc/source/core/data/formulacell.cxx |2 
 4 files changed, 66 insertions(+), 47 deletions(-)

New commits:
commit e4cd5707809042eec435fd24be8729e87e350d1a
Author: Michael Meeks 
Date:   Fri Nov 17 17:36:38 2017 +

Document, and simplify the two uses of ScMutationGuard.

Creates ScMutationDisable - used to ensure that no core data
structure is mutated below this guard in any thread. This can
also be used to disable access in the same thread now.

Change-Id: I7e4e98d8ff986490ccd5064b3b9af56acd877b49
Reviewed-on: https://gerrit.libreoffice.org/45119
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c4db749eab6a..bb7bad7652b2 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -294,14 +294,11 @@ struct ScDocumentThreadSpecific
 void MergeBackIntoNonThreadedData(ScDocumentThreadSpecific& 
rNonThreadedData);
 };
 
-enum class ScMutationGuardFlags
+/// Enumeration to determine which pieces of the code should not be mutated 
when set.
+enum ScMutationGuardFlags
 {
 // Bit mask bits
-CORE= 0x0001,
-FORMULA = 0x0002,
-RECURSIVE_INTERPRET = 0x0004,
-// How many bits there are
-N = 3
+CORE = 0x0001, /// Core calc data structures should not be mutated
 };
 
 class ScDocument
@@ -330,7 +327,8 @@ friend class sc::ColumnSpanSet;
 friend class sc::EditTextIterator;
 friend class sc::FormulaGroupAreaListener;
 friend class sc::TableColumnBlockPositionSet;
-friend class ScMutationGuard;
+friend struct ScMutationGuard;
+friend struct ScMutationDisable;
 
 typedef std::vector TableContainer;
 
@@ -536,7 +534,7 @@ private:
 boolmbTrackFormulasPending  : 1;
 boolmbFinalTrackFormulas: 1;
 
-std::recursive_mutex 
maMutationGuard[static_cast(ScMutationGuardFlags::N)];
+size_t  mnMutationGuardFlags;
 
 public:
 bool IsCellInChangeTrack(const ScAddress &cell,Color 
*pColCellBorder);
@@ -550,7 +548,7 @@ public:
 // number 
formatter
 public:
 SC_DLLPUBLICScDocument( ScDocumentMode eMode = 
SCDOCMODE_DOCUMENT,
-SfxObjectShell* pDocShell = nullptr );
+SfxObjectShell* pDocShell = 
nullptr );
 SC_DLLPUBLIC~ScDocument();
 
 void  SetName( const OUString& r ) { aDocName = r; }
@@ -2460,17 +2458,64 @@ private:
 
 typedef std::unique_ptr> 
ScDocumentUniquePtr;
 
-class ScMutationGuard
+/**
+ * Instantiate this to ensure that subsequent modification of
+ * the document will cause an assertion failure while this is
+ * in-scope.
+ */
+struct ScMutationDisable
 {
-public:
-ScMutationGuard(ScDocument* pDocument, ScMutationGuardFlags nFlags);
-~ScMutationGuard();
-
-private:
-ScDocument* const mpDocument;
-const ScMutationGuardFlags mnFlags;
+ScMutationDisable(ScDocument* pDocument, ScMutationGuardFlags nFlags)
+{
+#ifndef NDEBUG
+mpDocument = pDocument;
+mnFlagRestore = pDocument->mnMutationGuardFlags;
+assert((mnFlagRestore & nFlags) == 0);
+mpDocument->mnMutationGuardFlags |= static_cast(nFlags);
+#else
+(void)pDocument; (void)nFlags;
+#endif
+}
+#ifndef NDEBUG
+~ScMutationDisable()
+{
+mpDocument->mnMutationGuardFlags = mnFlagRestore;
+}
+size_t mnFlagRestore;
+ScDocument* mpDocument;
+#endif
 };
 
+/**
+ * A pretty assertion that checks that the relevant bits in
+ * the @nFlags are not set on the document at entry and exit.
+ *
+ * Its primary use is for debugging threading. As such, an
+ * @ScMutationDisable is created to forbid mutation, and this
+ * condition is then asserted on at prominent sites that
+ * mutate @nFlags.
+ */
+struct ScMutationGuard
+{
+ScMutationGuard(ScDocument* pDocument, ScMutationGuardFlags nFlags)
+{
+#ifndef NDEBUG
+mpDocument = pDocument;
+mnFlags = static_cast(nFlags);
+assert((mpDocument->mnMutationGuardFlags & mnFlags) == 0);
+#else
+(void)pDocument; (void)nFlags;
+#endif
+}
+#ifndef NDEBUG
+~ScMutationGuard()
+{
+assert((mpDocument->mnMutationGuardFlags & mnFlags) == 0);
+}
+size_t mnFlags;
+ScDocument* mpDocument;
+#endif
+};
 
 #endif
 
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 9bf0fcf73194..f2e0c7d35b67 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -221,7 +221,8 @@ ScDocument::ScDocument( ScDocumentMode eMode, 
SfxObjectShell* pDocShell ) :
 mnNamedRangesLockCount(0),
 mbUseEmbedFonts(false),
 m

[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype

2017-11-23 Thread Korrawit Pruegsanusak

 bin/get-bugzilla-attachments-by-mimetype |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 051130e25b0e133667a39b3e7a8c758c1cb5240f
Author: Korrawit Pruegsanusak 
Date:   Mon Oct 23 20:41:32 2017 +0700

get-bugzilla-attachments-by-mimetype: add some duplicated mimetypes ...

that are really used in our TDF bugzilla

Change-Id: I5945cbf10ad2698471a3a74be8773ee1b5d81656
Reviewed-on: https://gerrit.libreoffice.org/43722
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index 1450d215b548..fe81fa673350 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -479,16 +479,21 @@ mimetypes = {
 # relatively uncommon image mimetypes
 'image/x-freehand': 'fh',
 'image/cgm': 'cgm',
+'image/tif': 'tiff',
 'image/tiff': 'tiff',
 'image/vnd.dxf': 'dxf',
+'image/emf': 'emf',
 'image/x-emf': 'emf',
 'image/x-targa': 'tga',
 'image/x-sgf': 'sgf',
 'image/x-svm': 'svm',
+'image/wmf': 'wmf',
 'image/x-wmf': 'wmf',
 'image/x-pict': 'pict',
 'image/x-cmx': 'cmx',
 'image/svg+xml': 'svg',
+'image/bmp': 'bmp',
+'image/x-ms-bmp': 'bmp',
 'image/x-MS-bmp': 'bmp',
 'image/x-wpg': 'wpg',
 'image/x-eps': 'eps',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Serge Krot

 sc/source/core/data/document.cxx |   13 +++--
 sc/source/ui/unoobj/docuno.cxx   |8 
 sc/source/ui/view/pfuncache.cxx  |3 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 4c5a19f9cf98fb2b38ee6b4b35f4074499270353
Author: Serge Krot 
Date:   Thu Nov 23 11:13:35 2017 +0100

related tdf#108757 small enhancements for speed up

- no strings reallocation
- faster for-loops

Change-Id: I98a355eb3bcb48219afd6334615c9c092ed1a352
Reviewed-on: https://gerrit.libreoffice.org/45142
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3fb8c338f242..019bfcb99f4a 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6275,7 +6275,7 @@ void ScDocument::SetRepeatRowRange( SCTAB nTab, const 
ScRange* pNew )
 
 ScPrintRangeSaver* ScDocument::CreatePrintRangeSaver() const
 {
-SCTAB nCount = static_cast(maTabs.size());
+const SCTAB nCount = static_cast(maTabs.size());
 ScPrintRangeSaver* pNew = new ScPrintRangeSaver( nCount );
 for (SCTAB i=0; i(maTabs.size()); i++)
+const SCTAB nCount = rSaver.GetTabCount();
+const SCTAB maxIndex = std::min(nCount, static_cast(maTabs.size()));
+for (SCTAB i=0; iRestorePrintRanges( rSaver.GetTabData(i) );
 }
@@ -6298,10 +6299,10 @@ bool ScDocument::NeedPageResetAfterTab( SCTAB nTab ) 
const
 
 if ( nTab + 1 < static_cast(maTabs.size()) && maTabs[nTab] && 
maTabs[nTab+1] )
 {
-OUString aNew = maTabs[nTab+1]->GetPageStyle();
-if ( aNew != maTabs[nTab]->GetPageStyle() )
+const OUString & rNew = maTabs[nTab+1]->GetPageStyle();
+if ( rNew != maTabs[nTab]->GetPageStyle() )
 {
-SfxStyleSheetBase* pStyle = mxPoolHelper->GetStylePool()->Find( 
aNew, SfxStyleFamily::Page );
+SfxStyleSheetBase* pStyle = mxPoolHelper->GetStylePool()->Find( 
rNew, SfxStyleFamily::Page );
 if ( pStyle )
 {
 const SfxItemSet& rSet = pStyle->GetItemSet();
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 60bd3239cc27..ca287c11b398 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1338,13 +1338,13 @@ static OutputDevice* lcl_GetRenderDevice( const 
uno::Sequence xRenderDevice(rProp.Value, 
uno::UNO_QUERY);
 if ( xRenderDevice.is() )
@@ -1947,7 +1947,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, 
const uno::Any& aSelec
 
 //  resolve the hyperlinks for PDF export
 
-if ( pPDFData )
+if ( pPDFData && !pPDFData->GetBookmarks().empty() )
 {
 //  iterate over the hyperlinks that were output for this page
 
diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx
index daf593fdbb3d..c738d4920f79 100644
--- a/sc/source/ui/view/pfuncache.cxx
+++ b/sc/source/ui/view/pfuncache.cxx
@@ -163,7 +163,8 @@ SCTAB ScPrintFuncCache::GetTabForPage( long nPage ) const
 long ScPrintFuncCache::GetTabStart( SCTAB nTab ) const
 {
 long nRet = 0;
-for ( SCTAB i=0; i(nPages.size()); i++ )
+const SCTAB maxIndex = std::min(nTab, static_cast(nPages.size()));
+for ( SCTAB i=0; ihttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/lok_dialog' - 2407 commits - accessibility/inc accessibility/source android/source animations/source apple_remote/source avmedia/inc avmedia/Library_avm

2017-11-23 Thread Pranav Kant

Rebased ref, commits from common ancestor:
commit 9bcfa24ef2c081bb87e5922adce5de461f371df9
Author: Pranav Kant 
Date:   Fri Nov 24 02:27:49 2017 +0530

lokdialog: Pull the plug; set headless mode to off

Hope is that it only turns the DialogCancelMode to off and do not have
any repurcussions on how LOK clients like Online behave.

Change-Id: I378496b48dbf0dd2c7a3664c1d1c76dfb3a8b1cd

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3d7ca4cf195d..c5b7bd342d6f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3573,11 +3573,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 // Force headless -- this is only for bitmap rendering.
 rtl::Bootstrap::set("SAL_USE_VCLPLUGIN", "svp");
 
-// We specifically need to make sure we have the "headless"
-// command arg set (various code specifically checks via
-// CommandLineArgs):
-desktop::Desktop::GetCommandLineArgs().setHeadless();
-
 #ifdef IOS
 // mpDefInst need to be initialized, which only happens in 
InitVCL(),
 // there might be more elegant ways to get InitVCL() called, but
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 7a995adf107a..017a0015fee1 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -787,9 +787,6 @@ bool Dialog::ImplStartExecuteModal()
 case Application::DialogCancelMode::Off:
 break;
 case Application::DialogCancelMode::Silent:
-if (ImplGetDialogText(this) == "Character")
-break;
-
 SAL_INFO(
 "vcl",
 "Dialog \"" << ImplGetDialogText(this)
commit 88b407f674714f412db85d0ae2d2722f0547f721
Author: Pranav Kant 
Date:   Fri Nov 24 02:27:09 2017 +0530

lokdialog: Let all modal dialogs notify about creation, disposal

Change-Id: I8ec0ad81abcf1adf628906b02f7f94ab74a550b5

diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index cb403c78a075..694f5b04df53 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -71,6 +71,8 @@ protected:
 public:
 virtual ~SfxModalDialog() override;
 virtual void dispose() override;
+
+virtual short   Execute();
 const SfxItemSet*   GetOutputItemSet() const { return pOutputSet; }
 const SfxItemSet*   GetInputItemSet() const { return pInputSet; }
 };
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 7877e878e129..73a110038d95 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -160,9 +160,33 @@ void SfxModalDialog::dispose()
 {
 SetDialogData_Impl();
 delete pOutputSet;
+
+SfxViewShell* pViewShell = SfxViewShell::Current();
+if (comphelper::LibreOfficeKit::isActive() && pViewShell)
+{
+pViewShell->notifyDialog(maID, "close");
+pViewShell->UnregisterDlg(maID);
+}
+
 ModalDialog::dispose();
 }
 
+short SfxModalDialog::Execute()
+{
+SfxViewShell* pViewShell = SfxViewShell::Current();
+if (comphelper::LibreOfficeKit::isActive() && pViewShell)
+{
+pViewShell->RegisterDlg(maID, this);
+registerDialogNotifier(static_cast(pViewShell));
+const Size aSize = GetOptimalSize();
+std::vector aItems;
+aItems.emplace_back(std::make_pair("size", aSize.toString()));
+pViewShell->notifyDialog(maID, "created", aItems);
+}
+
+return ModalDialog::Execute();
+}
+
 void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool )
 {
 DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" );
commit 55afb7d96638d67196fd87f89cc4e3224e700ada
Author: Pranav Kant 
Date:   Fri Nov 24 01:56:25 2017 +0530

lokdialog: Notify to child helper method, not the main one

Change-Id: I0698bfe578cb122dfabed566cb7a096f3cb56af5

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 8038777667c4..6ad96f4cd981 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1955,7 +1955,7 @@ void SfxViewShell::notifyDialog(const vcl::DialogID& 
rDialogId, const OUString&
 
 void SfxViewShell::notifyDialogChild(const vcl::DialogID& rDialogId, const 
OUString& rAction, const Point& rPos)
 {
-SfxLokHelper::notifyDialog(rDialogId, rAction);
+SfxLokHelper::notifyDialogChild(rDialogId, rAction, rPos);
 }
 
 void SfxViewShell::RegisterDlg(const vcl::DialogID& rDialogId, Dialog* pDlg)
commit aacce82f6342fbadb29bef711fb87cfa90415d8f
Author: Pranav Kant 
Date:   Fri Nov 24 01:49:21 2017 +0530

lokdialog: Let modeless dialogs emit "created" callback too

Change-Id: Ie81f8bd19696e6f0abceb86369545766918ae46a

diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 539f369534ac..7877e878e129 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -221,6 +221,19 @@ void SfxM

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

2017-11-23 Thread Pranav Kant

 desktop/source/lib/init.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 723aae2d5b800be159e423e3a0e8f3cc282b0020
Author: Pranav Kant 
Date:   Fri Nov 24 02:17:23 2017 +0530

Remove redundant call

This call, which sets the DialogCancelMode to fatal is superceded by
another call which resets the DialogCancelMode back to Silent, as
follows.

0  0x7fffc8c1ece3 in 
Application::SetDialogCancelMode(Application::DialogCancelMode) 
(mode=Application::DialogCancelMode::Silent)
1  0x7fffc8c1f1fc in Application::EnableHeadlessMode(bool) 
(dialogsAreFatal=false)
2  0x7fffdd3824af in 
desktop::Desktop::RegisterServices(com::sun::star::uno::Reference
 const&)
3  0x7fffdd361eeb in desktop::Desktop::Main() (this=0x7fffde919950)
4  0x7fffc8c261f3 in ImplSVMain()
5  0x7fffc8c2635c in SVMain()

Change-Id: I30efe63932e98309f4d6ac609d09b08378076007

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b7874dc54b2e..42e78e8bec96 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3586,8 +3586,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 // CommandLineArgs):
 desktop::Desktop::GetCommandLineArgs().setHeadless();
 
-Application::EnableHeadlessMode(true);
-
 #ifdef IOS
 // mpDefInst need to be initialized, which only happens in 
InitVCL(),
 // there might be more elegant ways to get InitVCL() called, but
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 72/c9a57b915e080b4bd27800f30232624172b1c3

2017-11-23 Thread Caolán McNamara

 72/c9a57b915e080b4bd27800f30232624172b1c3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3de457896ae37b4cec5a692eebb19fd560ccad61
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 23 20:46:22 2017 +

Notes added by 'git notes add'

diff --git a/72/c9a57b915e080b4bd27800f30232624172b1c3 
b/72/c9a57b915e080b4bd27800f30232624172b1c3
new file mode 100644
index ..9f8f1bf49910
--- /dev/null
+++ b/72/c9a57b915e080b4bd27800f30232624172b1c3
@@ -0,0 +1 @@
+merged as: dbb42ebced375a366712394c1e8917e78abd7a5e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Damjan Jovanovic

 connectivity/source/inc/odbc/OFunctions.hxx |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit dbb42ebced375a366712394c1e8917e78abd7a5e
Author: Damjan Jovanovic 
Date:   Sun Nov 19 14:37:19 2017 +

Fix an argument for SQLSetDescRec.

Remove a duplicated and commented T3SQLNativeSql definition.

Patch by: me

(cherry picked from commit 72c9a57b915e080b4bd27800f30232624172b1c3)

Change-Id: I2730ede794f750181075b253f62951d47ec82ddc
Reviewed-on: https://gerrit.libreoffice.org/45176
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/connectivity/source/inc/odbc/OFunctions.hxx 
b/connectivity/source/inc/odbc/OFunctions.hxx
index 2ad9043541b1..95787a1db4d2 100644
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
@@ -188,7 +188,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath);
 SQLSMALLINT 
RecNumber,
 SQLSMALLINT Type,
 SQLSMALLINT 
SubType,
-SQLINTEGER  Length,
+SQLLEN  Length,
 SQLSMALLINT 
Precision,
 SQLSMALLINT Scale,
 SQLPOINTER  
DataPtr,
@@ -243,15 +243,6 @@ bool LoadLibrary_ODBC3(OUString &_rPath);
 
 #define N3SQLExecDirect(a,b,c) 
(*reinterpret_cast(getOdbcFunction(ODBC3SQLFunctionId::ExecDirect)))(a,b,c)
 
-/*typedef SQLRETURN  (SQL_API  *T3SQLNativeSql) (   SQLHDBC 
ConnectionHandle,
-SQLCHAR *   
InStatementText,
-SQLINTEGER  
TextLength1,
-SQLCHAR *   
utStatementText,
-SQLINTEGER  
BufferLength,
-SQLINTEGER *
TextLength2Ptr);
-
-#define N3SQLNativeSql(a,b,c,d,e,f) 
(*reinterpret_cast(getOdbcFunction(ODBC3SQLFunctionId::NativeSql)))(a,b,c,d,e,f)*/
-
 typedef SQLRETURN (SQL_API  *T3SQLDescribeParam) (SQLHSTMT  
StatementHandle,
 SQLUSMALLINT
ParameterNumber,
 SQLSMALLINT *   
DataTypePtr,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Tor Lillqvist

 sc/inc/rangelst.hxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 6a8c781df0b4e7760a52693b83e5cd903acd30d4
Author: Tor Lillqvist 
Date:   Thu Nov 23 16:59:06 2017 +0200

Add debug output operator<< for ScRangeList

Change-Id: I55f16428bbadd45d302ac31df9c1a691730c4a49
Reviewed-on: https://gerrit.libreoffice.org/45158
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 19d6d7701e0c..932a5ed52d6d 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -22,6 +22,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
+#include 
 #include 
 #include 
 
@@ -100,6 +101,22 @@ private:
 };
 typedef tools::SvRef ScRangeListRef;
 
+// For use in SAL_DEBUG etc. Output format not guaranteed to be stable.
+template
+inline std::basic_ostream & operator 
<<(std::basic_ostream & stream, const ScRangeList& rRangeList)
+{
+stream << "(";
+for (size_t i = 0; i < rRangeList.size(); ++i)
+{
+if (i > 0)
+stream << ",";
+stream << *(rRangeList[i]);
+}
+stream << ")";
+
+return stream;
+}
+
 // RangePairList:
 //aRange[0]: actual range,
 //aRange[1]: data for that range, e.g. Rows belonging to a ColName
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need code pointer for import of attributes

2017-11-23 Thread Michael Stahl

On 22.11.2017 17:32, Regina Henschel wrote:
> Hi all,
> 
> I've started on 
> https://bugs.documentfoundation.org/show_bug.cgi?id=101242. My current 
> work is in the attachment.
> 
> Problem: Although I remove the config-items IsVisible, IsPrintable, 
> IsLocked from the settings.xml of a file, the values from draw:display 
> and draw:locked of the  element are not used. It seems to 
> me, that somewhere the read values are overwritten with a default.
> 
> Where and when are the values from settings.xml transformed to 
> properties of the layers of a newly opened draw document?

probably in sd/source/ui/view/frmview.cxx,
FrameView::ReadUserDataSequence(), around line 858

> Any other hint, where to look?

there are SetVisibleLayers functions on 3 different classes, maybe
setting breakpoints on those would be helpful.

> Besides that, it would be nice, if you could tell me, if my approach is 
> correct so far.

looks promising to me

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

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

2017-11-23 Thread Caolán McNamara

 sw/source/filter/ww8/ww8par.cxx  |2 +-
 sw/source/filter/ww8/ww8par.hxx  |2 +-
 sw/source/filter/ww8/ww8par2.cxx |   39 ---
 3 files changed, 26 insertions(+), 17 deletions(-)

New commits:
commit 07027b5b8557d8a19bc2d25a3fcfa2b0e180e2ef
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 20 12:37:35 2017 +

ofz#4335 verify sprmTDefTable length

Change-Id: I846099f98c24ef1b53f070962c7a218e3a7e35b9
Reviewed-on: https://gerrit.libreoffice.org/44959
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 947a1e762ec4..e448087db0f3 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2522,7 +2522,7 @@ bool 
SwWW8ImplReader::FloatingTableConversion(WW8PLCFx_Cp_FKP* pPap)
 {
 bResult = false;
 WW8TabBandDesc aDesc;
-aDesc.ReadDef(false, aRes.pSprm);
+aDesc.ReadDef(false, aRes.pSprm, aRes.nRemainingData);
 int nTextAreaWidth = m_aSectionManager.GetTextAreaWidth();
 int nTableWidth = aDesc.nCenter[aDesc.nWwCols] - aDesc.nCenter[0];
 
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 637aac0c120d..968edc8eb73c 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1031,7 +1031,7 @@ struct WW8TabBandDesc
 WW8TabBandDesc(WW8TabBandDesc const & rBand);// deep copy
 ~WW8TabBandDesc();
 static void setcelldefaults(WW8_TCell *pCells, short nCells);
-void ReadDef(bool bVer67, const sal_uInt8* pS);
+void ReadDef(bool bVer67, const sal_uInt8* pS, short nLen);
 void ProcessDirection(const sal_uInt8* pParams);
 void ProcessSprmTSetBRC(int nBrcVer, const sal_uInt8* pParamsTSetBRC);
 void ProcessSprmTTableBorders(int nBrcVer, const sal_uInt8* pParams);
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 589af60dce43..e46878c0a5db 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1223,27 +1223,35 @@ WW8TabBandDesc::WW8TabBandDesc( WW8TabBandDesc const & 
rBand )
 }
 
 // ReadDef reads the cell position and the borders of a band
-void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS)
+void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS, short nLen)
 {
 if (!bVer67)
+{
+//the ww8 version of this is unusual in masquerading as a a srpm with a
+//single byte len arg while it really has a word len arg, after this
+//increment nLen is correct to describe the remaining amount of data
 pS++;
+}
 
-short nLen = (sal_Int16)SVBT16ToShort( pS - 2 ); // not beautiful
-
+--nLen; //reduce len by expected nCols arg
+if (nLen < 0)
+return;
 sal_uInt8 nCols = *pS;   // number of cells
-short nOldCols = nWwCols;
 
-if( nCols > MAX_COL )
+if (nCols > MAX_COL)
 return;
 
+short nOldCols = nWwCols;
 nWwCols = nCols;
 
+nLen -= 2 * (nCols + 1); //reduce len by claimed amount of next x-borders 
arguments
+if (nLen < 0)
+return;
+
 const sal_uInt8* pT = &pS[1];
-nLen --;
-int i;
-for(i=0; i<=nCols; i++, pT+=2 )
+for (int i = 0; i <= nCols; i++, pT+=2)
 nCenter[i] = (sal_Int16)SVBT16ToShort( pT );// X-borders
-nLen -= 2 * ( nCols + 1 );
+
 if( nCols != nOldCols ) // different column count
 {
 delete[] pTCs;
@@ -1263,11 +1271,9 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const 
sal_uInt8* pS)
 setcelldefaults(pTCs,nCols);
 }
 
-short nColsToRead = nFileCols;
-if (nColsToRead > nCols)
-nColsToRead = nCols;
+short nColsToRead = std::min(nFileCols, nCols);
 
-if( nColsToRead )
+if (nColsToRead > 0)
 {
 // read TCs
 
@@ -1283,7 +1289,7 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const 
sal_uInt8* pS)
 if( bVer67 )
 {
 WW8_TCellVer6 const * pTc = reinterpret_cast(pT);
-for(i=0; iGetFib().GetFIBVersion());
 switch (eSprm)
 {
@@ -1973,7 +1982,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP 
nStartCp) :
 m_bClaimLineFormat = true;
 break;
 case sprmTDefTable:
-pNewBand->ReadDef(bOldVer, pParams);
+pNewBand->ReadDef(bOldVer, pParams, nLen);
 bTabRowJustRead = true;
 break;
 case sprmTDefTableShd:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Caolán McNamara

 basic/source/inc/runtime.hxx|3 ++-
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx |6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 462866cfdc57e6901ae2c28a2b73e59e6f920fde
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 22 20:46:42 2017 +

various coverity warnings

Change-Id: I27f20c51f86aeaed8e932f7ca45cce8770bc34ec
Reviewed-on: https://gerrit.libreoffice.org/45140
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 647fe364274e..dc92fb87f3d9 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class SbiInstance;  // active StarBASIC process
@@ -127,7 +128,7 @@ class SbiInstance
 SbiRTLData  aRTLData;
 
 // file system
-std::unique_ptr pIosys;
+std::unique_ptr> pIosys;
 // DDE
 std::unique_ptrpDdeCtrl;
 // DLL-Calls (DECLARE)
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx 
b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index ae6ec2d8fae8..f3f7b061bed6 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -23,13 +23,13 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 
-#include 
-
 #include 
+#include 
 #include 
 
 namespace sd { namespace slidesorter { namespace controller {
@@ -96,7 +96,7 @@ private:
 AnimationList maAnimations;
 ::canvas::tools::ElapsedTime maElapsedTime;
 
-std::unique_ptr mpDrawLock;
+std::unique_ptr> mpDrawLock;
 
 AnimationId mnNextAnimationId;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Caolán McNamara

 sc/source/ui/unoobj/chart2uno.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6f394daa4828743a165121d9e8e1e2c7a63a1200
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 23 14:39:19 2017 +

crashtesting: crash loading fdo41403-1.xlsm

regression since...

commit 3af8a4faf5e20ccae2386052697713da160afb16
Date:   Wed Nov 15 13:10:40 2017 +0300

tdf#113861: Less aggressive expansion of chart headers.

pre-change code had...

   FormulaToken* pToken = it2->second;
   if (pToken && nRow>=nHeaderRowCount)

check, so restore that check for presence of FormulaToken

Change-Id: Ia1b301e4f7fdf447b08de7fb22bd7fde8735bd52
Reviewed-on: https://gerrit.libreoffice.org/45155
Reviewed-by: Vasily Melenchuk 
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index f280a14c42fd..7aae443e1089 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -301,7 +301,7 @@ Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount,  
SCROW nAllRowCount,
 for ( const auto & rCell : *rCol.second )
 {
 // Skip header rows
-if (rCell.first < nHeaderRowCount )
+if (rCell.first < nHeaderRowCount || !rCell.second)
 continue;
 
 ScRange aRange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/sfx2 sc/source sd/source sfx2/source sw/source

2017-11-23 Thread Caolán McNamara

 cui/source/tabpages/backgrnd.cxx   |2 +-
 include/sfx2/opengrf.hxx   |6 ++
 sc/source/ui/drawfunc/fuins1.cxx   |2 +-
 sd/source/ui/func/fuinsert.cxx |2 +-
 sfx2/source/appl/fileobj.cxx   |2 +-
 sfx2/source/appl/opengrf.cxx   |   23 +--
 sw/source/uibase/shells/drawsh.cxx |2 +-
 7 files changed, 28 insertions(+), 11 deletions(-)

New commits:
commit 8c9a3195068bf00e00290f363d5028e9986bbba6
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 23 16:52:23 2017 +

Resolves: tdf#113962 save detected filter outside file dialog

different file dialog impls work differently so store the
detected filter outside the file dialog

Change-Id: I144d8df06e5265fed8f11b284a2f40c17c3e09ef
Reviewed-on: https://gerrit.libreoffice.org/45166
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 1c2afbed0409..8101b930242c 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1178,7 +1178,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, 
Timer*, pIdle, void )
 {
 // new file chosen
 aBgdGraphicPath   = pImportDlg->GetPath();
-aBgdGraphicFilter = pImportDlg->GetCurrentFilter();
+aBgdGraphicFilter = pImportDlg->GetDetectedFilter();
 bool bLink = ( nHtmlMode & HTMLMODE_ON ) || 
pImportDlg->IsAsLink();
 m_pBtnLink->Check( bLink );
 m_pBtnLink->Enable();
diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx
index 498ccdb7f9a8..fbf3c573e15f 100644
--- a/include/sfx2/opengrf.hxx
+++ b/include/sfx2/opengrf.hxx
@@ -42,8 +42,14 @@ public:
 voidAsLink(bool);
 boolIsAsLink() const;
 
+//what the dialog thought the format was
 OUStringGetCurrentFilter() const;
 voidSetCurrentFilter(const OUString&);
+
+//what was subsequently found to be the format
+OUStringGetDetectedFilter() const;
+voidSetDetectedFilter(const OUString&);
+
 private:
 SvxOpenGraphicDialog(const SvxOpenGraphicDialog&) = delete;
 SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & ) = delete;
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 310da9e53afe..f7f99bc6bd56 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -264,7 +264,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell*   pViewSh,
 if( nError == ERRCODE_NONE )
 {
 OUString aFileName = aDlg.GetPath();
-OUString aFilterName = aDlg.GetCurrentFilter();
+OUString aFilterName = aDlg.GetDetectedFilter();
 bool bAsLink = aDlg.IsAsLink();
 
 // really store as link only?
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 97fdea1f5768..e0ad64bd7169 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -148,7 +148,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq )
 nError = aDlg.GetGraphic(aGraphic);
 bAsLink = aDlg.IsAsLink();
 aFileName = aDlg.GetPath();
-aFilterName = aDlg.GetCurrentFilter();
+aFilterName = aDlg.GetDetectedFilter();
 }
 
 if( nError == ERRCODE_NONE )
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index bb71b5ddc413..46c860e2fcbe 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -413,7 +413,7 @@ void SvFileObject::Edit(vcl::Window* pParent, 
sfx2::SvBaseLink* pLink, const Lin
 sFile = aDlg.GetPath()
 + OUStringLiteral1(sfx2::cTokenSeparator)
 + OUStringLiteral1(sfx2::cTokenSeparator)
-+ aDlg.GetCurrentFilter();
++ aDlg.GetDetectedFilter();
 
 aEndEditLink.Call( sFile );
 }
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 0bb827edd1fc..9407c88dd96c 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -73,6 +73,7 @@ struct SvxOpenGrf_Impl
 SvxOpenGrf_Impl(const vcl::Window* pPreferredParent);
 
 sfx2::FileDialogHelper  aFileDlg;
+OUString sDetectedFilter;
 uno::Reference < XFilePickerControlAccess > xCtrlAcc;
 };
 
@@ -153,11 +154,15 @@ ErrCode SvxOpenGraphicDialog::Execute()
 }
 else
 {
-// setup appropriate filter (so next time, it will work)
 if( rFilter.GetImportFormatCount() )
 {
-OUString  aFormatName(rFilter.GetImportFormatName(nFound));
-SetCurrentFilter(aFormatName);
+

[Libreoffice-commits] online.git: common/Seccomp.cpp

2017-11-23 Thread Aron Budea

 common/Seccomp.cpp |  105 ++---
 1 file changed, 37 insertions(+), 68 deletions(-)

New commits:
commit f6ec965dffdab41df9fb58d58661026b5fd406f0
Author: Aron Budea 
Date:   Tue Nov 14 18:26:33 2017 +0100

rlimits: Friendlier and more precise logging of numbers

Unlimited settings were logged as huge numbers.
In two cases settings were logged via LOG_SYS (and as errors)
instead of LOG_INF.

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

diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index 09a53cdc..e49c4d5e 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -228,91 +228,60 @@ bool lockdown(Type type)
 
 namespace Rlimit {
 
+void setRLimit(rlim_t confLim, int resource, const std::string &resourceText, 
const std::string &unitText)
+{
+rlim_t lim = confLim;
+if (lim <= 0)
+lim = RLIM_INFINITY;
+const std::string limTextWithUnit((lim == RLIM_INFINITY) ? "unlimited" : 
std::to_string(lim) + " " + unitText);
+if (resource != RLIMIT_FSIZE && resource != RLIMIT_NOFILE)
+{
+/* FIXME Currently the RLIMIT_FSIZE handling is non-ideal, and can
+ * lead to crashes of the kit processes due to not handling signal
+ * 25 gracefully.  Let's disable for now before there's a more
+ * concrete plan.
+ * Similar issues with RLIMIT_NOFILE
+ */
+rlimit rlim = { lim, lim };
+if (setrlimit(resource, &rlim) != 0)
+LOG_SYS("Failed to set " << resourceText << " to " << 
limTextWithUnit << ".");
+if (getrlimit(resource, &rlim) == 0)
+{
+const std::string setLimTextWithUnit((rlim.rlim_max == 
RLIM_INFINITY) ? "unlimited" : std::to_string(rlim.rlim_max) + " " + unitText);
+LOG_INF(resourceText << " is " << setLimTextWithUnit << " after 
setting it to " << limTextWithUnit << ".");
+}
+else
+LOG_SYS("Failed to get " << resourceText << ".");
+}
+else
+LOG_INF("Ignored setting " << resourceText << " to " << 
limTextWithUnit << ".");
+}
+
 bool handleSetrlimitCommand(const std::vector& tokens)
 {
 if (tokens.size() == 3 && tokens[0] == "setconfig")
 {
 if (tokens[1] == "limit_virt_mem_mb")
 {
-rlim_t lim = std::stoi(tokens[2]) * 1024 * 1024;
-if (lim <= 0)
-lim = RLIM_INFINITY;
-
-rlimit rlim = { lim, lim };
-if (setrlimit(RLIMIT_AS, &rlim) != 0)
-LOG_SYS("Failed to set RLIMIT_AS to " << lim << " bytes.");
-
-if (getrlimit(RLIMIT_AS, &rlim) == 0)
-LOG_INF("RLIMIT_AS is " << rlim.rlim_max << " bytes after 
setting it to " << lim << " bytes.");
-else
-LOG_SYS("Failed to get RLIMIT_AS.");
-
-return true;
+setRLimit(std::stoi(tokens[2]) * 1024 * 1024, RLIMIT_AS, 
"RLIMIT_AS", "bytes");
 }
 else if (tokens[1] == "limit_stack_mem_kb")
 {
-rlim_t lim = std::stoi(tokens[2]) * 1024;
-if (lim <= 0)
-lim = RLIM_INFINITY;
-
-rlimit rlim = { lim, lim };
-if (setrlimit(RLIMIT_STACK, &rlim) != 0)
-LOG_SYS("Failed to set RLIMIT_STACK to " << lim << " bytes.");
-
-if (getrlimit(RLIMIT_STACK, &rlim) == 0)
-LOG_INF("RLIMIT_STACK is " << rlim.rlim_max << " bytes after 
setting it to " << lim << " bytes.");
-else
-LOG_SYS("Failed to get RLIMIT_STACK.");
-
-return true;
+setRLimit(std::stoi(tokens[2]) * 1024, RLIMIT_STACK, 
"RLIMIT_STACK", "bytes");
 }
 else if (tokens[1] == "limit_file_size_mb")
 {
-rlim_t lim = std::stoi(tokens[2]) * 1024 * 1024;
-if (lim <= 0)
-lim = RLIM_INFINITY;
-
-/* FIXME Currently the RLIMIT_FSIZE handling is non-ideal, and can
- * lead to crashes of the kit processes due to not handling signal
- * 25 gracefully.  Let's disable for now before there's a more
- * concrete plan.
-rlimit rlim = { lim, lim };
-if (setrlimit(RLIMIT_FSIZE, &rlim) != 0)
-LOG_SYS("Failed to set RLIMIT_FSIZE to " << lim << " bytes.");
-
-if (getrlimit(RLIMIT_FSIZE, &rlim) == 0)
-LOG_INF("RLIMIT_FSIZE is " << rlim.rlim_max << " bytes after 
setting it to " << lim << " bytes.");
-else
-LOG_SYS("Failed to get RLIMIT_FSIZE.");
-*/
-LOG_SYS("Ignored setting RLIMIT_FSIZE to " << lim << " bytes.");
-
-return true;
+setRLimit(std::stoi(tokens[2]) * 1024 * 1024, RLIMIT_FSIZE, 
"RLIMIT_FSIZE", "bytes");
 }
 else if (tokens[1] == "limit_num_open_file

[Libreoffice-commits] core.git: RepositoryExternal.mk

2017-11-23 Thread Thorsten Behrens

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a27f26228c8311b3b01ecca81d6cdcd3ceb644e1
Author: Thorsten Behrens 
Date:   Thu Nov 23 18:06:59 2017 +0100

fix build: use same conditional as in configure

Change-Id: I2383baaafbb5f79e1469a6296f3d65f1eadfa5eb

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cad1db6ddc7c..4fba2a4c00e5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3469,7 +3469,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
-else # NON-SYSTEM_GPGME
+else ifneq ($(filter GPGMEPP,$(BUILD_TYPE)),) # NON-SYSTEM_GPGME
 
 define gb_ExternalProject__use_gpgmepp
 $(call gb_ExternalProject_use_external_project,$(1),gpgmepp)
___
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-5.3' - 4 commits - include/sfx2 sfx2/source solenv/bin vcl/osx

2017-11-23 Thread Caolán McNamara

 include/sfx2/dinfdlg.hxx|   34 +-
 sfx2/source/dialog/dinfdlg.cxx  |  383 ++--
 solenv/bin/modules/installer.pm |1 
 solenv/bin/modules/installer/scriptitems.pm |   10 
 vcl/osx/DataFlavorMapping.cxx   |2 
 5 files changed, 168 insertions(+), 262 deletions(-)

New commits:
commit d7357db1c2b2092913fd33ad58b63ad473fbc9c4
Author: CaolÃ¡n McNamara 
Date:   Tue Aug 29 16:27:31 2017 +0100

Resolves: tdf#95960 improve custom properties page

wrt widget heights and positions and other flakiness

take the natural combobox height as the line height, use a vclgrid
element for each row to get everything set to the same height

move the positioning code into Resize, etc.

Reviewed-on: https://gerrit.libreoffice.org/41734
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 14afb688d3a24be302867ea614b0e30e01d168be)

Reviewed-on: https://gerrit.libreoffice.org/41749
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 69f19b7d2e538c66bb89f2acaf6e4ad7b0305825)
Signed-off-by: Andras Timar 

Change-Id: I22de98ef91e39d1e7e45bbe62f68496d55c0c1cb

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 9ffbb3370e94..7915d7be345b 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -367,6 +367,7 @@ public:
 
 struct CustomPropertyLine
 {
+ScopedVclPtr   m_aLine;
 ScopedVclPtr  m_aNameBox;
 ScopedVclPtr   m_aTypeBox;
 ScopedVclPtr  m_aValueEdit;
@@ -391,20 +392,15 @@ struct CustomPropertyLine
 class CustomPropertiesWindow : public vcl::Window
 {
 private:
+VclPtr   m_pHeaderBar;
+VclPtr   m_pScrollBar;
 VclPtr   m_pHeaderAccName;
 VclPtr   m_pHeaderAccType;
 VclPtr   m_pHeaderAccValue;
 
-VclPtrm_aNameBox;
-VclPtr m_aTypeBox;
-VclPtrm_aValueEdit;
-VclPtr   m_aDateField;
-VclPtr   m_aTimeField;
-VclPtrm_aDurationField;
-VclPtr  m_aEditButton;
-VclPtr m_aYesNoButton;
-VclPtr m_aRemoveButton;
-
+sal_Int32   m_nWidgetHeight;
+sal_Int32   m_nRemoveButtonWidth;
+sal_Int32   m_nTypeBoxWidth;
 sal_Int32   m_nLineHeight;
 sal_Int32   m_nScrollPos;
 std::vector< CustomPropertyLine* >  m_aCustomPropertiesLines;
@@ -414,10 +410,10 @@ private:
 Idlem_aBoxLoseFocusIdle;
 Linkm_aRemovedHdl;
 
-DECL_STATIC_LINK( CustomPropertiesWindow, TypeHdl, ListBox&, void );
-DECL_LINK(  RemoveHdl, Button*, void );
-DECL_LINK(  EditLoseFocusHdl, Control&, void );
-DECL_LINK(  BoxLoseFocusHdl, Control&, void );
+DECL_LINK(TypeHdl, ListBox&, void);
+DECL_LINK(RemoveHdl, Button*, void);
+DECL_LINK(EditLoseFocusHdl, Control&, void);
+DECL_LINK(BoxLoseFocusHdl, Control&, void);
 //add lose focus handlers of Date/TimeField?
 
 DECL_LINK(EditTimeoutHdl, Idle *, void);
@@ -431,10 +427,18 @@ public:
 FixedText *pHeaderAccName,
 FixedText *pHeaderAccType,
 FixedText *pHeaderAccValue);
+void Init(HeaderBar* pHeaderBar, ScrollBar* pScrollBar);
 virtual ~CustomPropertiesWindow() override;
 virtual void dispose() override;
 
-boolInitControls( HeaderBar* pHeaderBar, const ScrollBar* 
pScrollBar );
+virtual void Resize() override;
+//these consts are unhelpful, this changes the state of the widgets
+//that belong to CustomPropertyLine, but they are held by VclPtr
+//and operator-> on a VclPtr is a const method that returns the
+//non-const contents of the VclPtr, but loplugin:constparams
+//correctly sees that it could all be set to const, so we end
+//up with this unhappy situation
+void SetWidgetWidths(const CustomPropertyLine* pLine) const;
 sal_uInt16  GetVisibleLineCount() const;
 inline sal_Int32GetLineHeight() const { return m_nLineHeight; }
 voidAddLine( const OUString& sName, css::uno::Any& rAny );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index f8dc73daedf5..95476788fa0e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1390,11 +1390,11 @@ void CustomPropertiesYesNoButton::Resize()
 {
 Size aParentSize(GetSizePixel());
 const long nWidth = aParentSize.Width();
-Size a1Size = LogicToPixel(Size(1, 1), MapUnit::MapAppFont);
+const long n1Width = LogicToPixel(Size(1, 1), MapUnit::MapApp

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

2017-11-23 Thread G??bor Koruhely

 vcl/source/control/button.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 788515f4ecc26275746e97f8f35cab87799797a6
Author: G??bor Koruhely 
Date:   Wed Nov 22 15:25:38 2017 +0100

tdf#111782: fix Wrong rendering of image radiobutton on Split Cells dialog

The radio button icon was too big and there weren't enough space to render 
the
bottom border, so I reduced the size of the radio button icon.

Change-Id: Ie93f21ca730329716d0d209726e4d41c5d235b88
Reviewed-on: https://gerrit.libreoffice.org/45097
Reviewed-by: TamÃ¡s Zolnai 
Tested-by: TamÃ¡s Zolnai 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index a67ebb3ffe03..d39a9f72de1b 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1938,6 +1938,11 @@ void 
RadioButton::ImplDrawRadioButtonState(vcl::RenderContext& rRenderContext)
 aImageSize.Width()  = CalcZoom(aImageSize.Width());
 aImageSize.Height() = CalcZoom(aImageSize.Height());
 
+aImageRect.Left()++;
+aImageRect.Top()++;
+aImageRect.Right()--;
+aImageRect.Bottom()--;
+
 // display border and selection status
 aImageRect = aDecoView.DrawFrame(aImageRect, 
DrawFrameStyle::DoubleIn);
 if ((ImplGetButtonState() & DrawButtonFlags::Pressed) || !bEnabled)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Michael Stahl

 include/svx/fntctrl.hxx|1 -
 svx/source/dialog/fntctrl.cxx  |2 +-
 sw/qa/core/data/ww8/fail/redline-1.doc |binary
 3 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit bb0fdccaac9495628e67d1ad1812e95b1c9397ba
Author: Michael Stahl 
Date:   Wed Sep 27 12:16:38 2017 +0200

ofz#3301 add bugdoc

Change-Id: I9a6425f5c0ed519ef7cb90e66b0d4c8e0fe700d4

diff --git a/sw/qa/core/data/ww8/fail/redline-1.doc 
b/sw/qa/core/data/ww8/fail/redline-1.doc
new file mode 100644
index ..86c967314894
Binary files /dev/null and b/sw/qa/core/data/ww8/fail/redline-1.doc differ
commit 16687c57b5e378db93972fc1887b9b19747d068c
Author: Michael Stahl 
Date:   Thu Nov 23 20:14:01 2017 +0100

svx: loplugin:staticmethods

Change-Id: I8786baa0a5142397c157e01d5b99aa2c482bb468

diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index 9b54d2ae0a3c..ed0828e8cc3b 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -63,7 +63,6 @@ public:
 voidResetColor();
 voidSetBackColor( const Color& rColor );
 voidUseResourceText();
-boolCleanAndCheckEmpty(OUString& rText);
 voidPaint( vcl::RenderContext& rRenderContext, const 
tools::Rectangle& ) override;
 
 boolIsTwoLines() const;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 039f69fe2d80..f41889f3b766 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -616,7 +616,7 @@ void SvxFontPrevWindow::UseResourceText()
  * removes line feeds and carriage returns from string
  * returns if param is empty
  */
-bool SvxFontPrevWindow::CleanAndCheckEmpty(OUString& rText)
+bool CleanAndCheckEmpty(OUString& rText)
 {
 bool bEmpty = true;
 for (sal_Int32 i = 0; i < rText.getLength(); ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Stephan Bergmann

 connectivity/source/drivers/macab/MacabRecords.cxx |   68 +++--
 connectivity/source/drivers/macab/MacabRecords.hxx |   12 ++-
 connectivity/source/drivers/macab/macaborder.cxx   |6 -
 connectivity/source/drivers/macab/macaborder.hxx   |3 
 4 files changed, 34 insertions(+), 55 deletions(-)

New commits:
commit d48cf244b922d6be2d62e8dffa56a505a72f0933
Author: Stephan Bergmann 
Date:   Thu Nov 23 15:28:21 2017 +0100

loplugin:useuniqueptr in connectivity/source/drivers/macab/

...which revealed that lcl_CFType.cf should rather be of type CFTypeID 
(i.e.,
unsigned long), and required some adaption of for loops to cope with the 
type
differences between old sal_Int32 length vars and new std::vector::size 
calls.

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

diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx 
b/connectivity/source/drivers/macab/MacabRecords.cxx
index 958fdd87c901..68ebe0780b0d 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -188,8 +188,6 @@ void MacabRecords::initialize()
 
 MacabRecords::~MacabRecords()
 {
-delete [] lcl_CFTypes;
-delete [] requiredProperties;
 }
 
 
@@ -315,26 +313,13 @@ sal_Int32 MacabRecords::getFieldNumber(const OUString& 
_columnName) const
  */
 void MacabRecords::bootstrap_CF_types()
 {
-lcl_CFTypesLength = 6;
-lcl_CFTypes = new lcl_CFType[lcl_CFTypesLength];
-
-lcl_CFTypes[0].cf = CFNumberGetTypeID();
-lcl_CFTypes[0].ab = kABIntegerProperty;
-
-lcl_CFTypes[1].cf = CFStringGetTypeID();
-lcl_CFTypes[1].ab = kABStringProperty;
-
-lcl_CFTypes[2].cf = CFDateGetTypeID();
-lcl_CFTypes[2].ab = kABDateProperty;
-
-lcl_CFTypes[3].cf = CFArrayGetTypeID();
-lcl_CFTypes[3].ab = kABArrayProperty;
-
-lcl_CFTypes[4].cf = CFDictionaryGetTypeID();
-lcl_CFTypes[4].ab = kABDictionaryProperty;
-
-lcl_CFTypes[5].cf = CFDataGetTypeID();
-lcl_CFTypes[5].ab = kABDataProperty;
+lcl_CFTypes = {
+{CFNumberGetTypeID(), kABIntegerProperty},
+{CFStringGetTypeID(), kABStringProperty},
+{CFDateGetTypeID(), kABDateProperty},
+{CFArrayGetTypeID(), kABArrayProperty},
+{CFDictionaryGetTypeID(), kABDictionaryProperty},
+{CFDataGetTypeID(), kABDataProperty}};
 }
 
 
@@ -344,15 +329,9 @@ void MacabRecords::bootstrap_CF_types()
  */
 void MacabRecords::bootstrap_requiredProperties()
 {
-numRequiredProperties = 7;
-requiredProperties = new CFStringRef[numRequiredProperties];
-requiredProperties[0] = kABTitleProperty;
-requiredProperties[1] = kABFirstNameProperty;
-requiredProperties[2] = kABLastNameProperty;
-requiredProperties[3] = kABOrganizationProperty;
-requiredProperties[4] = kABAddressProperty;
-requiredProperties[5] = kABPhoneProperty;
-requiredProperties[6] = kABEmailProperty;
+requiredProperties = {
+kABTitleProperty, kABFirstNameProperty, kABLastNameProperty, 
kABOrganizationProperty,
+kABAddressProperty, kABPhoneProperty, kABEmailProperty};
 }
 
 
@@ -384,12 +363,12 @@ MacabHeader 
*MacabRecords::createHeaderForRecordType(const CFArrayRef _records,
 CFStringRef *nonRequiredProperties;
 sal_Int32 numRecords = (sal_Int32) CFArrayGetCount(_records);
 sal_Int32 numProperties = (sal_Int32) CFArrayGetCount(allProperties);
-sal_Int32 numNonRequiredProperties = numProperties - numRequiredProperties;
+sal_Int32 numNonRequiredProperties = numProperties - 
requiredProperties.size();
 
 /* While searching through the properties for required properties, these
  * sal_Bools will keep track of what we have found.
  */
-bool bFoundRequiredProperties[numRequiredProperties];
+bool bFoundRequiredProperties[requiredProperties.size()];
 
 
 /* We have three MacabHeaders: headerDataForProperty is where we
@@ -404,7 +383,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const 
CFArrayRef _records,
 MacabHeader *nonRequiredHeader = new MacabHeader();
 
 /* Other variables... */
-sal_Int32 i, j, k;
+sal_Int32 k;
 ABRecordRef record;
 CFStringRef property;
 
@@ -412,15 +391,15 @@ MacabHeader 
*MacabRecords::createHeaderForRecordType(const CFArrayRef _records,
 /* Allocate and initialize... */
 nonRequiredProperties = new CFStringRef[numNonRequiredProperties];
 k = 0;
-for(i = 0; i < numRequiredProperties; i++)
+for(std::vector::size_type i = 0; i < 
requiredProperties.size(); i++)
 bFoundRequiredProperties[i] = false;
 
 /* Determine the non-required properties... */
-for(i = 0; i < numProperties; i++)
+for(sal_Int32 i = 0; i < numProperties; i++)
 {
 bool bFoundProperty = false;
 property = 
static_cast(CFArrayGetValueAtIndex(allProperties, i));
-for(j

[Libreoffice-commits] help.git: help3xsl/get_hid2file.sh

2017-11-23 Thread David Tardon

 help3xsl/get_hid2file.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8aff7a4747fbabc5d8db9c9c52c1e67684965fd4
Author: David Tardon 
Date:   Thu Nov 23 19:00:05 2017 +0100

create dir before resolving its path

Change-Id: I4724d2444b0bd9daa6a6f0f8c7165a594db08ad9

diff --git a/help3xsl/get_hid2file.sh b/help3xsl/get_hid2file.sh
index 26d692c87..480572ed6 100755
--- a/help3xsl/get_hid2file.sh
+++ b/help3xsl/get_hid2file.sh
@@ -22,8 +22,8 @@ productversion=$1
 
 helpFiles=$(realpath $workDir/../helpcontent2/source/text)
 
+mkdir -p $workDir/HelpTargetHTML/$productversion
 outDir=$(realpath $workDir/HelpTargetHTML/$productversion)
-mkdir -p $outDir
 
 bookmarkFile=$outDir'/hid2file.js'
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-11-23 Thread David Tardon

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

New commits:
commit ac5e8ce2fe18d923ea73692a79a18e94402355ac
Author: David Tardon 
Date:   Thu Nov 23 19:00:05 2017 +0100

Updated core
Project: help  8aff7a4747fbabc5d8db9c9c52c1e67684965fd4

create dir before resolving its path

Change-Id: I4724d2444b0bd9daa6a6f0f8c7165a594db08ad9

diff --git a/helpcontent2 b/helpcontent2
index d2dec6e9c5aa..8aff7a4747fb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d2dec6e9c5aafcc2b64a74bb496d42a965531dff
+Subproject commit 8aff7a4747fbabc5d8db9c9c52c1e67684965fd4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Eike Rathke

 basic/source/runtime/methods1.cxx |   27 +++
 1 file changed, 19 insertions(+), 8 deletions(-)

New commits:
commit db080dad6c9ad9930e26aeb70638d7146afa279a
Author: Eike Rathke 
Date:   Thu Nov 23 17:03:21 2017 +0100

tdf#114011 limit/truncate date, not only year

Change-Id: I479040f411fb8b5975c0aa1aa24f95c957cf80cf

diff --git a/basic/source/runtime/methods1.cxx 
b/basic/source/runtime/methods1.cxx
index 5639bf08eef8..ad9424a56976 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1834,17 +1834,26 @@ inline void implGetDayMonthYear( sal_Int16& rnYear, 
sal_Int16& rnMonth, sal_Int1
 rnYear  = implGetDateYear( dDate );
 }
 
-inline sal_Int16 limitToINT16( sal_Int32 n32 )
+/** Limits a date to valid dates within tools' class Date capabilities.
+
+@return the year number, truncated if necessary and in that case also
+rMonth and rDay adjusted.
+ */
+inline sal_Int16 limitDate( sal_Int32 n32Year, sal_Int16& rMonth, sal_Int16& 
rDay )
 {
-if( n32 > 32767 )
+if( n32Year > SAL_MAX_INT16 )
 {
-n32 = 32767;
+n32Year = SAL_MAX_INT16;
+rMonth = 12;
+rDay = 31;
 }
-else if( n32 < -32768 )
+else if( n32Year < SAL_MIN_INT16 )
 {
-n32 = -32768;
+n32Year = SAL_MIN_INT16;
+rMonth = 1;
+rDay = 1;
 }
-return (sal_Int16)n32;
+return (sal_Int16)n32Year;
 }
 
 void SbRtl_DateAdd(StarBASIC *, SbxArray & rPar, bool)
@@ -1886,7 +1895,8 @@ void SbRtl_DateAdd(StarBASIC *, SbxArray & rPar, bool)
 case INTERVAL_:
 {
 sal_Int32 nTargetYear = lNumber + nYear;
-nTargetYear16 = limitToINT16( nTargetYear );
+nTargetYear16 = limitDate( nTargetYear, nMonth, nDay );
+/* TODO: should the result be error if the date was limited? 
It never was. */
 nTargetMonth = nMonth;
 bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, 
false, true, dNewDate );
 break;
@@ -1931,7 +1941,8 @@ void SbRtl_DateAdd(StarBASIC *, SbxArray & rPar, bool)
 }
 nTargetYear = (sal_Int32)nYear + nYearsAdd;
 }
-nTargetYear16 = limitToINT16( nTargetYear );
+nTargetYear16 = limitDate( nTargetYear, nTargetMonth, nDay );
+/* TODO: should the result be error if the date was limited? 
It never was. */
 bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, 
false, true, dNewDate );
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

2017-11-23 Thread Caolán McNamara

 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/silence-assert.patch|   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit e5e8181161632ace434359de2a983ae425670c40
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 23 15:33:54 2017 +

crashtesting: assert from liborcus

Change-Id: I3b148354745fa419b6299b6456d24925ea4fb980
Reviewed-on: https://gerrit.libreoffice.org/45160
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index b3261a5fa993..e9270c24a5cb 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,liborcus))
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
+   external/liborcus/silence-assert.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/silence-assert.patch 
b/external/liborcus/silence-assert.patch
new file mode 100644
index ..fb0bba200df7
--- /dev/null
+++ b/external/liborcus/silence-assert.patch
@@ -0,0 +1,11 @@
+--- liborcus/src/parser/sax_parser_base.cpp2017-11-23 15:26:54.307416084 
+
 liborcus/src/parser/sax_parser_base.cpp2017-11-16 00:38:32.0 
+
+@@ -296,7 +296,7 @@
+ str = pstring(buf.get(), buf.size());
+ 
+ // Skip the closing quote.
+-assert(cur_char() == '"');
++assert(!has_char() || cur_char() == '"');
+ next();
+ }
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Katarina Behrens

 include/fpicker/strings.hrc |2 ++
 vcl/inc/strings.hrc |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit d938e1ab00897c12938443ed373bf00083126df2
Author: Katarina Behrens 
Date:   Thu Nov 23 15:47:41 2017 +0100

gpg4libre: translatable strings for non-LibO filepickers

just strings, code using them is yet to be implemented

Change-Id: I03b2c44f574b3212b39bf4aabedf01c577f35de9
Reviewed-on: https://gerrit.libreoffice.org/45156
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/include/fpicker/strings.hrc b/include/fpicker/strings.hrc
index ad0569aed0ed..eee7cc86f385 100644
--- a/include/fpicker/strings.hrc
+++ b/include/fpicker/strings.hrc
@@ -13,6 +13,8 @@
 
 #define STR_SVT_FILEPICKER_AUTO_EXTENSION   
NC_("STR_SVT_FILEPICKER_AUTO_EXTENSION", "~Automatic file name extension")
 #define STR_SVT_FILEPICKER_PASSWORD 
NC_("STR_SVT_FILEPICKER_PASSWORD", "Save with pass~word")
+//dear loplugins, please don't remove this constant, it will be used in 
follow-up commits
+#define STR_SVT_FILEPICKER_GPGENCRYPT   
NC_("STR_SVT_FILEPICKER_GPGENCRYPT", "Encrypt with ~GPG key")
 #define STR_SVT_FILEPICKER_FILTER_OPTIONS   
NC_("STR_SVT_FILEPICKER_FILTER_OPTIONS", "~Edit filter settings")
 #define STR_SVT_FILEPICKER_READONLY 
NC_("STR_SVT_FILEPICKER_READONLY", "~Read-only")
 #define STR_SVT_FILEPICKER_INSERT_AS_LINK   
NC_("STR_SVT_FILEPICKER_INSERT_AS_LINK", "~Link")
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index c06bc06d7793..3960232843f7 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -92,6 +92,8 @@
 
 #define STR_FPICKER_AUTO_EXTENSION   
NC_("STR_FPICKER_AUTO_EXTENSION", "~Automatic file name extension")
 #define STR_FPICKER_PASSWORD 
NC_("STR_FPICKER_PASSWORD", "Save with pass~word")
+// dear loplugins, please don't remove this constant, it will be used in 
follow-up commits
+#define STR_FPICKER_GPGENCRYPT   
NC_("STR_FPICKER_GPGENCRYPT", "Encrypt with ~GPG key")
 #define STR_FPICKER_FILTER_OPTIONS   
NC_("STR_FPICKER_FILTER_OPTIONS", "~Edit filter settings")
 #define STR_FPICKER_READONLY 
NC_("STR_FPICKER_READONLY", "~Read-only")
 #define STR_FPICKER_INSERT_AS_LINK   
NC_("STR_FPICKER_INSERT_AS_LINK", "Insert as ~Link")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Stephan Bergmann

 fpicker/source/aqua/FilterHelper.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 474c6ba06e94ba635075a1fe0aee15c555400c0c
Author: Stephan Bergmann 
Date:   Thu Nov 23 17:29:55 2017 +0100

loplugin:unnecessaryparen

Change-Id: Id49d107e4f8ddbe7f49d7ddfefb7e13344c9ac4f

diff --git a/fpicker/source/aqua/FilterHelper.mm 
b/fpicker/source/aqua/FilterHelper.mm
index 1cca2ad8816f..47eeaca0a7c5 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -283,7 +283,7 @@ void FilterHelper::setCurrentFilter( const ::rtl::OUString& 
aTitle )
 
 ::rtl::OUString SAL_CALL FilterHelper::getCurrentFilter(  )
 {
-::rtl::OUString sReturn = (m_aCurrentFilter);
+::rtl::OUString sReturn = m_aCurrentFilter;
 
 return sReturn;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2017-11-23 Thread Michael Meeks

* Present:
+ Eike, Christian, Miklos, Heiko, Sophie, Kendy, Stephan, Mike S,
  Xisco, Samuel, Caolan, Michael S, Michael M

* Completed Action Items:
+ ask Norbert wrt. Bisect repos for Mac (Michael)
[ same tooling & commands as on Linux, Windows
+ opened a redmine ticket (Xisco)
+ 
https://redmine.documentfoundation.org/issues/2412#change-13809
+ discussing locally or in a data-center ]
+ mail devs asking if they’d like to be certified (Stephan)
+ script a ‘make check’ clang-format option (Miklos)
[ thanks to Markus for helping & deploying LODE changes ]
+ mail the list wrt. bundling GPG-4-Win (Thorsten)
[ dropped ]
+ fwd build details on Mac / CVE build / test failure to the list (Shinnok)
[ abandoned for now ]

* Pending Action Items:
+ come up with a list of retiring committers to mail (Norbert)
+ find code pointer auto-format table style config merging (Caolan)
+ find data for x86 / Linux downloads with view to removing for 6.0 (Cloph)
[ have the data, not broken down yet: termbin.com/2jc2 ]

* Release Engineering update (Christian)
+ back from vacation
+ 6.0 Beta 1 update & feature freeze: week 47 (of Nov 20th)
+ this week will branch for 6.0
   + asked to wait for some fixes.
   + one pending from Samuel this evening
   + splash screen bits too ? (Heiko)
   + like to have it in the Beta.
   + HTML help won’t be ready for B1
   + GPG bits are submitted, but need gcc/cygwin compiler to build.
   + is it a new compile dependency ? (Michael)
   + tried hard not to rely on it (Cloph)
   + think a permanent requirement
+ late features
   + HTML help pieces (Olivier, Cloph)
   [ will do the make integration (Cloph)
 have scripts that work (Olivier) ]
   + GPG / Windows bits (Samuel)
   [ is now in, fixes coming ... ]
   + Calc threading bits (Michael)
   [ merged, fixes coming ... ]
   + Calc column span update from Noel (Michael)
   [ unlikely to make it – needs more design work ]
   + missing piece from customization GSoC (Heiko)
   [ mkara submitted a new patch, it was accepted
 missing piece is macros – still working on it.
 Styles are working, but macros are missing. ]
   + 5.4.4 RC1: week 48 (of Nov 27th)
+ next week.
   + Android
+ patches to use NDK16 and unified headers this introduces
+ font rendering issue still a problem.
   + Online
+ branch and beta source archive coming.

* FOSDEM / Brussels, 3 & 4 February 2018
   + Papers deadline Dec 4
   + https://penta.fosdem.org/submission/FOSDEM18 
   + Coming:
   + Caolan – fuzzing talk ?
   + Heiko - ?
   + Kendy – Online dialog tunneling (?)
   + Mike S – planning to interview people, bringing the camera
   + Miklos – ePUB talk (?)
   + Samuel – don’t know.
   + Xisco – talk to pentabarf quietly.
   + Christian – a dashboard talk.
   + Olivier – Converging documentation
   + Stephan – giving thought to topic.
   + Michael S – still planning.
   + Michael M – calc threading
   + more most welcome ...

* Documentation (Olivier)
   + More work on integration of new help into build
   + (gbuild makefiles not easy to hack !)
   + lots of people coming to help: cloph, dtardon, shinnok
   + talk and action with Mike Saunders to set a prototype XHP editor
   + Getting Started guide 6.0
   + Last meeting was adjourned due to connectivity issues. Resume next 
Monday.
   + awaiting latest 6.0 features to write about.

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
261(261) (topicUI) bugs open, 369(369) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month3 months   12 months  
 added  6(2) 17(-3) 46(-1) 118(0)  
 commented 62(23)   225(-47)   629(-2)2410(-9) 
   removed  0(0)  0(0)   4(-1)  19(-1) 
  resolved  6(4) 22(1)  54(2)  244(3)  
+ top 10 contributors:
  Philips, Yousuf made 102 changes in 1 month, and 825 changes in 1 year
  Tietze, Heiko made 82 changes in 1 month, and 1125 changes in 1 year
  Faulí Tarazona, Xisco made 68 changes in 1 month, and 402 changes in 
1 y
  Zolnai, Tamás made 60 changes in 1 month, and 136 changes in 1 year
  Thomas Lendo made 32 changes in 1 month, and 429 changes in 1 year
  dieterp made 31 changes in 1 month, and 81 changes in 1 year
  Henschel, Regina made 20 changes in 1 month, and 125 changes in 1 year
  Christian Lehmann made 19 changes in 1 month, and 19 changes in 1 year
  Buovjaga made 1

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

2017-11-23 Thread Jean-Pierre Ledure

 wizards/source/access2base/Database.xba |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 008673c23db0c812eb0b48a1c29ab88b48aaa867
Author: Jean-Pierre Ledure 
Date:   Thu Nov 23 16:42:40 2017 +0100

Access2Base - FIX OutputStringToHtml

Remove useless ConvertToUrl function

diff --git a/wizards/source/access2base/Database.xba 
b/wizards/source/access2base/Database.xba
index e3dba90c9ac6..30b412fb9cfa 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -1574,7 +1574,7 @@ Dim i As Integer, l As Long
lNextQuote = InStr(lUrl, psString, 
, 1)
If lNextQuote = 0 Then lNextQuote = 
Len(psString)   '  Should not happen but, if quoted 
string not closed ...
sUrl = Mid(psString, lUrl, lNextQuote - 
lUrl)
-   sOutput = sOutput & sPattern & 
Iif(sPattern = "

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

2017-11-23 Thread Katarina Behrens

 cui/uiconfig/ui/optuserpage.ui   | 1279 ---
 officecfg/registry/schema/org/openoffice/UserProfile.xcs |   21 
 2 files changed, 715 insertions(+), 585 deletions(-)

New commits:
commit 9d06ffadbec8c3b2281f3e04b6c612b86965c146
Author: Katarina Behrens 
Date:   Thu Nov 23 13:37:26 2017 +0100

gpg4libre: UI and config for adding GPG keys to user's identity

Change-Id: I1a176ca998f49b68c6ca8129fba4eb56445892a2
Reviewed-on: https://gerrit.libreoffice.org/45145
Tested-by: Thorsten Behrens 
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 

diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 61245f6fb3b8..ad893936cb0f 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -1,815 +1,924 @@
 
-
+
 
   
-  
+  
 True
 False
 6
-0
-none
+vertical
 
-  
+  
 True
 False
-6
-12
+6
+0
+none
 
-  
+  
 True
 False
-6
-12
+6
+12
 
-  
-False
-True
-end
-_Company:
-True
-company
-  
-  
-0
-0
-  
-
-
-  
-False
-True
-end
-First/last _name/initials:
-True
-firstname
-  
-  
-0
-1
-  
-
-
-  
-False
-True
-end
-_Street:
-True
-street
-  
-  
-0
-4
-  
-
-
-  
-False
-True
-end
-City/state/_zip:
-True
-city
-  
-  
-0
-7
-  
-
-
-  
-False
-True
-end
-Country/re_gion:
-True
-country
-  
-  
-0
-8
-  
-
-
-  
-False
-True
-end
-_Title/position:
-True
-title
-  
-  
-0
-9
-  
-
-
-  
+  
+True
 False
-True
-end
-Telephone (home/_work):
-True
-home
-
-  
-Home telephone 
number
+6
+12
+
+  
+False
+True
+end
+_Company:
+True
+company
   
+  
+0
+0
+  
 
-  
-  
-0
-10
-  
-
-
-  
-False
-True
-end
-Fa_x/e-mail:
-True
-fax
-  
-  
-0
-11
-  
-
-
-  
-False
-True
-6
 
-  
-True
+  
+False
 True
-center
-True
-â¢
-
-  
-First 
name
-  
-
+end
+First/last _name/initials:
+True
+firstname
   
   
 0
-0
+1
   
 
 
-  
-True
+  
+False
 True
-center
-True
-â¢
-
-  
-Last name
-  
-
+end
+_Street:
+True
+s

[Libreoffice-commits] core.git: desktop/unx instsetoo_native/CustomTarget_setup.mk instsetoo_native/util

2017-11-23 Thread heiko tietze

 desktop/unx/source/splashx.c|   19 ---
 instsetoo_native/CustomTarget_setup.mk  |2 ++
 instsetoo_native/util/openoffice.lst.in |2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit e27e6720ac1f7bb1e44872a7fd3cca5f3340b16a
Author: heiko tietze 
Date:   Wed Nov 22 19:05:29 2017 +0100

tdf#90794 Position of progress bar on high res screens

Introduced two new consts

Change-Id: I15e01eabe9fd3225c36d06cbb59310a07a30f2c1
Reviewed-on: https://gerrit.libreoffice.org/45105
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 6bb98f965a91..8a1064e3673c 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -55,6 +55,8 @@ struct splash
 Colormap color_map;
 Window win;
 GC gc;
+//true when intro-highres loaded successfully
+sal_Bool bHasHiDpiImage;
 
 // Progress bar values
 // taken from desktop/source/splash/splash.cxx
@@ -611,12 +613,15 @@ static void splash_load_image( struct splash* splash, 
rtl_uString* pUAppPath )
 goto cleanup; /* success */
 
 /* load high resolution splash image */
+splash->bHasHiDpiImage = sal_False;
 if (isHiDPI(splash))
 {
-/* TODO- change progress bar parameters after getting size of 
intro-highres.png */
 strcpy (pSuffix, "intro-highres" IMG_SUFFIX);
 if ( splash_load_bmp( splash, pBuffer ) )
+{
+splash->bHasHiDpiImage = sal_True;
 goto cleanup; /* success */
+}
 }
 /* load standard resolution splash image */
 strcpy (pSuffix, "intro" IMG_SUFFIX);
@@ -655,8 +660,16 @@ static void splash_load_defaults( struct splash* splash, 
rtl_uString* pAppPath,
 get_bootstrap_value( logo,  1, handle, "Logo" );
 get_bootstrap_value( bar,   3, handle, "ProgressBarColor" );
 get_bootstrap_value( frame, 3, handle, "ProgressFrameColor" );
-get_bootstrap_value( pos,   2, handle, "ProgressPosition" );
-get_bootstrap_value( size,  2, handle, "ProgressSize" );
+if (isHiDPI(splash) && splash->bHasHiDpiImage)
+{
+   get_bootstrap_value( pos,   2, handle, "ProgressPositionHigh" );
+   get_bootstrap_value( size,  2, handle, "ProgressSizeHigh" );
+}
+else
+{
+   get_bootstrap_value( pos,   2, handle, "ProgressPosition" );
+   get_bootstrap_value( size,  2, handle, "ProgressSize" );
+}
 
 if ( logo[0] == 0 )
 {
diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index ee90c17c31c0..95de9f7202fa 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -126,6 +126,8 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ProgressFrameColor=102,102,102' \
&& echo 'ProgressPosition=35,153' \
&& echo 'ProgressSize=444,8' \
+   && echo 'ProgressPositionHigh=46,212' \
+   && echo 'ProgressSizeHigh=617,12' \
&& echo 'ProgressTextBaseline=145' \
&& echo 'ProgressTextColor=255,255,255' \
&& echo 'SecureUserConfig=true' \
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 442cfca66c54..24bb9761f7f0 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -17,7 +17,9 @@ Globals
 SOLSUREPACKAGEPREFIX libreoffice
 PROGRESSBARCOLOR 0,0,0
 PROGRESSSIZE 444,8
+PROGRESSSIZEHIGH 617,12
 PROGRESSPOSITION 35,153
+PROGRESSPOSITIONHIGH 46,212
 PROGRESSFRAMECOLOR 102,102,102
 PROGRESSTEXTBASELINE 145
 PROGRESSTEXTCOLOR 255,255,255
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

2017-11-23 Thread Caolán McNamara

On Thu, 2017-11-23 at 12:21 +, Crashtest VM wrote:
> New crashtest update available at http://dev-builds.libreoffice.org/c
> rashtest/95e3e5b83b2b7be86310f38aeae60cd4bc83939b/

fdo41403-1.xlsm and some others crash in Chart2PositionMap and
https://gerrit.libreoffice.org/#/c/45155/ might be the fix there

but, fdo69698-1.ods still crashes in chart2
StockDataInterpreter::interpretDataSource on referencing aData[0] where
aData is empty and reverting 3af8a4faf5e20ccae2386052697713da160afb16
locally makes it not crash. Any ideas what the right solution is ?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-11-23 Thread Tor Lillqvist

 sc/inc/attarray.hxx  |2 +-
 sc/source/core/data/attarray.cxx |4 ++--
 sc/source/core/data/column.cxx   |4 ++--
 sc/source/core/data/table2.cxx   |4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2923cb0b5b757a764e285d7295f4e78b8494c5c8
Author: Tor Lillqvist 
Date:   Thu Nov 23 14:24:16 2017 +0200

Move the need for several ugly const_casts deeper down to just one place

Change-Id: I2cdd66b9819f070548c2a0af7388d9bfbd3689c1
Reviewed-on: https://gerrit.libreoffice.org/45144
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 726c5a831114..ccfb1bb8120a 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -139,7 +139,7 @@ public:
 voidSetPattern( SCROW nRow, const ScPatternAttr* pPattern, bool 
bPutToPool = false );
 voidSetPatternArea( SCROW nStartRow, SCROW nEndRow, const 
ScPatternAttr* pPattern,
 bool bPutToPool = false, ScEditDataArray* 
pDataArray = nullptr );
-voidApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* 
pStyle );
+voidApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const 
ScStyleSheet& rStyle );
 voidApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* 
pCache,
 ScEditDataArray* pDataArray = nullptr, bool* const 
pIsChanged = nullptr );
 voidSetAttrEntries(std::vector && vNewData);
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index ef4b11cdf09c..c8a7d50da93c 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -605,7 +605,7 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW 
nEndRow, const ScPattern
 #endif
 }
 
-void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, 
ScStyleSheet* pStyle )
+void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const 
ScStyleSheet& rStyle )
 {
 if (ValidRow(nStartRow) && ValidRow(nEndRow))
 {
@@ -625,7 +625,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW 
nEndRow, ScStyleSheet*
 {
 const ScPatternAttr* pOldPattern = mvData[nPos].pPattern;
 std::unique_ptr pNewPattern(new 
ScPatternAttr(*pOldPattern));
-pNewPattern->SetStyleSheet(pStyle);
+pNewPattern->SetStyleSheet(const_cast(&rStyle));
 SCROW nY1 = nStart;
 SCROW nY2 = mvData[nPos].nEndRow;
 nStart = mvData[nPos].nEndRow + 1;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ff507715af12..73afe1a810f8 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -567,7 +567,7 @@ void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet* 
rStyle )
 
 void ScColumn::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const 
ScStyleSheet& rStyle )
 {
-pAttrArray->ApplyStyleArea(nStartRow, nEndRow, 
const_cast(&rStyle));
+pAttrArray->ApplyStyleArea(nStartRow, nEndRow, rStyle);
 }
 
 void ScColumn::ApplySelectionStyle(const ScStyleSheet& rStyle, const 
ScMarkData& rMark)
@@ -579,7 +579,7 @@ void ScColumn::ApplySelectionStyle(const ScStyleSheet& 
rStyle, const ScMarkData&
 {
 ScMultiSelIter aMultiIter( rMark.GetMultiSelData(), nCol );
 while (aMultiIter.Next( nTop, nBottom ))
-pAttrArray->ApplyStyleArea(nTop, nBottom, 
const_cast(&rStyle));
+pAttrArray->ApplyStyleArea(nTop, nBottom, rStyle);
 }
 }
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 0053e5f67f3c..a45d7af408c2 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2569,12 +2569,12 @@ void ScTable::ApplyStyleArea( SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, S
 nEndCol = aCol.size() - 1;
 for (SCCOL i = nStartCol; i <= nEndCol; i++)
 aCol[i].ApplyStyleArea(nStartRow, nEndRow, rStyle);
-aDefaultColAttrArray.ApplyStyleArea(nStartRow, nEndRow, 
const_cast( &rStyle ) );
+aDefaultColAttrArray.ApplyStyleArea(nStartRow, nEndRow, rStyle 
);
 }
 else
 {
 CreateColumnIfNotExists( nStartCol - 1 );
-aDefaultColAttrArray.ApplyStyleArea(nStartRow, nEndRow, 
const_cast( &rStyle ) );
+aDefaultColAttrArray.ApplyStyleArea(nStartRow, nEndRow, rStyle 
);
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 20/440b8f01a386ea7bf6f186cd2c4e45f22fa331

2017-11-23 Thread Caolán McNamara

 20/440b8f01a386ea7bf6f186cd2c4e45f22fa331 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 93b6f7164fae93d346a6cf5242f3ae9ff7f364ba
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 23 14:18:34 2017 +

Notes added by 'git notes add'

diff --git a/20/440b8f01a386ea7bf6f186cd2c4e45f22fa331 
b/20/440b8f01a386ea7bf6f186cd2c4e45f22fa331
new file mode 100644
index ..96c44189cdeb
--- /dev/null
+++ b/20/440b8f01a386ea7bf6f186cd2c4e45f22fa331
@@ -0,0 +1 @@
+reject: bogus looking workaround
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Julien Nabet

 include/svx/fntctrl.hxx   |1 +
 svx/source/dialog/fntctrl.cxx |   32 +---
 2 files changed, 22 insertions(+), 11 deletions(-)

New commits:
commit 3f289fef2f2b00dcca4948dd9fb2ba2c493fac6f
Author: Julien Nabet 
Date:   Wed Nov 8 23:17:56 2017 +0100

tdf#113657: fix crash when trying to format empty paragraph

by creating a function to clean line feeds and returns if it's empty or not

Change-Id: I3a744c52bdb457c92f38595463099e1cbf17a37e
Reviewed-on: https://gerrit.libreoffice.org/44513
Tested-by: Jenkins 
Tested-by: Xisco FaulÃ 
Reviewed-by: Michael Stahl 

diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index ed0828e8cc3b..9b54d2ae0a3c 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -63,6 +63,7 @@ public:
 voidResetColor();
 voidSetBackColor( const Color& rColor );
 voidUseResourceText();
+boolCleanAndCheckEmpty(OUString& rText);
 voidPaint( vcl::RenderContext& rRenderContext, const 
tools::Rectangle& ) override;
 
 boolIsTwoLines() const;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index c78c8f481d47..039f69fe2d80 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -612,6 +612,24 @@ void SvxFontPrevWindow::UseResourceText()
 pImpl->mbUseResText = true;
 }
 
+/*
+ * removes line feeds and carriage returns from string
+ * returns if param is empty
+ */
+bool SvxFontPrevWindow::CleanAndCheckEmpty(OUString& rText)
+{
+bool bEmpty = true;
+for (sal_Int32 i = 0; i < rText.getLength(); ++i)
+{
+if (0xa == rText[i] || 0xd == rText[i])
+rText = rText.replaceAt(i, 1, " ");
+else
+bEmpty = false;
+}
+return bEmpty;
+}
+
+
 void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&)
 {
 ApplySettings(rRenderContext);
@@ -645,7 +663,7 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::R
 {
 pImpl->maText = pSh->GetSelectionText();
 pImpl->mbGetSelection = true;
-pImpl->mbSelection = !pImpl->maText.isEmpty();
+pImpl->mbSelection = !CleanAndCheckEmpty(pImpl->maText);
 }
 
 if (!pImpl->mbSelection || pImpl->mbUseFontNameAsText)
@@ -681,16 +699,8 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::R
 pImpl->maText = makeRepresentativeTextForFont(LATIN, rFont);
 }
 
-// remove line feeds and carriage returns from string
-bool bNotEmpty = false;
-for (sal_Int32 i = 0; i < pImpl->maText.getLength(); ++i)
-{
-if (0xa == pImpl->maText[i] || 0xd == pImpl->maText[i])
- pImpl->maText = pImpl->maText.replaceAt(i, 1, " ");
-else
-bNotEmpty = true;
-}
-if (!bNotEmpty)
+bool bEmpty = CleanAndCheckEmpty(pImpl->maText);
+if (bEmpty)
 pImpl->maText = GetText();
 
 if (pImpl->maText.getLength() > (TEXT_WIDTH - 1))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Caolán McNamara

 framework/source/loadenv/loadenv.cxx |   31 +-
 sfx2/inc/preventduplicateinteraction.hxx |  112 +++
 sfx2/source/appl/preventduplicateinteraction.cxx |   10 +-
 3 files changed, 129 insertions(+), 24 deletions(-)

New commits:
commit c46f0c9f6eb07db061d2f99c61c9ea05644a78ec
Author: CaolÃ¡n McNamara 
Date:   Tue Nov 21 16:25:55 2017 +

Related: tdf#113160 set a temporary dialog parent during type detection

to get warning dialogs that don't block the existing windows but whose
lifecycle can be controlled to avoid crashes during exit

Change-Id: I57965301c3d8a031acb33e83bf7715fe132385d0
Reviewed-on: https://gerrit.libreoffice.org/45044
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index b76f13ef8c66..3bfd87e3244c 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1042,32 +1042,17 @@ bool LoadEnv::impl_loadContent()
 bool bHidden= 
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(),
 false);
 bool bMinimized = 
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(),
 false);
 bool bPreview   = 
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(),
 false);
+css::uno::Reference< css::task::XStatusIndicator > xProgress  = 
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(),
 css::uno::Reference< css::task::XStatusIndicator >());
 
-if (!bHidden && !bMinimized && !bPreview)
+if (!bHidden && !bMinimized && !bPreview && !xProgress.is())
 {
-css::uno::Reference< css::task::XStatusIndicator > xProgress  = 
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(),
 css::uno::Reference< css::task::XStatusIndicator >());
-if (!xProgress.is())
+// Note: it's an optional interface!
+css::uno::Reference< css::task::XStatusIndicatorFactory > 
xProgressFactory(xTargetFrame, css::uno::UNO_QUERY);
+if (xProgressFactory.is())
 {
-// Note: it's an optional interface!
-css::uno::Reference< css::task::XStatusIndicatorFactory > 
xProgressFactory(xTargetFrame, css::uno::UNO_QUERY);
-if (xProgressFactory.is())
-{
-xProgress = xProgressFactory->createStatusIndicator();
-if (xProgress.is())
-
m_lMediaDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xProgress;
-}
-}
-if (!comphelper::LibreOfficeKit::isActive())
-{
-//now that we have a window, set things up so that warnings 
dialogs are relative to that window
-css::uno::Reference 
xInteractionHandler(
-task::InteractionHandler::createWithParent(m_xContext, 
xTargetFrame->getContainerWindow()),
-css::uno::UNO_QUERY);
-if (xInteractionHandler.is())
-{
-
m_lMediaDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER()] <<= 
xInteractionHandler;
-
m_lMediaDescriptor[utl::MediaDescriptor::PROP_AUTHENTICATIONHANDLER()] <<= 
xInteractionHandler;
-}
+xProgress = xProgressFactory->createStatusIndicator();
+if (xProgress.is())
+
m_lMediaDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xProgress;
 }
 }
 
diff --git a/sfx2/inc/preventduplicateinteraction.hxx 
b/sfx2/inc/preventduplicateinteraction.hxx
index f7bec486a2cf..9e31a5bcc829 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -22,17 +22,127 @@
 
 #include 
 
+#include 
+#include 
+#include 
 #include 
 #include 
 
+#include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+#include 
+
 namespace com { namespace sun { namespace star { namespace uno {
 class XComponentContext;
 } } } }
 
 namespace sfx2 {
 
+inline void closedialogs(SystemWindow& rTopLevel, bool bCloseRoot)
+{
+for (vcl::Window *pChild = 
rTopLevel.GetWindow(GetWindowType::FirstTopWindowChild); pChild; pChild = 
rTopLevel.GetWindow(GetWindowType::NextTopWindowSibling))
+closedialogs(dynamic_cast(*pChild), true);
+if (bCloseRoot)
+rTopLevel.Close();
+}
+
+// This is intended to be the parent for any warning dialogs launched
+// during the load of a document so that those dialogs are modal to
+// this window and don't block any existing windows.
+//
+// If there are dialog children open on exit then veto termination,
+// close the topmost dialog and retry termination.
+class WarningDialogsParent :
+public cppu::WeakComponentImplHelper
+{
+private:
+osl::Mutex m_aLock;
+VclPtr m_xWin;
+css::uno::Reference m_xInterface;
+
+private:
+
+DECL_STATIC_LINK(WarningDialogsParent

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

2017-11-23 Thread Takeshi Abe

 xmloff/source/text/txtprhdl.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit e0bd8f36964b84d7649b7705c3df98256d3ce627
Author: Takeshi Abe 
Date:   Thu Nov 23 17:57:04 2017 +0900

xmloff: Drop non-existent XMLTextPropertyHandlerFactory_Impl

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

diff --git a/xmloff/source/text/txtprhdl.hxx b/xmloff/source/text/txtprhdl.hxx
index 8870268eb0a8..6b1703f16eaa 100644
--- a/xmloff/source/text/txtprhdl.hxx
+++ b/xmloff/source/text/txtprhdl.hxx
@@ -21,9 +21,6 @@
 
 
 #include 
-#include 
-
-class XMLTextPropertyHandlerFactory_Impl;
 
 class XMLTextPropertyHandlerFactory : public XMLPropertyHandlerFactory
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Noel Grandin

 sc/inc/patattr.hxx  |7 ++
 sc/qa/unit/helper/qahelper.cxx  |   10 +-
 sc/qa/unit/subsequent_filters-test.cxx  |9 +-
 sc/source/core/data/attarray.cxx|   78 +-
 sc/source/core/data/column.cxx  |8 +-
 sc/source/core/data/column2.cxx |   45 +
 sc/source/core/data/column3.cxx |4 -
 sc/source/core/data/column4.cxx |7 --
 sc/source/core/data/documen4.cxx|4 -
 sc/source/core/data/documen6.cxx|2 
 sc/source/core/data/document.cxx|6 -
 sc/source/core/data/fillinfo.cxx|   33 +++--
 sc/source/core/data/global.cxx  |2 
 sc/source/core/data/patattr.cxx |   11 +--
 sc/source/core/data/table1.cxx  |4 -
 sc/source/core/data/table2.cxx  |4 -
 sc/source/core/data/table4.cxx  |4 -
 sc/source/core/tool/detfunc.cxx |2 
 sc/source/core/tool/editutil.cxx|   15 ++--
 sc/source/core/tool/interpr1.cxx|3 
 sc/source/filter/html/htmlexp.cxx   |   28 
 sc/source/filter/rtf/rtfexp.cxx |   16 ++--
 sc/source/filter/xml/XMLExportDataPilot.cxx |2 
 sc/source/ui/app/inputhdl.cxx   |   14 +---
 sc/source/ui/docshell/docfunc.cxx   |8 +-
 sc/source/ui/unoobj/cellsuno.cxx|   16 ++--
 sc/source/ui/view/cellsh1.cxx   |2 
 sc/source/ui/view/formatsh.cxx  |   30 +++-
 sc/source/ui/view/gridwin.cxx   |   23 ++
 sc/source/ui/view/gridwin4.cxx  |9 +-
 sc/source/ui/view/output.cxx|   28 +++-
 sc/source/ui/view/output2.cxx   |   96 ++--
 sc/source/ui/view/printfun.cxx  |4 -
 sc/source/ui/view/viewdata.cxx  |   12 +--
 sc/source/ui/view/viewfun3.cxx  |4 -
 sc/source/ui/view/viewfunc.cxx  |   19 ++---
 36 files changed, 263 insertions(+), 306 deletions(-)

New commits:
commit 94d76cef1f71056fab106caf4cc8e65504475615
Author: Noel Grandin 
Date:   Thu Nov 23 11:25:49 2017 +0200

TypedWhichId create custom get methods in ScPatternAttr

Change-Id: Iaa326332f5806477dd81463e6b6004a962bac934
Reviewed-on: https://gerrit.libreoffice.org/45128
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 4dddfd6739dd..115072b863f5 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -69,9 +69,16 @@ public:
 
 const SfxPoolItem&  GetItem( sal_uInt16 nWhichP ) const
 { return GetItemSet().Get(nWhichP); }
+template const T& GetItem( TypedWhichId nWhich ) const
+{ return static_cast(GetItem(sal_uInt16(nWhich))); }
 
 static const SfxPoolItem& GetItem( sal_uInt16 nWhich, const SfxItemSet& 
rItemSet, const SfxItemSet* pCondSet );
+template static const T& GetItem( TypedWhichId nWhich, const 
SfxItemSet& rItemSet, const SfxItemSet* pCondSet )
+{ return static_cast(GetItem(sal_uInt16(nWhich), rItemSet, 
pCondSet)); }
+
 const SfxPoolItem&  GetItem( sal_uInt16 nWhich, const SfxItemSet* 
pCondSet ) const;
+template const T& GetItem( TypedWhichId nWhich, const 
SfxItemSet* pCondSet  ) const
+{ return static_cast(GetItem(sal_uInt16(nWhich), pCondSet)); }
 
 /// @param pWhich are no ranges, but single IDs, 
0-terminated
 boolHasItemsSet( const sal_uInt16* pWhich ) const;
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 66d2da055013..b53c8377e1a0 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -226,17 +226,17 @@ void testFormats(ScBootstrapFixture* pTest, ScDocument* 
pDoc, sal_Int32 nFormat)
 CPPUNIT_ASSERT_EQUAL( aKnownGoodStr, aTestStr );
 }
 pPattern = pDoc->GetPattern(1,4,1);
-Color aColor = static_cast(pPattern->GetItem(ATTR_BACKGROUND)).GetColor();
+Color aColor = pPattern->GetItem(ATTR_BACKGROUND).GetColor();
 CPPUNIT_ASSERT_EQUAL_MESSAGE("background color should be green", 
Color(COL_LIGHTGREEN), aColor);
 pPattern = pDoc->GetPattern(2,0,1);
-SvxCellHorJustify eHorJustify = static_cast(pPattern->GetItem(ATTR_HOR_JUSTIFY)).GetValue();
+SvxCellHorJustify eHorJustify = 
pPattern->GetItem(ATTR_HOR_JUSTIFY).GetValue();
 CPPUNIT_ASSERT_EQUAL_MESSAGE("cell content should be aligned centre 
horizontally", SvxCellHorJustify::Center, eHorJustify);
 //test alignment
 pPattern = pDoc->GetPattern(2,1,1);
-eHorJustify = static_cast(pPattern->GetItem(ATTR_HOR_JUSTIFY)).GetValue();
+eHorJustify = pPattern->GetItem(ATTR_HOR_JUSTIFY).GetValue();
 CPPUNIT_ASSERT_EQUAL_MESSAGE("cell content should be aligned right 
horizontally", SvxCellHorJustify::Right, eHorJustify);

[Libreoffice-commits] online.git: kit/Delta.hpp

2017-11-23 Thread Andras Timar

 kit/Delta.hpp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f3ab71e4b3b4b7316e9fc9be838e41fe15c26512
Author: Andras Timar 
Date:   Thu Nov 23 15:01:25 2017 +0100

fix error: unused parameter âbufferHeightâ [-Werror=unused-parameter]

Change-Id: I6a1f64796d3304e12f0159bed03b5f95a760ce6a

diff --git a/kit/Delta.hpp b/kit/Delta.hpp
index e1890370..1cc3afba 100644
--- a/kit/Delta.hpp
+++ b/kit/Delta.hpp
@@ -154,6 +154,8 @@ class DeltaGenerator {
 assert (startX + width <= (size_t)bufferWidth);
 assert (startY + height <= (size_t)bufferHeight);
 
+(void)bufferHeight;
+
 LOG_TRC("Converting pixel data to delta data of size "
 << (width * height * 4) << " width " << width
 << " height " << height);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang filter/source sal/rtl svl/source tools/source

2017-11-23 Thread Noel Grandin

 compilerplugins/clang/simplifybool.cxx  |4 
 compilerplugins/clang/test/simplifybool.cxx |   11 ++-
 filter/source/graphicfilter/icgm/class4.cxx |4 ++--
 sal/rtl/math.cxx|2 +-
 svl/source/numbers/zformat.cxx  |2 +-
 tools/source/generic/b3dtrans.cxx   |4 ++--
 6 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit e0846b7abe78e55bc1e959143d980208077b13ca
Author: Noel Grandin 
Date:   Thu Nov 23 10:39:41 2017 +0200

loplugin:simplifybool can't invert conditions involving float types

so revert some of the changes from

commit 7a1c21e53fc4733a4bb52282ce0098fcc085ab0e
loplugin:simplifybool for negation of comparison operator

Change-Id: I937d575b86c1e418805d399b0dc16ae91876b4fe
Reviewed-on: https://gerrit.libreoffice.org/45130
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/compilerplugins/clang/simplifybool.cxx 
b/compilerplugins/clang/simplifybool.cxx
index 260946a5fd98..9167014f8c84 100644
--- a/compilerplugins/clang/simplifybool.cxx
+++ b/compilerplugins/clang/simplifybool.cxx
@@ -142,6 +142,10 @@ bool SimplifyBool::VisitUnaryLNot(UnaryOperator const * 
expr) {
 // RecordType would require more smarts - we'd need to verify that an 
inverted operator actually existed
 if (t->isTemplateTypeParmType() || t->isRecordType() || 
t->isDependentType())
 return true;
+// for floating point (with NaN) !(x=y
+if (t->isFloatingType() ||
+
binaryOp->getRHS()->IgnoreImpCasts()->getType()->getUnqualifiedDesugaredType()->isFloatingType())
+return true;
 if (!binaryOp->isComparisonOp())
 return true;
 report(
diff --git a/compilerplugins/clang/test/simplifybool.cxx 
b/compilerplugins/clang/test/simplifybool.cxx
index e6b52c33f3b6..2cb2e810c110 100644
--- a/compilerplugins/clang/test/simplifybool.cxx
+++ b/compilerplugins/clang/test/simplifybool.cxx
@@ -15,7 +15,16 @@ void f1(int a, int b)
 }
 };
 
-// Consitently either warn about all or none of the below occurrences of "!!":
+void f2(float a, float b)
+{
+// no warning expected
+if (!(a < b))
+{
+a = b;
+}
+};
+
+// Consistently either warn about all or none of the below occurrences of "!!":
 
 enum E1
 {
diff --git a/filter/source/graphicfilter/icgm/class4.cxx 
b/filter/source/graphicfilter/icgm/class4.cxx
index 46f15e650c01..0185f699014c 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -395,7 +395,7 @@ void CGM::ImplDoClass4()
 fStartAngle = fEndAngle;
 fEndAngle = fG;
 }
-if ( ( fInterAngle <= fStartAngle )  && ( fInterAngle < 
fEndAngle ) )
+if ( ! ( fInterAngle > fStartAngle )  && ( fInterAngle < 
fEndAngle ) )
 {
 nSwitch ^=1;
 aIntermediatePoint = aEndingPoint;
@@ -465,7 +465,7 @@ void CGM::ImplDoClass4()
 fStartAngle = fEndAngle;
 fEndAngle = fG;
 }
-if ( ( fInterAngle <= fStartAngle )  && ( fInterAngle < 
fEndAngle ) )
+if ( ! ( fInterAngle > fStartAngle )  && ( fInterAngle < 
fEndAngle ) )
 {
 aIntermediatePoint = aEndingPoint;
 aEndingPoint = aStartingPoint;
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index a9b30a4dc498..96c5843dcfea 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -170,7 +170,7 @@ bool isRepresentableInteger(double fAbsValue)
 // this here.
 double fInt;
 return (nInt <= kMaxInt &&
-(((fInt = static_cast< double >(nInt)) >= fAbsValue) && (fInt 
<= fAbsValue)));
+(!((fInt = static_cast< double >(nInt)) < fAbsValue) && !(fInt 
> fAbsValue)));
 }
 return false;
 }
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 9a314d40b6aa..d3e48317f4d0 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2368,7 +2368,7 @@ bool SvNumberformat::GetOutputString(double fNumber,
 {
 if (::rtl::math::isSignBitSet(fNumber))
 {
-if (fNumber >= 0.0)
+if (!(fNumber < 0.0))
 fNumber = -fNumber; // do not display -0.0
 }
 if (fNumber == 0.0)
diff --git a/tools/source/generic/b3dtrans.cxx 
b/tools/source/generic/b3dtrans.cxx
index c65074482529..1162f24993f6 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -59,11 +59,11 @@ void 
B3dTransformationSet::Orientation(basegfx::B3DHomMatrix& rTarget, const bas
 
 void B3dTransformationSet::Frustum(basegfx::B3DHomMa

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

2017-11-23 Thread Stephan Bergmann

 vcl/osx/salframe.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1db2cdd97155f690fa9e08911c20ea3d246418dc
Author: Stephan Bergmann 
Date:   Thu Nov 23 13:55:01 2017 +0100

loplugin:unnecessaryparen

Change-Id: Iddf5ed0a611f6dec4d30d056729dfd6dcd1f37d9

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 4b96443e72bf..9bf63720dbef 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -178,15 +178,15 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 }
 else
 {
-if( (mnStyle & SalFrameStyleFlags::MOVEABLE) )
+if( mnStyle & SalFrameStyleFlags::MOVEABLE )
 {
 mnStyleMask |= NSTitledWindowMask;
 if( mpParent == nullptr )
 mnStyleMask |= NSMiniaturizableWindowMask;
 }
-if( (mnStyle & SalFrameStyleFlags::SIZEABLE) )
+if( mnStyle & SalFrameStyleFlags::SIZEABLE )
 mnStyleMask |= NSResizableWindowMask;
-if( (mnStyle & SalFrameStyleFlags::CLOSEABLE) )
+if( mnStyle & SalFrameStyleFlags::CLOSEABLE )
 mnStyleMask |= NSClosableWindowMask;
 // documentation says anything other than NSBorderlessWindowMask (=0)
 // should also include NSTitledWindowMask;
@@ -206,7 +206,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 return;
 }
 
-if( (mnStyle & SalFrameStyleFlags::TOOLTIP) )
+if( mnStyle & SalFrameStyleFlags::TOOLTIP )
 [mpNSWindow setIgnoresMouseEvents: YES];
 else
 [mpNSWindow setAcceptsMouseMovedEvents: YES];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Stephan Bergmann

 vcl/osx/HtmlFmtFlt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9017fee65712dd99cfeb14b55dea3fafb80134c9
Author: Stephan Bergmann 
Date:   Thu Nov 23 13:54:29 2017 +0100

loplugin:simplifybool

Change-Id: If6084771aaa9d2bdc7ffca7550749cbb3bf8e084

diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index 5c32772aa512..7208c67616e7 100644
--- a/vcl/osx/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
@@ -82,7 +82,7 @@ Sequence SAL_CALL 
TextHtmlToHTMLFormat(Sequence const & aTex
 {
 OSL_ASSERT(aTextHtml.getLength() > 0);
 
-if (!(aTextHtml.getLength() > 0))
+if (aTextHtml.getLength() <= 0)
 return Sequence();
 
 // fill the buffer with dummy values to calc the exact length
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Timotej Lazar

 desktop/source/app/app.cxx |  133 +
 1 file changed, 40 insertions(+), 93 deletions(-)

New commits:
commit 6a97d9c4d9b80db41149740e4fb7706142d1b20c
Author: Timotej Lazar 
Date:   Wed Nov 22 12:40:26 2017 +0100

tdf#112689 Replace chained O(U)StringBuffer::append with operator+

Change-Id: Iea9a6e2104966bd47f09a82df9b01f065f678d17
Reviewed-on: https://gerrit.libreoffice.org/45079
Tested-by: Jenkins 
Reviewed-by: Muhammet Kara 
Reviewed-by: Noel Grandin 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a27408547d38..d66fb1658054 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -337,31 +337,19 @@ namespace {
 
 OUString MakeStartupErrorMessage(OUString const & aErrorMessage)
 {
-OUStringBufferaDiagnosticMessage( 100 );
-
-aDiagnosticMessage.append(DpResId(STR_BOOTSTRAP_ERR_CANNOT_START));
-
-aDiagnosticMessage.append( "\n" );
-
-aDiagnosticMessage.append( aErrorMessage );
-
-return aDiagnosticMessage.makeStringAndClear();
+return DpResId(STR_BOOTSTRAP_ERR_CANNOT_START) + "\n" + aErrorMessage;
 }
 
 OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg 
)
 {
-OUStringBuffer aDiagnosticMessage( 200 );
-
-aDiagnosticMessage.append(DpResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS));
-
+OUString aDiagnosticMessage = DpResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS);
 if ( !aInternalErrMsg.isEmpty() )
 {
-aDiagnosticMessage.append("\n\n");
-aDiagnosticMessage.append(DpResId(STR_INTERNAL_ERRMSG));
-aDiagnosticMessage.append(aInternalErrMsg);
+aDiagnosticMessage += "\n\n"
+   + DpResId(STR_INTERNAL_ERRMSG)
+   + aInternalErrMsg;
 }
-
-return aDiagnosticMessage.makeStringAndClear();
+return aDiagnosticMessage;
 }
 
 
@@ -386,11 +374,8 @@ void FatalError(const OUString& sMessage)
 sProductKey = sProductKey.copy( nLastIndex+1 );
 }
 
-OUStringBuffer sTitle (128);
-sTitle.append  (sProductKey );
-sTitle.append (" - Fatal Error");
-
-Application::ShowNativeErrorBox (sTitle.makeStringAndClear (), sMessage);
+OUString sTitle = sProductKey + " - Fatal Error";
+Application::ShowNativeErrorBox (sTitle, sMessage);
 _exit(EXITHELPER_FATAL_ERROR);
 }
 
@@ -849,29 +834,18 @@ void Desktop::HandleBootstrapErrors(
 }
 
 // First sentence. We cannot bootstrap office further!
-OUStringaMessage;
-OUStringBufferaDiagnosticMessage( 100 );
-
-OUString aErrorMsg = DpResId(STR_BOOTSTRAP_ERR_NO_CFG_SERVICE);
-
-aDiagnosticMessage.append( aErrorMsg );
-aDiagnosticMessage.append( "\n" );
+OUString aDiagnosticMessage = 
DpResId(STR_BOOTSTRAP_ERR_NO_CFG_SERVICE) + "\n";
 if ( !aErrorMessage.isEmpty() )
 {
-aDiagnosticMessage.append( "(\"" );
-aDiagnosticMessage.append( aErrorMessage );
-aDiagnosticMessage.append( "\")\n" );
+aDiagnosticMessage += "(\"" + aErrorMessage + "\")\n";
 }
 
 // Due to the fact the we haven't a backup applicat.rdb file anymore 
it is not possible to
 // repair the installation with the setup executable besides the 
office executable. Now
 // we have to ask the user to start the setup on CD/installation 
directory manually!!
-OUString aStartSetupManually(DpResId(STR_ASK_START_SETUP_MANUALLY));
+aDiagnosticMessage += DpResId(STR_ASK_START_SETUP_MANUALLY);
 
-aDiagnosticMessage.append(aStartSetupManually);
-aMessage = 
MakeStartupErrorMessage(aDiagnosticMessage.makeStringAndClear());
-
-FatalError( aMessage);
+FatalError(MakeStartupErrorMessage(aDiagnosticMessage));
 }
 else if ( aBootstrapError == BE_OFFICECONFIG_BROKEN )
 {
@@ -891,50 +865,30 @@ void Desktop::HandleBootstrapErrors(
 }
 else if ( aBootstrapError == BE_USERINSTALL_FAILED )
 {
-OUString aMessage;
-OUStringBuffer aDiagnosticMessage( 100 );
-OUString aErrorMsg;
-aErrorMsg = DpResId(STR_BOOTSTRAP_ERR_USERINSTALL_FAILED);
-aDiagnosticMessage.append( aErrorMsg );
-aMessage = MakeStartupErrorMessage( 
aDiagnosticMessage.makeStringAndClear() );
-FatalError(aMessage);
+OUString aDiagnosticMessage = 
DpResId(STR_BOOTSTRAP_ERR_USERINSTALL_FAILED);
+FatalError(MakeStartupErrorMessage(aDiagnosticMessage));
 }
 else if ( aBootstrapError == BE_LANGUAGE_MISSING )
 {
-OUString aMessage;
-OUStringBuffer aDiagnosticMessage( 100 );
-OUString aErrorMsg;
-aErrorMsg = DpResId(
-//@@@ FIXME: should use an own resource string => #i36213#
-STR_BOOTSTRAP_ERR_LANGUAGE_MISSING);
-aDiagnosticMessage.append( aErrorMsg );
-aMessage = MakeStartupErrorMessage(
-

Crash test update

2017-11-23 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/95e3e5b83b2b7be86310f38aeae60cd4bc83939b/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: RepositoryExternal.mk

2017-11-23 Thread Thorsten Behrens

 RepositoryExternal.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit db2111d207770c7a15e9535dfd7d8ec012125d19
Author: Thorsten Behrens 
Date:   Thu Nov 23 10:02:09 2017 +0100

gpg4libre: package gpgme spawn helper for Windows

Change-Id: If8dbe10b87d329fab3639392f6c352bce75c54c1
Reviewed-on: https://gerrit.libreoffice.org/45127
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 995a490214ec..cad1db6ddc7c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3534,6 +3534,10 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
gpgmepp \
 ))
 
+$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
+   gpgmepp-w32spawn \
+))
+
 endif
 
 ifneq ($(filter MACOSX LINUX,$(OS)),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
+
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |5 
-
 sc/uiconfig/scalc/menubar/menubar.xml|3 ++-
 sc/uiconfig/scalc/popupmenu/cell.xml |6 
--
 sw/uiconfig/sglobal/menubar/menubar.xml  |2 +-
 sw/uiconfig/swriter/menubar/menubar.xml  |2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit b2f79f363c02738bf9d3b4e7b2834214b8a52c96
Author: Yousuf Philips 
Date:   Wed Nov 22 17:56:53 2017 +0400

tdf#50746 add paste unformatted to menu and context menu

also unified menus and context menus in writer and calc

Change-Id: I929df7a0fe2be7b8bf58cf048e53536ea89d5c9c
Reviewed-on: https://gerrit.libreoffice.org/45095
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 6b755820bb41..791ebefce51b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6036,6 +6036,11 @@
   
 
 
+  
+
+  Paste ~Special
+
+  
   
 
   St~yle
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 5b3c5ed09ae9..fb87ee73b526 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2635,11 +2635,6 @@
   
 
 
-  
-
-  Paste ~Special
-
-  
   
 
   T~able
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 812903a8de48..0a4136d3c242 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -84,7 +84,7 @@
 
 
 
-
+
 
 
 
@@ -92,6 +92,7 @@
 
 
 
+
 
 
 
diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml 
b/sc/uiconfig/scalc/popupmenu/cell.xml
index 57ecd2864069..7412caf636ff 100644
--- a/sc/uiconfig/scalc/popupmenu/cell.xml
+++ b/sc/uiconfig/scalc/popupmenu/cell.xml
@@ -11,12 +11,14 @@
   
   
   
-  
-  
+  
 
   
   
   
+  
+  
+  
 
   
   
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index e492f604017c..19b9c3fabbaf 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -93,8 +93,8 @@
   
   
   
-  
   
+  
   
   
 
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index b5ba20d1f96d..1f7366733f59 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -93,8 +93,8 @@
   
   
   
-  
   
+  
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_gpgme.h.in configure.ac xmlsecurity/source

2017-11-23 Thread Thorsten Behrens

 config_host/config_gpgme.h.in  |3 +++
 configure.ac   |1 +
 xmlsecurity/source/helper/documentsignaturemanager.cxx |6 --
 xmlsecurity/source/helper/xsecctl.cxx  |5 +++--
 xmlsecurity/source/helper/xsecverify.cxx   |3 ++-
 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx  |5 +++--
 6 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 43ac50dcccdf4f1954e666d6b18452b37a19d31e
Author: Thorsten Behrens 
Date:   Wed Nov 22 19:06:26 2017 +0100

gpg4libre: conditional-compile gpgme code

Change-Id: I1d139a7b6df271d61bedd107c6b3a0535d233606
Reviewed-on: https://gerrit.libreoffice.org/45124
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/config_host/config_gpgme.h.in b/config_host/config_gpgme.h.in
index 50f9edd8f8a0..86f3f07931f6 100644
--- a/config_host/config_gpgme.h.in
+++ b/config_host/config_gpgme.h.in
@@ -10,6 +10,9 @@
 /* Configuration for gpgme++.
  */
 
+// Defined if gpgme support is available
+#define GPGME_HAVE_GPGME 0
+
 // Defined if gpgme supports exporting minimal key.
 #define GPGME_CAN_EXPORT_MINIMAL_KEY 0
 
diff --git a/configure.ac b/configure.ac
index d36e75b472b6..8e0822caac64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10169,6 +10169,7 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin" \
 LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs 
-lassuan"
 fi
 fi
+AC_DEFINE([GPGME_HAVE_GPGME])
 fi
 AC_SUBST(SYSTEM_GPGMEPP)
 AC_SUBST(GPG_ERROR_CFLAGS)
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx 
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 78ce27d18dae..7cfeb2728ae8 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 
@@ -64,14 +66,14 @@ bool DocumentSignatureManager::init()
 initXmlSec();
 
 mxSEInitializer = xml::crypto::SEInitializer::create(mxContext);
-#if !defined(MACOSX) && !defined(WNT) && !defined(ANDROID)
+#if GPGME_HAVE_GPGME
 mxGpgSEInitializer.set(new SEInitializerGpg());
 #endif
 
 if (mxSEInitializer.is())
 mxSecurityContext = mxSEInitializer->createSecurityContext(OUString());
 
-#if !defined(MACOSX) && !defined(WNT) && !defined(ANDROID)
+#if GPGME_HAVE_GPGME
 if (mxGpgSEInitializer.is())
 mxGpgSecurityContext = 
mxGpgSEInitializer->createSecurityContext(OUString());
 
diff --git a/xmlsecurity/source/helper/xsecctl.cxx 
b/xmlsecurity/source/helper/xsecctl.cxx
index a64883d842b1..c746f8012f95 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -17,12 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
 #include 
 #include 
 #include 
 #include 
-#if !defined(MACOSX) && !defined(WNT) && !defined(ANDROID)
+#if GPGME_HAVE_GPGME
 # include 
 #endif
 
@@ -160,7 +161,7 @@ void XSecController::createXSecComponent( )
 
 cssu::Reference< cssl::XMultiComponentFactory > xMCF( 
mxCtx->getServiceManager() );
 
-#if !defined(MACOSX) && !defined(WNT) && !defined(ANDROID)
+#if GPGME_HAVE_GPGME
 uno::Reference< lang::XServiceInfo > xServiceInfo( m_xSecurityContext, 
cssu::UNO_QUERY );
 if (xServiceInfo->getImplementationName() == 
"com.sun.star.xml.security.gpg.XMLSecurityContext_GpgImpl")
 m_xXMLSignature.set(new XMLSignature_GpgImpl());
diff --git a/xmlsecurity/source/helper/xsecverify.cxx 
b/xmlsecurity/source/helper/xsecverify.cxx
index 72474337a7e7..707527d3acdb 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
 #include 
 #include "xsecparser.hxx"
@@ -119,7 +120,7 @@ void XSecController::addSignature()
 
 void XSecController::switchGpgSignature()
 {
-#if !defined(MACOSX) && !defined(WNT) && !defined(ANDROID)
+#if GPGME_HAVE_GPGME
 // swap signature verifier for the Gpg one
 m_xXMLSignature.set(new XMLSignature_GpgImpl());
 if (!m_vInternalSignatureInformations.empty())
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx 
b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index 807eff2cddee..265ab2f8f960 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -27,7 +27,8 @@
 #include 
 #include "xsec_xmlsec.hxx"
 
-#if !defined(MACOSX) && !defined(WNT) && !defined(ANDROID)
+#include 
+#if GPGME_HAVE_GPGME
 # include 
 #endif
 
@@ -44,7 +45,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL 
xsec_xmlsec_component_getFactory( const sal_
 Reference< XInterface > xFactory ;
 
 if( pImplName != nullptr ) {
-#if !defined(MACOSX) && !defined(WNT)

Timotej Lazar license statement

2017-11-23 Thread Timotej Lazar

Hi,

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.

Regards,
Timotej Lazar
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-11-23 Thread Noel Grandin

 sfx2/source/doc/objcont.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 530a587f232e2552216fae363d798901aa2bd259
Author: Noel Grandin 
Date:   Wed Nov 22 15:46:20 2017 +0200

tdf#113935 Switching from read-only to edit mode slow

Regression introduced by

commit 389da66dfc96d06c407bff156c4ea21e940c5e06
remove unused uno::Reference vars

I'm guessing this variable keeps some kind of cache alive which prevents
us from re-parsing the PDF file when we switch to edit mode - which is
clearly what we are doing when I remove the line.

Change-Id: Iea2cf9640d876028a78806e717b930d4a063dc9b
Reviewed-on: https://gerrit.libreoffice.org/45093
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit 5ee141ee2fb77c3cc452ac656235d7e83e15072c)
Reviewed-on: https://gerrit.libreoffice.org/45108
Tested-by: Noel Grandin 
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index ca419ab37d64..9acded4ba510 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -384,6 +384,11 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
 // update only for documents loaded from the local file system
 return;
 
+// tdf#113935 - do not remove this line - somehow, it makes the process
+// of switching from viewing a read-only document to opening it in writable
+// mode much faster.
+uno::Reference< embed::XStorage > xDocStor = pFile->GetStorage();
+
 // only for own storage formats
 if ( !pFile->GetFilter() || !pFile->GetFilter()->IsOwnFormat() )
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Stephan Bergmann

 extensions/source/update/check/updatecheck.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eeb0ea67d242d77c6ec56e4601d44c9517eb381b
Author: Stephan Bergmann 
Date:   Thu Nov 23 11:23:39 2017 +0100

loplugin:simplifybool

Change-Id: I2e340824db3e1e5197a23e567e4b88b64136562f

diff --git a/extensions/source/update/check/updatecheck.cxx 
b/extensions/source/update/check/updatecheck.cxx
index 7e59bfc9a7ea..8c52e1c138c8 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -480,7 +480,7 @@ UpdateCheckThread::run()
 rModel.clear();
 
 // last == 0 means check immediately
-bool checkNow = ! (last > 0);
+bool checkNow = last <= 0;
 
 // Reset the condition to avoid busy loops
 if( osl::Condition::result_ok == aResult )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Julien Nabet

 sc/source/ui/view/tabvwsha.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ad0fc224acb42cad766813972689deb5e4bb3c32
Author: Julien Nabet 
Date:   Tue Nov 21 20:43:35 2017 +0100

Disabled slot with Put leaks entry (tabvwsha/sc)

Same as 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=21dde7a09e2cfe7b48d2fec1edc7a94fa94af5c3

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

diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index a0eb6aec055d..861ced08b5a6 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -425,18 +425,18 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
 break;
 case FID_CHG_ACCEPT:
 {
-rSet.Put(SfxBoolItem(FID_CHG_ACCEPT,
-pThisFrame->HasChildWindow(FID_CHG_ACCEPT)));
-if(pDoc->GetChangeTrack()==nullptr)
+if(
+   ( !pDoc->GetChangeTrack() &&  
!pThisFrame->HasChildWindow(FID_CHG_ACCEPT) )
+   ||
+   ( pDocShell && pDocShell->IsDocShared() )
+  )
 {
-if ( !pThisFrame->HasChildWindow(FID_CHG_ACCEPT) )
-{
-rSet.DisableItem( nWhich);
-}
+rSet.DisableItem( nWhich);
 }
-if ( pDocShell && pDocShell->IsDocShared() )
+else
 {
-rSet.DisableItem( nWhich );
+rSet.Put(SfxBoolItem(FID_CHG_ACCEPT,
+pThisFrame->HasChildWindow(FID_CHG_ACCEPT)));
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Samuel Mehrbrodt

 oox/source/export/vmlexport.cxx |   13 +++--
 1 file changed, 3 insertions(+), 10 deletions(-)

New commits:
commit a8e83ce1d86892061603159f5c4460803d077fd5
Author: Samuel Mehrbrodt 
Date:   Tue Nov 21 14:39:44 2017 +0100

Convert fprintf to SAL_WARN / SAL_INFO

Change-Id: Ibdc67eb7af83c9ffa29531a20f68efce578f3e47
Reviewed-on: https://gerrit.libreoffice.org/45082
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index b90b18977ec9..29034a9ba07b 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -93,10 +93,7 @@ void VMLExport::OpenContainer( sal_uInt16 nEscherContainer, 
int nRecInstance )
 if ( nEscherContainer == ESCHER_SpContainer )
 {
 // opening a shape container
-#if OSL_DEBUG_LEVEL > 0
-if ( m_nShapeType != ESCHER_ShpInst_Nil )
-fprintf( stderr, "Warning!  VMLExport::OpenContainer(): opening 
shape inside a shape.\n" );
-#endif
+SAL_WARN_IF(m_nShapeType != ESCHER_ShpInst_Nil, "oox.vml", "opening 
shape inside of a shape!");
 m_nShapeType = ESCHER_ShpInst_Nil;
 m_pShapeAttrList = FastSerializerHelper::createAttrList();
 
@@ -589,10 +586,8 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, 
const tools::Rectangle&
 if ( !aPath.isEmpty() && pathString != "xe" )
 m_pShapeAttrList->add( XML_path, pathString );
 }
-#if OSL_DEBUG_LEVEL > 0
 else
-fprintf( stderr, "TODO: unhandled shape path, missing 
either pVertices or pSegmentInfo.\n" );
-#endif
+SAL_WARN("oox.vml", "unhandled shape path, missing 
either pVertices or pSegmentInfo.");
 }
 bAlreadyWritten[ ESCHER_Prop_pVertices ] = true;
 bAlreadyWritten[ ESCHER_Prop_pSegmentInfo ] = true;
@@ -653,9 +648,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, 
const tools::Rectangle&
 // TODO case ESCHER_FillShadeTitle:  pFillType 
= ""; break;
 // TODO case ESCHER_FillBackground:  pFillType 
= ""; break;
 default:
-#if OSL_DEBUG_LEVEL > 0
-fprintf( stderr, "TODO: unhandled fill 
type\n" );
-#endif
+SAL_INFO("oox.vml", "Uunhandled fill type: 
" << nValue);
 break;
 }
 if ( pFillType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gbuild-to-ide

2017-11-23 Thread Miklos Vajna

 bin/gbuild-to-ide |4 
 1 file changed, 4 deletions(-)

New commits:
commit f85859d2146b29ed4dce17695efd4012a0fa1e1c
Author: Miklos Vajna 
Date:   Thu Nov 23 09:07:47 2017 +0100

vim-ide-integration: -I workaround is no longer needed

Since commit ecbaf980625a9e7b06abe91c7c70e78f6ad469a7 (-I$(dir $(3)) in
gb_CObject__command_pattern is no longer needed, 2017-11-01).

Change-Id: I9d6b7436f7b6e865d37e358adb9cf075e4e51bff

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index abf7c7c572bb..35fefd110e0b 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -365,10 +365,6 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
 command += '='
 command += value
 
-# The directory of the file is missing from lib's include list, as that
-# one is not the same for all source files in the lib.
-command += ' -I' + os.path.dirname(file)
-
 for include in lib.include:
 command += ' -I'
 command += include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

2017-11-23 Thread Stephan Bergmann

 compilerplugins/clang/simplifybool.cxx  |   32 +---
 compilerplugins/clang/test/simplifybool.cxx |   32 
 2 files changed, 61 insertions(+), 3 deletions(-)

New commits:
commit 52dbe0c99b58bf306004e3e7f7d0d98adb16193b
Author: Stephan Bergmann 
Date:   Wed Nov 22 13:13:09 2017 +0100

Make not warning about !! in loplugin:simplifybool consistent

...so that 640e03da110d76b2c7d5ed5b8b8ba3b4367865ba "loplugin:simplifybool 
re-
activate the !! warning", which did not warn about

  !!( nAttribs & ucb::ContentInfoAttribute::KIND_FOLDER )

in ucb/source/core/ucbcmds.cxx (involving sal_Int32 and sal_Int16), would 
not
have warned about

  !!(nMode & nUpdateMode)

in sfx2/source/appl/workwin.cxx (ivolving 
o3tl::typed_flags)
either.

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

diff --git a/compilerplugins/clang/simplifybool.cxx 
b/compilerplugins/clang/simplifybool.cxx
index 091591f30988..260946a5fd98 100644
--- a/compilerplugins/clang/simplifybool.cxx
+++ b/compilerplugins/clang/simplifybool.cxx
@@ -7,10 +7,35 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
 #include "plugin.hxx"
 
 namespace {
 
+// Like clang::Stmt::IgnoreImplicit (lib/AST/Stmt.cpp), but also looking 
through implicit
+// UserDefinedConversion's member function call:
+Expr const * ignoreAllImplicit(Expr const * expr) {
+if (auto const e = dyn_cast(expr)) {
+expr = e->getSubExpr();
+}
+if (auto const e = dyn_cast(expr)) {
+expr = e->GetTemporaryExpr();
+}
+if (auto const e = dyn_cast(expr)) {
+expr = e->getSubExpr();
+}
+while (auto const e = dyn_cast(expr)) {
+expr = e->getSubExpr();
+if (e->getCastKind() == CK_UserDefinedConversion) {
+auto const ce = cast(expr);
+assert(ce->getNumArgs() == 0);
+expr = ce->getImplicitObjectArgument();
+}
+}
+return expr;
+}
+
 Expr const * ignoreParenImpCastAndComma(Expr const * expr) {
 for (;;) {
 expr = expr->IgnoreParenImpCasts();
@@ -94,15 +119,16 @@ bool SimplifyBool::VisitUnaryLNot(UnaryOperator const * 
expr) {
 if (e->getLocStart().isMacroID())
 return true;
 // double logical not of an int is an idiom to convert to bool
-if (!e->IgnoreImpCasts()->getType()->isBooleanType())
+auto const sub = ignoreAllImplicit(e);
+if (!sub->getType()->isBooleanType())
 return true;
 report(
 DiagnosticsEngine::Warning,
 ("double logical negation expression of the form '!!A' (with A of 
type"
  " %0) can %select{logically|literally}1 be simplified as 'A'"),
 expr->getLocStart())
-<< e->IgnoreImpCasts()->getType()
-<< e->IgnoreImpCasts()->getType()->isBooleanType()
+<< sub->getType()
+<< sub->getType()->isBooleanType()
 << expr->getSourceRange();
 return true;
 }
diff --git a/compilerplugins/clang/test/simplifybool.cxx 
b/compilerplugins/clang/test/simplifybool.cxx
index 383e513b25e2..e6b52c33f3b6 100644
--- a/compilerplugins/clang/test/simplifybool.cxx
+++ b/compilerplugins/clang/test/simplifybool.cxx
@@ -15,4 +15,36 @@ void f1(int a, int b)
 }
 };
 
+// Consitently either warn about all or none of the below occurrences of "!!":
+
+enum E1
+{
+E1_1 = 1
+};
+
+enum E2
+{
+E2_1 = 1
+};
+E2 operator&(E2 e1, E2 e2);
+bool operator!(E2 e);
+
+enum class E3
+{
+E1 = 1
+};
+struct W
+{
+operator bool();
+};
+W operator&(E3 e1, E3 e2);
+
+bool f0(int n) { return !!(n & 1); }
+
+bool f1(E1 e) { return !!(e & E1_1); }
+
+bool f2(E2 e) { return !!(e & E2_1); }
+
+bool f3(E3 e) { return !!(e & E3::E1); }
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/source compilerplugins/clang cppcanvas/source cui/source dbaccess/source i18npool/source reportdesign/source sc/source sd/source sot/source svtools/source svx/s

2017-11-23 Thread Stephan Bergmann

 basegfx/source/polygon/b2dpolygontools.cxx|2 
 compilerplugins/clang/test/unnecessaryparen.cxx   |   12 +
 compilerplugins/clang/unnecessaryparen.cxx|   19 
++-
 cppcanvas/source/mtfrenderer/implrenderer.cxx |   20 

 cui/source/tabpages/swpossizetabpage.cxx  |2 
 dbaccess/source/ui/dlg/advancedsettings.cxx   |2 
 dbaccess/source/ui/querydesign/JoinTableView.cxx  |2 
 i18npool/source/characterclassification/cclass_unicode_parser.cxx |2 
 reportdesign/source/filter/xml/xmlfilter.cxx  |2 
 reportdesign/source/ui/dlg/Formula.cxx|2 
 sc/source/core/data/column.cxx|2 
 sd/source/ui/tools/PreviewRenderer.cxx|2 
 sot/source/sdstor/ucbstorage.cxx  |4 -
 svtools/source/contnr/iconviewimpl.cxx|2 
 svtools/source/contnr/treelistbox.cxx |4 -
 svx/source/dialog/srchdlg.cxx |   24 
+-
 sw/source/core/doc/DocumentContentOperationsManager.cxx   |2 
 sw/source/core/layout/paintfrm.cxx|2 
 sw/source/filter/html/htmlflywriter.cxx   |4 -
 sw/source/filter/xml/xmlexpit.cxx |2 
 sw/source/uibase/docvw/edtwin.cxx |2 
 toolkit/source/awt/vclxwindows.cxx|2 
 vcl/source/control/imp_listbox.cxx|8 +--
 vcl/source/gdi/pdfwriter_impl.cxx |   16 +++---
 vcl/source/gdi/salgdilayout.cxx   |   12 ++---
 vcl/source/outdev/bitmap.cxx  |2 
 vcl/source/window/toolbox.cxx |2 
 vcl/unx/generic/window/salframe.cxx   |   10 ++--
 vcl/unx/gtk/gtksalframe.cxx   |8 +--
 vcl/unx/gtk/salnativewidgets-gtk.cxx  |2 
 vcl/unx/gtk3/gtk3gtkframe.cxx |8 +--
 vcl/unx/kde4/KDESalGraphics.cxx   |   12 ++---
 32 files changed, 111 insertions(+), 86 deletions(-)

New commits:
commit b26012ef159bd420ac3bb9275607d3a1622422f7
Author: Stephan Bergmann 
Date:   Thu Nov 23 08:13:06 2017 +0100

Make loplugin:unnecessaryparen look through implicit

...similar to how  "Make not 
warning
about !! in loplugin:simplifybool consistent" does for loplugin:simplifybool

Change-Id: I23eef400af71c582d380c9bae6546ce06e8a1e18
Reviewed-on: https://gerrit.libreoffice.org/45122
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/basegfx/source/polygon/b2dpolygontools.cxx 
b/basegfx/source/polygon/b2dpolygontools.cxx
index 45fc27f5575f..489b77af92aa 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -946,7 +946,7 @@ namespace basegfx
 
 if(!bFinished && (aCutFlags & CutFlagValue::LINE))
 {
-if((aCutFlags & CutFlagValue::START1))
+if(aCutFlags & CutFlagValue::START1)
 {
 // start1 on line 2 ?
 if(isPointOnEdge(rEdge1Start, rEdge2Start, rEdge2Delta, 
&fCut2))
diff --git a/compilerplugins/clang/test/unnecessaryparen.cxx 
b/compilerplugins/clang/test/unnecessaryparen.cxx
index 968522d63a73..4e85fe97076f 100644
--- a/compilerplugins/clang/test/unnecessaryparen.cxx
+++ b/compilerplugins/clang/test/unnecessaryparen.cxx
@@ -14,6 +14,8 @@ bool foo(int);
 
 enum class EFoo { Bar };
 
+struct S { operator bool(); };
+
 int main()
 {
 int x = 1;
@@ -49,6 +51,16 @@ int main()
 std::string v3;
 v3 = (std::string("xx") + "xx"); // expected-error {{parentheses 
immediately inside assignment [loplugin:unnecessaryparen]}}
 (void)v3;
+
+S s1;
+if ((s1)) { // expected-error {{parentheses immediately inside if 
statement [loplugin:unnecessaryparen]}}
+// expected-error@-1 {{unnecessary parentheses around identifier 
[loplugin:unnecessaryparen]}}
+return 0;
+}
+S s2;
+if ((s2 = s1)) {
+return 0;
+}
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unnecessaryparen.cxx 
b/compilerplugins/clang/unnecessaryparen.cxx
index fdc83410cb0e..a7d3d26e6591 100644
--- a/compilerplugins/clang/unnecessaryparen.cxx
+++ b/compilerplugins/clang/unnecessaryparen.cxx
@@ -23,8 +23,8 @@ look for unnecessary parentheses
 
 namespace {
 
-// Like clang

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

2017-11-23 Thread Miklos Vajna

 solenv/clang-format/blacklist |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bfaf5740bb10ce8c51017cba44681de10953bea4
Author: Miklos Vajna 
Date:   Thu Nov 23 09:56:03 2017 +0100

ios: blacklist newly pushed non-formatted files

Commit ed885a3cdbfc4b4d194d40508a29334b9780858f (iOS, do not use
different C compilers, 2017-11-23) was pushed directly and clang-format
wasn't used locally, either -- so just blacklist these new files.

Change-Id: Id6e39e68ac112494139e982ebcf7c32531184ec2

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index c698185bb47c..c8709b81d8c3 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -8296,6 +8296,8 @@ ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c
 ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h
 ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c
 ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
+ios/source/LibreOfficeKit.c
+ios/source/LibreOfficeKit.h
 javaunohelper/source/bootstrap.cxx
 javaunohelper/source/javaunohelper.cxx
 javaunohelper/source/juhx-export-functions.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/Library_fwe.mk framework/source include/framework sfx2/inc sfx2/Library_sfx.mk sfx2/source solenv/clang-format

2017-11-23 Thread Caolán McNamara

 framework/Library_fwe.mk |1 -
 sfx2/Library_sfx.mk  |1 +
 sfx2/inc/preventduplicateinteraction.hxx |8 +++-
 sfx2/source/appl/appopen.cxx |6 +++---
 sfx2/source/appl/preventduplicateinteraction.cxx |6 +++---
 solenv/clang-format/blacklist|4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)

New commits:
commit 6d5aeece56e0ab33150bdcf8a037cdb004ae2d1d
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 22 15:15:08 2017 +

move preventduplicateinteraction from framework to sfx2 consumer

Change-Id: I1388a88ba20b5cde65cd1d88694775b071a0dff6
Reviewed-on: https://gerrit.libreoffice.org/45099
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 5f70d38eb004..bff052f499ad 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
 framework/source/fwe/helper/titlehelper \
 framework/source/fwe/helper/documentundoguard \
 framework/source/fwe/helper/undomanagerhelper \
-framework/source/fwe/interaction/preventduplicateinteraction \
 framework/source/fwe/xml/menuconfiguration \
 framework/source/fwe/xml/menudocumenthandler \
 framework/source/fwe/xml/saxnamespacefilter \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 3dd3d892ed4c..d721b72438a8 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/appl/newhelp \
 sfx2/source/appl/opengrf \
 sfx2/source/appl/openuriexternally \
+sfx2/source/appl/preventduplicateinteraction \
 sfx2/source/appl/sfxhelp \
 sfx2/source/appl/sfxpicklist \
 sfx2/source/appl/shellimpl \
diff --git a/include/framework/preventduplicateinteraction.hxx 
b/sfx2/inc/preventduplicateinteraction.hxx
similarity index 98%
rename from include/framework/preventduplicateinteraction.hxx
rename to sfx2/inc/preventduplicateinteraction.hxx
index ae5bafaaf28a..f7bec486a2cf 100644
--- a/include/framework/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_PREVENTDUPLICATEINTERACTION_HXX
 #define INCLUDED_FRAMEWORK_PREVENTDUPLICATEINTERACTION_HXX
 
-#include 
-
 #include 
 
 #include 
@@ -33,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace 
uno {
 class XComponentContext;
 } } } }
 
-namespace framework{
+namespace sfx2 {
 
 /**
 @short  Prevent us from showing the same interaction more than once 
during
@@ -51,7 +49,7 @@ struct ThreadHelpBase2
 mutable ::osl::Mutex m_aLock;
 };
 
-class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
+class PreventDuplicateInteraction : private ThreadHelpBase2
 ,public ::cppu::WeakImplHelper< 
css::task::XInteractionHandler2 >
 {
 
@@ -230,7 +228,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private 
ThreadHelpBase2
   
PreventDuplicateInteraction::InteractionInfo* pReturn ) const;
 };
 
-} // namespace framework
+} // namespace sfx2
 
 #endif // INCLUDED_FRAMEWORK_PREVENTDUPLICATEINTERACTION_HXX
 
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 8e1a16c00f17..0ae86d85f9b4 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -53,7 +53,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -666,7 +666,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 // intercept all incoming interactions and provide useful 
information
 // later if the following transaction was finished.
 
-::framework::PreventDuplicateInteraction* pHandler 
  = new 
::framework::PreventDuplicateInteraction(::comphelper::getProcessComponentContext());
+::sfx2::PreventDuplicateInteraction* pHandler  
 = new 
::sfx2::PreventDuplicateInteraction(::comphelper::getProcessComponentContext());
 css::uno::Reference< css::task::XInteractionHandler > xHandler 
  (static_cast< css::task::XInteractionHandler* >(pHandler), 
css::uno::UNO_QUERY);
 css::uno::Reference< css::task::XInteractionHandler > 
xWrappedHandler;
 
@@ -685,7 +685,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
 // define rules for this handler
 css::uno::Type
aInteraction = ::cppu::UnoType::get();
-::framework::PreventDuplicateInteraction::InteractionInfo aRule
(aInteraction, 1);
+::sfx2::PreventDuplicateInteraction::InteractionInfo aRule
(aInteraction, 1);
 pHandler->addInteractionRule(aRule);

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

2017-11-23 Thread Jens Carl

 include/test/sheet/xscenarioenhanced.hxx|   34 
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |1 
 qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java   |   80 
--
 sc/qa/extras/sctablesheetobj.cxx|   40 -
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/xscenarioenhanced.cxx |   39 
 7 files changed, 113 insertions(+), 83 deletions(-)

New commits:
commit a8681f24d786a5498844e29a3029cf9e60e74ca3
Author: Jens Carl 
Date:   Thu Nov 23 07:24:25 2017 +

tdf#45904 Move _XScenarioEnhanced Java test to C++

Change-Id: Ibc99dc0d50e612bc6cdebaf5f9c5f828e5af859f
Reviewed-on: https://gerrit.libreoffice.org/45123
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/include/test/sheet/xscenarioenhanced.hxx 
b/include/test/sheet/xscenarioenhanced.hxx
new file mode 100644
index ..ff5261f31d50
--- /dev/null
+++ b/include/test/sheet/xscenarioenhanced.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XSCENARIOENHANCED_HXX
+#define INCLUDED_TEST_SHEET_XSCENARIOENHANCED_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XScenarioEnhanced
+{
+public:
+virtual css::uno::Reference getScenarioSpreadsheet() 
= 0;
+
+void testGetRanges();
+
+protected:
+~XScenarioEnhanced() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XSCENARIOENHANCED_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index f8d6b4a5ecd8..4ee5633c5650 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -609,7 +609,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XRangeSelection \
 qadevOOo/tests/java/ifc/sheet/_XRecentFunctions \
 qadevOOo/tests/java/ifc/sheet/_XScenario \
-qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced \
 qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor \
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
 qadevOOo/tests/java/ifc/style/_CharacterProperties \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
index 6f434c9b484c..4438b3b4d7c9 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -226,7 +226,6 @@
 
"ScTableSheetObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
 "ScTableSheetObj";"com::sun::star::sheet::XCellRangeData";"getDataArray()"
 "ScTableSheetObj";"com::sun::star::sheet::XCellRangeData";"setDataArray()"
-"ScTableSheetObj";"com::sun::star::sheet::XScenarioEnhanced#optional";"getRanges()"
 "ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"getData()"
 "ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"setData()"
 
"ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"getRowDescriptions()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java 
b/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java
deleted file mode 100644
index e573ea45f63d..
--- a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package ifc.sheet;
-
-import com.sun.star.sheet.XScenarioEnhanced;
-import com.sun.star.table.CellRangeAddress;
-import com.sun.star.uno.UnoRuntime;
-
-import lib.MultiMethodTest;
-
-public class _XScenarioEnhanced extends MultiMethodTest {
-public XScenarioEnhanced oObj = null;
-
-@Override
-public void be

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

2017-11-23 Thread Julien Nabet

 binaryurp/source/incomingrequest.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d3c607b4bbcc1727ba0d295ac7193bea2874ed5b
Author: Julien Nabet 
Date:   Fri Nov 17 19:16:04 2017 +0100

Replace list by vector in incomingrequest (binaryurp)

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

diff --git a/binaryurp/source/incomingrequest.cxx 
b/binaryurp/source/incomingrequest.cxx
index 86b3cc107c05..c54493d6e32a 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -174,7 +174,7 @@ bool IncomingRequest::execute_throw(
 {
 assert(object_.is());
 css::uno::TypeDescription retType;
-std::list< std::vector< char > > outBufs;
+std::vector< std::vector< char > > outBufs;
 std::vector< void * > args;
 switch (member_.get()->eTypeClass) {
 case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -257,7 +257,7 @@ bool IncomingRequest::execute_throw(
 typelib_InterfaceMethodTypeDescription * >(
 member_.get());
 std::vector< BinaryAny >::iterator 
i(outArguments->begin());
-std::list< std::vector< char > >::iterator j(
+std::vector< std::vector< char > >::iterator j(
 outBufs.begin());
 for (sal_Int32 k = 0; k != mtd->nParams; ++k) {
 if (mtd->pParams[k].bOut) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-23 Thread Tor Lillqvist

 configure.ac |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit b469ba0e7628199d40100d98ff19a835e273db43
Author: Tor Lillqvist 
Date:   Thu Nov 23 10:02:13 2017 +0200

Don't warn about the installer unless we are building an installer

Change-Id: Iefb40baab9eeaab6923a0f95681466afc6dc6643

diff --git a/configure.ac b/configure.ac
index 08a9c9cccf39..d36e75b472b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6500,8 +6500,16 @@ if test $_os = "WINNT"; then
 cd -
 else
 UCRT_REDISTDIR=""
-AC_MSG_WARN([--without-ucrt-dir not specified or dlls not found - 
installer will have runtime dependency])
-add_warning "--without-ucrt-dir not specified or dlls not found - 
installer will have runtime dependency"
+if test -n "$PKGFORMAT"; then
+   for i in "$PKGFORMAT"; do
+   case "$i" in
+   msi)
+   AC_MSG_WARN([--without-ucrt-dir not specified or dlls 
not found - installer will have runtime dependency])
+   add_warning "--without-ucrt-dir not specified or dlls 
not found - installer will have runtime dependency"
+   ;;
+   esac
+   done
+fi
 fi
 fi
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

73 matches

Mail list logo