date:20160517

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

2016-05-17 Thread Noel Grandin

 sd/source/ui/dlg/navigatr.cxx  |   20 ++--
 sd/source/ui/inc/navigatr.hxx  |   30 --
 sd/source/ui/view/drviewsd.cxx |   14 +++---
 3 files changed, 33 insertions(+), 31 deletions(-)

New commits:
commit 45ec74a080e17fc1b521d009d9a5a630a6434bab
Author: Noel Grandin 
Date:   Tue May 17 16:37:11 2016 +0200

convert NAV_STATE to scoped enum

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

diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index bf796ac..b761777 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -843,45 +843,45 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 
nSId,
 if( eState >= SfxItemState::DEFAULT && nSId == SID_NAVIGATOR_STATE )
 {
 const SfxUInt32Item& rStateItem = dynamic_cast(*pItem);
-sal_uInt32 nState = rStateItem.GetValue();
+NavState nState = (NavState)rStateItem.GetValue();
 
 // only if doc in LB is the active
 NavDocInfo* pInfo = pNavigatorWin->GetDocInfo();
 if( pInfo && pInfo->IsActive() )
 {
 // First
-if( nState & NAVBTN_FIRST_ENABLED &&
+if( nState & NavState::BtnFirstEnabled &&
 !pNavigatorWin->maToolbox->IsItemEnabled( TBI_FIRST ) )
 pNavigatorWin->maToolbox->EnableItem( TBI_FIRST );
-if( nState & NAVBTN_FIRST_DISABLED &&
+if( nState & NavState::BtnFirstDisabled &&
 pNavigatorWin->maToolbox->IsItemEnabled( TBI_FIRST ) )
 pNavigatorWin->maToolbox->EnableItem( TBI_FIRST, false );
 
 // Prev
-if( nState & NAVBTN_PREV_ENABLED &&
+if( nState & NavState::BtnPrevEnabled &&
 !pNavigatorWin->maToolbox->IsItemEnabled( TBI_PREVIOUS ) )
 pNavigatorWin->maToolbox->EnableItem( TBI_PREVIOUS );
-if( nState & NAVBTN_PREV_DISABLED &&
+if( nState & NavState::BtnPrevDisabled &&
 pNavigatorWin->maToolbox->IsItemEnabled( TBI_PREVIOUS ) )
 pNavigatorWin->maToolbox->EnableItem( TBI_PREVIOUS, false );
 
 // Last
-if( nState & NAVBTN_LAST_ENABLED &&
+if( nState & NavState::BtnLastEnabled &&
 !pNavigatorWin->maToolbox->IsItemEnabled( TBI_LAST ) )
 pNavigatorWin->maToolbox->EnableItem( TBI_LAST );
-if( nState & NAVBTN_LAST_DISABLED &&
+if( nState & NavState::BtnLastDisabled &&
 pNavigatorWin->maToolbox->IsItemEnabled( TBI_LAST ) )
 pNavigatorWin->maToolbox->EnableItem( TBI_LAST, false );
 
 // Next
-if( nState & NAVBTN_NEXT_ENABLED &&
+if( nState & NavState::BtnNextEnabled &&
 !pNavigatorWin->maToolbox->IsItemEnabled( TBI_NEXT ) )
 pNavigatorWin->maToolbox->EnableItem( TBI_NEXT );
-if( nState & NAVBTN_NEXT_DISABLED &&
+if( nState & NavState::BtnNextDisabled &&
 pNavigatorWin->maToolbox->IsItemEnabled( TBI_NEXT ) )
 pNavigatorWin->maToolbox->EnableItem( TBI_NEXT, false );
 
-if( nState & NAVTLB_UPDATE )
+if( nState & NavState::TableUpdate )
 {
 // InitTlb; is initiated by Slot
 if (maUpdateRequest)
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index f07cf1f..edad018 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -27,20 +27,6 @@
 #include "sdtreelb.hxx"
 #include "pres.hxx"
 
-#define NAVSTATE_NONE   0x
-
-#define NAVTLB_UPDATE   0x0100
-
-#define NAVBTN_FIRST_ENABLED0x1000
-#define NAVBTN_FIRST_DISABLED   0x2000
-#define NAVBTN_PREV_ENABLED 0x4000
-#define NAVBTN_PREV_DISABLED0x8000
-
-#define NAVBTN_LAST_ENABLED 0x0001
-#define NAVBTN_LAST_DISABLED0x0002
-#define NAVBTN_NEXT_ENABLED 0x0004
-#define NAVBTN_NEXT_DISABLED0x0008
-
 // forward
 namespace sd {
 class DrawDocShell;
@@ -50,6 +36,22 @@ class Menu;
 class SdNavigatorControllerItem;
 class SdPageNameControllerItem;
 
+enum class NavState {
+NONE   = 0x00,
+TableUpdate= 0x000100,
+BtnFirstEnabled= 0x001000,
+BtnFirstDisabled   = 0x002000,
+BtnPrevEnabled = 0x004000,
+BtnPrevDisabled= 0x008000,
+BtnLastEnabled = 0x01,
+BtnLastDisabled= 0x02,
+BtnNextEnabled = 0x04,
+BtnNextDisabled= 0x08,
+};
+namespace o3tl {
+template<> struct typed_flags : is_typed_flags {};
+}
+
 class NavDocInfo
 {
 public:
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 2d0d157..f0ae22e 100644
--- a/sd/source/ui/view/drvi

[Libreoffice-commits] core.git: 2 commits - basctl/source canvas/source chart2/source comphelper/source connectivity/source cppu/source cui/source dbaccess/source extensions/source filter/source oox/s

2016-05-17 Thread Noel Grandin

 basctl/source/basicide/basidesh.cxx   |2 
 canvas/source/tools/surfaceproxy.cxx  |5 --
 chart2/source/view/main/ChartView.cxx |2 
 comphelper/source/misc/threadpool.cxx |2 
 connectivity/source/commontools/TKeys.cxx |2 
 cppu/source/threadpool/threadpool.cxx |2 
 cui/source/options/optcolor.cxx   |   16 +++---
 dbaccess/source/core/api/query.cxx|2 
 dbaccess/source/ui/browser/sbagrid.cxx|2 
 dbaccess/source/ui/control/ColumnControlWindow.cxx|2 
 dbaccess/source/ui/misc/DExport.cxx   |4 -
 dbaccess/source/ui/misc/WCopyTable.cxx|2 
 dbaccess/source/ui/relationdesign/RelationController.cxx  |4 -
 dbaccess/source/ui/tabledesign/TEditControl.cxx   |6 +-
 dbaccess/source/ui/tabledesign/TableController.cxx|2 
 dbaccess/source/ui/tabledesign/TableUndo.cxx  |2 
 extensions/source/resource/oooresourceloader.cxx  |2 
 filter/source/msfilter/msdffimp.cxx   |4 -
 oox/source/core/fragmenthandler.cxx   |4 -
 oox/source/core/xmlfilterbase.cxx |5 --
 oox/source/drawingml/chart/plotareaconverter.cxx  |2 
 oox/source/drawingml/chart/typegroupconverter.cxx |2 
 oox/source/drawingml/shape.cxx|   12 ++---
 oox/source/drawingml/shapecontext.cxx |4 -
 oox/source/drawingml/shapegroupcontext.cxx|8 +--
 oox/source/drawingml/textliststyle.cxx|   10 ++--
 oox/source/drawingml/themeelementscontext.cxx |6 +-
 oox/source/export/vmlexport.cxx   |2 
 oox/source/ppt/pptimport.cxx  |2 
 oox/source/ppt/presentationfragmenthandler.cxx|4 -
 oox/source/ppt/slidefragmenthandler.cxx   |4 -
 oox/source/shape/WpgContext.cxx   |4 -
 reportdesign/source/core/misc/conditionalexpression.cxx   |   16 +++---
 reportdesign/source/ui/misc/FunctionHelper.cxx|4 -
 sc/source/core/opencl/formulagroupcl.cxx  |5 --
 sc/source/filter/excel/excimp8.cxx|2 
 sc/source/filter/excel/xecontent.cxx  |2 
 sc/source/filter/excel/xestyle.cxx|2 
 sc/source/filter/oox/condformatbuffer.cxx |2 
 sd/source/core/CustomAnimationPreset.cxx  |2 
 sd/source/filter/eppt/escherex.cxx|2 
 sd/source/filter/html/buttonset.cxx   |2 
 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx |2 
 sd/source/ui/remotecontrol/Server.cxx |2 
 sd/source/ui/slidesorter/model/SlideSorterModel.cxx   |5 --
 sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx   |8 +--
 sdext/source/presenter/PresenterHelpView.cxx  |4 -
 sdext/source/presenter/PresenterTimer.cxx |2 
 sfx2/source/dialog/templdlg.cxx   |   22 -
 sfx2/source/doc/Metadatable.cxx   |8 +--
 sfx2/source/inc/templdgi.hxx  |   12 +++--
 slideshow/source/engine/shapes/appletshape.cxx|   12 ++---
 slideshow/source/engine/shapes/backgroundshape.cxx|5 --
 slideshow/source/engine/shapes/mediashape.cxx |6 +-
 slideshow/source/engine/slide/layer.cxx   |2 
 slideshow/source/engine/slide/slideimpl.cxx   |2 
 slideshow/source/engine/slideshowimpl.cxx |4 -
 svl/source/items/itempool.cxx |2 
 svl/source/items/poolio.cxx   |4 -
 svl/source/items/style.cxx|2 
 svx/source/table/tablertfimporter.cxx |2 
 sw/source/core/doc/doclay.cxx |4 -
 sw/source/core/doc/tblrwcl.cxx|4 -
 sw/source/core/frmedt/fecopy.cxx  |4 -
 sw/source/core/unocore/unoobj2.cxx|6 +-
 sw/source/core/unocore/unoportenum.cxx|   23 --
 sw/source/core/unocore/unorefmk.cxx   |2 
 sw/source/filter/ww8/WW8TableInfo.cxx |   12 ++---
 sw/source/filter/ww8/docxattributeoutput.cxx  |6 +-

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

2016-05-17 Thread Takeshi Abe

 starmath/inc/token.hxx|3 +--
 starmath/source/parse.cxx |6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 70aa5799336de6cbd1d964e2e9a176b44d438db2
Author: Takeshi Abe 
Date:   Wed May 18 11:30:38 2016 +0900

starmath: Remove obsolete TG::Discarded

which was originally TGDISCARDED until 
cc1a0ba927ad6f85103059aa8e6108017f436304,
and its usage was gone with 9adcd261054a0e99ae032be5e7428e28a6663975.

Change-Id: Idb01f30b7b140b17deead7c5a83128fa1f3bdf4c
Reviewed-on: https://gerrit.libreoffice.org/25074
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index acb944a..eea2262 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -42,12 +42,11 @@ enum class TG {
 Color = 0x001000,
 Font  = 0x002000,
 Standalone= 0x004000,
-Discarded = 0x008000,
 Limit = 0x01,
 FontAttr  = 0x02
 };
 namespace o3tl {
-template<> struct typed_flags : is_typed_flags {};
+template<> struct typed_flags : is_typed_flags {};
 }
 
 enum SmTokenType
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index b3bef50..1c88da9 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -70,12 +70,12 @@ static const SmTokenTableEntry aTokenTable[] =
 { "arcoth", TACOTH, '\0', TG::Function, 5 },
 { "acute", TACUTE, MS_ACUTE, TG::Attribute, 5 },
 { "aleph" , TALEPH, MS_ALEPH, TG::Standalone, 5 },
-{ "alignb", TALIGNC, '\0', TG::Align | TG::Discarded, 0},
+{ "alignb", TALIGNC, '\0', TG::Align, 0},
 { "alignc", TALIGNC, '\0', TG::Align, 0},
 { "alignl", TALIGNL, '\0', TG::Align, 0},
-{ "alignm", TALIGNC, '\0', TG::Align | TG::Discarded, 0},
+{ "alignm", TALIGNC, '\0', TG::Align, 0},
 { "alignr", TALIGNR, '\0', TG::Align, 0},
-{ "alignt", TALIGNC, '\0', TG::Align | TG::Discarded, 0},
+{ "alignt", TALIGNC, '\0', TG::Align, 0},
 { "and", TAND, MS_AND, TG::Product, 0},
 { "approx", TAPPROX, MS_APPROX, TG::Relation, 0},
 { "aqua", TAQUA, '\0', TG::Color, 0},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Helena Svobodová license statement

2016-05-17 Thread jan iversen

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved/DeveloperStepByStep

rgds
Jan Iversen.


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

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

2016-05-17 Thread Takeshi Abe

 starmath/inc/node.hxx|   20 ++--
 starmath/source/node.cxx |   42 +-
 2 files changed, 35 insertions(+), 27 deletions(-)

New commits:
commit 378576a9082d64f0ae2becae8a7e2528999bd7a5
Author: Takeshi Abe 
Date:   Tue May 17 12:30:17 2016 +0900

Convert ATTR_* to scoped enum

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

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index da58c57..00b457d 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -33,8 +33,16 @@
 #include 
 #include 
 
-#define ATTR_BOLD   0x0001
-#define ATTR_ITALIC 0x0002
+enum class FontAttribute {
+None   = 0x,
+Bold   = 0x0001,
+Italic = 0x0002
+};
+
+namespace o3tl
+{
+template<> struct typed_flags : 
is_typed_flags {};
+}
 
 
 enum class FontSizeType {
@@ -104,7 +112,7 @@ class SmNode : public SmRect
 SmScaleMode meScaleMode;
 RectHorAlignmeRectHorAlign;
 FontChangeMask  mnFlags;
-sal_uInt16  mnAttributes;
+FontAttribute   mnAttributes;
 boolmbIsPhantom;
 boolmbIsSelected;
 
@@ -132,14 +140,14 @@ public:
 virtual const SmNode * GetLeftMost() const;
 
 FontChangeMask &Flags() { return mnFlags; }
-sal_uInt16 &Attributes() { return mnAttributes; }
+FontAttribute  &Attributes() { return mnAttributes; }
 
 bool IsPhantom() const { return mbIsPhantom; }
 void SetPhantom(bool bIsPhantom);
 void SetColor(const Color &rColor);
 
-void SetAttribut(sal_uInt16 nAttrib);
-void ClearAttribut(sal_uInt16 nAttrib);
+void SetAttribut(FontAttribute nAttrib);
+void ClearAttribut(FontAttribute nAttrib);
 
 const SmFace & GetFont() const { return maFace; };
   SmFace & GetFont()   { return maFace; };
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 58f4df3..71c48ba 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -61,7 +61,7 @@ SmNode::SmNode(SmNodeType eNodeType, const SmToken 
&rNodeToken)
 , meScaleMode( SCALE_NONE )
 , meRectHorAlign( RectHorAlign::Left )
 , mnFlags( FontChangeMask::None )
-, mnAttributes( 0 )
+, mnAttributes( FontAttribute::None )
 , mbIsPhantom( false )
 , mbIsSelected( false )
 , mnAccIndex( -1 )
@@ -124,11 +124,11 @@ void SmNode::SetColor(const Color& rColor)
 }
 
 
-void SmNode::SetAttribut(sal_uInt16 nAttrib)
+void SmNode::SetAttribut(FontAttribute nAttrib)
 {
 if (
-(nAttrib == ATTR_BOLD && !(Flags() & FontChangeMask::Bold)) ||
-(nAttrib == ATTR_ITALIC && !(Flags() & FontChangeMask::Italic))
+(nAttrib == FontAttribute::Bold && !(Flags() & FontChangeMask::Bold)) 
||
+(nAttrib == FontAttribute::Italic && !(Flags() & 
FontChangeMask::Italic))
)
 {
 mnAttributes |= nAttrib;
@@ -138,11 +138,11 @@ void SmNode::SetAttribut(sal_uInt16 nAttrib)
 }
 
 
-void SmNode::ClearAttribut(sal_uInt16 nAttrib)
+void SmNode::ClearAttribut(FontAttribute nAttrib)
 {
 if (
-(nAttrib == ATTR_BOLD && !(Flags() & FontChangeMask::Bold)) ||
-(nAttrib == ATTR_ITALIC && !(Flags() & FontChangeMask::Italic))
+(nAttrib == FontAttribute::Bold && !(Flags() & FontChangeMask::Bold)) 
||
+(nAttrib == FontAttribute::Italic && !(Flags() & 
FontChangeMask::Italic))
)
 {
 mnAttributes &= ~nAttrib;
@@ -232,8 +232,8 @@ void SmNode::SetRectHorAlign(RectHorAlign eHorAlign, bool 
bApplyToSubTree )
 
 void SmNode::PrepareAttributes()
 {
-GetFont().SetWeight((Attributes() & ATTR_BOLD)   ? WEIGHT_BOLD   : 
WEIGHT_NORMAL);
-GetFont().SetItalic((Attributes() & ATTR_ITALIC) ? ITALIC_NORMAL : 
ITALIC_NONE);
+GetFont().SetWeight((Attributes() & FontAttribute::Bold)   ? WEIGHT_BOLD   
: WEIGHT_NORMAL);
+GetFont().SetItalic((Attributes() & FontAttribute::Italic) ? ITALIC_NORMAL 
: ITALIC_NONE);
 }
 
 
@@ -241,7 +241,7 @@ void SmNode::Prepare(const SmFormat &rFormat, const 
SmDocShell &rDocShell)
 {
 mbIsPhantom  = false;
 mnFlags  = FontChangeMask::None;
-mnAttributes = 0;
+mnAttributes = FontAttribute::None;
 
 switch (rFormat.GetHorAlign())
 {   case AlignLeft: meRectHorAlign = RectHorAlign::Left;   break;
@@ -1954,10 +1954,10 @@ void SmFontNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 case TUNKNOWN : break;  // no assertion on "font  "
 
 case TPHANTOM : SetPhantom(true);   break;
-case TBOLD :SetAttribut(ATTR_BOLD); break;
-case TITALIC :  SetAttribut(ATTR_ITALIC);   break;
-case TNBOLD :   ClearAttribut(ATTR_BOLD);   break;
-case TNITALIC : ClearAttribut(ATTR_ITALIC); break;
+case TBOLD :

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

2016-05-17 Thread Khaled Hosny

 vcl/unx/generic/glyphs/gcach_layout.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f688acfdae00ebdd891737e533d54368810185e1
Author: Khaled Hosny 
Date:   Tue May 17 22:49:40 2016 +0200

Try to fix perf regression in HbLayoutEngine::Layout()

Regression from 1da9b4c24e806ad2447b4a656e2a7192755bb6a8. We should
cache the break iterator as creating it is pretty expensive.

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

diff --git a/vcl/unx/generic/glyphs/gcach_layout.cxx 
b/vcl/unx/generic/glyphs/gcach_layout.cxx
index 61d1477..f2afa9a 100644
--- a/vcl/unx/generic/glyphs/gcach_layout.cxx
+++ b/vcl/unx/generic/glyphs/gcach_layout.cxx
@@ -326,6 +326,7 @@ private:
 hb_script_t maHbScript;
 hb_face_t*  mpHbFace;
 int mnUnitsPerEM;
+css::uno::Reference mxBreak;
 
 public:
 explicitHbLayoutEngine(ServerFont&);
@@ -514,7 +515,8 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 
 sal_Int32 nGraphemeStartPos = 
std::numeric_limits::max();
 sal_Int32 nGraphemeEndPos = std::numeric_limits::min();
-css::uno::Reference xBreak = 
vcl::unohelper::CreateBreakIterator();
+if (!mxBreak.is())
+mxBreak = vcl::unohelper::CreateBreakIterator();
 com::sun::star::lang::Locale 
aLocale(rArgs.maLanguageTag.getLocale());
 
 for (int i = 0; i < nRunGlyphCount; ++i) {
@@ -539,13 +541,13 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 if(bRightToLeft && (nCharPos < nGraphemeStartPos))
 {
 sal_Int32 nDone;
-nGraphemeStartPos = 
xBreak->previousCharacters(rArgs.mrStr, nCharPos+1, aLocale,
+nGraphemeStartPos = 
mxBreak->previousCharacters(rArgs.mrStr, nCharPos+1, aLocale,
   
com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
 }
 else if(!bRightToLeft && (nCharPos >= nGraphemeEndPos))
 {
 sal_Int32 nDone;
-nGraphemeEndPos = xBreak->nextCharacters(rArgs.mrStr, 
nCharPos, aLocale,
+nGraphemeEndPos = mxBreak->nextCharacters(rArgs.mrStr, 
nCharPos, aLocale,
   
com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Project proposal accepted for GSoC 2016

2016-05-17 Thread Thorsten Behrens

Rosemary Sebastian wrote:
> Looking forward to an exciting summer hacking on LibreOffice!
> 
Hi Roses,

the pleasure is ours - happy to have you, and looking forward just as
well! :)

> [2] My blog 
> 
Just added to the planet.

Happy hacking,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-05-17 Thread László Németh

 0 files changed

New commits:
commit f4bc2b71002a1cd5c2c3af5dcf398bdf3bf2c119
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Wed May 18 01:34:45 2016 +0200

empty commit (calculateAll)

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

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

2016-05-17 Thread Henry Castro

 loolwsd/PrisonerSession.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb8350afd4c15a188733e416993fbcb32dae0167
Author: Henry Castro 
Date:   Tue May 17 18:38:56 2016 -0400

loolwsd: log info, rename to PrisonerSession

diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index f7388a4..41ad29d 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -40,7 +40,7 @@ PrisonerSession::PrisonerSession(const std::string& id,
 _docBroker(docBroker),
 _curPart(0)
 {
-Log::info("ClientSession ctor [" + getName() + "].");
+Log::info("PrisonerSession ctor [" + getName() + "].");
 }
 
 PrisonerSession::~PrisonerSession()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Henry Castro

 loolwsd/ClientSession.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c31bd8bcafc59f981fd63c1ec4d1a01fa9720d3
Author: Henry Castro 
Date:   Tue May 17 18:33:37 2016 -0400

loolwsd: log, rename to ClientSession

diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index 49ba399..5446179 100644
--- a/loolwsd/ClientSession.cpp
+++ b/loolwsd/ClientSession.cpp
@@ -49,7 +49,7 @@ ClientSession::ClientSession(const std::string& id,
 
 ClientSession::~ClientSession()
 {
-Log::info("~PrisonerSession dtor [" + getName() + "].");
+Log::info("~ClientSession dtor [" + getName() + "].");
 
 // Release the save-as queue.
 _saveAsQueue.put("");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Susobhan Ghosh

 cui/source/options/personalization.cxx |   38 +++--
 cui/source/options/personalization.hxx |2 -
 2 files changed, 24 insertions(+), 16 deletions(-)

New commits:
commit bdcb496858a7d37e7d24436dcededa8613469df0
Author: Susobhan Ghosh 
Date:   Sun May 8 15:33:46 2016 +0530

tdf#88502 Added error box to denote connection errors instead of progress 
bar

Change-Id: I8217fa487ed58f5d396e8769c76dd2d16f390472
Reviewed-on: https://gerrit.libreoffice.org/24757
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 486529d..b752f30 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -225,7 +225,7 @@ const OUString& 
SelectPersonaDialog::GetAppliedPersonaSetting() const
 return m_aAppliedPersona;
 }
 
-void SelectPersonaDialog::SetProgress( OUString& rProgress )
+void SelectPersonaDialog::SetProgress( const OUString& rProgress )
 {
 if(rProgress.isEmpty())
 m_pProgressLabel->Hide();
@@ -677,7 +677,7 @@ void SearchAndParseThread::execute()
 if( m_aURL.startsWith( "https://"; ) )
 {
 m_pPersonaDialog->ClearSearchResults();
-OUString sProgress( CUI_RES( RID_SVXSTR_SEARCHING ) );
+OUString sProgress( CUI_RES( RID_SVXSTR_SEARCHING ) ), sError;
 m_pPersonaDialog->SetProgress( sProgress );
 
 PersonasDocHandler* pHandler = new PersonasDocHandler();
@@ -704,9 +704,11 @@ void SearchAndParseThread::execute()
 {
 // in case of a returned CommandFailedException
 // SimpleFileAccess serves it, returning an empty stream
-sProgress = CUI_RES(RID_SVXSTR_SEARCHERROR);
-sProgress = sProgress.replaceAll("%1", m_aURL);
-m_pPersonaDialog->SetProgress(sProgress);
+sError = CUI_RES(RID_SVXSTR_SEARCHERROR);
+sError = sError.replaceAll("%1", m_aURL);
+m_pPersonaDialog->SetProgress( OUString() );
+ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, 
sError);
+aBox->Execute();
 return;
 }
 }
@@ -714,9 +716,11 @@ void SearchAndParseThread::execute()
 {
 // a catch all clause, in case the exception is not
 // served elsewhere
-sProgress = CUI_RES(RID_SVXSTR_SEARCHERROR);
-sProgress = sProgress.replaceAll("%1", m_aURL);
-m_pPersonaDialog->SetProgress(sProgress);
+sError = CUI_RES(RID_SVXSTR_SEARCHERROR);
+sError = sError.replaceAll("%1", m_aURL);
+m_pPersonaDialog->SetProgress( OUString() );
+ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError 
);
+aBox->Execute();
 return;
 }
 
@@ -752,9 +756,11 @@ void SearchAndParseThread::execute()
 {
 if( m_bDirectURL )
 {
-sProgress = CUI_RES(RID_SVXSTR_SEARCHERROR);
-sProgress = sProgress.replaceAll("%1", m_aURL);
-m_pPersonaDialog->SetProgress(sProgress);
+sError = CUI_RES(RID_SVXSTR_SEARCHERROR);
+sError = sError.replaceAll("%1", m_aURL);
+m_pPersonaDialog->SetProgress( OUString() );
+ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, 
sError);
+aBox->Execute();
 return;
 }
 continue;
@@ -784,7 +790,7 @@ void SearchAndParseThread::execute()
 
 else
 {
-OUString sProgress( CUI_RES( RID_SVXSTR_APPLYPERSONA ) );
+OUString sProgress( CUI_RES( RID_SVXSTR_APPLYPERSONA ) ), sError;
 m_pPersonaDialog->SetProgress( sProgress );
 
 uno::Reference< ucb::XSimpleFileAccess3 > xFileAccess( 
ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ), 
uno::UNO_QUERY );
@@ -833,9 +839,11 @@ void SearchAndParseThread::execute()
 }
 catch ( const uno::Exception & )
 {
-sProgress = CUI_RES( RID_SVXSTR_SEARCHERROR );
-sProgress = sProgress.replaceAll("%1", m_aURL);
-m_pPersonaDialog->SetProgress( sProgress );
+sError = CUI_RES( RID_SVXSTR_SEARCHERROR );
+sError = sError.replaceAll("%1", m_aURL);
+m_pPersonaDialog->SetProgress( OUString() );
+ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError);
+aBox->Execute();
 return;
 }
 
diff --git a/cui/source/options/personalization.hxx 
b/cui/source/options/personalization.hxx
index f607cf3..602de52 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@

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

2016-05-17 Thread Eike Rathke

 i18npool/source/localedata/data/gd_GB.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c98575877a64ca7afeb98c5d20e27ba47c14485
Author: Eike Rathke 
Date:   Tue May 17 22:34:23 2016 +0200

change Gaelic [gd-GB] QuotationStart to U+2019

Which is "â" RIGHT SINGLE QUOTATION MARK but due to Gaelic use of '
apostrophe as in a' d' the activated AutoCorrection in an otherwise
English context turns it into a typographic left single quotation mark,
which looks odd.

Per request of Michael Bauer of the l10n team.

Change-Id: If6b542636aad2a05b6f4b58f354b96becbf5f8dc

diff --git a/i18npool/source/localedata/data/gd_GB.xml 
b/i18npool/source/localedata/data/gd_GB.xml
index ae0d854..5a52ed0 100644
--- a/i18npool/source/localedata/data/gd_GB.xml
+++ b/i18npool/source/localedata/data/gd_GB.xml
@@ -42,7 +42,7 @@

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source

2016-05-17 Thread Arul Michael

 sc/source/core/data/column.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b7c9357dfbd119b0bad5034d61b1be140f99943b
Author: Arul Michael 
Date:   Mon May 16 15:52:21 2016 +0530

tdf#99255 Calc crashing on Undo after Spell Correction

 Avoiding null pointers being set for ScPostit* while
creating the undo document during spell check.

Change-Id: Ieb09cb2cee1c030f275eb5030dd779d543753c8b
Reviewed-on: https://gerrit.libreoffice.org/25030
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 2d15020ea29d5541d1c44ff44a06eb5bcb35c52e)
Reviewed-on: https://gerrit.libreoffice.org/25070

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 596e338..4a5f266 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1206,9 +1206,13 @@ void ScColumn::CopyCellToDocument( SCROW nSrcRow, SCROW 
nDestRow, ScColumn& rDes
 {
 rDestCol.maCellTextAttrs.set(nDestRow, 
maCellTextAttrs.get(nSrcRow));
 ScPostIt* pNote = maCellNotes.get(nSrcRow);
-rDestCol.maCellNotes.set(nDestRow, pNote);
 if (pNote)
+{
+rDestCol.maCellNotes.set(nDestRow, pNote);
 pNote->UpdateCaptionPos(ScAddress(rDestCol.nCol, nDestRow, 
rDestCol.nTab));
+}
+else
+rDestCol.maCellNotes.set_empty(nDestRow, nDestRow);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Khaled Hosny

 vcl/unx/generic/glyphs/gcach_layout.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 225411ebb572e4bb8b551509b37e20a529a91603
Author: Khaled Hosny 
Date:   Tue May 17 22:43:09 2016 +0200

Outdated comment

Change-Id: Ia9503b49387e3510073955da7ef042c4f46ff8ae

diff --git a/vcl/unx/generic/glyphs/gcach_layout.cxx 
b/vcl/unx/generic/glyphs/gcach_layout.cxx
index 81db0ae..61d1477 100644
--- a/vcl/unx/generic/glyphs/gcach_layout.cxx
+++ b/vcl/unx/generic/glyphs/gcach_layout.cxx
@@ -637,7 +637,6 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 
 ServerFontLayoutEngine* ServerFont::GetLayoutEngine()
 {
-// find best layout engine for font, platform, script and language
 if (!mpLayoutEngine) {
 mpLayoutEngine = new HbLayoutEngine(*this);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Caolán McNamara

 sfx2/source/dialog/backingcomp.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5b30054ee1088491335f41efd4243bf258a5cab8
Author: CaolÃ¡n McNamara 
Date:   Tue May 17 21:40:39 2016 +0100

fix JunitTest_sfx2_complex

post...

commit 6ebf9cfbf54052d7fae50cdab146cc5c63ba262a
Date:   Tue May 10 19:16:47 2016 +0200

Set different ui file for NotebookBar in each app

this stuff needs to be inside the SolarMutex

Change-Id: Idad938f413c7ef7f8574231116ea4cd518e3a035

diff --git a/sfx2/source/dialog/backingcomp.cxx 
b/sfx2/source/dialog/backingcomp.cxx
index 0654b3e..c4ac85f 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -594,6 +594,9 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const 
css::lang::EventObject& aEven
 void SAL_CALL BackingComp::dispose()
 throw(css::uno::RuntimeException, std::exception)
 {
+/* SAFE { */
+SolarMutexGuard aGuard;
+
 if (m_xFrame.is())
 {
 css::uno::Reference< css::awt::XWindow > xParentWindow = 
m_xFrame->getContainerWindow();
@@ -605,9 +608,6 @@ void SAL_CALL BackingComp::dispose()
 pSysWindow->GetNotebookBar()->Hide();
 }
 
-/* SAFE { */
-SolarMutexGuard aGuard;
-
 // stop listening at the window
 if (m_xWindow.is())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Some thoughts about our tests and the build time

2016-05-17 Thread Markus Mohrhard

Hey Miklos,

On Tue, May 17, 2016 at 5:30 PM, Miklos Vajna 
wrote:

> Hi Markus,
>
> On Tue, May 17, 2016 at 10:26:07AM +0200, Markus Mohrhard <
> markus.mohrh...@googlemail.com> wrote:
> > It is just a toplevel make. So it only covers unitcheck and slowcheck and
> > not subsequentcheck. Therefore we have no java tests in these numbers.
>
> I see. If you perform your checks again, then please consider timing
> 'make check', not 'make' next time -- I hope that subsequentchecks are
> not in the "nobody runs them" category.
>

Well. I think most people don't run them. Even I don't run them most of the
time. But to be able to have a comparison here the numbers for a time make
check:

real11m26.067s
user67m2.876s
sys1m24.788s

So based on that at least for the dbgutil build the java tests are actually
not that slow anymore. Well there are not that many and if you look how
many tests the slow cppunit tests I think they are still much slower. But
the numbers are now around 2:1 for the cppunit tests.

>
> Thanks,
>
> Miklos
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Some thoughts about our tests and the build time

2016-05-17 Thread Bjoern Michaelsen

Hi,

On Tue, May 17, 2016 at 04:25:35PM +0200, Markus Mohrhard wrote:
> > Did you by chance have an opportunity to also ran "make" from scratch on
> > that machine? I assume/hope it wont take the 70 min + 11 min = 82 min. a
> > straight addition would make one assume, because make will use idle job 
> > slots
> > during a full build.
> real83m37.618s
> user493m30.052s
> sys29m44.404s

Ah ok, so these add up pretty linear in both user and real.

> And then the following time make (therefore again only executing tests):
> 
> real9m16.741s
> user45m31.208s
> sys0m37.516s

Thats interesting as it should be comparable with:

> > > real6m37.479s
> > > user45m4.740s

and while it is for CPU time it isnt for wall time by a factor of 50%. So seems
we have quite some variance here ...

> > P.S.: For reference, the output of "time make build-nocheck" would be
> > helpful too (aka a noop incremental build time overhead in make/dep parsing
> > etc.)
> real0m38.787s
> user0m16.300s
> sys0m0.896s

Expected I guess -- and it seems heavily I/O bound, this is single threaded
and the CPU is waiting 2/3rds of the time.

Thanks for the additional numbers!

Best,

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

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

2016-05-17 Thread Arul Michael

 sc/source/core/data/column.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2d15020ea29d5541d1c44ff44a06eb5bcb35c52e
Author: Arul Michael 
Date:   Mon May 16 15:52:21 2016 +0530

tdf#99255 Calc crashing on Undo after Spell Correction

 Avoiding null pointers being set for ScPostit* while
creating the undo document during spell check.

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

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index faf7f3a2..6389b1c 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1206,9 +1206,13 @@ void ScColumn::CopyCellToDocument( SCROW nSrcRow, SCROW 
nDestRow, ScColumn& rDes
 {
 rDestCol.maCellTextAttrs.set(nDestRow, 
maCellTextAttrs.get(nSrcRow));
 ScPostIt* pNote = maCellNotes.get(nSrcRow);
-rDestCol.maCellNotes.set(nDestRow, pNote);
 if (pNote)
+{
+rDestCol.maCellNotes.set(nDestRow, pNote);
 pNote->UpdateCaptionPos(ScAddress(rDestCol.nCol, nDestRow, 
rDestCol.nTab));
+}
+else
+rDestCol.maCellNotes.set_empty(nDestRow, nDestRow);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Henry Castro

 loleaflet/src/core/Socket.js |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit c511cc9fca8f1c650ab7104c4e2ca00a76bf38b8
Author: Henry Castro 
Date:   Tue May 17 12:23:00 2016 -0400

loleaflet: fix "Maximum call stack size exceeded"

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 606e137..bbd68e2 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -100,6 +100,14 @@ L.Socket = L.Class.extend({
this._map._activate();
},
 
+   _utf8ToString: function (data) {
+   var strBytes = '';
+   for (var it = 0; it < data.length; it++) {
+   strBytes += String.fromCharCode(data[it]);
+   }
+   return strBytes;
+   },
+
_onMessage: function (e) {
var imgBytes, index, textMsg;
 
@@ -177,8 +185,13 @@ L.Socket = L.Class.extend({
// log the tile msg separately as we need the tile 
coordinates
L.Log.log(textMsg, L.INCOMING);
if (imgBytes !== undefined) {
-   // if it's not a tile, parse the whole message
-   textMsg = String.fromCharCode.apply(null, 
imgBytes);
+   try {
+   // if it's not a tile, parse the whole 
message
+   textMsg = 
String.fromCharCode.apply(null, imgBytes);
+   } catch (error) {
+   // big data string
+   textMsg = this._utf8ToString(imgBytes);
+   }
}
// Decode UTF-8.
textMsg = decodeURIComponent(window.escape(textMsg));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Some thoughts about our tests and the build time

2016-05-17 Thread Miklos Vajna

Hi Markus,

On Tue, May 17, 2016 at 10:26:07AM +0200, Markus Mohrhard 
 wrote:
> It is just a toplevel make. So it only covers unitcheck and slowcheck and
> not subsequentcheck. Therefore we have no java tests in these numbers.

I see. If you perform your checks again, then please consider timing
'make check', not 'make' next time -- I hope that subsequentchecks are
not in the "nobody runs them" category.

Thanks,

Miklos

signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Helena Svobodová license statement

2016-05-17 Thread Helena Svobodová

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


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

Re: Some thoughts about our tests and the build time

2016-05-17 Thread Wols Lists

On 17/05/16 02:14, Xen wrote:
> Markus Mohrhard schreef op 17-05-2016 2:37:
> 
>> I hope this long text gives you something to think about.
> 
> Just as an outsider:
> 
> Separating tests that are meaningful for a developer, and tests that are
> meaningful for a builder, seems most meaningful to me ;-).
> 
> Even as a developer, even if you were actively working, I don't think
> you would want to run the full suite more than once a week, even if you
> are making many changes daily, for instance.
> 
> So I think the goal is to reduce the incidence, to reduce the frequency
> of running the full set, by people that cannot gain much from it, as you
> indicated.
> 
> Just some thoughts, and just one opinion.
> 
Roughly what I was thinking.

Can we split "make tests" and create a bunch of targets like
"calc_tests", "writer-tests" etc all called from it? Plus, of course
"core_tests" which could either be called from "tests", or could be
called from all the subsection tests.

Over time move all the top-level tests into the lower tests, and only
add stuff to the lower tests.

So, as Xen says, if you're working on a section you only need to run the
tests for that section regularly, and the full tests occasionally. If
that reduces the cost enough, maybe even make the tests run as a matter
of course ...

Cheers,
Wol

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

Re: Some thoughts about our tests and the build time

2016-05-17 Thread Markus Mohrhard

Hey Björn,

On Tue, May 17, 2016 at 11:21 AM, Bjoern Michaelsen <
bjoern.michael...@canonical.com> wrote:

> Heya Markus,
>
> On Tue, May 17, 2016 at 02:37:02AM +0200, Markus Mohrhard wrote:
> > The results for the initial build without building or executing the
> tests:
> >
> > real70m17.990s
> > user436m43.860s
> > sys28m3.680s
> >
> > After that the results of a time make, therefore forcing the build of
> > everything test related and executing the tests:
> >
> > real11m30.192s
> > user58m43.384s
> > sys1m36.876s
>
> Did you by chance have an opportunity to also ran "make" from scratch on
> that
> machine? I assume/hope it wont take the 70 min + 11 min = 82 min. a
> straight
> addition would make one assume, because make will use idle job slots
> during a
> full build.
>

real83m37.618s
user493m30.052s
sys29m44.404s


And then the following time make (therefore again only executing tests):

real9m16.741s
user45m31.208s
sys0m37.516s



>
> IOW, these number suggest a 82min/70min = 17% overhead in real and a (436 +
> 58)min/436min = 13% overhead in CPU time -- but I assume the real overhead
> in a
> build from scratch is smaller than both of that in the real world.


> The most critical time I see from in all this is not anything build from
> scratch anyway, but the for a simple
> touch-one-cxx-recompile-relink-and-then-run-all-the-tests scenarios. So
> the:
>
> > real6m37.479s
> > user45m4.740s
>
> as an _absolute_ is the key there, I guess.
>


So for me the problem is that on machines that are much slower it takes
quite some time to execute the tests and that we are going to see people
just skipping the tests if the cost-value relationship becomes too bad. As
mentioned I think we are right now still in an area where it is somewhat ok
but we know that we are adding more and more tests and that it will mean
that the ratio test time/build time will become bigger.


>
> Best,
>
> Bjoern
>
> P.S.: I would have assumed compiling/linking the tests to take much more
> time
> than running the tests. But it seems with 45min/58min=77% -- most of the
> time
> is indeed spend on running tests, not building them.
>
> P.S.: For reference, the output of "time make build-nocheck" would be
> helpful
>   too (aka a noop incremental build time overhead in make/dep parsing
> etc.)
>

real0m38.787s
user0m16.300s
sys0m0.896s
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - unotools/source

2016-05-17 Thread Stephan Bergmann

 unotools/source/config/fontcfg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32beafbad3fe21991f5aac7656b8c1b2626570aa
Author: Stephan Bergmann 
Date:   Mon Dec 14 16:47:38 2015 +0100

Silence warning C4334 under --enble-64-bit MSVC

("'<<' : result of 32-bit shift implicitly converted to 64 bits")

Change-Id: I738fe94ec559e2a35ffc32fb91c22c06094cff9f
(cherry picked from commit c31b6e1a154d3bf94b5346343104cbc00378e51d)
Reviewed-on: https://gerrit.libreoffice.org/25065
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/unotools/source/config/fontcfg.cxx 
b/unotools/source/config/fontcfg.cxx
index d343450..2b5105a 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -1004,7 +1004,7 @@ ImplFontAttrs FontSubstConfiguration::getSubstType( const 
css::uno::Reference< X
 for( int k = 0; k < 32; k++ )
 if( aToken.equalsIgnoreAsciiCaseAscii( pAttribNames[k] ) )
 {
-type |= 1UL << k;
+type |= sal_uLong(1) << k;
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/ClientSession.cpp loolwsd/ClientSession.hpp loolwsd/DocumentBroker.cpp

2016-05-17 Thread Ashod Nakashian

 loolwsd/ClientSession.cpp  |   15 ---
 loolwsd/ClientSession.hpp  |2 +-
 loolwsd/DocumentBroker.cpp |2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 76991dd325f5b90ab1d7ceb6a9f55d952154f701
Author: Ashod Nakashian 
Date:   Tue May 17 08:17:21 2016 -0400

loolwsd: disable editlock in multiview

Change-Id: I4df2d8a321e160ce226c2e22aa754cd6e5b2c755
Reviewed-on: https://gerrit.libreoffice.org/25063
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index 33615ed..49ba399 100644
--- a/loolwsd/ClientSession.cpp
+++ b/loolwsd/ClientSession.cpp
@@ -40,7 +40,7 @@ ClientSession::ClientSession(const std::string& id,
 LOOLSession(id, Kind::ToClient, ws),
 _docBroker(docBroker),
 _queue(queue),
-_haveEditLock(false),
+_haveEditLock(std::getenv("LOK_VIEW_CALLBACK")),
 _loadFailed(false),
 _loadPart(-1)
 {
@@ -222,10 +222,9 @@ bool ClientSession::getStatus(const char *buffer, int 
length)
 sendTextFrame(status);
 
 // And let clients know if they hold the edit lock.
-std::string message = "editlock: ";
-message += std::to_string(isEditLocked());
-Log::debug("Forwarding [" + message + "] in response to status.");
-sendTextFrame(message);
+const auto msg = "editlock: " + std::to_string(isEditLocked());
+Log::debug("Returning [" + msg + "] in response to status.");
+sendTextFrame(msg);
 
 return true;
 }
@@ -243,8 +242,10 @@ bool ClientSession::getStatus(const char *buffer, int 
length)
 void ClientSession::setEditLock(const bool value)
 {
 // Update the sate and forward to child.
-_haveEditLock = value;
-const auto msg = std::string("editlock: ") + (value ? "1" : "0");
+markEditLock(value);
+const auto msg = "editlock: " + std::to_string(isEditLocked());
+const auto mv = std::getenv("LOK_VIEW_CALLBACK") ? "1" : "0";
+Log::debug("Forwarding [" + msg + "] to set editlock to " + 
std::to_string(value) + ". MultiView: " + mv);
 forwardToPeer(msg.data(), msg.size());
 }
 
diff --git a/loolwsd/ClientSession.hpp b/loolwsd/ClientSession.hpp
index 65891f7..2b5d0f0 100644
--- a/loolwsd/ClientSession.hpp
+++ b/loolwsd/ClientSession.hpp
@@ -27,7 +27,7 @@ public:
 virtual ~ClientSession();
 
 void setEditLock(const bool value);
-void markEditLock(const bool value) { _haveEditLock = value; }
+void markEditLock(const bool value) { _haveEditLock = (value || 
std::getenv("LOK_VIEW_CALLBACK")); }
 bool isEditLocked() const { return _haveEditLock; }
 
 void setPeer(const std::shared_ptr& peer) { _peer = peer; 
}
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index a7abd38..3bb2bcc 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -275,7 +275,7 @@ bool DocumentBroker::sendUnoSave()
 Log::info("Autosave triggered for doc [" + _docKey + "].");
 Util::assertIsLocked(_mutex);
 
-// Save using session holding the edit-lock
+// Save using session holding the edit-lock (or first if multview).
 for (auto& sessionIt: _sessions)
 {
 if (sessionIt.second->isEditLocked())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/ChildSession.cpp loolwsd/ChildSession.hpp loolwsd/LOOLKit.cpp

2016-05-17 Thread Ashod Nakashian

 loolwsd/ChildSession.cpp |   62 +++
 loolwsd/ChildSession.hpp |8 +++---
 loolwsd/LOOLKit.cpp  |   14 +-
 3 files changed, 42 insertions(+), 42 deletions(-)

New commits:
commit b41f0a6ea3fd9f7eb6fe8de5e6aadc8a1fc03e9d
Author: Ashod Nakashian 
Date:   Tue May 17 07:35:07 2016 -0400

loolwsd: ChildProcessSession -> ChildSession

Change-Id: I24f001cb4d17d1ddc5cbd4f48134ec4eb8777afb
Reviewed-on: https://gerrit.libreoffice.org/25062
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index a612246..0c1d001 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -63,7 +63,7 @@ public:
 class CallbackWorker: public Runnable
 {
 public:
-CallbackWorker(NotificationQueue& queue, ChildProcessSession& session):
+CallbackWorker(NotificationQueue& queue, ChildSession& session):
 _queue(queue),
 _session(session),
 _stop(false)
@@ -280,13 +280,13 @@ public:
 
 private:
 NotificationQueue& _queue;
-ChildProcessSession& _session;
+ChildSession& _session;
 volatile bool _stop;
 };
 
-std::recursive_mutex ChildProcessSession::Mutex;
+std::recursive_mutex ChildSession::Mutex;
 
-ChildProcessSession::ChildProcessSession(const std::string& id,
+ChildSession::ChildSession(const std::string& id,
  std::shared_ptr ws,
  LibreOfficeKitDocument * 
loKitDocument,
  const std::string& jailId,
@@ -301,14 +301,14 @@ ChildProcessSession::ChildProcessSession(const 
std::string& id,
 _onUnload(onUnload),
 _callbackWorker(new CallbackWorker(_callbackQueue, *this))
 {
-Log::info("ChildProcessSession ctor [" + getName() + "].");
+Log::info("ChildSession ctor [" + getName() + "].");
 
 _callbackThread.start(*_callbackWorker);
 }
 
-ChildProcessSession::~ChildProcessSession()
+ChildSession::~ChildSession()
 {
-Log::info("~ChildProcessSession dtor [" + getName() + "].");
+Log::info("~ChildSession dtor [" + getName() + "].");
 
 disconnect();
 
@@ -317,7 +317,7 @@ ChildProcessSession::~ChildProcessSession()
 _callbackThread.join();
 }
 
-void ChildProcessSession::disconnect()
+void ChildSession::disconnect()
 {
 if (!isDisconnected())
 {
@@ -332,7 +332,7 @@ void ChildProcessSession::disconnect()
 }
 }
 
-bool ChildProcessSession::_handleInput(const char *buffer, int length)
+bool ChildSession::_handleInput(const char *buffer, int length)
 {
 const std::string firstLine = getFirstLine(buffer, length);
 StringTokenizer tokens(firstLine, " ", StringTokenizer::TOK_IGNORE_EMPTY | 
StringTokenizer::TOK_TRIM);
@@ -569,7 +569,7 @@ bool ChildProcessSession::_handleInput(const char *buffer, 
int length)
 return true;
 }
 
-bool ChildProcessSession::loadDocument(const char * /*buffer*/, int 
/*length*/, StringTokenizer& tokens)
+bool ChildSession::loadDocument(const char * /*buffer*/, int /*length*/, 
StringTokenizer& tokens)
 {
 int part = -1;
 if (tokens.count() < 2)
@@ -623,7 +623,7 @@ bool ChildProcessSession::loadDocument(const char * 
/*buffer*/, int /*length*/,
 return true;
 }
 
-void ChildProcessSession::sendFontRendering(const char* /*buffer*/, int 
/*length*/, StringTokenizer& tokens)
+void ChildSession::sendFontRendering(const char* /*buffer*/, int /*length*/, 
StringTokenizer& tokens)
 {
 std::string font, decodedFont;
 
@@ -665,7 +665,7 @@ void ChildProcessSession::sendFontRendering(const char* 
/*buffer*/, int /*length
 sendBinaryFrame(output.data(), output.size());
 }
 
-bool ChildProcessSession::getStatus(const char* /*buffer*/, int /*length*/)
+bool ChildSession::getStatus(const char* /*buffer*/, int /*length*/)
 {
 std::unique_lock lock(Mutex);
 
@@ -683,7 +683,7 @@ bool ChildProcessSession::getStatus(const char* /*buffer*/, 
int /*length*/)
 return true;
 }
 
-bool ChildProcessSession::getCommandValues(const char* /*buffer*/, int 
/*length*/, StringTokenizer& tokens)
+bool ChildSession::getCommandValues(const char* /*buffer*/, int /*length*/, 
StringTokenizer& tokens)
 {
 std::string command;
 if (tokens.count() != 2 || !getTokenString(tokens[1], "command", command))
@@ -701,7 +701,7 @@ bool ChildProcessSession::getCommandValues(const char* 
/*buffer*/, int /*length*
 return true;
 }
 
-bool ChildProcessSession::getPartPageRectangles(const char* /*buffer*/, int 
/*length*/)
+bool ChildSession::getPartPageRectangles(const char* /*buffer*/, int 
/*length*/)
 {
 std::unique_lock lock(Mutex);
 
@@ -712,7 +712,7 @@ bool ChildProcessSession::getPartPageRectangles(const char* 
/*buffer*/, int /*le
 return true;
 }
 
-bool ChildProcessSession::clientZoom(const char* /*buffer*/, int /*length*/, 
StringTokenizer& tokens)
+bool ChildSession::clientZoom(const char* /*buffer*/, int /*length*/, 
StringTokenize

[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/ChildProcessSession.hpp loolwsd/ChildSession.cpp loolwsd/ChildSession.hpp loolwsd/LOOLKit.cpp loolwsd/Makefile.am

2016-05-17 Thread Ashod Nakashian

 loolwsd/ChildProcessSession.cpp | 1164 
 loolwsd/ChildProcessSession.hpp |  112 ---
 loolwsd/ChildSession.cpp| 1164 
 loolwsd/ChildSession.hpp|  112 +++
 loolwsd/LOOLKit.cpp |2 
 loolwsd/Makefile.am |4 
 6 files changed, 1279 insertions(+), 1279 deletions(-)

New commits:
commit 7ce6e67731ef55358d93c2f101fd03a925586ede
Author: Ashod Nakashian 
Date:   Tue May 17 07:32:33 2016 -0400

loolwsd: ChildProcessSession.{cpp,hpp} -> ChildSession.{cpp,hpp}

Change-Id: Ic0c7f0992c9024d8fb8478b41205394372094af8
Reviewed-on: https://gerrit.libreoffice.org/25061
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildSession.cpp
similarity index 99%
rename from loolwsd/ChildProcessSession.cpp
rename to loolwsd/ChildSession.cpp
index 21c2aad..a612246 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -23,7 +23,7 @@
 #include 
 #include 
 
-#include "ChildProcessSession.hpp"
+#include "ChildSession.hpp"
 #include "Common.hpp"
 #include "LOKitHelper.hpp"
 #include "LOOLProtocol.hpp"
diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildSession.hpp
similarity index 98%
rename from loolwsd/ChildProcessSession.hpp
rename to loolwsd/ChildSession.hpp
index ab552d3..2f06374 100644
--- a/loolwsd/ChildProcessSession.hpp
+++ b/loolwsd/ChildSession.hpp
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_CHILDPROCESSSESSION_HPP
-#define INCLUDED_CHILDPROCESSSESSION_HPP
+#ifndef INCLUDED_CHILDSESSION_HPP
+#define INCLUDED_CHILDSESSION_HPP
 
 #include 
 
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index fb6b314..6f13298 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -44,7 +44,7 @@
 #include 
 #include 
 
-#include "ChildProcessSession.hpp"
+#include "ChildSession.hpp"
 #include "Common.hpp"
 #include "IoUtil.hpp"
 #include "LOKitHelper.hpp"
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 98e9960..ac7f672 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -28,7 +28,7 @@ AM_LDFLAGS = -pthread -Wl,-E
 AM_ETAGSFLAGS = --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes *
 AM_CTAGSFLAGS = $(AM_ETAGSFLAGS)
 
-shared_sources = ChildProcessSession.cpp \
+shared_sources = ChildSession.cpp \
  IoUtil.cpp \
  Log.cpp \
  LOOLProtocol.cpp \
@@ -79,7 +79,7 @@ looltool_SOURCES = LOOLTool.cpp
 noinst_HEADERS = Admin.hpp \
  AdminModel.hpp \
  Auth.hpp \
- ChildProcessSession.hpp \
+ ChildSession.hpp \
  Common.hpp \
  DocumentBroker.hpp \
  Exceptions.hpp \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread David Tardon

 chart2/source/view/charttypes/BarChart.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 55a7d9ff6c2f754ea8ba1def8c1ff464629eb81d
Author: David Tardon 
Date:   Tue May 17 15:54:17 2016 +0200

avoid assert

Change-Id: I60ea0f29226d12e98ed88716d092d7f9f7df184f

diff --git a/chart2/source/view/charttypes/BarChart.cxx 
b/chart2/source/view/charttypes/BarChart.cxx
index 411fb4c..a082d21 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -468,6 +468,10 @@ void BarChart::createShapes()
 if( 
aLogicYSumMap.find(nAttachedAxisIndex)==aLogicYSumMap.end() )
 aLogicYSumMap[nAttachedAxisIndex]=0.0;
 
+const sal_Int32 nSlotPoints = aXSlotIter->getPointCount();
+if( nPointIndex >= nSlotPoints )
+continue;
+
 double fMinimumY = 0.0, fMaximumY = 0.0;
 aXSlotIter->calculateYMinAndMaxForCategory( nPointIndex
 , isSeparateStackingForDifferentSigns( 1 ), fMinimumY, 
fMaximumY, nAttachedAxisIndex );
@@ -510,8 +514,9 @@ void BarChart::createShapes()
 // get distance from base value to maximum and minimum
 
 double fMinimumY = 0.0, fMaximumY = 0.0;
-aXSlotIter->calculateYMinAndMaxForCategory( nPointIndex
-, isSeparateStackingForDifferentSigns( 1 ), fMinimumY, 
fMaximumY, nAttachedAxisIndex );
+if( nPointIndex < aXSlotIter->getPointCount())
+aXSlotIter->calculateYMinAndMaxForCategory( nPointIndex
+, isSeparateStackingForDifferentSigns( 1 ), fMinimumY, 
fMaximumY, nAttachedAxisIndex );
 
 double fLogicPositiveYSum = 0.0;
 if( !::rtl::math::isNan( fMaximumY ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Miklos Vajna

 sfx2/source/view/classificationhelper.cxx |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit b0f964d3c32b276613b07b3cc0312ed94618169f
Author: Miklos Vajna 
Date:   Tue May 17 14:39:23 2016 +0200

sfx2 classification: make categories list independent from policy type

This needs adding the policy type prefix in
SfxClassificationHelper::SetBACName() (when selecting a category), not
early in SfxClassificationHelper::Impl::parsePolicy().

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

diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index 0bc615f..f1e7212 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -359,15 +359,7 @@ void SfxClassificationHelper::Impl::parsePolicy()
 {
 SAL_WARN("sfx.view", "parsePolicy() failed: " << rException.Message);
 }
-m_aCategories.clear();
-for (const SfxClassificationCategory& rCategory : 
xClassificationParser->m_aCategories)
-{
-SfxClassificationCategory aCategory;
-aCategory.m_aName = rCategory.m_aName;
-for (const auto& rLabel : rCategory.m_aLabels)
-aCategory.m_aLabels[PROP_PREFIX_INTELLECTUALPROPERTY() + 
rLabel.first] = rLabel.second;
-m_aCategories.push_back(aCategory);
-}
+m_aCategories = xClassificationParser->m_aCategories;
 }
 
 bool lcl_containsProperty(const uno::Sequence& rProperties, 
const OUString& rName)
@@ -692,7 +684,10 @@ void SfxClassificationHelper::SetBACName(const OUString& 
rName)
 return;
 }
 
-m_pImpl->m_aCategory = *it;
+m_pImpl->m_aCategory.m_aName = it->m_aName;
+m_pImpl->m_aCategory.m_aLabels.clear();
+for (const auto& rLabel : it->m_aLabels)
+m_pImpl->m_aCategory.m_aLabels[PROP_PREFIX_INTELLECTUALPROPERTY() + 
rLabel.first] = rLabel.second;
 
 m_pImpl->setStartValidity();
 m_pImpl->pushToDocumentProperties();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread László Németh

 0 files changed

New commits:
commit c61cc4533197ea311103d2716f00c1e007e14a58
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Tue May 17 14:48:16 2016 +0200

empty commit (non-determ. sched.)

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 60/e93b8b5b6bc4220d66e95cd234a37f3c8f8fd7

2016-05-17 Thread Caolán McNamara

 60/e93b8b5b6bc4220d66e95cd234a37f3c8f8fd7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4dfba8347b8446ec84e1c150b808a7667fb09eb4
Author: CaolÃ¡n McNamara 
Date:   Tue May 17 13:45:35 2016 +0100

Notes added by 'git notes add'

diff --git a/60/e93b8b5b6bc4220d66e95cd234a37f3c8f8fd7 
b/60/e93b8b5b6bc4220d66e95cd234a37f3c8f8fd7
new file mode 100644
index 000..5795513
--- /dev/null
+++ b/60/e93b8b5b6bc4220d66e95cd234a37f3c8f8fd7
@@ -0,0 +1 @@
+merged as: 2049e55f507b00cf70f72706900e75d20ff3bb30
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Caolán McNamara

 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |9 +++--
 vcl/source/window/winproc.cxx|3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit dfe7142cdd05707123c688b2a746bed63180ff52
Author: CaolÃ¡n McNamara 
Date:   Tue May 17 13:38:46 2016 +0100

MouseClick -> MouseMove + MouseClick undesirably mimics a drag event

when we click, if the click does not occur at the last known location of the
mouse, we generate a mouse move event to this location, and then send the 
click
event.

But we are sending the move event with the current mouse-button held down 
state
so it appears as a mini drag from the last known mouse location to the click
site.

This makes the slide pane in impress believe an attempt to drag a slide has
occured, which is super annoying when trying to use the slide pane a lot.

It would seem a more sensible thing to generate a move event with the 
buttons
masked out and then continue to send the true button click afterwards.

Change-Id: I5d0caf2cc1c9381800346f0b069af58123473cab

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 3f3d0b2..d72d48e 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -289,7 +289,8 @@ bool ImplHandleMouseEvent( const VclPtr& 
xWindow, MouseNotifyEvent
 if ( (pWinFrameData->mnLastMouseX != nX) ||
  (pWinFrameData->mnLastMouseY != nY) )
 {
-ImplHandleMouseEvent( xWindow, MouseNotifyEvent::MOUSEMOVE, false, 
nX, nY, nMsgTime, nCode, nMode );
+sal_uInt16 nMoveCode = nCode & ~(MOUSE_LEFT | MOUSE_RIGHT | 
MOUSE_MIDDLE);
+ImplHandleMouseEvent(xWindow, MouseNotifyEvent::MOUSEMOVE, false, 
nX, nY, nMsgTime, nMoveCode, nMode);
 }
 }
 
commit 5c3c69bb15d324d48f171ce2c3a3f3fea2f08958
Author: CaolÃ¡n McNamara 
Date:   Tue May 17 12:41:14 2016 +0100

tidy this a little bit

Change-Id: I32c03940f36acb6b70c7d846d6e9ffdba84b8807

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 6c2396e..0dc10f4 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -1179,11 +1179,8 @@ bool NormalModeHandler::ProcessMotionEvent (
 bool bIsProcessed (true);
 switch (rDescriptor.mnEventCode)
 {
-case ANY_MODIFIER(MOUSE_MOTION | LEFT_BUTTON | SINGLE_CLICK | 
OVER_UNSELECTED_PAGE):
-//SetCurrentPage(rDescriptor.mpHitDescriptor);
-// Fallthrough
-
 // A mouse motion without visible substitution starts that.
+case ANY_MODIFIER(MOUSE_MOTION | LEFT_BUTTON | SINGLE_CLICK | 
OVER_UNSELECTED_PAGE):
 case ANY_MODIFIER(MOUSE_MOTION | LEFT_BUTTON | SINGLE_CLICK | 
OVER_SELECTED_PAGE):
 {
 if (maButtonDownLocation)
@@ -1200,10 +1197,10 @@ bool NormalModeHandler::ProcessMotionEvent (
 ? InsertionIndicatorHandler::CopyMode
 : InsertionIndicatorHandler::MoveMode);
 }
+break;
 }
-break;
 
-// A mouse motion not over a page starts a rectangle selection.
+// A mouse motion not over a page starts a rectangle selection.
 case ANY_MODIFIER(MOUSE_MOTION | LEFT_BUTTON | SINGLE_CLICK | 
NOT_OVER_PAGE):
 mrSelectionFunction.SwitchToMultiSelectionMode(
 rDescriptor.maMouseModelPosition,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk sd/sdi sd/source sd/uiconfig sd/UIConfig_simpress.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk vcl/source

2016-05-17 Thread Szymon Kłos

 sc/UIConfig_scalc.mk   |1 
 sc/sdi/docsh.sdi   |1 
 sc/source/ui/docshell/docsh4.cxx   |   14 ++
 sc/uiconfig/scalc/ui/notebookbar.ui|  172 +
 sd/UIConfig_simpress.mk|1 
 sd/sdi/docshell.sdi|5 
 sd/source/ui/docshell/docshel3.cxx |7 +
 sd/source/ui/docshell/docshell.cxx |7 +
 sd/uiconfig/simpress/ui/notebookbar.ui |  118 ++
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/dialog/backingcomp.cxx |   20 +++
 sfx2/uiconfig/ui/notebookbar.ui|  118 ++
 vcl/source/window/brdwin.cxx   |2 
 13 files changed, 467 insertions(+)

New commits:
commit 6ebf9cfbf54052d7fae50cdab146cc5c63ba262a
Author: Szymon KÅos 
Date:   Tue May 10 19:16:47 2016 +0200

Set different ui file for NotebookBar in each app

Changes:
+ added ui file for start center, calc and impress
+ NotebookBar not visible in Math, Draw

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

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index f67a879..21bb7e1 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftfooterdialog \
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \
+   sc/uiconfig/scalc/ui/notebookbar \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/movecopysheet \
sc/uiconfig/scalc/ui/movingaveragedialog \
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index 25852fb..852af49 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -87,6 +87,7 @@ interface TableDocument
 SID_EDIT_SCENARIO   [ ExecMethod = Execute; ]
 SID_ATTR_CHAR_FONTLIST  [ StateMethod = GetState; ]
 SID_SHARE_DOC   [ ExecMethod = Execute; StateMethod = GetState; ]
+SID_NOTEBOOKBAR [ ExecMethod = Execute; StateMethod = GetState; ]
 }
 
 
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 1bedf91..bdf1c52 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -101,6 +101,7 @@ using namespace ::com::sun::star;
 #include "formulacell.hxx"
 #include 
 #include 
+#include 
 
 void ScDocShell::Execute( SfxRequest& rReq )
 {
@@ -1103,6 +1104,12 @@ void ScDocShell::Execute( SfxRequest& rReq )
 { &aApp, &aTarget });
 }
 break;
+case SID_NOTEBOOKBAR:
+{
+if (pBindings)
+sfx2::SfxNotebookBar::ExecMethod(*pBindings);
+}
+break;
 default:
 {
 // kleiner (?) Hack -> forward der Slots an TabViewShell
@@ -1857,6 +1864,13 @@ void ScDocShell::GetState( SfxItemSet &rSet )
 rSet.Put( SvxFontListItem( pImpl->pFontList, nWhich ) );
 break;
 
+case SID_NOTEBOOKBAR:
+{
+if (GetViewBindings())
+sfx2::SfxNotebookBar::StateMethod(*GetViewBindings(), 
"modules/scalc/ui/notebookbar.ui");
+}
+break;
+
 default:
 {
 }
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
new file mode 100644
index 000..337448d
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -0,0 +1,172 @@
+
+
+
+  
+  
+  
+True
+False
+
+  
+True
+False
+vertical
+
+  
+True
+True
+True
+True
+
+  
+True
+False
+6
+
+  
+True
+False
+vertical
+
+  
+True
+True
+True
+.uno:Open
+none
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+True
+.uno:Save
+none
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+0
+  
+
+

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

2016-05-17 Thread Damjan Jovanovic

 connectivity/source/drivers/flat/ETable.cxx |   59 +---
 1 file changed, 53 insertions(+), 6 deletions(-)

New commits:
commit 2049e55f507b00cf70f72706900e75d20ff3bb30
Author: Damjan Jovanovic 
Date:   Sun Apr 17 16:44:43 2016 +

Make CSV line parsers consistent with CSV field parsers.

Our CSV field parsing algorithms treats fields starting with a quote
(immediately at the beginning of the row, or after the field delimiter) as
quoted. A quoted field ends at the corresponding closing quote, and any
remaining text between the closing quote and the next field delimeter or end
of line is appended to the text already extracted from the field, but not
processed further. Any quotes in this extra text are taken verbatim - they
do not quote anything.

Our CSV line parsers were big hacks - they essentially read and concatenate
lines until an even number of quote characters is found, and then feed this
through the CSV field parsers.

This patch rewrites the line parsers to work exactly how the field parsers
work. Text such as:
"another" ",something else
is now correctly parsed by both Calc and Base as:
[another "],[something else]
instead of breaking all further parsing.

Patch by: me

(cherry picked from commit 60e93b8b5b6bc4220d66e95cd234a37f3c8f8fd7)

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

diff --git a/connectivity/source/drivers/flat/ETable.cxx 
b/connectivity/source/drivers/flat/ETable.cxx
index a79ded6..323e709 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -890,14 +890,61 @@ bool OFlatTable::readLine(sal_Int32 * const pEndPos, 
sal_Int32 * const pStartPos
 return false;
 
 QuotedTokenizedString sLine = m_aCurrentLine; // check if the string 
continues on next line
-while( (comphelper::string::getTokenCount(sLine.GetString(), 
m_cStringDelimiter) % 2) != 1 )
+sal_Int32 nLastOffset = 0;
+bool isQuoted = false;
+bool isFieldStarting = true;
+while (true)
 {
-m_pFileStream->ReadByteStringLine(sLine,nEncoding);
-if ( !m_pFileStream->IsEof() )
+bool wasQuote = false;
+const sal_Unicode *p = sLine.GetString().getStr() + nLastOffset;
+while (*p)
 {
-OUString aStr = m_aCurrentLine.GetString() + "\n" + 
sLine.GetString();
-m_aCurrentLine.SetString(aStr);
-sLine = m_aCurrentLine;
+if (isQuoted)
+{
+if (*p == m_cStringDelimiter)
+wasQuote = !wasQuote;
+else
+{
+if (wasQuote)
+{
+wasQuote = false;
+isQuoted = false;
+if (*p == m_cFieldDelimiter)
+isFieldStarting = true;
+}
+}
+}
+else
+{
+if (isFieldStarting)
+{
+isFieldStarting = false;
+if (*p == m_cStringDelimiter)
+isQuoted = true;
+else if (*p == m_cFieldDelimiter)
+isFieldStarting = true;
+}
+else if (*p == m_cFieldDelimiter)
+isFieldStarting = true;
+}
+++p;
+}
+
+if (wasQuote)
+isQuoted = false;
+
+if (isQuoted)
+{
+nLastOffset = sLine.Len();
+m_pFileStream->ReadByteStringLine(sLine,nEncoding);
+if ( !m_pFileStream->IsEof() )
+{
+OUString aStr = m_aCurrentLine.GetString() + "\n" + 
sLine.GetString();
+m_aCurrentLine.SetString(aStr);
+sLine = m_aCurrentLine;
+}
+else
+break;
 }
 else
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: multi-threading task under SolarMutex -> deadlock

2016-05-17 Thread Norbert Thiebaud

On Tue, May 17, 2016 at 6:44 AM, Thorsten Behrens  wrote:
> Norbert Thiebaud wrote:
>> The threaded work then raise() due to some memory problem and out
>> signal handler try to acquire the solar mutex ->deadlock
>>
> Eek, that's ugly. Then again, at the core is the OOM condition, which
> needs solving independently. Per chance, is that happening on a box
> with massive amounts of CPU threads?

it is on the ci builder, so yeah 32 thread or so.

but I disagree that it is _at the core_

at the core this exhibit 2 things:
1/ we do a lot of thing that is verboten in a signal handler.
2/ taking a lock that rely on other thread to move forward while
holding the solarmutex is begging for deadlock.

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

[Libreoffice-commits] core.git: g

2016-05-17 Thread Christian Lohmaier

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

New commits:
commit d94b827c404e2801797c97a830eecfc6d1489202
Author: Christian Lohmaier 
Date:   Mon May 9 16:06:38 2016 +0200

it is "git submodule", not "git submodules"

diff --git a/g b/g
index 69b0812..3d2a37d 100755
--- a/g
+++ b/g
@@ -220,7 +220,7 @@ local module
 if [ -f .gitmodules ] ; then
git submodule update
if [ -n "$branch" ] ; then
-   git submodules foreach git checkout -b ${branch} HEAD || return $?
+   git submodule foreach git checkout -b ${branch} HEAD || return $?
fi
 else
# now that is the nasty case we moved prior to submodules
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: multi-threading task under SolarMutex -> deadlock

2016-05-17 Thread Thorsten Behrens

Norbert Thiebaud wrote:
> The threaded work then raise() due to some memory problem and out
> signal handler try to acquire the solar mutex ->deadlock
> 
Eek, that's ugly. Then again, at the core is the OOM condition, which
needs solving independently. Per chance, is that happening on a box
with massive amounts of CPU threads?

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-05-17 Thread Caolán McNamara

 vcl/unx/gtk/a11y/atklistener.cxx |   57 +++
 vcl/unx/gtk/a11y/atkutil.cxx |   10 --
 2 files changed, 40 insertions(+), 27 deletions(-)

New commits:
commit 0defd98b5995a27117023c289d628a6efbc5d2cc
Author: CaolÃ¡n McNamara 
Date:   Tue May 17 12:35:04 2016 +0100

The other Invalidate is a OSL_TRACE, so silence here likewise

Change-Id: Ib7e7d53e8feb378229a71985bb6108ce9b58cb29

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 9b5bbd0..d722936 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -199,8 +199,9 @@ void DocumentFocusListener::notifyEvent( const 
accessibility::AccessibleEventObj
 
 if( accessibility::AccessibleStateType::FOCUSED == nState )
 atk_wrapper_focus_tracker_notify_when_idle( 
getAccessible(aEvent) );
+
+break;
 }
-break;
 
 case accessibility::AccessibleEventId::CHILD:
 {
@@ -210,12 +211,13 @@ void DocumentFocusListener::notifyEvent( const 
accessibility::AccessibleEventObj
 
 if( (aEvent.NewValue >>= xChild) && xChild.is() )
 attachRecursive(xChild);
+
+break;
 }
-break;
 
 case accessibility::AccessibleEventId::INVALIDATE_ALL_CHILDREN:
-g_warning( "Invalidate all children called\n" );
-break;
+OSL_TRACE( "Invalidate all children called\n" );
+break;
 
 default:
 break;
commit 47bf48a035f768689b92a977caffbd312f6a2a5d
Author: CaolÃ¡n McNamara 
Date:   Tue May 17 12:32:41 2016 +0100

shut up about the PAGE_CHANGED event from slide pane slide switching

Change-Id: I8ebe1b3db894cd3a2e9834ec73949cc6504366b9

diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index d4eb9ed..053138e 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -558,6 +558,17 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 break;
 }
 
+case accessibility::AccessibleEventId::PAGE_CHANGED:
+{
+/* // If we implemented AtkDocument then I imagine this is what 
this
+   // handler should look like
+   sal_Int32 nPos=0;
+   aEvent.NewValue >>= nPos;
+   g_signal_emit_by_name( G_OBJECT( atk_obj ), "page_changed", 
nPos );
+*/
+break;
+}
+
 default:
 g_warning( "Unknown event notification %d", aEvent.EventId );
 break;
commit 0e609b5d9576c612ca98a820374daf94fdf485fd
Author: CaolÃ¡n McNamara 
Date:   Tue May 17 12:21:01 2016 +0100

fix indent

Change-Id: I5be34b446166e221d02c55ad5eb7b25182f20891

diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index d94970e..d4eb9ed 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -293,8 +293,8 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 
 if( aEvent.NewValue >>= xChild )
 handleChildAdded(xParent, xChild);
-}
 break;
+}
 
 case accessibility::AccessibleEventId::INVALIDATE_ALL_CHILDREN:
 {
@@ -304,8 +304,8 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 g_return_if_fail( xParent.is() );
 
 handleInvalidateChildren(xParent);
-}
 break;
+}
 
 case accessibility::AccessibleEventId::NAME_CHANGED:
 {
@@ -315,8 +315,8 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 atk_object_set_name(atk_obj,
 OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
 }
-}
 break;
+}
 
 case accessibility::AccessibleEventId::DESCRIPTION_CHANGED:
 {
@@ -326,8 +326,8 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 atk_object_set_description(atk_obj,
 OUStringToOString(aDescription, 
RTL_TEXTENCODING_UTF8).getStr());
 }
-}
 break;
+}
 
 case accessibility::AccessibleEventId::STATE_CHANGED:
 {
@@ -495,24 +495,24 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 };
 switch( aChange.Type )
 {
-case accessibility::AccessibleTableModelChangeType::INSERT:
-case accessibility::AccessibleTableModelChangeType::DELETE:
-if( nRowsChanged > 0 )
-g_signal_emit_by_name( G_OBJECT( atk_obj ),
-   aSignalNames[aChange.Type].row,
-

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

2016-05-17 Thread Tomaž Vajngerl

 basegfx/source/polygon/b2dlinegeometry.cxx  |   29 
 basegfx/source/polygon/b2dpolygon.cxx   |2 -
 include/basegfx/polygon/b2dlinegeometry.hxx |5 
 vcl/opengl/gdiimpl.cxx  |4 ---
 4 files changed, 2 insertions(+), 38 deletions(-)

New commits:
commit 37ed508022e0be8b793caa4748cfee634c1c8a9c
Author: TomaÅ¾ Vajngerl 
Date:   Mon May 16 22:25:15 2016 +0900

tdf#99130 use subdivision on B2DPolygon, angle based subdivision

Remove the subdivider we used until now as there is a better
way to subdivide a polygon with getDefaultAdaptiveSubdivision,
which in additiona also caches the result. The subdivider used in
getDefaultAdaptiveSubdivision was a limited count based subdivider
so this exchanges that with an angle based one which gives much
better results.

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

diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx 
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 2177ff4..799604f 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -779,35 +779,6 @@ namespace basegfx
 
 namespace tools
 {
-B2DPolygon polygonSubdivide(const B2DPolygon& rCandidate, double 
fMaxAllowedAngle, double fMaxPartOfEdge)
-{
-if(fMaxAllowedAngle > F_PI2)
-{
-fMaxAllowedAngle = F_PI2;
-}
-else if(fMaxAllowedAngle < 0.01 * F_PI2)
-{
-fMaxAllowedAngle = 0.01 * F_PI2;
-}
-
-if(fMaxPartOfEdge > 1.0)
-{
-fMaxPartOfEdge = 1.0;
-}
-else if(fMaxPartOfEdge < 0.01)
-{
-fMaxPartOfEdge = 0.01;
-}
-
-B2DPolygon aCandidate(rCandidate);
-const double fMaxCos(cos(fMaxAllowedAngle));
-
-aCandidate.removeDoublePoints();
-aCandidate = subdivideToSimple(aCandidate, fMaxCos * fMaxCos, 
fMaxPartOfEdge * fMaxPartOfEdge);
-
-return aCandidate;
-}
-
 B2DPolyPolygon createAreaGeometry(
 const B2DPolygon& rCandidate,
 double fHalfLineWidth,
diff --git a/basegfx/source/polygon/b2dpolygon.cxx 
b/basegfx/source/polygon/b2dpolygon.cxx
index f46c377..5ad06ea 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -483,7 +483,7 @@ public:
 {
 if(!mpDefaultSubdivision)
 {
-const_cast< ImplBufferedData* 
>(this)->mpDefaultSubdivision.reset(new 
basegfx::B2DPolygon(basegfx::tools::adaptiveSubdivideByCount(rSource, 9)));
+const_cast< ImplBufferedData* 
>(this)->mpDefaultSubdivision.reset(new 
basegfx::B2DPolygon(basegfx::tools::adaptiveSubdivideByAngle(rSource)));
 }
 
 return *mpDefaultSubdivision;
diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx 
b/include/basegfx/polygon/b2dlinegeometry.hxx
index d336456..5aefafb 100644
--- a/include/basegfx/polygon/b2dlinegeometry.hxx
+++ b/include/basegfx/polygon/b2dlinegeometry.hxx
@@ -138,11 +138,6 @@ namespace basegfx
 double fMaxPartOfEdge = 0.4,
 double fMiterMinimumAngle = (15.0 * F_PI180));
 
-BASEGFX_DLLPUBLIC B2DPolygon polygonSubdivide(
-const B2DPolygon& rCandidate,
-double fMaxAllowedAngle = (12.5 * F_PI180),
-double fMaxPartOfEdge = 0.4);
-
 } // end of namespace tools
 } // end of namespace basegfx
 
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 9048344..bba462f 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -2064,9 +2064,7 @@ bool OpenGLSalGraphicsImpl::drawPolyLine(
 basegfx::B2DPolygon aPolygon(rPolygon);
 
 if (aPolygon.areControlPointsUsed())
-aPolygon = basegfx::tools::polygonSubdivide(aPolygon, 5 * F_PI180);
-else
-aPolygon.removeDoublePoints();
+aPolygon = aPolygon.getDefaultAdaptiveSubdivision();
 
 DrawPolyLine(aPolygon, fLineWidth, eLineJoin, eLineCap, 
fMiterMinimumAngle);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Miklos Vajna

 include/sfx2/classificationhelper.hxx |2 
 sfx2/source/view/classificationhelper.cxx |  116 --
 sw/source/core/edit/edfcol.cxx|   14 ++-
 3 files changed, 75 insertions(+), 57 deletions(-)

New commits:
commit f935bf47d1928f3b4df9cde600ce365cd63e485d
Author: Miklos Vajna 
Date:   Tue May 17 12:01:57 2016 +0200

sfx2 classification: do not hardcode policy type in SfxClassificationParser

TSCP_BAILSv1 says:

"{type} designates the type of a policy. In BAILS 1.0, the recognized
string values are: ExportControl, NationalSecurity and
IntellectualProperty"

Previously {type} was always assumed to be IntellectualProperty. Change
the parser to not hardcode the policy type anymore; also change the
getter for the string constants to not contain this prefix.

SfxClassificationHelper::Impl still doesn't support multiple policy
types, though.

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

diff --git a/include/sfx2/classificationhelper.hxx 
b/include/sfx2/classificationhelper.hxx
index 5cf0cdd..0ece553 100644
--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -75,6 +75,8 @@ public:
 static const OUString& PROP_DOCFOOTER();
 /// Brief text formatted as a watermark on each document's page.
 static const OUString& PROP_DOCWATERMARK();
+/// Get the property prefix for the IntellectualProperty policy type.
+static const OUString& PROP_PREFIX_INTELLECTUALPROPERTY();
 };
 
 #endif
diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index 5c581d5..0bc615f 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -42,13 +42,13 @@ namespace
 
 const OUString& PROP_BACNAME()
 {
-static OUString 
sProp("urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Name");
+static OUString sProp("BusinessAuthorizationCategory:Name");
 return sProp;
 }
 
 const OUString& PROP_STARTVALIDITY()
 {
-static OUString 
sProp("urn:bails:IntellectualProperty:Authorization:StartValidity");
+static OUString sProp("Authorization:StartValidity");
 return sProp;
 }
 
@@ -60,13 +60,13 @@ const OUString& PROP_NONE()
 
 const OUString& PROP_IMPACTSCALE()
 {
-static OUString sProp("urn:bails:IntellectualProperty:Impact:Scale");
+static OUString sProp("Impact:Scale");
 return sProp;
 }
 
 const OUString& PROP_IMPACTLEVEL()
 {
-static OUString 
sProp("urn:bails:IntellectualProperty:Impact:Level:Confidentiality");
+static OUString sProp("Impact:Level:Confidentiality");
 return sProp;
 }
 
@@ -178,39 +178,39 @@ throw (xml::sax::SAXException, uno::RuntimeException, 
std::exception)
 m_aCategories.push_back(SfxClassificationCategory());
 SfxClassificationCategory& rCategory = m_aCategories.back();
 rCategory.m_aName = aName;
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:PolicyAuthority:Name"] = 
m_aPolicyAuthorityName;
-rCategory.m_aLabels["urn:bails:IntellectualProperty:Policy:Name"] 
= m_aPolicyName;
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Identifier"]
 = m_aProgramID;
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Identifier"]
 = aIdentifier;
+rCategory.m_aLabels["PolicyAuthority:Name"] = 
m_aPolicyAuthorityName;
+rCategory.m_aLabels["Policy:Name"] = m_aPolicyName;
+rCategory.m_aLabels["BusinessAuthorization:Identifier"] = 
m_aProgramID;
+rCategory.m_aLabels["BusinessAuthorizationCategory:Identifier"] = 
aIdentifier;
 
 // Also initialize defaults.
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:PolicyAuthority:Identifier"]
 = PROP_NONE();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:PolicyAuthority:Country"] = 
PROP_NONE();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:Policy:Identifier"] = 
PROP_NONE();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Name"]
 = PROP_NONE();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Locator"]
 = PROP_NONE();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Identifier:OID"]
 = PROP_NONE();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Locator"]
 = PROP_NONE();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Locator"]
 = PROP_NONE();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:MarkingPrecedence"] = 
PROP_NONE();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:Ma

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

2016-05-17 Thread Olivier Hallot

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e96587601e7f73869d09ac2e3296b606b290721
Author: Olivier Hallot 
Date:   Mon May 16 12:57:13 2016 -0300

tdf#99850 Menu entry for Select Sheets...

Change-Id: I045677d79894791b8add3b79eddac73e3a526d4e
Reviewed-on: https://gerrit.libreoffice.org/25035
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 40b3e64..03d07c3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -217,7 +217,7 @@
   
   
 
-  ~Go to Sheet...
+  ~Select Sheets...
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes21' - vcl/source vcl/win

2016-05-17 Thread Michael Stahl

 vcl/source/app/svapp.cxx   |7 +--
 vcl/win/source/app/salinst.cxx |5 -
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 5ff11f229b03eaca93880abed65e925fda3a661b
Author: Michael Stahl 
Date:   Tue May 3 17:17:52 2016 +0200

tdf#99383 vcl: don't dispatch events from SolarMutexReleaser

Having SolarMutexReleaser effectively do Reschedule() on WNT and not on
other platforms doesn't seem such a good idea.  Let's try to restrict it
so that it still calls ImplSalYieldMutexAcquireWithWait() but no longer
dispatches messages, timers and idles.

(regression from 482c52e91fe41a52e68827e9bf64a9736427d517)

Change-Id: I52a2c88e9c2473e35909bf270b9e3ae7acbe0d17
(cherry picked from commit ea3ce0b3073c72f474365e438ddabd19de915b76)
Reviewed-on: https://gerrit.libreoffice.org/24623
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index a18b91e..a5a01a1 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -515,8 +515,11 @@ inline bool ImplYield(bool i_bWait, bool i_bAllEvents, 
sal_uLong const nReleased
 
 DBG_TESTSOLARMUTEX(); // must be locked on return from Yield
 
-// Process all Tasks
-Scheduler::ProcessTaskScheduling(eResult == SalYieldResult::EVENT);
+if (nReleased == 0) // tdf#99383 don't run stuff from ReAcquireSolarMutex
+{
+// Process all Tasks
+Scheduler::ProcessTaskScheduling(eResult == SalYieldResult::EVENT);
+}
 
 // flush lazy deleted objects
 if( pSVData->maAppData.mnDispatchLevel == 0 )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 5cf6c3d..40e44d2 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -696,7 +696,10 @@ SalYieldResult WinSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents,
 }
 else
 {
-eDidWork = ImplSalYield( bWait, bHandleAllCurrentEvents );
+if (nReleased == 0) // tdf#99383 ReAcquireSolarMutex shouldn't Yield
+{
+eDidWork = ImplSalYield( bWait, bHandleAllCurrentEvents );
+}
 
 n = nCount;
 while ( n )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Markus Mohrhard

 sc/qa/unit/helper/qahelper.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ca0da38c1739df56494859212c662a2e92ab4d28
Author: Markus Mohrhard 
Date:   Tue May 17 11:36:53 2016 +0200

loplugin:commaoperator, this should have been a |

Change-Id: If0d6e896752ec564df6f32f4b871c3f3dde1a825

diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 101df14..9929c6c 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -51,7 +51,7 @@
 #define DIF_FORMAT_TYPE  (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT 
| SfxFilterFlags::ALIEN )
 #define XLS_XML_FORMAT_TYPE  (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT 
| SfxFilterFlags::ALIEN)
 #define XLSB_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | 
 SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | 
SfxFilterFlags::PREFERED)
-#define FODS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT 
| SfxFilterFlags::OWN, SfxFilterFlags::STARONEFILTER )
+#define FODS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT 
| SfxFilterFlags::OWN | SfxFilterFlags::STARONEFILTER )
 
 #define FORMAT_ODS  0
 #define FORMAT_XLS  1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Caolán McNamara

 sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx |8 
+---
 sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx |1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 926b01907545e22b98dca1dc666a11d71e55
Author: CaolÃ¡n McNamara 
Date:   Tue May 17 10:20:46 2016 +0100

maDeletedPages member of slidesorter is only written to, never read

Change-Id: I5eb58462306f3d8cab54eb00f4ff492c80585dbb

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index c90b104..18b77b6 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -58,8 +58,7 @@ void SelectionObserver::Context::Abort()
 SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter)
 : mrSlideSorter(rSlideSorter),
   mbIsOvservationActive(false),
-  maInsertedPages(),
-  maDeletedPages()
+  maInsertedPages()
 {
 }
 
@@ -84,8 +83,6 @@ void SelectionObserver::NotifyPageEvent (const SdrPage* 
pSdrPage)
 ::std::find(maInsertedPages.begin(), maInsertedPages.end(), 
pPage));
 if (iPage != maInsertedPages.end())
 maInsertedPages.erase(iPage);
-
-maDeletedPages.push_back(pPage->GetPageNum());
 }
 }
 
@@ -93,7 +90,6 @@ void SelectionObserver::StartObservation()
 {
 OSL_ASSERT(!mbIsOvservationActive);
 maInsertedPages.clear();
-maDeletedPages.clear();
 mbIsOvservationActive = true;
 }
 
@@ -102,7 +98,6 @@ void SelectionObserver::AbortObservation()
 OSL_ASSERT(mbIsOvservationActive);
 mbIsOvservationActive = false;
 maInsertedPages.clear();
-maDeletedPages.clear();
 }
 
 void SelectionObserver::EndObservation()
@@ -126,7 +121,6 @@ void SelectionObserver::EndObservation()
 }
 maInsertedPages.clear();
 }
-maDeletedPages.clear();
 
 aUpdateLock.Release();
 
mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage();
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx 
b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index 4bdfc15..c88b032 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -68,7 +68,6 @@ private:
 bool mbIsOvservationActive;
 
 ::std::vector maInsertedPages;
-::std::vector maDeletedPages;
 };
 
 } } } // end of namespace ::sd::slidesorter::controller
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Some thoughts about our tests and the build time

2016-05-17 Thread Bjoern Michaelsen

Heya Markus,

On Tue, May 17, 2016 at 02:37:02AM +0200, Markus Mohrhard wrote:
> The results for the initial build without building or executing the tests:
> 
> real70m17.990s
> user436m43.860s
> sys28m3.680s
> 
> After that the results of a time make, therefore forcing the build of
> everything test related and executing the tests:
> 
> real11m30.192s
> user58m43.384s
> sys1m36.876s

Did you by chance have an opportunity to also ran "make" from scratch on that
machine? I assume/hope it wont take the 70 min + 11 min = 82 min. a straight
addition would make one assume, because make will use idle job slots during a
full build.

IOW, these number suggest a 82min/70min = 17% overhead in real and a (436 +
58)min/436min = 13% overhead in CPU time -- but I assume the real overhead in a
build from scratch is smaller than both of that in the real world.

The most critical time I see from in all this is not anything build from
scratch anyway, but the for a simple
touch-one-cxx-recompile-relink-and-then-run-all-the-tests scenarios. So the:

> real6m37.479s
> user45m4.740s

as an _absolute_ is the key there, I guess.

Best,

Bjoern

P.S.: I would have assumed compiling/linking the tests to take much more time
than running the tests. But it seems with 45min/58min=77% -- most of the time
is indeed spend on running tests, not building them.

P.S.: For reference, the output of "time make build-nocheck" would be helpful
  too (aka a noop incremental build time overhead in make/dep parsing etc.)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Question on cppUnit Test Framework

2016-05-17 Thread Markus Mohrhard

Hey,

somehow your mail landed in my spam folder.

On Fri, Apr 29, 2016 at 10:57 AM, Yogesh Deshpande <
yogeshbdeshpa...@yahoo.co.uk> wrote:

> Hello,
>
> I am trying to use cppUnit with Microsoft Visual Studio 2015.
>
> Few questions:
>
> (1) Is this tool compatible with Visual Studio 2015?
>


Yes. We are for example using cppunit in the LibreOffice build with VS
2015. But you should use version 1.13.2 if you want to use VS2015 as that
contains fixes for many newer VS versions . Have a look at
https://freedesktop.org/wiki/Software/cppunit/

>
> (2) The reason for Question 1, is that I ccould make it work with 2005,
> however, the source code does not link properly? Is there a compatibility
> issue?
>

No. YOu are just using an outdated version.

Regards,
Markus


>
>
> Below are the Errors:
> =
>
>
> Can some one please help understand the issues?
>
> Best Regards,
> Yogesh Deshpande
>
> Severity
> Code
> Description
> Project
> File
> Line
> Suppression State
> Error
> MSB3073
> The command "copy
> "C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\cppunit\.\Debug\cppunit.lib"
> ..\..\lib\cppunit.lib:VCEnd" exited with code 1.
> cppunit
> C:\Program Files
> (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets
> 133
>
> Error
> MSB3073
> The command "copy
> "C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\cppunit\.\Debug\cppunit.lib"
> ..\..\lib\cppunit.lib:VCEnd" exited with code 1.
> cppunit
> C:\Program Files
> (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets
> 133
>
> Error
> MSB3073
> The command "copy
> "C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\cppunit\.\DebugDll\cppunit_dll.dll"
> ..\..\lib\cppunit_dll.dllcopy
> "C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\cppunit\DebugDll\cppunit_dll.lib"
> ..\..\lib\cppunit_dll.lib:VCEnd" exited with code 1.
> cppunit_dll
> C:\Program Files
> (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets
> 133
>
> Error
> MSB3073
> The command "copy
> "C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\cppunit\.\DebugDll\cppunit_dll.dll"
> ..\..\lib\cppunit_dll.dllcopy
> "C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\cppunit\DebugDll\cppunit_dll.lib"
> ..\..\lib\cppunit_dll.lib:VCEnd" exited with code 1.
> cppunit_dll
> C:\Program Files
> (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets
> 133
>
> Error
> MSB3073
> The command "copy
> "C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\cppunit\.\DebugDll\cppunit_dll.dll"
> ..\..\lib\cppunit_dll.dllcopy
> "C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\cppunit\DebugDll\cppunit_dll.lib"
> ..\..\lib\cppunit_dll.lib:VCEnd" exited with code 1.
> cppunit_dll
> C:\Program Files
> (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets
> 133
>
> Error
> LNK1181
> cannot open input file 'cppunitd_dll.lib'
> DllPlugInTester
>
> C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\DllPlugInTester\LINK
> 1
>
> Error
> C3505
> cannot load type library '{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}'
> TestRunner
>
> C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\msvc6\testrunner\MsDevCallerListCtrl.cpp
> 67
>
> Error
> C1104
> fatal error importing libid: '80cc9f66-e7d8-4ddd-85b6-d9e6cd0e93e2'
> TestRunner
>
> C:\NGC\CPP_Unit_Test\UTF\cppunit-1.12.1.tar\cppunit-1.12.1\src\msvc6\testrunner\MsDevCallerListCtrl.cpp
> 67
>
> Error
> MSB6006
> "cmd.exe" exited with code 1.
> TestPlugInRunner
> C:\Program Files
> (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets
> 171
>
>
>
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Some thoughts about our tests and the build time

2016-05-17 Thread Markus Mohrhard

Hey Miklos,

On Tue, May 17, 2016 at 9:31 AM, Miklos Vajna 
wrote:

> Hi Markus,
>
> On Tue, May 17, 2016 at 02:37:02AM +0200, Markus Mohrhard <
> markus.mohrh...@googlemail.com> wrote:
> > After that the results of a time make, therefore forcing the build of
> > everything test related and executing the tests:
> >
> > real11m30.192s
> > user58m43.384s
> > sys1m36.876s
> >
> > And finally a second time make to measure the time it takes to just
> execute
> > the tests:
> >
> > real6m37.479s
> > user45m4.740s
> > sys0m34.988s
>
> Is this just toplevel 'make' or 'make check'? I find it a bit strange
> that we have 'make build-nocheck' to build the code, 'make check' to run
> the tests, and 'make' to do something between the two -- and this
> "something" is the default. ;-)
>

It is just a toplevel make. So it only covers unitcheck and slowcheck and
not subsequentcheck. Therefore we have no java tests in these numbers.


>
> Also, I didn't do measurements, but my impression is that the current
> hot path in 'make check' are still the Java tests, so if we want faster
> 'make check', then perhaps a way towards that would be to accelerate the
> conversion of the majority of those Java tests to in-process ones.
>

> Or did I miss something? :-)
>


As mentioned this does not include the java tests.


To make it easier to see what I'm talking about I have attached the
combined *resource.log files.

Regards,
Markus


>
> Regards,
>
> Miklos
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
Name = basegfx.test
UserSpace = 2.408
KernelSpace = 0
Name = basic_macros.test
UserSpace = 1.284
KernelSpace = 0.024
Name = basic_scanner.test
UserSpace = 0.052
KernelSpace = 0.004
Name = binaryurp_test-cache.test
UserSpace = 0.696
KernelSpace = 0
Name = binaryurp_test-unmarshal.test
UserSpace = 0
KernelSpace = 0.004
Name = chart2_common_functors.test
UserSpace = 0.008
KernelSpace = 0
Name = chart2_export.test
UserSpace = 156.472
KernelSpace = 1.38
Name = chart2_import.test
UserSpace = 42.976
KernelSpace = 0.172
Name = chart2_trendcalculators.test
UserSpace = 10.688
KernelSpace = 0.096
Name = comphelper_ifcontainer.test
UserSpace = 0.004
KernelSpace = 0
Name = comphelper_syntaxhighlight_test.test
UserSpace = 0.004
KernelSpace = 0
Name = comphelper_test.test
UserSpace = 0.004
KernelSpace = 0
Name = comphelper_variadictemplates_test.test
UserSpace = 0.004
KernelSpace = 0
Name = configmgr_unit.test
UserSpace = 1.46
KernelSpace = 0.012
Name = connectivity_commontools.test
UserSpace = 0.836
KernelSpace = 0.012
Name = connectivity_mork.test
UserSpace = 0.884
KernelSpace = 0.016
Name = cppcanvas_test.test
UserSpace = 0.892
KernelSpace = 0.028
Name = cppuhelper_cppu_ifcontainer.test
UserSpace = 0.004
KernelSpace = 0
Name = cppuhelper_cppu_unourl.test
UserSpace = 0.004
KernelSpace = 0
Name = cppu_qa_any.test
UserSpace = 0.004
KernelSpace = 0
Name = cppu_qa_recursion.test
UserSpace = 0
KernelSpace = 0
Name = cppu_qa_reference.test
UserSpace = 0
KernelSpace = 0
Name = cppu_qa_unotype.test
UserSpace = 0.004
KernelSpace = 0
Name = cppu_test_cppumaker.test
UserSpace = 0.004
KernelSpace = 0
Name = dbaccess_dialog_save.test
UserSpace = 1.564
KernelSpace = 0.04
Name = dbaccess_embeddeddb_performancetest.test
UserSpace = 0.924
KernelSpace = 0.024
Name = dbaccess_empty_stdlib_save.test
UserSpace = 1.64
KernelSpace = 0.032
Name = dbaccess_firebird_test.test
UserSpace = 2.008
KernelSpace = 0.084
Name = dbaccess_hsqldb_test.test
UserSpace = 2.436
KernelSpace = 0.116
Name = dbaccess_macros_test.test
UserSpace = 1.324
KernelSpace = 0.052
Name = dbaccess_nolib_save.test
UserSpace = 1.644
KernelSpace = 0.064
Name = dbaccess_RowSetClones.test
UserSpace = 5.816
KernelSpace = 0.58
Name = desktop_lib.test
UserSpace = 12.192
KernelSpace = 0.172
Name = desktop_version.test
UserSpace = 0.008
KernelSpace = 0
Name = drawinglayer_border.test
UserSpace = 0.812
KernelSpace = 0.012
Name = editeng_borderline.test
UserSpace = 0.036
KernelSpace = 0.008
Name = editeng_core.test
UserSpace = 0.952
KernelSpace = 0.024
Name = editeng_lookuptree.test
UserSpace = 0.036
KernelSpace = 0.012
Name = filter_dxf_test.test
UserSpace = 0.852
KernelSpace = 0.028
Name = filter_eps_test.test
UserSpace = 1.228
KernelSpace = 0.08
Name = filter_met_test.test
UserSpace = 0.856
KernelSpace = 0.012
Name = filter_msfilter.test
UserSpace = 0.224
KernelSpace = 0.012
Name = filter_pcd_test.test
UserSpace = 0.844
KernelSpace = 0.02
Name = filter_pcx_test.test
UserSpace = 0.788
KernelSpace = 0.008
Name = filter_pict_test.test
UserSpace = 5.536
KernelSpace = 0.24
Name = filter_ppm_test.test
UserSpace = 0.756
KernelSpace = 0.02
Name = filter_priority.test
UserSpace = 0.852
KernelSpace = 0.012
Name = filter_psd_test.test
UserSpace = 0.956
KernelSpace = 0.004
Name = filter_ras_test.test
UserSpace = 1.008
KernelSpace = 0.06
Name = filter_tga_test.test
Use

Re: Some thoughts about our tests and the build time

2016-05-17 Thread Bjoern Michaelsen

Hi,

On Tue, May 17, 2016 at 09:31:54AM +0200, Miklos Vajna wrote:
> Also, I didn't do measurements, but my impression is that the current
> hot path in 'make check' are still the Java tests, so if we want faster
> 'make check', then perhaps a way towards that would be to accelerate the
> conversion of the majority of those Java tests to in-process ones.

since Markus said he ran "make" (not "make check") twice, none of the above
number include anything Java-ish (those are in "make check" and "make
subsequentcheck" but not in "make" or "make slowcheck unitcheck"). So, if
anything, these numbers show that the non-Java tests grow and will dominate
even "make check" soon.

Best,

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

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

2016-05-17 Thread Miklos Vajna

 sw/source/filter/ww8/docxtablestyleexport.cxx  |2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx|4 ++--
 sw/source/filter/ww8/rtfexport.cxx |2 +-
 writerfilter/source/dmapper/SdtHelper.cxx  |4 ++--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
 writerfilter/source/rtftok/rtfsdrimport.cxx|2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit e0026b25e796eb89fa01fb42a759e89af4ab43e5
Author: Miklos Vajna 
Date:   Tue May 17 09:32:20 2016 +0200

sw, writerfilter: indentation fixes

These files had a consistent style perviously, don't break that.

Change-Id: I8d204e78463e7fe302a172a1af6ad3de51997977

diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx 
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 107fe77..a1b90a0 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -673,7 +673,7 @@ void 
DocxTableStyleExport::Impl::TableStyle(uno::Sequence&
 tableStyleRPr(aRPr);
 tableStyleTablePr(aTablePr);
 tableStyleTcPr(aTcPr);
-for (uno::Sequence & i : aTableStylePrs)
+for (uno::Sequence& i : aTableStylePrs)
 tableStyleTableStylePr(i);
 
 m_pSerializer->endElementNS(XML_w, XML_style);
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9cd98a6..2aa0cf6 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1880,7 +1880,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const 
ww8::Frame& rFrame, const Poi
 lcl_TextFrameShadow(m_aFlyProperties, rFrameFormat);
 lcl_TextFrameRelativeSize(m_aFlyProperties, rFrameFormat);
 
-for (std::pair & rPair : m_aFlyProperties)
+for (std::pair& rPair : m_aFlyProperties)
 {
 m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{");
 m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " ");
@@ -3966,7 +3966,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const 
SwFlyFrameFormat* pFlyFrameFormat
 if (!pFlyFrameFormat->GetOpaque().GetValue())
 aFlyProperties.push_back(std::make_pair("fBehindDocument", "1"));
 
-for (std::pair & rPair : aFlyProperties)
+for (std::pair& rPair : aFlyProperties)
 {
 m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{");
 m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " ");
diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index c572804..729ce24 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -392,7 +392,7 @@ void RtfExport::WriteMainText()
 std::vector< std::pair > aProperties;
 aProperties.push_back(std::make_pair("shapeType", 
"1"));
 aProperties.push_back(std::make_pair("fillColor", 
OString::number(msfilter::util::BGRToRGB(oBrush->GetColor().GetColor();
-for (std::pair & rPair : aProperties)
+for (std::pair& rPair : aProperties)
 {
 Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{");
 Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " ");
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 293ff4f..ba8410d 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -29,7 +29,7 @@ awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& 
pStyleSheet, OUString& r
 {
 OUString aLongest = rDefault;
 sal_Int32 nHeight = 0;
-for (const OUString & rItem : rItems)
+for (const OUString& rItem : rItems)
 if (rItem.getLength() > aLongest.getLength())
 aLongest = rItem;
 
@@ -190,7 +190,7 @@ sal_Int32 SdtHelper::getInteropGrabBagSize()
 
 bool SdtHelper::containedInInteropGrabBag(const OUString& rValueName)
 {
-for (beans::PropertyValue & i : m_aGrabBag)
+for (beans::PropertyValue& i : m_aGrabBag)
 if (i.Name == rValueName)
 return true;
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8793d4f..24a9456 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1458,7 +1458,7 @@ void RTFDocumentImpl::replayRowBuffer(
 rCellsSrpms.pop_front();
 rCellsAttributes.pop_front();
 }
-for (Buf_t & i : rBuffer)
+for (Buf_t& i : rBuffer)
 {
 SAL_WARN_IF(BUFFER_CELLEND == std::get<0>(i),
 "writerfilter.rtf", "dropping table cell!");
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 5e919d3..3984fd6 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -298,7 +298,7 @@ int 
RTFSdrImport::initShape(

Re: Some thoughts about our tests and the build time

2016-05-17 Thread Miklos Vajna

Hi Markus,

On Tue, May 17, 2016 at 02:37:02AM +0200, Markus Mohrhard 
 wrote:
> After that the results of a time make, therefore forcing the build of
> everything test related and executing the tests:
> 
> real11m30.192s
> user58m43.384s
> sys1m36.876s
> 
> And finally a second time make to measure the time it takes to just execute
> the tests:
> 
> real6m37.479s
> user45m4.740s
> sys0m34.988s

Is this just toplevel 'make' or 'make check'? I find it a bit strange
that we have 'make build-nocheck' to build the code, 'make check' to run
the tests, and 'make' to do something between the two -- and this
"something" is the default. ;-)

Also, I didn't do measurements, but my impression is that the current
hot path in 'make check' are still the Java tests, so if we want faster
'make check', then perhaps a way towards that would be to accelerate the
conversion of the majority of those Java tests to in-process ones.

Or did I miss something? :-)

Regards,

Miklos

signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-05-17 Thread Michael Stahl

 sw/source/core/access/accframe.hxx |3 ++-
 sw/source/core/access/accmap.cxx   |   15 +++
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit dc5ab01a75877d4f4c79b7ff734d3f41a232c31f
Author: Michael Stahl 
Date:   Fri May 13 15:46:10 2016 +0200

tdf#99722 sw: avoid buffering a11y events for not-visible frames

The problem with the bugdoc is that all pages are moved by 60 twips or
so in CheckViewLayout(), which generates a event for every SwTextFrame
but there is no SwAccessible for the SwTextFrame yet hence it is a
CHILD_POS_CHANGE on the parent, which happens to be (because SwPageFrames
are not accessible) the SwRootFrame so that's how we get an enormous number
(~90k per 500 pages) WeakReference in the buffered
SwAccessibleEvent_Impl pointing to the same object (the SwAccessible of
the root frame).

Then at a later stage the events are actually sent and
SwAccessibleContext::InvalidateChildPosOrSize() discards all but 80 or
so that are on the first page.

So check the visiblility before buffering the event, to avoid
scalability issues in the WeakReference.

This brings the cpu-time from 1:37 to 0:17 for the 500 pager, and the
full bugdoc is now just 3-4 seconds slower than with a11y disabled.

Change-Id: Ia91653fd7572f32ce3cf765a4ecd2b7077ace8f6
(cherry picked from commit 6afa142fdecc3a7f2f182bcd2c035bf3089f1ce8)
Reviewed-on: https://gerrit.libreoffice.org/24979
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/access/accframe.hxx 
b/sw/source/core/access/accframe.hxx
index 55d9e24..7685c59 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -76,16 +76,17 @@ protected:
  ::std::list< sw::access::SwAccessibleChild >& 
rChildren,
  bool bInPagePreview );
 
-protected:
 bool IsEditable( SwViewShell *pVSh ) const;
 
 bool IsOpaque( SwViewShell *pVSh ) const;
 
+public:
 bool IsShowing( const SwAccessibleMap& rAccMap,
 const sw::access::SwAccessibleChild& rFrameOrObj ) 
const;
 inline bool IsShowing( const SwRect& rFrame ) const;
 inline bool IsShowing( const SwAccessibleMap& rAccMap ) const;
 
+protected:
 inline bool IsInPagePreview() const
 {
 return mbIsInPagePreview;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 8f6c9da..ed9ec9d 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2437,10 +2437,17 @@ void SwAccessibleMap::InvalidatePosOrSize( const 
SwFrame *pFrame,
 {
 if( GetShell()->ActionPend() )
 {
-SwAccessibleEvent_Impl aEvent(
-SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
-xParentAccImpl.get(), aFrameOrObj, rOldBox );
-AppendEvent( aEvent );
+assert(pParent);
+// tdf#99722 faster not to buffer events that won't be sent
+if (!SwAccessibleChild(pParent).IsVisibleChildrenOnly()
+|| xParentAccImpl->IsShowing(rOldBox)
+|| xParentAccImpl->IsShowing(*this, aFrameOrObj))
+{
+SwAccessibleEvent_Impl aEvent(
+SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
+xParentAccImpl.get(), aFrameOrObj, rOldBox );
+AppendEvent( aEvent );
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Caolán McNamara

 sfx2/source/sidebar/TabItem.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6b8c3b6435bd7ab0cd922db2fe7abc2f206f8dab
Author: CaolÃ¡n McNamara 
Date:   Fri May 13 12:31:53 2016 +0100

Resolves: tdf#96092 crash on activating manage changes sidebar

Change-Id: I39ab778114e2317ac471e92f9441ed4a83e7023b
(cherry picked from commit 296a67874a9e5ee1f93a38716e996207b1d2b59f)
Reviewed-on: https://gerrit.libreoffice.org/24957
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index 8042528..8c45b65 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -103,9 +103,12 @@ void TabItem::MouseButtonUp(const MouseEvent& rMouseEvent)
 {
 Check();
 Click();
-GetParent()->Invalidate();
+vcl::Window* pParent = GetParent();
+if (pParent)
+pParent->Invalidate();
 }
 }
+
 if (mbIsLeftButtonDown)
 {
 mbIsLeftButtonDown = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Caolán McNamara

 starmath/qa/extras/data/tdf99556-1.mml |3 +++
 starmath/qa/extras/mmlimport-test.cxx  |   10 ++
 starmath/source/mathmlimport.cxx   |   10 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit d4e284ab44f4644a60eea50052f7940098541145
Author: CaolÃ¡n McNamara 
Date:   Fri May 13 13:03:55 2016 +0100

Resolves: tdf#99556 if the num of arguments is not 1 infer a row

not just if the num of arguments is > 1

(cherry picked from commit eb2da27e0834925d449373593fb650db49671adf)

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

diff --git a/starmath/qa/extras/data/tdf99556-1.mml 
b/starmath/qa/extras/data/tdf99556-1.mml
new file mode 100644
index 000..0eae8b2
--- /dev/null
+++ b/starmath/qa/extras/data/tdf99556-1.mml
@@ -0,0 +1,3 @@
+http://www.w3.org/1998/Math/MathML";>
+
+
diff --git a/starmath/qa/extras/mmlimport-test.cxx 
b/starmath/qa/extras/mmlimport-test.cxx
index 4313019..db18fe1 100644
--- a/starmath/qa/extras/mmlimport-test.cxx
+++ b/starmath/qa/extras/mmlimport-test.cxx
@@ -32,11 +32,13 @@ public:
 void testSimple();
 void testNsPrefixMath();
 void testMaction();
+void testtdf99556();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testSimple);
 CPPUNIT_TEST(testNsPrefixMath);
 CPPUNIT_TEST(testMaction);
+CPPUNIT_TEST(testtdf99556);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -103,6 +105,14 @@ void Test::testMaction()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("loaded text", sExpected, 
mxDocShell->GetText());
 }
 
+void Test::testtdf99556()
+{
+loadURL(getURLFromSrc("starmath/qa/extras/data/tdf99556-1.mml"));
+OUString sExpected("sqrt");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("loaded text", sExpected, 
mxDocShell->GetText());
+}
+
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 48c0d48..3e98307 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -800,7 +800,7 @@ void SmXMLEncloseContext_Impl::EndElement()
 contents are treated as a single "inferred " containing its
 arguments
 */
-if (GetSmImport().GetNodeStack().size() - nElementCount > 1)
+if (GetSmImport().GetNodeStack().size() - nElementCount != 1)
 SmXMLRowContext_Impl::EndElement();
 }
 
@@ -873,7 +873,7 @@ void SmXMLStyleContext_Impl::EndElement()
 arguments
 */
 SmNodeStack &rNodeStack = GetSmImport().GetNodeStack();
-if (rNodeStack.size() - nElementCount > 1)
+if (rNodeStack.size() - nElementCount != 1)
 SmXMLRowContext_Impl::EndElement();
 aStyleHelper.ApplyAttrs();
 }
@@ -898,7 +898,7 @@ void SmXMLPaddedContext_Impl::EndElement()
 contents are treated as a single "inferred " containing its
 arguments
 */
-if (GetSmImport().GetNodeStack().size() - nElementCount > 1)
+if (GetSmImport().GetNodeStack().size() - nElementCount != 1)
 SmXMLRowContext_Impl::EndElement();
 }
 
@@ -922,7 +922,7 @@ void SmXMLPhantomContext_Impl::EndElement()
 contents are treated as a single "inferred " containing its
 arguments
 */
-if (GetSmImport().GetNodeStack().size() - nElementCount > 1)
+if (GetSmImport().GetNodeStack().size() - nElementCount != 1)
 SmXMLRowContext_Impl::EndElement();
 
 SmToken aToken;
@@ -2201,7 +2201,7 @@ void SmXMLSqrtContext_Impl::EndElement()
 contents are treated as a single "inferred " containing its
 arguments
 */
-if (GetSmImport().GetNodeStack().size() - nElementCount > 1)
+if (GetSmImport().GetNodeStack().size() - nElementCount != 1)
 SmXMLRowContext_Impl::EndElement();
 
 SmToken aToken;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/win

2016-05-17 Thread Tor Lillqvist

 vcl/win/source/gdi/salgdi3.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3d0e80229ba99d3ad2b57a9c213bda8b0d861524
Author: Tor Lillqvist 
Date:   Fri May 13 11:14:18 2016 +0300

tdf#98983: Use 'Microsoft Sans Serif' instead of 'MS Sans Serif'

For some reason, in this branch, when OpenGL is used, the fixes by
Michael Stahl to make the code avoid non-scalable fonts don't work,
and text that uses the old 'MS Sans Serif' raster font just doesn't
show up at all. Fix this by bluntly using the metric equivalent
'Microsoft Sans Serif' instead.

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

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index f755f73..a802158 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1468,6 +1468,10 @@ HFONT WinSalGraphics::ImplDoSetFont( FontSelectPattern* 
i_pFont, float& o_rFontS
 && (ImplSalWICompareAscii( aLogFont.lfFaceName, "Courier" ) == 0) )
 lstrcpynW( aLogFont.lfFaceName, L"Courier New", 12 );
 
+// Prefer the scalable 'Microsoft Sans Serif' to the old raster 'MS Sans 
Serif'
+if( ImplSalWICompareAscii( aLogFont.lfFaceName, "MS Sans Serif" ) == 0 )
+wcscpy( aLogFont.lfFaceName, L"Microsoft Sans Serif" );
+
 // #i47675# limit font requests to MAXFONTHEIGHT
 // TODO: share MAXFONTHEIGHT font instance
 if( (-aLogFont.lfHeight <= MAXFONTHEIGHT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-17 Thread Michael Stahl

 vcl/source/app/svapp.cxx   |7 +--
 vcl/win/source/app/salinst.cxx |5 -
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit ea2c3f47682b79319d5ccaade4226f45aeec7369
Author: Michael Stahl 
Date:   Tue May 3 17:17:52 2016 +0200

tdf#99383 vcl: don't dispatch events from SolarMutexReleaser

Having SolarMutexReleaser effectively do Reschedule() on WNT and not on
other platforms doesn't seem such a good idea.  Let's try to restrict it
so that it still calls ImplSalYieldMutexAcquireWithWait() but no longer
dispatches messages, timers and idles.

(regression from 482c52e91fe41a52e68827e9bf64a9736427d517)

Change-Id: I52a2c88e9c2473e35909bf270b9e3ae7acbe0d17
(cherry picked from commit ea3ce0b3073c72f474365e438ddabd19de915b76)
Reviewed-on: https://gerrit.libreoffice.org/24623
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index a18b91e..a5a01a1 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -515,8 +515,11 @@ inline bool ImplYield(bool i_bWait, bool i_bAllEvents, 
sal_uLong const nReleased
 
 DBG_TESTSOLARMUTEX(); // must be locked on return from Yield
 
-// Process all Tasks
-Scheduler::ProcessTaskScheduling(eResult == SalYieldResult::EVENT);
+if (nReleased == 0) // tdf#99383 don't run stuff from ReAcquireSolarMutex
+{
+// Process all Tasks
+Scheduler::ProcessTaskScheduling(eResult == SalYieldResult::EVENT);
+}
 
 // flush lazy deleted objects
 if( pSVData->maAppData.mnDispatchLevel == 0 )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 5cf6c3d..40e44d2 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -696,7 +696,10 @@ SalYieldResult WinSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents,
 }
 else
 {
-eDidWork = ImplSalYield( bWait, bHandleAllCurrentEvents );
+if (nReleased == 0) // tdf#99383 ReAcquireSolarMutex shouldn't Yield
+{
+eDidWork = ImplSalYield( bWait, bHandleAllCurrentEvents );
+}
 
 n = nCount;
 while ( n )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

55 matches

Mail list logo