Re: [Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit
On 01/19/2016 04:38 PM, Miklos Vajna wrote: On Tue, Jan 19, 2016 at 06:39:56AM -0800, Oliver Specht wrote: diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index 7d4210e..8057d75 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -51,6 +51,7 @@ struct _LibreOfficeKitClass const char* pURL); char* (*getError) (LibreOfficeKit* pThis); +void (*freeError) (const char *pfree); LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis, const char* pURL, Won't this break backwards compatibility with existing clients? I think you can only append new functions to the end of the function list, otherwise the LIBREOFFICEKIT_HAS_MEMBER() macro is quite pointless. ;-) ...and the usage of char* vs. char const* seems curiously inconsistent in that API ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/firebird
external/firebird/firebird-c++11.patch.1 | 26 +
external/firebird/firebird-c++11replfn.patch.0 |6 -
2 files changed, 27 insertions(+), 5 deletions(-)
New commits:
commit 3179e8f7e6ce550bbe766ed730e68b0374944dd5
Author: Stephan Bergmann
Date: Tue Jan 19 16:19:44 2016 +0100
external/firebird: Adapt to GCC 6
...which switched defaults from C++03 to C++14, so causes some errors now.
Curiously, the throw(std::bad_alloc) vs. throw-anything mismatch between the
global operator new replacements and the standard headers is OK for GCC only
when there is no further declaration in between the standard header and the
replacmenet definition.
Change-Id: Ib54727fecf4ad07426b811a9cc04b08ea80e59dc
diff --git a/external/firebird/firebird-c++11.patch.1
b/external/firebird/firebird-c++11.patch.1
index e8cb52d..2890577 100644
--- a/external/firebird/firebird-c++11.patch.1
+++ b/external/firebird/firebird-c++11.patch.1
@@ -1,4 +1,19 @@
# -*- Mode: Diff -*-
+--- firebird/src/dudley/exe.epp
firebird/src/dudley/exe.epp
+@@ -2884,9 +2884,9 @@
+ blr_parameter, 0, 0, 0,
+ blr_parameter, 0, 1, 0,
+ blr_parameter, 1, 0, 0,
+- blr_end,
+- blr_end,
+- blr_end,
++ SCHAR(blr_end),
++ SCHAR(blr_end),
++ SCHAR(blr_end),
+ blr_eoc
+ };
+ static FB_API_HANDLE req_handle;
--- firebird/src/gpre/c_cxx.cpp
+++ firebird/src/gpre/c_cxx.cpp
@@ -876,7 +876,7 @@
@@ -156,6 +171,17 @@
}
else {
sprintf(p, "%d", value);
+--- firebird/src/gpre/sqe.cpp
firebird/src/gpre/sqe.cpp
+@@ -2529,7 +2529,7 @@
+ return par_stat(request);
+
+ if (MSC_match(KW_MINUS))
+- return MSC_unary(nod_negate, par_primitive_value(request,
false, paren_count, false));
++ return MSC_unary(nod_negate, par_primitive_value(request,
false, paren_count, NULL));
+
+ MSC_match(KW_PLUS);
+
--- firebird/src/common/classes/alloc.cpp
+++ firebird/src/common/classes/alloc.cpp
@@ -1100,7 +1100,7 @@
diff --git a/external/firebird/firebird-c++11replfn.patch.0
b/external/firebird/firebird-c++11replfn.patch.0
index d14296c..53b1dd0 100644
--- a/external/firebird/firebird-c++11replfn.patch.0
+++ b/external/firebird/firebird-c++11replfn.patch.0
@@ -1,6 +1,6 @@
--- src/common/classes/alloc.h
+++ src/common/classes/alloc.h
-@@ -489,23 +489,11 @@
+@@ -489,23 +489,7 @@
inline static MemoryPool* getDefaultMemoryPool() { return
Firebird::MemoryPool::processMemoryPool; }
// Global versions of operators new and delete
@@ -12,8 +12,6 @@
-{
- return Firebird::MemoryPool::globalAlloc(s);
-}
-+void* operator new(size_t s) THROW_BAD_ALLOC;
-+void* operator new[](size_t s) THROW_BAD_ALLOC;
-inline void operator delete(void* mem) throw()
-{
@@ -23,8 +21,6 @@
-{
- Firebird::MemoryPool::globalFree(mem);
-}
-+void operator delete(void* mem) throw();
-+void operator delete[](void* mem) throw();
#ifdef DEBUG_GDS_ALLOC
inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char*
file, int line)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/LibreOfficeKit
include/LibreOfficeKit/LibreOfficeKit.h |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 23c2c7c9cb86db4a36f8a798e63402a053816ef2 Author: Oliver Specht Date: Wed Jan 20 07:52:51 2016 +0100 freeError function moved to the end of the list Change-Id: I4aed102b25ddcd5f2e8fa03395e2ffd89c858bb9 Reviewed-on: https://gerrit.libreoffice.org/21619 Tested-by: Jenkins Reviewed-by: Oliver Specht diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index 8057d75..80f8451 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -51,7 +51,6 @@ struct _LibreOfficeKitClass const char* pURL); char* (*getError) (LibreOfficeKit* pThis); -void (*freeError) (const char *pfree); LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis, const char* pURL, @@ -64,6 +63,8 @@ struct _LibreOfficeKitClass /// @see lok::Office::getFilterTypes(). char* (*getFilterTypes) (LibreOfficeKit* pThis); #endif +void (*freeError) (const char *pfree); + }; #define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit
Hi Miklos, you're probably right. Oliver On 19.01.2016 16:38, Miklos Vajna wrote: Hi Oliver, On Tue, Jan 19, 2016 at 06:39:56AM -0800, Oliver Specht wrote: diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index 7d4210e..8057d75 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -51,6 +51,7 @@ struct _LibreOfficeKitClass const char* pURL); char* (*getError) (LibreOfficeKit* pThis); +void (*freeError) (const char *pfree); LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis, const char* pURL, Won't this break backwards compatibility with existing clients? I think you can only append new functions to the end of the function list, otherwise the LIBREOFFICEKIT_HAS_MEMBER() macro is quite pointless. ;-) Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/5fe99ea3ee7b33a80f1419f2a4c9c1ea56dd00ee/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unostyle.cxx | 995 +++-
1 file changed, 437 insertions(+), 558 deletions(-)
New commits:
commit c116aafe38f264be29f415b74a968f6efa59a56a
Author: Chris Sherlock
Date: Wed Jan 20 10:50:49 2016 +1100
sw: (mea culpa) fix unostyle.cxx
Unfortunately in commit 2b297116cb6bb1061c4 I messed up whilst
doing a rebase via meld to incorporate my changes. This meant
that I overwrote changes made to
sw/source/core/unocore/unostyle.cxx.
Even more regrettably, my original changes missed making changes
in Windows and OS X builds as I pushed too quickly from within
gerrit, assuming that the build errors weren't caused by me.
These series of VCL changes I had made were quite rightly
reverted, and I worked towards fixing them up again - sadly my
ISP (iiNet) had connectivity problems so it took me some time to
even gain access to the repository to do the cherry-picks of my
previous commits so I could fix them up and resubmit them.
I honestly didn't notice that I had overwritten the changes in
unostyle.cxx previously, as I was so intent on fixing my errors
that this entirely passed me by. This unfortunately led to this
commit, where I overwrote the changes a second time:
28c96fc2553a5c3dee108f1e2060d7bc081a7e7e
I was informed of this problem via the mailing list [1] which I
read the next morning immediately after I work up. I take full
responsibility and very much regret having made these mistakes.
This commit fixes the issue and I will take steps to ensure that
it doesn't occur again. I can reassure all that this was not
intentional, nor would I ever do such a thing on purpose - quite
frankly I'm mortified.
1.
http://lists.freedesktop.org/archives/libreoffice/2016-January/072067.html
Change-Id: I336626059d4acd175669832950f3ed52b2539087
Reviewed-on: https://gerrit.libreoffice.org/21618
Reviewed-by: Chris Sherlock
Tested-by: Chris Sherlock
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 118d4d5..2e6ef30 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -89,6 +89,7 @@
#include
#include
#include
+#include
namespace
{
@@ -243,6 +244,8 @@ namespace sw
};
}
+
+class SwStyleBase_Impl;
class SwXStyle : public cppu::WeakImplHelper
<
css::style::XStyle,
@@ -269,6 +272,8 @@ protected:
css::uno::Reference m_xStyleFamily;
css::uno::Reference m_xStyleData;
+template
+void SetPropertyValue(const SfxItemPropertySimpleEntry&, const
SfxItemPropertySet&, const uno::Any&, SwStyleBase_Impl&);
void SAL_CALL SetPropertyValues_Impl( const css::uno::Sequence< OUString
>& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues )
throw (css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
@@ -359,6 +364,8 @@ public:
void Invalidate();
void ApplyDescriptorProperties();
void SetStyleName(const OUString& rSet){ m_sStyleName = rSet;}
+void SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const
SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase)
throw(beans::PropertyVetoException, lang::IllegalArgumentException,
lang::WrappedTargetException, uno::RuntimeException, std::exception);
+void PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet&
rPropSet, const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rVal,
SwStyleBase_Impl& rBaseImpl);
};
class SwXFrameStyle
@@ -1092,7 +1099,7 @@ static uno::Reference
lcl_InitStandardStyle(const SfxStyleF
if(eFamily != SFX_STYLE_FAMILY_PARA && eFamily != SFX_STYLE_FAMILY_PAGE)
return {};
auto aResult(rxStyleFamily->getByName("Standard"));
-if(!aResult.isExtractableTo(cppu::UnoType::get()))
+if(!aResult.has())
return {};
return aResult.get();
}
@@ -1108,7 +1115,7 @@ static uno::Reference
lcl_InitStyleFamily(SwDoc* pDoc, c
uno::Reference xFamilySupplier(xModel,
uno::UNO_QUERY);
auto xFamilies = xFamilySupplier->getStyleFamilies();
auto aResult(xFamilies->getByName(rEntry.m_sName));
-if(!aResult.isExtractableTo(cppu::UnoType::get()))
+if(!aResult.has())
return {};
return aResult.get();
}
@@ -1399,580 +1406,453 @@ const SwPageDesc* SwStyleBase_Impl::GetOldPageDesc()
return m_pOldPageDesc;
}
+static void lcl_SetDefaultWay(const SfxItemPropertySimpleEntry& rEntry, const
SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl&
o_rStyleBase)
+{
+// default ItemSet handling
+SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
+SfxItemSet aSet(*rStyleSet.GetPool(), rEntry.nWID, rEntry.nWID);
+aSet.SetParent(&rStyleSet);
+rPropSet.setPropertyValue(rEntry, rValue, aSet);
+rStyleSet.Put(aSet);
+}
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b4f60e1c7c68a6e2a8b295aeffb85573b61ad045 Author: Thorsten Behrens Date: Wed Jan 20 02:39:21 2016 +0100 writerfilter: fix VS2015 build Change-Id: I9cde0ecf2c883b977df4f633e5106d39628444ca diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index c6d1ef3..428ba2b 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk
Hi Pranav, can you review the below commit - your scp2 changes broke Windows packaging. Thanks, Thorsten libreoffice-comm...@lists.freedesktop.org wrote: > scp2/InstallModule_ooo.mk |4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > New commits: > commit 8a99e4b0de7a516b8577d34dd39296afda604290 > Author: Thorsten Behrens > Date: Wed Jan 20 01:47:37 2016 +0100 > > No LOKDocView packaging for Win/Mac for the while > > This unbreaks Windows packaging after > 85b46f51928dc17cda1bc974bca9159de9221b4d - I guess this should be > Linux-only for the moment. > > Change-Id: Ie19f7f3e4b611e2884e3fdb1a64c63927b018989 > > diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk > index 47c8cc6..2f4320b 100644 > --- a/scp2/InstallModule_ooo.mk > +++ b/scp2/InstallModule_ooo.mk > @@ -103,7 +103,9 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ > scp2/source/ooo/mingw_dlls \ > ) \ > scp2/source/ooo/module_filter \ > -scp2/source/ooo/module_libreofficekit \ > +$(if $(filter-out MACOSX WNT,$(OS)), \ > + scp2/source/ooo/module_libreofficekit \ > + ) \ > )) > > $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\ signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk
scp2/InstallModule_ooo.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 8a99e4b0de7a516b8577d34dd39296afda604290 Author: Thorsten Behrens Date: Wed Jan 20 01:47:37 2016 +0100 No LOKDocView packaging for Win/Mac for the while This unbreaks Windows packaging after 85b46f51928dc17cda1bc974bca9159de9221b4d - I guess this should be Linux-only for the moment. Change-Id: Ie19f7f3e4b611e2884e3fdb1a64c63927b018989 diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 47c8cc6..2f4320b 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -103,7 +103,9 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ scp2/source/ooo/mingw_dlls \ ) \ scp2/source/ooo/module_filter \ -scp2/source/ooo/module_libreofficekit \ +$(if $(filter-out MACOSX WNT,$(OS)), \ + scp2/source/ooo/module_libreofficekit \ + ) \ )) $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: unostyle.cxx: Repeatedly driving over changes of others ...
I have submitted a fix to gerrit, waiting for Jenkins to verify this on all platforms. https://gerrit.libreoffice.org/#/c/21618/ Chris > On 20 Jan 2016, at 7:37 AM, Chris Sherlock wrote: > > Hey, I totally understand the feeling - I made a number of mistakes and > compounded things greatly. > > It honestly shouldn’t take long to fix this - I just need to get the original > file and then change all the GetName’s to GetFamilyName on that one file :-) > The only limiting factor is how fast my computer will build sw! > > For the original issue, I’m going to start building on my own OS X machine > and not rely on gerrit so much, and I’ll resurrect my Windows laptop > (hopefully not on its last legs) and install lode. That should help with my > build workflow, and take some pressure off the buildbots, and should prevent > me from making mistakes like that in future. > > Chris > > >> On 20 Jan 2016, at 7:32 AM, Bjoern Michaelsen >> wrote: >> >> Hi Chris, >> >> On Wed, Jan 20, 2016 at 07:02:37AM +1100, Chris Sherlock wrote: >>> I will fix this immediately. >> >> Thanks, I was first confused by the source I saw lcov.libreoffice.org >> operating >> on and then got a bit indignified when I figured out what happened looking at >> the commit log. If this is fixed soonish, lets forget about this, no harm >> done. >> >> Best, >> >> Bjoern > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.0.5.1'
Tag 'libreoffice-5.0.5.1' created by Christian Lohmaier at 2016-01-20 00:29 -0800 Tag libreoffice-5.0.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWntTjAAoJEPQ0oe+v7q6j7UAP/RXfczJoRCbbh6eWH9jXfdOe h7T2TikZ7r4c55rXvA8JhKEuNVaZExi+Eos3zrw1Y82K+NXY0VAINwP1KtYLNQjs TzjFgYHh9cwzAXyrfitP29D7hp8ZviqJ3boqbYzIJYaQ5HrNfRJciZ5x1MSK8oA3 a7YU1GKiIo2qB+WpnzkqW9EX/CexK2qlFnmpTTLq7WTim3bYJy3IqwkYWFlmFsVF 884KP2t/p1Cf+w6S7HnNZJnrBcXZVoJhru1xLf534jSMzPrHQPy4AK/aGTEzeThj na5hAaRXKw0Sc46tE5ZJfYZpfMAZt4UU9D84kJnG765P5WnO45XVc36572NDwUuC T9/INhOSCO550VSx4MUzGK5s3qGosZW+FjK+2xo4JT+/TW995DKJQBNe5ZVL9ct6 sIbcplNr1/9QMzw9LvNMTSsxg0zTZ4iykSCz4aZzvNDAqvbi9ctBMrzfTlggnqJp tW3rBWBYcv9j00Bf7meoy7dvUmjRlS3PtaPOsaVj9QNqZmX3FpnWjFq/FwSmWPew 09a1UxSAJXcLXPHxoY6WUFOH2AmOVyHzqesZ2K0jO6+MgJ6o2DQgFnOIs0mEeB4A QyD6vYFoFUg42qU8k69sByuDAWAUognxswSZlbxJ4hEvOQrn0jiMVprc0yVq0Tot TPn6dTN3exIp6tyfCd2A =750m -END PGP SIGNATURE- Changes since cp-5.0-branch-point-1591: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.0.5.1'
Tag 'libreoffice-5.0.5.1' created by Christian Lohmaier at 2016-01-20 00:29 -0800 Tag libreoffice-5.0.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWntTdAAoJEPQ0oe+v7q6jgaMP/1mJBbffRJKIcRWOl85NXWzn vdMwlV6xHZvL0GE4BCuU6GG6fQGqyDmfbYKkkmgA5kr9ylrVH5tSqHy7idvQK16s rvmovO00Au5kkMtcbV2AjItO+M/fDRU6hk0/X/V74rLhwujXPVOyLNaET1rMC6h6 JrkwDj4t9HgmMLhss6y9XLRo/oyFqonPE1Aj2+OqQ/ECrzN3dpI2tShnVxQxuXv7 wwn+BBUKZHd6kk+Bf0w/LpGXjJnX0LEzmISJF88qxJchh7gNDsstDQJgEzbqzt7u HbP8OFEWWh3fl+4ISHLboXRCNjoI9x0SEYkFjO8FOeC8U37fcPWVZISxi014iwUD bOqc8zgig/cmZ3a2f8r1/J0Jksk6w5mLrQJ8VMETX/8bSLM5YuWXAJ8FIul2odMH /WEiUX6OLtUhcXFbRKd3qoS/01KZFenoNisjt+TkS/heBvhvZ+3SiruyUjh0zUJI cLs8SADwU4kalblybDLUMkjylCFzIseQS1aFUhnVNVR/AL3kwPAq8nYz1ixSFJMZ FAdkrKXMR6xPvL6ftN/ZBXgbcFlh6h4qKrbBEQIBG5IFAsgaBZutsgzwxLhgJa4T ZSAN5jzMvQtXH8cOVeV3MYlZojVrfRhTSmSiUtxdCMLScLeNuhD264SBtIbzMWUx BMGoF9PE0CEOomtCpPiW =c41U -END PGP SIGNATURE- Changes since cp-5.0-18-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.0.5.1'
Tag 'libreoffice-5.0.5.1' created by Christian Lohmaier at 2016-01-20 00:29 -0800 Tag libreoffice-5.0.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWntTgAAoJEPQ0oe+v7q6jjxsP/A7WR5eG3RpQljRvbqli9DuL uvZciniRFiTkNT4zbHsml1ew750tvK8O48as3pIUDDArBmHHxdeVTMBTiI5UITF0 dteWc77i1sO1kgSH+UZO/Z8PDflZjhQozq+zLw+9p/R5rNreGXtV1hACJ8/8Ma2c GsEaRY9MYck/zrHFA60xlPLOiYKOqEmNfSez9h2bKKqeOm1LHbVzfiQF7IC/fGEZ Ixw8TF/532gXWlaa6F+XBIhiyUedXFBrkPAFrC6Hq4qszmX5LqosM+9U1VeKprw5 D5gbqnjEaIo3ErskvPwLVlIYBWM6AIDPkJB4f5/ZDfaVbKUZ2/bA4nMeegNlGdc2 TdtsRareQjUFpfC9JNju5TLvUZbXy9Rlct+jCF8KujPPrvnspCd+zFGYpIaCP9lr O3818VfevR5uB0CKlzu5LrvRSSQ8Q/n0XwzgEqDKYpXMoj58Kl4yv6Ia/88piuBp T3toaQDWEjGSdA5g0QyadkwT0d9OJzg+D//UEf//8abBs2wlHomGut6ZqvNehQlC WhjKh6Em8CiMVbvgkWr46JDGij7hJkW6KotgjoCTo0DyrRjq+fHYrgSWyw68DdXl 326o7tvRua5/4bzLEkM400U/iVRhCNmF8dPITu7PO6NlATycsxqnV38gBf2A28WB fH7fsE0e434ehnWCeSnw =aNsa -END PGP SIGNATURE- Changes since cp-5.0-18-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.0.5.1'
Tag 'libreoffice-5.0.5.1' created by Christian Lohmaier at 2016-01-20 00:29 -0800 Tag libreoffice-5.0.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWntTZAAoJEPQ0oe+v7q6jFGUP/A55hxoPvIcrD8SRfJNMdpk2 eN/Bdh48BG0snz60u5AcJG9inlo147FUwj5X/QrzKzBH4w12H8o7VJHKMxkiMXva 14i6FVdEXo3I1an+Pt9J23hF76k7MuHb1GMrT+crO/3CzHhOlTSAzUcX2M3IBo/G E1guRHe24K5HpHCdVwSHwpbUd8BxW2jbLiRNdMYhdrWLhx3uX4/GFsYOXEVQoz+X jSau35uHeak8mCHmjV2k0gMsuF6jw1lAc5oCyfn29OWRt2btH/Wh82sXjTWybLzf YOkH/i3wGqXNnQ8SYNz00XX+htxV8s8G2XzufwqYRnS5yrXQkFv3Kb5mjjwVkSwo vcgxPSo1aQduKrkKMHE4rH7aRToMbR2W4n25Ry9v6k0G0HtKPplgUMlSjYMN4ki3 euCUlyxpXIyxIHzERK+Nk3tYGDOW5OF1395qnhY/rGtl9y1ZOKYZn6AxiC64gwV8 yV3jFWsJsihnSX52OtQPTZGwZu3gSwBS5pV5hbrJ25BUs/u2QPZgoNsBo0BF1ole pShZDdOuBgT9mAxpx/9XRs6zM973moj1GRbxwBGesabRzdj3G20Bqjd7Pq/Hatxi HLTWwOI2Ep7eKqPW2JqnYJBlGvi14GYrlfQ8Up7wTt4k1ZJ/zYvb24aabSEqGtUe I2KiXPdruxh5Zd89TWB+ =Lu35 -END PGP SIGNATURE- Changes since cp-5.0-18-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-5' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 40e048b30a0763f9897b380cac372f2668d7faba Author: Christian Lohmaier Date: Wed Jan 20 01:29:56 2016 +0100 bump product version to 5.0.5.1.0+ Change-Id: I14cceeb7fb6e425418b9f8b1aedc67556b55cd81 diff --git a/configure.ac b/configure.ac index 6ce1e51..7f4f47a60 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.0.5.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.0.5.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2f6e3fbf54795af75cb3733d3e82dda48fc760f3 Author: Christian Lohmaier Date: Wed Jan 20 01:26:40 2016 +0100 bump product version to 5.0.6.0.0+ Change-Id: I04b67426055fc067403c8f5ee7fb6b5598faf43d diff --git a/configure.ac b/configure.ac index 6ce1e51..bf3d55b 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.0.5.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.0.6.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-5-0-5'
New branch 'libreoffice-5-0-5' available with the following commits: commit ce4424d992b825c180af6db609618c381506dbc9 Author: Christian Lohmaier Date: Wed Jan 20 01:22:47 2016 +0100 Branch libreoffice-5-0-5 This is 'libreoffice-5-0-5' - the stable branch for the 5.0.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, please use the 'libreoffice-5-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ic250e6be9f165a75dcf54f988303c420a0819fb6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-0-5'
New branch 'libreoffice-5-0-5' available with the following commits: commit 16405f354a17e79b2a8797d6bea42a42d305e2ad Author: Christian Lohmaier Date: Wed Jan 20 01:22:22 2016 +0100 Branch libreoffice-5-0-5 This is 'libreoffice-5-0-5' - the stable branch for the 5.0.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, please use the 'libreoffice-5-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ie56d6f7727be74ebc5c1081199bb36c0604b830d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-0-5'
New branch 'libreoffice-5-0-5' available with the following commits: commit 25d2fa38d0abde15dfaef626ce7adc90885fb887 Author: Christian Lohmaier Date: Wed Jan 20 01:22:22 2016 +0100 Branch libreoffice-5-0-5 This is 'libreoffice-5-0-5' - the stable branch for the 5.0.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, please use the 'libreoffice-5-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Iac9b3fe71bae4eb28891a0dc31d279bb22ac827a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-5-0-5'
New branch 'libreoffice-5-0-5' available with the following commits: commit 45c8e98259ca99f0facffa70975219a0377b5e00 Author: Christian Lohmaier Date: Wed Jan 20 01:22:22 2016 +0100 Branch libreoffice-5-0-5 This is 'libreoffice-5-0-5' - the stable branch for the 5.0.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, please use the 'libreoffice-5-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I006d7fb82c64358bd140471c107f8cc445579e69 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2849 ++-- 1 file changed, 1431 insertions(+), 1418 deletions(-) New commits: commit 0465c9517302fa71629265f2c82e3fc639e182f7 Author: Christian Lohmaier Date: Wed Jan 20 01:11:48 2016 +0100 update credits Change-Id: Ib620fe26481bf13021930ae58f7421b9cb7bdb4b (cherry picked from commit 00c523c0daac1934e300775ea370003e84da1971) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 3169333..a805df2 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,7 +1,7 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA 527 @@ -68,7 +68,7 @@ false false true - 4535349 + 4624212 false false false @@ -311,26 +311,23 @@ - + - + - + - + - + - - - @@ -392,24 +389,24 @@ - + - + - + - + - + - + @@ -1032,7 +1029,7 @@ Credits -1106 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-13 00:52:38. +1109 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-19 20:11:57. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1059,10 +1056,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 18869Joined: 2000-10-10 + Caolán McNamaraCommits: 18937Joined: 2000-10-10 - Stephan BergmannCommits: 11080Joined: 2000-10-04 + Stephan BergmannCommits: 11144Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1070,21 +1067,21 @@ - Tor LillqvistCommits: 7245Joined: 2010-03-23 + Tor LillqvistCommits: 7257Joined: 2010-03-23 Kohei YoshidaCommits: 5364Joined: 2009-06-19 - Miklos VajnaCommits: 5210Joined: 2010-07-29 + Miklos VajnaCommits: 5246Joined: 2010-07-29 - *Noel GrandinCommits: 5163Joined: 2011-12-12 + *Noel GrandinCommits: 5210Joined: 2011-12-12 - Michael StahlCommits: 5162Joined: 2008-06-16 + Michael StahlCommits: 5194Joined: 2008-06-16
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2849 ++-- 1 file changed, 1431 insertions(+), 1418 deletions(-) New commits: commit 0872eec5c78e6fef22d89142850f151937aaf673 Author: Christian Lohmaier Date: Wed Jan 20 01:11:48 2016 +0100 update credits Change-Id: Ib620fe26481bf13021930ae58f7421b9cb7bdb4b (cherry picked from commit 00c523c0daac1934e300775ea370003e84da1971) (cherry picked from commit dc7ec3770819a9aa485221cc8a9b169462689515) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 3169333..a805df2 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,7 +1,7 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA 527 @@ -68,7 +68,7 @@ false false true - 4535349 + 4624212 false false false @@ -311,26 +311,23 @@ - + - + - + - + - + - - - @@ -392,24 +389,24 @@ - + - + - + - + - + - + @@ -1032,7 +1029,7 @@ Credits -1106 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-13 00:52:38. +1109 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-19 20:11:57. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1059,10 +1056,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 18869Joined: 2000-10-10 + Caolán McNamaraCommits: 18937Joined: 2000-10-10 - Stephan BergmannCommits: 11080Joined: 2000-10-04 + Stephan BergmannCommits: 11144Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1070,21 +1067,21 @@ - Tor LillqvistCommits: 7245Joined: 2010-03-23 + Tor LillqvistCommits: 7257Joined: 2010-03-23 Kohei YoshidaCommits: 5364Joined: 2009-06-19 - Miklos VajnaCommits: 5210Joined: 2010-07-29 + Miklos VajnaCommits: 5246Joined: 2010-07-29 - *Noel GrandinCommits: 5163Joined: 2011-12-12 + *Noel GrandinCommits: 5210Joined: 2011-12-12 - Michael StahlCommits: 5162Joined: 2008-06-1
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2849 ++-- 1 file changed, 1431 insertions(+), 1418 deletions(-) New commits: commit dc7ec3770819a9aa485221cc8a9b169462689515 Author: Christian Lohmaier Date: Wed Jan 20 01:11:48 2016 +0100 update credits Change-Id: Ib620fe26481bf13021930ae58f7421b9cb7bdb4b (cherry picked from commit 00c523c0daac1934e300775ea370003e84da1971) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 3169333..a805df2 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,7 +1,7 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA 527 @@ -68,7 +68,7 @@ false false true - 4535349 + 4624212 false false false @@ -311,26 +311,23 @@ - + - + - + - + - + - - - @@ -392,24 +389,24 @@ - + - + - + - + - + - + @@ -1032,7 +1029,7 @@ Credits -1106 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-13 00:52:38. +1109 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-19 20:11:57. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1059,10 +1056,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 18869Joined: 2000-10-10 + Caolán McNamaraCommits: 18937Joined: 2000-10-10 - Stephan BergmannCommits: 11080Joined: 2000-10-04 + Stephan BergmannCommits: 11144Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1070,21 +1067,21 @@ - Tor LillqvistCommits: 7245Joined: 2010-03-23 + Tor LillqvistCommits: 7257Joined: 2010-03-23 Kohei YoshidaCommits: 5364Joined: 2009-06-19 - Miklos VajnaCommits: 5210Joined: 2010-07-29 + Miklos VajnaCommits: 5246Joined: 2010-07-29 - *Noel GrandinCommits: 5163Joined: 2011-12-12 + *Noel GrandinCommits: 5210Joined: 2011-12-12 - Michael StahlCommits: 5162Joined: 2008-06-16 + Michael StahlCommits: 5194Joined: 2008-06-16
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2849 ++-- 1 file changed, 1431 insertions(+), 1418 deletions(-) New commits: commit 00c523c0daac1934e300775ea370003e84da1971 Author: Christian Lohmaier Date: Wed Jan 20 01:11:48 2016 +0100 update credits Change-Id: Ib620fe26481bf13021930ae58f7421b9cb7bdb4b diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 3169333..a805df2 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,7 +1,7 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA 527 @@ -68,7 +68,7 @@ false false true - 4535349 + 4624212 false false false @@ -311,26 +311,23 @@ - + - + - + - + - + - - - @@ -392,24 +389,24 @@ - + - + - + - + - + - + @@ -1032,7 +1029,7 @@ Credits -1106 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-13 00:52:38. +1109 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-19 20:11:57. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1059,10 +1056,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 18869Joined: 2000-10-10 + Caolán McNamaraCommits: 18937Joined: 2000-10-10 - Stephan BergmannCommits: 11080Joined: 2000-10-04 + Stephan BergmannCommits: 11144Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1070,21 +1067,21 @@ - Tor LillqvistCommits: 7245Joined: 2010-03-23 + Tor LillqvistCommits: 7257Joined: 2010-03-23 Kohei YoshidaCommits: 5364Joined: 2009-06-19 - Miklos VajnaCommits: 5210Joined: 2010-07-29 + Miklos VajnaCommits: 5246Joined: 2010-07-29 - *Noel GrandinCommits: 5163Joined: 2011-12-12 + *Noel GrandinCommits: 5210Joined: 2011-12-12 - Michael StahlCommits: 5162Joined: 2008-06-16 + Michael StahlCommits: 5194Joined: 2008-06-16 Frank Schoenheit [fs]Commits: 5008Joined: 2000-09-19 @@ -1093,12
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9d09db27a819b9c3a8c86a792cd95402e4cb3f67 Author: Christian Lohmaier Date: Wed Jan 20 01:01:12 2016 +0100 Updated core Project: translations 570c55cf00a9e100dbd6fb99543a3f19484a4e7c update translations for 5.0.5 rc1 and force-fix errors using pocheck Change-Id: I3dab47d7c02a3be443ff060d0206206f9844b605 diff --git a/translations b/translations index a4d73b6..570c55c 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit a4d73b6c9d421623eef51d4ca9907954002cf8dd +Subproject commit 570c55cf00a9e100dbd6fb99543a3f19484a4e7c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sc/source
sc/source/ui/view/viewdata.cxx | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 33619948835d8b9522cf7240125f8018c50a437d
Author: Henry Castro
Date: Tue Jan 19 15:11:57 2016 -0400
sc lokit: the visible row/column must be 0, when loading a document
Change-Id: Ie980e0bb0726dd8bc4215d5b23ac6e1d2c9e2719
Reviewed-on: https://gerrit.libreoffice.org/21611
Reviewed-by: Henry Castro
Tested-by: Henry Castro
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 85fc81a..290bb46 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -171,6 +171,7 @@ void ScViewDataTable::ReadUserDataSequence(const
uno::Sequence >= nTemp32;
-nPosX[SC_SPLIT_LEFT] = SanitizeCol( static_cast(nTemp32));
+nPosX[SC_SPLIT_LEFT] = bIsTiledRendering ? 0 :
+ SanitizeCol( static_cast(nTemp32));
}
else if (sName == SC_POSITIONRIGHT)
{
aSettings[i].Value >>= nTemp32;
-nPosX[SC_SPLIT_RIGHT] = SanitizeCol( static_cast(nTemp32));
+nPosX[SC_SPLIT_RIGHT] = bIsTiledRendering ? 0 :
+SanitizeCol( static_cast(nTemp32));
}
else if (sName == SC_POSITIONTOP)
{
aSettings[i].Value >>= nTemp32;
-nPosY[SC_SPLIT_TOP] = SanitizeRow( static_cast(nTemp32));
+nPosY[SC_SPLIT_TOP] = bIsTiledRendering ? 0 :
+ SanitizeRow( static_cast(nTemp32));
}
else if (sName == SC_POSITIONBOTTOM)
{
aSettings[i].Value >>= nTemp32;
-nPosY[SC_SPLIT_BOTTOM] = SanitizeRow( static_cast(nTemp32));
+nPosY[SC_SPLIT_BOTTOM] = bIsTiledRendering ? 0 :
+ SanitizeRow( static_cast(nTemp32));
}
else if (sName == SC_ZOOMTYPE)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewdata.cxx | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 029ce852c2f67e06d60e0ce50fff936c8e2ce9f4
Author: Henry Castro
Date: Tue Jan 19 15:11:57 2016 -0400
sc lokit: the visible row/column must be 0, when loading a document
Change-Id: Ie980e0bb0726dd8bc4215d5b23ac6e1d2c9e2719
Reviewed-on: https://gerrit.libreoffice.org/21611
Reviewed-by: Henry Castro
Tested-by: Henry Castro
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index c1889e0..f5a8384 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -172,6 +172,7 @@ void ScViewDataTable::ReadUserDataSequence(const
uno::Sequence >= nTemp32;
-nPosX[SC_SPLIT_LEFT] = SanitizeCol( static_cast(nTemp32));
+nPosX[SC_SPLIT_LEFT] = bIsTiledRendering ? 0 :
+ SanitizeCol( static_cast(nTemp32));
}
else if (sName == SC_POSITIONRIGHT)
{
aSettings[i].Value >>= nTemp32;
-nPosX[SC_SPLIT_RIGHT] = SanitizeCol( static_cast(nTemp32));
+nPosX[SC_SPLIT_RIGHT] = bIsTiledRendering ? 0 :
+SanitizeCol( static_cast(nTemp32));
}
else if (sName == SC_POSITIONTOP)
{
aSettings[i].Value >>= nTemp32;
-nPosY[SC_SPLIT_TOP] = SanitizeRow( static_cast(nTemp32));
+nPosY[SC_SPLIT_TOP] = bIsTiledRendering ? 0 :
+ SanitizeRow( static_cast(nTemp32));
}
else if (sName == SC_POSITIONBOTTOM)
{
aSettings[i].Value >>= nTemp32;
-nPosY[SC_SPLIT_BOTTOM] = SanitizeRow( static_cast(nTemp32));
+nPosY[SC_SPLIT_BOTTOM] = bIsTiledRendering ? 0 :
+ SanitizeRow( static_cast(nTemp32));
}
else if (sName == SC_ZOOMTYPE)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: unostyle.cxx: Repeatedly driving over changes of others ...
OK, this is taking a little longer than I was expecting. I know exactly how to fix this, I’m afraid I was so embarrassed by the mistake I made that I forgot I was in the middle of another change I was making when I read this email that I fixed up the issue and managed to entangle that change in my fix. Don’t worry, it’s not something I’ve committed to master, but I’m redoing the change now and doing another build on my local system. I’ll send this to gerrit and ensure it builds cleanly - I’ll update the list with the gerrit URL when I do so. Once again, I deeply apologise for the error I made repeatedly. I’ve stopped all work on anything till I get this fixed, which I want to do in as clean a manner as possible. Chris > On 20 Jan 2016, at 7:37 AM, Chris Sherlock wrote: > > Hey, I totally understand the feeling - I made a number of mistakes and > compounded things greatly. > > It honestly shouldn’t take long to fix this - I just need to get the original > file and then change all the GetName’s to GetFamilyName on that one file :-) > The only limiting factor is how fast my computer will build sw! > > For the original issue, I’m going to start building on my own OS X machine > and not rely on gerrit so much, and I’ll resurrect my Windows laptop > (hopefully not on its last legs) and install lode. That should help with my > build workflow, and take some pressure off the buildbots, and should prevent > me from making mistakes like that in future. > > Chris > > >> On 20 Jan 2016, at 7:32 AM, Bjoern Michaelsen >> wrote: >> >> Hi Chris, >> >> On Wed, Jan 20, 2016 at 07:02:37AM +1100, Chris Sherlock wrote: >>> I will fix this immediately. >> >> Thanks, I was first confused by the source I saw lcov.libreoffice.org >> operating >> on and then got a bit indignified when I figured out what happened looking at >> the commit log. If this is fixed soonish, lets forget about this, no harm >> done. >> >> Best, >> >> Bjoern > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: building a shadow test lib with all symbols? (was: Adding cppunit test to ucb.ucp.webdav)
On Tue, Jan 19, 2016 at 11:46:21PM +0100, Bjoern Michaelsen wrote: > The last point is a huge disadvantage -- but I wonder if it might be workable > these days, esp. since the static relinking of huge amounts of the same > objects > in some 10-20 test libs as we are doing today does not come for free > either[2]. For reference on a master checkout: du -sch workdir/LinkTarget/CppunitTest/libtest_sw_*|grep total 35M total du -sh instdir/program/libswlo.so 19M instdir/program/libswlo.so Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
building a shadow test lib with all symbols? (was: Adding cppunit test to ucb.ucp.webdav)
Hi, On Tue, Jan 19, 2016 at 03:38:32PM +0100, Stephan Bergmann wrote: > There's two approaches to this ugly problem. One is as above, with the > downside of increasing the number of global symbols. The other is to link a > Library's objects directly into a CppunitTest library via > gb_CppunitTest_use_library_objects. The downside there is that you need > typically duplicate all the Library_*.mk's gb_Library_set/use/whatever... > calls as gb_CppunitTest_... calls in the CppunitTest_*.mk. > > Both approaches suck. True. It was "Good Enough"(tm) for the time being "Back Then"[1], but we have much more tests now. I wonder if we should consider something like creating a second "shadow" library that exports all symbols, but doesnt get build by default. Thus e.g. the stuff in sw/Library_sw.mk would create _two_ targets: ./instdir/program/libswlo.so ./workdir/LinkTarget/libswlo_tests.so Only the first is made a depended upon by the module (and thus is build unconditionally). This is the one we build now already, in a "production" style. The second one is not build by default, until a CppunitTest doesnt something like: $(eval $(call gb_CppunitTest_use_test_libraries, sw_uwriter, sw)) which would link against ./workdir/LinkTarget/libswlo_tests.so (which exports all symbols). This would: + remove the need for duplicating all the build parameters in a bitrotting and error-prone fashion + remove the need for re-linking the same objects is loads of unittests again and again + remove the need to export symbols in production just for tests + remove the need to think about which set of object files I need to link in a unittest - likely require us to build the targeted libs twice The last point is a huge disadvantage -- but I wonder if it might be workable these days, esp. since the static relinking of huge amounts of the same objects in some 10-20 test libs as we are doing today does not come for free either[2]. Most importantly, once done the incremental cost in adding a new test both in manpower, build time and discspace is lowered a lot with this. Opinions? Best, Bjoern [1] Admittedly that likely glorified past and a lame excuse. [2] As a bonus, one _might_ consider things like building the _tests.so lib with DEBUG=T or somesuch by default. I am not entirely sure that would be a good idea though (as it would be testing code that is too different from what we ship, while not testing the code that we ship). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl
include/vcl/menu.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f52f2e6aaec8263922befe9203416b7a5c54753c Author: Stephan Bergmann Date: Tue Jan 19 23:25:54 2016 +0100 DeactivateMenuBar can be non-virtual now ...after 9c09d4d0d36076d39926eeaf7774171df3b55e52 "tdf#96888 - Kill internal vcl dog-tags ..." Change-Id: I12c30f5ec3d498561b47ae61b34326d4a1f380d7 diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 7e6b244..774fd40 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -448,7 +448,7 @@ public: virtual void ClosePopup(Menu* pMenu) override; /// Deactivate the MenuBarWindow. -virtual void DeactivateMenuBar(VclPtr& xFocusId); +void DeactivateMenuBar(VclPtr& xFocusId); /// Forward the KeyInput call to the MenuBar. virtual void MenuBarKeyInput(const KeyEvent& rEvent) override; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - xmloff/source
xmloff/source/text/XMLTextFrameContext.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ac05fade5b56be408b014140bd243b21e807be4a
Author: Caolán McNamara
Date: Tue Jan 19 14:03:12 2016 +
Resolves: tdf#96245 relax test for duplicate frame names
to allow duplicated unnamed frames
Change-Id: I871849b23d01209f027b6295777db705f7dc86d8
(cherry picked from commit 86963c2e23aebfa7b9df4e2d28278dfb581974d3)
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index 2b4727e..20768ff 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -597,7 +597,8 @@ void XMLTextFrameContext_Impl::Create( bool
/*bHRefOrBase64*/ )
{
bool bSuccess = xTextImportHelper->GetRenameMap().Add(
XML_TEXT_RENAME_TYPE_FRAME,
sOldName, sName );
-if (!bSuccess)
+
+if (!bSuccess && !sOldName.isEmpty())
{
bCreateFailed = true;
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk scp2/source
scp2/InstallModule_ooo.mk |1 + scp2/source/ooo/module_libreofficekit.scp |2 ++ 2 files changed, 3 insertions(+) New commits: commit 8373ae58eb0dfb57d5145afaf6830ec9f05849de Author: Miklos Vajna Date: Tue Jan 19 22:03:39 2016 +0100 scp2: fix --disable-gtk3 build Change-Id: I231cb935f1d0a4e69bc3f970e48aece8305ab2b3 diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 77b865c..47c8cc6 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -19,6 +19,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_GTK \ + ENABLE_GTK3 \ ENABLE_MACOSX_SANDBOX \ ENABLE_ONLINE_UPDATE \ ENABLE_TDE \ diff --git a/scp2/source/ooo/module_libreofficekit.scp b/scp2/source/ooo/module_libreofficekit.scp index e66331f..09b3220 100644 --- a/scp2/source/ooo/module_libreofficekit.scp +++ b/scp2/source/ooo/module_libreofficekit.scp @@ -28,6 +28,7 @@ Directory gid_Dir_Share_Libreofficekit DosName = "libreofficekit"; End +#ifdef ENABLE_GTK3 File gid_File_Dat_HandleImageStart TXT_FILE_BODY; Dir = gid_Dir_Share_Libreofficekit; @@ -55,5 +56,6 @@ File gid_File_Dat_HandleGraphic Name = "handle_graphic.png"; Styles = (PACKED); End +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 10c9f31ad7d0696327b67b6d2a4e3f244473d877
Author: Stephan Bergmann
Date: Tue Jan 19 22:05:00 2016 +0100
loplugin:cstylecast
Change-Id: Ib4052fa88cce3b21d20d050fff9c8d32fcde4c20
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d2b4f60..6b8f369 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1576,7 +1576,7 @@ static char* lo_getError (LibreOfficeKit *pThis)
}
static void lo_freeError(const char *pfree)
{
-free((void *) pfree);
+free(const_cast(pfree));
}
static char* lo_getFilterTypes(LibreOfficeKit* pThis)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: unostyle.cxx: Repeatedly driving over changes of others ...
Hey, I totally understand the feeling - I made a number of mistakes and compounded things greatly. It honestly shouldn’t take long to fix this - I just need to get the original file and then change all the GetName’s to GetFamilyName on that one file :-) The only limiting factor is how fast my computer will build sw! For the original issue, I’m going to start building on my own OS X machine and not rely on gerrit so much, and I’ll resurrect my Windows laptop (hopefully not on its last legs) and install lode. That should help with my build workflow, and take some pressure off the buildbots, and should prevent me from making mistakes like that in future. Chris > On 20 Jan 2016, at 7:32 AM, Bjoern Michaelsen > wrote: > > Hi Chris, > > On Wed, Jan 20, 2016 at 07:02:37AM +1100, Chris Sherlock wrote: >> I will fix this immediately. > > Thanks, I was first confused by the source I saw lcov.libreoffice.org > operating > on and then got a bit indignified when I figured out what happened looking at > the commit log. If this is fixed soonish, lets forget about this, no harm > done. > > Best, > > Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loolwsd/configure.ac
loolwsd/configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 04bd9722ae3acdbb4a7bfe824d078708477ad556 Author: Andras Timar Date: Tue Jan 19 21:34:42 2016 +0100 loolwsd: bump version after tarball diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index 49acb84..89a5cf0 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.4.34], [libreoff...@collabora.com]) +AC_INIT([loolwsd], [1.4.35], [libreoff...@collabora.com]) AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects]) commit 1a9fdd1aeaaf10978088bc7cb25d1f4e803e5bd0 Author: Andras Timar Date: Tue Jan 19 17:24:56 2016 +0100 loolwsd: bump version before tarball diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index db16403..49acb84 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.4.33], [libreoff...@collabora.com]) +AC_INIT([loolwsd], [1.4.34], [libreoff...@collabora.com]) AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: unostyle.cxx: Repeatedly driving over changes of others ...
Hi Chris, On Wed, Jan 20, 2016 at 07:02:37AM +1100, Chris Sherlock wrote: > I will fix this immediately. Thanks, I was first confused by the source I saw lcov.libreoffice.org operating on and then got a bit indignified when I figured out what happened looking at the commit log. If this is fixed soonish, lets forget about this, no harm done. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: unostyle.cxx: Repeatedly driving over changes of others ...
I am just compiling now. Chris > On 20 Jan 2016, at 7:00 AM, Bjoern Michaelsen > wrote: > > Hi Chris, > > with commits: > > http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=2b297116cb6bb1061c43e5714e2609c8ee9f57d2 > > which was reverted by Norbert for breaking the build and then again: > > http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=28c96fc2553a5c3dee108f1e2060d7bc081a7e7e > > which is not trivially revertable anymore right now, you mangled and undid the > changes done to sw/source/core/unocore/unostyle.cxx with a steamroller -- > _twice_. > > Please stop whatever you are doing right now and an ensure to restore > unostyle.cxx to be properly based on: > > http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=394895de8c47e7ab3b560d1ecb3242901a9ff92b > > ASAP. I assume this was a innocent (if repeated) mistake and not an attempt at > wikipedia-editwar brute forcing, but if you have 'accidents' like this please > consider to SLOW IT DOWN. > > Please make sure to clean up this mess in the next 48 hours and that you dont > undo the work of others in the future. > > Best, > > Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 95060d44300d8866fa81c16fc8fe2afe22d63777 Author: Andras Timar Date: Tue Jan 19 17:11:09 2016 +0100 Bump version to 5.0-19 Change-Id: I59783e40f3274c37bd8d77aaa333727a526e99e0 diff --git a/configure.ac b/configure.ac index b38eb92..f023616 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.0.10.18],[],[],[https://CollaboraOffice.com/]) +AC_INIT([Collabora Office],[5.0.10.19],[],[],[https://CollaboraOffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: unostyle.cxx: Repeatedly driving over changes of others ...
I can assure you, it was entirely innocent! I would *never* do this on purpose. I’ll fix this ASAP. Terribly sorry, I didn’t realise I had done this. I will fix this immediately. Chris > On 20 Jan 2016, at 7:00 AM, Bjoern Michaelsen > wrote: > > Hi Chris, > > with commits: > > http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=2b297116cb6bb1061c43e5714e2609c8ee9f57d2 > > which was reverted by Norbert for breaking the build and then again: > > http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=28c96fc2553a5c3dee108f1e2060d7bc081a7e7e > > which is not trivially revertable anymore right now, you mangled and undid the > changes done to sw/source/core/unocore/unostyle.cxx with a steamroller -- > _twice_. > > Please stop whatever you are doing right now and an ensure to restore > unostyle.cxx to be properly based on: > > http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=394895de8c47e7ab3b560d1ecb3242901a9ff92b > > ASAP. I assume this was a innocent (if repeated) mistake and not an attempt at > wikipedia-editwar brute forcing, but if you have 'accidents' like this please > consider to SLOW IT DOWN. > > Please make sure to clean up this mess in the next 48 hours and that you dont > undo the work of others in the future. > > Best, > > Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
unostyle.cxx: Repeatedly driving over changes of others ...
Hi Chris, with commits: http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=2b297116cb6bb1061c43e5714e2609c8ee9f57d2 which was reverted by Norbert for breaking the build and then again: http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=28c96fc2553a5c3dee108f1e2060d7bc081a7e7e which is not trivially revertable anymore right now, you mangled and undid the changes done to sw/source/core/unocore/unostyle.cxx with a steamroller -- _twice_. Please stop whatever you are doing right now and an ensure to restore unostyle.cxx to be properly based on: http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=394895de8c47e7ab3b560d1ecb3242901a9ff92b ASAP. I assume this was a innocent (if repeated) mistake and not an attempt at wikipedia-editwar brute forcing, but if you have 'accidents' like this please consider to SLOW IT DOWN. Please make sure to clean up this mess in the next 48 hours and that you dont undo the work of others in the future. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/impfont.hxx | 19 ---
1 file changed, 8 insertions(+), 11 deletions(-)
New commits:
commit 005bc2c94f8e075207d5e53c1494e4e66607062a
Author: Chris Sherlock
Date: Wed Jan 20 06:55:12 2016 +1100
vcl: fix comments in impfont.hxx
Change-Id: I7942cf513439f8fe72775846eeb4cf4e6f176ed3
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index aaad50a2..c425ea7 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -68,9 +68,9 @@ public:
// device dependent functions
int GetQuality() const {
return mnQuality; }
-voidSetQuality( int nQuality ) { mnQuality =
nQuality; }
-voidIncreaseQualityBy( int nQualityAmount ) { mnQuality +=
nQualityAmount; }
-voidDecreaseQualityBy( int nQualityAmount ) { mnQuality -=
nQualityAmount; }
+voidSetQuality( int nQuality ) {
mnQuality = nQuality; }
+voidIncreaseQualityBy( int nQualityAmount ) {
mnQuality += nQualityAmount; }
+voidDecreaseQualityBy( int nQualityAmount ) {
mnQuality -= nQualityAmount; }
/* Missing function: OUString GetMapNames() const; */
/* Missing function: bool IsBuiltInFont() const; */
@@ -79,16 +79,13 @@ public:
/* Missing function: bool CanRotate() const; */
/* Missing function: bool HasMapNames() const; */
-/* Missing function: void SetQuality( int nQuality ); */
-/* Missing function: void IncreaseQualityBy( int nQualityAmount ); */
-/* Missing function: void DecreaseQualityBy( int nQualityAmount ); */
/* Missing function: void SetNames( OUString const& ); */
-/* Missing function: Vod AddMapName( OUString const& ); */
+/* Missing function: void AddMapName( OUString const& ); */
-/* Missing function: SetBuiltInFontFlag( bool ); */
-/* Missing function: SetEmbeddableFlag( bool ); */
-/* Missing function: SetSettableFlag( bool ); */
-/* missing function: SetOrientationFlag( bool ); */
+/* Missing function: void SetBuiltInFontFlag( bool ); */
+/* Missing function: void SetEmbeddableFlag( bool ); */
+/* Missing function: void SetSettableFlag( bool ); */
+/* missing function: void SetOrientationFlag( bool ); */
booloperator==( const ImplFont& ) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/qa vcl/source
include/vcl/font.hxx |5 +
vcl/inc/impfont.hxx|7 ++-
vcl/qa/cppunit/font.cxx| 13 +
vcl/source/font/font.cxx | 29 +++--
vcl/source/outdev/font.cxx |1 +
5 files changed, 32 insertions(+), 23 deletions(-)
New commits:
commit 94b7876e43a88618364c8256f0645e70d0daae6f
Author: Chris Sherlock
Date: Tue Jan 19 14:10:02 2016 +1100
vcl: add quality accessor & mutator to Font
Change-Id: I261c717cabf966b8b20b8e6c921b38f4cd73e268
Reviewed-on: https://gerrit.libreoffice.org/21597
Tested-by: Jenkins
Reviewed-by: Chris Sherlock
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index bf50ab7..920f069 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -82,6 +82,11 @@ public:
voidSetSymbolFlag( bool );
+// Device dependent functions
+int GetQuality() const;
+
+voidSetQuality(int);
+
// setting the color on the font is obsolete, the only remaining
// valid use is for keeping backward compatibility with old MetaFiles
const Color&GetColor() const;
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index f9c006f..aaad50a2 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -66,7 +66,11 @@ public:
voidSetSymbolFlag( const bool bSymbolFlag ) {
mbSymbol = bSymbolFlag; }
// device dependent functions
-/* Missing function: int GetQuality() const; */
+int GetQuality() const {
return mnQuality; }
+
+voidSetQuality( int nQuality ) { mnQuality =
nQuality; }
+voidIncreaseQualityBy( int nQualityAmount ) { mnQuality +=
nQualityAmount; }
+voidDecreaseQualityBy( int nQualityAmount ) { mnQuality -=
nQualityAmount; }
/* Missing function: OUString GetMapNames() const; */
/* Missing function: bool IsBuiltInFont() const; */
@@ -121,6 +125,7 @@ private:
mbShadow:1,
mbVertical:1,
mbTransparent:1;// compatibility, now on output
device
+int mnQuality;
friend SvStream&ReadImplFont( SvStream& rIStm, ImplFont& );
friend SvStream&WriteImplFont( SvStream& rOStm, const ImplFont& );
diff --git a/vcl/qa/cppunit/font.cxx b/vcl/qa/cppunit/font.cxx
index a8532a9..f4fcf18 100644
--- a/vcl/qa/cppunit/font.cxx
+++ b/vcl/qa/cppunit/font.cxx
@@ -26,6 +26,7 @@ public:
void testWidthType();
void testPitch();
void testItalic();
+void testQuality();
void testSymbolFlagAndCharSet();
CPPUNIT_TEST_SUITE(VclFontTest);
@@ -34,6 +35,7 @@ public:
CPPUNIT_TEST(testWidthType);
CPPUNIT_TEST(testPitch);
CPPUNIT_TEST(testItalic);
+CPPUNIT_TEST(testQuality);
CPPUNIT_TEST(testSymbolFlagAndCharSet);
CPPUNIT_TEST_SUITE_END();
};
@@ -91,6 +93,17 @@ void VclFontTest::testPitch()
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Pitch should be PITCH_FIXED",
FontPitch::PITCH_FIXED, aFont.GetPitch());
}
+void VclFontTest::testQuality()
+{
+vcl::Font aFont;
+
+CPPUNIT_ASSERT_EQUAL( (int)0, aFont.GetQuality() );
+
+aFont.SetQuality( 100 );
+CPPUNIT_ASSERT_EQUAL( (int)100, aFont.GetQuality());
+}
+
+
void VclFontTest::testSymbolFlagAndCharSet()
{
// default constructor should set scalable flag to false
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 8cca361..7fe618a 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -771,41 +771,29 @@ Font Font::identifyFont( const void* i_pBuffer,
sal_uInt32 i_nSize )
// The inlines from the font.hxx header are now instantiated for
pImpl-ification
const Color& Font::GetColor() const { return mpImplFont->maColor; }
-
const Color& Font::GetFillColor() const { return mpImplFont->maFillColor; }
-
bool Font::IsTransparent() const { return mpImplFont->mbTransparent; }
FontAlign Font::GetAlign() const { return mpImplFont->meAlign; }
const OUString& Font::GetFamilyName() const { return
mpImplFont->GetFamilyName(); }
-
const OUString& Font::GetStyleName() const { return mpImplFont->maStyleName; }
const Size& Font::GetSize() const { return mpImplFont->maSize; }
-
void Font::SetHeight( long nHeight ) { SetSize( Size(
mpImplFont->maSize.Width(), nHeight ) ); }
-
long Font::GetHeight() const { return mpImplFont->maSize.Height(); }
-
void Font::SetWidth( long nWidth ) { SetSize( Size( nWidth,
mpImplFont->maSize.Height() ) ); }
-
long Font::GetWidth() const { return mpImplFont->maSize.Width(); }
rtl_TextEncoding Font::GetCharSet() const { return mpImplFont->meCharSet; }
const LanguageTag& Font::GetLanguageTag() const { return
mpImplFont->maLanguageTag; }
-
const LanguageTag& Font::GetCJKContextLanguageTag() const { return
mpImplFont->maCJKLanguageTag; }
-
LanguageType Font::GetLanguage() cons
[Bug 96888] Kill internal vcl dog-tags ...
https://bugs.documentfoundation.org/show_bug.cgi?id=96888 Commit Notification changed: What|Removed |Added Whiteboard|| target:5.2.0 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 96888] Kill internal vcl dog-tags ...
https://bugs.documentfoundation.org/show_bug.cgi?id=96888 --- Comment #34 from Commit Notification --- Ras-al-Ghul committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=9c09d4d0d36076d39926eeaf7774171df3b55e52 tdf#96888 - Kill internal vcl dog-tags ... It will be available in 5.2.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source include/vcl vcl/inc vcl/source
cui/source/dialogs/hangulhanjadlg.cxx|4 ++--
include/vcl/floatwin.hxx |2 +-
include/vcl/menu.hxx |5 +
include/vcl/window.hxx |4 ++--
vcl/inc/svdata.hxx |7 +--
vcl/source/window/floatwin.cxx | 10 +-
vcl/source/window/menu.cxx | 29 +++--
vcl/source/window/menubarwindow.cxx | 22 ++
vcl/source/window/menubarwindow.hxx |6 +++---
vcl/source/window/menufloatingwindow.cxx | 21 +
vcl/source/window/menufloatingwindow.hxx |8
vcl/source/window/window2.cxx| 20 +++-
12 files changed, 56 insertions(+), 82 deletions(-)
New commits:
commit 9c09d4d0d36076d39926eeaf7774171df3b55e52
Author: Ras-al-Ghul
Date: Thu Jan 14 01:38:03 2016 +0530
tdf#96888 - Kill internal vcl dog-tags ...
Modifications done as per CR
Change-Id: I0b57f5c32fc217929d71411ca5176e3cab3f6e73
Reviewed-on: https://gerrit.libreoffice.org/21457
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx
b/cui/source/dialogs/hangulhanjadlg.cxx
index 8ebe2f4..0be8100 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -825,9 +825,9 @@ namespace svx
// give the focus to the new def button temporarily - VCL is
somewhat peculiar
// in recognizing a new default button
-sal_uInt32 nSaveFocusId = Window::SaveFocus();
+VclPtr xSaveFocusId = Window::SaveFocus();
pNewDefButton->GrabFocus();
-Window::EndSaveFocus( nSaveFocusId );
+Window::EndSaveFocus( xSaveFocusId );
}
}
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index d999e65..61d724b 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -134,7 +134,7 @@ public:
SAL_DLLPRIVATE static Point ImplCalcPos( vcl::Window* pWindow,
const Rectangle& rRect,
FloatWinPopupFlags nFlags,
sal_uInt16& rArrangeIndex );
-SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags
nFlags = FloatWinPopupEndFlags::NONE, sal_uLong nFocusId = 0 );
+SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags
nFlags = FloatWinPopupEndFlags::NONE, VclPtr xFocusId = nullptr );
SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect();
SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return
mbInPopupMode; }
virtualvoid doDeferredInit(WinBits nBits) override;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index d5eec40..7e6b244 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -207,9 +207,6 @@ protected:
/// Close the 'pStartedFrom' menu window.
virtual void ClosePopup(Menu* pMenu) = 0;
-/// Deactivate the MenuBarWindow.
-virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId);
-
/// Forward the KeyInput call to the MenuBar.
virtual void MenuBarKeyInput(const KeyEvent& rEvent);
@@ -451,7 +448,7 @@ public:
virtual void ClosePopup(Menu* pMenu) override;
/// Deactivate the MenuBarWindow.
-virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId) override;
+virtual void DeactivateMenuBar(VclPtr& xFocusId);
/// Forward the KeyInput call to the MenuBar.
virtual void MenuBarKeyInput(const KeyEvent& rEvent) override;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 6b383bd..e757170 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1142,8 +1142,8 @@ public:
boolIsCompoundControl() const;
-static sal_uIntPtr SaveFocus();
-static bool EndSaveFocus( sal_uIntPtr nSaveId,
bool bRestore = true );
+static VclPtr SaveFocus();
+static bool EndSaveFocus( const
VclPtr& xFocusWin, bool bRestore = true );
voidCaptureMouse();
voidReleaseMouse();
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 7f6090b..285d847 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -406,11 +406,6 @@ private:
};
-struct ImplFocusDelData : public ImplDelData
-{
-VclPtr mpFocusWin;
-};
-
struct ImplSVEvent
{
void* mpData;
@@ -423,4 +418,4 @@ struct ImplSVEvent
#endif // INCLUDED_VCL_INC_SVDATA_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index b5c038c..8
[Bug 94865] MENU: Duplicate accelerators in en_US version
https://bugs.documentfoundation.org/show_bug.cgi?id=94865 raal changed: What|Removed |Added CC||baffc...@yahoo.co.jp --- Comment #12 from raal --- *** Bug 97222 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk scp2/source setup_native/source
scp2/InstallModule_ooo.mk|1 scp2/source/ooo/module_libreofficekit.scp| 59 +++ setup_native/source/packinfo/packinfo_office.txt | 14 + 3 files changed, 74 insertions(+) New commits: commit 85b46f51928dc17cda1bc974bca9159de9221b4d Author: Pranav Kant Date: Tue Jan 19 19:05:40 2016 +0530 lokdocview: Add scp files for selection handle PNGs Change-Id: I4d3eab1f16751a1b3f24a995e3d28322fd2f510b Reviewed-on: https://gerrit.libreoffice.org/21606 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index c9e4199..77b865c 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -102,6 +102,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ scp2/source/ooo/mingw_dlls \ ) \ scp2/source/ooo/module_filter \ +scp2/source/ooo/module_libreofficekit \ )) $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\ diff --git a/scp2/source/ooo/module_libreofficekit.scp b/scp2/source/ooo/module_libreofficekit.scp new file mode 100644 index 000..e66331f --- /dev/null +++ b/scp2/source/ooo/module_libreofficekit.scp @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "macros.inc" + +Module gid_Module_Libreofficekit +Name = "Libreofficekit Data"; +Description = "Libreofficekit Data"; +PackageInfo = "packinfo_office.txt"; +ParentID = gid_Module_Root_Brand; +Styles = (HIDDEN_ROOT); +Dirs = (gid_Dir_Share_Libreofficekit); +Files = ( +gid_File_Dat_HandleImageStart, +gid_File_Dat_HandleImageMiddle, +gid_File_Dat_HandleImageEnd, +gid_File_Dat_HandleGraphic); +End + +Directory gid_Dir_Share_Libreofficekit +ParentID = gid_Brand_Dir_Share; +DosName = "libreofficekit"; +End + +File gid_File_Dat_HandleImageStart +TXT_FILE_BODY; +Dir = gid_Dir_Share_Libreofficekit; +Name = "handle_image_start.png"; +Styles = (PACKED); +End + +File gid_File_Dat_HandleImageMiddle +TXT_FILE_BODY; +Dir = gid_Dir_Share_Libreofficekit; +Name = "handle_image_middle.png"; +Styles = (PACKED); +End + +File gid_File_Dat_HandleImageEnd +TXT_FILE_BODY; +Dir = gid_Dir_Share_Libreofficekit; +Name = "handle_image_end.png"; +Styles = (PACKED); +End + +File gid_File_Dat_HandleGraphic +TXT_FILE_BODY; +Dir = gid_Dir_Share_Libreofficekit; +Name = "handle_graphic.png"; +Styles = (PACKED); +End + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 8bc7ed8..a097481 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -1177,3 +1177,17 @@ destpath = "/opt" packageversion = "%PACKAGEVERSION" End +Start +module = "gid_Module_Libreofficekit" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-libreofficekit-data" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" +packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-libreofficekit-data" +requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxpatchrequires = "" +copyright = "2016 The Document Foundation" +solariscopyright = "solariscopyrightfile" +vendor = "The Document Foundation" +description = "Libreofficekit data files for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] website.git: Branch 'update' - check.php
check.php | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 0fa72acce23696490cd21480f44e2fbe9f238de0
Author: Christian Lohmaier
Date: Tue Jan 19 18:23:35 2016 +0100
enable update to 5.0.4
diff --git a/check.php b/check.php
index 3ff8ed4..c9afae7 100644
--- a/check.php
+++ b/check.php
@@ -387,6 +387,9 @@ $build_hash_to_version = array(
# 5.0.3
'fd8cfc22f7f58033351fcb8a83b92acbadb0749e' => '5.0.3.1',
'e5f16313668ac592c1bfb310f4390624e3dbfb75' => '5.0.3.2', # Final
+# 5.0.4
+'2def61bcbb29a7a8611b833682fe1291910b11ad' => '5.0.4.1',
+'2b9802c1994aa0b7dc6079e128979269cf95bc78' => '5.0.4.2', # Final
);
# Descriptions of the target versions
@@ -405,11 +408,11 @@ $update_map = array(
'update_type' => 'text/html',
'update_src' =>
'http://www.libreoffice.org/download/libreoffice-still/?type=&lang=&version=4.4.7',
'substitute' => true ),
-'latest' => array('gitid' =>
'e5f16313668ac592c1bfb310f4390624e3dbfb75',
- 'id' => 'LibreOffice 5.0.3',
- 'version' => '5.0.3',
+'latest' => array('gitid' =>
'2b9802c1994aa0b7dc6079e128979269cf95bc78',
+ 'id' => 'LibreOffice 5.0.4',
+ 'version' => '5.0.4',
'update_type' => 'text/html',
- 'update_src' =>
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=5.0.3',
+ 'update_src' =>
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=5.0.4',
'substitute' => true ),
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libreofficekit/Module_libreofficekit.mk libreofficekit/Package_selectionhandles.mk libreofficekit/source
libreofficekit/Module_libreofficekit.mk|1 +
libreofficekit/Package_selectionhandles.mk | 19 +++
libreofficekit/source/gtk/lokdocview.cxx | 12 ++--
3 files changed, 26 insertions(+), 6 deletions(-)
New commits:
commit 11a3449429c5853c5feedce6ac3f8f3829d1bbf9
Author: Pranav Kant
Date: Tue Jan 19 18:34:56 2016 +0530
lokdocview: Package and install selection handles
Now since, LOKDocView has started to get clients, we need to ship
all of its dependencies with the widget.
Reviewed on:
https://gerrit.libreoffice.org/21605
Change-Id: I874eb416587a80b7760c5f00183d6004dfca4cce
diff --git a/libreofficekit/Module_libreofficekit.mk
b/libreofficekit/Module_libreofficekit.mk
index 70cf40b..cc842b2 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_targets,libreofficekit,\
Library_libreofficekitgtk \
Executable_gtktiledviewer \
Executable_tilebench \
+Package_selectionhandles \
))
endif # ($(ENABLE_GTK3),)
diff --git a/libreofficekit/Package_selectionhandles.mk
b/libreofficekit/Package_selectionhandles.mk
new file mode 100644
index 000..5d87805
--- /dev/null
+++ b/libreofficekit/Package_selectionhandles.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_Package_Package,libreofficekit_selectionhandles,$(SRCDIR)/android/source/res/drawable))
+
+$(eval $(call
gb_Package_add_files,libreofficekit_selectionhandles,$(LIBO_SHARE_FOLDER)/libreofficekit,\
+ handle_image_start.png \
+ handle_image_middle.png \
+ handle_image_end.png \
+ handle_graphic.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index bca54bd..f70b15f 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -34,8 +34,8 @@
#define g_info(...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__)
#endif
-// Cursor bitmaps from the Android app.
-#define CURSOR_HANDLE_DIR "/android/source/res/drawable/"
+// Cursor bitmaps from the installation set.
+#define CURSOR_HANDLE_DIR "/../share/libreofficekit/"
// Number of handles around a graphic selection.
#define GRAPHIC_HANDLE_COUNT 8
// Maximum Zoom allowed
@@ -1311,7 +1311,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
if (priv->m_bEdit && priv->m_bCursorVisible &&
!isEmptyRectangle(priv->m_aVisibleCursor) &&
priv->m_aTextSelectionRectangles.empty())
{
// Have a cursor, but no selection: we need the middle handle.
-gchar* handleMiddlePath = g_strconcat (priv->m_aLOPath, "/../..",
CURSOR_HANDLE_DIR, "handle_image_middle.png", nullptr);
+gchar* handleMiddlePath = g_strconcat (priv->m_aLOPath,
CURSOR_HANDLE_DIR, "handle_image_middle.png", nullptr);
if (!priv->m_pHandleMiddle)
{
priv->m_pHandleMiddle =
cairo_image_surface_create_from_png(handleMiddlePath);
@@ -1339,7 +1339,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
if (!isEmptyRectangle(priv->m_aTextSelectionStart))
{
// Have a start position: we need a start handle.
-gchar* handleStartPath = g_strconcat (priv->m_aLOPath, "/../..",
CURSOR_HANDLE_DIR, "handle_image_start.png", nullptr);
+gchar* handleStartPath = g_strconcat (priv->m_aLOPath,
CURSOR_HANDLE_DIR, "handle_image_start.png", nullptr);
if (!priv->m_pHandleStart)
{
priv->m_pHandleStart =
cairo_image_surface_create_from_png(handleStartPath);
@@ -1351,7 +1351,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
if (!isEmptyRectangle(priv->m_aTextSelectionEnd))
{
// Have a start position: we need an end handle.
-gchar* handleEndPath = g_strconcat (priv->m_aLOPath, "/../..",
CURSOR_HANDLE_DIR, "handle_image_end.png", nullptr);
+gchar* handleEndPath = g_strconcat (priv->m_aLOPath,
CURSOR_HANDLE_DIR, "handle_image_end.png", nullptr);
if (!priv->m_pHandleEnd)
{
priv->m_pHandleEnd =
cairo_image_surface_create_from_png(handleEndPath);
@@ -1364,7 +1364,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
if (!isEmptyRectangle(priv->m_aGraphicSelection))
{
-gchar* handleGraphicPath = g_strconcat (priv->m_aLOPath, "/../..",
CURSOR_HANDLE_DIR, "handle_graphic.png", nullptr);
+gchar* handleGraphicPath = g_strconcat (priv->m_aLOPath,
CURSOR_HANDLE_DIR, "handle_graphic.png", nullptr);
if (!priv->m_pGraphi
[Libreoffice-commits] core.git: 3 commits - sfx2/source xmlsecurity/source
sfx2/source/doc/docfile.cxx|7 +++
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |3 +++
xmlsecurity/source/helper/ooxmlsecparser.cxx | 13 +
xmlsecurity/source/helper/ooxmlsecparser.hxx |2 ++
4 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit 2737a187a6a7c2e04aa1c6b519a712cfb989c592
Author: Miklos Vajna
Date: Tue Jan 19 17:18:04 2016 +0100
xmlsecurity: import OOXML
That stores the signature timestamp, and that now immediately shows up
in DigitalSignaturesDialog as well.
Change-Id: I83a63a10cf946f47a03e4570c461a92512638600
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx
b/xmlsecurity/source/helper/ooxmlsecparser.cxx
index e47f9dd..d8b5c93 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx
@@ -17,6 +17,7 @@ OOXMLSecParser::OOXMLSecParser(XSecController*
pXSecController)
,m_bInDigestValue(false)
,m_bInSignatureValue(false)
,m_bInX509Certificate(false)
+,m_bInMdssiValue(false)
{
}
@@ -71,6 +72,11 @@ throw (xml::sax::SAXException, uno::RuntimeException,
std::exception)
m_aX509Certificate.clear();
m_bInX509Certificate = true;
}
+else if (rName == "mdssi:Value")
+{
+m_aMdssiValue.clear();
+m_bInMdssiValue = true;
+}
if (m_xNextHandler.is())
m_xNextHandler->startElement(rName, xAttribs);
@@ -94,6 +100,11 @@ void SAL_CALL OOXMLSecParser::endElement(const OUString&
rName) throw (xml::sax:
m_pXSecController->setX509Certificate(m_aX509Certificate);
m_bInX509Certificate = false;
}
+else if (rName == "mdssi:Value")
+{
+m_pXSecController->setDate(m_aMdssiValue);
+m_bInMdssiValue = false;
+}
if (m_xNextHandler.is())
m_xNextHandler->endElement(rName);
@@ -107,6 +118,8 @@ void SAL_CALL OOXMLSecParser::characters(const OUString&
rChars) throw (xml::sax
m_aSignatureValue += rChars;
else if (m_bInX509Certificate)
m_aX509Certificate += rChars;
+else if (m_bInMdssiValue)
+m_aMdssiValue += rChars;
if (m_xNextHandler.is())
m_xNextHandler->characters(rChars);
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx
b/xmlsecurity/source/helper/ooxmlsecparser.hxx
index 54c522b..b071bca 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.hxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx
@@ -35,6 +35,8 @@ class OOXMLSecParser: public cppu::WeakImplHelper
OUString m_aSignatureValue;
bool m_bInX509Certificate;
OUString m_aX509Certificate;
+bool m_bInMdssiValue;
+OUString m_aMdssiValue;
public:
OOXMLSecParser(XSecController* pXSecController);
commit 8b8b5e21b03387d482ead79afe250cc7fe6e78f7
Author: Miklos Vajna
Date: Tue Jan 19 17:17:04 2016 +0100
xmlsecurity: handle OOXML signatures in ImplGetSignatureInformations()
With this, DigitalSignaturesDialog correctly shows the "Signed by" field
when reading a single valid OOXML signature.
Change-Id: Ic52a56767f65ab30924b07073d31677cb3a27de5
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index bb93298..ea2430b 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include
#include
@@ -744,6 +745,8 @@ void
DigitalSignaturesDialog::ImplGetSignatureInformations(bool bUseTempStream)
uno::Reference< io::XInputStream > xInputStream(
aStreamHelper.xSignatureStream, uno::UNO_QUERY );
maSignatureHelper.ReadAndVerifySignature( xInputStream );
}
+else if (aStreamHelper.nStorageFormat == embed::StorageFormats::OFOPXML &&
aStreamHelper.xSignatureStorage.is())
+
maSignatureHelper.ReadAndVerifySignatureStorage(aStreamHelper.xSignatureStorage);
maSignatureHelper.EndMission();
maCurrentSignatureInformations =
maSignatureHelper.GetSignatureInformations();
commit ac699587dc30f005f5e4657e95b0dbf6a9deebc3
Author: Miklos Vajna
Date: Tue Jan 19 17:16:00 2016 +0100
SfxMedium: only own format has the signature in a single stream
OOXML has one stream for each signature, so it wants a storage instead.
Change-Id: Iff2ed4b65d8c2023d02578ec4e80c13e36f55390
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index d30d52f..bb44a1c 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3579,10 +3579,9 @@ bool SfxMedium::SignContents_Impl( bool
bScriptingContent, const OUString& aODFV
}
else
{
- uno::Reference< io::XStream > xStream(
-xMetaInf->openStreamElement(
xSigner->getDocumentContentSignatureDefaultStreamN
[Libreoffice-commits] online.git: loolwsd/configure.ac loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hpp
loolwsd/LOOLWSD.cpp | 14 ++
loolwsd/LOOLWSD.hpp |1 +
loolwsd/configure.ac | 12
3 files changed, 27 insertions(+)
New commits:
commit f429001ff9ed1a903b6687b8798fa8d8698c7adb
Author: Pranav Kant
Date: Sun Dec 20 00:08:44 2015 +0530
loolwsd: Display version information on command line
Change-Id: Ie65c30574ca4cef619a224ec6df3501d6bda086a
Reviewed-on: https://gerrit.libreoffice.org/20847
Reviewed-by: jan iversen
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 78fcc7c..f629d8e 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -718,6 +718,10 @@ void LOOLWSD::defineOptions(OptionSet& optionSet)
.required(false)
.repeatable(false));
+optionSet.addOption(Option("version", "", "Display version information.")
+.required(false)
+.repeatable(false));
+
optionSet.addOption(Option("port", "", "Port number to listen to (default:
" + std::to_string(DEFAULT_CLIENT_PORT_NUMBER) + "),"
" must not be " +
std::to_string(MASTER_PORT_NUMBER) + ".")
.required(false)
@@ -775,6 +779,11 @@ void LOOLWSD::handleOption(const std::string& optionName,
const std::string& val
displayHelp();
exit(Application::EXIT_OK);
}
+else if (optionName == "version")
+{
+displayVersion();
+exit(Application::EXIT_OK);
+}
else if (optionName == "port")
ClientPortNumber = std::stoi(value);
else if (optionName == "cache")
@@ -806,6 +815,11 @@ void LOOLWSD::displayHelp()
helpFormatter.format(std::cout);
}
+void LOOLWSD::displayVersion()
+{
+std::cout << LOOLWSD_VERSION << std::endl;
+}
+
bool LOOLWSD::createBroker(const std::string& rJailId)
{
Process::Args args;
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index e29f6bd..0e8e798 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -184,6 +184,7 @@ protected:
private:
void displayHelp();
+void displayVersion();
void componentMain();
void desktopMain();
void startupComponent(int nComponents);
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index de10fd0..1201c93 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -7,6 +7,18 @@ AC_INIT([loolwsd], [1.5.0],
[libreoffice@lists.freedesktop.org])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
+LOOLWSD_VERSION_MAJOR=`echo $VERSION | awk -F. '{print $1}'`
+LOOLWSD_VERSION_MINOR=`echo $VERSION | awk -F. '{print $2}'`
+LOOLWSD_VERSION_MICRO=`echo $VERSION | awk -F. '{print $3}'`
+LOOLWSD_VERSION="$LOOLWSD_VERSION_MAJOR.$LOOLWSD_VERSION_MINOR.$LOOLWSD_VERSION_MICRO"
+
+AC_SUBST([LOOLWSD_VERSION_MAJOR])
+AC_SUBST([LOOLWSD_VERSION_MINOR])
+AC_SUBST([LOOLWSD_VERSION_MICRO])
+AC_SUBST([LOOLWSD_VERSION])
+
+AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[LibreOffice
On-Line WebSocket server version])
+
AC_CONFIG_SRCDIR([LOOLWSD.cpp])
AC_CONFIG_HEADERS([config.h])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/qa
desktop/qa/desktop_lib/test_desktop_lib.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 220b25ba2711d2805b9927cd6b37468e619c6d30
Author: Tor Lillqvist
Date: Tue Jan 19 18:17:58 2016 +0200
WaE: unused variable
Change-Id: I826a1eb45d0669dbe2495b4dbe4a171fcebb0865
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 75b4f64..b9d4ca6 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -435,7 +435,6 @@ void DesktopLOKTest::testPasteWriterJPEG()
{
comphelper::LibreOfficeKit::setActive();
LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
-OString aText("hello");
OUString aFileURL;
createFileURL(OUString::createFromAscii("paste.jpg"), aFileURL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/reference.html
loleaflet/reference.html |5 + 1 file changed, 5 insertions(+) New commits: commit aed9e61c2e81c66575e52311bcac08d94d01a348 Author: Miklos Vajna Date: Tue Jan 19 17:06:55 2016 +0100 loleaflet: document .uno:ModifiedStatus diff --git a/loleaflet/reference.html b/loleaflet/reference.html index 1fb2953..eb68f94 100644 --- a/loleaflet/reference.html +++ b/loleaflet/reference.html @@ -2543,6 +2543,11 @@ The id property of ErrorEvent can have the following values: String Font size related uno command. + + '.uno:ModifiedStatus' + String + If the document is now marked as modified. + CommandStateValues ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loleaflet/reference.html
loleaflet/reference.html |5 + 1 file changed, 5 insertions(+) New commits: commit cb30bf8b123861c8f440252ca0c6fad8992afc15 Author: Miklos Vajna Date: Tue Jan 19 17:06:55 2016 +0100 loleaflet: document .uno:ModifiedStatus (cherry picked from commit aed9e61c2e81c66575e52311bcac08d94d01a348) diff --git a/loleaflet/reference.html b/loleaflet/reference.html index 1fb2953..eb68f94 100644 --- a/loleaflet/reference.html +++ b/loleaflet/reference.html @@ -2543,6 +2543,11 @@ The id property of ErrorEvent can have the following values: String Font size related uno command. + + '.uno:ModifiedStatus' + String + If the document is now marked as modified. + CommandStateValues ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loleaflet/Makefile
loleaflet/Makefile |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e812b757047024e5fbadf556a9ccd3ecce0528bc
Author: Jan Holesovsky
Date: Tue Jan 19 16:55:02 2016 +0100
loleaflet: bump version after tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 7a2c37e..325008e 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.4.40
+VERSION=1.4.41
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit 2a3f24162bdabd671131c4bc74bd254a0af71e72
Author: Jan Holesovsky
Date: Tue Jan 19 16:54:39 2016 +0100
loleaflet: bump version before tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index d2e01b7..7a2c37e 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.4.39
+VERSION=1.4.40
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/source sfx2/source
desktop/source/lib/init.cxx |3 ++-
sfx2/source/control/unoctitm.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 3bdc59bcde10bb4cc676bf7ed13bab2738ad41dc
Author: Miklos Vajna
Date: Tue Jan 19 15:18:52 2016 +0100
LOK: include ModifiedStatus in CALLBACK_STATE_CHANGED
Change-Id: Ic44a9266a67bfad8b0490a8acb4a419af99ea42c
(cherry picked from commit abbfbb4d35d6fa9edbb8f331a9d9503183eb0356)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f8d37ef..cbce5cc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -692,7 +692,8 @@ static void doc_iniUnoCommands ()
OUString(".uno:SuperScript"),
OUString(".uno:Strikeout"),
OUString(".uno:StyleApply"),
-OUString(".uno:Underline")
+OUString(".uno:Underline"),
+OUString(".uno:ModifiedStatus")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index ddc1596..a189a5f 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1079,7 +1079,8 @@ void
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
aEvent.FeatureURL.Path == "SubScript" ||
aEvent.FeatureURL.Path == "SuperScript" ||
aEvent.FeatureURL.Path == "Strikeout" ||
-aEvent.FeatureURL.Path == "Underline")
+aEvent.FeatureURL.Path == "Underline" ||
+aEvent.FeatureURL.Path == "ModifiedStatus")
{
bool bTemp = false;
aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - desktop/qa desktop/source sfx2/source
desktop/qa/desktop_lib/test_desktop_lib.cxx | 43 +++-
desktop/source/lib/init.cxx |3 +
sfx2/source/control/bindings.cxx|4 +-
sfx2/source/control/unoctitm.cxx|3 +
4 files changed, 49 insertions(+), 4 deletions(-)
New commits:
commit cdf08b3aa74bb32ea18b583a9c0c41b91d7819ac
Author: Miklos Vajna
Date: Tue Jan 19 16:30:59 2016 +0100
CppunitTest_desktop_lib: add ModifiedStatus callback testcase
Change-Id: Ieb7e808ebc7619c3a4a013cad776eeefd6163e22
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index d55ae37..75b4f64 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -39,7 +40,8 @@ class DesktopLOKTest : public UnoApiTest
public:
DesktopLOKTest() : UnoApiTest("/desktop/qa/data/"),
m_nSelectionBeforeSearchResult(0),
-m_nSelectionAfterSearchResult(0)
+m_nSelectionAfterSearchResult(0),
+m_bModified(false)
{
}
@@ -80,6 +82,7 @@ public:
void testCellCursor();
void testCommandResult();
void testWriterComments();
+void testModifiedStatus();
CPPUNIT_TEST_SUITE(DesktopLOKTest);
CPPUNIT_TEST(testGetStyles);
@@ -98,6 +101,7 @@ public:
CPPUNIT_TEST(testCellCursor);
CPPUNIT_TEST(testCommandResult);
CPPUNIT_TEST(testWriterComments);
+CPPUNIT_TEST(testModifiedStatus);
CPPUNIT_TEST_SUITE_END();
uno::Reference mxComponent;
@@ -110,6 +114,10 @@ public:
// for testCommandResult
osl::Condition m_aCommandResultCondition;
OString m_aCommandResult;
+
+// for testModifiedStatus
+osl::Condition m_aStateChangedCondition;
+bool m_bModified;
};
LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName,
LibreOfficeKitDocumentType eType)
@@ -183,6 +191,17 @@ void DesktopLOKTest::callbackImpl(int nType, const char*
pPayload)
m_aCommandResultCondition.set();
}
break;
+case LOK_CALLBACK_STATE_CHANGED:
+{
+OString aPayload(pPayload);
+OString aPrefix(".uno:ModifiedStatus=");
+if (aPayload.startsWith(aPrefix))
+{
+m_bModified = aPayload.copy(aPrefix.getLength()).toBoolean();
+m_aStateChangedCondition.set();
+}
+}
+break;
}
}
@@ -600,6 +619,28 @@ void DesktopLOKTest::testWriterComments()
comphelper::LibreOfficeKit::setActive(false);
}
+void DesktopLOKTest::testModifiedStatus()
+{
+LibLibreOffice_Impl aOffice;
+comphelper::LibreOfficeKit::setActive();
+LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+pDocument->pClass->initializeForRendering(pDocument, nullptr);
+pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback,
this);
+
+// Set the document as modified.
+m_aStateChangedCondition.reset();
+uno::Reference xModifiable(mxComponent, uno::UNO_QUERY);
+xModifiable->setModified(true);
+TimeValue aTimeValue = { 2 , 0 }; // 2 seconds max
+m_aStateChangedCondition.wait(aTimeValue);
+Scheduler::ProcessEventsToIdle();
+
+// This was false, there was no callback about the modified status change.
+CPPUNIT_ASSERT(m_bModified);
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index aa62415..9e679b7 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1587,7 +1587,9 @@ bool SfxBindings::NextJob_Impl(Timer * pTimer)
}
// if possible Update all server / happens in its own time slice
-if ( pImp->bMsgDirty )
+// but process all events at once when unit testing, for reliability
reasons
+static bool bTest = getenv("LO_TESTNAME");
+if ( pImp->bMsgDirty && !bTest )
{
UpdateSlotServer_Impl();
return false;
commit abbfbb4d35d6fa9edbb8f331a9d9503183eb0356
Author: Miklos Vajna
Date: Tue Jan 19 15:18:52 2016 +0100
LOK: include ModifiedStatus in CALLBACK_STATE_CHANGED
Change-Id: Ic44a9266a67bfad8b0490a8acb4a419af99ea42c
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f8d6a6c..d2b4f60 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -684,7 +684,8 @@ static void doc_iniUnoCommands ()
OUString(".uno:SuperScript"),
OUString(".uno:Strikeout"),
OUString(".uno:StyleApply"),
-OUString(".uno:Underline")
+OUString(".uno:Underline"),
+OUString(".uno:ModifiedStatus")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 5b4b8af..7a2616c 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/co
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/xmloff sw/inc sw/qa sw/source xmloff/source
include/xmloff/txtimp.hxx |3 +
sw/inc/IDocumentMarkAccess.hxx |2
sw/qa/extras/odfexport/odfexport.cxx|4 -
sw/source/core/doc/docbm.cxx|6 --
sw/source/core/inc/MarkManager.hxx |2
sw/source/core/unocore/unobkm.cxx |9 ---
xmloff/source/core/xmlimp.cxx |2
xmloff/source/text/XMLTextMarkImportContext.cxx | 46 +-
xmloff/source/text/XMLTextMarkImportContext.hxx |6 ++
xmloff/source/text/txtimp.cxx | 60
xmloff/source/text/txtparai.cxx | 40
11 files changed, 152 insertions(+), 28 deletions(-)
New commits:
commit 55d2301ac658167396bf5533c940bce67f04
Author: Michael Stahl
Date: Fri Jan 8 16:02:43 2016 +0100
tdf#96480: ODF import: eliminate duplicate cross reference heading bookmarks
7c3c3006deaaaf1bb3f2f4eeeaf11da3bcebe53c is apparently worse than it
appeared at first glance since there are numerous assumptions about
bookmarks, such as that if they were inserted successfully they may be
copied successfully, which isn't the case for duplicate cross reference
bookmarks.
So fix this differently, by eliminating the duplicates and mapping all
reference fields to refer to the surviving bookmark.
It was not possible to do this in SwXBookmark by checking the makeMark()
return as that would raise interesting problems such as it's currently
guaranteed to have 1:1 SwXBoomarks to core Marks so we can't just
connect 2 SwXBookmarks to the same core Mark, and we also can't leave
the SwXBookmark unconnected after attach.
Another alternative would be to temporarily allow inserting the
duplicate bookmarks and then eliminate them after the import, but what
is implemented now is to check from xmloff for duplicates, which is
reasonably simple.
(cherry picked from commit 774fb6d2e7cf36b677e66c54278225b1256bd40f)
Change-Id: I7ee4854d1c9d8bf74201089cbb7287b1bd8ee3b9
Reviewed-on: https://gerrit.libreoffice.org/21369
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index ca0ce7a..291998b 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -733,6 +733,9 @@ public:
void SetCellParaStyleDefault(OUString const& rNewValue);
OUString const& GetCellParaStyleDefault();
+
+void AddCrossRefHeadingMapping(OUString const& rFrom, OUString const& rTo);
+void MapCrossRefHeadingFieldsHorribly();
};
#endif
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index befbaeb..78e73f7 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -77,7 +77,7 @@ class IDocumentMarkAccess
*/
virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM,
const OUString& rProposedName,
-MarkType eMark, bool = false) = 0;
+MarkType eMark) = 0;
virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
const OUString& rName,
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index bc7d768..0e106fa 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -385,9 +385,7 @@
DECLARE_ODFEXPORT_TEST(testDuplicateCrossRefHeadingBookmark, "CrossRefHeadingBoo
uno::Reference xBookmark1(
xBookmarks->getByName("__RefHeading__8284_1826734303"),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xBookmark1.is());
-uno::Reference xBookmark2(
-xBookmarks->getByName("__RefHeading__1673_25705824"), uno::UNO_QUERY);
-CPPUNIT_ASSERT(xBookmark2.is());
+CPPUNIT_ASSERT_THROW(xBookmarks->getByName("__RefHeading__1673_25705824"),
container::NoSuchElementException);
uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference(xTextFieldsSupplier->getTextFields(),
uno::UNO_QUERY)->refresh();
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 4680744..9b93a37 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -352,8 +352,7 @@ namespace sw { namespace mark
::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM,
const OUString& rName,
-const IDocumentMarkAccess::MarkType eType,
-bool const isHorribleHackIgnoreDuplicates)
+const IDocumentMarkAccess::MarkType eType)
{
#if 0
{
@@ -376,8 +375,7 @@ namespace sw { namespace mark
" - more than USHRT_MAX marks are not supported correctly");
// There should only be one CrossRefBookmark per Textnode per Type
if ((eType == MarkType::CROSSREF_NUMITEM_BOOKMARK || eType ==
MarkType::CROSSREF_HEADING_BOOKMARK)
-&& (lcl_FindMarkAtPos(m_vBookmarks, *rPaM.Start(), eTy
Re: [Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit
Hi Oliver, On Tue, Jan 19, 2016 at 06:39:56AM -0800, Oliver Specht wrote: > diff --git a/include/LibreOfficeKit/LibreOfficeKit.h > b/include/LibreOfficeKit/LibreOfficeKit.h > index 7d4210e..8057d75 100644 > --- a/include/LibreOfficeKit/LibreOfficeKit.h > +++ b/include/LibreOfficeKit/LibreOfficeKit.h > @@ -51,6 +51,7 @@ struct _LibreOfficeKitClass > const char* pURL); > > char* (*getError) (LibreOfficeKit* pThis); > +void (*freeError) (const char *pfree); > > LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* > pThis, > const char* pURL, Won't this break backwards compatibility with existing clients? I think you can only append new functions to the end of the function list, otherwise the LIBREOFFICEKIT_HAS_MEMBER() macro is quite pointless. ;-) Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/XMLTextFrameContext.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 86963c2e23aebfa7b9df4e2d28278dfb581974d3
Author: Caolán McNamara
Date: Tue Jan 19 14:03:12 2016 +
Resolves: tdf#96245 relax test for duplicate frame names
to allow duplicated unnamed frames
Change-Id: I871849b23d01209f027b6295777db705f7dc86d8
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index 81b3b18..e032bdd 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -587,7 +587,8 @@ void XMLTextFrameContext_Impl::Create( bool
/*bHRefOrBase64*/ )
{
bool bSuccess = xTextImportHelper->GetRenameMap().Add(
XML_TEXT_RENAME_TYPE_FRAME,
sOldName, sName );
-if (!bSuccess)
+
+if (!bSuccess && !sOldName.isEmpty())
{
bCreateFailed = true;
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-design] Minutes of the Design Hangout: 2016-01-08
Samuel do you need an icon from me (breeze?) for the save stuff. should I add one in Galaxy? cu Andreas Am 19.01.2016 15:35 schrieb "Jan Holesovsky" : > * Present: Heiko, Kendy, Samuel > > * UI changes integrated since the last meeting: > > + resource menus & readonly improvements (Maxim) > + new saving behavior + indication (Maxim) > + "show draw functions" button for Draw & Impress (Gulsah) > > + Comments on design blog (Heiko) > > + currently go to only one person (Heiko) > + let's ask admins to setup a mail alias for the main account (Kendy) > > + Blog about menu changes (Heiko) > > + Reason: https://bugs.documentfoundation.org/show_bug.cgi?id=91820 > + to explain what has been done, what are the concepts behind that > (Heiko) > + sounds great (Kendy) > + ideal if Jay can do that, he did all the heavy lifting... > + Heiko about to work on a draft, details needed from Jay > > + Find&Replace dialog in the sidebar (Heiko) > > + https://bugs.documentfoundation.org/show_bug.cgi?id=96394 > + Sidebar as a host for functions? - F&R is not a property like > paragraph settings, for instance > > + it is possible from the development point of view (Heiko) > + but do we want that conceptually? > + another example where this was attempted: change tracking (Heiko) > > + conceptually - it is changing the meaning of the sidebar a bit > + sidebar is not meant as a replacement for dialogs (at least > currently) (Heiko) > + overall, moving some modeless dialogs to sidebar could be a > not-that-bad thing (Kendy) > + can imagine scenarios where it is useful to be able quickly > switch between > eg. change tracking and search/replace (which would take too > much space with just dialogs) > > + let's think a bit more about this, and if we agree to this, make > this a GSoC project > > + many search&replace bugs in the bugzilla, would be good to have them > in mind too > when considering the move to the sidebar (Heiko) > + design session to mocup it with these in mind, prioritization, > etc. needed (Heiko) > + GSoC not that near, let's do it in some later Friday, after the > normal meeting > > + Save button behavior (Samuel) > > + implemented now > + thanks so much Maxim! > > + not in RC2 yet (Samuel) > + the only missing bit is the icon (Samuel) > + Heiko will sync with Andreas if he can have that before the RC2 > (Tuesday evening tagging) > + Samuel will backport to libreoffice-5-1 > + then 3 reviews needed for the late feature, Kendy to ask ESC > on the ML > > + Mail merge toolbar (Kendy) > > + implementation mostly finished (Kendy) > + bugfixing before I can merge it to master > > * Area Tab design session (Heiko/Jay) > > + Area Tab - https://bugs.documentfoundation.org/show_bug.cgi?id=94551 > > https://docs.google.com/document/d/1gf7wqYszXnbrbzbyNlLKbJelMb20ssuimxfszcHP_wM/edit?usp=sharing > + not published yet > > + ~10 comments > + positive feedback > + suggestion to remove the pattern editor and to rename some captions > + one preference for the three-column layout > > + next: implement it :-) probably again good for a GSoC task > > * Draw problems (Stuart) > > + might be interesting to have a survey about what the users actually > use Draw for (Tomaž) > + Heiko will have a look / think this through > > * Bug discussions > > + > https://bugs.documentfoundation.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=NEEDINFO&component=ux-advise&list_id=527515&query_format=advanced&resolution=--- > > + discussed, and acted on: > + [nothing today sadly] > > > > -- > To unsubscribe e-mail to: design+unsubscr...@global.libreoffice.org > Problems? > http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ > Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette > List archive: http://listarchives.libreoffice.org/global/design/ > All messages sent to this list will be publicly archived and cannot be > deleted > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Minutes of the Design Hangout: 2016-01-08
* Present: Heiko, Kendy, Samuel * UI changes integrated since the last meeting: + resource menus & readonly improvements (Maxim) + new saving behavior + indication (Maxim) + "show draw functions" button for Draw & Impress (Gulsah) + Comments on design blog (Heiko) + currently go to only one person (Heiko) + let's ask admins to setup a mail alias for the main account (Kendy) + Blog about menu changes (Heiko) + Reason: https://bugs.documentfoundation.org/show_bug.cgi?id=91820 + to explain what has been done, what are the concepts behind that (Heiko) + sounds great (Kendy) + ideal if Jay can do that, he did all the heavy lifting... + Heiko about to work on a draft, details needed from Jay + Find&Replace dialog in the sidebar (Heiko) + https://bugs.documentfoundation.org/show_bug.cgi?id=96394 + Sidebar as a host for functions? - F&R is not a property like paragraph settings, for instance + it is possible from the development point of view (Heiko) + but do we want that conceptually? + another example where this was attempted: change tracking (Heiko) + conceptually - it is changing the meaning of the sidebar a bit + sidebar is not meant as a replacement for dialogs (at least currently) (Heiko) + overall, moving some modeless dialogs to sidebar could be a not-that-bad thing (Kendy) + can imagine scenarios where it is useful to be able quickly switch between eg. change tracking and search/replace (which would take too much space with just dialogs) + let's think a bit more about this, and if we agree to this, make this a GSoC project + many search&replace bugs in the bugzilla, would be good to have them in mind too when considering the move to the sidebar (Heiko) + design session to mocup it with these in mind, prioritization, etc. needed (Heiko) + GSoC not that near, let's do it in some later Friday, after the normal meeting + Save button behavior (Samuel) + implemented now + thanks so much Maxim! + not in RC2 yet (Samuel) + the only missing bit is the icon (Samuel) + Heiko will sync with Andreas if he can have that before the RC2 (Tuesday evening tagging) + Samuel will backport to libreoffice-5-1 + then 3 reviews needed for the late feature, Kendy to ask ESC on the ML + Mail merge toolbar (Kendy) + implementation mostly finished (Kendy) + bugfixing before I can merge it to master * Area Tab design session (Heiko/Jay) + Area Tab - https://bugs.documentfoundation.org/show_bug.cgi?id=94551 https://docs.google.com/document/d/1gf7wqYszXnbrbzbyNlLKbJelMb20ssuimxfszcHP_wM/edit?usp=sharing + not published yet + ~10 comments + positive feedback + suggestion to remove the pattern editor and to rename some captions + one preference for the three-column layout + next: implement it :-) probably again good for a GSoC task * Draw problems (Stuart) + might be interesting to have a survey about what the users actually use Draw for (Tomaž) + Heiko will have a look / think this through * Bug discussions + https://bugs.documentfoundation.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=NEEDINFO&component=ux-advise&list_id=527515&query_format=advanced&resolution=--- + discussed, and acted on: + [nothing today sadly] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit
desktop/source/lib/init.cxx |6 ++
include/LibreOfficeKit/LibreOfficeKit.h |2 ++
include/LibreOfficeKit/LibreOfficeKit.hxx |9 +
include/LibreOfficeKit/LibreOfficeKitInit.h | 18 +-
4 files changed, 26 insertions(+), 9 deletions(-)
New commits:
commit 442a022cf7baefbd5519ea55c7978cf839e1f44d
Author: Oliver Specht
Date: Tue Jan 19 10:58:07 2016 +0100
Make LibreOffice kit usable on windows
Uses Ascii variants of LoadLibrary,Get/SetEnvironmentVariable_A_
and adds a freeError function
includes windows.h instead of pre/postwin.h
Change-Id: I88b7e3ed3818078efec5688e207da47dc4049b98
Reviewed-on: https://gerrit.libreoffice.org/21600
Tested-by: Jenkins
Reviewed-by: Oliver Specht
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 28a5442..f8d6a6c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -430,6 +430,7 @@ static voidlo_destroy
(LibreOfficeKit* pThis);
static int lo_initialize(LibreOfficeKit* pThis, const
char* pInstallPath, const char* pUserProfilePath);
static LibreOfficeKitDocument* lo_documentLoad (LibreOfficeKit* pThis, const
char* pURL);
static char * lo_getError (LibreOfficeKit* pThis);
+static voidlo_freeError (const char *pfree);
static LibreOfficeKitDocument* lo_documentLoadWithOptions (LibreOfficeKit*
pThis,
const char* pURL,
const char*
pOptions);
@@ -451,6 +452,7 @@ LibLibreOffice_Impl::LibLibreOffice_Impl()
m_pOfficeClass->destroy = lo_destroy;
m_pOfficeClass->documentLoad = lo_documentLoad;
m_pOfficeClass->getError = lo_getError;
+m_pOfficeClass->freeError = lo_freeError;
m_pOfficeClass->documentLoadWithOptions = lo_documentLoadWithOptions;
m_pOfficeClass->registerCallback = lo_registerCallback;
m_pOfficeClass->getFilterTypes = lo_getFilterTypes;
@@ -1571,6 +1573,10 @@ static char* lo_getError (LibreOfficeKit *pThis)
strcpy(pMemory, aString.getStr());
return pMemory;
}
+static void lo_freeError(const char *pfree)
+{
+free((void *) pfree);
+}
static char* lo_getFilterTypes(LibreOfficeKit* pThis)
{
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index 7d4210e..8057d75 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -51,6 +51,7 @@ struct _LibreOfficeKitClass
const char* pURL);
char* (*getError) (LibreOfficeKit* pThis);
+void (*freeError) (const char *pfree);
LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis,
const char* pURL,
@@ -82,6 +83,7 @@ struct _LibreOfficeKitDocumentClass
const char* pUrl,
const char* pFormat,
const char* pFilterOptions);
+void (*freeError) (const char *pfree);
#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
/// @see lok::Document::getDocumentType().
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 9396f1e..5623fad 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -56,6 +56,10 @@ public:
/// Gives access to the underlying C pointer.
inline LibreOfficeKitDocument *get() { return mpDoc; }
+inline void freeError(const char *pfree)
+{
+mpDoc->pClass->freeError(pfree);
+}
#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
/**
@@ -434,6 +438,11 @@ public:
{
return mpThis->pClass->getError(mpThis);
}
+inline void freeError(const char *pfree)
+{
+mpThis->pClass->freeError(pfree);
+}
+
#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
/**
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 880f11e..23e5772 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -76,8 +76,7 @@ extern "C"
#else
-#include "prewin.h"
-#include "postwin.h"
+#include
#define TARGET_LIB"sofficeapp" ".dll"
#define TARGET_MERGED_LIB "mergedlo" ".dll"
#define SEPARATOR '\\'
@@ -85,7 +84,7 @@ extern "C"
void *lok_loadlib(const char *pFN)
{
-return (void *) LoadLibrary(pFN);
+return (void *) LoadLibraryA(pFN);
}
char *lok_dlerror(void)
@@ -111,11 +110,11 @@ extern "C"
return;
char* sEnvPath = NULL;
-DWORD cChars = GetEnvironmentVariable("PATH", sEnvPath,
Re: Adding cppunit test to ucb.ucp.webdav
On 01/19/2016 03:13 PM, Giuseppe Castagno wrote: Hi all, I'm trying to add unit tests to webdav, for the time being limited to member function that are used internally, that is that don't need a server to interact with. Member functions in library ucpdav1 are not exported (so I gather...). Is the following method allowed to make externally visible member function that I intend to test? Any downside? Limited to webdav_ucp::NeonUri as the first to be checked: diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx index cd9fbe9..c5cea8c 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.hxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx @@ -41,7 +41,8 @@ namespace webdav_ucp #define DEFAULT_FTP_PORT21 // A URI implementation for use with the neon/expat library -class NeonUri +// Added SAL_DLLPUBLIC_EXPORT to implement cppunit test +class SAL_DLLPUBLIC_EXPORT NeonUri There's two approaches to this ugly problem. One is as above, with the downside of increasing the number of global symbols. The other is to link a Library's objects directly into a CppunitTest library via gb_CppunitTest_use_library_objects. The downside there is that you need typically duplicate all the Library_*.mk's gb_Library_set/use/whatever... calls as gb_CppunitTest_... calls in the CppunitTest_*.mk. Both approaches suck. When possible, try to stick with the second one, though. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Adding cppunit test to ucb.ucp.webdav
Hi all,
I'm trying to add unit tests to webdav, for the time being limited to
member function that are used internally, that is that don't need a
server to interact with.
Member functions in library ucpdav1 are not exported (so I gather...).
Is the following method allowed to make externally visible member
function that I intend to test? Any downside?
Limited to webdav_ucp::NeonUri as the first to be checked:
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx
b/ucb/source/ucp/webdav-neon/NeonUri.hxx
index cd9fbe9..c5cea8c 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx
@@ -41,7 +41,8 @@ namespace webdav_ucp
#define DEFAULT_FTP_PORT21
// A URI implementation for use with the neon/expat library
-class NeonUri
+// Added SAL_DLLPUBLIC_EXPORT to implement cppunit test
+class SAL_DLLPUBLIC_EXPORT NeonUri
{
private:
OUString mURI;
Thanks,
--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 3 commits - desktop/qa include/sot sot/source svtools/source
desktop/qa/data/paste.jpg |binary
desktop/qa/desktop_lib/test_desktop_lib.cxx | 24
include/sot/formats.hxx |3 +-
sot/source/base/exchange.cxx|1
sot/source/base/formats.cxx | 42
svtools/source/misc/transfer.cxx| 25
6 files changed, 94 insertions(+), 1 deletion(-)
New commits:
commit 7d3d4b5c1e14874fb2e2f62838195738d7633d8d
Author: Miklos Vajna
Date: Tue Jan 19 14:29:33 2016 +0100
CppunitTest_desktop_lib: add jpeg paste testcase
Fails without commit 27c6b8586d5d2cd1fa5425b4969d915a0b739475 (svtools:
implement clipboard import of JPEG files, 2016-01-19).
(cherry picked from commit 802564e036db1ee3df8b19593b7f9f1be0deec54)
Conflicts:
desktop/qa/desktop_lib/test_desktop_lib.cxx
Change-Id: Ic4e3b036b3a6a1c294bf15ef0b206cf1e458fc4e
diff --git a/desktop/qa/data/paste.jpg b/desktop/qa/data/paste.jpg
new file mode 100644
index 000..ca9183e
Binary files /dev/null and b/desktop/qa/data/paste.jpg differ
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 87aaf2f..5e7a14d 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#ifdef WNT
#include
@@ -81,6 +82,7 @@ public:
void testSaveAs();
void testSaveAsCalc();
void testPasteWriter();
+void testPasteWriterJPEG();
void testRowColumnHeaders();
void testCommandResult();
void testWriterComments();
@@ -97,6 +99,7 @@ public:
CPPUNIT_TEST(testSaveAs);
CPPUNIT_TEST(testSaveAsCalc);
CPPUNIT_TEST(testPasteWriter);
+CPPUNIT_TEST(testPasteWriterJPEG);
CPPUNIT_TEST(testRowColumnHeaders);
CPPUNIT_TEST(testCommandResult);
CPPUNIT_TEST(testWriterComments);
@@ -414,6 +417,27 @@ void DesktopLOKTest::testPasteWriter()
comphelper::LibreOfficeKit::setActive(false);
}
+void DesktopLOKTest::testPasteWriterJPEG()
+{
+comphelper::LibreOfficeKit::setActive();
+LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+OString aText("hello");
+
+OUString aFileURL;
+createFileURL(OUString::createFromAscii("paste.jpg"), aFileURL);
+std::ifstream
aImageStream(aFileURL.toUtf8().copy(strlen("file://")).getStr());
+std::vector
aImageContents((std::istreambuf_iterator(aImageStream)),
std::istreambuf_iterator());
+
+CPPUNIT_ASSERT(pDocument->pClass->paste(pDocument, "image/jpeg",
aImageContents.data(), aImageContents.size()));
+
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference xDrawPage =
xDrawPageSupplier->getDrawPage();
+// This was 0, JPEG was not handled as a format for clipboard paste.
+CPPUNIT_ASSERT_EQUAL(static_cast(1), xDrawPage->getCount());
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
void DesktopLOKTest::testRowColumnHeaders()
{
/*
commit 3679748b30807a5713aa2f56af2c385003734cff
Author: Miklos Vajna
Date: Tue Jan 19 12:47:45 2016 +0100
svtools: implement clipboard import of JPEG files
With this, lok::Document::paste("image/jpeg", "...") as invoked by
gtktiledviewer results in a Writer image just like the previously
already working PNG variant.
(cherry picked from commit 27c6b8586d5d2cd1fa5425b4969d915a0b739475)
Conflicts:
svtools/source/misc/transfer.cxx
Change-Id: I9e7b94043519db4ccf3c9ad32474a15275896dd4
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 40d2a04..e6c47b6 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -60,6 +60,7 @@
#include
#include
#include
+#include
// - Namespaces -
@@ -1667,11 +1668,19 @@ bool TransferableDataHelper::GetBitmapEx( const
DataFlavor& rFlavor, BitmapEx& r
DataFlavor aSubstFlavor;
bool bRet(GetSotStorageStream(rFlavor, xStm));
bool bSuppressPNG(false); // #122982# If PNG stream not accessed, but BMP
one, suppress trying to load PNG
+bool bSuppressJPEG(false);
if(!bRet && HasFormat(SotClipboardFormatId::PNG) &&
SotExchange::GetFormatDataFlavor(SotClipboardFormatId::PNG, aSubstFlavor))
{
// when no direct success, try if PNG is available
bRet = GetSotStorageStream(aSubstFlavor, xStm);
+bSuppressJPEG = bRet;
+}
+
+if(!bRet && HasFormat(SotClipboardFormatId::JPEG) &&
SotExchange::GetFormatDataFlavor(SotClipboardFormatId::JPEG, aSubstFlavor))
+{
+bRet = GetSotStorageStream(aSubstFlavor, xStm);
+bSuppressPNG = bRet;
}
if(!bRet && HasFormat(SotClipboardFormatId::BMP) &&
SotExchange::GetFormatDataFlavor(SotClipboardFormatId::BMP, aSubstFlavor))
@@ -1679,6 +1688,7 @@ bool TransferableDataHelper::GetBitmapEx( const
DataFlavor& rFlavor, Bitmap
[Libreoffice-commits] core.git: desktop/qa
desktop/qa/data/paste.jpg |binary
desktop/qa/desktop_lib/test_desktop_lib.cxx | 24
2 files changed, 24 insertions(+)
New commits:
commit 802564e036db1ee3df8b19593b7f9f1be0deec54
Author: Miklos Vajna
Date: Tue Jan 19 14:29:33 2016 +0100
CppunitTest_desktop_lib: add jpeg paste testcase
Fails without commit 27c6b8586d5d2cd1fa5425b4969d915a0b739475 (svtools:
implement clipboard import of JPEG files, 2016-01-19).
Change-Id: Ic4e3b036b3a6a1c294bf15ef0b206cf1e458fc4e
diff --git a/desktop/qa/data/paste.jpg b/desktop/qa/data/paste.jpg
new file mode 100644
index 000..ca9183e
Binary files /dev/null and b/desktop/qa/data/paste.jpg differ
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 01657b9..d55ae37 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -74,6 +75,7 @@ public:
void testSaveAs();
void testSaveAsCalc();
void testPasteWriter();
+void testPasteWriterJPEG();
void testRowColumnHeaders();
void testCellCursor();
void testCommandResult();
@@ -91,6 +93,7 @@ public:
CPPUNIT_TEST(testSaveAs);
CPPUNIT_TEST(testSaveAsCalc);
CPPUNIT_TEST(testPasteWriter);
+CPPUNIT_TEST(testPasteWriterJPEG);
CPPUNIT_TEST(testRowColumnHeaders);
CPPUNIT_TEST(testCellCursor);
CPPUNIT_TEST(testCommandResult);
@@ -409,6 +412,27 @@ void DesktopLOKTest::testPasteWriter()
comphelper::LibreOfficeKit::setActive(false);
}
+void DesktopLOKTest::testPasteWriterJPEG()
+{
+comphelper::LibreOfficeKit::setActive();
+LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+OString aText("hello");
+
+OUString aFileURL;
+createFileURL(OUString::createFromAscii("paste.jpg"), aFileURL);
+std::ifstream
aImageStream(aFileURL.toUtf8().copy(strlen("file://")).getStr());
+std::vector
aImageContents((std::istreambuf_iterator(aImageStream)),
std::istreambuf_iterator());
+
+CPPUNIT_ASSERT(pDocument->pClass->paste(pDocument, "image/jpeg",
aImageContents.data(), aImageContents.size()));
+
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference xDrawPage =
xDrawPageSupplier->getDrawPage();
+// This was 0, JPEG was not handled as a format for clipboard paste.
+CPPUNIT_ASSERT_EQUAL(static_cast(1), xDrawPage->getCount());
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
void DesktopLOKTest::testRowColumnHeaders()
{
/*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: setup_native/scripts
setup_native/scripts/source/getuid.c |8 1 file changed, 8 insertions(+) New commits: commit 723719b41348e275c760c6c66bbc9619fafa37fe Author: Stephan Bergmann Date: Tue Jan 19 14:33:37 2016 +0100 Silence -Werror=nonnull (GCC 6) Change-Id: I3aa5f4342ad362b0075d033df222467723ee002e diff --git a/setup_native/scripts/source/getuid.c b/setup_native/scripts/source/getuid.c index 9a9f826..2f1aaa4 100644 --- a/setup_native/scripts/source/getuid.c +++ b/setup_native/scripts/source/getuid.c @@ -123,7 +123,15 @@ int __lxstat(int n, const char *path, struct stat *buf) p_lstat = (int (*)(int n, const char *path, struct stat *buf)) dlsym (RTLD_NEXT, "__lxstat"); ret = (*p_lstat)(n, path, buf); +#if defined __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnonnull" +// __lxstat may be declared in system headers as taking nonnull argument +#endif assert(buf != NULL); +#if defined __GNUC__ +#pragma GCC diagnostic pop +#endif buf->st_uid = 0; /* root */ buf->st_gid = 0; /* root */ return ret; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/ui/app/inputhdl.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 26bafaacd071dcba4bf7f75776e31c5786cfd725 Author: Winfried Donkers Date: Mon Jan 18 12:27:49 2016 +0100 follow-up of tdf#89031 No function name hints or autocompletion when character right of caret is '$' Change-Id: I4fcfa6e29e5671e97743c7fc520953721d0bda24 Reviewed-on: https://gerrit.libreoffice.org/21577 Reviewed-by: Eike Rathke Tested-by: Eike Rathke (cherry picked from commit 1e2bcb3177d58e6f446296ae28fcff7f5da9b620) Reviewed-on: https://gerrit.libreoffice.org/21602 diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index fe9ef00..09bc73d 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1061,7 +1061,8 @@ void ScInputHandler::UseFormulaData() if ( aParagraph.getLength() > aSel.nEndPos && ( ScGlobal::pCharClass->isLetterNumeric( aParagraph, aSel.nEndPos ) || aParagraph[ aSel.nEndPos ] == '_' || - aParagraph[ aSel.nEndPos ] == '.' ) ) + aParagraph[ aSel.nEndPos ] == '.' || + aParagraph[ aSel.nEndPos ] == '$' ) ) return; // Is the cursor at the end of a word? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit d6c5a8103b103b80ef171c09ca593e68ae867189
Author: Caolán McNamara
Date: Tue Jan 19 13:22:10 2016 +
Resolves: tdf#99604 ungrab modal dialogs
Change-Id: I6735913c371968745da3ad6bf61e6ae3287c19a6
(cherry picked from commit 011ce226e89ecabaf621603d692547c88061eaba)
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 576946f..aace8b3 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2377,6 +2377,13 @@ void GtkSalFrame::SetModal(bool bModal)
if (!m_pWindow)
return;
gtk_window_set_modal(GTK_WINDOW(m_pWindow), bModal);
+if (bModal)
+{
+//gtk_window_set_modal bTrue adds a grab, so ungrab here. Quite
+//possibly we should alternatively call grab_add grab_ungrab on
+//show/hide of menus ?
+gtk_grab_remove(m_pWindow);
+}
}
gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent,
gpointer frame )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - basebmp/inc basebmp/source basebmp/test include/basebmp vcl/headless vcl/unx
basebmp/inc/colorblendaccessoradapter.hxx | 123 ---
basebmp/inc/fillimage.hxx | 63 ---
basebmp/inc/scaleimage.hxx| 189 --
basebmp/source/bitmapdevice.cxx | 526 --
basebmp/source/intconversion.hxx | 88 -
basebmp/test/basictest.cxx|4
include/basebmp/bitmapdevice.hxx | 54 ---
vcl/headless/svpbmp.cxx |5
vcl/headless/svpgdi.cxx |3
vcl/unx/gtk3/gtk3gtkframe.cxx |7
10 files changed, 92 insertions(+), 970 deletions(-)
New commits:
commit 011ce226e89ecabaf621603d692547c88061eaba
Author: Caolán McNamara
Date: Tue Jan 19 13:22:10 2016 +
Resolves: tdf#99604 ungrab modal dialogs
Change-Id: I6735913c371968745da3ad6bf61e6ae3287c19a6
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 6012f58..803542d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2367,6 +2367,13 @@ void GtkSalFrame::SetModal(bool bModal)
if (!m_pWindow)
return;
gtk_window_set_modal(GTK_WINDOW(m_pWindow), bModal);
+if (bModal)
+{
+//gtk_window_set_modal bTrue adds a grab, so ungrab here. Quite
+//possibly we should alternatively call grab_add grab_ungrab on
+//show/hide of menus ?
+gtk_grab_remove(m_pWindow);
+}
}
gboolean GtkSalFrame::signalTooltipQuery(GtkWidget*, gint /*x*/, gint /*y*/,
commit e187217222ba3be497f45a7d1e72a1a25b2fb9d6
Author: Caolán McNamara
Date: Tue Jan 19 12:49:11 2016 +
drop some more unused pieces now
Change-Id: Icd2497f0befad0a3221230fe82cb100cddbd7764
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 211f16b..1e1c14e 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -117,31 +117,21 @@ namespace
typedef typename AccessorSelector::template wrap_accessor<
raw_accessor_type >::type
dest_accessor_type;
-typedef AccessorTraits< dest_accessor_type >
accessor_traits;
-
-typedef AccessorTraits< raw_accessor_type >
raw_accessor_traits;
-
dest_iterator_type maBegin;
dest_accessor_type maAccessor;
-raw_accessor_type maRawAccessor;
-
-
-
BitmapRenderer( const basegfx::B2IBox& rBounds,
Format
nScanlineFormat,
sal_Int32
nScanlineStride,
sal_uInt8*
pFirstScanline,
dest_iterator_type begin,
-raw_accessor_type rawAccessor,
dest_accessor_type accessor,
const RawMemorySharedArray&rMem,
const PaletteMemorySharedVector& rPalette ) :
BitmapDevice( rBounds, nScanlineFormat,
nScanlineStride, pFirstScanline, rMem, rPalette ),
maBegin( begin ),
-maAccessor( accessor ),
-maRawAccessor( rawAccessor )
+maAccessor( accessor )
{}
private:
@@ -275,7 +265,6 @@ BitmapDeviceSharedPtr createRenderer(
Format
nScanlineFormat,
sal_Int32
nScanlineStride,
sal_uInt8*
pFirstScanline,
-typename FormatTraits::raw_accessor_type const& rRawAccessor,
typename FormatTraits::accessor_selector::template wrap_accessor<
typename FormatTraits::raw_accessor_type>::type const& rAccessor,
boost::shared_array< sal_uInt8 > pMem,
@@ -296,7 +285,6 @@ BitmapDeviceSharedPtr createRenderer(
reinterpret_cast(
pFirstScanline),
nScanlineStride),
- rRawAccessor,
rAccessor,
pMem,
pPal ));
@@ -336,7 +324,6 @@ BitmapDeviceSharedPtr createRenderer(
nScanlineFormat,
nScanlineStride,
pFirstScanline,
- typename
FormatTraits::raw_accessor_type(),
typename
FormatTraits::accessor_selector::template
wrap_accessor<
typename
FormatTraits::raw_a
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source
sc/source/ui/app/inputhdl.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit e2b222cc98b1378b85d0c37eb9f5ef562247b3cf Author: Winfried Donkers Date: Mon Jan 18 12:27:49 2016 +0100 follow-up of tdf#89031 No function name hints or autocompletion when character right of caret is '$' Change-Id: I4fcfa6e29e5671e97743c7fc520953721d0bda24 Reviewed-on: https://gerrit.libreoffice.org/21577 Reviewed-by: Eike Rathke Tested-by: Eike Rathke (cherry picked from commit 1e2bcb3177d58e6f446296ae28fcff7f5da9b620) Reviewed-on: https://gerrit.libreoffice.org/21601 diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index a464c34..2395cba 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1060,7 +1060,8 @@ void ScInputHandler::UseFormulaData() if ( aParagraph.getLength() > aSel.nEndPos && ( ScGlobal::pCharClass->isLetterNumeric( aParagraph, aSel.nEndPos ) || aParagraph[ aSel.nEndPos ] == '_' || - aParagraph[ aSel.nEndPos ] == '.' ) ) + aParagraph[ aSel.nEndPos ] == '.' || + aParagraph[ aSel.nEndPos ] == '$' ) ) return; // Is the cursor at the end of a word? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 1e2bcb3177d58e6f446296ae28fcff7f5da9b620 Author: Winfried Donkers Date: Mon Jan 18 12:27:49 2016 +0100 follow-up of tdf#89031 No function name hints or autocompletion when character right of caret is '$' Change-Id: I4fcfa6e29e5671e97743c7fc520953721d0bda24 Reviewed-on: https://gerrit.libreoffice.org/21577 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 21e8697..9656fe9 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1228,7 +1228,8 @@ void ScInputHandler::UseFormulaData() if ( aParagraph.getLength() > aSel.nEndPos && ( ScGlobal::pCharClass->isLetterNumeric( aParagraph, aSel.nEndPos ) || aParagraph[ aSel.nEndPos ] == '_' || - aParagraph[ aSel.nEndPos ] == '.' ) ) + aParagraph[ aSel.nEndPos ] == '.' || + aParagraph[ aSel.nEndPos ] == '$' ) ) return; // Is the cursor at the end of a word? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/sot sot/source svtools/source
include/sot/formats.hxx |3 +-
sot/source/base/exchange.cxx |1
sot/source/base/formats.cxx | 42 +++
svtools/source/misc/transfer.cxx | 25 +++
4 files changed, 70 insertions(+), 1 deletion(-)
New commits:
commit 27c6b8586d5d2cd1fa5425b4969d915a0b739475
Author: Miklos Vajna
Date: Tue Jan 19 12:47:45 2016 +0100
svtools: implement clipboard import of JPEG files
With this, lok::Document::paste("image/jpeg", "...") as invoked by
gtktiledviewer results in a Writer image just like the previously
already working PNG variant.
Change-Id: I9e7b94043519db4ccf3c9ad32474a15275896dd4
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 0371ea8..ccad405 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -60,6 +60,7 @@
#include
#include
#include
+#include
#include
// - Namespaces -
@@ -1628,11 +1629,19 @@ bool TransferableDataHelper::GetBitmapEx( const
DataFlavor& rFlavor, BitmapEx& r
DataFlavor aSubstFlavor;
bool bRet(GetSotStorageStream(rFlavor, xStm));
bool bSuppressPNG(false); // #122982# If PNG stream not accessed, but BMP
one, suppress trying to load PNG
+bool bSuppressJPEG(false);
if(!bRet && HasFormat(SotClipboardFormatId::PNG) &&
SotExchange::GetFormatDataFlavor(SotClipboardFormatId::PNG, aSubstFlavor))
{
// when no direct success, try if PNG is available
bRet = GetSotStorageStream(aSubstFlavor, xStm);
+bSuppressJPEG = bRet;
+}
+
+if(!bRet && HasFormat(SotClipboardFormatId::JPEG) &&
SotExchange::GetFormatDataFlavor(SotClipboardFormatId::JPEG, aSubstFlavor))
+{
+bRet = GetSotStorageStream(aSubstFlavor, xStm);
+bSuppressPNG = bRet;
}
if(!bRet && HasFormat(SotClipboardFormatId::BMP) &&
SotExchange::GetFormatDataFlavor(SotClipboardFormatId::BMP, aSubstFlavor))
@@ -1640,6 +1649,7 @@ bool TransferableDataHelper::GetBitmapEx( const
DataFlavor& rFlavor, BitmapEx& r
// when no direct success, try if BMP is available
bRet = GetSotStorageStream(aSubstFlavor, xStm);
bSuppressPNG = bRet;
+bSuppressJPEG = bRet;
}
if(bRet)
@@ -1651,6 +1661,14 @@ bool TransferableDataHelper::GetBitmapEx( const
DataFlavor& rFlavor, BitmapEx& r
rBmpEx = aPNGReader.Read();
}
+else if(!bSuppressJPEG &&
rFlavor.MimeType.equalsIgnoreAsciiCase("image/jpeg"))
+{
+// it's a JPEG, import to BitmapEx
+GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+Graphic aGraphic;
+if (rFilter.ImportGraphic(aGraphic, "", *xStm) == GRFILTER_OK)
+rBmpEx = aGraphic.GetBitmapEx();
+}
if(rBmpEx.IsEmpty())
{
@@ -1800,6 +1818,13 @@ bool TransferableDataHelper::GetGraphic( const
css::datatransfer::DataFlavor& rF
if( ( bRet = GetBitmapEx( aFlavor, aBmpEx ) ) )
rGraphic = aBmpEx;
}
+else if (SotExchange::GetFormatDataFlavor(SotClipboardFormatId::JPEG,
aFlavor) && TransferableDataHelper::IsEqual(aFlavor, rFlavor))
+{
+BitmapEx aBitmapEx;
+
+if ((bRet = GetBitmapEx(aFlavor, aBitmapEx)))
+rGraphic = aBitmapEx;
+}
else if(SotExchange::GetFormatDataFlavor( SotClipboardFormatId::BITMAP,
aFlavor ) &&
TransferableDataHelper::IsEqual( aFlavor, rFlavor ) )
{
commit f731ecfd7bd3c703455e07447e9bb593e7b6e059
Author: Miklos Vajna
Date: Tue Jan 19 12:31:03 2016 +0100
sot: accept JPEG as a clipboard format where we accept PNG already
Change-Id: I64602d31e8aa873e2280f86eaf618dd6007acaf1
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx
index fa3c768..04094b0 100644
--- a/include/sot/formats.hxx
+++ b/include/sot/formats.hxx
@@ -171,8 +171,9 @@ enum class SotClipboardFormatId : sal_uLong
PNG= 141,
STARWRITERGLOB_8_TEMPLATE = 142,
MATHML = 143,
+JPEG = 144,
// the point at which we start allocating "runtime" format IDs
-USER_END = MATHML
+USER_END = JPEG
};
/** Make it easier to iterate over format IDs */
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 88de2a6..36c5a50 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -202,6 +202,7 @@ namespace
/*141 SotClipboardFormatId::PNG*/{
"image/png", "PNG Bitmap", &cppu::UnoType>::get() },
/*142 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE*/ {
MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8
Template", &cppu::UnoType>::get() },
/*143 SotClipboardFormatId::MATHML*/ { "application/mathml+xml",
"MathML", &::cppu::UnoType>::get() },
+/*144 SotClipboardFormatId::JPEG*/ { "image/jpeg", "JPEG Bi
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - sal/qa sal/rtl
sal/qa/rtl/math/test-rtl-math.cxx | 55 +
sal/rtl/math.cxx | 82 ++
2 files changed, 137 insertions(+)
New commits:
commit ab0ef85c7dbc0f8f25cb39ebcce4d5aa038d2f56
Author: Eike Rathke
Date: Wed Jan 13 14:40:12 2016 +0100
tdf#96918 display accurate integer double values up to (2^53)-1
(cherry picked from commit 0f6203edf74832f84d8263d7a544d679203a4efc)
unit test for tdf#96918 display accurate integer double values
(cherry picked from commit a3f5f4f6369552a3da870de1ed4ea9d8c628c7a8)
619e0cb0fbbfd0dfba3b2fe9c3476be55a3eea8e
sal: as always C++ is too stupid to deduce parameter types of min
(cherry picked from commit 2d526a9ffbad7effaabb70f4e52904c09d0ab22b)
b00f29a6024e22c65a30bf4a45332e550994f03f
loplugin:defaultparams
(cherry picked from commit 036b4a366ecc7ea343a3fedee268463d6576cb32)
Keep MSVC happy
(warning C4305 when converting 9007199254740993 from __int64 to double)
(cherry picked from commit e5d393cf0edc5d871cfe1aea6acede482eecec84)
handle negative decimal places for rounding, tdf#96918 related
(cherry picked from commit fdf982f70b2944053d995baaa3d78c7cdc4bbc4b)
unit test for negative decimal places rounding, tdf#96918 related
(cherry picked from commit 5299400e5cce3060a0de85bb4dedd065b5ad1f41)
use getN10Exp(x) instead of pow(10.0,x)
(cherry picked from commit e6c9bdfdc181c95d5757b96b6194d639a0df3c79)
use ::std::swap() to reverse buffer
(cherry picked from commit f19b4826c44e9e5f54b968fef59a3fcd3007d522)
0e2b92a01ba5ae1824d609ee2e557f1a1cc85cbd
fa423eabc64ead519c4f4a3370a06e88ea5c7466
b2f3ffaa7c4216b66479c750465c2beab927405a
b7e49126cbffc510fa941c25a8d57222bad51c46
7e18e57636416f0a3ed96c2fa3adc004fb3ba013
507a16e1d87460dead79b78621202c68ee12c2c8
Change-Id: I42001583c72bc3faab94489a4eabfa183cab5ae2
Reviewed-on: https://gerrit.libreoffice.org/21435
Reviewed-by: Michael Stahl
Reviewed-by: Miklos Vajna
Reviewed-by: Tor Lillqvist
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx
b/sal/qa/rtl/math/test-rtl-math.cxx
index aa7b213..3de4956 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -88,6 +88,60 @@ public:
CPPUNIT_ASSERT_EQUAL(0.0, res);
}
+void test_doubleToString() {
+double fVal = 999.0;
+sal_Int32 aGroups[3] = { 3, 2, 0 };
+rtl::OUString aRes( rtl::math::doubleToUString( fVal,
+rtl_math_StringFormat_Automatic,
+rtl_math_DecimalPlaces_Max,
+'.', aGroups, ',', true));
+CPPUNIT_ASSERT_EQUAL( OUString("99,99,99,99,99,99,999"), aRes);
+
+fVal = 949.0;
+aRes = rtl::math::doubleToUString( fVal,
+rtl_math_StringFormat_Automatic,
+-2, // round before decimals
+'.', aGroups, ',', true);
+CPPUNIT_ASSERT_EQUAL( OUString("900"), aRes);
+
+fVal = 950.0;
+aRes = rtl::math::doubleToUString( fVal,
+rtl_math_StringFormat_Automatic,
+-2, // round before decimals
+'.', aGroups, ',', true);
+CPPUNIT_ASSERT_EQUAL( OUString("1,000"), aRes);
+
+fVal = 4503599627370495.0;
+aRes = rtl::math::doubleToUString( fVal,
+rtl_math_StringFormat_Automatic,
+rtl_math_DecimalPlaces_Max, '.');
+CPPUNIT_ASSERT_EQUAL( OUString("4503599627370495"), aRes);
+
+fVal = 4503599627370496.0;
+aRes = rtl::math::doubleToUString( fVal,
+rtl_math_StringFormat_Automatic,
+2, '.');
+CPPUNIT_ASSERT_EQUAL( OUString("4503599627370496.00"), aRes);
+
+fVal = 9007199254740991.0; // (2^53)-1
+aRes = rtl::math::doubleToUString( fVal,
+rtl_math_StringFormat_Automatic,
+rtl_math_DecimalPlaces_Max, '.', true);
+CPPUNIT_ASSERT_EQUAL( OUString("9007199254740991"), aRes);
+
+fVal = 9007199254740992.0; // (2^53), algorithm switch
+aRes = rtl::math::doubleToUString( fVal,
+rtl_math_StringFormat_Automatic,
+rtl_math_DecimalPlaces_Max, '.', true);
+CPPUNIT_ASSERT_EQUAL( OUString("9.00719925474099E+015"), aRes);
+
+fVal = 9007199254740993.0; // (2^53)+1 would be but is
9007199254740992
+aRes = rtl::math::doubleToUString( fVal,
+rtl_math_StringFormat_Automatic,
+rtl_math_DecimalPlaces_Max, '.', true);
+CPPUNIT_ASSERT_EQUAL( OUString("9.00719925474099E+015"), aRes);
+}
+
void test_erf() {
double x, res;
x = 0.0;
@@ -
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/gdiimpl.cxx | 16
1 file changed, 16 deletions(-)
New commits:
commit 94f7321e66b136fdff880a7c89eaebbc0e6782f2
Author: Tor Lillqvist
Date: Tue Jan 19 14:13:41 2016 +0200
Win9x has been dead and forgotten for a long time
Change-Id: I75c58e81c27edd65239c6e033170a432735a81e4
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 6cb9e3e..5c13028 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -73,7 +73,6 @@
#define DMAP( _def_nVal, _def_nThres )
((pDitherDiff[_def_nVal]>(_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal])
#define SAL_POLY_STACKBUF 32
-#define USE_GDI_BEZIERS
namespace {
@@ -1775,22 +1774,15 @@ void WinSalGraphicsImpl::drawPolyPolygon( sal_uInt32
nPoly, const sal_uInt32* pP
bool WinSalGraphicsImpl::drawPolyLineBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const BYTE* pFlgAry )
{
-#ifdef USE_GDI_BEZIERS
-// for NT, we can handover the array directly
static_assert( sizeof( POINT ) == sizeof( SalPoint ), "must be the same
size" );
ImplRenderPath( mrParent.getHDC(), nPoints, pPtAry, pFlgAry );
return true;
-#else
-return false;
-#endif
}
bool WinSalGraphicsImpl::drawPolygonBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const BYTE* pFlgAry )
{
-#ifdef USE_GDI_BEZIERS
-// for NT, we can handover the array directly
static_assert( sizeof( POINT ) == sizeof( SalPoint ), "must be the same
size" );
POINT aStackAry1[SAL_POLY_STACKBUF];
@@ -1831,16 +1823,11 @@ bool WinSalGraphicsImpl::drawPolygonBezier( sal_uInt32
nPoints, const SalPoint*
}
return bRet;
-#else
-return false;
-#endif
}
bool WinSalGraphicsImpl::drawPolyPolygonBezier( sal_uInt32 nPoly, const
sal_uInt32* pPoints,
const SalPoint* const* pPtAry,
const BYTE* const* pFlgAry )
{
-#ifdef USE_GDI_BEZIERS
-// for NT, we can handover the array directly
static_assert( sizeof( POINT ) == sizeof( SalPoint ), "must be the same
size" );
sal_uLong nCurrPoly, nTotalPoints;
@@ -1885,9 +1872,6 @@ bool WinSalGraphicsImpl::drawPolyPolygonBezier(
sal_uInt32 nPoly, const sal_uInt
}
return bRet;
-#else
-return false;
-#endif
}
void impAddB2DPolygonToGDIPlusGraphicsPathReal(Gdiplus::GpPath *pPath, const
basegfx::B2DPolygon& rPolygon, bool bNoLineJoin)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - include/vcl
include/vcl/salnativewidgets.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit bbe4b3a7cc2f5410e65b220e24f23f55f7eaaa1d Author: Tor Lillqvist Date: Mon Jan 18 14:33:40 2016 +0200 tdf#95913: Don't cache CTRL_SLIDER Change-Id: I6af4b27f5bc2f24918d92fe8c5e430cfdfad6439 (cherry picked from commit 56a35d67138beada946697a81daa9f0b08e77cfc) Reviewed-on: https://gerrit.libreoffice.org/21580 Reviewed-by: Eike Rathke Reviewed-by: David Tardon Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 34c2514..8c1176a 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -287,6 +287,7 @@ public: case CTRL_CHECKBOX: case CTRL_RADIOBUTTON: case CTRL_LISTNODE: +case CTRL_SLIDER: return false; case CTRL_MENUBAR: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sal/qa sc/inc sc/source svx/inc sw/inc
sal/qa/inc/stringhelper.hxx |4
sc/inc/address.hxx| 10 --
sc/inc/cellvalue.hxx |2 --
sc/inc/chartarr.hxx |2 --
sc/inc/pivot.hxx |1 -
sc/source/core/data/cellvalue.cxx |9 -
sc/source/core/data/pivot2.cxx| 20
sc/source/core/tool/chartarr.cxx |6 --
sc/source/ui/inc/docsh.hxx|1 -
svx/inc/xpolyimp.hxx |2 --
sw/inc/IMark.hxx | 24
11 files changed, 24 insertions(+), 57 deletions(-)
New commits:
commit a06eefdec89537ec1d939a5d001fd0d6f3eb9793
Author: Noel Grandin
Date: Tue Jan 19 13:21:37 2016 +0200
place it safe with MSVC 2008 build
revert a couple of pieces of commit
5fe99ea3ee7b33a80f1419f2a4c9c1ea56dd00ee
"loplugin:unusedmethods in sw"
Change-Id: If1eb9c7f01dcdea7ef7059165470357d5186ff93
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 0a8860e..5f891b8 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -137,6 +137,18 @@ namespace sw { namespace mark
{
return pMark->StartsAfter(rPos);
}
+#ifdef DBG_UTIL
+bool operator()(std::shared_ptr const& pMark,
+SwPosition const& rPos)
+{
+return pMark->StartsBefore(rPos);
+}
+bool operator()(std::shared_ptr const& pMark1,
+std::shared_ptr const& pMark2)
+{
+return (*pMark1) < (*pMark2);
+}
+#endif
};
// MSVC 2008 with _DEBUG calls this with parameters in wrong order
@@ -148,6 +160,18 @@ namespace sw { namespace mark
{
return pMark->StartsBefore(rPos);
}
+#ifdef DBG_UTIL
+bool operator()(SwPosition const& rPos,
+std::shared_ptr const& pMark)
+{
+return pMark->StartsAfter(rPos);
+}
+bool operator()(std::shared_ptr const& pMark1,
+std::shared_ptr const& pMark2)
+{
+return (*pMark1) < (*pMark2);
+}
+#endif
};
OUString ExpandFieldmark(IFieldmark* pBM);
commit c0b199b3c69ace999db6e688466b2bbd9ad7c389
Author: Noel Grandin
Date: Tue Jan 19 13:10:56 2016 +0200
loplugin:unusedmethods in sc/
Change-Id: I2c24d06d9fad26c65fa13cdcaa2c3f908971106c
diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx
index cb7a0ab..e7a0328 100644
--- a/sal/qa/inc/stringhelper.hxx
+++ b/sal/qa/inc/stringhelper.hxx
@@ -27,10 +27,6 @@ inline void operator <<= (rtl::OString& _rAsciiString,
rtl::OUString const & _rU
{
_rAsciiString =
rtl::OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US);
}
-inline void operator <<= (rtl::OUString& _rUnicodeString, rtl::OString const &
_rAsciiString )
-{
-_rUnicodeString = rtl::OStringToOUString(_rAsciiString,
RTL_TEXTENCODING_ASCII_US);
-}
#endif
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 3aa0ba1..9853a40 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -709,7 +709,6 @@ public:
return aRange[n];
}
inline bool operator==( const ScRangePair& ) const;
-inline bool operator!=( const ScRangePair& ) const;
};
inline ScRangePair& ScRangePair::operator= ( const ScRangePair& rRange )
@@ -725,11 +724,6 @@ inline bool ScRangePair::operator==( const ScRangePair&
rRange ) const
(aRange[1] == rRange.aRange[1]);
}
-inline bool ScRangePair::operator!=( const ScRangePair& rRange ) const
-{
-return !operator==( rRange );
-}
-
// ScRefAddress
class ScRefAddress
{
@@ -809,10 +803,6 @@ public:
}
inline bool operator == ( const ScRefAddress& r ) const;
-inline bool operator != ( const ScRefAddress& r ) const
-{
-return !(operator==(r));
-}
OUString GetRefString( ScDocument* pDocument, SCTAB nActTab,
const ScAddress::Details& rDetails =
ScAddress::detailsOOOa1) const;
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 7ac6a87..6dcbc8f 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -155,8 +155,6 @@ struct SC_DLLPUBLIC ScRefCellValue
bool equalsWithoutFormat( const ScRefCellValue& r ) const;
ScRefCellValue& operator= ( const ScRefCellValue& r );
-
-void swap( ScRefCellValue& r );
};
#endif
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index 0e2c255..d91e492 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -84,8 +84,6 @@ public:
boolHasRowHeaders() const { return aPositioner.HasRowHeaders(); }
const OUString& GetName() const { return aName; }
-bool operator==(const ScChartArray& rCmp) const;
-
ScMemChart* CreateMemChart();
};
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index a3583a7..f0dd99b 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -124,7 +124,6 @@ struct ScPivotField
ScPivotFi
[Libreoffice-commits] core.git: desktop/Library_sofficeapp.mk
desktop/Library_sofficeapp.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0d31873dc1f40963b70a3840537e9c25bec7cff0 Author: Oliver Specht Date: Tue Jan 19 10:47:01 2016 +0100 Build the LibreOfficeKit bits also on Windows Change-Id: Ibbd5e50ffeeb061a30d6f0f09a393a67ba67421e Reviewed-on: https://gerrit.libreoffice.org/21598 Tested-by: Jenkins Reviewed-by: Oliver Specht diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 6062da8..9be7c2d 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -117,7 +117,7 @@ endif endif # LibreOfficeKit bits -ifneq ($(filter $(OS),ANDROID IOS MACOSX),) +ifneq ($(filter $(OS),ANDROID IOS MACOSX WNT),) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/init \ desktop/source/lib/lokinteractionhandler \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/clucene
external/clucene/patches/clucene-warnings.patch |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f71a0b44e634ca3ca61ac15e4cd62b0db1354ae6 Author: Stephan Bergmann Date: Tue Jan 19 12:24:04 2016 +0100 Silence -Werror,-Wunknown-pragmas Change-Id: If726008f6755db59b01784ad6b479bbfe2d23e96 diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch index 49cc0d4..270451d 100644 --- a/external/clucene/patches/clucene-warnings.patch +++ b/external/clucene/patches/clucene-warnings.patch @@ -69,7 +69,7 @@ #endif --- src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 + +++ src/core/CLucene/util/Array.h 2012-02-22 12:38:33.71884 + -@@ -7,6 +7,13 @@ +@@ -7,6 +7,14 @@ #ifndef _lucene_util_Array_ #define _lucene_util_Array_ @@ -77,6 +77,7 @@ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wunused-parameter" ++# pragma GCC diagnostic ignored "-Wpragmas" +# pragma GCC diagnostic ignored "-Wmisleading-indentation" +#endif + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/src
loleaflet/src/layer/tile/CalcTileLayer.js|5 ++---
loleaflet/src/layer/tile/ImpressTileLayer.js |5 ++---
loleaflet/src/layer/tile/WriterTileLayer.js |3 +++
3 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 152a7bbb76137508b112f940150f475eec350dc7
Author: Jan Holesovsky
Date: Tue Jan 19 11:45:51 2016 +0100
loleaflet: No need to ask for tiles for non-current parts.
LibreOffice may trigger invalidation of a part that is not current (eg.
during
the part switch). But as we don't need the old data, discard such requests.
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index a993db6..061eaa1 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -69,7 +69,7 @@ L.CalcTileLayer = L.TileLayer.extend({
}
}
- if (needsNewTiles)
+ if (needsNewTiles && command.part === this._selectedPart)
{
var message = 'tilecombine ' +
'part=' + command.part + ' ' +
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 16f9bb2..b5e78e3 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -60,7 +60,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
}
}
- if (needsNewTiles)
+ if (needsNewTiles && command.part === this._selectedPart)
{
var message = 'tilecombine ' +
'part=' + command.part + ' ' +
diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js
b/loleaflet/src/layer/tile/WriterTileLayer.js
index 31be837..5fdcb25 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -63,6 +63,9 @@ L.WriterTileLayer = L.TileLayer.extend({
if (needsNewTiles)
{
+ // CalcTileLayer.js and ImpressTileLayer.js avoid this
when
+ // command.part !== this._selectedPart; but in Writer,
the part is
+ // always 0 anyway
var message = 'tilecombine ' +
'part=' + command.part + ' ' +
'width=' + this._tileSize + ' ' +
commit 3f35e2f3ade05cb453ea6cadd9802dec6a303ed7
Author: Jan Holesovsky
Date: Tue Jan 19 09:09:04 2016 +0100
loleaflet: Share code for updating the parts.
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 0d8167e..a993db6 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -112,8 +112,7 @@ L.CalcTileLayer = L.TileLayer.extend({
_onSetPartMsg: function (textMsg) {
var part = parseInt(textMsg.match(/\d+/g)[0]);
if (part !== this._selectedPart) {
- this._selectedPart = part;
- this._update();
+ this._map.setPart(part);
this._map.fire('setpart', {selectedPart:
this._selectedPart});
this._map._socket.sendMessage('commandvalues
command=.uno:ViewRowColumnHeaders');
}
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index d1caefd..16f9bb2 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -108,8 +108,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
_onSetPartMsg: function (textMsg) {
var part = parseInt(textMsg.match(/\d+/g)[0]);
if (part !== this._selectedPart) {
- this._selectedPart = part;
- this._update();
+ this._map.setPart(part);
this._map.fire('setpart', {selectedPart:
this._selectedPart});
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loleaflet/src
loleaflet/src/layer/tile/CalcTileLayer.js|5 ++---
loleaflet/src/layer/tile/ImpressTileLayer.js |5 ++---
loleaflet/src/layer/tile/WriterTileLayer.js |3 +++
3 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit bb96386735844f0c19d77a910554ad5489adb6ca
Author: Jan Holesovsky
Date: Tue Jan 19 11:45:51 2016 +0100
loleaflet: No need to ask for tiles for non-current parts.
LibreOffice may trigger invalidation of a part that is not current (eg.
during
the part switch). But as we don't need the old data, discard such requests.
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index a993db6..061eaa1 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -69,7 +69,7 @@ L.CalcTileLayer = L.TileLayer.extend({
}
}
- if (needsNewTiles)
+ if (needsNewTiles && command.part === this._selectedPart)
{
var message = 'tilecombine ' +
'part=' + command.part + ' ' +
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 4bb1e9f..1969bd6 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -60,7 +60,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
}
}
- if (needsNewTiles)
+ if (needsNewTiles && command.part === this._selectedPart)
{
var message = 'tilecombine ' +
'part=' + command.part + ' ' +
diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js
b/loleaflet/src/layer/tile/WriterTileLayer.js
index 31be837..5fdcb25 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -63,6 +63,9 @@ L.WriterTileLayer = L.TileLayer.extend({
if (needsNewTiles)
{
+ // CalcTileLayer.js and ImpressTileLayer.js avoid this
when
+ // command.part !== this._selectedPart; but in Writer,
the part is
+ // always 0 anyway
var message = 'tilecombine ' +
'part=' + command.part + ' ' +
'width=' + this._tileSize + ' ' +
commit f029a13a6af4b44ac1bab1f32cccd328efdf11d0
Author: Jan Holesovsky
Date: Tue Jan 19 09:09:04 2016 +0100
loleaflet: Share code for updating the parts.
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 0d8167e..a993db6 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -112,8 +112,7 @@ L.CalcTileLayer = L.TileLayer.extend({
_onSetPartMsg: function (textMsg) {
var part = parseInt(textMsg.match(/\d+/g)[0]);
if (part !== this._selectedPart) {
- this._selectedPart = part;
- this._update();
+ this._map.setPart(part);
this._map.fire('setpart', {selectedPart:
this._selectedPart});
this._map._socket.sendMessage('commandvalues
command=.uno:ViewRowColumnHeaders');
}
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 6505f6d..4bb1e9f 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -108,8 +108,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
_onSetPartMsg: function (textMsg) {
var part = parseInt(textMsg.match(/\d+/g)[0]);
if (part !== this._selectedPart) {
- this._selectedPart = part;
- this._update();
+ this._map.setPart(part);
this._map.fire('setpart', {selectedPart:
this._selectedPart});
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/boost
external/boost/UnpackedTarball_boost.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 356599d2e156b98f21536d25797228b1e174b3ad Author: Stephan Bergmann Date: Tue Jan 19 12:12:28 2016 +0100 Remove bogus addition from prev commit Change-Id: I9b1aa86e3cb325b07158e3994a961db8ea4114d8 diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 6b99265..b3a9c3a 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -87,7 +87,6 @@ boost_patches += boost_1_59_0.property_tree.wreturn-type.patch boost_patches += clang-cl.patch.0 boost_patches += gcc6-warnings.patch.0 -boost_patches += gcc-pr69327.patch.0 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/boost
external/boost/UnpackedTarball_boost.mk |1 +
external/boost/gcc6-warnings.patch.0|6 --
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2c9d652dc7f7a1e2d0d8ea0cfcdcf47608a3d84e
Author: Stephan Bergmann
Date: Tue Jan 19 12:01:08 2016 +0100
Does that help old GCC that don't know -Wplacement-new
...and would thus error out with -Werror=pragmas?
Change-Id: I113c43bed4d6d0c03e4c3c68684c50fd386428d9
diff --git a/external/boost/UnpackedTarball_boost.mk
b/external/boost/UnpackedTarball_boost.mk
index b3a9c3a..6b99265 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -87,6 +87,7 @@ boost_patches += boost_1_59_0.property_tree.wreturn-type.patch
boost_patches += clang-cl.patch.0
boost_patches += gcc6-warnings.patch.0
+boost_patches += gcc-pr69327.patch.0
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/external/boost/gcc6-warnings.patch.0
b/external/boost/gcc6-warnings.patch.0
index b0362d1..e5f7b2d 100644
--- a/external/boost/gcc6-warnings.patch.0
+++ b/external/boost/gcc6-warnings.patch.0
@@ -1,11 +1,12 @@
--- boost/function/function_base.hpp
+++ boost/function/function_base.hpp
-@@ -305,7 +305,14 @@
+@@ -305,7 +305,15 @@
if (op == clone_functor_tag || op == move_functor_tag) {
const functor_type* in_functor =
static_cast(static_cast(&in_buffer.data));
+#if defined __GNUC__
+#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wplacement-new"
+#endif
new (reinterpret_cast(&out_buffer.data))
functor_type(*in_functor);
@@ -17,12 +18,13 @@
functor_type* f =
static_cast(static_cast(&in_buffer.data));
--- boost/function/function_template.hpp
+++ boost/function/function_template.hpp
-@@ -569,7 +569,14 @@
+@@ -569,7 +569,15 @@
void
assign_functor(FunctionObj f, function_buffer& functor, mpl::true_)
const
{
+#if defined __GNUC__
+#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wplacement-new"
+#endif
new (reinterpret_cast(&functor.data)) FunctionObj(f);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - officecfg/registry sd/source sd/uiconfig
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 10 ++
sd/source/ui/app/optsitem.cxx | 13 +++
sd/source/ui/inc/optsitem.hxx |4 ++
sd/source/ui/view/ViewShellBase.cxx | 20 +++-
sd/uiconfig/simpress/toolbar/standardbar.xml|5 +--
5 files changed, 41 insertions(+), 11 deletions(-)
New commits:
commit bef97e1e067b4e0ef48c0ea8966c8107a0d2b6d4
Author: Philippe Jung
Date: Mon Jan 18 13:25:41 2016 +0100
tdf#97119 Make TabBarVisible configuration persistant
Now the TabBarVisible status persist between LO quit/relaunch. It is also
taking into accoutn when opening a (existing/new) presentation.
Fixes the incorrect toolbar button status
Moves the two buttons on Standard bar, in the PageSetup/SlideMasterPage
group.
ShowTabBar button is also enabled but not selected by default.
Change-Id: Idd9ab15efebc2bf43bc827afaa1eb1457b39deec
Reviewed-on: https://gerrit.libreoffice.org/21541
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
(cherry picked from commit 87084436d39662636e92dd03a5161293efb80948)
Reviewed-on: https://gerrit.libreoffice.org/21584
Reviewed-by: Samuel Mehrbrodt
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 276476a..2ba88b4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -559,6 +559,16 @@
150
+
+
+
+
+
+ Indicates whether the tab bar should be visible on top of the
slide panel.
+ Tab bar is visible
+
+false
+
Contains text editing related configuration items.
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 628453b..ca0d104 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -428,6 +428,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, bool
bUseConfig ) :
bEnablePresenterScreen( true),
bSolidDragging( true ),
bSummationOfParagraphs( false ),
+bTabBarVisible( true ),
bShowUndoDeleteWarning( true ),
bSlideshowRespectZOrder( true ),
bShowComments( true ),
@@ -460,6 +461,7 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt )
const
IsEnableSdremote() == rOpt.IsEnableSdremote() &&
IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen()&&
IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
+IsTabBarVisible() == rOpt.IsTabBarVisible() &&
IsSolidDragging() == rOpt.IsSolidDragging() &&
IsShowUndoDeleteWarning() == rOpt.IsShowUndoDeleteWarning() &&
IsSlideshowRespectZOrder() == rOpt.IsSlideshowRespectZOrder() &&
@@ -513,7 +515,8 @@ void SdOptionsMisc::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
"PenColor",
"PenWidth",
"Start/EnableSdremote",
-"Start/EnablePresenterScreen"
+"Start/EnablePresenterScreen",
+"TabBarVisible"
};
rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? SAL_N_ELEMENTS(aPropNames)
: 14 );
@@ -574,6 +577,10 @@ bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[25].hasValue() )
SetEnablePresenterScreen( *static_cast(pValues[
25 ].getValue()) );
+
+if( pValues[26].hasValue() ) {
+SetTabBarVisible( *static_cast(pValues[ 26
].getValue()) );
+}
}
return true;
@@ -615,6 +622,7 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const
pValues[ 23 ] <<= GetPresentationPenWidth();
pValues[ 24 ] <<= IsEnableSdremote();
pValues[ 25 ] <<= IsEnablePresenterScreen();
+pValues[ 26 ] <<= IsTabBarVisible();
}
return true;
@@ -642,6 +650,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich,
SdOptions* pOpts, ::sd
maOptionsMisc.SetEnableSdremote( pOpts->IsEnableSdremote() );
maOptionsMisc.SetEnablePresenterScreen(
pOpts->IsEnablePresenterScreen() );
maOptionsMisc.SetSummationOfParagraphs(
pOpts->IsSummationOfParagraphs() );
+maOptionsMisc.SetTabBarVisible( pOpts->IsTabBarVisible() );
maOptionsMisc.SetShowUndoDeleteWarning(
pOpts->IsShowUndoDeleteWarning() );
maOptionsMisc.SetPrinterIndependentLayout(
pOpts->GetPrinterIndependentLayout() );
maOptionsMisc.SetDefaultObjectSizeWidth(
pOpts->GetDefaultObjectSizeWidth() );
@@ -718,6 +727,8 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
pOpts->SetEnableSdremote( maOptionsMisc.IsEnableSdremote() );
pOpts->SetEnablePresenterScreen(
maOptionsMisc.IsEnablePresenterScr
Re: Resuming downloads of external files
On 18 January 2016 at 23:16, Chris Sherlock wrote: > I notice we use curl to download things like boost. I think we use curl only if wget is not found. > Would it be possible to use the -C (continue) command? No idea, but you can easily do that locally as make CURL="curl -C" fetch Something like that should work I hope. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/txtfrm.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 59f190a5ac18a68a60d169e87fab9c335f488da0
Author: Stephan Bergmann
Date: Tue Jan 19 11:49:44 2016 +0100
Silence some odd -Werror=strict-overflow (GCC 6)
Change-Id: I7facae62c7ce0977e8c40d60720e4fe32460cd3d
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 0cc84d9..dc33a52 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -681,7 +681,15 @@ sal_Int32 SwTextFrame::FindBrk( const OUString &rText,
bool SwTextFrame::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen )
const
{
+// Silence over-eager warning emitted at least by GCC trunk towards 6:
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-overflow"
+#endif
if( nLen != COMPLETE_STRING && GetOfst() > nPos + nLen ) // the range
preceded us
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic pop
+#endif
return false;
if( !GetFollow() ) // the range doesn't precede us,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/ExternalProject_libetonyek.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b03879a9396c740bca248d9fcc7d8420a414e946 Author: Stephan Bergmann Date: Tue Jan 19 11:48:21 2016 +0100 Pass --enable-symbols into external/libetonyek Change-Id: I60f7817b1d5e32ad642076ea2a9f7b7522ebb1de diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index dda5a8b..963f48e 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\ORIGIN') \ CPPFLAGS="$(CPPFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ - CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11)" \ + CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))" \ LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \ LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \ XML_CFLAGS="$(LIBXML_CFLAGS)" \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/clucene
external/clucene/patches/clucene-warnings.patch |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit ae4139e220201fe40f034e054849634786f1afd9 Author: Stephan Bergmann Date: Tue Jan 19 11:47:18 2016 +0100 external/clucene: Silence -Werror=misleading-indentation (GCC 6) Change-Id: I9a067605f7c477f4e057338577a437cda7f2aa3d diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch index fc3e322..49cc0d4 100644 --- a/external/clucene/patches/clucene-warnings.patch +++ b/external/clucene/patches/clucene-warnings.patch @@ -69,7 +69,7 @@ #endif --- src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 + +++ src/core/CLucene/util/Array.h 2012-02-22 12:38:33.71884 + -@@ -7,6 +7,12 @@ +@@ -7,6 +7,13 @@ #ifndef _lucene_util_Array_ #define _lucene_util_Array_ @@ -77,6 +77,7 @@ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wunused-parameter" ++# pragma GCC diagnostic ignored "-Wmisleading-indentation" +#endif + #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/boost
external/boost/UnpackedTarball_boost.mk |1
external/boost/gcc6-warnings.patch.0| 51
2 files changed, 52 insertions(+)
New commits:
commit 92969eaa5628c914e113d754c197de19c0908687
Author: Stephan Bergmann
Date: Tue Jan 19 11:45:08 2016 +0100
external/boost: silence some GCC 6 warnings
Change-Id: I4613f013c39e439dd11d3abc3737511cb8788d4f
diff --git a/external/boost/UnpackedTarball_boost.mk
b/external/boost/UnpackedTarball_boost.mk
index e52f6cd..b3a9c3a 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -86,6 +86,7 @@ boost_patches += boost_1_59_0.multi_array.wshadow.patch
boost_patches += boost_1_59_0.property_tree.wreturn-type.patch
boost_patches += clang-cl.patch.0
+boost_patches += gcc6-warnings.patch.0
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/external/boost/gcc6-warnings.patch.0
b/external/boost/gcc6-warnings.patch.0
new file mode 100644
index 000..b0362d1
--- /dev/null
+++ b/external/boost/gcc6-warnings.patch.0
@@ -0,0 +1,51 @@
+--- boost/function/function_base.hpp
boost/function/function_base.hpp
+@@ -305,7 +305,14 @@
+ if (op == clone_functor_tag || op == move_functor_tag) {
+ const functor_type* in_functor =
+ static_cast(static_cast(&in_buffer.data));
++#if defined __GNUC__
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wplacement-new"
++#endif
+ new (reinterpret_cast(&out_buffer.data))
functor_type(*in_functor);
++#if defined __GNUC__
++#pragma GCC diagnostic pop
++#endif
+
+ if (op == move_functor_tag) {
+ functor_type* f =
static_cast(static_cast(&in_buffer.data));
+--- boost/function/function_template.hpp
boost/function/function_template.hpp
+@@ -569,7 +569,14 @@
+ void
+ assign_functor(FunctionObj f, function_buffer& functor, mpl::true_)
const
+ {
++#if defined __GNUC__
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wplacement-new"
++#endif
+ new (reinterpret_cast(&functor.data)) FunctionObj(f);
++#if defined __GNUC__
++#pragma GCC diagnostic pop
++#endif
+ }
+ template
+ void
+--- boost/multi_index/detail/index_node_base.hpp
boost/multi_index/detail/index_node_base.hpp
+@@ -51,7 +51,14 @@
+
+ value_type& value()
+ {
++#if defined __GNUC__
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wstrict-aliasing"
++#endif
+ return *reinterpret_cast(&this->space);
++#if defined __GNUC__
++#pragma GCC diagnostic pop
++#endif
+ }
+
+ const value_type& value()const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/cmdlineargs.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 4a5dda084a8257bde6d89f7657a54def9e286c21
Author: Stephan Bergmann
Date: Tue Jan 19 11:30:12 2016 +0100
Make sure desktop under LOK does not see osl_setCommandArgs CommandLineArgs
Our sal/cppunittester/cppunittester.cxx uses SAL_IMPLEMENT_MAIN, so
forwards the
cmd line args to osl_setCommandArgs.
CppunitTest_libreofficekit_tiledrendering
(run via that cppunittester) starts LOK, which starts SVMain on a
lo_startmain
thread, which calls deskopt::DispatchWatcher::executeDispatchRequests to
process
any cmd line arg requests to open documents. It sees the
libtest_libreofficekit_tiledrendering.so (or .dylib/.dll) passed to
cppunittester, and tries to open it as a LO document. Type detection will
typically determine it is plain text that should be opened with Writer,
which
will succeed. But when the .so is built with GCC 6, it happens to be
detected
as a MacPaint document, loading which fails, so that executeDispatchRequests
(desktop/source/app/dispatchwatcher.cxx) will call xDesktop->terminate(),
which
unwinds that lo_startmain thread (DeInitVCL etc.). But the main
cppunittester
thread is still calling into LOK, which is under the assumption that VCL
etc. is
still functional, and somewhat random crashes will happen.
Change-Id: Ie7b00e797a0f3223b3942bb63a31aa9c44370247
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index aa65234..b2b1ba8 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -70,7 +71,9 @@ std::vector< OUString > translateExternalUris(
class ExtCommandLineSupplier: public CommandLineArgs::Supplier {
public:
explicit ExtCommandLineSupplier():
-m_count(rtl_getAppCommandArgCount()),
+m_count(
+comphelper::LibreOfficeKit::isActive()
+? 0 : rtl_getAppCommandArgCount()),
m_index(0)
{
OUString url;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/validate.cxx |5 +
sc/source/ui/inc/validate.hxx |2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 8d1a24dae03690b576310e3539369916f31ac475
Author: Stephan Bergmann
Date: Tue Jan 19 10:58:44 2016 +0100
Make virtual ~ScValidationDlg non-inline
...otherwise, GCC 6 would aggressively inline ScValidationDlg destruction
of the
VclPtr in ScValidityRefChildWin::ScValidityRefChildWin
(sc/source/ui/view/reffact.cxx, in sc library), checking whether the vtable
points at ~ScValidationDlg (instead of a derived class dtor) to directly
inline
the ~ScValidationDlg code, which requires the ScValidateionDlg vtable (to
store
it in the object's vtable during destruction), which requires the code of
inline
virtual ScValidationDlg::dispose and ScValidationDlg::Close, which in turn
need
the addresses of (non-inline) ScValidationDlg::RemoveRefDlg and
ScTPValidationValue::RemoveRefDlg, both defined in the scui library and not
exported from there.
Change-Id: I7eb96f42deb5edd844d91e999aa5511679302c01
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 459c5d7..db73012 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -96,6 +96,11 @@ ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const
SfxItemSet* pArgSet
get(m_pHBox, "refinputbox");
}
+ScValidationDlg::~ScValidationDlg()
+{
+disposeOnce();
+}
+
void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument*
pDoc )
{
if ( rRange.aStart != rRange.aEnd )
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 2ef7738..8849557 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -176,7 +176,7 @@ class ScValidationDlg
public:
explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet,
ScTabViewShell * pTabViewSh, SfxBindings *pB = nullptr );
-virtual ~ScValidationDlg() { disposeOnce(); }
+virtual ~ScValidationDlg();
virtual voiddispose() override
{
if( m_bOwnRefHdlr )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/polygon/b2dpolygoncutandtouch.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 6dfcaa89b542efac7561a956fb8bfaf39c3b89de
Author: Tor Lillqvist
Date: Tue Jan 19 11:58:03 2016 +0200
Bin unneeded variable
As far as I see, the only use of aNormalizedEdgeVector is as a
parameter to areParallel(), and there is no need for that to be
normalized, is there?
Change-Id: I31ca09391894ab441e5b88dbdd636cf4b91ac5c2
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 71804b3..378c858 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -620,8 +620,6 @@ namespace basegfx
{
const B2DRange aRange(rCurr, rNext);
const B2DVector aEdgeVector(rNext - rCurr);
-B2DVector aNormalizedEdgeVector(aEdgeVector);
-aNormalizedEdgeVector.normalize();
bool bTestUsingX(fabs(aEdgeVector.getX()) >
fabs(aEdgeVector.getY()));
for(sal_uInt32 a(0L); a < nPointCount; a++)
@@ -634,7 +632,7 @@ namespace basegfx
{
const B2DVector aTestVector(aTestPoint - rCurr);
-if(areParallel(aNormalizedEdgeVector, aTestVector))
+if(areParallel(aEdgeVector, aTestVector))
{
const double fCut((bTestUsingX)
? aTestVector.getX() / aEdgeVector.getX()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/scmod.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8404dc3c76babbc9d0a165f4046a6e5e1be35fe5
Author: Stephan Bergmann
Date: Tue Jan 19 10:53:27 2016 +0100
-Werror=address (GCC 6)
"the compiler can assume that the address of ârItemâ will never be NULL"
Change-Id: I90a8a3074c2dab427b4bc6345ec4a824eb2ac249
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 6fbbf92..162e355 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -467,8 +467,9 @@ void ScModule::Execute( SfxRequest& rReq )
case SID_PSZ_FUNCTION:
if (pReqArgs)
{
-const SfxUInt16Item& rItem = static_cast(pReqArgs->Get(SID_PSZ_FUNCTION));
-OSL_ENSURE(dynamic_cast( &rItem) !=
nullptr,"wrong Parameter");
+auto const & p = pReqArgs->Get(SID_PSZ_FUNCTION);
+OSL_ENSURE(dynamic_cast(&p) !=
nullptr,"wrong Parameter");
+const SfxUInt16Item& rItem = static_cast(p);
ScAppOptions aNewOpts( GetAppOptions() );
aNewOpts.SetStatusFunc( rItem.GetValue() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table5.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 811d1f0a0428a293d829d2c3d90bf3e8bbe1be90
Author: Stephan Bergmann
Date: Tue Jan 19 10:51:03 2016 +0100
-Werror=maybe-uninitialized (GCC 6)
...so take the same "= -1" approach in ScTable::CopyColHidden as was alreday
taken in ScTable::CopyRowHidden
Change-Id: I0155965f142bd33706a303fb154d46776e40ec62
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index eb18a2c..8ba078c 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -620,7 +620,7 @@ void ScTable::CopyColHidden(ScTable& rTable, SCCOL
nStartCol, SCCOL nEndCol)
SCCOL nCol = nStartCol;
while (nCol <= nEndCol)
{
-SCCOL nLastCol;
+SCCOL nLastCol = -1;
bool bHidden = rTable.ColHidden(nCol, nullptr, &nLastCol);
if (nLastCol > nEndCol)
nLastCol = nEndCol;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/filters-test.cxx | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 9e74ff76cdd92849def033f2f65dd5d771bb0267
Author: Stephan Bergmann
Date: Tue Jan 19 10:49:57 2016 +0100
-Werror=address (GCC 6)
"the compiler can assume that the address of ârDocâ will always
evaluate to
âtrueâ"
Change-Id: Ic5dc481b84efad679150d13002a360478474cb90
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 0a02a0d..33bf054 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -289,7 +289,6 @@ void ScFiltersTest::testContentLotus123()
xDocSh->DoHardRecalc(true);
ScDocument& rDoc = xDocSh->GetDocument();
-CPPUNIT_ASSERT(&rDoc);
testContentImpl(rDoc, FORMAT_LOTUS123);
xDocSh->DoClose();
}
@@ -298,8 +297,7 @@ void ScFiltersTest::testContentDIF()
{
ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_DIF);
-ScDocument& rDoc = xDocSh->GetDocument();
-CPPUNIT_ASSERT(&rDoc);
+xDocSh->GetDocument();
xDocSh->DoClose();
}
@@ -319,7 +317,6 @@ void ScFiltersTest::testContentXLSB()
// CPPUNIT_ASSERT(xDocSh);
//
// ScDocument& rDoc = xDocSh->GetDocument();
-// CPPUNIT_ASSERT(&rDoc);
// testContentImpl(pDoc, FORMAT_XLS_XML);
// xDocSh->DoClose();
// }
@@ -397,7 +394,6 @@ void ScFiltersTest::testSharedFormulaXLSX()
{
ScDocShellRef xDocSh = loadDoc("shared-formula/basic.", FORMAT_XLSX);
ScDocument& rDoc = xDocSh->GetDocument();
-CPPUNIT_ASSERT(&rDoc);
xDocSh->DoHardRecalc(true);
// Check the results of formula cells in the shared formula range.
for (SCROW i = 1; i <= 18; ++i)
@@ -472,7 +468,6 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
ScDocShellRef xDocSh =
loadDoc("legacycellanchoredrotatedclippedshape.", FORMAT_ODS);
ScDocument& rDoc = xDocSh->GetDocument();
-CPPUNIT_ASSERT(&rDoc);
// ensure the imported legacy rotated shape is in the expected position
Rectangle aRect( 6000, -2000, 8000, 4000 );
// ensure the imported ( and converted ) anchor ( note we internally
now store the anchor in
@@ -488,7 +483,6 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
// a core dump in editeng ( so moved to here )
xDocSh = saveAndReload( &(*xDocSh), FORMAT_ODS);
ScDocument& rDoc2 = xDocSh->GetDocument();
-CPPUNIT_ASSERT(&rDoc2);
impl_testLegacyCellAnchoredRotatedShape( rDoc2, aRect, aAnchor );
xDocSh->DoClose();
@@ -500,7 +494,6 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
// are hidden
ScDocShellRef xDocSh =
loadDoc("legacycellanchoredrotatedhiddenshape.", FORMAT_ODS, true);
ScDocument& rDoc = xDocSh->GetDocument();
-CPPUNIT_ASSERT(&rDoc);
// ensure the imported legacy rotated shape is in the expected position
// when a shape is fully hidden reloading seems to result is in some
errors, usually
// ( same but different error happens pre-patch ) - we should do
better here, I regard it
@@ -528,7 +521,6 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
ScDocShellRef xDocSh = loadDoc("legacycellanchoredrotatedshape.",
FORMAT_ODS);
ScDocument& rDoc = xDocSh->GetDocument();
-CPPUNIT_ASSERT(&rDoc);
// ensure the imported legacy rotated shape is in the expected position
Rectangle aRect( 6000, 3000, 8000, 9000 );
// ensure the imported (and converted) anchor (note we internally now
store the anchor in
@@ -544,7 +536,6 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
// test save and reload
xDocSh = saveAndReload( &(*xDocSh), FORMAT_ODS);
ScDocument& rDoc2 = xDocSh->GetDocument();
-CPPUNIT_ASSERT(&rDoc2);
impl_testLegacyCellAnchoredRotatedShape( rDoc2, aRect, aAnchor );
xDocSh->DoClose();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/o3tl
include/o3tl/enumarray.hxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 96fea1a05d2cfb0173f292f59018c997d2f63c89
Author: Stephan Bergmann
Date: Tue Jan 19 10:46:13 2016 +0100
Make enumarray_iterator adhere to iterator requirements
...or else using it with GCC 6 libstdc++ std::find causes compilation
failures
Change-Id: I95e674922348f72fab6da8f049b2b4fcbdc74d07
diff --git a/include/o3tl/enumarray.hxx b/include/o3tl/enumarray.hxx
index a6861c1..c264c2f 100644
--- a/include/o3tl/enumarray.hxx
+++ b/include/o3tl/enumarray.hxx
@@ -22,6 +22,7 @@
#include
#include
+#include
namespace o3tl {
@@ -86,7 +87,10 @@ public:
typedef typename EA::value_type value_type;
typedef typename EA::key_type key_type;
typedef std::bidirectional_iterator_tag iterator_category; //should be
random access, but that would require define subtraction operators on the enums
-typedef typename EA::key_type difference_type;
+typedef
+typename std::make_signed<
+typename std::underlying_type::type>::type
+difference_type;
typedef typename EA::value_type* pointer;
typedef typename EA::value_type& reference;
@@ -95,8 +99,8 @@ public:
value_type &operator*() { return (*m_buf)[static_cast(m_pos)]; }
value_type *operator->() { return &(operator*()); }
self_type &operator++() { ++m_pos; return *this; }
-booloperator!=(const self_type& other) { return m_buf !=
other.m_buf || m_pos != other.m_pos; }
-booloperator==(const self_type& other) { return m_buf ==
other.m_buf && m_pos == other.m_pos; }
+booloperator!=(const self_type& other) const { return m_buf !=
other.m_buf || m_pos != other.m_pos; }
+booloperator==(const self_type& other) const { return m_buf ==
other.m_buf && m_pos == other.m_pos; }
};
}; // namespace o3tl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx | 25 -
1 file changed, 20 insertions(+), 5 deletions(-)
New commits:
commit e96eaea07dde9a375c4d771c27ee7e7da9ef53b6
Author: Stephan Bergmann
Date: Tue Jan 19 10:44:50 2016 +0100
-Werror=misleading-indentation (GCC 6)
Change-Id: Idcb4386f37d4f945301934e4f2e65d81cf1db2bd
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 8e5d8ae..e88d9e8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2215,11 +2215,26 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
nCnt = (sal_Int16)( nTmp & 0x1fff );//Last 13 bits for
segment points number
switch( nTmp >> 13 )//First 3 bits for command type
{
-case 0x0: nCommand =
EnhancedCustomShapeSegmentCommand::LINETO; if ( !nCnt ) nCnt = 1; break;
-case 0x1: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break;
-case 0x2: nCommand =
EnhancedCustomShapeSegmentCommand::MOVETO; if ( !nCnt ) nCnt = 1; break;
-case 0x3: nCommand =
EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nCnt = 0; break;
-case 0x4: nCommand =
EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nCnt = 0; break;
+case 0x0:
+nCommand =
EnhancedCustomShapeSegmentCommand::LINETO;
+if ( !nCnt ) nCnt = 1;
+break;
+case 0x1:
+nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO;
+if ( !nCnt ) nCnt = 1;
+break;
+case 0x2:
+nCommand =
EnhancedCustomShapeSegmentCommand::MOVETO;
+if ( !nCnt ) nCnt = 1;
+break;
+case 0x3:
+nCommand =
EnhancedCustomShapeSegmentCommand::CLOSESUBPATH;
+nCnt = 0;
+break;
+case 0x4:
+nCommand =
EnhancedCustomShapeSegmentCommand::ENDSUBPATH;
+nCnt = 0;
+break;
case 0x5:
case 0x6:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/unx
desktop/unx/source/splashx.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ef219e719116fd02030503d4711b22894b9208c9
Author: Stephan Bergmann
Date: Tue Jan 19 10:43:55 2016 +0100
-Werror=strict-aliasing (GCC 6)
Change-Id: I080315852db2f6e852f63f3965a2b7bf91529168
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index e26c530..d10ee89 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -304,7 +304,7 @@ static void create_pixmap(struct splash* splash)
else if ( bpp == 24 )
{
if ( machine_byte_order == byte_order && byte_order == LSBFirst )
-COPY_IN_OUT( 3, *( (color_t *)out ) = *( (color_t *)( &pixel )
); out += 3; )
+COPY_IN_OUT( 3, memcpy(out, &pixel, sizeof (color_t)); out +=
3; )
else if ( machine_byte_order == byte_order && byte_order ==
MSBFirst )
COPY_IN_OUT( 3, tmp = pixel;
*( (uint8_t *)out ) = *( (uint8_t *)(&tmp) +
1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
