date:20171229

Re: LibreOfficeLight / iOS

2017-12-29 Thread Jon Nermut

Thanks for the reply Jan.

My main point about BridgeLOKit was that you don't really need to add
another FFI on top of the existing LibreOfficeKit.h FFI.
Swift can import and use the existing _LibreOfficeKit /
_LibreOfficeKitClass and _LibreOfficeKitDocument /
_LibreOfficeKitDocumentClass structs and their functions just fine. Swift
actually has excellent C integration (and non-existent C++). To do so I
just added:

#define LOK_USE_UNSTABLE_API 1

#import "../../../include/LibreOfficeKit/LibreOfficeKit.h"

Into lokit-Bridging-Header.h, and the struct types mentioned above are
usable directly within Swift without anymore C needed
- LibreOfficeKitWrapper.swift is an example of using the functions from
these structs directly, and wrapping the C struct pointers in swift
classes, making them encapsulated and easier to use.
The exception being the lok_init functions, which need to be included and
called from within a C file.

>> The LIBRARY_SEARCH_PATH should be overwritten by the xcconfig file, but
I will need to check that.

Oh, I couldn't find it... where is it supposed to be generated to? I
changed the the path settings in LibreOfficeLight.xcodeproj like this:

- LIBRARY_SEARCH_PATHS = /Users/jani/LO/core/ios/generated/;
+ LIBRARY_SEARCH_PATHS = $PROJECT_DIR/../generated/;

I tried a few settings on the linking, couldn't make it better. Need to
find a way to work out what its doing... I'll have more of a play.
My suggestion is to split the C integration, and it's swift wrappers, into
a separate Framework project, and let that produce a dylib.
That should link pretty much instantly to the app, and should only rebuild
and link when the libreoffice lib changes, or the code in the Framework

Cheers

Jon


On Fri, Dec 29, 2017 at 6:38 PM, jan iversen  wrote:

> Hi
>
> adding dev list to reply, so that others might benefit from the info.
>
> Hope you don't mind the unsolicited email, I figured you were the guy to
>> talk to about this from the git commits.
>>
> I am working actively on creating a version of LO for the iPad.
>
> So I got it compiling via lode, with just a couple of hitches (had to
>> install libassuan, had to make sure to use the make out of lode, and there
>> is a hard coded LIBRARY_SEARCH_PATH to /Users/jani/... in the ios project
>> file)
>>
> I do not understand why you had to install extra libraries. I work on high
> sierra with xcode 9 and have not installed that library.
>
> The LIBRARY_SEARCH_PATH should be overwritten by the xcconfig file, but I
> will need to check that.
>
> There are 2 projects, but I assume you talk about the kit project?
>
>>
>> 1. The app doesnt actually attempt to render yet? Were you planning on
>> using CATiledLayer for that? I've used it a couple of times (for PDFs)...
>> it's fun
>>
>
> No it doesn’t. As you probably have seen the render function is near
> empty, I am strugling to find out what the tiled calls returns and how to
> use that in the swift app.
>
> 2. The static lib, and the compiled app, are pretty fat. (At least in
>> debug for the simulator - ~400mb, I havent tried the release build yet).
>> Too fat to embed in my app, it would have to be a separate app. Any insight
>> as to whether this could ever be cut down to a reasonable size?
>>
> Well is it actually quite reduced. LO is simply big.
>
> 3. The link time on the app is outrageously slow at the moment - at least
>> on my macbook pro - I guess this is related to the size and number of
>> symbols in the static lib. That's what the dummy.c file is all about? Needs
>> to be quarantined from the app somehow.  Perhaps by keeping it in a
>> Framework project? Or cutting down its size. I was too scared to turn on
>> LTO...
>>
> The link time is my biggest problem, linking the kit is a fraction of
> linking the app, and It seems to be the swift interface that is the problem.
>
> dummy.c is to link without the kit, and it is automatically quarantined,
> look in build phases, where you will see it is not being compiled.
>
> 4. Just wondering the reasoning for starting a new C interface into
>> LibreOfficeKit (eg BridgeLOkit_* )?
>>
> How else would you make a C/C++ interface for swift ?
>
> I had success in talking to the main LibreOfficeKit.h file directly from
>> swift by including it in the bridging file. Using it directly would take
>> away a lot of duplication needed to flesh out BridgeLOkit. Granted the main
>> C api isnt that friendly to use, but IMHO it would be better to do the
>> wrapping and making the API friendly on the Swift side, rather than another
>> layer of C, which then still needs swift friendly classes around it.
>> The main problem is with the way LibreOfficeKitInit works (which seems
>> weird...), for which I reused BridgeLOkit_Init and added a func to get
>> the pointer to kit out.
>> See the attached LibreOfficeKitWrapper.swift file - it has just a couple
>> wrapped functions done but you can see what I mean. Needs the rest filled
>> in and memory handling done.
>>
> Functions no

[Libreoffice-commits] core.git: filter/source include/rtl qadevOOo/tests xmloff/source

2017-12-29 Thread Andrea Gelmini

 filter/source/flash/swfexporter.cxx  |2 +-
 include/rtl/alloc.h  |2 +-
 qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java |2 +-
 xmloff/source/draw/ximpshap.cxx  |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 19e519593c940fbbf953b7d0ff6d7c86707f39e2
Author: Andrea Gelmini 
Date:   Fri Dec 29 00:42:06 2017 +0100

Fix typos

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

diff --git a/filter/source/flash/swfexporter.cxx 
b/filter/source/flash/swfexporter.cxx
index 7b796a5c4bed..8b923b750f66 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -180,7 +180,7 @@ bool FlashExporter::exportAll( const Reference< XComponent 
>& xDoc, Reference< X
 if ( xStatusIndicator.is() )
 xStatusIndicator->setValue( nPage );
 
-// #i56084# get current xDrawPage when not exporting selection; else 
alraedy set above
+// #i56084# get current xDrawPage when not exporting selection; else 
already set above
 if(!mbExportSelection)
 {
 xDrawPages->getByIndex(nPage) >>= xDrawPage;
diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h
index 83babccb9e70..9f8dfc1f992e 100644
--- a/include/rtl/alloc.h
+++ b/include/rtl/alloc.h
@@ -294,7 +294,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_cache_free (
  * This is used to control the pre-init logic
  * in rtl_alloc_preInit. The reason for this is
  * to first initialize all caching and other memory
- * logic from WSD (the Online demaon) at startup.
+ * logic from WSD (the Online daemon) at startup.
  * All these pages will then be forked over when
  * spawning per-document instances. This is done
  * by calling rtl_alloc_preInit with rtlAllocPreInitStart.
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java 
b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
index 49fe7107ffdf..884fb27afb8d 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
@@ -188,7 +188,7 @@ public class _XMultiPropertyStates extends MultiMethodTest {
log.println("Ignore Runtime Exception: " + e.getMessage());
}
 log.println("Checking that all properties are now in DEFAULT state" +
-" excepting may be those which 'cann't be default'");
+" excepting may be those which 'can't be default'");
 
 try {
 states = oObj.getPropertyStates(names);
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 2f4f873a9cf4..9061d9f2583e 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3701,7 +3701,7 @@ void SdXMLCustomShapeContext::StartElement( const 
uno::Reference< xml::sax::XAtt
 
 void SdXMLCustomShapeContext::EndElement()
 {
-// for backward compatibility, the above SetTransformation() may alraedy 
have
+// for backward compatibility, the above SetTransformation() may already 
have
 // applied a call to SetMirroredX/SetMirroredY. This is not yet added to 
the
 // beans::PropertyValues in maCustomShapeGeometry. When applying these 
now, this
 // would be lost again.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source connectivity/source cui/source filter/source framework/inc framework/qa framework/source include/svtools include/xmloff odk/examples sc/source sfx2/source

2017-12-29 Thread Andrea Gelmini

 basic/source/comp/parser.cxx   |2 +-
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +-
 cui/source/inc/acccfg.hxx  |4 ++--
 filter/source/config/cache/filtercache.cxx |6 +++---
 filter/source/config/cache/filtercache.hxx |6 +++---
 filter/source/config/cache/typedetection.cxx   |4 ++--
 framework/inc/classes/framecontainer.hxx   |2 +-
 framework/qa/complex/framework/autosave/Protocol.java  |2 +-
 framework/source/helper/persistentwindowstate.cxx  |2 +-
 framework/source/services/frame.cxx|2 +-
 include/svtools/transfer.hxx   |2 +-
 include/xmloff/xmlnume.hxx |2 +-
 odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx  |2 +-
 sc/source/ui/vba/vbaborders.cxx|2 +-
 sc/source/ui/vba/vbapagebreaks.cxx |4 ++--
 sc/source/ui/vba/vbarange.cxx  |2 +-
 sfx2/source/doc/objcont.cxx|8 
 sw/source/core/unocore/unodraw.cxx |4 ++--
 sw/source/core/view/printdata.cxx  |2 +-
 sw/source/filter/ww8/ww8scan.cxx   |2 +-
 sw/source/ui/vba/vbaborders.cxx|2 +-
 vcl/headless/svpinst.cxx   |2 +-
 22 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit d0222ba1fd7617b793e1e513247b11a82eb22f4e
Author: Andrea Gelmini 
Date:   Fri Dec 29 00:31:05 2017 +0100

Fix typos

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

diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 7d08a99b511e..ff16b016f154 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -605,7 +605,7 @@ void SbiParser::Set()
 // It's a good idea to distinguish between
 // set something = another &
 // something = another
-// ( its necessary for vba objects where set is object
+// ( it's necessary for vba objects where set is object
 // specific and also doesn't involve processing default params )
 if( pDef->GetTypeId() )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 7c440d7eb334..906ce288c1bb 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1314,7 +1314,7 @@ sal_Int32 typeNameToDataType( const OUString &typeName, 
const OUString &typtype
 // the user is better of with interpreting arrays as strings !
 // if( typeName.getLength() && '_' == typeName[0] )
 // {
-// its just a naming convention, but as long as we don't have 
anything better,
+// it's just a naming convention, but as long as we don't have 
anything better,
 // we take it as granted
 // ret = css::sdbc::DataType::ARRAY;
 // }
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 34414c09f559..20e37f0ce1bb 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -80,8 +80,8 @@ struct TAccInfo
  const vcl::KeyCode& aKey )
 : m_nKeyPos(nKeyPos  )
 , m_nListPos   (nListPos )
-, m_bIsConfigurable(true ) /**< its important to set sal_True as 
default -
-because only fix entries will 
be disabled later ... */
+, m_bIsConfigurable(true ) /**< it's important to set true as 
default -
+because only fix entries will 
be disabled later... */
 , m_sCommand   ( )
 , m_aKey   (aKey )
 {}
diff --git a/filter/source/config/cache/filtercache.cxx 
b/filter/source/config/cache/filtercache.cxx
index 6b97bda29bb2..79af348702e0 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1579,10 +1579,10 @@ CacheItem FilterCache::impl_loadItem(const 
css::uno::Reference< css::container::
  css::uno::Reference< 
css::uno::XInterface >());
 }
 
-// set too. Of course its already used as key into the e.g. outside
-// used hash map ... but some of our API methods provide
+// set too. Of course it's already used as key into the e.g. outside
+// used hash map... but some of our API methods p

[Libreoffice-commits] core.git: codemaker/source connectivity/source dbaccess/source editeng/source filter/source framework/inc framework/source hwpfilter/source include/rtl include/sfx2 include/svx q

2017-12-29 Thread Andrea Gelmini

 codemaker/source/cppumaker/dependencies.hxx |2 -
 connectivity/source/inc/file/FTable.hxx |2 -
 dbaccess/source/ui/misc/UITools.cxx |2 -
 editeng/source/editeng/editdoc.cxx  |2 -
 filter/source/xslt/import/wordml/wordml2ooo_draw.xsl|   12 
+-
 filter/source/xslt/import/wordml/wordml2ooo_path.xsl|2 -
 framework/inc/jobs/configaccess.hxx |2 -
 framework/inc/jobs/job.hxx  |2 -
 framework/source/inc/loadenv/loadenvexception.hxx   |2 -
 hwpfilter/source/hbox.h |2 -
 include/rtl/uuid.h  |2 -
 include/sfx2/docmacromode.hxx   |2 -
 include/svx/fmdpage.hxx |2 -
 qadevOOo/tests/java/ifc/awt/_XWindow.java   |2 -
 qadevOOo/tests/java/ifc/container/_XContainer.java  |2 -
 qadevOOo/tests/java/ifc/document/_XFilter.java  |2 -
 qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java   |2 -
 qadevOOo/tests/java/ifc/frame/_XFrame.java  |2 -
 qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java  |2 -
 qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java |2 -
 qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java  |4 +--
 qadevOOo/tests/java/ifc/view/_XPrintable.java   |2 -
 qadevOOo/tests/java/mod/_dbaccess/ORowSet.java  |2 -
 qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java |2 -
 qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java |2 -
 sc/qa/complex/dataPilot/_XDataPilotDescriptor.java  |2 -
 sc/source/core/tool/interpr5.cxx|2 -
 sd/xsl/effect.xsl   |2 -
 svtools/source/table/gridtablerenderer.cxx  |2 -
 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx  |2 -
 sw/source/core/edit/edattr.cxx  |4 +--
 sw/source/core/txtnode/thints.cxx   |2 -
 sw/source/filter/html/htmltab.cxx   |2 -
 sw/source/filter/ww8/ww8atr.cxx |4 +--
 sw/source/filter/ww8/ww8struc.hxx   |2 -
 sw/source/ui/dbui/mmgreetingspage.cxx   |2 -
 36 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit a2ef65b09da20aa1d0c15b883a58056df2dbad6b
Author: Andrea Gelmini 
Date:   Fri Dec 29 00:35:10 2017 +0100

Fix typos

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

diff --git a/codemaker/source/cppumaker/dependencies.hxx 
b/codemaker/source/cppumaker/dependencies.hxx
index b74ae489d076..718dac392c87 100644
--- a/codemaker/source/cppumaker/dependencies.hxx
+++ b/codemaker/source/cppumaker/dependencies.hxx
@@ -34,7 +34,7 @@ class TypeManager;
 namespace codemaker { namespace cppumaker {
 
 /**
-   A simple class to track which other entites a given entity depends on.
+   A simple class to track which other entities a given entity depends on.
 
This class is not multi-thread–safe.
  */
diff --git a/connectivity/source/inc/file/FTable.hxx 
b/connectivity/source/inc/file/FTable.hxx
index 3a234674b620..a13437a052fd 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -44,7 +44,7 @@ namespace connectivity
 sal_Int32   m_nFilePos;
 // current IResultSetHelper::Movement
 sal_uInt8*  m_pBuffer;
 sal_uInt16  m_nBufferSize; 
 // size of the ReadBuffer, if pBuffer != NULL
-boolm_bWriteable;   // 
svstream cann't say if we are writeable
+boolm_bWriteable;   // 
svstream can't say if we are writeable

 // so we have to
 
 virtual void FileClose();
diff --git a/dbaccess/source/ui/misc/UITools.cxx 
b/dbaccess/source/ui/misc/UITools.cxx
index cc7eb2c97f78..ee94235457fb 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1126,7 +1126,7 @@ TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& 
_rTypeInfo)
 if ( !pTypeInfo.get() ) // just a fallback
 pTypeInfo = queryTypeInfoByType(DataType::VARCHAR,_rTypeInfo);
 
-OSL_ENSUR

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

2017-12-29 Thread andreas kainz

 icon-themes/elementary/links.txt |4 
 icon-themes/elementary/svx/res/fr01.png  |binary
 icon-themes/elementary/svx/res/fr010.png |binary
 icon-themes/elementary/svx/res/fr011.png |binary
 icon-themes/elementary/svx/res/fr012.png |binary
 icon-themes/elementary/svx/res/fr02.png  |binary
 icon-themes/elementary/svx/res/fr03.png  |binary
 icon-themes/elementary/svx/res/fr04.png  |binary
 icon-themes/elementary/svx/res/fr05.png  |binary
 icon-themes/elementary/svx/res/fr06.png  |binary
 icon-themes/elementary/svx/res/fr07.png  |binary
 icon-themes/elementary/svx/res/fr08.png  |binary
 icon-themes/elementary/svx/res/fr09.png  |binary
 icon-themes/elementary_svg/links.txt |4 
 icon-themes/elementary_svg/svx/res/fr01.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr010.svg |2 +-
 icon-themes/elementary_svg/svx/res/fr011.svg |2 +-
 icon-themes/elementary_svg/svx/res/fr012.svg |2 +-
 icon-themes/elementary_svg/svx/res/fr02.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr03.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr04.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr05.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr06.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr07.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr08.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr09.svg  |2 +-
 26 files changed, 12 insertions(+), 20 deletions(-)

New commits:
commit a1ccac19ab1bc616262ed3a5f7511f258c3e2aa8
Author: andreas kainz 
Date:   Fri Dec 29 00:56:44 2017 +0100

Elementary-icons: fix table border icons

Change-Id: Ibe60237bfaf60773289525e987faeef3bf83d12c
Reviewed-on: https://gerrit.libreoffice.org/47162
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index c2c376ed2404..c074cb207642 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -401,10 +401,6 @@ cmd/sc_recundo.png cmd/sc_undo.png
 cmd/lc_bezieredge.png cmd/lc_bezierappend.png
 cmd/sc_bezieredge.png cmd/sc_bezierappend.png
 
-# Frame
-cmd/lc_setborderstyle.png cmd/lc_diagramarea.png
-cmd/sc_setborderstyle.png cmd/sc_diagramarea.png
-
 # Label
 cmd/lc_definename.png cmd/lc_label.png
 cmd/sc_definename.png cmd/sc_label.png
diff --git a/icon-themes/elementary/svx/res/fr01.png 
b/icon-themes/elementary/svx/res/fr01.png
index a1fd221e00e3..65d0ec142091 100644
Binary files a/icon-themes/elementary/svx/res/fr01.png and 
b/icon-themes/elementary/svx/res/fr01.png differ
diff --git a/icon-themes/elementary/svx/res/fr010.png 
b/icon-themes/elementary/svx/res/fr010.png
index c20ce4674ff8..32d91570ba36 100644
Binary files a/icon-themes/elementary/svx/res/fr010.png and 
b/icon-themes/elementary/svx/res/fr010.png differ
diff --git a/icon-themes/elementary/svx/res/fr011.png 
b/icon-themes/elementary/svx/res/fr011.png
index cf9056130bf4..482a9a923041 100644
Binary files a/icon-themes/elementary/svx/res/fr011.png and 
b/icon-themes/elementary/svx/res/fr011.png differ
diff --git a/icon-themes/elementary/svx/res/fr012.png 
b/icon-themes/elementary/svx/res/fr012.png
index 414ebd7fd4df..428e1b2fd1c5 100644
Binary files a/icon-themes/elementary/svx/res/fr012.png and 
b/icon-themes/elementary/svx/res/fr012.png differ
diff --git a/icon-themes/elementary/svx/res/fr02.png 
b/icon-themes/elementary/svx/res/fr02.png
index de18ebb53aa1..32e974c54af2 100644
Binary files a/icon-themes/elementary/svx/res/fr02.png and 
b/icon-themes/elementary/svx/res/fr02.png differ
diff --git a/icon-themes/elementary/svx/res/fr03.png 
b/icon-themes/elementary/svx/res/fr03.png
index 4f5919197c4d..fadf3d5638a3 100644
Binary files a/icon-themes/elementary/svx/res/fr03.png and 
b/icon-themes/elementary/svx/res/fr03.png differ
diff --git a/icon-themes/elementary/svx/res/fr04.png 
b/icon-themes/elementary/svx/res/fr04.png
index 9b6a5f249f42..0f09d3bf2435 100644
Binary files a/icon-themes/elementary/svx/res/fr04.png and 
b/icon-themes/elementary/svx/res/fr04.png differ
diff --git a/icon-themes/elementary/svx/res/fr05.png 
b/icon-themes/elementary/svx/res/fr05.png
index 56b8840cdd2e..a473f47b493e 100644
Binary files a/icon-themes/elementary/svx/res/fr05.png and 
b/icon-themes/elementary/svx/res/fr05.png differ
diff --git a/icon-themes/elementary/svx/res/fr06.png 
b/icon-themes/elementary/svx/res/fr06.png
index af3e7b7c0c62..ae8661e2c3f4 100644
Binary files a/icon-themes/elementary/svx/res/fr06.png and 
b/icon-themes/elementary/svx/res/fr06.png differ
diff --git a/icon-themes/elementary/svx/res/fr07.png 
b/icon-themes/elementary/svx/res/fr07.png
index b9516ca440bd..4d57a840be08 100644
Binary files a/icon-themes/elementary/svx/res/fr07.png and 
b/icon-themes/elementary/svx/res/fr07.png differ
diff --git a/icon-themes/elementary/svx/res/fr08.png 
b/icon-themes/elementary/svx/res/fr08.png
index afc89c639f47..1750428fc34b 100644
Binary files a/ico

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/elementary icon-themes/elementary_svg

2017-12-29 Thread andreas kainz

 icon-themes/elementary/cmd/sc_editglossary.png |binary
 icon-themes/elementary/links.txt   |   14 +-
 icon-themes/elementary_svg/cmd/sc_editglossary.svg |1 +
 icon-themes/elementary_svg/links.txt   |   14 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 707dfc5f45533164afcae4a444c81a3ae9d38ccf
Author: andreas kainz 
Date:   Fri Dec 29 00:10:11 2017 +0100

Elementary-Icons: update links for writer menue

Change-Id: Ifa487bd055b4a3cef9bf8c9b9f0f7d40f3fc0417
Reviewed-on: https://gerrit.libreoffice.org/47160
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 
(cherry picked from commit 367b10fb833aa854c2c52c91757c40bdd10be97d)
Reviewed-on: https://gerrit.libreoffice.org/47163

diff --git a/icon-themes/elementary/cmd/sc_editglossary.png 
b/icon-themes/elementary/cmd/sc_editglossary.png
new file mode 100644
index ..a3dc0c1a1354
Binary files /dev/null and b/icon-themes/elementary/cmd/sc_editglossary.png 
differ
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index eb18ba561b9f..c2c376ed2404 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -73,6 +73,7 @@ cmd/lc_insertrowbreak.png cmd/lc_insertpagebreak.png
 cmd/lc_insertrowsbefore.png cmd/lc_insertrows.png
 cmd/lc_insertspreadsheet.png cmd/lc_togglesheetgrid.png
 cmd/lc_inserttimefield.png cmd/lc_timefield.png
+cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
 
 cmd/sc_insobjctrl.png cmd/sc_newdoc.png
 cmd/sc_insert.png cmd/sc_togglesheetgrid.png
@@ -112,7 +113,7 @@ cmd/sc_inserttimefield.png cmd/sc_timefield.png
 cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
 cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
 cmd/sc_tracechangemode.png cmd/sc_trackchanges.png
-cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
+cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png
 
 # Zoom
 cmd/lc_previewzoom.png cmd/lc_zoomprevious.png
@@ -276,6 +277,8 @@ cmd/sc_basicshapes.circle-pie.png cmd/sc_pie.png
 cmd/sc_flowchartshapes.flowchart-merge.png 
cmd/sc_fontworkshapetype.fontwork-triangle-down.png
 cmd/sc_fontworkshapetype.fontwork-fade-down.png 
cmd/sc_basicshapes.trapezoid.png
 cmd/sc_flowchartshapes.flowchart-magnetic-disk.png cmd/sc_basicshapes.can.png
+cmd/sc_shapesmenu.png cmd/sc_basicshapes.round-quadrat.png
+cmd/sc_shapeslinemenu.png cmd/sc_line.png
 
 # Open
 cmd/lc_openfromwriter.png cmd/lc_open.png
@@ -378,6 +381,13 @@ cmd/sc_romanliststyle.png cmd/sc_defaultnumbering.png
 cmd/lc_defaultparastyle.png cmd/lc_controlcodes.png
 cmd/sc_defaultparastyle.png cmd/sc_controlcodes.png
 
+# Format
+cmd/sc_formattextmenu.png cmd/sc_bold.png
+cmd/sc_formatspacingmenu.png cmd/sc_paraspaceincrease.png
+cmd/sc_textalign.png cmd/sc_alignleft.png
+cmd/sc_formatbulletsmenu.png cmd/sc_defaultbullet.png
+cmd/sc_formatframemenu.png cmd/sc_chainframes.png
+
 # Group
 cmd/lc_leaveallgroups.png cmd/lc_leavegroup.png
 cmd/sc_leaveallgroups.png cmd/sc_leavegroup.png
@@ -701,6 +711,8 @@ cmd/sc_presentation.png cmd/sc_dia.png
 # Style
 cmd/lc_editstyled.png cmd/lc_editstyle.png
 cmd/sc_editstyled.png cmd/sc_editstyle.png
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
 
 # Outline
 cmd/lc_outlineright.png cmd/lc_decrementlevel.png
diff --git a/icon-themes/elementary_svg/cmd/sc_editglossary.svg 
b/icon-themes/elementary_svg/cmd/sc_editglossary.svg
new file mode 100644
index ..cf51ae935cef
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/sc_editglossary.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/links.txt 
b/icon-themes/elementary_svg/links.txt
index adcfe8fd4f11..67aef15fc03d 100644
--- a/icon-themes/elementary_svg/links.txt
+++ b/icon-themes/elementary_svg/links.txt
@@ -73,6 +73,7 @@ cmd/lc_insertrowbreak.svg cmd/lc_insertpagebreak.svg
 cmd/lc_insertrowsbefore.svg cmd/lc_insertrows.svg
 cmd/lc_insertspreadsheet.svg cmd/lc_togglesheetgrid.svg
 cmd/lc_inserttimefield.svg cmd/lc_timefield.svg
+cmd/lc_tracechangemode.svg cmd/lc_trackchanges.svg
 
 cmd/sc_insobjctrl.svg cmd/sc_newdoc.svg
 cmd/sc_insert.svg cmd/sc_togglesheetgrid.svg
@@ -112,7 +113,7 @@ cmd/sc_inserttimefield.svg cmd/sc_timefield.svg
 cmd/sc_showtrackedchanges.svg cmd/sc_addwatch.svg
 cmd/lc_showtrackedchanges.svg cmd/lc_addwatch.svg
 cmd/sc_tracechangemode.svg cmd/sc_trackchanges.svg
-cmd/lc_tracechangemode.svg cmd/lc_trackchanges.svg
+cmd/sc_numberformatmenu.svg cmd/sc_numberformatstandard.svg
 
 # Zoom
 cmd/lc_previewzoom.svg cmd/lc_zoomprevious.svg
@@ -276,6 +277,8 @@ cmd/sc_basicshapes.circle-pie.svg cmd/sc_pie.svg
 cmd/sc_flowchartshapes.flowchart-merge.svg 
cmd/sc_fontworkshapetype.fontwork-triangle-down.svg
 cmd/sc_fontworkshapetype.fontwork-fade-down.svg 
cmd/sc_basicshapes.trapezoid.svg
 cmd/sc_flowchartshapes.flowchart-ma

[Libreoffice-commits] core.git: basegfx/source include/basegfx slideshow/source xmlhelp/source

2017-12-29 Thread Noel Grandin

 basegfx/source/polygon/b3dpolygon.cxx|2 +-
 include/basegfx/polygon/b3dpolygon.hxx   |2 +-
 slideshow/source/engine/animationnodes/animationbasenode.cxx |2 +-
 slideshow/source/engine/animationnodes/animationbasenode.hxx |2 +-
 slideshow/source/engine/opengl/TransitionerImpl.cxx  |2 +-
 slideshow/source/engine/slide/userpaintoverlay.cxx   |2 +-
 slideshow/source/engine/slide/userpaintoverlay.hxx   |2 +-
 slideshow/source/engine/smilfunctionparser.cxx   |4 ++--
 slideshow/source/inc/smilfunctionparser.hxx  |4 ++--
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |2 +-
 xmlhelp/source/cxxhelp/provider/urlparameter.hxx |2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit e21ae87458b0b6e0ad4cc9b41ed02fc8b6a20736
Author: Noel Grandin 
Date:   Fri Dec 29 09:20:44 2017 +0200

loplugin:passstuffbyref improved return in xmlhelp,slideshow

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

diff --git a/basegfx/source/polygon/b3dpolygon.cxx 
b/basegfx/source/polygon/b3dpolygon.cxx
index d28d31c7f2d8..ed564228e0fb 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -1548,7 +1548,7 @@ namespace basegfx
 mpPolygon->clearBColors();
 }
 
-B3DVector B3DPolygon::getNormal() const
+B3DVector const & B3DPolygon::getNormal() const
 {
 return mpPolygon->getNormal();
 }
diff --git a/include/basegfx/polygon/b3dpolygon.hxx 
b/include/basegfx/polygon/b3dpolygon.hxx
index 765762730f20..1d3dd515b757 100644
--- a/include/basegfx/polygon/b3dpolygon.hxx
+++ b/include/basegfx/polygon/b3dpolygon.hxx
@@ -79,7 +79,7 @@ namespace basegfx
 void clearBColors();
 
 // Normals interface
-B3DVector getNormal() const; // plane normal
+B3DVector const & getNormal() const; // plane normal
 B3DVector getNormal(sal_uInt32 nIndex) const; // normal in each point
 void setNormal(sal_uInt32 nIndex, const B3DVector& rValue);
 void transformNormals(const B3DHomMatrix& rMatrix);
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx 
b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 678c4a51a9ff..6c7eebed0ad1 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -465,7 +465,7 @@ AnimationBaseNode::fillCommonParameters() const
 getSlideSize());
 }
 
-AttributableShapeSharedPtr AnimationBaseNode::getShape() const
+AttributableShapeSharedPtr const & AnimationBaseNode::getShape() const
 {
 // any subsetting at all?
 if (mpShapeSubset)
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx 
b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index d2c03a4ec4d3..84b3d5a82b5e 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -56,7 +56,7 @@ protected:
 /// Create parameter struct for ActivitiesFactory
 ActivitiesFactory::CommonParameters fillCommonParameters() const;
 ::basegfx::B2DVector const& getSlideSize() const { return 
maSlideSize; }
-AttributableShapeSharedPtr  getShape() const;
+AttributableShapeSharedPtr const &  getShape() const;
 
 private:
 virtual bool hasPendingAnimation() const override;
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx 
b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index f8018c0275e6..8e21e6768616 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -808,7 +808,7 @@ namespace
 }
 };
 
-uno::Reference
+uno::Reference const &
 getOGLColorSpace()
 {
 return OGLColorSpaceHolder::get();
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx 
b/slideshow/source/engine/slide/userpaintoverlay.cxx
index f1a1789ad8c9..096efe6b1284 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -468,7 +468,7 @@ namespace slideshow
 mrMultiplexer.addUserPaintHandler(mpHandler);
 }
 
-PolyPolygonVector UserPaintOverlay::getPolygons()
+PolyPolygonVector const & UserPaintOverlay::getPolygons()
 {
 return mpHandler->getPolygons();
 }
diff --git a/slideshow/source/engine/slide/userpaintoverlay.hxx 
b/slideshow/source/engine/slide/userpaintoverlay.hxx
index 4c2e16288c88..3dc6fa976a7f 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.hxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.hxx
@@ -65,7 +65,7 @@ namespace slidesho

[Libreoffice-commits] core.git: helpcontent2

2017-12-29 Thread Ilmari Lauhakangas

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

New commits:
commit 4475ffbdaec9353ba01b6e4a39420d81c562d5d9
Author: Ilmari Lauhakangas 
Date:   Thu Dec 28 16:05:43 2017 +0200

Updated core
Project: help  50b850013374e0f711b5cded92739934d758bf1f

tdf#114709, tdf#112758, tdf#112757

Lots of changes and tweaks.
Header and footer now span 100% width even on desktop.
Font sizes were increased and content area made narrower.
We now have two separate language menus so the menu is
always visible on mobile.
Google search moved out of the accordion panel.
Accordion panel colours made darker.
On desktop, expanded accordion panels overlap content.

Change-Id: I976a67b1ca0cb2d21f0569da8d1fefd2b589d7d3
Reviewed-on: https://gerrit.libreoffice.org/47139
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index dfdc1f55f63d..50b850013374 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dfdc1f55f63d4497e6bd5fa5793ba8b57d6a78fc
+Subproject commit 50b850013374e0f711b5cded92739934d758bf1f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help.js help3xsl/localized.xsl help3xsl/online_transform.xsl

2017-12-29 Thread Ilmari Lauhakangas

 help3xsl/default.css  |  135 ++--
 help3xsl/help.js  |   16 -
 help3xsl/localized.xsl|   41 
 help3xsl/online_transform.xsl |  349 +-
 4 files changed, 304 insertions(+), 237 deletions(-)

New commits:
commit 50b850013374e0f711b5cded92739934d758bf1f
Author: Ilmari Lauhakangas 
Date:   Thu Dec 28 16:05:43 2017 +0200

tdf#114709, tdf#112758, tdf#112757

Lots of changes and tweaks.
Header and footer now span 100% width even on desktop.
Font sizes were increased and content area made narrower.
We now have two separate language menus so the menu is
always visible on mobile.
Google search moved out of the accordion panel.
Accordion panel colours made darker.
On desktop, expanded accordion panels overlap content.

Change-Id: I976a67b1ca0cb2d21f0569da8d1fefd2b589d7d3
Reviewed-on: https://gerrit.libreoffice.org/47139
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index f4ee3273f..268b1ac4d 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -92,7 +92,7 @@ h6 {
 }
 p,
 td {
-font-size: 11pt;
+font-size: 14pt;
 margin: 2px 2px 2px 2px;
 }
 h1 {
@@ -102,15 +102,15 @@ h1 {
 padding-bottom: 6px;
 }
 h2 {
-font-size: 14pt;
+font-size: 18pt;
 }
 h3 {
-font-size: 12pt;
+font-size: 16pt;
 }
 h4,
 h5,
 h6 {
-font-size: 11pt;
+font-size: 14pt;
 }
 .avis {
 /*background-color: #EE;*/
@@ -191,6 +191,7 @@ h6 {
 overflow: auto;
 padding: 10px;
 grid-area: main;
+margin-bottom: 50px;
 }
 .mediabutton {
 background-color: cyan;
@@ -211,21 +212,20 @@ header {
 color: #fff;
 height: 4em;
 padding: .5em .5em .5em 1em;
-flex-wrap: wrap;
-justify-content: space-between;
 grid-area: header;
 }
+.logo-menu-container {
+display: flex;
+justify-content: space-between;
+}
 .logo {
-flex-shrink: 0;
 color: #fff;
 text-decoration: none;
-float: left;
-width: 190px;
+display: flex;
+align-items: flex-end;
 }
 .logo p {
 font-size: 1.5em;
-width: 130px;
-float: left;
 }
 .logo .symbol {
 background-image: url(media/navigation/libo-symbol-white.svg);
@@ -233,20 +233,19 @@ header {
 background-size: contain;
 width: 3em;
 height: 3.7em;
-float: left;
 margin-right: .5em;
 }
 header nav {
 margin-top: .7em;
 padding: 0;
 display: none;
-border: 1px solid;
+border: 1px solid #333;
 position: relative;
 }
 /* Create a style for the first level items */
 
-header nav a {
-color: #33;
+header nav a, .mobile-lang a {
+color: #333;
 background-color: #EE;
 display: block;
 line-height: 1.5em;
@@ -255,14 +254,14 @@ header nav a {
 font-weight: bold;
 border-width: 0 1px 0 0;
 border-style: solid;
-border-color: #33;
+border-color: #333;
 font-size: 1.5em;
 flex-shrink: 0;
 z-index: 100;
 white-space: nowrap;
 }
 
-header nav a:last-child {
+header nav a:last-child, .mobile-lang a:last-child {
 border-right-width: 0;
 }
 
@@ -272,21 +271,34 @@ header label {
 position: relative;
 top: 2em;
 float: right;
+display: none;
 }
 header input[type="checkbox"]:checked ~ nav {
 background: #f1f1f1;
-color: #444;
+color: #333;
 z-index: 100;
-/* line them up horizontally */
+display: none;
+/* allow for scrolling */
+
+overflow-x: auto;
+/* make it smooth on iOS */
 
+-webkit-overflow-scrolling: touch;
+clear: both;
+text-align: center;
+}
+.mobile-lang {
+background: #f1f1f1;
+color: #333;
+border: 1px solid #333;
+z-index: 100;
+/* line them up horizontally */
 display: flex;
 flex-direction: row;
 /* allow for scrolling */
-
 overflow-x: auto;
 overflow-y: hidden;
 /* make it smooth on iOS */
-
 -webkit-overflow-scrolling: touch;
 clear: both;
 text-align: center;
@@ -298,6 +310,9 @@ footer {
 text-align: center;
 grid-area: footer;
 }
+footer .headerfooter-center {
+margin-top: 20px;
+}
 footer a {
 color: #c2f6ba;
 }
@@ -343,9 +358,17 @@ footer a {
 list-style-type: none;
 grid-area: accordion;
 }
+.acc-panel {
+z-index: 10;
+}
 .acc-panel > div {
 display: none;
 }
+.gsc-control-cse {
+border-color: transparent !important;
+background-color: transparent !important;
+padding: 3px 0 0 0 !important;
+}
 header input[type=checkbox],
 .contents-treeview input[type=checkbox] {
 position: absolute;
@@ -355,7 +378,7 @@ header input[type=checkbox],
 display: none;
 }
 .acc-panel > label {
-color: #666;
+color: #333;
 cursor: pointer;
 display: block;
 font-size: 1em;
@@ -364,32 +387,27 @@ header input[type=checkbox],
 padding: 0 1.5em;
 text-align: center;
 }
-.acc-panel:nth-of-type(1) > label

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/elementary icon-themes/elementary_svg

2017-12-29 Thread andreas kainz

 icon-themes/elementary/links.txt |4 
 icon-themes/elementary/svx/res/fr01.png  |binary
 icon-themes/elementary/svx/res/fr010.png |binary
 icon-themes/elementary/svx/res/fr011.png |binary
 icon-themes/elementary/svx/res/fr012.png |binary
 icon-themes/elementary/svx/res/fr02.png  |binary
 icon-themes/elementary/svx/res/fr03.png  |binary
 icon-themes/elementary/svx/res/fr04.png  |binary
 icon-themes/elementary/svx/res/fr05.png  |binary
 icon-themes/elementary/svx/res/fr06.png  |binary
 icon-themes/elementary/svx/res/fr07.png  |binary
 icon-themes/elementary/svx/res/fr08.png  |binary
 icon-themes/elementary/svx/res/fr09.png  |binary
 icon-themes/elementary_svg/links.txt |4 
 icon-themes/elementary_svg/svx/res/fr01.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr010.svg |2 +-
 icon-themes/elementary_svg/svx/res/fr011.svg |2 +-
 icon-themes/elementary_svg/svx/res/fr012.svg |2 +-
 icon-themes/elementary_svg/svx/res/fr02.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr03.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr04.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr05.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr06.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr07.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr08.svg  |2 +-
 icon-themes/elementary_svg/svx/res/fr09.svg  |2 +-
 26 files changed, 12 insertions(+), 20 deletions(-)

New commits:
commit 131075771a730104ebe5a485d137fcc0e76bd60a
Author: andreas kainz 
Date:   Fri Dec 29 00:56:44 2017 +0100

Elementary-icons: fix table border icons

Change-Id: Ibe60237bfaf60773289525e987faeef3bf83d12c
Reviewed-on: https://gerrit.libreoffice.org/47162
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 
(cherry picked from commit a1ccac19ab1bc616262ed3a5f7511f258c3e2aa8)
Reviewed-on: https://gerrit.libreoffice.org/47166

diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index c2c376ed2404..c074cb207642 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -401,10 +401,6 @@ cmd/sc_recundo.png cmd/sc_undo.png
 cmd/lc_bezieredge.png cmd/lc_bezierappend.png
 cmd/sc_bezieredge.png cmd/sc_bezierappend.png
 
-# Frame
-cmd/lc_setborderstyle.png cmd/lc_diagramarea.png
-cmd/sc_setborderstyle.png cmd/sc_diagramarea.png
-
 # Label
 cmd/lc_definename.png cmd/lc_label.png
 cmd/sc_definename.png cmd/sc_label.png
diff --git a/icon-themes/elementary/svx/res/fr01.png 
b/icon-themes/elementary/svx/res/fr01.png
index a1fd221e00e3..65d0ec142091 100644
Binary files a/icon-themes/elementary/svx/res/fr01.png and 
b/icon-themes/elementary/svx/res/fr01.png differ
diff --git a/icon-themes/elementary/svx/res/fr010.png 
b/icon-themes/elementary/svx/res/fr010.png
index c20ce4674ff8..32d91570ba36 100644
Binary files a/icon-themes/elementary/svx/res/fr010.png and 
b/icon-themes/elementary/svx/res/fr010.png differ
diff --git a/icon-themes/elementary/svx/res/fr011.png 
b/icon-themes/elementary/svx/res/fr011.png
index cf9056130bf4..482a9a923041 100644
Binary files a/icon-themes/elementary/svx/res/fr011.png and 
b/icon-themes/elementary/svx/res/fr011.png differ
diff --git a/icon-themes/elementary/svx/res/fr012.png 
b/icon-themes/elementary/svx/res/fr012.png
index 414ebd7fd4df..428e1b2fd1c5 100644
Binary files a/icon-themes/elementary/svx/res/fr012.png and 
b/icon-themes/elementary/svx/res/fr012.png differ
diff --git a/icon-themes/elementary/svx/res/fr02.png 
b/icon-themes/elementary/svx/res/fr02.png
index de18ebb53aa1..32e974c54af2 100644
Binary files a/icon-themes/elementary/svx/res/fr02.png and 
b/icon-themes/elementary/svx/res/fr02.png differ
diff --git a/icon-themes/elementary/svx/res/fr03.png 
b/icon-themes/elementary/svx/res/fr03.png
index 4f5919197c4d..fadf3d5638a3 100644
Binary files a/icon-themes/elementary/svx/res/fr03.png and 
b/icon-themes/elementary/svx/res/fr03.png differ
diff --git a/icon-themes/elementary/svx/res/fr04.png 
b/icon-themes/elementary/svx/res/fr04.png
index 9b6a5f249f42..0f09d3bf2435 100644
Binary files a/icon-themes/elementary/svx/res/fr04.png and 
b/icon-themes/elementary/svx/res/fr04.png differ
diff --git a/icon-themes/elementary/svx/res/fr05.png 
b/icon-themes/elementary/svx/res/fr05.png
index 56b8840cdd2e..a473f47b493e 100644
Binary files a/icon-themes/elementary/svx/res/fr05.png and 
b/icon-themes/elementary/svx/res/fr05.png differ
diff --git a/icon-themes/elementary/svx/res/fr06.png 
b/icon-themes/elementary/svx/res/fr06.png
index af3e7b7c0c62..ae8661e2c3f4 100644
Binary files a/icon-themes/elementary/svx/res/fr06.png and 
b/icon-themes/elementary/svx/res/fr06.png differ
diff --git a/icon-themes/elementary/svx/res/fr07.png 
b/icon-themes/elementary/svx/res/fr07.png
index b9516ca440bd..4d57a840be08 100644
Binary files a/icon-themes/elementary/svx/res/fr07.png and 
b/icon-themes/elementary/svx/res/fr07.png differ
diff --git a/icon-themes/el

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

2017-12-29 Thread Caolán McNamara

 sw/source/filter/html/swhtml.cxx |   41 ++-
 sw/source/filter/html/swhtml.hxx |2 +
 2 files changed, 26 insertions(+), 17 deletions(-)

New commits:
commit 1f349bb10c3c1fc6d5d598847a7281cef728b762
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 28 22:28:08 2017 +

ofz#4817 Chaos with multiple body tags

Change-Id: I4f2ab3a3be0909176599963c8ca113e3af85c832
Reviewed-on: https://gerrit.libreoffice.org/47159
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 53dc9e5e32ef..7376ab23da47 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -298,6 +298,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_bInFootEndNoteSymbol( false ),
 m_bIgnoreHTMLComments( bNoHTMLComments ),
 m_bRemoveHidden( false ),
+m_bBodySeen( false ),
 m_pTempViewFrame(nullptr)
 {
 m_nEventId = nullptr;
@@ -1257,25 +1258,31 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
 switch( nToken )
 {
 case HtmlTokenId::BODY_ON:
-if( !m_aStyleSource.isEmpty() )
-{
-m_pCSS1Parser->ParseStyleSheet( m_aStyleSource );
-m_aStyleSource.clear();
-}
-if( IsNewDoc() )
+if (m_bBodySeen)
+eState = SvParserState::Error;
+else
 {
-InsertBodyOptions();
-// If there is a template for the first or the right page,
-// it is set here.
-const SwPageDesc *pPageDesc = nullptr;
-if( m_pCSS1Parser->IsSetFirstPageDesc() )
-pPageDesc = m_pCSS1Parser->GetFirstPageDesc();
-else if( m_pCSS1Parser->IsSetRightPageDesc() )
-pPageDesc = m_pCSS1Parser->GetRightPageDesc();
-
-if( pPageDesc )
+m_bBodySeen = true;
+if( !m_aStyleSource.isEmpty() )
 {
-m_xDoc->getIDocumentContentOperations().InsertPoolItem( 
*m_pPam, SwFormatPageDesc( pPageDesc ) );
+m_pCSS1Parser->ParseStyleSheet( m_aStyleSource );
+m_aStyleSource.clear();
+}
+if( IsNewDoc() )
+{
+InsertBodyOptions();
+// If there is a template for the first or the right page,
+// it is set here.
+const SwPageDesc *pPageDesc = nullptr;
+if( m_pCSS1Parser->IsSetFirstPageDesc() )
+pPageDesc = m_pCSS1Parser->GetFirstPageDesc();
+else if( m_pCSS1Parser->IsSetRightPageDesc() )
+pPageDesc = m_pCSS1Parser->GetRightPageDesc();
+
+if( pPageDesc )
+{
+m_xDoc->getIDocumentContentOperations().InsertPoolItem( 
*m_pPam, SwFormatPageDesc( pPageDesc ) );
+}
 }
 }
 break;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 1392192852a9..7ba0e42ace00 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -483,6 +483,8 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
 bool m_bIgnoreHTMLComments : 1;
 bool m_bRemoveHidden : 1; // the filter implementation might set the 
hidden flag
 
+bool m_bBodySeen : 1;
+
 /// the names corresponding to the DOCINFO field subtypes INFO[1-4]
 OUString m_InfoNames[4];
 
___
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' - 1e/98fcbdb657980a5af9370972789c9be71794dc

2017-12-29 Thread Caolán McNamara

 1e/98fcbdb657980a5af9370972789c9be71794dc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6c4117240d36f64abea30d4586cbfda2c026257b
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:41:54 2017 +

Notes added by 'git notes add'

diff --git a/1e/98fcbdb657980a5af9370972789c9be71794dc 
b/1e/98fcbdb657980a5af9370972789c9be71794dc
new file mode 100644
index ..8ebbe55237b1
--- /dev/null
+++ b/1e/98fcbdb657980a5af9370972789c9be71794dc
@@ -0,0 +1 @@
+ignore: obsolete
___
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' - f0/503de97c8c1523d6f36315ee40519692734d8d

2017-12-29 Thread Caolán McNamara

 f0/503de97c8c1523d6f36315ee40519692734d8d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e14c1ab15377afa2523cf8b4c12f9b896bc1e813
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:47:56 2017 +

Notes added by 'git notes add'

diff --git a/f0/503de97c8c1523d6f36315ee40519692734d8d 
b/f0/503de97c8c1523d6f36315ee40519692734d8d
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/f0/503de97c8c1523d6f36315ee40519692734d8d
@@ -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' - 89/f51e51df4601b93d8df658765a289c2c7c977c

2017-12-29 Thread Caolán McNamara

 89/f51e51df4601b93d8df658765a289c2c7c977c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e889230e274b8798c5e9dbfc60b8a90e59ffe924
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:48:19 2017 +

Notes added by 'git notes add'

diff --git a/89/f51e51df4601b93d8df658765a289c2c7c977c 
b/89/f51e51df4601b93d8df658765a289c2c7c977c
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/89/f51e51df4601b93d8df658765a289c2c7c977c
@@ -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' - 5c/f54015cf26a7a554a0a42e2a424772247a8c51

2017-12-29 Thread Caolán McNamara

 5c/f54015cf26a7a554a0a42e2a424772247a8c51 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 947a65249a5c262c117dd7ed87a100d225b8
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:48:49 2017 +

Notes added by 'git notes add'

diff --git a/5c/f54015cf26a7a554a0a42e2a424772247a8c51 
b/5c/f54015cf26a7a554a0a42e2a424772247a8c51
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/5c/f54015cf26a7a554a0a42e2a424772247a8c51
@@ -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' - 12/d2b65cc40eb1ab7c134ef2fc1c255e3fc665a0

2017-12-29 Thread Caolán McNamara

 12/d2b65cc40eb1ab7c134ef2fc1c255e3fc665a0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c9f5404d51ba919c8c14c3e8dee1f9823a922ff2
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:49:22 2017 +

Notes added by 'git notes add'

diff --git a/12/d2b65cc40eb1ab7c134ef2fc1c255e3fc665a0 
b/12/d2b65cc40eb1ab7c134ef2fc1c255e3fc665a0
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/12/d2b65cc40eb1ab7c134ef2fc1c255e3fc665a0
@@ -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' - 8c/c0fa0ead89370dc2249a5334758d437dec1b1b

2017-12-29 Thread Caolán McNamara

 8c/c0fa0ead89370dc2249a5334758d437dec1b1b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fe3098e26e739c424b381c337a39789c61bc9d6c
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:49:54 2017 +

Notes added by 'git notes add'

diff --git a/8c/c0fa0ead89370dc2249a5334758d437dec1b1b 
b/8c/c0fa0ead89370dc2249a5334758d437dec1b1b
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/8c/c0fa0ead89370dc2249a5334758d437dec1b1b
@@ -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' - f2/525d80a4ae4425bc43a1b43b96026294f29352

2017-12-29 Thread Caolán McNamara

 f2/525d80a4ae4425bc43a1b43b96026294f29352 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d5d804e0b906f1ee280c50e12c4f5e3676c72271
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:50:27 2017 +

Notes added by 'git notes add'

diff --git a/f2/525d80a4ae4425bc43a1b43b96026294f29352 
b/f2/525d80a4ae4425bc43a1b43b96026294f29352
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/f2/525d80a4ae4425bc43a1b43b96026294f29352
@@ -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' - 28/3f9bd000c187fe29edc04a23fcaf0da7459ece

2017-12-29 Thread Caolán McNamara

 28/3f9bd000c187fe29edc04a23fcaf0da7459ece |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 713593591dedf5a8660584bc17b1aa3cc6c4faaf
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:50:59 2017 +

Notes added by 'git notes add'

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

Re: LibreOfficeLight / iOS

2017-12-29 Thread jan iversen

On 29 December 2017 at 09:36, Jon Nermut  wrote:

> Thanks for the reply Jan.
>
> My main point about BridgeLOKit was that you don't really need to add
> another FFI on top of the existing LibreOfficeKit.h FFI.
> Swift can import and use the existing _LibreOfficeKit /
> _LibreOfficeKitClass and _LibreOfficeKitDocument /
> _LibreOfficeKitDocumentClass structs and their functions just fine. Swift
> actually has excellent C integration (and non-existent C++). To do so I
> just added:
>
> #define LOK_USE_UNSTABLE_API 1
>
> #import "../../../include/LibreOfficeKit/LibreOfficeKit.h"
>
> The reason I added a C layer is two fold:
1) I needed one to make the init call anyway.
2) I got several problems using the kit pointer, and calling functions
directly, it was clear that a lot of the calls was not converted correctly,
e.g. swift does naturally not know about the something special strings in
LO.

So in total I preferred supplying a bridgeheader, which tells exactly what
are tested and will work.


> >> The LIBRARY_SEARCH_PATH should be overwritten by the xcconfig file, but
> I will need to check that.
>
> Oh, I couldn't find it... where is it supposed to be generated to? I
> changed the the path settings in LibreOfficeLight.xcodeproj like this:
>
Look in the .mk files in iOS.


> I tried a few settings on the linking, couldn't make it better. Need to
> find a way to work out what its doing... I'll have more of a play.
> My suggestion is to split the C integration, and it's swift wrappers, into
> a separate Framework project, and let that produce a dylib.
> That should link pretty much instantly to the app, and should only rebuild
> and link when the libreoffice lib changes, or the code in the Framework
>

I do not see a real difference between a framework (which is basically a
library and a header file) and the current kit project ?

dylib files would be real preferencial, but how do you get those to work in
iOS. iOS demand static libraries.

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

Re: LibreOfficeLight / iOS

2017-12-29 Thread jan iversen

Please do not misunderstand my comments, I am open to any enhancements
especially on the linking process of the app...but I would like to see a
benefit of the changes.

rgds
jan I.

On 29 December 2017 at 09:36, Jon Nermut  wrote:

> Thanks for the reply Jan.
>
> My main point about BridgeLOKit was that you don't really need to add
> another FFI on top of the existing LibreOfficeKit.h FFI.
> Swift can import and use the existing _LibreOfficeKit /
> _LibreOfficeKitClass and _LibreOfficeKitDocument /
> _LibreOfficeKitDocumentClass structs and their functions just fine. Swift
> actually has excellent C integration (and non-existent C++). To do so I
> just added:
>
> #define LOK_USE_UNSTABLE_API 1
>
> #import "../../../include/LibreOfficeKit/LibreOfficeKit.h"
>
> Into lokit-Bridging-Header.h, and the struct types mentioned above are
> usable directly within Swift without anymore C needed
> - LibreOfficeKitWrapper.swift is an example of using the functions from
> these structs directly, and wrapping the C struct pointers in swift
> classes, making them encapsulated and easier to use.
> The exception being the lok_init functions, which need to be included and
> called from within a C file.
>
> >> The LIBRARY_SEARCH_PATH should be overwritten by the xcconfig file, but
> I will need to check that.
>
> Oh, I couldn't find it... where is it supposed to be generated to? I
> changed the the path settings in LibreOfficeLight.xcodeproj like this:
>
> - LIBRARY_SEARCH_PATHS = /Users/jani/LO/core/ios/generated/;
> + LIBRARY_SEARCH_PATHS = $PROJECT_DIR/../generated/;
>
> I tried a few settings on the linking, couldn't make it better. Need to
> find a way to work out what its doing... I'll have more of a play.
> My suggestion is to split the C integration, and it's swift wrappers, into
> a separate Framework project, and let that produce a dylib.
> That should link pretty much instantly to the app, and should only rebuild
> and link when the libreoffice lib changes, or the code in the Framework
>
> Cheers
>
> Jon
>
>
> On Fri, Dec 29, 2017 at 6:38 PM, jan iversen  wrote:
>
>> Hi
>>
>> adding dev list to reply, so that others might benefit from the info.
>>
>> Hope you don't mind the unsolicited email, I figured you were the guy to
>>> talk to about this from the git commits.
>>>
>> I am working actively on creating a version of LO for the iPad.
>>
>> So I got it compiling via lode, with just a couple of hitches (had to
>>> install libassuan, had to make sure to use the make out of lode, and there
>>> is a hard coded LIBRARY_SEARCH_PATH to /Users/jani/... in the ios project
>>> file)
>>>
>> I do not understand why you had to install extra libraries. I work on
>> high sierra with xcode 9 and have not installed that library.
>>
>> The LIBRARY_SEARCH_PATH should be overwritten by the xcconfig file, but I
>> will need to check that.
>>
>> There are 2 projects, but I assume you talk about the kit project?
>>
>>>
>>> 1. The app doesnt actually attempt to render yet? Were you planning on
>>> using CATiledLayer for that? I've used it a couple of times (for PDFs)...
>>> it's fun
>>>
>>
>> No it doesn’t. As you probably have seen the render function is near
>> empty, I am strugling to find out what the tiled calls returns and how to
>> use that in the swift app.
>>
>> 2. The static lib, and the compiled app, are pretty fat. (At least in
>>> debug for the simulator - ~400mb, I havent tried the release build yet).
>>> Too fat to embed in my app, it would have to be a separate app. Any insight
>>> as to whether this could ever be cut down to a reasonable size?
>>>
>> Well is it actually quite reduced. LO is simply big.
>>
>> 3. The link time on the app is outrageously slow at the moment - at least
>>> on my macbook pro - I guess this is related to the size and number of
>>> symbols in the static lib. That's what the dummy.c file is all about? Needs
>>> to be quarantined from the app somehow.  Perhaps by keeping it in a
>>> Framework project? Or cutting down its size. I was too scared to turn on
>>> LTO...
>>>
>> The link time is my biggest problem, linking the kit is a fraction of
>> linking the app, and It seems to be the swift interface that is the problem.
>>
>> dummy.c is to link without the kit, and it is automatically quarantined,
>> look in build phases, where you will see it is not being compiled.
>>
>> 4. Just wondering the reasoning for starting a new C interface into
>>> LibreOfficeKit (eg BridgeLOkit_* )?
>>>
>> How else would you make a C/C++ interface for swift ?
>>
>> I had success in talking to the main LibreOfficeKit.h file directly from
>>> swift by including it in the bridging file. Using it directly would take
>>> away a lot of duplication needed to flesh out BridgeLOkit. Granted the main
>>> C api isnt that friendly to use, but IMHO it would be better to do the
>>> wrapping and making the API friendly on the Swift side, rather than another
>>> layer of C, which then still needs swift friendly classes around it.
>>> T

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2017-12-29 Thread Aron Budea

 sd/source/ui/sidebar/SlideBackground.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 4eeb0f5a76a6e9190fd1db457042720c10ef804a
Author: Aron Budea 
Date:   Fri Dec 22 13:26:49 2017 +0100

tdf#109100: Hide label for margin control in Impress

Change-Id: Ib61656913df673ebfde61e2c921f84cb81195a3b
Reviewed-on: https://gerrit.libreoffice.org/46974
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit 88f6ffeb9e0c0b942c2b0bc9d60af7bb7a6caaf8)
Reviewed-on: https://gerrit.libreoffice.org/47119
Reviewed-by: Yousuf Philips 

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 9c94a208b2cb..76da35ddd0b0 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -240,7 +240,13 @@ void SlideBackground::HandleContextChange(
 if ( IsImpress() )
 {
 mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
+
+// margin selector is only for Draw
 mpMarginSelectBox->Hide();
+VclPtr pMarginLabel;
+get(pMarginLabel, "labelmargin");
+if ( pMarginLabel )
+pMarginLabel->Hide();
 
 if ( maContext == maImpressMasterContext )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-29 Thread Caolán McNamara

 sw/source/core/doc/htmltbl.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a24cfdf7646e827beb34bdcad99f59956ef8d582
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:45:57 2017 +

ofz#4829 Floating-point-exception

Change-Id: Ifadeff08fe0c7d88498c8c657ce3955f0a518ef9

diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index d329824725de..d3cbdbcaf564 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -964,10 +964,15 @@ void SwHTMLTableLayout::AutoLayoutPass1()
 // width of the affected columns.
 // For the maximum widths we also take the fixed-width columns
 // into account.  Is that correct?
+sal_uLong nFixMax = 0;
 if( nRel < 100 && nRelCols < m_nCols )
 {
+nFixMax = m_nMax - nRelMax;
+SAL_WARN_IF(!nFixMax, "sw.core", "bad fixed width max");
+}
+if (nFixMax)
+{
 sal_uInt16 nRelLeft = 100 - nRel;
-sal_uLong nFixMax = m_nMax - nRelMax;
 for( i=0; i___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/rtl

2017-12-29 Thread Stephan Bergmann

 sal/rtl/alloc_impl.hxx |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 0e5fc156da7f40528f636a89b6bad7e14bdc8350
Author: Stephan Bergmann 
Date:   Fri Dec 29 16:21:59 2017 +0100

PRIu64 is unused

...since 2d9beb7854bdfa6e6140e78ab754414340725e38 "OSL_TRACE in
sal/rtl/source/alloc_*.cxx leads to deadlock..."

Change-Id: I7ede71b8257fa402f5f174dfb9c12fa5e648a017
Reviewed-on: https://gerrit.libreoffice.org/47177
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sal/rtl/alloc_impl.hxx b/sal/rtl/alloc_impl.hxx
index 852db3767e2c..89b9b7c9fa67 100644
--- a/sal/rtl/alloc_impl.hxx
+++ b/sal/rtl/alloc_impl.hxx
@@ -51,17 +51,6 @@
 #define RTL_MEMORY_P2END(value, align) \
 (-(~(sal_IntPtr)(value) & -(sal_IntPtr)(align)))
 
-/** printf() format specifier(s)
- *  (from C90 )
- */
-#ifndef PRIu64
-#if defined(_MSC_VER)
-#define PRIu64 "I64u"
-#else  /* !_MSC_VER */
-#define PRIu64 "llu"
-#endif /* !_MSC_VER */
-#endif /* PRIu64 */
-
 /** highbit(): log2() + 1
 (complexity O(1))
 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang drawinglayer/source editeng/source emfio/source lotuswordpro/source sal/qa sd/source svgio/source vcl/workben

2017-12-29 Thread Noel Grandin

 compilerplugins/clang/unnecessaryparen.cxx   |   46 ++-
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |2 
 editeng/source/accessibility/AccessibleSelectionBase.cxx |2 
 emfio/source/emfuno/xemfparser.cxx   |2 
 lotuswordpro/source/filter/lwpfont.cxx   |4 
 sal/qa/osl/file/osl_File.cxx |2 
 sd/source/core/EffectMigration.cxx   |2 
 svgio/source/svguno/xsvgparser.cxx   |2 
 vcl/workben/vcldemo.cxx  |2 
 9 files changed, 35 insertions(+), 29 deletions(-)

New commits:
commit d460842616d467dfaf7b51ac2db94adb1ff5cbb0
Author: Noel Grandin 
Date:   Fri Dec 29 12:23:33 2017 +0200

loplugin:unnecessaryparen improve return check

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

diff --git a/compilerplugins/clang/unnecessaryparen.cxx 
b/compilerplugins/clang/unnecessaryparen.cxx
index db241024dba4..ba6c62a78e43 100644
--- a/compilerplugins/clang/unnecessaryparen.cxx
+++ b/compilerplugins/clang/unnecessaryparen.cxx
@@ -27,27 +27,33 @@ namespace {
 // Like clang::Stmt::IgnoreImplicit (lib/AST/Stmt.cpp), but also ignoring 
CXXConstructExpr and
 // looking through implicit UserDefinedConversion's member function call:
 Expr const * ignoreAllImplicit(Expr const * expr) {
-if (auto const e = dyn_cast(expr)) {
-expr = e->getSubExpr();
-}
-if (auto const e = dyn_cast(expr)) {
-if (e->getNumArgs() == 1) {
-expr = e->getArg(0);
+while (true)
+{
+auto oldExpr = expr;
+if (auto const e = dyn_cast(expr)) {
+expr = e->getSubExpr();
 }
-}
-if (auto const e = dyn_cast(expr)) {
-expr = e->GetTemporaryExpr();
-}
-if (auto const e = dyn_cast(expr)) {
-expr = e->getSubExpr();
-}
-while (auto const e = dyn_cast(expr)) {
-expr = e->getSubExpr();
-if (e->getCastKind() == CK_UserDefinedConversion) {
-auto const ce = cast(expr);
-assert(ce->getNumArgs() == 0);
-expr = ce->getImplicitObjectArgument();
+else if (auto const e = dyn_cast(expr)) {
+if (e->getNumArgs() == 1) {
+expr = e->getArg(0);
+}
 }
+else if (auto const e = dyn_cast(expr)) {
+expr = e->GetTemporaryExpr();
+}
+else if (auto const e = dyn_cast(expr)) {
+expr = e->getSubExpr();
+}
+else if (auto const e = dyn_cast(expr)) {
+expr = e->getSubExpr();
+if (e->getCastKind() == CK_UserDefinedConversion) {
+auto const ce = cast(expr);
+assert(ce->getNumArgs() == 0);
+expr = ce->getImplicitObjectArgument();
+}
+}
+if (expr == oldExpr)
+return expr;
 }
 return expr;
 }
@@ -261,7 +267,7 @@ bool UnnecessaryParen::VisitReturnStmt(const ReturnStmt* 
returnStmt)
 return true;
 
 // only non-operator-calls for now
-auto subExpr = parenExpr->getSubExpr();
+auto subExpr = ignoreAllImplicit(parenExpr->getSubExpr());
 if (isa(subExpr) && !isa(subExpr))
 {
 report(
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx 
b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 85788ad978b3..9d0dd000bc6a 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -182,7 +182,7 @@ namespace drawinglayer
 
 OUString SAL_CALL XPrimitive2DRenderer::getImplementationName()
 {
-return(XPrimitive2DRenderer_getImplementationName());
+return XPrimitive2DRenderer_getImplementationName();
 }
 
 sal_Bool SAL_CALL XPrimitive2DRenderer::supportsService(const 
OUString& rServiceName)
diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx 
b/editeng/source/accessibility/AccessibleSelectionBase.cxx
index cc819b46db09..09975c9ecab0 100644
--- a/editeng/source/accessibility/AccessibleSelectionBase.cxx
+++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx
@@ -77,7 +77,7 @@ namespace accessibility
 uno::Reference< XAccessible > SAL_CALL 
AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 
nSelectedChildIndex )
 {
 ::osl::MutexGuard aGuard( implGetMutex() );
-return( OCommonAccessibleSelection::getSelectedAccessibleChild( 
nSelectedChildIndex ) );
+return OCommonAccessibleSelection::getSelectedAccessibleChild( 
nSelectedChildIndex );
 }
 
 
diff --git a/emfio/source/emfuno/xemfparser.cxx 
b/emfio/source/emfuno/xemfparser.cxx
index 7d0870025fa3..e9175de10d60 100644
--- a/emfio/source/e

[Libreoffice-commits] core.git: basctl/source chart2/source connectivity/source embeddedobj/source filter/source include/filter include/formula include/oox oox/inc oox/source

2017-12-29 Thread Noel Grandin

 basctl/source/basicide/baside2.hxx  |8 
 basctl/source/basicide/baside3.cxx  |2 +-
 basctl/source/inc/baside3.hxx   |2 +-
 chart2/source/controller/inc/SelectionHelper.hxx|4 ++--
 chart2/source/controller/main/SelectionHelper.cxx   |4 ++--
 chart2/source/inc/PopupRequest.hxx  |2 +-
 chart2/source/view/main/VButton.hxx |2 +-
 connectivity/source/drivers/firebird/Util.hxx   |2 +-
 embeddedobj/source/inc/commonembobj.hxx |2 +-
 embeddedobj/source/inc/docholder.hxx|2 +-
 filter/source/msfilter/mstoolbar.cxx|2 +-
 filter/source/svg/impsvgdialog.cxx  |2 +-
 filter/source/svg/impsvgdialog.hxx  |2 +-
 include/filter/msfilter/mstoolbar.hxx   |4 ++--
 include/formula/tokenarray.hxx  |2 +-
 include/oox/core/filterbase.hxx |4 ++--
 include/oox/export/vmlexport.hxx|4 ++--
 oox/inc/drawingml/chart/converterbase.hxx   |4 ++--
 oox/source/core/filterbase.cxx  |4 ++--
 oox/source/drawingml/chart/converterbase.cxx|4 ++--
 oox/source/drawingml/diagram/layoutatomvisitors.hxx |2 +-
 oox/source/export/vmlexport.cxx |4 ++--
 22 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 4b030651a0ad5e0eedd6d08b6cd1459ca514d818
Author: Noel Grandin 
Date:   Fri Dec 29 14:15:54 2017 +0200

loplugin:passstuffbyref improved return in various

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

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index b2d10b8aa205..1e97b1cf9040 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -420,8 +420,8 @@ public:
 public:
 void BasicAddWatch (OUString const&);
 void BasicRemoveWatch ();
-Color GetBackgroundColor () const { return 
aSyntaxColors.GetBackgroundColor(); }
-Color GetFontColor () const { return aSyntaxColors.GetFontColor(); }
+Color const & GetBackgroundColor () const { return 
aSyntaxColors.GetBackgroundColor(); }
+Color const & GetFontColor () const { return aSyntaxColors.GetFontColor(); 
}
 Color GetSyntaxColor (TokenType eType) const { return 
aSyntaxColors.GetColor(eType); }
 
 protected:
@@ -447,8 +447,8 @@ private:
 public:
 void SetActiveEditor (EditorWindow* pEditor_) { pEditor = pEditor_; }
 public:
-Color GetBackgroundColor () const { return m_aBackgroundColor; };
-Color GetFontColor () const { return m_aFontColor; }
+Color const & GetBackgroundColor () const { return m_aBackgroundColor; 
};
+Color const & GetFontColor () const { return m_aFontColor; }
 Color GetColor (TokenType eType) const { return aColors[eType]; }
 
 private:
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 4ebbadb600d5..5b705b15f2c4 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -564,7 +564,7 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
 rReq.Done();
 }
 
-Reference< container::XNameContainer > DialogWindow::GetDialog() const
+Reference< container::XNameContainer > const & DialogWindow::GetDialog() const
 {
 return m_pEditor->GetDialog();
 }
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index ae09f3cecc0c..5062e8050751 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -84,7 +84,7 @@ public:
 virtual voidExecuteCommand( SfxRequest& rReq ) override;
 virtual voidGetState( SfxItemSet& ) override;
 DlgEditor&  GetEditor() const   { return *m_pEditor; }
-css::uno::Reference< css::container::XNameContainer > GetDialog() const;
+css::uno::Reference< css::container::XNameContainer > const & GetDialog() 
const;
 DlgEdModel& GetModel() const;
 DlgEdPage&  GetPage() const;
 DlgEdView&  GetView() const;
diff --git a/chart2/source/controller/inc/SelectionHelper.hxx 
b/chart2/source/controller/inc/SelectionHelper.hxx
index b40d8fe8592c..a3002dda8a7f 100644
--- a/chart2/source/controller/inc/SelectionHelper.hxx
+++ b/chart2/source/controller/inc/SelectionHelper.hxx
@@ -36,8 +36,8 @@ class Selection
 public: //methods
 bool hasSelection();
 
-OUString getSelectedCID();
-css::uno::Reference< css::drawing::XShape > getSelectedAdditionalShape();
+OUString const & getSelectedCID();
+css::uno::Reference< css::drawing::XShape > const & 
getSelectedAdditionalShape();
 const ObjectIdentifier& getSelectedOID() const { return m_aSelectedOID;}
 
 bool isResizeableObjectSelected();

Re: LibreOfficeLight / iOS

2017-12-29 Thread Sophia Schröder


BTW:

from the marketing perspective (where I came from) I love the name you 
gave your babe:


I would also love to have two apps, for Android the existing "Viewer" 
what it isn't anymore with the new possibilities for editing e.g. and 
for iOS your awesome work, both as "LibreOfficeLight".


Given they have mainly the same functionalities and maybe have some less 
or more differences here and there.



Am 29.12.2017 um 16:43 schrieb jan iversen:
Please do not misunderstand my comments, I am open to any enhancements 
especially on the linking process of the app...but I would like to see 
a benefit of the changes.


rgds
jan I.

On 29 December 2017 at 09:36, Jon Nermut > wrote:


Thanks for the reply Jan.

My main point about BridgeLOKit was that you don't really need to
add another FFI on top of the existing LibreOfficeKit.h FFI.
Swift can import and use the existing _LibreOfficeKit /
_LibreOfficeKitClass and _LibreOfficeKitDocument /
_LibreOfficeKitDocumentClass structs and their functions just
fine. Swift actually has excellent C integration (and non-existent
C++). To do so I just added:

#define LOK_USE_UNSTABLE_API 1

#import "../../../include/LibreOfficeKit/LibreOfficeKit.h"


Into lokit-Bridging-Header.h, and the struct types mentioned above
are usable directly within Swift without anymore C needed
- LibreOfficeKitWrapper.swift is an example of using the functions
from these structs directly, and wrapping the C struct pointers in
swift classes, making them encapsulated and easier to use.
The exception being the lok_init functions, which need to be
included and called from within a C file.

>> The LIBRARY_SEARCH_PATH should be overwritten by the xcconfig file, but 
I will need to check that.

Oh, I couldn't find it... where is it supposed to be generated to?
I changed the the path settings in LibreOfficeLight.xcodeproj like
this:

-LIBRARY_SEARCH_PATHS = /Users/jani/LO/core/ios/generated/;
+LIBRARY_SEARCH_PATHS = $PROJECT_DIR/../generated/;

I tried a few settings on the linking, couldn't make it better.
Need to find a way to work out what its doing... I'll have more of
a play.
My suggestion is to split the C integration, and it's swift
wrappers, into a separate Framework project, and let that produce
a dylib.
That should link pretty much instantly to the app, and should only
rebuild and link when the libreoffice lib changes, or the code in
the Framework

Cheers

Jon


On Fri, Dec 29, 2017 at 6:38 PM, jan iversen mailto:j...@apache.org>> wrote:

Hi

adding dev list to reply, so that others might benefit from
the info.

Hope you don't mind the unsolicited email, I figured you
were the guy to talk to about this from the git commits.

I am working actively on creating a version of LO for the iPad.

So I got it compiling via lode, with just a couple of
hitches (had to install libassuan, had to make sure to use
the make out of lode, and there is a hard coded
LIBRARY_SEARCH_PATH to /Users/jani/... in the ios project
file)

I do not understand why you had to install extra libraries. I
work on high sierra with xcode 9 and have not installed that
library.

The LIBRARY_SEARCH_PATH should be overwritten by the xcconfig
file, but I will need to check that.

There are 2 projects, but I assume you talk about the kit project?


1. The app doesnt actually attempt to render yet? Were you
planning on using CATiledLayer for that? I've used it a
couple of times (for PDFs)... it's fun


No it doesn’t. As you probably have seen the render function
is near empty, I am strugling to find out what the tiled calls
returns and how to use that in the swift app.

2. The static lib, and the compiled app, are pretty fat.
(At least in debug for the simulator - ~400mb, I havent
tried the release build yet). Too fat to embed in my app,
it would have to be a separate app. Any insight as to
whether this could ever be cut down to a reasonable size?

Well is it actually quite reduced. LO is simply big.

3. The link time on the app is outrageously slow at the
moment - at least on my macbook pro - I guess this is
related to the size and number of symbols in the static
lib. That's what the dummy.c file is all about? Needs to
be quarantined from the app somehow.  Perhaps by keeping
it in a Framework project? Or cutting down its size. I was
too scared to turn on LTO...

The link time is my biggest problem, linking the kit is a
fraction of linking the app, and It seems to be the swift

Re: LibreOfficeLight / iOS

2017-12-29 Thread jan iversen

Hi

adding dev list to reply, so that others might benefit from the info.

Hope you don't mind the unsolicited email, I figured you were the guy to
> talk to about this from the git commits.
>
I am working actively on creating a version of LO for the iPad.

So I got it compiling via lode, with just a couple of hitches (had to
> install libassuan, had to make sure to use the make out of lode, and there
> is a hard coded LIBRARY_SEARCH_PATH to /Users/jani/... in the ios project
> file)
>
I do not understand why you had to install extra libraries. I work on high
sierra with xcode 9 and have not installed that library.

The LIBRARY_SEARCH_PATH should be overwritten by the xcconfig file, but I
will need to check that.

There are 2 projects, but I assume you talk about the kit project?

>
> 1. The app doesnt actually attempt to render yet? Were you planning on
> using CATiledLayer for that? I've used it a couple of times (for PDFs)...
> it's fun
>

No it doesn’t. As you probably have seen the render function is near empty,
I am strugling to find out what the tiled calls returns and how to use that
in the swift app.

2. The static lib, and the compiled app, are pretty fat. (At least in debug
> for the simulator - ~400mb, I havent tried the release build yet). Too fat
> to embed in my app, it would have to be a separate app. Any insight as to
> whether this could ever be cut down to a reasonable size?
>
Well is it actually quite reduced. LO is simply big.

3. The link time on the app is outrageously slow at the moment - at least
> on my macbook pro - I guess this is related to the size and number of
> symbols in the static lib. That's what the dummy.c file is all about? Needs
> to be quarantined from the app somehow.  Perhaps by keeping it in a
> Framework project? Or cutting down its size. I was too scared to turn on
> LTO...
>
The link time is my biggest problem, linking the kit is a fraction of
linking the app, and It seems to be the swift interface that is the problem.

dummy.c is to link without the kit, and it is automatically quarantined,
look in build phases, where you will see it is not being compiled.

4. Just wondering the reasoning for starting a new C interface into
> LibreOfficeKit (eg BridgeLOkit_* )?
>
How else would you make a C/C++ interface for swift ?

I had success in talking to the main LibreOfficeKit.h file directly from
> swift by including it in the bridging file. Using it directly would take
> away a lot of duplication needed to flesh out BridgeLOkit. Granted the main
> C api isnt that friendly to use, but IMHO it would be better to do the
> wrapping and making the API friendly on the Swift side, rather than another
> layer of C, which then still needs swift friendly classes around it.
> The main problem is with the way LibreOfficeKitInit works (which seems
> weird...), for which I reused BridgeLOkit_Init and added a func to get
> the pointer to kit out.
> See the attached LibreOfficeKitWrapper.swift file - it has just a couple
> wrapped functions done but you can see what I mean. Needs the rest filled
> in and memory handling done.
>
Functions not declared in the bridge are unlikely to work in swift
(according to the swift documentation).


> I've done this before for Pdfium - which also has a C based FFI. We
> created a framework called PdfiumSwift which had swift classes like
> PDFDocument, PDFPage etc which wrapped the C interface and made consuming
> it easy in Swift. We hooked the memory management off the swift deinit()
> etc.  It used an internal private module to consume the C API so it was
> just the Swift API exposed outside of the framework / module.
>
this is basically the same the kit project does, except it does not use
classes.

rgds
jan i

>
> Once the basic wrapping is done, then these classes provide a good place
> to add stuff like converting the raw tiles into iOS friendly bitmaps etc.
>
> Anyway, good job on getting it this far, and happy new year.
>
> Cheers
>
>
> Jon Nermut
>
-- 
Sent from My iPad, sorry for any misspellings.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-12-29 Thread Caolán McNamara

 sw/qa/core/data/ooxml/pass/ofz4825-1.docx |binary
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 752684babf5ebc4ac6dfa4a7ea30f7f7cb4a9e4a
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 29 14:40:13 2017 +

ofz#4825 Bad-cast

Change-Id: I57f180c9e28d5f2439efcc1f2726d8fabc108bc9
Reviewed-on: https://gerrit.libreoffice.org/47176
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/core/data/ooxml/pass/ofz4825-1.docx 
b/sw/qa/core/data/ooxml/pass/ofz4825-1.docx
new file mode 100644
index ..ce8e6493af45
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/ofz4825-1.docx differ
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 9379fa95f3b4..80f4a2e420f3 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1898,7 +1898,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
 bool bSkipImages = getDocument()->IsSkipImages() && 
oox::getNamespace(Element) == static_cast(NMSP_dml) &&
 !((oox::getBaseToken(Element) == XML_linkedTxbx) || 
(oox::getBaseToken(Element) == XML_txbx));
 
-if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || 
static_cast(mpParent)->isShapeSent()) )
+if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || 
dynamic_cast(*mpParent).isShapeSent()) )
 xResult.set(OOXMLFactory::createFastChildContextFromStart(this, 
Element));
 else if (mxContext.is()  && !bSkipImages)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-12-29 Thread Mike Kaganski

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

New commits:
commit 1c5b481a52c296d1c3b93d8ae740143e44b1df6f
Author: Mike Kaganski 
Date:   Fri Dec 29 12:27:36 2017 +0100

Updated core
Project: help  cac2a5ccfd5d7197a1a1ad706bca5f0f4235a2fd

Correction to the QUOTIENT spreadsheet function documentation

If arguments have different signs, it isn't equivalent to
INT(numerator/denominator). E.g., QUOTIENT(-3,14;1) gives -3, while
INT(-3,14/1) gives -4.

Change-Id: I1abe0a6bd77ba5f451844cf3e5c2ab2e021d7c96
Reviewed-on: https://gerrit.libreoffice.org/47171
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 50b850013374..cac2a5ccfd5d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 50b850013374e0f711b5cded92739934d758bf1f
+Subproject commit cac2a5ccfd5d7197a1a1ad706bca5f0f4235a2fd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-29 Thread Mike Kaganski

 source/text/scalc/01/04060106.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cac2a5ccfd5d7197a1a1ad706bca5f0f4235a2fd
Author: Mike Kaganski 
Date:   Fri Dec 29 12:27:36 2017 +0100

Correction to the QUOTIENT spreadsheet function documentation

If arguments have different signs, it isn't equivalent to
INT(numerator/denominator). E.g., QUOTIENT(-3,14;1) gives -3, while
INT(-3,14/1) gives -4.

Change-Id: I1abe0a6bd77ba5f451844cf3e5c2ab2e021d7c96
Reviewed-on: https://gerrit.libreoffice.org/47171
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index 7d49a2905..806a043a1 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -887,7 +887,7 @@
 Syntax
 QUOTIENT(Numerator; 
Denominator)
 Returns the 
integer part of Numerator divided by 
Denominator.
-QUOTIENT is 
equivalent to INT(numerator/denominator), except 
that it may report errors with different error codes.
+QUOTIENT is 
equivalent to INT(numerator/denominator) for 
same-sign numerator and denominator, except that it may report errors with 
different error codes. More generally, it is equivalent to INT(numerator/denominator/SIGN(numerator/denominator))*SIGN(numerator/denominator).
 
 Example
 =QUOTIENT(11;3) returns 3. The remainder of 2 is 
lost.see also MOD, INT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-29 Thread Noel Grandin

 compilerplugins/clang/test/unnecessaryoverride.cxx |   13 +
 compilerplugins/clang/unnecessaryoverride.cxx  |7 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 667236e600d4c23af5ecd92f33c9fa0f57edb167
Author: Noel Grandin 
Date:   Fri Dec 29 20:15:30 2017 +0200

loplugin:unnecessaryoverride fix for changing access

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

diff --git a/compilerplugins/clang/test/unnecessaryoverride.cxx 
b/compilerplugins/clang/test/unnecessaryoverride.cxx
index 7caeab3b7cec..7941263e2cec 100644
--- a/compilerplugins/clang/test/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/test/unnecessaryoverride.cxx
@@ -135,4 +135,17 @@ struct Derived2 : Base2
 }
 };
 
+class Base3
+{
+public:
+void f1();
+};
+
+class Derived3 : protected Base3
+{
+public:
+// effectively changing access from protected to public
+void f1() { Base3::f1(); }
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx 
b/compilerplugins/clang/unnecessaryoverride.cxx
index f912e43009bb..c5e483816383 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -391,7 +391,7 @@ const CXXMethodDecl* 
UnnecessaryOverride::findOverriddenOrSimilarMethodInSupercl
 
 std::vector maSimilarMethods;
 
-auto BaseMatchesCallback = [&](const CXXBaseSpecifier *cxxBaseSpecifier, 
CXXBasePath& )
+auto BaseMatchesCallback = [&](const CXXBaseSpecifier *cxxBaseSpecifier, 
CXXBasePath& path)
 {
 if (cxxBaseSpecifier->getAccessSpecifier() != AS_public && 
cxxBaseSpecifier->getAccessSpecifier() != AS_protected)
 return false;
@@ -404,6 +404,11 @@ const CXXMethodDecl* 
UnnecessaryOverride::findOverriddenOrSimilarMethodInSupercl
 return false;
 for (const CXXMethodDecl* baseMethod : baseCXXRecordDecl->methods())
 {
+auto effectiveBaseMethodAccess = baseMethod->getAccess();
+if (effectiveBaseMethodAccess == AS_public && path.Access == 
AS_protected)
+effectiveBaseMethodAccess = AS_protected;
+if (effectiveBaseMethodAccess != methodDecl->getAccess())
+continue;
 if (!baseMethod->getDeclName().isIdentifier() || 
methodDecl->getName() != baseMethod->getName()) {
 continue;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg

2017-12-29 Thread Matthias Freund

 icon-themes/sifr/cmd/32/deletetable.png  |binary
 icon-themes/sifr/cmd/lc_deletetable.png  |binary
 icon-themes/sifr/cmd/sc_deletetable.png  |binary
 icon-themes/sifr_dark/cmd/32/deletetable.png |binary
 icon-themes/sifr_dark/cmd/lc_deletetable.png |binary
 icon-themes/sifr_dark/cmd/sc_deletetable.png |binary
 icon-themes/sifr_svg/cmd/32/deletetable.svg  |  296 +++
 icon-themes/sifr_svg/cmd/lc_deletetable.svg  |  279 +
 icon-themes/sifr_svg/cmd/sc_deletetable.svg  |  123 +++
 9 files changed, 698 insertions(+)

New commits:
commit cbea57bac09f40e2576d080ecc6ccec1e02f131c
Author: Matthias Freund 
Date:   Fri Dec 29 12:22:18 2017 +0100

tdf#75256 New sifr icon for deletetable

Change-Id: Id03229cf9229880f570cacba61ae2e563c05559e
Reviewed-on: https://gerrit.libreoffice.org/47170
Tested-by: Jenkins 
Reviewed-by: Matthias Freund 

diff --git a/icon-themes/sifr/cmd/32/deletetable.png 
b/icon-themes/sifr/cmd/32/deletetable.png
new file mode 100644
index ..7ecaeab3cbf0
Binary files /dev/null and b/icon-themes/sifr/cmd/32/deletetable.png differ
diff --git a/icon-themes/sifr/cmd/lc_deletetable.png 
b/icon-themes/sifr/cmd/lc_deletetable.png
new file mode 100644
index ..eaf3601147d8
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_deletetable.png differ
diff --git a/icon-themes/sifr/cmd/sc_deletetable.png 
b/icon-themes/sifr/cmd/sc_deletetable.png
new file mode 100644
index ..c12b0b70ae78
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_deletetable.png differ
diff --git a/icon-themes/sifr_dark/cmd/32/deletetable.png 
b/icon-themes/sifr_dark/cmd/32/deletetable.png
new file mode 100644
index ..f253c73d4c6c
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/deletetable.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_deletetable.png 
b/icon-themes/sifr_dark/cmd/lc_deletetable.png
new file mode 100644
index ..8203f6e97d01
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_deletetable.png differ
diff --git a/icon-themes/sifr_dark/cmd/sc_deletetable.png 
b/icon-themes/sifr_dark/cmd/sc_deletetable.png
new file mode 100644
index ..7930a9cc02c9
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_deletetable.png differ
diff --git a/icon-themes/sifr_svg/cmd/32/deletetable.svg 
b/icon-themes/sifr_svg/cmd/32/deletetable.svg
new file mode 100644
index ..4cbe2e05330f
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/32/deletetable.svg
@@ -0,0 +1,296 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="deletetable.svg"
+   inkscape:version="0.92.2 (unknown)"
+   inkscape:export-filename="/home/matthias/git/icons/sifr_svg/deletetable.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   width="32"
+   height="32">
+  
+  
+
+  
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+http://creativecommons.org/licenses/by-sa/4.0/"; />
+
+  
+The Document Foundation
+  
+
+
+  
+Matthias Freund
+  
+
+  
+  http://creativecommons.org/licenses/by-sa/4.0/";>
+http://creativecommons.org/ns#Reproduction"; />
+http://creativecommons.org/ns#Distribution"; />
+http://creativecommons.org/ns#Notice"; />
+http://creativecommons.org/ns#Attribution"; />
+http://creativecommons.org/ns#DerivativeWorks"; />
+http://creativecommons.org/ns#ShareAlike"; />
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
diff --git a/icon-themes/sifr_svg/cmd/lc_deletetable.svg 
b/icon-themes/sifr_svg/cmd/lc_deletetable.svg
new file mode 100644
index ..75af13ba8e4d
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/lc_deletetable.svg
@@ -0,0 +1,279 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="lc_deletetable.svg"
+   inkscape:version="0.92.2 (unknown)"
+   
inkscape:export-filename="/home/matthias/git/icons/sifr_svg/lc_deletetable.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-yd

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

2017-12-29 Thread andreas kainz

 icon-themes/elementary/cmd/lc_attributepagesize.png |binary
 icon-themes/elementary/cmd/lc_pagecolumntype.png|binary
 icon-themes/elementary/cmd/sc_attributepagesize.png |binary
 icon-themes/elementary/cmd/sc_pagecolumntype.png|binary
 icon-themes/elementary_svg/cmd/lc_attributepagesize.svg |1 +
 icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg|2 +-
 icon-themes/elementary_svg/cmd/sc_attributepagesize.svg |1 +
 icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg|5 -
 8 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit c73a8a1b5f14da14f89c0e98f69aeee86fa6c068
Author: andreas kainz 
Date:   Fri Dec 29 21:10:02 2017 +0100

Elementary-icons: add Page Layout icons

Change-Id: I2f11dab4035cb6866d953239515eec3bc6602dfd
Reviewed-on: https://gerrit.libreoffice.org/47183
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/elementary/cmd/lc_attributepagesize.png 
b/icon-themes/elementary/cmd/lc_attributepagesize.png
new file mode 100644
index ..1f55195651a3
Binary files /dev/null and 
b/icon-themes/elementary/cmd/lc_attributepagesize.png differ
diff --git a/icon-themes/elementary/cmd/lc_pagecolumntype.png 
b/icon-themes/elementary/cmd/lc_pagecolumntype.png
index 2234ffe9d64f..318cb07a4c61 100644
Binary files a/icon-themes/elementary/cmd/lc_pagecolumntype.png and 
b/icon-themes/elementary/cmd/lc_pagecolumntype.png differ
diff --git a/icon-themes/elementary/cmd/sc_attributepagesize.png 
b/icon-themes/elementary/cmd/sc_attributepagesize.png
new file mode 100644
index ..1e12d15d47c3
Binary files /dev/null and 
b/icon-themes/elementary/cmd/sc_attributepagesize.png differ
diff --git a/icon-themes/elementary/cmd/sc_pagecolumntype.png 
b/icon-themes/elementary/cmd/sc_pagecolumntype.png
index 79bd664cb6f7..58b5e72d66ff 100644
Binary files a/icon-themes/elementary/cmd/sc_pagecolumntype.png and 
b/icon-themes/elementary/cmd/sc_pagecolumntype.png differ
diff --git a/icon-themes/elementary_svg/cmd/lc_attributepagesize.svg 
b/icon-themes/elementary_svg/cmd/lc_attributepagesize.svg
new file mode 100644
index ..80eb24ba7530
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/lc_attributepagesize.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg 
b/icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg
index 1090747c2fe6..2e109caed992 100644
--- a/icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg
+++ b/icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_attributepagesize.svg 
b/icon-themes/elementary_svg/cmd/sc_attributepagesize.svg
new file mode 100644
index ..89fa260587ed
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/sc_attributepagesize.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg 
b/icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg
index df08c380372a..0aaaf1c5aa35 100644
--- a/icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg
+++ b/icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg
@@ -1 +1,4 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+
+ />
+ 
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOfficeLight / iOS

2017-12-29 Thread Jon Nermut

Hi Jan,
The way I understand it is that the static libs, the .a files, aren't
actually linked yet - they are just an archive of .o object files collected
together.
When you link the app with the static lib it has to do a full read of the
symbols in the .a file and write the relevant ones into the executable.
There are 1.3 million symbols in the .a file (from nm libKit_X86_64_debug.a
| wc -l )
Adding -print_statistics to the linker flags gives this:

   ld total time:  894.4 seconds ( 100.0%)
 option parsing time:   11.0 milliseconds (   0.0%)
  object file processing:0.1 milliseconds (   0.0%)
 resolve symbols:  612.3 seconds (  68.4%)
 build atom list:0.0 milliseconds (   0.0%)
 passess:  486.3 milliseconds (   0.0%)
write output:  281.6 seconds (  31.4%)
pageins=447127, pageouts=2622, faults=3099715
processed   7 object files,  totaling 476,732 bytes
processed   2 archive files, totaling 456,642,248 bytes
processed  32 dylib files
wrote output filetotaling 324,771,884 bytes

Eg most of the time is spent reading symbols from the .a file, and then
writing them into the executable.
I also played around of using ld independantly of XCode and just trying to
link the .a file with no app and no swift involved - times were about the
same.
So to improve the linking of the .a file I think the main game would be
reducing the number of symbols in the .a. Probably not that practical.

So what I think you will get with a Framework project is actually linking
the .a file, seperately to the application executable. That means you won't
have that full link every time you build the app, but only when the
framework needs to build. That's the theory, anyway.

iOS has allowed dylibs since iOS 8 and the introduction of Swift. In fact
you can't produce a static lib with Swift, only a dylib.
For our Pdfium wrapper we produce a static lib out of the Pdfium code
itself, and link that in a framework project with the swift wrappers, to
produce a dylib which is a swift module that can be imported into an app.
Beside the linking benefits this then gives you a nice encapsulated library
that is easy to consume from swift.

If I have time over the next couple of days I'll have a go at creating a
framework to see if it does actually behave as I expect.

Cheers

Jon

On Sat, Dec 30, 2017 at 2:43 AM, jan iversen  wrote:

> Please do not misunderstand my comments, I am open to any enhancements
> especially on the linking process of the app...but I would like to see a
> benefit of the changes.
>
> rgds
> jan I.
>
> On 29 December 2017 at 09:36, Jon Nermut  wrote:
>
>> Thanks for the reply Jan.
>>
>> My main point about BridgeLOKit was that you don't really need to add
>> another FFI on top of the existing LibreOfficeKit.h FFI.
>> Swift can import and use the existing _LibreOfficeKit /
>> _LibreOfficeKitClass and _LibreOfficeKitDocument /
>> _LibreOfficeKitDocumentClass structs and their functions just fine. Swift
>> actually has excellent C integration (and non-existent C++). To do so I
>> just added:
>>
>> #define LOK_USE_UNSTABLE_API 1
>>
>> #import "../../../include/LibreOfficeKit/LibreOfficeKit.h"
>>
>> Into lokit-Bridging-Header.h, and the struct types mentioned above are
>> usable directly within Swift without anymore C needed
>> - LibreOfficeKitWrapper.swift is an example of using the functions from
>> these structs directly, and wrapping the C struct pointers in swift
>> classes, making them encapsulated and easier to use.
>> The exception being the lok_init functions, which need to be included and
>> called from within a C file.
>>
>> >> The LIBRARY_SEARCH_PATH should be overwritten by the xcconfig file,
>> but I will need to check that.
>>
>> Oh, I couldn't find it... where is it supposed to be generated to? I
>> changed the the path settings in LibreOfficeLight.xcodeproj like this:
>>
>> - LIBRARY_SEARCH_PATHS = /Users/jani/LO/core/ios/generated/;
>> + LIBRARY_SEARCH_PATHS = $PROJECT_DIR/../generated/;
>>
>> I tried a few settings on the linking, couldn't make it better. Need to
>> find a way to work out what its doing... I'll have more of a play.
>> My suggestion is to split the C integration, and it's swift wrappers,
>> into a separate Framework project, and let that produce a dylib.
>> That should link pretty much instantly to the app, and should only
>> rebuild and link when the libreoffice lib changes, or the code in the
>> Framework
>>
>> Cheers
>>
>> Jon
>>
>>
>> On Fri, Dec 29, 2017 at 6:38 PM, jan iversen  wrote:
>>
>>> Hi
>>>
>>> adding dev list to reply, so that others might benefit from the info.
>>>
>>> Hope you don't mind the unsolicited email, I figured you were the guy to
 talk to about this from the git commits.

>>> I am working actively on creating a version of LO for the iPad.
>>>
>>> So I got it compiling via lode, with just a couple of hitches (had to
 install libassuan, had to make sure to use the make out

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/elementary icon-themes/elementary_svg

2017-12-29 Thread andreas kainz

 icon-themes/elementary/cmd/lc_attributepagesize.png |binary
 icon-themes/elementary/cmd/lc_pagecolumntype.png|binary
 icon-themes/elementary/cmd/sc_attributepagesize.png |binary
 icon-themes/elementary/cmd/sc_pagecolumntype.png|binary
 icon-themes/elementary_svg/cmd/lc_attributepagesize.svg |1 +
 icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg|2 +-
 icon-themes/elementary_svg/cmd/sc_attributepagesize.svg |1 +
 icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg|5 -
 8 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 4393ced78656c083b01b66d8987ff956e90b39ab
Author: andreas kainz 
Date:   Fri Dec 29 21:10:02 2017 +0100

Elementary-icons: add Page Layout icons

Change-Id: I2f11dab4035cb6866d953239515eec3bc6602dfd
Reviewed-on: https://gerrit.libreoffice.org/47183
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 
(cherry picked from commit c73a8a1b5f14da14f89c0e98f69aeee86fa6c068)
Reviewed-on: https://gerrit.libreoffice.org/47184

diff --git a/icon-themes/elementary/cmd/lc_attributepagesize.png 
b/icon-themes/elementary/cmd/lc_attributepagesize.png
new file mode 100644
index ..1f55195651a3
Binary files /dev/null and 
b/icon-themes/elementary/cmd/lc_attributepagesize.png differ
diff --git a/icon-themes/elementary/cmd/lc_pagecolumntype.png 
b/icon-themes/elementary/cmd/lc_pagecolumntype.png
index 2234ffe9d64f..318cb07a4c61 100644
Binary files a/icon-themes/elementary/cmd/lc_pagecolumntype.png and 
b/icon-themes/elementary/cmd/lc_pagecolumntype.png differ
diff --git a/icon-themes/elementary/cmd/sc_attributepagesize.png 
b/icon-themes/elementary/cmd/sc_attributepagesize.png
new file mode 100644
index ..1e12d15d47c3
Binary files /dev/null and 
b/icon-themes/elementary/cmd/sc_attributepagesize.png differ
diff --git a/icon-themes/elementary/cmd/sc_pagecolumntype.png 
b/icon-themes/elementary/cmd/sc_pagecolumntype.png
index 79bd664cb6f7..58b5e72d66ff 100644
Binary files a/icon-themes/elementary/cmd/sc_pagecolumntype.png and 
b/icon-themes/elementary/cmd/sc_pagecolumntype.png differ
diff --git a/icon-themes/elementary_svg/cmd/lc_attributepagesize.svg 
b/icon-themes/elementary_svg/cmd/lc_attributepagesize.svg
new file mode 100644
index ..80eb24ba7530
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/lc_attributepagesize.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg 
b/icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg
index 1090747c2fe6..2e109caed992 100644
--- a/icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg
+++ b/icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_attributepagesize.svg 
b/icon-themes/elementary_svg/cmd/sc_attributepagesize.svg
new file mode 100644
index ..89fa260587ed
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/sc_attributepagesize.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg 
b/icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg
index df08c380372a..0aaaf1c5aa35 100644
--- a/icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg
+++ b/icon-themes/elementary_svg/cmd/sc_pagecolumntype.svg
@@ -1 +1,4 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+
+ />
+ 
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - starmath/source

2017-12-29 Thread Caolán McNamara

 starmath/source/mathmlattr.hxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3cd0f7aedc46653ae84db9e460609a814ec9013d
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 28 21:29:53 2017 +

ofz#4765: Conditional jump or move depends on uninitialised value

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

diff --git a/starmath/source/mathmlattr.hxx b/starmath/source/mathmlattr.hxx
index f5402546e68e..56144b7b6028 100644
--- a/starmath/source/mathmlattr.hxx
+++ b/starmath/source/mathmlattr.hxx
@@ -43,6 +43,10 @@ struct MathMLAttributeLengthValue
 {
 Fraction aNumber;
 MathMLLengthUnit eUnit;
+MathMLAttributeLengthValue()
+: eUnit(MathMLLengthUnit::None)
+{
+}
 };
 
 sal_Int32 ParseMathMLAttributeLengthValue(const OUString &rStr, 
MathMLAttributeLengthValue *pV);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

2017-12-29 Thread scan-admin


Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

2 new defect(s) introduced to LibreOffice found with Coverity Scan.
1 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 2 of 2 defect(s)


** CID 1427009:  Uninitialized members  (UNINIT_CTOR)
/connectivity/source/drivers/firebird/Blob.cxx: 48 in 
connectivity::firebird::Blob::Blob(unsigned int *, unsigned int *, const 
GDS_QUAD_t &)()



*** CID 1427009:  Uninitialized members  (UNINIT_CTOR)
/connectivity/source/drivers/firebird/Blob.cxx: 48 in 
connectivity::firebird::Blob::Blob(unsigned int *, unsigned int *, const 
GDS_QUAD_t &)()
42 m_blobHandle(nullptr),
43 #endif
44 m_bBlobOpened(false),
45 m_nBlobLength(0),
46 m_nBlobPosition(0)
47 {
>>> CID 1427009:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "m_nMaxSegmentSize" is not initialized in this 
>>> constructor nor in any functions that it calls.
48 }
49 
50 void Blob::ensureBlobIsOpened()
51 {
52 MutexGuard aGuard(m_aMutex);
53 

** CID 1427008:  Incorrect expression  (UNINTENDED_INTEGER_DIVISION)
/sw/source/filter/html/svxcss1.cxx: 2300 in ParseCSS1_margin(const 
CSS1Expression *, SfxItemSet &, SvxCSS1PropertyInfo &, const SvxCSS1Parser &)()



*** CID 1427008:  Incorrect expression  (UNINTENDED_INTEGER_DIVISION)
/sw/source/filter/html/svxcss1.cxx: 2300 in ParseCSS1_margin(const 
CSS1Expression *, SfxItemSet &, SvxCSS1PropertyInfo &, const SvxCSS1Parser &)()
2294 bSetThis = true;
2295 }
2296 break;
2297 case CSS1_PIXLENGTH:
2298 {
2299 auto fMargin = pExpr->GetNumber();
>>> CID 1427008:  Incorrect expression  (UNINTENDED_INTEGER_DIVISION)
>>> Dividing integer expressions "2147483647" and "2", and then converting 
>>> the integer quotient to type "double". Any remainder, or fractional part of 
>>> the quotient, is ignored.
2300 if (fMargin < SAL_MAX_INT32/2 && fMargin > 
SAL_MIN_INT32/2)
2301 {
2302 nMargin =  (long)fMargin;
2303 long nPWidth = 0;
2304 SvxCSS1Parser::PixelToTwip( nPWidth, nMargin );
2305 bSetThis = true;



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyHJYV0YMSfoRZm0xr2Uel7f935lkD8zh2972P6qw5APgOZFHwoXgvAzxhbNmqEt3-2BAw5dux9CYTKSQXDOvqATIPAa96HPyPAbSBIa8gRk12MfyiblOXHy1GwnaDkLcXVcMfTDTWaVQ7qDQXCZm2IWYBbUBE-2FsEE-2BzGrCq5uZuYUE-3D

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRbVDbis712qZDP-2FA8y06Nq4k1FZJSDV-2FTHi5VQof9xGafB4oBwGYxuHHknceo2QLpCrZ44Ciy7AqBR2QyX6OCB5lwWgMDuK-2FivqaohkU3M9kT-2Fww10Qt2GoaCJAOQCa0Wv4ijH4oV8jCt0XXa7QeAwh_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyHJYV0YMSfoRZm0xr2Uel7aJcR2FdC-2FMGuWC-2BmD5WnU8x9MHRZQdD84lErTpPmq3RfA3uNrN3do7-2F1Ebpxcw7MyNdgqbA0S5II0HmyoXwbiUoTV49gui0ee-2BPa1qwIOrbhSSkyYi5-2FBIi-2B2XF0s5VT0ZZgtmVVQOGhB7s7sGKpQM-3D

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

Re: LibreOfficeLight / iOS

2017-12-29 Thread jan iversen

try the -r flag which is for prelinking. you can see that in the .mk file

And of course a debug version contains tons of symbols in order for the
debugger to be able to do its work.


> iOS has allowed dylibs since iOS 8 and the introduction of Swift. In fact
> you can't produce a static lib with Swift, only a dylib.
> For our Pdfium wrapper we produce a static lib out of the Pdfium code
> itself, and link that in a framework project with the swift wrappers, to
> produce a dylib which is a swift module that can be imported into an app.
> Beside the linking benefits this then gives you a nice encapsulated library
> that is easy to consume from swift.
>
that was my first attempt but the apple developers said no, will try to
scan through the doc again.


> If I have time over the next couple of days I'll have a go at creating a
> framework to see if it does actually behave as I expect.
>
or a lot easier simply change the .mk to build a .dylib instead of the .a
thr .o file within both should be identical.

rgds
jan i

-- 
Sent from My iPad, sorry for any misspellings.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

39 matches

Mail list logo