[Bug 92755] Avoid temporary XML files in winreg configmgr backend

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=92755

Stephan Bergmann  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1
 Whiteboard||EasyHack
   ||DifficultyInteresting
   ||SkillCpp

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 92755] New: Avoid temporary XML files in winreg configmgr backend

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=92755

Bug ID: 92755
   Summary: Avoid temporary XML files in winreg configmgr backend
   Product: LibreOffice
   Version: unspecified
  Hardware: All
OS: Windows (All)
Status: UNCONFIRMED
  Severity: enhancement
  Priority: medium
 Component: framework
  Assignee: libreoffice-b...@lists.freedesktop.org
  Reporter: sberg...@redhat.com
CC: fari.libreoff...@gmail.com,
libreoffice@lists.freedesktop.org


"Windows registry configuration backend" added support to read configuration
data from the Windows registry (see
),
but does so by creating intermediary XML files.


"configmgr: support reading from a dconf layer (WIP)" (which does something
similar for Linux dconf support), can now be used as a blueprint (modulo any
bugs that new code invariably still contains) how to avoid intermediary files
and directly feed into the configmgr's internal data structures.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bin/lo-commit-stat

[Dennis Roczek]

 bin/lo-commit-stat |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 880e3af2b502ca4f5a1f34ad9d98b9a26dc091ed
Author: Dennis Roczek 
Date:   Sun Jul 12 04:35:28 2015 +0200

removing additional colons from the commit msg

Change-Id: Ie35ee8c392e3e8ebc4a42d20e76813c8d29d387b
Reviewed-on: https://gerrit.libreoffice.org/17028
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 92dd5e5..e33ca79 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -55,7 +55,7 @@ sub search_bugs()
 #print "   found $bug\n";
 # remove bug number from the comment; it will be added later a 
standardized way
 $bug_orig =~ s/\#/\\#/;
-$line =~ s/(,\s)*[Rr](elated|esolve[ds]):?\s*$bug_orig\s*//;
+$line =~ s/(,\s)*[Rr](elated|esolve[ds]):?\s*$bug_orig\s?:?\s*//;
 $line =~ s/\s*-\s*$bug_orig\s*//;
 $line =~ s/\(?$bug_orig\)?\s*[:,-]?\s*//;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source svx/source

[matteocam]

 editeng/source/editeng/impedit3.cxx |2 +-
 svx/source/svdraw/svdedxv.cxx   |   13 -
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 89c288be6f20141ad6e29374dc3c4e7084dcc348
Author: matteocam 
Date:   Tue Jul 14 20:03:31 2015 -0400

Handle UF/OF from KeyInput only

Change-Id: Icf9a248450ac6e03d6aab6c3e7d202aab7b3a171

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 82fd6cd..f564a78 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -481,7 +481,7 @@ void ImpEditEngine::FormatDoc()
 
 //FIXME(matteocam)
 
-CallChainingEventHdl(); // For chaining
+//CallChainingEventHdl(); // For chaining
 
 LeaveBlockNotifications();
 }
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 7314e41..4bbb28d 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -540,11 +540,12 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
 OutlinerView* pOLV = GetTextEditOutlinerView();
 
 TextChain *pTextChain = pTextObj->GetTextChain();
+ESelection aNewSel = pTextChain->GetPostChainingSel(pTextObj);
 
 switch ( pTextChain->GetCursorEvent(pTextObj) ) {
 
 case CursorChainingEvent::UNCHANGED:
-// Set same selection as before the chainging
+// Set same selection as before the chaining
 // We need an explicit set because the Outliner is messed up
 //after text transfer and otherwise it brings us at 
arbitrary positions.
 pOLV->SetSelection(pTextChain->GetPreChainingSel(pTextObj));
@@ -554,8 +555,7 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
 SdrBeginTextEdit(pNextLink);
 // OutlinerView has changed, so we update the pointer
 pOLV = GetTextEditOutlinerView();
-pOLV->SetSelection(pTextChain->GetPostChainingSel(pTextObj)); 
// XXX
-
+pOLV->SetSelection(aNewSel); // XXX
 break;
 case CursorChainingEvent::TO_PREV_LINK:
 // XXX: To be handled
@@ -1294,14 +1294,17 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWin)
 pMod->SetChanged( true );
 }
 
+// FIXME(matteocam)
+ImpChainingEventHdl(NULL);
+ImpMoveCursorAfterChainingEvent();
+
 if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin);
 #ifdef DBG_UTIL
 if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
 #endif
 ImpMakeTextCursorAreaVisible();
 
-// FIXME(matteocam)
-ImpMoveCursorAfterChainingEvent();
+
 
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

character format controls that do NOT turn off

[tracey002]

I submitted a bug for \ulw (underliine word).
Then I discovered the same issue for \sub (subscript) and \super 
(superscript).

*I put them under one bug number.*

*Should they be 3 separate submissions?*

Please advise.
Thanks, Tracey

No virus found in this outgoing message.
Checked by AVG - www.avg.com
Version: 9.0.935 / Virus Database: 4365.1.1/9725 - Release Date: 07/13/15 
20:02:00




--
View this message in context: 
http://nabble.documentfoundation.org/character-format-controls-that-do-NOT-turn-off-tp4154489.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[GSoC] Haskell UNO Language Binding - Weekly Report 7

[Jorge Mendes]

Hi,

The past week I've been working on generating more UNO entity types,
and testing the result. Some tweaks were needed along the way, and
changes will be needed to make the API use more of Haskell's type
system, hoping to reduce the amount of work for the user.

For this week, most of the code generation should be done. Note that I
haven't pushed any commit recently since the generated code is
"broken" (read: not yet in a state where the basics work without
problems). Something should come along in the next few days.

Kind regards,
Jorge
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/textchainflow.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 3f5c5eb2942f8aa7e31401a302899cc492f17519
Author: matteocam 
Date:   Tue Jul 14 18:52:03 2015 -0400

Update postChainging position properly for both UF/OF

Change-Id: I1607338bcc0fd5938e383ec2f3df451c9f8d91a8

diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index a6b8b1d..607a2d6 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -127,18 +127,16 @@ void TextChainFlow::impUpdateCursorInfo()
 
 mbPossiblyCursorOut = bOverflow;
 
-if (mbPossiblyCursorOut && !mbOFisUFinduced) { // if this is false, 
mpOverflChText might be NULL
-maOverflowPosSel = ESelection(mpOverflChText->GetOverflowPointSel());
-// After the chaining event the cursor is where the text from the 
source box merged with the rest
-maPostChainingSel = ESelection(mpOverflChText->GetInsertionPointSel());
-} else if(mbPossiblyCursorOut && mbOFisUFinduced) {
+if(mbPossiblyCursorOut ) {
 maOverflowPosSel = ESelection(mpOverflChText->GetOverflowPointSel());
 ESelection aSelAtUFTime = 
GetTextChain()->GetPreChainingSel(GetLinkTarget());
 // Might be an invalid selection if the cursor at UF time was before
-//   the (UF-induced) Overflowing point but we don't use it in that 
case
+//   the (possibly UF-induced) Overflowing point but we don't use it 
in that case
 maPostChainingSel = 
ESelection(aSelAtUFTime.nStartPara-maOverflowPosSel.nStartPara,

aSelAtUFTime.nStartPos-maOverflowPosSel.nStartPos );
 }
+
+// XXX: It may not be necessary anymore to keep this method separated from 
EditingTextChainFlow::impBroadcastCursorInfo
 }
 
 void TextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/textchainflow.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 4ab9ea60c4f61e552d11c05ed42c1fa5da1107cb
Author: matteocam 
Date:   Tue Jul 14 18:28:20 2015 -0400

Translate postChaining position if UF occurs

Change-Id: I74c6d0bbef6dc6cee1fc6a561f6f487e9e3ccd64

diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 20c26b6..a6b8b1d 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -118,9 +118,6 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 
 // To check whether an overflow is underflow induced or not (useful in 
cursor checking)
 mbOFisUFinduced = bUnderflow;
-
-
-
 }
 
 void TextChainFlow::impUpdateCursorInfo()
@@ -128,11 +125,19 @@ void TextChainFlow::impUpdateCursorInfo()
 // XXX: Maybe we can get rid of mbOFisUFinduced by not allowing handling 
of more than one event by the same TextChainFlow
 // if this is not an OF triggered during an UF
 
-mbPossiblyCursorOut = bOverflow /* && !mbOFisUFinduced */; // XXX: Not 
sure we need !mbOFisUFinduced
-if (mbPossiblyCursorOut) { // if this is false, mpOverflChText might be 
NULL
+mbPossiblyCursorOut = bOverflow;
+
+if (mbPossiblyCursorOut && !mbOFisUFinduced) { // if this is false, 
mpOverflChText might be NULL
 maOverflowPosSel = ESelection(mpOverflChText->GetOverflowPointSel());
 // After the chaining event the cursor is where the text from the 
source box merged with the rest
 maPostChainingSel = ESelection(mpOverflChText->GetInsertionPointSel());
+} else if(mbPossiblyCursorOut && mbOFisUFinduced) {
+maOverflowPosSel = ESelection(mpOverflChText->GetOverflowPointSel());
+ESelection aSelAtUFTime = 
GetTextChain()->GetPreChainingSel(GetLinkTarget());
+// Might be an invalid selection if the cursor at UF time was before
+//   the (UF-induced) Overflowing point but we don't use it in that 
case
+maPostChainingSel = 
ESelection(aSelAtUFTime.nStartPara-maOverflowPosSel.nStartPara,
+   
aSelAtUFTime.nStartPos-maOverflowPosSel.nStartPos );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/avmedia include/svx officecfg/registry sc/Library_sc.mk sc/sdi sc/source sd/inc sd/source svx/Library_svx.mk svx/sdi svx/source sw/inc sw/Library_sw

[Maxim Monastirsky]

 include/avmedia/mediatoolbox.hxx|4 
 include/svx/grafctrl.hxx|   17 -
 include/svx/subtoolboxcontrol.hxx   |   47 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   70 ++
 sc/Library_sc.mk|1 
 sc/sdi/scalc.sdi|4 
 sc/sdi/tabvwsh.sdi  |4 
 sc/source/ui/app/scdll.cxx  |4 
 sc/source/ui/cctrl/tbinsert.cxx |  106 
--
 sc/source/ui/inc/tabvwsh.hxx|6 
 sc/source/ui/inc/tbinsert.hxx   |   44 
 sc/source/ui/view/tabvwsh4.cxx  |   35 ---
 sd/inc/pch/precompiled_sd.hxx   |1 
 sd/source/ui/app/sddll.cxx  |3 
 svx/Library_svx.mk  |1 
 svx/sdi/svx.sdi |4 
 svx/source/tbxctrls/grafctrl.cxx|   26 --
 svx/source/tbxctrls/subtoolboxcontrol.cxx   |   55 -
 sw/Library_sw.mk|1 
 sw/inc/view.hxx |4 
 sw/sdi/_viewsh.sdi  |4 
 sw/sdi/swriter.sdi  |6 
 sw/sdi/viewsh.sdi   |1 
 sw/source/uibase/app/swmodule.cxx   |6 
 sw/source/uibase/inc/tblctrl.hxx|   39 ---
 sw/source/uibase/inc/workctrl.hxx   |   20 -
 sw/source/uibase/ribbar/tblctrl.cxx |   50 
 sw/source/uibase/ribbar/workctrl.cxx|   89 
 sw/source/uibase/uiview/view.cxx|4 
 sw/source/uibase/uiview/view2.cxx   |   24 --
 sw/source/uibase/uiview/viewstat.cxx|   30 --
 31 files changed, 80 insertions(+), 630 deletions(-)

New commits:
commit a3050f632517137f809d76662170726b518f043a
Author: Maxim Monastirsky 
Date:   Tue Jul 14 17:24:23 2015 +0300

Convert filters button to the generic controller

Change-Id: I6d3c76c0aafe0ad77b597a2cb8331e6f8219e2d2

diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx
index fb61d33..e0ccd86 100644
--- a/include/avmedia/mediatoolbox.hxx
+++ b/include/avmedia/mediatoolbox.hxx
@@ -27,10 +27,6 @@
 namespace avmedia
 {
 
-
-// - SvxGrafFilterToolBoxControl -
-
-
 class MediaItem;
 
 class AVMEDIA_DLLPUBLIC MediaToolBoxControl : public SfxToolBoxControl
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index c91ff3a..1adcc39 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -40,23 +40,6 @@ public:
 };
 
 
-// - SvxGrafFilterToolBoxControl -
-
-
-class SVX_DLLPUBLIC SvxGrafFilterToolBoxControl : public SfxToolBoxControl
-{
-public:
-
-SFX_DECL_TOOLBOX_CONTROL();
-
-SvxGrafFilterToolBoxControl( sal_uInt16 
nSlotId, sal_uInt16 nId, ToolBox& rTbx );
-virtual ~SvxGrafFilterToolBoxControl();
-
-virtual voidStateChanged( sal_uInt16 nSID, SfxItemState 
eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
-virtual VclPtr CreatePopupWindow() SAL_OVERRIDE;
-};
-
-
 // - SvxGrafToolBoxControl -
 
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 8d96dc6..20fc41e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -176,6 +176,20 @@
   
 
 
+  
+
+  .uno:GraphicFilterToolbox
+
+
+  
+
+
+  com.sun.star.comp.framework.SubToolBarController
+
+
+  graffilterbar
+
+  
   
 
   .uno:OptimizeTable
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 6095a1b..be95d7d 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -185,7 +185,6 @@ void ScDLL::Init()
 SvxGrafContrastToolBoxControl   ::RegisterControl(SID_ATTR_GRAF_CONTRAST,  
 pMod);
 SvxGrafGammaToolBoxControl  ::RegisterControl(SID_ATTR_GRAF_GAMMA, 
 pMod);
 
SvxGrafTransparenceToolBoxControl::RegisterControl(SID_ATTR_GRAF_TRANSPARENCE, 
pMod);
-SvxGrafFilterToolBoxControl ::RegisterControl(SID_GRFFILTER,   
 pMod);
 
 SvxVertText

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

[Michael Stahl]

 include/sfx2/app.hxx |1 
 include/sfx2/genlink.hxx |   50 ---
 include/sfx2/hintpost.hxx|   35 ++-
 sfx2/source/appl/app.cxx |1 
 sfx2/source/control/dispatch.cxx |2 -
 sfx2/source/notify/hintpost.cxx  |   22 -
 sfx2/source/toolbox/tbxitem.cxx  |1 
 7 files changed, 21 insertions(+), 91 deletions(-)

New commits:
commit dac1be92f22197c9e144ef36963547c46d12e77d
Author: Michael Stahl 
Date:   Tue Jul 14 23:01:13 2015 +0200

sfx2: remove pointless GenLink class

Change-Id: I82df7b89c598c3c7903dee865f899862902a0d86

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index cf2b132..0b986c1 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -42,7 +42,6 @@ class WorkWindow;
 class ISfxTemplateCommon;
 class BasicManager;
 class DdeService;
-class GenLink;
 class PrinterDialog;
 class Point;
 class Rectangle;
diff --git a/include/sfx2/genlink.hxx b/include/sfx2/genlink.hxx
deleted file mode 100644
index 5c738e3..000
--- a/include/sfx2/genlink.hxx
+++ /dev/null
@@ -1,50 +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_SFX2_GENLINK_HXX
-#define INCLUDED_SFX2_GENLINK_HXX
-
-
-#include 
-typedef long (*CFuncPtr)(void*);
-
-class GenLink
-{
-Link<>  aLink;
-CFuncPtrpFunc;
-
-public:
-GenLink(): pFunc(0) {}
-GenLink( CFuncPtr pCFunc ): pFunc(pCFunc) {}
-GenLink( const Link<>& rLink ): aLink(rLink), pFunc(0) {}
-GenLink( const GenLink& rOrig ):
-aLink(rOrig.aLink), pFunc(rOrig.pFunc) {}
-
-GenLink& operator = ( const GenLink& rOrig )
-{ pFunc = rOrig.pFunc; aLink = rOrig.aLink; return *this; }
-
-bool operator!() const { return !aLink && !pFunc; }
-bool IsSet() const { return aLink.IsSet() || pFunc; }
-
-long Call( void* pCaller )
- { return pFunc ? (*pFunc)(pCaller) : aLink.Call(pCaller); }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx
index f9950119..469b190 100644
--- a/include/sfx2/hintpost.hxx
+++ b/include/sfx2/hintpost.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SFX2_HINTPOST_HXX
 #define INCLUDED_SFX2_HINTPOST_HXX
 
-#include 
+#include 
 #include 
 
 
@@ -34,13 +34,13 @@ class SfxHint;
 
 The instances are held via Ref-Count until a possibly sent
 event has arrived.  If the target dies before delivery,
-the connection must be severed with SetEventHdl(GenLink()).
+the connection must be severed with SetEventHdl(Link()).
 */
 class SfxHintPoster : public SvRefBase
 {
-GenLink aLink;
-
 private:
+Link<> m_Link;
+
 DECL_LINK( DoEvent_Impl, SfxHint * );
 
 protected:
@@ -48,10 +48,10 @@ protected:
 voidEvent( SfxHint* pPostedHint );
 
 public:
-SfxHintPoster( const GenLink& rLink );
+SfxHintPoster(const Link<>& rLink);
 
 voidPost( SfxHint* pHint = 0 );
-voidSetEventHdl( const GenLink& rLink );
+voidSetEventHdl(const Link<>& rLink);
 };
 
 typedef tools::SvRef SfxHintPosterRef;
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 7be02d9..a22f36d 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -77,7 +77,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include "appdata.hxx"
 #include "openflag.hxx"
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 109d336..9f3de39 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -329,7 +329,7 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
 for (sal_uInt16 n=0; naObjBars[n].nResId = 0;
 
-GenLink aGenLink( LINK(this, SfxDispatcher, PostMsgHandler) );
+Link<> aGenLink( LINK(this, SfxDispatcher, PostMsgHandler) );
 
 xImp->xPoster = new SfxHintPoster(aGenLink);
 
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 2e86883..00e4290 100644
--- a/sfx2/so

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/textchainflow.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 07690343de9fae1484b8fc0c1f8d2e1767b8e1be
Author: matteocam 
Date:   Tue Jul 14 17:34:05 2015 -0400

Underflow can overflow cursor

Change-Id: Iff8b9f76402a358bb9d90ad712e3a6ede897a6bb

diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index fe4f9fc..20c26b6 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -128,7 +128,7 @@ void TextChainFlow::impUpdateCursorInfo()
 // XXX: Maybe we can get rid of mbOFisUFinduced by not allowing handling 
of more than one event by the same TextChainFlow
 // if this is not an OF triggered during an UF
 
-mbPossiblyCursorOut = bOverflow && !mbOFisUFinduced;
+mbPossiblyCursorOut = bOverflow /* && !mbOFisUFinduced */; // XXX: Not 
sure we need !mbOFisUFinduced
 if (mbPossiblyCursorOut) { // if this is false, mpOverflChText might be 
NULL
 maOverflowPosSel = ESelection(mpOverflChText->GetOverflowPointSel());
 // After the chaining event the cursor is where the text from the 
source box merged with the rest
@@ -206,6 +206,7 @@ void 
TextChainFlow::impLeaveOnlyNonOverflowingText(SdrOutliner *pNonOverflOutl)
 pNonOverflOutl->SetText(*pNewText);
 
 mpTargetLink->NbcSetOutlinerParaObject(pNewText);
+// For some reason the paper size is lost after last instruction, so we 
set it.
 pNonOverflOutl->SetPaperSize(Size(pNonOverflOutl->GetPaperSize().Width(),
   pNonOverflOutl->GetTextHeight()));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.3-10'

[Andras Timar]

Tag 'cp-4.3-10' created by Andras Timar  at 
2015-07-14 22:30 -0700

cp-4.3-10

Changes since cp-4.3-9-13:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.3-10'

[Andras Timar]

Tag 'cp-4.3-10' created by Andras Timar  at 
2015-07-14 22:30 -0700

cp-4.3-10

Changes since cp-4.3-8:
Andras Timar (1):
  tdf#86301 fix hids of startcenter

---
 source/text/shared/guide/startcenter.xhp |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.3-10'

[Andras Timar]

Tag 'cp-4.3-10' created by Andras Timar  at 
2015-07-14 22:30 -0700

cp-4.3-10

Changes since cp-4.3-5-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.3-10'

[Andras Timar]

Tag 'cp-4.3-10' created by Andras Timar  at 
2015-07-14 22:30 -0700

cp-4.3-10

Changes since cp-4.3-8:
Andras Timar (1):
  Updated pt_PT dictionary to version 15.7.4.1

---
 pt_PT/description.xml |2 +-
 pt_PT/pt_PT.dic   |   22 ++
 2 files changed, 19 insertions(+), 5 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 2 commits - configmgr/source configure.ac scp2/source

[Andras Timar]

 configmgr/source/components.cxx  |8 +---
 configmgr/source/winreg.cxx  |5 +++--
 configmgr/source/winreg.hxx  |4 +++-
 configure.ac |2 +-
 scp2/source/ooo/common_brand.scp |2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit b32cbfd0a398c01fadec4b610b6ba24b116b0cc5
Author: Andras Timar 
Date:   Tue Jul 14 14:28:27 2015 -0700

Bump version to 4.3-10

Change-Id: Id5c6c114a2ba1e5a55cc4edf07861ebb3177f507

diff --git a/configure.ac b/configure.ac
index e5700d8..29b7656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.3.10.9],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.3.10.10],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
commit 15511f327d36a288c229faa1b2cfb9765ed36752
Author: Michael Meeks 
Date:   Tue Jul 14 10:44:52 2015 +0100

Add HKEY_CURRENT_USER registry integration.

It seems rather odd that we dump this to a file and parse again to me.

Conflicts:
configmgr/source/components.cxx
instsetoo_native/CustomTarget_setup.mk
scp2/source/ooo/common_brand.scp

Change-Id: Ia32ba9ff3e7878d40032bd7d10fba2c143d11757

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 4e7259b..6f11331 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -544,7 +544,7 @@ Components::Components(
 parseModificationLayer(url);
 }
 #ifdef WNT
-else if ( type == "winreg" )
+else if (type == "winreg" || type == "winuserreg")
 {
 if (!url.isEmpty()) {
 SAL_WARN(
@@ -552,8 +552,10 @@ Components::Components(
 "winreg URL is not empty, URL handling is not implemented 
for winreg");
 }
 OUString aTempFileURL;
-if ( dumpWindowsRegistry(&aTempFileURL) )
-{
+WinRegType eType = WinRegType::LOCAL_MACHINE;
+if (type == "winuserreg")
+eType = WinRegType::CURRENT_USER;
+if (dumpWindowsRegistry(&aTempFileURL, eType)) {
 parseFileLeniently(&parseXcuFile, aTempFileURL, layer, data_, 
0, 0, 0);
 layer++;
 osl::File::remove(aTempFileURL);
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index a47fe25..82367ee 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -190,10 +190,11 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString aKeyName, 
oslFileHandle aFileHan
 }
 }
 
-bool dumpWindowsRegistry(OUString* pFileURL)
+bool dumpWindowsRegistry(OUString* pFileURL, WinRegType eType)
 {
 HKEY hKey;
-if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Policies\\LibreOffice", 
0, KEY_READ, &hKey) != ERROR_SUCCESS)
+HKEY hDomain = eType == LOCAL_MACHINE ? HKEY_LOCAL_MACHINE : 
HKEY_CURRENT_USER;
+if(RegOpenKeyExW(hDomain, L"SOFTWARE\\Policies\\LibreOffice", 0, KEY_READ, 
&hKey) != ERROR_SUCCESS)
 {
 SAL_INFO(
 "configmgr",
diff --git a/configmgr/source/winreg.hxx b/configmgr/source/winreg.hxx
index 0209772..fb880ac 100644
--- a/configmgr/source/winreg.hxx
+++ b/configmgr/source/winreg.hxx
@@ -13,7 +13,9 @@
 
 namespace configmgr {
 
-bool dumpWindowsRegistry(OUString* pFileURL);
+enum WinRegType { LOCAL_MACHINE, CURRENT_USER };
+
+bool dumpWindowsRegistry(OUString* pFileURL, WinRegType eType);
 
 }
 
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7f0d8c0..9a872e2 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1261,7 +1261,7 @@ ProfileItem 
gid_Brand_Profileitem_Fundamental_Configuration_Layers
 Section = "Bootstrap";
 Key = "CONFIGURATION_LAYERS";
 #if defined WNT
-Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry winreg: 
res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry 
bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) 
":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) 
":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) 
":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) 
":UserInstallation}/user/registrymodifications.xcu";
+Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry winreg: 
winuserreg: res:

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - svtools/source vcl/source

[Michael Meeks]

 svtools/source/misc/dialogcontrolling.cxx |   18 ++
 vcl/source/window/event.cxx   |6 --
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 46e1e1292ac801598e1f43657a1320c45ef8776d
Author: Michael Meeks 
Date:   Tue Jul 14 12:51:04 2015 +0100

tdf#92706 - avoid dbaccess wizard crash.

Hold a VclPtr on the window, make reset cleaner, and don't crash
removing listeners from disposed windows.

Change-Id: I3efb71117fc45562d5c740578f5e33dabb2684fe
Reviewed-on: https://gerrit.libreoffice.org/17039
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/svtools/source/misc/dialogcontrolling.cxx 
b/svtools/source/misc/dialogcontrolling.cxx
index b381c43..ca62804 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -49,13 +49,13 @@ namespace svt
 
 struct DialogController_Data
 {
-vcl::Window& rInstigator;
-::std::vector< VclPtr >aConcernedWindows;
+VclPtr  xInstigator;
+::std::vector< VclPtr > aConcernedWindows;
 PWindowEventFilter  pEventFilter;
 PWindowOperator pOperator;
 
-DialogController_Data( vcl::Window& _rInstigator, const 
PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator )
-:rInstigator( _rInstigator )
+DialogController_Data( vcl::Window& _xInstigator, const 
PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator )
+:xInstigator( &_xInstigator )
 ,pEventFilter( _pEventFilter )
 ,pOperator( _pOperator )
 {
@@ -66,14 +66,14 @@ namespace svt
 //= DialogController
 
 
-DialogController::DialogController( vcl::Window& _rInstigator, const 
PWindowEventFilter& _pEventFilter,
+DialogController::DialogController( vcl::Window& _xInstigator, const 
PWindowEventFilter& _pEventFilter,
 const PWindowOperator& _pOperator )
-:m_pImpl( new DialogController_Data( _rInstigator, _pEventFilter, 
_pOperator ) )
+:m_pImpl( new DialogController_Data( _xInstigator, _pEventFilter, 
_pOperator ) )
 {
 DBG_ASSERT( m_pImpl->pEventFilter.get() && m_pImpl->pOperator.get(),
 "DialogController::DialogController: invalid filter and/or 
operator!" );
 
-m_pImpl->rInstigator.AddEventListener( LINK( this, DialogController, 
OnWindowEvent ) );
+m_pImpl->xInstigator->AddEventListener( LINK( this, DialogController, 
OnWindowEvent ) );
 }
 
 
@@ -85,7 +85,9 @@ namespace svt
 
 void DialogController::reset()
 {
-m_pImpl->rInstigator.RemoveEventListener( LINK( this, 
DialogController, OnWindowEvent ) );
+if (m_pImpl->xInstigator)
+m_pImpl->xInstigator->RemoveEventListener( LINK( this, 
DialogController, OnWindowEvent ) );
+m_pImpl->xInstigator.clear();
 m_pImpl->aConcernedWindows.clear();
 m_pImpl->pEventFilter.reset();
 m_pImpl->pOperator.reset();
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 61c11ab..852cc0c 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -249,7 +249,8 @@ void Window::AddEventListener( const Link<>& rEventListener 
)
 
 void Window::RemoveEventListener( const Link<>& rEventListener )
 {
-mpWindowImpl->maEventListeners.removeListener( rEventListener );
+if (mpWindowImpl)
+mpWindowImpl->maEventListeners.removeListener( rEventListener );
 }
 
 void Window::AddChildEventListener( const Link<>& rEventListener )
@@ -259,7 +260,8 @@ void Window::AddChildEventListener( const Link<>& 
rEventListener )
 
 void Window::RemoveChildEventListener( const Link<>& rEventListener )
 {
-mpWindowImpl->maChildEventListeners.removeListener( rEventListener );
+if (mpWindowImpl)
+mpWindowImpl->maChildEventListeners.removeListener( rEventListener );
 }
 
 ImplSVEvent * Window::PostUserEvent( const Link<>& rLink, void* pCaller, bool 
bReferenceLink )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Caolán McNamara]

 vcl/source/filter/igif/decode.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit c4f0878e3800e981e5dec75d06983600dd37fe71
Author: Caolán McNamara 
Date:   Tue Jul 14 12:43:05 2015 +0100

use same limit in ProcessOneCode as AddToTable

Change-Id: Id0345e5d867d18bf7eb341f04086226b7fa79680
(cherry picked from commit 59197f1892777a5629bad210b9ed1071ed550570)
Reviewed-on: https://gerrit.libreoffice.org/17041
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index 2b445e9..0008f63 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -109,11 +109,9 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, 
sal_uInt8 cBufSize,
 
 bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 
nCodeFirstData )
 {
-GIFLZWTableEntry* pE;
-
 if( nTableSize < 4096 )
 {
-pE = pTable + nTableSize;
+GIFLZWTableEntry* pE = pTable + nTableSize;
 pE->pPrev = pTable + nPrevCode;
 pE->pFirst = pE->pPrev->pFirst;
 GIFLZWTableEntry *pEntry = pTable[nCodeFirstData].pFirst;
@@ -130,7 +128,6 @@ bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, 
sal_uInt16 nCodeFirst
 
 bool GIFLZWDecompressor::ProcessOneCode()
 {
-GIFLZWTableEntry*   pE;
 sal_uInt16  nCode;
 boolbRet = false;
 boolbEndOfBlock = false;
@@ -193,11 +190,11 @@ bool GIFLZWDecompressor::ProcessOneCode()
 
 nOldCode = nCode;
 
-if (nCode > 4096)
+if (nCode >= 4096)
 return false;
 
 // write character(/-sequence) of code nCode in the output buffer:
-pE = pTable + nCode;
+GIFLZWTableEntry* pE = pTable + nCode;
 do
 {
 if (pOutBufData == pOutBuf) //can't go back past start
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/filter/igif/decode.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit e70d45d67bb763373ae05a0729cba03e48a099bf
Author: Caolán McNamara 
Date:   Tue Jul 14 12:43:05 2015 +0100

use same limit in ProcessOneCode as AddToTable

Change-Id: Id0345e5d867d18bf7eb341f04086226b7fa79680
(cherry picked from commit 59197f1892777a5629bad210b9ed1071ed550570)
Reviewed-on: https://gerrit.libreoffice.org/17040
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index 24b25ac..a8e49e6 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -109,11 +109,9 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, 
sal_uInt8 cBufSize,
 
 bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 
nCodeFirstData )
 {
-GIFLZWTableEntry* pE;
-
 if( nTableSize < 4096 )
 {
-pE = pTable + nTableSize;
+GIFLZWTableEntry* pE = pTable + nTableSize;
 pE->pPrev = pTable + nPrevCode;
 pE->pFirst = pE->pPrev->pFirst;
 GIFLZWTableEntry *pEntry = pTable[nCodeFirstData].pFirst;
@@ -130,7 +128,6 @@ bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, 
sal_uInt16 nCodeFirst
 
 bool GIFLZWDecompressor::ProcessOneCode()
 {
-GIFLZWTableEntry*   pE;
 sal_uInt16  nCode;
 boolbRet = false;
 boolbEndOfBlock = false;
@@ -193,11 +190,11 @@ bool GIFLZWDecompressor::ProcessOneCode()
 
 nOldCode = nCode;
 
-if (nCode > 4096)
+if (nCode >= 4096)
 return false;
 
 // write character(/-sequence) of code nCode in the output buffer:
-pE = pTable + nCode;
+GIFLZWTableEntry* pE = pTable + nCode;
 do
 {
 if (pOutBufData == pOutBuf) //can't go back past start
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configmgr/source instsetoo_native/CustomTarget_setup.mk scp2/source

[Michael Meeks]

 configmgr/source/components.cxx|7 +--
 configmgr/source/winreg.cxx|5 +++--
 configmgr/source/winreg.hxx|4 +++-
 instsetoo_native/CustomTarget_setup.mk |2 +-
 scp2/source/ooo/common_brand.scp   |4 +++-
 5 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 097292feab4fc3c064983e1dd08ac4bebe1fe216
Author: Michael Meeks 
Date:   Tue Jul 14 10:44:52 2015 +0100

Add HKEY_CURRENT_USER registry integration.

It seems rather odd that we dump this to a file and parse again to me.

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

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 4b1eaea..9e19ef9 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -537,13 +537,16 @@ Components::Components(
 ++layer; //TODO: overflow
 #endif
 #if defined WNT
-} else if (type == "winreg") {
+} else if (type == "winreg" || type == "winuserreg") {
 if (!url.isEmpty()) {
 throw css::uno::RuntimeException(
 "CONFIGURATION_LAYERS: non-empty \"winreg\" URL");
 }
 OUString aTempFileURL;
-if (dumpWindowsRegistry(&aTempFileURL)) {
+WinRegType eType = WinRegType::LOCAL_MACHINE;
+if (type == "winuserreg")
+eType = WinRegType::CURRENT_USER;
+if (dumpWindowsRegistry(&aTempFileURL, eType)) {
 parseFileLeniently(&parseXcuFile, aTempFileURL, layer, 0, 0, 
0);
 osl::File::remove(aTempFileURL);
 }
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index a5723d7..455c711 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -188,10 +188,11 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString aKeyName, 
oslFileHandle aFileHan
 }
 }
 
-bool dumpWindowsRegistry(OUString* pFileURL)
+bool dumpWindowsRegistry(OUString* pFileURL, WinRegType eType)
 {
 HKEY hKey;
-if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Policies\\LibreOffice", 
0, KEY_READ, &hKey) != ERROR_SUCCESS)
+HKEY hDomain = eType == LOCAL_MACHINE ? HKEY_LOCAL_MACHINE : 
HKEY_CURRENT_USER;
+if(RegOpenKeyExW(hDomain, L"SOFTWARE\\Policies\\LibreOffice", 0, KEY_READ, 
&hKey) != ERROR_SUCCESS)
 {
 SAL_INFO(
 "configmgr",
diff --git a/configmgr/source/winreg.hxx b/configmgr/source/winreg.hxx
index 0209772..fb880ac 100644
--- a/configmgr/source/winreg.hxx
+++ b/configmgr/source/winreg.hxx
@@ -13,7 +13,9 @@
 
 namespace configmgr {
 
-bool dumpWindowsRegistry(OUString* pFileURL);
+enum WinRegType { LOCAL_MACHINE, CURRENT_USER };
+
+bool dumpWindowsRegistry(OUString* pFileURL, WinRegType eType);
 
 }
 
diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 44c3001..e3f645b 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -48,7 +48,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
&& echo 'BRAND_INI_DIR=$${ORIGIN}' \
&& echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
-   && echo 
'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry 
res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry  $(if 
$(ENABLE_DCONF),dconf: )$(if $(filter WNT,$(OS)),winreg: 
)bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 user:$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu'
 \
+   && echo 
'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry 
res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry  $(if 
$(ENABLE_DCONF),dconf: )$(if $(filter WNT,$(OS)),winreg: 
)bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - fpicker/source

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 6bf4d86116181b1806f84bc8cb025a3337678e02
Author: Szymon Kłos 
Date:   Tue Jul 14 20:55:52 2015 +0200

question about overwriting the file only in the save mode

Change-Id: Iabb3bc12a8efae65a1c3d221a31c2214de8f6c90

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index 6c200ae..ec34e96 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -777,11 +777,14 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
 
 if ( bExists )
 {
-OUString sMsg = ResId( STR_SVT_ALREADYEXISTOVERWRITE, 
*ResMgrHolder::getOrCreate() );
-sMsg = sMsg.replaceFirst( "$filename$", sName );
-ScopedVclPtrInstance< MessageDialog > aBox( this, sMsg, 
VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO );
-if( aBox->Execute() != RET_YES )
-return 0;
+if( m_eMode == REMOTEDLG_MODE_SAVE )
+{
+OUString sMsg = ResId( STR_SVT_ALREADYEXISTOVERWRITE, 
*ResMgrHolder::getOrCreate() );
+sMsg = sMsg.replaceFirst( "$filename$", sName );
+ScopedVclPtrInstance< MessageDialog > aBox( this, sMsg, 
VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO );
+if( aBox->Execute() != RET_YES )
+return 0;
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: bugzilla: no ASSIGNED status anymore?

[Lionel Elie Mamane]

On Tue, Jul 14, 2015 at 01:19:20PM -0500, Robinson Tryon wrote:
> On Tue, Jul 14, 2015 at 10:53 AM, Lionel Elie Mamane  wrote:
> > On Tue, Jul 14, 2015 at 05:46:23PM +0200, Lionel Elie Mamane wrote:
> >
> >> Did the ASSIGNED status for a bug disappear or am I being particularly
> >> blind today?
> >
> > It appeared, seemingly only after I changed the "assigned to" field
> > away from the default?
> 
> I don't think it was a part of the 4.4.9 upgrade
> (https://www.bugzilla.org/releases/4.4.9/release-notes.html); it's
> possible that some of our recent changes to who can edit Bugzilla
> fields has slightly tweaked the field interactions. Is there an
> instance in which we'd like to use ASSIGNED with the default
> assigned-to account/email?

No, but:

1) I was surprised, I just didn't have the choice, it is only when I
   went back to the same bug *after* saving the assigned-to change
   that ASSIGNED appeared.

2) I consider putting myself as assigned-to and status "ASSIGNED" as
   one atomic operation, now I have to do two; first change
   assigned-to, save that, then change status to ASSIGNED.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: bugzilla: no ASSIGNED status anymore?

[Robinson Tryon]

On Tue, Jul 14, 2015 at 10:53 AM, Lionel Elie Mamane  wrote:
> On Tue, Jul 14, 2015 at 05:46:23PM +0200, Lionel Elie Mamane wrote:
>
>> Did the ASSIGNED status for a bug disappear or am I being particularly
>> blind today?
>
> It appeared, seemingly only after I changed the "assigned to" field
> away from the default?

I don't think it was a part of the 4.4.9 upgrade
(https://www.bugzilla.org/releases/4.4.9/release-notes.html); it's
possible that some of our recent changes to who can edit Bugzilla
fields has slightly tweaked the field interactions. Is there an
instance in which we'd like to use ASSIGNED with the default
assigned-to account/email?

Quick Reminder for everyone else: If you're unable to edit the
Priority/Severity/Assigned-To fields, ping one of the Bugzilla admins*
and we'll add you to the 'contributors' group.

Best,
--R

* https://wiki.documentfoundation.org/QA/Bugzilla/Administration#Administrators

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
802-379-9482 | IRC: colonelqubit on Freenode
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svtools/source

[Michael Meeks]

 svtools/source/uno/genericunodialog.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0fb49c071f8f6b1569a8cf20f7fc598b098b1eb5
Author: Michael Meeks 
Date:   Tue Jul 14 19:34:39 2015 +0200

tdf#91715: lock SolarMutex from dbaui::~ODatabaseAdministrationDialog()

Change-Id: I91b78ec3a19b6f09ae6e9ff723ebda41d656f2fc
(cherry picked from commit 0a7375e372ee9583d31d44a7cc7b6a21e6197bf1)
Signed-off-by: Michael Stahl 

diff --git a/svtools/source/uno/genericunodialog.cxx 
b/svtools/source/uno/genericunodialog.cxx
index 4b7f82f..6cabb2b1 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -313,6 +313,7 @@ void SAL_CALL OGenericUnoDialog::initialize( const 
Sequence< Any >& aArguments )
 
 void OGenericUnoDialog::destroyDialog()
 {
+SolarMutexGuard aSolarGuard;
 m_pDialog.disposeAndClear();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 svtools/source/uno/genericunodialog.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0a7375e372ee9583d31d44a7cc7b6a21e6197bf1
Author: Michael Meeks 
Date:   Tue Jul 14 19:34:39 2015 +0200

tdf#91715: lock SolarMutex from dbaui::~ODatabaseAdministrationDialog()

Change-Id: I91b78ec3a19b6f09ae6e9ff723ebda41d656f2fc

diff --git a/svtools/source/uno/genericunodialog.cxx 
b/svtools/source/uno/genericunodialog.cxx
index 7f47b57a..64e9656 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -313,6 +313,7 @@ void SAL_CALL OGenericUnoDialog::initialize( const 
Sequence< Any >& aArguments )
 
 void OGenericUnoDialog::destroyDialog()
 {
+SolarMutexGuard aSolarGuard;
 m_pDialog.disposeAndClear();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - vcl/generic

[Tor Lillqvist]

 vcl/generic/glyphs/gcach_ftyp.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit c4cbfb6352339b88977e5f17c5eb948eb600b7bc
Author: Tor Lillqvist 
Date:   Mon Mar 2 09:29:48 2015 +0200

WaE: comparison of integers of different signs

Change-Id: Ie3c7fd8b72cd3cd3f9943c026ca348d9ed3c31f0
(cherry picked from commit bc4a2d7ce9d4417f9d6cd58505d4ea3e959b1354)
Signed-off-by: Michael Stahl 

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index dab5479..8481bba 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1214,7 +1214,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, 
RawBitmap& rRawBitmap )
 unsigned int x;
 for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
 {
-for( x = 0; x < rBitmapFT.width; ++x )
+for( x = 0; x < static_cast(rBitmapFT.width); ++x )
 *(pDest++) = *(pSrc++);
 for(; x < rRawBitmap.mnScanlineSize; ++x )
 *(pDest++) = 0;
@@ -1226,7 +1226,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, 
RawBitmap& rRawBitmap )
 for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
 {
 unsigned char nSrc = 0;
-for( x = 0; x < rBitmapFT.width; ++x, nSrc+=nSrc )
+for( x = 0; x < static_cast(rBitmapFT.width); ++x, 
nSrc+=nSrc )
 {
 if( (x & 7) == 0 )
 nSrc = *(pSrc++);
commit 3725977b0dd5b1d04eebc9b8c62c0daa4e9d1e87
Author: Noel Grandin 
Date:   Mon Mar 2 08:06:45 2015 +0200

-Werror,-Wsign-compare

Change-Id: I18e4249d574f0d48e2c2027a89a37125d09e6702
(cherry picked from commit 08a9452b677bc68f56fbac3638cfaeff9f90b1eb)
Signed-off-by: Michael Stahl 

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 2db0f0d..dab5479 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1211,17 +1211,19 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, 
RawBitmap& rRawBitmap )
 unsigned char* pDest = rRawBitmap.mpBits.get();
 if( !bEmbedded )
 {
-for( int y = rRawBitmap.mnHeight, x; --y >= 0 ; )
+unsigned int x;
+for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
 {
 for( x = 0; x < rBitmapFT.width; ++x )
 *(pDest++) = *(pSrc++);
-for(; x < int(rRawBitmap.mnScanlineSize); ++x )
+for(; x < rRawBitmap.mnScanlineSize; ++x )
 *(pDest++) = 0;
 }
 }
 else
 {
-for( int y = rRawBitmap.mnHeight, x; --y >= 0 ; )
+unsigned int x;
+for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
 {
 unsigned char nSrc = 0;
 for( x = 0; x < rBitmapFT.width; ++x, nSrc+=nSrc )
@@ -1230,7 +1232,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, 
RawBitmap& rRawBitmap )
 nSrc = *(pSrc++);
 *(pDest++) = (0x7F - nSrc) >> 8;
 }
-for(; x < int(rRawBitmap.mnScanlineSize); ++x )
+for(; x < rRawBitmap.mnScanlineSize; ++x )
 *(pDest++) = 0;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: 2 commits - src/lib

[David Tardon]

 src/lib/VSDParser.cpp  |   15 +++
 src/lib/VSDParser.h|2 +-
 src/lib/VSDXParser.cpp |   16 +++-
 src/lib/VSDXParser.h   |2 +-
 4 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit 072a9025d0267c4faff12f28c3b0c63c383516fe
Author: David Tardon 
Date:   Tue Jul 14 18:39:41 2015 +0200

ignore errors when parsing metadata

Change-Id: Ia2f5e1882764899cc1dade967acbf474c7b80a3f

diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index e889fff..23fc541 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -256,15 +256,13 @@ bool 
libvisio::VSDXParser::parseTheme(librevenge::RVNGInputStream *input, const
   return true;
 }
 
-bool libvisio::VSDXParser::parseMetaData(librevenge::RVNGInputStream *input, 
libvisio::VSDXRelationships &rels)
+void libvisio::VSDXParser::parseMetaData(librevenge::RVNGInputStream *input, 
libvisio::VSDXRelationships &rels) try
 {
   if (!input)
-return false;
+return;
   input->seek(0, librevenge::RVNG_SEEK_SET);
   if (!input->isStructured())
-return false;
-
-  bool result = false;
+return;
 
   VSDXMetaData metaData;
   const libvisio::VSDXRelationship *coreProp = 
rels.getRelationshipByType("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";);
@@ -273,7 +271,6 @@ bool 
libvisio::VSDXParser::parseMetaData(librevenge::RVNGInputStream *input, lib
 const RVNGInputStreamPtr_t 
stream(input->getSubStreamByName(coreProp->getTarget().c_str()));
 if (stream)
 {
-  result = true;
   metaData.parse(stream.get());
 }
   }
@@ -284,13 +281,14 @@ bool 
libvisio::VSDXParser::parseMetaData(librevenge::RVNGInputStream *input, lib
 const RVNGInputStreamPtr_t 
stream(input->getSubStreamByName(extendedProp->getTarget().c_str()));
 if (stream)
 {
-  result = true;
   metaData.parse(stream.get());
 }
   }
   m_collector->collectMetaData(metaData.getMetaData());
-
-  return result;
+}
+catch (...)
+{
+  // Ignore any exceptions in metadata. They are not important enough to stop 
parsing.
 }
 
 void libvisio::VSDXParser::processXmlDocument(librevenge::RVNGInputStream 
*input, VSDXRelationships &rels)
diff --git a/src/lib/VSDXParser.h b/src/lib/VSDXParser.h
index 069204c..9eef41e 100644
--- a/src/lib/VSDXParser.h
+++ b/src/lib/VSDXParser.h
@@ -54,7 +54,7 @@ private:
   bool parsePages(librevenge::RVNGInputStream *input, const char *name);
   bool parsePage(librevenge::RVNGInputStream *input, const char *name);
   bool parseTheme(librevenge::RVNGInputStream *input, const char *name);
-  bool parseMetaData(librevenge::RVNGInputStream *input, VSDXRelationships 
&rels);
+  void parseMetaData(librevenge::RVNGInputStream *input, VSDXRelationships 
&rels);
   void processXmlDocument(librevenge::RVNGInputStream *input, 
VSDXRelationships &rels);
   void processXmlNode(xmlTextReaderPtr reader);
 
commit c2eb5794e865efa74fbf1c6be8ed9fadae137d85
Author: David Tardon 
Date:   Tue Jul 14 18:39:28 2015 +0200

ignore errors when parsing metadata

Change-Id: I5780e7c95655766eb821045de70ed426eaa35be0

diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 5da88c7..9e75485 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -147,20 +147,18 @@ bool libvisio::VSDParser::parseMain()
   return true;
 }
 
-bool libvisio::VSDParser::parseMetaData()
+void libvisio::VSDParser::parseMetaData() try
 {
   if (!m_container)
-return false;
+return;
   m_container->seek(0, librevenge::RVNG_SEEK_SET);
   if (!m_container->isStructured())
-return false;
-  bool result = false;
+return;
   VSDMetaData metaData;
 
   librevenge::RVNGInputStream *sumaryInfo = 
m_container->getSubStreamByName("\x05SummaryInformation");
   if (sumaryInfo)
   {
-result = true;
 metaData.parse(sumaryInfo);
 delete sumaryInfo;
   }
@@ -168,7 +166,6 @@ bool libvisio::VSDParser::parseMetaData()
   librevenge::RVNGInputStream *docSumaryInfo = 
m_container->getSubStreamByName("\005DocumentSummaryInformation");
   if (docSumaryInfo)
   {
-result = true;
 metaData.parse(docSumaryInfo);
 delete docSumaryInfo;
   }
@@ -176,8 +173,10 @@ bool libvisio::VSDParser::parseMetaData()
   m_container->seek(0, librevenge::RVNG_SEEK_SET);
   metaData.parseTimes(m_container);
   m_collector->collectMetaData(metaData.getMetaData());
-
-  return result;
+}
+catch (...)
+{
+  // Ignore any exceptions in metadata. They are not important enough to stop 
parsing.
 }
 
 bool libvisio::VSDParser::parseDocument(librevenge::RVNGInputStream *input, 
unsigned shift)
diff --git a/src/lib/VSDParser.h b/src/lib/VSDParser.h
index 2df8547..b42c57d 100644
--- a/src/lib/VSDParser.h
+++ b/src/lib/VSDParser.h
@@ -114,7 +114,7 @@ protected:
   // parser of one pass
   bool parseDocument(librevenge::RVNGInputStream *input, unsigned shift);
 
-  bool parseMetaData();
+  void parseMetaData();
 
   // Stream handlers
   void handleStreams(librevenge::

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

[Mihai Varga]

 loolwsd/LOOLSession.cpp |6 +++---
 loolwsd/LOOLWSD.cpp |8 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 0d80d63cb415e0bbc9de6e405f90923eae4df937
Author: Mihai Varga 
Date:   Tue Jul 14 19:46:29 2015 +0300

loolwsd: don't cancel special tile requests that have an ID

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 631e2b3..61fe7a6 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -235,7 +235,9 @@ public:
 // "tile" messages from the queue.
 if (tokens.count() == 1 && tokens[0] == 
"canceltiles")
 {
-queue.remove_if([](std::string& x){ return 
x.find("tile ") == 0;});
+queue.remove_if([](std::string& x) {
+return (x.find("tile ") == 0 && 
x.find("id=") == std::string::npos);
+});
 
 // Also forward the "canceltiles" to the child 
process, if any
 session->handleInput(buffer, n);
@@ -870,7 +872,9 @@ void LOOLWSD::componentMain()
 // "tile" messages from the queue.
 if (tokens.count() == 1 && tokens[0] == "canceltiles")
 {
-queue.remove_if([](std::string& x){ return x.find("tile ") 
== 0;});
+queue.remove_if([](std::string& x) {
+return (x.find("tile ") == 0 && x.find("id=") == 
std::string::npos);
+});
 }
 else
 {
commit 97191d985b6b9a38227fef4d162b26c61800dbc5
Author: Mihai Varga 
Date:   Tue Jul 14 19:46:04 2015 +0300

loolwsd: allow an extra paramater to the tile command (ID)

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 0fdf4d8..0e73bf6 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -171,7 +171,7 @@ bool MasterProcessSession::handleInput(const char *buffer, 
int length)
 if (tokens[0] == "tile:")
 {
 int part, width, height, tilePosX, tilePosY, tileWidth, 
tileHeight;
-if (tokens.count() != 8 ||
+if (tokens.count() < 8 ||
 !getTokenInteger(tokens[1], "part", part) ||
 !getTokenInteger(tokens[2], "width", width) ||
 !getTokenInteger(tokens[3], "height", height) ||
@@ -409,7 +409,7 @@ void MasterProcessSession::sendTile(const char *buffer, int 
length, StringTokeni
 {
 int part, width, height, tilePosX, tilePosY, tileWidth, tileHeight;
 
-if (tokens.count() != 8 ||
+if (tokens.count() < 8 ||
 !getTokenInteger(tokens[1], "part", part) ||
 !getTokenInteger(tokens[2], "width", width) ||
 !getTokenInteger(tokens[3], "height", height) ||
@@ -780,7 +780,7 @@ void ChildProcessSession::sendTile(const char *buffer, int 
length, StringTokeniz
 {
 int part, width, height, tilePosX, tilePosY, tileWidth, tileHeight;
 
-if (tokens.count() != 8 ||
+if (tokens.count() < 8 ||
 !getTokenInteger(tokens[1], "part", part) ||
 !getTokenInteger(tokens[2], "width", width) ||
 !getTokenInteger(tokens[3], "height", height) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mihai Varga]

 loleaflet/debug/document/document_simple_example.html   |2 
 loleaflet/dist/leaflet.css  |   30 ++-
 loleaflet/src/control/Control.Parts.js  |   65 +---
 loleaflet/src/control/Parts.js  |   21 +
 loleaflet/src/layer/tile/TileLayer.js   |   19 +++-
 loleaflet/src/scrollbar/jquery.mCustomScrollbar.css |4 
 loleaflet/src/scrollbar/jquery.mCustomScrollbar.min.css |2 
 7 files changed, 125 insertions(+), 18 deletions(-)

New commits:
commit e593ca02845bb8129ebd4884c9cf5d58c1df9de5
Author: Mihai Varga 
Date:   Tue Jul 14 19:24:04 2015 +0300

loleaflet: removed scroll inertia and fixed some tabs

diff --git a/loleaflet/src/control/Control.Parts.js 
b/loleaflet/src/control/Control.Parts.js
index 9d2e30b..8118efd 100644
--- a/loleaflet/src/control/Control.Parts.js
+++ b/loleaflet/src/control/Control.Parts.js
@@ -13,13 +13,13 @@ L.Control.Parts = L.Control.extend({
 
onAdd: function (map) {
var partName = 'leaflet-control-part',
-   container = L.DomUtil.create('div', partName + ' 
leaflet-bar'),
-   options = this.options;
+   container = L.DomUtil.create('div', partName + ' 
leaflet-bar'),
+   options = this.options;
 
this._prevPartButton  = 
this._createButton(options.prevPartText, options.prevPartTitle,
-   partName + '-prev',  container, this._prevPart);
+   partName + '-prev',  container, this._prevPart);
this._nextPartButton = this._createButton(options.nextPartText, 
options.nextPartTitle,
-   partName + '-next', container, this._nextPart);
+   partName + '-next', container, this._nextPart);
this._previewInitialized = false;
this._previewTiles = {};
 
@@ -43,10 +43,10 @@ L.Control.Parts = L.Control.extend({
link.title = title;
 
L.DomEvent
-   .on(link, 'mousedown dblclick', L.DomEvent.stopPropagation)
-   .on(link, 'click', L.DomEvent.stop)
-   .on(link, 'click', fn, this)
-   .on(link, 'click', this._refocusOnMap, this);
+   .on(link, 'mousedown dblclick', 
L.DomEvent.stopPropagation)
+   .on(link, 'click', L.DomEvent.stop)
+   .on(link, 'click', fn, this)
+   .on(link, 'click', this._refocusOnMap, this);
 
return link;
},
@@ -98,9 +98,10 @@ L.Control.Parts = L.Control.extend({
// probably a bug from the scrollbar
this._previewTiles[id].onload = function () {
$('#parts-preview').mCustomScrollbar({
-axis: 'y',
-theme: 'dark-thick',
-alwaysShowScrollbar: 1});
+   axis: 'y',
+   theme: 'dark-thick',
+   scrollInertia: 0,
+   alwaysShowScrollbar: 1});
}
 
this._previewTiles[id].src = e.tile;
commit 8bcdf523e75a4b8f3278004dee250d1add4a9fd6
Author: Mihai Varga 
Date:   Tue Jul 14 19:19:37 2015 +0300

loleaflet: reduce the margin of the scrollbar

diff --git a/loleaflet/src/scrollbar/jquery.mCustomScrollbar.css 
b/loleaflet/src/scrollbar/jquery.mCustomScrollbar.css
index ca92d1e..24b73be 100644
--- a/loleaflet/src/scrollbar/jquery.mCustomScrollbar.css
+++ b/loleaflet/src/scrollbar/jquery.mCustomScrollbar.css
@@ -51,7 +51,7 @@ y-axis
 

 */
 
-   .mCSB_inside > .mCSB_container{ margin-right: 30px; }
+   .mCSB_inside > .mCSB_container{ margin-right: 15px; }
 
.mCSB_container.mCS_no_scrollbar_y.mCS_y_hidden{ margin-right: 0; } /* 
non-visible scrollbar */

@@ -230,7 +230,7 @@ yx-axis
left: 0;
right: 0;
bottom: 0;
-   margin-right: 30px;
+   margin-right: 15px;
margin-bottom: 30px;
}

diff --git a/loleaflet/src/scrollbar/jquery.mCustomScrollbar.min.css 
b/loleaflet/src/scrollbar/jquery.mCustomScrollbar.min.css
index 73d4bbd..afa3308 100644
--- a/loleaflet/src/scrollbar/jquery.mCustomScrollbar.min.css
+++ b/loleaflet/src/scrollbar/jquery.mCustomScrollbar.min.css
@@ -1 +1 @@
-.mCustomScrollbar{-ms-touch-action:none;touch-action:none}.mCustomScrollbar.mCS_no_scrollbar{-ms-touch-action:auto;touch-action:auto}.mCustomScrollBox{position:relative;overflow:hidden;height:100%;max-width:100%;outline:0;direction:ltr}.mCSB_container{overflow:hidden;width:auto;height:auto}.mCSB_inside>.mCSB_container{margin-right:30px}.mCSB_container.mCS_no_scrollbar_y.mCS_y_hidden{mar

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - nss/makefile.mk nss/nss_freebsd.patch rat-excludes

[Pedro Giffuni]

 nss/makefile.mk   |4 
 nss/nss_freebsd.patch |   14 ++
 rat-excludes  |2 ++
 3 files changed, 20 insertions(+)

New commits:
commit 6a731e4f0ea7516cea0a72c513adaed599bc6e30
Author: Pedro Giffuni 
Date:   Tue Jul 14 15:37:48 2015 +

Fix nss build on the FreeBSD buildbot.

Submitted by:   Don Lewis

diff --git a/nss/makefile.mk b/nss/makefile.mk
index 60275aa..c14dc47 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -50,6 +50,10 @@ MACOS_SDK_DIR=$(SDK_PATH)
 PATCH_FILES+=nss_macosx.patch
 .ENDIF # "$(OS)"=="MACOSX"
 
+.IF "$(OS)"=="FREEBSD"
+PATCH_FILES+=nss_freebsd.patch
+.ENDIF
+
 .IF "$(debug)" != ""
 .ELSE
 BUILD_OPT=1
diff --git a/nss/nss_freebsd.patch b/nss/nss_freebsd.patch
new file mode 100644
index 000..53df536
--- /dev/null
+++ b/nss/nss_freebsd.patch
@@ -0,0 +1,14 @@
+--- misc/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk   2012-05-03 
09:42:51.0 +
 misc/build/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2015-07-13 
23:42:44.915864000 +
+@@ -5,9 +5,8 @@
+ 
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+ 
+-DEFAULT_COMPILER  = gcc
+-CC= gcc
+-CCC   = g++
++DEFAULT_COMPILER  = $(CC)
++CCC   = $(CXX)
+ RANLIB= ranlib
+ 
+ CPU_ARCH  = $(OS_TEST)
commit 497e752ca86d1dc57d0afacdcaf4049102f027e3
Author: Regina Henschel 
Date:   Tue Jul 14 14:36:27 2015 +

Add rat excludes

Patch by: Gavin McDonald 
see d...@openoffice.apache.org 'Rat Patch take 2'

diff --git a/rat-excludes b/rat-excludes
index e61a603..918191d 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -1492,4 +1492,6 @@ main/winenv.set*
 
 main/ooxml/source/framework/OOXMLViewer/.settings/org.eclipse.jdt.core.prefs
 main/ooxml/source/framework/SchemaParser/.settings/org.eclipse.jdt.core.prefs
+main/ooxml/source/framework/JavaOOXMLParser/.settings/org.eclipse.jdt.core.prefs
+main/ooxml/source/framework/JavaPartManager/.settings/org.eclipse.jdt.core.prefs
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 framework/source/uielement/subtoolbarcontroller.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ffafd8e7a0794b3034d6fa047ba5de95e82f84f1
Author: Stephan Bergmann 
Date:   Tue Jul 14 18:04:31 2015 +0200

-fsanitize=function

Change-Id: I0a57d590d9e82d368b00ef11426e512ba7bc4dd4

diff --git a/framework/source/uielement/subtoolbarcontroller.cxx 
b/framework/source/uielement/subtoolbarcontroller.cxx
index 2b6e307..3a16760 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -450,7 +450,7 @@ css::uno::Sequence< OUString > 
SubToolBarController::getSupportedServiceNames()
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_comp_framework_SubToolBarController_get_implementation(
 css::uno::XComponentContext*,
-css::uno::Sequence& rxArgs )
+css::uno::Sequence const & rxArgs )
 {
 return cppu::acquire( new SubToolBarController( rxArgs ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: 9 commits - configure.ac src/lib

[David Tardon]

 configure.ac |1 
 src/lib/VSDXMLHelper.cpp |   20 +++
 src/lib/VSDXMLHelper.h   |5 
 src/lib/VSDXMLParserBase.cpp |  216 +++
 src/lib/VSDXParser.cpp   |  165 +---
 src/lib/VSDXTheme.cpp|   11 +-
 src/lib/libvisio_utils.h |4 
 7 files changed, 182 insertions(+), 240 deletions(-)

New commits:
commit 5e0cf3b1972fa26d28209a828933d2a6f95b49b1
Author: David Tardon 
Date:   Tue Jul 14 17:43:42 2015 +0200

avoid memory leak

Change-Id: Ibd1e042f11f0191bda0a4ae3064df603137fe5ba

diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index 23c9778..12fe447 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -1197,8 +1197,8 @@ void 
libvisio::VSDXMLParserBase::readCharIX(xmlTextReaderPtr reader)
 case XML_FONT:
   if (XML_READER_TYPE_ELEMENT == tokenType)
   {
-xmlChar *stringValue = readStringData(reader);
-if (stringValue && !xmlStrEqual(stringValue, BAD_CAST("Themed")))
+const shared_ptr stringValue(readStringData(reader), xmlFree);
+if (stringValue && !xmlStrEqual(stringValue.get(), BAD_CAST("Themed")))
 {
   try
   {
@@ -1207,11 +1207,11 @@ void 
libvisio::VSDXMLParserBase::readCharIX(xmlTextReaderPtr reader)
 if (iter != m_fonts.end())
   font = iter->second;
 else
-  font = VSDName(librevenge::RVNGBinaryData(stringValue, 
xmlStrlen(stringValue)), VSD_TEXT_UTF8);
+  font = VSDName(librevenge::RVNGBinaryData(stringValue.get(), 
xmlStrlen(stringValue.get())), VSD_TEXT_UTF8);
   }
   catch (const XmlParserException &)
   {
-font = VSDName(librevenge::RVNGBinaryData(stringValue, 
xmlStrlen(stringValue)), VSD_TEXT_UTF8);
+font = VSDName(librevenge::RVNGBinaryData(stringValue.get(), 
xmlStrlen(stringValue.get())), VSD_TEXT_UTF8);
   }
 }
   }
commit 13eba01e48420e17525f271a0b1f9124fd22a8a2
Author: David Tardon 
Date:   Tue Jul 14 17:41:52 2015 +0200

fix more string leaks

Change-Id: Ifc79cf5d91a262fb4d51d13d9d183164ccc24f07

diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp
index 85cf0ac..f962105 100644
--- a/src/lib/VSDXTheme.cpp
+++ b/src/lib/VSDXTheme.cpp
@@ -8,9 +8,14 @@
  */
 
 #include "VSDXTheme.h"
+
+#include 
+
 #include "VSDXMLTokenMap.h"
 #include "libvisio_utils.h"
 
+using boost::shared_ptr;
+
 libvisio::VSDXVariationClrScheme::VSDXVariationClrScheme()
   : m_varColor1()
   , m_varColor2()
@@ -96,7 +101,7 @@ boost::optional 
libvisio::VSDXTheme::readSrgbClr(xmlTextReader
   boost::optional retVal;
   if (XML_A_SRGBCLR == getElementToken(reader))
   {
-xmlChar *val = xmlTextReaderGetAttribute(reader, BAD_CAST("val"));
+const shared_ptr val(xmlTextReaderGetAttribute(reader, 
BAD_CAST("val")), xmlFree);
 if (val)
 {
   try
@@ -106,7 +111,6 @@ boost::optional 
libvisio::VSDXTheme::readSrgbClr(xmlTextReader
   catch (const XmlParserException &)
   {
   }
-  xmlFree(val);
 }
   }
   return retVal;
@@ -117,7 +121,7 @@ boost::optional 
libvisio::VSDXTheme::readSysClr(xmlTextReaderP
   boost::optional retVal;
   if (XML_A_SYSCLR == getElementToken(reader))
   {
-xmlChar *lastClr = xmlTextReaderGetAttribute(reader, BAD_CAST("lastClr"));
+const shared_ptr lastClr(xmlTextReaderGetAttribute(reader, 
BAD_CAST("lastClr")), xmlFree);
 if (lastClr)
 {
   try
@@ -127,7 +131,6 @@ boost::optional 
libvisio::VSDXTheme::readSysClr(xmlTextReaderP
   catch (const XmlParserException &)
   {
   }
-  xmlFree(lastClr);
 }
   }
   return retVal;
commit 5409f4e852318f59fc59bf56701205095954073b
Author: David Tardon 
Date:   Tue Jul 14 17:39:28 2015 +0200

avoid a slew of string leaks

Change-Id: I72b02e1752df97501a0c1a5aef123f7f43dcdd2f

diff --git a/src/lib/VSDXMLHelper.cpp b/src/lib/VSDXMLHelper.cpp
index 4180316..582763e 100644
--- a/src/lib/VSDXMLHelper.cpp
+++ b/src/lib/VSDXMLHelper.cpp
@@ -120,6 +120,11 @@ libvisio::Colour libvisio::xmlStringToColour(const xmlChar 
*s)
   return Colour((val & 0xff) >> 16, (val & 0xff00) >> 8, val & 0xff, 0);
 }
 
+libvisio::Colour libvisio::xmlStringToColour(const boost::shared_ptr 
&s)
+{
+  return xmlStringToColour(s.get());
+}
+
 long libvisio::xmlStringToLong(const xmlChar *s)
 {
   using boost::lexical_cast;
@@ -139,6 +144,11 @@ long libvisio::xmlStringToLong(const xmlChar *s)
   return 0;
 }
 
+long libvisio::xmlStringToLong(const boost::shared_ptr &s)
+{
+  return xmlStringToLong(s.get());
+}
+
 double libvisio::xmlStringToDouble(const xmlChar *s) try
 {
   if (xmlStrEqual(s, BAD_CAST("Themed")))
@@ -152,6 +162,11 @@ catch (const boost::bad_lexical_cast &)
   throw XmlParserException();
 }
 
+double libvisio::xmlStringToDouble(const boost::shared_ptr &s)
+{
+  return xmlStringToDouble(s.get());
+}
+
 boo

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

[Lionel Elie Mamane]

 external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk  |1 
 external/jfreereport/UnpackedTarball_jfreereport_libformula.mk   |1 
 external/jfreereport/patches/flow-engine_date_is_datetime.patch.1|   13 

 external/jfreereport/patches/libformula-datevalue_truncation.patch.1 |   29 
++
 4 files changed, 44 insertions(+)

New commits:
commit 8c271621c8d2c1e50cfe8bf4866b9a42adf3c9d8
Author: Lionel Elie Mamane 
Date:   Tue Jul 14 17:49:44 2015 +0200

tdf#92654 a "Date" can contain a Time, so don't loose date by default

also fix DATEVALUE() function that was relying on this dataloss

Change-Id: I6030505a762df3ecbfe9a8331267846d3de817e8

diff --git a/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk 
b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
index f6640e4..e0d309a 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
@@ -17,6 +17,7 @@ $(eval $(call 
gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\
 
 $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\
external/jfreereport/patches/flow-engine.patch \
+   external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk 
b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
index bb78966..ec9d29d 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_UnpackedTarball_add_patches,jfreereport_libformula,\
external/jfreereport/patches/common_build.patch \
external/jfreereport/patches/libformula-time-notz.patch \
external/jfreereport/patches/libformula-minutes_truncation.patch.1 \
+   external/jfreereport/patches/libformula-datevalue_truncation.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 
b/external/jfreereport/patches/flow-engine_date_is_datetime.patch.1
new file mode 100644
index 000..3ed23ee
--- /dev/null
+++ b/external/jfreereport/patches/flow-engine_date_is_datetime.patch.1
@@ -0,0 +1,13 @@
+diff -ur 
jfreereport_flow_engine.org/source/org/jfree/report/expressions/ReportFormulaContext.java
 
jfreereport_flow_engine/source/org/jfree/report/expressions/ReportFormulaContext.java
+--- 
jfreereport_flow_engine.org/source/org/jfree/report/expressions/ReportFormulaContext.java
  2015-07-14 17:24:51.924156060 +0200
 
jfreereport_flow_engine/source/org/jfree/report/expressions/ReportFormulaContext.java
  2015-07-14 17:27:56.669270298 +0200
+@@ -120,7 +120,7 @@
+   {
+ if (flags.isDate())
+ {
+-  return DateTimeType.DATE_TYPE;
++  return DateTimeType.DATETIME_TYPE;
+ }
+ if (flags.isNumeric())
+ {
+Only in jfreereport_flow_engine/source/org/jfree/report/expressions: 
ReportFormulaContext.java~
diff --git 
a/external/jfreereport/patches/libformula-datevalue_truncation.patch.1 
b/external/jfreereport/patches/libformula-datevalue_truncation.patch.1
new file mode 100644
index 000..069c667
--- /dev/null
+++ b/external/jfreereport/patches/libformula-datevalue_truncation.patch.1
@@ -0,0 +1,29 @@
+diff -ur 
jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java
 
jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java
+--- 
jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java
 2010-06-01 17:15:50.0 +0200
 
jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java
 2015-07-14 17:24:42.503895240 +0200
+@@ -18,6 +18,7 @@
+ package org.pentaho.reporting.libraries.formula.function.datetime;
+ 
+ import java.util.Date;
++import java.util.Calendar;
+ 
+ import org.pentaho.reporting.libraries.formula.EvaluationException;
+ import org.pentaho.reporting.libraries.formula.FormulaContext;
+@@ -28,6 +29,7 @@
+ import org.pentaho.reporting.libraries.formula.typing.Type;
+ import org.pentaho.reporting.libraries.formula.typing.TypeRegistry;
+ import org.pentaho.reporting.libraries.formula.typing.coretypes.DateTimeType;
++import org.pentaho.reporting.libraries.formula.util.DateUtil;
+ 
+ /**
+  * This function returns
+@@ -61,7 +63,8 @@
+ final Object value = parameters.getValue(0);
+ 
+ final Date date1 = typeRegistry.convertToDate(type, value);
+-return new TypeValuePair(DateTimeType.DATE_TYPE, date1);
++final Date date  = DateUtil.normalizeDate(date1, DateTimeType.DATE_TYPE);
+ 
++return new TypeValuePair(DateTimeType.DATE_TYPE, date);
+   }
+ }
_

Re: bugzilla: no ASSIGNED status anymore?

[Lionel Elie Mamane]

On Tue, Jul 14, 2015 at 05:46:23PM +0200, Lionel Elie Mamane wrote:

> Did the ASSIGNED status for a bug disappear or am I being particularly
> blind today?

It appeared, seemingly only after I changed the "assigned to" field
away from the default?

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

bugzilla: no ASSIGNED status anymore?

[Lionel Elie Mamane]

Hi,

Did the ASSIGNED status for a bug disappear or am I being particularly
blind today?

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

visual studio 2013 express

[Michael Stahl]

anybody has $SUBJECT installed?  /me doesn't, hence this mail...

on master configure fails with Express since commit
98a61f5b8da500fcefd2e7f0dfb1231bfb87f2fb  due to a check for devenv.exe,
which does not exist in  Express but there is a different executable,
probably vcexpress.exe.

does that executable support an /Upgrade switch to upgrade project and
solution files?  if not we'll have to drop support for VS Express at
some point and require VS Community.


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

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

[Stephan Bergmann]

 sw/qa/extras/uiwriter/uiwriter.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e46bf197d98a199bf235c6d6820848d98854e67f
Author: Stephan Bergmann 
Date:   Tue Jul 14 17:07:39 2015 +0200

loplugin:salbool

Change-Id: Ia8df87e2b6803ebe4ab8d3defa147d20ca8d7422

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 08d05d5..b0e0457 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1157,8 +1157,8 @@ void SwUiWriterTest::testTextSearch()
 
CPPUNIT_ASSERT_EQUAL(uno::makeAny(float(com::sun::star::awt::FontWeight::BOLD)),
 aPropVal2[0].Value);
 //specifying the search attributes
 uno::Reference xPropSet(xSearchDes, 
uno::UNO_QUERY_THROW);
-xPropSet->setPropertyValue(OUString("SearchWords"), 
uno::makeAny(sal_Bool(true)));
-xPropSet->setPropertyValue(OUString("SearchCaseSensitive"), 
uno::makeAny(sal_Bool(true)));
+xPropSet->setPropertyValue(OUString("SearchWords"), uno::makeAny(true));
+xPropSet->setPropertyValue(OUString("SearchCaseSensitive"), 
uno::makeAny(true));
 //this will search all the BOLD words
 uno::Reference 
xIndex(xSearch->findAll(xSearchDes));
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndex->getCount());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 vcl/generic/glyphs/gcach_ftyp.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e8b6834e49799c887f77a952ee9e6eb90090ca9c
Author: Michael Stahl 
Date:   Tue Jul 14 16:46:51 2015 +0200

Revert "Revert "WaE: comparison of integers of different signs""

This reverts commit e60f6ac2492f7780f55e0d336966d78097a4b396.

The "width" field is "int" in freetype 2.4.8 and "unsigned int" in 2.5.5

Change-Id: I4f7cc2bcf715890a85b956a5bf59667f634f31b5

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 823b568..1c9d177 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1206,7 +1206,8 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, 
RawBitmap& rRawBitmap )
 unsigned int x;
 for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
 {
-for( x = 0; x < rBitmapFT.width; ++x )
+// note width is "int" in freetype 2.4.8 and "unsigned int" in 
2.5.5
+for (x = 0; x < static_cast(rBitmapFT.width); ++x)
 *(pDest++) = *(pSrc++);
 for(; x < rRawBitmap.mnScanlineSize; ++x )
 *(pDest++) = 0;
@@ -1218,7 +1219,8 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, 
RawBitmap& rRawBitmap )
 for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
 {
 unsigned char nSrc = 0;
-for( x = 0; x < rBitmapFT.width; ++x, nSrc+=nSrc )
+// note width is "int" in freetype 2.4.8 and "unsigned int" in 
2.5.5
+for (x = 0; x < static_cast(rBitmapFT.width); ++x, 
nSrc+=nSrc)
 {
 if( (x & 7) == 0 )
 nSrc = *(pSrc++);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LibreOffice 5.0.0 RC3 available

[Christian Lohmaier]

Dear Community,

The Document Foundation is pleased to announce the third release
candidate of LibreOffice 5.0.0. The upcoming 5.0.0 will be the first
release of our fresh 5.0 line. Please be aware that LibreOffice 5.0.0
RC3 has not been flagged as ready for production use yet, however feel
free to give it a try instead of 4.4.4.

A work-in-progress list of new features in LibreOffice 5.0 can be
found at https://wiki.documentfoundation.org/ReleaseNotes/5.0

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Windows builds are also provided in 64bit version.

Developers and QA might also be interested in the symbol server for
windows debug information (see the release notes linked below for
details)

Should you find bugs, please report them to our Bugzilla:

  https://bugs.documentfoundation.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/community/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs compared to 5.0.0 rc2 is
available from our wiki:

  http://wiki.documentfoundation.org/Releases/5.0.0/RC3

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

On behalf of the Community,

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

[Libreoffice-commits] core.git: filter/CppunitTest_filter_utils.mk

[Michael Stahl]

 filter/CppunitTest_filter_utils.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 75d0f7262004d93d457b4b0b499ebf0b23fcda04
Author: Michael Stahl 
Date:   Tue Jul 14 16:32:01 2015 +0200

filter: filter_utils test needs tools library

Change-Id: I0de6e4598f365fda1cccd1d3466429e52cf4067f

diff --git a/filter/CppunitTest_filter_utils.mk 
b/filter/CppunitTest_filter_utils.mk
index d719b60..1d042a9 100644
--- a/filter/CppunitTest_filter_utils.mk
+++ b/filter/CppunitTest_filter_utils.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_externals,filter_utils, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,filter_utils, \
+   tl \
comphelper \
unotest \
cppuhelper \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Varun]

 sw/qa/extras/uiwriter/uiwriter.cxx |   83 +
 1 file changed, 83 insertions(+)

New commits:
commit aea6321fbb6c533f527456ccf0d312bc4ba6777e
Author: Varun 
Date:   Mon Jul 13 22:54:18 2015 +0530

Added UNO test coverage for SwXTextSearch

Change-Id: Iee933f042186326ef4d8cd5da0090348de7a1aae
Reviewed-on: https://gerrit.libreoffice.org/17018
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 92300c8..08d05d5 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -59,6 +59,8 @@
 #include "com/sun/star/i18n/TransliterationModulesExtra.hpp"
 #include "com/sun/star/sdbcx/XTablesSupplier.hpp"
 #include "com/sun/star/text/XParagraphCursor.hpp"
+#include "com/sun/star/util/XPropertyReplace.hpp"
+#include "com/sun/star/awt/FontStrikeout.hpp"
 #include "com/sun/star/beans/PropertyAttribute.hpp"
 #include "com/sun/star/text/XTextField.hpp"
 #include 
@@ -107,6 +109,7 @@ public:
 void testdelofTableRedlines();
 void testTdf81995();
 void testExportToPicture();
+void testTextSearch();
 void testTdf69282();
 void testTdf69282WithMirror();
 void testSearchWithTransliterate();
@@ -162,6 +165,7 @@ public:
 CPPUNIT_TEST(testdelofTableRedlines);
 CPPUNIT_TEST(testTdf81995);
 CPPUNIT_TEST(testExportToPicture);
+CPPUNIT_TEST(testTextSearch);
 CPPUNIT_TEST(testTdf69282);
 CPPUNIT_TEST(testTdf69282WithMirror);
 CPPUNIT_TEST(testSearchWithTransliterate);
@@ -1103,6 +1107,85 @@ void SwUiWriterTest::testExportToPicture()
 aTempFile.EnableKillingFile();
 }
 
+void SwUiWriterTest::testTextSearch()
+{
+// Create a new empty Writer document
+SwDoc* pDoc = createDoc();
+SwPaM* pCrsr = pDoc->GetEditShell()->GetCrsr();
+IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
+// Insert some text
+rIDCO.InsertString(*pCrsr, "Hello World This is a test");
+// Use cursor to select part of text
+for (int i = 0; i < 10; i++) {
+pCrsr->Move(fnMoveBackward);
+}
+pCrsr->SetMark();
+for(int i = 0; i < 4; i++) {
+pCrsr->Move(fnMoveBackward);
+}
+//Checking that the proper selection is made
+CPPUNIT_ASSERT_EQUAL(OUString("This"), pCrsr->GetText());
+// Apply a "Bold" attribute to selection
+SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
+rIDCO.InsertPoolItem(*pCrsr, aWeightItem);
+//making another selection of text
+for (int i = 0; i < 7; i++) {
+pCrsr->Move(fnMoveBackward);
+}
+pCrsr->SetMark();
+for(int i = 0; i < 5; i++) {
+pCrsr->Move(fnMoveBackward);
+}
+//Checking that the proper selection is made
+CPPUNIT_ASSERT_EQUAL(OUString("Hello"), pCrsr->GetText());
+// Apply a "Bold" attribute to selection
+rIDCO.InsertPoolItem(*pCrsr, aWeightItem);
+//Performing Search Operation and also covering the UNO coverage for 
setProperty
+uno::Reference xSearch(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xSearchDes(xSearch->createSearchDescriptor(), uno::UNO_QUERY);
+uno::Reference xProp(xSearchDes, uno::UNO_QUERY);
+//setting some properties
+uno::Sequence aDescriptor =
+{
+beans::PropertyValue("CharWeight", sal_Int32(0), 
uno::makeAny(float(com::sun::star::awt::FontWeight::BOLD)), 
beans::PropertyState_DIRECT_VALUE)
+};
+xProp->setSearchAttributes(aDescriptor);
+//receiving the defined properties and asserting them with expected 
values, covering UNO
+uno::Sequence 
aPropVal2(xProp->getSearchAttributes());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aPropVal2.getLength());
+CPPUNIT_ASSERT_EQUAL(OUString("CharWeight"), aPropVal2[0].Name);
+
CPPUNIT_ASSERT_EQUAL(uno::makeAny(float(com::sun::star::awt::FontWeight::BOLD)),
 aPropVal2[0].Value);
+//specifying the search attributes
+uno::Reference xPropSet(xSearchDes, 
uno::UNO_QUERY_THROW);
+xPropSet->setPropertyValue(OUString("SearchWords"), 
uno::makeAny(sal_Bool(true)));
+xPropSet->setPropertyValue(OUString("SearchCaseSensitive"), 
uno::makeAny(sal_Bool(true)));
+//this will search all the BOLD words
+uno::Reference 
xIndex(xSearch->findAll(xSearchDes));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndex->getCount());
+//Replacing the searched string via XReplaceable
+uno::Reference xReplace(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xReplaceDes(xReplace->createReplaceDescriptor(), uno::UNO_QUERY);
+uno::Reference xProp2(xReplaceDes, uno::UNO_QUERY);
+xProp2->setReplaceAttributes(aDescriptor);
+//checking that the proper attributes are there or not
+uno::Sequence 
aRepProp(xProp2->getReplaceAttributes());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRepProp.getLength());
+CPPUNIT_ASSERT_EQUAL(OUString("CharWeight"), aRepProp[0].Name);
+
CPPUNIT_ASSERT_EQUAL(uno::makeAny(float(com::

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

[Miklos Vajna]

 i18npool/source/breakiterator/breakiterator_th.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4655de1381826be042b28df6b3db62dd146d7c71
Author: Miklos Vajna 
Date:   Sat May 23 10:20:47 2015 +0100

i18npool: missing include

Change-Id: I04b2e2aa5fffd570f33b69d8df99b9a88481a3a2
(cherry picked from commit d8208da8576874fdb07014287e6cbc0aeba741bb)
Reviewed-on: https://gerrit.libreoffice.org/17047
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx 
b/i18npool/source/breakiterator/breakiterator_th.cxx
index 5b4973b..db1dcde4 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -21,6 +21,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 i18npool/source/breakiterator/breakiterator_th.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit acddaea669fcb30660f1844e84582ce11e31
Author: Miklos Vajna 
Date:   Sat May 23 10:20:47 2015 +0100

i18npool: missing include

Change-Id: I04b2e2aa5fffd570f33b69d8df99b9a88481a3a2
(cherry picked from commit d8208da8576874fdb07014287e6cbc0aeba741bb)
Reviewed-on: https://gerrit.libreoffice.org/17046
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx 
b/i18npool/source/breakiterator/breakiterator_th.cxx
index 5b4973b..db1dcde4 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -21,6 +21,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 vcl/generic/glyphs/gcach_ftyp.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e60f6ac2492f7780f55e0d336966d78097a4b396
Author: Michael Stahl 
Date:   Tue Jul 14 16:16:20 2015 +0200

Revert "WaE: comparison of integers of different signs"

This is pointless, the GCC warning was fixed in the previous commit and
FT_Bitmap.width is of type "unsigned int" already.

This reverts commit bc4a2d7ce9d4417f9d6cd58505d4ea3e959b1354.

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 85e01f3..823b568 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1206,7 +1206,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, 
RawBitmap& rRawBitmap )
 unsigned int x;
 for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
 {
-for( x = 0; x < static_cast(rBitmapFT.width); ++x )
+for( x = 0; x < rBitmapFT.width; ++x )
 *(pDest++) = *(pSrc++);
 for(; x < rRawBitmap.mnScanlineSize; ++x )
 *(pDest++) = 0;
@@ -1218,7 +1218,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, 
RawBitmap& rRawBitmap )
 for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
 {
 unsigned char nSrc = 0;
-for( x = 0; x < static_cast(rBitmapFT.width); ++x, 
nSrc+=nSrc )
+for( x = 0; x < rBitmapFT.width; ++x, nSrc+=nSrc )
 {
 if( (x & 7) == 0 )
 nSrc = *(pSrc++);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - fpicker/source

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit cae7cef9584c76612093403dbf6e6c90c37c4039
Author: Szymon Kłos 
Date:   Tue Jul 14 16:16:06 2015 +0200

FilePickerLastService as a string, not string-list 2

Change-Id: If100617ef968fde94178528327135e15f64c1542

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index 5ea0658..6c200ae 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -227,10 +227,7 @@ void RemoteFilesDialog::dispose()
 
 std::shared_ptr< comphelper::ConfigurationChanges > batch( 
comphelper::ConfigurationChanges::create( m_context ) );
 
-Sequence< OUString > lastService( 1 );
-lastService[0] = m_sLastServiceUrl;
-
-officecfg::Office::Common::Misc::FilePickerLastService::set( lastService, 
batch );
+officecfg::Office::Common::Misc::FilePickerLastService::set( 
m_sLastServiceUrl, batch );
 
 if( m_bIsUpdated )
 {
@@ -324,10 +321,8 @@ void RemoteFilesDialog::FillServicesListbox()
 
 unsigned int nPos = 0;
 unsigned int i = 0;
-Sequence< OUString > lastService( 
officecfg::Office::Common::Misc::FilePickerLastService::get( m_context ) );
 
-if( lastService.getLength() > 0 )
-m_sLastServiceUrl = lastService[0];
+m_sLastServiceUrl = 
officecfg::Office::Common::Misc::FilePickerLastService::get( m_context );
 
 for( sal_Int32 nPlace = 0; nPlace < placesUrlsList.getLength() && nPlace < 
placesNamesList.getLength(); ++nPlace )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - officecfg/registry

[Szymon Kłos]

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 504a227998baead6a8c304daed9bf7d234791fee
Author: Szymon Kłos 
Date:   Tue Jul 14 16:02:02 2015 +0200

FilePickerLastService as a string, not string-list

Change-Id: I7c379e797250be2f61791f5f3260d23ad24d26b3

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index d3581d5..4c2e16f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5790,7 +5790,7 @@
   List of names of the places the user bookmarked in the file 
picker dialog.
 
   
-  
+  
 
   URL of the last used service in the remote file picker.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About fix for tdf#82744: WebDAV LOCK is released when document is saved

[Giuseppe Castagno]

Hi Tor,

On 07/14/2015 03:13 PM, Tor Lillqvist wrote:


BTW, what does HAVE_FEATURE_MULTIUSER_ENVIRONMENT compile time flag
(inside the commit recalled above) mean?


The HAVE_FEATURE_* macros are (or should be) documented where defined,
in config_host/config_features.h.in .

In practice, HAVE_FEATURE_MULTIUSER_ENVIRONMENT currently means anything
except Android and iOS.


thanks, exactly the clarification I needed.

--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About fix for tdf#82744: WebDAV LOCK is released when document is saved

[Tor Lillqvist]

> BTW, what does HAVE_FEATURE_MULTIUSER_ENVIRONMENT compile time flag
> (inside the commit recalled above) mean?


The HAVE_FEATURE_* macros are (or should be) documented where defined, in
config_host/config_features.h.in.

In practice, HAVE_FEATURE_MULTIUSER_ENVIRONMENT currently means anything
except Android and iOS.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About fix for tdf#82744: WebDAV LOCK is released when document is saved

[Giuseppe Castagno]

Hi Stephan,

On 07/14/2015 02:12 PM, Stephan Bergmann wrote:

On 07/14/2015 12:34 PM, Giuseppe Castagno wrote:

I came across a comment on top of method
SfxMedium::ShowLockedDocumentDialog.

The comment states that lock/unlock should be put in the relevant ucb
component.


You mean the "FIXME: ..." comment added with

"Don't use lock files when sandboxed on OS X"?  I wouldn't worry too
much about it.  IIUC, it is concerned with LO's "home-grown" locking
scheme (involving additional .~lock.*# files), which is only marginally
related to the question whether to send WebDAV UNLOCK when saving vs.
when closing a document.


exactly that, 3rd hunk of the commit you pointed me to.




Unfortunately I started implementing the fix managing the WebDAV
lock/unlock from the framework instead.


You mean, you somehow manage with modifications to the framework code to
cause the sending of WebDAV UNLOCK to happen upon closing a document,
instead upon saving it?  Sounds good then, IMO.


the framework changes I'working on are meant to manage correctly the 
lock/unlock in WebDAV.


ASA I have a working commit, I'll push to gerrit.

BTW, what does HAVE_FEATURE_MULTIUSER_ENVIRONMENT compile time flag 
(inside the commit recalled above) mean?


--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu

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

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

[Michael Stahl]

On 14.07.2015 08:21, Stephan Bergmann wrote:
> On 07/10/2015 01:09 PM, Varun wrote:
>> commit 6a0efa9873b1a5cae4ae0719a7ae1eee97838168
>> Author: Varun 
>> Date:   Thu Jul 9 23:33:24 2015 +0530
>>
>>  Added Test for tdf#80663 table row/column delete undo crash
>>
>>  Change-Id: Ica62926486831f126cce54d651e230cee3360074
>>  Reviewed-on: https://gerrit.libreoffice.org/16901
>>  Reviewed-by: Michael Stahl 
>>  Tested-by: Michael Stahl 
> 
> Looks like that new test unearthed an undo-related bug, as my asan+ubsan 
> build now reproducible fails during CppunitTest_sw_uiwriter with
> 
>> sw/source/core/undo/untbl.cxx:997:25: runtime error: downcast of address 
>> 0x2b35a17ec0a8 which does not point to an object of type 'SwTableBoxFormat'
>> 0x2b35a17ec0a8: note: object is of type 'SwTableFormat'
>>  00 00 00 00  90 d9 e5 58 35 2b 00 00  a0 d2 7e a1 35 2b 00 00  f8 b1 7e a1 
>> 35 2b 00 00  00 60 6e 97
>>   ^~~
>>   vptr for 'SwTableFormat'

that looks like a bug but it happens to not crash since neither
SwTableFormat nor SwTableBoxFormat add members to their common base
class; fixed on master with commit e0cf60a4acfcb7788ebd145a1ddb7354b5d7d39a

good to hear that additional code coverage finds such bugs.


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

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

[Michael Stahl]

 sw/source/core/undo/untbl.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e0cf60a4acfcb7788ebd145a1ddb7354b5d7d39a
Author: Michael Stahl 
Date:   Tue Jul 14 14:35:43 2015 +0200

sw: _SaveTable::CreateNew() fix invalid cast ...

... of SwTableFormat to SwTableBoxFormat for the temporary SwTableBox.

Change-Id: I74118b1b028bd71561f9afe6acd1cc95991a3761

diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 40f9ef9..f1cfb15 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -993,8 +993,9 @@ void _SaveTable::CreateNew( SwTable& rTable, bool 
bCreateFrms,
 pFormat->SetInCache( false );
 }
 
-// SwTableBox must have a format
-SwTableBox aParent( static_cast(pFormat), 
rTable.GetTabLines().size(), 0 );
+// SwTableBox must have a format - the SwTableBox takes ownership of it
+SwTableBoxFormat *const 
pNewFormat(pFormat->GetDoc()->MakeTableBoxFormat());
+SwTableBox aParent(pNewFormat, rTable.GetTabLines().size(), 0);
 
 // fill FrameFormats with defaults (0)
 pFormat = 0;
commit 7132dfe7b5030ef5a27a65e5ceaeca67dac96f13
Author: Michael Stahl 
Date:   Tue Jul 14 14:34:55 2015 +0200

sw: assert _SaveTable::CreateNew() deletes everything in temp box

Change-Id: Ib668bb948a2cd557db7b8804f8a81800048f88bd

diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index c2c34a0..40f9ef9 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -1068,6 +1068,7 @@ void _SaveTable::CreateNew( SwTable& rTable, bool 
bCreateFrms,
 }
 
 aParent.GetTabLines().erase( aParent.GetTabLines().begin(), 
aParent.GetTabLines().begin() + n );
+assert(aParent.GetTabLines().empty());
 
 if( bCreateFrms )
 aTmpBox.MakeFrms( rTable );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/svtools/filectrl.hxx   |2 --
 svtools/source/filter/exportdialog.hxx |3 ---
 2 files changed, 5 deletions(-)

New commits:
commit 34c211efce812d16dd414a94ca7aead8f671ae71
Author: Stephan Bergmann 
Date:   Tue Jul 14 14:59:56 2015 +0200

-Werror,-Wunused-private-field

Change-Id: Iccb727f1aae27a27ed829c9ba09e247611710295

diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index 8038b78..f82f67b 100644
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@ -60,8 +60,6 @@ private:
 OUStringmaButtonText;
 boolmbOpenDlg;
 
-Link<>  maDialogCreatedHdl;
-
 FileControlMode mnFlags;
 FileControlMode_InternalmnInternalFlags;
 
diff --git a/svtools/source/filter/exportdialog.hxx 
b/svtools/source/filter/exportdialog.hxx
index e3015ec..1ef4ecd 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -109,13 +109,10 @@ private:
 OUStringms8BitColorPalette;
 OUStringms24BitColor;
 
-SizemaDialogSize;
-
 FilterConfigItem*   mpOptionsItem;
 FilterConfigItem*   mpFilterOptionsItem;
 
 OUStringmaExt;
-OUStringmaEstimatedSizeText;
 sal_Int16   mnFormat;
 sal_Int32   mnMaxFilesizeForRealtimePreview;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About fix for tdf#82744: WebDAV LOCK is released when document is saved

[Stephan Bergmann]

On 07/14/2015 12:34 PM, Giuseppe Castagno wrote:

I came across a comment on top of method
SfxMedium::ShowLockedDocumentDialog.

The comment states that lock/unlock should be put in the relevant ucb
component.


You mean the "FIXME: ..." comment added with 
 
"Don't use lock files when sandboxed on OS X"?  I wouldn't worry too 
much about it.  IIUC, it is concerned with LO's "home-grown" locking 
scheme (involving additional .~lock.*# files), which is only marginally 
related to the question whether to send WebDAV UNLOCK when saving vs. 
when closing a document.



Unfortunately I started implementing the fix managing the WebDAV
lock/unlock from the framework instead.


You mean, you somehow manage with modifications to the framework code to 
cause the sending of WebDAV UNLOCK to happen upon closing a document, 
instead upon saving it?  Sounds good then, IMO.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - wizards/com

[Julien Nabet]

 wizards/com/sun/star/wizards/web/WWD_Events.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bdc50ac10d5987b7d0545d765f4097c9246a2dc0
Author: Julien Nabet 
Date:   Sat Jul 4 16:20:32 2015 +0200

tdf#92404: Web Wizard - no result / crash

Fixes
Traceback (most recent call last):
  File 
"/home/laci/m/bibisect/lo-linux-dbgutil-daily/opt/program/wizards/web/WWD_Events.py",
 line 249, in addDocument
oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, self)
TypeError: __init__() missing 1 required positional argument: 'parent_'

and:
Traceback (most recent call last):
  File 
"/home/julien/compile-libreoffice/libreoffice/instdir/program/wizards/web/WWD_Events.py",
 line 252, in addDocument
oLoadDocs.loadDocuments()
  File 
"/home/julien/compile-libreoffice/libreoffice/instdir/program/wizards/web/WWD_Events.py",
 line 934, in loadDocuments
doc.cp_URL = FileAccess.connectURLs(files[0], self.files[i])
NameError: global name 'files' is not defined

Change-Id: I737117a6981e541f12453bb9d9b2680f5fb79142
Reviewed-on: https://gerrit.libreoffice.org/16756
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 2f0d1a23759c1b973593bfba642d01fb3df3c269)
Reviewed-on: https://gerrit.libreoffice.org/17035

diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py 
b/wizards/com/sun/star/wizards/web/WWD_Events.py
index 72b393e..4f2208c 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -246,7 +246,7 @@ class WWD_Events(WWD_Startup):
 sd = self.getStatusDialog()
 sd.setLabel(self.resources.resValidatingDocuments)
 sd.execute(self, task, self.resources.prodName)
-oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, 
self)
+oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, 
task, self)
 oLoadDocs.loadDocuments()
 task.removeTaskListener(sd)
 else:
@@ -926,7 +926,7 @@ class WWD_Events(WWD_Startup):
 if start == 0:
 doc.cp_URL = self.files[i]
 else:
-doc.cp_URL = FileAccess.connectURLs(files[0], 
self.files[i])
+doc.cp_URL = FileAccess.connectURLs(self.files[0], 
self.files[i])
 
 '''
 so - i check each document and if it is ok I add it.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - wizards/com

[Julien Nabet]

 wizards/com/sun/star/wizards/web/WWD_Events.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4f0f8a5c6860bde571ab8babc6559cfd638d6c3d
Author: Julien Nabet 
Date:   Sat Jul 4 16:20:32 2015 +0200

tdf#92404: Web Wizard - no result / crash

Fixes
Traceback (most recent call last):
  File 
"/home/laci/m/bibisect/lo-linux-dbgutil-daily/opt/program/wizards/web/WWD_Events.py",
 line 249, in addDocument
oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, self)
TypeError: __init__() missing 1 required positional argument: 'parent_'

and:
Traceback (most recent call last):
  File 
"/home/julien/compile-libreoffice/libreoffice/instdir/program/wizards/web/WWD_Events.py",
 line 252, in addDocument
oLoadDocs.loadDocuments()
  File 
"/home/julien/compile-libreoffice/libreoffice/instdir/program/wizards/web/WWD_Events.py",
 line 934, in loadDocuments
doc.cp_URL = FileAccess.connectURLs(files[0], self.files[i])
NameError: global name 'files' is not defined

Change-Id: I737117a6981e541f12453bb9d9b2680f5fb79142
Reviewed-on: https://gerrit.libreoffice.org/16756
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 2f0d1a23759c1b973593bfba642d01fb3df3c269)
Reviewed-on: https://gerrit.libreoffice.org/17034

diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py 
b/wizards/com/sun/star/wizards/web/WWD_Events.py
index 72b393e..4f2208c 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -246,7 +246,7 @@ class WWD_Events(WWD_Startup):
 sd = self.getStatusDialog()
 sd.setLabel(self.resources.resValidatingDocuments)
 sd.execute(self, task, self.resources.prodName)
-oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, 
self)
+oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, 
task, self)
 oLoadDocs.loadDocuments()
 task.removeTaskListener(sd)
 else:
@@ -926,7 +926,7 @@ class WWD_Events(WWD_Startup):
 if start == 0:
 doc.cp_URL = self.files[i]
 else:
-doc.cp_URL = FileAccess.connectURLs(files[0], 
self.files[i])
+doc.cp_URL = FileAccess.connectURLs(self.files[0], 
self.files[i])
 
 '''
 so - i check each document and if it is ok I add it.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sfx2/source/sidebar/SidebarController.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c32333aed6286b6f42f2a491759a559732d0b8b2
Author: Michael Stahl 
Date:   Tue Jul 14 13:25:44 2015 +0200

sfx2: tolerate frames without controller in GetSidebarControllerForFrame

Unfortnately happens in CppunitTest_writerperfect_draw for Draw docs.

Change-Id: I1317d30d71fa5975564d1060cbf8958f63b67f40

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 3831023..a87b653 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -149,8 +149,14 @@ SidebarController::~SidebarController()
 SidebarController* SidebarController::GetSidebarControllerForFrame (
 const css::uno::Reference& rxFrame)
 {
+uno::Reference const 
xController(rxFrame->getController());
+if (!xController.is()) // this may happen during dispose of Draw 
controller but perhaps it's a bug
+{
+SAL_WARN("sfx2.sidebar", "GetSidebarControllerForFrame: frame has no 
XController");
+return nullptr;
+}
 uno::Reference const xListener(
-framework::GetFirstListenerWith(rxFrame->getController(),
+framework::GetFirstListenerWith(xController,
 [] (uno::Reference const& xRef)
 { return nullptr != dynamic_cast(xRef.get()); }
 ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a3/6df662fb300c0209fed5f97d851dcb457e91c6

[Caolán McNamara]

 a3/6df662fb300c0209fed5f97d851dcb457e91c6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0dc15f3ab0dfde3c80297c20a89eadf988c96a55
Author: Caolán McNamara 
Date:   Tue Jul 14 12:46:29 2015 +0100

Notes added by 'git notes add'

diff --git a/a3/6df662fb300c0209fed5f97d851dcb457e91c6 
b/a3/6df662fb300c0209fed5f97d851dcb457e91c6
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/a3/6df662fb300c0209fed5f97d851dcb457e91c6
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - be/d851e498f8a532fa9785e420ba26472cef6216

[Caolán McNamara]

 be/d851e498f8a532fa9785e420ba26472cef6216 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d6e2c3d077c59d4b406b8f134a7f418e9a9cc3ec
Author: Caolán McNamara 
Date:   Tue Jul 14 12:46:05 2015 +0100

Notes added by 'git notes add'

diff --git a/be/d851e498f8a532fa9785e420ba26472cef6216 
b/be/d851e498f8a532fa9785e420ba26472cef6216
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/be/d851e498f8a532fa9785e420ba26472cef6216
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c6/3d7d7754d7e53f43275763b73f6fc6c6076eea

[Caolán McNamara]

 c6/3d7d7754d7e53f43275763b73f6fc6c6076eea |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 04ca5c27c0d7c5554e153b5920ccd8e8f89147cb
Author: Caolán McNamara 
Date:   Tue Jul 14 12:45:41 2015 +0100

Notes added by 'git notes add'

diff --git a/c6/3d7d7754d7e53f43275763b73f6fc6c6076eea 
b/c6/3d7d7754d7e53f43275763b73f6fc6c6076eea
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/c6/3d7d7754d7e53f43275763b73f6fc6c6076eea
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8d/0c956faa72044280cd9088928cea548a7776e5

[Caolán McNamara]

 8d/0c956faa72044280cd9088928cea548a7776e5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8378f4637d5b550c7fa3710a120cb11f6ba9a65a
Author: Caolán McNamara 
Date:   Tue Jul 14 12:44:57 2015 +0100

Notes added by 'git notes add'

diff --git a/8d/0c956faa72044280cd9088928cea548a7776e5 
b/8d/0c956faa72044280cd9088928cea548a7776e5
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/8d/0c956faa72044280cd9088928cea548a7776e5
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 35/2796f225e035babb7083f69dbfbcd52ec89b4b

[Caolán McNamara]

 35/2796f225e035babb7083f69dbfbcd52ec89b4b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ec7a861277bfd83c1bf7d343f1de3f685fd46d36
Author: Caolán McNamara 
Date:   Tue Jul 14 12:44:36 2015 +0100

Notes added by 'git notes add'

diff --git a/35/2796f225e035babb7083f69dbfbcd52ec89b4b 
b/35/2796f225e035babb7083f69dbfbcd52ec89b4b
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/35/2796f225e035babb7083f69dbfbcd52ec89b4b
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/filter/igif/decode.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 59197f1892777a5629bad210b9ed1071ed550570
Author: Caolán McNamara 
Date:   Tue Jul 14 12:43:05 2015 +0100

use same limit in ProcessOneCode as AddToTable

Change-Id: Id0345e5d867d18bf7eb341f04086226b7fa79680

diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index 2b445e9..0008f63 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -109,11 +109,9 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, 
sal_uInt8 cBufSize,
 
 bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 
nCodeFirstData )
 {
-GIFLZWTableEntry* pE;
-
 if( nTableSize < 4096 )
 {
-pE = pTable + nTableSize;
+GIFLZWTableEntry* pE = pTable + nTableSize;
 pE->pPrev = pTable + nPrevCode;
 pE->pFirst = pE->pPrev->pFirst;
 GIFLZWTableEntry *pEntry = pTable[nCodeFirstData].pFirst;
@@ -130,7 +128,6 @@ bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, 
sal_uInt16 nCodeFirst
 
 bool GIFLZWDecompressor::ProcessOneCode()
 {
-GIFLZWTableEntry*   pE;
 sal_uInt16  nCode;
 boolbRet = false;
 boolbEndOfBlock = false;
@@ -193,11 +190,11 @@ bool GIFLZWDecompressor::ProcessOneCode()
 
 nOldCode = nCode;
 
-if (nCode > 4096)
+if (nCode >= 4096)
 return false;
 
 // write character(/-sequence) of code nCode in the output buffer:
-pE = pTable + nCode;
+GIFLZWTableEntry* pE = pTable + nCode;
 do
 {
 if (pOutBufData == pOutBuf) //can't go back past start
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif |binary
 vcl/source/filter/igif/decode.cxx  |3 +++
 2 files changed, 3 insertions(+)

New commits:
commit 11fb5b5cce6ebb857bd6ede39815b37256db3e1f
Author: Caolán McNamara 
Date:   Sun Jul 12 10:56:48 2015 +0100

fix another gif import crash

Change-Id: I0ffa569e0c4240e11184df7dd56b95d87a12425d
(cherry picked from commit ee35b72064d8d1333709b102b051360018f8044b)
Reviewed-on: https://gerrit.libreoffice.org/17002
Reviewed-by: David Tardon 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif
new file mode 100644
index 000..b7265f8
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif differ
diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index 1b18f5e..2b445e9 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -193,6 +193,9 @@ bool GIFLZWDecompressor::ProcessOneCode()
 
 nOldCode = nCode;
 
+if (nCode > 4096)
+return false;
+
 // write character(/-sequence) of code nCode in the output buffer:
 pE = pTable + nCode;
 do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif |binary
 vcl/source/filter/igif/decode.cxx  |2 ++
 2 files changed, 2 insertions(+)

New commits:
commit 6029d711a7af1a68ffa8d0cb0a0bd8092984f659
Author: Caolán McNamara 
Date:   Sat Jul 11 15:31:19 2015 +0100

fix gif import crash

Change-Id: I3a5e0efef6843fb8f8b485fa2369ac5b99513c31
(cherry picked from commit 839e051c658a638a259be6a6bb091b654fac405f)
Reviewed-on: https://gerrit.libreoffice.org/17003
Reviewed-by: David Tardon 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif
new file mode 100644
index 000..860f9e1
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif differ
diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index 46a666f..1b18f5e 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -197,6 +197,8 @@ bool GIFLZWDecompressor::ProcessOneCode()
 pE = pTable + nCode;
 do
 {
+if (pOutBufData == pOutBuf) //can't go back past start
+return false;
 nOutBufDataLen++;
 *(--pOutBufData) = pE->nData;
 pE = pE->pPrev;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx  |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fdea2a41da361ee160aaeac1af47eec4499b
Author: Caolán McNamara 
Date:   Mon Jul 13 09:10:12 2015 +0100

emf: fix hang

Change-Id: I2410308ecccb8c5318a718bafadc7b40a98cb82b
(cherry picked from commit 8695633023cc321a095753db98bdc69d2aeee058)
Reviewed-on: https://gerrit.libreoffice.org/16976
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit bcf9f7c7e06ee97106b5a555a97599e6b0ed1c13)
Reviewed-on: https://gerrit.libreoffice.org/16992
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf
new file mode 100644
index 000..634fccd
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 345d06b..741ec15 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -663,7 +663,7 @@ bool EnhWMFReader::ReadEnhWMF()
 
 SAL_INFO("vcl.emf", "\tGDI comment, length: " << length);
 
-if( pWMF->good() && length >= 4 ) {
+if( pWMF->good() && length >= 4 && length <= pWMF->remainingSize() 
) {
 sal_uInt32 id;
 
 pWMF->ReadUInt32( id );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx  |4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ae58f6fcb0cc9eb83781602aabbf0a35add26f42
Author: Caolán McNamara 
Date:   Mon Jul 13 09:45:55 2015 +0100

emf: fix another hang

Change-Id: I971ba5f422827f3b8fcdb86c447fc48415225eca
(cherry picked from commit fe20502c86ef6156a54bb37ba2560c8b64d129a4)
Reviewed-on: https://gerrit.libreoffice.org/16998
Reviewed-by: David Tardon 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf
new file mode 100644
index 000..e3baf3b
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 741ec15..dcd802c 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1728,9 +1728,9 @@ bool EnhWMFReader::ReadHeader()
 
 pWMF->ReadInt32(nRecordCount);
 
-if (nRecordCount == 0)
+if (nRecordCount <= 0)
 {
-SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 
0! This shouldn't "
+SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 
<= 0! This shouldn't "
 "be possible... indicator of possible file 
corruption?");
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-1.wmf |binary
 vcl/source/filter/wmf/winwmf.cxx  |   10 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit dcc1159192182f76891625c96b1edc601d4193f8
Author: Caolán McNamara 
Date:   Fri Jul 10 08:40:42 2015 +0100

avoid endless loop with busted wmf

Change-Id: I104de360f2e861e959ad2dad434a768440877f6f
(cherry picked from commit fd2749455fe25e24b448a44f9ada6113e5ac0d13)
Reviewed-on: https://gerrit.libreoffice.org/16914
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit 55486cf648813bc0c46eaf0df2f0544a5d57ccb2)
Reviewed-on: https://gerrit.libreoffice.org/16993
Reviewed-by: David Tardon 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-1.wmf 
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-1.wmf
new file mode 100644
index 000..7ba05cb
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-1.wmf differ
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index c7d1315..5e25949 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1394,9 +1394,13 @@ void WMFReader::ReadWMF()
 }
 }
 }
-nPos += nRecSize * 2;
-if ( nPos <= nEndPos )
-pWMF->Seek( nPos  );
+const sal_uInt32 nAvailableBytes = nEndPos - nPos;
+const sal_uInt32 nMaxPossibleRecordSize = nAvailableBytes/2;
+if (nRecSize <= nMaxPossibleRecordSize)
+{
+nPos += nRecSize * 2;
+pWMF->Seek(nPos);
+}
 else
 pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - fpicker/source officecfg/registry

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx|   29 +++--
 fpicker/source/office/RemoteFilesDialog.hxx|1 
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |3 +
 officecfg/registry/data/org/openoffice/Setup.xcu   |1 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 ++
 5 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit d04b85c8f8e85bcb5c1fc05ba7e71713259b768f
Author: Szymon Kłos 
Date:   Tue Jul 14 13:10:53 2015 +0200

RemoteFilesDialog: remember last used service

Change-Id: I494b1d43d28d8e6c37ce9d391b37580be6a9be31

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index 533940d..5ea0658 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -225,6 +225,13 @@ void RemoteFilesDialog::dispose()
 {
 m_pFileView->SetSelectHdl( Link<>() );
 
+std::shared_ptr< comphelper::ConfigurationChanges > batch( 
comphelper::ConfigurationChanges::create( m_context ) );
+
+Sequence< OUString > lastService( 1 );
+lastService[0] = m_sLastServiceUrl;
+
+officecfg::Office::Common::Misc::FilePickerLastService::set( lastService, 
batch );
+
 if( m_bIsUpdated )
 {
 Sequence< OUString > placesUrlsList( m_aServices.size() );
@@ -238,12 +245,12 @@ void RemoteFilesDialog::dispose()
 ++i;
 }
 
-std::shared_ptr< comphelper::ConfigurationChanges > batch( 
comphelper::ConfigurationChanges::create( m_context ) );
 officecfg::Office::Common::Misc::FilePickerPlacesUrls::set( 
placesUrlsList, batch );
 officecfg::Office::Common::Misc::FilePickerPlacesNames::set( 
placesNamesList, batch );
-batch->commit();
 }
 
+batch->commit();
+
 m_pContainer.disposeAndClear(); // container must be first!
 m_pTreeView.disposeAndClear();
 m_pFileView.disposeAndClear();
@@ -315,6 +322,13 @@ void RemoteFilesDialog::FillServicesListbox()
 Sequence< OUString > placesUrlsList( 
officecfg::Office::Common::Misc::FilePickerPlacesUrls::get( m_context ) );
 Sequence< OUString > placesNamesList( 
officecfg::Office::Common::Misc::FilePickerPlacesNames::get( m_context ) );
 
+unsigned int nPos = 0;
+unsigned int i = 0;
+Sequence< OUString > lastService( 
officecfg::Office::Common::Misc::FilePickerLastService::get( m_context ) );
+
+if( lastService.getLength() > 0 )
+m_sLastServiceUrl = lastService[0];
+
 for( sal_Int32 nPlace = 0; nPlace < placesUrlsList.getLength() && nPlace < 
placesNamesList.getLength(); ++nPlace )
 {
 ServicePtr pService( new Place( placesNamesList[nPlace], 
placesUrlsList[nPlace], true ) );
@@ -328,12 +342,19 @@ void RemoteFilesDialog::FillServicesListbox()
 if( !sPrefix.isEmpty() )
  sPrefix += ": ";
 
+if( placesUrlsList[nPlace] == m_sLastServiceUrl )
+nPos = i;
+
 m_pServices_lb->InsertEntry( sPrefix + placesNamesList[nPlace] );
+
+i++;
 }
 }
 
 if( m_pServices_lb->GetEntryCount() > 0 )
-m_pServices_lb->SelectEntryPos( 0 );
+{
+m_pServices_lb->SelectEntryPos( nPos );
+}
 
 EnableControls();
 }
@@ -507,6 +528,8 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectServiceHdl )
 m_pTreeView->Expand( pRoot );
 
 m_pName_ed->GrabFocus();
+
+m_sLastServiceUrl = sURL;
 }
 }
 
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx 
b/fpicker/source/office/RemoteFilesDialog.hxx
index 3462305..05f9ca1 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -114,6 +114,7 @@ private:
 
 OUString m_sPath;
 OUString m_sStdDir;
+OUString m_sLastServiceUrl;
 unsigned int m_nCurrentFilter;
 
 ::com::sun::star::uno::Sequence< OUString > m_aBlackList;
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 6394722..8940778 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -568,6 +568,9 @@
 
   
 
+
+  
+
 
   
 https://www.googleapis.com/drive/v2
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index 9b17125..2a77ab1 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -898,6 +898,7 @@
 
/org.openoffice.Office.Common/Misc/UseSystemPrintDialog
 
/org.openoffice.Office.Common/Misc/FilePickerPlacesNames
 
/org.openoffice.Office.Common/Misc/FilePickerPlacesUrls
+
/org.openoffice.Office.Common/Misc/FilePickerLastService
 /org.openoffice.Office.

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - include/vcl

[Caolán McNamara]

 include/vcl/printerinfomanager.hxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 95898b6bd3ae0fc2b4c0df0a59fa07041f4940a4
Author: Caolán McNamara 
Date:   Sun Jul 12 15:56:40 2015 +0100

coverity#1311653 Uninitialized scalar field

Change-Id: Ib1cc81ce30752a3794a009ee8cae826abdb9fc03
(cherry picked from commit ca1a5ebf49d377d93c6c8c57a14d64460babf176)
Reviewed-on: https://gerrit.libreoffice.org/17001
Reviewed-by: David Tardon 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/printerinfomanager.hxx 
b/include/vcl/printerinfomanager.hxx
index 52245c4..3f1debf 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -52,8 +52,9 @@ struct PrinterInfo : JobData
 OUString m_aFeatures;
 bool m_bPapersizeFromSetup;
 
-PrinterInfo() :
-JobData()
+PrinterInfo()
+: JobData()
+, m_bPapersizeFromSetup(false)
 {}
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf |binary
 vcl/source/filter/wmf/winmtf.cxx   |   26 +
 2 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit 14a3f7c013f35be2fd8cb70610b28b23c0aa3e3a
Author: Caolán McNamara 
Date:   Mon Jul 13 08:33:50 2015 +0100

emf: test for empty polygons

Change-Id: I3c8896230e3d48a37f4b8d702b0f673e44f45ba4
(cherry picked from commit 7df4d8544c6b12e31bcb81d9389d03ae7c11bfea)
Reviewed-on: https://gerrit.libreoffice.org/16999
Reviewed-by: David Tardon 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf
new file mode 100644
index 000..6adabec
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf differ
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index f14f934..20e2b5c 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1294,18 +1294,22 @@ void WinMtfOutput::DrawPolyLine( Polygon& rPolygon, 
bool bTo, bool bRecordPath )
 {
 UpdateClipRegion();
 
-ImplMap( rPolygon );
-if ( bTo )
-{
-rPolygon[ 0 ] = maActPos;
-maActPos = rPolygon[ rPolygon.GetSize() - 1 ];
-}
-if ( bRecordPath )
-aPathObj.AddPolyLine( rPolygon );
-else
+sal_uInt16 nPoints = rPolygon.GetSize();
+if (nPoints >= 1)
 {
-UpdateLineStyle();
-mpGDIMetaFile->AddAction( new MetaPolyLineAction( rPolygon, 
maLineStyle.aLineInfo ) );
+ImplMap( rPolygon );
+if ( bTo )
+{
+rPolygon[ 0 ] = maActPos;
+maActPos = rPolygon[ rPolygon.GetSize() - 1 ];
+}
+if ( bRecordPath )
+aPathObj.AddPolyLine( rPolygon );
+else
+{
+UpdateLineStyle();
+mpGDIMetaFile->AddAction( new MetaPolyLineAction( rPolygon, 
maLineStyle.aLineInfo ) );
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm |   12 
 vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm | 2011 +
 vcl/qa/cppunit/graphicfilter/filters-test.cxx  |4 
 vcl/source/filter/ixbm/xbmread.cxx |2 
 4 files changed, 2028 insertions(+), 1 deletion(-)

New commits:
commit cd501c499743897254e0fa1ca821053b0b36a977
Author: Caolán McNamara 
Date:   Sat Jul 11 17:23:06 2015 +0100

fix and test for xbm import crash

Change-Id: I47e7cb259908ffc6a00475369af1a841acda1da7
(cherry picked from commit 7eb693f87b6a01044999564cce0a18fefca11c99)
Reviewed-on: https://gerrit.libreoffice.org/17004
Reviewed-by: David Tardon 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/fail/.gitignore 
b/vcl/qa/cppunit/graphicfilter/data/xbm/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm 
b/vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm
new file mode 100644
index 000..9d2a434
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm
@@ -0,0 +1,12 @@
+#define?te_width 31
+#define te_height = {
+   0x0e, 0x20, 0x02, 0x38, 0x11, 0x70, 0x07, 0x 0x44,
+   0x11, 1x2e, 0x3a, 0x44, 0x8e, 0x24, 0x92, 0x38, 0xdf, 0x25, 0xd2,0x7d,
+   0x91, 0x24 0x92, 0x44, 0x95: 0x24, 0x92, 0x54, 0xf5, 0x7f, 0xff, 0x57,
+   0x95, 0x24, 0x92, 0x54, 0x95, 0x 4,54, 0x95, 0x24, 0x92, 0x54,
+   0x95, 0x24,x54, 0x95, 0x24, 0x92, 0x54, 0x95, 0x24, 0x92, 0x54,
+   0x95, 0x24, 0x92, 0x54, 0x95, 0x24, 0x92,0x54, 0x95, 0x24, 0x92, 0x54,
+   0x95, 0x24,ÏÏÏ 0x92, 0x54, 0x95, 0x24, 0x92, 0x54, 0xf5, 0x7f, 0xff, 
0x57,
+   0x95,0x24, 0x92, 0x54, 0x95, 0x24, 0x92, 0x54, 0, 0x54, 0xf5, 0xd= {
+ 25, 0xd2, 0x7d,
+0x00, 0x7c };
\ No newline at end of file
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/indeterminate/.gitignore 
b/vcl/qa/cppunit/graphicfilter/data/xbm/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/pass/.gitignore 
b/vcl/qa/cppunit/graphicfilter/data/xbm/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm 
b/vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm
new file mode 100755
index 000..aad9f03
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm
@@ -0,0 +1,2011 @@
+#define Grafix1_width 485
+#define Grafix1_height 395
+static char Grafix1_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0xc0, 0x01,

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx   |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 346fa5ada6a976969a19389531fc8671f6a40643
Author: Caolán McNamara 
Date:   Sun Jul 12 21:07:21 2015 +0100

emf: test for negative numbers

Change-Id: I9d9b6f3e9592ca7b85cee5422e43d4ca46b8bb36
(cherry picked from commit 4661b2dd34bd7c56b6d783d49f265e9ecde19caa)
Reviewed-on: https://gerrit.libreoffice.org/17000
Reviewed-by: David Tardon 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf
new file mode 100644
index 000..bbc0285
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index f02871d..345d06b 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1441,7 +1441,7 @@ bool EnhWMFReader::ReadEnhWMF()
 DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) 
== 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
 
 Point aPos( ptlReferenceX, ptlReferenceY );
-if ( nLen && nLen < static_cast( SAL_MAX_UINT32 
/ sizeof(sal_Int32) ) )
+if ( nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
 {
 if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= 
nNextPos ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 wizards/com/sun/star/wizards/web/WWD_Events.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2f0d1a23759c1b973593bfba642d01fb3df3c269
Author: Julien Nabet 
Date:   Sat Jul 4 16:20:32 2015 +0200

tdf#92404: Web Wizard - no result / crash

Fixes
Traceback (most recent call last):
  File 
"/home/laci/m/bibisect/lo-linux-dbgutil-daily/opt/program/wizards/web/WWD_Events.py",
 line 249, in addDocument
oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, self)
TypeError: __init__() missing 1 required positional argument: 'parent_'

and:
Traceback (most recent call last):
  File 
"/home/julien/compile-libreoffice/libreoffice/instdir/program/wizards/web/WWD_Events.py",
 line 252, in addDocument
oLoadDocs.loadDocuments()
  File 
"/home/julien/compile-libreoffice/libreoffice/instdir/program/wizards/web/WWD_Events.py",
 line 934, in loadDocuments
doc.cp_URL = FileAccess.connectURLs(files[0], self.files[i])
NameError: global name 'files' is not defined

Change-Id: I737117a6981e541f12453bb9d9b2680f5fb79142
Reviewed-on: https://gerrit.libreoffice.org/16756
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py 
b/wizards/com/sun/star/wizards/web/WWD_Events.py
index fbe439a..eaca38d 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -246,7 +246,7 @@ class WWD_Events(WWD_Startup):
 sd = self.getStatusDialog()
 sd.setLabel(self.resources.resValidatingDocuments)
 sd.execute(self, task, self.resources.prodName)
-oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, 
self)
+oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, 
task, self)
 oLoadDocs.loadDocuments()
 task.removeTaskListener(sd)
 else:
@@ -926,7 +926,7 @@ class WWD_Events(WWD_Startup):
 if start == 0:
 doc.cp_URL = self.files[i]
 else:
-doc.cp_URL = FileAccess.connectURLs(files[0], 
self.files[i])
+doc.cp_URL = FileAccess.connectURLs(self.files[0], 
self.files[i])
 
 '''
 so - i check each document and if it is ok I add it.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-4' - source/text

[Andras Timar]

 source/text/shared/01/01070001.xhp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9b9960279d36f9bfcfd898108b556838da21aa85
Author: Andras Timar 
Date:   Tue Jul 14 09:27:11 2015 +0200

tdf#92684 embed places section instead of the deleted defaultdir section

Change-Id: I2e360913ca041996c2fe5638a992d1f999e3b67f
(cherry picked from commit 053cee1d890e225245b9d8004ab94cf27b1a9621)
Reviewed-on: https://gerrit.libreoffice.org/17030
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/source/text/shared/01/01070001.xhp 
b/source/text/shared/01/01070001.xhp
index 2a05122..ec00edf 100644
--- a/source/text/shared/01/01070001.xhp
+++ b/source/text/shared/01/01070001.xhp
@@ -47,8 +47,7 @@
 
 Create New Directory
 
-Default Directory
-
+
 Display area
 
 File Name
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - helpcontent2

[Andras Timar]

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

New commits:
commit 3d167a7e0e15403e3bd390c612fd4bc163975a37
Author: Andras Timar 
Date:   Tue Jul 14 09:27:11 2015 +0200

Updated core
Project: help  9b9960279d36f9bfcfd898108b556838da21aa85

tdf#92684 embed places section instead of the deleted defaultdir section

Change-Id: I2e360913ca041996c2fe5638a992d1f999e3b67f
(cherry picked from commit 053cee1d890e225245b9d8004ab94cf27b1a9621)
Reviewed-on: https://gerrit.libreoffice.org/17030
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/helpcontent2 b/helpcontent2
index 172c582..9b99602 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 172c582a5c6f5f93997d99872114f9f1b2c6e415
+Subproject commit 9b9960279d36f9bfcfd898108b556838da21aa85
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - helpcontent2

[Andras Timar]

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

New commits:
commit a5266c84adae943c988ed3e2c797a6c610b36cca
Author: Andras Timar 
Date:   Tue Jul 14 09:27:11 2015 +0200

Updated core
Project: help  df04396f17c0ed2d76bc10f60fda61fc1ee34ce5

tdf#92684 embed places section instead of the deleted defaultdir section

Change-Id: I2e360913ca041996c2fe5638a992d1f999e3b67f
(cherry picked from commit 053cee1d890e225245b9d8004ab94cf27b1a9621)
Reviewed-on: https://gerrit.libreoffice.org/17029
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/helpcontent2 b/helpcontent2
index 176f822..df04396 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 176f822e7a3569ffeb3026df7fc074fd8c0163cc
+Subproject commit df04396f17c0ed2d76bc10f60fda61fc1ee34ce5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-5-0' - source/text

[Andras Timar]

 source/text/shared/01/01070001.xhp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit df04396f17c0ed2d76bc10f60fda61fc1ee34ce5
Author: Andras Timar 
Date:   Tue Jul 14 09:27:11 2015 +0200

tdf#92684 embed places section instead of the deleted defaultdir section

Change-Id: I2e360913ca041996c2fe5638a992d1f999e3b67f
(cherry picked from commit 053cee1d890e225245b9d8004ab94cf27b1a9621)
Reviewed-on: https://gerrit.libreoffice.org/17029
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/source/text/shared/01/01070001.xhp 
b/source/text/shared/01/01070001.xhp
index 2a05122..ec00edf 100644
--- a/source/text/shared/01/01070001.xhp
+++ b/source/text/shared/01/01070001.xhp
@@ -47,8 +47,7 @@
 
 Create New Directory
 
-Default Directory
-
+
 Display area
 
 File Name
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-5-0-0' - sl_SI/description.xml sl_SI/README_th_sl_SI.txt sl_SI/th_sl_SI_v2.dat

[Andras Timar]

 sl_SI/README_th_sl_SI.txt |4 
 sl_SI/description.xml |4 
 sl_SI/th_sl_SI_v2.dat | 1954 +++---
 3 files changed, 1523 insertions(+), 439 deletions(-)

New commits:
commit 6fdfef4b1255fae6716ab3a789e3247586e27763
Author: Andras Timar 
Date:   Mon Jul 13 23:55:57 2015 +0200

Updated Slovenian thesaurus

Change-Id: If822610ad6d9eca02629959cf8040fe1680f8140
(cherry picked from commit a06da898df0371577c5c2466480f6c807e6c211f)
Reviewed-on: https://gerrit.libreoffice.org/17027
Reviewed-by: David Tardon 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sl_SI/README_th_sl_SI.txt b/sl_SI/README_th_sl_SI.txt
index a90862c..396fef0 100644
--- a/sl_SI/README_th_sl_SI.txt
+++ b/sl_SI/README_th_sl_SI.txt
@@ -2,7 +2,7 @@ The Slovenian thesaurus is developed as a part of project/
 Slovenski tezaver nastaja v okviru projekta:
OdprtiTezaver (www.tezaver.si)
 This dictionary pack includes version/Paket vsebuje različico:
-   1.7.17000
+   1.7.17500
 Thesaurus managed and edited by/Tezaver pripravlja in ureja:
Martin Srebotnjak (miles at filmsi net)
 Thesaurus data licensed under both/Podatki tezavra so izdani pod licencama:
@@ -18,7 +18,7 @@ Bug report/O napakah poročajte:
 http://external.openoffice.org/ form data:
 
 Product Name: Slovenian thesaurus
-Product Version: 1.7.17000
+Product Version: 1.7.17500
 Vendor or Owner Name: Martin Srebotnjak
 Vendor or Owner Contact: mi...@filmsi.net
 OpenOffice.org Contact: fil...@openoffice.org
diff --git a/sl_SI/description.xml b/sl_SI/description.xml
index 07b658b..85cab19 100644
--- a/sl_SI/description.xml
+++ b/sl_SI/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 Slovenian spelling dictionary, hyphenation rules, 
and thesaurus
@@ -10,6 +10,6 @@
 
 
 
-http://sl.libreoffice.org/slovenjenje-2/jezikovne-razsiritve/"; 
lang="sl-SI">sl.libreoffice.org
+http://sl.libreoffice.org/skupnost/slovenjenje/jezikovne-razsiritve/";
 lang="sl-SI">sl.libreoffice.org
 
 
diff --git a/sl_SI/th_sl_SI_v2.dat b/sl_SI/th_sl_SI_v2.dat
index f1a6a7c..2971d0f 100644
--- a/sl_SI/th_sl_SI_v2.dat
+++ b/sl_SI/th_sl_SI_v2.dat
@@ -37,7 +37,8 @@ ISO8859-2
 (sam.)|prvenstvo
 ¹ank|1
 (sam.)|¹ank (pogovorno)|toèilna miza|toèilni pult
-¹ansa|1
+¹ansa|2
+(sam.)|¹ansa (pogovorno)|izgled|mo¾nost|mogoèost|obet|upanje
 (sam.)|¹ansa (pogovorno)|prilika|prilo¾nost
 ¹anson|1
 (sam.)|chanson|pesem|popevka
@@ -47,12 +48,14 @@ ISO8859-2
 (sam.)|¹antavost (slab¹alno)|¹epavost|kruljavost (ekspresivno)
 ¹apa|1
 (sam.)|taca
+¹ar¾a|1
+(sam.)|¹ar¾a (zastarelo)|èin
 ¹ar¾er|1
 (sam.)|okvir
 ¹ariti|1
 (gl.)|brèkati|brkljariti (ekspresivno)|brkljati (pogovorno)|brskati|stikati
 ¹arm|1
-(sam.)|dra¾|dra¾est|mik|mikavnost|oèarljivost|privlaènost
+(sam.)|dra¾|dra¾est|ljubkost|mik|mikavnost|oèarljivost|privlaènost
 ¹arnir|1
 (sam.)|zapirnica
 ¹arovit|1
@@ -65,6 +68,8 @@ ISO8859-2
 (gl.)|¹u¹njati
 ¹èavje|1
 (sam.)|¹avje
+¹èebljati|1
+(gl.)|èebljati
 ¹èegetavèek|1
 (sam.)|klitoris
 ¹èetka|1
@@ -84,7 +89,7 @@ ISO8859-2
 ¹enk|1
 (sam.)|¹enk (pogovorno)|dar|darilo|naklonilo (zastarelo)|naklonitev 
(zastarelo)|podarek (zastarelo)|poklon (zastarelo)|poklonilo 
(zastarelo)|poklonitev (zastarelo)|poklonstvo (zastarelo)|prezent 
(zastarelo)|vezilo (zastarelo)
 ¹ent|1
-(sam.)|¹ment|hudiè|hudiman|hudimar|hudir|parkelj|peklen¹èek|rogaè|satan|sku¹njavec|vrag|vragec|vranè|zlobec|zlodej
+(sam.)|¹ment|hudiè|hudiman|hudimar|hudir|hudnik|parkelj|peklen¹èek|rogaè|satan|sku¹njavec|vrag|vragec|vranè|zlobec|zlodej
 ¹entjan¾evka|1
 (sam.)|Hypericum perforatum (strokovno)|krènica|krvavec
 ¹epast|1
@@ -143,13 +148,16 @@ ISO8859-2
 (sam.)|¹pièenje (pogovorno)|ostrenje
 ¹initi|1
 (gl.)|¹vigniti|blisniti (ekspresivno)
+¹ipkova u¹ica|1
+(sam.)|Macrosiphon rosae (strokovno)
 ¹iptarski|1
 (prid.)|albanski
 ¹iren|1
 (prid.)|¹iro¹iren (ekspresivno)|obse¾en|prostran
 ¹irjava|1
 (sam.)|prostranstvo|vse¹ir
-¹irjenje|1
+¹irjenje|2
+(sam.)|dilatacija|raz¹irjanje
 (sam.)|iradiacija|raz¹irjanje
 ¹iro¹iren|1
 (prid.)|¹iren|¹iro¹iren (ekspresivno)|obse¾en|prostran
@@ -172,7 +180,7 @@ ISO8859-2
 ¹irokoustnost|1
 (sam.)|¹irokoustnost (ekspresivno)|bahavost|hvalisavost|razustnost
 ¹kandalozen|1
-(prid.)|¹kandalozen (ekspresivno)|grozen 
(ekspresivno)|nekvaliteten|neprebavljiv (ekspresivno)|neu¾iten 
(ekspresivno)|neznosen|obupen|po¹asten (ekspresivno)|slab|stra¹en (ekspresivno)
+(prid.)|¹kandalozen (ekspresivno)|grozen 
(ekspresivno)|hud|nekvaliteten|neprebavljiv (ekspresivno)|neu¾iten 
(ekspresivno)|neznosen|obupen|po¹asten (ekspresivno)|slab|srep|stra¹en 
(ekspresivno)
 ¹kant|1
 (sam.)|¹kant (zastarelo)|¹kripalo (slab¹alno)|gosli|violina
 ¹karjevec|1
@@ -187,6 +195,10 @@ ISO8859-2
 (prid.)|¹kilav|kri¾emgled|krivogled|prekogled (zastarelo)
 ¹kilav|1
 (p

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - dictionaries

[Andras Timar]

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

New commits:
commit 4f60b3bcde456c8c6f1f55193bb662366f703dbb
Author: Andras Timar 
Date:   Mon Jul 13 23:55:57 2015 +0200

Updated core
Project: dictionaries  6fdfef4b1255fae6716ab3a789e3247586e27763

Updated Slovenian thesaurus

Change-Id: If822610ad6d9eca02629959cf8040fe1680f8140
(cherry picked from commit a06da898df0371577c5c2466480f6c807e6c211f)
Reviewed-on: https://gerrit.libreoffice.org/17027
Reviewed-by: David Tardon 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dictionaries b/dictionaries
index 2d64c57..6fdfef4 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 2d64c57a4375fe489b16c358ce38848c938bc201
+Subproject commit 6fdfef4b1255fae6716ab3a789e3247586e27763
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 forms/source/component/clickableimage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c5498ec5ee478e27fd62bdcf9de1208c692422c
Author: Noel Grandin 
Date:   Tue Jul 14 12:37:13 2015 +0200

fix windows build

Change-Id: I505b7b0e6bf86093fbed1aa7e28b710e12116e6e

diff --git a/forms/source/component/clickableimage.cxx 
b/forms/source/component/clickableimage.cxx
index 77c2410..bef40ab 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -866,7 +866,7 @@ namespace frm
 }
 else
 {
-m_xGraphicObject = GraphicObject::create( m_xContext );
+m_xGraphicObject = css::graphic::GraphicObject::create( m_xContext 
);
 m_xGraphicObject->setGraphic( xGraphic );
 }
 return 1L;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Multiselection needs work?

[Michael Meeks]

On Mon, 2015-07-13 at 23:30 +0200, Julien Nabet wrote:
> I thought about a step by step/commit by commit process to change 
> getFiles, and if necessary getSelectedFiles first, then unwinding each 
> use of getFiles and submit a patch for each one.
> Do you think it could be a problem?

Sounds lovely to me =)

Thanks !

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

About fix for tdf#82744: WebDAV LOCK is released when document is saved

[Giuseppe Castagno]

Hi all,

while implementing a fix for:

https://bugs.documentfoundation.org/show_bug.cgi?id=82744

using ideas from a similar patch I proposed in AOO:
https://bz.apache.org/ooo/show_bug.cgi?id=126305

I came across a comment on top of method 
SfxMedium::ShowLockedDocumentDialog.


The comment states that lock/unlock should be put in the relevant ucb 
component.


Unfortunately I started implementing the fix managing the WebDAV 
lock/unlock from the framework instead.


Implementing the same thing directly in ucb/webdav appears difficult, 
because I didn't find there anything that has a lifetime usable for 
lock/unlock.


So, given the two choices:

1) do I continue to implement the fix in framework, hopefully finishing 
it in few days, or


2) do I start studying what to rewrite in webdav ucb component in order 
to support the lock/unlock directly there, in this case I have no idea 
what to to ATM; it can take some time to work out a suitable solution.


What would be the best course of action?

--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Stahl]

 include/framework/ContextChangeEventMultiplexerTunnel.hxx |   24 ++
 1 file changed, 24 insertions(+)

New commits:
commit 8a1e063aaff5244171f5b9164980a027b734
Author: Michael Stahl 
Date:   Tue Jul 14 12:22:18 2015 +0200

oops, forgot to add new header file

Change-Id: I83ce7cb1b06ad69250aee48e9a8c1167ae7ef239

diff --git a/include/framework/ContextChangeEventMultiplexerTunnel.hxx 
b/include/framework/ContextChangeEventMultiplexerTunnel.hxx
new file mode 100644
index 000..efa2db5
--- /dev/null
+++ b/include/framework/ContextChangeEventMultiplexerTunnel.hxx
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+
+namespace framework {
+
+// this is pretty horrible, don't use it!
+FWE_DLLPUBLIC css::uno::Reference
+GetFirstListenerWith(
+css::uno::Reference const& xEventFocus,
+std::function const&)> const& 
rPredicate);
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: accessibility/inc compilerplugins/clang framework/inc framework/source include/svtools svtools/inc svtools/source

[Noel Grandin]

 accessibility/inc/accessibility/extended/AccessibleGridControl.hxx |   18 -
 compilerplugins/clang/unusedmethods.cxx|2 
 framework/inc/uielement/fontmenucontroller.hxx |1 
 framework/inc/uielement/fontsizemenucontroller.hxx |1 
 framework/inc/uielement/headermenucontroller.hxx   |1 
 framework/inc/uielement/langselectionmenucontroller.hxx|1 
 framework/inc/uielement/macrosmenucontroller.hxx   |1 
 framework/source/uielement/controlmenucontroller.cxx   |   13 -
 framework/source/uielement/fontmenucontroller.cxx  |8 
 framework/source/uielement/fontsizemenucontroller.cxx  |9 
 framework/source/uielement/headermenucontroller.cxx|8 
 framework/source/uielement/langselectionmenucontroller.cxx |   32 ---
 framework/source/uielement/macrosmenucontroller.cxx|   16 -
 framework/source/uielement/objectmenucontroller.cxx|   10 -
 include/svtools/accessibilityoptions.hxx   |2 
 include/svtools/accessibletable.hxx|   14 -
 include/svtools/accessibletableprovider.hxx|2 
 include/svtools/addresstemplate.hxx|1 
 include/svtools/apearcfg.hxx   |1 
 include/svtools/asynclink.hxx  |2 
 include/svtools/brwbox.hxx |   10 -
 include/svtools/calendar.hxx   |   58 
--
 include/svtools/ctrlbox.hxx|   43 +---
 include/svtools/ctrltool.hxx   |2 
 include/svtools/dialogcontrolling.hxx  |1 
 include/svtools/editbrowsebox.hxx  |6 
 include/svtools/editimplementation.hxx |7 
 include/svtools/filectrl.hxx   |   15 -
 include/svtools/fileview.hxx   |1 
 include/svtools/fmtfield.hxx   |4 
 include/svtools/framestatuslistener.hxx|1 
 include/svtools/grfmgr.hxx |3 
 include/svtools/headbar.hxx|   16 -
 include/svtools/hyperlabel.hxx |5 
 include/svtools/imapcirc.hxx   |3 
 include/svtools/imapobj.hxx|   20 --
 include/svtools/imappoly.hxx   |5 
 include/svtools/imaprect.hxx   |3 
 include/svtools/inetimg.hxx|   12 -
 include/svtools/ivctrl.hxx |   20 --
 include/svtools/miscopt.hxx|3 
 include/svtools/parhtml.hxx|7 
 include/svtools/parrtf.hxx |5 
 include/svtools/popupmenucontrollerbase.hxx|1 
 include/svtools/prnsetup.hxx   |1 
 include/svtools/ruler.hxx  |   21 --
 include/svtools/simptabl.hxx   |9 
 include/svtools/stdmenu.hxx|6 
 include/svtools/svlbitm.hxx|8 
 include/svtools/svparser.hxx   |   13 -
 include/svtools/svtabbx.hxx|1 
 include/svtools/tabbar.hxx |   16 -
 include/svtools/table/tableinputhandler.hxx|4 
 include/svtools/table/tablemodel.hxx   |   77 

 include/svtools/toolpanelopt.hxx   |2 
 include/svtools/transfer.hxx   |   23 +-
 include/svtools/treelist.hxx   |4 
 include/svtools/treelistbox.hxx|   10 -
 include/svtools/treelistentry.hxx  |1 
 include/svtools/valueset.hxx   |   51 +
 include/svtools/wizardmachine.hxx  |3 
 include/svtools/wizdlg.hxx |7 
 include/svtools/xwindowitem.hxx|1 
 svtools/inc/table/defaultinputhandler.hxx  |4 
 svtools/inc/table/tablecontrol.hxx |   28 ---
 svtools

Re: Gerrit: Reliability and fidelity of verification results

[Norbert Thiebaud]

On Tue, Jul 14, 2015 at 3:49 AM, David Tardon  wrote:
> Hi,
>
> On Mon, Jul 13, 2015 at 04:51:01PM -0500, Norbert Thiebaud wrote:
>> Do not get me wrong. I applaud the effort to get rid of boost if we
>> can.. that is a big and expensive dep.
>
> Except that I doubt we'll ever be able to do that. boost is used not
> only by libreoffice, but also by many bundled libs. And there is a lot
> of it used that'll hardly ever have an equivalent in the std. library.

Then that make the notion of dropping maverick only to be able to go
from boost::bind to std::
even less appealing.

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

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

[Michael Stahl]

 framework/inc/helper/mischelper.hxx |   12 +++
 framework/source/fwe/classes/sfxhelperfunctions.cxx |   10 ++
 framework/source/fwi/helper/mischelper.cxx  |   15 +++
 framework/source/services/ContextChangeEventMultiplexer.cxx |   47 +++-
 include/sfx2/sidebar/SidebarController.hxx  |9 --
 sfx2/source/sidebar/SidebarController.cxx   |   27 +-
 6 files changed, 90 insertions(+), 30 deletions(-)

New commits:
commit 9be8c4f21200aeec5b334d9536b3b7a0b72c24fa
Author: Michael Stahl 
Date:   Mon Jul 13 18:54:17 2015 +0200

sfx2: remove the global SidebarController::maSidebarControllerContainer

This global was crashing on exit, unsurprising as it contains UNO
services that reference VCL objects.

It turns out that there is already a UNO singleton
framework::ContextChangeEventMultiplexer that effectively contains this
mapping already, so try to hook that up without creating a public API of
it, which is made quite a bit harder by framework's inexplicable
multitude of libraries.

Change-Id: I4baf67b42c630191fa8879d650eeb62520c331a5

diff --git a/framework/inc/helper/mischelper.hxx 
b/framework/inc/helper/mischelper.hxx
index 6aa0015..7f45aa6 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -36,6 +37,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 namespace framework
@@ -304,6 +306,16 @@ class WeakDocumentEventListener : public 
::cppu::WeakImplHelper1
+GetFirstListenerWith_Impl(
+css::uno::Reference const& xEventFocus,
+std::function const&)> const& 
rPredicate);
+
+FWI_DLLPUBLIC extern auto (*g_pGetMultiplexerListener)(
+css::uno::Reference const&,
+std::function const&)> const&)
+-> css::uno::Reference;
+
 } // namespace framework
 
 #endif // INCLUDED_FRAMEWORK_INC_HELPER_MISCHELPER_HXX
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx 
b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index a1f0826..c04105c 100644
--- a/framework/source/fwe/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -18,6 +18,8 @@
  */
 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -163,6 +165,14 @@ void SAL_CALL ActivateToolPanel( const 
::com::sun::star::uno::Reference< ::com::
 (*pActivator)( i_rFrame, i_rPanelURL );
 }
 
+using namespace ::com::sun::star;
+uno::Reference GetFirstListenerWith(
+uno::Reference const& xEventFocus,
+std::function 
const&)> const& rPredicate)
+{
+return GetFirstListenerWith_Impl(xEventFocus, rPredicate);
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/helper/mischelper.cxx 
b/framework/source/fwi/helper/mischelper.cxx
index 5b1e15f..06cc061 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -212,6 +212,21 @@ void FillLangItems( std::set< OUString > &rLangItems,
 }
 }
 
+auto (*g_pGetMultiplexerListener)(
+uno::Reference const&,
+std::function 
const&)> const&)
+-> uno::Reference = nullptr;
+
+uno::Reference
+GetFirstListenerWith_Impl(
+uno::Reference const& xEventFocus,
+std::function 
const&)> const& rPredicate)
+{
+assert(g_pGetMultiplexerListener != nullptr); // should not be called too 
early, nor too late
+return g_pGetMultiplexerListener(xEventFocus, rPredicate);
+}
+
+
 } // namespace framework
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx 
b/framework/source/services/ContextChangeEventMultiplexer.cxx
index 6fe88ee..d672704 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 #include 
@@ -88,7 +90,6 @@ public:
 const css::lang::EventObject& rEvent)
 throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 
-private:
 typedef 
::std::vector > 
ListenerContainer;
 class FocusDescriptor
 {
@@ -362,6 +363,50 @@ struct Singleton:
 
 }
 
+namespace framework {
+
+// right now we assume there's one matching listener
+uno::Reference GetFirstListenerWith_ImplImpl(
+uno::Reference const& xEventFocus,
+std::function 
const&)> const& rPredicate)
+{
+assert(xEventFocus.is()); // in current usage it's a bug if the 
XController is null here
+uno::Reference xRet;
+
+ContextChangeEventMultiplexer *const pMultiplexer(
+dynamic_cast(Singleton::get().instance.get()));
+assert(pMultiplexer);
+
+ContextChangeEventMultiplexer::FocusDescriptor const*const 
pFocusDescriptor(
+pMultiplexer->GetFocusDescriptor(xEventFocus, false));
+if (!pFocusDescript

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

[Noel Grandin]

 include/toolkit/awt/scrollabledialog.hxx   |8 
 include/toolkit/awt/vclxgraphics.hxx   |2 --
 include/toolkit/awt/vclxregion.hxx |1 -
 include/toolkit/awt/vclxtopwindow.hxx  |3 +--
 include/toolkit/controls/controlmodelcontainerbase.hxx |1 -
 include/toolkit/controls/unocontrols.hxx   |2 --
 package/source/zipapi/MemoryByteGrabber.hxx|   15 ---
 toolkit/inc/helper/unowrapper.hxx  |   16 
 8 files changed, 1 insertion(+), 47 deletions(-)

New commits:
commit a792aa2c48490e43f7460c7418048d32dc891a62
Author: Noel Grandin 
Date:   Tue Jul 14 10:25:32 2015 +0200

loplugin:unusedmethods toolkit,package

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

diff --git a/include/toolkit/awt/scrollabledialog.hxx 
b/include/toolkit/awt/scrollabledialog.hxx
index a085e65..42b70fe 100644
--- a/include/toolkit/awt/scrollabledialog.hxx
+++ b/include/toolkit/awt/scrollabledialog.hxx
@@ -31,13 +31,9 @@ namespace toolkit
 public:
 virtual ~ScrollableInterface() {}
 virtual voidSetScrollWidth( long nWidth ) = 0;
-virtual longGetScrollWidth() = 0;
 virtual voidSetScrollHeight( long nHeight ) = 0;
-virtual longGetScrollHeight() = 0;
 virtual voidSetScrollLeft( long nLeft ) = 0;
-virtual longGetScrollLeft() = 0;
 virtual voidSetScrollTop( long Top ) = 0;
-virtual longGetScrollTop() = 0;
 };
 
   template < class T >
@@ -61,13 +57,9 @@ namespace toolkit
 virtual ~ScrollableWrapper();
 virtual void dispose() SAL_OVERRIDE;
 virtual voidSetScrollWidth( long nWidth ) SAL_OVERRIDE;
-virtual longGetScrollWidth() SAL_OVERRIDE { return 
maScrollArea.Width(); }
 virtual voidSetScrollHeight( long nHeight ) SAL_OVERRIDE;
-virtual longGetScrollHeight() SAL_OVERRIDE { return 
maScrollArea.Height(); }
 virtual voidSetScrollLeft( long nLeft ) SAL_OVERRIDE;
-virtual longGetScrollLeft() SAL_OVERRIDE { return mnScrollPos.X(); 
}
 virtual voidSetScrollTop( long Top ) SAL_OVERRIDE;
-virtual longGetScrollTop() SAL_OVERRIDE { return mnScrollPos.Y() ; 
}
 
 void setScrollVisibility( ScrollBarVisibility rState );
 DECL_LINK( ScrollBarHdl, ScrollBar* );
diff --git a/include/toolkit/awt/vclxgraphics.hxx 
b/include/toolkit/awt/vclxgraphics.hxx
index fdd3d40..547e096 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -84,8 +84,6 @@ public:
 voidSetOutputDevice( OutputDevice* pOutDev );
 OutputDevice*   GetOutputDevice() const { return mpOutputDevice; }
 
-const vcl::Font&  GetFont() const { return maFont; }
-
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any  SAL_CALL queryInterface( const 
::com::sun::star::uno::Type & rType ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 voidSAL_CALL acquire() throw() 
SAL_OVERRIDE  { OWeakObject::acquire(); }
diff --git a/include/toolkit/awt/vclxregion.hxx 
b/include/toolkit/awt/vclxregion.hxx
index 1206a4f..599b9b7 100644
--- a/include/toolkit/awt/vclxregion.hxx
+++ b/include/toolkit/awt/vclxregion.hxx
@@ -49,7 +49,6 @@ public:
 VCLXRegion();
 virtual ~VCLXRegion();
 
-voidSetRegion( const vcl::Region& rRegion )  { maRegion = 
rRegion; }
 const vcl::Region&   GetRegion() const   { return 
maRegion; }
 
 // ::com::sun::star::uno::XInterface
diff --git a/include/toolkit/awt/vclxtopwindow.hxx 
b/include/toolkit/awt/vclxtopwindow.hxx
index a8b5e2b..890d731 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -42,9 +42,8 @@ private:
 const bool  m_bWHWND;
 
 protected:
-  ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar> 
mxMenuBar;
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar> 
mxMenuBar;
 
-bool isSystemDependentWindowPeer() const { return m_bWHWND; }
 
 virtual vcl::Window* GetWindowImpl() = 0;
 virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() = 0;
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx 
b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 0d44bc3..091a7e2 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -216,7 +216,6 @@ typedef ::cppu::AggImplInheritanceHelper3   < 
UnoControlContainer
 
 class ControlContainerBase : public ContainerControl_IBase
 {
-::Size ImplGetSizePixel( const ::Size

[Libreoffice-commits] core.git: filter/CppunitTest_filter_utils.mk

[Stephan Bergmann]

 filter/CppunitTest_filter_utils.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit bd8e8db250f99445dc1a8baa7ffc6ddfe90fdf5b
Author: Stephan Bergmann 
Date:   Tue Jul 14 10:52:31 2015 +0200

Missing boost_headers

Change-Id: Ie42c10d09a7b6194919e57e88022e05e4cbd7016

diff --git a/filter/CppunitTest_filter_utils.mk 
b/filter/CppunitTest_filter_utils.mk
index 4735abb..d719b60 100644
--- a/filter/CppunitTest_filter_utils.mk
+++ b/filter/CppunitTest_filter_utils.mk
@@ -14,6 +14,10 @@ $(eval $(call gb_CppunitTest_use_ure,filter_utils))
 
 $(eval $(call gb_CppunitTest_use_configuration,filter_utils))
 
+$(eval $(call gb_CppunitTest_use_externals,filter_utils, \
+boost_headers \
+))
+
 $(eval $(call gb_CppunitTest_use_libraries,filter_utils, \
comphelper \
unotest \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit: Reliability and fidelity of verification results

[David Tardon]

Hi,

On Mon, Jul 13, 2015 at 04:51:01PM -0500, Norbert Thiebaud wrote:
> Do not get me wrong. I applaud the effort to get rid of boost if we
> can.. that is a big and expensive dep.

Except that I doubt we'll ever be able to do that. boost is used not
only by libreoffice, but also by many bundled libs. And there is a lot
of it used that'll hardly ever have an equivalent in the std. library.

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

[Libreoffice-commits] core.git: 2 commits - filter/CppunitTest_filter_utils.mk filter/Module_filter.mk filter/qa filter/source forms/source sw/qa

[Zolnai Tamás]

 filter/CppunitTest_filter_utils.mk |   41 +++
 filter/Module_filter.mk|1 
 filter/qa/cppunit/utils-test.cxx   |   77 +
 filter/source/msfilter/util.cxx|   70 +-
 forms/source/component/clickableimage.cxx  |   21 +++
 forms/source/component/clickableimage.hxx  |5 +
 sw/qa/extras/globalfilter/globalfilter.cxx |   24 -
 7 files changed, 226 insertions(+), 13 deletions(-)

New commits:
commit 16f9cf57e20ffbe34cb184f694f465708250a578
Author: Zolnai Tamás 
Date:   Tue Jul 14 09:44:10 2015 +0200

tdf#92471: Improve color conversion to MSO highlighting

The simple color distance on RGB color space is not good enough.
It leads to a better result if we use the scheme of the primary
colors.
This method works well with MSO highlighting color palette, but
not neccessarily in general. In highlighting palette light and
dark variant of the same color type (e.g. blue and light blue) has
the exactly same scheme.

Change-Id: Ied08b4c388b8020326709d01d2de290afdd9d77b

diff --git a/filter/CppunitTest_filter_utils.mk 
b/filter/CppunitTest_filter_utils.mk
new file mode 100644
index 000..4735abb
--- /dev/null
+++ b/filter/CppunitTest_filter_utils.mk
@@ -0,0 +1,41 @@
+# -*- 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_CppunitTest_CppunitTest,filter_utils))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_utils))
+$(eval $(call gb_CppunitTest_use_ure,filter_utils))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_utils))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_utils, \
+   comphelper \
+   unotest \
+   cppuhelper \
+   cppu \
+   msfilter \
+   sal \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_components,filter_utils,\
+   configmgr/source/configmgr \
+   filter/source/config/cache/filterconfig1 \
+   framework/util/fwk \
+   framework/util/fwl \
+   i18npool/util/i18npool \
+   ucb/source/core/ucb1 \
+   ucb/source/ucp/file/ucpfile1 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_utils, \
+   filter/qa/cppunit/utils-test \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 33f0f74..4cb6462 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -81,6 +81,7 @@ endif
 $(eval $(call gb_Module_add_check_targets,filter,\
 CppunitTest_filter_xslt \
 CppunitTest_filter_priority \
+CppunitTest_filter_utils \
 ))
 
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
diff --git a/filter/qa/cppunit/utils-test.cxx b/filter/qa/cppunit/utils-test.cxx
new file mode 100644
index 000..5e306ef
--- /dev/null
+++ b/filter/qa/cppunit/utils-test.cxx
@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+namespace {
+
+class UtilsTest
+: public test::BootstrapFixtureBase
+{
+public:
+void testTransColToIco();
+
+CPPUNIT_TEST_SUITE(UtilsTest);
+CPPUNIT_TEST(testTransColToIco);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void UtilsTest::testTransColToIco()
+{
+const sal_uInt32 aStdCol[] = {
+0xee, 0x99, 0xff6600, 0xff, 0xff00cc, 0xff33ff, 0x9900ff, 
0xff, 0x00ccff, 0x66, 0x33ff99, 0x99ff66, 0xccff00,
+0xdd, 0x66, 0xffcc00, 0xff, 0xff66cc, 0xff99ff, 0xcc66ff, 
0xff, 0xff, 0x99, 0x66ff99, 0x99ff99, 0xccff66,
+0xcc, 0x00, 0xff9900, 0xff, 0xff3399, 0xff66ff, 0x9933ff, 
0xff, 0x3399ff, 0x00, 0x00ff66, 0x66ff66, 0x99ff33,
+0xb2b2b2, 0xcc9900, 0xff3300, 0xff, 0xff0066, 0xff00ff, 0x6600ff, 
0xff, 0x0066ff, 0x00, 0x00cc33, 0x00cc00, 0x66ff00,
+0x99, 0x996600, 0xcc3300, 0xcc, 0xcc0066, 0xcc00cc, 0x6600cc, 
0xcc, 0x0066cc, 0x00, 0x009933, 0x009900, 0x66cc00,
+0x808080, 0x663300, 0x801900, 0x99, 0x990066, 0x990099, 0x330099, 
0x99, 0x006699, 0x00, 0x007826, 0x006600, 0x669900,
+0x66, 0x00, 0x461900, 0x33, 0x330033, 0x660066, 0x33, 
0x66, 0x80, 0x00, 0x00331a, 0x003300, 0x193300,
+0x33, 0x33, 0x661900, 0x66, 0x660033, 0x663366, 0x330066, 
0x66, 0x003366, 0x33, 0x006633, 0x336633, 0x336600 };
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx   |4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5b8ec42cd7d09291c0662aacbaaa507eafda1ea4
Author: Caolán McNamara 
Date:   Mon Jul 13 20:44:16 2015 +0100

fix a third emf crash

Change-Id: I3b5d0daf05e3272d2afa0da84ff0b1f8d5c965a4
(cherry picked from commit 173fd90387e8bb7f33c2608628f12c7f772f0277)
Reviewed-on: https://gerrit.libreoffice.org/17023
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf
new file mode 100644
index 000..92da5f0
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 553f871..63e4104 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1425,7 +1425,9 @@ bool EnhWMFReader::ReadEnhWMF()
 DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) 
== 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
 
 Point aPos( ptlReferenceX, ptlReferenceY );
-if ( nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
+bool bLenSane = nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) );
+bool bOffStringSane = nOffString <= nEndPos - nCurPos;
+if (bLenSane && bOffStringSane)
 {
 if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= 
nNextPos ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx   |4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 729ba6999667fea9bc4ee6966f63368726a290f5
Author: Caolán McNamara 
Date:   Mon Jul 13 20:44:16 2015 +0100

fix a third emf crash

Change-Id: I3b5d0daf05e3272d2afa0da84ff0b1f8d5c965a4
(cherry picked from commit 173fd90387e8bb7f33c2608628f12c7f772f0277)
Reviewed-on: https://gerrit.libreoffice.org/17022
Tested-by: Jenkins 
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf
new file mode 100644
index 000..92da5f0
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index dcd802c..c20ab5f 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1441,7 +1441,9 @@ bool EnhWMFReader::ReadEnhWMF()
 DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) 
== 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
 
 Point aPos( ptlReferenceX, ptlReferenceY );
-if ( nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
+bool bLenSane = nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) );
+bool bOffStringSane = nOffString <= nEndPos - nCurPos;
+if (bLenSane && bOffStringSane)
 {
 if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= 
nNextPos ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

[Julien Nabet]

 offapi/com/sun/star/ui/dialogs/XFilePicker.idl |   15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

New commits:
commit c657740b0f6caa5d0c7d54db37aca013d6ac1c8c
Author: Julien Nabet 
Date:   Mon Jul 13 12:20:50 2015 +0200

getFiles: simplify even more description

Conflicts:
offapi/com/sun/star/ui/dialogs/XFilePicker.idl

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

diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl 
b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
index 7552854..17b56cc 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
@@ -87,21 +87,8 @@ published interface XFilePicker: 
com::sun::star::ui::dialogs::XExecutableDialog
 
 @returns
  The complete path of the file or directory currently selected
-in URL format. There are two different cases:
-
-Multi-selection is disabled:
-The first and only entry of the sequence contains the complete
-path/filename in URL format.
-
-Multi-selection is enabled:
-If only one file is selected, the first entry
-of the sequence contains the complete path/filename in URL 
format.
-If multiple files are selected, only the first entry is 
retrieved with
-the path in URL format.
-
-
+in URL format. This always returns only the first entry of the 
sequence.
 
-
 Notes for the implementation of a FileSave 
dialog:If there exists
 a checkbox "Automatic File Extension" which is checked and a valid 
filter is currently selected
 the dialog may automatically add an extension to the selected file 
name.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-5-0' - sl_SI/description.xml sl_SI/README_th_sl_SI.txt sl_SI/th_sl_SI_v2.dat

[Andras Timar]

 sl_SI/README_th_sl_SI.txt |4 
 sl_SI/description.xml |4 
 sl_SI/th_sl_SI_v2.dat | 1954 +++---
 3 files changed, 1523 insertions(+), 439 deletions(-)

New commits:
commit bf7a33714170fc040fcfa0b0f0770cf217e5b79c
Author: Andras Timar 
Date:   Mon Jul 13 23:55:57 2015 +0200

Updated Slovenian thesaurus

Change-Id: If822610ad6d9eca02629959cf8040fe1680f8140
(cherry picked from commit a06da898df0371577c5c2466480f6c807e6c211f)
Reviewed-on: https://gerrit.libreoffice.org/17026
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sl_SI/README_th_sl_SI.txt b/sl_SI/README_th_sl_SI.txt
index a90862c..396fef0 100644
--- a/sl_SI/README_th_sl_SI.txt
+++ b/sl_SI/README_th_sl_SI.txt
@@ -2,7 +2,7 @@ The Slovenian thesaurus is developed as a part of project/
 Slovenski tezaver nastaja v okviru projekta:
OdprtiTezaver (www.tezaver.si)
 This dictionary pack includes version/Paket vsebuje različico:
-   1.7.17000
+   1.7.17500
 Thesaurus managed and edited by/Tezaver pripravlja in ureja:
Martin Srebotnjak (miles at filmsi net)
 Thesaurus data licensed under both/Podatki tezavra so izdani pod licencama:
@@ -18,7 +18,7 @@ Bug report/O napakah poročajte:
 http://external.openoffice.org/ form data:
 
 Product Name: Slovenian thesaurus
-Product Version: 1.7.17000
+Product Version: 1.7.17500
 Vendor or Owner Name: Martin Srebotnjak
 Vendor or Owner Contact: mi...@filmsi.net
 OpenOffice.org Contact: fil...@openoffice.org
diff --git a/sl_SI/description.xml b/sl_SI/description.xml
index 07b658b..85cab19 100644
--- a/sl_SI/description.xml
+++ b/sl_SI/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 Slovenian spelling dictionary, hyphenation rules, 
and thesaurus
@@ -10,6 +10,6 @@
 
 
 
-http://sl.libreoffice.org/slovenjenje-2/jezikovne-razsiritve/"; 
lang="sl-SI">sl.libreoffice.org
+http://sl.libreoffice.org/skupnost/slovenjenje/jezikovne-razsiritve/";
 lang="sl-SI">sl.libreoffice.org
 
 
diff --git a/sl_SI/th_sl_SI_v2.dat b/sl_SI/th_sl_SI_v2.dat
index f1a6a7c..2971d0f 100644
--- a/sl_SI/th_sl_SI_v2.dat
+++ b/sl_SI/th_sl_SI_v2.dat
@@ -37,7 +37,8 @@ ISO8859-2
 (sam.)|prvenstvo
 ¹ank|1
 (sam.)|¹ank (pogovorno)|toèilna miza|toèilni pult
-¹ansa|1
+¹ansa|2
+(sam.)|¹ansa (pogovorno)|izgled|mo¾nost|mogoèost|obet|upanje
 (sam.)|¹ansa (pogovorno)|prilika|prilo¾nost
 ¹anson|1
 (sam.)|chanson|pesem|popevka
@@ -47,12 +48,14 @@ ISO8859-2
 (sam.)|¹antavost (slab¹alno)|¹epavost|kruljavost (ekspresivno)
 ¹apa|1
 (sam.)|taca
+¹ar¾a|1
+(sam.)|¹ar¾a (zastarelo)|èin
 ¹ar¾er|1
 (sam.)|okvir
 ¹ariti|1
 (gl.)|brèkati|brkljariti (ekspresivno)|brkljati (pogovorno)|brskati|stikati
 ¹arm|1
-(sam.)|dra¾|dra¾est|mik|mikavnost|oèarljivost|privlaènost
+(sam.)|dra¾|dra¾est|ljubkost|mik|mikavnost|oèarljivost|privlaènost
 ¹arnir|1
 (sam.)|zapirnica
 ¹arovit|1
@@ -65,6 +68,8 @@ ISO8859-2
 (gl.)|¹u¹njati
 ¹èavje|1
 (sam.)|¹avje
+¹èebljati|1
+(gl.)|èebljati
 ¹èegetavèek|1
 (sam.)|klitoris
 ¹èetka|1
@@ -84,7 +89,7 @@ ISO8859-2
 ¹enk|1
 (sam.)|¹enk (pogovorno)|dar|darilo|naklonilo (zastarelo)|naklonitev 
(zastarelo)|podarek (zastarelo)|poklon (zastarelo)|poklonilo 
(zastarelo)|poklonitev (zastarelo)|poklonstvo (zastarelo)|prezent 
(zastarelo)|vezilo (zastarelo)
 ¹ent|1
-(sam.)|¹ment|hudiè|hudiman|hudimar|hudir|parkelj|peklen¹èek|rogaè|satan|sku¹njavec|vrag|vragec|vranè|zlobec|zlodej
+(sam.)|¹ment|hudiè|hudiman|hudimar|hudir|hudnik|parkelj|peklen¹èek|rogaè|satan|sku¹njavec|vrag|vragec|vranè|zlobec|zlodej
 ¹entjan¾evka|1
 (sam.)|Hypericum perforatum (strokovno)|krènica|krvavec
 ¹epast|1
@@ -143,13 +148,16 @@ ISO8859-2
 (sam.)|¹pièenje (pogovorno)|ostrenje
 ¹initi|1
 (gl.)|¹vigniti|blisniti (ekspresivno)
+¹ipkova u¹ica|1
+(sam.)|Macrosiphon rosae (strokovno)
 ¹iptarski|1
 (prid.)|albanski
 ¹iren|1
 (prid.)|¹iro¹iren (ekspresivno)|obse¾en|prostran
 ¹irjava|1
 (sam.)|prostranstvo|vse¹ir
-¹irjenje|1
+¹irjenje|2
+(sam.)|dilatacija|raz¹irjanje
 (sam.)|iradiacija|raz¹irjanje
 ¹iro¹iren|1
 (prid.)|¹iren|¹iro¹iren (ekspresivno)|obse¾en|prostran
@@ -172,7 +180,7 @@ ISO8859-2
 ¹irokoustnost|1
 (sam.)|¹irokoustnost (ekspresivno)|bahavost|hvalisavost|razustnost
 ¹kandalozen|1
-(prid.)|¹kandalozen (ekspresivno)|grozen 
(ekspresivno)|nekvaliteten|neprebavljiv (ekspresivno)|neu¾iten 
(ekspresivno)|neznosen|obupen|po¹asten (ekspresivno)|slab|stra¹en (ekspresivno)
+(prid.)|¹kandalozen (ekspresivno)|grozen 
(ekspresivno)|hud|nekvaliteten|neprebavljiv (ekspresivno)|neu¾iten 
(ekspresivno)|neznosen|obupen|po¹asten (ekspresivno)|slab|srep|stra¹en 
(ekspresivno)
 ¹kant|1
 (sam.)|¹kant (zastarelo)|¹kripalo (slab¹alno)|gosli|violina
 ¹karjevec|1
@@ -187,6 +195,10 @@ ISO8859-2
 (prid.)|¹kilav|kri¾emgled|krivogled|prekogled (zastarelo)
 ¹kilav|1
 (prid.)|¹kilast|kri¾emgled|krivogled|prek

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - dictionaries

[Andras Timar]

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

New commits:
commit d67271d6e1d0b151fdfaa117ff9297ac88ff5f3b
Author: Andras Timar 
Date:   Mon Jul 13 23:55:57 2015 +0200

Updated core
Project: dictionaries  bf7a33714170fc040fcfa0b0f0770cf217e5b79c

Updated Slovenian thesaurus

Change-Id: If822610ad6d9eca02629959cf8040fe1680f8140
(cherry picked from commit a06da898df0371577c5c2466480f6c807e6c211f)
Reviewed-on: https://gerrit.libreoffice.org/17026
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/dictionaries b/dictionaries
index 73f1d13..bf7a337 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 73f1d1388511bdf5046d5a37b2f61ff019f189c6
+Subproject commit bf7a33714170fc040fcfa0b0f0770cf217e5b79c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

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

New commits:
commit f3df77accae2941ba9c6a5e48b84d661f7a87863
Author: Tor Lillqvist 
Date:   Tue Jul 14 11:01:48 2015 +0300

With --enable-gtk3 we need GLib >= 2.38

The G_ADD_PRIVATE used in libreofficekit/source/gtk/lokdocview.cxx is from
2.38.

Change-Id: I2058932f8252d2715f970f020160f4f960987125

diff --git a/configure.ac b/configure.ac
index 7c362aa6..87d7990 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9972,11 +9972,11 @@ if test "x$enable_gtk3" = "xyes"; then
 AC_MSG_ERROR([System cairo required for gtk3 support, do not combine 
--enable-gtk3 with --without-system-cairo])
 fi
 : ${with_system_cairo:=yes}
-PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 
gmodule-no-export-2.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 
gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", 
ENABLE_GTK3="")
 if test "x$ENABLE_GTK3" = "xTRUE"; then
 R="gtk3"
 else
-AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
+AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not 
found])
 fi
 GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 compilerplugins/clang/unusedmethods.cxx |   17 +++--
 compilerplugins/clang/unusedmethods.py  |3 +--
 2 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit a04354ecb34216d7fb9868f701fd3ee2b70883c8
Author: Noel Grandin 
Date:   Mon Jul 13 13:31:13 2015 +0200

improve the unusedmethods plugin

to find stuff called from 2 levels+ inside template methods

Change-Id: I4ba308a992e64a091e5364b8aa89e44d6772dcb0

diff --git a/compilerplugins/clang/unusedmethods.cxx 
b/compilerplugins/clang/unusedmethods.cxx
index 655dfe2..162bff0 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -33,7 +33,6 @@ to auto-remove the method declarations
 Note that the actual process may involve a fair amount of undoing, hand 
editing, and general messing around
 to get it to work :-)
 
-TODO ignore calls from a method to itself, so we can eliminate unused 
recursive methods
 TODO deal with calls to superclass/member constructors from other 
constructors, so
  we can find unused constructors
 TODO need to handle places where the code takes the address of a method, that 
needs to count
@@ -139,7 +138,7 @@ static bool isStandardStuff(const std::string& s)
 }
 
 // prevent recursive templates from blowing up the stack
-static std::set traversedTemplateFunctionSet;
+static std::set traversedFunctionSet;
 
 bool UnusedMethods::VisitCallExpr(CallExpr* expr)
 {
@@ -150,14 +149,12 @@ bool UnusedMethods::VisitCallExpr(CallExpr* expr)
 if (calleeFunctionDecl == nullptr) {
 return true;
 }
-// if we see a call to a templated function, it effectively creates new 
code,
-// so we need to examine it's interior to see if it, in turn, calls 
anything else
-if (calleeFunctionDecl->getTemplatedKind() != 
FunctionDecl::TemplatedKind::TK_NonTemplate
-|| calleeFunctionDecl->isFunctionTemplateSpecialization())
-{
-if 
(traversedTemplateFunctionSet.insert(calleeFunctionDecl->getQualifiedNameAsString()).second)
-TraverseFunctionDecl(calleeFunctionDecl);
-}
+// if we see a call to a function, it may effectively create new code,
+// if the function is templated. However, if we are inside a template 
function,
+// calling another function on the same template, the same problem occurs.
+// Rather than tracking all of that, just traverse anything we have not 
already traversed.
+if 
(traversedFunctionSet.insert(calleeFunctionDecl->getQualifiedNameAsString()).second)
+TraverseFunctionDecl(calleeFunctionDecl);
 
 CXXMethodDecl* calleeMethodDecl = 
dyn_cast_or_null(calleeFunctionDecl);
 if (calleeMethodDecl == nullptr) {
diff --git a/compilerplugins/clang/unusedmethods.py 
b/compilerplugins/clang/unusedmethods.py
index ef2beb9..1d4208c 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -29,7 +29,6 @@ exclusionSet = set([
 "void comphelper::IEventProcessor::release()",
 "void SotMutexHolder::acquire()",
 "void SotMutexHolder::release()",
-"class Rectangle ComboBox::GetDropDownPosSizePixel() const"
 # only used by Windows build
 "_Bool basegfx::B2ITuple::equalZero() const",
 "class basegfx::B2DPolyPolygon 
basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const",
@@ -47,7 +46,7 @@ exclusionSet = set([
 "int PhysicalFontFace::GetWidth() const",
 "void PhysicalFontFace::SetBitmapSize(int,int)",
 "_Bool SalObject::IsEraseBackgroundEnabled()",
-# instantiated from a template in VCL, not sure why it is not being picked 
up
+# instantiated from templates, not sure why it is not being picked up
 "class basegfx::B2DPolygon OutputDevice::PixelToLogic(const class 
basegfx::B2DPolygon &,const class MapMode &) const",
 # only used by OSX build
 "void StyleSettings::SetHideDisabledMenuItems(_Bool)",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Reuse Mozilla's rolling update mechanism for LibreOffice - Weekly Report 7

[Nathan Yee]

This is the week 7 progress report of the GSoC bug "Reuse Mozilla's rolling
update mechanism for LibreOffice".

Last week:
- successfully built Mozilla's mar creation executable on a Windows
LibreOffice build
- came close to successfully building Mozilla's updater executable on a
Windows LibreOffice build

Goals for this week:
- successfully build Mozilla's updater executable on a Windows LibreOffice
build

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

[Libreoffice-commits] core.git: helpcontent2

[Andras Timar]

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

New commits:
commit 1038d628b3ece37251e3900e7c4014393c13dc3b
Author: Andras Timar 
Date:   Tue Jul 14 09:27:11 2015 +0200

Updated core
Project: help  053cee1d890e225245b9d8004ab94cf27b1a9621

tdf#92684 embed places section instead of the deleted defaultdir section

Change-Id: I2e360913ca041996c2fe5638a992d1f999e3b67f

diff --git a/helpcontent2 b/helpcontent2
index 3fb910b..053cee1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3fb910bf25d846dd7bc1902e8fe54518b417e793
+Subproject commit 053cee1d890e225245b9d8004ab94cf27b1a9621
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 source/text/shared/01/01070001.xhp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 053cee1d890e225245b9d8004ab94cf27b1a9621
Author: Andras Timar 
Date:   Tue Jul 14 09:27:11 2015 +0200

tdf#92684 embed places section instead of the deleted defaultdir section

Change-Id: I2e360913ca041996c2fe5638a992d1f999e3b67f

diff --git a/source/text/shared/01/01070001.xhp 
b/source/text/shared/01/01070001.xhp
index 2a05122..ec00edf 100644
--- a/source/text/shared/01/01070001.xhp
+++ b/source/text/shared/01/01070001.xhp
@@ -47,8 +47,7 @@
 
 Create New Directory
 
-Default Directory
-
+
 Display area
 
 File Name
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits