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

[Noel Grandin]

 sw/inc/fmtsrnd.hxx  |8 -
 sw/inc/fmtsrndenum.hxx  |   37 
--
 sw/source/core/doc/DocumentStylePoolManager.cxx |   11 -
 sw/source/core/doc/doclay.cxx   |4 
 sw/source/core/doc/textboxhelper.cxx|2 
 sw/source/core/draw/dcontact.cxx|4 
 sw/source/core/frmedt/fefly1.cxx|2 
 sw/source/core/frmedt/feshview.cxx  |8 -
 sw/source/core/frmedt/fews.cxx  |2 
 sw/source/core/inc/sortedobjs.hxx   |4 
 sw/source/core/inc/txtfly.hxx   |   12 +-
 sw/source/core/layout/anchoredobject.cxx|2 
 sw/source/core/layout/atrfrm.cxx|   38 
--
 sw/source/core/layout/flowfrm.cxx   |2 
 sw/source/core/layout/fly.cxx   |8 -
 sw/source/core/layout/flycnt.cxx|8 -
 sw/source/core/layout/frmtool.cxx   |2 
 sw/source/core/layout/sortedobjs.cxx|4 
 sw/source/core/layout/tabfrm.cxx|   12 +-
 sw/source/core/layout/trvlfrm.cxx   |4 
 sw/source/core/layout/wsfrm.cxx |4 
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |2 
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx  |4 
 sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx |2 
 sw/source/core/text/itratr.cxx  |2 
 sw/source/core/text/txtfly.cxx  |   56 
-
 sw/source/core/unocore/unoframe.cxx |2 
 sw/source/filter/html/htmlcss1.cxx  |6 -
 sw/source/filter/html/htmldrawreader.cxx|4 
 sw/source/filter/html/htmlflywriter.cxx |   36 
+++---
 sw/source/filter/html/htmlgrin.cxx  |   12 +-
 sw/source/filter/html/htmlplug.cxx  |4 
 sw/source/filter/html/htmltab.cxx   |6 -
 sw/source/filter/html/htmltabw.cxx  |6 -
 sw/source/filter/html/swhtml.cxx|   22 +--
 sw/source/filter/ww8/docxattributeoutput.cxx|   32 
++---
 sw/source/filter/ww8/docxsdrexport.cxx  |8 -
 sw/source/filter/ww8/rtfattributeoutput.cxx |   14 +-
 sw/source/filter/ww8/wrtw8esh.cxx   |   18 +--
 sw/source/filter/ww8/ww8atr.cxx |4 
 sw/source/filter/ww8/ww8graf.cxx|   22 +--
 sw/source/filter/ww8/ww8par.cxx |2 
 sw/source/filter/ww8/ww8par2.cxx|2 
 sw/source/filter/ww8/ww8par2.hxx|   15 +-
 sw/source/filter/ww8/ww8par6.cxx|6 -
 sw/source/ui/dbui/mmlayoutpage.cxx  |2 
 sw/source/ui/frmdlg/frmpage.cxx |2 
 sw/source/ui/frmdlg/wrap.cxx|   36 
+++---
 sw/source/uibase/shells/basesh.cxx  |   60 
+-
 sw/source/uibase/utlui/attrdesc.cxx |   14 +-
 50 files changed, 256 insertions(+), 323 deletions(-)

New commits:
commit 1e2bd1771808da00ec959995ab1284c6193a57f5
Author: Noel Grandin 
Date:   Thu Mar 2 09:22:44 2017 +0200

elide the SwSurround enum

no point in redeclaring an existing enum exactly

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

diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index cc9bce7..02bf0e0 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -20,11 +20,11 @@
 #define INCLUDED_SW_INC_FMTSRND_HXX
 
 #include "swdllapi.h"
+#include 
 #include 
 #include 
 #include 
 
-#include 
 class IntlWrapper;
 
 // SwFormatSurround: How document content under the frame shall behave.
@@ -34,7 +34,7 @@ class SW_DLLPUBLIC SwFormatSurround: public SfxEnumItem
 boolbContour:1;
 boolbOutside:1;
 public:
-SwFormatSurround( SwSurround eNew = SURROUND_PARALLEL );
+SwFormatSurround( css::text::WrapTextMode eNew = 

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

[Zdeněk Crhonek]

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

New commits:
commit 04fe439b053f2d361e74975a4b66cd359980976e
Author: Zdeněk Crhonek 
Date:   Wed Mar 1 23:18:37 2017 +0100

add test for own basic function

Change-Id: I9c42195c7338300964e111e2a3fbc8d61cac6186
Reviewed-on: https://gerrit.libreoffice.org/34770
Tested-by: Jenkins 
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/unit/data/functions/fods/own_function.fods 
b/sc/qa/unit/data/functions/fods/own_function.fods
new file mode 100644
index 000..4a6198e
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/own_function.fods
@@ -0,0 +1,4865 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2017-03-01T23:17:33.235475443P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/36de6c50684c8241969a2064d30aff41e0bc5d97
+ 
+  
+   0
+   0
+   21431
+   4459
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   4
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+ 
+  REM  *  BASIC  *
+
+REMcase SbxINTEGER:
+REMcase SbxLONG:
+REMcase SbxSINGLE:
+REMcase SbxDOUBLE:
+REMcase SbxCURRENCY:
+REMcase SbxDATE:
+REMcase SbxUSHORT:
+REMcase SbxULONG:
+REMcase SbxINT:
+REMcase SbxUINT:
+REMcase SbxSALINT64:
+REMcase SbxSALUINT64:
+REMcase SbxDECIMAL:
+REM   case SbxBOOL:
+
+Function TestFuncCurr() As Curre

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

[Noel Grandin]

 include/svtools/brwbox.hxx|   13 +
 svtools/source/brwbox/brwbox2.cxx |2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

New commits:
commit 60f612785477ab86fe580e4ba8b567a401e09985
Author: Noel Grandin 
Date:   Thu Mar 2 08:38:55 2017 +0200

don't need this STL hack anymore

Change-Id: Id0883060acf2ca73af5cce56e1cf9021c2fb121a

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 266491a..4e9f2df 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -39,7 +39,6 @@ class BrowserColumn;
 class BrowserDataWin;
 class MultiSelection;
 class BrowserHeader;
-
 typedef ::std::vector< BrowserColumn* > BrowserColumns;
 
 namespace svt {
@@ -372,16 +371,11 @@ protected:
 
 longCalcReverseZoom(long nVal);
 
-inline const DataFlavorExVector&
+const DataFlavorExVector&
 GetDataFlavors() const;
 
 boolIsDropFormatSupported( SotClipboardFormatId nFormat ); 
// need this because the base class' IsDropFormatSupported is not const ...
 
-private:
-const DataFlavorExVector& implGetDataFlavors() const;
-// with this we can make GetDataFlavors() inline, which is strongly 
needed as SVTOOLS does not export
-// any sysmbol containing an "_STL", so a non-inlined method would not 
be exported 
-
 protected:
 // callbacks for the data window
 virtual voidImplStartTracking();
@@ -785,11 +779,6 @@ private:
 };
 
 
-inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const
-{
-return implGetDataFlavors();
-}
-
 #endif // INCLUDED_SVTOOLS_BRWBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index 8346f0f..f623b17 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -67,7 +67,7 @@ sal_Int8 BrowseBox::ExecuteDrop( const 
BrowserExecuteDropEvent& )
 }
 
 
-const DataFlavorExVector& BrowseBox::implGetDataFlavors() const
+const DataFlavorExVector& BrowseBox::GetDataFlavors() const
 {
 if (pDataWin->bCallingDropCallback)
 return pDataWin->GetDataFlavorExVector();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 sw/source/ui/frmdlg/wrap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d96fa0cb80f38ee94ec59565b2391848663378d
Author: Jochen Nitschke 
Date:   Wed Mar 1 19:49:29 2017 +0100

sw: replace hardcoded 1 with TRISTATE_TRUE

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

diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index e29a814..881d4eb 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -385,7 +385,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet)
 if ( m_bDrawMode )
 {
 bool bChecked = m_pWrapTransparentCB->IsChecked() && 
m_pWrapTransparentCB->IsEnabled();
-if ((m_pWrapTransparentCB->GetSavedValue() == 1) != bChecked)
+if ((m_pWrapTransparentCB->GetSavedValue() == TRISTATE_TRUE) != 
bChecked)
 bModified |= nullptr != rSet->Put(SfxInt16Item(FN_DRAW_WRAP_DLG, 
bChecked ? 0 : 1));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 include/svtools/brwbox.hxx  |4 -
 include/svtools/transfer.hxx|   12 +---
 reportdesign/source/ui/report/ReportSection.cxx |2 
 svtools/source/brwbox/brwbox2.cxx   |6 +-
 svtools/source/misc/transfer.cxx|   69 ++--
 svtools/source/misc/transfer2.cxx   |   15 ++---
 sw/source/uibase/dochdl/swdtflvr.cxx|2 
 sw/source/uibase/utlui/condedit.cxx |2 
 8 files changed, 50 insertions(+), 62 deletions(-)

New commits:
commit 5ee57cabb40fefbba401cbcf8b181e02ad4f1f5d
Author: Jochen Nitschke 
Date:   Tue Feb 28 23:48:06 2017 +0100

no need to use smart pointers for DataFlavorExVector

DataFlavorExVector is a std::vector<..> typedef.
remove odd void pointer in BrowseBox.
return const references to keep getter const qualified.

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

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index ae950f5..266491a 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -378,7 +378,7 @@ protected:
 boolIsDropFormatSupported( SotClipboardFormatId nFormat ); 
// need this because the base class' IsDropFormatSupported is not const ...
 
 private:
-void*   implGetDataFlavors() const;
+const DataFlavorExVector& implGetDataFlavors() const;
 // with this we can make GetDataFlavors() inline, which is strongly 
needed as SVTOOLS does not export
 // any sysmbol containing an "_STL", so a non-inlined method would not 
be exported 
 
@@ -787,7 +787,7 @@ private:
 
 inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const
 {
-return *static_cast(implGetDataFlavors());
+return implGetDataFlavors();
 }
 
 #endif // INCLUDED_SVTOOLS_BRWBOX_HXX
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 4cfa475..8cf82f4 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -158,7 +158,7 @@ private:
 OUString  
maLastFormat;
 mutable css::uno::Reference< css::datatransfer::clipboard::XClipboard >   
mxClipboard;
 css::uno::Reference< css::frame::XTerminateListener > 
mxTerminateListener;
-std::unique_ptr   
mxFormats;
+DataFlavorExVector
maFormats;
 std::unique_ptr 
mxObjDesc;
 
 protected:
@@ -238,8 +238,6 @@ protected:
 
 public:
 
-TransferableHelper();
-
 voidPrepareOLE( const TransferableObjectDescriptor& 
rObjDesc );
 
 voidCopyToClipboard( vcl::Window *pWindow ) const;
@@ -267,7 +265,7 @@ private:
 
 css::uno::Reference< css::datatransfer::XTransferable >   
mxTransfer;
 css::uno::Reference< css::datatransfer::clipboard::XClipboard >   
mxClipboard;
-std::unique_ptr   
mxFormats;
+DataFlavorExVector
maFormats;
 std::unique_ptr 
mxObjDesc;
 std::unique_ptr  mxImpl;
 
@@ -299,7 +297,7 @@ public:
 SotClipboardFormatId   GetFormat( sal_uInt32 nFormat ) const;
 css::datatransfer::DataFlavor  GetFormatDataFlavor( sal_uInt32 nFormat ) 
const;
 
-DataFlavorExVector& GetDataFlavorExVector() const {return 
*mxFormats; }
+const DataFlavorExVector&   GetDataFlavorExVector() const {return 
maFormats; }
 
 boolStartClipboardListening( );
 voidStopClipboardListening( );
@@ -444,7 +442,7 @@ private:
 css::uno::Reference< css::datatransfer::dnd::XDropTarget >
mxDropTarget;
 
 css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >
mxDropTargetListener;
-DataFlavorExVector*   
mpFormats;
+DataFlavorExVector
maFormats;
 
 DropTargetHelper() = delete;
 DropTargetHelper&   operator=( const DropTargetHelper& rDropTargetHelper ) 
= delete;
@@ -471,7 +469,7 @@ public:
 // typically called by the application in ::AcceptDrop 
and ::ExecuteDrop and (see above)
 boolIsDropFormatSupported( SotClipboardFormatId nFormat );
 
-DataFlavorExVector& GetDataFlavorExVector() const {return *mpFormats; }
+const DataFlavorExVector& GetDataFlavorExVector() const {return maFormats; 
}
 
 };
 
diff --git a/reportdesign/source/ui/report/ReportSection.cxx 
b/reportdesign/source/ui/report/ReportSection.cxx
index 4dbcf32..8693298 100644
--- a/reportdesign/source/ui/report

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

[Pranav Kant]

 loleaflet/src/control/Control.Menubar.js |   12 ++--
 loleaflet/src/layer/AnnotationManager.js |3 +--
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 8328b1bdb6da69a165b14a002cdebc405dbb7ef3
Author: Pranav Kant 
Date:   Thu Mar 2 11:44:08 2017 +0530

lolefalet: Bin unused variables

Change-Id: I693f67254194f78d999103801b1cf05d1f8196b4

diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index 5c7d4ba..4d7a66f 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -288,8 +288,7 @@ L.AnnotationManager = L.Class.extend({
 
 
 L.Map.include({
-   insertComment: function(comment) {
-   comment = !!comment ? comment : {};
+   insertComment: function() {
this._docLayer.newAnnotation({
text: '',
textrange: '',
commit 40a1383b6dec2e921fee1d71908445937ac0f2c3
Author: Pranav Kant 
Date:   Wed Mar 1 15:55:11 2017 +0530

loleaflet: Show change tracking menu options in file menubar

Change-Id: Ie48bfdeb9545fbe7aec40ce3e7bc0f50b7f5007f

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 01a4cb5..d066e66 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -26,8 +26,16 @@ L.Control.Menubar = L.Control.extend({
{name: _('Copy'), type: 'unocommand', uno: 
'.uno:Copy'},
{name: _('Paste'), type: 'unocommand', uno: 
'.uno:Paste'},
{type: 'separator'},
-   {name: _('Select all'), type: 'unocommand', 
uno: '.uno:SelectAll'}]
-   },
+   {name: _('Select all'), type: 'unocommand', 
uno: '.uno:SelectAll'},
+   {type: 'separator'},
+   {name: _('Track Changes'), type: 'menu', menu: [
+   {name: _('Record'), type: 'unocommand', 
uno: '.uno:TrackChanges'},
+   {name: _('Show'), type: 'unocommand', 
uno: '.uno:ShowTrackedChanges'},
+   {type: 'separator'},
+   {name: _('Previous'), type: 
'unocommand', uno: '.uno:PreviousTrackedChange'},
+   {name: _('Next'), type: 'unocommand', 
uno: '.uno:NextTrackedChange'}
+   ]}
+   ]},
{name: _('View'), id: 'view', type: 'menu', menu: [
{name: _('Full screen'), id: 'fullscreen', 
type: 'action'},
{type: 'separator'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/Socket.hpp

[Ashod Nakashian]

 net/Socket.hpp |   18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 7dd1686f0d22f6b08a9b0dd5709dd628afc8df4a
Author: Ashod Nakashian 
Date:   Wed Mar 1 21:24:17 2017 -0500

nb: disable hex dumping

No longer necessary to have them enabled
permanently, especially that they affect
performance significantly negatively.

Change-Id: I02ef99da00ba4ecb8e24647ee372a03d79d07fe7

diff --git a/net/Socket.hpp b/net/Socket.hpp
index fe4a721..55f264a 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -471,7 +471,7 @@ protected:
 if (log.trace()) {
 LOG_TRC("#" << getFD() << ": Incoming data buffer " << 
_inBuffer.size() <<
 " bytes, closeSocket? " << closed);
-log.dump("", &_inBuffer[0], _inBuffer.size());
+// log.dump("", &_inBuffer[0], _inBuffer.size());
 }
 
 // If we have data, allow the app to consume.
@@ -518,17 +518,13 @@ protected:
 len = writeData(&_outBuffer[0], _outBuffer.size());
 
 auto& log = Log::logger();
-if (log.trace()) {
-if (len > 0)
-{
-LOG_TRC("#" << getFD() << ": Wrote outgoing data " << 
len << " bytes");
-log.dump("", &_outBuffer[0], len);
-}
-else
-{
-LOG_SYS("#" << getFD() << ": Wrote outgoing data " << 
len << " bytes");
-}
+if (log.trace() && len > 0) {
+LOG_TRC("#" << getFD() << ": Wrote outgoing data " << len 
<< " bytes");
+// log.dump("", &_outBuffer[0], len);
 }
+
+if (len <= 0)
+LOG_SYS("#" << getFD() << ": Wrote outgoing data " << len 
<< " bytes");
 }
 while (len < 0 && errno == EINTR);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loleaflet/src/layer/AnnotationManager.js  |3 ++-
 loleaflet/src/layer/marker/Annotation.js  |   10 --
 loleaflet/src/layer/tile/CalcTileLayer.js |3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit a1ed658080aae44d9cc6fd011ad533dd8a915146
Author: Henry Castro 
Date:   Wed Mar 1 22:10:23 2017 -0400

loleaflet: enable annotation pop-up menu

Change-Id: I670987359261b27d0b081ea2bd803b3fbb43d7dc

diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index bb9aa2e..5c7d4ba 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -19,7 +19,8 @@ L.AnnotationManager = L.Class.extend({
this._map.on('AnnotationSave', this._onAnnotationSave, this);
var that = this;
$.contextMenu({
-   selector: '.loleaflet-annotation-content',
+   selector: '.loleaflet-annotation-menu',
+   trigger: 'none',
className: 'loleaflet-font',
items: {
modify: {
diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index 4ff80dd..a181e79 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -92,9 +92,9 @@ L.Annotation = L.Layer.extend({
L.DomUtil.create('div', 'loleaflet-annotation-userline', tdImg);
this._contentAuthor = L.DomUtil.create('div', 
'loleaflet-annotation-content-author', tdAuthor);
this._contentDate = L.DomUtil.create('div', 
'loleaflet-annotation-date', tdAuthor);
-   L.DomUtil.create('div', 'loleaflet-annotation-menu', tdMenu);
+   var divMenu = L.DomUtil.create('div', 
'loleaflet-annotation-menu', tdMenu);
+   divMenu.annotation = this;
this._contentNode = L.DomUtil.create('div', 
'loleaflet-annotation-content', wrapper);
-   this._contentNode.annotation = this;
this._editNode = L.DomUtil.create('div', 
'loleaflet-annotation-edit', wrapper);
this._contentText = L.DomUtil.create('div', '', 
this._contentNode);
this._editText = L.DomUtil.create('textarea', 
'loleaflet-annotation-textarea', this._editNode);
@@ -129,6 +129,12 @@ L.Annotation = L.Layer.extend({
},
 
_onMouseClick: function (e) {
+   var target = e.target || e.srcElement;
+   L.DomEvent.stopPropagation(e);
+   if (L.DomUtil.hasClass(target, 'loleaflet-annotation-menu')) {
+   $(target).contextMenu();
+   return;
+   }
L.DomEvent.stopPropagation(e);
this._map.fire('AnnotationClick', {annotation: this});
},
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 3b34c4a..000d795 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -67,7 +67,8 @@ L.CalcTileLayer = L.TileLayer.extend({
L.TileLayer.prototype.onAdd.call(this, map);
this._annotations = {};
$.contextMenu({
-   selector: '.loleaflet-annotation-content',
+   selector: '.loleaflet-annotation-menu',
+   trigger: 'none',
className: 'loleaflet-font',
items: {
modify: {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 starmath/inc/error.hxx|1 -
 starmath/inc/starmath.hrc |3 +--
 starmath/source/parse.cxx |3 +--
 starmath/source/smres.src |5 -
 4 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit a5c947579253a7f4e784004e18929af5ab22fa28
Author: Takeshi Abe 
Date:   Wed Mar 1 16:23:48 2017 +0900

starmath: Drop SmParseError::UnoperExpected

because it cannot happen unless the invariant about TG::UnOper is
broken.

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

diff --git a/starmath/inc/error.hxx b/starmath/inc/error.hxx
index ec0c10c..aff5faf 100644
--- a/starmath/inc/error.hxx
+++ b/starmath/inc/error.hxx
@@ -29,7 +29,6 @@ enum class SmParseError
 UnexpectedChar,
 UnexpectedToken,
 FuncExpected,
-UnoperExpected,
 PoundExpected,
 ColorExpected,
 LgroupExpected,
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 28106ed..508ad28 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -133,8 +133,7 @@
 #define RID_ERR_LBRACEEXPECTED  (RID_APP_START + 925)
 #define RID_ERR_RBRACEEXPECTED  (RID_APP_START + 926)
 #define RID_ERR_FUNCEXPECTED(RID_APP_START + 927)
-#define RID_ERR_UNOPEREXPECTED  (RID_APP_START + 928)
-// blank: 929 - 931
+// blank: 928 - 931
 #define RID_ERR_POUNDEXPECTED   (RID_APP_START + 932)
 #define RID_ERR_COLOREXPECTED   (RID_APP_START + 933)
 #define RID_ERR_LPARENTEXPECTED (RID_APP_START + 934)
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 0a2dbbc..0d38459 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1678,7 +1678,7 @@ void SmParser::DoUnOper()
 break;
 
 default :
-Error(SmParseError::UnoperExpected);
+assert(false);
 }
 
 // get argument
@@ -2346,7 +2346,6 @@ void SmParser::AddError(SmParseError Type, SmNode *pNode)
 case SmParseError::LbraceExpected: nRID = RID_ERR_LBRACEEXPECTED;  
break;
 case SmParseError::RbraceExpected: nRID = RID_ERR_RBRACEEXPECTED;  
break;
 case SmParseError::FuncExpected:   nRID = RID_ERR_FUNCEXPECTED;
break;
-case SmParseError::UnoperExpected: nRID = RID_ERR_UNOPEREXPECTED;  
break;
 case SmParseError::PoundExpected:  nRID = RID_ERR_POUNDEXPECTED;   
break;
 case SmParseError::ColorExpected:  nRID = RID_ERR_COLOREXPECTED;   
break;
 case SmParseError::RightExpected:  nRID = RID_ERR_RIGHTEXPECTED;   
break;
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index a11baf4..b5efdeb 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -201,11 +201,6 @@ String RID_ERR_FUNCEXPECTED
 Text [ en-US ] = "Function expected" ;
 };
 
-String RID_ERR_UNOPEREXPECTED
-{
-Text [ en-US ] = "Unary operator expected" ;
-};
-
 String RID_ERR_POUNDEXPECTED
 {
 Text [ en-US ] = "'#' expected" ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 138 commits - accessibility/source basctl/source bin/lo-pack-sources bin/symstore.sh canvas/source comphelper/source configure.ac

[Samuel Mehrbrodt]

Rebased ref, commits from common ancestor:
commit 6f9a2cf3fe98778cc77c4b0250c3b244a7fe800b
Author: Samuel Mehrbrodt 
Date:   Fri Jan 27 16:57:49 2017 +0100

Symstore: Also add .exe and .dlls to symstore

These are needed when analyzing the minidump.

Change-Id: Ife296c298e3b2f1ca8a47dcbaaf1947e6aefdc81
Reviewed-on: https://gerrit.libreoffice.org/33631
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit 8a0416be440180d0a6cedd449307f6a9bde22eaa)

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 56260c0..b368eb3 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -6,13 +6,17 @@ add_pdb()
 type=$2
 list=$3
 for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+# store dll/exe itself (needed for minidumps)
+if [ -f "$file" ]; then
+cygpath -w "$file" >> "$list"
+fi
+# store pdb file
 filename=$(basename "$file" ".${extension}")
 pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
 if [ -f "$pdb" ]; then
 cygpath -w "$pdb" >> "$list"
 fi
 done
-
 }
 
 # check preconditions
commit 762db0242e321ef07023162ed34f46c42b136c52
Author: Thorsten Behrens 
Date:   Sun Jan 15 11:50:27 2017 +0100

gbuild: populate local symstore on Windows

Script based on Lubos' tb master script from
http://nabble.documentfoundation.org/Daily-Win32-debug-builds-td4067279.html

Change-Id: I7f3247367a63078881f3cf51cf3e2cad59ad67b5
Reviewed-on: https://gerrit.libreoffice.org/33088
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit 17e9a5bf94eb08f88f8c78c9982dd0ce48a5e2d9)

diff --git a/Makefile.in b/Makefile.in
index f1bd93b..a51b17a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -387,6 +387,7 @@ symbols:
mkdir -p $(WORKDIR)/symbols/
 ifeq ($(OS),WNT)
$(SRCDIR)/bin/symbolstore.py 
$(WORKDIR)/UnpackedTarball/breakpad/src/tools/windows/binaries/dump_syms.exe 
$(WORKDIR)/symbols/ $(INSTDIR)/program/*
+   $(SRCDIR)/bin/symstore.sh
 else
$(SRCDIR)/bin/symbolstore.py 
$(WORKDIR)/UnpackedTarball/breakpad/src/tools/linux/dump_syms/dump_syms 
$(WORKDIR)/symbols/ $(INSTDIR)/program/*
 endif
diff --git a/bin/symstore.sh b/bin/symstore.sh
new file mode 100755
index 000..56260c0
--- /dev/null
+++ b/bin/symstore.sh
@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+add_pdb()
+{
+extension=$1
+type=$2
+list=$3
+for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+filename=$(basename "$file" ".${extension}")
+pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
+if [ -f "$pdb" ]; then
+cygpath -w "$pdb" >> "$list"
+fi
+done
+
+}
+
+# check preconditions
+if [ -z "${INSTDIR}" ] || [ -z "${WORKDIR}" ]; then
+echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv"
+exit 1
+fi
+if [ ! -d "${INSTDIR}" ] || [ ! -d "${WORKDIR}" ]; then
+echo "INSTDIR or WORKDIR not present - script expects calling after full 
build"
+exit 1
+fi
+which symstore.exe > /dev/null 2>&1 || {
+echo "symstore.exe is expected in the PATH"
+exit 1
+}
+
+# defaults
+MAX_KEEP=5
+SYM_PATH=${WORKDIR}/symstore
+
+USAGE="Usage: $0 [-h|-k |-p ]
+   -h: this cruft
+   -k :   keep this number of old symbol versions around
+   (default: ${MAX_KEEP}. Set to 0 for unlimited)
+   -p :  specify full path to symbol store tree
+If no path is specified, defaults to ${SYM_PATH}.
+"
+
+# process args
+while :
+do
+   case "$1" in
+-k|--keep) MAX_KEEP="$2"; shift 2;;
+-p|--path) SYM_PATH="$2"; shift 2;;
+-h|--help) echo "${USAGE}"; exit 0; shift;;
+-*) echo "${USAGE}" >&2; exit 1;;
+*) break;;
+   esac
+done
+
+if [ $# -gt 0 ]; then
+echo "${USAGE}" >&2
+exit 1
+fi
+
+# populate symbol store from here
+TMPFILE=$(mktemp) || exit 1
+trap '{ rm -f ${TMPFILE}; }' EXIT
+
+# add dlls and executables
+add_pdb dll Library "${TMPFILE}"
+add_pdb exe Executable "${TMPFILE}"
+
+# stick all of it into symbol store
+symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w 
"${SYM_PATH}")" /t "${PRODUCTNAME}" /v 
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
+rm -f "${TMPFILE}"
+
+# Cleanup symstore, older revisions will be removed.  Unless the
+# .dll/.exe changes, the .pdb should be shared, so with incremental
+# tinderbox several revisions should not be that space-demanding.
+if [ "${MAX_KEEP}" -gt 0 ] && [ -d "${SYM_PATH}/000Admin" ]; then
+to_remove=$(ls -1 "${SYM_PATH}/000Admin" | grep -v '\.txt' | grep -v 
'\.deleted' | sort | head -n "-${MAX_KEEP}")
+for revision in $to_remove; do
+symstore.exe del /i "${revision}" /s "$(cygpath -w "${SYM_PATH}")"
+done
+fi
commit bc9d4938b86b90fa6beccea01006ba05c872beb5
Author: Katarina Behrens 

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

[László Németh]

 vcl/opengl/win/gdiimpl.cxx |2 +-
 vcl/source/opengl/OpenGLHelper.cxx |4 ++--
 vcl/win/gdi/winlayout.cxx  |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c3cc9ec53e75ff41d81727e39e81272209e9fa0c
Author: László Németh 
Date:   Wed Mar 1 23:58:41 2017 +0100

disable GL

diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index 12f6151..0ea127e 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -798,7 +798,7 @@ bool OpenGLHelper::isDeviceBlacklisted()
 
 bool OpenGLHelper::supportsVCLOpenGL()
 {
-static bool bDisableGL = !!getenv("SAL_DISABLEGL");
+static bool bDisableGL = true;
 bool bBlacklisted = isDeviceBlacklisted();
 
 if (bDisableGL || bBlacklisted)
@@ -990,7 +990,7 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
  */
 
 bSet = true;
-bForceOpenGL = !!getenv("SAL_FORCEGL") || 
officecfg::Office::Common::VCL::ForceOpenGL::get();
+bForceOpenGL = false;
 
 bool bRet = false;
 if (bForceOpenGL)
commit 7e849e8d72dc02f27a0fb7f59f659daaaf751976
Author: László Németh 
Date:   Wed Mar 1 23:56:59 2017 +0100

disable widget cache

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 310eb14..3015353 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -692,7 +692,7 @@ ControlCacheType gTextureCache(200);
 
 bool WinOpenGLSalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& 
rControlCacheKey, int nX, int nY)
 {
-static bool gbCacheEnabled = !getenv("SAL_WITHOUT_WIDGET_CACHE");
+static bool gbCacheEnabled = false;
 
 if (!gbCacheEnabled)
 return false;
commit 95f5db5a7a3573f1ab40403e70e8dea17b66c45d
Author: László Németh 
Date:   Wed Mar 1 23:54:14 2017 +0100

disable glyph catching

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 41b01c3..467441b 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -1458,7 +1458,7 @@ void WinLayout::DrawText(SalGraphics& rGraphics) const
 
 bool SimpleWinLayout::CacheGlyphs(SalGraphics& rGraphics) const
 {
-static bool bDoGlyphCaching = (std::getenv("SAL_DISABLE_GLYPH_CACHING") == 
NULL);
+static bool bDoGlyphCaching = false;
 
 if (!bDoGlyphCaching)
 return false;
@@ -2726,7 +2726,7 @@ bool UniscribeLayout::DrawTextImpl(HDC hDC,
 
 bool UniscribeLayout::CacheGlyphs(SalGraphics& rGraphics) const
 {
-static bool bDoGlyphCaching = (std::getenv("SAL_DISABLE_GLYPH_CACHING") == 
NULL);
+static bool bDoGlyphCaching = false;
 
 if (!bDoGlyphCaching)
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[U-WIN-VMDUB0V81FM\Buildslave]

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

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

[Julien Nabet]

 xmloff/source/transform/TransformerBase.cxx |8 
 xmloff/source/transform/TransformerBase.hxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 472f92421b1b15dc765714a7c657704812859868
Author: Julien Nabet 
Date:   Wed Mar 1 22:58:54 2017 +0100

xmloff: prefix member nElement of XMLTransformerBase

Change-Id: I83f62ccad47bc10c2a506a6b79a24e3367df5335
Reviewed-on: https://gerrit.libreoffice.org/34769
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/xmloff/source/transform/TransformerBase.cxx 
b/xmloff/source/transform/TransformerBase.cxx
index 558214c..351b39e 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -179,7 +179,7 @@ XMLTransformerBase::XMLTransformerBase( 
XMLTransformerActionInit *pInit,
 m_pReplaceNamespaceMap( new SvXMLNamespaceMap ),
 m_pElemActions( new XMLTransformerActions( pInit ) ),
 m_pTokenMap( new XMLTransformerTokenMap( pTKMapInit ) ),
-nElement(0),
+m_nElement(0),
 m_xFastAttributes( new sax_fastparser::FastAttributeList( 
m_xTokenHandler.get(),
 dynamic_cast< sax_fastparser::FastTokenHandlerBase *>( 
m_xTokenHandler.get() ) ) )
 {
@@ -1449,7 +1449,7 @@ void XMLTransformerBase::startFastElement( const 
OUString& rName,
 {
 OUString aLocalName;
 sal_uInt16 nPrefix = m_pNamespaceMap->GetKeyByAttrName( rName, 
&aLocalName );
-nElement = NAMESPACE_TOKEN( nPrefix ) | 
m_xTokenHandler->getTokenDirect(
+m_nElement = NAMESPACE_TOKEN( nPrefix ) | 
m_xTokenHandler->getTokenDirect(
 OUStringToOString( aLocalName, 
RTL_TEXTENCODING_ASCII_US ).getStr(), aLocalName.getLength() ) ;
 m_xFastAttributes->clear();
 
@@ -1472,7 +1472,7 @@ void XMLTransformerBase::startFastElement( const 
OUString& rName,
 m_xFastAttributes->add( nAttr, OUStringToOString( rAttrValue, 
RTL_TEXTENCODING_ASCII_US ).getStr() );
 }
 }
-m_xFastHandler->startFastElement( nElement, m_xFastAttributes.get() );
+m_xFastHandler->startFastElement( m_nElement, m_xFastAttributes.get() 
);
 }
 else
 m_xHandler->startElement( rName, xAttrList );
@@ -1481,7 +1481,7 @@ void XMLTransformerBase::startFastElement( const 
OUString& rName,
 void XMLTransformerBase::endFastElement( const OUString& rName )
 {
 if( m_xFastHandler.is() )
-   m_xFastHandler->endFastElement( nElement );
+   m_xFastHandler->endFastElement( m_nElement );
 else
 m_xHandler->endElement( rName );
 }
diff --git a/xmloff/source/transform/TransformerBase.hxx 
b/xmloff/source/transform/TransformerBase.hxx
index 323ddc5..ad0257f 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -76,7 +76,7 @@ class XMLTransformerBase : public XMLTransformer
 XMLTransformerTokenMap  *m_pTokenMap;
 
 //for feeding FastDocumentHandler
-sal_Int32 nElement;
+sal_Int32 m_nElement;
 rtl::Reference< sax_fastparser::FastAttributeList > m_xFastAttributes;
 
 protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 xmloff/source/core/xmlimp.cxx   |2 +-
 xmloff/source/transform/TransformerBase.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 08c49bf075ae8bd44db36890dcf90b1d137d2354
Author: Julien Nabet 
Date:   Wed Mar 1 22:47:36 2017 +0100

Typo: decaration->declaration

Change-Id: I743e7f41243ae54b1deece4743b248a002ecfdb8
Reviewed-on: https://gerrit.libreoffice.org/34768
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index fed34b6..7f412ab 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -655,7 +655,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& 
rName,
 {
 //SAL_INFO("svg", "startElement " << rName);
 // Process namespace attributes. This must happen before creating the
-// context, because namespace decaration apply to the element name itself.
+// context, because namespace declaration apply to the element name itself.
 std::unique_ptr 
pRewindMap(processNSAttributes(xAttrList));
 
 // Get element's namespace and local name.
diff --git a/xmloff/source/transform/TransformerBase.cxx 
b/xmloff/source/transform/TransformerBase.cxx
index 8995f5e..558214c 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -219,7 +219,7 @@ void SAL_CALL XMLTransformerBase::startElement( const 
OUString& rName,
 (void)bRect;
 
 // Process namespace attributes. This must happen before creating the
-// context, because namespace decaration apply to the element name itself.
+// context, because namespace declaration apply to the element name itself.
 XMLMutableAttributeList *pMutableAttrList = nullptr;
 Reference< XAttributeList > xAttrList( rAttrList );
 sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loleaflet/dist/images/submenu.png|binary
 loleaflet/dist/images/user.png   |binary
 loleaflet/dist/loleaflet.css |   67 ---
 loleaflet/src/layer/marker/Annotation.js |   33 ---
 4 files changed, 80 insertions(+), 20 deletions(-)

New commits:
commit dc24fdea67236190333f60c0a4037cf38a54739d
Author: Henry Castro 
Date:   Wed Mar 1 17:40:57 2017 -0400

loleaflet: change annotation appearance

Change-Id: I9c27b0576b686ac5b8a92bda8ab7960a1b400777

diff --git a/loleaflet/dist/images/submenu.png 
b/loleaflet/dist/images/submenu.png
new file mode 100644
index 000..5159693
Binary files /dev/null and b/loleaflet/dist/images/submenu.png differ
diff --git a/loleaflet/dist/images/user.png b/loleaflet/dist/images/user.png
new file mode 100644
index 000..88d9050
Binary files /dev/null and b/loleaflet/dist/images/user.png differ
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index cebdde0..a5e3f05 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -135,13 +135,16 @@ body {
 }
 
 .loleaflet-annotation-content-wrapper {
-   padding: 1px;
+   padding: 8px;
+   font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif 
!important;
+   font-size: 13px;
text-align: left;
border-radius: 5px;
-   background: #c0;
-   box-shadow: 0 3px 14px rgba(0,0,0,0.4);
+   background-color: #f5f5f5;
+   box-shadow: 0px 3px 6px rgba(0,0,0,0.2);
color: #333;
-   border: 1px solid #999;
+   border: none;
+   border-radius: 2px;
 }
 
 .loleaflet-annotation-content {
@@ -149,15 +152,26 @@ body {
line-height: 1.4;
 }
 
+.loleaflet-annotation-content-author {
+   margin: 0;
+   margin-top: 2px;
+   height: 18px;
+}
+
 .loleaflet-annotation-edit {
margin: 3px 3px;
line-height: 1.4;
 }
 
 .loleaflet-annotation-textarea {
+   font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif 
!important;
+   font-size: 13px;
border: 1px solid #c8c8c8;
resize: none;
-   background-color: #c0;
+   background-color: white;
+   overflow-x: hidden;
+   overflow-y: hidden;
+   width: 95%;
 }
 
 .loleaflet-cell-annotation {
@@ -171,3 +185,46 @@ body {
left: 0;
top: 0;
 }
+
+.loleaflet-annotation-table {
+   border-spacing: 0;
+   border-collapse: separate;
+   white-space: nowrap;
+   width: 100%;
+}
+
+.loleaflet-annotation-img {
+   max-width: 32px;
+   display: inline-block;
+}
+
+.loleaflet-annotation-author {
+   padding-left: 10px;
+   vertical-align: top;
+   display: table-cell;
+}
+
+.loleaflet-annotation-date {
+   font-size: 11px;
+}
+
+.loleaflet-annotation-userline {
+   background-color: darkblue;
+   width: 32px;
+   height: 6px;
+}
+
+.loleaflet-annotation-menu {
+   background: url(../images/submenu.png) no-repeat;
+   margin: 0;
+   padding: 0;
+   min-width: 15px;
+   height: 21px;
+   text-align: right;
+   border: 1px solid transparent;
+   display: inline-block;
+}
+
+.loleaflet-annotation-menu:hover {
+   border: 1px solid darkgrey;
+}
diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index 26299b0..4ff80dd 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -4,7 +4,7 @@
 
 L.Annotation = L.Layer.extend({
options: {
-   minWidth: 200,
+   minWidth: 240,
maxHeight: 50
},
 
@@ -81,19 +81,23 @@ L.Annotation = L.Layer.extend({
L.DomUtil.create('div', 'loleaflet-annotation');
var wrapper = this._wrapper =
L.DomUtil.create('div', 
'loleaflet-annotation-content-wrapper', container);
-
-   L.DomEvent.disableScrollPropagation(this._container);
+   var table = L.DomUtil.create('table', 
'loleaflet-annotation-table', wrapper);
+   var tbody = L.DomUtil.create('tbody', '', table);
+   var tr = L.DomUtil.create('tr', '', tbody);
+   var tdImg = L.DomUtil.create('td', 'loleaflet-annotation-img', 
tr);
+   var tdAuthor = L.DomUtil.create('td', 
'loleaflet-annotation-author', tr);
+   var tdMenu = L.DomUtil.create('td', '', tr);
+   var imgAuthor = L.DomUtil.create('img', '', tdImg);
+   imgAuthor.src = L.Icon.Default.imagePath + '/user.png';
+   L.DomUtil.create('div', 'loleaflet-annotation-userline', tdImg);
+   this._contentAuthor = L.DomUtil.create('div', 
'loleaflet-annotation-content-author', tdAuthor);
+   this._contentDate = L.DomUtil.create('div', 
'loleaflet-annotation-date', tdAuthor);
+   L.DomUtil.create('div', 'loleaflet-annotation-menu', tdMenu);
this._conte

Stack of contexts corrupted in xmloff?

[julien2412]

Hello,

Giving a try to tdf#33838 "Default bullet point not showing correctly (.lwp
import)", I noticed these kinds of logs on console:
warn:xmloff.core:13055:1:xmloff/source/core/xmlimp.cxx:731:
SvXMLImport::endElement: popped context has wrong prefix
warn:xmloff.core:13055:1:xmloff/source/core/xmlimp.cxx:733:
SvXMLImport::endElement: popped context has wrong lname

After adding some traces on sources, I get this:
 XMLTransformerBase::startFastElement rName=office:document nElement=66102
 XMLTransformerBase::startFastElement rName=office:meta nElement=66659
 XMLTransformerBase::startFastElement rName=meta:generator nElement=590655
 XMLTransformerBase::endFastElement rName=meta:generator nElement=590655
 XMLTransformerBase::startFastElement rName=dc:title nElement=526091
 XMLTransformerBase::endFastElement rName=dc:title nElement=526091
 XMLTransformerBase::startFastElement rName=meta:keyword nElement=590810
 XMLTransformerBase::endFastElement rName=meta:keyword nElement=590810
 XMLTransformerBase::startFastElement rName=meta:creation-date
nElement=590254
 XMLTransformerBase::endFastElement rName=meta:creation-date nElement=590254
 XMLTransformerBase::startFastElement rName=dc:date nElement=524784
 XMLTransformerBase::endFastElement rName=dc:date nElement=524784
 XMLTransformerBase::startFastElement rName=meta:editing-duration
nElement=590418
 XMLTransformerBase::endFastElement rName=meta:editing-duration
nElement=590418
 XMLTransformerBase::startFastElement rName=dc:description nElement=524826
 XMLTransformerBase::endFastElement rName=dc:description nElement=524826
 XMLTransformerBase::startFastElement rName=meta:initial-creator
nElement=590778
 XMLTransformerBase::endFastElement rName=meta:initial-creator
nElement=590778
 XMLTransformerBase::endFastElement rName=office:meta nElement=590778

warn:xmloff.core:13055:1:xmloff/source/core/xmlimp.cxx:731:
SvXMLImport::endElement: popped context has wrong prefix 0 8
warn:xmloff.core:13055:1:xmloff/source/core/xmlimp.cxx:733:
SvXMLImport::endElement: popped context has wrong lname meta initial-creator


Notice the last line with "office:meta" that should have had nElement =
66659

bts on gdb seem to confirm the pb:
First I get this
#0  SvXMLImport::endElement (this=0x579a7290,
rName="meta:initial-creator") at
/home/julien/lo/libreoffice/xmloff/source/core/xmlimp.cxx:729
#1  0x7fffe9a515cf in SvXMLImportContext::endUnknownElement
(this=this@entry=0x57a3baf0, rPrefix="meta",
rLocalName="initial-creator")
at /home/julien/lo/libreoffice/xmloff/source/core/xmlictxt.cxx:139
#2  0x7fffe9a50d2f in SvXMLImportContext::endFastElement
(this=0x57a3baf0, nElement=590778) at
/home/julien/lo/libreoffice/xmloff/source/core/xmlictxt.cxx:129
#3  0x7fffe9a585da in SvXMLImport::endFastElement (this=0x579a7290,
Element=590778) at
/home/julien/lo/libreoffice/xmloff/source/core/xmlimp.cxx:848
#4  0x7fffca94a081 in XMLTransformerBase::endFastElement
(this=0x57977630, rName="meta:initial-creator")
at
/home/julien/lo/libreoffice/xmloff/source/transform/TransformerBase.cxx:1484
#5  0x7fffca9526ff in XMLTransformerContext::EndElement
(this=0x57a48980) at
/home/julien/lo/libreoffice/xmloff/source/transform/TransformerContext.cxx:70
#6  0x7fffca94b1ad in XMLTransformerBase::endElement
(this=0x57977630, rName="meta:initial-creator")
at
/home/julien/lo/libreoffice/xmloff/source/transform/TransformerBase.cxx:323
#7  0x7fffcd1ce347 in XFSaxStream::EndElement
(this=this@entry=0x579b3220, oustr="meta:initial-creator")
at
/home/julien/lo/libreoffice/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx:112

but then I get this
#0  SvXMLImport::endElement (this=0x579a7290,
rName="meta:initial-creator") at
/home/julien/lo/libreoffice/xmloff/source/core/xmlimp.cxx:729
#1  0x7fffe9a515cf in SvXMLImportContext::endUnknownElement
(this=this@entry=0x57a2d250, rPrefix="meta",
rLocalName="initial-creator")
at /home/julien/lo/libreoffice/xmloff/source/core/xmlictxt.cxx:139
#2  0x7fffe9a50d2f in SvXMLImportContext::endFastElement
(this=0x57a2d250, nElement=590778) at
/home/julien/lo/libreoffice/xmloff/source/core/xmlictxt.cxx:129
#3  0x7fffe9a585da in SvXMLImport::endFastElement (this=0x579a7290,
Element=590778) at
/home/julien/lo/libreoffice/xmloff/source/core/xmlimp.cxx:848
#4  0x7fffca94a081 in XMLTransformerBase::endFastElement
(this=0x57977630, rName="office:meta")
at
/home/julien/lo/libreoffice/xmloff/source/transform/TransformerBase.cxx:1484
#5  0x7fffca9526ff in XMLTransformerContext::EndElement
(this=0x57a27da0) at
/home/julien/lo/libreoffice/xmloff/source/transform/TransformerContext.cxx:70
#6  0x7fffca94b1ad in XMLTransformerBase::endElement
(this=0x57977630, rName="office:meta")
at
/home/julien/lo/libreoffice/xmloff/source/transform/TransformerBase.cxx:323
#7  0x7fffcd1ce347 in XFSaxStream::EndElement
(this=this@entry=0x579b3220, oustr="office:meta")

[Libreoffice-commits] core.git: Branch 'feature/pivotcharts' - 3 commits - chart2/source sc/inc sc/source

[Tomaž Vajngerl]

 chart2/source/model/main/ChartModel.cxx |9 +
 chart2/source/model/main/ChartModel_Persistence.cxx |   34 
 sc/inc/PivotChartDataProvider.hxx   |1 
 sc/source/ui/drawfunc/fuins2.cxx|   88 +++-
 sc/source/ui/unoobj/PivotChartDataProvider.cxx  |  145 ++--
 5 files changed, 197 insertions(+), 80 deletions(-)

New commits:
commit 376fc4e8f43f7b1e9383cb12c4491fb1dd9ce945
Author: Tomaž Vajngerl 
Date:   Wed Mar 1 22:40:09 2017 +0100

pivotcharts: collect and set the number format for the data

Change-Id: I5eb2e9b9cb5abb798b99a23cfa16d790ff62ff08

diff --git a/sc/inc/PivotChartDataProvider.hxx 
b/sc/inc/PivotChartDataProvider.hxx
index d1139a5..1c2df5a 100644
--- a/sc/inc/PivotChartDataProvider.hxx
+++ b/sc/inc/PivotChartDataProvider.hxx
@@ -150,6 +150,7 @@ private:
 std::vector> m_aCategoriesColumnOrientation;
 std::vector> m_aCategoriesRowOrientation;
 std::vector> m_aLabels;
+std::vector> m_aDataRowVector;
 
 std::vector> 
m_aValueListeners;
 };
diff --git a/sc/source/ui/unoobj/PivotChartDataProvider.cxx 
b/sc/source/ui/unoobj/PivotChartDataProvider.cxx
index 8d9b3e1..37becaf 100644
--- a/sc/source/ui/unoobj/PivotChartDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotChartDataProvider.cxx
@@ -41,6 +41,8 @@
 
 #include 
 
+#include 
+
 using namespace css;
 
 namespace sc
@@ -244,9 +246,35 @@ uno::Reference 
PivotChartDataProvider::createPivotCha
 
 void PivotChartDataProvider::collectPivotTableData(ScDPObject* pDPObject)
 {
+uno::Reference 
xDPResults(pDPObject->GetSource(), uno::UNO_QUERY);
+uno::Sequence> xDataResultsSequence = 
xDPResults->getResults();
+
+double fNan;
+rtl::math::setNan(&fNan);
+
+for (uno::Sequence const & xDataResults : 
xDataResultsSequence)
+{
+size_t nIndex = 0;
+for (sheet::DataResult const & rDataResult : xDataResults)
+{
+if (rDataResult.Flags == 0 || rDataResult.Flags & 
css::sheet::DataResultFlags::HASDATA)
+{
+if (nIndex >= m_aDataRowVector.size())
+m_aDataRowVector.resize(nIndex + 1);
+
m_aDataRowVector[nIndex].push_back(PivotChartItem(rDataResult.Flags ? 
rDataResult.Value : fNan, 0));
+}
+nIndex++;
+}
+}
+
 uno::Reference 
xDimensionsSupplier(pDPObject->GetSource());
 uno::Reference xDims = new 
ScNameToIndexAccess(xDimensionsSupplier->getDimensions());
 
+std::unordered_map 
aDataFieldNumberFormatMap;
+std::vector aDataFieldNamesVectors;
+
+sheet::DataPilotFieldOrientation eDataFieldOrientation = 
sheet::DataPilotFieldOrientation_HIDDEN;
+
 for (long nDim = 0; nDim < xDims->getCount(); nDim++)
 {
 uno::Reference xDim = 
ScUnoHelpFunctions::AnyToInterface(xDims->getByIndex(nDim));
@@ -261,11 +289,9 @@ void 
PivotChartDataProvider::collectPivotTableData(ScDPObject* pDPObject)
 ScUnoHelpFunctions::GetEnumProperty(xDimProp, 
SC_UNO_DP_ORIENTATION,
 
sheet::DataPilotFieldOrientation_HIDDEN));
 
-long nDimPos = ScUnoHelpFunctions::GetLongProperty(xDimProp, 
SC_UNO_DP_POSITION);
-sal_Int32 nNumberFormat = 
ScUnoHelpFunctions::GetLongProperty(xDimProp, SC_UNO_DP_NUMBERFO);
-
 if (eDimOrient == sheet::DataPilotFieldOrientation_HIDDEN)
 continue;
+
 uno::Reference xHiers = new 
ScNameToIndexAccess(xDimSupp->getHierarchies());
 long nHierarchy = ScUnoHelpFunctions::GetLongProperty(xDimProp, 
SC_UNO_DP_USEDHIERARCHY);
 if (nHierarchy >= xHiers->getCount())
@@ -286,6 +312,10 @@ void 
PivotChartDataProvider::collectPivotTableData(ScDPObject* pDPObject)
 uno::Reference xLevName(xLevel, uno::UNO_QUERY);
 uno::Reference xLevRes(xLevel, 
uno::UNO_QUERY );
 
+bool bIsDataLayout = ScUnoHelpFunctions::GetBoolProperty(xDimProp, 
SC_UNO_DP_ISDATALAYOUT);
+long nDimPos = ScUnoHelpFunctions::GetLongProperty(xDimProp, 
SC_UNO_DP_POSITION);
+sal_Int32 nNumberFormat = 
ScUnoHelpFunctions::GetLongProperty(xDimProp, SC_UNO_DP_NUMBERFO);
+
 if (xLevName.is() && xLevRes.is())
 {
 switch (eDimOrient)
@@ -294,7 +324,8 @@ void 
PivotChartDataProvider::collectPivotTableData(ScDPObject* pDPObject)
 {
 uno::Sequence aSeq = 
xLevRes->getResults();
 size_t i = 0;
-OUString sValue;
+OUString sCaption;
+OUString sName;
 m_aLabels.resize(aSeq.getLength());
 for (sheet::MemberResult & rMember : aSeq)
 {
@@ -302,12 +333,20 @@ void 
PivotChartDataProvider::collectPivotTableData(ScDPObject* pDPObject)
 rMember.Flags & 
sheet::MemberResultFlags::CONTINUE)
  

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

[Caolán McNamara]

 vcl/source/gdi/svmconverter.cxx |  148 
 1 file changed, 90 insertions(+), 58 deletions(-)

New commits:
commit 505d113a3b692002cda077653ead48df4c3f190b
Author: Caolán McNamara 
Date:   Wed Mar 1 21:19:14 2017 +

ofz: check reads, zero vars, return earlier on failure

Change-Id: I287ec575d95ff950097a255abbcd0d3304c04a56

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index b1e3be8..099c791 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -53,29 +53,47 @@ void ImplWriteRect( SvStream& rOStm, const Rectangle& rRect 
)
 WritePair( rOStm, rRect.BottomRight() );
 }
 
-void ImplReadPoly( SvStream& rIStm, tools::Polygon& rPoly )
+bool ImplReadPoly(SvStream& rIStm, tools::Polygon& rPoly)
 {
-sal_Int32   nSize;
+sal_Int32 nSize32(0);
+rIStm.ReadInt32(nSize32);
+sal_uInt16 nSize = nSize32;
 
-rIStm.ReadInt32( nSize );
-rPoly = tools::Polygon( (sal_uInt16) nSize );
+const size_t nMaxPossiblePoints = rIStm.remainingSize() / 2 * 
sizeof(sal_Int32);
+if (nSize > nMaxPossiblePoints)
+{
+SAL_WARN("vcl.gdi", "svm record claims to have: " << nSize << " 
points, but only " << nMaxPossiblePoints << " possible");
+return false;
+}
+
+rPoly = tools::Polygon(nSize);
 
-for( sal_uInt16 i = 0; i < (sal_uInt16) nSize; i++ )
-ReadPair( rIStm, rPoly[ i ] );
+for (sal_uInt16 i = 0; i < nSize && rIStm.good(); ++i)
+ReadPair(rIStm, rPoly[i]);
+
+return rIStm.good();
 }
 
-void ImplReadPolyPoly( SvStream& rIStm, tools::PolyPolygon& rPolyPoly )
+bool ImplReadPolyPoly(SvStream& rIStm, tools::PolyPolygon& rPolyPoly)
 {
-tools::Polygon aPoly;
-sal_Int32   nPolyCount;
+bool bSuccess = true;
 
-rIStm.ReadInt32( nPolyCount );
+tools::Polygon aPoly;
+sal_Int32 nPolyCount32(0);
+rIStm.ReadInt32(nPolyCount32);
+sal_uInt16 nPolyCount = (sal_uInt16)nPolyCount32;
 
-for( sal_uInt16 i = 0; i < (sal_uInt16) nPolyCount; i++ )
+for (sal_uInt16 i = 0; i < nPolyCount && rIStm.good(); ++i)
 {
-ImplReadPoly( rIStm, aPoly );
-rPolyPoly.Insert( aPoly );
+if (!ImplReadPoly(rIStm, aPoly))
+{
+bSuccess = false;
+break;
+}
+rPolyPoly.Insert(aPoly);
 }
+
+return bSuccess && rIStm.good();
 }
 
 void ImplWritePolyPolyAction( SvStream& rOStm, const tools::PolyPolygon& 
rPolyPoly )
@@ -109,7 +127,7 @@ void ImplWritePolyPolyAction( SvStream& rOStm, const 
tools::PolyPolygon& rPolyPo
 
 void ImplReadColor( SvStream& rIStm, Color& rColor )
 {
-sal_Int16 nVal;
+sal_Int16 nVal(0);
 
 rIStm.ReadInt16( nVal ); rColor.SetRed( 
sal::static_int_cast((sal_uInt16)nVal >> 8) );
 rIStm.ReadInt16( nVal ); rColor.SetGreen( 
sal::static_int_cast((sal_uInt16)nVal >> 8) );
@@ -775,32 +793,35 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 
 case GDI_POLYLINE_ACTION:
 {
-ImplReadPoly( rIStm, aActionPoly );
-nLastPolygonAction = rMtf.GetActionSize();
+if (ImplReadPoly(rIStm, aActionPoly))
+{
+nLastPolygonAction = rMtf.GetActionSize();
 
-if( bFatLine )
-rMtf.AddAction( new MetaPolyLineAction( aActionPoly, 
aLineInfo ) );
-else
-rMtf.AddAction( new MetaPolyLineAction( aActionPoly ) );
+if( bFatLine )
+rMtf.AddAction( new MetaPolyLineAction( aActionPoly, 
aLineInfo ) );
+else
+rMtf.AddAction( new MetaPolyLineAction( aActionPoly ) 
);
+}
 }
 break;
 
 case GDI_POLYGON_ACTION:
 {
-ImplReadPoly( rIStm, aActionPoly );
-
-if( bFatLine )
-{
-rMtf.AddAction( new MetaPushAction( PushFlags::LINECOLOR ) 
);
-rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, 
false ) );
-rMtf.AddAction( new MetaPolygonAction( aActionPoly ) );
-rMtf.AddAction( new MetaPopAction() );
-rMtf.AddAction( new MetaPolyLineAction( aActionPoly, 
aLineInfo ) );
-}
-else
+if (ImplReadPoly(rIStm, aActionPoly))
 {
-nLastPolygonAction = rMtf.GetActionSize();
-rMtf.AddAction( new MetaPolygonAction( aActionPoly ) );
+if( bFatLine )
+{
+rMtf.AddAction( new MetaPushAction( 
PushFlags::LINECOLOR ) );
+rMtf.AddAction( new MetaLineColorAction( 
COL_TRANSPARENT, false ) );
+rMtf.AddAction( new MetaPolygonAction( aActionPoly ) );
+rMtf.AddActi

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 77/b1df1522a249467d3ee404f797f782a5157183

[Caolán McNamara]

 77/b1df1522a249467d3ee404f797f782a5157183 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9aa74e6df85ab4f055379ca635f72378952a0017
Author: Caolán McNamara 
Date:   Wed Mar 1 20:50:44 2017 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ae/9b167cfe09fdc3c23c4e4ad7589673bcbbbcf5

[Caolán McNamara]

 ae/9b167cfe09fdc3c23c4e4ad7589673bcbbbcf5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 046898af7aea77c16d9c67067e30bba0ccb81fa5
Author: Caolán McNamara 
Date:   Wed Mar 1 20:50:14 2017 +

Notes added by 'git notes add'

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

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

[Caolán McNamara]

 hwpfilter/source/hwpfile.cxx|2 +-
 sw/source/filter/ww8/wrtww8.cxx |8 
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 425572b9d510cee805dc4160d7e81887d8f27577
Author: Caolán McNamara 
Date:   Wed Mar 1 20:47:59 2017 +

ofz: ReadBlock has to be HWPIDLen to be useful

Change-Id: Iaa349921972bb19b40bf68c6a3b0c7128cff4b8d

diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 33505c0..2983ef0 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -126,7 +126,7 @@ int HWPFile::Open(HStream * stream)
 
 char idstr[HWPIDLen];
 
-if (ReadBlock(idstr, HWPIDLen) <= 0
+if (ReadBlock(idstr, HWPIDLen) < HWPIDLen
 || HWP_V30 != (version = detect_hwp_version(idstr)))
 {
 return SetState(HWP_UNSUPPORTED_VERSION);
commit 6f3e24ad64dd40b3ef8def7d879ba395a16874a1
Author: Caolán McNamara 
Date:   Wed Mar 1 17:24:21 2017 +

Resolves: tdf#106261 throw away old node map for table

when generating a new one, otherwise on exporting the same table
twice to two consecutive .doc footnotes will think the second
export of the table is a level lower because it will find it
in the map and

WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo

does pNodeInfo->setDepth(nDepth + pNodeInfo->getDepth());
using the cached pNodeInfo depth and not a new fresh pNodeInfo of
depth 0

Change-Id: I7aa7ac6a19814910c1d19d78f04cfd9886c444c5

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 849f325..e3f5e1e 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1824,8 +1824,16 @@ void MSWordExportBase::WriteSpecialText( sal_uLong 
nStart, sal_uLong nEnd, sal_u
 // clear linked textboxes since old ones can't be linked to frames in this 
section
 m_aLinkedTextboxesHelper.clear();
 
+// tdf#106261 Reset table infos, otherwise the depth of the cells will be
+// incorrect, in case the header/footer had table(s) and we try to export
+// the same table second time.
+ww8::WW8TableInfo::Pointer_t pOldTableInfo = m_pTableInfo;
+m_pTableInfo = std::make_shared();
+
 WriteText();
 
+m_pTableInfo = pOldTableInfo;
+
 m_bOutPageDescs = bOldPageDescs;
 delete m_pCurPam;// delete Pam
 m_pCurPam = pOldPam;
___
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' - sw/source sw/uiconfig

[Michael Stahl]

 sw/source/ui/table/tabledlg.cxx |   63 +---
 sw/source/uibase/table/tablepg.hxx  |3 -
 sw/uiconfig/swriter/ui/tabletextflowpage.ui |   10 +++-
 3 files changed, 49 insertions(+), 27 deletions(-)

New commits:
commit 362ff67556cca0890ca01f2de44596491c0e9bc8
Author: Michael Stahl 
Date:   Wed Mar 1 17:20:41 2017 +0100

tdf#77111 sw: fix page number offset on table dialog "Text Flow"

Commit c2ccd20c0fd92bddfff76447754541705e3eb8f3 introduced 0 as a valid
value for page number offset in sw core.

Unfortunately the table dialog was not changed then; previously
page number 0 would do automatic numbering, but since then 0 was set as
the offset, and once you have a 0 offset there's no easy way to remove
it, you have to remove the whole page break.

* change the label before the text number edit widget to a checkbox
  that disables the edit widget
* keep the id "pagenoft" so that translations still work
* set initial value to 1; 0 is a really bad default since we can't
  export it to ODF
* add a little bit of left margin so the line is indented below the
  upper line

Change-Id: I70cf5a66d4191acd2c19b3d0a83609e2b348a886
(cherry picked from commit c1e7fc6f497d7570cb0832c43647d295f8592567)
Reviewed-on: https://gerrit.libreoffice.org/34763
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index e96e195..611a2ce 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1282,7 +1282,7 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
 
 get(m_pPageCollCB, "pagestyle");
 get(m_pPageCollLB, "pagestylelb");
-get(m_pPageNoFT, "pagenoft");
+get(m_pPageNoCB, "pagenoft");
 get(m_pPageNoNF, "pagenonf");
 
 get(m_pSplitCB, "split");
@@ -1307,6 +1307,8 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
 LINK( this, SwTextFlowPage, PageBreakTypeHdl_Impl ) );
 m_pPgBrkRB->SetClickHdl(
 LINK( this, SwTextFlowPage, PageBreakTypeHdl_Impl ) );
+m_pPageNoCB->SetClickHdl(
+LINK(this, SwTextFlowPage, PageNoClickHdl_Impl));
 m_pSplitCB->SetClickHdl(
 LINK( this, SwTextFlowPage, SplitHdl_Impl));
 m_pSplitRowCB->SetClickHdl(
@@ -1341,7 +1343,7 @@ void SwTextFlowPage::dispose()
 m_pPgBrkAfterRB.clear();
 m_pPageCollCB.clear();
 m_pPageCollLB.clear();
-m_pPageNoFT.clear();
+m_pPageNoCB.clear();
 m_pPageNoNF.clear();
 m_pSplitCB.clear();
 m_pSplitRowCB.clear();
@@ -1387,10 +1389,10 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
 
 //If we have a page style, then there's no break
 bool bPageItemPut = false;
-if ( bState != (m_pPageCollCB->GetSavedValue() == 1) ||
- ( bState &&
-   m_pPageCollLB->IsValueChangedFromSaved() )
-   || (m_pPageNoNF->IsEnabled() && m_pPageNoNF->IsValueModified()) )
+if (   bState != (m_pPageCollCB->GetSavedValue() == TRISTATE_TRUE)
+|| (bState && m_pPageCollLB->IsValueChangedFromSaved())
+|| (m_pPageNoCB->IsEnabled() && m_pPageNoCB->IsValueChangedFromSaved())
+|| (m_pPageNoNF->IsEnabled() && m_pPageNoNF->IsValueModified()))
 {
 OUString sPage;
 
@@ -1399,12 +1401,15 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
 sPage = m_pPageCollLB->GetSelectEntry();
 }
 sal_uInt16 nPgNum = static_cast< sal_uInt16 >(m_pPageNoNF->GetValue());
-if ( !pDesc || !pDesc->GetPageDesc() ||
-( pDesc->GetPageDesc() && ((pDesc->GetPageDesc()->GetName() != 
sPage) ||
-!comphelper::string::equals(m_pPageNoNF->GetSavedValue(), 
nPgNum
+bool const usePageNo(bState && m_pPageNoCB->IsChecked());
+boost::optional const oPageNum(
+(usePageNo) ? nPgNum : boost::optional());
+if (!pDesc || !pDesc->GetPageDesc()
+|| (pDesc->GetPageDesc()->GetName() != sPage)
+|| (pDesc->GetNumOffset() != oPageNum))
 {
 SwFormatPageDesc aFormat( pShell->FindPageDescByName( sPage, true 
) );
-aFormat.SetNumOffset(bState ? nPgNum : 0);
+aFormat.SetNumOffset(oPageNum);
 bModified |= nullptr != rSet->Put( aFormat );
 bPageItemPut = bState;
 }
@@ -1526,12 +1531,18 @@ void   SwTextFlowPage::Reset( const SfxItemSet* rSet )
 OUString sPageDesc;
 const SwPageDesc* pDesc = static_cast(pItem)->GetPageDesc();
 
-//m_pPageNoNF->SetValue(static_cast(pItem)->GetNumOffset());
 ::boost::optional oNumOffset = static_cast(pItem)->GetNumOffset();
 if (oNumOffset)
+{
+m_pPageNoCB->Check();
+m_pPageNoNF->Enable(true)

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

[Michael Meeks]

 vcl/source/window/mouse.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e2eb25a52d86eec868ace658dd3a27eaf536b311
Author: Michael Meeks 
Date:   Wed Mar 1 15:13:19 2017 +

Tolerate mouse move generation on disposed windows.


http://crashreport.libreoffice.org/stats/crash_details/524d28fb-4fd2-4d11-83b1-1360b5ab5068

Change-Id: I19a13f751b5cf000c9938ff991d7d44bba0a4de7
Reviewed-on: https://gerrit.libreoffice.org/34756
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit a9be0b6a4e39240871a9b35ae9afd04f242a3ea4)
Reviewed-on: https://gerrit.libreoffice.org/34757
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index adea785..a2a214b 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -160,7 +160,8 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool 
bModChanged )
 
 void Window::ImplGenerateMouseMove()
 {
-if ( !mpWindowImpl->mpFrameData->mnMouseMoveId )
+if ( mpWindowImpl && mpWindowImpl->mpFrameData &&
+ !mpWindowImpl->mpFrameData->mnMouseMoveId )
 mpWindowImpl->mpFrameData->mnMouseMoveId = Application::PostUserEvent( 
LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ), nullptr, 
true );
 }
 
___
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' - readlicense_oo/Package_files.mk solenv/gbuild

[Tor Lillqvist]

 readlicense_oo/Package_files.mk  |4 
 solenv/gbuild/platform/macosx.mk |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 578c0236017833641d645a47dbaa7ae0e61e3a2d
Author: Tor Lillqvist 
Date:   Wed Feb 22 17:13:13 2017 +0200

Put also the LICENSE file in Resources on macOS

Follow-up: Fix gb_Extension_LICENSEFILE_DEFAULT.

Change-Id: Ia4888050099e74b93af67c58e988b4ae9e2516a1
(cherry picked from commit 3c946d688627ba0c31bcb37dfed4e6e180608854)
(cherry picked from commit c0c3575f7434712d294ccb0eaa7f49bf845437e0)
Reviewed-on: https://gerrit.libreoffice.org/34758
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 1f06bdd..0570a79 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -12,7 +12,11 @@ $(eval $(call 
gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo/l
 # LICENSE (upper case) is copied without EOL conversion
 # license.txt is converted, prior to copy, see Package_license.mk
 ifneq ($(OS),WNT)
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE))
+else
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE,LICENSE))
+endif
 endif
 
 ifneq ($(OS),MACOSX)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 9bf18c3..626f399 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -334,7 +334,7 @@ gb_CliAssemblyTarget_get_dll :=
 
 # Extension class
 
-gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE
+gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/Resources/LICENSE
 
 # UnpackedTarget class
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - 2 commits - net/WebSocketHandler.cpp net/WebSocketHandler.hpp test/Makefile.am wsd/LOOLWSD.cpp

[Jan Holesovsky]

 net/WebSocketHandler.cpp |   12 
 net/WebSocketHandler.hpp |   35 +--
 test/Makefile.am |1 -
 wsd/LOOLWSD.cpp  |   16 
 4 files changed, 21 insertions(+), 43 deletions(-)

New commits:
commit 01885dc81aafd7613896b801567909285d9cfa9b
Author: Jan Holesovsky 
Date:   Wed Mar 1 19:49:29 2017 +0100

nb: No need for the WebSocketSender I think.

Change-Id: I133bb8341a846d70f95e0c70274541b5db62f65d

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 3b5756d..b55c4f2 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -33,6 +33,12 @@ public:
 {
 }
 
+WebSocketHandler(const std::weak_ptr& socket) :
+_shuttingDown(false)
+{
+onConnect(socket);
+}
+
 /// Implementation of the SocketHandlerInterface.
 void onConnect(const std::weak_ptr& socket) override
 {
@@ -193,6 +199,11 @@ public:
 _wsPayload.clear();
 }
 
+void sendFrame(const std::string& msg) const
+{
+sendMessage(msg.data(), msg.size(), WSOpCode::Text);
+}
+
 /// Sends a WebSocket message of WPOpCode type.
 /// Returns the number of bytes written (including frame overhead) on 
success,
 /// 0 for closed/invalid socket, and -1 for other errors.
@@ -274,29 +285,9 @@ protected:
 return len + 2;
 }
 
-/// To me overriden to handle the websocket messages the way you need.
-virtual void handleMessage(bool fin, WSOpCode code, std::vector 
&data) = 0;
-};
-
-class WebSocketSender : private WebSocketHandler
-{
-public:
-WebSocketSender(const std::weak_ptr& socket)
-{
-onConnect(socket);
-}
-
-void sendFrame(const std::string& msg) const
-{
-sendMessage(msg.data(), msg.size(), WSOpCode::Text);
-}
-
-using WebSocketHandler::shutdown;
-
-private:
-void handleMessage(bool, WSOpCode, std::vector&) override
+/// To be overriden to handle the websocket messages the way you need.
+virtual void handleMessage(bool /*fin*/, WSOpCode /*code*/, 
std::vector &/*data*/)
 {
-// We will not read any.
 }
 };
 
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 2985b25..73f5454 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -204,7 +204,7 @@ static int careerSpanSeconds = 0;
 namespace
 {
 
-inline void shutdownLimitReached(WebSocketSender& ws)
+inline void shutdownLimitReached(WebSocketHandler& ws)
 {
 const std::string error = Poco::format(PAYLOAD_UNAVAILABLE_LIMIT_REACHED, 
MAX_DOCUMENTS, MAX_CONNECTIONS);
 LOG_INF("Sending client limit-reached message: " << error);
@@ -2340,7 +2340,7 @@ bool LOOLWSD::createForKit()
 std::mutex Connection::Mutex;
 #endif
 
-static std::shared_ptr createDocBroker(WebSocketSender& ws,
+static std::shared_ptr createDocBroker(WebSocketHandler& ws,
const std::string& uri,
const std::string& 
docKey,
const Poco::URI& 
uriPublic)
@@ -2378,7 +2378,7 @@ static std::shared_ptr 
createDocBroker(WebSocketSender& ws,
 /// Otherwise, creates and adds a new one to DocBrokers.
 /// May return null if terminating or MaxDocuments limit is reached.
 /// After returning a valid instance DocBrokers must be cleaned up after 
exceptions.
-static std::shared_ptr findOrCreateDocBroker(WebSocketSender& 
ws,
+static std::shared_ptr findOrCreateDocBroker(WebSocketHandler& 
ws,
  const 
std::string& uri,
  const 
std::string& docKey,
  const 
std::string& id,
@@ -2514,7 +2514,7 @@ static void removeDocBrokerSession(const 
std::shared_ptr& docBro
 }
 }
 
-static std::shared_ptr createNewClientSession(const 
WebSocketSender& ws,
+static std::shared_ptr createNewClientSession(const 
WebSocketHandler& ws,
  const 
std::string& id,
  const Poco::URI& 
uriPublic,
  const 
std::shared_ptr& docBroker,
@@ -3125,7 +3125,7 @@ private:
 LOG_INF("Client WS request" << request.getURI() << ", url: " << url);
 
 // First Upgrade.
-WebSocketSender ws = upgradeToWebSocket(request);
+WebSocketHandler ws = upgradeToWebSocket(request);
 
 if (_connectionNum > MAX_CONNECTIONS)
 {
@@ -3206,7 +3206,7 @@ private:
 LOG_CHECK_RET(docBroker && "Null DocumentBroker instance", );
 const auto docKey = docBroker->getDocKey();
 
-WebSocketSender ws(_socket);
+WebSocketHandler ws(_socket);
 try
 {
 // Connection terminated. Destroy session.
@@ -3282,7 +3282,7

[Libreoffice-commits] core.git: desktop/Module_desktop.mk desktop/Package_desktop_install.mk

[Tor Lillqvist]

 desktop/Module_desktop.mk  |4 
 desktop/Package_desktop_install.mk |   14 --
 2 files changed, 18 deletions(-)

New commits:
commit ed3b58dc67616c772f736e52b87fd9c84078b8db
Author: Tor Lillqvist 
Date:   Wed Mar 1 18:05:49 2017 +0200

No need for the program -> MacOS symlink

Or could it be that some external scripts insist on running
LibreOffice.app/Contents/program/soffice? Or some instructions talk
about that pathname?

Change-Id: I99e2b2636971c7ee8de09a9e42df9f965eeec5fb

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 17ec5bf..a5a6883 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -100,10 +100,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
 
 else ifeq ($(OS),MACOSX)
 
-$(eval $(call gb_Module_add_targets,desktop,\
-Package_desktop_install \
-))
-
 else ifeq ($(OS),ANDROID)
 
 else ifeq ($(OS),IOS)
diff --git a/desktop/Package_desktop_install.mk 
b/desktop/Package_desktop_install.mk
deleted file mode 100644
index 00d7546..000
--- a/desktop/Package_desktop_install.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- 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_Package_Package,desktop_install,$(SRCDIR)))
-
-$(eval $(call gb_Package_add_symbolic_link,desktop_install,program,MacOS))
-
-# 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] help.git: source/text

[Michael Stahl]

 source/text/swriter/01/05030200.xhp |2 +-
 source/text/swriter/01/05090300.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e7999c35fd7460118469142420c7d39ba556
Author: Michael Stahl 
Date:   Wed Mar 1 17:52:19 2017 +0100

tdf#77111 helpcontent: adapt "Text flow" tab page help

Replace obsolete description of "0" page number.

Change-Id: I1881bca456d94af74060e1e3b92e043255c9e702

diff --git a/source/text/swriter/01/05030200.xhp 
b/source/text/swriter/01/05030200.xhp
index d55766f..e97ec42 100644
--- a/source/text/swriter/01/05030200.xhp
+++ b/source/text/swriter/01/05030200.xhp
@@ -75,7 +75,7 @@
 Select the 
formatting style to use for the first page after the break.
 
 Page number
-Enter the page 
number that you want to appear on the first page after the break. If you want 
to use the current page numbering, select "0".
+Enter the page 
number for the first page that follows the break. If you want to continue the 
current page numbering, leave the checkbox unchecked.
 Options
 Specify the text flow options for paragraphs that appear before and 
after a page break.
 
diff --git a/source/text/swriter/01/05090300.xhp 
b/source/text/swriter/01/05090300.xhp
index d3da878..2eceaa9 100644
--- a/source/text/swriter/01/05090300.xhp
+++ b/source/text/swriter/01/05090300.xhp
@@ -70,7 +70,7 @@
 Select the page style 
that you want to apply to the first page that follows the 
break.
 
 Page number
-Enter 
the page number for the first page that follows the break.
+Enter 
the page number for the first page that follows the break. If you want to 
continue the current page numbering, leave the checkbox 
unchecked.
 
 Allow table to split across pages and columns
 Allows a 
page break or column break between the rows of a table.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Michael Stahl]

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

New commits:
commit 6f63d83a4f4cba7670f16f418d687650457a1bdb
Author: Michael Stahl 
Date:   Wed Mar 1 17:52:19 2017 +0100

Updated core
Project: help  e7999c35fd7460118469142420c7d39ba556

tdf#77111 helpcontent: adapt "Text flow" tab page help

Replace obsolete description of "0" page number.

Change-Id: I1881bca456d94af74060e1e3b92e043255c9e702

diff --git a/helpcontent2 b/helpcontent2
index a43b8eb..e7999c3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a43b8eb31d44f4a3193029f7593281152ed2e5f9
+Subproject commit e7999c35fd7460118469142420c7d39ba556
___
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' - cui/source cui/uiconfig sw/source

[Michael Stahl]

 cui/source/inc/paragrph.hxx   |3 -
 cui/source/tabpages/paragrph.cxx  |   85 --
 cui/uiconfig/ui/textflowpage.ui   |   10 +++-
 sw/source/uibase/utlui/uitool.cxx |   21 -
 4 files changed, 90 insertions(+), 29 deletions(-)

New commits:
commit a5104f575a5acf8aea957cb79aa0fd67bc74f141
Author: Michael Stahl 
Date:   Wed Mar 1 12:39:54 2017 +0100

tdf#77111 cui,sw: fix page number offset on paragraph dialog "Text Flow"

Commit c2ccd20c0fd92bddfff76447754541705e3eb8f3 introduced 0 as a valid
value for page number offset in sw core.

Unfortunately the paragraph dialog was not changed then; previously
page number 0 would do automatic numbering, but since then 0 was set as
the offset, and once you have a 0 offset there's no easy way to remove
it, you have to remove the whole page break.

* change the label before the text number edit widget to a checkbox
  that disables the edit widget

* keep the id "labelPageNum" so that translations still work

* adapt SfxToSwPageDescAttr so it can not just set but also clear the
  page number

* set initial value to 1; 0 is a really bad default since we can't
  export it to ODF (see tdf#91306)

Change-Id: Ic4ca9e2562bb65ac359b305a2202f782e8598307
(cherry picked from commit d36fa0589ab822dc617c65b4d0d3bf68c092ad37)
Reviewed-on: https://gerrit.libreoffice.org/34745
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index c38f65a..abe414a 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -234,7 +234,7 @@ private:
 VclPtrm_pBreakPositionLB;
 VclPtrm_pApplyCollBtn;
 VclPtrm_pApplyCollBox;
-VclPtr  m_pPagenumText;
+VclPtrm_pPageNumBox;
 VclPtr   m_pPagenumEdit;
 
 // paragraph division
@@ -262,6 +262,7 @@ private:
 DECL_LINK(ApplyCollClickHdl_Impl, Button*, void);
 DECL_LINK( PageBreakPosHdl_Impl, ListBox&, void );
 DECL_LINK( PageBreakTypeHdl_Impl, ListBox&, void );
+DECL_LINK(PageNumBoxClickHdl_Impl, Button*, void);
 
 virtual voidPageCreated(const SfxAllItemSet& aSet) override;
 };
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 2f63044..5a26a65 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1402,18 +1402,27 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* 
rOutSet )
 }
 }
 
-if (m_pPagenumEdit->IsEnabled() && m_pPagenumEdit->IsValueModified())
+if (m_pPageNumBox->IsEnabled()
+&& (m_pPageNumBox->IsValueChangedFromSaved() || 
m_pPagenumEdit->IsValueModified()))
 {
-SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM,
-(sal_uInt16)m_pPagenumEdit->GetValue() );
-
 pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGENUM );
 
-if ( !pOld || static_cast(pOld)->GetValue() != 
aPageNum.GetValue() )
+if (TRISTATE_TRUE == m_pPageNumBox->GetState()
+&& (!pOld || IsInvalidItem(pOld)
+|| static_cast(pOld)->GetValue() != 
m_pPagenumEdit->GetValue()))
 {
+SfxUInt16Item aPageNum(SID_ATTR_PARA_PAGENUM,
+static_cast(m_pPagenumEdit->GetValue()));
 rOutSet->Put( aPageNum );
 bModified = true;
 }
+else if (TRISTATE_FALSE == m_pPageNumBox->GetState()
+&& (pOld || IsInvalidItem(pOld)))
+{
+// need to tell sw to remove the item
+rOutSet->DisableItem(SID_ATTR_PARA_PAGENUM);
+bModified = true;
+}
 }
 
 // pagebreak
@@ -1605,11 +1614,34 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* 
rSet )
 
 _nWhich = GetWhich( SID_ATTR_PARA_PAGENUM );
 
-if (rSet->GetItemState(_nWhich) >= SfxItemState::SET)
+switch (rSet->GetItemState(_nWhich))
 {
-const sal_uInt16 nPageNum =
-static_cast(rSet->Get( _nWhich ) 
).GetValue();
-m_pPagenumEdit->SetValue( nPageNum );
+case SfxItemState::SET:
+{
+m_pPageNumBox->EnableTriState(false);
+m_pPageNumBox->SetState(TRISTATE_TRUE);
+SfxUInt16Item const*const pItem(static_cast(rSet->GetItem(_nWhich)));
+const sal_uInt16 nPageNum(pItem->GetValue());
+m_pPagenumEdit->SetValue( nPageNum );
+break;
+}
+case SfxItemState::DONTCARE:
+{
+m_pPageNumBox->EnableTriState();
+m_pPageNumBox->SetState(TRISTATE_INDET);
+break;
+}
+case SfxItemState::UNKNOWN:
+case SfxItemState::DEFAULT:
+case SfxItemState::DISABLED:
+{
+m_pPageNumBox->EnableTriState(false);
+m_pPageNumBox->SetState(TRISTATE_F

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

[Michael Stahl]

 sw/source/ui/table/tabledlg.cxx |   67 +---
 sw/source/uibase/table/tablepg.hxx  |3 -
 sw/uiconfig/swriter/ui/tabletextflowpage.ui |   10 ++--
 3 files changed, 51 insertions(+), 29 deletions(-)

New commits:
commit e453c5f0b9b85a9d77629efde89e499cfcd9a1db
Author: Michael Stahl 
Date:   Wed Mar 1 17:21:34 2017 +0100

sw: remove some more hardcoded 1 with TRISTATE_TRUE

Change-Id: I8cc89c66eb1c3f09e02ba312e6ea8c9379ff8a4d

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 611a2ce..a2c73a8 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1416,8 +1416,8 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
 }
 bool bIsChecked = m_pPgBrkCB->IsChecked();
 if ( !bPageItemPut &&
-(   bState != (m_pPageCollCB->GetSavedValue() == 1) ||
-bIsChecked != (m_pPgBrkCB->GetSavedValue() ==1) ||
+(   bState != (m_pPageCollCB->GetSavedValue() == TRISTATE_TRUE) ||
+bIsChecked != (m_pPgBrkCB->GetSavedValue() == TRISTATE_TRUE) ||
 m_pPgBrkBeforeRB->IsValueChangedFromSaved()||
 m_pPgBrkRB->IsValueChangedFromSaved() ))
 {
commit c1e7fc6f497d7570cb0832c43647d295f8592567
Author: Michael Stahl 
Date:   Wed Mar 1 17:20:41 2017 +0100

tdf#77111 sw: fix page number offset on table dialog "Text Flow"

Commit c2ccd20c0fd92bddfff76447754541705e3eb8f3 introduced 0 as a valid
value for page number offset in sw core.

Unfortunately the table dialog was not changed then; previously
page number 0 would do automatic numbering, but since then 0 was set as
the offset, and once you have a 0 offset there's no easy way to remove
it, you have to remove the whole page break.

* change the label before the text number edit widget to a checkbox
  that disables the edit widget
* keep the id "pagenoft" so that translations still work
* set initial value to 1; 0 is a really bad default since we can't
  export it to ODF
* add a little bit of left margin so the line is indented below the
  upper line

Change-Id: I70cf5a66d4191acd2c19b3d0a83609e2b348a886

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index e96e195..611a2ce 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1282,7 +1282,7 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
 
 get(m_pPageCollCB, "pagestyle");
 get(m_pPageCollLB, "pagestylelb");
-get(m_pPageNoFT, "pagenoft");
+get(m_pPageNoCB, "pagenoft");
 get(m_pPageNoNF, "pagenonf");
 
 get(m_pSplitCB, "split");
@@ -1307,6 +1307,8 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
 LINK( this, SwTextFlowPage, PageBreakTypeHdl_Impl ) );
 m_pPgBrkRB->SetClickHdl(
 LINK( this, SwTextFlowPage, PageBreakTypeHdl_Impl ) );
+m_pPageNoCB->SetClickHdl(
+LINK(this, SwTextFlowPage, PageNoClickHdl_Impl));
 m_pSplitCB->SetClickHdl(
 LINK( this, SwTextFlowPage, SplitHdl_Impl));
 m_pSplitRowCB->SetClickHdl(
@@ -1341,7 +1343,7 @@ void SwTextFlowPage::dispose()
 m_pPgBrkAfterRB.clear();
 m_pPageCollCB.clear();
 m_pPageCollLB.clear();
-m_pPageNoFT.clear();
+m_pPageNoCB.clear();
 m_pPageNoNF.clear();
 m_pSplitCB.clear();
 m_pSplitRowCB.clear();
@@ -1387,10 +1389,10 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
 
 //If we have a page style, then there's no break
 bool bPageItemPut = false;
-if ( bState != (m_pPageCollCB->GetSavedValue() == 1) ||
- ( bState &&
-   m_pPageCollLB->IsValueChangedFromSaved() )
-   || (m_pPageNoNF->IsEnabled() && m_pPageNoNF->IsValueModified()) )
+if (   bState != (m_pPageCollCB->GetSavedValue() == TRISTATE_TRUE)
+|| (bState && m_pPageCollLB->IsValueChangedFromSaved())
+|| (m_pPageNoCB->IsEnabled() && m_pPageNoCB->IsValueChangedFromSaved())
+|| (m_pPageNoNF->IsEnabled() && m_pPageNoNF->IsValueModified()))
 {
 OUString sPage;
 
@@ -1399,12 +1401,15 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
 sPage = m_pPageCollLB->GetSelectEntry();
 }
 sal_uInt16 nPgNum = static_cast< sal_uInt16 >(m_pPageNoNF->GetValue());
-if ( !pDesc || !pDesc->GetPageDesc() ||
-( pDesc->GetPageDesc() && ((pDesc->GetPageDesc()->GetName() != 
sPage) ||
-!comphelper::string::equals(m_pPageNoNF->GetSavedValue(), 
nPgNum
+bool const usePageNo(bState && m_pPageNoCB->IsChecked());
+boost::optional const oPageNum(
+(usePageNo) ? nPgNum : boost::optional());
+if (!pDesc || !pDesc->GetPageDesc()
+|| (pDesc->GetPageDesc()->GetName() != sPage)
+|| (pDesc->GetNumOffset() != oPageNum))
 {
 SwFormatPageDesc aFo

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwptablelayout.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 6c9aa14ca7335ca5e2d3c3353f5142c48d6ef0c2
Author: Caolán McNamara 
Date:   Wed Mar 1 16:25:57 2017 +

build WordProCellsMap much faster

Change-Id: I1fbc1f7ec14c8133fb8fcd3532d5d551dcc7ddfb

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 6914cf4..5e42c10 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -460,10 +460,7 @@ void LwpTableLayout::TraverseTable()
 sal_uInt32 nCount = m_nRows*m_nCols;
 
 // new cell map nRow*nCOl and initialize
-for (sal_uInt32 iLoop = 0; iLoop < nCount; ++iLoop)
-{
-m_WordProCellsMap.push_back(GetDefaultCellLayout());
-}
+m_WordProCellsMap.insert(m_WordProCellsMap.end(), nCount, 
m_pDefaultCellLayout);
 
 // set value
 LwpObjectID& rRowID = GetChildHead();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst

[Matthias Seidel]

 extensions.lst |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 77b1df1522a249467d3ee404f797f782a5157183
Author: Matthias Seidel 
Date:   Wed Mar 1 15:04:24 2017 +

Updated more links for dictionaries

diff --git a/extensions.lst b/extensions.lst
index 88d2815..5089034 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -25,7 +25,7 @@
 # file:// URLs are interpreted relative to the solver/340//bin/ 
directory to which 
 # built extensions are delivered by default.
 
-# http:// URLs can be prefixed by an MD5 checksum.  If that is present then it 
is an error if
+# https:// URLs can be prefixed by an MD5 checksum.  If that is present then 
it is an error if
 # the file pointed to by the URL has a different MD5 checksum.
 # When the downloaded file name is not the last part of the URL (everything 
after the final /) then
 # the name has to be specified after the URL enclosed in double quotes.
@@ -63,7 +63,7 @@
 
 # Spanish dictionary.
 [ language=es || language=ca || language=ca_XV ]
-59dd45e6785ed644adbbd73f4f126182 
https://sourceforge.net/projects/aoo-extensions/files/1657/3/es_es.oxt/download 
"es_es.oxt"
+1b999fcef948148e269161a08e7acf20 
https://sourceforge.net/projects/aoo-extensions/files/1657/4/es_es.oxt/download 
"es_es.oxt"
 
 # Danish dictionary.
 [ language=da ]
@@ -80,7 +80,7 @@
 
 # Russian dictionary.
 [ language=ru ]
-93921f14809a22770f1bd89af65015bc 
https://sourceforge.net/projects/aoo-extensions/files/3233/3/dict_ru_ru-0.3.7.oxt/download
 "dict-ru.oxt"
+93921f14809a22770f1bd89af65015bc 
https://sourceforge.net/projects/aoo-extensions/files/3233/3/dict_ru_ru-0.3.7.oxt/download
 "dict_ru_ru-0.3.7.oxt"
 
 # Slovak dictionary.
 [ language=sk ]
@@ -92,7 +92,7 @@
 
 # German (Austria) dictionary.
 [ language=de || language=de_AT || language=de_DE ]
-  0cf6783cb0f1355ef3869aa9699700b3 
https://sourceforge.net/projects/aoo-extensions/files/1697/12/dict-de_at-frami_2017-01-28.oxt/download
 "dict-de_at-frami_2017-01-12.oxt"
+0cf6783cb0f1355ef3869aa9699700b3 
https://sourceforge.net/projects/aoo-extensions/files/1697/12/dict-de_at-frami_2017-01-28.oxt/download
 "dict-de_at-frami_2017-01-12.oxt"
 
 # German (Switzerland) dictionary.
 [ language=de || language=de_CH || language=de_DE ]
@@ -117,7 +117,7 @@
 
 # Asturian.
 [ language=ast ]
-ed5702f25c8f5e36f97cafc606470c42 
https://sourceforge.net/projects/aoo-extensions/files/3932/1/asturianu.oxt/download
 "asturianu.oxt"
+931373dea3bed9621dd55713b53b38ae 
https://sourceforge.net/projects/aoo-extensions/files/3932/2/ort_ast_20150417_2259.oxt/download
 "ort_ast_20150417_2259.oxt"
 
 # Norwegian.
 [ language=nb ]
@@ -133,7 +133,7 @@
 
 # Polish.
 [ language=pl ]
-a69f9221864b1360e38ff3f0b0cc9222 
https://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download
 "pl-dict.oxt"
+6218d6999038aaab574e05b1b891078e 
https://sourceforge.net/projects/aoo-extensions/files/806/7/pl-dict.oxt/download
 "pl-dict.oxt"
 
 # Portuguese (European).
 [ language=pt || language=pt_PT ]
@@ -141,13 +141,13 @@
 
 # Catalan.
 [ language=ca ]
-ed1c612a462490b541297a8522f667d0 
https://sourceforge.net/projects/aoo-extensions/files/1205/3/catalan.oxt/download
 "dict-ca.oxt"
+4cf4e4a9d85f14761d38943b7e1fd76d 
https://sourceforge.net/projects/aoo-extensions/files/1205/5/ca.3.0.0.oxt/download
 "ca.3.0.0.oxt"
 
 # Valencian AVL (this is incompatible with Catalan).
 [ language=ca_XV ]
-3b87a28bf1ff2a8beb76a5b501f40d1c 
https://sourceforge.net/projects/aoo-extensions/files/1475/0/avl.oxt/download 
"dict-ca-xv.oxt"
+d425579a9a2e26663abaecdd661be419 
https://sourceforge.net/projects/aoo-extensions/files/1475/1/ca-valencia.3.0.0.oxt/download
 "ca-valencia.3.0.0.oxt"
 
 # Valencian RACV (this is incompatible with Catalan).
 [ language=ca_XR ]
-6112a73444a1ad3cf70736649e228f0f 
https://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download
 "dict-ca-xr.oxt"
+6112a73444a1ad3cf70736649e228f0f 
https://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download
 "dict_valencian_llit.oxt"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 vcl/source/window/mouse.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a9be0b6a4e39240871a9b35ae9afd04f242a3ea4
Author: Michael Meeks 
Date:   Wed Mar 1 15:13:19 2017 +

Tolerate mouse move generation on disposed windows.


http://crashreport.libreoffice.org/stats/crash_details/524d28fb-4fd2-4d11-83b1-1360b5ab5068

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

diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index d6bf320..b4f2f6d 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -160,7 +160,8 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool 
bModChanged )
 
 void Window::ImplGenerateMouseMove()
 {
-if ( !mpWindowImpl->mpFrameData->mnMouseMoveId )
+if ( mpWindowImpl && mpWindowImpl->mpFrameData &&
+ !mpWindowImpl->mpFrameData->mnMouseMoveId )
 mpWindowImpl->mpFrameData->mnMouseMoveId = Application::PostUserEvent( 
LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ), nullptr, 
true );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-0' - vcl/Library_vclplug_kde.mk

[Thorsten Behrens]

 vcl/Library_vclplug_kde.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 83814e0896d849d4c18d58dad5b4b216ff4d2bf1
Author: Thorsten Behrens 
Date:   Wed Mar 1 16:36:36 2017 +0100

Fix kde3 build on Linux

Change-Id: I5ac9bc37bde356be1327444b51a2ada1b92d22f7

diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 4071422..4049208 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
 
 $(eval $(call gb_Library_use_externals,vclplug_kde,\
boost_headers \
+   cairo \
icuuc \
kde \
glew \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 Makefile.in |2 +-
 solenv/gbuild/Module.mk |5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c835ed0229f4647bd14344195e212fb7602506b5
Author: Markus Mohrhard 
Date:   Wed Mar 1 16:32:56 2017 +0100

uitest: finally a working dependency on the build target for uicheck

Change-Id: Icaf1de556ae20027e27321750197ed574b508435

diff --git a/Makefile.in b/Makefile.in
index 7146be0..080ba46 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck 
subsequentcheck perfcheck uic
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
- $(if $(filter build-nocheck,$(MAKECMDGOALS)),build)\
+ $(if $(filter build-nocheck uicheck,$(MAKECMDGOALS)),build)\
  $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\
  $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules 
translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo 
gbuildtojson,$(MAKECMDGOALS))
 
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index dd159a74..24f932c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -372,6 +372,11 @@ define gb_Module_add_uicheck_target
 $(call gb_Module__read_targetfile,$(1),$(2),uicheck target)
 
 $(call gb_Module_get_uicheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
+$$(gb_Module_CURRENTTARGET) :| \
+   $(call gb_Postprocess_get_target,AllModulesButInstsetNative) \
+$(call gb_Package_get_target,instsetoo_native_setup) \
+$(call gb_Package_get_target,instsetoo_native_setup_ure)
+$(call gb_Module_get_uicheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
___
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-21'

[Andras Timar]

Tag 'cp-5.1-21' created by Andras Timar  at 
2017-03-01 15:13 +

cp-5.1-21

Changes since cp-5.1-17:
Andras Timar (1):
  tdf#105396 update German dictionaries

---
 de/README_extension_owner.txt |   11 
 de/README_hyph_de.txt |5 
 de/README_thesaurus.txt   |4 
 de/de_AT_frami.aff|4 
 de/de_AT_frami.dic|12602 -
 de/de_CH_frami.aff|4 
 de/de_CH_frami.dic|12460 -
 de/de_DE_frami.aff|4 
 de/de_DE_frami.dic|12574 -
 de/description.xml|2 
 de/hyph_de_AT.dic |74431 +++-
 de/hyph_de_CH.dic |74429 +++-
 de/hyph_de_DE.dic |74427 +++-
 de/th_de_CH_v2.dat|95202 ++---
 de/th_de_DE_v2.dat|95282 ++
 15 files changed, 360559 insertions(+), 90882 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 4 commits - configure.ac dtrans/source include/vcl sc/source toolkit/source

[Andras Timar]

 configure.ac   |2 -
 dtrans/source/win32/dtobj/XTDataObject.cxx |   38 -
 dtrans/source/win32/dtobj/XTDataObject.hxx |3 --
 include/vcl/svapp.hxx  |4 ---
 sc/source/core/data/document10.cxx |7 +++--
 sc/source/ui/view/viewfun2.cxx |   12 ++---
 toolkit/source/awt/asynccallback.cxx   |3 +-
 7 files changed, 18 insertions(+), 51 deletions(-)

New commits:
commit e91d2c2d59b035e40bdefac5fe06fb210180ed86
Author: Andras Timar 
Date:   Wed Mar 1 16:13:15 2017 +0100

Bump version to 5.1-21

Change-Id: I39c14759e6b974e08af9a4c1781fc2286078b74c

diff --git a/configure.ac b/configure.ac
index b1b6ee0..cc7599f 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([Collabora Office],[5.1.10.20],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.1.10.21],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit d063db2f6dc3e6f36ec53cd5d7f4c1ed1095774c
Author: Markus Mohrhard 
Date:   Mon Sep 19 17:18:21 2016 +0200

tdf#100393, handle copying one cell to multiple cols with cond format

The same fix has been applied for rows already.

Change-Id: I77300680a657fb874d07641fbae928eb6c210acd
(cherry picked from commit 3a9917b66d6820ec9f2844f8292a46d8b0b9180b)

diff --git a/sc/source/core/data/document10.cxx 
b/sc/source/core/data/document10.cxx
index 99bc8a2..a5e95a37 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -125,8 +125,11 @@ bool ScDocument::CopyOneCellFromClip(
 if (rCxt.getInsertFlag() & InsertDeleteFlags::ATTRIB)
 for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
 {
-maTabs[i]->CopyConditionalFormat(nCol1, nRow, nCol2, nRow, 
nCol1 - aClipRange.aStart.Col(),
-nRow - aClipRange.aStart.Row(), pSrcTab);
+for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
+{
+maTabs[i]->CopyConditionalFormat(nCol, nRow, nCol, nRow, 
nCol - aClipRange.aStart.Col(),
+nRow - aClipRange.aStart.Row(), pSrcTab);
+}
 }
 }
 
commit 38903acb970cf5d6ef10b47b65f996dd266d6d72
Author: Laurent Balland-Poirier 
Date:   Wed Jul 20 20:27:23 2016 +0200

tdf#90943 Don't ask to move cells if they are empty

During merge of cells, test of empty cells was wrong.
Test of first column should not be done if there is only 1 row

Change-Id: If8011f3e6d6e9006d242a8c2ef0fcb2ce12180ad
Reviewed-on: https://gerrit.libreoffice.org/27354
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 0baeea95f38a5cdb19936290c69d33541274ad41)

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 273b290..3e40098 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1063,9 +1063,15 @@ bool ScViewFunc::MergeCells( bool bApi, bool& 
rDoContents, bool bRecord, bool bC
 SCTAB i = *itr;
 aMergeOption.maTabs.insert(i);
 
-if (!rDoc.IsBlockEmpty(i, nStartCol, nStartRow+1, nStartCol, nEndRow) 
||
-!rDoc.IsBlockEmpty(i, nStartCol+1, nStartRow, nEndCol, nEndRow))
-bAskDialog = true;
+if ( nEndRow == nStartRow )
+{
+if (!rDoc.IsBlockEmpty(i, nStartCol+1, nStartRow, nEndCol, 
nEndRow))
+bAskDialog = true;
+}
+else
+if (!rDoc.IsBlockEmpty(i, nStartCol, nStartRow+1, nStartCol, 
nEndRow) ||
+!rDoc.IsBlockEmpty(i, nStartCol+1, nStartRow, nEndCol, 
nEndRow))
+bAskDialog = true;
 }
 
 bool bOk = true;
commit 0759c5973cf7be07789f21204540f62594224b86
Author: Andras Timar 
Date:   Wed Mar 1 16:11:53 2017 +0100

Revert "tdf#103852 avoid clipboard deadlock"

This reverts commit 56b7eb743e82c1e12bc91d73f526e705f2c70b39.

diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx 
b/dtrans/source/win32/dtobj/XTDataObject.cxx
index d36328a..3c8a937 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -25,11 +25,8 @@
 #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)
@@ -55,33 +52,6 @@ using namespace com::sun::star::datatransfer::clipboard;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace
-{
-
-/**
-   We need to destroy XTransferable in the main thread to avoid dead lock
-   when locking in the cl

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

[Andras Timar]

Tag 'cp-5.1-21' created by Andras Timar  at 
2017-03-01 15:13 +

cp-5.1-21

Changes since cp-5.1-20-4:
---
 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/cp-5.1-21'

[jan Iversen]

Tag 'cp-5.1-21' created by Andras Timar  at 
2017-03-01 15:13 +

cp-5.1-21

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] help.git: Changes to 'refs/tags/cp-5.1-21'

[Miklos Vajna]

Tag 'cp-5.1-21' created by Andras Timar  at 
2017-03-01 15:13 +

cp-5.1-21

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

Re: Various MacOS extension issues.

[Adomas Venčkauskas]

On 24 February 2017 at 18:04, Stephan Bergmann  wrote:

> should work now on master with  libreoffice/core/commit/?id=f21994e7a240563283b7a17dcb435ce7c5156b60>
> "Make JVM -Xrunjdwp option work on macOS"
>
>
​Thanks for ​looking into this. Meanwhile I've built with debug logging
enabled and got

> CE> warn:legacy.tools:52336:7:toolkit/source/helper/unowrapper.cxx:176:
> UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for
> this window!
>
> CE> warn:legacy.tools:52336:7:toolkit/source/awt/vclxtoolkit.cxx:1301:
> VCLXToolkit::createWindow: did #133706# resurge?
>
​when trying to show a MessageBox with Java on MacOS. The example to
reproduce this is actually included with the SDK itself:
http://api.libreoffice.org/examples/DevelopersGuide/GUI/MessageBox.java .
This code properly shows a prompt on Linux, but doesn't on MacOS.

Would appreciate if you could take a look.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 sw/inc/breakit.hxx|7 ++-
 sw/source/core/bastyp/breakit.cxx |   36 
 2 files changed, 14 insertions(+), 29 deletions(-)

New commits:
commit 14b4fcf0d8c761ad1679b0d6e765ebd7f3a90dbd
Author: Caolán McNamara 
Date:   Mon Feb 27 10:34:12 2017 +

reorg SwBreakIt to just create it at the start

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

diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 6b92d80..0bb13f0 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -33,7 +33,7 @@ enum class SvtScriptType;
 class SW_DLLPUBLIC SwBreakIt
 {
 css::uno::Reference< css::uno::XComponentContext > m_xContext;
-mutable css::uno::Reference< css::i18n::XBreakIterator > xBreak;
+css::uno::Reference m_xBreak;
 
 std::unique_ptr m_xLanguageTag;   ///< language tag of the 
current locale
 std::unique_ptr m_xForbidden;
@@ -44,8 +44,6 @@ class SW_DLLPUBLIC SwBreakIt
 void GetLocale_( const LanguageTag& rLanguageTag );
 void GetForbidden_( const LanguageType  aLang );
 
-void createBreakIterator() const;
-
 SwBreakIt(SwBreakIt const&) = delete;
 SwBreakIt& operator=(SwBreakIt const&) = delete;
 
@@ -63,8 +61,7 @@ public:
 
 css::uno::Reference< css::i18n::XBreakIterator > const & GetBreakIter()
 {
-createBreakIterator();
-return xBreak;
+return m_xBreak;
 }
 
 const css::lang::Locale& GetLocale( const LanguageType aLang )
diff --git a/sw/source/core/bastyp/breakit.cxx 
b/sw/source/core/bastyp/breakit.cxx
index 5e7a22c..ff955e1 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -54,15 +54,9 @@ SwBreakIt * SwBreakIt::Get()
 
 SwBreakIt::SwBreakIt( const uno::Reference & rxContext 
)
 : m_xContext(rxContext)
+, m_xBreak(i18n::BreakIterator::create(m_xContext))
 , aForbiddenLang(LANGUAGE_DONTKNOW)
 {
-assert(m_xContext.is() && "SwBreakIt: no MultiServiceFactory");
-}
-
-void SwBreakIt::createBreakIterator() const
-{
-if (!xBreak.is())
-xBreak.set(i18n::BreakIterator::create(m_xContext));
 }
 
 void SwBreakIt::GetLocale_( const LanguageType aLang )
@@ -91,16 +85,15 @@ void SwBreakIt::GetForbidden_( const LanguageType aLang )
 
 sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rText, sal_Int32 
nPos ) const
 {
-createBreakIterator();
 sal_uInt16 nScript = i18n::ScriptType::WEAK;
-if( xBreak.is() && !rText.isEmpty() )
+if (!rText.isEmpty())
 {
 if( nPos && nPos == rText.getLength() )
 --nPos;
 else if( nPos < 0)
 nPos = 0;
 
-nScript = xBreak->getScriptType( rText, nPos );
+nScript = m_xBreak->getScriptType(rText, nPos);
 sal_Int32 nChgPos = 0;
 if (i18n::ScriptType::WEAK == nScript && nPos >= 0 && nPos + 1 < 
rText.getLength())
 {
@@ -111,22 +104,22 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const 
OUString& rText, sal_Int32 nPos
 case U_NON_SPACING_MARK:
 case U_ENCLOSING_MARK:
 case U_COMBINING_SPACING_MARK:
-nScript = xBreak->getScriptType( rText, nPos+1 );
+nScript = m_xBreak->getScriptType(rText, nPos+1);
 break;
 }
 }
 if( i18n::ScriptType::WEAK == nScript &&
 nPos &&
-0 < ( nChgPos = xBreak->beginOfScript( rText, nPos, nScript ) ) )
+0 < ( nChgPos = m_xBreak->beginOfScript(rText, nPos, nScript) ) )
 {
-nScript = xBreak->getScriptType( rText, nChgPos-1 );
+nScript = m_xBreak->getScriptType(rText, nChgPos-1);
 }
 
 if( i18n::ScriptType::WEAK == nScript &&
-rText.getLength() > ( nChgPos = xBreak->endOfScript( rText, nPos, 
nScript ) ) &&
+rText.getLength() > ( nChgPos = m_xBreak->endOfScript(rText, nPos, 
nScript) ) &&
 0 <= nChgPos )
 {
-nScript = xBreak->getScriptType( rText, nChgPos );
+nScript = m_xBreak->getScriptType(rText, nChgPos);
 }
 }
 if( i18n::ScriptType::WEAK == nScript )
@@ -139,19 +132,14 @@ SvtScriptType SwBreakIt::GetAllScriptsOfText( const 
OUString& rText ) const
 const SvtScriptType coAllScripts = ( SvtScriptType::LATIN |
   SvtScriptType::ASIAN |
   SvtScriptType::COMPLEX );
-createBreakIterator();
 SvtScriptType nRet = SvtScriptType::NONE;
 sal_uInt16 nScript = 0;
-if( !xBreak.is() )
-{
-nRet = coAllScripts;
-}
-else if( !rText.isEmpty() )
+if (!rText.isEmpty())
 {
 for( sal_Int32 n = 0, nEnd = rText.getLength(); n < nEnd;
-n = xBreak->endOfScript(rText, n, nScript) )
+  

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpfilter.cxx |5 -
 starmath/inc/document.hxx|8 
 starmath/source/document.cxx |   16 +++-
 starmath/source/edit.cxx |2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit a42d9c5b541d637dcf24086e30f341b30e03c4c7
Author: Caolán McNamara 
Date:   Wed Mar 1 14:11:47 2017 +

ofz: oom on seeks past end of SvMemoryStream

cause it grows to fit if its a resizable stream

Change-Id: I28b42becdfc8eb591d19d2512cdc1f1ec32c3bbe

diff --git a/lotuswordpro/source/filter/lwpfilter.cxx 
b/lotuswordpro/source/filter/lwpfilter.cxx
index f2fe380..8f8c8a3 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -104,7 +104,7 @@ using namespace OpenStormBento;
 bool Decompress(SvStream *pCompressed, SvStream * & pOutDecompressed)
 {
 pCompressed->Seek(0);
-std::unique_ptr aDecompressed(new SvMemoryStream(4096, 4096));
+std::unique_ptr aDecompressed(new SvMemoryStream(4096, 
4096));
 unsigned char buffer[512];
 pCompressed->ReadBytes(buffer, 16);
 aDecompressed->WriteBytes(buffer, 16);
@@ -136,6 +136,9 @@ bool Decompress(SvStream *pCompressed, SvStream * & 
pOutDecompressed)
 while (sal_uInt32 iRead = pCompressed->ReadBytes(buffer, 512))
 aDecompressed->WriteBytes(buffer, iRead);
 
+// disable stream growing past its current size
+aDecompressed->SetResizeOffset(0);
+
 //transfer ownership of aDecompressed's ptr
 pOutDecompressed = aDecompressed.release();
 return true;
commit b2a76e663f68a3f377630c925ba61981105b9f48
Author: Caolán McNamara 
Date:   Wed Mar 1 13:19:31 2017 +

move SvtLinguOptions into SmDocShell

Change-Id: I46b84ab4cb9cc5d25b6cb60241fcc8a65e449886

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 756fc0f..83cda04 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -65,7 +66,6 @@ class SmCursor;
 class SmDocShell;
 class EditEngine;
 
-
 class SmPrinterAccess
 {
 VclPtr pPrinter;
@@ -77,9 +77,7 @@ public:
 OutputDevice* GetRefDev()  { return pRefDev.get(); }
 };
 
-
-void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool);
-
+void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool, const 
SvtLinguOptions &rOpt);
 
 class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
 {
@@ -90,6 +88,7 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public 
SfxListener
 SmFormatmaFormat;
 SmParsermaParser;
 OUStringmaAccText;
+SvtLinguOptions maLinguOptions;
 SmTableNode*mpTree;
 SfxItemPool*mpEditEngineItemPool;
 EditEngine *mpEditEngine;
@@ -188,6 +187,7 @@ public:
 
 EditEngine &GetEditEngine();
 SfxItemPool &   GetEditEngineItemPool();
+const SvtLinguOptions & GetLinguOptions() const { return maLinguOptions; }
 
 voidDrawFormula(OutputDevice &rDev, Point &rPosition, bool 
bDrawSelection = false);
 SizeGetSize();
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 3e2bf42..a07c39f 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -46,7 +46,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -287,12 +286,9 @@ void SmDocShell::ArrangeFormula()
 maAccText.clear();
 }
 
-void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool)
+void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool, const 
SvtLinguOptions &rOpt)
 {
 // set fonts to be used
-SvtLinguOptions aOpt;
-SvtLinguConfig().GetOptions( aOpt );
-
 struct FontDta {
 sal_Int16   nFallbackLang;
 sal_Int16   nLang;
@@ -310,9 +306,9 @@ void SetEditEngineDefaultFonts(SfxItemPool 
&rEditEngineItemPool)
 {   LANGUAGE_ARABIC_SAUDI_ARABIA,  LANGUAGE_NONE,
 DefaultFontType::CTL_TEXT,   EE_CHAR_FONTINFO_CTL }
 };
-aTable[0].nLang = aOpt.nDefaultLanguage;
-aTable[1].nLang = aOpt.nDefaultLanguage_CJK;
-aTable[2].nLang = aOpt.nDefaultLanguage_CTL;
+aTable[0].nLang = rOpt.nDefaultLanguage;
+aTable[1].nLang = rOpt.nDefaultLanguage_CJK;
+aTable[2].nLang = rOpt.nDefaultLanguage_CTL;
 
 for (FontDta & rFntDta : aTable)
 {
@@ -348,7 +344,7 @@ EditEngine& SmDocShell::GetEditEngine()
 
 mpEditEngineItemPool = EditEngine::CreatePool();
 
-SetEditEngineDefaultFonts(*mpEditEngineItemPool);
+SetEditEngineDefaultFonts(*mpEditEngineItemPool, maLinguOptions);
 
 mpEditEngine = new EditEngine( mpEditEngineItemPool );
 
@@ -640,6 +636,8 @@ SmDocShell::SmDocShell( SfxModelFlags i_nSfxCreationFlags )
 , mnModifyCount(0)
 , mbFormulaArranged(false)
 {
+SvtLinguConfig()

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst

[Matthias Seidel]

 extensions.lst |   46 +++---
 1 file changed, 23 insertions(+), 23 deletions(-)

New commits:
commit ae9b167cfe09fdc3c23c4e4ad7589673bcbbbcf5
Author: Matthias Seidel 
Date:   Wed Mar 1 13:08:37 2017 +

Updated links for dictionaries (EN, DE-de, DE-at, DE-ch), added https for 
some links

diff --git a/extensions.lst b/extensions.lst
index d711283..88d2815 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -39,19 +39,19 @@
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
-7addf9efd0570ec439593988ce6f43f7 
https://sourceforge.net/projects/aoo-extensions/files/17102/32/dict-en-20170101.oxt/download
 "dict-en-20170101.oxt"
+8dbb002630b566c2392f1ca638c39244 
https://sourceforge.net/projects/aoo-extensions/files/17102/33/dict-en-20170301.oxt/download
 "dict-en-20170301.oxt"
 
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
-e2eab80772ab1aa09716954219351a80 
http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download 
"en_US.oxt"
+e2eab80772ab1aa09716954219351a80 
https://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download 
"en_US.oxt"
 
 # German dictionary.
 [ language=de || language=de_DE || language=nl || language=ru ]
-cf68110f1097cd8c2f7eb41dfbbfe86d 
https://sourceforge.net/projects/aoo-extensions/files/1075/14/dict-de_de-frami_2015-12-28.oxt/download
 "dict-de_de-frami_2015-12-28.oxt"
+ea35a6a6761655107da3e99ee56c171f 
https://sourceforge.net/projects/aoo-extensions/files/1075/15/dict-de_de-frami_2017-01-12.oxt/download
 "dict-de_de-frami_2017-01-12.oxt"
 
 # Dutch dictionary.
 [ language=nl ]
-5c0de383ef649cffefc128cfb36b4d43 
http://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download
 "nl-dict-v2.00g.oxt"
+5c0de383ef649cffefc128cfb36b4d43 
https://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download
 "nl-dict-v2.00g.oxt"
 
 # French dictionary.
 [ language=fr || language=nl || language=de || language=de_DE || language=ca 
|| language=ca_XV ]
@@ -63,16 +63,16 @@
 
 # Spanish dictionary.
 [ language=es || language=ca || language=ca_XV ]
-59dd45e6785ed644adbbd73f4f126182 
http://sourceforge.net/projects/aoo-extensions/files/1657/3/es_es.oxt/download 
"es_es.oxt"
+59dd45e6785ed644adbbd73f4f126182 
https://sourceforge.net/projects/aoo-extensions/files/1657/3/es_es.oxt/download 
"es_es.oxt"
 
 # Danish dictionary.
 [ language=da ]
-b38cba04b6513dd42b031199d617cce6 
http://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download
 "DanskeSynonymer.oxt"
-6ee1e24fb17e44577d8e3200f3e44adc 
http://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download
 "dict-da-current.oxt"
+b38cba04b6513dd42b031199d617cce6 
https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download
 "DanskeSynonymer.oxt"
+6ee1e24fb17e44577d8e3200f3e44adc 
https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download
 "dict-da-current.oxt"
 
 # Lithuanian dictionary.
 [ language=lt ]
-d8d4a3d5c6abfde1b4c81cc1ddd1afa0 
http://sourceforge.net/projects/aoo-extensions/files/17703/0/openoffice-spellcheck-lt-1.3.oxt/download
 "openoffice-spellcheck-lt-1.3.oxt"
+d8d4a3d5c6abfde1b4c81cc1ddd1afa0 
https://sourceforge.net/projects/aoo-extensions/files/17703/0/openoffice-spellcheck-lt-1.3.oxt/download
 "openoffice-spellcheck-lt-1.3.oxt"
 
 # Romanian dictionary.
 [ language=ro ]
@@ -80,11 +80,11 @@
 
 # Russian dictionary.
 [ language=ru ]
-93921f14809a22770f1bd89af65015bc 
http://sourceforge.net/projects/aoo-extensions/files/3233/3/dict_ru_ru-0.3.7.oxt/download
 "dict-ru.oxt"
+93921f14809a22770f1bd89af65015bc 
https://sourceforge.net/projects/aoo-extensions/files/3233/3/dict_ru_ru-0.3.7.oxt/download
 "dict-ru.oxt"
 
 # Slovak dictionary.
 [ language=sk ]
-5a7cec122a215c9f6a906ecb8ad46ee6 
http://sourceforge.net/projects/aoo-extensions/files/1143/11/dict-sk.oxt/download
 "dict-sk.oxt"
+5a7cec122a215c9f6a906ecb8ad46ee6 
https://sourceforge.net/projects/aoo-extensions/files/1143/11/dict-sk.oxt/download
 "dict-sk.oxt"
 
 # Slovenian dictionary.
 [ language=sl ]
@@ -92,15 +92,15 @@
 
 # German (Austria) dictionary.
 [ language=de || language=de_AT || language=de_DE ]
-  368c87a186ea4b4e170c57c3216a7c4d 
https://sourceforge.net/projects/aoo-extensions/files/1697/11/dict-de_at-frami_2015-12-28.oxt/download
 "dict-de_at-frami_2015-12-28.oxt"
+  0cf6783cb0f1355ef3869aa9699700b3 
https://sourceforge.net/projects/aoo-extensions/files/1697/12/dict-de_at-frami_2017-01-28.oxt/download
 "dict-de_at-frami_2017-01-12.oxt"
 
 # German (Switzerland) dictionary.
 [ langu

[Libreoffice-commits] core.git: desktop/GeneratedPackage_desktop_unopackages_install.mk

[Tor Lillqvist]

 desktop/GeneratedPackage_desktop_unopackages_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c2b1336b7b2fbec0172c09e247593bd43320f5fd
Author: Tor Lillqvist 
Date:   Wed Mar 1 14:40:25 2017 +0200

Use $(LIBO_SHARE_FOLDER) instead of hard-coded "share"

Avoids creating a pointless and empty "share" tree in the Mac app
bundle.

Change-Id: I4edbc91c7bd82d777566a1a21e0e33248a8f9651

diff --git a/desktop/GeneratedPackage_desktop_unopackages_install.mk 
b/desktop/GeneratedPackage_desktop_unopackages_install.mk
index 243396c..b3b3cc6 100644
--- a/desktop/GeneratedPackage_desktop_unopackages_install.mk
+++ b/desktop/GeneratedPackage_desktop_unopackages_install.mk
@@ -11,6 +11,6 @@ $(eval $(call 
gb_GeneratedPackage_GeneratedPackage,desktop_unopackages_install,$
 
 $(eval $(call 
gb_GeneratedPackage_use_customtarget,desktop_unopackages_install,desktop/unopackages_install))
 
-$(eval $(call 
gb_GeneratedPackage_add_dir,desktop_unopackages_install,$(INSTROOT)/share/uno_packages,uno_packages))
+$(eval $(call 
gb_GeneratedPackage_add_dir,desktop_unopackages_install,$(INSTROOT)/$(LIBO_SHARE_FOLDER)/uno_packages,uno_packages))
 
 # 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] online.git: favicon.ico

[Samuel Mehrbrodt]

 favicon.ico |binary
 1 file changed

New commits:
commit f0ac4913ef47a3fccb56d8322d4060be0b899507
Author: Samuel Mehrbrodt 
Date:   Wed Mar 1 14:21:45 2017 +0100

Add LibreOffice favicon

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

diff --git a/favicon.ico b/favicon.ico
index 10c0557..b890a56 100644
Binary files a/favicon.ico and b/favicon.ico differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

New commits:
commit bb626853cbe59010537d35e9390f24963e149fe4
Author: Caolán McNamara 
Date:   Wed Mar 1 13:22:54 2017 +

fix leak

Change-Id: I61e21619e949fe0dda7c4820e6ddbb8d4d597652

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index 3113776..d83da25 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -719,23 +719,21 @@ sal_uInt16 LwpDocument::GetNumberOfPagesBefore()
 pDivision = pDivision->GetNextDivision();
 }
 }
-  /**
+
+ /**
  * @descrParse the frame which anchor is to page before parse other 
contents,
- *  This method is called when the document is root document.
+ *   This method is called when the document is root document.
  */
 void LwpDocument::ParseFrameInPage(IXFStream * pOutputStream)
 {
-if(IsChildDoc())
+if (IsChildDoc())
 return;
 
-XFContentContainer* pXFContainer = new XFContentContainer;
-
-XFConvertFrameInPage(pXFContainer);
-
-pXFContainer->ToXml(pOutputStream);
-delete pXFContainer;
-pXFContainer = nullptr;
+rtl::Reference xXFContainer(new XFContentContainer);
+XFConvertFrameInPage(xXFContainer.get());
+xXFContainer->ToXml(pOutputStream);
 }
+
  /**
  * @descrParse the frame which anchor is to page in the entire document
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 sw/source/core/draw/dcontact.cxx |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 01f28ca8c555cc8b6496d155ea466ed6b47ca32b
Author: Bjoern Michaelsen 
Date:   Tue Feb 28 11:26:44 2017 +0100

remove UsedOrUnusedVirtObjPred and replace it with a small lambda

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

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 78e6710..bdb41f9 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -75,15 +75,6 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/** unary function used to find a disconnected 'virtual' drawing object */
-struct UsedOrUnusedVirtObjPred
-{
-bool m_bUsedPred;
-UsedOrUnusedVirtObjPred(bool bUsed) : m_bUsedPred(bUsed) {};
-bool operator()(const std::unique_ptr& pDrawVirtObj)
-{ return pDrawVirtObj->IsConnected() == m_bUsedPred; };
-};
-
 /** unary function used to find a 'virtual' drawing object anchored at a 
given frame */
 struct VirtObjAnchoredAtFramePred
 {
@@ -1687,7 +1678,7 @@ void SwDrawContact::DisconnectObjFromLayout( SdrObject* 
_pDrawObj )
 else
 {
 const auto ppVirtDrawObj(std::find_if(maDrawVirtObjs.begin(), 
maDrawVirtObjs.end(),
-UsedOrUnusedVirtObjPred(true)));
+[] (const std::unique_ptr& pObj) { return 
pObj->IsConnected(); }));
 if(ppVirtDrawObj != maDrawVirtObjs.end())
 {
 // replace found 'virtual' drawing object by 'master' drawing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 sw/inc/dcontact.hxx  |3 +
 sw/source/core/draw/dcontact.cxx |   52 +++
 sw/source/core/inc/flyfrm.hxx|1 
 sw/source/core/layout/fly.cxx|   64 ---
 4 files changed, 55 insertions(+), 65 deletions(-)

New commits:
commit 720dc84b855b6f200d97882157ac07d96207ffab
Author: Bjoern Michaelsen 
Date:   Wed Mar 1 02:57:05 2017 +0100

move GetOrdNumForNewRef() and CreateNewRef() ...

... from SwFlyFrame to SwFlyDrawContact as that is the object they are
doing most of the work. Also refactor a bit while at it.

Change-Id: I9a08592afb15be32c2c36408e4126807871f77c8
Reviewed-on: https://gerrit.libreoffice.org/34733
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 

diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 781257d..351d598 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -191,12 +191,13 @@ class SW_DLLPUBLIC SwFlyDrawContact final : public 
SwContact
 private:
 std::unique_ptr mpMasterObj;
 void SwClientNotify(const SwModify&, const SfxHint& rHint) override;
-
+sal_uInt32 GetOrdNumForNewRef(const SwFlyFrame* pFly);
 
 public:
 
 /// Creates DrawObject and registers it with the Model.
 SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod );
+SwVirtFlyDrawObj* CreateNewRef(SwFlyFrame* pFly);
 virtual ~SwFlyDrawContact() override;
 
 virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj 
) const override;
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 107fdad..78e6710 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -488,6 +488,58 @@ SwFlyDrawContact::~SwFlyDrawContact()
 }
 }
 
+sal_uInt32 SwFlyDrawContact::GetOrdNumForNewRef(const SwFlyFrame* pFly)
+{
+// search for another Writer fly frame registered at same frame format
+SwIterator aIter(*GetFormat());
+const SwFlyFrame* pFlyFrame(nullptr);
+for(pFlyFrame = aIter.First(); pFlyFrame; pFlyFrame = aIter.Next())
+{
+if(pFlyFrame != pFly)
+break;
+}
+
+if(pFlyFrame)
+{
+// another Writer fly frame found. Take its order number
+return pFlyFrame->GetVirtDrawObj()->GetOrdNum();
+}
+// no other Writer fly frame found. Take order number of 'master' object
+// #i35748# - use method  instead
+// of method  to avoid a recalculation of the order number,
+// which isn't intended.
+return GetMaster()->GetOrdNumDirect();
+}
+
+SwVirtFlyDrawObj* SwFlyDrawContact::CreateNewRef(SwFlyFrame* pFly)
+{
+SwVirtFlyDrawObj* pDrawObj(new SwVirtFlyDrawObj(*GetMaster(), pFly));
+pDrawObj->SetModel(GetMaster()->GetModel());
+pDrawObj->SetUserCall(this);
+
+// The Reader creates the Masters and inserts them into the Page in
+// order to transport the z-order.
+// After creating the first Reference the Masters are removed from the
+// List and are not important anymore.
+SdrPage* pPg(nullptr);
+if(nullptr != (pPg = GetMaster()->GetPage()))
+{
+const size_t nOrdNum = GetMaster()->GetOrdNum();
+pPg->ReplaceObject(pDrawObj, nOrdNum);
+}
+// #i27030# - insert new  instance
+// into drawing page with correct order number
+else
+{
+GetFormat()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0)->
+InsertObject(pDrawObj, GetOrdNumForNewRef(pFly));
+}
+// #i38889# - assure, that new  instance
+// is in a visible layer.
+MoveObjToVisibleLayer(pDrawObj);
+return pDrawObj;
+}
+
 // #i26791#
 const SwAnchoredObject* SwFlyDrawContact::GetAnchoredObj(const SdrObject* 
pSdrObj) const
 {
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 12a3ec8..4fbb818 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -70,7 +70,6 @@ class SwFlyFrame : public SwLayoutFrame, public 
SwAnchoredObject
 
 using SwLayoutFrame::CalcRel;
 
-sal_uInt32 GetOrdNumForNewRef( const SwFlyDrawContact* );
 SwVirtFlyDrawObj* CreateNewRef( SwFlyDrawContact* );
 
 protected:
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 02b32b0..add94cd 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -330,67 +330,6 @@ void SwFlyFrame::DeleteCnt()
 InvalidatePage();
 }
 
-sal_uInt32 SwFlyFrame::GetOrdNumForNewRef( const SwFlyDrawContact* pContact )
-{
-sal_uInt32 nOrdNum( 0L );
-
-// search for another Writer fly frame registered at same frame format
-SwIterator aIter( *pContact->GetFormat() );
-const SwFlyFrame* pFlyFrame( nullptr );
-for ( pFlyFrame = aIter.First(); pFlyFrame; pFlyFrame = aIter.Next() )
-{
-if ( pFlyFrame != this )
-{
-break;
-}
-}
-
-if ( pFlyFrame )
-{
-// another Writer fly frame found. Take its order numb

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

[Bjoern Michaelsen]

 sw/inc/dcontact.hxx  |   26 ---
 sw/source/core/draw/dcontact.cxx |   65 ++-
 2 files changed, 31 insertions(+), 60 deletions(-)

New commits:
commit 7e8bef556184851edd7a716cf3284cd1ae3b3366
Author: Bjoern Michaelsen 
Date:   Tue Feb 28 11:12:36 2017 +0100

move predicates into only using compilation unit

- also refactor and simplify

Change-Id: I0fe0c043b72d7664a0fe27baf13ab029aed41eab
Reviewed-on: https://gerrit.libreoffice.org/34726
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 

diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 468a866..781257d 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -337,32 +337,6 @@ class SwDrawContact final : public SwContact
 
 friend class NestedUserCallHdl;
 
-/** unary function used by  iterator to find a disconnected 
'virtual'
- drawing object */
-struct UsedOrUnusedVirtObjPred
-{
-bool mbUsedPred;
-UsedOrUnusedVirtObjPred( bool _bUsed ) : mbUsedPred( _bUsed ) {};
-bool operator() ( const std::unique_ptr& 
_pDrawVirtObj )
-{
-if ( mbUsedPred )
-{
-return _pDrawVirtObj->IsConnected();
-}
-else
-{
-return !_pDrawVirtObj->IsConnected();
-}
-}
-};
-
-/** unary function used to find a 'virtual' drawing object anchored at 
a given frame */
-struct VirtObjAnchoredAtFramePred
-{
-const SwFrame* mpAnchorFrame;
-VirtObjAnchoredAtFramePred( const SwFrame& _rAnchorFrame );
-bool operator() ( const std::unique_ptr& 
_pDrawVirtObj );
-};
 
 void RemoveAllVirtObjs();
 
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 6192fd2..107fdad 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -73,6 +73,36 @@
 
 using namespace ::com::sun::star;
 
+namespace
+{
+/** unary function used to find a disconnected 'virtual' drawing object */
+struct UsedOrUnusedVirtObjPred
+{
+bool m_bUsedPred;
+UsedOrUnusedVirtObjPred(bool bUsed) : m_bUsedPred(bUsed) {};
+bool operator()(const std::unique_ptr& pDrawVirtObj)
+{ return pDrawVirtObj->IsConnected() == m_bUsedPred; };
+};
+
+/** unary function used to find a 'virtual' drawing object anchored at a 
given frame */
+struct VirtObjAnchoredAtFramePred
+{
+const SwFrame* m_pAnchorFrame;
+// #i26791# - compare with master frame
+static const SwFrame* FindFrame(const SwFrame* pFrame)
+{
+if(!pFrame || !pFrame->IsContentFrame())
+return pFrame;
+auto pContentFrame = static_cast(pFrame);
+while(pContentFrame->IsFollow())
+pContentFrame = pContentFrame->FindMaster();
+return pContentFrame;
+};
+VirtObjAnchoredAtFramePred(const SwFrame* pAnchorFrame) : 
m_pAnchorFrame(FindFrame(pAnchorFrame)) {};
+bool operator()(const std::unique_ptr& rpDrawVirtObj)
+{ return FindFrame(rpDrawVirtObj->GetAnchorFrame()) == 
m_pAnchorFrame; };
+};
+}
 
 void setContextWritingMode(SdrObject* pObj, SwFrame* pAnchor)
 {
@@ -763,39 +793,6 @@ void SwDrawContact::RemoveAllVirtObjs()
 maDrawVirtObjs.clear();
 }
 
-SwDrawContact::VirtObjAnchoredAtFramePred::VirtObjAnchoredAtFramePred(
-const SwFrame& _rAnchorFrame )
-: mpAnchorFrame( &_rAnchorFrame )
-{
-if ( mpAnchorFrame->IsContentFrame() )
-{
-const SwContentFrame* pTmpFrame =
-static_cast( mpAnchorFrame 
);
-while ( pTmpFrame->IsFollow() )
-{
-pTmpFrame = pTmpFrame->FindMaster();
-}
-mpAnchorFrame = pTmpFrame;
-}
-}
-
-// #i26791# - compare with master frame
-bool SwDrawContact::VirtObjAnchoredAtFramePred::operator() ( const 
std::unique_ptr& _pDrawVirtObj )
-{
-const SwFrame* pObjAnchorFrame = _pDrawVirtObj->GetAnchorFrame();
-if ( pObjAnchorFrame && pObjAnchorFrame->IsContentFrame() )
-{
-const SwContentFrame* pTmpFrame =
-static_cast( 
pObjAnchorFrame );
-while ( pTmpFrame->IsFollow() )
-{
-pTmpFrame = pTmpFrame->FindMaster();
-}
-pObjAnchorFrame = pTmpFrame;
-}
-
-return ( pObjAnchorFrame == mpAnchorFrame );
-}
 
 /// get drawing object ('master' or 'virtual') by frame.
 SdrObject* SwDrawContact::GetDrawObjectByAnchorFrame( const SwFrame& 
_rAnchorFrame )
@@ -834,7 +831,7 @@ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrame( const 
SwFrame& _rAnchorFra
 else
 {
 const auto ppFoundVirtObj(std::find_if(maDrawVirtObjs.begin(), 
maDrawVirtObjs.end(),

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

[Caolán McNamara]

 starmath/source/document.cxx |   96 ---
 1 file changed, 46 insertions(+), 50 deletions(-)

New commits:
commit 9a8ebc858c06b572c3b90bb0e5526979f81fb466
Author: Caolán McNamara 
Date:   Wed Mar 1 13:10:06 2017 +

fix indent

Change-Id: Ib5679684c899a7362b71ab8688fd37d276176fef

diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 804e3f7..3e2bf42 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -287,61 +287,57 @@ void SmDocShell::ArrangeFormula()
 maAccText.clear();
 }
 
-
 void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool)
 {
+// set fonts to be used
+SvtLinguOptions aOpt;
+SvtLinguConfig().GetOptions( aOpt );
+
+struct FontDta {
+sal_Int16   nFallbackLang;
+sal_Int16   nLang;
+DefaultFontType nFontType;
+sal_uInt16  nFontInfoId;
+} aTable[3] =
+{
+// info to get western font to be used
+{   LANGUAGE_ENGLISH_US,LANGUAGE_NONE,
+DefaultFontType::FIXED,  EE_CHAR_FONTINFO },
+// info to get CJK font to be used
+{   LANGUAGE_JAPANESE,  LANGUAGE_NONE,
+DefaultFontType::CJK_TEXT,   EE_CHAR_FONTINFO_CJK },
+// info to get CTL font to be used
+{   LANGUAGE_ARABIC_SAUDI_ARABIA,  LANGUAGE_NONE,
+DefaultFontType::CTL_TEXT,   EE_CHAR_FONTINFO_CTL }
+};
+aTable[0].nLang = aOpt.nDefaultLanguage;
+aTable[1].nLang = aOpt.nDefaultLanguage_CJK;
+aTable[2].nLang = aOpt.nDefaultLanguage_CTL;
+
+for (FontDta & rFntDta : aTable)
+{
+LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ?
+rFntDta.nFallbackLang : rFntDta.nLang;
+vcl::Font aFont = OutputDevice::GetDefaultFont(
+rFntDta.nFontType, nLang, GetDefaultFontFlags::OnlyOne );
+rEditEngineItemPool.SetPoolDefaultItem(
+SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(),
+aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(),
+rFntDta.nFontInfoId ) );
+}
 
-// set fonts to be used
-
-SvtLinguOptions aOpt;
-SvtLinguConfig().GetOptions( aOpt );
-
-struct FontDta {
-sal_Int16   nFallbackLang;
-sal_Int16   nLang;
-DefaultFontType nFontType;
-sal_uInt16  nFontInfoId;
-} aTable[3] =
-{
-// info to get western font to be used
-{   LANGUAGE_ENGLISH_US,LANGUAGE_NONE,
-DefaultFontType::FIXED,  EE_CHAR_FONTINFO },
-// info to get CJK font to be used
-{   LANGUAGE_JAPANESE,  LANGUAGE_NONE,
-DefaultFontType::CJK_TEXT,   EE_CHAR_FONTINFO_CJK },
-// info to get CTL font to be used
-{   LANGUAGE_ARABIC_SAUDI_ARABIA,  LANGUAGE_NONE,
-DefaultFontType::CTL_TEXT,   EE_CHAR_FONTINFO_CTL }
-};
-aTable[0].nLang = aOpt.nDefaultLanguage;
-aTable[1].nLang = aOpt.nDefaultLanguage_CJK;
-aTable[2].nLang = aOpt.nDefaultLanguage_CTL;
-
-for (FontDta & rFntDta : aTable)
-{
-LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ?
-rFntDta.nFallbackLang : rFntDta.nLang;
-vcl::Font aFont = OutputDevice::GetDefaultFont(
-rFntDta.nFontType, nLang, GetDefaultFontFlags::OnlyOne 
);
-rEditEngineItemPool.SetPoolDefaultItem(
-SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(),
-aFont.GetStyleName(), aFont.GetPitch(), 
aFont.GetCharSet(),
-rFntDta.nFontInfoId ) );
-}
-
-// set font heights
-SvxFontHeightItem aFontHeigt(
-Application::GetDefaultDevice()->LogicToPixel(
-Size( 0, 11 ), MapMode( MapUnit::MapPoint ) 
).Height(), 100,
-EE_CHAR_FONTHEIGHT );
-rEditEngineItemPool.SetPoolDefaultItem( aFontHeigt );
-aFontHeigt.SetWhich( EE_CHAR_FONTHEIGHT_CJK );
-rEditEngineItemPool.SetPoolDefaultItem( aFontHeigt );
-aFontHeigt.SetWhich( EE_CHAR_FONTHEIGHT_CTL );
-rEditEngineItemPool.SetPoolDefaultItem( aFontHeigt );
+// set font heights
+SvxFontHeightItem aFontHeigt(
+Application::GetDefaultDevice()->LogicToPixel(
+Size( 0, 11 ), MapMode( MapUnit::MapPoint ) ).Height(), 
100,
+EE_CHAR_FONTHEIGHT );
+rEditEngineItemPool.SetPoolDefaultItem( aFontHeigt );
+aFontHeigt.SetWhich( EE_CHAR_FONTHEIGHT_CJK );
+rEditEngineItemPool.SetPoolDefaultItem( aFontHeigt );
+aFontHeigt.SetWhich( EE_CHAR_FONTHEIGHT_CTL );
+rEditEngineItemPool.SetPoolDefaultItem( aFontHeigt );
 }
 
-
 EditEngine& SmDocShell::GetEditEngine()
 {
 if (!mpEd

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

[Markus Mohrhard]

 sc/source/core/data/document.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 745234c01e20d6f88826b4c33d6f29342f230e08
Author: Markus Mohrhard 
Date:   Fri Feb 24 23:10:57 2017 +0100

xPoolHelper is empty in a clipboard doc

Found by the crashreporter:

http://crashreport.libreoffice.org/stats/signature/ScDocument::IsClipboardSource()

Change-Id: I3fb030921b653396deb46a9e98d30d5df9c9ce15
(cherry picked from commit c63ff2a769f4601f67ffd13cb36df63c70fdd601)
Reviewed-on: https://gerrit.libreoffice.org/34642
Reviewed-by: Eike Rathke 
Reviewed-by: Michael Stahl 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 27456da..80fb075 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2516,7 +2516,7 @@ void ScDocument::SetClipParam(const ScClipParam& rParam)
 bool ScDocument::IsClipboardSource() const
 {
 ScDocument* pClipDoc = ScModule::GetClipDoc();
-return pClipDoc && pClipDoc->xPoolHelper.is() &&
+return xPoolHelper.is() && pClipDoc && pClipDoc->xPoolHelper.is() &&
 xPoolHelper->GetDocPool() == pClipDoc->xPoolHelper->GetDocPool();
 }
 
___
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-1' - svx/source

[Markus Mohrhard]

 svx/source/tbxctrls/PaletteManager.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 9b4c2e40ac081e1f8834b1d831b393917fb19df5
Author: Markus Mohrhard 
Date:   Fri Feb 24 18:08:39 2017 +0100

prevent crash in PaletteManager

Found by the crashreporter:

http://crashreport.libreoffice.org/stats/signature/PaletteManager::ReloadColorSet(SvxColorValueSet%20&)

Change-Id: I82c5e3f7588615700ec3b5540ac94e331df783bb
Reviewed-on: https://gerrit.libreoffice.org/34627
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit ece3c97ca6c9aaffbf9dd51785ae2f1d4d3e2c9b)
Reviewed-on: https://gerrit.libreoffice.org/34634
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 5b76c743488b1e206cfe40a5ed087b3a0ceaa1d8)
Reviewed-on: https://gerrit.libreoffice.org/34720
Reviewed-by: Katarina Behrens 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 1dc3a46..bdd9701 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -120,8 +120,6 @@ void PaletteManager::LoadPalettes()
 
 void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet)
 {
-SfxObjectShell* pDocSh = SfxObjectShell::Current();
-
 if( mnCurrentPalette == 0)
 {
 rColorSet.Clear();
@@ -138,10 +136,14 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet 
&rColorSet)
 else if( mnCurrentPalette == mnNumOfPalettes - 1 )
 {
 // Add doc colors to palette
-std::set aColors = pDocSh->GetDocColors();
-mnColorCount = aColors.size();
-rColorSet.Clear();
-rColorSet.addEntriesForColorSet(aColors, SVX_RESSTR( 
RID_SVXSTR_DOC_COLOR_PREFIX ) + " " );
+SfxObjectShell* pDocSh = SfxObjectShell::Current();
+if (pDocSh)
+{
+std::set aColors = pDocSh->GetDocColors();
+mnColorCount = aColors.size();
+rColorSet.Clear();
+rColorSet.addEntriesForColorSet(aColors, SVX_RESSTR( 
RID_SVXSTR_DOC_COLOR_PREFIX ) + " " );
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 starmath/inc/edit.hxx|2 --
 starmath/source/edit.cxx |   15 ---
 2 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 9a39b4c946f59981975d3cd4556185168192874b
Author: Caolán McNamara 
Date:   Wed Mar 1 13:02:41 2017 +

unroll SmEditWindow::GetEditEngineItemPool

Change-Id: Iaf7a7c65109864f429ab5cc6848a12a37421afa1

diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 286078a..5fb4ec1 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -82,8 +82,6 @@ class SmEditWindow : public vcl::Window, public 
DropTargetHelper
 void InvalidateSlots();
 void UpdateStatus(bool bSetDocModified);
 
-SfxItemPool* GetEditEngineItemPool();
-
 public:
 explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin);
 virtual ~SmEditWindow() override;
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 47ecd52..89275bb 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -199,13 +199,6 @@ EditEngine * SmEditWindow::GetEditEngine()
 return pEditEng;
 }
 
-
-SfxItemPool * SmEditWindow::GetEditEngineItemPool()
-{
-SmDocShell *pDoc = GetDoc();
-return pDoc ? &pDoc->GetEditEngineItemPool() : nullptr;
-}
-
 void SmEditWindow::ApplyColorConfigValues( const svtools::ColorConfig 
&rColorCfg )
 {
 // Note: SetBackground still done in SmEditWindow::DataChanged
@@ -226,10 +219,10 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
 // the application font thus we use this one too
 SetPointFont(*this, aSettings.GetFieldFont() /*aSettings.GetAppFont()*/);
 
-EditEngine  *pEditEngine = GetEditEngine();
-SfxItemPool *pEditEngineItemPool = GetEditEngineItemPool();
+EditEngine *pEditEngine = GetEditEngine();
+SmDocShell *pDoc = GetDoc();
 
-if (pEditEngine && pEditEngineItemPool)
+if (pEditEngine && pDoc)
 {
 //!
 //! see also SmDocShell::GetEditEngine() !
@@ -237,7 +230,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
 
 pEditEngine->SetDefTab(sal_uInt16(GetTextWidth("")));
 
-SetEditEngineDefaultFonts(*pEditEngineItemPool);
+SetEditEngineDefaultFonts(pDoc->GetEditEngineItemPool());
 
 // forces new settings to be used
 // unfortunately this resets the whole edit engine
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 starmath/inc/edit.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d9edcfa76c3f46d94bf5adfd9e18655c4cac12b1
Author: Caolán McNamara 
Date:   Wed Mar 1 13:00:15 2017 +

GetEditEngineItemPool can be private

Change-Id: Ie7a8230dcc5b8576aea44c6e62eedaf971241be7

diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index dbb27a8..286078a 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -82,6 +82,8 @@ class SmEditWindow : public vcl::Window, public 
DropTargetHelper
 void InvalidateSlots();
 void UpdateStatus(bool bSetDocModified);
 
+SfxItemPool* GetEditEngineItemPool();
+
 public:
 explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin);
 virtual ~SmEditWindow() override;
@@ -91,7 +93,6 @@ public:
 SmViewShell* GetView();
 EditView* GetEditView();
 EditEngine* GetEditEngine();
-SfxItemPool* GetEditEngineItemPool();
 
 // Window
 virtual void SetText(const OUString& rText) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sfx2/source/doc/objstor.cxx |  129 ++--
 1 file changed, 65 insertions(+), 64 deletions(-)

New commits:
commit 7dae589b0cbb40bd3ee7831f0c140e05398faa47
Author: Tor Lillqvist 
Date:   Wed Mar 1 14:59:22 2017 +0200

Correct indentation of try block

Change-Id: I32ca961ebb4393e483bab12a6c69ab4c2016cc3f

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b80e551..0e8f04e 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2200,84 +2200,85 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
 if ( xLoader.is() )
 {
 // it happens that xLoader does not support xImporter!
-try{
-uno::Reference< lang::XComponent >  xComp( GetModel(), 
uno::UNO_QUERY_THROW );
-uno::Reference< document::XImporter > xImporter( xLoader, 
uno::UNO_QUERY_THROW );
-xImporter->setTargetDocument( xComp );
+try
+{
+uno::Reference< lang::XComponent >  xComp( GetModel(), 
uno::UNO_QUERY_THROW );
+uno::Reference< document::XImporter > xImporter( xLoader, 
uno::UNO_QUERY_THROW );
+xImporter->setTargetDocument( xComp );
 
-uno::Sequence < beans::PropertyValue > lDescriptor;
-rMedium.GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, 
rMedium.GetName() ) );
-TransformItems( SID_OPENDOC, *rMedium.GetItemSet(), lDescriptor );
+uno::Sequence < beans::PropertyValue > lDescriptor;
+rMedium.GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, 
rMedium.GetName() ) );
+TransformItems( SID_OPENDOC, *rMedium.GetItemSet(), lDescriptor );
 
-css::uno::Sequence < css::beans::PropertyValue > aArgs ( 
lDescriptor.getLength() );
-css::beans::PropertyValue * pNewValue = aArgs.getArray();
-const css::beans::PropertyValue * pOldValue = 
lDescriptor.getConstArray();
-const OUString sInputStream ( "InputStream"  );
+css::uno::Sequence < css::beans::PropertyValue > aArgs ( 
lDescriptor.getLength() );
+css::beans::PropertyValue * pNewValue = aArgs.getArray();
+const css::beans::PropertyValue * pOldValue = 
lDescriptor.getConstArray();
+const OUString sInputStream ( "InputStream"  );
 
-bool bHasInputStream = false;
-bool bHasBaseURL = false;
-sal_Int32 i;
-sal_Int32 nEnd = lDescriptor.getLength();
+bool bHasInputStream = false;
+bool bHasBaseURL = false;
+sal_Int32 i;
+sal_Int32 nEnd = lDescriptor.getLength();
 
-for ( i = 0; i < nEnd; i++ )
-{
-pNewValue[i] = pOldValue[i];
-if ( pOldValue [i].Name == sInputStream )
-bHasInputStream = true;
-else if ( pOldValue[i].Name == "DocumentBaseURL" )
-bHasBaseURL = true;
-}
+for ( i = 0; i < nEnd; i++ )
+{
+pNewValue[i] = pOldValue[i];
+if ( pOldValue [i].Name == sInputStream )
+bHasInputStream = true;
+else if ( pOldValue[i].Name == "DocumentBaseURL" )
+bHasBaseURL = true;
+}
 
-if ( !bHasInputStream )
-{
-aArgs.realloc ( ++nEnd );
-aArgs[nEnd-1].Name = sInputStream;
-aArgs[nEnd-1].Value <<= css::uno::Reference < 
css::io::XInputStream > ( new utl::OSeekableInputStreamWrapper ( 
*rMedium.GetInStream() ) );
-}
+if ( !bHasInputStream )
+{
+aArgs.realloc ( ++nEnd );
+aArgs[nEnd-1].Name = sInputStream;
+aArgs[nEnd-1].Value <<= css::uno::Reference < 
css::io::XInputStream > ( new utl::OSeekableInputStreamWrapper ( 
*rMedium.GetInStream() ) );
+}
 
-if ( !bHasBaseURL )
-{
-aArgs.realloc ( ++nEnd );
-aArgs[nEnd-1].Name = "DocumentBaseURL";
-aArgs[nEnd-1].Value <<= rMedium.GetBaseURL();
-}
+if ( !bHasBaseURL )
+{
+aArgs.realloc ( ++nEnd );
+aArgs[nEnd-1].Name = "DocumentBaseURL";
+aArgs[nEnd-1].Value <<= rMedium.GetBaseURL();
+}
 
-if (xInsertPosition.is()) {
-aArgs.realloc( ++nEnd );
-aArgs[nEnd-1].Name = "InsertMode";
-aArgs[nEnd-1].Value <<= true;
-aArgs.realloc( ++nEnd );
-aArgs[nEnd-1].Name = "TextInsertModeRange";
-aArgs[nEnd-1].Value <<= xInsertPosition;
-}
+if (xInsertPosition.is()) {
+aArgs.realloc( ++nEnd );
+aArgs[nEnd-1].Name = "InsertMode";
+aArgs[nEnd-1].Value <<= true;
+aArgs.realloc( ++nEnd );
+aArgs[nEnd-1].Name = "TextInsertModeRange";
+aArgs[nEnd-1].Value <<= xInsertPosition;
+}
 
-// #i119492# 

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

[Justin Luth]

 sw/source/filter/xml/xmlimpit.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a170ee831a116b2aeb1506986fca4c672c75368
Author: Justin Luth 
Date:   Wed Jan 18 15:52:33 2017 +0300

tdf#77111 odt import: treat PAGEDESC_PAGENUMOFFSET==0 as auto

Ever since 2010 commit 7edaf190 zeroes have been saved as XML_AUTO.
Ever since 2014 commit c2ccd20c, a numoffset of zero is no longer
considered to be auto (for MS compatibility) but is still treated
as auto during xml export. Thus, any older documents that had been
saved with a zero should still xml import as auto instead of as 0.

Change-Id: I1a0df32a8e2f1b30b2bedbf4c9bb07ebec239637
Reviewed-on: https://gerrit.libreoffice.org/33267
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Michael Stahl 
(cherry picked from commit e36f0860f00af139a8fa94d36302f7b0c56383fe)
Reviewed-on: https://gerrit.libreoffice.org/34694
(cherry picked from commit ae225329435cb49e61e3c9fc76129aa4e334598a)
Reviewed-on: https://gerrit.libreoffice.org/34698
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sw/source/filter/xml/xmlimpit.cxx 
b/sw/source/filter/xml/xmlimpit.cxx
index bb0f51e..058c951 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -786,7 +786,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
 sal_Int32 nVal;
 bOk = ::sax::Converter::convertNumber(
 nVal, rValue, 0, USHRT_MAX);
-if( bOk )
+if( bOk && nVal > 0 )
 rPageDesc.SetNumOffset( (sal_uInt16)nVal );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx   |   39 --
 lotuswordpro/source/filter/lwpcelllayout.hxx   |6 +-
 lotuswordpro/source/filter/lwprowlayout.cxx|   40 +-
 lotuswordpro/source/filter/lwptablelayout.cxx  |   53 -
 lotuswordpro/source/filter/xfilter/xfrow.cxx   |   24 ---
 lotuswordpro/source/filter/xfilter/xfrow.hxx   |5 +-
 lotuswordpro/source/filter/xfilter/xftable.cxx |   41 +++
 lotuswordpro/source/filter/xfilter/xftable.hxx |4 -
 vcl/source/app/svdata.cxx  |   24 +++
 vcl/source/opengl/OpenGLContext.cxx|5 +-
 10 files changed, 117 insertions(+), 124 deletions(-)

New commits:
commit 79d93c7d1195cca3afcb0c5241efa458fddf5134
Author: Caolán McNamara 
Date:   Wed Mar 1 12:41:22 2017 +

fix leak

Change-Id: I985d422f4c0b41937e4df616fb3154bb7cbad28d

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 1858788..f09630e 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -310,7 +310,7 @@ OUString const & LwpCellLayout::GetCellStyleName(sal_uInt16 
nRow, sal_uInt16 nCo
 *   @param  bIsRightCol - whether current cell is the rightest column
 *   @return XFCell*
 */
-XFCell* LwpCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, 
sal_uInt16 nCol)
+rtl::Reference LwpCellLayout::ConvertCell(LwpObjectID aTableID, 
sal_uInt16 nRow, sal_uInt16 nCol)
 {
 // if cell layout is aTableID's default cell layout
 // it can't have any content, bypass these code
@@ -320,7 +320,7 @@ XFCell* LwpCellLayout::ConvertCell(LwpObjectID aTableID, 
sal_uInt16 nRow, sal_uI
 assert(false);
 return nullptr;
 }
-XFCell * pXFCell = new XFCell();
+rtl::Reference xXFCell(new XFCell);
 OUString aStyleName = m_StyleName;
 
 // if cell layout is aTableID's default cell layout
@@ -334,12 +334,12 @@ XFCell* LwpCellLayout::ConvertCell(LwpObjectID aTableID, 
sal_uInt16 nRow, sal_uI
 LwpStory* pStory = dynamic_cast(m_Content.obj().get());
 if (pStory)
 {
-pStory->XFConvert(pXFCell);
+pStory->XFConvert(xXFCell.get());
 }
 
-ApplyProtect(pXFCell, aTableID);
-pXFCell->SetStyleName(aStyleName);
-return pXFCell;
+ApplyProtect(xXFCell.get(), aTableID);
+xXFCell->SetStyleName(aStyleName);
+return xXFCell;
 }
 
 LwpPara* LwpCellLayout::GetLastParaOfPreviousStory()
@@ -824,21 +824,20 @@ void LwpConnectedCellLayout::Read()
 
 m_pObjStrm->SkipExtra();
 }
-XFCell* LwpConnectedCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 
nRow, sal_uInt16 nCol)
+
+rtl::Reference LwpConnectedCellLayout::ConvertCell(LwpObjectID 
aTableID, sal_uInt16 nRow, sal_uInt16 nCol)
 {
-XFCell * pXFCell = LwpCellLayout::ConvertCell(aTableID, nRow, nCol);
-pXFCell->SetColumnSpaned(cnumcols);
-//  if(!m_bSplitFlag)
-//  {
-//  }
-return pXFCell;
+rtl::Reference xXFCell = LwpCellLayout::ConvertCell(aTableID, 
nRow, nCol);
+xXFCell->SetColumnSpaned(cnumcols);
+return xXFCell;
 }
+
 /**
  * @short   parse connected cell layout
  * @param pOutputStream - output stream
  * @return
  */
- void  LwpConnectedCellLayout::Parse(IXFStream* /*pOutputStream*/)
+void LwpConnectedCellLayout::Parse(IXFStream* /*pOutputStream*/)
 {
 }
 
@@ -876,7 +875,7 @@ void LwpHiddenCellLayout::Read()
  * @return XFCell * - pointer to converted cell
  */
 
-XFCell* LwpHiddenCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 
nRow, sal_uInt16 nCol)
+rtl::Reference LwpHiddenCellLayout::ConvertCell(LwpObjectID aTableID, 
sal_uInt16 nRow, sal_uInt16 nCol)
 {
 if (!cconnectedlayout.obj().is())
 return nullptr;
@@ -886,26 +885,26 @@ XFCell* LwpHiddenCellLayout::ConvertCell(LwpObjectID 
aTableID, sal_uInt16 nRow,
 return nullptr;
 // if the hidden cell should be displayed for limit of SODC
 // use the default cell layout
-XFCell* pXFCell = nullptr;
+rtl::Reference xXFCell;
 LwpTable *pTable = dynamic_cast(aTableID.obj().get());
 if (pTable)
 {
 LwpCellLayout *pDefault = dynamic_cast(pTable->GetDefaultCellStyle().obj().get());
 if (pDefault)
 {
-pXFCell = pDefault->ConvertCell(aTableID, nRow, nCol);
+xXFCell = pDefault->ConvertCell(aTableID, nRow, nCol);
 }
 else
 {
-pXFCell = pConnCell->ConvertCell(aTableID, nRow, nCol);
+xXFCell = pConnCell->ConvertCell(aTableID, nRow, nCol);
 }
-pXFCell->SetColumnSpaned(pConnCell->GetNumcols());
+xXFCell->SetColumnSpaned(pConnCell->GetNumcols());
 }
 else
 {
 assert(false);
 }
-return pXFCell;
+return xXFCell;
 }
 /**
  * @short   parse hidden cell layout
diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx 
b/lotuswordpro/source/filter/lwpcelllayout.hxx
index 

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - 2 commits - net/loolnb.cpp net/Socket.hpp

[Jan Holesovsky]

 net/Socket.hpp |1 +
 net/loolnb.cpp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dbbc28646c130997c570025f6e44c6ed01823358
Author: Jan Holesovsky 
Date:   Wed Mar 1 13:41:04 2017 +0100

nb: When we cannot send the file, we must respond with 404.

Change-Id: I5f11e7de4b0bfb6e44929b8317e4788d2cc81610

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 5ba902e..fe4a721 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -586,6 +586,7 @@ namespace HttpHelper
 if (stat(path.c_str(), &st) != 0)
 {
 LOG_WRN("Failed to stat [" << path << "]. File will not be sent.");
+throw Poco::FileNotFoundException("Failed to stat [" + path + "]. 
File will not be sent.");
 return;
 }
 
commit 826c4c234a42ad2aa61409787a83eed3ceef9477
Author: Jan Holesovsky 
Date:   Mon Feb 27 12:22:14 2017 +0100

nb: Fix the check in loolnb.

Change-Id: I54f23cb5fb76e4f9aab2743ddc2e6cda04a2656b

diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index 9e6ac4d..f568821 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -196,7 +196,7 @@ public:
 };
 
 // Start the server.
-if (args.back() == "ssl")
+if (!args.empty() && args.back() == "ssl")
 server(addrSsl, poller, std::unique_ptr{new 
SslSocketFactory});
 else
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 xmlsecurity/source/dialogs/certificateviewer.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 62e5c2422cfd0e4c7f3ae3a84e9a8462db4a19dc
Author: Samuel Mehrbrodt 
Date:   Wed Mar 1 11:59:51 2017 +0100

CertificateViewer: Don't crash with empty certificate path

gpg4libre

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

diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx 
b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 0d15353..ebe8712 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -400,9 +400,9 @@ void CertificateViewerCertPathTP::ActivatePage()
 
 sal_Int32 i, nCnt = aCertPath.getLength();
 SvTreeListEntry* pParent = nullptr;
-for( i = nCnt; i; )
+for (i = nCnt-1; i >= 0; i--)
 {
-const Reference< security::XCertificate > rCert = pCertPath[ --i ];
+const Reference< security::XCertificate > rCert = pCertPath[ i ];
 OUString sName = XmlSec::GetContentPart( rCert->getSubjectName() );
 //Verify the certificate
 sal_Int32 certStatus = 
mpDlg->mxSecurityEnvironment->verifyCertificate(rCert,
@@ -411,7 +411,8 @@ void CertificateViewerCertPathTP::ActivatePage()
 pParent = InsertCert( pParent, sName, rCert, bCertValid);
 }
 
-mpCertPathLB->Select( pParent );
+if (pParent)
+mpCertPathLB->Select( pParent );
 mpViewCertPB->Disable(); // Own certificate selected
 
 while( pParent )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 8 commits - editeng/source extras/source filter/source readlicense_oo/license svx/source sw/source vcl/source

[Christian Lohmaier]

 editeng/source/editeng/editview.cxx |   11 
 extras/source/autocorr/lang/ca/DocumentList.xml |   70 
 filter/source/graphicfilter/itiff/itiff.cxx |   16 
 readlicense_oo/license/CREDITS.fodt | 3025 
 svx/source/tbxctrls/PaletteManager.cxx  |   14 
 svx/source/tbxctrls/tbcontrl.cxx|   61 
 sw/source/uibase/utlui/content.cxx  |1 
 vcl/source/window/status.cxx|   16 
 8 files changed, 1694 insertions(+), 1520 deletions(-)

New commits:
commit 1edc20f98cc288c08f241ce57691b20a69f4b4ba
Author: Christian Lohmaier 
Date:   Tue Feb 28 15:30:45 2017 +0100

update credits

Change-Id: Iea0785f5ec1b55200d25d5cd55a63652ab5a38e1
(cherry picked from commit b694f15c86169fca1109ff0068afdf180c8a7d3b)
(cherry picked from commit e9fd3674fe783df2c905c3d9b29d0a2bec0cfa00)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index af2e061..d6ae0c9 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,29 +1,30 @@
 
 
 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.5.1$Linux_X86_64
 
LibreOffice_project/0312e1a284a7d50ca85a365c316c7abbf20a4d222012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.3.0.3$Linux_X86_64
 
LibreOffice_project/7074905676c47b82bbcfbea1aeefc84afe1c50e12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   686
+   531
501
41197
-   21645
+   21698
true
true

 
  view2
- 3676
+ 3649
  3471
  501
- 686
+ 531
  41697
- 22329
+ 7
  0
  0
  false
  100
  false
+ false
 

   
@@ -46,13 +47,13 @@
false
false
false
-   false
false
false
true
false
true
true
+   1557161
false
false
false
@@ -69,7 +70,7 @@
false
false
true
-   6348325
+   6399058
false
false
false
@@ -94,6 +95,12 @@
 

false
+   false
+   false
+   false
+   1
+   true
+   false
true
true
true
@@ -109,11 +116,6 @@

false
false
-   1557161
-   false
-   1
-   true
-   false
false
0
false
@@ -314,40 +316,37 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -356,19 +355,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -377,19 +376,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

@@ -398,23 +394,26 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -1042,7 +1041,7 @@

   
  Credits
-1246 i

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 11 commits - download.lst forms/source hwpfilter/qa hwpfilter/source jvmfwk/plugins sc/source sd/source svx/source sw/source

[Markus Mohrhard]

 download.lst|4 +--
 forms/source/misc/InterfaceContainer.cxx|   16 ++--
 hwpfilter/qa/cppunit/data/fail/skipblock-1.hwp  |binary
 hwpfilter/qa/cppunit/test_hwpfilter.cxx |   16 +++-
 hwpfilter/source/hiodev.cxx |8 --
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |   10 +++
 sc/source/core/data/document.cxx|2 -
 sc/source/ui/inc/tabview.hxx|5 +++
 sc/source/ui/view/tabview.cxx   |1 
 sc/source/ui/view/tabview4.cxx  |   26 
 sd/source/filter/eppt/pptx-epptooxml.cxx|7 +
 svx/source/sidebar/media/MediaPlaybackPanel.cxx |   18 +
 svx/source/stbctrls/stbctrls.src|3 --
 sw/source/filter/xml/xmlimpit.cxx   |2 -
 14 files changed, 81 insertions(+), 37 deletions(-)

New commits:
commit 726fc14b79362553c2d2a0fb556ce39d54242e09
Author: Markus Mohrhard 
Date:   Tue Feb 28 02:25:30 2017 +0100

mpMediaItem might be nullptr

This fixes at least two crashes reported through the crashreporter:

http://crashreport.libreoffice.org/stats/signature/avmedia::MediaItem::getTime()

http://crashreport.libreoffice.org/stats/signature/avmedia::MediaItem::getDuration()

Change-Id: I92eeca229fa46921317586d0317e9f00309e793b
Reviewed-on: https://gerrit.libreoffice.org/34710
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit b5987a4148a10e27fe44ecf5d03e697692e07ca9)
Reviewed-on: https://gerrit.libreoffice.org/34712
Reviewed-by: Katarina Behrens 
(cherry picked from commit 52b89c4764b68cd56cec68678c8234a8a3d5)

diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx 
b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
index 46f7645..f1e744d 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
@@ -118,10 +118,13 @@ void MediaPlaybackPanel::UpdateToolBoxes(MediaItem 
aMediaItem)
 
 void MediaPlaybackPanel::Update()
 {
-UpdateToolBoxes( *mpMediaItem );
-UpdateTimeSlider( *mpMediaItem );
-UpdateVolumeSlider( *mpMediaItem );
-UpdateTimeField( *mpMediaItem, mpMediaItem->getTime() );
+if (mpMediaItem)
+{
+UpdateToolBoxes( *mpMediaItem );
+UpdateTimeSlider( *mpMediaItem );
+UpdateVolumeSlider( *mpMediaItem );
+UpdateTimeField( *mpMediaItem, mpMediaItem->getTime() );
+}
 }
 
 IMPL_LINK_NOARG( MediaPlaybackPanel, VolumeSlideHdl, Slider*, void)
@@ -135,7 +138,10 @@ IMPL_LINK_NOARG( MediaPlaybackPanel, SeekHdl, Slider*, 
void)
 {
 MediaItem aItem(SID_AVMEDIA_TOOLBOX);
 aItem.setState( MediaState::Pause );
-aItem.setTime( mpTimeSlider->GetThumbPos() * mpMediaItem->getDuration() / 
AVMEDIA_TIME_RANGE);
+double nTime = 0;
+if (mpMediaItem)
+nTime = mpTimeSlider->GetThumbPos() * mpMediaItem->getDuration() / 
AVMEDIA_TIME_RANGE;
+aItem.setTime(nTime);
 mpBindings->GetDispatcher()->ExecuteList(SID_AVMEDIA_TOOLBOX, 
SfxCallMode::RECORD, { &aItem });
 mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX);
 }
@@ -154,7 +160,7 @@ IMPL_LINK( MediaPlaybackPanel, PlayToolBoxSelectHdl, 
ToolBox*, pControl, void)
 {
 aItem.setState( MediaState::Play );
 
-if( mpMediaItem->getTime() == mpMediaItem->getDuration() )
+if( !mpMediaItem || (mpMediaItem->getTime() == 
mpMediaItem->getDuration() ))
 aItem.setTime( 0.0 );
 else
 aItem.setTime( mpMediaItem->getTime());
commit 4eaaea896d4709d4a56318b9e879e889cbc0d86f
Author: Justin Luth 
Date:   Wed Jan 18 15:52:33 2017 +0300

tdf#77111 odt import: treat PAGEDESC_PAGENUMOFFSET==0 as auto

Ever since 2010 commit 7edaf190 zeroes have been saved as XML_AUTO.
Ever since 2014 commit c2ccd20c, a numoffset of zero is no longer
considered to be auto (for MS compatibility) but is still treated
as auto during xml export. Thus, any older documents that had been
saved with a zero should still xml import as auto instead of as 0.

Change-Id: I1a0df32a8e2f1b30b2bedbf4c9bb07ebec239637
Reviewed-on: https://gerrit.libreoffice.org/33267
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Michael Stahl 
(cherry picked from commit e36f0860f00af139a8fa94d36302f7b0c56383fe)
Reviewed-on: https://gerrit.libreoffice.org/34694
(cherry picked from commit ae225329435cb49e61e3c9fc76129aa4e334598a)

diff --git a/sw/source/filter/xml/xmlimpit.cxx 
b/sw/source/filter/xml/xmlimpit.cxx
index bb0f51e..058c951 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -786,7 +786,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
 sal_Int32 nVal;
 bOk = ::sax::Converter::convertNumber(
  

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

[Samuel Mehrbrodt]

 xmlsecurity/inc/certificate.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4a8b4a7b3c540b397778d83f7028a07facc97315
Author: Samuel Mehrbrodt 
Date:   Wed Mar 1 12:07:51 2017 +0100

Add missing include

Change-Id: If4fa588ac7508edc886c93be7e870677b7dfeae0
Reviewed-on: https://gerrit.libreoffice.org/34742
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index 88af1e5..19db386 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -12,6 +12,8 @@
 
 #include 
 
+#include 
+
 namespace xmlsecurity
 {
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 xmloff/inc/animations.hxx  |   34 -
 xmloff/source/draw/animationexport.cxx |  711 ++---
 xmloff/source/draw/animationimport.cxx |   32 -
 xmloff/source/draw/sdpropls.cxx|4 
 4 files changed, 352 insertions(+), 429 deletions(-)

New commits:
commit d49c0f3b3053390f5ff7eaca1a1ce0f5eb3f9cb4
Author: Noel Grandin 
Date:   Wed Mar 1 11:33:23 2017 +0200

expose the SvXMLEnumMapEntry arrays in getAnimationsEnumMap

preparatory change to making SvXMLEnumMapEntry a template class for the
"UNO scoped enum" change.

But I think its an improvement by itself, there is no need to initialise
these arrays on-demand, the compiler will do that at link time.

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

diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index 2ff9f76..417a213 100644
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
@@ -26,24 +26,22 @@ struct SvXMLEnumMapEntry;
 
 namespace xmloff
 {
-const sal_uInt16 Animations_EnumMap_Fill= 0;
-const sal_uInt16 Animations_EnumMap_FillDefault = 1;
-const sal_uInt16 Animations_EnumMap_Restart = 2;
-const sal_uInt16 Animations_EnumMap_RestartDefault = 3;
-const sal_uInt16 Animations_EnumMap_Endsync = 4;
-const sal_uInt16 Animations_EnumMap_CalcMode = 5;
-const sal_uInt16 Animations_EnumMap_AdditiveMode = 6;
-const sal_uInt16 Animations_EnumMap_TransformType = 7;
-const sal_uInt16 Animations_EnumMap_TransitionType = 8;
-const sal_uInt16 Animations_EnumMap_TransitionSubType = 9;
-const sal_uInt16 Animations_EnumMap_EventTrigger = 10;
-const sal_uInt16 Animations_EnumMap_EffectPresetClass = 11;
-const sal_uInt16 Animations_EnumMap_EffectNodeType = 12;
-const sal_uInt16 Animations_EnumMap_SubItem = 13;
-const sal_uInt16 Animations_EnumMap_IterateType = 14;
-const sal_uInt16 Animations_EnumMap_Command = 15;
-
-extern const SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap );
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_Fill[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_FillDefault[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_Restart[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_RestartDefault[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_Endsync[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_CalcMode[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_AdditiveMode[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_TransformType[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_TransitionType[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_TransitionSubType[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_EventTrigger[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_EffectPresetClass[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_EffectNodeType[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_SubItem[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_IterateType[];
+extern const SvXMLEnumMapEntry aAnimations_EnumMap_Command[];
 
 struct ImplAttributeNameConversion
 {
diff --git a/xmloff/source/draw/animationexport.cxx 
b/xmloff/source/draw/animationexport.cxx
index 4c87961..11d4746 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -96,381 +96,306 @@ using ::com::sun::star::container::XEnumeration;
 namespace xmloff
 {
 
-const SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
+const SvXMLEnumMapEntry aAnimations_EnumMap_Fill[] =
 {
-switch( nMap )
-{
-case Animations_EnumMap_Fill:
-{
-static const SvXMLEnumMapEntry aAnimations_EnumMap_Fill[] =
-{
-{ XML_DEFAULT,  AnimationFill::DEFAULT },
-{ XML_REMOVE,   AnimationFill::REMOVE },
-{ XML_FREEZE,   AnimationFill::FREEZE },
-{ XML_HOLD, AnimationFill::HOLD },
-{ XML_TRANSITION,   AnimationFill::TRANSITION },
-{ XML_AUTO, AnimationFill::AUTO },
-{ XML_TOKEN_INVALID, 0 }
-};
-return aAnimations_EnumMap_Fill;
-}
-case Animations_EnumMap_FillDefault:
-{
-static const SvXMLEnumMapEntry aAnimations_EnumMap_Fill[] =
-{
-{ XML_INHERIT,  AnimationFill::INHERIT },
-{ XML_REMOVE,   AnimationFill::REMOVE },
-{ XML_FREEZE,   AnimationFill::FREEZE },
-{ XML_HOLD, AnimationFill::HOLD },
-{ XML_TRANSITION,   AnimationFill::TRANSITION },
-{ XML_AUTO, AnimationFill::AUTO },
-{ XML_TOKEN_INVALID, 0 }
-};
-return aAnimations_EnumMap_Fill;
-}
-case Animations_EnumMap_Restart:
-{
-static const SvXMLEnumMapEntry aAnima

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

[Stephan Bergmann]

 sw/inc/docary.hxx  |5 -
 sw/qa/core/uwriter.cxx |2 +-
 sw/qa/extras/uiwriter/uiwriter.cxx |8 
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 9ca8a63fff65acf2ea13b391495ad232f4636548
Author: Stephan Bergmann 
Date:   Wed Mar 1 13:09:25 2017 +0100

Use consistent integer types in the SwRedlineTable interface

ddd84d08c9bb6e00fbd9a73bd52a28688a8c1ba7 "Convert
SV_DECL_PTRARR_SORT_DEL(_SwRedlineTbl) to o3tl::sorted_vector" had 
introduced
size and operator[] operating on underlying vector's size_type, but had 
left the
other functions at sal_uInt16.  Keep everything at sal_uInt16 for now until
fixing everything to use that underlying vector size_type instead.

Change-Id: I92570dcb8ab5fa88b52e2b24899b833829693a88

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 45f9e45..2de106f 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -318,7 +318,10 @@ class SwRedlineTable
 public:
 typedef o3tl::sorted_vector vector_type;
-typedef vector_type::size_type size_type;
+typedef sal_uInt16 size_type;
+//TOOD: should be vector_type::size_type, but then all the uses of
+// sal_uInt16 in this class that represent positions in maVector need 
to
+// be changed, too
 private:
 vector_type maVector;
 public:
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index c0c4560..a32605d 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -775,7 +775,7 @@ void SwDocTest::testSwScanner()
 const SwRedlineTable& rTable = 
m_pDoc->getIDocumentRedlineAccess().GetRedlineTable();
 
 SwNodes& rNds = m_pDoc->GetNodes();
-CPPUNIT_ASSERT_EQUAL(static_cast(1), rTable.size());
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
rTable.size());
 
 SwNodeIndex* pNodeIdx = rTable[0]->GetContentIdx();
 CPPUNIT_ASSERT(pNodeIdx);
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index d9c76ba..dd969a4 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -839,7 +839,7 @@ void SwUiWriterTest::testCp171()
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 
 const SwRedlineTable& rTable = 
pDoc->getIDocumentRedlineAccess().GetRedlineTable();
-CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTable.size());
+CPPUNIT_ASSERT_EQUAL( SwRedlineTable::size_type( 2 ), rTable.size());
 sal_uLong redlineStart0NodeIndex = rTable[ 0 ]->Start()->nNode.GetIndex();
 sal_Int32 redlineStart0Index = rTable[ 0 ]->Start()->nContent.GetIndex();
 sal_uLong redlineEnd0NodeIndex = rTable[ 0 ]->End()->nNode.GetIndex();
@@ -861,7 +861,7 @@ void SwUiWriterTest::testCp171()
 rUndoManager.Undo();
 
 // Check that redlines are the same like at the beginning.
-CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTable.size());
+CPPUNIT_ASSERT_EQUAL( SwRedlineTable::size_type( 2 ), rTable.size());
 CPPUNIT_ASSERT_EQUAL( redlineStart0NodeIndex, rTable[ 0 
]->Start()->nNode.GetIndex());
 CPPUNIT_ASSERT_EQUAL( redlineStart0Index, rTable[ 0 
]->Start()->nContent.GetIndex());
 CPPUNIT_ASSERT_EQUAL( redlineEnd0NodeIndex, rTable[ 0 
]->End()->nNode.GetIndex());
@@ -4012,7 +4012,7 @@ void SwUiWriterTest::testRedlineViewAuthor()
 
 // Now assert that SwView::SetRedlineAuthor() had an effect.
 const SwRedlineTable& rTable = 
pDoc->getIDocumentRedlineAccess().GetRedlineTable();
-CPPUNIT_ASSERT_EQUAL(static_cast(1), rTable.size());
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
rTable.size());
 SwRangeRedline* pRedline = rTable[0];
 // This was 'Unknown Author' instead of 'A U. Thor'.
 CPPUNIT_ASSERT_EQUAL(aAuthor, pRedline->GetAuthorString());
@@ -4067,7 +4067,7 @@ void SwUiWriterTest::testRedlineTimestamp()
 // The relatively rare case when waiting for a second also changes the 
minute.
 return;
 
-CPPUNIT_ASSERT_EQUAL(static_cast(2), rTable.size());
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
rTable.size());
 sal_uInt16 nSec1 = rTable[0]->GetRedlineData().GetTimeStamp().GetSec();
 sal_uInt16 nSec2 = rTable[1]->GetRedlineData().GetTimeStamp().GetSec();
 // This failed, seconds was always 0.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 basegfx/source/range/b2dpolyrange.cxx  |   12 +
 basegfx/source/tools/b2dclipstate.cxx  |   13 
++
 include/basegfx/range/b2dpolyrange.hxx |3 ++
 include/basegfx/tools/b2dclipstate.hxx |3 ++
 vcl/qa/cppunit/graphicfilter/data/emf/fail/slow-moveclip-1.emf |binary
 vcl/source/filter/wmf/winmtf.cxx   |9 +-
 6 files changed, 33 insertions(+), 7 deletions(-)

New commits:
commit d9262e19c942f2719bfa7de3a5059e4f6e0039c6
Author: Caolán McNamara 
Date:   Wed Mar 1 10:35:31 2017 +

ofz: timeout loading emf with move clip record

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

diff --git a/basegfx/source/range/b2dpolyrange.cxx 
b/basegfx/source/range/b2dpolyrange.cxx
index 25117cb..3b86f4f 100644
--- a/basegfx/source/range/b2dpolyrange.cxx
+++ b/basegfx/source/range/b2dpolyrange.cxx
@@ -87,6 +87,13 @@ namespace basegfx
 return tools::solveCrossovers(maRanges,maOrient);
 }
 
+void transform(const basegfx::B2DHomMatrix& rTranslate)
+{
+maBounds.transform(rTranslate);
+for (auto &a : maRanges)
+a.transform(rTranslate);
+}
+
 private:
 B2DRange maBounds;
 std::vectormaRanges;
@@ -148,6 +155,11 @@ namespace basegfx
 return mpImpl->overlaps(rRange);
 }
 
+void B2DPolyRange::transform(const basegfx::B2DHomMatrix& rTranslate)
+{
+mpImpl->transform(rTranslate);
+}
+
 B2DPolyPolygon B2DPolyRange::solveCrossovers() const
 {
 return mpImpl->solveCrossovers();
diff --git a/basegfx/source/tools/b2dclipstate.cxx 
b/basegfx/source/tools/b2dclipstate.cxx
index db09324..5ce779c 100644
--- a/basegfx/source/tools/b2dclipstate.cxx
+++ b/basegfx/source/tools/b2dclipstate.cxx
@@ -173,6 +173,13 @@ namespace tools
 addPolyPolygon(rPolyPoly,XOR);
 }
 
+void transform(const basegfx::B2DHomMatrix& rTranslate)
+{
+maPendingRanges.transform(rTranslate);
+maPendingPolygons.transform(rTranslate);
+maClipPoly.transform(rTranslate);
+}
+
 B2DPolyPolygon const & getClipPoly() const
 {
 commitPendingRanges();
@@ -481,6 +488,12 @@ namespace tools
 return mpImpl->getClipPoly();
 }
 
+void B2DClipState::transform(const basegfx::B2DHomMatrix& rTranslate)
+{
+return mpImpl->transform(rTranslate);
+}
+
+
 } // end of namespace tools
 } // end of namespace basegfx
 
diff --git a/include/basegfx/range/b2dpolyrange.hxx 
b/include/basegfx/range/b2dpolyrange.hxx
index f3494c1..bfd3630 100644
--- a/include/basegfx/range/b2dpolyrange.hxx
+++ b/include/basegfx/range/b2dpolyrange.hxx
@@ -30,6 +30,7 @@ namespace basegfx
 class B2DTuple;
 class B2DRange;
 class B2DPolyPolygon;
+class B2DHomMatrix;
 class ImplB2DPolyRange;
 
 /** Multiple ranges in one object.
@@ -84,6 +85,8 @@ namespace basegfx
  */
 B2DPolyPolygon solveCrossovers() const;
 
+void transform(const B2DHomMatrix& rTranslate);
+
 private:
 o3tl::cow_wrapper< ImplB2DPolyRange > mpImpl;
 };
diff --git a/include/basegfx/tools/b2dclipstate.hxx 
b/include/basegfx/tools/b2dclipstate.hxx
index dab598e..865bdd7 100644
--- a/include/basegfx/tools/b2dclipstate.hxx
+++ b/include/basegfx/tools/b2dclipstate.hxx
@@ -31,6 +31,7 @@ namespace basegfx
 class B2DPolyRange;
 class B2DPolygon;
 class B2DPolyPolygon;
+class B2DHomMatrix;
 
 namespace tools
 {
@@ -85,6 +86,8 @@ namespace basegfx
 void xorRange(const B2DRange& );
 void xorPolyPolygon(const B2DPolyPolygon& );
 
+void transform(const B2DHomMatrix& );
+
 B2DPolyPolygon getClipPoly() const;
 };
 }
diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/slow-moveclip-1.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/slow-moveclip-1.emf
new file mode 100644
index 000..ef4c6a0
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/slow-moveclip-1.emf differ
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index d51db44..028495d 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -78,14 +78,9 @@ void WinMtfClipPath::setClipPath( const tools::PolyPolygon& 
rPolyPolygon, sal_In
 
 void WinMtfClipPath::moveClipRegion( const Size& rSize )
 {
-// what a weird concept. emulate, don't want this in B2DClipState
-// API
-basegfx::B2DPolyPolygon aCurrClip=maClip.getClipPoly();
 basegfx::B2DHomMatrix aTranslate;
 aTranslate.translate(rSize.Width(), rSize.Height());
-
-aCurrClip.tr

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

[Caolán McNamara]

 cui/uiconfig/ui/textflowpage.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 03899e1284db150d2da78b725aba7180147123c4
Author: Caolán McNamara 
Date:   Wed Mar 1 12:01:01 2017 +

express that the checkbox labels the page number field

Change-Id: I54e0de99a7d97be2c85221ecab0ebbe07ed4ae4a

diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui
index 644fb3f..8ce7a43 100644
--- a/cui/uiconfig/ui/textflowpage.ui
+++ b/cui/uiconfig/ui/textflowpage.ui
@@ -244,6 +244,9 @@
 True
 •
 adjustment3
+
+  
+
   
   
 4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: FastSaxSerializer: SAL_WARN() when writing invalid XML characters

[Stephan Bergmann]

On 03/01/2017 12:05 PM, Eike Rathke wrote:

On Wednesday, 2017-03-01 10:34:04 +0100, Stephan Bergmann wrote:

(1)  If the input is assumed to be an arbitrary sequence of Unicode scalar
values (i.e., may contain noncharacters, even despite the caveat that those
should never be interchanged), the below invalidChar handling might want to
also watch out for U+FFFE and U+.


Also if UTF-8 encoded? (as we write OString/chars there..)


Yes, the XML requirement is on the Unicode (or ISO/IEC 10646) 
characters, regardless how they're encoded in a given file.  Though it's 
probably a bit difficult to cram that check into FastSaxSerializer's 
design.  And, again, may even not be relevant if the input must not 
contain any noncharacters anyway.  (In configmgr, I didn't bother to 
ensure that at any higher abstraction level, and simply make sure 
arbitrary sequences of Unicode scalar values are properly encoded for 
XML's requirements.)

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

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpframelayout.cxx |   44 +-
 lotuswordpro/source/filter/lwpframelayout.hxx |2 -
 lotuswordpro/source/filter/lwptablelayout.cxx |4 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit a75439fe0f2e54781e6344b4b2db1a0a02a94c76
Author: Caolán McNamara 
Date:   Wed Mar 1 11:53:50 2017 +

fix leak

Change-Id: I7f87bf07e50baffd463d4429186928642bdf73b3

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index a1cb935..c4de863 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -83,26 +83,26 @@ LwpFrame::~LwpFrame()
 * @param:  pFrameStyle - Frame Style object
 *
 */
-void  LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
+void LwpFrame::RegisterStyle(std::unique_ptr& rFrameStyle)
 {
-ApplyWrapType(pFrameStyle);
-ApplyMargins(pFrameStyle);
-ApplyPadding(pFrameStyle);
-ApplyBorders(pFrameStyle);
-ApplyColumns(pFrameStyle);
-ApplyShadow(pFrameStyle);
-ApplyBackGround(pFrameStyle);
-ApplyWatermark(pFrameStyle);
-//  ApplyBackColor(pFrameStyle);
-ApplyProtect(pFrameStyle);
-ApplyTextDir(pFrameStyle);
-ApplyPosType(pFrameStyle);
-
-pFrameStyle->SetStyleName(m_pLayout->GetName().str());
+ApplyWrapType(rFrameStyle.get());
+ApplyMargins(rFrameStyle.get());
+ApplyPadding(rFrameStyle.get());
+ApplyBorders(rFrameStyle.get());
+ApplyColumns(rFrameStyle.get());
+ApplyShadow(rFrameStyle.get());
+ApplyBackGround(rFrameStyle.get());
+ApplyWatermark(rFrameStyle.get());
+ApplyProtect(rFrameStyle.get());
+ApplyTextDir(rFrameStyle.get());
+ApplyPosType(rFrameStyle.get());
+
+rFrameStyle->SetStyleName(m_pLayout->GetName().str());
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
-m_StyleName = 
pXFStyleManager->AddStyle(pFrameStyle).m_pStyle->GetStyleName();
+m_StyleName = 
pXFStyleManager->AddStyle(rFrameStyle.release()).m_pStyle->GetStyleName();
 m_pLayout->SetStyleName(m_StyleName);
 }
+
 /**
 * @descr:  parse frame and set frame properties
 * @param:   pXFFrame - XFFrame object
@@ -856,9 +856,9 @@ void  LwpFrameLayout::RegisterStyle()
 return;
 
 //register frame style
-XFFrameStyle* pFrameStyle = new XFFrameStyle();
-m_pFrame.reset( new LwpFrame(this) );
-m_pFrame->RegisterStyle(pFrameStyle);
+std::unique_ptr xFrameStyle(new XFFrameStyle);
+m_pFrame.reset(new LwpFrame(this));
+m_pFrame->RegisterStyle(xFrameStyle);
 
 //register content style
 rtl::Reference content = m_Content.obj();
@@ -1046,9 +1046,9 @@ void LwpGroupLayout::RegisterStyle()
 return;
 
 //register frame style
-XFFrameStyle* pFrameStyle = new XFFrameStyle();
-m_pFrame.reset( new LwpFrame(this) );
-m_pFrame->RegisterStyle(pFrameStyle);
+std::unique_ptr xFrameStyle(new XFFrameStyle);
+m_pFrame.reset(new LwpFrame(this));
+m_pFrame->RegisterStyle(xFrameStyle);
 
 //register child frame style
 RegisterChildStyle();
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx 
b/lotuswordpro/source/filter/lwpframelayout.hxx
index 9575687..527e5fb 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -74,7 +74,7 @@ class LwpFrame
 public:
 explicit LwpFrame(LwpPlacableLayout* pLayout);
 ~LwpFrame();
-void RegisterStyle(XFFrameStyle* pFrameStyle);
+void RegisterStyle(std::unique_ptr& rFrameStyle);
 void Parse(XFFrame* pXFFrame, sal_Int32 nPageNo);
 void XFConvert(XFContentContainer* pCont);
 private:
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index f690daf..7973803 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -410,8 +410,8 @@ void  
LwpSuperTableLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 n
  */
 void  LwpSuperTableLayout::RegisterFrameStyle()
 {
-XFFrameStyle* pFrameStyle = new XFFrameStyle();
-m_pFrame->RegisterStyle(pFrameStyle);
+std::unique_ptr xFrameStyle(new XFFrameStyle);
+m_pFrame->RegisterStyle(xFrameStyle);
 }
 
 LwpTableLayout::LwpTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 cui/source/inc/paragrph.hxx   |3 -
 cui/source/tabpages/paragrph.cxx  |   85 --
 cui/uiconfig/ui/textflowpage.ui   |7 +--
 sw/source/uibase/utlui/uitool.cxx |   21 -
 4 files changed, 87 insertions(+), 29 deletions(-)

New commits:
commit d36fa0589ab822dc617c65b4d0d3bf68c092ad37
Author: Michael Stahl 
Date:   Wed Mar 1 12:39:54 2017 +0100

tdf#77111 cui,sw: fix page number offset on paragraph dialog "Text Flow"

Commit c2ccd20c0fd92bddfff76447754541705e3eb8f3 introduced 0 as a valid
value for page number offset in sw core.

Unfortunately the paragraph dialog was not changed then; previously
page number 0 would do automatic numbering, but since then 0 was set as
the offset, and once you have a 0 offset there's no easy way to remove
it, you have to remove the whole page break.

* change the label before the text number edit widget to a checkbox
  that disables the edit widget

* keep the id "labelPageNum" so that translations still work

* adapt SfxToSwPageDescAttr so it can not just set but also clear the
  page number

* set initial value to 1; 0 is a really bad default since we can't
  export it to ODF (see tdf#91306)

Change-Id: Ic4ca9e2562bb65ac359b305a2202f782e8598307

diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index c38f65a..abe414a 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -234,7 +234,7 @@ private:
 VclPtrm_pBreakPositionLB;
 VclPtrm_pApplyCollBtn;
 VclPtrm_pApplyCollBox;
-VclPtr  m_pPagenumText;
+VclPtrm_pPageNumBox;
 VclPtr   m_pPagenumEdit;
 
 // paragraph division
@@ -262,6 +262,7 @@ private:
 DECL_LINK(ApplyCollClickHdl_Impl, Button*, void);
 DECL_LINK( PageBreakPosHdl_Impl, ListBox&, void );
 DECL_LINK( PageBreakTypeHdl_Impl, ListBox&, void );
+DECL_LINK(PageNumBoxClickHdl_Impl, Button*, void);
 
 virtual voidPageCreated(const SfxAllItemSet& aSet) override;
 };
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 97edb56..3c28357 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1401,18 +1401,27 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* 
rOutSet )
 }
 }
 
-if (m_pPagenumEdit->IsEnabled() && m_pPagenumEdit->IsValueModified())
+if (m_pPageNumBox->IsEnabled()
+&& (m_pPageNumBox->IsValueChangedFromSaved() || 
m_pPagenumEdit->IsValueModified()))
 {
-SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM,
-(sal_uInt16)m_pPagenumEdit->GetValue() );
-
 pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGENUM );
 
-if ( !pOld || static_cast(pOld)->GetValue() != 
aPageNum.GetValue() )
+if (TRISTATE_TRUE == m_pPageNumBox->GetState()
+&& (!pOld || IsInvalidItem(pOld)
+|| static_cast(pOld)->GetValue() != 
m_pPagenumEdit->GetValue()))
 {
+SfxUInt16Item aPageNum(SID_ATTR_PARA_PAGENUM,
+static_cast(m_pPagenumEdit->GetValue()));
 rOutSet->Put( aPageNum );
 bModified = true;
 }
+else if (TRISTATE_FALSE == m_pPageNumBox->GetState()
+&& (pOld || IsInvalidItem(pOld)))
+{
+// need to tell sw to remove the item
+rOutSet->DisableItem(SID_ATTR_PARA_PAGENUM);
+bModified = true;
+}
 }
 
 // pagebreak
@@ -1604,11 +1613,34 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* 
rSet )
 
 _nWhich = GetWhich( SID_ATTR_PARA_PAGENUM );
 
-if (rSet->GetItemState(_nWhich) >= SfxItemState::SET)
+switch (rSet->GetItemState(_nWhich))
 {
-const sal_uInt16 nPageNum =
-static_cast(rSet->Get( _nWhich ) 
).GetValue();
-m_pPagenumEdit->SetValue( nPageNum );
+case SfxItemState::SET:
+{
+m_pPageNumBox->EnableTriState(false);
+m_pPageNumBox->SetState(TRISTATE_TRUE);
+SfxUInt16Item const*const pItem(static_cast(rSet->GetItem(_nWhich)));
+const sal_uInt16 nPageNum(pItem->GetValue());
+m_pPagenumEdit->SetValue( nPageNum );
+break;
+}
+case SfxItemState::DONTCARE:
+{
+m_pPageNumBox->EnableTriState();
+m_pPageNumBox->SetState(TRISTATE_INDET);
+break;
+}
+case SfxItemState::UNKNOWN:
+case SfxItemState::DEFAULT:
+case SfxItemState::DISABLED:
+{
+m_pPageNumBox->EnableTriState(false);
+m_pPageNumBox->SetState(TRISTATE_FALSE);
+break;
+}
+default:
+assert(false); // unexpected
+break;
 }
 
 if ( bPageBreak )
@@ -1664,7 +1696,7 @@ void SvxExtParagraphTabPage::Reset( const SfxIte

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

[Caolán McNamara]

 hwpfilter/source/hinfo.h   |5 +++--
 hwpfilter/source/hwpfile.cxx   |4 ++--
 hwpfilter/source/hwpreader.cxx |2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 86463ec54dcdc562121bdb57b1ac4e85b135b2df
Author: Caolán McNamara 
Date:   Wed Mar 1 11:41:17 2017 +

ofz#711: direct leak

Change-Id: I65ec47b4290d845f1803b20b93f149d35d9a60ea

diff --git a/hwpfilter/source/hinfo.h b/hwpfilter/source/hinfo.h
index d16da5d..7f1eee0 100644
--- a/hwpfilter/source/hinfo.h
+++ b/hwpfilter/source/hinfo.h
@@ -23,6 +23,8 @@
 #include "hwplib.h"
 #include "string.h"
 
+#include 
+
 #define CHAIN_MAX_PATH  40
 #define ANNOTATION_LEN  24
 
@@ -77,7 +79,7 @@ struct PaperBackInfo
 int range; /* 0-, 1-, 3-??, 4-?? */
 char reserved3[27];
 int size;
-char *data;// image data
+std::vector data;// image data
 bool isset;
 PaperBackInfo()
 : type(0)
@@ -87,7 +89,6 @@ struct PaperBackInfo
 , flag(0)
 , range(0)
 , size(0)
-, data(nullptr)
 , isset(false)
 {
 memset(reserved1, 0, sizeof(reserved1));
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 0ce3902..33505c0 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -356,8 +356,8 @@ void HWPFile::TagsRead()
 return;
  }
 
- _hwpInfo.back_info.data = new char[(unsigned 
int)_hwpInfo.back_info.size];
- ReadBlock(_hwpInfo.back_info.data, 
_hwpInfo.back_info.size);
+ _hwpInfo.back_info.data.resize(_hwpInfo.back_info.size);
+ ReadBlock(_hwpInfo.back_info.data.data(), 
_hwpInfo.back_info.size);
 
  if( _hwpInfo.back_info.size > 0 )
   _hwpInfo.back_info.type = 2;
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 53fd080..5e499e7 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1736,7 +1736,7 @@ void HwpReader::makePageStyle()
  if( hwpinfo.back_info.type == 2 ){
  rstartEl("office:binary-data", mxList.get());
  mxList->clear();
- std::shared_ptr 
pStr(base64_encode_string(reinterpret_cast(hwpinfo.back_info.data), hwpinfo.back_info.size ), Free());
+ std::shared_ptr 
pStr(base64_encode_string(reinterpret_cast(hwpinfo.back_info.data.data()), hwpinfo.back_info.size ), Free());
  rchars(ascii(pStr.get()));
  rendEl("office:binary-data");
  }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 tools/source/zcodec/zcodec.cxx |2 +-
 vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp |binary
 vcl/source/gdi/dibtools.cxx|5 +++--
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit aacaacc16938b030a1341d8dbaf56c6a2efeb1dc
Author: Caolán McNamara 
Date:   Wed Mar 1 11:12:45 2017 +

ofz: Z_NEED_DICT is unsupported

Change-Id: Ib0945d5a4606915aff9ee3019203caaf2a3cc7c5

diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 161aa33..c935bb8 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -222,7 +222,7 @@ long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, 
sal_uInt32 nSize )
 
 }
 err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
-if ( err < 0 )
+if (err < 0 || err == Z_NEED_DICT)
 {
 // Accept Z_BUF_ERROR as EAGAIN or EWOULDBLOCK.
 mbStatus = (err == Z_BUF_ERROR);
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp
new file mode 100644
index 000..a75d6eb
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp differ
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 89abf96..8dd710e 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -841,7 +841,8 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, 
AlphaMask* pBmpAlpha, sal_u
 // Seek behind the encoded block. There might have been bytes 
left or the codec might have read more than necessary.
 rIStm.Seek(nCodedSize + nCodedPos);
 }
-else
+
+if (aData.empty())
 {
 // add something so we can take address of the first element
 aData.resize(1);
@@ -850,7 +851,7 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, 
AlphaMask* pBmpAlpha, sal_u
 
 // set decoded bytes to memory stream,
 // from which we will read the bitmap data
-pMemStm.reset( new SvMemoryStream);
+pMemStm.reset(new SvMemoryStream);
 pIStm = pMemStm.get();
 assert(!aData.empty());
 pMemStm->SetBuffer(aData.data(), nUncodedSize, nUncodedSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 oox/source/export/ooxml-export-notes.txt |6 --
 1 file changed, 6 deletions(-)

New commits:
commit c70081972c900afccd822999bc0398aa0c5751da
Author: Tor Lillqvist 
Date:   Wed Mar 1 13:22:13 2017 +0200

Remove clearly outdated stuff

Change-Id: I23ca8cc512a0bd433474c12d06461597d0bd35ee

diff --git a/oox/source/export/ooxml-export-notes.txt 
b/oox/source/export/ooxml-export-notes.txt
index d76c083..36c42fc 100644
--- a/oox/source/export/ooxml-export-notes.txt
+++ b/oox/source/export/ooxml-export-notes.txt
@@ -16,12 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-How to install this

-
-> cd instsetoo_native/util
-> LOCALINSTALLDIR=/where/you/want dmake openoffice_en-US PKGFORMAT=installed
-
 OOXML generally
 ---
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: FastSaxSerializer: SAL_WARN() when writing invalid XML characters

[Eike Rathke]

Hi Stephan,

On Wednesday, 2017-03-01 10:34:04 +0100, Stephan Bergmann wrote:

> (1)  If the input is assumed to be an arbitrary sequence of Unicode scalar
> values (i.e., may contain noncharacters, even despite the caveat that those
> should never be interchanged), the below invalidChar handling might want to
> also watch out for U+FFFE and U+.

Also if UTF-8 encoded? (as we write OString/chars there..)

  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: sd/source sd/uiconfig

[Rohan Kumar]

 sd/source/ui/dlg/prltempl.cxx  |1 +
 sd/source/ui/func/futempl.cxx  |   22 ++
 sd/source/ui/inc/prltempl.hxx  |1 +
 sd/uiconfig/sdraw/ui/drawprtldialog.ui |   14 ++
 4 files changed, 38 insertions(+)

New commits:
commit a04abc59ae24690992a771305a4e89451c77c289
Author: Rohan Kumar 
Date:   Sat Jan 21 01:31:34 2017 +0530

tdf#96681 Lack of UI to change the text background color of a style

Added Highlighting tab to Edit Style button in impress

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

diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 7c25490..03dfaf4 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -149,6 +149,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( 
SfxObjectShell* pDocSh,
 mnTab =  AddTabPage( "RID_SVXPAGE_TABULATOR", 
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TABULATOR ), nullptr );
 mnAsian = AddTabPage( "RID_SVXPAGE_PARA_ASIAN", 
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PARA_ASIAN ), nullptr );
 mnAlign = AddTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH", 
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGN_PARAGRAPH ), nullptr );
+mnBackground = AddTabPage( "RID_SVXPAGE_BACKGROUND", 
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr);
 
 SvtCJKOptions aCJKOptions;
 if( !aCJKOptions.IsAsianTypographyEnabled() )
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index bd97800..30893d8 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -36,6 +36,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -103,6 +105,10 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 SfxStyleSheetBase* pStyleSheet = nullptr;
 
 const SfxPoolItem* pItem;
+static const sal_uInt16 aRanges[] = {
+EE_ITEMS_START, EE_ITEMS_END,
+SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR
+};
 SfxStyleFamily nFamily = (SfxStyleFamily)USHRT_MAX;
 if( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_STYLE_FAMILY,
 false, &pItem ))
@@ -299,6 +305,15 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 ScopedVclPtr pPresDlg;
 SdAbstractDialogFactory* pFact = 
SdAbstractDialogFactory::Create();
 bool bOldDocInOtherLanguage = false;
+SfxItemSet aNewAttr(mpViewShell->GetPool(), aRanges);
+
+if( aNewAttr.GetItemState( XATTR_FILLBACKGROUND, true, &pItem 
) == SfxItemState::SET)
+{
+Color aBackColor = static_cast(pItem)->GetValue();
+SvxBrushItem aBrushItem(aBackColor, XATTR_FILLBACKGROUND);
+aNewAttr.ClearItem(XATTR_FILLBACKGROUND);
+aNewAttr.Put(aBrushItem);
+}
 
 SfxStyleFamily eFamily = pStyleSheet->GetFamily();
 
@@ -399,6 +414,13 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 SfxItemSet aTempSet(*pOutSet);
 
static_cast(pStyleSheet)->AdjustToFontHeight(aTempSet);
 
+const SvxBrushItem* pBrushItem = static_cast(aTempSet.GetItem(XATTR_FILLBACKGROUND));
+if( pBrushItem )
+{
+   SvxBackgroundColorItem aBackColorItem( 
pBrushItem->GetColor(), EE_CHAR_BKGCOLOR);
+   aTempSet.ClearItem(XATTR_FILLBACKGROUND);
+   aTempSet.Put(aBackColorItem);
+}
 /* Special treatment: reset the INVALIDS to
NULL-Pointer (otherwise INVALIDs or pointer 
point
to DefaultItems in the template; both would
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index e2b8bc6..0694e86 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -61,6 +61,7 @@ private:
 sal_uInt16mnTab;
 sal_uInt16mnAsian;
 sal_uInt16mnAlign;
+sal_uInt16mnBackground;
 
 PresentationObjects ePO;
 
diff --git a/sd/uiconfig/sdraw/ui/drawprtldialog.ui 
b/sd/uiconfig/sdraw/ui/drawprtldialog.ui
index c5c5fa2..561f630 100644
--- a/sd/uiconfig/sdraw/ui/drawprtldialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawprtldialog.ui
@@ -298,6 +298,20 @@
 False
   
 
+
+  
+
+
+  
+True
+False
+Highlighting
+  
+  
+15
+False
+  
+
   
   
 False
___

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/financial/fods/t.inv.fods | 5315 
 1 file changed, 5315 insertions(+)

New commits:
commit d40a90f6d156fcdca8737295d85befe6cc384b8e
Author: Zdeněk Crhonek 
Date:   Wed Mar 1 06:13:43 2017 +0100

add T.INV test case

Change-Id: I0cdd009a444c0c2363d74b9b09ddd8c09c906acb
Reviewed-on: https://gerrit.libreoffice.org/34734
Tested-by: Jenkins 
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/unit/data/functions/financial/fods/t.inv.fods 
b/sc/qa/unit/data/functions/financial/fods/t.inv.fods
new file mode 100644
index 000..813fb6a
--- /dev/null
+++ b/sc/qa/unit/data/functions/financial/fods/t.inv.fods
@@ -0,0 +1,5315 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2017-02-24T16:58:49.339122616P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/36de6c50684c8241969a2064d30aff41e0bc5d97
+ 
+  
+   0
+   0
+   55364
+   21043
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   2
+   37
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   21
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgBJbnB1dFNsb3Q6VHJheTEARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   -
+   
+
+   Kč
+   
+  
+  
+   
+
+ 

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

[Bjoern Michaelsen]

 sw/source/core/draw/dcontact.cxx |   22 +-
 1 file changed, 9 insertions(+), 13 deletions(-)

New commits:
commit 5021cb725d727f493ec7f11691936d3efafdbca7
Author: Bjoern Michaelsen 
Date:   Tue Feb 28 11:22:08 2017 +0100

simplify setContextWritingMode a bit

Change-Id: Iab0462703634866a47b77c4862de52b69390b992
Reviewed-on: https://gerrit.libreoffice.org/34727
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index fe9b058..6192fd2 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -74,22 +74,18 @@
 using namespace ::com::sun::star;
 
 
-void setContextWritingMode( SdrObject* pObj, SwFrame* pAnchor )
+void setContextWritingMode(SdrObject* pObj, SwFrame* pAnchor)
 {
-if( pObj && pAnchor )
-{
-short nWritingDirection = text::WritingMode2::LR_TB;
-if( pAnchor->IsVertical() )
-{
-nWritingDirection = text::WritingMode2::TB_RL;
-} else if( pAnchor->IsRightToLeft() )
-{
-nWritingDirection = text::WritingMode2::RL_TB;
-}
-pObj->SetContextWritingMode( nWritingDirection );
-}
+if(!pObj || !pAnchor)
+return;
+short nWritingDirection =
+pAnchor->IsVertical()? text::WritingMode2::TB_RL :
+pAnchor->IsRightToLeft() ? text::WritingMode2::RL_TB :
+text::WritingMode2::LR_TB;
+pObj->SetContextWritingMode(nWritingDirection);
 }
 
+
 /** The Get reverse way: seeks the format to the specified object.
  * If the object is a SwVirtFlyDrawObj then the format of this
  * will be acquired.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/graphicfilter/itiff/ccidecom.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit f01a975cb22d33a386bfd8db4ea6b4b77aceca1b
Author: Caolán McNamara 
Date:   Wed Mar 1 09:35:34 2017 +

defer this for a while

This reverts commit 99c361be16eb3a21aa679a103db2d07ecd0f5d3c.

diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx 
b/filter/source/graphicfilter/itiff/ccidecom.cxx
index b5f3ab4..125d9c8 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -627,9 +627,7 @@ void CCIDecompressor::StartDecompression( SvStream & 
rIStream )
 
 bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong 
nTargetBits, bool bLastLine )
 {
-//Read[1|2]DScanlineData take a sal_uInt16, so its either limit here or 
expand there
-if (nTargetBits > SAL_MAX_UINT16)
-return false;
+bool b2D;
 
 if ( nEOLCount >= 5 )   // RTC (Return To Controller)
 return true;
@@ -684,7 +682,6 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 * 
pTarget, sal_uLong nTarget
 if ( nOptions & CCI_OPTION_BYTEALIGNROW )
 nInputBitsBufSize &= 0xfff8;
 
-bool b2D;
 // is it a 2D row?
 if ( nOptions & CCI_OPTION_2D )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: FastSaxSerializer: SAL_WARN() when writing invalid XML characters

[Stephan Bergmann]

(1)  If the input is assumed to be an arbitrary sequence of Unicode 
scalar values (i.e., may contain noncharacters, even despite the caveat 
that those should never be interchanged), the below invalidChar handling 
might want to also watch out for U+FFFE and U+.  (See 
writeValueContent in configmgr/source/writemodfile.cxx.  Somewhat oddly, 
XML 1.0 excludes those two noncharacters from its Char definition while 
not excluding any other Unicode noncharacters, U+FDD0..U+FDEF and 
U+nFFFE..U+n for n in 1..10 hex.)


On 02/28/2017 10:30 PM, Eike Rathke wrote:

commit baca2ec8d5a457512e25b499c3cacc7a66ca853f
Author: Eike Rathke 
Date:   Tue Feb 28 22:14:08 2017 +0100

FastSaxSerializer: SAL_WARN() when writing invalid XML characters

This catches things for OOXML, that could be escaped using _x_

Change-Id: I937f67dc5edd3c0e5727d74bebb736dc82bdc53d

diff --git a/sax/source/tools/fastserializer.cxx 
b/sax/source/tools/fastserializer.cxx
index 620fe68..a571829 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -101,6 +101,26 @@ namespace sax_fastparser {
 write( sOutput.getStr(), sOutput.getLength(), bEscape );
 }

+#if OSL_DEBUG_LEVEL > 0
+/** Characters not allowed in XML 1.0
+XML 1.1 would exclude only U+
+ */
+bool invalidChar( char c )
+{
+if (static_cast(c) >= 0x20)
+return false;
+
+switch (c)
+{
+case 0x09:
+case 0x0a:
+case 0x0d:
+return false;
+}
+return true;
+}
+#endif
+
 void FastSaxSerializer::write( const char* pStr, sal_Int32 nLen, bool 
bEscape )
 {
 if (nLen == -1)
@@ -112,6 +132,7 @@ namespace sax_fastparser {
 return;
 }

+bool bGood = true;
 for (sal_Int32 i = 0; i < nLen; ++i)
 {
 char c = pStr[ i ];
@@ -124,9 +145,26 @@ namespace sax_fastparser {
 case '"':   writeBytes( """, 6 );   break;
 case '\n':  writeBytes( "
", 5 );break;
 case '\r':  writeBytes( "
", 5 );break;
-default:writeBytes( &c, 1 );  break;
+default:
+#if OSL_DEBUG_LEVEL > 0
+/* FIXME: we should escape such invalid characters
+ * in the _x_ form OOXML uses. Note that also a
+ * literal "_x0008_" would have to be escaped then
+ * as _x005F_x0008_ (where only the leading '_' is
+ * escaped as _x005F_). */
+if (invalidChar(pStr[i]))
+{
+bGood = false;
+// The SAL_WARN() for the single character is
+// issued in writeBytes(), just gather for the
+// SAL_WARN_IF() below.
+}
+#endif
+writeBytes( &c, 1 ); break;
 }
 }
+SAL_WARN_IF( !bGood && nLen > 1, "sax", "in '" << 
OString(pStr,std::min(nLen,42)) << "'");
+(void)bGood;
 }

 void FastSaxSerializer::endDocument()
@@ -496,6 +534,21 @@ namespace sax_fastparser {

 void FastSaxSerializer::writeBytes( const char* pStr, size_t nLen )
 {
+#if OSL_DEBUG_LEVEL > 0
+{
+bool bGood = true;
+for (size_t i=0; i < nLen; ++i)
+{
+if (invalidChar(pStr[i]))
+{
+bGood = false;
+SAL_WARN("sax", "FastSaxSerializer::writeBytes - illegal XML 
character 0x" <<
+std::hex << int(static_cast(pStr[i])));
+}
+}
+SAL_WARN_IF( !bGood && nLen > 1, "sax", "in '" << 
OString(pStr,std::min(nLen,42)) << "'");
+}
+#endif
 maCachedOutputStream.writeBytes( reinterpret_cast(pStr), nLen );
 }



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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 99/5c892201e3aea41aae920348abfa1fde02a39d

[Caolán McNamara]

 99/5c892201e3aea41aae920348abfa1fde02a39d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 721efc93cd13a0c35114ee714eeb6c254832339e
Author: Caolán McNamara 
Date:   Wed Mar 1 09:30:02 2017 +

Notes added by 'git notes add'

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

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpfootnote.cxx   |   41 +--
 lotuswordpro/source/filter/lwppagelayout.cxx |   58 ---
 2 files changed, 47 insertions(+), 52 deletions(-)

New commits:
commit ea860ba986394e72123479e32ee4f363e19386d9
Author: Caolán McNamara 
Date:   Wed Mar 1 09:27:37 2017 +

fix leak

Change-Id: I6e3d1d3b43967f10a151a6b696a863383a7b1776

diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx 
b/lotuswordpro/source/filter/lwpfootnote.cxx
index dbf35db..15bf99d 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -116,11 +116,11 @@ void LwpFribFootnote::XFConvert(XFContentContainer* pCont)
 if (m_ModFlag)
 {
 //set footnote number font style
-XFTextSpan *pSpan = new XFTextSpan;
-pSpan->SetStyleName(GetStyleName());
+rtl::Reference xSpan(new XFTextSpan);
+xSpan->SetStyleName(GetStyleName());
 //add the xffootnote into the content container
-pSpan->Add(xContent.get());
-pCont->Add(pSpan);
+xSpan->Add(xContent.get());
+pCont->Add(xSpan.get());
 }
 else
 {
@@ -472,27 +472,26 @@ void LwpFootnoteOptions::RegisterStyle()
  */
 void LwpFootnoteOptions::RegisterFootnoteStyle()
 {
-XFFootnoteConfig* pFootnoteConfig = new XFFootnoteConfig();
-pFootnoteConfig->SetStartValue(m_FootnoteNumbering.GetStartingNumber() -1);
-pFootnoteConfig->SetNumPrefix(m_FootnoteNumbering.GetLeadingText());
-pFootnoteConfig->SetNumSuffix(m_FootnoteNumbering.GetTrailingText());
+std::unique_ptr xFootnoteConfig(new XFFootnoteConfig);
+xFootnoteConfig->SetStartValue(m_FootnoteNumbering.GetStartingNumber() -1);
+xFootnoteConfig->SetNumPrefix(m_FootnoteNumbering.GetLeadingText());
+xFootnoteConfig->SetNumSuffix(m_FootnoteNumbering.GetTrailingText());
 if(m_FootnoteNumbering.GetReset() == LwpFootnoteNumberOptions::RESET_PAGE)
 {
-pFootnoteConfig->SetRestartOnPage();
+xFootnoteConfig->SetRestartOnPage();
 }
 if(GetContinuedFrom())
 {
-pFootnoteConfig->SetMessageFrom(GetContinuedFromMessage());
+xFootnoteConfig->SetMessageFrom(GetContinuedFromMessage());
 }
 if(GetContinuedOn())
 {
-pFootnoteConfig->SetMessageOn(GetContinuedOnMessage());
+xFootnoteConfig->SetMessageOn(GetContinuedOnMessage());
 }
 
-pFootnoteConfig->SetMasterPage( m_strMasterPage);
+xFootnoteConfig->SetMasterPage( m_strMasterPage);
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
-pXFStyleManager->SetFootnoteConfig(pFootnoteConfig);
-
+pXFStyleManager->SetFootnoteConfig(xFootnoteConfig.release());
 }
 
 /**
@@ -500,29 +499,29 @@ void LwpFootnoteOptions::RegisterFootnoteStyle()
  */
 void LwpFootnoteOptions::RegisterEndnoteStyle()
 {
-XFEndnoteConfig* pEndnoteConfig = new XFEndnoteConfig();
-pEndnoteConfig->SetStartValue(m_EndnoteDocNumbering.GetStartingNumber() 
-1);
+std::unique_ptr xEndnoteConfig(new XFEndnoteConfig);
+xEndnoteConfig->SetStartValue(m_EndnoteDocNumbering.GetStartingNumber() 
-1);
 OUString message = m_EndnoteDocNumbering.GetLeadingText();
 if(message.isEmpty())
 {
 message = "[";//default prefix
 }
-pEndnoteConfig->SetNumPrefix(message);
+xEndnoteConfig->SetNumPrefix(message);
 message = m_EndnoteDocNumbering.GetTrailingText();
 if(message.isEmpty())
 {
 message = "]";//default suffix
 }
-pEndnoteConfig->SetNumSuffix(message);
+xEndnoteConfig->SetNumSuffix(message);
 if(m_EndnoteDocNumbering.GetReset() == 
LwpFootnoteNumberOptions::RESET_PAGE)
 {
-pEndnoteConfig->SetRestartOnPage();
+xEndnoteConfig->SetRestartOnPage();
 }
 
-pEndnoteConfig->SetMasterPage( m_strMasterPage);
+xEndnoteConfig->SetMasterPage( m_strMasterPage);
 
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
-pXFStyleManager->SetEndnoteConfig(pEndnoteConfig);
+pXFStyleManager->SetEndnoteConfig(xEndnoteConfig.release());
 }
 
 /**
commit 637c71b0325d9422bf93f6b5076b025916725134
Author: Caolán McNamara 
Date:   Wed Mar 1 09:10:44 2017 +

coverity#1401593 Wrapper object use after free

Change-Id: I7fdaf527ffbe7d3d952c17c62707bb4a22b05f1d

diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx 
b/lotuswordpro/source/filter/lwppagelayout.cxx
index 45e1047..0856661 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -312,8 +312,7 @@ void LwpPageLayout::ParseFootNoteSeparator(XFPageMaster * 
pm1)
 */
 void LwpPageLayout::RegisterStyle()
 {
-std::unique_ptr xpm1(new XFPageMaster());
-m_pXFPageMaster = xpm1.get();
+std::unique_ptr xpm1(new XFPageMaster);
 
 ParseGeometry(xpm1.get());
 //Does not proc

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

[Stephan Bergmann]

 oox/source/vml/vmlshape.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 79d3c022394d6e07c1f4268f11233b9600ff4360
Author: Stephan Bergmann 
Date:   Wed Mar 1 09:50:34 2017 +0100

cid#1401592: bFlipX and bFlipY won't both be true

Change-Id: If5ab5d340166b5eedb97773a9907eee1b188027e

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 8def04f..b0e76de 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -18,6 +18,8 @@
  */
 
 #include 
+#include 
+
 #include 
 
 #include "oox/vml/vmlshape.hxx"
@@ -800,19 +802,17 @@ Reference< XShape > SimpleShape::implConvertAndInsert( 
const Reference< XShapes
 // The associated properties "PROP_MirroredX" and "PROP_MirroredY" 
have to be set here so that direction change will occur internally.
 if (bFlipX || bFlipY)
 {
-css::uno::Sequence< css::beans::PropertyValue > aPropSequence (
-bFlipX && bFlipY ? 2 : 1);
-int nPropertyIndex = 0;
+assert(!(bFlipX && bFlipY));
+css::uno::Sequence< css::beans::PropertyValue > aPropSequence (1);
 if (bFlipX)
 {
-aPropSequence [nPropertyIndex].Name = "MirroredX";
-aPropSequence [nPropertyIndex].Value <<= bFlipX;
-nPropertyIndex++;
+aPropSequence [0].Name = "MirroredX";
+aPropSequence [0].Value <<= bFlipX;
 }
-if (bFlipY)
+else
 {
-aPropSequence [nPropertyIndex].Name = "MirroredY";
-aPropSequence [nPropertyIndex].Value <<= bFlipY;
+aPropSequence [0].Name = "MirroredY";
+aPropSequence [0].Value <<= bFlipY;
 }
 aPropertySet.setAnyProperty(PROP_CustomShapeGeometry, makeAny( 
aPropSequence ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/i18nutil/searchopt.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2ec7457eec4535e81e4a32b48df5ab45d39476db
Author: Noel Grandin 
Date:   Wed Mar 1 10:27:12 2017 +0200

Blind fix for 64-bit Windows builds

Change-Id: Ica9e99fc363d8c7bfbc40dceb66ad350e5a02ce5

diff --git a/include/i18nutil/searchopt.hxx b/include/i18nutil/searchopt.hxx
index 5fc8b1a..13a3195 100644
--- a/include/i18nutil/searchopt.hxx
+++ b/include/i18nutil/searchopt.hxx
@@ -33,7 +33,7 @@ namespace i18nutil
  * This is a wrapper around com::sun::star::util::SearchOptions
  * but using the more type-safe TransliterationFlags enum.
  */
-struct I18NUTIL_DLLPUBLIC SAL_WARN_UNUSED SearchOptions {
+struct SAL_WARN_UNUSED SearchOptions {
 css::util::SearchAlgorithms algorithmType;
 sal_Int32 searchFlag;
 OUString searchString;
@@ -93,7 +93,7 @@ struct I18NUTIL_DLLPUBLIC SAL_WARN_UNUSED SearchOptions {
  * This is a wrapper around com::sun::star::util::SearchOptions and 
SearchOptions2,
  * but using the more type-safe TransliterationFlags enum.
  */
-struct I18NUTIL_DLLPUBLIC SAL_WARN_UNUSED SearchOptions2 : public 
SearchOptions {
+struct SAL_WARN_UNUSED SearchOptions2 : public SearchOptions {
 
 sal_Int16 AlgorithmType2;
 sal_Int32 WildcardEscapeCharacter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 i18npool/qa/cppunit/test_textsearch.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a176fddc5b952f4427f9700f6630ee3d84b1f72
Author: Stephan Bergmann 
Date:   Wed Mar 1 09:15:47 2017 +0100

Blind fix for 32-bit builds

Change-Id: I056fe8fb3e6b87ecae4e07f757c1a9588bbb1c06

diff --git a/i18npool/qa/cppunit/test_textsearch.cxx 
b/i18npool/qa/cppunit/test_textsearch.cxx
index 1118b5a..0f286a2 100644
--- a/i18npool/qa/cppunit/test_textsearch.cxx
+++ b/i18npool/qa/cppunit/test_textsearch.cxx
@@ -128,7 +128,7 @@ void TestTextSearch::testSearches()
 CPPUNIT_ASSERT_EQUAL( bStartRes, aRes.startOffset[0] );
 CPPUNIT_ASSERT_EQUAL( bEndRes, aRes.endOffset[0] );
 
-aOptions.transliterateFlags = (sal_Int32) 
(TransliterationFlags::IGNORE_CASE
+aOptions.transliterateFlags = (int) (TransliterationFlags::IGNORE_CASE
 | TransliterationFlags::IGNORE_WIDTH);
 aOptions.searchString = "([^ ]*)[ ]*([^ ]*)";
 m_xSearch->setOptions(aOptions);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits