date:20161010

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

2016-10-10 Thread Stephan Bergmann

 include/tools/ref.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6cded5c853defdda928036d11ae88fa3cf19a79a
Author: Stephan Bergmann 
Date:   Tue Oct 11 08:52:41 2016 +0200

Demonstrate that SvRef ==/!= are acceptable as member functions

Change-Id: I30771393bc16f2320cd89f018ff93c756913b70d

diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 30abab3..c8db2bd 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -31,7 +31,7 @@
 namespace tools {
 
 /** T must be a class that extends SvRefBase */
-template class SAL_DLLPUBLIC_RTTI SvRef {
+template class SAL_DLLPUBLIC_RTTI SvRef final {
 public:
 SvRef(): pObj(nullptr) {}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - i18npool/inc i18npool/source

2016-10-10 Thread Andras Timar

 i18npool/inc/numberformatcode.hxx |   15 +--
 i18npool/source/numberformatcode/numberformatcode.cxx |   77 ++
 2 files changed, 55 insertions(+), 37 deletions(-)

New commits:
commit bee4d76b85645bca795c6f15c322ccba9a7074e2
Author: Andras Timar 
Date:   Tue Oct 11 08:39:41 2016 +0200

Revert "tdf#53698: Cache more than 1 item in NumberFormatCodeMapper"

This reverts commit 5ee0cf887301ea0e994e3ec7299f4958808fc2d8.

diff --git a/i18npool/inc/numberformatcode.hxx 
b/i18npool/inc/numberformatcode.hxx
index 48c64c2..9c7d780 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -29,9 +29,6 @@
 #include 
 #include 
 
-#include 
-#include 
-
 class NumberFormatCodeMapper : public cppu::WeakImplHelper
 <
 css::i18n::XNumberFormatCode,
@@ -58,15 +55,19 @@ public:
 
 private:
 osl::Mutex maMutex;
-css::uno::Reference < css::i18n::XLocaleData4 > m_xLocaleData;
-typedef std::pair< css::lang::Locale, css::uno::Sequence< 
css::i18n::FormatElement > > FormatElementCacheItem;
-std::deque < FormatElementCacheItem > m_aFormatElementCache;
+css::lang::Locale aLocale;
+css::uno::Reference < css::uno::XComponentContext > mxContext;
+css::uno::Sequence< css::i18n::FormatElement > aFormatSeq;
+css::uno::Reference < css::i18n::XLocaleData4 > mxLocaleData;
+bool bFormatsValid;
 
-const css::uno::Sequence< css::i18n::FormatElement >& getFormats( const 
css::lang::Locale& rLocale );
+void setupLocale( const css::lang::Locale& rLocale );
+void getFormats( const css::lang::Locale& rLocale );
 static OUString mapElementTypeShortToString(sal_Int16 formatType);
 static sal_Int16 mapElementTypeStringToShort(const OUString& formatType);
 static OUString mapElementUsageShortToString(sal_Int16 formatUsage);
 static sal_Int16 mapElementUsageStringToShort(const OUString& formatUsage);
+void createLocaleDataObject();
 };
 
 
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx 
b/i18npool/source/numberformatcode/numberformatcode.cxx
index fe565560..4a5e147 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.cxx
@@ -25,8 +25,10 @@
 
 NumberFormatCodeMapper::NumberFormatCodeMapper(
 const css::uno::Reference < css::uno::XComponentContext >& 
rxContext )
+:
+mxContext( rxContext ),
+bFormatsValid( false )
 {
-m_xLocaleData.set( css::i18n::LocaleData::create( rxContext ) );
 }
 
 
@@ -43,10 +45,10 @@ NumberFormatCodeMapper::getDefault( sal_Int16 formatType, 
sal_Int16 formatUsage,
 OUString elementUsage = mapElementUsageShortToString(formatUsage);
 
 osl::MutexGuard g(maMutex);
-const css::uno::Sequence< css::i18n::FormatElement > &aFormatSeq = 
getFormats( rLocale );
+getFormats( rLocale );
 
-for (sal_Int32 i = 0; i < aFormatSeq.getLength(); i++) {
-if (aFormatSeq[i].isDefault && aFormatSeq[i].formatType == elementType 
&&
+for(sal_Int32 i = 0; i < aFormatSeq.getLength(); i++) {
+if(aFormatSeq[i].isDefault && aFormatSeq[i].formatType == elementType 
&&
 aFormatSeq[i].formatUsage == elementUsage) {
 css::i18n::NumberFormatCode anumberFormatCode(formatType,
 
formatUsage,
@@ -67,10 +69,10 @@ css::i18n::NumberFormatCode SAL_CALL
 NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const 
css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception)
 {
 osl::MutexGuard g(maMutex);
-const css::uno::Sequence< css::i18n::FormatElement > &aFormatSeq = 
getFormats( rLocale );
+getFormats( rLocale );
 
-for (sal_Int32 i = 0; i < aFormatSeq.getLength(); i++) {
-if (aFormatSeq[i].formatIndex == formatIndex) {
+for(sal_Int32 i = 0; i < aFormatSeq.getLength(); i++) {
+if(aFormatSeq[i].formatIndex == formatIndex) {
 css::i18n::NumberFormatCode 
anumberFormatCode(mapElementTypeStringToShort(aFormatSeq[i].formatType),
 
mapElementUsageStringToShort(aFormatSeq[i].formatUsage),
 
aFormatSeq[i].formatCode,
@@ -83,6 +85,7 @@ NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, 
const css::lang::L
 }
 css::i18n::NumberFormatCode defaultNumberFormatCode;
 return defaultNumberFormatCode;
+
 }
 
 
@@ -90,21 +93,21 @@ css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL
 NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const 
css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception)
 {
 osl::MutexGuard g(maMutex);
-const css::uno::Sequence< css::i18n::FormatElement > &aFormatSeq = 
getFormats( rLocale );
+getFormats( rLocale );
 
 sal_Int32 i, count;
 count = 0;
-for (

[Libreoffice-commits] core.git: basegfx/source compilerplugins/clang cui/source drawinglayer/source editeng/source include/basegfx include/sfx2 include/svx include/unotools include/xmloff sc/inc sc/qa

2016-10-10 Thread Noel Grandin

 basegfx/source/polygon/b2dpolypolygontools.cxx |5 
 compilerplugins/clang/store/constantfunction.cxx   |   87 ++---
 cui/source/options/optopencl.cxx   |4 
 cui/source/options/optopencl.hxx   |2 
 drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx |2 
 editeng/source/editeng/editobj.cxx |9 -
 editeng/source/items/numitem.cxx   |2 
 include/basegfx/polygon/b2dpolypolygontools.hxx|6 
 include/sfx2/childwin.hxx  |1 
 include/sfx2/dispatch.hxx  |2 
 include/sfx2/dockwin.hxx   |1 
 include/svx/svdhdl.hxx |4 
 include/unotools/fontcvt.hxx   |1 
 include/xmloff/xmlnume.hxx |3 
 sc/inc/colorscale.hxx  |2 
 sc/inc/compiler.hxx|4 
 sc/inc/document.hxx|2 
 sc/qa/unit/ucalc.cxx   |1 
 sc/source/core/data/colorscale.cxx |   13 -
 sc/source/core/data/documen8.cxx   |8 -
 sc/source/core/data/validat.cxx|4 
 sc/source/core/tool/interpr4.cxx   |2 
 sc/source/core/tool/odffmap.cxx|6 
 sc/source/filter/excel/xecontent.cxx   |2 
 sc/source/filter/excel/xeextlst.cxx|2 
 sc/source/filter/oox/condformatbuffer.cxx  |2 
 sc/source/filter/xml/xmlcondformat.cxx |2 
 sc/source/filter/xml/xmlexprt.cxx  |2 
 sc/source/ui/condformat/condformatdlgentry.cxx |2 
 sfx2/source/appl/childwin.cxx  |4 
 sfx2/source/control/dispatch.cxx   |8 -
 sfx2/source/dialog/basedlgs.cxx|2 
 sfx2/source/dialog/dockwin.cxx |8 -
 sfx2/source/dialog/splitwin.cxx|2 
 sfx2/source/view/viewfrm.cxx   |   26 ---
 unotools/source/misc/fontcvt.cxx   |6 
 vcl/qa/cppunit/wmf/wmfimporttest.cxx   |3 
 xmloff/source/core/xmlimp.cxx  |4 
 xmloff/source/style/xmlnume.cxx|8 -
 xmloff/source/text/XMLPropertyBackpatcher.cxx  |6 
 xmloff/source/text/XMLPropertyBackpatcher.hxx  |5 
 41 files changed, 68 insertions(+), 197 deletions(-)

New commits:
commit 5c84f40ea2e86bf85c0a59201faf1431f16aee40
Author: Noel Grandin 
Date:   Mon Oct 10 13:49:12 2016 +0200

loplugin:constantfunction

update the plugin similarly to
commit 3ee3b36ae0c064fb5c81268d8d63444309d1b970
Author: Stephan Bergmann 
Date:   Fri Oct 7 12:05:49 2016 +0200
loplugin:staticmethods: Don't be fooled by decls starting with macros

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

diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx 
b/basegfx/source/polygon/b2dpolypolygontools.cxx
index 0c50e52..8e8f4c5 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -395,11 +395,6 @@ namespace basegfx
 }
 }
 
-void correctGrowShrinkPolygonPair(SAL_UNUSED_PARAMETER B2DPolyPolygon& 
/*rOriginal*/, SAL_UNUSED_PARAMETER B2DPolyPolygon& /*rGrown*/)
-{
-//TODO!
-}
-
 B2DPolyPolygon reSegmentPolyPolygon(const B2DPolyPolygon& rCandidate, 
sal_uInt32 nSegments)
 {
 B2DPolyPolygon aRetval;
diff --git a/compilerplugins/clang/store/constantfunction.cxx 
b/compilerplugins/clang/store/constantfunction.cxx
index fd429ac..943cc7d 100644
--- a/compilerplugins/clang/store/constantfunction.cxx
+++ b/compilerplugins/clang/store/constantfunction.cxx
@@ -21,50 +21,20 @@ namespace {
 class ConstantFunction:
 public RecursiveASTVisitor, public loplugin::Plugin
 {
-StringRef getFilename(SourceLocation loc);
+StringRef getFilename(const FunctionDecl* functionDecl);
 public:
 explicit ConstantFunction(InstantiationData const & data): Plugin(data) {}
 
 void run() override
 {
 // these files crash clang-3.5 somewhere in the 
isEvaluatable/EvaluateAsXXX stuff
-FileID mainFileID = compiler.getSourceManager().getMainFileID();
-if 
(strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(),
 "sc/source/core/data") != 0) {

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

2016-10-10 Thread Noel Grandin

 xmloff/inc/SchXMLExport.hxx  |1 -
 xmloff/source/chart/SchXMLExport.cxx |5 -
 xmloff/source/draw/ximp3dobject.cxx  |   34 --
 xmloff/source/draw/ximp3dobject.hxx  |5 -
 xmloff/source/draw/ximpstyl.cxx  |6 --
 xmloff/source/draw/ximpstyl.hxx  |1 -
 6 files changed, 52 deletions(-)

New commits:
commit fe82f6fc5cbd638972571a33f04e95971507bba9
Author: Noel Grandin 
Date:   Mon Oct 10 15:46:52 2016 +0200

loplugin:unnnecessaryoverride in xmloff

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

diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index beb0d87..c06ad7f 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -44,7 +44,6 @@ private:
 protected:
 virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = 
::xmloff::token::XML_TOKEN_INVALID ) override;
 
-virtual void ExportStyles_( bool bUsed ) override;
 virtual void ExportAutoStyles_() override;
 virtual void ExportMasterStyles_() override;
 virtual void ExportContent_() override;
diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 5548b67..843ae9c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3549,11 +3549,6 @@ sal_uInt32 SchXMLExport::exportDoc( enum 
::xmloff::token::XMLTokenEnum eClass )
 return SvXMLExport::exportDoc( eClass );
 }
 
-void SchXMLExport::ExportStyles_( bool bUsed )
-{
-SvXMLExport::ExportStyles_( bUsed );
-}
-
 void SchXMLExport::ExportMasterStyles_()
 {
 // not available in chart
diff --git a/xmloff/source/draw/ximp3dobject.cxx 
b/xmloff/source/draw/ximp3dobject.cxx
index 2229a56..02205c6 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -185,13 +185,6 @@ void SdXML3DCubeObjectShapeContext::StartElement(const 
uno::Reference< xml::sax:
 }
 }
 
-void SdXML3DCubeObjectShapeContext::EndElement()
-{
-// call parent
-SdXML3DObjectContext::EndElement();
-}
-
-
 SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
 SvXMLImport& rImport,
 sal_uInt16 nPrfx,
@@ -279,13 +272,6 @@ void SdXML3DSphereObjectShapeContext::StartElement(const 
uno::Reference< xml::sa
 }
 }
 
-void SdXML3DSphereObjectShapeContext::EndElement()
-{
-// call parent
-SdXML3DObjectContext::EndElement();
-}
-
-
 SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext(
 SvXMLImport& rImport,
 sal_uInt16 nPrfx,
@@ -362,12 +348,6 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const 
uno::Reference< xml::sa
 }
 }
 
-void SdXML3DPolygonBasedShapeContext::EndElement()
-{
-// call parent
-SdXML3DObjectContext::EndElement();
-}
-
 
 SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext(
 SvXMLImport& rImport,
@@ -395,13 +375,6 @@ void SdXML3DLatheObjectShapeContext::StartElement(const 
uno::Reference< xml::sax
 }
 }
 
-void SdXML3DLatheObjectShapeContext::EndElement()
-{
-// call parent
-SdXML3DPolygonBasedShapeContext::EndElement();
-}
-
-
 SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext(
 SvXMLImport& rImport,
 sal_uInt16 nPrfx,
@@ -427,12 +400,5 @@ void SdXML3DExtrudeObjectShapeContext::StartElement(const 
uno::Reference< xml::s
 }
 }
 
-void SdXML3DExtrudeObjectShapeContext::EndElement()
-{
-// call parent
-SdXML3DPolygonBasedShapeContext::EndElement();
-}
-
-// EOF
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximp3dobject.hxx 
b/xmloff/source/draw/ximp3dobject.hxx
index 6527aa3..d60a253 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -69,7 +69,6 @@ public:
 virtual ~SdXML3DCubeObjectShapeContext() override;
 
 virtual void StartElement(const css::uno::Reference< 
css::xml::sax::XAttributeList>& xAttrList) override;
-virtual void EndElement() override;
 };
 
 // dr3d:3dsphere context
@@ -90,7 +89,6 @@ public:
 virtual ~SdXML3DSphereObjectShapeContext() override;
 
 virtual void StartElement(const css::uno::Reference< 
css::xml::sax::XAttributeList>& xAttrList) override;
-virtual void EndElement() override;
 };
 
 // polygonbased context
@@ -109,7 +107,6 @@ public:
 virtual ~SdXML3DPolygonBasedShapeContext() override;
 
 virtual void StartElement(const css::uno::Reference< 
css::xml::sax::XAttributeList>& xAttrList) override;
-virtual void EndElement() override;
 };
 
 // dr3d:3dlathe context
@@ -125,7 +122,6 @@ public:
 virtual ~SdXML3DLatheObjectShapeContext() override;
 
 virtual void StartElement(const css::uno::Reference< 
css::xml::sax::XAttributeList>& xAttrList) override;
-virtual void EndElement() override;
 };
 
 // dr3d:3dextrude context
@@ -141,7 +137,6 @@ pu

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

2016-10-10 Thread Noel Grandin

 include/svtools/editbrowsebox.hxx  |   18 -
 include/svtools/ivctrl.hxx |1 
 include/svtools/svtabbx.hxx|3 --
 include/svtools/toolbarmenu.hxx|1 
 svtools/inc/vclxaccessibleheaderbaritem.hxx|3 --
 svtools/source/brwbox/datwin.hxx   |3 --
 svtools/source/brwbox/editbrowsebox2.cxx   |   10 -
 svtools/source/contnr/ivctrl.cxx   |6 -
 svtools/source/contnr/svtabbx.cxx  |5 
 svtools/source/control/toolbarmenu.cxx |6 -
 svtools/source/control/vclxaccessibleheaderbaritem.cxx |8 ---
 svtools/source/uno/popupwindowcontroller.cxx   |1 
 12 files changed, 2 insertions(+), 63 deletions(-)

New commits:
commit 90a0e59737d680b35d7dff1a59f66e53c13f444d
Author: Noel Grandin 
Date:   Mon Oct 10 15:45:53 2016 +0200

loplugin:unnnecessaryoverride in svtools

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

diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 8103789..8f66b13 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -607,16 +607,6 @@ namespace svt
 virtual void DeactivateCell(bool bUpdate = true);
 // Children 
---
 
-/** Creates the accessible object of a data table cell.
-@param nRow
-The row index of the cell.
-@param nColumnId
-The column ID of the cell.
-@return
-The XAccessible interface of the specified cell. */
-virtual css::uno::Reference< css::accessibility::XAccessible >
-CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) override;
-
 /** @return  The count of additional controls of the control area. */
 virtual sal_Int32 GetAccessibleControlCount() const override;
 
@@ -628,14 +618,6 @@ namespace svt
 virtual css::uno::Reference< css::accessibility::XAccessible >
 CreateAccessibleControl( sal_Int32 nIndex ) override;
 
-/** Creates the accessible object of a column header.
-@param nColumnId
-The column ID of the header.
-@return
-The XAccessible interface of the specified column header. */
-virtual css::uno::Reference< css::accessibility::XAccessible >
-CreateAccessibleRowHeader( sal_Int32 _nRow ) override;
-
 /** Sets focus to current cell of the data table. */
 virtual void GrabTableFocus() override;
 
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 37f3a75..27779af 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -209,7 +209,6 @@ protected:
 virtual voidGetFocus() override;
 virtual voidLoseFocus() override;
 voidClickIcon();
-virtual voidStateChanged( StateChangedType nType ) override;
 virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
 virtual voidRequestHelp( const HelpEvent& rHEvt ) override;
 static void DrawEntryImage(
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index b779494..03580f1 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -188,9 +188,8 @@ public:
 virtual boolGoToCell( sal_Int32 _nRow, sal_uInt16 
_nColumn ) override;
 
 virtual voidSetNoSelection() override;
-using SvListView::SelectAll;
+using SvTabListBox::SelectAll;
 virtual voidSelectAll() override;
-virtual voidSelectAll( bool bSelect, bool bPaint = 
true ) override;
 virtual voidSelectRow( long _nRow, bool _bSelect = 
true, bool bExpand = true ) override;
 virtual voidSelectColumn( sal_uInt16 _nColumn, bool 
_bSelect = true ) override;
 virtual sal_Int32   GetSelectedRowCount() const override;
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index e2b47f4..840c641 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -84,7 +84,6 @@ public:
 virtual voidKeyInput( const KeyEvent& rKEvent ) override;
 virtual voidCommand( const CommandEvent& rCEvt ) override;
 virtual voidPaint( vcl::RenderContext& rRenderContext, const 
Rectangle& rRect ) override;
-virtual voidRequestHelp( const HelpEvent& rHEvt ) override;
 virtual voidGetFocus() override;
 virtual voidLoseFocus() override;
 
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx 
b/svtools/inc/vclxaccessiblehead

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

2016-10-10 Thread Giuseppe Castagno

 ucb/source/ucp/webdav-neon/DAVTypes.cxx  |   77 --
 ucb/source/ucp/webdav-neon/DAVTypes.hxx  |5 +
 ucb/source/ucp/webdav-neon/NeonSession.cxx   |  113 ++-
 ucb/source/ucp/webdav-neon/webdavcontent.cxx |  100 ---
 4 files changed, 237 insertions(+), 58 deletions(-)

New commits:
commit 16df731a30917a426df81d751a0bfd0ae5fcdd45
Author: Giuseppe Castagno 
Date:   Mon Sep 12 20:59:09 2016 +0200

tdf#102499 (5): Deal with HTTP unofficial response status codes

A reference can be found here:

(retrieved 2016-09-13).

Changes done:
Add set of 'HEAD method not available' before using fall back GET method.
Add new method in OPTIONS cache.
Add response status code if fall-back GET didn't succeeded.
Add copy-assignement operator to DAVOptions.
Fix behaviour of GET fall back when HEAD missing.

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

diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.cxx 
b/ucb/source/ucp/webdav-neon/DAVTypes.cxx
index 3e48752..1990289 100644
--- a/ucb/source/ucp/webdav-neon/DAVTypes.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVTypes.cxx
@@ -34,7 +34,6 @@ DAVOptions::DAVOptions() :
 {
 }
 
-
 DAVOptions::DAVOptions( const DAVOptions & rOther ) :
 m_isClass1( rOther.m_isClass1 ),
 m_isClass2( rOther.m_isClass2 ),
@@ -50,11 +49,25 @@ DAVOptions::DAVOptions( const DAVOptions & rOther ) :
 {
 }
 
-
 DAVOptions::~DAVOptions()
 {
 }
 
+DAVOptions & DAVOptions::operator=( const DAVOptions& rOpts )
+{
+m_isClass1 = rOpts.m_isClass1;
+m_isClass2 = rOpts.m_isClass2;
+m_isClass3 = rOpts.m_isClass3;
+m_isLocked = rOpts.m_isLocked;
+m_isHeadAllowed = rOpts.m_isHeadAllowed;
+m_aAllowedMethods = rOpts.m_aAllowedMethods;
+m_nStaleTime = rOpts.m_nStaleTime;
+m_sURL = rOpts.m_sURL;
+m_sRedirectedURL = rOpts.m_sRedirectedURL;
+m_nHttpResponseStatusCode = rOpts.m_nHttpResponseStatusCode;
+m_sHttpResponseStatusText = rOpts.m_sHttpResponseStatusText;
+return *this;
+}
 
 bool DAVOptions::operator==( const DAVOptions& rOpts ) const
 {
@@ -79,12 +92,10 @@ DAVOptionsCache::DAVOptionsCache()
 {
 }
 
-
 DAVOptionsCache::~DAVOptionsCache()
 {
 }
 
-
 bool DAVOptionsCache::getDAVOptions( const OUString & rURL, DAVOptions & 
rDAVOptions )
 {
 osl::MutexGuard aGuard( m_aMutex );
@@ -113,7 +124,6 @@ bool DAVOptionsCache::getDAVOptions( const OUString & rURL, 
DAVOptions & rDAVOpt
 }
 }
 
-
 void DAVOptionsCache::removeDAVOptions( const OUString & rURL )
 {
 osl::MutexGuard aGuard( m_aMutex );
@@ -128,7 +138,6 @@ void DAVOptionsCache::removeDAVOptions( const OUString & 
rURL )
 }
 }
 
-
 void DAVOptionsCache::addDAVOptions( DAVOptions & rDAVOptions, const 
sal_uInt32 nLifeTime )
 {
 osl::MutexGuard aGuard( m_aMutex );
@@ -149,6 +158,39 @@ void DAVOptionsCache::addDAVOptions( DAVOptions & 
rDAVOptions, const sal_uInt32
 m_aTheCache[ aEncodedUrl ] = rDAVOptions;
 }
 
+void DAVOptionsCache::updateCachedOption( DAVOptions & rDAVOptions, const 
sal_uInt32 nLifeTime )
+{
+osl::MutexGuard aGuard( m_aMutex );
+OUString aURL( rDAVOptions.getURL() );
+
+OUString aEncodedUrl( ucb_impl::urihelper::encodeURI( NeonUri::unescape( 
aURL ) ) );
+normalizeURLLastChar( aEncodedUrl );
+rDAVOptions.setURL( aEncodedUrl );
+
+// unchanged, it may be used to access a server
+OUString aRedirURL( rDAVOptions.getRedirectedURL() );
+rDAVOptions.setRedirectedURL( aRedirURL );
+
+// check if already cached
+DAVOptionsMap::iterator it;
+it = m_aTheCache.find( aEncodedUrl );
+if ( it != m_aTheCache.end() )
+{
+DAVOptions &opts = (*it).second;
+// exists, set new staletime, only if remaining time is higher
+TimeValue t1;
+osl_getSystemTime( &t1 );
+
+if ( ( opts.getStaleTime() - t1.Seconds ) > nLifeTime )
+{
+opts.setStaleTime( t1.Seconds + nLifeTime );
+}
+// update relevant fields
+opts.setHttpResponseStatusCode( 
rDAVOptions.getHttpResponseStatusCode() );
+opts.setHttpResponseStatusText( 
rDAVOptions.getHttpResponseStatusText() );
+}
+}
+
 sal_uInt16 DAVOptionsCache::getHttpResponseStatusCode( const OUString & rURL, 
OUString & rHttpResponseStatusText )
 {
 osl::MutexGuard aGuard( m_aMutex );
@@ -174,6 +216,29 @@ sal_uInt16 DAVOptionsCache::getHttpResponseStatusCode( 
const OUString & rURL, OU
 return 0;
 }
 
+void DAVOptionsCache::setHeadAllowed( const OUString & rURL, const bool 
HeadAllowed )
+{
+osl::MutexGuard aGuard( m_aMutex );
+OUString aEncodedUrl( ucb_impl::urihelper::encodeURI( NeonUri::unescape( 
rURL ) ) );
+normalizeURLLastChar( aEncodedUrl );
+
+DAVOptionsMap::iterator it;
+it = m_aTheCache.find( aEnc

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

2016-10-10 Thread Norbert Thiebaud

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

New commits:
commit 91d406f5afb6e08f418d14761beb4a5af5783275
Author: Norbert Thiebaud 
Date:   Mon Oct 10 23:11:55 2016 -0500

check-elf whitelist libxml2 not libxml

Change-Id: If0179726861c867f9c25c13f9eb0b61faaee9524

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index fa46cb7..7d444ee 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -62,7 +62,7 @@ programfiles=$(basename -a $(echo ${files} | grep -o 
'/program/[^/]* '))
 
 # whitelists should contain only system libraries that have a good reputation
 # of maintaining ABI stability
-globalwhitelist="ld-linux-x86-64.so.2 libc.so.6 libm.so.6 libdl.so.2 
libpthread.so.0 librt.so.1 libutil.so.1 libnsl.so.1 libcrypt.so.1 libgcc_s.so.1 
libstdc++.so.6 libz.so.1 libfontconfig.so.1 libfreetype.so.6 libxml.so.2 
libxslt.so.1 libexslt.so.0"
+globalwhitelist="ld-linux-x86-64.so.2 libc.so.6 libm.so.6 libdl.so.2 
libpthread.so.0 librt.so.1 libutil.so.1 libnsl.so.1 libcrypt.so.1 libgcc_s.so.1 
libstdc++.so.6 libz.so.1 libfontconfig.so.1 libfreetype.so.6 libxml2.so.2 
libxslt.so.1 libexslt.so.0"
 x11whitelist="libX11.so.6 libXext.so.6 libSM.so.6 libICE.so.6 libXinerama.so.1 
libXrender.so.1 libXrandr.so.2 libcairo.so.2"
 openglwhitelist="libGL.so.1"
 giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 
libdbus-glib-1.so.2 libdbus-1.so.3"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-10 Thread Norbert Thiebaud

 bin/check-elf-dynamic-objects |   75 +++---
 1 file changed, 70 insertions(+), 5 deletions(-)

New commits:
commit 4189551d56b4c6f37e8aebb856411794ea98e44f
Author: Norbert Thiebaud 
Date:   Mon Oct 10 22:21:14 2016 -0500

Support parallelism for check-elf-dynamic-objects

using that and restricting the tests to the content of
instdir/program bring the runtime on out slave builder from
4 minutes+ to just above one second

added -d  to override INSTDIR
added -p to indicate parallelism (no limit for now, so be cautious
with the -d you point too

Change-Id: I14c140f54bea329b82960843a6db44bfaf6c7108

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index b34af3e..fa46cb7 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -12,7 +12,51 @@
 
 set -euo pipefail
 
-files=$(find "${INSTDIR}" -type f)
+PARA=1
+check_path="${INSTDIR:-.}/program"
+
+while [ "${1:-}" != "" ]; do
+parm=${1%%=*}
+arg=${1#*=}
+has_arg=
+if [ "${1}" != "${parm?}" ] ; then
+has_arg=1
+else
+arg=""
+fi
+
+case "${parm}" in
+--dir|-d)
+   if [ "$has_arg" ] ; then
+   check_path=$arg
+   else
+   shift
+   check_path=$1
+   fi
+;;
+-p)
+   # this sound counter intuitive. but the idea
+# is to possibly support -p 
+# in the mean time 0 = nolimit and -p 1 would mean
+# the current default: serialize
+PARA=0
+;;
+-*)
+die "Invalid option $1"
+;;
+*)
+if [ "$DO_NEW" = 1 ] ; then
+REPO="$1"
+else
+die "Invalid argument $1"
+fi
+;;
+esac
+shift
+done
+
+
+files=$(find "${check_path}" -type f)
 # all RPATHs should point to ${INSTDIR}/program so that's the files they find
 programfiles=$(basename -a $(echo ${files} | grep -o '/program/[^/]* '))
 
@@ -29,10 +73,10 @@ kde4whitelist="libkio.so.5 libkfile.so.4 libkdeui.so.5 
libkdecore.so.5 libQtNetw
 avahiwhitelist="libdbus-glib-1.so.2 libdbus-1.so.3 libgobject-2.0.so.0 
libglib-2.0.so.0 libavahi-common.so.3 libavahi-client.so.3"
 kerberoswhitelist="libgssapi_krb5.so.2 libcom_err.so.2 libkrb5.so.3"
 
-status=0
+check_one_file()
+{
+local file="$1"
 
-for file in ${files}
-do
 skip=0
 whitelist="${globalwhitelist}"
 case "${file}" in
@@ -132,7 +176,28 @@ do
 esac
 fi
 fi
-done
+}
+status=0
+
+if [ "$PARA" = "1" ] ; then
+for file in ${files}
+do
+   check_one_file $file
+done
+else
+rm -f check_elf.out
+for file in ${files}
+do
+   (
+   check_one_file $file
+   )>> check_elf.out &
+done
 
+if [ -s check_elf.out ] ; then
+   cat check_elf.out
+   status=1
+fi
+rm check_elf.out
+fi
 exit ${status}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

comment about connection.py in UI testing code

2016-10-10 Thread Markus Mohrhard

Hey Stephan,

to come back to your comment from IRC earlier.

https://cgit.freedesktop.org/libreoffice/core/commit/?id=74bf4ca9f382fa12481fda18b57cdce4c0d5422b
should catch the case now that the started LibreOffice instance has already
stopped before we can connect.

Additionally I found some more information about the dbgutil assert that I
mentioned.

I managed to add some debug code and improve the order that the output for
the test is generated and found the following pattern.

tearDown: calling terminate()...
create desktop<-- added from me as debug output
terminate<-- added from me as debug output
caught DisposedException while TearDown
ok
test_select_text (start.SimpleWriterTest) ...
warn:sal.osl.pipe:23905:6:sal/osl/unx/pipe.cxx:497: recv() failed:
Connection reset by peer
warn:binaryurp:23583:9:binaryurp/source/reader.cxx:123: caught UNO
exception 'Binary URP bridge already disposed'
warn:binaryurp:23905:6:binaryurp/source/bridge.cxx:844: undisposed bridge,
potential deadlock ahead
python3: /home/moggi/devel/libo/binaryurp/source/binaryany.cxx:107: void*
binaryurp::BinaryAny::getValue(const com::sun::star::uno::TypeDescription&)
const: Assertion `type.get()->eTypeClass == typelib_TypeClass_ANY ||
type.equals(css::uno::TypeDescription(data_.pType))' failed.

So it seems I basically hit this if I the Desktop.terminate call has thrown
a DisposedException that we get the problem during the next start.
Additionally it seems that we might leak Bridge instances but I need to
debug that a bit more. Adding a SAL_DEBUG into the Bridge constructor and
destructor shows two created bridges but only one destroyed one per test.

78 matches

Mail list logo