date:20161122

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sfx2/uiconfig svx/uiconfig

2016-11-22 Thread Andras Timar

 sfx2/uiconfig/ui/safemodequerydialog.ui  |2 +-
 svx/uiconfig/ui/profileexporteddialog.ui |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit be052dfbde2ed071791d271d6c7d8101b128979b
Author: Andras Timar 
Date:   Wed Nov 23 08:51:43 2016 +0100

make strings localizable

Change-Id: Ic74b55b12926a23e9e98308407a88e73dc9cb0c7
(cherry picked from commit 666eb88b3125e8d62e05f6e0fc75cc6653ab42d5)

diff --git a/sfx2/uiconfig/ui/safemodequerydialog.ui 
b/sfx2/uiconfig/ui/safemodequerydialog.ui
index 8a24691..60d6b3a 100644
--- a/sfx2/uiconfig/ui/safemodequerydialog.ui
+++ b/sfx2/uiconfig/ui/safemodequerydialog.ui
@@ -37,7 +37,7 @@
 
 
   
-_Restart
+_Restart
 True
 True
 True
diff --git a/svx/uiconfig/ui/profileexporteddialog.ui 
b/svx/uiconfig/ui/profileexporteddialog.ui
index 93ac9de..b21c76a 100644
--- a/svx/uiconfig/ui/profileexporteddialog.ui
+++ b/svx/uiconfig/ui/profileexporteddialog.ui
@@ -37,7 +37,7 @@
 
 
   
-Open Containing _Folder
+Open Containing 
_Folder
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Andras Timar

 sfx2/uiconfig/ui/safemodequerydialog.ui  |2 +-
 svx/uiconfig/ui/profileexporteddialog.ui |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 666eb88b3125e8d62e05f6e0fc75cc6653ab42d5
Author: Andras Timar 
Date:   Wed Nov 23 08:51:43 2016 +0100

make strings localizable

Change-Id: Ic74b55b12926a23e9e98308407a88e73dc9cb0c7

diff --git a/sfx2/uiconfig/ui/safemodequerydialog.ui 
b/sfx2/uiconfig/ui/safemodequerydialog.ui
index 8a24691..60d6b3a 100644
--- a/sfx2/uiconfig/ui/safemodequerydialog.ui
+++ b/sfx2/uiconfig/ui/safemodequerydialog.ui
@@ -37,7 +37,7 @@
 
 
   
-_Restart
+_Restart
 True
 True
 True
diff --git a/svx/uiconfig/ui/profileexporteddialog.ui 
b/svx/uiconfig/ui/profileexporteddialog.ui
index 93ac9de..b21c76a 100644
--- a/svx/uiconfig/ui/profileexporteddialog.ui
+++ b/svx/uiconfig/ui/profileexporteddialog.ui
@@ -37,7 +37,7 @@
 
 
   
-Open Containing _Folder
+Open Containing 
_Folder
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Noel Grandin

 editeng/source/editeng/editeng.cxx  |   10 
 editeng/source/editeng/editview.cxx |2 -
 editeng/source/editeng/impedit.cxx  |   20 -
 editeng/source/editeng/impedit.hxx  |   42 ++--
 editeng/source/editeng/impedit2.cxx |   22 +-
 svx/source/svdraw/svdedxv.cxx   |   22 +++---
 6 files changed, 66 insertions(+), 52 deletions(-)

New commits:
commit 1a4cb47b27c059d92b4e94b249ca3974b72b35da
Author: Noel Grandin 
Date:   Wed Nov 23 09:19:10 2016 +0200

convert GETCRSR constants to o3tl::typed_flags

Change-Id: Ia367d9a1b73d6c5b7a7989da45af0f002c43413c

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index c151c67..11912f6 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -958,7 +958,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, 
EditView* pEditView, v
 bool bAllowIdle = true;
 bool bReadOnly  = pEditView->IsReadOnly();
 
-sal_uInt16 nNewCursorFlags = 0;
+GetCursorFlags nNewCursorFlags = GetCursorFlags::NONE;
 bool bSetCursorFlags = true;
 
 EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() );
@@ -1091,9 +1091,9 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, 
EditView* pEditView, v
 
 bMoved = true;
 if ( nCode == KEY_HOME )
-nNewCursorFlags |= GETCRSR_STARTOFLINE;
+nNewCursorFlags |= GetCursorFlags::StartOfLine;
 else if ( nCode == KEY_END )
-nNewCursorFlags |= GETCRSR_ENDOFLINE;
+nNewCursorFlags |= GetCursorFlags::EndOfLine;
 
 }
 #if OSL_DEBUG_LEVEL > 1
@@ -2367,8 +2367,8 @@ Rectangle EditEngine::GetCharacterBounds( const 
EPosition& rPos ) const
 // Check against index, not paragraph
 if ( pNode && ( rPos.nIndex < pNode->Len() ) )
 {
-aBounds = pImpEditEngine->PaMtoEditCursor( EditPaM( pNode, rPos.nIndex 
), GETCRSR_TXTONLY );
-Rectangle aR2 = pImpEditEngine->PaMtoEditCursor( EditPaM( pNode, 
rPos.nIndex+1 ), GETCRSR_TXTONLY|GETCRSR_ENDOFLINE );
+aBounds = pImpEditEngine->PaMtoEditCursor( EditPaM( pNode, rPos.nIndex 
), GetCursorFlags::TextOnly );
+Rectangle aR2 = pImpEditEngine->PaMtoEditCursor( EditPaM( pNode, 
rPos.nIndex+1 ), GetCursorFlags::TextOnly|GetCursorFlags::EndOfLine );
 if ( aR2.Right() > aBounds.Right() )
 aBounds.Right() = aR2.Right();
 }
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 2d0ace8..732f774 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -971,7 +971,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, 
LinkRemoveDisabledEntries( true, true );
 
-Rectangle aTempRect = 
pImpEditView->pEditEngine->pImpEditEngine->PaMtoEditCursor( aPaM, 
GETCRSR_TXTONLY );
+Rectangle aTempRect = 
pImpEditView->pEditEngine->pImpEditEngine->PaMtoEditCursor( aPaM, 
GetCursorFlags::TextOnly );
 Point aScreenPos = pImpEditView->GetWindowPos( aTempRect.TopLeft() );
 aScreenPos = pImpEditView->GetWindow()->OutputToScreenPixel( 
aScreenPos );
 aTempRect = pImpEditView->GetWindow()->LogicToPixel( 
Rectangle(aScreenPos, aTempRect.GetSize() ));
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index eeacfe0..1b8349b 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -82,7 +82,7 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, 
vcl::Window* pWindo
 mpViewShell = nullptr;
 mpOtherShell= nullptr;
 nScrollDiffX= 0;
-nExtraCursorFlags   = 0;
+nExtraCursorFlags   = GetCursorFlags::NONE;
 nCursorBidiLevel= CURSOR_BIDILEVEL_DONTKNOW;
 pCursor = nullptr;
 pDragAndDropInfo= nullptr;
@@ -816,7 +816,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool 
bForceVisCursor )
 
 const ParaPortion* pParaPortion = pEditEngine->GetParaPortions()[nPara];
 
-sal_uInt16 nShowCursorFlags = nExtraCursorFlags | GETCRSR_TXTONLY;
+GetCursorFlags nShowCursorFlags = nExtraCursorFlags | 
GetCursorFlags::TextOnly;
 
 // Use CursorBidiLevel 0/1 in meaning of
 // 0: prefer portion end, normal mode
@@ -824,7 +824,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool 
bForceVisCursor )
 
 if ( ( GetCursorBidiLevel() != CURSOR_BIDILEVEL_DONTKNOW ) && 
GetCursorBidiLevel() )
 {
-nShowCursorFlags |= GETCRSR_PREFERPORTIONSTART;
+nShowCursorFlags |= GetCursorFlags::PreferPortionStart;
 }
 
 Rectangle aEditCursor = pEditEngine->pImpEditEngine->PaMtoEditCursor( 
aPaM, nShowCursorFlags );
@@ -833,7 +833,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool 
bForceVisCursor )
 if ( aPaM.GetNode(

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

2016-11-22 Thread Bartosz Kosiorek

 sw/source/filter/basflt/fltini.cxx|2 --
 sw/source/filter/html/SwAppletImpl.cxx|1 -
 sw/source/filter/html/htmlplug.cxx|1 -
 sw/source/filter/html/htmltabw.cxx|7 ---
 sw/source/filter/html/wrthtml.cxx |7 ---
 sw/source/filter/inc/fltshell.hxx |3 ---
 sw/source/filter/ww8/docxexportfilter.hxx |1 -
 sw/source/filter/ww8/writerhelper.cxx |1 -
 sw/source/filter/ww8/wrtw8esh.cxx |2 --
 sw/source/filter/ww8/ww8par3.cxx  |   16 +---
 sw/source/filter/ww8/ww8par5.cxx  |1 -
 sw/source/filter/ww8/ww8toolbar.cxx   |3 ---
 sw/source/filter/xml/swxml.cxx|2 --
 sw/source/filter/xml/wrtxml.cxx   |4 +---
 sw/source/filter/xml/wrtxml.hxx   |1 +
 sw/source/filter/xml/xmlbrsh.cxx  |1 -
 sw/source/filter/xml/xmlexp.cxx   |1 -
 sw/source/filter/xml/xmlfmte.cxx  |1 -
 sw/source/filter/xml/xmlfonte.cxx |1 -
 sw/source/filter/xml/xmlimp.cxx   |2 --
 sw/source/filter/xml/xmlmeta.cxx  |2 --
 sw/source/filter/xml/xmltexte.cxx |5 -
 sw/source/filter/xml/xmltexti.cxx |3 ---
 23 files changed, 3 insertions(+), 65 deletions(-)

New commits:
commit 45c7ba7ad6befdc4c212c376ef9399976f6695e1
Author: Bartosz Kosiorek 
Date:   Tue Nov 22 21:11:04 2016 +0100

tdf#42949 Remove unnecessary headers from sw/source/filters

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

diff --git a/sw/source/filter/basflt/fltini.cxx 
b/sw/source/filter/basflt/fltini.cxx
index 071751b..3b896eb 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -54,8 +54,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 
 using namespace utl;
diff --git a/sw/source/filter/html/SwAppletImpl.cxx 
b/sw/source/filter/html/SwAppletImpl.cxx
index bfeb6e8..fc8fb91 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -21,7 +21,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
diff --git a/sw/source/filter/html/htmlplug.cxx 
b/sw/source/filter/html/htmlplug.cxx
index 468ba55..cedeafd 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -55,7 +55,6 @@
 #include "swcss1.hxx"
 #include "unoframe.hxx"
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/filter/html/htmltabw.cxx 
b/sw/source/filter/html/htmltabw.cxx
index 3becd8c..d536ff0 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -27,13 +27,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/filter/html/wrthtml.cxx 
b/sw/source/filter/html/wrthtml.cxx
index 147d175..b3034c7 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -43,13 +43,6 @@
 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/filter/inc/fltshell.hxx 
b/sw/source/filter/inc/fltshell.hxx
index bd669dd..702e12f 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -19,9 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_INC_FLTSHELL_HXX
 #define INCLUDED_SW_SOURCE_FILTER_INC_FLTSHELL_HXX
 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx 
b/sw/source/filter/ww8/docxexportfilter.hxx
index 0c4b859..983c8d7 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 
-#include 
 
 /// The physical access to the DOCX document (for writing).
 class DocxExportFilter : public oox::core::XmlFilterBase
diff --git a/sw/source/filter/ww8/writerhelper.cxx 
b/sw/source/filter/ww8/writerhelper.cxx
index 4c1ef18..5d38ce1 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -23,7 +23,6 @@
 #include "writerhelper.hxx"
 #include 
 #include 
-#include 
 
 #include 
 #include 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 9fc4425..b654cdb 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -85,9 +85,7 @@
 #include "escher.hxx"
 #include 
 #include "WW8FFData.hxx"
-#include 
 #include 
-#include 
 #include 
 #include "docsh.hxx"
 #include "IDocumentStylePoolAccess.hxx"
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 5c34fe8..cd292a62 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -22,25 +22,11 @@
 #include 
 
 #include

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

2016-11-22 Thread Bartosz Kosiorek

 sw/source/uibase/app/apphdl.cxx |7 ---
 sw/source/uibase/app/applab.cxx |1 
 sw/source/uibase/app/docsh2.cxx |1 
 sw/source/uibase/app/swmodule.cxx   |1 
 sw/source/uibase/config/usrpref.cxx |1 
 sw/source/uibase/dbui/dbmgr.cxx |4 -
 sw/source/uibase/dbui/dbtree.cxx|5 --
 sw/source/uibase/dbui/mmconfigitem.cxx  |4 -
 sw/source/uibase/dochdl/swdtflvr.cxx|1 
 sw/source/uibase/fldui/fldmgr.cxx   |2 
 sw/source/uibase/fldui/xfldui.cxx   |2 
 sw/source/uibase/frmdlg/frmmgr.cxx  |1 
 sw/source/uibase/inc/SwXFilterOptions.hxx   |1 
 sw/source/uibase/inc/cption.hxx |7 ---
 sw/source/uibase/inc/glossary.hxx   |7 ---
 sw/source/uibase/inc/labimp.hxx |   44 
 sw/source/uibase/inc/swrenamexnameddlg.hxx  |3 -
 sw/source/uibase/inc/uivwimp.hxx|1 
 sw/source/uibase/inc/unotools.hxx   |2 
 sw/source/uibase/inc/unotxvw.hxx|1 
 sw/source/uibase/inc/wrtsh.hxx  |1 
 sw/source/uibase/index/idxmrk.cxx   |3 -
 sw/source/uibase/lingu/hyp.cxx  |1 
 sw/source/uibase/lingu/olmenu.cxx   |5 --
 sw/source/uibase/lingu/sdrhhcwrap.cxx   |1 
 sw/source/uibase/shells/annotsh.cxx |2 
 sw/source/uibase/shells/drwtxtex.cxx|1 
 sw/source/uibase/shells/grfshex.cxx |3 -
 sw/source/uibase/shells/textsh1.cxx |2 
 sw/source/uibase/shells/textsh2.cxx |8 ---
 sw/source/uibase/sidebar/PageFooterPanel.cxx|3 -
 sw/source/uibase/sidebar/PageFooterPanel.hxx|1 
 sw/source/uibase/sidebar/PageFormatPanel.cxx|3 -
 sw/source/uibase/sidebar/PageFormatPanel.hxx|1 
 sw/source/uibase/sidebar/PageHeaderPanel.cxx|3 -
 sw/source/uibase/sidebar/PageHeaderPanel.hxx|1 
 sw/source/uibase/sidebar/PageOrientationControl.cxx |2 
 sw/source/uibase/sidebar/PageOrientationControl.hxx |2 
 sw/source/uibase/sidebar/PageStylesPanel.cxx|3 -
 sw/source/uibase/sidebar/PageStylesPanel.hxx|1 
 sw/source/uibase/sidebar/StylePresetsPanel.cxx  |4 -
 sw/source/uibase/sidebar/StylePresetsPanel.hxx  |1 
 sw/source/uibase/sidebar/ThemePanel.cxx |5 --
 sw/source/uibase/sidebar/ThemePanel.hxx |1 
 sw/source/uibase/table/chartins.cxx |4 -
 sw/source/uibase/uiview/srcview.cxx |2 
 sw/source/uibase/uiview/uivwimp.cxx |2 
 sw/source/uibase/uiview/view1.cxx   |1 
 sw/source/uibase/uiview/view2.cxx   |1 
 sw/source/uibase/uiview/viewling.cxx|1 
 sw/source/uibase/uiview/viewprt.cxx |1 
 sw/source/uibase/uno/dlelstnr.cxx   |2 
 sw/source/uibase/uno/unoatxt.cxx|1 
 sw/source/uibase/uno/unomailmerge.cxx   |2 
 sw/source/uibase/uno/unomod.cxx |1 
 sw/source/uibase/utlui/numfmtlb.cxx |1 
 sw/source/uibase/wrtsh/wrtsh1.cxx   |1 
 57 files changed, 3 insertions(+), 171 deletions(-)

New commits:
commit 9b2e69abfc6386578fe3313362f1bbfe74c36a14
Author: Bartosz Kosiorek 
Date:   Wed Nov 23 02:45:38 2016 +0100

tdf#42949 Remove unused uno headers from /sw/source/uibase

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

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 00a9f81..270711f 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -86,14 +86,7 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index c15fa2e..5d6d523 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -38,7 +38,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 21c1b48..c1f8a65 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -20,7 +20,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/sw/source/uibase/app/swmodule.cxx 
b/sw/source/uibase/app/swmodule.cxx
index 19bc121..b43c8fd 100644
--- a/sw/source/uibase/app/swmodule.cx

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

2016-11-22 Thread Bartosz Kosiorek

 sd/source/core/CustomAnimationCloner.cxx |7 +--
 sd/source/core/CustomAnimationEffect.cxx |1 -
 sd/source/core/EffectMigration.cxx   |3 ---
 sd/source/core/TransitionPreset.cxx  |1 -
 sd/source/core/annotations/AnnotationEnumeration.cxx |1 -
 sd/source/core/drawdoc.cxx   |2 --
 sd/source/core/drawdoc2.cxx  |2 --
 sd/source/core/drawdoc3.cxx  |2 --
 sd/source/core/drawdoc4.cxx  |2 --
 sd/source/core/sdpage_animations.cxx |1 -
 10 files changed, 1 insertion(+), 21 deletions(-)

New commits:
commit 741b56fc09e8c9c4361baa7a876fe3c8b81710db
Author: Bartosz Kosiorek 
Date:   Wed Nov 23 03:21:04 2016 +0100

tdf#42949 Remove unused uno headers from /sd/source/core

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

diff --git a/sd/source/core/CustomAnimationCloner.cxx 
b/sd/source/core/CustomAnimationCloner.cxx
index 6fcb46e..a8d2d24 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -17,19 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/core/CustomAnimationEffect.cxx 
b/sd/source/core/CustomAnimationEffect.cxx
index 74d842b..469e06e 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/core/EffectMigration.cxx 
b/sd/source/core/EffectMigration.cxx
index 607f798..2348381 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -21,9 +21,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/core/TransitionPreset.cxx 
b/sd/source/core/TransitionPreset.cxx
index b4dda7d..b9e9a91 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx 
b/sd/source/core/annotations/AnnotationEnumeration.cxx
index 07d7ad6..842cbd5 100644
--- a/sd/source/core/annotations/AnnotationEnumeration.cxx
+++ b/sd/source/core/annotations/AnnotationEnumeration.cxx
@@ -21,7 +21,6 @@
 
 #include 
 
-#include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/office/XAnnotationEnumeration.hpp"
 
 #include "AnnotationEnumeration.hxx"
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index f11fce1..df8afd1 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -20,7 +20,6 @@
 #include 
 
 #include "PageListWatcher.hxx"
-#include 
 #include 
 #include 
 #include 
@@ -74,7 +73,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 8c7cdba..747d316 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
-#include 
 #include 
 #include 
 
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 62754d3..e20c8d0 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
-#include 
 
 #include "comphelper/anytostring.hxx"
 #include "cppuhelper/exc_hlp.hxx"
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 9d27b77..9787754 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -21,7 +21,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -89,7 +88,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/core/sdpage_animations.cxx 
b/sd/source/core/sdpage_animations.cxx
index f58c704..2877ea5 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -18,7 +18,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/Makefile.am

2016-11-22 Thread Andras Timar

 loolwsd/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8d577c8d96d099039ec981b9da8c3915be65c0e8
Author: Andras Timar 
Date:   Wed Nov 23 08:20:55 2016 +0100

loolwsd: add LibreOfficeKit.hxx to tarball

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 865d3e7..6df3998 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -120,6 +120,7 @@ noinst_HEADERS = Admin.hpp \
  UserMessages.hpp \
  Util.hpp \
  bundled/include/LibreOfficeKit/LibreOfficeKit.h \
+ bundled/include/LibreOfficeKit/LibreOfficeKit.hxx \
  bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitInit.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Bartosz Kosiorek

 sw/source/core/access/accdoc.cxx  |1 
 sw/source/core/access/accdoc.hxx  |1 
 sw/source/core/access/accfootnote.cxx |1 
 sw/source/core/access/accheaderfooter.cxx |1 
 sw/source/core/access/acchyperlink.cxx|1 
 sw/source/core/access/accmap.cxx  |1 
 sw/source/core/access/accnotextframe.cxx  |3 --
 sw/source/core/access/accpara.cxx |2 -
 sw/source/core/access/accportions.cxx |2 -
 sw/source/core/access/accselectionhelper.hxx  |1 
 sw/source/core/access/acctextframe.cxx|1 
 sw/source/core/attr/format.cxx|1 
 sw/source/core/bastyp/breakit.cxx |1 
 sw/source/core/bastyp/calc.cxx|1 
 sw/source/core/bastyp/init.cxx|2 -
 sw/source/core/crsr/swcrsr.cxx|1 
 sw/source/core/doc/doc.cxx|7 -
 sw/source/core/doc/doclay.cxx |2 -
 sw/source/core/doc/docnew.cxx |3 --
 sw/source/core/doc/docsort.cxx|2 -
 sw/source/core/doc/docxforms.cxx  |1 
 sw/source/core/doc/tblrwcl.cxx|1 
 sw/source/core/docnode/finalthreadmanager.cxx |1 
 sw/source/core/docnode/ndtbl.cxx  |1 
 sw/source/core/draw/drawdoc.cxx   |1 
 sw/source/core/edit/edfldexp.cxx  |2 -
 sw/source/core/edit/edlingu.cxx   |1 
 sw/source/core/edit/edtab.cxx |1 
 sw/source/core/fields/docufld.cxx |9 --
 sw/source/core/fields/macrofld.cxx|1 
 sw/source/core/fields/reffld.cxx  |1 
 sw/source/core/frmedt/feflyole.cxx|1 
 sw/source/core/graphic/grfatr.cxx |   12 
-
 sw/source/core/graphic/ndgrf.cxx  |2 -
 sw/source/core/inc/retrieveinputstream.hxx|1 
 sw/source/core/inc/unofootnote.hxx|1 
 sw/source/core/inc/unoparaframeenum.hxx   |3 --
 sw/source/core/inc/unosection.hxx |1 
 sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx |1 
 sw/source/core/ole/ndole.cxx  |4 ---
 sw/source/core/para/paratr.cxx|   13 
--
 sw/source/core/text/itradj.cxx|1 
 sw/source/core/text/itratr.cxx|1 
 sw/source/core/text/pormulti.cxx  |1 
 sw/source/core/tox/toxhlp.cxx |1 
 sw/source/core/txtnode/txtedt.cxx |1 
 sw/source/core/view/vprint.cxx|1 
 47 files changed, 100 deletions(-)

New commits:
commit c840c49b62b919ec4d0d947fe8cd530a785cf80d
Author: Bartosz Kosiorek 
Date:   Wed Nov 23 01:45:47 2016 +0100

tdf#42949 Remove unused uno headers from /sw/source/core

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

diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 06b9c5b..93c17f0 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -22,7 +22,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 47caf4c..6075e5b 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -22,7 +22,6 @@
 
 #include "acccontext.hxx"
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/access/accfootnote.cxx 
b/sw/source/core/access/accfootnote.cxx
index 7c16cab..a2ec4ce 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -19,7 +19,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/access/accheaderfooter.cxx 
b/sw/source/core/access/accheaderfooter.cxx
index 36327d5..eb87ee5 100644
--- a/sw/source/core/access/acch

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - 5 commits - loolwsd/ClientSession.hpp loolwsd/common loolwsd/DocumentBroker.cpp loolwsd/LOOLWSD.cpp loolwsd/Makefile.

2016-11-22 Thread Andras Timar

 loolwsd/ClientSession.hpp   |2 +-
 loolwsd/DocumentBroker.cpp  |2 +-
 loolwsd/LOOLWSD.cpp |   30 ++
 loolwsd/Makefile.am |1 +
 loolwsd/common/FileUtil.cpp |   23 +--
 loolwsd/common/FileUtil.hpp |2 +-
 6 files changed, 39 insertions(+), 21 deletions(-)

New commits:
commit eb31030f431f6d4ab4e9c5b48bcb8aaffe9ea792
Author: Andras Timar 
Date:   Wed Nov 23 08:20:55 2016 +0100

loolwsd: add LibreOfficeKit.hxx to tarball

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 865d3e7..6df3998 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -120,6 +120,7 @@ noinst_HEADERS = Admin.hpp \
  UserMessages.hpp \
  Util.hpp \
  bundled/include/LibreOfficeKit/LibreOfficeKit.h \
+ bundled/include/LibreOfficeKit/LibreOfficeKit.hxx \
  bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitInit.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h \
commit 4b04119a2e2def6af3adaa4941bf5211d3392d86
Author: Pranav Kant 
Date:   Wed Nov 23 11:31:39 2016 +0530

loolwsd: unused param

Change-Id: If74ccb603337971076e93c03ac28a9d8b5115f61
(cherry picked from commit 96952ceafd4de83093b4aed78320f673d599fda8)

diff --git a/loolwsd/ClientSession.hpp b/loolwsd/ClientSession.hpp
index 586b438..a8f2e51 100644
--- a/loolwsd/ClientSession.hpp
+++ b/loolwsd/ClientSession.hpp
@@ -40,7 +40,7 @@ public:
 const std::string getUserId() const { return _userId; }
 void setUserId(const std::string& userId) { _userId = userId; }
 void setUserName(const std::string& userName) { _userName = userName; }
-void setDocumentOwner(const bool documentOwner) { _isDocumentOwner = 
isDocumentOwner; }
+void setDocumentOwner(const bool documentOwner) { _isDocumentOwner = 
documentOwner; }
 bool isDocumentOwner() const { return _isDocumentOwner; }
 
 /**
commit f56ee6bd70505f5a710918a1b14ab2bc8f3f37f3
Author: Pranav Kant 
Date:   Wed Nov 23 11:15:05 2016 +0530

loolwsd: -Werror=shadow

Change-Id: If346299e76e50eabde65a4c3aab7b529a8c09148
(cherry picked from commit 81e4b052beda012219a5990dfed222f518b899a3)

diff --git a/loolwsd/ClientSession.hpp b/loolwsd/ClientSession.hpp
index 5349caa..586b438 100644
--- a/loolwsd/ClientSession.hpp
+++ b/loolwsd/ClientSession.hpp
@@ -40,7 +40,7 @@ public:
 const std::string getUserId() const { return _userId; }
 void setUserId(const std::string& userId) { _userId = userId; }
 void setUserName(const std::string& userName) { _userName = userName; }
-void setDocumentOwner(const bool isDocumentOwner) { _isDocumentOwner = 
isDocumentOwner; }
+void setDocumentOwner(const bool documentOwner) { _isDocumentOwner = 
isDocumentOwner; }
 bool isDocumentOwner() const { return _isDocumentOwner; }
 
 /**
commit d5393326957048b193935e40f658e345ed1c4789
Author: Ashod Nakashian 
Date:   Tue Nov 22 22:06:50 2016 -0500

loolwsd: avoid deadlocking when alerting all users

Alerting all users is done from different contexts.
One such is when loading a new document.

Since both alerting all users and loading documents
need to hold the same lock, this would deadlock.

The solution here is to differentiate between
external alerts and internal ones (to WSD).

The internal one expects to be invoked while holding
the lock, while the external one always takes the lock.

Care should be taking when alerting from within WSD to
avoid this deadlock.

Change-Id: Idf0e952db1216a3d161f22c7da51af16701f685b
Reviewed-on: https://gerrit.libreoffice.org/31102
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
(cherry picked from commit 51c88c5fb79c5db146a08f5ef2d9a4fe6d095caa)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 1f8644f..c253f51 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -228,6 +228,20 @@ void shutdownLimitReached(LOOLWebSocket& ws)
 }
 }
 
+/// Internal implementation to alert all clients
+/// connected to any document.
+void alertAllUsersInternal(const std::string& msg)
+{
+Util::assertIsLocked(DocBrokersMutex);
+
+LOG_INF("Alerting all users: [" << msg << "]");
+
+for (auto& brokerIt : DocBrokers)
+{
+auto lock = brokerIt.second->getLock();
+brokerIt.second->alertAllUsers(msg);
+}
+}
 }
 
 /// Remove dead DocBrokers.
@@ -260,7 +274,13 @@ static void forkChildren(const int number)
 
 if (number > 0)
 {
-FileUtil::checkDiskSpaceOnRegisteredFileSystems();
+const std::string fs = 
FileUtil::checkDiskSpaceOnRegisteredFileSystems();
+if (!fs.empty())
+{
+LOG_WRN("File system of " << fs << " dangerously low on disk 
space");
+alertAllUsersInternal("error: cmd=internal kind=diskfull");
+

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

2016-11-22 Thread Aron Budea

 scp2/source/ooo/common_brand.scp|5 +
 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 6 files changed, 47 insertions(+)

New commits:
commit fc88ed47a66e76d279471c1da1193ce90ad8e9e5
Author: Aron Budea 
Date:   Tue Nov 22 23:15:28 2016 +0100

tdf#103922: Add Tibetan (bo) dictionary

Change-Id: Ief1a83bb87d03e46a3d3fa7702ab852401d3ed89
Reviewed-on: https://gerrit.libreoffice.org/31089
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7cd7733..6424960 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -183,6 +183,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Bn
 DosName = "dict-bn";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Bo
+ParentID = gid_Brand_Dir_Share_Extensions;
+DosName = "dict-bo";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Br
 ParentID = gid_Brand_Dir_Share_Extensions;
 DosName = "dict-br";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 4f6a1ee..f0542fc 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -421,6 +421,15 @@ End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Bo
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-bo.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Br
Dir = FILELIST_DIR;
Name = "Dictionary/dict-br.filelist";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 7819b24..0d781e1 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -225,6 +225,17 @@ Module gid_Module_Root_Extension_Dictionary_Bn
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Bo
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BO );
+Files = (gid_File_Extension_Dictionary_Bo);
+InstallOrder = "2000";
+Sortkey = "525";
+Spellcheckerlanguage = "bo";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Br
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
 Files = (gid_File_Extension_Dictionary_Br);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 6c1c894..25c5400 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -76,6 +76,12 @@ en-US = "Bengali"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_BN]
 en-US = "Bengali spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BO]
+en-US = "Classical Tibetan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BO]
+en-US = "Classical Tibetan syllable spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
 en-US = "Breton"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 613c79b..47e5817 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -442,6 +442,21 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Bo"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bo"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bo"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2016 Elie Roux"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Bo dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Br"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-br"
 solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 12e5f59..3a343b0 10

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

2016-11-22 Thread Noel Grandin

 editeng/source/editeng/editeng.cxx  |2 +-
 editeng/source/editeng/editundo.cxx |2 +-
 editeng/source/editeng/editundo.hxx |   10 +-
 editeng/source/editeng/editview.cxx |2 +-
 editeng/source/editeng/edtspell.cxx |2 +-
 editeng/source/editeng/impedit.hxx  |5 +
 editeng/source/editeng/impedit5.cxx |6 +++---
 include/editeng/editeng.hxx |6 +-
 8 files changed, 18 insertions(+), 17 deletions(-)

New commits:
commit aebf05f324661a07f4124a4c48b6fc889d4bfbf6
Author: Noel Grandin 
Date:   Wed Nov 23 09:18:23 2016 +0200

convert ATTRSPECIAL to scoped enum

Change-Id: I8abf09dc5f17343945b909887c580e9016a79ac5

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index bde286a..c151c67 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -907,7 +907,7 @@ void EditEngine::SetParaAttribsOnly(sal_Int32 nPara, const 
SfxItemSet& rSet)
 pImpEditEngine->SetParaAttribs(nPara, rSet);
 }
 
-void EditEngine::SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, 
sal_uInt8 nSpecial)
+void EditEngine::SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, 
SetAttribsMode nSpecial)
 {
 pImpEditEngine->SetAttribs(rSel, rSet, nSpecial);
 }
diff --git a/editeng/source/editeng/editundo.cxx 
b/editeng/source/editeng/editundo.cxx
index 90ea9ba..c96174f 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -505,7 +505,7 @@ EditUndoSetAttribs::EditUndoSetAttribs(EditEngine* pEE, 
const ESelection& rESel,
 bSetIsRemove = false;
 bRemoveParaAttribs = false;
 nRemoveWhich = 0;
-nSpecial = 0;
+nSpecial = SetAttribsMode::NONE;
 }
 
 namespace {
diff --git a/editeng/source/editeng/editundo.hxx 
b/editeng/source/editeng/editundo.hxx
index 1364b0c..f85ee12 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -28,7 +28,7 @@
 
 class EditEngine;
 class EditView;
-
+enum class SetAttribsMode;
 
 // EditUndoDelContent
 
@@ -216,10 +216,10 @@ private:
 SfxItemSet  aNewAttribs;
 InfoArrayType   aPrevAttribs;
 
-sal_uInt8   nSpecial;
+SetAttribsMode  nSpecial;
 boolbSetIsRemove;
 boolbRemoveParaAttribs;
-sal_uInt16  nRemoveWhich;
+sal_uInt16  nRemoveWhich;
 
 voidImpSetSelection( EditView* pView );
 
@@ -230,10 +230,10 @@ public:
 
 SfxItemSet& GetNewAttribs() { return aNewAttribs; }
 
-voidSetSpecial( sal_uInt8 n )   { nSpecial = n; }
+voidSetSpecial( SetAttribsMode n )  { nSpecial = n; }
 voidSetRemoveAttribs( bool b )  { bSetIsRemove = b; }
 voidSetRemoveParaAttribs( bool b )  { bRemoveParaAttribs = 
b; }
-voidSetRemoveWhich( sal_uInt16 n )  { nRemoveWhich = 
n; }
+voidSetRemoveWhich( sal_uInt16 n )  { nRemoveWhich = n; }
 
 virtual voidUndo() override;
 virtual voidRedo() override;
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 3245004..2d0ace8 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -481,7 +481,7 @@ void EditView::SetAttribs( const SfxItemSet& rSet )
 DBG_ASSERT( !pImpEditView->aEditSelection.IsInvalid(), "Blind Selection in 
" );
 
 pImpEditView->DrawSelection();
-pImpEditView->pEditEngine->SetAttribs( pImpEditView->GetEditSelection(), 
rSet, ATTRSPECIAL_WHOLEWORD );
+pImpEditView->pEditEngine->SetAttribs( pImpEditView->GetEditSelection(), 
rSet, SetAttribsMode::WholeWord );
 pImpEditView->pEditEngine->FormatAndUpdate( this );
 }
 
diff --git a/editeng/source/editeng/edtspell.cxx 
b/editeng/source/editeng/edtspell.cxx
index 4077ae5..887e814 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -624,7 +624,7 @@ void EdtAutoCorrDoc::SetAttr(sal_Int32 nStt, sal_Int32 nEnd,
 
 EditSelection aSel( EditPaM( pCurNode, nStt ), EditPaM( pCurNode, nEnd 
) );
 aSel.Max().SetIndex( nEnd );// ???
-mpEditEngine->SetAttribs( aSel, aSet, ATTRSPECIAL_EDGE );
+mpEditEngine->SetAttribs( aSel, aSet, SetAttribsMode::Edge );
 bAllowUndoAction = false;
 }
 }
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index b76fa58..5cb4feb 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -66,9 +66,6 @@
 #define CURSOR_BIDILEVEL_DONTKNOW   0x
 #define MAXCHARSINPARA  0x3FFF-CHARPOSGROW  // Max 16K, because WYSIWYG 
array
 
-#define ATTRSPECIAL_WHOLEWORD   1
-#define ATTRSPECIAL_EDGE2
-
 #define GETCRSR_TXTONLY 0x0001
 #define GETCRSR_STARTOFLINE 0x0002
 #define GETCRSR_ENDOFLINE   0x0004
@@ -

[Libreoffice-commits] core.git: compilerplugins/clang include/vcl include/xmloff include/xmlscript vcl/source xmloff/source

2016-11-22 Thread Noel Grandin

 compilerplugins/clang/unusedfields.cxx|   13 +++-
 include/vcl/button.hxx|   72 ---
 include/vcl/dockwin.hxx   |1 
 include/vcl/field.hxx |   91 +++---
 include/vcl/graph.hxx |   16 ++---
 include/vcl/graphicfilter.hxx |   32 --
 include/vcl/idle.hxx  |1 
 include/vcl/longcurr.hxx  |   32 +-
 include/vcl/metric.hxx|2 
 include/vcl/msgbox.hxx|7 +-
 include/vcl/pdfwriter.hxx |1 
 include/vcl/spinfld.hxx   |   70 +++
 include/xmloff/XMLCharContext.hxx |2 
 include/xmloff/XMLEventsImportContext.hxx |2 
 include/xmloff/XMLShapeStyleContext.hxx   |4 -
 include/xmloff/controlpropertyhdl.hxx |1 
 include/xmloff/formlayerexport.hxx|1 
 include/xmloff/styleexp.hxx   |   10 ---
 include/xmloff/txtparae.hxx   |5 -
 include/xmloff/xmlexp.hxx |4 -
 include/xmlscript/xml_helper.hxx  |6 -
 vcl/source/window/msgbox.cxx  |4 -
 xmloff/source/text/txtparae.cxx   |2 
 23 files changed, 189 insertions(+), 190 deletions(-)

New commits:
commit 29a9e97db65bcf5914aed9bf8cb8e8f38c3c5fc0
Author: Noel Grandin 
Date:   Tue Nov 22 10:36:24 2016 +0200

loplugin field-can-be-private in include/vcl..xmlscript

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

diff --git a/compilerplugins/clang/unusedfields.cxx 
b/compilerplugins/clang/unusedfields.cxx
index 1bf71cd..94a1cb6 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -106,7 +106,18 @@ private:
 MyFieldInfo UnusedFields::niceName(const FieldDecl* fieldDecl)
 {
 MyFieldInfo aInfo;
-aInfo.parentClass = fieldDecl->getParent()->getQualifiedNameAsString();
+
+const RecordDecl* recordDecl = fieldDecl->getParent();
+
+if (const CXXRecordDecl* cxxRecordDecl = 
dyn_cast(recordDecl))
+{
+if (cxxRecordDecl->getTemplateInstantiationPattern())
+cxxRecordDecl = cxxRecordDecl->getTemplateInstantiationPattern();
+aInfo.parentClass = cxxRecordDecl->getQualifiedNameAsString();
+}
+else
+aInfo.parentClass = recordDecl->getQualifiedNameAsString();
+
 aInfo.fieldName = fieldDecl->getNameAsString();
 aInfo.fieldType = fieldDecl->getType().getAsString();
 
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 78df45e..d8588dc 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -114,47 +114,12 @@ enum class PushButtonDropdownStyle
 
 class VCL_DLLPUBLIC PushButton : public Button
 {
-protected:
-SymbolType  meSymbol;
-TriStatemeState;
-TriStatemeSaveValue;
-PushButtonDropdownStyle mnDDStyle;
-boolmbPressed;
-boolmbIsActive;
-
-SAL_DLLPRIVATE voidImplInitPushButtonData();
-SAL_DLLPRIVATE static WinBits  ImplInitStyle( const vcl::Window* 
pPrevWindow, WinBits nStyle );
-SAL_DLLPRIVATE voidImplInitSettings( bool bFont, bool 
bForeground, bool bBackground );
-SAL_DLLPRIVATE voidImplDrawPushButtonContent(OutputDevice* 
pDev, DrawFlags nDrawFlags,
- const Rectangle& 
rRect, bool bMenuBtnSep);
-SAL_DLLPRIVATE voidImplDrawPushButton(vcl::RenderContext& 
rRenderContext);
-using Button::ImplGetTextStyle;
-SAL_DLLPRIVATE DrawTextFlags   ImplGetTextStyle( DrawFlags nDrawFlags ) 
const;
-SAL_DLLPRIVATE boolIsSymbol() const { return ( (meSymbol != 
SymbolType::DONTKNOW) && (meSymbol != SymbolType::IMAGE) ); }
-
-   PushButton( const PushButton & ) = delete;
-   PushButton& operator=( const PushButton & )
-   = delete;
-
-SAL_DLLPRIVATE voidImplInit( vcl::Window* pParent, WinBits 
nStyle );
-
-using Control::ImplInitSettings;
-using Window::ImplInit;
 public:
 SAL_DLLPRIVATE voidImplSetDefButton( bool bSet );
 SAL_DLLPRIVATE voidImplDrawPushButtonFrame(vcl::RenderContext& 
rRenderContext, Rectangle& rRect, DrawButtonFlags nStyle);
 SAL_DLLPRIVATE static bool ImplHitTestPushButton(vcl::Window* pDev, 
const Point& rPos);
 SAL_DLLPRIVATE boolImplIsDefButton() const;
 
-protected:
-explicitPushButton( WindowType nType );
-
-virtual voidFillLayoutData() const override;
-virtual const vcl::Font&
-GetCanonicalFont( const StyleSettings& _rStyle ) const 
override;
-virtual const Color&
-

[Libreoffice-commits] core.git: helpcontent2

2016-11-22 Thread Laurent Balland-Poirier

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

New commits:
commit c895cb32fa8d1cf7fa82cebbde9d8259e68e66f6
Author: Laurent Balland-Poirier 
Date:   Sun Oct 23 17:28:52 2016 +0200

Updated core
Project: help  576f344764a89a1533d39d1424d3bd4176af1aae

tdf#36038 Help for Extended LCID

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

diff --git a/helpcontent2 b/helpcontent2
index b429143..576f344 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b429143c2cbedbc28b9b8c9cc07cd76cd69b68c6
+Subproject commit 576f344764a89a1533d39d1424d3bd4176af1aae
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Laurent Balland-Poirier

 source/text/shared/01/05020301.xhp |  682 +++--
 1 file changed, 654 insertions(+), 28 deletions(-)

New commits:
commit 576f344764a89a1533d39d1424d3bd4176af1aae
Author: Laurent Balland-Poirier 
Date:   Sun Oct 23 17:28:52 2016 +0200

tdf#36038 Help for Extended LCID

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

diff --git a/source/text/shared/01/05020301.xhp 
b/source/text/shared/01/05020301.xhp
index df8c1f5..54e2654 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -41,6 +41,8 @@
   scientific notation, formats
   engineering notation, formats
   fraction, formats
+  native numeral
+  LCID, extended
 
 mw made "time formats" a two level entry and deleted 2x 
"formats;"
 
@@ -269,7 +271,7 @@
 To display 
numbers as percentages, add the percent sign (%) to the number 
format.
 
 Scientific Notation
-Scientific 
notation lets you write very large numbers or very small fractions in a compact 
form. For example, in scientific notation, 65 is written as 6.5 x 10^5, and 
0.65 as 6.5 x 10^-5. Translators: use the decimal delimiter of 
your language (period or comma) for all number format codes in 
Calc.In %PRODUCTNAME, these numbers 
are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that 
displays numbers using scientific notation, enter a # or 0, and then one of the 
following codes E-, E+, e- or e+. If sign is omitted after E or e, it won't 
appear for positive value of exponent. To get engineering notation, enter 3 
digits (0 or #) in the integer part.For instance: ###.##E+00
+Scientific 
notation lets you write very large numbers or very small fractions in a compact 
form. For example, in scientific notation, 65 is written as 6.5 x 10^5, and 
0.65 as 6.5 x 10^-5. Translators: use the decimal delimiter of 
your language (period or comma) for all number format codes in 
Calc.In %PRODUCTNAME, these numbers 
are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that 
displays numbers using scientific notation, enter a # or 0, and then one of the 
following codes E-, E+, e- or e+. If sign is omitted after E or e, it won't 
appear for positive value of exponent. To get engineering notation, enter 3 
digits (0 or #) in the integer part. For instance: ###.##E+00
 
 Fraction Representation
 To represent a 
value as a fraction, format consists of two or three parts: integer optional 
part, numerator and denominator. Integer and numerator are separated by a blank 
or any quoted text. Numerator and denominator are separated by a slash 
character. Each part can consist of a combination of #, ? and 0 as 
placeholders.
@@ -716,9 +718,10 @@
 
 Entering Dates
 To enter a 
date in a cell, use the Gregorian calendar format. For example, in an English 
locale, enter 1/2/2002 for Jan 2, 2002.
-All date 
formats are dependent on the locale that is set in %PRODUCTNAME - Preferences
+All date 
formats are dependent on the locale that is set in %PRODUCTNAME - Preferences 
 Tools - 
Options - Language settings - 
Languages. For example, if your locale is set to 'Japanese', then the 
Gengou calendar is used. The default date format in %PRODUCTNAME uses the Gregorian Calendar.
 To specify a 
calendar format that is independent of the locale, add a modifier in front of 
the date format. For example, to display a date using the Jewish calendar 
format in a non-Hebrew locale, enter: [~jewish]DD/MM/.
+The 
specified calendar is exported to MS-Excel using extended LCID. Extended LCID 
can also be used in the format string. It will be converted to a calendar 
modifier if it is supported. See Extended LCID section 
below.
 
 
   
@@ -787,7 +790,7 @@
   
 
 
-If you perform a calculation that 
involves one or more cells using a date format, the result is formatted 
according to the following mappings:
+If you perform a calculation that 
involves one or more cells using a date format, the result is formatted 
according to the following mappings: 
 
 
 
@@ -885,7 +888,7 @@
 
 
 
-The Date&Time format displays the 
date and time that an entry was made to a cell with this format.
+The Date&Time format displays the 
date and time that an entry was made to a cell with this format. 
 
 
 
@@ -985,16 +988,16 @@
 If a time is 
entered in the form 02:03.45 or 01:02:03.45 or 25:01:02, the following formats 
are assigned if no other time format has been specified: MM:SS.00 or 
[HH]:MM:SS.00 or [HH]:MM:SSTranslators: use the decimal delimiter of 
your language (period or comma) for all number format codes in 
Calc.
 
 Displaying Numbers Using Native Characters
+
+NatNum modifiers
 To display 
numbers using native number characters, use a [NatNum1], [NatNum2], ... 
[NatNum11] modifier at the beginning of a number format codes.
 The [NatNum1] 
modifier always uses a one to one character map

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

2016-11-22 Thread Pranav Kant

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

New commits:
commit 96952ceafd4de83093b4aed78320f673d599fda8
Author: Pranav Kant 
Date:   Wed Nov 23 11:31:39 2016 +0530

loolwsd: unused param

Change-Id: If74ccb603337971076e93c03ac28a9d8b5115f61

diff --git a/loolwsd/ClientSession.hpp b/loolwsd/ClientSession.hpp
index 586b438..a8f2e51 100644
--- a/loolwsd/ClientSession.hpp
+++ b/loolwsd/ClientSession.hpp
@@ -40,7 +40,7 @@ public:
 const std::string getUserId() const { return _userId; }
 void setUserId(const std::string& userId) { _userId = userId; }
 void setUserName(const std::string& userName) { _userName = userName; }
-void setDocumentOwner(const bool documentOwner) { _isDocumentOwner = 
isDocumentOwner; }
+void setDocumentOwner(const bool documentOwner) { _isDocumentOwner = 
documentOwner; }
 bool isDocumentOwner() const { return _isDocumentOwner; }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Pranav Kant

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

New commits:
commit 81e4b052beda012219a5990dfed222f518b899a3
Author: Pranav Kant 
Date:   Wed Nov 23 11:15:05 2016 +0530

loolwsd: -Werror=shadow

Change-Id: If346299e76e50eabde65a4c3aab7b529a8c09148

diff --git a/loolwsd/ClientSession.hpp b/loolwsd/ClientSession.hpp
index 5349caa..586b438 100644
--- a/loolwsd/ClientSession.hpp
+++ b/loolwsd/ClientSession.hpp
@@ -40,7 +40,7 @@ public:
 const std::string getUserId() const { return _userId; }
 void setUserId(const std::string& userId) { _userId = userId; }
 void setUserName(const std::string& userName) { _userName = userName; }
-void setDocumentOwner(const bool isDocumentOwner) { _isDocumentOwner = 
isDocumentOwner; }
+void setDocumentOwner(const bool documentOwner) { _isDocumentOwner = 
isDocumentOwner; }
 bool isDocumentOwner() const { return _isDocumentOwner; }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Ashod Nakashian

 loolwsd/LOOLWSD.cpp |   30 ++
 loolwsd/common/FileUtil.cpp |9 +
 loolwsd/common/FileUtil.hpp |2 +-
 3 files changed, 28 insertions(+), 13 deletions(-)

New commits:
commit 51c88c5fb79c5db146a08f5ef2d9a4fe6d095caa
Author: Ashod Nakashian 
Date:   Tue Nov 22 22:06:50 2016 -0500

loolwsd: avoid deadlocking when alerting all users

Alerting all users is done from different contexts.
One such is when loading a new document.

Since both alerting all users and loading documents
need to hold the same lock, this would deadlock.

The solution here is to differentiate between
external alerts and internal ones (to WSD).

The internal one expects to be invoked while holding
the lock, while the external one always takes the lock.

Care should be taking when alerting from within WSD to
avoid this deadlock.

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

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 1f8644f..c253f51 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -228,6 +228,20 @@ void shutdownLimitReached(LOOLWebSocket& ws)
 }
 }
 
+/// Internal implementation to alert all clients
+/// connected to any document.
+void alertAllUsersInternal(const std::string& msg)
+{
+Util::assertIsLocked(DocBrokersMutex);
+
+LOG_INF("Alerting all users: [" << msg << "]");
+
+for (auto& brokerIt : DocBrokers)
+{
+auto lock = brokerIt.second->getLock();
+brokerIt.second->alertAllUsers(msg);
+}
+}
 }
 
 /// Remove dead DocBrokers.
@@ -260,7 +274,13 @@ static void forkChildren(const int number)
 
 if (number > 0)
 {
-FileUtil::checkDiskSpaceOnRegisteredFileSystems();
+const std::string fs = 
FileUtil::checkDiskSpaceOnRegisteredFileSystems();
+if (!fs.empty())
+{
+LOG_WRN("File system of " << fs << " dangerously low on disk 
space");
+alertAllUsersInternal("error: cmd=internal kind=diskfull");
+}
+
 const std::string aMessage = "spawn " + std::to_string(number) + "\n";
 LOG_DBG("MasterToForKit: " << aMessage.substr(0, aMessage.length() - 
1));
 
@@ -2155,13 +2175,7 @@ void alertAllUsers(const std::string& msg)
 {
 std::lock_guard DocBrokersLock(DocBrokersMutex);
 
-LOG_INF("Alerting all users: [" << msg << "]");
-
-for (auto& brokerIt : DocBrokers)
-{
-auto lock = brokerIt.second->getLock();
-brokerIt.second->alertAllUsers(msg);
-}
+alertAllUsersInternal(msg);
 }
 
 }
diff --git a/loolwsd/common/FileUtil.cpp b/loolwsd/common/FileUtil.cpp
index 19e8e00..ea55548 100644
--- a/loolwsd/common/FileUtil.cpp
+++ b/loolwsd/common/FileUtil.cpp
@@ -163,7 +163,7 @@ namespace FileUtil
 }
 }
 
-void checkDiskSpaceOnRegisteredFileSystems()
+std::string checkDiskSpaceOnRegisteredFileSystems()
 {
 std::lock_guard lock(fsmutex);
 
@@ -172,7 +172,7 @@ namespace FileUtil
 
 // Don't check more often that once a minute
 if (std::chrono::duration_cast(now - 
lastCheck).count() < 60)
-return;
+return std::string();
 
 lastCheck = now;
 
@@ -180,10 +180,11 @@ namespace FileUtil
 {
 if (!checkDiskSpace(i.path))
 {
-alertAllUsersAndLog("File system of " + i.path + " dangerously 
low on disk space", "internal", "diskfull");
-break;
+return i.path;
 }
 }
+
+return std::string();
 }
 
 bool checkDiskSpace(const std::string& path)
diff --git a/loolwsd/common/FileUtil.hpp b/loolwsd/common/FileUtil.hpp
index aa6bba6..e0e9487 100644
--- a/loolwsd/common/FileUtil.hpp
+++ b/loolwsd/common/FileUtil.hpp
@@ -51,7 +51,7 @@ namespace FileUtil
 // Perform the check. If the free space on any of the registered file 
systems is below 5%, call
 // 'alertAllUsers("internal", "diskfull")'. The check will be made no more 
often than once a
 // minute.
-void checkDiskSpaceOnRegisteredFileSystems();
+std::string checkDiskSpaceOnRegisteredFileSystems();
 
 // Check disk space on a specific file system, the one where 'path' is 
located. This does not
 // add that file system to the list used by 
'registerFileSystemForDiskSpaceChecks'. If the free
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Ashod Nakashian

 loolwsd/DocumentBroker.cpp  |2 +-
 loolwsd/common/FileUtil.cpp |   14 --
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 5d4aa362404eff5c5ed12ffcce2cefa8e5be409d
Author: Ashod Nakashian 
Date:   Tue Nov 22 22:06:05 2016 -0500

loolwsd: minor cleanups

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

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 949cec5..9fa56ae 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -598,7 +598,7 @@ void DocumentBroker::alertAllUsers(const std::string& msg)
 {
 Util::assertIsLocked(_mutex);
 
-LOG_DBG("Alerting all users: " << msg);
+LOG_DBG("Alerting all users of [" << _docKey << "]: " << msg);
 for (auto& it : _sessions)
 {
 try
diff --git a/loolwsd/common/FileUtil.cpp b/loolwsd/common/FileUtil.cpp
index 461513e..19e8e00 100644
--- a/loolwsd/common/FileUtil.cpp
+++ b/loolwsd/common/FileUtil.cpp
@@ -148,17 +148,18 @@ namespace FileUtil
 {
 std::lock_guard lock(fsmutex);
 
-if (path != "")
+if (!path.empty())
 {
 std::string dirPath = path;
 std::string::size_type lastSlash = dirPath.rfind('/');
 assert(lastSlash != std::string::npos);
-dirPath = dirPath.substr(0, lastSlash + 1) + ".";
+dirPath = dirPath.substr(0, lastSlash + 1) + '.';
 
 struct stat s;
-if (stat(dirPath.c_str(), &s) == -1)
-return;
-filesystems.insert(fs(dirPath, s.st_dev));
+if (stat(dirPath.c_str(), &s) == 0)
+{
+filesystems.insert(fs(dirPath, s.st_dev));
+}
 }
 }
 
@@ -187,7 +188,8 @@ namespace FileUtil
 
 bool checkDiskSpace(const std::string& path)
 {
-assert(path != "");
+assert(!path.empty());
+
 struct statfs sfs;
 if (statfs(path.c_str(), &sfs) == -1)
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Tamás Zolnai

 sc/inc/miscuno.hxx   |2 ++
 sc/source/core/data/dpobject.cxx |2 +-
 sc/source/core/data/dpoutput.cxx |2 +-
 sc/source/ui/unoobj/dapiuno.cxx  |2 +-
 sc/source/ui/unoobj/miscuno.cxx  |   18 ++
 5 files changed, 23 insertions(+), 3 deletions(-)

New commits:
commit 5b7b2c8649596299c8f00b8b3b5056d272e25ccd
Author: TamÃ¡s Zolnai 
Date:   Wed Nov 23 04:13:05 2016 +

GeneralFunction is not an enum anymore

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

diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index e453a0a..d939d77 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -154,6 +154,8 @@ public:
 AnyToInterface( const css::uno::Any& rAny );
 static bool GetBoolProperty( const css::uno::Reference< 
css::beans::XPropertySet>& xProp,
 const OUString& rName, bool 
bDefault = false );
+static sal_Int16GetShortProperty( const css::uno::Reference< 
css::beans::XPropertySet>& xProp,
+const OUString& rName, sal_Int16 
nDefault );
 static sal_Int32GetLongProperty( const css::uno::Reference< 
css::beans::XPropertySet>& xProp,
 const OUString& rName );
 static sal_Int32GetEnumProperty( const css::uno::Reference< 
css::beans::XPropertySet>& xProp,
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 3e1813c..ab220f1 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2195,7 +2195,7 @@ void lcl_FillOldFields( ScPivotFieldVector& rFields,
 PivotFunc nMask = PivotFunc::NONE;
 if ( nOrient == sheet::DataPilotFieldOrientation_DATA )
 {
-sal_Int16 eFunc = 
(sal_Int16)ScUnoHelpFunctions::GetEnumProperty(
+sal_Int16 eFunc = ScUnoHelpFunctions::GetShortProperty(
   xDimProp, SC_UNO_DP_FUNCTION2,
   sheet::GeneralFunction2::NONE );
 if ( eFunc == sheet::GeneralFunction2::AUTO )
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 1fd2c3f..031aa12 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1588,7 +1588,7 @@ void ScDPOutput::GetDataDimensionNames(
 // Generate "given name" the same way as in dptabres.
 //TODO: Should use a stored name when available
 
-sal_Int16 eFunc = (sal_Int16)ScUnoHelpFunctions::GetEnumProperty(
+sal_Int16 eFunc = ScUnoHelpFunctions::GetShortProperty(
   xDimProp, SC_UNO_DP_FUNCTION2,
   sheet::GeneralFunction2::NONE );
 rGivenName = lcl_GetDataFieldName( rSourceName, eFunc );
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index dca4479..41e3887 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1869,7 +1869,7 @@ void SAL_CALL ScDataPilotFieldObj::setPropertyValue( 
const OUString& aPropertyNa
 }
 else if ( aPropertyName == SC_UNONAME_FUNCTION2 )
 {
-sal_Int16 eFunction = (sal_Int16) ScUnoHelpFunctions::GetEnumFromAny( 
aValue );
+sal_Int16 eFunction = ScUnoHelpFunctions::GetInt16FromAny( aValue );
 setFunction( eFunction );
 }
 else if ( aPropertyName == SC_UNONAME_SUBTOTALS )
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index fb870d5..bb9a8ac 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -56,6 +56,24 @@ bool ScUnoHelpFunctions::GetBoolProperty( const 
uno::Reference& xProp,
+const OUString& rName, 
sal_Int16 nDefault )
+{
+sal_Int16 nRet = nDefault;
+if ( xProp.is() )
+{
+try
+{
+xProp->getPropertyValue( rName ) >>= nRet;
+}
+catch(uno::Exception&)
+{
+// keep default
+}
+}
+return nRet;
+}
+
 sal_Int32 ScUnoHelpFunctions::GetLongProperty( const 
uno::Reference& xProp,
 const OUString& rName )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Kohei Yoshida

 vcl/inc/sft.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7637a20a622d6799ba867bd0122841a393178545
Author: Kohei Yoshida 
Date:   Tue Nov 22 22:32:25 2016 -0500

Fix my windows build.

Change-Id: I0cd6213f58e8b2d3d5950dfbb12e524de2950265

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 5f65488..2efe115 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -50,6 +50,7 @@
 #include 
 
 #include 
+#include 
 
 namespace vcl
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk sc/inc sc/qa sc/source

2016-11-22 Thread Tamás Zolnai

 offapi/UnoApi_offapi.mk|1 
 offapi/com/sun/star/sheet/DataPilotField.idl   |   32 +++
 offapi/com/sun/star/sheet/DataPilotSourceDimension.idl |6 
 offapi/com/sun/star/sheet/DataPilotSourceLevel.idl |7 
 offapi/com/sun/star/sheet/GeneralFunction2.idl |  111 
 sc/inc/dapiuno.hxx |   13 -
 sc/inc/dpobject.hxx|2 
 sc/inc/dpoutput.hxx|1 
 sc/inc/dpsave.hxx  |4 
 sc/inc/dptabsrc.hxx|7 
 sc/inc/dputil.hxx  |1 
 sc/inc/unonames.hxx|4 
 sc/qa/extras/check_data_pilot_field.cxx|4 
 sc/qa/unit/subsequent_export-test.cxx  |   18 --
 sc/qa/unit/subsequent_filters-test.cxx |4 
 sc/source/core/data/dpobject.cxx   |   64 +++
 sc/source/core/data/dpoutput.cxx   |   40 ++--
 sc/source/core/data/dpsave.cxx |   15 -
 sc/source/core/data/dptabres.cxx   |   13 -
 sc/source/core/data/dptabsrc.cxx   |   66 ++-
 sc/source/core/data/dputil.cxx |   30 ++-
 sc/source/core/tool/interpr2.cxx   |2 
 sc/source/filter/xml/XMLConverter.cxx  |   70 +--
 sc/source/filter/xml/XMLConverter.hxx  |7 
 sc/source/filter/xml/XMLExportDataPilot.cxx|   10 -
 sc/source/filter/xml/xmldpimp.cxx  |5 
 sc/source/ui/unoobj/dapiuno.cxx|  150 +++--
 sc/source/ui/unoobj/datauno.cxx|6 
 28 files changed, 489 insertions(+), 204 deletions(-)

New commits:
commit c0d4aadf08c16f2d79508367c631366f7a856346
Author: TamÃ¡s Zolnai 
Date:   Wed Nov 23 03:27:11 2016 +

[API Change]: Create new GeneralFunction2 for adding median

New functionality added to pivot table became fully
broken with Eike's revertion:
50244309501d738e7314fa79785db139c826f8d7
This commit fixes this problem.

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

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index b5657f7..c53b2d9 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3409,6 +3409,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/sheet,\
FunctionArgument \
FunctionCategory \
GeneralFunction \
+   GeneralFunction2 \
GoalResult \
IconSetFormatEntry \
IconSetType \
diff --git a/offapi/com/sun/star/sheet/DataPilotField.idl 
b/offapi/com/sun/star/sheet/DataPilotField.idl
index edc84ae..b9f6b2b 100644
--- a/offapi/com/sun/star/sheet/DataPilotField.idl
+++ b/offapi/com/sun/star/sheet/DataPilotField.idl
@@ -98,7 +98,6 @@ published service DataPilotField
  */
 [property, optional] sequence Subtotals;
 
-
 /** specifies the selected page which is used to filter the data pilot.
  */
 [property, optional] string SelectedPage;
@@ -175,6 +174,37 @@ published service DataPilotField
 /** specifies whether to show this field also if it is empty or not.
  */
 [property, optional] boolean ShowEmpty;
+
+/** specifies the function used to calculate results for this field.
+
+For column and row fields, this is the function for subtotals
+(GeneralFunction2::NONE means no subtotals).
+For data fields, this is the function shown in the data pilot
+table.
+
+@since LibreOffice 5.3
+ */
+
+[property, optional] short Function2;
+
+/** specifies the functions used to calculate subtotals for this field.
+
+This property is supported by column and row fields only.
+
+An empty sequence means no subtotals. The same effect can be
+achieved by setting the property #Function2 to the
+value GeneralFunction::NONE. If the length of the
+sequence is greater then 1, then the sequence MUST NOT contain one of
+the values GeneralFunction2::NONE or
+GeneralFunction2::AUTO.
+
+The order of the functions in this sequence is reflected in the
+DataPilot table. Multiple entries of the same function are ignored
+when setting the property.
+
+@since LibreOffice 5.3
+ */
+[property, optional] sequence Subtotals2;
 };
 
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl 
b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
index 2309d17..5ef61f5 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
@@ -122,6 +122,12 @@

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.3.0.0.beta1'

2016-11-22 Thread Christian Lohmaier

Tag 'libreoffice-5.3.0.0.beta1' created by Christian Lohmaier 
 at 2016-11-23 01:04 +

Tag libreoffice-5.3.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYNOsDAAoJEPQ0oe+v7q6jyeEQAJXZC8+sfpbDwa5EdBBDizqv
tpIqWqioJLDoy7mowr3SOkAIhGqnw93XGoP8rfn5rb+WpGLtuecqnOAH9RzrE4Cb
ZKI6gutiMxsmqZSKPJIV7RLX6bGswi70VLsa5ETFzaw7dwdVqJBz1NZ2XyM+JiaC
cukz+gxIUs9YPqCIdDHUT+Tis0ohtJC6ZXTmYo4AlzlTPhs9puzpywgc6QUgFA+X
vI1WWUoCE1mHaMWyfQabx8nVrkW8y0rrdou38QZpYWXOGp66O6pl1czOgt8NZ9lu
CKTECi11Gf/YbLMBh/4qRCiavV9CpV6VYG0oApMpwfXMPpJzNLbvXtWZsZlX6Kt/
0Ciba8Yx1ALrWKNJ+l/FQs9qNaStE3Xv4Dj+OOZkA5sLVfGeh76Tld53GzCJjt5M
6O3FYtnOsustcFaAKGuGstFPmhhvURjNVx0TPBznKwhBC41VhlgnQchh4xWIFQFG
W7wcfJjBCFOM8L4TU+BvZm7QLc4jGz8NAjp4ljv+lVX188HLWwWGKSPyu3yphZ9t
k7fDfw5unLNFeloA1hyK9B9vrIzC/oaUr7efrc/NmLGq9W+ebKtF+/JDAkrx2SDt
TqInSnfzpuX3PXaLCR0+PRz4l13AXMd+I88A/yPYi8Vf2BxFaWdnU/2l7iW9AtoQ
AplTNbmAVzRdR1lk7yAS
=AxRW
-END PGP SIGNATURE-

Changes since libreoffice-5-3-branch-point-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.3.0.0.beta1'

2016-11-22 Thread Christian Lohmaier

Tag 'libreoffice-5.3.0.0.beta1' created by Christian Lohmaier 
 at 2016-11-23 01:03 +

Tag libreoffice-5.3.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYNOr8AAoJEPQ0oe+v7q6jvokQAKEQ3e56VxRz1nYE0hwACP1A
KenTEYn/yEB3cxu4q1k4N3CVmXoO3V2jpXm1G481nfCyqWccVHlFraGmTSkcyqMh
ZFZG70wv9u6uEyBwXVqBAwRq77Ovav21erIRum/1MZ/hDv5Ro7z4rEv2jF7PE/uf
WTNqFI5Ql1ZqsXAr9kF7IsFwwq560T7uOKfAqXBPVzTroZX+dDxrjuB9afQvZLiC
Y8xKEBUz2pjbeiCVPXn99EdCbBwYpGs48hSurpvA9VuR6WgR9I16FEimVVtNpyiN
7pS+b5o1v3/66fJjw0Yr8C8eG/6JJsq46rHN5KiAMbyc9Tfnk/UGZActleOUrtiN
dDRRG9dhJvh0YzECCmT+NNCGxWvRLwhiev7PQmne4ZJ+lkmB96AoURYY+jWxzYSU
uVIlMx3SCiXh/thuSf6yzzMynkadYb1/3T6G7GzZ/+JJRApR1bu5Fh2CEou1TFqQ
0tltFWwJqXmh2d/rGMxKvCZsoRXqpsEuXPS1INUcj+3/2tje+U8zgUNUeu8iAvMf
bnzf6Mz1YDmeM95Az+56lwjH7g5RncQmCDxbOK/1XumTr6bDYmytx1cEz+TJ9w4O
nnoaZgquBeUD6zCDiST1MJ5Bnl9I9jJxttUDpE3bTFMJbFpijBT2EdmDCQTjfPMY
gISDM8cGhzpV+uBpvbp7
=ltWB
-END PGP SIGNATURE-

Changes since libreoffice-5-3-branch-point-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.3.0.0.beta1'

2016-11-22 Thread Christian Lohmaier

Tag 'libreoffice-5.3.0.0.beta1' created by Christian Lohmaier 
 at 2016-11-23 01:04 +

Tag libreoffice-5.3.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYNOsAAAoJEPQ0oe+v7q6jefgQALV1GjNefbUfYAkBJLK7s6I0
2K08JPu2Gsq+ypKPcoPKsIDMunsouO23GdPUbjoxIy1fqEsexsIoObU8Z5eC9/Iv
BcDQ/aGHrfJnkTE0bPRwbZAGTigrqzNWBLRjS/0lh/8NkNjC9jmexa52E8bJSJB5
NZDTaExkVyEHHMFaQ3Ae1NSWbgW12y3Jp2t1BvHW3Om2qNbRQ8IVy2y9WOPNveMi
hjxYe+U2c0OdVG244a0G4FkLS8rTiVVNqcaPdCiK1RLj+miTWikg8YTIs2FMU0Zm
yBGLrahuwA6KoSjgee4NJkJ99fuLRXeUCjjTA68H5mhX9vU/QGUfagRAm4VVlu8T
spPoWZ+CVMzzNLliq14ooMDgaFF+Ojurga+aHs6mN/lSBWrUqdw4cwL7jrpJa6wV
zffapJonZG7UJo6E0GJqcK5euaB3HiqvkXHBTFPnY4+lOBUDk9rCH7zR8ptpYqBb
8fw9/XISn92LXpiZdJa2b95dd5+t6l0JRs06taBbeclwS6E9/crfvVN1YxEHsz59
hRU5u4z10qDD6QNa/yNybDiJs57p7KkrTFzKB8+9zhPFPa8ASW+gj1Riv97BbQlx
A57SE6JWg+l7J1url/Jivkdftb744078Z4t97bvFojoi/9P4w8w7eGei6+X4xeXn
gTQfg84ZK4EPIDbM2TLU
=io41
-END PGP SIGNATURE-

Changes since libreoffice-5-3-branch-point-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.3.0.0.beta1'

2016-11-22 Thread Christian Lohmaier

Tag 'libreoffice-5.3.0.0.beta1' created by Christian Lohmaier 
 at 2016-11-23 01:03 +

Tag libreoffice-5.3.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYNOr4AAoJEPQ0oe+v7q6j3q4P/2y9OK6eYzNZXDAj344b1NfF
uvH/PUko4fwmKX9vLL0kN9N+jEHdkpk1r/b3mUqk9OrgeShYDCWCHApHd+VWJZp3
V0yJmhIqBkSJbxOZqe+6kcZGR+ro3OQD2rqMhCUesq2wDhBpVFKXLfsoIqRq3T8A
Itwb81gnpji4nx+QOV8DNSTev5+VOp6F7qKHBECOWMx/LywLYY1FJRLjGX128N5c
cm5QbYhr4oAc286u18mc+o2Ql1x5YRQvRu+8eCimWzBEREGtZTjKau0aNdKW7dZE
jFouGQURGnq+QCgTuWFXd14O9FiweYO3lm2P/PGQqUo21c68NW1o1QLRJMRVnEMK
PVSjvZ63kDqpzL7dtFYEzdALf7GaVAHGlqRHJJHDeQNknwCgsyHJuQqAGkCFDprk
n/HU0jqPhIgAtJ7L+m8Nkxy69yc3poBCiq/EZCeC0mE8RyLbpjhzc863yiOy8phe
6ZZ1FwqQjTuKuhgY44PTGxvUzhys44rZfW8+YxsX9zHi0R7xKvKnFHAPIgAZ5Ywt
rNPos4Cf/KgSZV+X86P3DHiTqaMtDlqf0Os1WSk+AKE+jwwe6Fe7ovPkmupCYG2s
GJQ3ZFko/0oaLU13Q1qZox+HPGpY3jcUM8neuHoRCpfwA+jiY1Kf+pAjJFG+00pH
MaJVpw9yOmZziyWwfPcJ
=/Uyd
-END PGP SIGNATURE-

Changes since libreoffice-5-3-branch-point-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - configure.ac

2016-11-22 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit de35a932f409893e11faed78ca9e486b7cb3c265
Author: Christian Lohmaier 
Date:   Wed Nov 23 02:04:37 2016 +0100

bump product version to 5.3.0.0.beta1+

Change-Id: Id34ceb5f63dbcd634503589c7754cfa93ac68b26

diff --git a/configure.ac b/configure.ac
index b1b277d..4696ebf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.3.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.3.0.0.beta1+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5-3-branch-point'

2016-11-22 Thread Christian Lohmaier

Tag 'libreoffice-5-3-branch-point' created by Christian Lohmaier 
 at 2016-11-23 01:00 +

Tag libreoffice-5-3-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYNOouAAoJEPQ0oe+v7q6js94P/iwcZbSrfjtkCirvteZ2ahuv
LidSTjPcuG/lhZFf/Y5m4Ca41wLhgYynxFtApXOycphuJyNJ4zVYJgoVs44fXhHj
JsSafKXbGw4LLAbZh618hwKbIB6EAeAd12ReB2tlXFzHTaRVhMmbZrD89Jfgf0Gv
h4FD6Z8w3WAXGZT1Rjr52ylT0NRbbnGJY0Lav0WCwqAbRmo+pAWr28QoXJjXxjtx
UWLxIWbRrgMK0+QZ0R0eEpyh+pDK2mLluS01FvW/jLku+Q8Y5i6RpLUFpyaBaXwc
AZPOnqIDzOOGendJUIVk/8JreFyzuwX4q6v6nYAkLVaktk9HDxlX8HojLzvcB7lD
+r2Fmp79PbNnfxM1ATwnNzPUXjeJUR/ze5wsW6sOiKuqQTD4AOknOflZSWdhrbrG
AjZLjNqK1MY1NGBouKZwLc4vGRc406h4IRU1TVuvIkriHr0Frj5vRqcG/MfEvomD
oGA/oNHFP3n9pWOHP50DYJbOWWkBlreSc/pETLcEOO8+DgrKCOC4dazHlroNWGAv
JzjXbeKFd7sFaZG3WgDocT6Hv2V36YQ+x8cV59C2GMupHMJeG43P3ljOIENmi5RP
QBCB4lgMv/HOcqJkTVDw49eL/MAqHYx4Z3ZuU4KK09Br/JQsbIRbttJPQCxwrK7T
2cYfS8nkHJNa/WX7OQXX
=5X6X
-END PGP SIGNATURE-

Changes since libreoffice-5-2-branch-point-7484:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5-3-branch-point'

2016-11-22 Thread tagezi

Tag 'libreoffice-5-3-branch-point' created by Christian Lohmaier 
 at 2016-11-23 01:00 +

Tag libreoffice-5-3-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYNOokAAoJEPQ0oe+v7q6jGPcP/R/N7R7j19Xa/awifjtNmSOl
DJnb7P3hiDpekkxEXsBiAaO+2p7812GlJPcXssMAjEYTat6bBTlJBqaiiy/9aYzU
ScE0s1jTLTcMaqsXZ8lBjIRLX3uUuUCKvb76aEP5Pjp0g8v+/CioebS9RIrwZHlx
qrz+i+6vqzqkjdRGX4zTEZ7UomLavSw3xcOPHSisDNmZ8DFZVmOOmMmLX6gkXQ2G
cbysKO9H5kwYIPDg2+Vk6HjniuV2HmZ4v1i3968AHTxz1YPhN8bekh85N/ejC53c
AOAzQvGVDLl+ZcOm50aTr6ZPZY6ykRW6jAvY1eh0mYrjeAzvuifBJ3xUXdMH0iRR
A751xHLQoaWvhLk9efpDp9ilS+xbBl1tPE4pX9G+pT4BnsIRI23tdoOMyJcOkfr0
XXBOB/X+KS89qs8A7Fd1xHFyyyFSsS+4zxrq2LWBblQOUwf0lm8YYR6od3Ut6i5H
jMNdbgB200wzlLvFiZV5yXg8eYO/CGXfJ4W0RPuWvt++L+QmQvG7DcgiDmhLDAMG
XuF4MhbaFDAK1yQAc8V1C8vves172UflO2jIvtbbec36I5E+8rqddRWk4ez89wfS
UiF9IKkY4u8gOGfr/S3AM6jvXDCY+gqj1xlBwe7dWFajD4rfZB5YK+w4J2xso+ld
WVSpTMWJpoQpB8Y3UBzp
=BYxF
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-164:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b14e198d31f3189b2f574898dbe6bf6067643ba
Author: Christian Lohmaier 
Date:   Wed Nov 23 02:01:05 2016 +0100

bump product version to 5.4.0.0.alpha0+

Change-Id: Ia5ed3eab0956bcd746df65b0f234270004804449

diff --git a/configure.ac b/configure.ac
index b1b277d..7e152a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.3.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.0.0.alpha0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5-3-branch-point'

2016-11-22 Thread Christian Lohmaier

Tag 'libreoffice-5-3-branch-point' created by Christian Lohmaier 
 at 2016-11-23 01:00 +

Tag libreoffice-5-3-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYNOonAAoJEPQ0oe+v7q6jKjsP/29Jxa5MxU2Lf/uwVUgrwfV0
LQkAW0A29QPzuowV31aVbicnaxE10XMRIZQrkuFh28uQ0nLeUhuWZzlVLXe8LWus
BJYmA9hUTXBfP8S4WSEh/GGDAso7vw4puz0LSbjkP9l1ZdCN8nTw32knv8xpJHEh
YpF/AV5Mo6U+FoTFXhrkobpjuvsXZ2JxTozT+C/bYQp5O7U5cxztz51pJ5LNU8XP
qYZ4QIIL/22xZf8dCIkGfkCdRMpKs5VcWiWOZ7/zcZdV5fsIAr8pQw6BYATJGxIg
5WcKZ0ykx6xGz/tKx462qLwaqB0ZPOi48/6YFazkXFol7xZ9gEiTZUDpssErxv+W
Q0y67H/09B6t2Q5PuZTVrYWrOj8YIJDWu0sFzG7c8jasvLm3zHPjgqVO0vTc5BMl
0wmXX4crfvRoFcvMUbqgH8eT+ow5CK0yTkcdZOKN1gYDNID/ekPCtfAyRySCglQD
OmhXrc/OpbqJwpRf4reuTDO/GAoOs+WZIVO+1emzJ68jXMmSnpBMLw8TeeEleKe6
w6uWVjIbf8EkBmVpOQDa8x6QFX59uOW3PVe8jJ32MdR9zQkmjUKpmGFAx02lfk5G
VHv2S/snlHPioLAOomi16mKkEtzkXqqQlBEUIYuwlpHUlcBc84bU+s9aTWhPnmfI
+MIaYFvUsxxpROx8uM5Q
=4FD2
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-16:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5-3-branch-point'

2016-11-22 Thread Aron Budea

Tag 'libreoffice-5-3-branch-point' created by Christian Lohmaier 
 at 2016-11-23 01:00 +

Tag libreoffice-5-3-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYNOogAAoJEPQ0oe+v7q6jwRgP/1iMliNhutB3lxWRNqykHg3j
ZlyKTLuBzX4v6Wh9DM8ajKp/Krm6AcM05eK7kQox5eisznDnWpaMqzXGHVkZebLs
nhSuRSUd9fNdT1XWi7ipyrmVIc9xF055Ole99aEh3I/t/nKQgEg/G4LpTVG027rV
Enqwsh4VQR09xt9gEV2IBW0YGQx7qIacOpn7+7jmK7O4kjWipmpbK72XBHDgOymi
zBq98lwR7pe3/4t1r7rstuDqZXUSdE4bcV456OfmqXoMwOGNbbMX2bc9rlCmszb7
H713jZnWqNjNO9pIunzyD6InVUVXArANVxSSYqHQRRLGTqYNe+ritCK+pmmlofPP
/NDTv/rW7Acy/Zyr1BVm6BUv5PX4bwoxhe/3TqtKotMETcKhdHjHJ92kieFpfRYO
ti3rPmwClfitUFY/IQ02BouFuMFwomfnRlBuYFzxiFidXOROLQ5Vr3OQMmPyALdj
2ir0ZMGqD012i2aaSUIH6lspl8p19FnQhfI0KtsLvCyimJAiiCcI3FJtCl7DTTat
XN0xrskmpWjdW5zJghvkNl8TlgToxyJk0h2Bw+GcU+jrlF1/ZOlb8ERAkgLEm0ao
AwtMTAUGyBBYXJKwdnlazwsDGeQlPgKZARAegVxfSYAY6QGE/zlGCTMzpldj5Hij
e15wZOYphqBJ/GpcI59E
=lxOW
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-10:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-5-3'

2016-11-22 Thread Christian Lohmaier

New branch 'libreoffice-5-3' available with the following commits:
commit f69b1497f9c34562c949b2068b06ad33a3474da7
Author: Christian Lohmaier 
Date:   Wed Nov 23 01:58:05 2016 +0100

Branch libreoffice-5-3

This is 'libreoffice-5-3' - the stable branch for the 5.3.x releases.
The commit rules are different according to the development phase:

A. 5.3.0 beta phase:

   A. any bug fixes are allowed without review
   B. late features need approval by 3 people with different affiliation

B. 5.3.0 rc phase and later:

   A. fixes need approval by one reviewer
   B. late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
  appropriate branches. Note that we do not plan any merge
  from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I223da394fba39f113e984bed4d65873b23a9daf0

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-5-3'

2016-11-22 Thread Christian Lohmaier

New branch 'libreoffice-5-3' available with the following commits:
commit 8e04cdb5fd59a3f721597db6ac4c8092d80f70cc
Author: Christian Lohmaier 
Date:   Wed Nov 23 01:57:43 2016 +0100

Branch libreoffice-5-3

This is 'libreoffice-5-3' - the stable branch for the 5.3.x releases.
The commit rules are different according to the development phase:

A. 5.3.0 beta phase:

   A. any bug fixes are allowed without review
   B. late features need approval by 3 people with different affiliation

B. 5.3.0 rc phase and later:

   A. fixes need approval by one reviewer
   B. late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
  appropriate branches. Note that we do not plan any merge
  from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I9c6750c95e21889fa1171575e0b473e7f9817534

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-3'

2016-11-22 Thread Christian Lohmaier

New branch 'libreoffice-5-3' available with the following commits:
commit ef8d66e63474e8996e97ee7caabb1a59fa439f03
Author: Christian Lohmaier 
Date:   Wed Nov 23 01:57:43 2016 +0100

Branch libreoffice-5-3

This is 'libreoffice-5-3' - the stable branch for the 5.3.x releases.
The commit rules are different according to the development phase:

A. 5.3.0 beta phase:

   A. any bug fixes are allowed without review
   B. late features need approval by 3 people with different affiliation

B. 5.3.0 rc phase and later:

   A. fixes need approval by one reviewer
   B. late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
  appropriate branches. Note that we do not plan any merge
  from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I120bea6230cdc86f87b720f8a061774996293f42

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-3'

2016-11-22 Thread Christian Lohmaier

New branch 'libreoffice-5-3' available with the following commits:
commit ce0a9ff2303b3295e34f1a972628b6c5b06a242f
Author: Christian Lohmaier 
Date:   Wed Nov 23 01:57:43 2016 +0100

Branch libreoffice-5-3

This is 'libreoffice-5-3' - the stable branch for the 5.3.x releases.
The commit rules are different according to the development phase:

A. 5.3.0 beta phase:

   A. any bug fixes are allowed without review
   B. late features need approval by 3 people with different affiliation

B. 5.3.0 rc phase and later:

   A. fixes need approval by one reviewer
   B. late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
  appropriate branches. Note that we do not plan any merge
  from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I98e19c9a32148fcda72ac4cdbf3d5d046d024d79

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

[Libreoffice-commits] core.git: readlicense_oo/license

2016-11-22 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 3090 ++--
 1 file changed, 1593 insertions(+), 1497 deletions(-)

New commits:
commit 4136757b4e51c4e6f7cb4132c95538a7f831ef2c
Author: Christian Lohmaier 
Date:   Wed Nov 23 01:56:47 2016 +0100

update credits

Change-Id: I8ce476f182ce5004619a8380b9effb135bcf7d55

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 0ab7285..18acfea 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.2.2.2$Linux_X86_64
 
LibreOffice_project/8f96e87c890bf8fa77463cd4b640a2312823f3ad2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.2.3.3$Linux_X86_64
 
LibreOffice_project/d54a8868f08a7b39642414cf2c8ef2f228f780cf2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   607
+   501
501
41197
21645
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 607
+ 501
  41697
- 22250
+ 22144
  0
  0
  false
@@ -69,7 +69,7 @@
false
false
true
-   6058431
+   6141507
false
false
false
@@ -314,23 +314,26 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -349,7 +352,7 @@
   

   
-  
+  

   
   
@@ -395,24 +398,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
@@ -466,38 +466,37 @@
   
   
   
-  
-  
-  
-  
-  
+  
+  
+  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  


   
@@ -779,7 +778,7 @@
 


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1042,7 +1041,7 @@

   
  Credits
-1209 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-10-05 11:32:17.
+1218 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-11-23 01:43:47.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1069,10 +1068,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 20303Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 20534Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 12822Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 12969Joined: 
2000-10-04
   
   
Ivo

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

2016-11-22 Thread Christian Lohmaier

 extras/source/autocorr/lang/ca/DocumentList.xml|   46 +
 extras/source/autocorr/lang/cs/DocumentList.xml|   12 
 extras/source/autocorr/lang/da/DocumentList.xml|   12 
 extras/source/autocorr/lang/en-AU/DocumentList.xml |   12 
 extras/source/autocorr/lang/en-US/DocumentList.xml |   12 
 extras/source/autocorr/lang/es/DocumentList.xml|   12 
 extras/source/autocorr/lang/fr/DocumentList.xml|   12 
 extras/source/autocorr/lang/hr/DocumentList.xml|  698 ++---
 extras/source/autocorr/lang/hu/DocumentList.xml|   12 
 extras/source/autocorr/lang/is/DocumentList.xml|   13 
 extras/source/autocorr/lang/it/DocumentList.xml|   12 
 extras/source/autocorr/lang/lt/DocumentList.xml|  453 +
 extras/source/autocorr/lang/nl/DocumentList.xml|   12 
 extras/source/autocorr/lang/pt-BR/DocumentList.xml |   12 
 extras/source/autocorr/lang/pt-PT/DocumentList.xml |   12 
 extras/source/autocorr/lang/pt/DocumentList.xml|  172 ++---
 extras/source/autocorr/lang/sk/DocumentList.xml|   12 
 extras/source/autocorr/lang/sl/DocumentList.xml|   12 
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |   12 
 19 files changed, 995 insertions(+), 555 deletions(-)

New commits:
commit 7e99596e87fe7b4c68c648aaa98e20d168ee554e
Author: Christian Lohmaier 
Date:   Wed Nov 23 01:43:47 2016 +0100

update emoji autocorrect files from po-files

Change-Id: Iac50196233f1d99eea4f5adcb57b576cbab018b1

diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index d497dcf..5b3f48a 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -357,50 +357,64 @@
   
   
   
+  
+  
   
   
   
   
+  
   
+  
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
@@ -411,11 +425,13 @@
   
   
   
+  
   
   
   
   
   
+  
   
   
   
@@ -483,9 +499,11 @@
   
   
   
+  
   
   
   
+  
   
   
   
@@ -540,6 +558,8 @@
   
   
   
+  
+  
   
   
   
@@ -574,7 +594,7 @@
   
   
   
-  
+  
   
   
   
@@ -624,6 +644,7 @@
   
   
   
+  
   
   
   
@@ -684,7 +705,7 @@
   
   
   
-  
+  
   
   
   
@@ -736,6 +757,7 @@
   
   
   
+  
   
   
   
@@ -750,7 +772,7 @@
   
   
   
-  
+  
   
   
   
@@ -782,6 +804,7 @@
   
   
   
+  
   
   
   
@@ -802,6 +825,7 @@
   
   
   
+  
   
   
   
@@ -830,11 +854,12 @@
   
   
   
+  
   
   
   
   
-  
+  
   
   
   
@@ -842,6 +867,7 @@
   
   
   
+  
   
   
   
@@ -858,6 +884,7 @@
   
   
   
+  
   
   
   
@@ -939,7 +966,9 @@
   
   
   
-  
+  
+  
+  
   
   
   
@@ -1077,6 +1106,7 @@
   
   
   
+  
   
   
   
@@ -1115,7 +1145,7 @@
   
   
   
-  
+  
   
   
   
@@ -1158,11 +1188,13 @@
   
   
   
+  
   
   
   
   
   
+  
   
   
   
@@ -1188,7 +1220,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index e168d0e..06824eb 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -573,46 +573,58 @@
   
   
   
+  
   
+  
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/da/DocumentList.xml 
b/extras/source/autocorr/lang/da/DocumentList.xml
index 63463d8..9ee0658 100644
--- a/extras/source/autocorr/lang/da/DocumentList.xml
+++ b/extras/source/autocorr/lang/da/DocumentList.xml
@@ -624,35 +624,47 @@
   
   
   
+  
+  
   
+  
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/en-AU/DocumentList.xml 
b/extras/source/autocorr/lang/en-AU/DocumentList.xml
index d0590bf..398f6c7 100644
--- a/extras/source/autocorr/lang/en-AU/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-AU/DocumentList.xml
@@ -828,46 +828,58 @@
   
   
   
+  
   
+  
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/en-US/DocumentList.xml 
b/extras/source/autocorr/lang/en-US/DocumentList.xml
index 0cac93d..e1415f0 100644
--- a/extras/source/autocorr/lang/en-US/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-US/DocumentList.xml
@@ -833,46 +833,58 @@
   
   
   
+  
   
+  
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+

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

2016-11-22 Thread Takeshi Abe

 starmath/inc/node.hxx|   13 +++--
 starmath/source/node.cxx |   33 +
 2 files changed, 24 insertions(+), 22 deletions(-)

New commits:
commit 803ad61c80220ab28c3fb14cfae0985f30b8b868
Author: Takeshi Abe 
Date:   Mon Nov 21 16:20:18 2016 +0900

starmath: Prefix members of SmNodeMatrix

Change-Id: I76c7e34878b9d2bc74d2499cf65448f0dd3a17b3
Reviewed-on: https://gerrit.libreoffice.org/31034
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index c0e5de4e..29c9ccb 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -1091,18 +1091,19 @@ public:
  */
 class SmMatrixNode : public SmStructureNode
 {
-sal_uInt16  nNumRows,
-nNumCols;
+sal_uInt16 mnNumRows,
+   mnNumCols;
 
 public:
 explicit SmMatrixNode(const SmToken &rNodeToken)
-:   SmStructureNode(NMATRIX, rNodeToken)
+: SmStructureNode(NMATRIX, rNodeToken)
+, mnNumRows(0)
+, mnNumCols(0)
 {
-nNumRows = nNumCols = 0;
 }
 
-sal_uInt16 GetNumRows() const {return nNumRows;}
-sal_uInt16 GetNumCols() const {return nNumCols;}
+sal_uInt16 GetNumRows() const {return mnNumRows;}
+sal_uInt16 GetNumCols() const {return mnNumCols;}
 void SetRowCol(sal_uInt16 nMatrixRows, sal_uInt16 nMatrixCols);
 
 virtual const SmNode * GetLeftMost() const override;
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 6b7adb4..f650108 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2212,17 +2212,17 @@ sal_Unicode 
SmTextNode::ConvertSymbolToUnicode(sal_Unicode nIn)
 void SmMatrixNode::CreateTextFromNode(OUString &rText)
 {
 rText += "matrix {";
-for (sal_uInt16 i = 0;  i < nNumRows; i++)
+for (sal_uInt16 i = 0;  i < mnNumRows; i++)
 {
-for (sal_uInt16 j = 0;  j < nNumCols; j++)
+for (sal_uInt16 j = 0;  j < mnNumCols; j++)
 {
-SmNode *pNode = GetSubNode(i * nNumCols + j);
+SmNode *pNode = GetSubNode(i * mnNumCols + j);
 if (pNode)
 pNode->CreateTextFromNode(rText);
-if (j != nNumCols-1)
+if (j != mnNumCols-1)
 rText += "# ";
 }
-if (i != nNumRows-1)
+if (i != mnNumRows-1)
 rText += "## ";
 }
 rText = comphelper::string::stripEnd(rText, ' ');
@@ -2237,7 +2237,7 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 
 // initialize array that is to hold the maximum widths of all
 // elements (subnodes) in that column.
-std::vector aColWidth(nNumCols);
+std::vector aColWidth(mnNumCols);
 
 // arrange subnodes and calculate the above arrays contents
 sal_uInt16 nNodes = GetNumSubNodes();
@@ -2247,7 +2247,7 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 if (nullptr != (pNode = GetSubNode(nIdx)))
 {
 pNode->Arrange(rDev, rFormat);
-int  nCol = nIdx % nNumCols;
+int  nCol = nIdx % mnNumCols;
 aColWidth[nCol] = std::max(aColWidth[nCol], 
pNode->GetItalicWidth());
 }
 }
@@ -2261,21 +2261,22 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
   nVerDist = nNormDist * rFormat.GetDistance(DIS_MATRIXROW) / 100L;
 
 // build array that holds the leftmost position for each column
-std::vector aColLeft(nNumCols);
+std::vector aColLeft(mnNumCols);
 long  nX = 0;
-for (j = 0;  j < nNumCols;  j++)
+for (j = 0;  j < mnNumCols;  j++)
 {
 aColLeft[j] = nX;
 nX += aColWidth[j] + nHorDist;
 }
 
 SmRect::operator = (SmRect());
-for (i = 0;  i < nNumRows;  i++)
+for (i = 0;  i < mnNumRows;  i++)
 {
 Point aPos;
 SmRect aLineRect;
-for (j = 0;  j < nNumCols;  j++)
-{   SmNode *pTmpNode = GetSubNode(i * nNumCols + j);
+for (j = 0;  j < mnNumCols;  j++)
+{
+SmNode *pTmpNode = GetSubNode(i * mnNumCols + j);
 assert(pTmpNode);
 
 const SmRect &rNodeRect = pTmpNode->GetRect();
@@ -2318,8 +2319,8 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 Point aDelta(0, // since horizontal alignment is already done
  aPos.Y() - aLineRect.GetTop());
 aLineRect.Move(aDelta);
-for (j = 0;  j < nNumCols;  j++)
-if (nullptr != (pNode = GetSubNode(i * nNumCols + j)))
+for (j = 0;  j < mnNumCols;  j++)
+if (nullptr != (pNode = GetSubNode(i * mnNumCols + j)))
 pNode->Move(aDelta);
 
 ExtendBy(aLineRect, RectCopyMBL::None);
@@ -2329,8 +2330,8 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 
 void SmMatrixNode::SetRowCol(sal_uInt16 nMatrixRows, sal_uInt16 nMatrixCols)
 {
-nNumRows = nMatrixRows;
-nNum

[Libreoffice-commits] core.git: translations

2016-11-22 Thread Christian Lohmaier

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

New commits:
commit f965a629fba10ecba7bad938a0c1c9c3db1e510d
Author: Christian Lohmaier 
Date:   Wed Nov 23 00:54:09 2016 +0100

Updated core
Project: translations  315ce3da5f7a87ae67a77001152867dac0f8d524

update translations for 5.3.0 beta1

and force-fix errors using pocheck

Change-Id: I96587a8a2e13785525cc386b708359317b0f5985

diff --git a/translations b/translations
index 97e932d..315ce3d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 97e932d28eed355e43a1ae32ac960793a6ae5198
+Subproject commit 315ce3da5f7a87ae67a77001152867dac0f8d524
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tip for debugging CppunitTest_sd_tiledrendering failure

2016-11-22 Thread Khaled Hosny

On Tue, Nov 22, 2016 at 10:44:40AM +0100, Miklos Vajna wrote:
> Another option: given that you mention incrementing Y by 1 changes the
> situation, it would be fine to work with the "vertical center" of the
> cursor not the "top" of it when we decide the click position.
> 
> Does this help? It would be no problem to include this change.

I did that in a followup commit and it seems to work as well.

Regards,
Khaled


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

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

2016-11-22 Thread Tor Lillqvist

 svx/source/tbxctrls/PaletteManager.cxx | 1079 -
 1 file changed, 1 insertion(+), 1078 deletions(-)

New commits:
commit 0183432b6a4080f19711a723b9e2301bb738160c
Author: Tor Lillqvist 
Date:   Wed Nov 23 01:29:31 2016 +0200

Revert "tdf#104052: Add LibreColor palette"

VÃ¤Ã¤rin sammutettu.

This reverts commit aa522981e6a0953e157fa13ec5193147653d317b.
This reverts commit 75fb3f79c3ba5e94740cea947527477bba50b358.
This reverts commit 250680f57b74f55071d2431e5941dacffa018be4.

diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 7342b25..1dc3a46 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -35,1080 +35,6 @@
 
 #include "palettes.hxx"
 
-static const struct
-{
-Color mColor;
-const char* mName;
-} aLibreColors[] =
-{
-{ Color(0x1b, 0x1b, 0x1b), "HLC 000 10 00" },
-{ Color(0x30, 0x30, 0x30), "HLC 000 20 00" },
-{ Color(0x47, 0x47, 0x47), "HLC 000 30 00" },
-{ Color(0x5e, 0x5e, 0x5e), "HLC 000 40 00" },
-{ Color(0x77, 0x77, 0x77), "HLC 000 50 00" },
-{ Color(0x91, 0x91, 0x91), "HLC 000 60 00" },
-{ Color(0xab, 0xab, 0xab), "HLC 000 70 00" },
-{ Color(0xc6, 0xc6, 0xc6), "HLC 000 80 00" },
-{ Color(0xe2, 0xe2, 0xe2), "HLC 000 90 00" },
-{ Color(0x3d, 0x2b, 0x2f), "HLC 010 20 10" },
-{ Color(0x4a, 0x24, 0x2d), "HLC 010 20 20" },
-{ Color(0x56, 0x1a, 0x2a), "HLC 010 20 30" },
-{ Color(0x55, 0x42, 0x45), "HLC 010 30 10" },
-{ Color(0x63, 0x3b, 0x43), "HLC 010 30 20" },
-{ Color(0x70, 0x32, 0x40), "HLC 010 30 30" },
-{ Color(0x7c, 0x27, 0x3e), "HLC 010 30 40" },
-{ Color(0x88, 0x13, 0x3d), "HLC 010 30 50" },
-{ Color(0x6d, 0x59, 0x5d), "HLC 010 40 10" },
-{ Color(0x7d, 0x52, 0x5a), "HLC 010 40 20" },
-{ Color(0x8b, 0x4a, 0x57), "HLC 010 40 30" },
-{ Color(0x98, 0x40, 0x55), "HLC 010 40 40" },
-{ Color(0xa5, 0x33, 0x54), "HLC 010 40 50" },
-{ Color(0xb1, 0x1e, 0x51), "HLC 010 40 60" },
-{ Color(0x87, 0x72, 0x76), "HLC 010 50 10" },
-{ Color(0x97, 0x6b, 0x73), "HLC 010 50 20" },
-{ Color(0xa6, 0x63, 0x70), "HLC 010 50 30" },
-{ Color(0xb4, 0x5a, 0x6d), "HLC 010 50 40" },
-{ Color(0xc2, 0x4e, 0x6c), "HLC 010 50 50" },
-{ Color(0xcf, 0x40, 0x69), "HLC 010 50 60" },
-{ Color(0xdb, 0x2d, 0x67), "HLC 010 50 70" },
-{ Color(0xa1, 0x8b, 0x8f), "HLC 010 60 10" },
-{ Color(0xb2, 0x84, 0x8c), "HLC 010 60 20" },
-{ Color(0xc2, 0x7d, 0x89), "HLC 010 60 30" },
-{ Color(0xd1, 0x74, 0x86), "HLC 010 60 40" },
-{ Color(0xe0, 0x69, 0x85), "HLC 010 60 50" },
-{ Color(0xbc, 0xa5, 0xaa), "HLC 010 70 10" },
-{ Color(0xce, 0x9f, 0xa7), "HLC 010 70 20" },
-{ Color(0xdf, 0x97, 0xa3), "HLC 010 70 30" },
-{ Color(0xef, 0x8e, 0xa0), "HLC 010 70 40" },
-{ Color(0xd8, 0xc1, 0xc5), "HLC 010 80 10" },
-{ Color(0xea, 0xba, 0xc2), "HLC 010 80 20" },
-{ Color(0xf4, 0xdc, 0xe1), "HLC 010 90 10" },
-{ Color(0x3e, 0x2b, 0x2c), "HLC 020 20 10" },
-{ Color(0x4a, 0x25, 0x28), "HLC 020 20 20" },
-{ Color(0x56, 0x1c, 0x23), "HLC 020 20 30" },
-{ Color(0x56, 0x42, 0x42), "HLC 020 30 10" },
-{ Color(0x63, 0x3b, 0x3e), "HLC 020 30 20" },
-{ Color(0x70, 0x33, 0x39), "HLC 020 30 30" },
-{ Color(0x7b, 0x29, 0x35), "HLC 020 30 40" },
-{ Color(0x87, 0x17, 0x2f), "HLC 020 30 50" },
-{ Color(0x6e, 0x59, 0x5a), "HLC 020 40 10" },
-{ Color(0x7c, 0x53, 0x55), "HLC 020 40 20" },
-{ Color(0x8b, 0x4b, 0x4f), "HLC 020 40 30" },
-{ Color(0x97, 0x42, 0x4b), "HLC 020 40 40" },
-{ Color(0xa4, 0x36, 0x46), "HLC 020 40 50" },
-{ Color(0xaf, 0x25, 0x42), "HLC 020 40 60" },
-{ Color(0x88, 0x72, 0x72), "HLC 020 50 10" },
-{ Color(0x97, 0x6b, 0x6e), "HLC 020 50 20" },
-{ Color(0xa6, 0x64, 0x67), "HLC 020 50 30" },
-{ Color(0xb4, 0x5b, 0x63), "HLC 020 50 40" },
-{ Color(0xc2, 0x50, 0x5d), "HLC 020 50 50" },
-{ Color(0xce, 0x44, 0x59), "HLC 020 50 60" },
-{ Color(0xd9, 0x33, 0x55), "HLC 020 50 70" },
-{ Color(0xa2, 0x8b, 0x8c), "HLC 020 60 10" },
-{ Color(0xb2, 0x85, 0x87), "HLC 020 60 20" },
-{ Color(0xc2, 0x7d, 0x80), "HLC 020 60 30" },
-{ Color(0xd0, 0x75, 0x7c), "HLC 020 60 40" },
-{ Color(0xdf, 0x6b, 0x76), "HLC 020 60 50" },
-{ Color(0xbd, 0xa5, 0xa6), "HLC 020 70 10" },
-{ Color(0xce, 0x9f, 0xa1), "HLC 020 70 20" },
-{ Color(0xdf, 0x97, 0x9a), "HLC 020 70 30" },
-{ Color(0xd9, 0xc1, 0xc1), "HLC 020 80 10" },
-{ Color(0xea, 0xba, 0xbc), "HLC 020 80 20" },
-{ Color(0xf5, 0xdc, 0xdd), "HLC 020 90 10" },
-{ Color(0x3d, 0x2c, 0x29), "HLC 030 20 10" },
-{ Color(0x4a, 0x26, 0x23), "HLC 030 20 20" },
-{ Color(0x55, 0x1e, 0x1c), "HLC 030 20 30" },
-{ Color(0x55, 0x42, 0x3f), "HLC 030 30 10" },
-{ Color(0x63, 0x3c, 0x38), "HLC 030 30 20" },
-{ Color(0x6f, 0x35, 0x31), "HLC 030 30 30" },
-{ Color(0x79, 0x2c, 0

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - 58 commits - loleaflet/dist loleaflet/main.js loleaflet/Makefile loleaflet/po loleaflet/README loleaflet/reference.ht

2016-11-22 Thread Andras Timar

 loleaflet/Makefile|3 
 loleaflet/README  |7 
 loleaflet/dist/spreadsheet.css|   10 
 loleaflet/dist/toolbar/toolbar.js |2 
 loleaflet/main.js |2 
 loleaflet/po/templates/loleaflet-ui.pot   | 1812 --
 loleaflet/reference.html  |   21 
 loleaflet/src/control/Control.CharacterMap.js |  474 --
 loleaflet/src/control/Control.PartsPreview.js |5 
 loleaflet/src/control/Control.Tabs.js |   22 
 loleaflet/src/control/Parts.js|9 
 loleaflet/src/core/Socket.js  |   61 
 loleaflet/src/layer/tile/ImpressTileLayer.js  |1 
 loleaflet/src/layer/tile/TileLayer.js |   12 
 loleaflet/src/layer/tile/WriterTileLayer.js   |   33 
 loleaflet/src/map/Map.js  |2 
 loolwsd/.clang-tidy   |2 
 loolwsd/Admin.cpp |3 
 loolwsd/ClientSession.hpp |1 
 loolwsd/Common.hpp|2 
 loolwsd/DocumentBroker.cpp|  100 +
 loolwsd/DocumentBroker.hpp|7 
 loolwsd/IoUtil.cpp|5 
 loolwsd/LOOLForKit.cpp|   58 
 loolwsd/LOOLKit.cpp   |9 
 loolwsd/LOOLWSD.cpp   |   38 
 loolwsd/LOOLWebSocket.hpp |   28 
 loolwsd/MessageQueue.cpp  |   37 
 loolwsd/MessageQueue.hpp  |4 
 loolwsd/README.vars   |7 
 loolwsd/Storage.cpp   |4 
 loolwsd/TileDesc.hpp  |   18 
 loolwsd/Unit.cpp  |3 
 loolwsd/Util.hpp  |   22 
 loolwsd/common/SigUtil.cpp|   40 
 loolwsd/common/SigUtil.hpp|   24 
 loolwsd/discovery.xml |4 
 loolwsd/protocol.txt  |   13 
 loolwsd/test/Makefile.am  |5 
 loolwsd/test/TileCacheTests.cpp   |4 
 loolwsd/test/UnitRequests.cpp |   99 +
 loolwsd/test/helpers.hpp  |   21 
 loolwsd/test/httpwstest.cpp   |8 
 loolwsd/test/run_unit.sh.in   |4 
 rename.patch  |  586 +++-
 rename.sh |5 
 46 files changed, 2911 insertions(+), 726 deletions(-)

New commits:
commit b8e7bcbeddfc15bb881ae89e102be586bd2fc70c
Author: Andras Timar 
Date:   Tue Nov 22 23:14:49 2016 +0100

loleaflet: updated pot file

(cherry picked from commit a01ec99e90a1b15ad495cc0f5cf809015283f558)

diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index dfc9d49..f81c6c4 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-07 18:51+0100\n"
+"POT-Creation-Date: 2016-11-22 23:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -81,9 +81,9 @@ msgstr ""
 msgid "Graphs"
 msgstr ""
 
-#: admin.strings.js:21 dist/toolbar/toolbar.js:339
-#: src/control/Control.Menubar.js:10 src/control/Control.Menubar.js:152
-#: src/control/Control.Menubar.js:198
+#: admin.strings.js:21 dist/toolbar/toolbar.js:344
+#: src/control/Control.Menubar.js:11 src/control/Control.Menubar.js:163
+#: src/control/Control.Menubar.js:221
 msgid "Save"
 msgstr ""
 
@@ -237,412 +237,1491 @@ msgstr ""
 msgid "Are you sure you want to delete this page?"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:330
+#: dist/toolbar/toolbar.js:335
 msgid "Textwrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:331
-msgid "No wrap"
+#: dist/toolbar/toolbar.js:336
+msgid "No wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:337
+msgid "Page wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:338
+msgid "Wrap anchor only"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:339
+msgid "Ideal wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:340
+msgid "Left wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:341
+msgid "Right wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:342
+msgid "Wrap through"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:346 src/control/Control.Menubar.js:22
+#: src/control/Control.Menubar.js:173 src/control/Control.Menubar.js:231
+msgid "Undo"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:347 src/control/Control.Menubar.js:23
+#: src/control/Control.Menubar.js:174 src/control/Control.Menubar.js:232
+msgid "Redo"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:348
+msgid "Document repair"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:354 src/control/Control.Menubar.js:60
+msgid "Bold"
+msgstr ""
+
+#

[Libreoffice-commits] translations.git: source/sl

2016-11-22 Thread Andras Timar

 source/sl/extras/source/autocorr/emoji.po |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 97e932d28eed355e43a1ae32ac960793a6ae5198
Author: Andras Timar 
Date:   Tue Nov 22 23:47:37 2016 +0100

Updated Slovenian translation

Change-Id: Idb2462f4386b5d9d4059fee9c33737b99d300242

diff --git a/source/sl/extras/source/autocorr/emoji.po 
b/source/sl/extras/source/autocorr/emoji.po
index 76712c1..4c1341c 100644
--- a/source/sl/extras/source/autocorr/emoji.po
+++ b/source/sl/extras/source/autocorr/emoji.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: LibreOffice 5.2\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2016-10-07 21:52+0200\n"
-"PO-Revision-Date: 2016-09-21 23:22+0200\n"
+"PO-Revision-Date: 2016-11-22 22:54+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -7881,7 +7881,7 @@ msgctxt ""
 "CLOCK_FACE_ONE_OCLOCK\n"
 "LngText.text"
 msgid "1 h"
-msgstr "1:00"
+msgstr "1.00"
 
 #. ð (U+1F551), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7890,7 +7890,7 @@ msgctxt ""
 "CLOCK_FACE_TWO_OCLOCK\n"
 "LngText.text"
 msgid "2 h"
-msgstr "2:00"
+msgstr "2.00"
 
 #. ð (U+1F552), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7899,7 +7899,7 @@ msgctxt ""
 "CLOCK_FACE_THREE_OCLOCK\n"
 "LngText.text"
 msgid "3 h"
-msgstr "3:00"
+msgstr "3.00"
 
 #. ð (U+1F553), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7908,7 +7908,7 @@ msgctxt ""
 "CLOCK_FACE_FOUR_OCLOCK\n"
 "LngText.text"
 msgid "4 h"
-msgstr "4:00"
+msgstr "4.00"
 
 #. ð (U+1F554), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7917,7 +7917,7 @@ msgctxt ""
 "CLOCK_FACE_FIVE_OCLOCK\n"
 "LngText.text"
 msgid "5 h"
-msgstr "5:00"
+msgstr "5.00"
 
 #. ð (U+1F555), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7926,7 +7926,7 @@ msgctxt ""
 "CLOCK_FACE_SIX_OCLOCK\n"
 "LngText.text"
 msgid "6 h"
-msgstr "6:00"
+msgstr "6.00"
 
 #. ð (U+1F556), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7935,7 +7935,7 @@ msgctxt ""
 "CLOCK_FACE_SEVEN_OCLOCK\n"
 "LngText.text"
 msgid "7 h"
-msgstr "7:00"
+msgstr "7.00"
 
 #. ð (U+1F557), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7944,7 +7944,7 @@ msgctxt ""
 "CLOCK_FACE_EIGHT_OCLOCK\n"
 "LngText.text"
 msgid "8 h"
-msgstr "8:00"
+msgstr "8.00"
 
 #. ð (U+1F558), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7953,7 +7953,7 @@ msgctxt ""
 "CLOCK_FACE_NINE_OCLOCK\n"
 "LngText.text"
 msgid "9 h"
-msgstr "9:00"
+msgstr "9.00"
 
 #. ð (U+1F559), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7962,7 +7962,7 @@ msgctxt ""
 "CLOCK_FACE_TEN_OCLOCK\n"
 "LngText.text"
 msgid "10 h"
-msgstr "10:00"
+msgstr "10.00"
 
 #. ð (U+1F55A), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7971,7 +7971,7 @@ msgctxt ""
 "CLOCK_FACE_ELEVEN_OCLOCK\n"
 "LngText.text"
 msgid "11 h"
-msgstr "11:00"
+msgstr "11.00"
 
 #. ð (U+1F55B), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7980,7 +7980,7 @@ msgctxt ""
 "CLOCK_FACE_TWELVE_OCLOCK\n"
 "LngText.text"
 msgid "12 h"
-msgstr "12:00"
+msgstr "12.00"
 
 #. ð (U+1F55C), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

2016-11-22 Thread Andras Timar

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

New commits:
commit 3d43a7971a4aa7e17a690b0fc2de3fa0571fc082
Author: Andras Timar 
Date:   Tue Nov 22 23:47:37 2016 +0100

Updated core
Project: translations  97e932d28eed355e43a1ae32ac960793a6ae5198

Updated Slovenian translation

Change-Id: Idb2462f4386b5d9d4059fee9c33737b99d300242

diff --git a/translations b/translations
index f883966..97e932d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f88396624a2f348f845818564210947f3e738e55
+Subproject commit 97e932d28eed355e43a1ae32ac960793a6ae5198
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - translations

2016-11-22 Thread Andras Timar

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

New commits:
commit a8e46d87ced8a057568718b42185cdf2366c66de
Author: Andras Timar 
Date:   Tue Nov 22 23:46:03 2016 +0100

Updated core
Project: translations  02803ddf83a003b347bdbda458c7dca2bdc28de2

Updated Slovenian translation

Change-Id: I0c76b852a5ac8feb3dcef52ff223efccb12c2a5a

diff --git a/translations b/translations
index 564e055..02803dd 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 564e0552d0a99c02a1505509390a41edc9d0f510
+Subproject commit 02803ddf83a003b347bdbda458c7dca2bdc28de2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-2' - source/sl

2016-11-22 Thread Andras Timar

 source/sl/cui/uiconfig/ui.po   |   97 +---
 source/sl/extras/source/autocorr/emoji.po  |   54 +--
 source/sl/helpcontent2/source/text/scalc/01.po |   20 ++--
 source/sl/helpcontent2/source/text/sdraw/04.po |6 -
 source/sl/helpcontent2/source/text/swriter.po  |6 -
 source/sl/sc/uiconfig/scalc/ui.po  |  118 +
 source/sl/sd/source/core.po|   22 
 source/sl/sfx2/source/view.po  |   15 ++-
 8 files changed, 139 insertions(+), 199 deletions(-)

New commits:
commit 02803ddf83a003b347bdbda458c7dca2bdc28de2
Author: Andras Timar 
Date:   Tue Nov 22 23:46:03 2016 +0100

Updated Slovenian translation

Change-Id: I0c76b852a5ac8feb3dcef52ff223efccb12c2a5a

diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index 8a00c9e..850ee69 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.2\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-06-12 16:51+0200\n"
-"PO-Revision-Date: 2016-06-05 18:34+0200\n"
+"POT-Creation-Date: 2016-11-21 12:30+0100\n"
+"PO-Revision-Date: 2016-07-20 23:12+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "MIME-Version: 1.0\n"
@@ -812,6 +812,42 @@ msgstr "Zapolni"
 #: areatabpage.ui
 msgctxt ""
 "areatabpage.ui\n"
+"TSB_STEPCOUNT\n"
+"label\n"
+"string.text"
+msgid "_Automatic"
+msgstr "S_amodejno"
+
+#: areatabpage.ui
+msgctxt ""
+"areatabpage.ui\n"
+"label2\n"
+"label\n"
+"string.text"
+msgid "Increments"
+msgstr "Koraki"
+
+#: areatabpage.ui
+msgctxt ""
+"areatabpage.ui\n"
+"CB_HATCHBCKGRD\n"
+"label\n"
+"string.text"
+msgid "_Background color"
+msgstr "Barva _ozadja"
+
+#: areatabpage.ui
+msgctxt ""
+"areatabpage.ui\n"
+"label3\n"
+"label\n"
+"string.text"
+msgid "Colors"
+msgstr "Barve"
+
+#: areatabpage.ui
+msgctxt ""
+"areatabpage.ui\n"
 "TSB_ORIGINAL\n"
 "label\n"
 "string.text"
@@ -5564,6 +5600,15 @@ msgstr "Datoteka"
 #: gradientpage.ui
 msgctxt ""
 "gradientpage.ui\n"
+"typeft\n"
+"label\n"
+"string.text"
+msgid "_Type:"
+msgstr "_Vrsta:"
+
+#: gradientpage.ui
+msgctxt ""
+"gradientpage.ui\n"
 "gradienttypelb\n"
 "0\n"
 "stringlist.text"
@@ -5618,29 +5663,20 @@ msgstr "Kvadratno"
 #: gradientpage.ui
 msgctxt ""
 "gradientpage.ui\n"
-"typeft\n"
-"label\n"
-"string.text"
-msgid "_Type:"
-msgstr "_Vrsta:"
-
-#: gradientpage.ui
-msgctxt ""
-"gradientpage.ui\n"
-"incrementft\n"
+"centerxft\n"
 "label\n"
 "string.text"
-msgid "Increment:"
-msgstr "Prirastek:"
+msgid "Center _X:"
+msgstr "Sredina _X:"
 
 #: gradientpage.ui
 msgctxt ""
 "gradientpage.ui\n"
-"centerft\n"
+"centeryft\n"
 "label\n"
 "string.text"
-msgid "Center ( X / Y ) :"
-msgstr "Sredina (X/Y):"
+msgid "Center _Y:"
+msgstr "Sredina _Y:"
 
 #: gradientpage.ui
 msgctxt ""
@@ -6104,6 +6140,15 @@ msgstr "Vrsta _Ärte:"
 #: hatchpage.ui
 msgctxt ""
 "hatchpage.ui\n"
+"linecolorft\n"
+"label\n"
+"string.text"
+msgid "Line _color:"
+msgstr "_Barva Ärte:"
+
+#: hatchpage.ui
+msgctxt ""
+"hatchpage.ui\n"
 "linetypelb\n"
 "0\n"
 "stringlist.text"
@@ -6131,24 +6176,6 @@ msgstr "Trojno"
 #: hatchpage.ui
 msgctxt ""
 "hatchpage.ui\n"
-"linecolorft\n"
-"label\n"
-"string.text"
-msgid "Line _color:"
-msgstr "_Barva Ärte:"
-
-#: hatchpage.ui
-msgctxt ""
-"hatchpage.ui\n"
-"backgroundcolorft\n"
-"label\n"
-"string.text"
-msgid "Background color:"
-msgstr "Barva ozadja:"
-
-#: hatchpage.ui
-msgctxt ""
-"hatchpage.ui\n"
 "previewctl-atkobject\n"
 "AtkObject::accessible-name\n"
 "string.text"
diff --git a/source/sl/extras/source/autocorr/emoji.po 
b/source/sl/extras/source/autocorr/emoji.po
index 569f62c0..b13f35e 100644
--- a/source/sl/extras/source/autocorr/emoji.po
+++ b/source/sl/extras/source/autocorr/emoji.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.2\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-04-09 17:50+0200\n"
-"PO-Revision-Date: 2016-04-09 13:01+0200\n"
+"POT-Creation-Date: 2016-11-21 12:30+0100\n"
+"PO-Revision-Date: 2016-11-22 22:26+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -7880,8 +7880,8 @@ msgctxt ""
 "emoji.ulf\n"
 "CLOCK_FACE_ONE_OCLOCK\n"
 "LngText.text"
-msgid "1"
-msgstr "1"
+msgid "1 h"
+msgstr "1.00"
 
 #. ð (U+1F551), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -7889,8 +7889,8 @@ msgctxt ""
 "emoji.ulf\n"
 "CLOCK_FACE

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

2016-11-22 Thread Tor Lillqvist

 svx/source/tbxctrls/PaletteManager.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit aa522981e6a0953e157fa13ec5193147653d317b
Author: Tor Lillqvist 
Date:   Wed Nov 23 00:21:37 2016 +0200

Clear the color set before setting it up

Change-Id: I4c4e30be172e8fcb2b6d966f06540b9b1b62b9ad

diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index d08a2f3..7342b25 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -1096,6 +1096,7 @@ public:
 
 virtual void LoadColorSet( SvxColorValueSet& rColorSet ) override
 {
+rColorSet.Clear();
 for (size_t i = 0; i < SAL_N_ELEMENTS(aLibreColors); i++)
 {
 rColorSet.InsertItem(i, aLibreColors[i].mColor, 
OUString::createFromAscii(aLibreColors[i].mName));
commit 75fb3f79c3ba5e94740cea947527477bba50b358
Author: Tor Lillqvist 
Date:   Wed Nov 23 00:20:37 2016 +0200

Avoid OUString construction at library load time

Change-Id: Ie56cea732ade971aa276411e7552d4eefe47621a

diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 27ef209..d08a2f3 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -35,7 +35,11 @@
 
 #include "palettes.hxx"
 
-static NamedColor aLibreColors[] =
+static const struct
+{
+Color mColor;
+const char* mName;
+} aLibreColors[] =
 {
 { Color(0x1b, 0x1b, 0x1b), "HLC 000 10 00" },
 { Color(0x30, 0x30, 0x30), "HLC 000 20 00" },
@@ -1094,7 +1098,7 @@ public:
 {
 for (size_t i = 0; i < SAL_N_ELEMENTS(aLibreColors); i++)
 {
-rColorSet.InsertItem(i, aLibreColors[i].first, 
aLibreColors[i].second);
+rColorSet.InsertItem(i, aLibreColors[i].mColor, 
OUString::createFromAscii(aLibreColors[i].mName));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: bo/bo.aff bo/bo.dic bo/CHANGELOG.md bo/description.xml bo/dictionaries.xcu bo/META-INF bo/README.md Dictionary_bo.mk Module_dictionaries.mk

2016-11-22 Thread Aron Budea

 Dictionary_bo.mk |   19 ++
 Module_dictionaries.mk   |1 
 bo/CHANGELOG.md  |   28 +++
 bo/META-INF/manifest.xml |6 
 bo/README.md |   41 +
 bo/bo.aff|   73 +
 bo/bo.dic|  373 +++
 bo/description.xml   |   16 ++
 bo/dictionaries.xcu  |   18 ++
 9 files changed, 575 insertions(+)

New commits:
commit f023ac778c97881a53035f951fca95cee759888e
Author: Aron Budea 
Date:   Thu Nov 17 04:20:51 2016 +0100

tdf#103922: add Tibetan syllable spellchecker

Change-Id: Idd42597c95fac98023e3a6b671ef73f8ead7fabc
From: https://github.com/eroux/hunspell-bo
Reviewed-on: https://gerrit.libreoffice.org/30920
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/Dictionary_bo.mk b/Dictionary_bo.mk
new file mode 100644
index 000..f30b087
--- /dev/null
+++ b/Dictionary_bo.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Dictionary_Dictionary,dict-bo,dictionaries/bo))
+
+$(eval $(call gb_Dictionary_add_root_files,dict-bo,\
+   dictionaries/bo/bo.aff \
+   dictionaries/bo/bo.dic \
+   dictionaries/bo/CHANGELOG.md \
+   dictionaries/bo/README.md \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Module_dictionaries.mk b/Module_dictionaries.mk
index 338e3f2..c70f64f 100644
--- a/Module_dictionaries.mk
+++ b/Module_dictionaries.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_l10n_targets,dictionaries,\
Dictionary_be \
Dictionary_bg \
Dictionary_bn \
+   Dictionary_bo \
Dictionary_br \
Dictionary_bs \
Dictionary_ca \
diff --git a/bo/CHANGELOG.md b/bo/CHANGELOG.md
new file mode 100644
index 000..ef2e6f7
--- /dev/null
+++ b/bo/CHANGELOG.md
@@ -0,0 +1,28 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+As of v0.3.0 this project adheres to [Semantic 
Versioning](http://semver.org/). It follows [some 
conventions](http://keepachangelog.com/).
+
+## [0.3.0] - 2016-08-31
+### Fixed
+- à½§à¾¤ -> à½§à¾¥
+
+### Added
+- more wasurs and à½ à½´ suffix possibilities
+- rare affixed particle combination à½ à½²à½ à½¼
+
+### Changed
+- treat à½à¾², à½à¾², à½¦à¾£à¾² and à½¦à¾¨à¾² as exceptions and list their 
possibilities
+
+### Removed
+- remove erroneous à½à½à¾³, à½à½à¾² and à½à½à¾²
+
+## [0.2.0] - 2015-08-15
+### Changed
+- contains all possible "legal" Classical Tibetan syllables (coming from 
research in grammar books), not limitted to a dictionnary, see 
[tibetan-spellchecker](https://github.com/eroux/tibetan-spellchecker)
+
+### Added
+- replacement proposals for archaic forms
+- main proper name syllables (not including Sanskrit names)
+
+## [0.1.0] - 2013-06-15
+- initial release, contains syllables from the 
à½à½¼à½à¼à½¢à¾à¾±à¼à½à½²à½à¼à½à½à½¼à½à¼à½à½ºà½à¼à½à½¼à¼.
diff --git a/bo/META-INF/manifest.xml b/bo/META-INF/manifest.xml
new file mode 100644
index 000..0383ca4
--- /dev/null
+++ b/bo/META-INF/manifest.xml
@@ -0,0 +1,6 @@
+
+
+http://openoffice.org/2001/manifest";>
+
+
+
diff --git a/bo/README.md b/bo/README.md
new file mode 100644
index 000..5dc8ccb
--- /dev/null
+++ b/bo/README.md
@@ -0,0 +1,41 @@
+# Classical Tibetan syllable spellchecker for Hunspell
+
+You can find here the necessary files to use spell checking for Classical 
Tibetan at syllable level (not composed words) in 
[Hunspell](http://hunspell.sourceforge.net/) (used in [many 
applications](https://en.wikipedia.org/wiki/Hunspell#Uses)).
+
+Note that checking compound words for Tibetan is not possible with hunspell 
alone due to the absence of separation between words.
+
+## Using
+
+ Global installation
+
+Under Linux or OSX, you can install the spellchecker globally and benefit from 
it in most applications.
+
+- under Linux, copy `bo.dic` and `bo.aff` to `/usr/share/hunspell`, or use the 
`hunspell-bo` package if available in your distribution (under 
[Debian](https://packages.debian.org/search?keywords=hunspell-bo) for example).
+- Under OSX, copy `bo.dic` and `bo.aff` to `/Library/Spelling` and restart 
your machine.
+
+ Application-specific installation
+
+- for Firefox, [an 
extension](https://addons.mozilla.org/fr/firefox/addon/tibetan-spellchecker/) 
is released
+- for LibreOffice/OpenOffice see [this 
extension](http://extensions.openoffice.org/en/project/tibetan-syllable-spell-checker)
+- for Adobe products (>= CS5.5), see the instructions on [this 
page](http://blog.napsys.com/2012/11/adding-hyphenation-and-spelling.html)
+- for Chrome see [this feature 
request](https://bugs.chromium.org/p/chromium/issues/detail?id=66285

[Libreoffice-commits] core.git: dictionaries

2016-11-22 Thread Aron Budea

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

New commits:
commit 0155d33972159eae54e7f48faca47a3feac29c99
Author: Aron Budea 
Date:   Thu Nov 17 04:20:51 2016 +0100

Updated core
Project: dictionaries  f023ac778c97881a53035f951fca95cee759888e

tdf#103922: add Tibetan syllable spellchecker

Change-Id: Idd42597c95fac98023e3a6b671ef73f8ead7fabc
From: https://github.com/eroux/hunspell-bo
Reviewed-on: https://gerrit.libreoffice.org/30920
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index 3470ef8..f023ac7 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 3470ef8c07e59551eb3bbe3c5aa4e7a8f98b124d
+Subproject commit f023ac778c97881a53035f951fca95cee759888e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/Makefile loleaflet/po

2016-11-22 Thread Andras Timar

 loleaflet/Makefile  |1 
 loleaflet/po/templates/loleaflet-ui.pot | 1812 +---
 2 files changed, 1452 insertions(+), 361 deletions(-)

New commits:
commit a01ec99e90a1b15ad495cc0f5cf809015283f558
Author: Andras Timar 
Date:   Tue Nov 22 23:14:49 2016 +0100

loleaflet: updated pot file

diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index dfc9d49..f81c6c4 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-07 18:51+0100\n"
+"POT-Creation-Date: 2016-11-22 23:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -81,9 +81,9 @@ msgstr ""
 msgid "Graphs"
 msgstr ""
 
-#: admin.strings.js:21 dist/toolbar/toolbar.js:339
-#: src/control/Control.Menubar.js:10 src/control/Control.Menubar.js:152
-#: src/control/Control.Menubar.js:198
+#: admin.strings.js:21 dist/toolbar/toolbar.js:344
+#: src/control/Control.Menubar.js:11 src/control/Control.Menubar.js:163
+#: src/control/Control.Menubar.js:221
 msgid "Save"
 msgstr ""
 
@@ -237,412 +237,1491 @@ msgstr ""
 msgid "Are you sure you want to delete this page?"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:330
+#: dist/toolbar/toolbar.js:335
 msgid "Textwrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:331
-msgid "No wrap"
+#: dist/toolbar/toolbar.js:336
+msgid "No wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:337
+msgid "Page wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:338
+msgid "Wrap anchor only"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:339
+msgid "Ideal wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:340
+msgid "Left wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:341
+msgid "Right wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:342
+msgid "Wrap through"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:346 src/control/Control.Menubar.js:22
+#: src/control/Control.Menubar.js:173 src/control/Control.Menubar.js:231
+msgid "Undo"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:347 src/control/Control.Menubar.js:23
+#: src/control/Control.Menubar.js:174 src/control/Control.Menubar.js:232
+msgid "Redo"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:348
+msgid "Document repair"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:354 src/control/Control.Menubar.js:60
+msgid "Bold"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:355 src/control/Control.Menubar.js:61
+msgid "Italic"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:356 src/control/Control.Menubar.js:62
+msgid "Underline"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:357
+msgid "Strikeout"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:359
+msgid "Insert Footnote"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:362
+msgid "Font color"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:364
+msgid "Highlighting"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:366
+msgid "Align left"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:367
+msgid "Center horizontally"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:368
+msgid "Align right"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:369 src/control/Control.Menubar.js:101
+msgid "Justified"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:371 src/control/Control.Menubar.js:107
+msgid "Bullets on/off"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:372 src/control/Control.Menubar.js:108
+msgid "Numbering on/off"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:374 src/control/Control.Menubar.js:95
+msgid "Increase indent"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:375 src/control/Control.Menubar.js:96
+msgid "Decrease indent"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:378
+msgid "Insert table"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:379
+msgid "Insert comment"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:380
+msgid "Insert graphic"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:381
+msgid "Special Character"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:383
+msgid "More"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:384
+msgid "Close document"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:414 dist/toolbar/toolbar.js:795
+msgid "Sum"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:415
+msgid "Function"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:416 src/control/Control.CharacterMap.js:389
+msgid "Cancel"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:417
+msgid "Accept"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:428
+msgid "First sheet"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:429
+msgid "Previous sheet"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:430
+msgid "Next sheet"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:431
+msgid "Last sheet"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:441 src/control/Control.Menubar.js:211
+msgid "Fullscreen presentation"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:443
+msgid "Insert slide"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:444 src/control/Control.Menubar.js:208
+msgid "Duplicate slide"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:445 src/control/Control.Menubar.js:209
+msgid "D

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

2016-11-22 Thread jan Iversen

Tag 'cp-5.1-13' created by Andras Timar  at 
2016-11-22 21:39 +

cp-5.1-13

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

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

2016-11-22 Thread Henry Castro

Tag 'cp-5.1-13' created by Andras Timar  at 
2016-11-22 21:39 +

cp-5.1-13

Changes since cp-5.1-12-15:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Miklos Vajna

Tag 'cp-5.1-13' created by Andras Timar  at 
2016-11-22 21:39 +

cp-5.1-13

Changes since libreoffice-5-1-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Andras Timar

Tag 'cp-5.1-13' created by Andras Timar  at 
2016-11-22 21:39 +

cp-5.1-13

Changes since cp-5.1-9:
Andras Timar (1):
  Update pt_PT dictionary to version 16.10.1.2

---
 pt_PT/README_th_pt_PT_v2.txt |  123 
 pt_PT/description.xml|2 
 pt_PT/pt_PT.dic  |   19 
 pt_PT/th_pt_PT_v2.dat|107769 
---
 4 files changed, 91971 insertions(+), 15942 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Tor Lillqvist

 svx/source/tbxctrls/PaletteManager.cxx | 1074 -
 1 file changed, 1073 insertions(+), 1 deletion(-)

New commits:
commit 250680f57b74f55071d2431e5941dacffa018be4
Author: Tor Lillqvist 
Date:   Tue Nov 22 22:21:28 2016 +0200

tdf#104052: Add LibreColor palette

Based on artwork by Christoph Schaefer, dtp studio oldenburg.

Instead of the suggested change which added an incompatibly licensed
palette file, add a built-in palette (defined in source code) with the
same named colours.

Change-Id: I3b97e803c0c7430d2ecde422bb5e6b665731f16a

diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 1dc3a46..27ef209 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -35,6 +35,1075 @@
 
 #include "palettes.hxx"
 
+static NamedColor aLibreColors[] =
+{
+{ Color(0x1b, 0x1b, 0x1b), "HLC 000 10 00" },
+{ Color(0x30, 0x30, 0x30), "HLC 000 20 00" },
+{ Color(0x47, 0x47, 0x47), "HLC 000 30 00" },
+{ Color(0x5e, 0x5e, 0x5e), "HLC 000 40 00" },
+{ Color(0x77, 0x77, 0x77), "HLC 000 50 00" },
+{ Color(0x91, 0x91, 0x91), "HLC 000 60 00" },
+{ Color(0xab, 0xab, 0xab), "HLC 000 70 00" },
+{ Color(0xc6, 0xc6, 0xc6), "HLC 000 80 00" },
+{ Color(0xe2, 0xe2, 0xe2), "HLC 000 90 00" },
+{ Color(0x3d, 0x2b, 0x2f), "HLC 010 20 10" },
+{ Color(0x4a, 0x24, 0x2d), "HLC 010 20 20" },
+{ Color(0x56, 0x1a, 0x2a), "HLC 010 20 30" },
+{ Color(0x55, 0x42, 0x45), "HLC 010 30 10" },
+{ Color(0x63, 0x3b, 0x43), "HLC 010 30 20" },
+{ Color(0x70, 0x32, 0x40), "HLC 010 30 30" },
+{ Color(0x7c, 0x27, 0x3e), "HLC 010 30 40" },
+{ Color(0x88, 0x13, 0x3d), "HLC 010 30 50" },
+{ Color(0x6d, 0x59, 0x5d), "HLC 010 40 10" },
+{ Color(0x7d, 0x52, 0x5a), "HLC 010 40 20" },
+{ Color(0x8b, 0x4a, 0x57), "HLC 010 40 30" },
+{ Color(0x98, 0x40, 0x55), "HLC 010 40 40" },
+{ Color(0xa5, 0x33, 0x54), "HLC 010 40 50" },
+{ Color(0xb1, 0x1e, 0x51), "HLC 010 40 60" },
+{ Color(0x87, 0x72, 0x76), "HLC 010 50 10" },
+{ Color(0x97, 0x6b, 0x73), "HLC 010 50 20" },
+{ Color(0xa6, 0x63, 0x70), "HLC 010 50 30" },
+{ Color(0xb4, 0x5a, 0x6d), "HLC 010 50 40" },
+{ Color(0xc2, 0x4e, 0x6c), "HLC 010 50 50" },
+{ Color(0xcf, 0x40, 0x69), "HLC 010 50 60" },
+{ Color(0xdb, 0x2d, 0x67), "HLC 010 50 70" },
+{ Color(0xa1, 0x8b, 0x8f), "HLC 010 60 10" },
+{ Color(0xb2, 0x84, 0x8c), "HLC 010 60 20" },
+{ Color(0xc2, 0x7d, 0x89), "HLC 010 60 30" },
+{ Color(0xd1, 0x74, 0x86), "HLC 010 60 40" },
+{ Color(0xe0, 0x69, 0x85), "HLC 010 60 50" },
+{ Color(0xbc, 0xa5, 0xaa), "HLC 010 70 10" },
+{ Color(0xce, 0x9f, 0xa7), "HLC 010 70 20" },
+{ Color(0xdf, 0x97, 0xa3), "HLC 010 70 30" },
+{ Color(0xef, 0x8e, 0xa0), "HLC 010 70 40" },
+{ Color(0xd8, 0xc1, 0xc5), "HLC 010 80 10" },
+{ Color(0xea, 0xba, 0xc2), "HLC 010 80 20" },
+{ Color(0xf4, 0xdc, 0xe1), "HLC 010 90 10" },
+{ Color(0x3e, 0x2b, 0x2c), "HLC 020 20 10" },
+{ Color(0x4a, 0x25, 0x28), "HLC 020 20 20" },
+{ Color(0x56, 0x1c, 0x23), "HLC 020 20 30" },
+{ Color(0x56, 0x42, 0x42), "HLC 020 30 10" },
+{ Color(0x63, 0x3b, 0x3e), "HLC 020 30 20" },
+{ Color(0x70, 0x33, 0x39), "HLC 020 30 30" },
+{ Color(0x7b, 0x29, 0x35), "HLC 020 30 40" },
+{ Color(0x87, 0x17, 0x2f), "HLC 020 30 50" },
+{ Color(0x6e, 0x59, 0x5a), "HLC 020 40 10" },
+{ Color(0x7c, 0x53, 0x55), "HLC 020 40 20" },
+{ Color(0x8b, 0x4b, 0x4f), "HLC 020 40 30" },
+{ Color(0x97, 0x42, 0x4b), "HLC 020 40 40" },
+{ Color(0xa4, 0x36, 0x46), "HLC 020 40 50" },
+{ Color(0xaf, 0x25, 0x42), "HLC 020 40 60" },
+{ Color(0x88, 0x72, 0x72), "HLC 020 50 10" },
+{ Color(0x97, 0x6b, 0x6e), "HLC 020 50 20" },
+{ Color(0xa6, 0x64, 0x67), "HLC 020 50 30" },
+{ Color(0xb4, 0x5b, 0x63), "HLC 020 50 40" },
+{ Color(0xc2, 0x50, 0x5d), "HLC 020 50 50" },
+{ Color(0xce, 0x44, 0x59), "HLC 020 50 60" },
+{ Color(0xd9, 0x33, 0x55), "HLC 020 50 70" },
+{ Color(0xa2, 0x8b, 0x8c), "HLC 020 60 10" },
+{ Color(0xb2, 0x85, 0x87), "HLC 020 60 20" },
+{ Color(0xc2, 0x7d, 0x80), "HLC 020 60 30" },
+{ Color(0xd0, 0x75, 0x7c), "HLC 020 60 40" },
+{ Color(0xdf, 0x6b, 0x76), "HLC 020 60 50" },
+{ Color(0xbd, 0xa5, 0xa6), "HLC 020 70 10" },
+{ Color(0xce, 0x9f, 0xa1), "HLC 020 70 20" },
+{ Color(0xdf, 0x97, 0x9a), "HLC 020 70 30" },
+{ Color(0xd9, 0xc1, 0xc1), "HLC 020 80 10" },
+{ Color(0xea, 0xba, 0xbc), "HLC 020 80 20" },
+{ Color(0xf5, 0xdc, 0xdd), "HLC 020 90 10" },
+{ Color(0x3d, 0x2c, 0x29), "HLC 030 20 10" },
+{ Color(0x4a, 0x26, 0x23), "HLC 030 20 20" },
+{ Color(0x55, 0x1e, 0x1c), "HLC 030 20 30" },
+{ Color(0x55, 0x42, 0x3f), "HLC 030 30 10" },
+{ Color(0x63, 0x3c, 0x38), "HLC 030 30 20" },
+{ Color(0x6f, 0x35, 0x31), "HLC 030 30 30" },
+{ Co

tdf#100826: replacing command-line help dialog with console under Windows

2016-11-22 Thread Kaganski Mike

Hello,

Currently, under Windows the command-line help information (that is available 
using soffice --help) and version information (soffice --version) are shown in 
a dedicated dialog window (CmdlineHelpDialog). That has following problems:

1. The dialog does not allow for scrolling, resizing and selecting. This 
impairs usability of the information, but it may be fixed.

2. This makes the code unnecessary complicated, OS-dependent, because on every 
other platform, we output the information to console.

Given that using command-line switches implies some experience with console, 
it's natural to unify the behavior and use console on Windows OS for this, too.

However, this approach has another problem. As a GUI program, that is launched 
by another GUI program (soffice.exe launches soffice.bin), LibreOffice does not 
have its own console from the beginning, and cannot easily get access to parent 
console (if any: it may be launched from yet another GUI app, e.g. from 
explorer shortcut). And even if we somehow get to that console, we cannot 
ensure native user experience with it: Windows knows that it started GUI app, 
and thus console had already displayed command prompt, so our output will go 
after that prompt, and will not be followed by another one.

Another option would be to make LO a console application, and release console 
early (but not before we handled command line and had output help message). But 
this is not a good solution, too: marking a Windows executable as console one 
will force OS to create console each time the program is executed from e.g. 
shortcut (before main()), and that console will flash on start, creating bad UX.

I have posted a patch to gerrit [1], that creates *new* console each time LO is 
started with --help or --version, even when it is started from console itself. 
This allows to use console's ability to scroll, select, resize, and also 
standardises our code. IMO, this new window is no worse than new graphic window 
used previously, given that we ecpect using console using command-line switches.

Could you please share your thoughts on this? Did I miss some way to implement 
it better?

Thanks!

1. https://gerrit.libreoffice.org/31059/

--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-11-22 Thread Tor Lillqvist

 basctl/inc/pch/precompiled_basctl.hxx  |1 
 include/svx/Palette.hxx|   70 
 svx/inc/palettes.hxx   |   95 +
 svx/source/tbxctrls/Palette.cxx|1 
 svx/source/tbxctrls/PaletteManager.cxx |2 
 5 files changed, 99 insertions(+), 70 deletions(-)

New commits:
commit e4a0fa273165d63e82dec9319dbc746f3edbafe5
Author: Tor Lillqvist 
Date:   Tue Nov 22 20:38:05 2016 +0200

The Palette subclasses don't need to be public

Change-Id: I40f942c202ab3ba1ca13d1b24d0cd72a4c561868

diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index 3ea15f7..64fde6f 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -24,10 +24,7 @@
 #include 
 #include 
 
-class SvFileStream;
-
 typedef std::pair NamedColor;
-typedef std::vector< NamedColor > ColorList;
 
 class SVX_DLLPUBLIC Palette
 {
@@ -41,71 +38,6 @@ public:
 virtual boolIsValid() = 0;
 };
 
-// ASE = Adobe Swatch Exchange
-
-class SVX_DLLPUBLIC PaletteASE : public Palette
-{
-boolmbValidPalette;
-OUStringmaFPath;
-OUStringmaASEPaletteName;
-ColorList   maColors;
-
-voidLoadPalette();
-public:
-PaletteASE( const OUString &rFPath, const OUString &rFName );
-virtual ~PaletteASE() override;
-
-virtual const OUString& GetName() override;
-virtual const OUString& GetPath() override;
-virtual voidLoadColorSet( SvxColorValueSet& rColorSet ) 
override;
-
-virtual boolIsValid() override;
-};
-
-// GPL - this is *not* GNU Public License, but is the Gimp PaLette
-
-class SVX_DLLPUBLIC PaletteGPL : public Palette
-{
-boolmbLoadedPalette;
-boolmbValidPalette;
-OUStringmaFName;
-OUStringmaFPath;
-OUStringmaGPLPaletteName;
-ColorList   maColors;
-
-boolReadPaletteHeader(SvFileStream& rFileStream);
-voidLoadPaletteHeader();
-voidLoadPalette();
-public:
-PaletteGPL( const OUString &rFPath, const OUString &rFName );
-virtual ~PaletteGPL() override;
-
-virtual const OUString& GetName() override;
-virtual const OUString& GetPath() override;
-virtual voidLoadColorSet( SvxColorValueSet& rColorSet ) 
override;
-
-virtual boolIsValid() override;
-};
-
-// SOC - Star Office Color-table
-
-class SVX_DLLPUBLIC PaletteSOC : public Palette
-{
-boolmbLoadedPalette;
-OUStringmaFPath;
-OUStringmaSOCPaletteName;
-XColorListRef   mpColorList;
-public:
-PaletteSOC( const OUString &rFPath, const OUString &rFName );
-virtual ~PaletteSOC() override;
-
-virtual const OUString& GetName() override;
-virtual const OUString& GetPath() override;
-virtual voidLoadColorSet( SvxColorValueSet& rColorSet ) 
override;
-
-virtual boolIsValid() override;
-};
-
 #endif // INCLUDED_SVX_PALETTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/palettes.hxx b/svx/inc/palettes.hxx
new file mode 100644
index 000..8aa05b8
--- /dev/null
+++ b/svx/inc/palettes.hxx
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_SVX_INC_PALETTE_HXX
+#define INCLUDED_SVX_INC_PALETTE_HXX
+
+#include 
+
+class SvFileStream;
+
+typedef std::vector< NamedColor > ColorList;
+
+// ASE = Adobe Swatch Exchange
+
+class SVX_DLLPUBLIC PaletteASE : public Palette
+{
+boolmbValidPalette;
+OUStringmaFPath;
+OUStringmaASEPaletteName;
+ColorList   maColors;
+
+voidLoadPalette();
+public:
+PaletteASE( const OUString &rFPath, const OUString &rFName );
+virtual ~PaletteASE() override;
+
+virtual const OUString& GetName() override;
+virtual const OUString& GetPath() override;
+virtual voidLoadColorSet( SvxColorValueSet& rColorSet ) 
override;
+
+virtual boolIsValid() override;
+};
+
+// GPL - this is *not* GNU Public License,

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

2016-11-22 Thread Eike Rathke

Hi Zolnai,

On Monday, 2016-11-21 22:30:42 +0100, Zolnai Tamás wrote:

> I wrote down my opinion. Sorry if I went to far with that word
> "ridiculous". Ignore that paragraph and you have what I should say on
> an ESC call. I would not bother with this API stability/instability
> anymore in general. I'm interested in only this specific case.
> Discuss it on ESC if needed and send me your decision. I can't do
> anything more with that.

Then let me explain why I consider changing this enum a non-acceptable
incompatible change.

For Java, receiving an unknown UNO API enum value results in a null
value. That can happen if an external Java process not knowing about the
new enum value using older LO jar files connects against a LibreOffice
process.

The css::sheet::GeneralFunction is marked 'published', which means we
strive to keep it stable and external applications can rely on it.
Specifically the pivot table context API is something which I think is
used mainly in larger organizations to extract data groups in preset
environments. As we don't know who is using a published API for which
purposes and what the implications might be if we break it, we should
not.

With commit
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=50244309501d738e7314fa79785db139c826f8d7
I reverted the incompatible change before we branch off to 5-3, keeping
all places that use GeneralFunction_MEDIAN in #if 0 so they can be
easily grep'ed for and adapted and where the new value was returned
I used GeneralFunction_NONE instead.

What now needs to be done is
* come up with a new css::sheet constant type (not enum) that can be extended
* an additional optional property for services where GeneralFunction is used
  * sheet::DataPilotField
  * sheet::DataPilotSourceLevel
  * sheet::DataPilotSourceDimension
* an internal mapping between the enum and the constant
* use the new constants in datapilot code
* return both properties to be read from services
* when evaluating properties written to services, if the new constant is
  present let it override the old enum
  * document that fact in the service's .idl files

Hope this helps.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack

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

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

2016-11-22 Thread Tomaž Vajngerl

 dtrans/source/win32/clipb/MtaOleClipb.cxx |   31 +-
 1 file changed, 14 insertions(+), 17 deletions(-)

New commits:
commit 4d833a75423b8aa2e938d0247f89661a4c8efcbf
Author: TomaÅ¾ Vajngerl 
Date:   Tue Nov 15 15:36:20 2016 +0100

tdf#103852 avoid clipboard deadlock

Change-Id: If0c5f01d0aefd2444781612d47d8145b4869f3a1

diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx 
b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 843a73d..c5b5718 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -200,15 +200,17 @@ class CAutoComInit
 public:
 CAutoComInit( )
 {
-/*
-to be safe we call CoInitialize
-although it is not necessary if
-the calling thread was created
-using osl_CreateThread because
-this function calls CoInitialize
-for every thread it creates
+/* To be safe we call CoInitializeEx although it is not necessary if
+   the calling thread was created using osl_CreateThread because
+   this function calls CoInitializeEx for every thread it creates.
+
+   We initialize with COINIT_APARTMENTTHREADED so Mulit-Threaded
+   Apartments(MTA) are used. See [1] for more details about STA and MTA
+   modes.
+
+   [1] https://msdn.microsoft.com/en-us/library/ms809971.aspx
 */
-m_hResult = CoInitialize( NULL );
+m_hResult = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
 
 if ( S_OK == m_hResult )
 OSL_FAIL( \
@@ -220,15 +222,10 @@ public:
 
 ~CAutoComInit( )
 {
-/*
-we only call CoUninitialize when
-CoInitialize returned S_FALSE, what
-means that com was already initialize
-for that thread so we keep the balance
-if CoInitialize returned S_OK what means
-com was not yet initialized we better
-let com initialized or we may run into
-the realm of undefined behaviour
+/* We only call CoUninitialize when CoInitialize returned S_FALSE, what
+   means that com was already initialize for that thread so we keep 
the balance
+   if CoInitialize returned S_OK what means com was not yet 
initialized we better
+   let com initialized or we may run into the realm of undefined 
behaviour
 */
 if ( m_hResult == S_FALSE )
 CoUninitialize( );
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx 
b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 51108a1..ad1c9f0 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -25,8 +25,11 @@
 #include "DTransHelper.hxx"
 #include "TxtCnvtHlp.hxx"
 #include 
+#include "com/sun/star/awt/AsyncCallback.hpp"
+#include "com/sun/star/awt/XCallback.hpp"
 #include "FmtFilter.hxx"
 #include 
+#include 
 
 #if defined _MSC_VER
 #pragma warning(push,1)
@@ -52,6 +55,22 @@ using namespace com::sun::star::datatransfer::clipboard;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
+
+class AsyncDereference : public cppu::WeakImplHelper
+{
+Reference maTransferable;
+public:
+AsyncDereference(css::uno::Reference 
const & rTransferable)
+: maTransferable(rTransferable)
+{}
+
+virtual void SAL_CALL notify(css::uno::Any const &)
+throw (css::uno::RuntimeException, std::exception) override
+{
+maTransferable.set(nullptr);
+}
+};
+
 // a helper class that will be thrown by the function validateFormatEtc
 
 class CInvalidFormatEtcException
@@ -67,12 +86,20 @@ CXTDataObject::CXTDataObject( const Reference< 
XComponentContext >& rxContext,
   const Reference< XTransferable >& aXTransferable 
)
 : m_nRefCnt( 0 )
 , m_XTransferable( aXTransferable )
+, m_XComponentContext( rxContext )
 , m_bFormatEtcContainerInitialized( sal_False )
 , m_DataFormatTranslator( rxContext )
 , m_FormatRegistrar( rxContext, m_DataFormatTranslator )
 {
 }
 
+CXTDataObject::~CXTDataObject()
+{
+css::awt::AsyncCallback::create(m_XComponentContext)->addCallback(
+new AsyncDereference(m_XTransferable),
+css::uno::Any());
+}
+
 // IUnknown->QueryInterface
 
 STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx 
b/dtrans/source/win32/dtobj/XTDataObject.hxx
index 3d8d71c..f9e98e8 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.hxx
@@ -64,7 +64,7 @@ class CXTDataObject : public IDataObject
 public:
 CXTDataObject( const css::uno::Reference< css::uno::XComponentContext >& 
rxContext,
const css::uno::Reference< css::datatransfer::XTransferable 
>& aXTransferable );
-virtual ~CXTDataObject() {}
+virtual ~CXTDataObject();
 
 // ole inter

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

2016-11-22 Thread David Tardon

 svx/source/unodraw/unoshtxt.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2ad50c9a8c8411a57bbbd7a52734e72ffc4cc0ee
Author: David Tardon 
Date:   Tue Nov 22 09:07:54 2016 +0100

avoid loss of text in edited placeholder

How to reproduce:
1. Create an empty presentation.
2. Save it.
3. Click at one of the text placeholders and write something.
4. Save again.
5. Reload. The placeholder is missing. (Actually, it's still there, but
   empty and 0-size.)

This only happens if a11y is enabled.

Change-Id: I7ae3d3c6ab0ce91aef01c0e9d62f7963dce965fc

diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index cda12f7..3a5705f 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -589,6 +589,7 @@ SvxTextForwarder* 
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
 bCreated = true;
 
 mbForwarderIsEditMode = false;
+mbDataValid = false;
 }
 
 if( mpObject && mpText && !mbDataValid && mpObject->IsInserted() && 
mpObject->GetPage() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Michael Stahl

 solenv/gbuild/extensions/post_GbuildToIde.mk |   25 +---
 solenv/qa/python/gbuildtoide.py  |   54 +--
 2 files changed, 5 insertions(+), 74 deletions(-)

New commits:
commit ab9c578ed17cfd9c9a49f22d83f33b0546faedba
Author: Michael Stahl 
Date:   Tue Nov 22 21:21:57 2016 +0100

Revert "improvements to gbuildtoide"

This reverts commit 294bfdfaada9ba85ddcf853650a8da9c10f25281.

Unfortunately this shutil.copytree(self.srcdirnative, self.tempsrc)
copies the entire SOURCEROOT into /tmp, with WORKDIR too if it's not
an out-of-tree build, which is quite an excessive use of space,
tmpfs or otherwise, and will no doubt make CI very happy.

diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk 
b/solenv/gbuild/extensions/post_GbuildToIde.mk
index fd5ca19..47d0779 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -88,33 +88,14 @@ $(call gb_LinkTarget__add_include,$(1),$(call 
gb_CustomTarget_get_workdir,$(2)))
 
 endef
 
-
-define gb_Module__add_target_impl
-$(call gb_Module__read_targetfile,$(1),$(2),target)
-
-$(call gb_Module_get_nonl10n_target,$(1)) : $(3)
-
-endef
-
 define gb_Module_add_target
-$(if $(filter Library_% Executable_%,$(2)),$(call 
gb_Module__add_target_impl,$(1),$(2),$$(gb_Module_CURRENTTARGET)))
-endef
+$(if $(filter Library_% Executable_%,$(2)),$(call 
gb_Module__read_targetfile,$(1),$(2),target))
 
-gb_Module_add_l10n_target =
-
-gb_GbuildToIde_BLACKLISTEDMODULES := connectivity compilerplugins cli_ure 
dictionaries bridges helpcompiler helpcontent2 icon-themes jurt sal shell cppu 
cppuhelper cpputools extensions external i18npool javaunohelper jurt 
lingucomponent odk scaddins solenv stoc tools translations udkapi unoidl 
writerfilter
-
-define gb_Module__add_moduledir_impl
-include $(patsubst $(1):%,%,$(filter 
$(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
-$(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
-gb_Module_TARGETSTACK := $$(wordlist 2,$$(words 
$$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
+$(if $(filter Library_% Executable_%,$(2)),$(call 
gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET))
 
 endef
 
-define gb_Module_add_moduledir
-$(if $(filter $(gb_GbuildToIde_BLACKLISTEDMODULES),$(2)),,$(call 
gb_Module__add_moduledir_impl,$(1),$(2)))
-
-endef
+gb_Module_add_l10n_target =
 
 endif
 
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 1d643c6..8ff87ba 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -112,7 +112,7 @@ class CheckGbuildToIdeModules(unittest.TestCase):
 shutil.copyfile(os.path.join(self.srcdirnative, 
'RepositoryExternal.mk'), os.path.join(self.tempsrc, 'RepositoryExternal.mk'))
 shutil.copyfile(os.path.join(self.srcdirnative, 'RepositoryFixes.mk'), 
os.path.join(self.tempsrc, 'RepositoryFixes.mk'))
 shutil.copytree(os.path.join(self.srcdirnative, 'config_host'),  
os.path.join(self.tempsrc, 'config_host'))
-#print('copytree from _%s_ to _%s_' % (os.path.join(self.srcdirnative, 
'solenv').replace('\\', '#').replace('/', '!'), os.path.join(self.tempsrc, 
'solenv').replace('\\', '#').replace('/', '!')))
+print('copytree from _%s_ to _%s_' % (os.path.join(self.srcdirnative, 
'solenv').replace('\\', '#').replace('/', '!'), os.path.join(self.tempsrc, 
'solenv').replace('\\', '#').replace('/', '!')))
 shutil.copytree(os.path.join(self.srcdirnative, 'solenv'),  
os.path.join(self.tempsrc, 'solenv'))
 
 def tearDown(self):
@@ -120,6 +120,7 @@ class CheckGbuildToIdeModules(unittest.TestCase):
 shutil.rmtree(self.tempwork)
 
 def test_gbuildtoide(self):
+blacklisted_modules = ['compilerplugins', 'cli_ure', 'dictionaries', 
'bridges', 'helpcompiler', 'helpcontent2', 'icon-themes', 'sal', 'shell', 
'cppu', 'cppuhelper', 'cpputools', 'extensions', 'external', 'i18npool', 
'javaunohelper', 'jurt', 'lingucomponent', 'odk', 'scaddins', 'solenv', 'stoc', 
'tools', 'translations', 'writerfilter']
 modules = ['accessibility', 'android', 'animations', 'apple_remote', 
'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 
'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 
'drawinglayer', 'dtrans', 'editeng', 'embeddedobj', 'embedserv', 
'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker', 
'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'idlc', 
'instsetoo_native', 'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 
'librelogo', 'libreofficekit', 'linguistic', 'lotuswordpro', 'mysqlc', 
'nlpsolver', 'o3tl', 'offapi', 'officecfg', 'onlineupdate', 'oovbaapi', 'oox', 
'opencl', 'package', 'postprocess', 'pyuno', 'registry', 'remotebridges', 
'reportbuilder', 'reportdesign', 'ridljar', 'rsc', 'salhelper', 'sax', 'sc', 
'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native', 's

[Libreoffice-commits] core.git: 3 commits - offapi/com offapi/UnoApi_offapi.mk vcl/source xmlsecurity/source

2016-11-22 Thread Miklos Vajna

 offapi/UnoApi_offapi.mk|1 
 offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl |2 
 offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl |   43 -
 vcl/source/gdi/pdfwriter_impl.cxx  |4 -
 xmlsecurity/source/pdfio/pdfdocument.cxx   |   10 +++
 5 files changed, 12 insertions(+), 48 deletions(-)

New commits:
commit 9b910bd62eaf000171c669692c40056ff47e4d76
Author: Miklos Vajna 
Date:   Tue Nov 22 16:43:44 2016 +0100

[API CHANGE] offapi: remove unused XSecurityController interface

This unpublished interface is not implemented by any C++ object in our
code and it's unlikely that 3rd-party code used it, so remove it.

Change-Id: Ide956c8a759ff8181dfd58351b79d4a011af50df

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 8251c35..b5657f7 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4258,7 +4258,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/crypto/sax,\
XSAXEventKeeper \
XSAXEventKeeperStatusChangeBroadcaster \
XSAXEventKeeperStatusChangeListener \
-   XSecurityController \
XSecuritySAXEventKeeper \
XSignatureCreationResultBroadcaster \
XSignatureCreationResultListener \
diff --git a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl 
b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
index 12ccf90..05d0f49 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
@@ -29,8 +29,6 @@ module com { module sun { module star { module xml { module 
crypto { module sax
 
 /**
  * Manipulate the "key SAX events" in a SAX event stream.
- *
- * @see   XSecurityController
  */
 interface XElementStackKeeper : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl 
b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
deleted file mode 100644
index c0b892f..000
--- a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_xml_crypto_sax_XSecurityController_idl_
-#define __com_sun_star_xml_crypto_sax_XSecurityController_idl_
-
-#include 
-#include 
-#include 
-#include 
-
-module com { module sun { module star { module xml { module crypto { module 
sax {
-
-/**
- * Interface of XML Security Controller
- * 
- * This interface is used to control security operations in the XML security 
framework.
- */
-interface XSecurityController : com::sun::star::uno::XInterface
-{
-};
-
-} ; } ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 4234b099f1ced2c1929a98ef6133b5280697f00a
Author: Miklos Vajna 
Date:   Tue Nov 22 15:07:54 2016 +0100

tdf#99327 vcl PDF mscrypto sign: fix SHA-256 OID

The previous OID only worked with NSS as NSS_CMSUtil_MapSignAlgs() has a
hack to accept it, saying Windows 2003 generates such OIDs. Don't depend
on readers of the signature accepting that incorrect OID.

Change-Id: I63e9a363e9e2ad233eeeacea1a354e3190da1ac1

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 496dd50..e5af4d4 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7306,7 +7306,7 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
 aPara.cbSize = sizeof(aPara);
 aPara.dwMsgEncodingType = PKCS_7_ASN_ENCODING | X509_ASN_ENCODING;
 aPara.pSigningCert = pCertContext;
-aPara.HashAlgorithm.pszObjId = const_cast(szOID_RSA_SHA256RSA);
+aPara.HashAlgorithm.pszObjId = const_cast(szOID_NIST_sha256);
 aPara.HashAlgorithm.Parameters.cbData = 0;
 aPara.cMsgCert = 1;
 aPara.rgpMsgCert = &pCertContext;
@@ -7335,7 +7335,7 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
 aSignerInfo.pCertInfo = pCertContext->pCertInfo;
 aSignerInfo.hCryptProv = hCryptProv;
 aSignerInfo.dwKeySpec = nKeySpec;
-aSignerInfo.

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

2016-11-22 Thread Eike Rathke

 offapi/com/sun/star/sheet/GeneralFunction.idl |7 +--
 offapi/type_reference/offapi.idl  |3 +--
 sc/qa/unit/subsequent_export-test.cxx |7 +++
 sc/source/core/data/dpoutput.cxx  |3 +++
 sc/source/core/data/dputil.cxx|3 +++
 sc/source/filter/xml/XMLConverter.cxx |6 ++
 sc/source/ui/unoobj/dapiuno.cxx   |6 ++
 sc/source/ui/unoobj/datauno.cxx   |5 +
 8 files changed, 32 insertions(+), 8 deletions(-)

New commits:
commit 50244309501d738e7314fa79785db139c826f8d7
Author: Eike Rathke 
Date:   Tue Nov 22 19:50:52 2016 +0100

[API Change] revert incompatible change of enum css::sheet::GeneralFunction

Quick solution before 5-3 branch off without reverting everything related.
This will need a new constant value type for API instead of the enum and an
internal mapping from/to the enum.

Kept the GeneralFunction_MEDIAN at all places in uing code so it can be
easily grep'ed for.

Change-Id: I95256649f16ded08e467003d2924be0ff5efb87f

diff --git a/offapi/com/sun/star/sheet/GeneralFunction.idl 
b/offapi/com/sun/star/sheet/GeneralFunction.idl
index a7d3416..ff9615c 100644
--- a/offapi/com/sun/star/sheet/GeneralFunction.idl
+++ b/offapi/com/sun/star/sheet/GeneralFunction.idl
@@ -93,13 +93,8 @@ published enum GeneralFunction
 
 /** variance is calculated based on the entire population.
  */
-VARP,
+VARP
 
-/**
-*   median of all numerical values is calculated.
-*   @since LibreOffice 5.3
-*/
-MEDIAN
 };
 
 
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index 04d89e8..c726834 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -11492,8 +11492,7 @@ module com {
  STDEV = 9,
  STDEVP = 10,
  VAR = 11,
- VARP = 12,
- MEDIAN = 13
+ VARP = 12
 };
 /** @deprecated */ published interface XConsolidationDescriptor {
  interface ::com::sun::star::uno::XInterface;
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 158f26b..9b2441a 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2968,9 +2968,16 @@ void ScExportTest::testPivotTableMedian()
 std::vector::size_type(1), aDims.size());
 
 const ScDPSaveDimension* pDim = aDims.back();
+#if 0
+// disabled because of css::sheet::GeneralFunction API incompatibility
 CPPUNIT_ASSERT_EQUAL_MESSAGE(
 "Function for the data field should be MEDIAN.",
 sal_uInt16(sheet::GeneralFunction_MEDIAN), pDim->GetFunction());
+#else
+CPPUNIT_ASSERT_EQUAL_MESSAGE(
+"Function for the data field should be MEDIAN.",
+sal_uInt16(sheet::GeneralFunction_NONE), pDim->GetFunction());
+#endif
 
 xDocSh2->DoClose();
 }
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 39227bf..1bd6a62 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1547,7 +1547,10 @@ OUString lcl_GetDataFieldName( const OUString& 
rSourceName, sheet::GeneralFuncti
 case sheet::GeneralFunction_COUNT:
 case sheet::GeneralFunction_COUNTNUMS:  nStrId = STR_FUN_TEXT_COUNT;   
 break;
 case sheet::GeneralFunction_AVERAGE:nStrId = STR_FUN_TEXT_AVG; 
 break;
+#if 0
+// disabled because of css::sheet::GeneralFunction API incompatibility
 case sheet::GeneralFunction_MEDIAN: nStrId = STR_FUN_TEXT_MEDIAN;  
 break;
+#endif
 case sheet::GeneralFunction_MAX:nStrId = STR_FUN_TEXT_MAX; 
 break;
 case sheet::GeneralFunction_MIN:nStrId = STR_FUN_TEXT_MIN; 
 break;
 case sheet::GeneralFunction_PRODUCT:nStrId = STR_FUN_TEXT_PRODUCT; 
 break;
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index b0f868f..d64a5a8d 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -410,7 +410,10 @@ ScSubTotalFunc 
ScDPUtil::toSubTotalFunc(css::sheet::GeneralFunction eGenFunc)
 case sheet::GeneralFunction_SUM:eSubTotal = SUBTOTAL_FUNC_SUM; 
 break;
 case sheet::GeneralFunction_COUNT:  eSubTotal = 
SUBTOTAL_FUNC_CNT2; break;
 case sheet::GeneralFunction_AVERAGE:eSubTotal = SUBTOTAL_FUNC_AVE; 
 break;
+#if 0
+// disabled because of css::sheet::GeneralFunction API incompatibility
 case sheet::GeneralFunction_MEDIAN: eSubTotal = SUBTOTAL_FUNC_MED; 
 break;
+#endif
 case sheet::GeneralFunction_MAX:eSubTotal = SUBTOTAL_FUNC_MAX; 
 break;
 case sheet::GeneralFunction_MIN:eSubTotal = SUBTOTAL_FUNC_MIN; 
 break;
 case sheet::GeneralFunction_PRODUCT:eSubTotal = 
SUBTOTAL_FUNC_PROD; break;
diff --git a/sc/source/filter/xml/XMLConverter.cxx 
b/sc/source/filter/xml/XMLConverter.cxx
index 9cd60bb..3c16880 100644
--- a/sc/sour

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

2016-11-22 Thread Tor Lillqvist

 loolwsd/test/httpwstest.cpp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8743e4bc858124c0942fe9ebe0d58889ebe5730a
Author: Tor Lillqvist 
Date:   Tue Nov 22 20:16:16 2016 +0200

Add comment that testConnectNoLoad does not fail all the time

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index b679e74..1e65fc2 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -62,7 +62,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testBadRequest);
 CPPUNIT_TEST(testHandShake);
 CPPUNIT_TEST(testCloseAfterClose);
-CPPUNIT_TEST(testConnectNoLoad);
+CPPUNIT_TEST(testConnectNoLoad); // This fails most of the times but 
occasionally succeeds
 CPPUNIT_TEST(testLoad);
 CPPUNIT_TEST(testBadLoad);
 CPPUNIT_TEST(testReload);
commit c1fc1b33ab52b05dee66df612751710b0c3f4a55
Author: Tor Lillqvist 
Date:   Tue Nov 22 20:07:11 2016 +0200

Change a few spurious messages to go to stderr as they should

Stdout is supposed to only get the "HTTPWSTest::testFontList. : OK"
style output.

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 93a024b..b679e74 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -318,7 +318,7 @@ void HTTPWSTest::testCloseAfterClose()
 
 // no more messages is received.
 bytes = socket->receiveFrame(buffer, sizeof(buffer), flags);
-std::cout << "Received " << bytes << " bytes, flags: "<< std::hex << 
flags << std::dec << std::endl;
+std::cerr << "Received " << bytes << " bytes, flags: "<< std::hex << 
flags << std::dec << std::endl;
 CPPUNIT_ASSERT_EQUAL(0, bytes);
 CPPUNIT_ASSERT_EQUAL(0, flags);
 }
@@ -527,7 +527,7 @@ void HTTPWSTest::testReloadWhileDisconnecting()
 socket->shutdown();
 
 // Load the same document and check that the last changes (pasted 
text) is saved.
-std::cout << "Loading again." << std::endl;
+std::cerr << "Loading again." << std::endl;
 socket = loadDocAndGetSocket(_uri, documentURL, testname);
 
 // Should have no new instances.
@@ -1344,7 +1344,7 @@ void HTTPWSTest::testCalcEditRendering()
 sendTextFrame(socket, req);
 
 const auto tile = getResponseMessage(socket, "tile:", testname);
-std::cout << "size: " << tile.size() << std::endl;
+std::cerr << "size: " << tile.size() << std::endl;
 
 // Return early for now when on LO >= 5.2.
 std::string clientVersion = "loolclient 0.1";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Khaled Hosny

 sd/qa/unit/tiledrendering/tiledrendering.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 8e31d8a27baa76564f3b71e0d31750ae56873c61
Author: Khaled Hosny 
Date:   Tue Nov 22 19:58:53 2016 +0200

Probably a more robust way to fix the test

Change-Id: Ib62df74ee8a53dac13c0ca8a839096932cf84c20

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index c07f00e..4122adc 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -351,9 +351,8 @@ void SdTiledRenderingTest::testPostMouseEvent()
 CPPUNIT_ASSERT_EQUAL(static_cast(1), 
rEditView.GetSelection().nStartPos);
 
 vcl::Cursor* pCursor = rEditView.GetCursor();
-Point aPosition = pCursor->GetPos();
+Point aPosition(pCursor->GetPos().getX(), pCursor->GetPos().getY() + 
pCursor->GetSize().Height() / 2);
 aPosition.setX(aPosition.getX() - 1000);
-aPosition.setY(aPosition.getY() + 1000);
 pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
   convertMm100ToTwip(aPosition.getX()), 
convertMm100ToTwip(aPosition.getY()),
   1, MOUSE_LEFT, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Pranav Kant

 loolwsd/ClientSession.hpp  |1 +
 loolwsd/DocumentBroker.cpp |   22 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 6debf76cd305c2174410105442e0b05d9b16f999
Author: Pranav Kant 
Date:   Tue Nov 22 23:10:10 2016 +0530

loolwsd: Use document owner always, if available, to autosave

Change-Id: I826cbac642579261ca76d7cc5602c5d39a1587cb

diff --git a/loolwsd/ClientSession.hpp b/loolwsd/ClientSession.hpp
index 7b7740c..5349caa 100644
--- a/loolwsd/ClientSession.hpp
+++ b/loolwsd/ClientSession.hpp
@@ -41,6 +41,7 @@ public:
 void setUserId(const std::string& userId) { _userId = userId; }
 void setUserName(const std::string& userName) { _userName = userName; }
 void setDocumentOwner(const bool isDocumentOwner) { _isDocumentOwner = 
isDocumentOwner; }
+bool isDocumentOwner() const { return _isDocumentOwner; }
 
 /**
  * Return the URL of the saved-as document when it's ready. If called
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 4b83ec4..949cec5 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -448,9 +448,25 @@ bool DocumentBroker::sendUnoSave(const bool 
dontSaveIfUnmodified)
 LOG_INF("Autosave triggered for doc [" << _docKey << "].");
 Util::assertIsLocked(_mutex);
 
-// Save using session holding the edit-lock (or first if multview).
+std::shared_ptr savingSession;
 for (auto& sessionIt : _sessions)
 {
+// Save the document using first session available ...
+if (!savingSession)
+{
+savingSession = sessionIt.second;
+}
+
+// or if any of the sessions is document owner, use that.
+if (sessionIt.second->isDocumentOwner())
+{
+savingSession = sessionIt.second;
+break;
+}
+}
+
+if (savingSession)
+{
 // Invalidate the timestamp to force persisting.
 _lastFileModifiedTime.fromEpochTime(0);
 
@@ -484,7 +500,7 @@ bool DocumentBroker::sendUnoSave(const bool 
dontSaveIfUnmodified)
 const auto saveArgs = oss.str();
 LOG_TRC(".uno:Save arguments: " << saveArgs);
 const auto command = "uno .uno:Save " + saveArgs;
-forwardToChild(sessionIt.second->getId(), command);
+forwardToChild(savingSession->getId(), command);
 return true;
 }
 
commit c06c0f83c25819ba4d65ac1b690b4c9f0d04422e
Author: Pranav Kant 
Date:   Tue Nov 22 23:08:40 2016 +0530

loolwsd: Set document owners unconditionally

Change-Id: I99b1ff4c30700a93a32f1a944704aee2b4b08ca8

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 74dada2..4b83ec4 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -276,7 +276,7 @@ bool DocumentBroker::load(std::shared_ptr& 
session, const std::st
 session->sendTextFrame("wopi: " + ossWopiInfo.str());
 
 // Mark the session as 'Document owner' if WOPI hosts supports it
-if (wopifileinfo._enableOwnerTermination && userid == 
_storage->getFileInfo()._ownerId)
+if (userid == _storage->getFileInfo()._ownerId)
 {
 LOG_DBG("Session [" + sessionId + "] is the document owner");
 session->setDocumentOwner(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Tor Lillqvist

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

New commits:
commit 8c2520a4ea9011751e9bf292eb361782e2b0c06e
Author: Tor Lillqvist 
Date:   Tue Nov 22 19:34:41 2016 +0200

testTilesRenderedJustOnceMultiClient seems to always fail nowadays

diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp
index da115cc..e391526 100644
--- a/loolwsd/test/TileCacheTests.cpp
+++ b/loolwsd/test/TileCacheTests.cpp
@@ -59,7 +59,7 @@ class TileCacheTests : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testClientPartImpress);
 CPPUNIT_TEST(testClientPartCalc);
 CPPUNIT_TEST(testTilesRenderedJustOnce);
-CPPUNIT_TEST(testTilesRenderedJustOnceMultiClient);
+// CPPUNIT_TEST(testTilesRenderedJustOnceMultiClient); // always fails, 
seems complicated to fix
 #if ENABLE_DEBUG
 CPPUNIT_TEST(testSimultaneousTilesRenderedJustOnce);
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Stephan Bergmann

 connectivity/source/drivers/ado/ACallableStatement.cxx |4 ++--
 connectivity/source/drivers/ado/AConnection.cxx|4 ++--
 connectivity/source/drivers/ado/APreparedStatement.cxx |3 +--
 connectivity/source/inc/ado/ACallableStatement.hxx |2 +-
 connectivity/source/inc/ado/APreparedStatement.hxx |3 +--
 5 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit f70ae430a047f44ed16868aa8a802c5f65404cf5
Author: Stephan Bergmann 
Date:   Tue Nov 22 17:40:18 2016 +0100

OPreparedStatement::m_aTypeInfo is unused

Change-Id: I89a43b06a9983e2fac374298db2fef17f3671ab5

diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx 
b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 2d6906d..9694948 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -38,8 +38,8 @@ 
IMPLEMENT_SERVICE_INFO(OCallableStatement,"com.sun.star.sdbcx.ACallableStatement
 
 // Class: java.sql.CallableStatement
 
-OCallableStatement::OCallableStatement( OConnection* _pConnection,const 
OTypeInfoMap& TypeInfo,const OUString& sql )
-: OPreparedStatement( _pConnection, TypeInfo, sql )
+OCallableStatement::OCallableStatement( OConnection* _pConnection, const 
OUString& sql )
+: OPreparedStatement( _pConnection, sql )
 {
 m_Command.put_CommandType(adCmdStoredProc);
 }
diff --git a/connectivity/source/drivers/ado/AConnection.cxx 
b/connectivity/source/drivers/ado/AConnection.cxx
index 47f011a..a61e12d 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -178,7 +178,7 @@ Reference< XPreparedStatement > SAL_CALL 
OConnection::prepareStatement( const OU
 checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
 
-OPreparedStatement* pStmt = new OPreparedStatement(this,m_aTypeInfo,sql);
+OPreparedStatement* pStmt = new OPreparedStatement(this, sql);
 Reference< XPreparedStatement > xPStmt = pStmt;
 m_aStatements.push_back(WeakReferenceHelper(*pStmt));
 return xPStmt;
@@ -190,7 +190,7 @@ Reference< XPreparedStatement > SAL_CALL 
OConnection::prepareCall( const OUStrin
 checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
 
-OCallableStatement* pStmt = new OCallableStatement(this,m_aTypeInfo,sql);
+OCallableStatement* pStmt = new OCallableStatement(this, sql);
 Reference< XPreparedStatement > xPStmt = pStmt;
 m_aStatements.push_back(WeakReferenceHelper(*pStmt));
 return xPStmt;
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx 
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 256fa3f..a29e00d 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -52,9 +52,8 @@ using namespace com::sun::star::util;
 
 
IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.APreparedStatement","com.sun.star.sdbc.PreparedStatement");
 
-OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const 
OTypeInfoMap& TypeInfo,const OUString& sql)
+OPreparedStatement::OPreparedStatement( OConnection* _pConnection, const 
OUString& sql)
 : OStatement_Base( _pConnection )
-,m_aTypeInfo(TypeInfo)
 {
 osl_atomic_increment( &m_refCount );
 
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx 
b/connectivity/source/inc/ado/ACallableStatement.hxx
index ed35e96..726bf69 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -42,7 +42,7 @@ namespace connectivity
 DECLARE_SERVICE_INFO();
 virtual ~OCallableStatement() override {} ;
 // a Constructor, that is needed for when Returning the Object is 
needed:
-OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& 
TypeInfo,const OUString& sql );
+OCallableStatement( OConnection* _pConnection, const OUString& sql 
);
 
 virtual css::uno::Any SAL_CALL queryInterface( const 
css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
 virtual void SAL_CALL acquire() throw() override;
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx 
b/connectivity/source/inc/ado/APreparedStatement.hxx
index 971faa6..73fce94 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -53,7 +53,6 @@ namespace connectivity
 // Data attributes
 
 css::uno::Reference< css::sdbc::XResultSetMetaData >  m_xMetaData;
-const OTypeInfoMap& m_aTypeInfo;
 ADOParameters*  m_pParameters;
 
 virtual ~OPreparedStatement() override;
@@ -61,7 +60,7 @@ namespace connectivity
 public:
 DECLARE_SERVICE_INFO();
 // a Constructor, that is needed for when Returning the Object is 
needed:

Crash test update

2016-11-22 Thread Crashtest VM

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


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

2016-11-22 Thread Stephan Bergmann

 framework/source/services/autorecovery.cxx |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit e19ffa13594640655841f26d797fcd8f49733932
Author: Stephan Bergmann 
Date:   Tue Nov 22 16:46:14 2016 +0100

Revert "Timer::Start must be called with SolarMutex locked"

This reverts commit 1c3e88a4ffd927d4dda8bb9e0d05cddc6cd685c0; the static
AutoRecovery instance is only destroyed during exit, but wants to use
SolarMutex; that causes crashes at least in CppunitTest_services.  
Apparently
needs more thought.

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index 6d0e064..dec1ee8 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2249,7 +2249,6 @@ void AutoRecovery::implts_updateTimer()
 {
 implts_stopTimer();
 
-sal_Int32 nMilliSeconds = 0;
 /* SAFE */ {
 osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
 
@@ -2259,6 +2258,7 @@ void AutoRecovery::implts_updateTimer()
)
 return;
 
+sal_Int32 nMilliSeconds = 0;
 if (m_eTimerType == AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL)
 {
 nMilliSeconds = (m_nAutoSaveTimeIntervall*6); // [min] => 60.000 ms
@@ -2270,16 +2270,15 @@ void AutoRecovery::implts_updateTimer()
 else if (m_eTimerType == AutoRecovery::E_POLL_TILL_AUTOSAVE_IS_ALLOWED)
 nMilliSeconds = 300; // there is a minimum time frame, where the user 
can lose some key input data!
 
-} /* SAFE */
-
-SolarMutexGuard g;
 m_aTimer.SetTimeout(nMilliSeconds);
 m_aTimer.Start();
+
+} /* SAFE */
 }
 
 void AutoRecovery::implts_stopTimer()
 {
-SolarMutexGuard g;
+osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
 
 if (!m_aTimer.IsActive())
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/qa vcl/inc vcl/quartz vcl/source vcl/unx vcl/win

2016-11-22 Thread Khaled Hosny

 sd/qa/unit/tiledrendering/tiledrendering.cxx   |1 
 vcl/inc/impfontmetricdata.hxx  |4 +
 vcl/inc/sft.hxx|   15 +
 vcl/quartz/ctfonts.cxx |   22 +--
 vcl/source/font/fontmetric.cxx |   72 +
 vcl/source/fontsubset/sft.cxx  |   29 ++
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |   68 +++
 vcl/win/gdi/salfont.cxx|   42 --
 8 files changed, 160 insertions(+), 93 deletions(-)

New commits:
commit 34d7602954d4483b3bc9db700e7df2c15348947a
Author: Khaled Hosny 
Date:   Wed Nov 9 15:22:43 2016 +0200

tdf#55469 Consistent line spacing across platforms

We current use platform APIs to calculate line spacing, however
different platforms behave differently:

* FreeType and Core Text will prefer hhea table over OS/2, and OS/2 Typo
  metrics over Win ones.
* GDIâs TEXTMETRIC only uses OS/2 Win metrics, while NEWTEXTMETRIC seems
  to use Typo one, but we use only the old TEXTMETRIC.

So we get inconsistent line spacing and we have no control which of
three competing sets of line spacing metrics we end up using.

The current conventional wisdom is that:
* hhea metrics should be used, since hhea is a mandatory font table and
  should always be present.
* But if OS/2 is present, it should be used since it is mandatory in
  Windows.
  OS/2 has Typo and Win metrics, but the later was meant to control
  text clipping not line spacing and can be ridiculously large.
  Unfortunately many Windows application incorrectly use the Win metrics
  (thanks to GDIâs TEXTMETRIC) and old fonts might be designed with this
  in mind, so OpenType introduced a flag for fonts to indicate that they
  really want to use Typo metrics. So for best backward compatibility:
  * Use Win metrics if available.
  * Unless USE_TYPO_METRICS flag is set, in which case use Typo metrics.

This patch does this by reading the hhea and OS/2 tables directly and
implementing the algorithm above.

Quick comparison with Microsoft Office 2016 shows similar line spacing
as the new line spacing here, so I guess we are improving compatibility
as well.

Change-Id: I4541e67e3e14508e3529e73083056a09de02e637
Reviewed-on: https://gerrit.libreoffice.org/31053
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 2d2cc99..c07f00e 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -353,6 +353,7 @@ void SdTiledRenderingTest::testPostMouseEvent()
 vcl::Cursor* pCursor = rEditView.GetCursor();
 Point aPosition = pCursor->GetPos();
 aPosition.setX(aPosition.getX() - 1000);
+aPosition.setY(aPosition.getY() + 1000);
 pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
   convertMm100ToTwip(aPosition.getX()), 
convertMm100ToTwip(aPosition.getY()),
   1, MOUSE_LEFT, 0);
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index 7251778..8122bbd 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -98,9 +98,13 @@ public:
 
 voidImplInitTextLineSize( const OutputDevice* pDev );
 voidImplInitAboveTextLineSize();
+voidImplCalcLineSpacing(const std::vector& rHhea,
+const std::vector& rOS_2,
+int nUPEM);
 
 private:
 // font instance attributes from the font request
+longmnHeight;   // Font size
 longmnWidth;// Reference Width
 short   mnOrientation;  // Rotation in 1/10 degrees
 
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 04aaf14..5f65488 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -204,6 +204,7 @@ namespace vcl
 sal_uInt32 ur4;   /**< bits 96 - 127 of Unicode Range flags
*/
 sal_uInt8  panose[10];/**< PANOSE classification number
*/
 sal_uInt32 typeFlags; /**< type flags (copyright bits + 
PS-OpenType flag)   */
+sal_uInt16 fsSelection;   /**< OS/2 fsSelection */
 } TTGlobalFontInfo;
 
 #define TYPEFLAG_INVALID0x800
@@ -508,6 +509,20 @@ namespace vcl
 void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo *info);
 
 /**
+ * Returns fonts metrics.
+ * @see TTGlobalFontInfo
+ *
+ * @param hheahhea table data
+ * @param os2 OS/2 table data
+ * @param infopointer to a TTGlobalFontInfo structure
+ * @ingroup sft
+ *
+ */
+ void GetT

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

2016-11-22 Thread Miklos Vajna

 xmlsecurity/inc/xmlsignaturehelper.hxx |1 -
 xmlsecurity/inc/xsecctl.hxx|8 
 xmlsecurity/source/helper/xsecctl.cxx  |6 --
 3 files changed, 15 deletions(-)

New commits:
commit c855aec445628f96d3d32cfde6efd4e51e4489c9
Author: Miklos Vajna 
Date:   Tue Nov 22 11:28:34 2016 +0100

xmlsecurity: no need to inherit from XSecurityController in XSecController

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

diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx 
b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 79311a7..edc09d0 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index 9cbb9e0..8f9f1db 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -88,7 +87,6 @@ public:
 
 class XSecController : public cppu::WeakImplHelper
 <
-css::xml::crypto::sax::XSecurityController,
 css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener,
 css::xml::crypto::sax::XSignatureCreationResultListener,
 css::xml::crypto::sax::XSignatureVerifyResultListener
@@ -407,12 +405,6 @@ public:
 /* Interface methods */
 
 /*
- * XSecurityController
- *
- * no method in XSecurityController interface
- */
-
-/*
  * XSAXEventKeeperStatusChangeListener
  */
 virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking )
diff --git a/xmlsecurity/source/helper/xsecctl.cxx 
b/xmlsecurity/source/helper/xsecctl.cxx
index a4e0ebe..bc9adbe 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -930,12 +930,6 @@ SignatureInformations 
XSecController::getSignatureInformations() const
 }
 
 /*
- * XSecurityController
- *
- * no methods
- */
-
-/*
  * XSAXEventKeeperStatusChangeListener
  */
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Stephan Bergmann

 vcl/inc/opengl/win/gdiimpl.hxx |2 +-
 vcl/opengl/win/gdiimpl.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bba580fad5ebe7643d4c6879f065d49102bf5069
Author: Stephan Bergmann 
Date:   Tue Nov 22 16:25:51 2016 +0100

loplugin:datamembershadow

Change-Id: If9e9371569750dd2c970450b808c6c5567faae55

diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index 8102d2e..1ea54be 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -20,7 +20,7 @@ class WinOpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl
 {
 friend class WinLayout;
 private:
-WinSalGraphics& mrParent;
+WinSalGraphics& mrWinParent;
 
 bool RenderCompatibleDC(OpenGLCompatibleDC& rWhite, OpenGLCompatibleDC& 
rBlack,
 int nX, int nY, TextureCombo& rCombo);
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 93e7cb9..6215c4c 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -700,7 +700,7 @@ OpenGLContext* WinSalInstance::CreateOpenGLContext()
 WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics,
SalGeometryProvider 
*mpProvider):
 OpenGLSalGraphicsImpl(rGraphics,mpProvider),
-mrParent(rGraphics)
+mrWinParent(rGraphics)
 {
 }
 
@@ -714,7 +714,7 @@ rtl::Reference 
WinOpenGLSalGraphicsImpl::CreateWinContext()
 {
 rtl::Reference xContext(new WinOpenGLContext);
 xContext->setVCLOnly();
-if (!xContext->init(mrParent.mhLocalDC, mrParent.mhWnd))
+if (!xContext->init(mrWinParent.mhLocalDC, mrWinParent.mhWnd))
 {
 SAL_WARN("vcl.opengl", "Context could not be created.");
 return rtl::Reference();
@@ -727,7 +727,7 @@ void WinOpenGLSalGraphicsImpl::Init()
 if (!IsOffscreen() && mpContext.is() && mpContext->isInitialized())
 {
 const GLWinWindow& rGLWindow = static_cast(mpContext->getOpenGLWindow());
-if (rGLWindow.hWnd != mrParent.mhWnd || rGLWindow.hDC == 
mrParent.mhLocalDC)
+if (rGLWindow.hWnd != mrWinParent.mhWnd || rGLWindow.hDC == 
mrWinParent.mhLocalDC)
 {
 // This can legitimately happen, SalFrame keeps 2x
 // SalGraphics which share the same hWnd and hDC.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Michael Meeks

 sc/source/ui/dialogs/searchresults.cxx |   83 -
 sc/source/ui/inc/searchresults.hxx |1 
 sc/uiconfig/scalc/ui/searchresults.ui  |7 ++
 3 files changed, 79 insertions(+), 12 deletions(-)

New commits:
commit 1a093a2c06c30c17e483614e36a75907e7d0991f
Author: Michael Meeks 
Date:   Fri Nov 4 20:19:12 2016 +

tdf#92160 - sc: limit search results to 1000 entries.

Very large replace results give huge space consumption in the
display widget, and are of dubious usefulness.

Change-Id: Ib8ad01a673ea52976befaf958f8f695aca2190ae
Reviewed-on: https://gerrit.libreoffice.org/30574
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit ba68e6dd7ad99ef2a2720f327813d13550b98966)
Reviewed-on: https://gerrit.libreoffice.org/30665
Reviewed-by: Eike Rathke 
Reviewed-by: Sophie Gautier 

diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index c6e7470..1d2e244 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -26,6 +26,8 @@ SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, 
vcl::Window* pParen
 ModelessDialog(pParent, "SearchResultsDialog", 
"modules/scalc/ui/searchresults.ui"),
 mpBindings(_pBindings), mpDoc(nullptr)
 {
+get(mpLabel, "skipped");
+
 SvSimpleTableContainer *pContainer = 
get("results");
 Size aControlSize(150, 120);
 aControlSize = pContainer->LogicToPixel(aControlSize, MAP_APPFONT);
@@ -47,18 +49,76 @@ SearchResultsDlg::~SearchResultsDlg()
 void SearchResultsDlg::dispose()
 {
 mpList.disposeAndClear();
+mpLabel.disposeAndClear();
 ModelessDialog::dispose();
 }
 
+namespace
+{
+class ListWrapper {
+size_t mnCount;
+const size_t mnMaximum;
+OUStringBuffer maName;
+VclPtr mpLabel;
+VclPtr mpList;
+public:
+ListWrapper(const VclPtr &pList,
+const VclPtr &pLabel) :
+mnCount(0),
+mnMaximum(1000),
+mpLabel(pLabel),
+mpList(pList)
+{
+mpList->Clear();
+mpList->SetUpdateMode(false);
+}
+void Insert(const OUString &aTabName,
+const ScAddress &rPos,
+formula::FormulaGrammar::AddressConvention eConvention,
+const OUString &aText)
+{
+if (mnCount++ < mnMaximum)
+{
+maName.append(aTabName);
+maName.append("\t");
+maName.append(rPos.Format(ScRefFlags::ADDR_ABS,
+  nullptr, eConvention));
+maName.append("\t");
+maName.append(aText);
+mpList->InsertEntry(maName.makeStringAndClear());
+}
+}
+void Update()
+{
+if (mnCount > mnMaximum)
+{
+if (mpLabel)
+{
+size_t nSkipped = mnCount - mnMaximum;
+OUString aSkipped(mpLabel->GetText());
+mpList->InsertEntry(
+aSkipped.replaceFirst("$1", 
OUString::number(nSkipped)));
+}
+}
+mpList->SetUpdateMode(true);
+}
+};
+}
+
 void SearchResultsDlg::FillResults( ScDocument* pDoc, const ScRangeList 
&rMatchedRanges, bool bCellNotes )
 {
-mpList->Clear();
-mpList->SetUpdateMode(false);
+ListWrapper aList(mpList, mpLabel);
 std::vector aTabNames = pDoc->GetAllTableNames();
 SCTAB nTabCount = aTabNames.size();
+
+// tdf#92160 - too many results blow the widget's mind
+size_t nMatchMax = rMatchedRanges.size();
+if (nMatchMax > 1000)
+nMatchMax = 1000;
+
 if (bCellNotes)
 {
-for (size_t i = 0, n = rMatchedRanges.size(); i < n; ++i)
+for (size_t i = 0, n = nMatchMax; i < n; ++i)
 {
 /* TODO: a CellNotes iterator would come handy and migt speed
  * things up a little, though we only loop through the
@@ -77,10 +137,9 @@ void SearchResultsDlg::FillResults( ScDocument* pDoc, const 
ScRangeList &rMatche
 {
 const ScPostIt* pNote = pDoc->GetNote( aPos);
 if (pNote)
-{
-OUString aPosStr = 
aPos.Format(ScRefFlags::ADDR_ABS, nullptr, pDoc->GetAddressConvention());
-mpList->InsertEntry(aTabNames[aPos.Tab()] + "\t" + 
aPosStr + "\t" + pNote->GetText());
-}
+aList.Insert(aTabNames[aPos.Tab()], aPos,
+ pDoc->GetAddressConvention(),
+ pNote->GetText());
 }
 }
 }
@@ -88,7 +147,7 @@ void SearchResultsDlg::FillResults( ScDocu

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

2016-11-22 Thread Stephan Bergmann

 framework/source/services/autorecovery.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 1c3e88a4ffd927d4dda8bb9e0d05cddc6cd685c0
Author: Stephan Bergmann 
Date:   Tue Nov 22 15:59:01 2016 +0100

Timer::Start must be called with SolarMutex locked

cf. DBG_TESTSOLARMUTEX added to Scheduler::Start in
c00d8271ba443c4f0acf657c226eea4824597f95 "vcl: assert solar mutex is held 
for
various timer / scheduler ops."

So cover operations on AutoRecovery::m_aTimer with SolarMutexGuard instead 
of
AutoRecovery's own mutex.  Is it safe to split guarding like that here?
Hopefully.  Would it be better to exclusively use SolarMutexGuard?  Maybe.

The DBG_TESTSOLARMUTEX assert fired at least on macOS when opening some .odb
file:

> frame #19: 0x7fffc80e5893 libsystem_c.dylib`__assert_rtn + 320
> frame #20: 0x00010f5e4dae libvcllo.dylib`ImplDbgTestSolarMutex() + 
110 at vcl/source/app/dbggui.cxx:47
> frame #21: 0x00010e6a5d62 libtllo.dylib`DbgTestSolarMutex() + 130 at 
tools/source/debug/debug.cxx:74
> frame #22: 0x00010f5eeb3a 
libvcllo.dylib`Scheduler::Start(this=0x0001489233a8) + 58 at 
vcl/source/app/scheduler.cxx:287
> frame #23: 0x00010f62f03f 
libvcllo.dylib`Timer::Start(this=0x0001489233a8) + 31 at 
vcl/source/app/timer.cxx:93
> frame #24: 0x0001481b7483 libfwklo.dylib`(anonymous 
namespace)::AutoRecovery::implts_updateTimer(this=0x0001489232a0) + 259 at 
framework/source/services/autorecovery.cxx:2274
> frame #25: 0x0001481b3009 libfwklo.dylib`(anonymous 
namespace)::AutoRecovery::changesOccurred(this=0x0001489232a0, 
aEvent=0x7f92d87d0ec8) + 649 at 
framework/source/services/autorecovery.cxx:1678
> frame #26: 0x00014807e04b 
libfwklo.dylib`framework::WeakChangesListener::changesOccurred(this=0x000148c42488,
 rEvent=0x7f92d87d0ec8) + 155 at framework/inc/helper/mischelper.hxx:222
> frame #27: 0x00011c13f29e 
libconfigmgrlo.dylib`configmgr::Broadcaster::send(this=0x782f9e70) + 
5694 at configmgr/source/broadcaster.cxx:187
> frame #28: 0x00011c0fd9bc 
libconfigmgrlo.dylib`configmgr::Access::insertByName(this=0x000148c118e0, 
aName=0x782fa258, aElement=0x782fa118) + 3196 at 
configmgr/source/access.cxx:1232
> frame #29: 0x0001481bdd23 libfwklo.dylib`(anonymous 
namespace)::AutoRecovery::implts_flushConfigItem(this=0x0001489232a0, 
rInfo=0x782fa600, bRemoveIt=false)::AutoRecovery::TDocumentInfo const&, 
bool) + 2483 at framework/source/services/autorecovery.cxx:2092
> frame #30: 0x0001481bb09d libfwklo.dylib`(anonymous 
namespace)::AutoRecovery::implts_registerDocument(this=0x0001489232a0, 
xDocument=0x782fa790) + 3597 at 
framework/source/services/autorecovery.cxx:2519
> frame #31: 0x0001481b2a35 libfwklo.dylib`(anonymous 
namespace)::AutoRecovery::documentEventOccured(this=0x0001489232a0, 
aEvent=0x7f92db3d8620) + 165 at 
framework/source/services/autorecovery.cxx:1571
> frame #32: 0x0001481d025b 
libfwklo.dylib`framework::WeakDocumentEventListener::documentEventOccured(this=0x000148c42548,
 rEvent=0x7f92db3d8620) + 155 at framework/inc/helper/mischelper.hxx:258
> frame #33: 0x000109fca69e 
libsfxlo.dylib`comphelper::OInterfaceContainerHelper2::NotifySingleListener::operator(this=0x782fa910, 
listener=0x782fa880)(com::sun::star::uno::Reference
 const&) const + 126 at include/comphelper/interfacecontainer2.hxx:272
> frame #34: 0x000109fca4a3 libsfxlo.dylib`void 
comphelper::OInterfaceContainerHelper2::forEach >(this=0x0001489186b8, 
func=0x782fa910) + 163 at include/comphelper/interfacecontainer2.hxx:285
> frame #35: 0x000109fca0de libsfxlo.dylib`void 
comphelper::OInterfaceContainerHelper2::notifyEach(this=0x0001489186b8, 
NotificationMethod=21 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00, 
Event=0x7f92db3d8620)(com::sun::star::document::DocumentEvent const&), 
com::sun::star::document::DocumentEvent const&) + 126 at 
include/comphelper/interfacecontainer2.hxx:298
> frame #36: 0x000109fc9f08 libsfxlo.dylib`(anonymous 
namespace)::SfxGlobalEvents_Impl::implts_notifyListener(this=0x000148918628,
 aEvent=0x7f92db3d8620) + 168 at sfx2/source/notify/globalevents.cxx:438
> frame #37: 0x000109fc6874 libsfxlo.dylib`(anonymous 
namespace)::SfxGlobalEvents_Impl::documentEventOccured(this=0x000148918628, 
Event=0x7f92db3d8620) + 132 at sfx2/source/notify/globalevents.cxx:243
> frame #38: 0x00014957597e 
libdbalo.dylib`comphelper::OInterfaceContainerHelper2::NotifySingleListener::operator(this=0x782fab30, 
listener=0x782faaa0)(com::sun::star::uno::Reference
 const&) const + 126 at include/comphelper/interfacecontainer2.hxx:272
> frame #39: 0x000149575753 libdbalo.dylib`void 
comphelper::OInterfaceContainerHelpe

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

2016-11-22 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_GbuildToIde.mk |   25 +++-
 solenv/qa/python/gbuildtoide.py  |   54 ++-
 2 files changed, 74 insertions(+), 5 deletions(-)

New commits:
commit 294bfdfaada9ba85ddcf853650a8da9c10f25281
Author: Bjoern Michaelsen 
Date:   Tue Nov 22 13:05:50 2016 +0100

improvements to gbuildtoide

- move supported module selection from the test directly into gbuild, it
  should not be possible now to have 'make gbuildtoide' failing, it
  should skip problematic parts
- move from whitelisting to blacklisting bad modules
- toplevel 'make gbuildtoide' should work now, so add test (limit to
  non-Windows for now, as Windows is stupid and slow)
- remove spurious debug output in test

Change-Id: I9838dd2fa091e5fb3e56f414f60164086e8f2076
Reviewed-on: https://gerrit.libreoffice.org/31072
Reviewed-by: BjÃ¶rn Michaelsen 
Tested-by: BjÃ¶rn Michaelsen 

diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk 
b/solenv/gbuild/extensions/post_GbuildToIde.mk
index 47d0779..fd5ca19 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -88,15 +88,34 @@ $(call gb_LinkTarget__add_include,$(1),$(call 
gb_CustomTarget_get_workdir,$(2)))
 
 endef
 
-define gb_Module_add_target
-$(if $(filter Library_% Executable_%,$(2)),$(call 
gb_Module__read_targetfile,$(1),$(2),target))
 
-$(if $(filter Library_% Executable_%,$(2)),$(call 
gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET))
+define gb_Module__add_target_impl
+$(call gb_Module__read_targetfile,$(1),$(2),target)
+
+$(call gb_Module_get_nonl10n_target,$(1)) : $(3)
+
+endef
 
+define gb_Module_add_target
+$(if $(filter Library_% Executable_%,$(2)),$(call 
gb_Module__add_target_impl,$(1),$(2),$$(gb_Module_CURRENTTARGET)))
 endef
 
 gb_Module_add_l10n_target =
 
+gb_GbuildToIde_BLACKLISTEDMODULES := connectivity compilerplugins cli_ure 
dictionaries bridges helpcompiler helpcontent2 icon-themes jurt sal shell cppu 
cppuhelper cpputools extensions external i18npool javaunohelper jurt 
lingucomponent odk scaddins solenv stoc tools translations udkapi unoidl 
writerfilter
+
+define gb_Module__add_moduledir_impl
+include $(patsubst $(1):%,%,$(filter 
$(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
+$(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
+gb_Module_TARGETSTACK := $$(wordlist 2,$$(words 
$$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
+
+endef
+
+define gb_Module_add_moduledir
+$(if $(filter $(gb_GbuildToIde_BLACKLISTEDMODULES),$(2)),,$(call 
gb_Module__add_moduledir_impl,$(1),$(2)))
+
+endef
+
 endif
 
 # vim: set noet ts=4 sw=4:
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 8ff87ba..1d643c6 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -112,7 +112,7 @@ class CheckGbuildToIdeModules(unittest.TestCase):
 shutil.copyfile(os.path.join(self.srcdirnative, 
'RepositoryExternal.mk'), os.path.join(self.tempsrc, 'RepositoryExternal.mk'))
 shutil.copyfile(os.path.join(self.srcdirnative, 'RepositoryFixes.mk'), 
os.path.join(self.tempsrc, 'RepositoryFixes.mk'))
 shutil.copytree(os.path.join(self.srcdirnative, 'config_host'),  
os.path.join(self.tempsrc, 'config_host'))
-print('copytree from _%s_ to _%s_' % (os.path.join(self.srcdirnative, 
'solenv').replace('\\', '#').replace('/', '!'), os.path.join(self.tempsrc, 
'solenv').replace('\\', '#').replace('/', '!')))
+#print('copytree from _%s_ to _%s_' % (os.path.join(self.srcdirnative, 
'solenv').replace('\\', '#').replace('/', '!'), os.path.join(self.tempsrc, 
'solenv').replace('\\', '#').replace('/', '!')))
 shutil.copytree(os.path.join(self.srcdirnative, 'solenv'),  
os.path.join(self.tempsrc, 'solenv'))
 
 def tearDown(self):
@@ -120,7 +120,6 @@ class CheckGbuildToIdeModules(unittest.TestCase):
 shutil.rmtree(self.tempwork)
 
 def test_gbuildtoide(self):
-blacklisted_modules = ['compilerplugins', 'cli_ure', 'dictionaries', 
'bridges', 'helpcompiler', 'helpcontent2', 'icon-themes', 'sal', 'shell', 
'cppu', 'cppuhelper', 'cpputools', 'extensions', 'external', 'i18npool', 
'javaunohelper', 'jurt', 'lingucomponent', 'odk', 'scaddins', 'solenv', 'stoc', 
'tools', 'translations', 'writerfilter']
 modules = ['accessibility', 'android', 'animations', 'apple_remote', 
'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 
'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 
'drawinglayer', 'dtrans', 'editeng', 'embeddedobj', 'embedserv', 
'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker', 
'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'idlc', 
'instsetoo_native', 'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 
'librelogo', 'libreofficekit', 'linguistic', 'lotuswordpro', 'mysqlc', 
'nlpsolver', 'o3tl

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

2016-11-22 Thread Stephan Bergmann

 sd/qa/unit/dialogs-test.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2c16af58eeb9a5092656e5df67ec504288645068
Author: Stephan Bergmann 
Date:   Tue Nov 22 15:35:14 2016 +0100

Destroy item sets in SdDialogsTest::tearDown

...as they apparently hold raw pointers to objects destroyed early, so only
destroying the item sets in the SdDialogsTest dtor caused use-after-free 
crashes
during shutdown.

Change-Id: Ibe3848c81a56fb0db4bf1fca0eab35836aab6a66

diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 66a4fd6..a314986 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -142,6 +142,9 @@ void SdDialogsTest::setUp()
 
 void SdDialogsTest::tearDown()
 {
+mpSfxItemSetFromSdrObject.reset();
+mpEmptySfxItemSet.reset();
+mpEmptyFillStyleSfxItemSet.reset();
 mxComponent->dispose();
 ScreenshotTest::tearDown();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Stephan Bergmann

 external/icu/icu-ubsan.patch.0 |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit a0ed1c9ad9b72347eff85c80ab85d49e7a414396
Author: Stephan Bergmann 
Date:   Tue Nov 22 15:33:21 2016 +0100

external/icu: Silence -fsanitize=null

...as seen during CppunitTest_sd_dialogs_test:

> collationdatareader.cpp:422:13: runtime error: null pointer passed as 
argument 1, which is declared to never be null
> /usr/include/string.h:66:33: note: nonnull attribute specified here
> #0 0x7fc3fc837f72 in 
icu_58::CollationDataReader::read(icu_58::CollationTailoring const*, unsigned 
char const*, int, icu_58::CollationTailoring&, UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/collationdatareader.cpp:422:13
> #1 0x7fc3fc7fc0bb in 
icu_58::CollationLoader::loadFromData(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:395:5
> #2 0x7fc3fc7fad16 in 
icu_58::CollationLoader::loadFromCollations(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:376:16
> #3 0x7fc3fc7f0c74 in 
icu_58::CollationLoader::createCacheEntry(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:221:16
> #4 0x7fc3fc7f079e in 
icu_58::LocaleCacheKey::createObject(void const*, 
UErrorCode&) const workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:144:20
> #5 0x7fc4262d558f in icu_58::UnifiedCache::_get(icu_58::CacheKeyBase 
const&, icu_58::SharedObject const*&, void const*, UErrorCode&) const 
workdir/UnpackedTarball/icu/source/common/unifiedcache.cpp:409:17
> #6 0x7fc3fc806774 in void 
icu_58::UnifiedCache::get(icu_58::CacheKey
 const&, void const*, icu_58::CollationCacheEntry const*&, UErrorCode&) const 
workdir/UnpackedTarball/icu/source/i18n/../common/unifiedcache.h:234:8
> #7 0x7fc3fc7f1c93 in 
icu_58::CollationLoader::getCacheEntry(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:466:12
> #8 0x7fc3fc7f76d4 in 
icu_58::CollationLoader::loadFromBundle(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:299:16
> #9 0x7fc3fc7f0ae5 in 
icu_58::CollationLoader::createCacheEntry(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:219:16
> #10 0x7fc3fc7f079e in 
icu_58::LocaleCacheKey::createObject(void const*, 
UErrorCode&) const workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:144:20
> #11 0x7fc4262d558f in icu_58::UnifiedCache::_get(icu_58::CacheKeyBase 
const&, icu_58::SharedObject const*&, void const*, UErrorCode&) const 
workdir/UnpackedTarball/icu/source/common/unifiedcache.cpp:409:17
> #12 0x7fc3fc806774 in void 
icu_58::UnifiedCache::get(icu_58::CacheKey
 const&, void const*, icu_58::CollationCacheEntry const*&, UErrorCode&) const 
workdir/UnpackedTarball/icu/source/i18n/../common/unifiedcache.h:234:8
> #13 0x7fc3fc7f1c93 in 
icu_58::CollationLoader::getCacheEntry(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:466:12
> #14 0x7fc3fc7f5a19 in 
icu_58::CollationLoader::loadFromLocale(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:247:16
> #15 0x7fc3fc7f0956 in 
icu_58::CollationLoader::createCacheEntry(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:217:16
> #16 0x7fc3fc7f079e in 
icu_58::LocaleCacheKey::createObject(void const*, 
UErrorCode&) const workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:144:20
> #17 0x7fc4262d558f in icu_58::UnifiedCache::_get(icu_58::CacheKeyBase 
const&, icu_58::SharedObject const*&, void const*, UErrorCode&) const 
workdir/UnpackedTarball/icu/source/common/unifiedcache.cpp:409:17
> #18 0x7fc3fc806774 in void 
icu_58::UnifiedCache::get(icu_58::CacheKey
 const&, void const*, icu_58::CollationCacheEntry const*&, UErrorCode&) const 
workdir/UnpackedTarball/icu/source/i18n/../common/unifiedcache.h:234:8
> #19 0x7fc3fc7f1c93 in 
icu_58::CollationLoader::getCacheEntry(UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:466:12
> #20 0x7fc3fc7f1525 in 
icu_58::CollationLoader::loadTailoring(icu_58::Locale const&, UErrorCode&) 
workdir/UnpackedTarball/icu/source/i18n/ucol_res.cpp:164:19
> #21 0x7fc3fc7ba783 in icu_58::Collator::makeInstance(icu_58::Locale 
const&, UErrorCode&) workdir/UnpackedTarball/icu/source/i18n/coll.cpp:460:40
> #22 0x7fc3fc7bb891 in icu_58::Collator::createInstance(icu_58::Locale 
const&, UErrorCode&) workdir/UnpackedTarball/icu/source/i18n/coll.cpp:448:16
> #23 0x7fc3f196cf17 in 
com::sun::star::i18n::Collator_Unicode::loadCollatorAlgorithm(rtl::OUString 
const&, com::sun::star::lang::Locale const&, int) 
i18npool/source/collator/collator_unicode.cxx:375:57
> #24 0x7fc3f1945c22 in 
com::sun::star::i18n::CollatorImpl::loadCollatorAlgorithm(rtl::OUString const&, 
com::sun::star::lang::Locale const&, int) 
i18npool/source/collator/collatorImpl.cxx:93:25
> #25 0x7fc3f1944a53 in 
com::su

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

2016-11-22 Thread Stephan Bergmann

 solenv/gbuild/CppunitTest.mk |4 ++--
 solenv/gbuild/gbuild.mk  |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 627a2fa0a75f7920df6d5e5d5c75accb118f1956
Author: Stephan Bergmann 
Date:   Tue Nov 22 15:31:41 2016 +0100

Exit gb_CppunitTest_localized loop on first failure

...instead of ignoring failures in every but the last iteration

Change-Id: Ie80e78f75aaec5e9b1625c2e1ef740adf31fab1b

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 63317d8..95f5fbc 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -110,7 +110,7 @@ $(call gb_CppunitTest_get_target,%) :| 
$(gb_CppunitTest_RUNTIMEDEPS)
$(if $(value gb_CppunitTest_postprocess), \
rm -fr $@.core && mkdir $@.core && cd $@.core 
&&)) \
( \
-   $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; 
do LO_TEST_LOCALE="$$l" ) \
+   $(if $(gb_CppunitTest_localized),$(OPEN_PAREN)for l in 
$(WITH_LANG_LIST) ; do LO_TEST_LOCALE="$$l" ) \
$(if $(filter 
gdb,$(CPPUNITTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
@@ -121,7 +121,7 @@ $(call gb_CppunitTest_get_target,%) :| 
$(gb_CppunitTest_RUNTIMEDEPS)
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_LinkTarget_get_target,$(call 
gb_CppunitTest_get_linktarget,$*)) \
$(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \
-   $(if $(gb_CppunitTest_localized), ;done ) \
+   $(if $(gb_CppunitTest_localized),|| exit $$?; 
done$(CLOSE_PAREN)) \
$(if $(gb_CppunitTest__interactive),, \
> $@.log 2>&1 \
|| ($(if $(value gb_CppunitTest_postprocess), \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f053107..747c1d6 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -57,6 +57,7 @@ endef
 
 COMMA :=,
 
+OPEN_PAREN :=(
 CLOSE_PAREN :=)
 
 gb_VERBOSE := $(verbose)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Caolán McNamara

 framework/source/layoutmanager/toolbarlayoutmanager.cxx |3 +++
 vcl/source/window/dockmgr.cxx   |3 +++
 vcl/source/window/dockwin.cxx   |2 ++
 3 files changed, 8 insertions(+)

New commits:
commit 19c3559e873e79a178e9c4932363e2a2cc1b9ac0
Author: CaolÃ¡n McNamara 
Date:   Tue Nov 22 13:43:32 2016 +

Resolves: rhbz#1397181 toolbar layout manager not respecting drag cancel

plus restore original mbDockCanceled state after wayland-enforced
cancel otherwise next drag won't work

Change-Id: Idefed25b925b36d0bf72b77609c4fc2eb47f71b9

diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx 
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 583d622..b770fd8 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -3476,6 +3476,9 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e )
 throw (uno::RuntimeException, std::exception)
 {
+if (e.bCancelled)
+return;
+
 bool bDockingInProgress( false );
 bool bStartDockFloated( false );
 bool bFloating( false );
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 9012a90..1467df8 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -935,6 +935,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& 
rRect, bool bFloatMo
 {
 Rectangle aRect( rRect );
 
+bool bOrigDockCanceled = mbDockCanceled;
 if (bFloatMode && !StyleSettings::GetDockingFloatsSupported())
 mbDockCanceled = true;
 
@@ -971,6 +972,8 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& 
rRect, bool bFloatMo
 
 // must be enabled in Window::Notify to prevent permanent docking during 
mouse move
 mbStartDockingEnabled = false;
+
+mbDockCanceled = bOrigDockCanceled;
 }
 
 bool ImplDockingWindowWrapper::PrepareToggleFloatingMode()
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 8f63c69..7d3ba8b 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -589,6 +589,7 @@ bool DockingWindow::Docking( const Point&, Rectangle& )
 
 void DockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
 {
+bool bOrigDockCanceled = mbDockCanceled;
 if (bFloatMode && !StyleSettings::GetDockingFloatsSupported())
 mbDockCanceled = true;
 
@@ -614,6 +615,7 @@ void DockingWindow::EndDocking( const Rectangle& rRect, 
bool bFloatMode )
 Show();
 }
 mbDocking = false;
+mbDockCanceled = bOrigDockCanceled;
 }
 
 bool DockingWindow::PrepareToggleFloatingMode()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - vcl/source xmlsecurity/Executable_pdfverify.mk xmlsecurity/source xmlsecurity/workben

2016-11-22 Thread Miklos Vajna

 vcl/source/gdi/pdfwriter_impl.cxx  |   78 
 xmlsecurity/Executable_pdfverify.mk|2 
 xmlsecurity/source/pdfio/pdfverify.cxx |  155 -
 xmlsecurity/workben/pdfverify.cxx  |  155 +
 4 files changed, 234 insertions(+), 156 deletions(-)

New commits:
commit 6971159bb4468110d79c8367fcd776138302c1b9
Author: Miklos Vajna 
Date:   Tue Nov 22 11:16:24 2016 +0100

Executable_pdfverify: move pdfverify.cxx to workben/

That's where the implementation of such internal test binaries usually
are.

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

diff --git a/xmlsecurity/Executable_pdfverify.mk 
b/xmlsecurity/Executable_pdfverify.mk
index 5cfbcd2..446c68f 100644
--- a/xmlsecurity/Executable_pdfverify.mk
+++ b/xmlsecurity/Executable_pdfverify.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_use_libraries,pdfverify,\
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pdfverify,\
-xmlsecurity/source/pdfio/pdfverify \
+xmlsecurity/workben/pdfverify \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/xmlsecurity/source/pdfio/pdfverify.cxx 
b/xmlsecurity/workben/pdfverify.cxx
similarity index 100%
rename from xmlsecurity/source/pdfio/pdfverify.cxx
rename to xmlsecurity/workben/pdfverify.cxx
commit 7c18387dd46391f033af504792b33b6ff4a4e9ad
Author: Miklos Vajna 
Date:   Tue Nov 22 10:26:50 2016 +0100

vcl NSS PDF sign: write IssuerSerial sequence

Nominally this is optional, but RFC 5035 says:

"The encoding of the ESSCertIDv2 for this certificate SHOULD include the
issuerSerial field."

So do write it, it fixes a warning issued by the PAdES validator from
.

Change-Id: I344f79e17febe82a697a0936a837c17aefa242df

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 47be24f..4b20942 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6037,6 +6037,31 @@ typedef struct {
 } TimeStampReq;
 
 /**
+ * General name, defined by RFC 3280.
+ */
+struct GeneralName
+{
+CERTName name;
+};
+
+/**
+ * List of general names (only one for now), defined by RFC 3280.
+ */
+struct GeneralNames
+{
+GeneralName names;
+};
+
+/**
+ * Supplies different fields to identify a certificate, defined by RFC 5035.
+ */
+struct IssuerSerial
+{
+GeneralNames issuer;
+SECItem serialNumber;
+};
+
+/**
  * Supplies different fields that are used to identify certificates, defined by
  * RFC 5035.
  */
@@ -6044,6 +6069,7 @@ struct ESSCertIDv2
 {
 SECAlgorithmID hashAlgorithm;
 SECItem certHash;
+IssuerSerial issuerSerial;
 };
 
 /**
@@ -6275,6 +6301,50 @@ const SEC_ASN1Template TimeStampReq_Template[] =
 };
 
 /**
+ * GeneralName ::= CHOICE {
+ *  otherName   [0] OtherName,
+ *  rfc822Name  [1] IA5String,
+ *  dNSName [2] IA5String,
+ *  x400Address [3] ORAddress,
+ *  directoryName   [4] Name,
+ *  ediPartyName[5] EDIPartyName,
+ *  uniformResourceIdentifier   [6] IA5String,
+ *  iPAddress   [7] OCTET STRING,
+ *  registeredID[8] OBJECT IDENTIFIER
+ * }
+ */
+const SEC_ASN1Template GeneralNameTemplate[] =
+{
+{SEC_ASN1_SEQUENCE, 0, nullptr, sizeof(GeneralName)},
+{SEC_ASN1_INLINE, offsetof(GeneralName, name), CERT_NameTemplate, 0},
+{0, 0, nullptr, 0}
+};
+
+/**
+ * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
+ */
+const SEC_ASN1Template GeneralNamesTemplate[] =
+{
+{SEC_ASN1_SEQUENCE, 0, nullptr, sizeof(GeneralNames)},
+{SEC_ASN1_INLINE | SEC_ASN1_CONTEXT_SPECIFIC | 4, offsetof(GeneralNames, 
names), GeneralNameTemplate, 0},
+{0, 0, nullptr, 0}
+};
+
+/**
+ * IssuerSerial ::= SEQUENCE {
+ * issuer GeneralNames,
+ * serialNumber CertificateSerialNumber
+ * }
+ */
+const SEC_ASN1Template IssuerSerialTemplate[] =
+{
+{SEC_ASN1_SEQUENCE, 0, nullptr, sizeof(IssuerSerial)},
+{SEC_ASN1_INLINE, offsetof(IssuerSerial, issuer), GeneralNamesTemplate, 0},
+{SEC_ASN1_INTEGER, offsetof(IssuerSerial, serialNumber), nullptr, 0},
+{0, 0, nullptr, 0}
+};
+
+/**
  * Hash ::= OCTET STRING
  *
  * ESSCertIDv2 ::= SEQUENCE {
@@ -6288,6 +6358,7 @@ const SEC_ASN1Template ESSCertIDv2Template[] =
 {SEC_ASN1_SEQUENCE, 0, nullptr, sizeof(ESSCertIDv2)},
 {SEC_ASN1_INLINE | SEC_ASN1_XTRN, offsetof(ESSCertIDv2, hashAlgorithm), 
SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate), 0},
 {SEC_ASN1_OCTET_STRING, offsetof(ESSCertIDv2, certHash), nullptr, 0},
+{SEC_ASN1_INLINE | SEC_ASN1_XTRN, offsetof(ESSCertIDv2, issuerSerial), 
IssuerSerialTemplate, 0},
 {0, 0, nullptr, 0}
 };
 
@@ -7113,6

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

2016-11-22 Thread Mike Kaganski

 sc/source/ui/docshell/docfunc.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit cc17915f6937a333bf7b741110dbdee39b1e3eb4
Author: Mike Kaganski 
Date:   Mon Nov 21 18:08:35 2016 +0300

Retain sheet protect options throughout unprotect/protect session

Currently, unprotecting a sheet clears the protection options it
had (i.e. if to allow users to select protected/unprotected cells).
So, protecting next time requires setting these options again.
Unprotecting a sheet usually happens when author edits e.g. a form
and intents to re-protect it when the edit is done, so it would be
handy to restore previous flags as they were before.

This patch allows saving the protection settings by using
current ScTableProtection copy with its protection set to appropriate
value, instead of new clean ScTableProtection or nullptr.

This does not allow to save the flags between edit sessions if the
protection is unset.

Change-Id: Ieaba4eee746efcf05308dbc88e402c200a59b0d2
Reviewed-on: https://gerrit.libreoffice.org/31044
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 4942c28..d84c47d 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3777,10 +3777,11 @@ bool ScDocFunc::Protect( SCTAB nTab, const OUString& 
rPassword, bool /*bApi*/ )
 {
 // sheet protection
 
-ScTableProtection aProtection;
-aProtection.setProtected(true);
-aProtection.setPassword(rPassword);
-rDoc.SetTabProtection(nTab, &aProtection);
+const ScTableProtection* pOldProtection = rDoc.GetTabProtection(nTab);
+::std::unique_ptr pNewProtection(pOldProtection ? 
new ScTableProtection(*pOldProtection) : new ScTableProtection());
+pNewProtection->setProtected(true);
+pNewProtection->setPassword(rPassword);
+rDoc.SetTabProtection(nTab, pNewProtection.get());
 if (rDoc.IsUndoEnabled())
 {
 ScTableProtection* pProtect = rDoc.GetTabProtection(nTab);
@@ -3859,7 +3860,9 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& 
rPassword, bool bApi )
 return false;
 }
 
-rDoc.SetTabProtection(nTab, nullptr);
+::std::unique_ptr pNewProtection(new 
ScTableProtection(*pTabProtect));
+pNewProtection->setProtected(false);
+rDoc.SetTabProtection(nTab, pNewProtection.get());
 if (rDoc.IsUndoEnabled())
 {
 pProtectCopy->setProtected(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Kohei Yoshida

 vcl/unx/gtk/a11y/atkaction.cxx |   11 -
 vcl/unx/gtk/a11y/atkcomponent.cxx  |   11 -
 vcl/unx/gtk/a11y/atkeditabletext.cxx   |   11 -
 vcl/unx/gtk/a11y/atkhypertext.cxx  |   11 -
 vcl/unx/gtk/a11y/atkimage.cxx  |   11 -
 vcl/unx/gtk/a11y/atkselection.cxx  |   11 -
 vcl/unx/gtk/a11y/atktable.cxx  |   11 -
 vcl/unx/gtk/a11y/atktext.cxx   |   44 +
 vcl/unx/gtk/a11y/atktextattributes.cxx |   11 -
 vcl/unx/gtk/a11y/atkutil.cxx   |   11 -
 vcl/unx/gtk/a11y/atkvalue.cxx  |   11 -
 vcl/unx/gtk/a11y/atkwrapper.cxx|  266 +
 vcl/unx/gtk/a11y/atkwrapper.hxx|   34 
 13 files changed, 201 insertions(+), 253 deletions(-)

New commits:
commit a0ef7474521413c8967559a635e6fdc0d88f1df6
Author: Kohei Yoshida 
Date:   Mon Nov 21 23:01:31 2016 -0500

tdf#71409: Use weak reference to avoid potential circular references.

AtkListener shouldn't be holding a reference back to the context /
broadcaster it listens to, as the latter also holds a reference to
the former.

Change-Id: Ie75cc4667f614752db710c20acbb83b93783654f
Reviewed-on: https://gerrit.libreoffice.org/31063
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index c9e3ec7..ef3c2ba 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -48,14 +48,11 @@ static 
css::uno::Reference
 {
 AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( action );
 
-if( pWrap )
+if (pWrap)
 {
-if( !pWrap->mpAction.is() )
-{
-pWrap->mpAction.set(pWrap->mpContext, css::uno::UNO_QUERY);
-}
-
-return pWrap->mpAction;
+uno::Reference xAction(
+pWrap->mpContext.get(), uno::UNO_QUERY);
+return xAction;
 }
 
 return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx 
b/vcl/unx/gtk/a11y/atkcomponent.cxx
index cbc4b8e..60600b2 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.cxx
@@ -27,14 +27,11 @@ static 
css::uno::Reference
 getComponent( AtkComponent *pComponent ) throw (uno::RuntimeException)
 {
 AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pComponent );
-if( pWrap )
+if (pWrap)
 {
-if( !pWrap->mpComponent.is() )
-{
-pWrap->mpComponent.set(pWrap->mpContext, css::uno::UNO_QUERY);
-}
-
-return pWrap->mpComponent;
+uno::Reference xComp(
+pWrap->mpContext.get(), uno::UNO_QUERY);
+return xComp;
 }
 
 return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx 
b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index f601f13..ee984bd 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx
@@ -31,14 +31,11 @@ static 
css::uno::Reference
 getEditableText( AtkEditableText *pEditableText ) throw 
(uno::RuntimeException)
 {
 AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pEditableText );
-if( pWrap )
+if (pWrap)
 {
-if( !pWrap->mpEditableText.is() )
-{
-pWrap->mpEditableText.set(pWrap->mpContext, css::uno::UNO_QUERY);
-}
-
-return pWrap->mpEditableText;
+uno::Reference xET(
+pWrap->mpContext.get(), uno::UNO_QUERY);
+return xET;
 }
 
 return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx 
b/vcl/unx/gtk/a11y/atkhypertext.cxx
index ff95255..4c28bab 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -193,14 +193,11 @@ static 
css::uno::Reference
 getHypertext( AtkHypertext *pHypertext ) throw (uno::RuntimeException)
 {
 AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pHypertext );
-if( pWrap )
+if (pWrap)
 {
-if( !pWrap->mpHypertext.is() )
-{
-pWrap->mpHypertext.set(pWrap->mpContext, css::uno::UNO_QUERY);
-}
-
-return pWrap->mpHypertext;
+uno::Reference xAH(
+pWrap->mpContext.get(), uno::UNO_QUERY);
+return xAH;
 }
 
 return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index c1652a4..873cddd 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.cxx
@@ -39,14 +39,11 @@ static 
css::uno::Reference
 getImage( AtkImage *pImage ) throw (uno::RuntimeException)
 {
 AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pImage );
-if( pWrap )
+if (pWrap)
 {
-if( !pWrap->mpImage.is() )
-{
-pWrap->mpImage.set(pWrap->mpContext, css::uno::UNO_QUERY);
-}
-
-return pWrap->mpImage;
+uno::Reference xAI(
+pWrap->mpContext.get(), uno::UNO_QUERY);
+return xAI;
 }
 
 return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atkselection.cxx 
b/vcl/unx/gtk/a11y/atkselection.

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

2016-11-22 Thread Kohei Yoshida

 vcl/unx/gtk/a11y/atklistener.cxx |   20 
 vcl/unx/gtk/a11y/atklistener.hxx |2 ++
 2 files changed, 22 insertions(+)

New commits:
commit 87e040fd0f04307534920d0765af6d5878794a98
Author: Kohei Yoshida 
Date:   Mon Nov 21 22:56:46 2016 -0500

tdf#71409: Stop listening to objects going out-of-focus.

This helps eliminate the number of AtkListener objects growing
over time.

Change-Id: I5cfeac8beae8e950382116544da99ad9c1c1a254
Reviewed-on: https://gerrit.libreoffice.org/31062
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index 5cc6083..39930b2 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -121,6 +121,9 @@ void AtkListener::updateChildList(
 css::uno::Reference const &
 pContext)
 {
+if (!pContext.is())
+return;
+
  m_aChildList.clear();
 
  uno::Reference< accessibility::XAccessibleStateSet > xStateSet = 
pContext->getAccessibleStateSet();
@@ -255,6 +258,19 @@ void AtkListener::handleInvalidateChildren(
 }
 }
 
+void AtkListener::stopListening()
+{
+uno::Reference xBroadcaster(
+mpWrapper->mpContext.get(), uno::UNO_QUERY);
+
+if (xBroadcaster.is())
+{
+uno::Reference 
xListener(this);
+if (xListener.is())
+xBroadcaster->removeAccessibleEventListener(xListener);
+}
+}
+
 /*/
 
 static uno::Reference< accessibility::XAccessibleContext >
@@ -346,6 +362,10 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 gboolean bState = eNewState != ATK_STATE_INVALID;
 AtkStateType eRealState = bState ? eNewState : eOldState;
 
+if (eOldState == ATK_STATE_FOCUSED)
+// Stop listening to object going out-of-focus.
+stopListening();
+
 atk_object_notify_state_change( atk_obj, eRealState, bState );
 break;
 }
diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index 39dbe5d..fccf031 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.hxx
@@ -66,6 +66,8 @@ private:
 // Process INVALIDATE_ALL_CHILDREN notification
 void handleInvalidateChildren(
 const css::uno::Reference< css::accessibility::XAccessibleContext >& 
rxParent);
+
+void stopListening();
 };
 
 #endif // INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Noel Grandin

 dbaccess/source/ui/inc/JoinExchange.hxx  |1 
 dbaccess/source/ui/querydesign/JoinExchange.cxx  |2 
 sc/source/filter/excel/xltools.cxx   |   29 +++
 sc/source/filter/inc/xltools.hxx |9 --
 sd/source/ui/dlg/PhotoAlbumDialog.cxx|3 
 sd/source/ui/dlg/PhotoAlbumDialog.hxx|1 
 sd/source/ui/framework/factories/PresentationFactory.cxx |6 -
 sd/source/ui/inc/framework/PresentationFactory.hxx   |2 
 sd/source/ui/view/ToolBarManager.cxx |8 -
 ucb/source/cacher/cachedcontentresultset.cxx |   61 ++-
 ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx  |   27 +++---
 ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx  |   15 ---
 12 files changed, 56 insertions(+), 108 deletions(-)

New commits:
commit e010834dc1a82fcb80dc23025001a752a0fb60a4
Author: Noel Grandin 
Date:   Tue Nov 22 12:41:43 2016 +0200

remove some more global OUStrings

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

diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx 
b/dbaccess/source/ui/inc/JoinExchange.hxx
index 450975c..8e16380 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -33,7 +33,6 @@ namespace dbaui
 typedef ::cppu::ImplHelper1< css::lang::XUnoTunnel > OJoinExchObj_Base;
 class OJoinExchObj : public TransferableHelper, public OJoinExchObj_Base
 {
-static OUString m_sJoinFormat;
 boolm_bFirstEntry;
 
 protected:
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx 
b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index c4c0dcf..bca06ae 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -28,8 +28,6 @@ namespace dbaui
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer;
 
-OUString OJoinExchObj::m_sJoinFormat;
-
 // class OJoinExchObj
 OJoinExchObj::OJoinExchObj(const OJoinExchangeData& jxdSource,bool 
_bFirstEntry)
 :m_bFirstEntry(_bFirstEntry)
diff --git a/sc/source/filter/excel/xltools.cxx 
b/sc/source/filter/excel/xltools.cxx
index 1392eb5..f2e33cf 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -434,9 +434,8 @@ OUString XclTools::GetXclFontName( const OUString& 
rFontName )
 }
 
 // built-in defined names
-const OUString XclTools::maDefNamePrefix( "Excel_BuiltIn_" );
-
-const OUString XclTools::maDefNamePrefixXml ( "_xlnm." );
+static const char maDefNamePrefix[]= "Excel_BuiltIn_"; /// Prefix for 
built-in defined names.
+static const char maDefNamePrefixXml[] = "_xlnm."; /// Prefix for 
built-in defined names for OOX
 
 static const sal_Char* const ppcDefNames[] =
 {
@@ -483,7 +482,7 @@ OUString XclTools::GetBuiltInDefNameXml( sal_Unicode 
cBuiltIn )
 
 sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName )
 {
-sal_Int32 nPrefixLen = maDefNamePrefix.getLength();
+sal_Int32 nPrefixLen = strlen(maDefNamePrefix);
 if( rDefName.startsWithIgnoreAsciiCase( maDefNamePrefix ) )
 {
 for( sal_Unicode cBuiltIn = 0; cBuiltIn < EXC_BUILTIN_UNKNOWN; 
++cBuiltIn )
@@ -505,8 +504,8 @@ sal_Unicode XclTools::GetBuiltInDefNameIndex( const 
OUString& rDefName )
 
 // built-in style names
 
-const OUString XclTools::maStyleNamePrefix1( "Excel_BuiltIn_" );
-const OUString XclTools::maStyleNamePrefix2( "Excel Built-in " );
+static const char maStyleNamePrefix1[] = "Excel_BuiltIn_";  /// Prefix for 
built-in cell style names.
+static const char maStyleNamePrefix2[] = "Excel Built-in "; /// Prefix for 
built-in cell style names from OOX filter.
 
 static const sal_Char* const ppcStyleNames[] =
 {
@@ -565,9 +564,9 @@ bool XclTools::IsBuiltInStyleName( const OUString& 
rStyleName, sal_uInt8* pnStyl
 
 sal_Int32 nPrefixLen = 0;
 if( rStyleName.startsWithIgnoreAsciiCase( maStyleNamePrefix1 ) )
-nPrefixLen = maStyleNamePrefix1.getLength();
+nPrefixLen = strlen(maStyleNamePrefix1);
 else if( rStyleName.startsWithIgnoreAsciiCase( maStyleNamePrefix2 ) )
-nPrefixLen = maStyleNamePrefix2.getLength();
+nPrefixLen = strlen(maStyleNamePrefix2);
 if( nPrefixLen > 0 )
 {
 for( sal_uInt8 nId = 0; nId < SAL_N_ELEMENTS( ppcStyleNames ); ++nId )
@@ -629,8 +628,8 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, 
sal_uInt8& rnLevel, cons
 
 // conditional formatting style names
 
-const OUString XclTools::maCFStyleNamePrefix1( "Excel_CondFormat_" );
-const OUString XclTools::maCFStyleNamePrefix2( "ConditionalStyle_" );
+static const char maCFStyleNamePrefix1[] = "Excel_CondFormat_"; /// Prefix for 
cond. formatting style names.
+static const char

[Libreoffice-commits] core.git: basic/CppunitTest_basic_scanner.mk dbaccess/CppunitTest_dbaccess_dialog_save.mk dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk dbaccess/CppunitTest_dbaccess_macros_

2016-11-22 Thread Michael Stahl

 basic/CppunitTest_basic_scanner.mk |6 +++---
 dbaccess/CppunitTest_dbaccess_RowSetClones.mk  |4 
 dbaccess/CppunitTest_dbaccess_dialog_save.mk   |4 
 dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk |4 
 dbaccess/CppunitTest_dbaccess_macros_test.mk   |4 
 dbaccess/CppunitTest_dbaccess_nolib_save.mk|4 
 editeng/Module_editeng.mk  |2 +-
 filter/CppunitTest_filter_dxf_test.mk  |2 +-
 filter/CppunitTest_filter_pict_test.mk |8 
 sal/CppunitTest_sal_rtl_oustring.mk|6 +++---
 svl/CppunitTest_svl_lngmisc.mk |3 ++-
 svx/CppunitTest_svx_unit.mk|4 
 12 files changed, 14 insertions(+), 37 deletions(-)

New commits:
commit 6a18fdceb5e6a2f2f9029ec767b405b4475a19e0
Author: Michael Stahl 
Date:   Mon Nov 21 23:10:52 2016 +0100

trivial makefile cleanups

Change-Id: Ida5bdfa06ecd7907305f4f171ca5ab64260d0259

diff --git a/basic/CppunitTest_basic_scanner.mk 
b/basic/CppunitTest_basic_scanner.mk
index c921cc5..aa03f41 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -41,9 +41,9 @@ $(eval $(call 
gb_CppunitTest_use_system_win32_libs,basic_scanner, \
 endif
 
 $(eval $(call gb_CppunitTest_set_include,basic_scanner,\
--I$(SRCDIR)/basic/source/inc \
--I$(SRCDIR)/basic/inc \
-$$(INCLUDE) \
+   -I$(SRCDIR)/basic/source/inc \
+   -I$(SRCDIR)/basic/inc \
+   $$(INCLUDE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk 
b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index c41c3fe..31dfae5 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -59,10 +59,6 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,dbaccess_RowSetClones,\
-$$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,dbaccess_RowSetClones,\
 offapi \
 oovbaapi \
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk 
b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
index 19d7767..0285625 100644
--- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
@@ -55,10 +55,6 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_dialog_save, \
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,dbaccess_dialog_save,\
-$$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,dbaccess_dialog_save,\
 offapi \
 oovbaapi \
diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk 
b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
index ffb2937..3c01fe0 100644
--- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
@@ -55,10 +55,6 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_empty_stdlib_save, \
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,dbaccess_empty_stdlib_save,\
-$$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,dbaccess_empty_stdlib_save,\
 offapi \
 oovbaapi \
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk 
b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 6a2bbc1..115bbfb 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -55,10 +55,6 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_macros_test, \
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\
-$$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
 offapi \
 oovbaapi \
diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk 
b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
index 3559cee..258eeb5 100644
--- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
@@ -55,10 +55,6 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_nolib_save, \
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,dbaccess_nolib_save,\
-$$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,dbaccess_nolib_save,\
 offapi \
 oovbaapi \
diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk
index 22f3602..f48dde9 100644
--- a/editeng/Module_editeng.mk
+++ b/editeng/Module_editeng.mk
@@ -20,7 +20,7 @@
 $(eval $(call gb_Module_Module,editeng))
 
 $(eval $(call gb_Module_add_targets,editeng,\
-CustomTarget_generated \
+   CustomTarget_generated \
Library_editeng \
 ))
 
diff --git a/filter/CppunitTest_filter_dxf_test.mk 
b/filter/CppunitTest_filter_dxf_test.mk
index 362c89b..19511c7 100644
--- a/filter/CppunitTest_filter_dxf_test.mk
+++ b/filter/CppunitTest_filter_dxf_test.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,filter_dxf_test, \
 ))
 
 $(eval $(

Re: SHELL in Mail Merge code

2016-11-22 Thread Jan-Marek Glogowski

Hi Alex,

Am 22.11.2016 um 09:45 schrieb Alex McMurchy:
> This Mail Merge code
> 
>> const bool bMT_EMAIL   = rMergeDescriptor.nMergeType ==
>> DBMGR_MERGE_EMAIL;
>> const bool bMT_SHELL   = rMergeDescriptor.nMergeType ==
>> DBMGR_MERGE_SHELL;
>> const bool bMT_PRINTER = rMergeDescriptor.nMergeType ==
>> DBMGR_MERGE_PRINTER;
>> const bool bMT_FILE= rMergeDescriptor.nMergeType ==
>> DBMGR_MERGE_FILE;
> 
> appears in sw/source/uibase/dbui/dbmgr.cxx
> 
> I'm mostly familiar with the EMAIL, PRINTER and FILE and when and how to
> test/use them.
> 
> What I'm not familiar is SHELL. What is it in respect of Mail Merge and
> under what circumstances would I use if and how?

This is used LO internally or via UNO to directly display a single
merged FILE document (the document shell) used by the wizard or plugins,
like WollMux.

So instead of writing the merged file and open it, mail merge returns a
reference to the generated document. This helps a lot with large
documents, because we don't have to open the document to display it to
the user.

> Regards

Jan-Marek

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

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

2016-11-22 Thread Noel Grandin

 cui/source/factory/dlgfact.hxx  |2 +-
 include/sfx2/StyleManager.hxx   |2 +-
 include/sfx2/StylePreviewRenderer.hxx   |2 +-
 include/sfx2/app.hxx|4 ++--
 include/sfx2/basedlgs.hxx   |4 ++--
 include/sfx2/ctrlitem.hxx   |2 +-
 include/sfx2/dispatch.hxx   |4 ++--
 include/sfx2/dockwin.hxx|2 +-
 include/sfx2/event.hxx  |2 +-
 include/sfx2/fcontnr.hxx|2 +-
 include/sfx2/filedlghelper.hxx  |4 ++--
 include/sfx2/frame.hxx  |5 ++---
 include/sfx2/hintpost.hxx   |2 +-
 include/sfx2/inputdlg.hxx   |2 +-
 include/sfx2/ipclient.hxx   |2 +-
 include/sfx2/linkmgr.hxx|2 +-
 include/sfx2/lnkbase.hxx|2 +-
 include/sfx2/new.hxx|2 +-
 include/sfx2/objsh.hxx  |   12 ++--
 include/sfx2/recentdocsviewitem.hxx |2 +-
 include/sfx2/request.hxx|4 ++--
 include/sfx2/sfxdlg.hxx |2 +-
 include/sfx2/sfxhtml.hxx|   10 +-
 include/sfx2/sidebar/SidebarToolBox.hxx |2 +-
 include/sfx2/tabdlg.hxx |2 +-
 include/sfx2/templatedlg.hxx|2 +-
 include/sfx2/thumbnailview.hxx  |2 +-
 include/sfx2/viewfrm.hxx|   10 +-
 include/sfx2/viewsh.hxx |2 +-
 include/svx/CommonStyleManager.hxx  |2 +-
 30 files changed, 49 insertions(+), 50 deletions(-)

New commits:
commit ac9ba521176c602544bf5fe1fdc1d216bfdd9849
Author: Noel Grandin 
Date:   Tue Nov 22 10:36:54 2016 +0200

loplugin:countusersofdefaultparams in include/sfx2

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

diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 2170fd8..79f3e7c 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -486,7 +486,7 @@ public:
 virtual VclPtr
CreateInsertObjectDialog( 
vcl::Window* pParent, const OUString& rCommmand,
 const css::uno::Reference < 
css::embed::XStorage >& xStor,
-const SvObjectServerList* pList = 
nullptr ) override;
+const SvObjectServerList* pList ) 
override;
 virtual VclPtr  CreateEditObjectDialog( const 
OUString& rCommmand,
 const css::uno::Reference < 
css::embed::XEmbeddedObject >& xObj ) override;
 virtual VclPtr CreatePasteDialog( vcl::Window* 
pParent ) override;
diff --git a/include/sfx2/StyleManager.hxx b/include/sfx2/StyleManager.hxx
index c6e7c23..b67a710 100644
--- a/include/sfx2/StyleManager.hxx
+++ b/include/sfx2/StyleManager.hxx
@@ -39,7 +39,7 @@ public:
 
 virtual StylePreviewRenderer* CreateStylePreviewRenderer(
 OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle,
-long nMaxHeight = 32) = 0;
+long nMaxHeight) = 0;
 };
 
 } // end namespace sfx2
diff --git a/include/sfx2/StylePreviewRenderer.hxx 
b/include/sfx2/StylePreviewRenderer.hxx
index 971ce01..2cace91 100644
--- a/include/sfx2/StylePreviewRenderer.hxx
+++ b/include/sfx2/StylePreviewRenderer.hxx
@@ -37,7 +37,7 @@ public:
 StylePreviewRenderer(const SfxObjectShell& rShell,
  OutputDevice& rOutputDev,
  SfxStyleSheetBase* pStyle,
- long nMaxHeight = 32)
+ long nMaxHeight)
 : mrShell(rShell)
 , mrOutputDev(rOutputDev)
 , mpStyle(pStyle)
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 63cc030..74d2900 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -155,7 +155,7 @@ public:
 /**
 * @param pArgs Takes ownership
 */
-sal_uIntPtr   LoadTemplate( SfxObjectShellLock& xDoc, 
const OUString& rFileName, SfxItemSet* pArgs = nullptr );
+sal_uIntPtr   LoadTemplate( SfxObjectShellLock& xDoc, 
const OUString& rFileName, SfxItemSet* pArgs );
 vcl::Window* GetTopWindow() const;
 
 // members
@@ -226,7 +226,7 @@ public:
 SAL_DLLPRIVATE void SetLastDir_Impl( const OUString & );
 
 SAL_DLLPRIVATE static void  Registrations_Impl();
-SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame 
*pFrame=nullptr) const;
+SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame 
*pFrame) const;
 
 // TODO/CLEANUP: still needed? -- unclear whether this comment
 // refers to the GetDisabledSlotList_Impl() method which was
diff --git a/includ

[Libreoffice-commits] dev-tools.git: esc-reporting/qa-tools.py

2016-11-22 Thread Xisco Fauli

 esc-reporting/qa-tools.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0b03e41e0dd62e23c5c302b98f92845df08c2e85
Author: Xisco Fauli 
Date:   Tue Nov 22 12:39:27 2016 +0100

Make path relative

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index b820ee4..1217def 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -148,7 +148,7 @@ def util_check_bugzilla_mail(statList, mail, name, 
date=None):
 statList['people'][mail]['newest'] = date
 
 def get_bugzilla(cfg):
-fileName = '/home/xisco/stats/dump/bugzilla_dump.json'
+fileName = homeDir + 'dump/bugzilla_dump.json'
 return util_load_file(fileName)
 
 def isOpen(status):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py

2016-11-22 Thread Xisco Fauli

 esc-reporting/esc-analyze.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d3b27e1b9988358f27878fdebbaa23a8525172e
Author: Xisco Fauli 
Date:   Tue Nov 22 12:29:55 2016 +0100

Revert this changes pushed accidentally

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 6245173..f6d7cf7 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -470,7 +470,7 @@ def runCfg(platform):
 if 'esc_homedir' in os.environ:
   homeDir = os.environ['esc_homedir']
 else:
-  homeDir = '/home/xisco/dev-tools/esc-reporting'
+  homeDir = '/home/jani/esc'
 cfg = util_load_data_file(homeDir + '/config.json')
 cfg['homedir'] = homeDir + '/'
 cfg['platform'] = platform
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/qa-tools.py

2016-11-22 Thread Xisco Fauli

 esc-reporting/esc-analyze.py |2 
 esc-reporting/qa-tools.py|  605 +++
 2 files changed, 606 insertions(+), 1 deletion(-)

New commits:
commit 09b57ca6d15509f266603cdc1b26904c017cc447
Author: Xisco Fauli 
Date:   Tue Nov 22 12:23:43 2016 +0100

Add qa-tools

Used for generating the Weekly Qa Report and the wikimedia tables

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index f6d7cf7..6245173 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -470,7 +470,7 @@ def runCfg(platform):
 if 'esc_homedir' in os.environ:
   homeDir = os.environ['esc_homedir']
 else:
-  homeDir = '/home/jani/esc'
+  homeDir = '/home/xisco/dev-tools/esc-reporting'
 cfg = util_load_data_file(homeDir + '/config.json')
 cfg['homedir'] = homeDir + '/'
 cfg['platform'] = platform
diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
new file mode 100755
index 000..b820ee4
--- /dev/null
+++ b/esc-reporting/qa-tools.py
@@ -0,0 +1,605 @@
+#!/usr/bin/env python3
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import sys
+import os
+import datetime
+import json
+
+homeDir = '/home/xisco/stats/'
+
+reportPeriod = '7d'
+
+newUsersPeriod = '7d'
+
+targets_list = ['5.3.0']
+
+periods_list = ['30d', '60d', '90d']
+
+priorities_list = ['highest','high','medium','low','lowest']
+
+severities_list = ['blocker', 'critical', 'major', 'normal', 'minor', 
'trivial','enhancement']
+
+statutes_list = ['UNCONFIRMED', 'NEW', 'CLOSED', 'NEEDINFO', 'REOPENED', 
'ASSIGNED', 'RESOLVED_FIXED',
+'RESOLVED_DUPLICATE', 'RESOLVED_WORKSFORME', 'RESOLVED_NOTABUG', 
'RESOLVED_NOTOURBUG', 'RESOLVED_WONTFIX',
+'RESOLVED_INVALID', 'RESOLVED_MOVED', 'RESOLVED_INSUFFICIENTDATA', 
'VERIFIED_FIXED', 'VERIFIED_DUPLICATE',
+'VERIFIED_WORKSFORME', 'VERIFIED_NOTABUG', 'VERIFIED_NOTOURBUG', 
'VERIFIED_WONTFIX', 'VERIFIED_INVALID',
+'VERIFIED_MOVED', 'VERIFIED_INSUFFICIENTDATA']
+
+keywords_list = ['accessibility', 'bibisected', 'bibisectNotNeeded', 
'bibisectRequest', 'bisected', 'corruptProfile',
+'dataLoss', 'easyHack', 'filter:doc', 'filter:docx', 'filter:emf', 
'filter:fodp', 'filter:fodt', 'filter:html',
+'filter:odf', 'filter:odp', 'filter:ods', 'filter:odt', 
'filter:ooxml', 'filter:pdf', 'filter:ppt',
+'filter:pptx', 'filter:rtf', 'filter:svgInsert', 'filter:svgOpen', 
'filter:visio', 'filter:xls', 'filter:xlsx',
+'haveBacktrace', 'implementationError', 'needsConfirmationAdvice', 
'needsDevAdvice', 'needsDevEval',
+'needsUXEval', 'needUITest', 'notBibisectable', 'patch', 'perf', 
'possibleRegression', 'preBibisect',
+'regression', 'security', 'text:cjk', 'text:ctl', 'text:rtl', 
'wantBacktrace']
+
+system_list = ['All', 'Linux (All)', 'Android', 'Windows (All)', 'Mac OS X 
(All)', 'iOS', 'FreeBSD', 'NetBSD', 'OpenBSD',
+'BSD (Others)', 'Solaris', 'Cygwin', 'AIX', 'HP-UX', 'IRIX', 
'Interix', 'other']
+
+product_list = ['cppunit', 'Document Liberation Project', 'Impress Remote', 
'libabw', 'libetonyek', 'libexttextcatYes',
+'libfreehand', 'libgltf', 'libmspub', 'libpagemaker', 'LibreOffice', 
'LibreOffice Online', 'libvisio', 'QA Tools']
+
+def util_load_file(fileName):
+try:
+fp = open(fileName, encoding='utf-8')
+rawData = json.load(fp)
+fp.close()
+except Exception as e:
+print('Error load file ' + fileName + ' due to ' + str(e))
+rawData = None
+pass
+return rawData
+
+def util_dump_file(fileName, rawList):
+try:
+fp = open(fileName, 'w', encoding='utf-8')
+json.dump(rawList, fp, ensure_ascii=False, indent=4, sort_keys=True)
+fp.close()
+except Exception as e:
+print('Error dump file ' + fileName + ' due to ' + str(e))
+os.remove(fileName)
+exit(-1)
+
+def util_create_person_bugzilla(email, name):
+return { 'name': name,
+ 'email': email,
+ 'oldest': datetime.datetime.now(),
+ 'newest': datetime.datetime(2001, 1, 1)
+}
+
+def util_create_detailed_person(email):
+return { 'email': email,
+ 'bugs': [],
+ 'created': 0,
+ 'comments':0,
+ 'status_changed': 0,
+ 'keyword_added': 0,
+ 'keyword_removed': 0,
+ 'severity_changed': 0,
+ 'priority_changed': 0,
+ 'system_changed': 0
+ }
+
+def util_create_statList():
+return {
+'data': 
+{
+'bugs':
+{
+ 'all':
+ {
+ 'count': 0,
+ 'status': {s:0 for s in statutes_list},
+

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

2016-11-22 Thread Stephan Bergmann

 compilerplugins/clang/oslendian.cxx  |  116 +++
 compilerplugins/clang/test/oslendian-1.cxx   |   47 ++
 compilerplugins/clang/test/oslendian-2.cxx   |   23 +
 compilerplugins/clang/test/oslendian-3.cxx   |   25 +
 solenv/CompilerTest_compilerplugins_clang.mk |3 
 5 files changed, 214 insertions(+)

New commits:
commit 0de1b34a89a5bafa87a031da7e53e902ec14312c
Author: Stephan Bergmann 
Date:   Tue Nov 22 10:54:25 2016 +0100

New loplugin:oslendian

...to catch new places where defined'ness of OSL_BIG/LITENDIAN would be 
checked
without osl/endian.h being included; cf.
e2f08f9def0869460ad38a1c2adb450778290f6e "connectivity, sc: add missing 
#include
" and 2b14fb3a4f92b928f0a5fc536c6a5f4a6e51a9b8 "cppcanvas, 
oox:
add missing #include ".

Change-Id: I167c8916a01391b7dacad7325153ccf35d3ba9dc

diff --git a/compilerplugins/clang/oslendian.cxx 
b/compilerplugins/clang/oslendian.cxx
new file mode 100644
index 000..99b2851
--- /dev/null
+++ b/compilerplugins/clang/oslendian.cxx
@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include "compat.hxx"
+#include "plugin.hxx"
+
+namespace {
+
+class OslEndian: public loplugin::Plugin, public PPCallbacks {
+public:
+explicit OslEndian(InstantiationData const & data): Plugin(data) {
+compat::addPPCallbacks(compiler.getPreprocessor(), this);
+}
+
+enum { isPPCallback = true };
+
+private:
+void run() override {}
+
+void MacroDefined(Token const & MacroNameTok, MacroDirective const *)
+override
+{
+auto id = MacroNameTok.getIdentifierInfo()->getName();
+if (id == "OSL_BIGENDIAN") {
+if (definedLit_.isValid()) {
+report(
+DiagnosticsEngine::Warning,
+"macro %0 defined in addition to 'OSL_LITENDIAN'",
+MacroNameTok.getLocation())
+<< MacroNameTok.getIdentifierInfo();
+report(
+DiagnosticsEngine::Note,
+"conflicting macro definition is here", definedLit_);
+}
+definedBig_ = MacroNameTok.getLocation();
+assert(definedBig_.isValid());
+} else if (id == "OSL_LITENDIAN") {
+if (definedBig_.isValid()) {
+report(
+DiagnosticsEngine::Warning,
+"macro %0 defined in addition to 'OSL_BIGENDIAN'",
+MacroNameTok.getLocation())
+<< MacroNameTok.getIdentifierInfo();
+report(
+DiagnosticsEngine::Note,
+"conflicting macro definition is here", definedBig_);
+}
+definedLit_ = MacroNameTok.getLocation();
+assert(definedLit_.isValid());
+}
+}
+
+void MacroUndefined(Token const & MacroNameTok, MacroDefinition const &)
+override
+{
+auto id = MacroNameTok.getIdentifierInfo()->getName();
+if (id == "OSL_BIGENDIAN" || id == "OSL_LITENDIAN") {
+report(
+DiagnosticsEngine::Warning, "macro %0 undefinition",
+MacroNameTok.getLocation())
+<< MacroNameTok.getIdentifierInfo();
+}
+}
+
+void Defined(
+Token const & MacroNameTok, MacroDefinition const &, SourceRange)
+override
+{
+check(MacroNameTok);
+}
+
+void Ifdef(
+SourceLocation, Token const & MacroNameTok, MacroDefinition const &)
+override
+{
+check(MacroNameTok);
+}
+
+void Ifndef(
+SourceLocation, Token const & MacroNameTok, MacroDefinition const &)
+override
+{
+check(MacroNameTok);
+}
+
+void check(Token const & macro) const {
+auto id = macro.getIdentifierInfo()->getName();
+if ((id == "OSL_BIGENDIAN" || id == "OSL_LITENDIAN")
+&& definedBig_.isInvalid() && definedLit_.isInvalid())
+{
+report(
+DiagnosticsEngine::Warning,
+"definition of macro %0 checked but 'osl/endian.h' is not"
+" included",
+macro.getLocation())
+<< macro.getIdentifierInfo();
+}
+}
+
+SourceLocation definedBig_;
+SourceLocation definedLit_;
+};
+
+loplugin::Plugin::Registration X("oslendian");
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/oslendian-1.cxx 
b/compilerplugins/clang/test/oslendian-1.cxx
new file mode 100644

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

2016-11-22 Thread Khaled Hosny

 extras/source/truetype/symbol/OpenSymbol.sfd |  620 ++-
 extras/source/truetype/symbol/opens___.ttf   |binary
 2 files changed, 616 insertions(+), 4 deletions(-)

New commits:
commit 37a14c5e359a554195fbcbe2805a284ccf4cb677
Author: Khaled Hosny 
Date:   Fri Nov 18 14:13:40 2016 +0200

Add the missing Adobe Symbol Encoding glyphs

Copied from SymbolNeu font which is metric compatible with Microsoftâs
Symbol font, from:

http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/croscorefonts-1.23.0.tar.gz

With the following license:
Licensed under the Apache License, Version 2.0

This fixes the original issue that was fixed in:

commit 8556cd881270823865662e9a7700da58d11c2785
Author: Miklos Vajna 
Date:   Thu Mar 6 09:48:54 2014 +0100

cp#139 DOC import: ignore symbol charset of the symbol font

Which was reverted in:

commit d8c386593e42e1f0cce52d052b1009c59e75afa2
Author: Khaled Hosny 
Date:   Thu Nov 17 15:03:39 2016 +0200

tdf#103944: Fix symbol font remapping

No test this time, as I donât think we can currently test which glyph
ended up being used (or the visual rendering of the document).

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

diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index ac9e2c8..f6582b3 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -3,8 +3,8 @@ FontName: OpenSymbol
 FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski
-Version: 102.8
+Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation
+Version: 102.9
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -20,7 +20,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1144938807
-ModificationTime: 1473153347
+ModificationTime: 1479471125
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
@@ -784,7 +784,7 @@ FitToEm: 1
 WinInfo: 0 34 12
 BeginPrivate: 0
 EndPrivate
-BeginChars: 1031 1031
+BeginChars: 1052 1052
 
 StartChar: Alpha
 Encoding: 0 913 0
@@ -108095,5 +108095,617 @@ LayerCount: 2
 Fore
 Refer: 1017 63731 N -1 0 0 1 1012 0 1
 EndChar
+
+StartChar: zero
+Encoding: 1031 48 1031
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+SplineSet
+946 676 m 0,0,1
+ 946 -20 946 -20 506 -20 c 0,2,3
+ 294 -20 294 -20 186 158 c 128,-1,4
+ 78 336 78 336 78 676 c 0,5,6
+ 78 1009 78 1009 186 1185.5 c 128,-1,7
+ 294 1362 294 1362 514 1362 c 0,8,9
+ 726 1362 726 1362 836 1187.5 c 128,-1,10
+ 946 1013 946 1013 946 676 c 0,0,1
+762 676 m 0,11,12
+ 762 998 762 998 701 1140 c 128,-1,13
+ 640 1282 640 1282 506 1282 c 0,14,15
+ 376 1282 376 1282 319 1148 c 128,-1,16
+ 262 1014 262 1014 262 676 c 0,17,18
+ 262 336 262 336 320 197.5 c 128,-1,19
+ 378 59 378 59 506 59 c 0,20,21
+ 638 59 638 59 700 204.5 c 128,-1,22
+ 762 350 762 350 762 676 c 0,11,12
+EndSplineSet
+EndChar
+
+StartChar: one
+Encoding: 1032 49 1032
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+SplineSet
+627 80 m 1,0,-1
+ 901 53 l 1,1,-1
+ 901 0 l 1,2,-1
+ 180 0 l 1,3,-1
+ 180 53 l 1,4,-1
+ 455 80 l 1,5,-1
+ 455 1174 l 1,6,-1
+ 184 1077 l 1,7,-1
+ 184 1130 l 1,8,-1
+ 575 1352 l 1,9,-1
+ 627 1352 l 1,10,-1
+ 627 80 l 1,0,-1
+EndSplineSet
+EndChar
+
+StartChar: two
+Encoding: 1033 50 1033
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+SplineSet
+911 0 m 1,0,-1
+ 90 0 l 1,1,-1
+ 90 147 l 1,2,-1
+ 276 316 l 1,3,4
+ 455 473 455 473 539 570 c 128,-1,5
+ 623 667 623 667 659.5 770 c 128,-1,6
+ 696 873 696 873 696 1006 c 0,7,8
+ 696 1136 696 1136 637 1204 c 128,-1,9
+ 578 1272 578 1272 444 1272 c 0,10,11
+ 391 1272 391 1272 335 1257.5 c 128,-1,12
+ 279 1243 279 1243 236 1219 c 1,13,-1
+ 201 1055 l 1,14,-1
+ 135 1055 l 1,15,-1
+ 135 1313 l 1,16,17
+ 317 1356 317 1356 444 1356 c 0,18,19
+ 664 1356 664 1356 774.5 1264.5 c 128,-1,20
+ 885 1173 885 1173 885 1006 c 0,21,22
+ 885 894 885 894 841.5 794.5 c 128,-1,23
+ 798 695 798 695 708 596.5 c 128,-1,24
+ 618 498 618 498 410 321 c 0,25,26
+ 321 245 321 245 221 154 c 1,27,-1
+ 911 154 l 1,28,-1
+ 911 0 l 1,0,-1
+EndSplineSet
+EndChar
+
+StartChar: three
+Encoding: 1034 51 1034
+Width: 1024
+Flags: W

Re: Tip for debugging CppunitTest_sd_tiledrendering failure

2016-11-22 Thread Miklos Vajna

Hi Khaled,

On Tue, Nov 22, 2016 at 08:55:33AM +0200, Khaled Hosny  
wrote:
> Thanks for the pointer. Incrementing the Y position by at least 1 fixes
> the test, but I’m still not sure what the position is supposed to be in
> the first place and why line spacing would matter.

Indeed it should not matter. SdTiledRenderingTest::testPostMouseEvent()
loads an Impress document, presses "x" (which in that context stars the
text edit of the only shape on the first slide), gets the position of
the cursor and then clicks to the same place, but 1000 mm100 away
towards the left edge of the slide.

Then it asserts that after the mouse click the cursor is no longer
after the "x" but before it.

The 1000 mm100 is indeed just something I came up with, assuming it is
larger than the width of "x" and smaller than the total width of the
text area of the shape. But in case it helps, feel free to tweak it,
just make sure that the asserts still pass:
rEditView.GetSelection().nStartPos should be "1" before clicking with
the mouse and it should be "0" after.

Maybe CPPUNIT_ASSERT(pView->GetTextEditObject()) currently fails as
after your changes the text area rectangle is changed, and 1000 is large
enough that it clicks outside the text area, finishing the whole text
edit, instead of just moving the cursor before "x"?

Another option: given that you mention incrementing Y by 1 changes the
situation, it would be fine to work with the "vertical center" of the
cursor not the "top" of it when we decide the click position.

Does this help? It would be no problem to include this change.

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 2d2cc99..4122adc 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -351,7 +351,7 @@ void SdTiledRenderingTest::testPostMouseEvent()
 CPPUNIT_ASSERT_EQUAL(static_cast(1), 
rEditView.GetSelection().nStartPos);

 vcl::Cursor* pCursor = rEditView.GetCursor();
-Point aPosition = pCursor->GetPos();
+Point aPosition(pCursor->GetPos().getX(), pCursor->GetPos().getY() + 
pCursor->GetSize().Height() / 2);
 aPosition.setX(aPosition.getX() - 1000);
 pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
   convertMm100ToTwip(aPosition.getX()), 
convertMm100ToTwip(aPosition.getY()),

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: translations

2016-11-22 Thread Andras Timar

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

New commits:
commit 4ebf1ea7cb66fc3e6b94cd38dd233aaead69f3d5
Author: Andras Timar 
Date:   Tue Nov 22 10:38:24 2016 +0100

Updated core
Project: translations  f88396624a2f348f845818564210947f3e738e55

Updated Slovenian translation

Change-Id: I5766d65b3a525745e7d02c316ab2b27ac79a448f

diff --git a/translations b/translations
index 4013287..f883966 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 401328740c69cd6ea0f27c537773bca184c01612
+Subproject commit f88396624a2f348f845818564210947f3e738e55
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/sl

2016-11-22 Thread Andras Timar

 source/sl/avmedia/source/framework.po  |4 
 source/sl/cui/uiconfig/ui.po   |4 
 source/sl/desktop/uiconfig/ui.po   |4 
 source/sl/helpcontent2/source/text/scalc/01.po |   26 +-
 source/sl/helpcontent2/source/text/shared/explorer/database.po |4 
 source/sl/helpcontent2/source/text/shared/guide.po |4 
 source/sl/helpcontent2/source/text/shared/optionen.po  |4 
 source/sl/helpcontent2/source/text/swriter/guide.po|4 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po  |4 
 source/sl/sc/source/ui/dbgui.po|   15 +
 source/sl/sc/source/ui/src.po  |  114 
+-
 source/sl/sc/uiconfig/scalc/ui.po  |4 
 source/sl/sd/source/core.po|   22 +
 source/sl/sfx2/source/view.po  |   14 -
 source/sl/sfx2/uiconfig/ui.po  |   51 
 source/sl/starmath/source.po   |4 
 source/sl/svx/uiconfig/ui.po   |4 
 source/sl/sw/uiconfig/swriter/ui.po|4 
 source/sl/xmlsecurity/uiconfig/ui.po   |4 
 19 files changed, 141 insertions(+), 153 deletions(-)

New commits:
commit f88396624a2f348f845818564210947f3e738e55
Author: Andras Timar 
Date:   Tue Nov 22 10:38:24 2016 +0100

Updated Slovenian translation

Change-Id: I5766d65b3a525745e7d02c316ab2b27ac79a448f

diff --git a/source/sl/avmedia/source/framework.po 
b/source/sl/avmedia/source/framework.po
index 78013e1..7adf08d 100644
--- a/source/sl/avmedia/source/framework.po
+++ b/source/sl/avmedia/source/framework.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-10-19 10:39+0200\n"
+"POT-Creation-Date: 2016-11-20 22:22+0100\n"
 "PO-Revision-Date: 2016-11-17 18:33+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index 262ad6f..256f52a 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.3\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-11-08 22:50+0100\n"
+"POT-Creation-Date: 2016-11-20 22:22+0100\n"
 "PO-Revision-Date: 2016-11-17 18:24+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/desktop/uiconfig/ui.po b/source/sl/desktop/uiconfig/ui.po
index c97a1d8..69a7d0d 100644
--- a/source/sl/desktop/uiconfig/ui.po
+++ b/source/sl/desktop/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.3\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-11-17 13:44+0100\n"
+"POT-Creation-Date: 2016-11-20 22:22+0100\n"
 "PO-Revision-Date: 2016-11-17 17:19+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/scalc/01.po 
b/source/sl/helpcontent2/source/text/scalc/01.po
index 0e42c70..d6b9c88 100644
--- a/source/sl/helpcontent2/source/text/scalc/01.po
+++ b/source/sl/helpcontent2/source/text/scalc/01.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.3\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-11-17 13:43+0100\n"
-"PO-Revision-Date: 2016-11-17 18:15+0200\n"
+"POT-Creation-Date: 2016-11-20 22:22+01

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

2016-11-22 Thread Stephan Bergmann

 solenv/CompilerTest_compilerplugins_clang.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4026c85d9d81bd49346597773c90e9167c4dae7b
Author: Stephan Bergmann 
Date:   Tue Nov 22 10:34:33 2016 +0100

Sort lines lexicographically

Change-Id: I4dc6bebb41b0e1beee58631fdf92dea82ae38db7

diff --git a/solenv/CompilerTest_compilerplugins_clang.mk 
b/solenv/CompilerTest_compilerplugins_clang.mk
index ae1a07f..3045fba 100644
--- a/solenv/CompilerTest_compilerplugins_clang.mk
+++ b/solenv/CompilerTest_compilerplugins_clang.mk
@@ -10,9 +10,9 @@
 $(eval $(call gb_CompilerTest_CompilerTest,compilerplugins_clang))
 
 $(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \
-compilerplugins/clang/test/salbool \
-compilerplugins/clang/test/finalprotected \
 compilerplugins/clang/test/datamembershadow \
+compilerplugins/clang/test/finalprotected \
+compilerplugins/clang/test/salbool \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread Laurent Balland-Poirier

 basic/qa/basic_coverage/test_array_methods.vb  |   38 +++
 basic/qa/basic_coverage/test_conversion_methods.vb |   59 +++
 basic/qa/basic_coverage/test_datetime_methods.vb   |   77 +++
 basic/qa/basic_coverage/test_logic_methods.vb  |   56 ++
 basic/qa/basic_coverage/test_math_methods.vb   |   73 ++
 basic/qa/basic_coverage/test_string_methods.vb |  107 +
 basic/qa/basic_coverage/test_system_methods.vb |   29 +
 7 files changed, 439 insertions(+)

New commits:
commit 8a50ea54546a51fc7a2a28174031e7351dbed10e
Author: Laurent Balland-Poirier 
Date:   Sat Oct 22 21:54:37 2016 +0200

tdf#102872 Add qa unit test for BASIC methods

Add test if several methods still works

Change-Id: I8d26e5e3555dbbc0f07152138e1bc0cd65d90998
Reviewed-on: https://gerrit.libreoffice.org/30166
Tested-by: Jenkins 
Reviewed-by: jan iversen 
Tested-by: jan iversen 
Reviewed-by: Laurent BP 

diff --git a/basic/qa/basic_coverage/test_array_methods.vb 
b/basic/qa/basic_coverage/test_array_methods.vb
new file mode 100644
index 000..093867a
--- /dev/null
+++ b/basic/qa/basic_coverage/test_array_methods.vb
@@ -0,0 +1,38 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Function doUnitTest as Integer
+dim aVector as Variant
+' ARRAY
+aVector = Array( Date(), Time(), "Hello", -3.14)
+If (aVector(2) <> "Hello") Then
+doUnitTest = 0
+' LBOUND
+Else If ( LBound( aVector() ) <> 0 ) Then
+doUnitTest = 0
+' TYPELEN
+Else If ( TypeLen(aVector(2)) <> 5 ) Then
+doUnitTest = 0
+' TYPENAME
+Else If ( TypeName(aVector(2)) <> "String" ) Then
+doUnitTest = 0
+' UBOUND
+Else If ( UBound( aVector() ) <> 3 ) Then
+doUnitTest = 0
+' VARTYPE
+Else If ( VarType(aVector(2)) <> 8 ) Then
+doUnitTest = 0
+Else
+doUnitTest = 1
+End If
+End If
+End If
+End If
+End If
+End If
+End Function
diff --git a/basic/qa/basic_coverage/test_conversion_methods.vb 
b/basic/qa/basic_coverage/test_conversion_methods.vb
new file mode 100644
index 000..7790cbc
--- /dev/null
+++ b/basic/qa/basic_coverage/test_conversion_methods.vb
@@ -0,0 +1,59 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Function doUnitTest as Integer
+Randomize 42
+dim aVector as Variant
+aVector = Array( Date(), Time(), "Hello", -3.14)
+' CBOOL
+If (CBool(3) <> True) Then
+doUnitTest = 0
+' CBYTE
+Else If (CByte("3") <> 3) Then
+doUnitTest = 0
+' CCUR
+Else If (CCur("100") <> 100) Then
+doUnitTest = 0
+' CDATE
+Else If (CDate(100) <> 100) Then
+doUnitTest = 0
+' CDEC
+'Else If (CDec("100") <> 100) Then
+'doUnitTest = 0
+' CDBL
+Else If (CDbl("100") <> 100) Then
+doUnitTest = 0
+' CINT
+Else If (CInt("100") <> 100) Then
+doUnitTest = 0
+' CLNG
+Else If (CLng("100") <> 100) Then
+doUnitTest = 0
+' CSNG
+Else If (CSng("100") <> 100) Then
+doUnitTest = 0
+' CSTR
+Else If (CStr(100) <> "100") Then
+doUnitTest = 0
+' VAL
+Else If ( Val("4") <> 4 ) Then
+doUnitTest = 0
+Else
+doUnitTest = 1
+End If
+End If
+End If
+End If
+End If
+End If
+End If
+End If
+End If
+End If
+'End If
+End Function
diff --git a/basic/qa/basic_coverage/test_datetime_methods.vb 
b/basic/qa/basic_coverage/test_datetime_methods.vb
new file mode 100644
index 000..679e129
--- /dev/null
+++ b/basic/qa/basic_coverage/test_datetime_methods.vb
@@ -0,0 +1,77 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Function doUnitTest as Integer
+dim aVector as Variant
+aVector = Array( Date(), Time(), "Hello", -3.14)
+' CDateFromUnoDate
+' CDateTomUnoDate
+' CDateFromUnoTime
+' CDateToUnoTime
+' CDateFromUnoDateTime
+' CDateToUnoDateTime
+' CDateFromIso CDateToIso
+If ( CDateToIso( CDateFromIso("20161016") ) <> "20161016" ) Then
+doUnitTest = 0
+' DATE DATEDIFF DATEADD
+Else If ( DateDiff( "d", aVector(0), DateAdd("d", 1, aVector(0)) ) <> 1 ) 
Then
+doUnitTest = 0
+' DATEPART  DAY
+Else If ( DatePart( "d", aVector(0) ) <> Day( aVector(0) ) )

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

2016-11-22 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/tdf103982.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|   10 ++
 sw/source/filter/ww8/docxsdrexport.cxx   |   13 +
 3 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit f9f7a4ddaed85427522834597271967ee494b436
Author: Miklos Vajna 
Date:   Tue Nov 22 09:23:28 2016 +0100

tdf#103982 DOCX export: make sure SdrObject margin is non-negative

Regression from commit a5a836d8c43dc9cebbbf8af39bf0142de603a7c6 (DOCX
filter: effect extent should be part of the margin, 2014-12-04), the
effect extent is added to the nominal margin in DOCX, so we exclude that
from the margin in our document model. But it shouldn't be ever
negative, ST_WrapDistance is a restriction of the W3C XML Schema
unsignedInt datatype.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf103982.docx 
b/sw/qa/extras/ooxmlexport/data/tdf103982.docx
new file mode 100644
index 000..13e6453
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf103982.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index a445ea2..2182cbc1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -118,6 +118,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf79329, "tdf79329.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(2), xTables->getCount());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf103982, "tdf103982.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+sal_Int32 nDistB = getXPath(pXmlDoc, "//wp:anchor", "distB").toInt32();
+// This was -260350, which is not a valid value for an unsigned type.
+CPPUNIT_ASSERT(nDistB >= 0);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 0cb5604..5af66a1 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -359,10 +359,15 @@ void DocxSdrExport::startDMLAnchorInline(const 
SwFrameFormat* pFrameFormat, cons
 lclMovePositionWithRotation(aPos, rSize, pObj->GetRotateAngle());
 }
 attrList->add(XML_behindDoc, bOpaque ? "0" : "1");
-attrList->add(XML_distT, 
OString::number(TwipsToEMU(aULSpaceItem.GetUpper()) - nTopExt).getStr());
-attrList->add(XML_distB, 
OString::number(TwipsToEMU(aULSpaceItem.GetLower()) - nBottomExt).getStr());
-attrList->add(XML_distL, 
OString::number(TwipsToEMU(aLRSpaceItem.GetLeft()) - nLeftExt).getStr());
-attrList->add(XML_distR, 
OString::number(TwipsToEMU(aLRSpaceItem.GetRight()) - nRightExt).getStr());
+// The type of dist* attributes is unsigned, so make sure no negative 
value is written.
+sal_Int64 nDistT = std::max(static_cast(0), 
TwipsToEMU(aULSpaceItem.GetUpper()) - nTopExt);
+attrList->add(XML_distT, OString::number(nDistT).getStr());
+sal_Int64 nDistB = std::max(static_cast(0), 
TwipsToEMU(aULSpaceItem.GetLower()) - nBottomExt);
+attrList->add(XML_distB, OString::number(nDistB).getStr());
+sal_Int64 nDistL = std::max(static_cast(0), 
TwipsToEMU(aLRSpaceItem.GetLeft()) - nLeftExt);
+attrList->add(XML_distL, OString::number(nDistL).getStr());
+sal_Int64 nDistR = std::max(static_cast(0), 
TwipsToEMU(aLRSpaceItem.GetRight()) - nRightExt);
+attrList->add(XML_distR, OString::number(nDistR).getStr());
 attrList->add(XML_simplePos, "0");
 attrList->add(XML_locked, "0");
 attrList->add(XML_layoutInCell, "1");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-22 Thread vsfoote

 extras/Package_palettes.mk  |1 
 extras/source/palettes/tonal_column.soc |  123 
 2 files changed, 124 insertions(+)

New commits:
commit 5c12939540fafb02de2f8c91a3022f9e16a1e38f
Author: vsfoote 
Date:   Mon Nov 21 20:53:41 2016 -0600

tdf#80196 - Standardized color palette normalized by graytone

mathematically generated colors, attachment 101316 attachment 104623
authored by Wade D. Peterson contributed CC0 in the public domain

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

diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index fa37de6..ed1f820 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -29,6 +29,7 @@ $(eval $(call 
gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,
standard.sop \
styles.sod \
tango.soc \
+   tonal_column.soc \
web.soc \
 ))
 
diff --git a/extras/source/palettes/tonal_column.soc 
b/extras/source/palettes/tonal_column.soc
new file mode 100644
index 000..1740160
--- /dev/null
+++ b/extras/source/palettes/tonal_column.soc
@@ -0,0 +1,123 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:svg="http://www.w3.org/2000/svg"; 
xmlns:ooo="http://openoffice.org/2004/office";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 107 matches

Mail list logo