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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/fods/decimal.fods | 1719 
 1 file changed, 1719 insertions(+)

New commits:
commit 62456ee20622eef8a3f5894946b844d1a9cc699e
Author: Zdeněk Crhonek 
Date:   Tue Oct 11 16:13:29 2016 +0200

add DECIMAL test case

Change-Id: Ia39837e0bf92008a7aceb97afd2f657c46287514
Reviewed-on: https://gerrit.libreoffice.org/29700
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/decimal.fods 
b/sc/qa/unit/data/functions/fods/decimal.fods
new file mode 100644
index 000..e5a4d63
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/decimal.fods
@@ -0,0 +1,1719 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-05-23T19:52:21.032366237P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/7b8832ff972a4e9f3e03fd7d96882b2a78c03b3e
+ 
+  
+   0
+   0
+   21171
+   16772
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   85
+   60
+   true
+   false
+  
+  
+   4
+   6
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   85
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 85
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ en
+ US
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   rgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink"/>
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+   £
+   
+  
+  
+   -
+   £
+   
+   
+  
+  
+   £
+   
+  
+  
+   -
+   £
+   
+   
+  
+  
+   £
+   
+  
+  
+   
+   -
+   £
+   
+   
+  
+  
+   £
+   
+  
+  
+   
+   -
+   £
+   
+   
+  
+  
+   £
+   
+  
+  
+   
+   -
+   £
+   
+   
+  
+  
+   
+
+  
+  
+   (
+   
+   )
+   
+  
+  
+   
+
+  
+  
+   (
+   
+   )
+   
+  
+  
+   £
+
+   
+  
+  
+   -
+   £
+
+   
+   
+  
+  
+   £
+
+   
+  
+  
+   -
+   £
+   

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

[Mike Kaganski]

 sw/source/uibase/docvw/SidebarWin.cxx |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit fa368c4eba7406b66623374cea69d9f59db1fb18
Author: Mike Kaganski 
Date:   Wed Sep 7 02:17:04 2016 +1000

tdf#91299: always use normal dates in comments (no "today"/"yesterday")

because if printed, these relative dates don't allow to know the
real dates.

Change-Id: I791214d727eee460dafeec2b7103f625ec08655d
Reviewed-on: https://gerrit.libreoffice.org/28698
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/sw/source/uibase/docvw/SidebarWin.cxx 
b/sw/source/uibase/docvw/SidebarWin.cxx
index 3c83978..9d8e7d6 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -677,17 +677,8 @@ void SwSidebarWin::CheckMetaText()
 mpMetadataAuthor->SetText(sMeta);
 }
 
-Date aSysDate( Date::SYSTEM );
 Date aDate = GetDate();
-if (aDate==aSysDate)
-{
-sMeta = SW_RESSTR(STR_POSTIT_TODAY);
-}
-else if (aDate == Date(aSysDate-1))
-{
-sMeta = SW_RESSTR(STR_POSTIT_YESTERDAY);
-}
-else if (aDate.IsValidAndGregorian() )
+if (aDate.IsValidAndGregorian() )
 {
 sMeta = rLocalData.getDate(aDate);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - chart2/source include/sfx2 include/svx reportdesign/source sfx2/source svx/source sw/source

[Maxim Monastirsky]

 chart2/source/controller/sidebar/ChartColorWrapper.cxx |   15 -
 include/sfx2/tbxctrl.hxx   |5 
 include/svx/linectrl.hxx   |5 
 include/svx/tbcontrl.hxx   |   17 -
 include/svx/tbxcolorupdate.hxx |1 
 reportdesign/source/ui/misc/toolboxcontroller.cxx  |8 
 sfx2/source/toolbox/tbxitem.cxx|  133 -
 svx/source/tbxctrls/PaletteManager.cxx |1 
 svx/source/tbxctrls/colorwindow.hxx|4 
 svx/source/tbxctrls/lboxctrl.cxx   |   12 
 svx/source/tbxctrls/linectrl.cxx   |   10 
 svx/source/tbxctrls/tbcontrl.cxx   |  248 +
 svx/source/tbxctrls/tbxcolorupdate.cxx |   12 
 sw/source/uibase/docvw/edtwin.cxx  |6 
 14 files changed, 113 insertions(+), 364 deletions(-)

New commits:
commit 9125a4f3f63a7f49fd307908c181e999120063e0
Author: Maxim Monastirsky 
Date:   Thu Oct 13 10:20:31 2016 +0300

Use FeatureStateEvent directly for status updates

... for SfxPopupWindow and SvxColorToolBoxControl (the
latter shares BorderColorStatus with SvxColorWindow_Impl,
so it was easier to convert it too).

Change-Id: Ifcb23fe5809e467322d1cf4d790420886ac79b47

diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index 4b2c769..b2ff619 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -11,9 +11,7 @@
 
 #include "ChartController.hxx"
 
-#include 
 #include 
-#include 
 
 namespace chart { namespace sidebar {
 
@@ -88,13 +86,14 @@ void ChartColorWrapper::updateData()
 if (!xPropSet.is())
 return;
 
-css::uno::Any aAny = xPropSet->getPropertyValue(maPropertyName);
-sal_uInt32 nColor = 0;
-aAny >>= nColor;
-Color aColor(nColor);
+css::util::URL aUrl;
+aUrl.Complete = ".uno:FillColor";
 
-SvxColorItem aItem(aColor, SID_ATTR_FILL_COLOR);
-mpControl->StateChanged(SID_ATTR_FILL_COLOR, SfxItemState::SET, &aItem);
+css::frame::FeatureStateEvent aEvent;
+aEvent.FeatureURL = aUrl;
+aEvent.IsEnabled = true;
+aEvent.State = xPropSet->getPropertyValue(maPropertyName);
+mpControl->statusChanged(aEvent);
 }
 
 } }
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 60536f5..6185ce7 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -95,10 +95,7 @@ protected:
 voidUnbindListener();
 voidAddStatusListener( const OUString& rCommandURL );
 
-// SfxStatusListenerInterface
-using FloatingWindow::StateChanged;
-virtual voidStateChanged( sal_uInt16 nSID, SfxItemState eState,
-  const SfxPoolItem* pState );
+virtual voidstatusChanged( const 
css::frame::FeatureStateEvent& rEvent );
 
 public:
 SfxPopupWindow( sal_uInt16 nId,
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index e29fe6c..99c4dbc 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -77,8 +77,6 @@ public:
 
 class SvxLineEndWindow : public SfxPopupWindow
 {
-using FloatingWindow::StateChanged;
-
 private:
 XLineEndListRef pLineEndList;
 VclPtr aLineEndSet;
@@ -116,8 +114,7 @@ public:
 
 voidStartSelection();
 
-virtual voidStateChanged( sal_uInt16 nSID, SfxItemState eState,
-  const SfxPoolItem* pState ) override;
+virtual voidstatusChanged( const css::frame::FeatureStateEvent& rEvent 
) override;
 };
 
 
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 174c16d..21f07f2 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -222,15 +222,13 @@ class BorderColorStatus
 public:
 BorderColorStatus();
 ~BorderColorStatus();
-void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* 
pState);
+bool statusChanged( const css::frame::FeatureStateEvent& rEvent );
 Color GetColor();
 };
 
 typedef std::function ColorSelectFunction;
 class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
 {
-using SfxToolBoxControl::StateChanged;
-
 std::unique_ptr m_xBtnUpdater;
 PaletteManager m_aPaletteManager;
 BorderColorStatus m_aBorderColorStatus;
@@ -242,8 +240,9 @@ public:
 SvxColorToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& 
rToolBox);
 virtual ~SvxColorToolBoxControl() override;
 
-virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-  const SfxPoolItem* pState) override;
+// XStatusListener
+virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& 
rEvent ) throw 

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

[Miklos Vajna]

 sw/source/core/layout/pagechg.cxx |2 +-
 sw/source/core/text/itrcrsr.cxx   |8 
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 192edafdd0e0ce38665d14022b4511eba1a9c954
Author: Miklos Vajna 
Date:   Thu Oct 13 08:02:22 2016 +0200

sw: remove useless debug code in SwTextMargin::CtorInitTextMargin()

Change-Id: I15bde2652ca39c2ea43036557c36b77c5ead0d32
Reviewed-on: https://gerrit.libreoffice.org/29750
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 720a541..0257f12 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1528,7 +1528,7 @@ void SwRootFrame::AssertPageFlys( SwPageFrame *pPage )
 // It can move by itself. Just send a modify to its 
anchor attribute.
 #if OSL_DEBUG_LEVEL > 1
 const size_t nCnt = pPage->GetSortedObjs()->size();
-rFormat.NotifyClients( 0, (SwFormatAnchor*)&rAnch );
+rFormat.NotifyClients( nullptr, &rAnch );
 OSL_ENSURE( !pPage->GetSortedObjs() ||
 nCnt != pPage->GetSortedObjs()->size(),
 "Object couldn't be reattached!" );
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 68fde89..884e5ce 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -344,14 +344,6 @@ void SwTextMargin::CtorInitTextMargin( SwTextFrame 
*pNewFrame, SwTextSizeInfo *p
 // #i91133#
 mnTabLeft = pNode->GetLeftMarginForTabCalculation();
 
-#if OSL_DEBUG_LEVEL > 1
-static bool bOne = false;
-static bool bLast = false;
-static bool bCenter = false;
-bOneBlock |= bOne;
-bLastBlock |= bLast;
-bLastCenter |= bCenter;
-#endif
 DropInit();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/source extensions/source include/svtools reportdesign/source sfx2/source svtools/source

[Caolán McNamara]

 dbaccess/source/ui/app/AppDetailView.cxx |1 
 dbaccess/source/ui/dlg/ConnectionHelper.cxx  |2 
 dbaccess/source/ui/dlg/ConnectionPage.cxx|2 
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx   |2 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx|2 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx  |1 
 dbaccess/source/ui/dlg/adminpages.cxx|2 
 dbaccess/source/ui/dlg/adtabdlg.cxx  |1 
 dbaccess/source/ui/dlg/dbadmin.cxx   |2 
 dbaccess/source/ui/dlg/dbwiz.cxx |1 
 dbaccess/source/ui/dlg/dbwizsetup.cxx|1 
 dbaccess/source/ui/dlg/detailpages.cxx   |2 
 dbaccess/source/ui/dlg/dsselect.cxx  |1 
 dbaccess/source/ui/dlg/generalpage.cxx   |2 
 dbaccess/source/ui/dlg/paramdialog.cxx   |1 
 dbaccess/source/ui/inc/localresaccess.hxx|   47 
 dbaccess/source/ui/querydesign/query.src |   16 
 dbaccess/source/ui/querydesign/querycontroller.cxx   |   11 
 extensions/source/abpilot/abspilot.cxx   |1 
 extensions/source/dbpilots/commonpagesdbp.cxx|1 
 extensions/source/dbpilots/controlwizard.cxx |1 
 extensions/source/propctrlr/formlinkdialog.cxx   |1 
 extensions/source/propctrlr/formmetadata.cxx |   20 
 extensions/source/propctrlr/formres.src  |  653 +++
 extensions/source/propctrlr/sqlcommanddesign.cxx |7 
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx |1 
 include/svtools/localresaccess.hxx   |   74 -
 reportdesign/source/ui/inspection/metadata.cxx   |1 
 sfx2/source/dialog/styfitem.cxx  |   41 
 svtools/source/dialogs/addresstemplate.cxx   |1 
 30 files changed, 271 insertions(+), 628 deletions(-)

New commits:
commit 15f5fdef976ac2a2fc7192ce7cd4324e0820a2ed
Author: Caolán McNamara 
Date:   Wed Oct 12 21:42:03 2016 +0100

move this monstrosity to the last place its used

Change-Id: I4691f20143406249afc8da1a6dfa901224f4a62d

diff --git a/extensions/source/abpilot/abspilot.cxx 
b/extensions/source/abpilot/abspilot.cxx
index 8ceb9e2..ca16523 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -23,7 +23,6 @@
 #include "componentmodule.hxx"
 #include 
 #include 
-#include 
 #include "typeselectionpage.hxx"
 #include "admininvokationpage.hxx"
 #include "tableselectionpage.hxx"
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx 
b/extensions/source/dbpilots/commonpagesdbp.cxx
index 84ee2e1..0dc6b27 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -30,7 +30,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/extensions/source/dbpilots/controlwizard.cxx 
b/extensions/source/dbpilots/controlwizard.cxx
index 82ea3ea..8f9a21c 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -40,7 +40,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx 
b/extensions/source/propctrlr/formlinkdialog.cxx
index 500bbc9..dfaf22f 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -30,7 +30,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx 
b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 15f97a5..012947b 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -42,7 +42,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/include/svtools/localresaccess.hxx 
b/include/svtools/localresaccess.hxx
deleted file mode 100644
index f38b1d3..000
--- a/include/svtools/localresaccess.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with th

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

[Caolán McNamara]

 extensions/source/propctrlr/fontdialog.cxx   |1 
 extensions/source/propctrlr/formlocalid.hrc  |   28 ---
 extensions/source/propctrlr/formres.src  |1 
 extensions/source/propctrlr/formresid.hrc|2 
 extensions/source/propctrlr/pcrmiscres.src   |   13 -
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx |1 
 6 files changed, 1 insertion(+), 45 deletions(-)

New commits:
commit 59ee2791e6c2640666dde6421db4f9b7964077ed
Author: Caolán McNamara 
Date:   Thu Oct 13 09:39:17 2016 +0100

drop unused RID_RSC_BUTTON_IMAGES resource

Change-Id: If85a3491c3cb6ebb05a82e1c732083d99e91d6e8

diff --git a/extensions/source/propctrlr/fontdialog.cxx 
b/extensions/source/propctrlr/fontdialog.cxx
index 61a8a71..a268635 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -21,7 +21,6 @@
 #include "fontdialog.hxx"
 #include "formresid.hrc"
 #include "modulepcr.hxx"
-#include "formlocalid.hrc"
 #include 
 #include 
 #include 
diff --git a/extensions/source/propctrlr/formlocalid.hrc 
b/extensions/source/propctrlr/formlocalid.hrc
deleted file mode 100644
index 59ca407..000
--- a/extensions/source/propctrlr/formlocalid.hrc
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLOCALID_HRC
-#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLOCALID_HRC
-
-#define IMG_PLUS1
-#define IMG_MINUS   2
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formres.src 
b/extensions/source/propctrlr/formres.src
index 6e3df3a..d09d7f9 100644
--- a/extensions/source/propctrlr/formres.src
+++ b/extensions/source/propctrlr/formres.src
@@ -18,7 +18,6 @@
  */
 
 #include "formresid.hrc"
-#include "formlocalid.hrc"
 
 String RID_STR_EDITMASK
 {
diff --git a/extensions/source/propctrlr/formresid.hrc 
b/extensions/source/propctrlr/formresid.hrc
index 3bf7a80..9f41b8f 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -286,7 +286,7 @@
 #define RID_RSC_ENUM_TEXTTYPE   ( RID_PROPCONTROLLER_START +  3 )
 #define RID_RSC_ENUM_VISUALEFFECT   ( RID_PROPCONTROLLER_START +  4 )
 #define RID_RSC_ENUM_IMAGE_POSITION ( RID_PROPCONTROLLER_START +  5 )
-#define RID_RSC_BUTTON_IMAGES   ( RID_PROPCONTROLLER_START +  6 )
+//available
 #define RID_RSC_ENUM_WHITESPACE_HANDLING( RID_PROPCONTROLLER_START +  7 )
 #define RID_RSC_ENUM_VERTICAL_ALIGN ( RID_PROPCONTROLLER_START +  8 )
 #define RID_RSC_ENUM_BORDER_TYPE( RID_PROPCONTROLLER_START +  9 )
diff --git a/extensions/source/propctrlr/pcrmiscres.src 
b/extensions/source/propctrlr/pcrmiscres.src
index 59e1e9b..29bed66 100644
--- a/extensions/source/propctrlr/pcrmiscres.src
+++ b/extensions/source/propctrlr/pcrmiscres.src
@@ -18,7 +18,6 @@
  */
 
 #include "formresid.hrc"
-#include "formlocalid.hrc"
 
 String RID_STR_CONFIRM_DELETE_DATA_TYPE
 {
@@ -26,18 +25,6 @@ String RID_STR_CONFIRM_DELETE_DATA_TYPE
  "Please note that this will affect all controls which are bound 
to this data type.";
 };
 
-Resource RID_RSC_BUTTON_IMAGES
-{
-Image IMG_PLUS
-{
-ImageBitmap = Bitmap{ file = "buttonplus.png"; };
-};
-Image IMG_MINUS
-{
-ImageBitmap = Bitmap{ file = "buttonminus.png"; };
-};
-};
-
 #define IMAGE_IDS \
 IdList = \
 { \
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx 
b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 012947b..136915e 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -26,7 +26,6 @@
 #include "xsddatatypes.hxx"
 #include "modulepcr.hxx"
 #include "formresid.hrc"
-#include "formlocalid.hrc"
 #include "propctrlr.hrc"
 #include "newdatatype.hxx"
 #include "xsdvalidationhelper.hxx"
_

_MSC_VER

[Stephan Bergmann]

 
announces that details of the predefined _MSC_VER macro will change 
slightly for future releases of Visual Studio.  Beginning with "VS '15' 
Preview 5' the lower two digits of _MSC_VER will increase with updates, 
instead of staying at "00".  That means that checks for compilers up to 
and including a certain version (regardless of update) shouldn't be done 
with


  #if _MSC_VER <= xx00

(Curiously, that blog post claims that "VS '15' Preview 5" has an 
_MSC_VER of 1910, i.e., still using the same major 19xx as the existing 
Visual Studio 2015, aka MSVC 14.)


I checked our code base, and the only use of "_MSC_VER <= 1900" is in 
include/rtl/stringutils.hxx, checking for a bug that is known to be 
present at least up to current Visual Studio 2015, so doing the check 
that way is correct for now (until we find out whether or not that bug 
is fixed in "VS '15' Preview 5" or later).  (There's also a handful of 
"_MSC_VER <= 1800" in sal/osl/w32/salinit.cxx and 
vcl/source/opengl/OpenGLHelper.cxx that should arguably be "_MSC_VER < 
1900", but those should be harmless, as there'll presumably be no 
updates to Visual Studio 2013 that bump to 18xx > 1800.)

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

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

[Tor Lillqvist]

 loolwsd/LOOLWSD.cpp |2 +-
 loolwsd/Util.cpp|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 213c7c6d09f46e786d9fa68cfefbd1019168e738
Author: Tor Lillqvist 
Date:   Thu Oct 13 11:58:15 2016 +0300

Catch by const ref

That's what we do everywhere else, not reason to do differently in
these two places.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 01b7b2a..cf22bfd 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -210,7 +210,7 @@ void shutdownLimitReached(WebSocket& ws)
 }
 while (retries > 0 && (flags & WebSocket::FRAME_OP_BITMASK) != 
WebSocket::FRAME_OP_CLOSE);
 }
-catch (Exception&)
+catch (const Exception&)
 {
 ws.sendFrame(error.data(), error.size());
 ws.shutdown(WebSocket::WS_POLICY_VIOLATION);
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 548698a..c367630 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -505,7 +505,7 @@ namespace Util
 {
 nMem = std::stoi(sResponse);
 }
-catch(std::exception& e)
+catch(const std::exception&)
 {
 Log::warn() << "Trying to find memory of invalid/dead PID" << 
Log::end;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk solenv/qa

[Bjoern Michaelsen]

 Repository.mk  |4 +
 solenv/qa/python/selftest/Library_gbuildselftest.mk|   37 +
 solenv/qa/python/selftest/Library_gbuildselftestdep.mk |   15 ++
 solenv/qa/python/selftest/Makefile |   21 +
 solenv/qa/python/selftest/Module_selftest.mk   |   17 +++
 5 files changed, 94 insertions(+)

New commits:
commit 7f77e6840d73c890e9cd0a94cab32b25d77883ae
Author: Bjoern Michaelsen 
Date:   Wed Oct 12 23:31:15 2016 +0200

add a testbed for gbuild

Change-Id: Ie6e54c291f92dfede113a1d0fa20771482d93605
Reviewed-on: https://gerrit.libreoffice.org/29743
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/Repository.mk b/Repository.mk
index f8599b3..169769e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1000,4 +1000,8 @@ $(eval $(call gb_Helper_register_uiconfigs,\
xmlsec \
 ))
 
+ifeq ($(gb_GBUILDSELFTEST),t)
+$(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo,gbuildselftestdep 
gbuildselftest))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/qa/python/selftest/Library_gbuildselftest.mk 
b/solenv/qa/python/selftest/Library_gbuildselftest.mk
new file mode 100644
index 000..d1b3919
--- /dev/null
+++ b/solenv/qa/python/selftest/Library_gbuildselftest.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Library_Library,gbuildselftest))
+
+$(eval $(call gb_Library_set_include,gbuildselftest,\
+-Igbuildtoidetestinclude\
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,gbuildselftest,\
+   -DGBUILDSELFTESTDEF \
+))
+
+$(eval $(call gb_Library_add_cxxflags,gbuildselftest,\
+   -DGBUILDSELFTESTCXXFLAG \
+))
+
+$(eval $(call gb_Library_add_cflags,gbuildselftest,\
+   -DGBUILDSELFTESTCFLAG \
+))
+
+$(eval $(call gb_Library_use_libraries,gbuildselftest,\
+   gbuildselftestdep \
+))
+
+$(eval $(call gb_Library_add_exception_objects,gbuildselftest,\
+   solenv/qa/python/selftest/selftestobject \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/qa/python/selftest/Library_gbuildselftestdep.mk 
b/solenv/qa/python/selftest/Library_gbuildselftestdep.mk
new file mode 100644
index 000..b28450c
--- /dev/null
+++ b/solenv/qa/python/selftest/Library_gbuildselftestdep.mk
@@ -0,0 +1,15 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Library_Library,gbuildselftestdep))
+
+$(eval $(call gb_Library_add_exception_objects,gbuildselftestdep,\
+   solenv/qa/python/selftest/selftestdepobject \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/qa/python/selftest/Makefile 
b/solenv/qa/python/selftest/Makefile
new file mode 100644
index 000..3566a72
--- /dev/null
+++ b/solenv/qa/python/selftest/Makefile
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
+
+ifeq (,$(BUILDDIR))
+gb_partial_build__makefile_dir=$(dir $(abspath $(firstword $(MAKEFILE_LIST
+BUILDDIR := $(gb_partial_build__makefile_dir)../../../..
+endif
+
+gb_GBUILDSELFTEST=t
+
+include $(module_directory)/../../../gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/qa/python/selftest/Module_selftest.mk 
b/solenv/qa/python/selftest/Module_selftest.mk
new file mode 100644
index 000..9e297dd
--- /dev/null
+++ b/solenv/qa/python/selftest/Module_selftest.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Module_Module,gbuildtoidetest))
+
+$(eval $(call gb_Module_add_targets,gbuildtoidetest,\
+   Library_gbuildselftestdep \
+   Library_gbuildselftest \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/qa/python/selftest/selftestdepobject.cxx 
b/solenv/qa/python/selftest/selftestdepobject.cxx
new file mode 100644
index 0

[Libreoffice-commits] core.git: 2 commits - Makefile.in solenv/bin solenv/gbuild solenv/Module_solenv.mk solenv/PythonTest_solenv_python.mk solenv/qa

[Bjoern Michaelsen]

 Makefile.in  |4 -
 dev/null |binary
 solenv/Module_solenv.mk  |6 ++
 solenv/PythonTest_solenv_python.mk   |   16 +++
 solenv/gbuild/extensions/post_GbuildToIde.mk |   50 
 solenv/qa/python/gbuildtoide.py  |   56 +++
 6 files changed, 130 insertions(+), 2 deletions(-)

New commits:
commit da47c37c59ce8ce8c56f396ec79361c19b4bdb51
Author: Bjoern Michaelsen 
Date:   Thu Oct 13 00:32:20 2016 +0200

installoffice{,_impress}.oxt seem to be long dead code

Change-Id: Idf11c19d861a95e0f4a0a2d9c7c7cd8739e71282
Reviewed-on: https://gerrit.libreoffice.org/29745
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/solenv/bin/installoffice.oxt b/solenv/bin/installoffice.oxt
deleted file mode 100644
index feb1d87..000
Binary files a/solenv/bin/installoffice.oxt and /dev/null differ
diff --git a/solenv/bin/installoffice_impress.oxt 
b/solenv/bin/installoffice_impress.oxt
deleted file mode 100755
index 31c7bfa4..000
Binary files a/solenv/bin/installoffice_impress.oxt and /dev/null differ
commit f2061f85bf4d3d005668c3192589f0d242a49a36
Author: Bjoern Michaelsen 
Date:   Wed Oct 12 23:42:26 2016 +0200

add initial json export for gbuild data

- also add gbuild selftest to test this (and possibly more later)

Change-Id: Ia4ef41095613e596f39d107df700e929579ba45f
Reviewed-on: https://gerrit.libreoffice.org/29744
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/Makefile.in b/Makefile.in
index 4a16e46..344d357 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@ MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
  $(if $(filter build-nocheck,$(MAKECMDGOALS)),build)\
  $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\
- $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules 
translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo,$(MAKECMDGOALS))
+ $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules 
translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo 
gbuildtoide,$(MAKECMDGOALS))
 
 SRCDIR := @SRC_ROOT@
 BUILDDIR := @BUILDDIR@
@@ -270,7 +270,7 @@ endif
 
 build-non-l10n-only build-l10n-only build-nocheck check debugrun translations 
packageinfo $(gb_Top_MODULE_CHECK_TARGETS): build
 
-help showmodules:
+help showmodules gbuildtoide:
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
 
 cross-toolset: bootstrap fetch
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 7800898..d179771 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -21,4 +21,10 @@ $(eval $(call gb_Module_add_targets,solenv,\
 ))
 endif
 
+ifneq ($(DISABLE_PYTHON),TRUE)
+$(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
+   PythonTest_solenv_python \
+))
+endif
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/PythonTest_solenv_python.mk 
b/solenv/PythonTest_solenv_python.mk
new file mode 100644
index 000..8985ce2
--- /dev/null
+++ b/solenv/PythonTest_solenv_python.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_PythonTest_PythonTest,solenv_python))
+
+$(eval $(call 
gb_PythonTest_add_modules,solenv_python,$(SRCDIR)/solenv/qa/python,\
+   gbuildtoide \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk 
b/solenv/gbuild/extensions/post_GbuildToIde.mk
new file mode 100644
index 000..1c242a40
--- /dev/null
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -0,0 +1,50 @@
+#
+# 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/.
+#
+
+ifneq ($(filter gbuildtoide,$(MAKECMDGOALS)),)
+
+gbuildtoide:
+   true
+
+.PHONY : foo
+foo:
+   true
+
+define gb_Postprocess_register_target
+gbuildtoide : $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,$(3)))
+
+
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(3))): 
$(gb_Helper_MISCDUMMY) foo
+
+define gb_LinkTarget__command
+   mkdir -p $(WORKDIR)/GbuildToIde/Library
+   printf '{"LINKTARGET": "%s"' '$$(2)' > $(WORKDIR)/GbuildToIde/$$(2)
+   printf ', "ILIBTARGET": "%s"' '$$(ILIBTARGET)' >> 
$(WORKDIR)/GbuildToIde/$$(2)
+   printf ', "COBJECTS": "%s"' '$$(COBJECTS)' >> 
$(WORKDIR)/GbuildToIde/$$(2)
+   printf ', "CXXOBJ

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

[Stephan Bergmann]

 sfx2/source/dialog/styfitem.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 0e005d4354ba7e9819a350177873b3b7dfcead53
Author: Stephan Bergmann 
Date:   Thu Oct 13 11:20:57 2016 +0200

loplugin:unreffun

Change-Id: I5f19ba3aa94bbe6b69026273208d6b53dd846211

diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index fb9ad08..5ae6a03 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -126,13 +126,6 @@ namespace
 {
 }
 
-OLocalResourceAccess(const ResId& _rId, RESOURCE_TYPE _rType)
-:Resource(_rId.SetRT(_rType).SetAutoRelease(false))
-,m_pManager(_rId.GetResMgr())
-{
-OSL_ENSURE( m_pManager != nullptr, 
"OLocalResourceAccess::OLocalResourceAccess: invalid resource manager!" );
-}
-
 ~OLocalResourceAccess()
 {
 if ( m_pManager )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fresh install of Win 10 + LODE + vs2013-ide-integration = Error 127

[Bjoern Michaelsen]

Hi,

On Tue, Oct 04, 2016 at 11:26:05AM +0200, Bjoern Michaelsen wrote:
> The main trouble with all these IDE integrations seems that the output of 
> "make
> -np" on which it depends is not as stable between versions of make as
> originally expected by that naive guy who did the initial implementation. Thus
> the parser of that is both more fragile and more complex as it should be by 
> now.
> 
> I have a half-finished patch that will make make write out how it intends to
> build stuff in small (json) text files. Parsing _that_ should be really 
> trivial
> and not fragile. Also it might make possible creating:
> 
> 1/ the possiblity of creating a IDE integration without a full build
> 2/ the possiblity to create MS Build solutions for some (non-special) targets,
>thus building like MSVS would.

Half of this, the "export from gbuild" part, is done now:

 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=f2061f85bf4d3d005668c3192589f0d242a49a36

It should be rather trivial to read that from gbuildtoide like the Pythontest
does. If anyone wants to other fun stuff with it, feel free. Now that the base
is there, extending this should be trvial.

Best,

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

[Libreoffice-commits] core.git: TEMPLATE.SOURCECODE.HEADER

[Stephan Bergmann]

 TEMPLATE.SOURCECODE.HEADER |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d2d034010950c2737bc57c26dbad8cf96cd53a5f
Author: Stephan Bergmann 
Date:   Thu Oct 13 11:21:40 2016 +0200

Use updated vim mode line also for legacy-infected code.

Change-Id: I548cf17fe2818e8c0fbb4dc356bff7abbe7cc7e6

diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
index d135ad6..7ba2a9f 100644
--- a/TEMPLATE.SOURCECODE.HEADER
+++ b/TEMPLATE.SOURCECODE.HEADER
@@ -95,7 +95,7 @@ For C/C++/Java/IDL etc.
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 ...
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
 
 For makefiles, perl, scripts etc.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

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


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: 7 commits - cui/source include/sfx2 postprocess/CustomTarget_images.mk sc/source sfx2/source starmath/inc starmath/source sw/source vcl/AllLangResTarget_vcl.mk vcl/sour

[Caolán McNamara]

 cui/source/inc/cuires.hrc  |1 
 cui/source/inc/treeopt.hxx |2 
 cui/source/options/treeopt.cxx |2 
 cui/source/options/treeopt.src |  255 ++---
 include/sfx2/sfxsids.hrc   |2 
 postprocess/CustomTarget_images.mk |1 
 sc/source/ui/src/scwarngs.src  |   37 
 sfx2/source/appl/app.src   |5 
 starmath/inc/smmod.hxx |2 
 starmath/inc/starmath.hrc  |1 
 starmath/source/smmod.cxx  |   11 -
 starmath/source/symbol.src |  169 +--
 sw/source/ui/index/cnttab.src  |   36 +---
 sw/source/ui/misc/numberingtypelistbox.src |   58 +++---
 sw/source/uibase/inc/cnttab.hxx|   13 -
 sw/source/uibase/utlui/unotools.cxx|6 
 sw/source/uibase/utlui/unotools.src|   11 -
 vcl/AllLangResTarget_vcl.mk|1 
 vcl/source/control/throbber.ilst   |   30 +++
 vcl/source/src/throbber.src|   67 ---
 20 files changed, 299 insertions(+), 411 deletions(-)

New commits:
commit a8fa87913f61ffbb67e224366d865ffe6ccfff86
Author: Caolán McNamara 
Date:   Thu Oct 13 10:21:08 2016 +0100

move pseudo bitmap resources to an ilst

Change-Id: Ib649db6620c83a42e96ca45e4a5018fdff74286b

diff --git a/postprocess/CustomTarget_images.mk 
b/postprocess/CustomTarget_images.mk
index 818c86f..ecfbe96 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -28,6 +28,7 @@ $(packimages_DIR)/%.zip : \
$(packimages_DIR)/sorted.lst \
$(packimages_DIR)/commandimagelist.ilst \
$(SRCDIR)/sfx2/source/sidebar/sidebar.ilst \
+   $(SRCDIR)/vcl/source/control/throbber.ilst \
$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if 
$(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \
$(call gb_Helper_get_imagelists)
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 822b3a2..c76fcd0 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
 
 $(eval $(call gb_SrsTarget_add_nonlocalizable_files,vcl/source/src,\
 vcl/source/src/images.src \
-vcl/source/src/throbber.src \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/source/control/throbber.ilst b/vcl/source/control/throbber.ilst
new file mode 100644
index 000..17f9e3e
--- /dev/null
+++ b/vcl/source/control/throbber.ilst
@@ -0,0 +1,30 @@
+%MODULE%/vcl/res/spinner-16-01.png
+%MODULE%/vcl/res/spinner-16-02.png
+%MODULE%/vcl/res/spinner-16-03.png
+%MODULE%/vcl/res/spinner-16-04.png
+%MODULE%/vcl/res/spinner-16-05.png
+%MODULE%/vcl/res/spinner-16-06.png
+%MODULE%/vcl/res/spinner-32-01.png
+%MODULE%/vcl/res/spinner-32-02.png
+%MODULE%/vcl/res/spinner-32-03.png
+%MODULE%/vcl/res/spinner-32-04.png
+%MODULE%/vcl/res/spinner-32-05.png
+%MODULE%/vcl/res/spinner-32-06.png
+%MODULE%/vcl/res/spinner-32-07.png
+%MODULE%/vcl/res/spinner-32-08.png
+%MODULE%/vcl/res/spinner-32-09.png
+%MODULE%/vcl/res/spinner-32-10.png
+%MODULE%/vcl/res/spinner-32-11.png
+%MODULE%/vcl/res/spinner-32-12.png
+%MODULE%/vcl/res/spinner-64-01.png
+%MODULE%/vcl/res/spinner-64-02.png
+%MODULE%/vcl/res/spinner-64-03.png
+%MODULE%/vcl/res/spinner-64-04.png
+%MODULE%/vcl/res/spinner-64-05.png
+%MODULE%/vcl/res/spinner-64-06.png
+%MODULE%/vcl/res/spinner-64-07.png
+%MODULE%/vcl/res/spinner-64-08.png
+%MODULE%/vcl/res/spinner-64-09.png
+%MODULE%/vcl/res/spinner-64-10.png
+%MODULE%/vcl/res/spinner-64-11.png
+%MODULE%/vcl/res/spinner-64-12.png
diff --git a/vcl/source/src/throbber.src b/vcl/source/src/throbber.src
deleted file mode 100644
index 41a5f50..000
--- a/vcl/source/src/throbber.src
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// TODO: we need a mechanism to add images to images.zip, *wit

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/uiconfig

[Katarina Behrens]

 cui/uiconfig/ui/screenshotannotationdialog.ui |   73 ++
 1 file changed, 42 insertions(+), 31 deletions(-)

New commits:
commit 09d40f06f323e9cdb4a9457665317c236d8f638f
Author: Katarina Behrens 
Date:   Thu Sep 29 16:26:18 2016 +0200

screenshot annotation: tweak dialog a bit

Add some descriptive labels
Remove OK button (redundant in this context, Save Screenshot... does
the job)

Change-Id: I36e32986f777675f297390b691f2cd1681a0eaa2

diff --git a/cui/uiconfig/ui/screenshotannotationdialog.ui 
b/cui/uiconfig/ui/screenshotannotationdialog.ui
index 6ab3436..71f0dff 100644
--- a/cui/uiconfig/ui/screenshotannotationdialog.ui
+++ b/cui/uiconfig/ui/screenshotannotationdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -15,40 +15,11 @@
 False
 vertical
 12
-
-  
-picture
-True
-False
-gtk-missing-image
-  
-  
-True
-True
-0
-  
-
 
   
 False
 end
 
-  
-gtk-ok
-True
-True
-True
-True
-True
-True
-  
-  
-False
-True
-0
-  
-
-
   
 gtk-cancel
 True
@@ -87,6 +58,46 @@
   
 
 
+  
+True
+False
+start
+Click the widgets to add 
annotation:
+  
+  
+False
+True
+0
+  
+
+
+  
+picture
+True
+False
+gtk-missing-image
+  
+  
+True
+True
+1
+  
+
+
+  
+True
+False
+start
+Paste the following 
markup into the help file:
+end
+  
+  
+False
+True
+3
+  
+
+
   
 text
 80
@@ -96,7 +107,7 @@
   
 False
 True
-2
+4
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 setup_native/source/win32/customactions/regactivex/regactivex.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c236c8e88a6d3e30cc4acc9108cbce018ca872cc
Author: Stephan Bergmann 
Date:   Thu Oct 13 10:53:53 2016 +0200

LoadLibraryEx returns null on error

Returning <= HINSTANCE_ERROR (aka 32) on error was apparently a feature of
LoadLibrary in 16-bit Windows 3 times.

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

diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx 
b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index bf33f71..b437318 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -72,7 +72,7 @@ char* UnicodeToAnsiString( wchar_t* pUniString )
 void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL 
InstallForAllUser, BOOL InstallFor64Bit )
 {
 HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, 
LOAD_WITH_ALTERED_SEARCH_PATH );
-if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) )
+if( hModule )
 {
 DllNativeRegProc pNativeProc = ( DllNativeRegProc )GetProcAddress( 
hModule, "DllRegisterServerNative" );
 if( pNativeProc!=NULL )
@@ -99,7 +99,7 @@ void RegisterActiveXNative( const char* pActiveXPath, int 
nMode, BOOL InstallFor
 void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL 
InstallForAllUser, BOOL InstallFor64Bit )
 {
 HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, 
LOAD_WITH_ALTERED_SEARCH_PATH );
-if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) )
+if( hModule )
 {
 DllNativeUnregProc pNativeProc = ( DllNativeUnregProc )GetProcAddress( 
hModule, "DllUnregisterServerNative" );
 if( pNativeProc!=NULL )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Asela Dasanayaka]

 idlc/inc/idlc.hxx   |2 +-
 idlc/inc/idlctypes.hxx  |3 ---
 idlc/inc/options.hxx|4 ++--
 idlc/source/idlcmain.cxx|4 ++--
 idlc/source/idlcproduce.cxx |8 
 idlc/source/parser.y|   22 +++---
 6 files changed, 20 insertions(+), 23 deletions(-)

New commits:
commit 4f0f1b6b5554f49dfe8cca1088d3e5b342b4fd2a
Author: Asela Dasanayaka 
Date:   Thu Oct 13 14:42:16 2016 +0530

tdf#96099 Reduce no of typedefs used for trivial containers

Removed various pinter typedefs in idlc module

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

diff --git a/idlc/inc/idlc.hxx b/idlc/inc/idlc.hxx
index 56fda18..468bec2 100644
--- a/idlc/inc/idlc.hxx
+++ b/idlc/inc/idlc.hxx
@@ -132,7 +132,7 @@ private:
 sal_uInt32  m_offsetStart;
 sal_uInt32  m_offsetEnd;
 ParseState  m_parseState;
-StringSet   m_includes;
+std::set< OString >   m_includes;
 };
 
 
diff --git a/idlc/inc/idlctypes.hxx b/idlc/inc/idlctypes.hxx
index 12c665c..931afbf 100644
--- a/idlc/inc/idlctypes.hxx
+++ b/idlc/inc/idlctypes.hxx
@@ -30,9 +30,6 @@
 #include 
 #include 
 
-typedef ::std::list< OString >   StringList;
-typedef ::std::vector< OString > StringVector;
-typedef ::std::set< OString >StringSet;
 
 class AstDeclaration;
 
diff --git a/idlc/inc/options.hxx b/idlc/inc/options.hxx
index 3fbfc45..709cfc6 100644
--- a/idlc/inc/options.hxx
+++ b/idlc/inc/options.hxx
@@ -64,14 +64,14 @@ public:
 const OString&   getOption(const OString& option)
 throw( IllegalArgument );
 
-const StringVector& getInputFiles() const { return m_inputFiles; }
+const std::vector< OString >& getInputFiles() const { return m_inputFiles; 
}
 bool readStdin() const { return m_stdin; }
 bool verbose() const { return m_verbose; }
 bool quiet() const { return m_quiet; }
 
 protected:
 OString  m_program;
-StringVectorm_inputFiles;
+std::vector< OString >m_inputFiles;
 boolm_stdin;
 boolm_verbose;
 boolm_quiet;
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index d610246..59a656a 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -72,14 +72,14 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 }
 idlc()->reset();
 }
-StringVector const & files = options.getInputFiles();
+std::vector< OString > const & files = options.getInputFiles();
 if ( options.verbose() )
 {
 fprintf( stdout, "%s: compiling %i source files ... \n",
 options.getProgramName().getStr(), (int)files.size() );
 fflush( stdout );
 }
-for (StringVector::const_iterator i(files.begin());
+for (std::vector< OString >::const_iterator i(files.begin());
  i != files.end() && nErrors == 0; ++i)
 {
 OString sysFileName( convertToAbsoluteSystemPath(*i) );
diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx
index 1588dd3..32e53db 100644
--- a/idlc/source/idlcproduce.cxx
+++ b/idlc/source/idlcproduce.cxx
@@ -39,7 +39,7 @@
 
 using namespace ::osl;
 
-StringList* pCreatedDirectories = nullptr;
+std::list< OString >* pCreatedDirectories = nullptr;
 
 static bool checkOutputPath(const OString& completeName)
 {
@@ -83,7 +83,7 @@ static bool checkOutputPath(const OString& completeName)
 } else
 {
 if ( !pCreatedDirectories )
-pCreatedDirectories = new StringList();
+pCreatedDirectories = new std::list< OString >();
 pCreatedDirectories->push_front(buffer.getStr());
 }
 }
@@ -96,8 +96,8 @@ static bool cleanPath()
 {
 if ( pCreatedDirectories )
 {
-StringList::iterator iter = pCreatedDirectories->begin();
-StringList::iterator end = pCreatedDirectories->end();
+std::list< OString >::iterator iter = pCreatedDirectories->begin();
+std::list< OString >::iterator end = pCreatedDirectories->end();
 while ( iter != end )
 {
 //#ifdef SAL_UNX
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index c045916..6e7bf78 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -235,7 +235,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration 
const * type2) {
 sal_uInt32  ulval;  /* sal_uInt32 value */
 double  dval;   /* double value */
 float   fval;   /* float value */
-StringList* slval;  /* StringList value */
+std::list< OString >* slval;  /* StringList value */
 AttributeExceptions::Part attexcpval;
 AttributeExceptions attexcval;
 }
@@ -1624,8 +1624,8 @@ service_e

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

[Gabor Kelemen]

 source/text/simpress/main0101.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e10266d2bfb851c82decbbb2ccaf5a638839b6b
Author: Gabor Kelemen 
Date:   Wed Oct 12 15:59:32 2016 +0200

find-invalid-help-embeds: Fix Printer Setup embed in Impress File menu

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

diff --git a/source/text/simpress/main0101.xhp 
b/source/text/simpress/main0101.xhp
index 7148e51..e0528bd 100644
--- a/source/text/simpress/main0101.xhp
+++ b/source/text/simpress/main0101.xhp
@@ -50,7 +50,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 3461c9d7a2fe7e8196d455ea2d7feb8a684e945e
Author: Gabor Kelemen 
Date:   Wed Oct 12 15:59:32 2016 +0200

Updated core
Project: help  3e10266d2bfb851c82decbbb2ccaf5a638839b6b

find-invalid-help-embeds: Fix Printer Setup embed in Impress File menu

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

diff --git a/helpcontent2 b/helpcontent2
index 75f5e0c..3e10266d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 75f5e0c62da711669d59f572c217b66a3f791b23
+Subproject commit 3e10266d2bfb851c82decbbb2ccaf5a638839b6b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sdext/source sfx2/source xmlsecurity/Executable_pdfverify.mk xmlsecurity/inc xmlsecurity/Library_xmlsecurity.mk xmlsecurity/source

[Miklos Vajna]

 sdext/source/pdfimport/config/pdf_import_filter.xcu|2 
 sfx2/source/doc/objserv.cxx|   22 
 xmlsecurity/Executable_pdfverify.mk|   15 
 xmlsecurity/Library_xmlsecurity.mk |   15 
 xmlsecurity/inc/pdfio/pdfdocument.hxx  |   70 
 xmlsecurity/inc/pdfsignaturehelper.hxx |   33 
 xmlsecurity/source/component/documentdigitalsignatures.cxx |9 
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   |   65 
 xmlsecurity/source/pdfio/pdfdocument.cxx   | 1461 
 xmlsecurity/source/pdfio/pdfverify.cxx | 1486 -
 10 files changed, 1678 insertions(+), 1500 deletions(-)

New commits:
commit 0f613adbfa44fb92e84e73a3fa7ea050c072944c
Author: Miklos Vajna 
Date:   Thu Oct 13 10:37:02 2016 +0200

xmlsecurity: add initial PDFSignatureHelper

This splits most of the PDF signature code out of the pdfverify
executable, and puts it into the xmlsecurity library instead.

The PDFSignatureHelper now attempts to verify PDF signatures, and code
in sdext / sfx2 also calls it (even if PDF is not a ZIP-based format).

Change-Id: I7b8b3ac9c976e4ea4f3796b1cda07c8a2c97bd02
Reviewed-on: https://gerrit.libreoffice.org/29751
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sdext/source/pdfimport/config/pdf_import_filter.xcu 
b/sdext/source/pdfimport/config/pdf_import_filter.xcu
index d454d6f1..3909f9f 100644
--- a/sdext/source/pdfimport/config/pdf_import_filter.xcu
+++ b/sdext/source/pdfimport/config/pdf_import_filter.xcu
@@ -31,7 +31,7 @@
 com.sun.star.comp.Writer.XmlFilterAdaptor


-3RDPARTYFILTER ALIEN IMPORT PREFERRED
+3RDPARTYFILTER ALIEN IMPORT PREFERRED SUPPORTSSIGNING


 pdf_Portable_Document_Format
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 2ba4ffd..f6243cc 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -102,6 +102,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
@@ -1291,7 +1293,7 @@ uno::Sequence< security::DocumentSignatureInformation > 
SfxObjectShell::ImplAnal
 uno::Reference< security::XDocumentDigitalSignatures > xLocSigner = 
xSigner;
 
 bool bSupportsSigning = GetMedium() && GetMedium()->GetFilter() && 
GetMedium()->GetFilter()->GetSupportsSigning();
-if (GetMedium() && !GetMedium()->GetName().isEmpty() && 
(IsOwnStorageFormat(*GetMedium()) || bSupportsSigning) && 
GetMedium()->GetStorage().is())
+if (GetMedium() && !GetMedium()->GetName().isEmpty() && 
((IsOwnStorageFormat(*GetMedium()) && GetMedium()->GetStorage().is()) || 
bSupportsSigning))
 {
 try
 {
@@ -1315,8 +1317,22 @@ uno::Sequence< security::DocumentSignatureInformation > 
SfxObjectShell::ImplAnal
 aResult = xLocSigner->verifyScriptingContentSignatures( 
GetMedium()->GetZipStorageToSign_Impl(),
 
uno::Reference< io::XInputStream >() );
 else
-aResult = xLocSigner->verifyDocumentContentSignatures( 
GetMedium()->GetZipStorageToSign_Impl(),
-
uno::Reference< io::XInputStream >() );
+{
+if (GetMedium()->GetStorage().is())
+{
+// Something ZIP-based.
+aResult = xLocSigner->verifyDocumentContentSignatures( 
GetMedium()->GetZipStorageToSign_Impl(),
+
uno::Reference< io::XInputStream >() );
+}
+else
+{
+// Not ZIP-based, e.g. PDF.
+SvStream* pStream = 
utl::UcbStreamHelper::CreateStream(GetMedium()->GetName(), StreamMode::READ);
+uno::Reference xStream(new 
utl::OStreamWrapper(*pStream));
+uno::Reference xInputStream(xStream, 
uno::UNO_QUERY);
+aResult = 
xLocSigner->verifyDocumentContentSignatures(uno::Reference(), 
xInputStream);
+}
+}
 }
 catch( css::uno::Exception& )
 {
diff --git a/xmlsecurity/Executable_pdfverify.mk 
b/xmlsecurity/Executable_pdfverify.mk
index c62698f..bc08d56 100644
--- a/xmlsecurity/Executable_pdfverify.mk
+++ b/xmlsecurity/Executable_pdfverify.mk
@@ -13,29 +13,18 @@ $(eval $(call gb_Executable_use_sdk_api,pdfverify))
 
 $(eval $(call gb_Executable_set_include,pdfverify,\
 $$(INCLUDE) \
+-I$(SRCDIR)/xmlsecurity/inc \
 ))
 
 $(eval $(call gb_Executable_use_libraries,pdfverify,\
 comphelper \
 sal \
 tl \
+xmlsecurity \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pdfverify,\
 xmlsecurity/source/pdfio/pdfverify \
 ))
 
-ifeq 

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

[Andras Timar]

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

New commits:
commit cb4fb867945e9e3350f0ce0ec931aebc9bf86aaa
Author: Andras Timar 
Date:   Thu Oct 13 12:58:04 2016 +0200

loleaflet: add Insert - Comment to Calc menu

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 7fee304..6f8f71d 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -124,6 +124,7 @@ L.Control.Menubar = L.Control.extend({

{name: _('Select all'), type: 'unocommand', uno: 
'.uno:SelectAll'}]
},
{name: _('Insert'), type: 'menu', menu: [{name: 
_('Image'), id: 'insertgraphic', type: 'action'},
+   
  {name: _('Comment'), type: 'unocommand', uno: 
'.uno:InsertAnnotation'},

  {type: 'separator'},

  {name: _('Row'), type: 'unocommand', uno: '.uno:InsertRows'},

  {name: _('Column'), type: 'unocommand', uno: 
'.uno:InsertColumns'}]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk/gtksalmenu.cxx |   33 ++---
 1 file changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 96d0aa8ca4f841fd5217b863b976c81959e4aca9
Author: Caolán McNamara 
Date:   Thu Oct 13 11:56:25 2016 +0100

Resolves: tdf#103166 if the menu is empty, add a disabled placeholder

i.e. 

otherwise it looks like a bug of some kind.

Change-Id: Ib35146698c31fd3f3d51915ea460eab1dde39d26

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 041e9c2..fa52fc9 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -30,14 +30,20 @@ static bool bUnityMode = false;
 /*
  * This function generates a unique command name for each menu item
  */
-static gchar* GetCommandForItem(GtkSalMenuItem* pSalMenuItem)
+static gchar* GetCommandForItem(GtkSalMenu* pParentMenu, sal_uInt16 nItemId)
 {
 OString aCommand("window-");
-aCommand = aCommand + OString::number(reinterpret_cast(pSalMenuItem->mpParentMenu));
-aCommand = aCommand + "-" + OString::number(pSalMenuItem->mnId);
+aCommand = aCommand + OString::number(reinterpret_cast(pParentMenu));
+aCommand = aCommand + "-" + OString::number(nItemId);
 return g_strdup(aCommand.getStr());
 }
 
+static gchar* GetCommandForItem(GtkSalMenuItem* pSalMenuItem)
+{
+return GetCommandForItem(pSalMenuItem->mpParentMenu,
+ pSalMenuItem->mnId);
+}
+
 bool GtkSalMenu::PrepUpdate()
 {
 #if GTK_CHECK_VERSION(3,0,0)
@@ -308,6 +314,27 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool 
bRemoveDisabledEntries)
 
 // Delete unused commands.
 RemoveUnusedCommands( pActionGroup, pOldCommandList, pNewCommandList );
+
+// Resolves: tdf#103166 if the menu is empty, add a disabled
+//  placeholder.
+sal_Int32 nSectionsCount = g_menu_model_get_n_items(G_MENU_MODEL(pLOMenu));
+gint nItemsCount = 0;
+for (nSection = 0; nSection < nSectionsCount; ++nSection)
+{
+nItemsCount += g_lo_menu_get_n_items_from_section(pLOMenu, nSection);
+if (nItemsCount)
+break;
+}
+if (!nItemsCount)
+{
+gchar* aNativeCommand = GetCommandForItem(this, 0x);
+OUString 
aPlaceholderText(VclResId(SV_RESID_STRING_NOSELECTIONPOSSIBLE));
+g_lo_menu_insert_in_section(pLOMenu, nSection-1, 0,
+OUStringToOString(aPlaceholderText, 
RTL_TEXTENCODING_UTF8).getStr());
+NativeSetItemCommand(nSection-1, 0, 0x, aNativeCommand, 
MenuItemBits::NONE, false, false);
+NativeSetEnableItem(aNativeCommand, false);
+g_free(aNativeCommand);
+}
 }
 
 void GtkSalMenu::Update()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/shared/01/0111.xhp   |2 +-
 source/text/shared/01/01110300.xhp   |2 +-
 source/text/shared/01/01110400.xhp   |2 +-
 source/text/shared/main0201.xhp  |2 +-
 source/text/swriter/menu/insert_footnote_endnote.xhp |4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a2e692fc4eeeb04fb0664bcac58f3e5dba9164cd
Author: Gabor Kelemen 
Date:   Thu Oct 13 12:57:58 2016 +0200

find-invalid-help-embeds: Remove links to deleted file

Not like these files don't need a complete rewrite anyways,
but even until then get rid of the annoying D'oh! errors
people filed in tdf#71039, tdf#91295, tdf#94133, tdf#98910

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

diff --git a/source/text/shared/01/0111.xhp 
b/source/text/shared/01/0111.xhp
index 650eda5..a89c048 100644
--- a/source/text/shared/01/0111.xhp
+++ b/source/text/shared/01/0111.xhp
@@ -38,7 +38,7 @@
 
 
 
-  
+
 
 Address Book Source
 
diff --git a/source/text/shared/01/01110300.xhp 
b/source/text/shared/01/01110300.xhp
index 1d4e0b7..dfeeff4 100644
--- a/source/text/shared/01/01110300.xhp
+++ b/source/text/shared/01/01110300.xhp
@@ -37,7 +37,7 @@
 Saves the current document as a 
template.
 
 
-  
+
 
 
 New Template
diff --git a/source/text/shared/01/01110400.xhp 
b/source/text/shared/01/01110400.xhp
index 57ac55d..3e8510b 100644
--- a/source/text/shared/01/01110400.xhp
+++ b/source/text/shared/01/01110400.xhp
@@ -37,7 +37,7 @@
 Opens a dialog where you can select a 
template for editing.
 
 
-  
+
 
 
 
commit 7bb91cb93d20ba6bb896baf2c7b6df21f17ba368
Author: Gabor Kelemen 
Date:   Thu Oct 13 12:51:33 2016 +0200

find-invalid-help-embeds: Fix embed section of nonprinting chars

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

diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp
index e80a015..a38b938 100644
--- a/source/text/shared/main0201.xhp
+++ b/source/text/shared/main0201.xhp
@@ -87,7 +87,7 @@
 
 
 
-
+
 
 
 
commit ff07ad6aec24f56189edc0d5ab708f27b5a52c5a
Author: Gabor Kelemen 
Date:   Wed Oct 12 15:37:57 2016 +0200

find-invalid-help-embeds: link to an existing variable

This one describes the whole window, should fit in here

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

diff --git a/source/text/swriter/menu/insert_footnote_endnote.xhp 
b/source/text/swriter/menu/insert_footnote_endnote.xhp
index ade1860..d63ccf8 100644
--- a/source/text/swriter/menu/insert_footnote_endnote.xhp
+++ b/source/text/swriter/menu/insert_footnote_endnote.xhp
@@ -42,7 +42,7 @@
 Insert a endnote at the 
current cursor position without a prompt.
 
 Footnote or 
Endnote
-
+
 
 
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 37aa977b72167dd3cc1a7b8b2bee309799232208
Author: Gabor Kelemen 
Date:   Wed Oct 12 15:37:57 2016 +0200

Updated core
Project: help  ff07ad6aec24f56189edc0d5ab708f27b5a52c5a

find-invalid-help-embeds: link to an existing variable

This one describes the whole window, should fit in here

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

diff --git a/helpcontent2 b/helpcontent2
index 3e10266d..ff07ad6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3e10266d2bfb851c82decbbb2ccaf5a638839b6b
+Subproject commit ff07ad6aec24f56189edc0d5ab708f27b5a52c5a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes36' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/interpr1.cxx |  736 ---
 1 file changed, 381 insertions(+), 355 deletions(-)

New commits:
commit 3ed7b390b02927c907b04232d20ecffe49937082
Author: Kohei Yoshida 
Date:   Wed Oct 12 20:29:33 2016 -0400

Do parameter count check outside of IterateParametersIfs().

To reduce branching and scoping.

Change-Id: I664e013f941c5b5dea44a6794ed133381cfc7b4c

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f540da9..239bb74 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5316,450 +5316,476 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 sal_uInt8 nParamCount = GetByte();
 sal_uInt8 nQueryCount = nParamCount / 2;
 
-bool bCheck;
-if ( eFunc == ifCOUNTIFS )
-bCheck = (nParamCount >= 2) && (nParamCount % 2 == 0);
-else
-bCheck = (nParamCount >= 3) && (nParamCount % 2 == 1);
+std::vector aResArray;
+size_t nRowSize = 0;
+size_t nColSize = 0;
+double fVal = 0.0;
+double fSum = 0.0;
+double fMem = 0.0;
+double fRes = 0.0;
+double fCount = 0.0;
+double fMin = std::numeric_limits::max();
+double fMax = std::numeric_limits::min();
+short nParam = 1;
+size_t nRefInList = 0;
+SCCOL nDimensionCols = 0;
+SCROW nDimensionRows = 0;
 
-if ( !bCheck )
+while (nParamCount > 1 && !nGlobalError)
 {
-SetError( errParameterExpected);
-}
-else
-{
-std::vector aResArray;
-size_t nRowSize = 0;
-size_t nColSize = 0;
-double fVal = 0.0;
-double fSum = 0.0;
-double fMem = 0.0;
-double fRes = 0.0;
-double fCount = 0.0;
-double fMin = std::numeric_limits::max();
-double fMax = std::numeric_limits::min();
-short nParam = 1;
-size_t nRefInList = 0;
-SCCOL nDimensionCols = 0;
-SCROW nDimensionRows = 0;
-
-while (nParamCount > 1 && !nGlobalError)
+// take criteria
+svl::SharedString aString;
+fVal = 0.0;
+bool bIsString = true;
+switch ( GetStackType() )
 {
-// take criteria
-svl::SharedString aString;
-fVal = 0.0;
-bool bIsString = true;
-switch ( GetStackType() )
-{
-case svDoubleRef :
-case svSingleRef :
-{
-ScAddress aAdr;
-if ( !PopDoubleRefOrSingleRef( aAdr ) )
-return 0;
+case svDoubleRef :
+case svSingleRef :
+{
+ScAddress aAdr;
+if ( !PopDoubleRefOrSingleRef( aAdr ) )
+return 0;
 
-ScRefCellValue aCell(*pDok, aAdr);
-switch (aCell.meType)
-{
-case CELLTYPE_VALUE :
-fVal = GetCellValue(aAdr, aCell);
-bIsString = false;
-break;
-case CELLTYPE_FORMULA :
-if (aCell.mpFormula->IsValue())
-{
-fVal = GetCellValue(aAdr, aCell);
-bIsString = false;
-}
-else
-GetCellString(aString, aCell);
-break;
-case CELLTYPE_STRING :
-case CELLTYPE_EDIT :
-GetCellString(aString, aCell);
-break;
-default:
-fVal = 0.0;
-bIsString = false;
-}
-}
-break;
-case svString:
-aString = GetString();
-break;
-case svMatrix :
-case svExternalDoubleRef:
-{
-ScMatValType nType = GetDoubleOrStringFromMatrix( 
fVal, aString);
-bIsString = ScMatrix::IsNonValueType( nType);
-}
-break;
-case svExternalSingleRef:
+ScRefCellValue aCell(*pDok, aAdr);
+switch (aCell.meType)
 {
-ScExternalRefCache::TokenRef pToken;
-PopExternalSingleRef(pToken);
-if (pToken)
-{
-if (pToken->GetType() == svDouble)
+case CELLTYPE_VALUE :
+fVal = GetCellV

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[Gabor Kelemen]

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

New commits:
commit 703f697b22ddfdcceed955d37e75db2299f5b120
Author: Gabor Kelemen 
Date:   Thu Oct 13 12:57:58 2016 +0200

Updated core
Project: help  a2e692fc4eeeb04fb0664bcac58f3e5dba9164cd

find-invalid-help-embeds: Remove links to deleted file

Not like these files don't need a complete rewrite anyways,
but even until then get rid of the annoying D'oh! errors
people filed in tdf#71039, tdf#91295, tdf#94133, tdf#98910

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

diff --git a/helpcontent2 b/helpcontent2
index 7bb91cb..a2e692f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7bb91cb93d20ba6bb896baf2c7b6df21f17ba368
+Subproject commit a2e692fc4eeeb04fb0664bcac58f3e5dba9164cd
commit 37032af03bda756c75df02a024c8f683964c1127
Author: Gabor Kelemen 
Date:   Thu Oct 13 12:51:33 2016 +0200

Updated core
Project: help  7bb91cb93d20ba6bb896baf2c7b6df21f17ba368

find-invalid-help-embeds: Fix embed section of nonprinting chars

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

diff --git a/helpcontent2 b/helpcontent2
index ff07ad6..7bb91cb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ff07ad6aec24f56189edc0d5ab708f27b5a52c5a
+Subproject commit 7bb91cb93d20ba6bb896baf2c7b6df21f17ba368
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 editeng/source/outliner/outliner.cxx |   49 ---
 editeng/source/outliner/outlundo.cxx |5 +--
 editeng/source/outliner/outlvw.cxx   |   13 +++--
 include/editeng/outliner.hxx |   33 +++
 sd/source/ui/func/fuinsfil.cxx   |   12 
 sd/source/ui/inc/OutlineView.hxx |6 ++--
 sd/source/ui/inc/View.hxx|4 +-
 sd/source/ui/view/outlview.cxx   |   33 +++
 sd/source/ui/view/sdview.cxx |   14 --
 9 files changed, 74 insertions(+), 95 deletions(-)

New commits:
commit 17ec3b96dee28b148773aa1715634171deaa0297
Author: Noel Grandin 
Date:   Thu Oct 13 10:45:45 2016 +0200

pass params to Outliner LINK callbacks on stack

instead of yuck..cough... on itself, which is horribly vulnerable to re-
entrancy

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

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index f385cee..3bf1486 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -89,10 +89,9 @@ Paragraph* Outliner::Insert(const OUString& rText, sal_Int32 
nAbsPos, sal_Int16
 if( pPara->GetDepth() != nDepth )
 {
 nDepthChangedHdlPrevDepth = pPara->GetDepth();
-mnDepthChangeHdlPrevFlags = pPara->nFlags;
+ParaFlag nPrevFlags = pPara->nFlags;
 pPara->SetDepth( nDepth );
-pHdlParagraph = pPara;
-DepthChangedHdl();
+DepthChangedHdl(pPara, nPrevFlags);
 }
 pPara->nFlags |= ParaFlag::HOLDDEPTH;
 SetText( rText, pPara );
@@ -107,8 +106,7 @@ Paragraph* Outliner::Insert(const OUString& rText, 
sal_Int32 nAbsPos, sal_Int16
 pEditEngine->InsertParagraph( nAbsPos, OUString() );
 DBG_ASSERT(pPara==pParaList->GetParagraph(nAbsPos),"Insert:Failed");
 ImplInitDepth( nAbsPos, nDepth, false );
-pHdlParagraph = pPara;
-ParagraphInsertedHdl();
+ParagraphInsertedHdl(pPara);
 pPara->nFlags |= ParaFlag::HOLDDEPTH;
 SetText( rText, pPara );
 ImplBlockInsertionCallbacks( false );
@@ -151,8 +149,7 @@ void Outliner::ParagraphInserted( sal_Int32 nPara )
 if( !pEditEngine->IsInUndo() )
 {
 ImplCalcBulletText( nPara, true, false );
-pHdlParagraph = pPara;
-ParagraphInsertedHdl();
+ParagraphInsertedHdl(pPara);
 }
 }
 }
@@ -171,8 +168,7 @@ void Outliner::ParagraphDeleted( sal_Int32 nPara )
 
 if( !pEditEngine->IsInUndo() )
 {
-pHdlParagraph = pPara;
-ParagraphRemovingHdl();
+ParagraphRemovingHdl(pPara);
 }
 
 pParaList->Remove( nPara );
@@ -253,8 +249,7 @@ void Outliner::SetDepth( Paragraph* pPara, sal_Int16 
nNewDepth )
 if ( nNewDepth != pPara->GetDepth() )
 {
 nDepthChangedHdlPrevDepth = pPara->GetDepth();
-mnDepthChangeHdlPrevFlags = pPara->nFlags;
-pHdlParagraph = pPara;
+ParaFlag nPrevFlags = pPara->nFlags;
 
 sal_Int32 nPara = GetAbsPos( pPara );
 ImplInitDepth( nPara, nNewDepth, true );
@@ -263,7 +258,7 @@ void Outliner::SetDepth( Paragraph* pPara, sal_Int16 
nNewDepth )
 if ( ImplGetOutlinerMode() == OutlinerMode::OutlineObject )
 ImplSetLevelDependendStyleSheet( nPara );
 
-DepthChangedHdl();
+DepthChangedHdl(pPara, nPrevFlags);
 }
 }
 
@@ -472,8 +467,7 @@ void Outliner::SetText( const OUString& rText, Paragraph* 
pPara )
 {
 pParaList->Insert( pPara, nInsPos );
 pEditEngine->InsertParagraph( nInsPos, aStr );
-pHdlParagraph = pPara;
-ParagraphInsertedHdl();
+ParagraphInsertedHdl(pPara);
 }
 else
 {
@@ -777,7 +771,6 @@ bool Outliner::Expand( Paragraph* pPara )
 pUndo->pParas = nullptr;
 pUndo->nCount = pParaList->GetAbsPos( pPara );
 }
-pHdlParagraph = pPara;
 pParaList->Expand( pPara );
 InvalidateBullet(pParaList->GetAbsPos(pPara));
 if( bUndo )
@@ -807,7 +800,6 @@ bool Outliner::Collapse( Paragraph* pPara )
 pUndo->nCount = pParaList->GetAbsPos( pPara );
 }
 
-pHdlParagraph = pPara;
 pParaList->Collapse( pPara );
 InvalidateBullet(pParaList->GetAbsPos(pPara));
 if( bUndo )
@@ -1185,17 +1177,15 @@ void Outliner::ImpTextPasted( sal_Int32 nStartPara, 
sal_Int32 nCount )
 if( ImplGetOutlinerMode() != OutlinerMode::TextObject )
 {
 nDepthChangedHdlPrevDepth = pPara->GetDepth();
-mnDepthChangeHdlPrevFlags = pPara->nFlags;
+ParaFlag nPrevFlags = pPara->nFlags;
 
 ImpConvertEdtToOut( nStartPara );

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 7bc5d17be6317e660f5f7a668bde967bfa8c0ff8
Author: Gabor Kelemen 
Date:   Thu Oct 13 13:15:09 2016 +0200

Updated core
Project: help  c75a1cde49dde5d78b2e640b382fbd3c1d103be6

find-invalid-help-embeds: Fix embed section names

These were changed related to tdf#92825
in I707e1daa263acb5a09a6a90e745a619f9dd67388

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

diff --git a/helpcontent2 b/helpcontent2
index a2e692f..c75a1cd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a2e692fc4eeeb04fb0664bcac58f3e5dba9164cd
+Subproject commit c75a1cde49dde5d78b2e640b382fbd3c1d103be6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/simpress/01/0315.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c75a1cde49dde5d78b2e640b382fbd3c1d103be6
Author: Gabor Kelemen 
Date:   Thu Oct 13 13:15:09 2016 +0200

find-invalid-help-embeds: Fix embed section names

These were changed related to tdf#92825
in I707e1daa263acb5a09a6a90e745a619f9dd67388

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

diff --git a/source/text/simpress/01/0315.xhp 
b/source/text/simpress/01/0315.xhp
index 1c7de26..07a301e 100644
--- a/source/text/simpress/01/0315.xhp
+++ b/source/text/simpress/01/0315.xhp
@@ -42,8 +42,8 @@
 
   
 
-
-
-link to 
03151000 reinserted, i59749
+
+
+link to 
03151000 reinserted, i59749
 
 
___
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 include/filter

[Noel Grandin]

 compilerplugins/clang/mergeclasses.results |1 
 filter/source/msfilter/escherex.cxx|4 +-
 filter/source/msfilter/eschesdo.cxx|   49 --
 filter/source/msfilter/eschesdo.hxx|   53 +++--
 include/filter/msfilter/escherex.hxx   |8 ++--
 5 files changed, 42 insertions(+), 73 deletions(-)

New commits:
commit a7e395f3975a326a278eb99dbabb0030e4335009
Author: Noel Grandin 
Date:   Thu Oct 13 13:30:27 2016 +0200

loplugin:mergeclasses ImplEESdrWriter with ImplEscherExSdr

Change-Id: Iea2241d9fc44b92e18101b3f367a643f03729183

diff --git a/compilerplugins/clang/mergeclasses.results 
b/compilerplugins/clang/mergeclasses.results
index d0c51a5..428bd40 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -71,7 +71,6 @@ merge IXFAttrList with XFSaxAttrList
 merge IXFStream with XFSaxStream
 merge IXFStyle with XFStyle
 merge IconChoicePage with SvxHyperlinkTabPageBase
-merge ImplEESdrWriter with ImplEscherExSdr
 merge ImplGlyphFallbackFontSubstitution with FcGlyphFallbackSubstitution
 merge ImplPreMatchFontSubstitution with FcPreMatchSubstitution
 merge LwpDLList with LwpParaProperty
diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index da6a5cf..ff78d89 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4975,7 +4975,7 @@ EscherEx::EscherEx(const std::shared_ptr& 
rxGlobal, SvStream* pO
 mbOwnsStrm = true;
 }
 mnStrmStartOfs = mpOutStrm->Tell();
-mpImplEscherExSdr.reset( new ImplEscherExSdr( *this ) );
+mpImplEESdrWriter.reset( new ImplEESdrWriter( *this ) );
 }
 
 EscherEx::~EscherEx()
@@ -5295,7 +5295,7 @@ sal_uInt32 EscherEx::EnterGroup( const OUString& 
rShapeName, const Rectangle* pB
 if ( mnGroupLevel > 1 )
 AddChildAnchor( aRect );
 
-EscherExHostAppData* pAppData = mpImplEscherExSdr->ImplGetHostData();
+EscherExHostAppData* pAppData = mpImplEESdrWriter->ImplGetHostData();
 if( pAppData )
 {
 if ( mnGroupLevel <= 1 )
diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index 010fadf..5b9028d 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -69,9 +69,13 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
 , mpPicStrm(nullptr)
 , mpHostAppData(nullptr)
 , mbIsTitlePossible(false)
+, mpSdrPage( nullptr )
+, mpSolverContainer( nullptr )
 {
 }
 
+
+
 Point ImplEESdrWriter::ImplMapPoint( const Point& rPoint )
 {
 return OutputDevice::LogicToLogic( rPoint, maMapModeSrc, maMapModeDest );
@@ -833,18 +837,9 @@ void ImplEESdrWriter::ImplWritePage(
 }
 }
 
-ImplEscherExSdr::ImplEscherExSdr( EscherEx& rEx )
-:
-ImplEESdrWriter( rEx ),
-mpSdrPage( nullptr ),
-mpSolverContainer( nullptr )
+ImplEESdrWriter::~ImplEESdrWriter()
 {
-}
-
-
-ImplEscherExSdr::~ImplEscherExSdr()
-{
-DBG_ASSERT( !mpSolverContainer, "ImplEscherExSdr::~ImplEscherExSdr: 
unwritten SolverContainer" );
+DBG_ASSERT( !mpSolverContainer, "ImplEESdrWriter::~ImplEESdrWriter: 
unwritten SolverContainer" );
 Reference xComp(mXDrawPage, UNO_QUERY);
 if (xComp.is())
 xComp->dispose();
@@ -852,7 +847,7 @@ ImplEscherExSdr::~ImplEscherExSdr()
 }
 
 
-bool ImplEscherExSdr::ImplInitPage( const SdrPage& rPage )
+bool ImplEESdrWriter::ImplInitPage( const SdrPage& rPage )
 {
 SvxDrawPage* pSvxDrawPage;
 if ( mpSdrPage != &rPage || !mXDrawPage.is() )
@@ -880,7 +875,7 @@ bool ImplEscherExSdr::ImplInitPage( const SdrPage& rPage )
 return pSvxDrawPage != nullptr;
 }
 
-bool ImplEscherExSdr::ImplInitUnoShapes( const Reference< XShapes >& rxShapes )
+bool ImplEESdrWriter::ImplInitUnoShapes( const Reference< XShapes >& rxShapes )
 {
 // eventually write SolverContainer of current page, deletes the Solver
 ImplFlushSolverContainer();
@@ -899,7 +894,7 @@ bool ImplEscherExSdr::ImplInitUnoShapes( const Reference< 
XShapes >& rxShapes )
 return true;
 }
 
-void ImplEscherExSdr::ImplExitPage()
+void ImplEESdrWriter::ImplExitPage()
 {
 // close all groups before the solver container is written
 while( mpEscherEx->GetGroupLevel() )
@@ -910,7 +905,7 @@ void ImplEscherExSdr::ImplExitPage()
 }
 
 
-void ImplEscherExSdr::ImplFlushSolverContainer()
+void ImplEESdrWriter::ImplFlushSolverContainer()
 {
 if ( mpSolverContainer )
 {
@@ -920,43 +915,43 @@ void ImplEscherExSdr::ImplFlushSolverContainer()
 }
 }
 
-void ImplEscherExSdr::ImplWriteCurrentPage()
+void ImplEESdrWriter::ImplWriteCurrentPage()
 {
-assert(mpSolverContainer && "ImplEscherExSdr::ImplWriteCurrentPage: no 
SolverContainer");
+assert(mpSolverContainer && "ImplEESdrWriter::ImplWriteCurrentPage: no 
SolverContainer");
 ImplWritePage( *mpSolverContainer );
 ImplExitPage();
 }
 
-sal_uInt32 Imp

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 162569e8c28d6519b73ccb4638cbd732103c8ef4
Author: Gabor Kelemen 
Date:   Thu Oct 13 13:45:43 2016 +0200

Updated core
Project: help  0f18a22ab657aa080900ecb6d851da0e27bd6ca3

find-invalid-help-embeds: Fix link to toolbar icon

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

diff --git a/helpcontent2 b/helpcontent2
index c75a1cd..0f18a22 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c75a1cde49dde5d78b2e640b382fbd3c1d103be6
+Subproject commit 0f18a22ab657aa080900ecb6d851da0e27bd6ca3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/simpress/02/1011.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f18a22ab657aa080900ecb6d851da0e27bd6ca3
Author: Gabor Kelemen 
Date:   Thu Oct 13 13:45:43 2016 +0200

find-invalid-help-embeds: Fix link to toolbar icon

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

diff --git a/source/text/simpress/02/1011.xhp 
b/source/text/simpress/02/1011.xhp
index efe18c0..733e895 100644
--- a/source/text/simpress/02/1011.xhp
+++ b/source/text/simpress/02/1011.xhp
@@ -50,7 +50,7 @@
 Open the Insert 
toolbar, where you can add objects, including charts, spreadsheets, and images, 
to your document.
 Slide
 
-
+
 Floating Frame
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loleaflet/dist/toolbar/toolbar.js|6 ++
 loleaflet/src/control/Control.Menubar.js |1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 20e18d3a6c40adc12394c624cb3cf5b47ca147dd
Author: Henry Castro 
Date:   Wed Oct 12 21:51:48 2016 -0400

loleaflet: fix style names in Layout dropdown

(cherry picked from commit fbfd500a2ec2d3425903c002c63f1a73f20d152a)

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 816bf3d..71a884b 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -822,11 +822,9 @@ map.on('commandstatechanged', function (e) {
return;
}
 
-   // For impress documents, template name is prefixed with style 
name.
-   // Strip the template name until we support it
+   // For impress documents, no styles is supported.
if (map.getDocType() === 'presentation') {
-   state = state.split('~LT~')[1];
-   state = L.Styles.impressMapping[state];
+   return;
}
 
$('.styles-select option').each(function () {
commit a2ac0ce49e63958be7a3a7a96dd502e289495aeb
Author: Andras Timar 
Date:   Thu Oct 13 12:58:04 2016 +0200

loleaflet: add Insert - Comment to Calc menu

(cherry picked from commit cb4fb867945e9e3350f0ce0ec931aebc9bf86aaa)

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index dd8b867..9f6e806 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -123,6 +123,7 @@ L.Control.Menubar = L.Control.extend({

{name: _('Select all'), type: 'unocommand', uno: 
'.uno:SelectAll'}]
},
{name: _('Insert'), type: 'menu', menu: [{name: 
_('Image'), id: 'insertgraphic', type: 'action'},
+   
  {name: _('Comment'), type: 'unocommand', uno: 
'.uno:InsertAnnotation'},

  {type: 'separator'},

  {name: _('Row'), type: 'unocommand', uno: '.uno:InsertRows'},

  {name: _('Column'), type: 'unocommand', uno: 
'.uno:InsertColumns'}]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes36' - sc/source

[Kohei Yoshida]

 sc/source/core/inc/interpre.hxx  |   12 
 sc/source/core/tool/interpr1.cxx |  101 ++-
 2 files changed, 58 insertions(+), 55 deletions(-)

New commits:
commit ab3f76d5aef497e67ecc072117a9bc2a939388b2
Author: Kohei Yoshida 
Date:   Wed Oct 12 20:29:34 2016 -0400

Remove the branching at the end of IterateParametersIfs().

For (hopefully) better performance.

Change-Id: I59ed454aa9ace2f945facceee14f4e25610feebf

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index a01b60b..4fe6e56 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class ScDocument;
 class SbxVariable;
@@ -62,6 +63,15 @@ struct RangeMatrix;
 struct Compare;
 struct CompareOptions;
 
+struct ParamIfsResult
+{
+double mfSum = 0.0;
+double mfMem = 0.0;
+double mfCount = 0.0;
+double mfMin = std::numeric_limits::max();
+double mfMax = std::numeric_limits::min();
+};
+
 }
 
 namespace svl {
@@ -555,7 +565,7 @@ double IterateParametersIf( ScIterFuncIf );
 void ScCountIf();
 void ScSumIf();
 void ScAverageIf();
-double IterateParametersIfs( ScIterFuncIfs );
+void IterateParametersIfs( sc::ParamIfsResult& rRes );
 void ScSumIfs();
 void ScAverageIfs();
 void ScCountIfs();
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 239bb74..532783c 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5311,7 +5311,7 @@ void ScInterpreter::ScCountIf()
 }
 }
 
-double ScInterpreter::IterateParametersIfs( ScIterFuncIfs eFunc )
+void ScInterpreter::IterateParametersIfs( sc::ParamIfsResult& rRes )
 {
 sal_uInt8 nParamCount = GetByte();
 sal_uInt8 nQueryCount = nParamCount / 2;
@@ -5320,12 +5320,6 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 size_t nRowSize = 0;
 size_t nColSize = 0;
 double fVal = 0.0;
-double fSum = 0.0;
-double fMem = 0.0;
-double fRes = 0.0;
-double fCount = 0.0;
-double fMin = std::numeric_limits::max();
-double fMax = std::numeric_limits::min();
 short nParam = 1;
 size_t nRefInList = 0;
 SCCOL nDimensionCols = 0;
@@ -5344,7 +5338,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 {
 ScAddress aAdr;
 if ( !PopDoubleRefOrSingleRef( aAdr ) )
-return 0;
+return;
 
 ScRefCellValue aCell(*pDok, aAdr);
 switch (aCell.meType)
@@ -5406,7 +5400,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 }
 
 if (nGlobalError)
-return 0;   // and bail out, no need to evaluate other arguments
+return;   // and bail out, no need to evaluate other arguments
 
 // take range
 nParam = 1;
@@ -5444,7 +5438,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 if (!pQueryMatrix)
 {
 SetError( errIllegalParameter);
-return 0;
+return;
 }
 nCol1 = 0;
 nRow1 = 0;
@@ -5458,12 +5452,12 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 break;
 default:
 SetError( errIllegalParameter);
-return 0;
+return;
 }
 if ( nTab1 != nTab2 )
 {
 SetError( errIllegalArgument);
-return 0;
+return;
 }
 
 // All reference ranges must be of same dimension and size.
@@ -5474,12 +5468,12 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 if ((nDimensionCols != (nCol2 - nCol1 + 1)) || (nDimensionRows != 
(nRow2 - nRow1 + 1)))
 {
 SetError ( errIllegalArgument);
-return 0;
+return;
 }
 
 // recalculate matrix values
 if (nGlobalError)
-return 0;
+return;
 
 // initialize temporary result matrix
 if (aResArray.empty())
@@ -5523,7 +5517,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 if (nGlobalError || !pResultMatrix)
 {
 SetError( errIllegalParameter);
-return 0;
+return;
 }
 
 // result matrix is filled with boolean values.
@@ -5532,7 +5526,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 if (aResArray.size() != aResValues.size())
 {
 SetError( errIllegalParameter);
-return 0;
+return;
 }
 
 std::vector::iterator itRes = aResArray.begin(), 
itResEnd = aResArray.end();

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

[Giuseppe Castagno]

 ucb/source/ucp/webdav-neon/DAVException.hxx  |4 
 ucb/source/ucp/webdav-neon/webdavcontent.cxx |   26 ++
 2 files changed, 30 insertions(+)

New commits:
commit 97cc70d7285526ae2ee3b3bac425eb031c4c0321
Author: Giuseppe Castagno 
Date:   Thu Oct 13 09:34:19 2016 +0200

tdf#102499 (7): Caching connect timeout or cannot connect.

An unofficial HTTP response status code is defined and used
internally in LibreOffice WebDAV ucp provider in order to
catch either the DAVException::DAV_HTTP_TIMEOUT state or the
DAVException::DAV_HTTP_CONNECT state.

Change-Id: Iec4927d18ace5384fed16a7ec2a2620dc8305c5b
Reviewed-on: https://gerrit.libreoffice.org/29757
Tested-by: Jenkins 
Reviewed-by: Giuseppe Castagno 

diff --git a/ucb/source/ucp/webdav-neon/DAVException.hxx 
b/ucb/source/ucp/webdav-neon/DAVException.hxx
index 424445c..a7e57ca 100644
--- a/ucb/source/ucp/webdav-neon/DAVException.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVException.hxx
@@ -101,6 +101,10 @@ const sal_uInt16 SC_HTTP_VERSION_NOT_SUPPORTED   = 505;
 // DAV extensions ()
 const sal_uInt16 SC_INSUFFICIENT_STORAGE = 507;
 
+// unofficial status codes only used internally by LO
+// used to cache the connection time out event
+const sal_uInt16 USC_CONNECTION_TIMED_OUT= 908;
+
 
 class DAVException : public std::exception
 {
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx 
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index a292128..cd32145c12 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3943,6 +3943,26 @@ Content::ResourceType Content::getResourceType(
 {
 rResAccess->resetUri();
 
+// first check if the cached error can be mapped to 
DAVException::DAV_HTTP_TIMEOUT or mapped to DAVException::DAV_HTTP_CONNECT
+if ( aDAVOptions.getHttpResponseStatusCode() == 
USC_CONNECTION_TIMED_OUT )
+{
+// behave same as DAVException::DAV_HTTP_TIMEOUT or 
DAVException::DAV_HTTP_CONNECT was thrown
+try
+{
+// extract host name and connection port
+NeonUri   theUri( rURL );
+OUString  aHostName  = theUri.GetHost();
+sal_Int32 nPort  = theUri.GetPort();
+throw DAVException( DAVException::DAV_HTTP_TIMEOUT,
+NeonUri::makeConnectionEndPointString( 
aHostName,
+   
nPort ) );
+}
+catch ( DAVException& exp )
+{
+cancelCommandExecution( exp, xEnv );
+}
+}
+
 if ( aDAVOptions.getHttpResponseStatusCode() != SC_NOT_FOUND &&
  aDAVOptions.getHttpResponseStatusCode() != SC_GONE ) // the 
cached OPTIONS can have SC_GONE
 {
@@ -4045,6 +4065,12 @@ void Content::getResourceOptions(
 // probably a new bit stating 'timed out' should be added 
to opts var?
 // in any case abort the command
 SAL_WARN( "ucb.ucp.webdav", "OPTIONS - DAVException: 
DAV_HTTP_TIMEOUT or DAV_HTTP_CONNECT for URL <" << 
m_xIdentifier->getContentIdentifier() << ">" );
+// cache the internal unofficial status code
+
+aDAVOptions.setHttpResponseStatusCode( 
USC_CONNECTION_TIMED_OUT );
+// used only internally, so the text doesn't really 
matter..
+aStaticDAVOptionsCache.addDAVOptions( aDAVOptions,
+  
m_nOptsCacheLifeNotFound );
 cancelCommandExecution( e, xEnv );
 // unreachable
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sw/source/filter/ww8/ww8par2.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 7da303f371c4bcfd8bde284e47a7e2d20c6cb719
Author: Takeshi Abe 
Date:   Thu Oct 13 18:04:18 2016 +0900

sw: Remove inheritance from std::vector

Change-Id: I1b0e42149a91d9e92d227659147584beb27a5704
Reviewed-on: https://gerrit.libreoffice.org/29753
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 34fb283..2e5b820 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -76,9 +76,10 @@
 using namespace ::com::sun::star;
 
 class WW8SelBoxInfo
-: public std::vector
 {
 private:
+std::vector m_vBoxes;
+
 WW8SelBoxInfo(WW8SelBoxInfo const&) = delete;
 WW8SelBoxInfo& operator=(WW8SelBoxInfo const&) = delete;
 
@@ -90,6 +91,12 @@ public:
 WW8SelBoxInfo(short nXCenter, short nWidth)
 : nGroupXStart( nXCenter ), nGroupWidth( nWidth ), bGroupLocked(false)
 {}
+
+size_t size() const { return m_vBoxes.size(); }
+
+SwTableBox* operator[]( size_t nIndex ) { return m_vBoxes[nIndex]; }
+
+void push_back( SwTableBox* pBox ) { m_vBoxes.push_back(pBox); }
 };
 
 WW8TabBandDesc::WW8TabBandDesc()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/inc/pdfsignaturehelper.hxx |7 
 xmlsecurity/source/component/documentdigitalsignatures.cxx |2 -
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   |   11 ++
 xmlsecurity/source/pdfio/pdfdocument.cxx   |   21 +
 4 files changed, 21 insertions(+), 20 deletions(-)

New commits:
commit 9fe910e4861a7911c6d286258a30954e715653ac
Author: Miklos Vajna 
Date:   Thu Oct 13 13:13:44 2016 +0200

xmlsecurity: use common NSS init in PDFDocument

The custom code took care of NSS only, the shared code will handle
mscrypto as well.

Change-Id: I73b904d2e0750d2d847eaaf1ac2b02d41b37d357
Reviewed-on: https://gerrit.libreoffice.org/29763
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx 
b/xmlsecurity/inc/pdfsignaturehelper.hxx
index fb92834..fe7847b 100644
--- a/xmlsecurity/inc/pdfsignaturehelper.hxx
+++ b/xmlsecurity/inc/pdfsignaturehelper.hxx
@@ -17,13 +17,20 @@
 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 /// Handles signatures of a PDF file.
 class XMLSECURITY_DLLPUBLIC PDFSignatureHelper
 {
+css::uno::Reference m_xComponentContext;
+css::uno::Reference m_xSEInitializer;
+css::uno::Reference 
m_xSecurityContext;
 std::vector m_aSignatureInfos;
 
 public:
+PDFSignatureHelper(const css::uno::Reference& 
xComponentContext);
 bool ReadAndVerifySignature(const 
css::uno::Reference& xInputStream);
 css::uno::Sequence 
GetDocumentSignatureInformations();
 };
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx 
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 2fa08a4..17b3783 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -263,7 +263,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
 if (xSignStream.is())
 {
 // Something not ZIP-based, try PDF.
-PDFSignatureHelper aSignatureHelper;
+PDFSignatureHelper aSignatureHelper(mxCtx);
 if (aSignatureHelper.ReadAndVerifySignature(xSignStream))
 return aSignatureHelper.GetDocumentSignatureInformations();
 }
diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx 
b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index d8e6cd5..9a5ec84 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -11,6 +11,8 @@
 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -19,6 +21,15 @@
 
 using namespace ::com::sun::star;
 
+PDFSignatureHelper::PDFSignatureHelper(const 
uno::Reference& xComponentContext)
+: m_xComponentContext(xComponentContext)
+{
+m_xSEInitializer = xml::crypto::SEInitializer::create(m_xComponentContext);
+if (m_xSEInitializer.is())
+// This initializes nss / mscrypto.
+m_xSecurityContext = 
m_xSEInitializer->createSecurityContext(OUString());
+}
+
 bool PDFSignatureHelper::ReadAndVerifySignature(const 
uno::Reference& xInputStream)
 {
 if (!xInputStream.is())
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 3bd90db..4ca43a2 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -734,20 +734,8 @@ bool PDFDocument::ValidateSignature(SvStream& rStream, 
PDFObjectElement* pSignat
 }
 
 #ifdef XMLSEC_CRYPTO_NSS
-// Validate the signature.
-
-const char* pEnv = getenv("MOZILLA_CERTIFICATE_FOLDER");
-if (!pEnv)
-{
-SAL_WARN("xmlsecurity.pdfio", "PDFDocument::ValidateSignature: no 
mozilla cert folder");
-return false;
-}
-
-if (NSS_Init(pEnv) != SECSuccess)
-{
-SAL_WARN("xmlsecurity.pdfio", "PDFDocument::ValidateSignature: 
NSS_Init() failed");
-return false;
-}
+// Validate the signature. No need to call NSS_Init() here, assume that the
+// caller did that already.
 
 SECItem aSignatureItem;
 aSignatureItem.data = aSignature.data();
@@ -875,11 +863,6 @@ bool PDFDocument::ValidateSignature(SvStream& rStream, 
PDFObjectElement* pSignat
 PORT_Free(pActualResultBuffer);
 HASH_Destroy(pHASHContext);
 NSS_CMSSignerInfo_Destroy(pCMSSignerInfo);
-if (NSS_Shutdown() != SECSuccess)
-{
-SAL_WARN("xmlsecurity.pdfio", "PDFDocument::ValidateSignature: 
NSS_Shutdown() failed");
-return false;
-}
 
 return true;
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 scp2/source/ooo/folderitem_ooo.scp |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 1ffc0ddfef403bd7cae3e43a4af368a4db7cc9f7
Author: Samuel Mehrbrodt 
Date:   Thu Oct 13 11:17:44 2016 +0200

Add windows start menu entry for Safe Mode

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

diff --git a/scp2/source/ooo/folderitem_ooo.scp 
b/scp2/source/ooo/folderitem_ooo.scp
index ff8a371..3c0423b 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -65,3 +65,26 @@ FolderItemProperty gid_Fip_Soffice_Desktop_AppID
 Key = "System.AppUserModel.ID";
 Value = "TheDocumentFoundation.LibreOffice.Startcenter";
 End
+
+FolderItem gid_Folderitem_LibreOffice_SafeMode
+Name = "%PRODUCTNAME (Safe Mode)";
+ModuleID = gid_Module_Root;
+#ifdef ENABLE_SILENT_MSI
+FolderID = PREDEFINED_STARTMENU;
+#else
+FolderID = gid_Folder_Staroffice51;
+#endif
+FileID = auto_brand_exe_soffice;
+IconFile = auto_brand_exe_soffice;
+IconID = 0;
+WkDir = gid_Brand_Dir_Program;
+Parameter = "--safe-mode";
+Styles = (NON_ADVERTISED);
+ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
+End
+
+FolderItemProperty gid_Fip_LibreOffice_SafeMode
+ShortcutID = gid_Folderitem_LibreOffice_SafeMode;
+Key = "System.AppUserModel.ID";
+Value = "TheDocumentFoundation.LibreOffice.SafeMode";
+End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Sudarshan K license statement.

[Sudarshan K]

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

Enclosed with this email is my license statement. Thanks.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Gulsah Kose]

 sc/sdi/tabvwsh.sdi  |1 +
 sc/source/ui/drawfunc/fuconrec.cxx  |   19 +++
 sc/source/ui/view/tabvwsh2.cxx  |2 ++
 sc/uiconfig/scalc/toolbar/arrowsbar.xml |2 ++
 4 files changed, 24 insertions(+)

New commits:
commit 042a7fc229c44fcb7a0c009a1b7f5d34913f8c12
Author: Gulsah Kose 
Date:   Tue Oct 11 23:50:47 2016 +0300

tdf#101390 Add "Dimesion Line" command to the calc arrowsbox.

Change-Id: I00a324dd0a27dbcf598e83d2a6cc857ab7b7d6aa
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/29716
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 91e92c9..f7da47f 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -95,6 +95,7 @@ interface BaseSelection
 SID_LINE_CIRCLE_ARROW   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 SID_LINE_SQUARE_ARROW   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 SID_LINE_ARROWS [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
+SID_DRAW_MEASURELINE[ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 SID_DRAWTBX_ARROWS  [ StateMethod = GetDrawState; ]
 SID_DRAW_RECT   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 SID_DRAW_ELLIPSE[ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx 
b/sc/source/ui/drawfunc/fuconrec.cxx
index 310b114..ebc2611 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -206,6 +207,11 @@ void FuConstRectangle::Activate()
 aObjKind = OBJ_LINE;
 break;
 
+case SID_DRAW_MEASURELINE:
+aNewPointer = Pointer( PointerStyle::DrawLine );
+aObjKind = OBJ_MEASURE;
+break;
+
 case SID_DRAW_RECT:
 aNewPointer = Pointer( PointerStyle::DrawRect );
 aObjKind = OBJ_RECT;
@@ -420,6 +426,19 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const 
sal_uInt16 nID, const Rec
 
 break;
 }
+
+case SID_DRAW_MEASURELINE:
+{
+if(dynamic_cast( pObj) != nullptr)
+{
+sal_Int32 nYMiddle((aRect.Top() + aRect.Bottom()) / 2);
+
static_cast(pObj)->SetPoint(Point(aStart.X(), nYMiddle), 0);
+
static_cast(pObj)->SetPoint(Point(aEnd.X(), nYMiddle), 1);
+}
+
+break;
+}
+
 case SID_DRAW_CAPTION:
 case SID_DRAW_CAPTION_VERTICAL:
 {
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index f1a0f48..13c32a8 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -227,6 +227,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 case SID_LINE_ARROWS:
 case SID_DRAW_RECT:
 case SID_DRAW_ELLIPSE:
+case SID_DRAW_MEASURELINE:
 pTabView->SetDrawFuncPtr(new FuConstRectangle(this, pWin, pView, 
pDoc, rReq));
 break;
 
@@ -375,6 +376,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
 case SID_LINE_CIRCLE_ARROW:
 case SID_LINE_SQUARE_ARROW:
 case SID_LINE_ARROWS:
+case SID_DRAW_MEASURELINE:
 case SID_DRAW_RECT:
 case SID_DRAW_ELLIPSE:
 case SID_DRAW_POLYGON:
diff --git a/sc/uiconfig/scalc/toolbar/arrowsbar.xml 
b/sc/uiconfig/scalc/toolbar/arrowsbar.xml
index 5ec4d8a..cfe177a 100644
--- a/sc/uiconfig/scalc/toolbar/arrowsbar.xml
+++ b/sc/uiconfig/scalc/toolbar/arrowsbar.xml
@@ -27,4 +27,6 @@
  
  
  
+ 
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sal/rtl/math.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b086fd9923e69b7494fd70e8f62b16c83837f7e6
Author: Eike Rathke 
Date:   Thu Oct 13 15:07:47 2016 +0200

approxEqual: check isFinite()

Necessary as all comparisons involving a Nan evaluate to false and the
assert() in isRepresentableInteger() was hit by crash test documents
where approxEqual() was called with a least one Nan.

Change-Id: I9e8f41c36c0cf14cabf47c3df773c601d32682d6

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 9ce10f7..95df820 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1095,6 +1095,8 @@ bool SAL_CALL rtl_math_approxEqual(double a, double b) 
SAL_THROW_EXTERN_C()
 if (a == 0.0 || b == 0.0)
 return false;
 const double d = fabs(a - b);
+if (!rtl::math::isFinite(d))
+return false;   // Nan or Inf involved
 if (d > ((a = fabs(a)) * e44) || d > ((b = fabs(b)) * e44))
 return false;
 if (isRepresentableInteger(d) && isRepresentableInteger(a) && 
isRepresentableInteger(b))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk/gtkprintwrapper.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit c12e14d19f86be8555f6262d138cf0776f2c9b56
Author: Caolán McNamara 
Date:   Thu Oct 13 14:29:15 2016 +0100

Resolves: tdf#102999 get_selected_printer is transfer none

gtk_print_unix_dialog_get_settings returns a new GObject we
have to unref, but gtk_print_unix_dialog_get_selected_printer doesn't
add a ref so dies along with its parent dialog.

Change-Id: Ie5f8ecd83f5cc2c13e4a8c3ba292ffa381f9bdf5

diff --git a/vcl/unx/gtk/gtkprintwrapper.cxx b/vcl/unx/gtk/gtkprintwrapper.cxx
index cae1658..248ccf1 100644
--- a/vcl/unx/gtk/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gtkprintwrapper.cxx
@@ -276,13 +276,16 @@ void 
GtkPrintWrapper::print_unix_dialog_add_custom_tab(GtkPrintUnixDialog* dialo
 
 GtkPrinter* 
GtkPrintWrapper::print_unix_dialog_get_selected_printer(GtkPrintUnixDialog* 
dialog) const
 {
+GtkPrinter* pRet = nullptr;
 #if !GTK_CHECK_VERSION(3,0,0)
 assert(m_print_unix_dialog_get_selected_printer);
-return (*m_print_unix_dialog_get_selected_printer)(dialog);
+pRet = (*m_print_unix_dialog_get_selected_printer)(dialog);
 #else
 (void) this; // loplugin:staticmethods
-return gtk_print_unix_dialog_get_selected_printer(dialog);
+pRet = gtk_print_unix_dialog_get_selected_printer(dialog);
 #endif
+g_object_ref(G_OBJECT(pRet));
+return pRet;
 }
 
 void 
GtkPrintWrapper::print_unix_dialog_set_manual_capabilities(GtkPrintUnixDialog* 
dialog, GtkPrintCapabilities capabilities) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Hieronymous]

 basic/source/uno/namecont.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 6956e3379b0c7bd8fc9e822fd58a71f038084b6d
Author: Hieronymous 
Date:   Thu Oct 13 17:53:30 2016 +0530

Improve UNO error reporting. Make exceptions more descriptive.

Change-Id: I7f7462d2fe2fa29361fd51871bf43bcc5e817944
Reviewed-on: https://gerrit.libreoffice.org/29771
Tested-by: jan iversen 
Reviewed-by: jan iversen 

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index b374fd2..566e349 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -303,7 +303,7 @@ void SAL_CALL NameContainer::addContainerListener( const 
Reference< XContainerLi
 if( !xListener.is() )
 {
 throw RuntimeException("addContainerListener called with null 
xListener",
-   static_cast< cppu::OWeakObject * >(this));
+static_cast< cppu::OWeakObject * >(this));
 }
 maContainerListeners.addInterface( Reference(xListener, 
UNO_QUERY) );
 }
@@ -313,7 +313,8 @@ void SAL_CALL NameContainer::removeContainerListener( const 
Reference< XContaine
 {
 if( !xListener.is() )
 {
-throw RuntimeException();
+throw RuntimeException("removeContainerListener called with null 
xListener",
+static_cast< cppu::OWeakObject * >(this));
 }
 maContainerListeners.removeInterface( Reference(xListener, 
UNO_QUERY) );
 }
@@ -324,7 +325,8 @@ void SAL_CALL NameContainer::addChangesListener( const 
Reference< XChangesListen
 {
 if( !xListener.is() )
 {
-throw RuntimeException();
+throw RuntimeException("addChangesListener called with null xListener",
+static_cast< cppu::OWeakObject * >(this));
 }
 maChangesListeners.addInterface( Reference(xListener, 
UNO_QUERY) );
 }
@@ -334,7 +336,8 @@ void SAL_CALL NameContainer::removeChangesListener( const 
Reference< XChangesLis
 {
 if( !xListener.is() )
 {
-throw RuntimeException();
+throw RuntimeException("removeChangesListener called with null 
xListener",
+static_cast< cppu::OWeakObject * >(this));
 }
 maChangesListeners.removeInterface( Reference(xListener, 
UNO_QUERY) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/qa/unit/signing/data/bad.pdf  |binary
 xmlsecurity/qa/unit/signing/data/good.pdf |binary
 xmlsecurity/qa/unit/signing/data/no.pdf   |binary
 xmlsecurity/qa/unit/signing/signing.cxx   |   52 ++
 4 files changed, 52 insertions(+)

New commits:
commit e78b5e9861de1549c3ed889821e67931d92424b7
Author: Miklos Vajna 
Date:   Thu Oct 13 13:14:04 2016 +0200

CppunitTest_xmlsecurity_signing: add PDF tests

3 cases: a good and a bad signature, also a document without a
signature. Disable on Windows for now, as the non-NSS part in
PDFDocument is not implemented yet.

Fails without e.g. the previous commit, due to not initializing NSS
properly.

Change-Id: I3f100bd035ac899db22001b2744d1cb3abe5beaf
Reviewed-on: https://gerrit.libreoffice.org/29764
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/xmlsecurity/qa/unit/signing/data/bad.pdf 
b/xmlsecurity/qa/unit/signing/data/bad.pdf
new file mode 100644
index 000..f3f056f
Binary files /dev/null and b/xmlsecurity/qa/unit/signing/data/bad.pdf differ
diff --git a/xmlsecurity/qa/unit/signing/data/good.pdf 
b/xmlsecurity/qa/unit/signing/data/good.pdf
new file mode 100644
index 000..4a506c1
Binary files /dev/null and b/xmlsecurity/qa/unit/signing/data/good.pdf differ
diff --git a/xmlsecurity/qa/unit/signing/data/no.pdf 
b/xmlsecurity/qa/unit/signing/data/no.pdf
new file mode 100644
index 000..5d55242
Binary files /dev/null and b/xmlsecurity/qa/unit/signing/data/no.pdf differ
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index 0f12c66a..c357a2d 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -76,6 +76,12 @@ public:
 void testOOXMLRemove();
 /// Test removing all signatures from a document.
 void testOOXMLRemoveAll();
+/// Test a typical PDF where the signature is good.
+void testPDFGood();
+/// Test a typical PDF where the signature is bad.
+void testPDFBad();
+/// Test a typical PDF which is not signed.
+void testPDFNo();
 void test96097Calc();
 void test96097Doc();
 
@@ -90,6 +96,9 @@ public:
 CPPUNIT_TEST(testOOXMLAppend);
 CPPUNIT_TEST(testOOXMLRemove);
 CPPUNIT_TEST(testOOXMLRemoveAll);
+CPPUNIT_TEST(testPDFGood);
+CPPUNIT_TEST(testPDFBad);
+CPPUNIT_TEST(testPDFNo);
 CPPUNIT_TEST(test96097Calc);
 CPPUNIT_TEST(test96097Doc);
 CPPUNIT_TEST_SUITE_END();
@@ -390,6 +399,49 @@ void SigningTest::testOOXMLBroken()
 CPPUNIT_ASSERT_EQUAL(static_cast(SignatureState::BROKEN), 
static_cast(pObjectShell->GetDocumentSignatureState()));
 }
 
+void SigningTest::testPDFGood()
+{
+#ifndef _WIN32
+createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "good.pdf");
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+// We expect NOTVALIDATED in case the root CA is not imported on the 
system, and OK otherwise, so accept both.
+SignatureState nActual = pObjectShell->GetDocumentSignatureState();
+CPPUNIT_ASSERT_MESSAGE(
+(OString::number(
+ static_cast::type>(nActual))
+ .getStr()),
+(nActual == SignatureState::NOTVALIDATED
+ || nActual == SignatureState::OK));
+#endif
+}
+
+void SigningTest::testPDFBad()
+{
+#ifndef _WIN32
+createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "bad.pdf");
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+CPPUNIT_ASSERT_EQUAL(static_cast(SignatureState::BROKEN), 
static_cast(pObjectShell->GetDocumentSignatureState()));
+#endif
+}
+
+void SigningTest::testPDFNo()
+{
+#ifndef _WIN32
+createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "no.pdf");
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+CPPUNIT_ASSERT_EQUAL(static_cast(SignatureState::NOSIGNATURES), 
static_cast(pObjectShell->GetDocumentSignatureState()));
+#endif
+}
+
 void SigningTest::test96097Calc()
 {
 createCalc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "tdf96097.ods");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes36' -

[László Németh]

 0 files changed

New commits:
commit 351afb4b08072084680270f72c8f309f69f05cd8
Author: László Németh 
Date:   Thu Oct 13 16:11:25 2016 +0200

empty commit (repeat, not copy)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Asela Dasanayaka]

 connectivity/source/drivers/ado/AResultSet.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 83cc9a3fae1cf8fa8b6753d1db8ccf7226797613
Author: Asela Dasanayaka 
Date:   Thu Oct 13 15:58:45 2016 +0530

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

Fix a bug on connectivity/source/drivers/ado/AResultSet.cxx

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

diff --git a/connectivity/source/drivers/ado/AResultSet.cxx 
b/connectivity/source/drivers/ado/AResultSet.cxx
index 020c643..f22c99f 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -61,10 +61,7 @@ OUString SAL_CALL OResultSet::getImplementationName(  ) 
throw (css::uno::Runtime
 
 css::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  
) throw(css::uno::RuntimeException)
 {
-css::uno::Sequence< OUString > aSupported(2);
-aSupported[0] = "com.sun.star.sdbc.ResultSet";
-aSupported[1] = "com.sun.star.sdbcx.ResultSet";
-return aSupported;
+return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"};
 }
 
 sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) 
throw(css::uno::RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/source desktop/source include/comphelper instsetoo_native/CustomTarget_setup.mk

[Armin Le Grand]

 comphelper/source/misc/backupfilehelper.cxx |  640 +++-
 desktop/source/app/app.cxx  |   99 +---
 include/comphelper/backupfilehelper.hxx |   85 +--
 instsetoo_native/CustomTarget_setup.mk  |   16 
 4 files changed, 625 insertions(+), 215 deletions(-)

New commits:
commit 5f55b7d00a70db5dddaa0e74ccef52c021770f95
Author: Armin Le Grand 
Date:   Thu Oct 13 14:16:56 2016 +0200

profilesafe: extended to three modes

Saving configuration is now extended to three
basic modes, from just saving registrymodifiications
to adding user-defined config stuff to saving all
information in the user profile, additionally
configuration information for Extensions is saved.
Added configuration entries for this and tested
saving/restoring.

Change-Id: I79b09c37617803bf656826f76a7e3db79cda49ac
Reviewed-on: https://gerrit.libreoffice.org/29770
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index f452213..d5468f4 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -27,11 +27,12 @@
 #include 
 
 using namespace css;
-typedef std::shared_ptr< osl::File > FileSharedPtr;
 static const sal_uInt32 BACKUP_FILE_HELPER_BLOCK_SIZE = 16384;
 
 namespace
 {
+typedef std::shared_ptr< osl::File > FileSharedPtr;
+
 OUString splitAtLastToken(const OUString& rSrc, sal_Unicode aToken, 
OUString& rRight)
 {
 const sal_Int32 nIndex(rSrc.lastIndexOf(aToken));
@@ -170,6 +171,41 @@ namespace
 return false;
 }
 
+OUString createFileURL(const OUString& rURL, const OUString& rName, const 
OUString& rExt)
+{
+OUString aRetval;
+
+if (!rURL.isEmpty() && !rName.isEmpty())
+{
+aRetval = rURL;
+aRetval += "/";
+aRetval += rName;
+
+if (!rExt.isEmpty())
+{
+aRetval += ".";
+aRetval += rExt;
+}
+}
+
+return aRetval;
+}
+
+OUString createPackURL(const OUString& rURL, const OUString& rName)
+{
+OUString aRetval;
+
+if (!rURL.isEmpty() && !rName.isEmpty())
+{
+aRetval = rURL;
+aRetval += "/";
+aRetval += rName;
+aRetval += ".pack";
+}
+
+return aRetval;
+}
+
 bool fileExists(const OUString& rBaseURL)
 {
 if (!rBaseURL.isEmpty())
@@ -181,6 +217,51 @@ namespace
 
 return false;
 }
+
+void scanDirsAndFiles(
+const OUString& rDirURL,
+std::set< OUString >& rDirs,
+std::set< std::pair< OUString, OUString > >& rFiles)
+{
+if (!rDirURL.isEmpty())
+{
+osl::Directory aDirectory(rDirURL);
+
+if (osl::FileBase::E_None == aDirectory.open())
+{
+osl::DirectoryItem aDirectoryItem;
+
+while (osl::FileBase::E_None == 
aDirectory.getNextItem(aDirectoryItem))
+{
+osl::FileStatus aFileStatus(osl_FileStatus_Mask_Type | 
osl_FileStatus_Mask_FileURL | osl_FileStatus_Mask_FileName);
+
+if (osl::FileBase::E_None == 
aDirectoryItem.getFileStatus(aFileStatus))
+{
+if (aFileStatus.isDirectory())
+{
+const OUString 
aFileName(aFileStatus.getFileName());
+
+if (!aFileName.isEmpty())
+{
+rDirs.insert(aFileName);
+}
+}
+else if (aFileStatus.isRegular())
+{
+OUString aFileName(aFileStatus.getFileName());
+OUString aExtension;
+aFileName = splitAtLastToken(aFileName, '.', 
aExtension);
+
+if (!aFileName.isEmpty())
+{
+rFiles.insert(std::pair< OUString, OUString 
>(aFileName, aExtension));
+}
+}
+}
+}
+}
+}
+}
 }
 
 namespace
@@ -1176,61 +1257,134 @@ namespace comphelper
 sal_uInt16 BackupFileHelper::mnMaxAllowedBackups = 10;
 bool BackupFileHelper::mbExitWasCalled = false;
 
-BackupFileHelper::BackupFileHelper(
-const OUString& rBaseURL,
-sal_uInt16 nNumBackups)
-:   mrBaseURL(rBaseURL),
-mnNumBackups(::std::min(::std::max(nNumBackups, sal_uInt16(1)), 
mnMaxAllowedBackups)),
-maBase(),
-maName(),
-maExt()
+BackupFileHelper::BackupFileHelper()
+: maInitialBaseURL(),
+maUserConfigBaseURL(),
+maRegModName(),
+ 

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

[Jean-Pierre Ledure]

 wizards/source/access2base/Application.xba |   22 ++
 wizards/source/access2base/Database.xba|  127 ++
 wizards/source/access2base/DoCmd.xba   |  254 ++---
 wizards/source/access2base/Field.xba   |2 
 wizards/source/access2base/L10N.xba|4 
 wizards/source/access2base/Recordset.xba   |5 
 wizards/source/access2base/Utils.xba   |  204 ++-
 wizards/source/access2base/_License.xba|2 
 wizards/source/access2base/acConstants.xba |3 
 9 files changed, 518 insertions(+), 105 deletions(-)

New commits:
commit 3cac16941b775e02159af75d9b390b7dcc08d7ec
Author: Jean-Pierre Ledure 
Date:   Thu Oct 13 16:54:15 2016 +0200

Access2Base - CopyObject applied on tables belonging to different databases

So far, only tables belonging to the SAME database could be copied.
Copying tables between databases from different sources (HSQLDB 1.8/2.3, 
MySQL, PostGres, Sqlite)
is admitted.
Field type conversions are in this case based on empiric rules.
A case study based on getMetadatInfo() is available on request.

Change-Id: Iae4ea7c4df4799cde3c8f973746513bad56246d8

diff --git a/wizards/source/access2base/Application.xba 
b/wizards/source/access2base/Application.xba
index 95f81df..31e0340 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -72,6 +72,8 @@ Global Const ERRTABLECREATION =   1551
 Global Const ERRFIELDCREATION  =   1552
 Global Const ERRSUBFORMNOTFOUND=   1553
 Global Const ERRWINDOW =   1554
+Global Const ERRCOMPATIBILITY  =   1555
+Global Const ERRPRECISION  =   1556
 
 REM 
---
 Global Const DBCONNECTBASE =   1   
'  Connection from Base document (OpenConnection)
@@ -79,6 +81,17 @@ Global Const DBCONNECTFORM   =   2   
'  Connection from a database-aware form
 Global Const DBCONNECTANY  =   3   
'  Connection from any document for data access only (OpenDatabase)
 
 REM 
---
+Global Const DBMS_UNKNOWN  =   0
+Global Const DBMS_HSQLDB1  =   1
+Global Const DBMS_HSQLDB2  =   2
+Global Const DBMS_FIREBIRD =   3
+Global Const DBMS_MSACCESS2003 =   4
+Global Const DBMS_MSACCESS2007 =   5
+Global Const DBMS_MYSQL=   6
+Global Const DBMS_POSTGRES =   7
+Global Const DBMS_SQLITE   =   8
+
+REM 
---
 Global Const COLLALLDIALOGS= "ALLDIALOGS"
 Global Const COLLALLFORMS  = "ALLFORMS"
 Global Const COLLCOMMANDBARS   = "COMMANDBARS"
@@ -1039,7 +1052,12 @@ Const cstThisSub = "OpenConnection"
vDocContainer.DbConnect = DBCONNECTBASE
._DbConnect = DBCONNECTBASE
Set .MetaData = .Connection.MetaData
-   ._ReadOnly = .Connection.isReadOnly()
+   ._LoadMetadata()
+   If .MetaData.DatabaseProductName = 
"MySQL" Then
+   ._ReadOnly = .MetaData.isReadOnly()
+   Else
+   ._ReadOnly = .Connection.isReadOnly()   
'  Always True in Mysql ??
+   End If
Set .Document = oComponent
.Title = oComponent.Title
.URL = vDocContainer.URL
@@ -1064,6 +1082,7 @@ Const cstThisSub = "OpenConnection"
Set .Connection = 
.Form.ActiveConnection'  Might be Nothing in Windows at AOO/LO 
startup (not met in Linux)
If Not IsNull(.Connection) Then
Set .MetaData = 
.Connection.MetaData
+   ._LoadMetadata()
._ReadOnly = 
.Connection.isReadOnly()
TraceLog(TRACEANY, 
.MetaData.getDatabaseProductName() & " " & 
.MetaData.getDatabaseProductVersion, False)
End If
@@ -1163,6 +1182,7 @@ Const cstThisSub = "OpenDatabase"
Set odbDatabase.Connection = oBa

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Stephan, Jan-Marek, Kendy, Michael M., Olivier, JanI, Heiko, Eike, 
Miklos, Bjoern
  Christian, Robinson, Thorsten, Sophie, Xisco, Norbert, Armin, Michael S
 
* Completed Action Items:
+ investigate a cron job that queries & auto-merges (Norbert)
[ waiting for David to up-stream it; will take a while. ]
 
* Pending Action Items:
+ enable linux / system library checker on CI (Norbert)
[ enabled, but some heisenbug in there ]
+ simplify & cleanup broken Windows build instructions & test (JanI)
[ in progress: test building completed, missing documentation
  are we leaving the busted intructions there ? (Michael)
  + would be good to remove that stuff
  + chocolatey has been removed (Norbert)
  + fix due by end of the week (JanI) ]
+ align release dates and issues, patch merging (Caolan, Cloph)
[ waiting on AOO decision ]
+ poke at MSDN licenses (Michael)
[ still chasing this one ]
+ tweak UI and get LiveConnect API key / build case for board (Christian)
   + still need to get API key, rest is done
[ no build yet, but on-track for 5.3 ]
+ Ask beta-co-working for a couple of days before FOSDEM (Sophie)
 
* hangout issues (JanI)
+ tried to get more people into the hangout.
+ can make a google apps account for 2 users; than have 25 users.
+ Eur 120 user/year.
+ Jitsi ? (Heiko)
+ hangout best ATM (JanI)
+ use it for Jay in near east, more reliable (Heiko)
+ agree the way to go - can scale to 100's of users (Thorsten)
+ only display last 3-4 that spoke in a call.
 
* Release Engineering update (JanI)
+ 5.1 → 5.1.6 rc2 (jani with help from Cloph)
+ tagging on Tuesday evening.
+ scheduled 18 October
+ 5.2.3 RC1 (Cloph)
+ tagged & built, builds on pre-release server
+ pushed to mirrors, and will announce tonight.
+ 5.2.3 RC2 - due in 2 weeks.
+ 5.3.0 alpha 1 Oct 18th
+ will tag mid-week next week.
+ Nov 21st: branch-off (Cloph)
+ Android & iOS Remote (Cloph)
+ query wrt. F-Droid maintenance ? (Stuart/Kendy)
+ FDroid version is pretty obsolete vs. play etc.
+ not sure who is maintaining that.
+ if someone has contact with F-droid people, can they clear it up ?
+ anyone can create an account there; but not been used ourselves.
+ initial release was by F-droid volunteer (Kendy)
+ but apparently now abandoned.
AI: + add it to the TDF priorities sheet (Michael)
+ different build variant without Android-wear support added for 
F-droid (Cloph)
+ hopefully it is done now (Kendy)
+ builds already made & provided as the minimal variant on download 
server
  
http://downloadarchive.documentfoundation.org/libreoffice/old/sdremote-2.3.0/minimal/
 
   → no google APIs used (and thus no android wear support)
  
http://downloadarchive.documentfoundation.org/libreoffice/old/sdremote-2.3.0/playstore/
   → the full variant, as uploaded to playstore
+ Windows Server 2016 (Cloph)
+ final version not out yet; would love to bump baseline - but not 
final yet.
+ only 100 day eval version available.
 
* Documentation (Olivier)
 + New Q&A site unique for LibreOffice developers
 + https://ask.libreoffice.org/developers/questions/
 + please ask your dev questions there so we collect knowledge...
 + e.g. subjects on git, gerrit, C, C++, gbuild, etc...
 + lack of content on stack-overflow, good to get things here ?
 + hard to find things in the wiki, not found a good wiki search.
 + google+site-search is the solution (Thorsten)
 + concern wrt. the spread of documentation and how to update it (JanI)
 + not concerned wrt. immediate problem (Thorsten)
+ ask - good for very specific questions
 + new article on C++ extensions with LibreOffice (Bjoern)
 + promote it, or not ?
+ 
https://studiofreya.com/2016/10/11/integrating-libreoffice-into-c/
 + Finished http://documentation.libreoffice.org
 + minus page on join the team
 + need proper announcement
 + Set a development plan for HelpContent with Kendy
 + will build and publish a plan to improve Help Content soon
 + outline (Kendy)
 + keep the XHPs for now
 + cleanup the markup, and add markup as needed for other 
use-cases.
 + evolve the transformation more
 + sort out how to do translations
 + evolve it and use it instead of the wiki-help & off-line help.
 + also converting to larger book-like / documentation.
 + More HelpContent cleanup from Gabor Kelemen, Andras Timar, Eike Rathke, 
Caolán.
 
* UX Update (Heiko)
  * Total numbe

Regarding [Bug:38812] PackageKit / Help integration

[Asela Rukmal]

Hi
 I am bit new to LibreOffice and now I am currently working on a above
mentioned bug.
In there need to detect and trap entry points and allow PackageKit to
be used to install the apropriate (localised) help if it is not
present.
At description there is a mention that to install packages using


I don't understand is how Can I detect those entry points ?? Can
someone please help me

-- 
Asela Dasanayaka
www.asela-rukmal.blogspot.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Giuseppe Castagno]

 sw/source/filter/ww8/ww8par5.cxx |   17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

New commits:
commit f8857f30cbf7124ca01355f32998c11cb1843950
Author: Giuseppe Castagno 
Date:   Thu Oct 13 14:42:33 2016 +0200

Related: tdf#90700, fix the link validity check in ww8 sw filter

As written, it would never have worked with http links.
This function seems only used in DOC import documents.

Change-Id: Ibc02f41245ea4c9e9155fc838e67404b34c5fa8f
Reviewed-on: https://gerrit.libreoffice.org/29772
Tested-by: Jenkins 
Reviewed-by: Giuseppe Castagno 

diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 4868450..327368f 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2328,10 +2328,21 @@ bool CanUseRemoteLink(const OUString &rGrfName)
 ::ucbhelper::Content aCnt(rGrfName,
   static_cast< ucb::XCommandEnvironment* 
>(pCommandEnv),
   comphelper::getProcessComponentContext());
-OUString   aTitle;
 
-aCnt.getPropertyValue("Title") >>= aTitle;
-bUseRemote = !aTitle.isEmpty();
+if ( !INetURLObject( rGrfName ).isAnyKnownWebDAVScheme() )
+{
+OUString   aTitle;
+aCnt.getPropertyValue("Title") >>= aTitle;
+bUseRemote = !aTitle.isEmpty();
+}
+else
+{
+// is a link to a WebDAV resource
+// need to use MediaType to check for link usability
+OUString   aMediaType;
+aCnt.getPropertyValue("MediaType") >>= aMediaType;
+bUseRemote = !aMediaType.isEmpty();
+}
 }
 catch ( ... )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/inc sc/Library_sc.mk sc/source

[Markus Mohrhard]

 sc/Library_sc.mk  |1 
 sc/inc/conditio.hxx   |2 
 sc/inc/scabstdlg.hxx  |4 
 sc/inc/scitems.hxx|3 
 sc/source/core/data/conditio.cxx  |   12 +
 sc/source/core/data/table1.cxx|9 -
 sc/source/ui/app/msgpool.cxx  |7 
 sc/source/ui/attrdlg/scdlgfact.cxx|7 
 sc/source/ui/attrdlg/scdlgfact.hxx|4 
 sc/source/ui/condformat/condformatdlg.cxx |  214 +++---
 sc/source/ui/condformat/condformatdlgitem.cxx |   77 +
 sc/source/ui/condformat/condformatmgr.cxx |   13 +
 sc/source/ui/inc/condformatdlg.hxx|   33 
 sc/source/ui/inc/condformatdlgitem.hxx|   68 
 sc/source/ui/inc/condformatmgr.hxx|3 
 sc/source/ui/inc/msgpool.hxx  |2 
 sc/source/ui/view/cellsh1.cxx |   74 +---
 sc/source/ui/view/tabvwshc.cxx|   47 +
 18 files changed, 316 insertions(+), 264 deletions(-)

New commits:
commit 98b580b302267fb7c781e94ef6d175d696e9e848
Author: Markus Mohrhard 
Date:   Sun Sep 18 16:07:22 2016 +0200

tdf#96453, tdf#100793 rework transfer of data between cond format dlgs

extract the code to get the max key id to own method

Change-Id: I56bd53e03a7ea97b15895528ec02a09a73d877b6
Reviewed-on: https://gerrit.libreoffice.org/28994
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 046f3aa2d9285da7661c4d9f59c0baf406227553)

tdf#96453, tdf#100793 rework transfer of data between cond format dlgs

The xml based transfer of information was a bad idea from the start. It
can obviously not transport the temporary conditional format information
from the manager dialog. Therefore the whole handling here was
completely broken and deleted formats came back, changed formats were
not saved and added formats got applied directly to the document.

Now the document fornat list and the one from the manager are indepedent
again and as long as the manager has not been closed with ok nothing is
written to the document.

Reviewed-on: https://gerrit.libreoffice.org/28995
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 
(cherry picked from commit 5b8c22379e2eae74f7ed78326ab89483db5c6624)

Conflicts:
sc/source/ui/inc/condformatdlg.hxx
sc/source/ui/view/cellsh1.cxx

Change-Id: I9802be11cd15c2d2d877e55c91d836735fe0e0ff

adapt aMsgItemInfo to 5b8c22379

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

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index bd767cb..0ef50c3 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -387,6 +387,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/ui/cctrl/tbzoomsliderctrl \
 sc/source/ui/condformat/condformatdlg \
 sc/source/ui/condformat/condformatdlgentry \
+sc/source/ui/condformat/condformatdlgitem \
 sc/source/ui/condformat/condformathelper \
 sc/source/ui/condformat/colorformat \
 sc/source/ui/dbgui/asciiopt \
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index f214320..104fe42 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -523,6 +523,8 @@ public:
 
 void startRendering();
 void endRendering();
+
+sal_uInt32 getMaxKey() const;
 };
 
 #endif
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 8c6c6c5..4f946f7 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -79,7 +79,9 @@ class AbstractScCondFormatManagerDlg : public 
VclAbstractDialog
 public:
 virtual ScConditionalFormatList* GetConditionalFormatList() = 0;
 
-virtual bool CondFormatsChanged() = 0;
+virtual bool CondFormatsChanged() const = 0;
+
+virtual void SetModified() = 0;
 
 virtual ScConditionalFormat* GetCondFormatSelected() = 0;
 };
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 4e7adb1..6664e91 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -41,8 +41,9 @@
 #define SCITEM_SOLVEDATA1107
 #define SCITEM_USERLIST 1108
 #define SCITEM_PRINTWARN1109
+#define SCITEM_CONDFORMATDLGDATA1110
 
-#define MSGPOOL_END 1109
+#define MSGPOOL_END 1110
 
 // Item-IDs for attributes:
 
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 684498c..7fd1ef5 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -2290,4 +2290,16 @@ void ScConditionalFormatList::clear()
 m_ConditionalFormats.clear();
 }
 
+sal_uInt32 ScConditionalFormatList::getMaxKey() const
+{
+sal_uInt32 nMax = 0;
+for (const auto& aEntry : m_Condition

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

[Miklos Vajna]

 sfx2/source/doc/docfile.cxx|   24 +++--
 sfx2/source/doc/objserv.cxx|5 +-
 sfx2/source/doc/objstor.cxx|2 +
 xmlsecurity/source/component/documentdigitalsignatures.cxx |5 ++
 4 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit 4eed1d85339f7f7572d5ddff543df447d4411e49
Author: Miklos Vajna 
Date:   Thu Oct 13 16:10:18 2016 +0200

sfx2: initial PDF document signatures dialog

This just allows the menu entry in Draw to reach
SfxMedium::SignContents_Impl(), and then call signDocumentContent(),
which shows the dialog (where the signature itself isn't visible yet).

Do this by not assuming a ZIP-based storage at various places when we're
not working with an "own" format.

Change-Id: I030d0f636d1aab98369024f3f10a975ea2786d59
Reviewed-on: https://gerrit.libreoffice.org/29774
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index cae3a9e..b8efb54 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3519,8 +3519,18 @@ bool SfxMedium::SignContents_Impl( bool 
bScriptingContent, const OUString& aODFV
 if ( !pImpl->xStream.is() )
 throw uno::RuntimeException();
 
-xWriteableZipStor = 
::comphelper::OStorageHelper::GetStorageOfFormatFromStream( 
ZIP_STORAGE_FORMAT_STRING, pImpl->xStream );
-if ( !xWriteableZipStor.is() )
+bool bODF = GetFilter()->IsOwnFormat();
+try
+{
+xWriteableZipStor = 
::comphelper::OStorageHelper::GetStorageOfFormatFromStream( 
ZIP_STORAGE_FORMAT_STRING, pImpl->xStream );
+}
+catch (const io::IOException& rException)
+{
+if (bODF)
+SAL_WARN("sfx.doc", "ODF stream is not a zip storage: 
" << rException.Message);
+}
+
+if ( !xWriteableZipStor.is() && bODF )
 throw uno::RuntimeException();
 
 uno::Reference< embed::XStorage > xMetaInf;
@@ -3581,7 +3591,7 @@ bool SfxMedium::SignContents_Impl( bool 
bScriptingContent, const OUString& aODFV
 bChanges = true;
 }
 }
-else
+else if (xWriteableZipStor.is())
 {
 // OOXML.
 uno::Reference xStream;
@@ -3596,6 +3606,14 @@ bool SfxMedium::SignContents_Impl( bool 
bScriptingContent, const OUString& aODFV
 bChanges = true;
 }
 }
+else
+{
+// Something not based: e.g. PDF.
+SvStream* pStream = 
utl::UcbStreamHelper::CreateStream(GetName(), StreamMode::READ);
+uno::Reference xStream(new 
utl::OStreamWrapper(*pStream));
+if 
(xSigner->signDocumentContent(uno::Reference(), xStream))
+bChanges = true;
+}
 }
 }
 catch ( const uno::Exception& )
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index f6243cc..9e1d8ef 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1371,7 +1371,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
 &&  GetMedium()->GetFilter()
 &&  !GetMedium()->GetName().isEmpty()
 &&  (   (!GetMedium()->GetFilter()->IsOwnFormat() && 
!GetMedium()->GetFilter()->GetSupportsSigning())
-||  !GetMedium()->HasStorage_Impl()
+||  (GetMedium()->GetFilter()->IsOwnFormat() && 
!GetMedium()->HasStorage_Impl())
 )
 )
 {
@@ -1382,7 +1382,8 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
 
 // check whether the document is signed
 ImplGetSignatureState(); // document signature
-ImplGetSignatureState( true ); // script signature
+if (GetMedium() && GetMedium()->GetFilter() && 
GetMedium()->GetFilter()->IsOwnFormat())
+ImplGetSignatureState( true ); // script signature
 bool bHasSign = ( pImpl->nScriptingSignatureState != 
SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState != 
SignatureState::NOSIGNATURES );
 
 // the target ODF version on saving
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 6edaf11..d4e82fa 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1871,6 +1871,8 @@ bool SfxObjectShell::ConnectTmpStorage_Impl(
 SetError( ERRCODE_IO_GENERAL, OSL_LOG_PREFIX );
 }
 }
+else if (!GetMedium()->GetFilter()->IsOwnFormat())
+bResult = true;
 
 return bResu

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - xmloff/source

[Markus Mohrhard]

 xmloff/source/chart/PropertyMaps.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit cf5d6ccea23549aea708c6e399a982598b2b58aa
Author: Markus Mohrhard 
Date:   Mon Oct 10 00:58:42 2016 +0200

catch the exception to prevent broken charts, tdf#98690

Change-Id: I5958c87ca793c19d5c78dc829eb0ff0a1e04dffa
(cherry picked from commit 0ab45be62bc1ffcbdd13aca7375fdcd1bbccb79a)
Reviewed-on: https://gerrit.libreoffice.org/29682
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/xmloff/source/chart/PropertyMaps.cxx 
b/xmloff/source/chart/PropertyMaps.cxx
index 72dcf2c..30ff2a6 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -360,8 +360,15 @@ OUString convertRange( const OUString & rRange, const 
uno::Reference< chart2::XC
 return aResult;
 uno::Reference< chart2::data::XRangeXMLConversion > xConversion(
 xDoc->getDataProvider(), uno::UNO_QUERY );
-if( xConversion.is())
-aResult = xConversion->convertRangeToXML( rRange );
+try
+{
+if( xConversion.is())
+aResult = xConversion->convertRangeToXML( rRange );
+}
+catch (css::lang::IllegalArgumentException&)
+{
+}
+
 return aResult;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - chart2/source

[Markus Mohrhard]

 chart2/source/controller/main/ChartController.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0e8045fd2365c5adf986cd845d4d1a185ffe0aeb
Author: Markus Mohrhard 
Date:   Sun Oct 9 00:57:13 2016 +0200

avoid crashes on broken charts, related tdf#98690

Change-Id: If81f963babc15fc549d9daa904fd9836ea02ecef
(cherry picked from commit c3cc9429d136178996d797ef8fd6d740b39cc94e)
Reviewed-on: https://gerrit.libreoffice.org/29683
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 5085223..3992def 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -315,7 +315,7 @@ OUString ChartController::GetContextName()
 
 ObjectType eObjectID = ObjectIdentifier::getObjectType(aCID);
 
-css::uno::Reference xChartType = 
getChartType(css::uno::Reference(getModel(), 
uno::UNO_QUERY_THROW));
+css::uno::Reference xChartType = 
getChartType(css::uno::Reference(getModel(), 
uno::UNO_QUERY));
 switch (eObjectID)
 {
 case OBJECTTYPE_DATA_SERIES:
@@ -330,7 +330,7 @@ OUString ChartController::GetContextName()
 case OBJECTTYPE_GRID:
 return OUString("Grid");
 case OBJECTTYPE_DIAGRAM:
-if (xChartType->getChartType() == 
"com.sun.star.chart2.PieChartType")
+if (xChartType.is() && xChartType->getChartType() == 
"com.sun.star.chart2.PieChartType")
 return OUString("ChartElements");
 break;
 case OBJECTTYPE_DATA_CURVE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - accessibility/inc accessibility/source

[Caolán McNamara]

 accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx |2 
 accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx |   16 -
 accessibility/source/standard/vclxaccessiblelist.cxx|4 
 accessibility/source/standard/vclxaccessiblelistitem.cxx|   82 
+-
 4 files changed, 51 insertions(+), 53 deletions(-)

New commits:
commit 8d403f337dde983aeccc8d6066abfda6c12599ca
Author: Caolán McNamara 
Date:   Tue Oct 11 10:04:13 2016 +0100

Resolves: tdf#103032 a11y crash on listbox dispose in toolbar dropdown

(cherry picked from commit 6c220995aa2485a9c5d23f0ec952a64151ab25b6)

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

diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx 
b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
index 86b3a04..f65e010 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -22,7 +22,6 @@
 
 #include 
 #include 
-#include "accessibility/standard/vclxaccessiblelistitem.hxx"
 #include 
 #include 
 #include 
@@ -136,6 +135,7 @@ public:
 
 void UpdateFocus_Impl_Acc ( sal_Int32 nPos, bool b_IsDropDownList) ;
 static void NotifyListItem(css::uno::Any& val);
+::accessibility::IComboListBoxHelper* getListBoxHelper() { return 
m_pListBoxHelper; }
 protected:
 BoxType m_aBoxType;
 ::accessibility::IComboListBoxHelper* m_pListBoxHelper;
diff --git 
a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx 
b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
index f851060..0a9889d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include "accessibility/standard/vclxaccessiblelist.hxx"
 
 // forward ---
 
@@ -40,11 +41,6 @@ namespace com { namespace sun { namespace star { namespace 
awt {
 class XFocusListener;
 } } } }
 
-namespace accessibility
-{
-class IComboListBoxHelper;
-}
-
 // class VCLXAccessibleListItem --
 
 typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible
@@ -69,9 +65,8 @@ private:
 protected:
 /// client id in the AccessibleEventNotifier queue
 sal_uInt32  m_nClientId;
-::accessibility::IComboListBoxHelper*   m_pListBoxHelper;
 
-css::uno::Reference< css::accessibility::XAccessible >m_xParent;
+rtl::Reference< VCLXAccessibleList > m_xParent;
 css::uno::Reference< css::accessibility::XAccessibleContext > 
m_xParentContext;
 
 protected:
@@ -87,16 +82,13 @@ protected:
 
 public:
 /** OAccessibleBase needs a valid view
-@param  _pListBoxHelper
-is the list- or combobox for which we implement an accessible 
object
 @param  _nIndexInParent
 is the position of the entry inside the listbox
 @param  _xParent
 is our parent accessible object
 */
-VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* 
_pListBoxHelper,
-sal_Int32 _nIndexInParent,
-const css::uno::Reference< 
css::accessibility::XAccessible >& _xParent );
+VCLXAccessibleListItem(sal_Int32 _nIndexInParent,
+   const rtl::Reference< VCLXAccessibleList >& 
_xParent);
 
 voidNotifyAccessibleEvent(  sal_Int16 _nEventId, const 
css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );
 
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx 
b/accessibility/source/standard/vclxaccessiblelist.cxx
index c425f3c..a03888c 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -503,7 +503,7 @@ Reference VCLXAccessibleList::CreateChild 
(sal_Int32 nPos)
 m_aAccessibleChildren.resize(nPos + 1);
 
 // insert into the container
-xChild = new VCLXAccessibleListItem(m_pListBoxHelper, nPos, this);
+xChild = new VCLXAccessibleListItem(nPos, this);
 m_aAccessibleChildren[nPos] = xChild;
 }
 else
@@ -512,7 +512,7 @@ Reference VCLXAccessibleList::CreateChild 
(sal_Int32 nPos)
 // check if position is empty and can be used else we have to adjust 
all entries behind this
 if (!xChild.is())
 {
-xChild = new VCLXAccessibleListItem(m_pListBoxHelper, nPos, this);
+xChild = new VCLXAccessibleListItem(nPos, this);
 m_aAccessibleChildren[nPos] = xChild;
 }
 }
diff --git a/accessibility/source/standard/vclxaccessiblelistitem

Re: Regarding [Bug:38812] PackageKit / Help integration

[Jan Iversen]

> On 13 Oct 2016, at 17:19, Asela Rukmal  wrote:
> 
> Hi
> I am bit new to LibreOffice and now I am currently working on a above
> mentioned bug.
> In there need to detect and trap entry points and allow PackageKit to
> be used to install the apropriate (localised) help if it is not
> present.
> At description there is a mention that to install packages using
> 
> 
> I don't understand is how Can I detect those entry points ?? Can
> someone please help me

First you need to build a version of libre office, with —enable-debug, then you 
can set breakpoints using gdb, and check when they are called.

The getInvolved link I sent you, also has some links on how to debug.

rgds
jan I.

> 
> -- 
> Asela Dasanayaka
> www.asela-rukmal.blogspot.com
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

Regarding [Bug:89860] Error while make install android viewer

[Rosen Silva]

Hi,
I was trying to install freshly build LibreOffice Android Viewer using
"make install" command using Makefile which was located at
"core/android/source" , but suddenly it shows that a file is missing. 
The file name was  "n/core/android/source/liboSettings.gradle"
then I searched the core in github weather is it available 
but there is no such file. Can anyone give me a solution ?
,Anyway I feels like that file should generated on my pc itself 
but I can't find what went wrong.
Thanks in advance ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Caolán McNamara]

 sw/source/uibase/utlui/navipi.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a357ce53723829748f3622137ae4d4e47d7b6bac
Author: Caolán McNamara 
Date:   Tue Oct 11 15:30:15 2016 +0100

Master Document toggle missing if switch to master doc from normal doc

regression since...

commit 20e2d7e7d1c518fe514e8252836c1c728fe3fc27
Author: akki95 
Date:   Sat Jan 30 09:55:41 2016 +0530

tdf#95408 -"Toggle" in Writer Navigator to be more explicit in what it 
toggles

(cherry picked from commit 045367d9ba43ec6afb003fd9117ae186c7e18e34)

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

diff --git a/sw/source/uibase/utlui/navipi.cxx 
b/sw/source/uibase/utlui/navipi.cxx
index 5c70544..2a62187 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -941,7 +941,7 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, 
SfxItemState /*eState*/,
 SwWrtShell* pWrtShell = pActView->GetWrtShellPtr();
 m_aContentTree->SetActiveShell(pWrtShell);
 bool bGlobal = IsGlobalDoc();
-m_aContentToolBox->EnableItem(FN_GLOBAL_SWITCH, bGlobal);
+m_aContentToolBox->ShowItem(FN_GLOBAL_SWITCH, bGlobal);
 if( (!bGlobal && IsGlobalMode()) ||
 (!IsGlobalMode() && m_pConfig->IsGlobalActive()) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/liblangtag

[Eike Rathke]

 download.lst   |4 -
 external/liblangtag/0001-use-standard-function.patch.1 |   35 -
 external/liblangtag/ExternalPackage_liblangtag.mk  |2 
 external/liblangtag/UnpackedTarball_langtag.mk |1 
 4 files changed, 3 insertions(+), 39 deletions(-)

New commits:
commit ab32758ea8378b56df04fb2a47791e0379adb5a2
Author: Eike Rathke 
Date:   Thu Oct 13 16:27:44 2016 +0200

upgrade to liblangtag-0.6.2

Change-Id: I315d9bcea575920b718da46007bd7500d6cca9c2
Reviewed-on: https://gerrit.libreoffice.org/29777
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/download.lst b/download.lst
index f5a696c..08d1005 100644
--- a/download.lst
+++ b/download.lst
@@ -90,8 +90,8 @@ export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
-export LIBLANGTAG_MD5SUM := 90be6460842d8b719de0c2058bf108e1
-export LIBLANGTAG_TARBALL := liblangtag-0.6.1.tar.bz2
+export LIBLANGTAG_MD5SUM := 284f120247323a35122ab32b4b359c45
+export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
 export LIBTOMMATH_MD5SUM := da283d2e3e72137d0c600ac36b991c9d
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export LIBXMLSEC_TARBALL := 
0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz
diff --git a/external/liblangtag/0001-use-standard-function.patch.1 
b/external/liblangtag/0001-use-standard-function.patch.1
deleted file mode 100644
index fc21f18..000
--- a/external/liblangtag/0001-use-standard-function.patch.1
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5caa5eb0cb1b356fcbdef586ea700c0b8df34ce1 Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Thu, 22 Sep 2016 18:12:36 +0200
-Subject: [PATCH] use standard function
-

- liblangtag/lt-xml.c | 5 +
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/liblangtag/lt-xml.c b/liblangtag/lt-xml.c
-index 170d8bb..abf2254 100644
 a/liblangtag/lt-xml.c
-+++ b/liblangtag/lt-xml.c
-@@ -16,9 +16,6 @@
- 
- #include 
- #include 
--#ifdef HAVE_STRINGS_H
--#include 
--#endif
- #include 
- #include 
- #include 
-@@ -409,7 +406,7 @@ lt_xml_get_cldr(lt_xml_t  *xml,
-   xmlDocPtr *d = &pref[idx - 1], doc = NULL;
- 
-   do {
--  p = index(pp, ':');
-+  p = strchr(pp, ':');
-   if (p)
-   s = lt_strndup(pp, p - pp);
-   else
--- 
-2.7.4
-
diff --git a/external/liblangtag/ExternalPackage_liblangtag.mk 
b/external/liblangtag/ExternalPackage_liblangtag.mk
index a29945e..6b3eac1 100644
--- a/external/liblangtag/ExternalPackage_liblangtag.mk
+++ b/external/liblangtag/ExternalPackage_liblangtag.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,liblangtag,langtag))
 ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag.1.dylib,liblangtag/.libs/liblangtag.1.dylib))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.4.0))
+$(eval $(call 
gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.4.1))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liblangtag/UnpackedTarball_langtag.mk 
b/external/liblangtag/UnpackedTarball_langtag.mk
index 3cde9e7..47505f8 100644
--- a/external/liblangtag/UnpackedTarball_langtag.mk
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -34,7 +34,6 @@ endif
 $(eval $(call gb_UnpackedTarball_add_patches,langtag, \
$(if 
$(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \
 external/liblangtag/clang-cl.patch.0 \
-external/liblangtag/0001-use-standard-function.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gulsah Kose]

 sw/sdi/viewsh.sdi |5 +
 sw/source/uibase/ribbar/conrect.cxx   |1 +
 sw/source/uibase/ribbar/drawbase.cxx  |2 +-
 sw/source/uibase/uiview/viewdraw.cxx  |1 +
 sw/source/uibase/uiview/viewstat.cxx  |1 +
 sw/uiconfig/swriter/toolbar/arrowsbar.xml |1 +
 6 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit c3f95221b83f2302778e315330ff8ccf2998a397
Author: Gulsah Kose 
Date:   Thu Oct 13 14:54:24 2016 +0300

tdf#101390 Add "Diagonal Line" command to the writer arrowsbar.

Change-Id: If21ea239289b985e6a7cea717b41e073bc591c62
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/29768
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 56a2d6e..c6d83c8 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -82,6 +82,11 @@ interface TextEditView : BaseTextEditView
 ExecMethod = ExecDraw ;
 StateMethod = GetDrawState ;
 ]
+SID_DRAW_XLINE
+[
+ExecMethod = ExecDraw ;
+StateMethod = GetDrawState ;
+]
 SID_LINE_ARROW_END
 [
 ExecMethod = ExecDraw ;
diff --git a/sw/source/uibase/ribbar/conrect.cxx 
b/sw/source/uibase/ribbar/conrect.cxx
index 2e0542f..39ccea5 100644
--- a/sw/source/uibase/ribbar/conrect.cxx
+++ b/sw/source/uibase/ribbar/conrect.cxx
@@ -167,6 +167,7 @@ void ConstRectangle::Activate(const sal_uInt16 nSlotId)
 case SID_LINE_SQUARE_ARROW:
 case SID_LINE_ARROWS:
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 m_pWin->SetSdrDrawMode(OBJ_LINE);
 break;
 
diff --git a/sw/source/uibase/ribbar/drawbase.cxx 
b/sw/source/uibase/ribbar/drawbase.cxx
index 48526fb..820a99e 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -621,7 +621,7 @@ Point  SwDrawBase::GetDefaultCenterPos()
 // #i33136#
 bool SwDrawBase::doConstructOrthogonal() const
 {
-return ( m_nSlotId == SID_DRAW_XPOLYGON || m_nSlotId == 
SID_DRAW_XPOLYGON_NOFILL );
+return ( m_nSlotId == SID_DRAW_XPOLYGON || m_nSlotId == 
SID_DRAW_XPOLYGON_NOFILL || m_nSlotId == SID_DRAW_XLINE );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/viewdraw.cxx 
b/sw/source/uibase/uiview/viewdraw.cxx
index 750caf8..dbe74d5 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -253,6 +253,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
 case SID_LINE_SQUARE_ARROW:
 case SID_LINE_ARROWS:
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 case SID_DRAW_MEASURELINE:
 case SID_DRAW_RECT:
 case SID_DRAW_ELLIPSE:
diff --git a/sw/source/uibase/uiview/viewstat.cxx 
b/sw/source/uibase/uiview/viewstat.cxx
index 1de3fc7..3f01b80 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -495,6 +495,7 @@ void SwView::GetDrawState(SfxItemSet &rSet)
 switch(nWhich)
 {
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 case SID_LINE_ARROW_END:
 case SID_LINE_ARROW_CIRCLE:
 case SID_LINE_ARROW_SQUARE:
diff --git a/sw/uiconfig/swriter/toolbar/arrowsbar.xml 
b/sw/uiconfig/swriter/toolbar/arrowsbar.xml
index cfe177a..40d7238 100644
--- a/sw/uiconfig/swriter/toolbar/arrowsbar.xml
+++ b/sw/uiconfig/swriter/toolbar/arrowsbar.xml
@@ -29,4 +29,5 @@
  
  
  
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Ask for help - disable OpenCL via config-file (*.xcu) or registry-key

[Thomas Krumbein]

Hey all,

there is a technical question in german ask.libreoffice.org system I 
cannot answer.


Maybe someone can help? I will pass the answer.

#  original message:

"Hallo,

wir nutzen LibreOffice in unseren Schule für ca. 3500 Accounts. Jetzt 
haben wir festgestellt, dass bei Impress im einer Fehler "fatal error" 
auftritt. Wir haben rausgefunden, dass dies mit der 
Hardwarebeschleunigung, Kantenglättung und OpenGL zusammenhängt.


Kann mir bitte jemand die Registry-Keys zum Deaktiveren der 
Hardwarebeschleunigung und der Kantenglättung verraten? Zum deaktiveren 
von OpenGL habe ich schon ein Admx-Template gefunden.


Vielen Dank"

##

free translation:

it is a school and the are using 3500 seats with LibreOffice. They do 
have a problem in Impress "fatal error" (crash) - this is a problem with 
OpenGL, edge smoothing and
hardware acceleration options. Now they want to disable this options via 
Windows registry-Key.


##

It would help if we have a caonfiguration file (*.xcu) - I can translate 
this to an registry key;)


Best regards

Thomas

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

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

[Gulsah Kose]

 sc/sdi/tabvwsh.sdi  |1 +
 sc/source/ui/drawfunc/fuconrec.cxx  |2 ++
 sc/source/ui/drawfunc/fupoor.cxx|4 +++-
 sc/source/ui/view/tabvwsh2.cxx  |2 ++
 sc/uiconfig/scalc/toolbar/arrowsbar.xml |1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 19dc5d725791388f1b7b17af2e48b0abdf8990bd
Author: Gulsah Kose 
Date:   Thu Oct 13 15:17:25 2016 +0300

tdf#101390 Add "Diagonal Line" command to the calc arrowsbar.

Change-Id: I1e29cd9a63424771576d1a5a47558d30faf53dda
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/29769
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index f7da47f..ec44746 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -88,6 +88,7 @@ interface BaseSelection
 
 SID_OBJECT_SELECT   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 SID_DRAW_LINE   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
+SID_DRAW_XLINE  [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 SID_LINE_ARROW_END  [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 SID_LINE_ARROW_CIRCLE   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 SID_LINE_ARROW_SQUARE   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx 
b/sc/source/ui/drawfunc/fuconrec.cxx
index ebc2611..d76b1ef 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -196,6 +196,7 @@ void FuConstRectangle::Activate()
 switch (aSfxRequest.GetSlot() )
 {
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 case SID_LINE_ARROW_END:
 case SID_LINE_ARROW_CIRCLE:
 case SID_LINE_ARROW_SQUARE:
@@ -403,6 +404,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const 
sal_uInt16 nID, const Rec
 switch(nID)
 {
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 case SID_LINE_ARROW_END:
 case SID_LINE_ARROW_CIRCLE:
 case SID_LINE_ARROW_SQUARE:
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 94829ea..03a6646 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -308,7 +308,9 @@ bool FuPoor::doConstructOrthogonal() const
 return bIsMediaSelected;
 }
 }
-else if (aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON || 
aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON_NOFILL)
+else if (aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON
+  || aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON_NOFILL
+  || aSfxRequest.GetSlot() == SID_DRAW_XLINE)
 return true;
 
 return false;
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 13c32a8..a3982db 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -218,6 +218,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 break;
 
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 case SID_LINE_ARROW_END:
 case SID_LINE_ARROW_CIRCLE:
 case SID_LINE_ARROW_SQUARE:
@@ -369,6 +370,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
 break;
 
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 case SID_LINE_ARROW_END:
 case SID_LINE_ARROW_CIRCLE:
 case SID_LINE_ARROW_SQUARE:
diff --git a/sc/uiconfig/scalc/toolbar/arrowsbar.xml 
b/sc/uiconfig/scalc/toolbar/arrowsbar.xml
index cfe177a..40d7238 100644
--- a/sc/uiconfig/scalc/toolbar/arrowsbar.xml
+++ b/sc/uiconfig/scalc/toolbar/arrowsbar.xml
@@ -29,4 +29,5 @@
  
  
  
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 extras/source/autocorr/lang/bg/DocumentList.xml|   12 
 extras/source/autocorr/lang/ca/DocumentList.xml|   12 
 extras/source/autocorr/lang/cs/DocumentList.xml|   12 
 extras/source/autocorr/lang/da/DocumentList.xml|   12 
 extras/source/autocorr/lang/en-AU/DocumentList.xml |   12 
 extras/source/autocorr/lang/en-US/DocumentList.xml |   12 
 extras/source/autocorr/lang/es/DocumentList.xml|   12 
 extras/source/autocorr/lang/fi/DocumentList.xml|   12 
 extras/source/autocorr/lang/fr/DocumentList.xml|   12 
 extras/source/autocorr/lang/hr/DocumentList.xml|   12 
 extras/source/autocorr/lang/hu/DocumentList.xml|   12 
 extras/source/autocorr/lang/is/DocumentList.xml|   12 
 extras/source/autocorr/lang/it/DocumentList.xml|   12 
 extras/source/autocorr/lang/ja/DocumentList.xml|   12 
 extras/source/autocorr/lang/ko/DocumentList.xml|   12 
 extras/source/autocorr/lang/lt/DocumentList.xml|   12 
 extras/source/autocorr/lang/nl/DocumentList.xml|   12 
 extras/source/autocorr/lang/pt-BR/DocumentList.xml |   12 
 extras/source/autocorr/lang/pt-PT/DocumentList.xml |   12 
 extras/source/autocorr/lang/pt/DocumentList.xml|   12 
 extras/source/autocorr/lang/ro/DocumentList.xml|   12 
 extras/source/autocorr/lang/sk/DocumentList.xml|   12 
 extras/source/autocorr/lang/sl/DocumentList.xml|   12 
 extras/source/autocorr/lang/sv/DocumentList.xml|   12 
 extras/source/autocorr/lang/tr/DocumentList.xml|   12 
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |   12 
 26 files changed, 312 deletions(-)

New commits:
commit 92bdea77195a23bc768cb411bf9d5e7113a02815
Author: Christian Lohmaier 
Date:   Thu Oct 13 19:37:36 2016 +0200

delete emoji autocorrect entries that conflict with entering time

entering 9:10:23 would trigger unwanted replacement of the :10: in the
middle by a clockface..

fixes the partial (and accidental) revert of
681d5fd37e469491268d40147c621187dc6f4b95 done by the last update of the
emojis in b36479dab027473b6a17d6a729e9d924ae24c4f1

Change-Id: Icb70f2df90e573043fb60f5c4c7cd5f74f61b71b

diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml 
b/extras/source/autocorr/lang/bg/DocumentList.xml
index eea1376..348a27a 100644
--- a/extras/source/autocorr/lang/bg/DocumentList.xml
+++ b/extras/source/autocorr/lang/bg/DocumentList.xml
@@ -20,57 +20,45 @@
   
   
   
-  
   
-  
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index f7a1866..d497dcf 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -361,57 +361,45 @@
   
   
   
-  
   
-  
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index 5c5c6e5..e168d0e 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -573,57 +573,45 @@
   
   
   
-  
   
-  
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/da/DocumentList.xml 
b/extras/source/autocorr/lang/da/DocumentList.xml
index 3192b46..63463d8 100644
--- a/extras/source/autocorr/lang/da/DocumentList.xml
+++ b/extras/source/autocorr/lang/da/DocumentList.xml
@@ -624,46 +624,34 @@
   
   
   
-  
-  
-  
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
   
-  
   
   
-  
   
   
   
-  
   
   
-  
   
   
   
-  
   
   
-  
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/en-AU/DocumentList.xml 
b/extras/source/autocorr/lang/en-AU/DocumentList.xml
index b8568d6..d0590bf 100644
--- a/extras/source/autocorr/lang/en-AU/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-AU/DocumentList.xml
@@ -828,57 +828,45 @@
   
   
   
-  
   
-  
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/en-US/DocumentList.xml 
b/ex

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - extras/source

[Christian Lohmaier]

 extras/source/autocorr/lang/bg/DocumentList.xml|   12 
 extras/source/autocorr/lang/ca/DocumentList.xml|   12 
 extras/source/autocorr/lang/cs/DocumentList.xml|   12 
 extras/source/autocorr/lang/da/DocumentList.xml|   12 
 extras/source/autocorr/lang/en-AU/DocumentList.xml |   12 
 extras/source/autocorr/lang/en-US/DocumentList.xml |   12 
 extras/source/autocorr/lang/es/DocumentList.xml|   12 
 extras/source/autocorr/lang/fi/DocumentList.xml|   12 
 extras/source/autocorr/lang/fr/DocumentList.xml|   12 
 extras/source/autocorr/lang/hr/DocumentList.xml|   12 
 extras/source/autocorr/lang/hu/DocumentList.xml|   12 
 extras/source/autocorr/lang/is/DocumentList.xml|   12 
 extras/source/autocorr/lang/it/DocumentList.xml|   12 
 extras/source/autocorr/lang/ja/DocumentList.xml|   12 
 extras/source/autocorr/lang/ko/DocumentList.xml|   12 
 extras/source/autocorr/lang/lt/DocumentList.xml|   12 
 extras/source/autocorr/lang/nl/DocumentList.xml|   12 
 extras/source/autocorr/lang/pt-BR/DocumentList.xml |   12 
 extras/source/autocorr/lang/pt/DocumentList.xml|   12 
 extras/source/autocorr/lang/ro/DocumentList.xml|   12 
 extras/source/autocorr/lang/sk/DocumentList.xml|   12 
 extras/source/autocorr/lang/sl/DocumentList.xml|   12 
 extras/source/autocorr/lang/sv/DocumentList.xml|   12 
 extras/source/autocorr/lang/tr/DocumentList.xml|   12 
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |   12 
 25 files changed, 300 deletions(-)

New commits:
commit 48864458c08e832408000c60ef521f7c8d8ad689
Author: Christian Lohmaier 
Date:   Thu Oct 13 19:37:36 2016 +0200

delete emoji autocorrect entries that conflict with entering time

entering 9:10:23 would trigger unwanted replacement of the :10: in the
middle by a clockface..

fixes the partial (and accidental) revert of
681d5fd37e469491268d40147c621187dc6f4b95 done by the last update of the
emojis in b36479dab027473b6a17d6a729e9d924ae24c4f1

(cherry picked from commit 92bdea77195a23bc768cb411bf9d5e7113a02815)

Change-Id: Icb70f2df90e573043fb60f5c4c7cd5f74f61b71b

diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml 
b/extras/source/autocorr/lang/bg/DocumentList.xml
index eea1376..348a27a 100644
--- a/extras/source/autocorr/lang/bg/DocumentList.xml
+++ b/extras/source/autocorr/lang/bg/DocumentList.xml
@@ -20,57 +20,45 @@
   
   
   
-  
   
-  
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index f7a1866..d497dcf 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -361,57 +361,45 @@
   
   
   
-  
   
-  
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index 5c5c6e5..e168d0e 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -573,57 +573,45 @@
   
   
   
-  
   
-  
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/da/DocumentList.xml 
b/extras/source/autocorr/lang/da/DocumentList.xml
index 3192b46..63463d8 100644
--- a/extras/source/autocorr/lang/da/DocumentList.xml
+++ b/extras/source/autocorr/lang/da/DocumentList.xml
@@ -624,46 +624,34 @@
   
   
   
-  
-  
-  
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
   
-  
   
   
-  
   
   
   
-  
   
   
-  
   
   
   
-  
   
   
-  
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/en-AU/DocumentList.xml 
b/extras/source/autocorr/lang/en-AU/DocumentList.xml
index b8568d6..d0590bf 100644
--- a/extras/source/autocorr/lang/en-AU/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-AU/DocumentList.xml
@@ -828,57 +828,45 @@
   
   
   
-  
   
-  
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
   
-  
   
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/en-US/DocumentList.xml

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

[Marco Cecchetti]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |6 +
 sc/source/ui/app/inputhdl.cxx|   10 +-
 sc/source/ui/inc/viewdata.hxx|5 +
 sc/source/ui/view/viewdata.cxx   |   13 ++-
 sw/uiconfig/swriter/ui/notebookbar_groups.ui |   35 
+-
 5 files changed, 29 insertions(+), 40 deletions(-)

New commits:
commit 8974b0fafb18f9dd3f2c0e175a3255b80e4c249e
Author: Marco Cecchetti 
Date:   Sun Oct 9 22:08:51 2016 +0200

LOK: Calc: in the numeric content case, the used alignment can be wrong

-description: in the numeric content case, the used horizontal
alignment can be wrong when input content goes further than the cell
border;

- reason: (very odd) bMoveArea and nEditAdjust are global variables in
viewdata.cxx instead of being data members of ScViewdata;

- solution: now bMoveArea and nEditAdjust are data members of
ScViewdata.

Change-Id: I58a4ec26ca290fd328ef28a92c3c590462c7231a
Reviewed-on: https://gerrit.libreoffice.org/29628
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 
Reviewed-on: https://gerrit.libreoffice.org/29661
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 834d4c4..e0712c4 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -91,8 +91,6 @@ using namespace formula;
 bool ScInputHandler::bOptLoaded = false;// Evaluate App options
 bool ScInputHandler::bAutoComplete = false; // Is set in KeyInput
 
-extern sal_uInt16 nEditAdjust;  //! Member of ViewData
-
 namespace {
 
 // Formula data replacement character for a pair of parentheses at end of
@@ -1972,8 +1970,10 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped )
 pEditDefaults->Put( SvxAdjustItem( eSvxAdjust, EE_PARA_JUST ) );
 pEngine->SetDefaults( *pEditDefaults );
 
-nEditAdjust = sal::static_int_cast(eSvxAdjust); //! set at 
ViewData or with PostEditView
-
+if ( pActiveViewSh )
+{
+pActiveViewSh->GetViewData().SetEditAdjust( eSvxAdjust );
+}
 pEngine->SetVertical( bAsianVertical );
 }
 
@@ -2317,7 +2317,7 @@ void ScInputHandler::DataChanged( bool bFromTopNotify, 
bool bSetModified )
 {
 ScViewData& rViewData = pActiveViewSh->GetViewData();
 
-bool bNeedGrow = ( nEditAdjust != SVX_ADJUST_LEFT ); // Always 
right-aligned
+bool bNeedGrow = ( rViewData.GetEditAdjust() != SVX_ADJUST_LEFT ); // 
Always right-aligned
 if (!bNeedGrow)
 {
 // Cursor before the end?
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index b0cd0a3..d4b5a04 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -218,12 +218,14 @@ private:
 
 ScSplitPos  eEditActivePart;// the part that was 
active when edit mode was started
 ScFillMode  nFillMode;
+SvxAdjust   eEditAdjust;
 boolbEditActive[4]; // Active?
 boolbActive:1;  // Active Window ?
 boolbIsRefMode:1;   // Reference input
 boolbDelMarkValid:1;// Only valid at 
SC_REFTYPE_FILL
 boolbPagebreak:1;   // Page break preview mode
 boolbSelCtrlMouseClick:1;   // special selection 
handling for ctrl-mouse-click
+boolbMoveArea:1;
 
 longm_nLOKPageUpDownOffset;
 
@@ -375,6 +377,9 @@ public:
 boolIsFillMode(){ return nFillMode == 
ScFillMode::FILL; }
 ScFillMode  GetFillMode()   { return nFillMode; }
 
+SvxAdjust   GetEditAdjust() const {return eEditAdjust; }
+voidSetEditAdjust( SvxAdjust eNewEditAdjust ) { eEditAdjust = 
eNewEditAdjust; }
+
 // TRUE: Cell is merged
 boolGetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, 
long& rSizeYPix ) const;
 voidGetPosFromPixel( long nClickX, long nClickY, ScSplitPos 
eWhich,
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 3cb30c7..7763af3 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -74,9 +74,6 @@ using namespace com::sun::star;
 
 #define TAG_TABBARWIDTH "tw:"
 
-static bool bMoveArea = false;  // Member?
-sal_uInt16 nEditAdjust = SVX_ADJUST_LEFT;   // Member!
-
 namespace {
 
 void lcl_LOKRemoveEditView(ScTabViewShell* pTabViewShell, ScSplitPos eWhich)
@@ -352,11 +349,13 @@ ScViewData::ScViewData( ScDocShell* pDocSh, 
ScTabViewShell* pViewSh ) :
 nPasteFlags ( SC_PASTE_NONE ),
 eEditActivePart( SC_SPLIT_BOTTOMLEFT ),
 nFillMode   

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

[Winfried Donkers]

 sc/source/core/inc/interpre.hxx  |2 +-
 sc/source/core/tool/interpr3.cxx |5 +++--
 sc/source/core/tool/interpr4.cxx |4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 52c79bbd1b4c58124738b59214a3f2b111ff0191
Author: Winfried Donkers 
Date:   Wed Sep 21 17:00:38 2016 +0200

tdf#102328 Add constraint for argument X in Calc function GAMMA.DIST.

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

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index dbe0a3c..fadd474 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -856,7 +856,7 @@ void ScFisher();
 void ScFisherInv();
 void ScFact();
 void ScNormDist( int nMinParamCount );
-void ScGammaDist( int nMinParamCount );
+void ScGammaDist( bool bODFF );
 void ScGammaInv();
 void ScExpDist();
 void ScBinomDist();
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 9b074fa..c877d72 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2107,8 +2107,9 @@ double ScInterpreter::GetHypGeomDist( double x, double n, 
double M, double N )
 return fFactor;
 }
 
-void ScInterpreter::ScGammaDist( int nMinParamCount )
+void ScInterpreter::ScGammaDist( bool bODFF )
 {
+sal_uInt8 nMinParamCount = ( bODFF ? 3 : 4 );
 sal_uInt8 nParamCount = GetByte();
 if ( !MustHaveParamCount( nParamCount, nMinParamCount, 4 ) )
 return;
@@ -2120,7 +2121,7 @@ void ScInterpreter::ScGammaDist( int nMinParamCount )
 double fBeta = GetDouble(); // scale
 double fAlpha = GetDouble();// shape
 double fX = GetDouble();// x
-if (fAlpha <= 0.0 || fBeta <= 0.0)
+if ((!bODFF && fX < 0) || fAlpha <= 0.0 || fBeta <= 0.0)
 PushIllegalArgument();
 else
 {
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 475e4ad..6f5c87e 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4299,8 +4299,8 @@ StackVar ScInterpreter::Interpret()
 case ocGammaLn  :
 case ocGammaLn_MS   : ScLogGamma(); break;
 case ocGamma: ScGamma();break;
-case ocGammaDist: ScGammaDist( 3 ); break;
-case ocGammaDist_MS : ScGammaDist( 4 ); break;
+case ocGammaDist: ScGammaDist( true );  break;
+case ocGammaDist_MS : ScGammaDist( false ); break;
 case ocGammaInv :
 case ocGammaInv_MS  : ScGammaInv(); break;
 case ocChiTest  :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/inc/documentsignaturemanager.hxx   |7 ++
 xmlsecurity/inc/pdfsignaturehelper.hxx |9 ++-
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |6 +-
 xmlsecurity/source/helper/documentsignaturemanager.cxx |   42 -
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   |   25 --
 5 files changed, 68 insertions(+), 21 deletions(-)

New commits:
commit 3b6f7f38100c9c9d799756ffddbf281bf49364f4
Author: Miklos Vajna 
Date:   Thu Oct 13 16:11:02 2016 +0200

xmlsecuity: show PDF signature in the doc signatures dialog

It doesn't actually show any details yet, but it shows a selectable
empty line, to be filled in with details.

Change-Id: Ib35f13e5c779fe1a28933c1a0761682e9f5de62d
Reviewed-on: https://gerrit.libreoffice.org/29775
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx 
b/xmlsecurity/inc/documentsignaturemanager.hxx
index a388105..097c0e1 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -21,8 +21,12 @@
 #define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX
 
 #include "xmlsecuritydllapi.h"
+
+#include 
+
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -35,6 +39,7 @@ public:
 css::uno::Reference mxContext;
 css::uno::Reference mxStore;
 XMLSignatureHelper maSignatureHelper;
+std::unique_ptr mpPDFSignatureHelper;
 SignatureInformations maCurrentSignatureInformations;
 DocumentSignatureMode meSignatureMode;
 css::uno::Sequence< css::uno::Sequence > 
m_manifest;
@@ -59,6 +64,8 @@ public:
 void read(bool bUseTempStream, bool bCacheLastSignature = true);
 /// Write signatures back to the persistent storage.
 void write();
+/// Lazy creation of PDF helper.
+PDFSignatureHelper& getPDFSignatureHelper();
 };
 
 #endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX
diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx 
b/xmlsecurity/inc/pdfsignaturehelper.hxx
index fe7847b..1e86f39 100644
--- a/xmlsecurity/inc/pdfsignaturehelper.hxx
+++ b/xmlsecurity/inc/pdfsignaturehelper.hxx
@@ -13,26 +13,27 @@
 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
 #include 
 #include 
 
+#include 
+
 /// Handles signatures of a PDF file.
 class XMLSECURITY_DLLPUBLIC PDFSignatureHelper
 {
 css::uno::Reference m_xComponentContext;
 css::uno::Reference m_xSEInitializer;
 css::uno::Reference 
m_xSecurityContext;
-std::vector m_aSignatureInfos;
+SignatureInformations m_aSignatureInfos;
 
 public:
 PDFSignatureHelper(const css::uno::Reference& 
xComponentContext);
 bool ReadAndVerifySignature(const 
css::uno::Reference& xInputStream);
-css::uno::Sequence 
GetDocumentSignatureInformations();
+css::uno::Sequence 
GetDocumentSignatureInformations() const;
+SignatureInformations GetSignatureInformations() const;
 };
 
 #endif // INCLUDED_XMLSECURITY_INC_PDFSIGNATUREHELPER_HXX
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 0a74f29..d99590a 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -432,9 +432,9 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 {
 DocumentSignatureAlgorithm mode = 
DocumentSignatureHelper::getDocumentAlgorithm(
 m_sODFVersion, 
maSignatureManager.maCurrentSignatureInformations[n]);
-std::vector< OUString > aElementsToBeVerified =
-DocumentSignatureHelper::CreateElementList(
-maSignatureManager.mxStore, 
maSignatureManager.meSignatureMode, mode);
+std::vector< OUString > aElementsToBeVerified;
+if (maSignatureManager.mxStore.is())
+aElementsToBeVerified = 
DocumentSignatureHelper::CreateElementList(maSignatureManager.mxStore, 
maSignatureManager.meSignatureMode, mode);
 
 const SignatureInformation& rInfo = 
maSignatureManager.maCurrentSignatureInformations[n];
 //First we try to get the certificate which is embedded in the XML 
Signature
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx 
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index a947ed5..5fa5f17 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -47,6 +47,17 @@ DocumentSignatureManager::~DocumentSignatureManager()
 {
 }
 
+PDFSignatureHelper& DocumentSignatureManager::getPDFSignatureHelper()
+{
+// It is important to create this only when dealing with PDF, in case both
+// this and XMLSignatureHelper is created, xmlsec gets confused, and
+// doesn't get correct result.
+if (!mpPDFSignatureHelper)
+mpPDFSignatureHelper.reset(new PDFSignatureHelper(mxContext));

[Libreoffice-commits] core.git: uui/source uui/util

[Matúš Kukan]

 uui/source/requeststringresolver.cxx |   33 -
 uui/source/requeststringresolver.hxx |   16 ++--
 uui/source/services.cxx  |   22 +-
 uui/util/uui.component   |4 ++--
 4 files changed, 13 insertions(+), 62 deletions(-)

New commits:
commit 22b0c09f8463b9c6cceb9e2c3addcab79d42aa0b
Author: Matúš Kukan 
Date:   Wed Sep 7 20:10:26 2016 +0200

tdf#74608: Ctor function for 
css.comp.uui.UUIInteractionRequestStringResolver

Change-Id: I42c0c2cc8797647aa9dd676034137a1430e42fee

diff --git a/uui/source/requeststringresolver.cxx 
b/uui/source/requeststringresolver.cxx
index d2ed7dc..b63b035 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -19,7 +19,6 @@
 
 #include "requeststringresolver.hxx"
 #include "iahndl.hxx"
-#include 
 #include 
 
 using namespace css;
@@ -39,7 +38,7 @@ OUString SAL_CALL
 UUIInteractionRequestStringResolver::getImplementationName()
 throw (uno::RuntimeException, std::exception)
 {
-return OUString::createFromAscii(m_aImplementationName);
+return 
OUString("com.sun.star.comp.uui.UUIInteractionRequestStringResolver");
 }
 
 sal_Bool SAL_CALL
@@ -50,11 +49,12 @@ UUIInteractionRequestStringResolver::supportsService(
 return cppu::supportsService(this, rServiceName);
 }
 
+
 uno::Sequence< OUString > SAL_CALL
 UUIInteractionRequestStringResolver::getSupportedServiceNames()
 throw (uno::RuntimeException, std::exception)
 {
-return getSupportedServiceNames_static();
+return { "com.sun.star.task.InteractionRequestStringResolver" };
 }
 
 beans::Optional< OUString > SAL_CALL
@@ -73,29 +73,12 @@ 
UUIInteractionRequestStringResolver::getStringFromInformationalRequest(
 }
 }
 
-char const UUIInteractionRequestStringResolver::m_aImplementationName[]
-= "com.sun.star.comp.uui.UUIInteractionRequestStringResolver";
-
-uno::Sequence< OUString >
-UUIInteractionRequestStringResolver::getSupportedServiceNames_static()
-{
-uno::Sequence< OUString > aNames { 
"com.sun.star.task.InteractionRequestStringResolver" };
-return aNames;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
-UUIInteractionRequestStringResolver::createInstance(
-uno::Reference< lang::XMultiServiceFactory > const &
-rServiceFactory)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation(
+css::uno::XComponentContext *context,
+css::uno::Sequence const &)
 {
-try
-{
-return *new 
UUIInteractionRequestStringResolver(comphelper::getComponentContext(rServiceFactory));
-}
-catch (std::bad_alloc const &)
-{
-throw uno::RuntimeException("out of memory", nullptr);
-}
+return cppu::acquire(new UUIInteractionRequestStringResolver(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/requeststringresolver.hxx 
b/uui/source/requeststringresolver.hxx
index 4ebbee0..e6dc745 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -35,16 +34,8 @@ class UUIInteractionRequestStringResolver:
 css::task::XInteractionRequestStringResolver >
 {
 public:
-static char const m_aImplementationName[];
-
-static css::uno::Sequence< OUString >
-getSupportedServiceNames_static();
-
-static css::uno::Reference< css::uno::XInterface >
-SAL_CALL
-createInstance(
-css::uno::Reference< css::lang::XMultiServiceFactory > const &
-rServiceFactory);
+explicit UUIInteractionRequestStringResolver(
+css::uno::Reference< css::uno::XComponentContext > const & rxContext);
 
 private:
 std::unique_ptr m_pImpl;
@@ -52,9 +43,6 @@ private:
 UUIInteractionRequestStringResolver(UUIInteractionRequestStringResolver &) 
= delete;
 void operator =(UUIInteractionRequestStringResolver&) = delete;
 
-explicit UUIInteractionRequestStringResolver(
-css::uno::Reference< css::uno::XComponentContext > const & rxContext);
-
 virtual ~UUIInteractionRequestStringResolver() override;
 
 virtual OUString SAL_CALL getImplementationName()
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index e914508..052658a 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 
-#include "requeststringresolver.hxx"
 #include "passwordcontainer.hxx"
 
 using namespace com::sun::star::uno;
@@ -45,28 +44,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL 
uui_component_getFactory(sal_Cha
 static_cast< XMultiServiceFactory * >( pServiceManager ) );
 Reference< XSingleServiceFactory > xFactory;
 
-
-// UUI Interaction Request String Resolver.
-
-
-if ( rtl_str_compare(pImplName,
-  UUIInteractio

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/gtkprintwrapper.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit bb51869d5fd339703767e1e70c832a803dd981eb
Author: Caolán McNamara 
Date:   Thu Oct 13 14:29:15 2016 +0100

Resolves: tdf#102999 get_selected_printer is transfer none

gtk_print_unix_dialog_get_settings returns a new GObject we
have to unref, but gtk_print_unix_dialog_get_selected_printer doesn't
add a ref so dies along with its parent dialog.

Change-Id: Ie5f8ecd83f5cc2c13e4a8c3ba292ffa381f9bdf5
(cherry picked from commit c12e14d19f86be8555f6262d138cf0776f2c9b56)
Reviewed-on: https://gerrit.libreoffice.org/29773
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/vcl/unx/gtk/gtkprintwrapper.cxx b/vcl/unx/gtk/gtkprintwrapper.cxx
index cae1658..248ccf1 100644
--- a/vcl/unx/gtk/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gtkprintwrapper.cxx
@@ -276,13 +276,16 @@ void 
GtkPrintWrapper::print_unix_dialog_add_custom_tab(GtkPrintUnixDialog* dialo
 
 GtkPrinter* 
GtkPrintWrapper::print_unix_dialog_get_selected_printer(GtkPrintUnixDialog* 
dialog) const
 {
+GtkPrinter* pRet = nullptr;
 #if !GTK_CHECK_VERSION(3,0,0)
 assert(m_print_unix_dialog_get_selected_printer);
-return (*m_print_unix_dialog_get_selected_printer)(dialog);
+pRet = (*m_print_unix_dialog_get_selected_printer)(dialog);
 #else
 (void) this; // loplugin:staticmethods
-return gtk_print_unix_dialog_get_selected_printer(dialog);
+pRet = gtk_print_unix_dialog_get_selected_printer(dialog);
 #endif
+g_object_ref(G_OBJECT(pRet));
+return pRet;
 }
 
 void 
GtkPrintWrapper::print_unix_dialog_set_manual_capabilities(GtkPrintUnixDialog* 
dialog, GtkPrintCapabilities capabilities) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 sc/source/core/tool/interpr8.cxx |   37 +
 1 file changed, 13 insertions(+), 24 deletions(-)

New commits:
commit ad707a3dafd020949cfd94098dc51c69466dafb8
Author: Winfried Donkers 
Date:   Tue Sep 20 08:04:50 2016 +0200

tdf#94635 follow up; correct handling of double x-values in case of

month intervals.

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

diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 894c623..5f98f26 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -221,16 +221,14 @@ bool ScETSForecastCalculation::PreprocessDataRange( const 
ScMatrixRef& rMatX, co
 mfStepSize = ::std::numeric_limits::max();
 if ( mnMonthDay )
 {
-aDate = aNullDate + static_cast< long >( maRange[ 0 ].X );
-maRange[ 0 ].X = aDate.GetYear() * 12 + aDate.GetMonth();
-}
-for ( SCSIZE i = 1; i < mnCount; i++ )
-{
-if ( mnMonthDay )
+for ( SCSIZE i = 0; i < mnCount; i++ )
 {
 aDate = aNullDate + static_cast< long >( maRange[ i ].X );
 maRange[ i ].X = aDate.GetYear() * 12 + aDate.GetMonth();
 }
+}
+for ( SCSIZE i = 1; i < mnCount; i++ )
+{
 double fStep = maRange[ i ].X - maRange[ i - 1 ].X;
 if ( fStep == 0.0 )
 {
@@ -245,15 +243,20 @@ bool ScETSForecastCalculation::PreprocessDataRange( const 
ScMatrixRef& rMatX, co
 switch ( nAggregation )
 {
 case 1 : // AVERAGE (default)
+ while ( maRange[ i ].X == maRange[ i - 1 ].X  && i < 
mnCount )
+ {
+ maRange.erase( maRange.begin() + i );
+ --mnCount;
+ }
+ break;
 case 7 : // SUM
  while ( maRange[ i ].X == maRange[ i - 1 ].X  && i < 
mnCount )
  {
  fTmp += maRange[ i ].Y;
- nCounter++;
  maRange.erase( maRange.begin() + i );
  --mnCount;
  }
- maRange[ i - 1 ].Y = ( nAggregation == 1 ? fTmp / 
nCounter : fTmp );
+ maRange[ i - 1 ].Y = fTmp;
  break;
 
 case 2 : // COUNT
@@ -310,22 +313,11 @@ bool ScETSForecastCalculation::PreprocessDataRange( const 
ScMatrixRef& rMatX, co
  break;
 }
 if ( i < mnCount - 1 )
-{
-i++;
-if ( mnMonthDay )
-{
-Date aDate1 = aNullDate + static_cast< long >( maRange[ i 
].X );
-fStep = 12 * ( aDate1.GetYear() - aDate.GetYear() ) +
-( aDate1.GetMonth() - aDate.GetMonth() );
-aDate = aDate1;
-}
-else
-fStep = maRange[ i ].X - maRange[ i - 1 ].X;
-}
+fStep = maRange[ i ].X - maRange[ i - 1 ].X;
 else
fStep = mfStepSize;
 }
-if ( fStep < mfStepSize )
+if ( fStep > 0 && fStep < mfStepSize )
 mfStepSize = fStep;
 }
 
@@ -972,9 +964,6 @@ bool ScETSForecastCalculation::GetStatisticValue( const 
ScMatrixRef& rTypeMat, c
 
 bool ScETSForecastCalculation::GetSamplesInPeriod( double& rVal )
 {
-if ( !initCalc() )
-return false;
-
 rVal = mnSmplInPrd;
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 oox/source/docprop/docprophandler.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7d5d5e6e9b67807560a7db4123e8b41cc0f70a32
Author: Bartosz Kosiorek 
Date:   Wed Oct 12 06:44:41 2016 +0200

tdf#103143 Fix importing number of characters from docx files

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

diff --git a/oox/source/docprop/docprophandler.cxx 
b/oox/source/docprop/docprophandler.cxx
index 773a6e5..d7a1e31 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -216,6 +216,10 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const 
OUString& aChars )
 switch( m_nBlock )
 {
 case EXTPR_TOKEN( Characters ):
+aName = "NonWhitespaceCharacterCount";
+break;
+
+case EXTPR_TOKEN( CharactersWithSpaces ):
 aName = "CharacterCount";
 break;
 
@@ -513,6 +517,7 @@ void SAL_CALL OOXMLDocPropHandler::characters( const 
OUString& aChars )
 break;
 
 case EXTPR_TOKEN( Characters ):
+case EXTPR_TOKEN( CharactersWithSpaces ):
 case EXTPR_TOKEN( Pages ):
 case EXTPR_TOKEN( Words ):
 case EXTPR_TOKEN( Paragraphs ):
@@ -589,7 +594,6 @@ void SAL_CALL OOXMLDocPropHandler::characters( const 
OUString& aChars )
 AddCustomProperty( uno::makeAny( aChars ) ); // the 
property has string type
 break;
 
-case EXTPR_TOKEN( CharactersWithSpaces ):
 case EXTPR_TOKEN( Lines ):
 case EXTPR_TOKEN( DigSig ):
 case EXTPR_TOKEN( HeadingPairs ):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 sc/qa/unit/data/functions/fods/forecast.ets.mult.fods | 4060 +-
 sc/source/core/tool/interpr8.cxx  |   19 
 2 files changed, 2093 insertions(+), 1986 deletions(-)

New commits:
commit fb790880eb11552b2e7d1dcf6c09d2663712290f
Author: Winfried Donkers 
Date:   Thu Sep 15 13:39:35 2016 +0200

tdf#94635 follow up; handle linear data properly when samples in period

are to be calculated by function.

Applies to all FORECAST.ETS functions with argument period_length having
value 1.

Change-Id: Icb5a0288670321caf0dd5b70bee4b8811b9ba4a9
Reviewed-on: https://gerrit.libreoffice.org/28923
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/qa/unit/data/functions/fods/forecast.ets.mult.fods 
b/sc/qa/unit/data/functions/fods/forecast.ets.mult.fods
index f5ae353..37aa304 100644
--- a/sc/qa/unit/data/functions/fods/forecast.ets.mult.fods
+++ b/sc/qa/unit/data/functions/fods/forecast.ets.mult.fods
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2016-07-24T08:15:55.36200P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/e1822c809b137859382139aace0c08be4547c157
+ 
2016-07-24T08:15:55.36200P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/7e1fd9aa86ab8d5e86f35df8615f438a3383af98
  
   
0
0
-   162119
-   145635
+   22009
+   4420

 
  view1
@@ -31,8 +31,8 @@
false
   
   
-   4
-   8
+   2
+   44
0
0
0
@@ -50,7 +50,7 @@
   
  
  Sheet2
- 1241
+ 1857
  0
  75
  60
@@ -91,10 +91,12 @@
true
true
true
+   true
+   true
false
12632256
false
-   Lexmark-E352dn
+   Generic 
Printer

 
  cs
@@ -125,14 +127,12 @@
  
 

-   true
-   true
3
1
true
1
true
-   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgBJbnB1dFNsb3Q6VHJheTEARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
+   iQH+/0dlbmVyaWMgUHJpbnRlcgAAU0dFTlBSVAAWAAMAqgAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6TGV0dGVyAAASAENPTVBBVF9EVVBMRVhfTU9ERQ8ARHVwbGV4TW9kZTo6T2Zm
false
0
   
@@ -2838,10 +2838,6 @@


   
-  
-   
-  
-  
   


@@ -2850,6 +2846,55 @@
   

   
+  
+   
+  
+  
+  
+   
+   
+  
+  
+   
+  
+  
+  
+   
+   
+  
+  
+   

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

[Caolán McNamara]

 vcl/source/gdi/pdfwriter_impl.cxx |   36 +---
 1 file changed, 33 insertions(+), 3 deletions(-)

New commits:
commit 1c9096dad7dc2ee25d9ebe16ab02d5caba5f8a79
Author: Caolán McNamara 
Date:   Thu Oct 13 20:14:03 2016 +0100

Resolves: tdf#103051 pdf export assumed 1bit bitmaps were N1BitMsbPal

Change-Id: I2268d8b74f187d07f161f42cc9530be3ebbc86d0

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 0d886e0..f5919ee 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -11066,6 +11066,36 @@ void PDFWriterImpl::writeJPG( JPGEmit& rObject )
 }
 }
 
+namespace
+{
+unsigned char reverseByte(unsigned char b)
+{
+b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
+b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
+b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
+return b;
+}
+
+//tdf#103051 convert any N1BitLsbPal to N1BitMsbPal
+Bitmap getExportBitmap(const Bitmap &rBitmap)
+{
+Bitmap::ScopedReadAccess pAccess(const_cast(rBitmap));
+const ScanlineFormat eFormat = pAccess->GetScanlineFormat();
+if (eFormat != ScanlineFormat::N1BitLsbPal)
+return rBitmap;
+Bitmap aNewBmp(rBitmap);
+Bitmap::ScopedWriteAccess xWriteAcc(aNewBmp);
+const int nScanLineBytes = (pAccess->Width() + 7U) / 8U;
+for (long nY = 0L; nY < xWriteAcc->Height(); ++nY)
+{
+Scanline pBitSwap = xWriteAcc->GetScanline(nY);
+for (int x = 0; x < nScanLineBytes; ++x)
+pBitSwap[x] = reverseByte(pBitSwap[x]);
+}
+return aNewBmp;
+}
+}
+
 bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
 {
 CHECK_RETURN( updateObject( rObject.m_nObject ) );
@@ -11075,7 +11105,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& 
rObject, bool bMask )
 boolbWriteMask = false;
 if( ! bMask )
 {
-aBitmap = rObject.m_aBitmap.GetBitmap();
+aBitmap = getExportBitmap(rObject.m_aBitmap.GetBitmap());
 if( rObject.m_aBitmap.IsAlpha() )
 {
 if( m_aContext.Version >= PDFWriter::PDF_1_4 )
@@ -11101,13 +11131,13 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& 
rObject, bool bMask )
 {
 if( m_aContext.Version < PDFWriter::PDF_1_4 || ! 
rObject.m_aBitmap.IsAlpha() )
 {
-aBitmap = rObject.m_aBitmap.GetMask();
+aBitmap = getExportBitmap(rObject.m_aBitmap.GetMask());
 aBitmap.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
 SAL_WARN_IF( aBitmap.GetBitCount() != 1, "vcl", "mask conversion 
failed" );
 }
 else if( aBitmap.GetBitCount() != 8 )
 {
-aBitmap = rObject.m_aBitmap.GetAlpha().GetBitmap();
+aBitmap = 
getExportBitmap(rObject.m_aBitmap.GetAlpha().GetBitmap());
 aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
 SAL_WARN_IF( aBitmap.GetBitCount() != 8, "vcl", "alpha mask 
conversion failed" );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 sc/qa/unit/data/functions/fods/mod.fods | 1702 +---
 sc/source/core/tool/interpr2.cxx|   23 
 2 files changed, 1169 insertions(+), 556 deletions(-)

New commits:
commit d8257535e348fa0b0a5c269d1aafa710585421d6
Author: Winfried Donkers 
Date:   Wed Sep 28 16:34:36 2016 +0200

tdf#102742 fix wrong results for MOD function

ScInterpreter::ScMod has been largely rewritten and
a constraint check has been added (numerator != 0).
It appears that integer values of arguments cannot accurately
determined nor converterd accurately to int values, so no simpler
(faster) treatment for integer values.
Updated test document.

Change-Id: I3af60d93019b212ce7c03eea48b509bfbc713cf7
Reviewed-on: https://gerrit.libreoffice.org/29365
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/qa/unit/data/functions/fods/mod.fods 
b/sc/qa/unit/data/functions/fods/mod.fods
index 48ab478..7a3bc65 100644
--- a/sc/qa/unit/data/functions/fods/mod.fods
+++ b/sc/qa/unit/data/functions/fods/mod.fods
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2016-06-25T07:16:38.437590147P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/a2c557d80ac68c06ea59586245a7431e061938f0
+ 
2016-06-25T07:16:38.437590147P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/66b67f40a7785f08ae214e62b669e001148b474c
  
   
0
0
-   22082
-   14449
+   22013
+   19233

 
  view1
@@ -31,8 +31,8 @@
false
   
   
-   4
-   22
+   0
+   37
0
0
0
@@ -67,8 +67,8 @@
false
   
  
- tdf86219
- 1241
+ Sheet2
+ 1857
  0
  95
  60
@@ -81,7 +81,7 @@
  true
  true
  true
- false
+ true
  false
  false
  1270
@@ -109,10 +109,12 @@
true
true
true
+   true
+   true
false
12632256
false
-   Lexmark-E352dn
+   Generic 
Printer

 
  en
@@ -122,14 +124,12 @@
  
 

-   true
-   true
3
1
true
1
true
-   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   kQH+/0dlbmVyaWMgUHJpbnRlcgAAU0dFTlBSVAAWAAMAsgAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6QTQARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RF

[Libreoffice-commits] core.git: 7 commits - framework/dtd framework/source include/vcl officecfg/registry vcl/source

[Samuel Mehrbrodt]

 framework/dtd/toolbar.dtd|1 
 framework/source/uielement/menubarmanager.cxx|   62 
++
 framework/source/uielement/toolbarmanager.cxx|6 
 framework/source/uielement/uicommanddescription.cxx  |   15 ++
 include/vcl/commandinfoprovider.hxx  |5 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |6 
 officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs  |5 
 vcl/source/helper/commandinfoprovider.cxx|   30 

 8 files changed, 106 insertions(+), 24 deletions(-)

New commits:
commit dad3e93a781165a124180d1f17c63a0e22f7a56e
Author: Samuel Mehrbrodt 
Date:   Thu Oct 13 21:50:16 2016 +0200

Improve formatting

Change-Id: I088997f51b6ed5131dec706f52b568671605d6e5

diff --git a/framework/source/uielement/menubarmanager.cxx 
b/framework/source/uielement/menubarmanager.cxx
index 77e484d..9817197 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -764,7 +764,9 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
 m_bActive = true;
 
 OUString aMenuCommand( m_aMenuItemCommand );
-if ( m_aMenuItemCommand == aSpecialWindowMenu || m_aMenuItemCommand == 
aSlotSpecialWindowMenu || aMenuCommand == aSpecialWindowCommand )
+if ( m_aMenuItemCommand == aSpecialWindowMenu ||
+ m_aMenuItemCommand == aSlotSpecialWindowMenu ||
+ aMenuCommand == aSpecialWindowCommand )
 UpdateSpecialWindowMenu( pMenu, m_xContext );
 
 // Check if some modes have changed so we have to update our menu 
images
@@ -1129,7 +1131,9 @@ bool MenuBarManager::CreatePopupMenuController( 
MenuItemHandler* pMenuItemHandle
 return false;
 }
 
-void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& 
rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const 
OUString& rModuleIdentifier, bool bDelete, bool bDeleteChildren )
+void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& 
rFrame,
+  const Reference< XDispatchProvider >& 
rDispatchProvider,
+  const OUString& rModuleIdentifier, bool 
bDelete, bool bDeleteChildren )
 {
 m_xFrame= rFrame;
 m_bActive   = false;
@@ -1289,7 +1293,9 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const 
Reference< XFrame >& rF
 AddonMenu* pSubMenu = dynamic_cast< AddonMenu* >( 
pPopup.get() );
 if ( pSubMenu )
 {
-MenuBarManager* pSubMenuManager = new MenuBarManager( 
m_xContext, m_xFrame, m_xURLTransformer,pSubMenu, true, false, false );
+MenuBarManager* pSubMenuManager = new MenuBarManager( 
m_xContext, m_xFrame,
+  
m_xURLTransformer,pSubMenu, true,
+  
false, false );
 AddMenu(pSubMenuManager,aItemCommand,nItemId);
 (pSubMenuManager->m_aMenuItemCommand).clear();
 
@@ -1304,7 +1310,10 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const 
Reference< XFrame >& rF
 }
 else
 {
-MenuBarManager* pSubMenuMgr = new MenuBarManager( 
m_xContext, rFrame, m_xURLTransformer,rDispatchProvider, aModuleIdentifier, 
pPopup, bDeleteChildren, bDeleteChildren, m_bHasMenuBar );
+MenuBarManager* pSubMenuMgr = new MenuBarManager( 
m_xContext, rFrame, m_xURLTransformer,
+  
rDispatchProvider, aModuleIdentifier,
+  pPopup, 
bDeleteChildren, bDeleteChildren,
+  
m_bHasMenuBar );
 AddMenu(pSubMenuMgr,aItemCommand,nItemId);
 }
 }
@@ -1603,23 +1612,23 @@ void MenuBarManager::FillMenuWithConfiguration(
 }
 
 void MenuBarManager::FillMenu(
-sal_uInt16&   nId,
-Menu* pMenu,
-const OUString&  rModuleIdentifier,
-const Reference< XIndexAccess >&  rItemContainer,
+sal_uInt16& nId,
+Menu* pMenu,
+const OUString& rModuleIdentifier,
+const Reference< XIndexAccess >& rItemContainer,
 const Reference< XDispatchProvider >& rDispatchProvider )
 {
 // Fill menu bar with container contents
- for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
+for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
 {
-Sequence< PropertyValue >  

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

[Samuel Mehrbrodt]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fed75d1009635ab6aea146df43aabcc3c584bd1a
Author: Samuel Mehrbrodt 
Date:   Thu Oct 13 22:14:52 2016 +0200

Make the Emoji control experimental

Change-Id: Iedc9bae0649fe316f3d958abd78bf0dc4e9190d1

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 9f8a648..4ff84a7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4012,6 +4012,9 @@
 
   1
 
+
+  1
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 framework/source/uielement/uicommanddescription.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 55d028488580c5835682188cb8d23e5fe4dcb424
Author: Maxim Monastirsky 
Date:   Thu Oct 13 23:25:11 2016 +0300

-Werror=reorder

Change-Id: I827911df1bc379a0f0e303a15d44b30309a8bc04

diff --git a/framework/source/uielement/uicommanddescription.cxx 
b/framework/source/uielement/uicommanddescription.cxx
index d4244c9..0aac542 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -120,8 +120,8 @@ class ConfigurationAccess_UICommand : // Order is necessary 
for right initializa
 {
 CmdToInfoMap() : bPopup( false ),
  bCommandNameCreated( false ),
- nProperties( 0 ),
- nIsExperimental(0) {}
+ nIsExperimental( 0 ),
+ nProperties( 0 ) {}
 
 OUStringaLabel;
 OUStringaContextLabel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/pivot_median'

[Samuel Mehrbrodt]

New branch 'feature/pivot_median' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLForKit.cpp

[Tor Lillqvist]

 loolwsd/LOOLForKit.cpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c8d5c279b9941bf39b396506ec984ba93b212d75
Author: Tor Lillqvist 
Date:   Thu Oct 13 13:10:09 2016 +0300

Move comment

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 2ee6306..a5f97a4 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -206,12 +206,13 @@ static int createLibreOfficeKit(const std::string& 
childRoot,
 Process::PID pid;
 if (!(pid = fork()))
 {
+// Child
+
 // Close the pipe from loolwsd
 close(0);
 
 UnitKit::get().postFork();
 
-// child
 if (std::getenv("SLEEPKITFORDEBUGGER"))
 {
 std::cerr << "Sleeping " << std::getenv("SLEEPKITFORDEBUGGER")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/commonsallayout' - 30 commits - config_host.mk.in configure.ac external/harfbuzz RepositoryExternal.mk vcl/CppunitTest_vcl_wmf_test.mk vcl/headless vcl/

[Khaled Hosny]

Rebased ref, commits from common ancestor:
commit 4f0fede6364bac10705a4bde325e9ab35ad5b5fd
Author: Khaled Hosny 
Date:   Thu Oct 13 22:46:28 2016 +0200

Check SAL_USE_COMMON_LAYOUT envar in one place

Makes it easier to flip the switch in the future (or even do something
more fancy other than checking envvar).

Change-Id: Ie42ca012c167b2108f0fca1ce9ff7beee95f1be7

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 1050943..364bd48 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -201,6 +201,8 @@ public:
 virtual std::shared_ptr
 CreateTextLayoutCache(OUString const&) const;
 
+static bool UseCommonLayout();
+
 protected:
 // used by layout engines
 SalLayout();
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index f7fe0af..856e066 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -782,7 +782,7 @@ void CTLayout::Simplify( bool /*bIsBase*/ ) {}
 
 SalLayout* CoreTextStyle::GetTextLayout() const
 {
-if (getenv("SAL_USE_COMMON_LAYOUT"))
+if (SalLayout::UseCommonLayout())
 return new CommonSalLayout(*this);
 else
 return new CTLayout(this);
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index ea16f4f..86b3ab1d 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -768,6 +768,12 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph )
 return bRet;
 }
 
+bool SalLayout::UseCommonLayout()
+{
+static bool bUse = getenv("SAL_USE_COMMON_LAYOUT") != nullptr;
+return bUse;
+}
+
 GenericSalLayout::GenericSalLayout()
 {}
 
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 46b9326..35d086d 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -532,7 +532,7 @@ SalLayout* CairoTextRender::GetTextLayout( ImplLayoutArgs& 
rArgs, int nFallbackL
 if( mpServerFont[ nFallbackLevel ]
 && !(rArgs.mnFlags & SalLayoutFlags::DisableGlyphProcessing) )
 {
-if (getenv("SAL_USE_COMMON_LAYOUT"))
+if (SalLayout::UseCommonLayout())
 {
 pLayout = new CommonSalLayout(*mpServerFont[nFallbackLevel]);
 }
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index de0b4bf..9681986 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3900,7 +3900,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& 
rArgs, int nFallbackLe
 const WinFontFace& rFontFace = *mpWinFontData[ nFallbackLevel ];
 WinFontInstance& rFontInstance = *mpWinFontEntry[ nFallbackLevel ];
 
-if (getenv("SAL_USE_COMMON_LAYOUT"))
+if (SalLayout::UseCommonLayout())
 {
 return new CommonSalLayout(this, rFontInstance, rFontFace);
 }
commit aba6d0bd84f8f36dcbe50eacbfd72d0d6182cc2d
Author: Khaled Hosny 
Date:   Mon Oct 10 01:36:45 2016 +0200

Just call ICU directly and cut the middle layers

Change-Id: I7603d03fef8ca227c3e6fe25239281d18801522a

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 6f24f30..3583b79 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if defined(_WIN32)
 struct WinSalGraphicsWithIDFace
@@ -116,14 +117,14 @@ static void scaleHbFont(hb_font_t* pHbFont, const 
FontSelectPattern& aFontSelDat
 hb_font_set_scale(pHbFont, nXScale, nYScale);
 }
 
+#if !HB_VERSION_ATLEAST(1, 1, 0)
 static hb_unicode_funcs_t* getUnicodeFuncs()
 {
 static hb_unicode_funcs_t* ufuncs = 
hb_unicode_funcs_create(hb_icu_get_unicode_funcs());
-#if !HB_VERSION_ATLEAST(1, 1, 0)
 hb_unicode_funcs_set_decompose_compatibility_func(ufuncs, 
unicodeDecomposeCompatibility, nullptr, nullptr);
-#endif
 return ufuncs;
 }
+#endif
 
 #if defined(_WIN32)
 CommonSalLayout::CommonSalLayout(WinSalGraphics* WSL, WinFontInstance& 
rWinFontInstance, const WinFontFace& rWinFontFace)
@@ -392,8 +393,8 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 nHbFlags |= HB_BUFFER_FLAG_EOT; /* End-of-text */
 
 hb_buffer_t *pHbBuffer = hb_buffer_create();
-static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs();
 #if !HB_VERSION_ATLEAST(1, 1, 0)
+static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs();
 hb_buffer_set_unicode_funcs(pHbBuffer, pHbUnicodeFuncs);
 #endif
 if (SAL_UNLIKELY(bVertical))
@@ -452,7 +453,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 else
 {
 #if HB_VERSION_ATLEAST(0, 9, 42)
-if (hb_unicode_general_category (pHbUnicodeFuncs, aChar) 
== HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)
+if (u_getIntPropertyValue(aChar, UCHAR_GENERAL_CATEGORY) 
== U_NON_SPACING_MARK)
 bDiacritic = tr

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

[Henry Castro]

 loolwsd/LOOLWSD.cpp |   29 -
 loolwsd/test/httpwstest.cpp |2 +-
 2 files changed, 25 insertions(+), 6 deletions(-)

New commits:
commit a0a87276f99919df82cc3d32a2d3da47adacc2e6
Author: Henry Castro 
Date:   Thu Oct 13 16:51:14 2016 -0400

loolwsd: fix media type

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index cf22bfd..1b176eb 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -155,6 +155,7 @@ using Poco::XML::DOMWriter;
 using Poco::XML::Element;
 using Poco::XML::InputSource;
 using Poco::XML::NodeList;
+using Poco::XML::Node;
 
 int ClientPortNumber = DEFAULT_CLIENT_PORT_NUMBER;
 int MasterPortNumber = DEFAULT_MASTER_PORT_NUMBER;
@@ -378,6 +379,28 @@ public:
 class ClientRequestHandler: public HTTPRequestHandler
 {
 private:
+static std::string getContentType(const std::string& fileName)
+{
+const std::string nodePath = Poco::format("//[@ext='%s']", 
Poco::Path(fileName).getExtension());
+std::string discPath = 
Path(Application::instance().commandPath()).parent().toString() + 
"discovery.xml";
+if (!File(discPath).exists())
+{
+discPath = LOOLWSD_DATADIR "/discovery.xml";
+}
+
+InputSource input(discPath);
+DOMParser domParser;
+AutoPtr doc = domParser.parse(&input);
+// TODO. discovery.xml missing application/pdf
+Node* node = doc->getNodeByPath(nodePath);
+if (node && (node = node->parentNode()) && node->hasAttributes())
+{
+return dynamic_cast(node)->getAttribute("name");
+}
+
+return "application/octet-stream";
+}
+
 static void waitBridgeCompleted(const std::shared_ptr& 
session)
 {
 bool isFound = false;
@@ -609,13 +632,9 @@ private:
 if (filePath.isAbsolute() && File(filePath).exists())
 {
 response.set("Access-Control-Allow-Origin", "*");
-HTMLForm form(request);
-const std::string mimeType = form.has("mime_type")
-   ? form.get("mime_type")
-   : "application/octet-stream";
 try
 {
-response.sendFile(filePath.toString(), mimeType);
+response.sendFile(filePath.toString(), 
getContentType(fileName));
 responded = true;
 }
 catch (const Exception& exc)
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 83115d2..2218a9f 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -879,7 +879,7 @@ void HTTPWSTest::testSlideShow()
 
 std::string encodedDoc;
 Poco::URI::encode(documentPath, ":/?", encodedDoc);
-const std::string path = "/lool/" + encodedDoc + "/" + jail + "/" + 
dir + "/" + name + "?mime_type=image/svg%2Bxml";
+const std::string path = "/lool/" + encodedDoc + "/" + jail + "/" + 
dir + "/" + name;
 std::unique_ptr 
session(helpers::createSession(_uri));
 Poco::Net::HTTPRequest requestSVG(Poco::Net::HTTPRequest::HTTP_GET, 
path);
 session->sendRequest(requestSVG);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

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

New commits:
commit 9d89989b998a87ac4a00bbb9714ce022665bdcee
Author: Henry Castro 
Date:   Thu Oct 13 17:03:48 2016 -0400

loleaflet: remove unused query string

diff --git a/loleaflet/src/map/handler/Map.SlideShow.js 
b/loleaflet/src/map/handler/Map.SlideShow.js
index 00c8d97..75668c0 100644
--- a/loleaflet/src/map/handler/Map.SlideShow.js
+++ b/loleaflet/src/map/handler/Map.SlideShow.js
@@ -57,7 +57,7 @@ L.Map.SlideShow = L.Handler.extend({
},
 
_onSlideDownloadReady: function (e) {
-   this._slideShow.src = e.url + '?mime_type=image/svg%2Bxml';
+   this._slideShow.src = e.url;
this._slideShow.contentWindow.focus();
clearInterval(this._slideShow.contentWindow.spinnerInterval);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Comment avez-vous rencontrée

[eduardo]

 Oui j’aime l’adultère. Je l’aime plus que tout, car il implique à la fois les 
liens du mariage et des sauteries des plus délicieuses. 
Le tout avec des personnes qui comme moi sont mariées !!! 
Je ne me définirait pas comme libérée, j’emmerde les féministes, je suis juste 
une jouisseuse.
-webcamhot.net

Voilà l’endroit où des femmes post-modernes comme moi sévissent :   
-webcamhot.net


Nous invitons toute personne ne souhaitant plus recevoir de courriel de notre 
part à utiliser le lien suivant :-desinscription.webcamhot.net
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/fixes36' - include/opencl opencl/source

[Tomaž Vajngerl]

 include/opencl/openclwrapper.hxx |1 
 opencl/source/openclwrapper.cxx  |   81 +++
 2 files changed, 49 insertions(+), 33 deletions(-)

New commits:
commit 6d4d3db53242e2dc588b347f313d17f9966f283e
Author: Tomaž Vajngerl 
Date:   Thu Oct 13 12:55:57 2016 +0200

opencl: initialize command queue on demand

Change-Id: Ie3da1d6ec91e951b1ffc15abf376c7af57789e47

diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index dae1192..233412f 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -42,6 +42,7 @@ struct OPENCL_DLLPUBLIC GPUEnv
 cl_context mpContext;
 cl_device_id mpDevID;
 cl_command_queue mpCmdQueue[OPENCL_CMDQUEUE_SIZE];
+bool mbCommandQueueInitialized;
 cl_program mpArryPrograms[MAX_CLFILE_NUM]; //one program object maps one 
kernel source file
 int mnIsUserCreated; // 1: created , 0:no create and needed to create by 
opencl wrapper
 int mnCmdQueuePos;
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index d8d16c3..5d40a54 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -103,8 +103,54 @@ OString getCacheFolder()
 
 }
 
+bool initializeCommandQueue(GPUEnv& aGpuEnv)
+{
+OpenCLZone zone;
+
+cl_int nState;
+cl_command_queue command_queue[OPENCL_CMDQUEUE_SIZE];
+
+for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i)
+{
+command_queue[i] = clCreateCommandQueue(aGpuEnv.mpContext, 
aGpuEnv.mpDevID, 0, &nState);
+if (nState != CL_SUCCESS)
+SAL_WARN("opencl", "clCreateCommandQueue failed: " << 
errorString(nState));
+
+if (command_queue[i] == nullptr || nState != CL_SUCCESS)
+{
+// Release all command queues created so far.
+for (int j = 0; j <= i; ++j)
+{
+if (command_queue[j])
+{
+clReleaseCommandQueue(command_queue[j]);
+command_queue[j] = nullptr;
+}
+}
+
+clReleaseContext(aGpuEnv.mpContext);
+SAL_WARN("opencl", "failed to set/switch opencl device");
+return false;
+}
+
+SAL_INFO("opencl", "Created command queue " << command_queue[i] << " 
for context " << aGpuEnv.mpContext);
+}
+
+for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i)
+{
+aGpuEnv.mpCmdQueue[i] = command_queue[i];
+}
+aGpuEnv.mbCommandQueueInitialized = true;
+return true;
+}
+
 void setKernelEnv( KernelEnv *envInfo )
 {
+if (!gpuEnv.mbCommandQueueInitialized)
+{
+initializeCommandQueue(gpuEnv);
+}
+
 envInfo->mpkContext = gpuEnv.mpContext;
 envInfo->mpkProgram = gpuEnv.mpArryPrograms[0];
 
@@ -265,8 +311,7 @@ bool initOpenCLAttr( OpenCLEnv * env )
 
 gpuEnv.mnIsUserCreated = 1;
 
-for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i)
-gpuEnv.mpCmdQueue[i] = env->mpOclCmdQueue[i];
+gpuEnv.mbCommandQueueInitialized = false;
 
 gpuEnv.mnCmdQueuePos = 0; // default to 0.
 
@@ -765,7 +810,6 @@ bool switchOpenCLDevice(const OUString* pDevice, bool 
bAutoSelect, bool bForceEv
 
 cl_context context;
 cl_platform_id platformId;
-cl_command_queue command_queue[OPENCL_CMDQUEUE_SIZE];
 
 {
 OpenCLZone zone;
@@ -790,33 +834,6 @@ bool switchOpenCLDevice(const OUString* pDevice, bool 
bAutoSelect, bool bForceEv
 }
 SAL_INFO("opencl", "Created context " << context << " for platform " 
<< platformId << ", device " << pDeviceId);
 
-for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i)
-{
-command_queue[i] = clCreateCommandQueue(
-context, pDeviceId, 0, &nState);
-if (nState != CL_SUCCESS)
-SAL_WARN("opencl", "clCreateCommandQueue failed: " << 
errorString(nState));
-
-if (command_queue[i] == nullptr || nState != CL_SUCCESS)
-{
-// Release all command queues created so far.
-for (int j = 0; j <= i; ++j)
-{
-if (command_queue[j])
-{
-clReleaseCommandQueue(command_queue[j]);
-command_queue[j] = nullptr;
-}
-}
-
-clReleaseContext(context);
-SAL_WARN("opencl", "failed to set/switch opencl device");
-return false;
-}
-
-SAL_INFO("opencl", "Created command queue " << command_queue[i] << 
" for context " << context);
-}
-
 OString sDeviceID = getDeviceInfoString(pDeviceId, CL_DEVICE_VENDOR) + 
" " + getDeviceInfoString(pDeviceId, CL_DRIVER_VERSION);
 rOutSelectedDeviceVersionIDString = OStringToOUString(sDeviceID, 
RTL_TEXTENCODING_UTF8);
 }
@@ -824,14 +841,12 @@ bool switchOpenCLDevice(const OUString* pDevice, bool 
bAutoSelect, bool bForceEv
 setOpe

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

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_GbuildToIde.mk |   49 +--
 solenv/qa/python/gbuildtoide.py  |8 ++--
 2 files changed, 30 insertions(+), 27 deletions(-)

New commits:
commit fcb7ee7aad1c798157bc84e418742a42cb625ae6
Author: Bjoern Michaelsen 
Date:   Thu Oct 13 23:24:44 2016 +0200

use tempdir for test

Change-Id: Ie218f87dc2f1c1b6031cc08f2027cfcf392c6c21

diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 6184f91..71c6775 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -21,17 +21,19 @@ import unittest
 import json
 import os
 import os.path
+import tempfile
 
 
 class CheckGbuildToIde(unittest.TestCase):
 
 def test_gbuildtoide(self):
+tempwork = tempfile.mkdtemp()
 os.chdir(os.path.join(os.environ['SRCDIR'], 'solenv', 'qa', 'python', 
'selftest'))
-subprocess.check_call(['make', 'gbuildtoide'])
-jsonfiles = os.listdir(os.path.join(os.environ['WORKDIR'], 
'GbuildToIde', 'Library'))
+subprocess.check_call(['make', 'gbuildtoide', 'WORKDIR=%s' % tempwork])
+jsonfiles = os.listdir(os.path.join(tempwork, 'GbuildToIde', 
'Library'))
 gbuildlibs = []
 for jsonfilename in jsonfiles:
-with open(os.path.join(os.environ['WORKDIR'], 'GbuildToIde', 
'Library', jsonfilename), 'r') as f:
+with open(os.path.join(tempwork, 'GbuildToIde', 'Library', 
jsonfilename), 'r') as f:
 print('loading %s' % jsonfilename)
 gbuildlibs.append(json.load(f))
 foundlibs = set()
commit 2eb6605c1dcf5ea8e0521a8162d20dfe6399ec88
Author: Bjoern Michaelsen 
Date:   Thu Oct 13 23:15:47 2016 +0200

gbuildtoide does not need deps

Change-Id: I806b8f445fad02e7dceff6263828fe9d8667341e

diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk 
b/solenv/gbuild/extensions/post_GbuildToIde.mk
index 2316b41..8d20e52 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -8,6 +8,8 @@
 
 ifneq ($(filter gbuildtoide,$(MAKECMDGOALS)),)
 
+gb_FULLDEPS:=
+
 gbuildtoide:
true
 
commit 6f345e1e6e2d7f6fdbd746dfd0c91843a5ff2d10
Author: Bjoern Michaelsen 
Date:   Thu Oct 13 23:15:20 2016 +0200

remove needless cascaded defines

Change-Id: Ie76dd70a6a0960ee49df6e31a171761fdaf88f53

diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk 
b/solenv/gbuild/extensions/post_GbuildToIde.mk
index 1c242a40..2316b41 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -15,35 +15,34 @@ gbuildtoide:
 foo:
true
 
+define gb_LinkTarget__command
+mkdir -p $(WORKDIR)/GbuildToIde/Library
+printf '{"LINKTARGET": "%s"' '$(2)' > $(WORKDIR)/GbuildToIde/$(2)
+printf ', "ILIBTARGET": "%s"' '$(ILIBTARGET)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "COBJECTS": "%s"' '$(COBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "CXXOBJECTS": "%s"' '$(CXXOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "YACCOBJECTS": "%s"' '$(YACCOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "OBJCOBJECTS": "%s"' '$(OBJCOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "OBJCXXOBJECTS": "%s"' '$(OBJCXXOBJECTS)' >> 
$(WORKDIR)/GbuildToIde/$(2)
+printf ', "ASMOBJECTS": "%s"' '$(ASMOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "GENCOBJECTS": "%s"' '$(GENCOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "GENCXXOBJECTS": "%s"' '$(GENCXXOBJECTS)' >> 
$(WORKDIR)/GbuildToIde/$(2)
+printf ', "CFLAGS": "%s"' '$(T_CFLAGS) $(T_CFLAGS_APPEND)' >> 
$(WORKDIR)/GbuildToIde/$(2)
+printf ', "CXXFLAGS": "%s"' '$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND)' >> 
$(WORKDIR)/GbuildToIde/$(2)
+printf ', "OBJCFLAGS": "%s"' '$(T_OBJCFLAGS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "OBJCXXFLAGS": "%s"' '$(T_OBJCXXFLAGS)' >> 
$(WORKDIR)/GbuildToIde/$(2)
+printf ', "DEFS": "%s"' '$(DEFS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "INCLUDE": "%s"' '$(INCLUDE)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "LINKED_LIBS": "%s"' '$(LINKED_LIBS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "LINKED_STATIC_LIBS": "%s"' '$(LINKED_STATIC_LIBS)' >> 
$(WORKDIR)/GbuildToIde/$(2)
+printf '}\n' >> $(WORKDIR)/GbuildToIde/$(2)
+endef
+
 define gb_Postprocess_register_target
 gbuildtoide : $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,$(3)))
 
-
 $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(3))): 
$(gb_Helper_MISCDUMMY) foo
 
-define gb_LinkTarget__command
-   mkdir -p $(WORKDIR)/GbuildToIde/Library
-   printf '{"LINKTARGET": "%s"' '$$(2)' > $(WORKDIR)/GbuildToIde/$$(2)
-   printf ', "ILIBTARGET": "%s"' '$$(ILIBTARGET)' >> 
$(WORKDIR)/GbuildToIde/$$(2)
-   printf ', "COBJECTS": "%s"' '$$(COBJECTS)' >> 
$(WORKDIR)/GbuildToIde/$$(2)
-   printf ', "CXXOBJECTS": "%s"' '$$(CXXOBJECTS)' >> 
$(WORKDIR)/GbuildToIde/$$(2)
-   printf ', "YACCOBJECTS": "%s"' '$$(YACCOBJECTS)' >> 
$(WORKDIR)/GbuildTo

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

[Michael Stahl]

 solenv/gbuild/extensions/post_GbuildToIde.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4ea6f3c38f81df3354a2ba4abfbb12641bf0c7bd
Author: Michael Stahl 
Date:   Thu Oct 13 23:05:33 2016 +0200

Don't hard-code Library directory because of ExtensionLibrary

Change-Id: I71a2e87279611a1a8f65ec86c47d26bbd5bd5f3b
Reviewed-on: https://gerrit.libreoffice.org/29800
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk 
b/solenv/gbuild/extensions/post_GbuildToIde.mk
index 8d20e52..d574d03 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -18,7 +18,7 @@ foo:
true
 
 define gb_LinkTarget__command
-mkdir -p $(WORKDIR)/GbuildToIde/Library
+mkdir -p $(WORKDIR)/GbuildToIde/$(dir $(2))
 printf '{"LINKTARGET": "%s"' '$(2)' > $(WORKDIR)/GbuildToIde/$(2)
 printf ', "ILIBTARGET": "%s"' '$(ILIBTARGET)' >> $(WORKDIR)/GbuildToIde/$(2)
 printf ', "COBJECTS": "%s"' '$(COBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
@@ -44,7 +44,6 @@ define gb_Postprocess_register_target
 gbuildtoide : $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,$(3)))
 
 $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(3))): 
$(gb_Helper_MISCDUMMY) foo
-
 endef
 
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - Repository.mk solenv/gbuild solenv/qa

[Bjoern Michaelsen]

 Repository.mk |3 -
 solenv/gbuild/extensions/post_GbuildToIde.mk  |4 -
 solenv/qa/python/gbuildtoide.py   |   37 --
 solenv/qa/python/selftest/Executable_gbuildselftestexe.mk |   16 ++
 solenv/qa/python/selftest/Module_selftest.mk  |1 
 solenv/qa/python/selftest/selftestexeobject.cxx   |1 
 6 files changed, 44 insertions(+), 18 deletions(-)

New commits:
commit 45a7137c6796f33fbf5b8f7cb64e293260d991cb
Author: Bjoern Michaelsen 
Date:   Fri Oct 14 01:04:51 2016 +0200

tearDown/clean up solenv test tempdir

Change-Id: I2fc5497b0aeadbc43e967f338a3b8718995f2a5c

diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index a1b8d1c..11e66a8 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -16,15 +16,19 @@ import tempfile
 
 
 class CheckGbuildToIde(unittest.TestCase):
+def setUp(self):
+self.tempwork = tempfile.mkdtemp()
+
+def tearDown(self):
+subprocess.check_call(['rm', '-rf', self.tempwork])
 
 def test_gbuildtoide(self):
-tempwork = tempfile.mkdtemp()
 os.chdir(os.path.join(os.environ['SRCDIR'], 'solenv', 'qa', 'python', 
'selftest'))
-subprocess.check_call(['make', 'gbuildtoide', 'WORKDIR=%s' % tempwork])
-jsonfiles = os.listdir(os.path.join(tempwork, 'GbuildToIde', 
'Library'))
+subprocess.check_call(['make', 'gbuildtoide', 'WORKDIR=%s' % 
self.tempwork])
+jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToIde', 
'Library'))
 gbuildlibs = []
 for jsonfilename in jsonfiles:
-with open(os.path.join(tempwork, 'GbuildToIde', 'Library', 
jsonfilename), 'r') as f:
+with open(os.path.join(self.tempwork, 'GbuildToIde', 'Library', 
jsonfilename), 'r') as f:
 gbuildlibs.append(json.load(f))
 foundlibs = set()
 for lib in gbuildlibs:
@@ -43,10 +47,10 @@ class CheckGbuildToIde(unittest.TestCase):
 self.assertTrue(False)
 self.assertEqual(foundlibs, set(['gbuildselftest', 
'gbuildselftestdep']))
 self.assertEqual(len(foundlibs), 2)
-jsonfiles = os.listdir(os.path.join(tempwork, 'GbuildToIde', 
'Executable'))
+jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToIde', 
'Executable'))
 gbuildexes = []
 for jsonfilename in jsonfiles:
-with open(os.path.join(tempwork, 'GbuildToIde', 'Executable', 
jsonfilename), 'r') as f:
+with open(os.path.join(self.tempwork, 'GbuildToIde', 'Executable', 
jsonfilename), 'r') as f:
 gbuildexes.append(json.load(f))
 foundexes = set()
 for exe in gbuildexes:
commit bc6c26d3c1269c91f7d963fe96c01740732b094b
Author: Bjoern Michaelsen 
Date:   Fri Oct 14 00:59:53 2016 +0200

fix license, this is entirely new content

Change-Id: Icf1818fb894d039eeb4e7f1306a53ac4322fa075

diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 78917b8..a1b8d1c 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -1,19 +1,10 @@
 '''
-  This is file is part of the LibreOffice project.
+  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 .
 '''
 
 import subprocess
commit 5cfcd6809f46e9ca3665c6f7430658e4d71af855
Author: Bjoern Michaelsen 
Date:   Fri Oct 14 00:57:36 2016 +0200

add gbuildtoide support for exes

Change-Id: I320ee341651dd0c92de5176c10aa5290afea1d38

diff --git a/Repository.mk b/Repository.mk
index 169769e..47a1ad0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1001,7 +1001,8 @@ $(eval $(call gb_Helper_register_uiconfigs,\
 ))
 
 ifeq ($(gb_GBUILDSELFTEST),t)
-$(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo,gbuildselftestdep 
gbuildselftest))
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, 
gbuildselftestdep gbuildselftest))
+$(eval $(call gb_Helper_register_executables,NONE, gbuildselftestexe))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk 
b/solenv/gbuild/extensions/post_GbuildToIde.mk
index d574d03..c808

Add-on updates via Extension Manager freeze LibreOffice

[Simon Beàn]

Hi, 

We made an add-on (C++) for LibreOffice. Recently, we've tried to push an 
update for our add-on via Extension Manager... (Check for updates...). But 
LibreOffice froze if the add-on has been loaded. Running LibreOffice in GDB, we 
saw LibreOffice is waiting for something. Is it a bug or we missed something in 
our add-on (unloader or similar)? We test LibreOffice 4.2 and LibreOffice 5.1 
(Linux).

Thank you.

sbean



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

Error while 'make install' Android Viewer

[Rosen Silva]

Hi,
I was trying to install freshly build LibreOffice Android Viewer using "make 
install" command using Makefile
which was located at "core/android/source" , but suddenly it shows that a file 
is missing. The file name was 
"n/core/android/source/liboSettings.gradle" then I searched the core in github 
weather is it available but there
is no such file. Can anyone give me a solution ? ,Anyway I feels like that file 
should generated on my pc itself 
but I can't find what went wrong 
Thanks in advance ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Want to join libreoffice developer

[Thongya Murong]

 

Dear

 

I am student in daffodill international university at dhaka Bangladesh and new want to working of libreoffice developer. I want to edit libreoffice source code but don't understand how to become start editing the code. I have pazzle of million million line code. If I get source code documentation then can start coding. Moreover I want joined libreoffice developer list and working intend of volunteer.

 

 

Best regards

Thongya Murong

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

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

[Kohei Yoshida]

 sc/source/ui/inc/viewdata.hxx  |   12 
 sc/source/ui/view/viewdata.cxx |3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit d800825f0d673071519846431e4113c1bd292482
Author: Kohei Yoshida 
Date:   Thu Oct 13 20:45:09 2016 -0400

Annotate the code a bit around EditGrowX/Y.

Change-Id: Ib7ee2e4aa393b7d842aeaf0569f104eee17ea4ad

diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index d4b5a04..4986e1f 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -444,7 +444,19 @@ public:
 EditView*   GetEditView( ScSplitPos eWhich ) const
 { return pEditView[eWhich]; }
 
+/**
+ * Extend the output area for the edit engine view in a horizontal
+ * direction as needed.
+ */
 voidEditGrowX();
+
+/**
+ * Extend the output area for the edit engine view in a vertical direction
+ * as needed.
+ *
+ * @param bInitial when true, then the call originates from a brand-new
+ * edit engine instance.
+ */
 voidEditGrowY( bool bInitial = false );
 
 ScSplitPos  GetEditActivePart() const   { return eEditActivePart; }
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 7763af3..4eb61f0 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1212,6 +1212,7 @@ void ScViewData::EditGrowX()
 static_cast( pCurView->GetEditEngine() );
 vcl::Window* pWin = pCurView->GetWindow();
 
+// Get the left- and right-most column positions.
 SCCOL nLeft = GetPosX(eHWhich);
 SCCOL nRight = nLeft + VisibleCellsX(eHWhich);
 
@@ -1219,7 +1220,7 @@ void ScViewData::EditGrowX()
 Rectangle   aArea = pCurView->GetOutputArea();
 longnOldRight = aArea.Right();
 
-//  Margin ist schon bei der urspruenglichen Breite beruecksichtigt
+// Margin is already included in the original width.
 long nTextWidth = pEngine->CalcTextWidth();
 
 bool bChanged = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/commonsallayout' - vcl/quartz

[Khaled Hosny]

 vcl/quartz/salgdi.cxx |   42 ++
 1 file changed, 42 insertions(+)

New commits:
commit 28bfc0984b1728b5a82c6b630277646b4c0a2794
Author: Khaled Hosny 
Date:   Fri Oct 14 02:19:32 2016 +0200

Untested first part of macOS font fallback

Change-Id: I0d9a5b9f951755e8f12d26116ee2c99bda1d42ce

diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index bb99737..37982a8 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -55,6 +55,45 @@
 
 using namespace vcl;
 
+class CoreTextGlyphFallbackSubstititution
+:public ImplGlyphFallbackFontSubstitution
+{
+public:
+bool FindFontSubstitute(FontSelectPattern&, OUString&) const override;
+}
+
+bool 
CoreTextGlyphFallbackSubstititution::FindFontSubstitute(FontSelectPattern& 
rPattern,
+OUString& rMissingChars) const
+{
+bool bFound = false;
+CoreTextStyle rStyle(rPattern);
+CTFontRef pFont = 
static_cast(CFDictionaryGetValue(rStyle.GetStyleDict(), 
kCTFontAttributeName));
+CFStringRef pStr = CreateCFString(rMissingChars);
+if (pStr)
+{
+CTFontRef pFallback = CTFontCreateForString(pFont, pStr, 
CFRangeMake(0, CFStringGetLength(pStr)));
+if (pFallback)
+{
+bFound = true;
+
+CTFontDescriptorRef pDesc = CTFontCopyFontDescriptor(pFallback);
+FontAttributes rAttr = DevFontFromCTFontDescriptor(pDesc, nullptr);
+
+rPattern.maSearchName = rAttr.GetFamilyName();
+
+rPattern.SetWeight(rAttr.GetWeight());
+rPattern.SetItalic(rAttr.GetItalic());
+rPattern.SetPitch(rAttr.GetPitch());
+rPattern.SetWidthType(rAttr.GetWidthType());
+
+CFRelease(pFallback);
+}
+CFRelease(pStr);
+}
+
+return bFound;
+}
+
 CoreTextFontFace::CoreTextFontFace( const CoreTextFontFace& rSrc )
   : PhysicalFontFace( rSrc )
   , mnFontId( rSrc.mnFontId )
@@ -387,6 +426,9 @@ void AquaSalGraphics::GetDevFontList( 
PhysicalFontCollection* pFontCollection )
 
 // Copy all PhysicalFontFace objects contained in the SystemFontList
 pSalData->mpFontList->AnnounceFonts( *pFontCollection );
+
+static CoreTextGlyphFallbackSubstititution aSubstFallback;
+pFontCollection->SetFallbackHook(&aSubstFallback);
 }
 
 void AquaSalGraphics::ClearDevFontCache()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

4 new defect(s) introduced to LibreOffice found with Coverity Scan.
6 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 4 of 4 defect(s)


** CID 1373665:  Incorrect expression  (USELESS_CALL)



*** CID 1373665:  Incorrect expression  (USELESS_CALL)
/vcl/source/control/combobox.cxx: 172 in ComboBox::ImplInit(vcl::Window *, 
long)()
166 m_pImpl->m_nDDHeight = 
sal::static_int_cast(nNCHeight);
167 }
168 }
169 
170 void ComboBox::ImplInit( vcl::Window* pParent, WinBits nStyle )
171 {
>>> CID 1373665:  Incorrect expression  (USELESS_CALL)
>>> Calling "ComboBox::ImplInitStyle(nStyle)" is only useful for its return 
>>> value, which is ignored.
172 ImplInitStyle( nStyle );
173 
174 bool bNoBorder = ( nStyle & WB_NOBORDER ) != 0;
175 if ( !(nStyle & WB_DROPDOWN) )
176 {
177 nStyle &= ~WB_BORDER;

** CID 1373664:  Uninitialized members  (UNINIT_CTOR)
/cui/source/tabpages/tabarea.cxx: 89 in 
SvxAreaTabDialog::SvxAreaTabDialog(vcl::Window *, const SfxItemSet *, SdrModel 
*, bool)()



*** CID 1373664:  Uninitialized members  (UNINIT_CTOR)
/cui/source/tabpages/tabarea.cxx: 89 in 
SvxAreaTabDialog::SvxAreaTabDialog(vcl::Window *, const SfxItemSet *, SdrModel 
*, bool)()
83 m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", 
SvxTransparenceTabPage::Create,  nullptr);
84 
85 SetCurPageId( "RID_SVXPAGE_AREA" );
86 
87 CancelButton& rBtnCancel = GetCancelButton();
88 rBtnCancel.SetClickHdl( LINK( this, SvxAreaTabDialog, CancelHdlImpl 
) );
>>> CID 1373664:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "mbAreaTP" is not initialized in this 
>>> constructor nor in any functions that it calls.
89 }
90 
91 void SvxAreaTabDialog::SavePalettes()
92 {
93 SfxObjectShell* pShell = SfxObjectShell::Current();
94 if( mpNewColorList != mpDrawModel->GetColorList() )

** CID 1373663:  Insecure data handling  (TAINTED_SCALAR)
/comphelper/source/misc/backupfilehelper.cxx: 434 in 
::ExtensionInfo::read_entries(std::shared_ptr &)()



*** CID 1373663:  Insecure data handling  (TAINTED_SCALAR)
/comphelper/source/misc/backupfilehelper.cxx: 434 in 
::ExtensionInfo::read_entries(std::shared_ptr &)()
428 
429 if (!read_sal_uInt32(rFile, nExtEntries))
430 {
431 return false;
432 }
433 
>>> CID 1373663:  Insecure data handling  (TAINTED_SCALAR)
>>> Using tainted variable "nExtEntries" as a loop boundary.
434 for (sal_uInt32 a(0); a < nExtEntries; a++)
435 {
436 ExtensionInfoEntry aNewEntry;
437 
438 if (aNewEntry.read_entry(rFile))
439 {

** CID 1373662:  Insecure data handling  (TAINTED_SCALAR)
/vcl/source/control/listbox.cxx: 201 in ListBox::ImplLoadRes()()



*** CID 1373662:  Insecure data handling  (TAINTED_SCALAR)
/vcl/source/control/listbox.cxx: 201 in ListBox::ImplLoadRes()()
195 
196 // The resource short is actually to be treated as unsigned short.
197 sal_uInt16 nResPos = static_cast(ReadShortRes());
198 sal_Int32 nSelPos = (nResPos == SAL_MAX_UINT16) ? 
LISTBOX_ENTRY_NOTFOUND : nResPos;
199 sal_Int32 nNumber = ReadLongRes();
200 
>>> CID 1373662:  Insecure data handling  (TAINTED_SCALAR)
>>> Using tainted variable "nNumber" as a loop boundary.
201 for( sal_Int32 i = 0; i < nNumber; i++ )
202 {
203 sal_Int32 nPos = InsertEntry( ReadStringRes() );
204 
205 sal_IntPtr nId = ReadLongRes();
206 if( nId )



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyGRQLPsJ4rfZ-2ByhtOe45xVen5IFJTX9GobMUFZVAWOdSOxMcf0lACl6ypuFtSyV1ORh8uYNLmyLPBSEB0Ze0adiUX7elBQRQPqUDRsQo9XMtk-2Bnq09mVoYwz1zQY9kogEj78e5Qfhn55k0RXgTL-2FLdBhpUbsL0E-2BkS8WErta45Sk-3D

To manage Coverity Scan email notifications for 
"libreoffice@lis

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

[Stephan Bergmann]

 fpicker/source/win32/filepicker/FileOpenDlg.hxx |   17 -
 1 file changed, 17 deletions(-)

New commits:
commit f74a76391cc8c41514ead1698f92037081a2e257
Author: Stephan Bergmann 
Date:   Thu Oct 13 21:28:41 2016 +0200

_OPENFILENAME_SIZE_VERISON_400 is unused

...since b30f91c58419e90a789f79a1391b13f2064997ab "Drop Win9x stuff"

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

diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx 
b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index 6d2d655..d3d09d5 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -32,10 +32,6 @@
 // into our build environment if have stolen the definition
 // for the new OPENFILENAME structure from the new headers
 
-#ifndef _CDSIZEOF_STRUCT
-#define _CDSIZEOF_STRUCT(structname, member)  
(((int)((LPBYTE)(&((structname*)0)->member) - ((LPBYTE)((structname*)0 + 
sizeof(((structname*)0)->member))
-#endif
-
 typedef struct _tagOFNA {
DWORDlStructSize;
HWND hwndOwner;
@@ -100,19 +96,6 @@ typedef _OPENFILENAMEA _OPENFILENAME;
 typedef _LPOPENFILENAMEA _LPOPENFILENAME;
 #endif // UNICODE
 
-#if (_WIN32_WINNT >= 0x0500)
-#define _OPENFILENAME_SIZE_VERSION_400A  
_CDSIZEOF_STRUCT(_OPENFILENAMEA,lpTemplateName)
-#define _OPENFILENAME_SIZE_VERSION_400W  
_CDSIZEOF_STRUCT(_OPENFILENAMEW,lpTemplateName)
-#ifdef UNICODE
-#define _OPENFILENAME_SIZE_VERSION_400  _OPENFILENAME_SIZE_VERSION_400W
-#else
-#define _OPENFILENAME_SIZE_VERSION_400  _OPENFILENAME_SIZE_VERSION_400A
-#endif // !UNICODE
-#else
-#error _WIN32_WINNT seems not to be valid.
-#endif // (_WIN32_WINNT >= 0x0500)
-
-
 // A simple wrapper class around the Win32 GetOpenFileName API.
 // This class is not thread-safe and only one instance at a
 // time is allowed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 fpicker/Library_fps.mk |1 
 fpicker/source/win32/filepicker/SolarMutex.cxx |   40 -
 fpicker/source/win32/filepicker/SolarMutex.hxx |   27 ---
 fpicker/source/win32/filepicker/asynceventnotifier.cxx |2 
 4 files changed, 70 deletions(-)

New commits:
commit e35e95560d714a84da4c3a07f50de1de339ab727
Author: Stephan Bergmann 
Date:   Thu Oct 13 22:02:19 2016 +0200

ReleaseSolarMutexOnMainThreadContext is unused

...ever since its introduction in 29da2639353762a64673d6ae5b32a36045caa7d3
"CWS-TOOLING: integrate CWS filepicker01"

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

diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 90eb8da..c57b411 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_Library_add_exception_objects,fps,\
fpicker/source/win32/filepicker/helppopupwindow \
fpicker/source/win32/filepicker/previewadapter \
fpicker/source/win32/filepicker/previewbase \
-   fpicker/source/win32/filepicker/SolarMutex \
fpicker/source/win32/filepicker/VistaFilePicker \
fpicker/source/win32/filepicker/VistaFilePickerEventHandler \
fpicker/source/win32/filepicker/VistaFilePickerImpl \
diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx 
b/fpicker/source/win32/filepicker/SolarMutex.cxx
deleted file mode 100644
index 3b8fdbb..000
--- a/fpicker/source/win32/filepicker/SolarMutex.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include 
-#include 
-#include 
-
-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId)
-{
-int nAcquireCount = 0;
-oslThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier();
-
-if ( nMainThreadId == nThreadId )
-{
-comphelper::SolarMutex& rMutex = Application::GetSolarMutex();
-if ( rMutex.tryToAcquire() )
-nAcquireCount = Application::ReleaseSolarMutex() - 1;
-}
-
-return nAcquireCount;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/SolarMutex.hxx 
b/fpicker/source/win32/filepicker/SolarMutex.hxx
deleted file mode 100644
index 3233083..000
--- a/fpicker/source/win32/filepicker/SolarMutex.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SOLARMUTEX_HXX
-#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SOLARMUTEX_HXX
-
-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId);
-
-#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SOLARMUTEX_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx 
b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 08b61f8..854a6b8 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -25,8 +25,6 @@
 
 #include 
 #include 
-#include "SolarMutex.hxx"
-
 
 using namespace com::sun::star;
 using ::com:

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

[Jochen Nitschke]

 writerfilter/source/dmapper/NumberingManager.cxx |   28 ---
 1 file changed, 15 insertions(+), 13 deletions(-)

New commits:
commit 7ae4cedd5a80eca1ec27045a1d97f94ea457ef0b
Author: Jochen Nitschke 
Date:   Thu Oct 13 20:37:00 2016 +0200

replace macro with function template

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

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 5607621..711e7c4 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -38,9 +38,6 @@
 
 using namespace com::sun::star;
 
-#define MAKE_PROPVAL(NameId, Value) \
-beans::PropertyValue(getPropertyName(NameId), 0, uno::makeAny(Value), 
beans::PropertyState_DIRECT_VALUE )
-
 #define NUMBERING_MAX_LEVELS10
 
 
@@ -48,6 +45,11 @@ namespace writerfilter {
 namespace dmapper {
 
 //---  Utility functions
+template 
+beans::PropertyValue lcl_makePropVal(PropertyIds nNameID, T aValue)
+{
+return {getPropertyName(nNameID), 0, uno::makeAny(aValue), 
beans::PropertyState_DIRECT_VALUE};
+}
 
 sal_Int32 lcl_findProperty( const uno::Sequence< beans::PropertyValue >& 
aProps, const OUString& sName )
 {
@@ -239,7 +241,7 @@ uno::Sequence< beans::PropertyValue > 
ListLevel::GetLevelProperties( )
 std::vector aNumberingProperties;
 
 if( m_nIStartAt >= 0)
-aNumberingProperties.push_back( MAKE_PROPVAL(PROP_START_WITH, 
(sal_Int16)m_nIStartAt) );
+
aNumberingProperties.push_back(lcl_makePropVal(PROP_START_WITH, 
m_nIStartAt) );
 
 sal_Int16 nNumberFormat = ConversionHelper::ConvertNumberingType(m_nNFC);
 if( m_nNFC >= 0)
@@ -250,11 +252,11 @@ uno::Sequence< beans::PropertyValue > 
ListLevel::GetLevelProperties( )
 // w:lvlText is empty, that means no numbering in Word.
 // CHAR_SPECIAL is handled separately below.
 nNumberFormat = style::NumberingType::NUMBER_NONE;
-aNumberingProperties.push_back( MAKE_PROPVAL(PROP_NUMBERING_TYPE, 
nNumberFormat ));
+aNumberingProperties.push_back(lcl_makePropVal(PROP_NUMBERING_TYPE, 
nNumberFormat));
 }
 
 if( m_nJC >= 0 && m_nJC <= 
sal::static_int_cast(sizeof(aWWToUnoAdjust) / sizeof(sal_Int16)) )
-aNumberingProperties.push_back( MAKE_PROPVAL(PROP_ADJUST, 
aWWToUnoAdjust[m_nJC]));
+aNumberingProperties.push_back(lcl_makePropVal(PROP_ADJUST, 
aWWToUnoAdjust[m_nJC]));
 
 if( !isOutlineNumbering())
 {
@@ -263,21 +265,21 @@ uno::Sequence< beans::PropertyValue > 
ListLevel::GetLevelProperties( )
 {
 if (!m_sBulletChar.isEmpty())
 {
-aNumberingProperties.push_back( MAKE_PROPVAL(PROP_BULLET_CHAR, 
m_sBulletChar.copy(0,1)));
+
aNumberingProperties.push_back(lcl_makePropVal(PROP_BULLET_CHAR, 
m_sBulletChar.copy(0, 1)));
 }
 else
 {
 // If w:lvlText's value is null - set bullet char to zero.
-aNumberingProperties.push_back( MAKE_PROPVAL(PROP_BULLET_CHAR, 
sal_Unicode(0x0)));
+
aNumberingProperties.push_back(lcl_makePropVal(PROP_BULLET_CHAR, 
0));
 }
 }
 if (!m_sGraphicURL.isEmpty())
-aNumberingProperties.push_back(MAKE_PROPVAL(PROP_GRAPHIC_URL, 
m_sGraphicURL));
+aNumberingProperties.push_back(lcl_makePropVal(PROP_GRAPHIC_URL, 
m_sGraphicURL));
 if (m_sGraphicBitmap.is())
-aNumberingProperties.push_back(MAKE_PROPVAL(PROP_GRAPHIC_BITMAP, 
m_sGraphicBitmap));
+
aNumberingProperties.push_back(lcl_makePropVal(PROP_GRAPHIC_BITMAP, 
m_sGraphicBitmap));
 }
 
-aNumberingProperties.push_back( MAKE_PROPVAL( PROP_LISTTAB_STOP_POSITION, 
m_nTabstop ) );
+aNumberingProperties.push_back(lcl_makePropVal(PROP_LISTTAB_STOP_POSITION, 
m_nTabstop));
 
 //TODO: handling of nFLegal?
 //TODO: nFNoRestart lower levels do not restart when higher levels are 
incremented, like:
@@ -291,14 +293,14 @@ uno::Sequence< beans::PropertyValue > 
ListLevel::GetLevelProperties( )
 if( m_nFWord6 > 0) //Word 6 compatibility
 {
 if( m_nFPrev == 1)
-aNumberingProperties.push_back( MAKE_PROPVAL( 
PROP_PARENT_NUMBERING, (sal_Int16) NUMBERING_MAX_LEVELS ));
+
aNumberingProperties.push_back(lcl_makePropVal(PROP_PARENT_NUMBERING,
 NUMBERING_MAX_LEVELS));
 //TODO: prefixing space nFPrevSpace; - has not been used in 
WW8 filter
 }
 
 //TODO: sRGBXchNums; array of inherited numbers
 
 //  nXChFollow; following character 0 - tab, 1 - space, 2 - nothing
-aNumberingProperties.push_back( MAKE_PROPVAL( PROP_LEVEL_FOLLOW, 
m_nXChFollow ));
+aNumberingProperties.push_back(lcl_makePropVal(PROP_LEVEL_FOLLOW, 
m_nXChFo

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

[nadith]

 connectivity/source/drivers/mork/MResultSet.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 0f67b8626b326caa8c43fd7ac57be4dd59b2f281
Author: nadith 
Date:   Thu Oct 13 22:16:16 2016 +0530

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

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

diff --git a/connectivity/source/drivers/mork/MResultSet.cxx 
b/connectivity/source/drivers/mork/MResultSet.cxx
index f00ab70..c620666 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -55,10 +55,7 @@ OUString SAL_CALL OResultSet::getImplementationName(  ) 
throw ( RuntimeException
 
  Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw( 
RuntimeException, std::exception)
 {
-css::uno::Sequence< OUString > aSupported(2);
-aSupported[0] = "com.sun.star.sdbc.ResultSet";
-aSupported[1] = "com.sun.star.sdbcx.ResultSet";
-return aSupported;
+   return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"};
 }
 
 sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) 
throw( RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Add arguments to Calc functions when exporting to xls

[Winfried Donkers]

Hi Eike,

Currently I'm working on tdf103186, LOGINV, which has optional arguments that 
are mandatory in Excel.
There is a class MissingConventionOOXML, so adding arguments for export to 
OOXML is no problem.
But I don't see a similar class for xls, probably because that export/saving 
mechanism is completely different.

Is there a way to add function arguments when saving to xls? Or do we accept 
#N/A errors in xls because the function plus argument count is not recognised?

Winfried

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