date:20141127

[Libreoffice-commits] core.git: testtools/com

2014-11-27 Thread Stephan Bergmann

 testtools/com/sun/star/comp/bridge/makefile.mk |   50 -
 1 file changed, 50 deletions(-)

New commits:
commit 7eab7fc586b4a3d4d1a1c3b192567c58b72b369d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Nov 27 09:22:07 2014 +0100

Remove dead dmake makefile.mk

Change-Id: If57799fb00ce55818658cce375e1ab0244372772

diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk 
b/testtools/com/sun/star/comp/bridge/makefile.mk
deleted file mode 100644
index 2d872ea..000
--- a/testtools/com/sun/star/comp/bridge/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..$/..$/..$/..
-PRJNAME=testtools
-PACKAGE=com$/sun$/star$/comp$/bridge
-TARGET=com_sun_star_comp_bridge
-
-# --- Settings -
-
-.INCLUDE :  settings.mk
-
-# --
-
-.IF $(ENABLE_JAVA) != 
-
-JARFILES   = ridl.jar jurt.jar juh.jar
-
-JAVACLASSFILES= \
-$(CLASSDIR)$/$(PACKAGE)$/CurrentContextChecker.class \
-$(CLASSDIR)$/$(PACKAGE)$/TestComponent.class \
-$(CLASSDIR)$/$(PACKAGE)$/TestComponentMain.class
-
-JAVAFILES  = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, 
$(subst,.class,.java $(JAVACLASSFILES))) 
-
-JARCLASSDIRS   = $(PACKAGE) test$/testtools$/bridgetest
-JARTARGET  = testComponent.jar
-JARCOMPRESS= TRUE
-CUSTOMMANIFESTFILE = manifest
-
-.ENDIF
-
-# --- Targets --
-
-.INCLUDE : target.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Miklos Vajna

 sw/source/core/layout/paintfrm.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 969937768a72a56dae3e55ea5d21fd77a0fed0c5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Nov 27 09:02:09 2014 +0100

SwFrm::GetBackgroundBrush(): silence assert

getSdrAllFillAttributesHelper() should be called on an SwFrm in case
supportsFullDrawingLayerFillAttributeSet() retruns true, otherwise we
get:

getSdrAllFillAttributesHelper() call only valid for RES_FLYFRMFMT and 
RES_FRMFMT (!)

Change-Id: I08b5bffee4f2ebd852017640f9c2e5a5075ca2ec

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 9ace578..2ab70d1 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -7477,7 +7477,8 @@ bool SwFrm::GetBackgroundBrush(
 return false;
 
 //
-rFillAttributes = pFrm-getSdrAllFillAttributesHelper();
+if (pFrm-supportsFullDrawingLayerFillAttributeSet())
+rFillAttributes = pFrm-getSdrAllFillAttributesHelper();
 const SvxBrushItem rBack = pFrm-GetAttrSet()-GetBackground();
 
 if( pFrm-IsSctFrm() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Stephan Bergmann

 solenv/gbuild/Jar.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ccfb8c78277d4a4f85af5ebbd96cf87f0d729016
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Nov 27 09:33:50 2014 +0100

Missing slash

Change-Id: I56a37e08b533afb7a2aa91c82862c232c99f7112

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 3d4401b..c9fd2b9c3 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -255,7 +255,7 @@ gb_Jar_COMPONENTPREFIXES := \
 OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
 URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
 OXT:./ \
-   NONE:$(call gb_Helper_make_url,$(WORKDIR)/Jar) \
+NONE:$(call gb_Helper_make_url,$(WORKDIR)/Jar/) \
 
 # get component prefix from layer name (OOO, URE, OXT, NONE)
 gb_Jar__get_componentprefix = \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/opencl officecfg/registry opencl/Library_opencl.mk opencl/Makefile

2014-11-27 Thread Tor Lillqvist

 Repository.mk  |1 
 RepositoryModule_host.mk   |1 
 config_host.mk.in  |1 
 configure.ac   |8 
 cui/Library_cui.mk |6 
 cui/UIConfig_cui.mk|3 
 cui/source/inc/cuires.hrc  |2 
 cui/source/options/optgdlg.cxx |   10 
 cui/source/options/optgdlg.hxx |2 
 cui/source/options/optopencl.cxx   |  283 ++
 cui/source/options/optopencl.hxx   |   71 ++
 cui/source/options/treeopt.cxx |2 
 cui/source/options/treeopt.src |1 
 cui/uiconfig/ui/blackorwhitelistentrydialog.ui |  281 ++
 cui/uiconfig/ui/optgeneralpage.ui  |   41 -
 cui/uiconfig/ui/optopenclpage.ui   |  349 +
 include/opencl/openclconfig.hxx|  100 +++
 include/opencl/opencldllapi.h  |   34 +
 include/opencl/platforminfo.hxx|   51 +
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs   |   14 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   14 
 opencl/Library_opencl.mk   |   42 +
 opencl/Makefile|   14 
 opencl/Module_opencl.mk|   16 
 opencl/source/openclconfig.cxx |  256 +
 opencl/source/platforminfo.cxx |   46 +
 sc/CppunitTest_sc_opencl_test.mk   |1 
 sc/CppunitTest_sc_ucalc.mk |4 
 sc/Library_sc.mk   |   12 
 sc/Library_scui.mk |1 
 sc/inc/calcconfig.hxx  |   59 --
 sc/inc/formulagroup.hxx|2 
 sc/inc/platforminfo.hxx|   50 -
 sc/qa/unit/opencl-test.cxx |2 
 sc/source/core/inc/openclwrapper.hxx   |5 
 sc/source/core/opencl/opencl_device.cxx|   11 
 sc/source/core/opencl/openclwrapper.cxx|   83 ---
 sc/source/core/tool/calcconfig.cxx |   43 -
 sc/source/core/tool/formulagroup.cxx   |3 
 sc/source/core/tool/formulaopt.cxx |  101 ---
 sc/source/core/tool/platforminfo.cxx   |   48 -
 sc/source/ui/optdlg/calcoptionsdlg.cxx |  207 ---
 sc/source/ui/optdlg/calcoptionsdlg.hxx |   29 -
 sc/source/ui/unoobj/docuno.cxx |8 
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui  |  260 -
 45 files changed, 1617 insertions(+), 961 deletions(-)

New commits:
commit c1d09b1ad02160850d40c0d242a0d0ec0a8dc1bc
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Nov 26 22:30:33 2014 +0200

Work in progress: Move Calc-independend OpenCL configuration out of sc

Intermediate commit. More changes will follow: The device selection
logic needs to be moved, too. (And cleaned up.) Instead of the
separate formulacalculationoptions dialog we should simply have a
normal options page for those OpenCL-related settings that will remain
purely Calc-specific, like the formula opcode subsetting.

Change-Id: Id60d95e80d377cbbf5780beb473b221bce06b5e5

diff --git a/Repository.mk b/Repository.mk
index 5476f89..b124c91 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -402,6 +402,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
odfflatxml \
offacc \
oox \
+   $(call gb_Helper_optional,OPENCL,opencl) \
passwordcontainer \
pcr \
$(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 6190e4b..4ad30ff 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
officecfg \
oovbaapi \
oox \
+   $(call gb_Helper_optional,OPENCL,opencl) \
package \
postprocess \
$(call gb_Helper_optional,PYUNO,pyuno) \
diff --git a/config_host.mk.in b/config_host.mk.in
index a23629f..58e8899 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -157,7 +157,6 @@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL=@ENABLE_OPENGL@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
-export

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

2014-11-27 Thread Caolán McNamara

 oox/source/drawingml/textliststyle.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dd1e40b8fd95a8d0aea531236b4e7fbad1f8b94d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 27 09:10:20 2014 +

fix higher debug level build

Change-Id: Id35efda5e4df820cda2afd7b65b5f890fec03f2f

diff --git a/oox/source/drawingml/textliststyle.cxx 
b/oox/source/drawingml/textliststyle.cxx
index 29b359f..5ea7a04 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -18,6 +18,7 @@
  */
 
 #include drawingml/textliststyle.hxx
+#include osl/diagnose.h
 
 namespace oox { namespace drawingml {
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OpenCL nomeclature

2014-11-27 Thread Stephan Bergmann


On 11/26/2014 12:58 PM, Lionel Elie Mamane wrote:

In my understanding, List of known-bad OpenCL implementations (it
needs to be a plural IMHO) is equivalent to List of OpenCL
implementations that are known to be bad, while List of known bad
implementations of OpenCL is equivalent to List of OpenCL
implementations that are known and are bad. Known to be bad and
known and bad are not the same statement.


...but for the end user it hardly makes a difference whether an 
implementation ends up on that list because it is known to be bad or 
merely because it is bad (and some oracle rightly put it on that list).  :)

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

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

2014-11-27 Thread Tor Lillqvist

 sc/source/ui/optdlg/calcoptionsdlg.cxx|7 +++
 sc/source/ui/optdlg/calcoptionsdlg.hxx|2 ++
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui |   14 ++
 3 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 28c7d76587fe3fce1d7544654f58a3028dc1d2fe
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 11:16:31 2014 +0200

Add the Test button back

This functionality is Calc-specific and will stay in the Calc part of
the options. Let's not give the false impression that it would be
going away. (How it looks and works now is not final.)

Change-Id: Ic2f783a6fd07de89eec7d7e685364dad71243b4b

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 4dc5c4f..e056980 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -153,6 +153,7 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* 
pParent, const ScCalcConfi
 get(mpBtnFalse, false);
 get(mpSpinButton, spinbutton);
 get(mpEditField, entry);
+get(mpTestButton, test);
 get(mpOpenclInfoList, opencl_list);
 get(mpBtnAutomaticSelectionTrue, automatic_select_true);
 get(mpBtnAutomaticSelectionFalse, automatic_select_false);
@@ -204,6 +205,8 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* 
pParent, const ScCalcConfi
 mpLbSettings-SetSelectHdl(aLink);
 mpLbOptionEdit-SetSelectHdl(aLink);
 
+mpTestButton-SetClickHdl(LINK(this, ScCalcOptionsDialog, TestClickHdl));
+
 aLink = LINK(this, ScCalcOptionsDialog, BtnToggleHdl);
 mpBtnTrue-SetToggleHdl(aLink); // Set handler only to the 'True' button.
 
@@ -729,8 +732,6 @@ IMPL_LINK(ScCalcOptionsDialog, EditModifiedHdl, Control*, 
pCtrl)
 return 0;
 }
 
-#if 0
-
 namespace {
 
 struct Area
@@ -1163,6 +1164,4 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, 
PushButton*, )
 return 0;
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx 
b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 789c01d..c7bfe4d 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -41,6 +41,7 @@ public:
 DECL_LINK( DeviceSelHdl, void* );
 DECL_LINK( NumModifiedHdl, void * );
 DECL_LINK( EditModifiedHdl, Control * );
+DECL_LINK( TestClickHdl, PushButton* );
 
 const ScCalcConfig GetConfig() const { return maConfig;}
 
@@ -74,6 +75,7 @@ private:
 RadioButton* mpBtnFalse;
 NumericField* mpSpinButton;
 Edit* mpEditField;
+PushButton* mpTestButton;
 
 FixedText* mpFtAnnotation;
 FixedText* mpFtFrequency;
diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui 
b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index 37a10c6..6fee1af 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -646,6 +646,20 @@
 property name=height1/property
   /packing
 /child
+child
+  object class=GtkButton id=test
+property name=label translatable=yes_Test/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach28/property
+property name=expandFalse/property
+property name=fillTrue/property
+  /packing
+/child
   /object
   packing
 property name=expandFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: guidance to write a unit test for SetMacroSecurityLevel()

2014-11-27 Thread Stephan Bergmann


On 11/27/2014 01:54 AM, nicholas ferguson wrote:

I can do
Line 544
SfxItemSet* pSet = pSrcMed-GetItemSet();
pSet-Put(SfxUInt16Item(SID_MACROEXECMODE,::com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN));



and add include
#include com/sun/star/document/MacroExecMode.hdl



[nicholas ferguson]
This does work. But someone needs to write a CPP Unit test of opening up a s/h, 
then dynamically changing MacroExecMode's and checking that they are ok.


No idea what you mean with dynamically changing MacroExecMode's and 
checking that they are ok (the macro security settings are checked 
once, when the document is opened, if that is where you're heading).

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

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

2014-11-27 Thread Tor Lillqvist

 include/opencl/platforminfo.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 280fd1542610af812ada54ad52e71ca674d65f27
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 11:43:14 2014 +0200

Try to fix MSVC build

Change-Id: I24c48d2540a8cb7d2a823862d53cddf90d41f94a

diff --git a/include/opencl/platforminfo.hxx b/include/opencl/platforminfo.hxx
index 6c40c43..28c7ba8 100644
--- a/include/opencl/platforminfo.hxx
+++ b/include/opencl/platforminfo.hxx
@@ -43,6 +43,9 @@ struct OPENCL_DLLPUBLIC OpenCLPlatformInfo
 std::vectorOpenCLDeviceInfo maDevices;
 
 OpenCLPlatformInfo();
+~OpenCLPlatformInfo()
+{
+}
 };
 
 OPENCL_DLLPUBLIC std::ostream operator(std::ostream rStream, const 
OpenCLPlatformInfo rPlatform);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Tor Lillqvist

 cui/source/options/treeopt.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 432368d1ff0fca43924a498f719c92b944682313
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 11:53:42 2014 +0200

Fix OpenCL-less build

Change-Id: I36a0151640067e3d040ebf46784bdb8c534153e1

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 772f80f..46673d2 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -47,7 +47,9 @@
 #include optjsearch.hxx
 #include optlingu.hxx
 #include optmemory.hxx
+#if HAVE_FEATURE_OPENCL
 #include optopencl.hxx
+#endif
 #include optpath.hxx
 #include optsave.hxx
 #include optupdt.hxx
@@ -321,7 +323,9 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, 
vcl::Window* pParent, const Sf
 case RID_SVXPAGE_ACCESSIBILITYCONFIG:   fnCreate = 
SvxAccessibilityOptionsTabPage::Create; break;
 case RID_SVXPAGE_OPTIONS_CTL:   fnCreate = 
SvxCTLOptionsPage::Create ; break;
 case RID_SVXPAGE_OPTIONS_JAVA:  fnCreate = 
SvxJavaOptionsPage::Create ; break;
+#if HAVE_FEATURE_OPENCL
 case RID_SVXPAGE_OPENCL:fnCreate = 
SvxOpenCLTabPage::Create ; break;
+#endif
 case RID_SVXPAGE_ONLINEUPDATE:  fnCreate = 
SvxOnlineUpdateTabPage::Create; break;
 case RID_OPTPAGE_CHART_DEFCOLORS:   fnCreate = 
SvxDefaultColorOptPage::Create; break;
 #if HAVE_FEATURE_SCRIPTING
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Caolán McNamara

 vcl/source/gdi/impfont.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit c56d96fc39de897b5e8213eb5e5af295759dccbf
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 27 10:07:22 2014 +

Resolves: fdo#86203 FontCharMap claims to have twice the entries it should

regression from

commit f6d61562d41b8a49449d881da66a3d8fa519487f
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Mon Oct 6 18:16:16 2014 +1100
vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMap

which added this hunk to FontCharMap::FontCharMap without
removing the existing loop in ImplFontCharMap::ImplFontCharMap
which did exactly the same thing. So doubling the true mnCharCount.

Lets just leave the initialization of mnCharCount in the ctor of the thing 
that
contains mnCharCount

Change-Id: I389cbd32217b48ed1faf8e2fa51c8f502c09dbf6

diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index 327b0d7..a8863ef 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -401,14 +401,6 @@ FontCharMap::FontCharMap( const CmapResult rCR )
 {
 ImplFontCharMapPtr pImplFontCharMap( new ImplFontCharMap(rCR) );
 mpImplFontCharMap = pImplFontCharMap;
-
-const sal_UCS4* pRangePtr = mpImplFontCharMap-mpRangeCodes;
-for( int i = mpImplFontCharMap-mnRangeCount; --i = 0; pRangePtr += 2 )
-{
-sal_UCS4 cFirst = pRangePtr[0];
-sal_UCS4 cLast  = pRangePtr[1];
-mpImplFontCharMap-mnCharCount += cLast - cFirst;
-}
 }
 
 FontCharMap::~FontCharMap()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Caolán McNamara

 vcl/source/gdi/impfont.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit b5795df5608c3dafa7895ab35a70ac172d68b32b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 27 10:07:22 2014 +

Resolves: fdo#86203 FontCharMap claims to have twice the entries it should

regression from

commit f6d61562d41b8a49449d881da66a3d8fa519487f
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Mon Oct 6 18:16:16 2014 +1100
vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMap

which added this hunk to FontCharMap::FontCharMap without
removing the existing loop in ImplFontCharMap::ImplFontCharMap
which did exactly the same thing. So doubling the true mnCharCount.

Lets just leave the initialization of mnCharCount in the ctor of the thing 
that
contains mnCharCount

Change-Id: I389cbd32217b48ed1faf8e2fa51c8f502c09dbf6
(cherry picked from commit c56d96fc39de897b5e8213eb5e5af295759dccbf)

diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index d36005a..28fc72d 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -397,14 +397,6 @@ FontCharMap::FontCharMap( const CmapResult rCR )
 {
 ImplFontCharMapPtr pImplFontCharMap( new ImplFontCharMap(rCR) );
 mpImplFontCharMap = pImplFontCharMap;
-
-const sal_UCS4* pRangePtr = mpImplFontCharMap-mpRangeCodes;
-for( int i = mpImplFontCharMap-mnRangeCount; --i = 0; pRangePtr += 2 )
-{
-sal_UCS4 cFirst = pRangePtr[0];
-sal_UCS4 cLast  = pRangePtr[1];
-mpImplFontCharMap-mnCharCount += cLast - cFirst;
-}
 }
 
 FontCharMap::~FontCharMap()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source filter/source forms/source formula/source fpicker/

2014-11-27 Thread Tobias Madl

 basctl/source/basicide/basicbox.cxx   |   12 -
 basctl/source/basicide/baside2b.cxx   |2 
 basctl/source/basicide/bastypes.cxx   |2 
 chart2/source/controller/main/ElementSelector.cxx |4 
 cui/source/customize/macropg.cxx  |2 
 cui/source/dialogs/SpellDialog.cxx|6 
 cui/source/dialogs/colorpicker.cxx|2 
 cui/source/dialogs/hangulhanjadlg.cxx |2 
 cui/source/options/connpooloptions.cxx|2 
 cui/source/options/optcolor.cxx   |2 
 cui/source/options/optpath.cxx|2 
 cui/source/options/treeopt.cxx|2 
 cui/source/tabpages/autocdlg.cxx  |2 
 cui/source/tabpages/numfmt.cxx|2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx|2 
 dbaccess/source/ui/app/AppView.cxx|4 
 dbaccess/source/ui/browser/brwview.cxx|2 
 dbaccess/source/ui/browser/dataview.cxx   |8 -
 dbaccess/source/ui/control/RelationControl.cxx|4 
 dbaccess/source/ui/control/TableGrantCtrl.cxx |4 
 dbaccess/source/ui/dlg/ConnectionHelper.cxx   |4 
 dbaccess/source/ui/misc/WTypeSelect.cxx   |4 
 dbaccess/source/ui/querydesign/JoinTableView.cxx  |6 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx|2 
 dbaccess/source/ui/querydesign/TableWindow.cxx|4 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |2 
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx |4 
 dbaccess/source/ui/querydesign/querycontainerwindow.cxx   |2 
 dbaccess/source/ui/relationdesign/RelationDesignView.cxx  |2 
 dbaccess/source/ui/tabledesign/TEditControl.cxx   |2 
 dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx |2 
 dbaccess/source/ui/tabledesign/TableDesignView.cxx|2 
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx  |2 
 desktop/source/deployment/gui/dp_gui_dialog2.cxx  |4 
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx   |4 
 extensions/source/bibliography/bibcont.cxx|2 
 extensions/source/bibliography/toolbar.cxx|4 
 extensions/source/propctrlr/browserlistbox.cxx|4 
 extensions/source/propctrlr/browserview.cxx   |2 
 extensions/source/propctrlr/commoncontrol.cxx |2 
 extensions/source/propctrlr/standardcontrol.cxx   |6 
 extensions/source/propctrlr/standardcontrol.hxx   |2 
 extensions/source/propctrlr/usercontrol.cxx   |2 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx  |4 
 forms/source/richtext/richtextvclcontrol.cxx  |4 
 formula/source/ui/dlg/formula.cxx |4 
 formula/source/ui/dlg/funcpage.cxx|4 
 formula/source/ui/dlg/funcutl.cxx |6 
 fpicker/source/office/iodlg.cxx   |4 
 framework/source/uielement/comboboxtoolbarcontroller.cxx  |6 
 framework/source/uielement/edittoolbarcontroller.cxx  |2 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx |2 
 include/vcl/event.hxx |   51 ---
 reportdesign/source/ui/dlg/AddField.cxx   |2 
 reportdesign/source/ui/dlg/CondFormat.cxx |4 
 reportdesign/source/ui/report/DesignView.cxx  |2 
 sc/source/ui/app/inputwin.cxx |6 
 sc/source/ui/cctrl/checklistmenu.cxx  |2 
 sc/source/ui/condformat/condformatdlgentry.cxx|2 
 sc/source/ui/miscdlgs/acredlin.cxx|2 
 sc/source/ui/miscdlgs/anyrefdg.cxx|4 
 sc/source/ui/navipi/navipi.cxx|8 -
 sc/source/ui/navipi/scenwnd.cxx   |4 
 sc/source/ui/pagedlg/tphfedit.cxx |4 
 sc/source/ui/view/gridwin.cxx |   10 -
 sd/source/ui/animations/CustomAnimationDialog.cxx |4 
 sd/source/ui/dlg/RemoteDialogClientBox.cxx|4 
 sd/source/ui/dlg/docprev.cxx  |2 
 sd/source/ui/view/viewshel.cxx|2 
 sfx2/source/appl/newhelp.cxx  |   28 ++--
 sfx2/source/control/thumbnailviewitem.cxx |4 
 sfx2/source/dialog/backingwindow.cxx  |4 
 sfx2/source/dialog/basedlgs.cxx   |   12 -
 sfx2/source/dialog/dockwin.cxx|6

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

2014-11-27 Thread Stephan Bergmann

 sal/inc/getexecutablefile.hxx |   44 --
 sal/osl/unx/process_impl.cxx  |   37 ---
 sal/osl/w32/process.cxx   |   32 ++
 sal/rtl/bootstrap.cxx |6 +
 4 files changed, 30 insertions(+), 89 deletions(-)

New commits:
commit 41565560250294e22fc1c21bc4bab8286255d4cc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Nov 27 11:48:34 2014 +0100

Make osl_getExecutableFile work even without a prior osl_setCommandArgs

After 2ad716f406e0fdb9b9294876c64ae92fecbf5e27 Revert 'pyuno: set up fake
command line in getComponentContext(),' e.g. PythonTest_sw_python would 
fail on
Windows, where WinSalGraphics::GetDevFontList 
(vcl/win/source/gdi/salgdi3.cxx)
calls osl_getExecutableFile and is itself called in a python process where
osl_setCommandArgs has not been set up.

This patch makes osl_getExecutableFile on all platforms if 
osl_setCommandArgs
has not (yet) been set fall back to the code that was
osl_bootstrap_getExecutableFile_Impl (which was called from
sal/rtl/bootstrap.cxx, which can now call osl_getExecutableFile).

Change-Id: I6c1bb59205041b3208c830a8b8406e28128b4566

diff --git a/sal/inc/getexecutablefile.hxx b/sal/inc/getexecutablefile.hxx
deleted file mode 100644
index 9ebf872..000
--- a/sal/inc/getexecutablefile.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SAL_INC_GETEXECUTABLEFILE_HXX
-#define INCLUDED_SAL_INC_GETEXECUTABLEFILE_HXX
-
-#include sal/config.h
-
-#include osl/process.h
-#include rtl/ustring.h
-#include sal/types.h
-
-/***
-  osl_bootstrap_getExecutableFile_Impl().
-
-  @internal
-  @see rtl_bootstrap
-  @see #i37371#
-
- **/
-
-extern C oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C();
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 0936b38..7d8cc81 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -34,7 +34,6 @@
 #include file_path_helper.hxx
 
 #include uunxapi.hxx
-#include getexecutablefile.hxx
 #include nlsupport.hxx
 
 #ifdef ANDROID
@@ -44,9 +43,9 @@
 #if defined(MACOSX) || defined(IOS)
 #include mach-o/dyld.h
 
-oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C()
+namespace {
+
+oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL)
 {
 oslProcessError result = osl_Process_E_NotFound;
 
@@ -83,12 +82,14 @@ oslProcessError SAL_CALL 
osl_bootstrap_getExecutableFile_Impl (
 return (result);
 }
 
+}
+
 #else
 #include dlfcn.h
 
-oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C()
+namespace {
+
+oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL)
 {
 oslProcessError result = osl_Process_E_NotFound;
 
@@ -110,13 +111,11 @@ oslProcessError SAL_CALL 
osl_bootstrap_getExecutableFile_Impl (
 }
 }
 
-/* Fallback to ordinary osl_getExecutableFile(). */
-if (result == osl_Process_E_NotFound)
-result = osl_getExecutableFile (ppFileURL);
-
 return (result);
 }
 
+}
+
 #endif
 
 /***
@@ -141,19 +140,17 @@ static struct CommandArgs_Impl g_command_args =
  **/
 oslProcessError SAL_CALL osl_getExecutableFile (rtl_uString ** ppustrFile)
 {
-oslProcessError result = osl_Process_E_NotFound;
-
 pthread_mutex_lock ((g_command_args.m_mutex));
-OSL_ASSERT(g_command_args.m_nCount  0);
-if (g_command_args.m_nCount  0)
+if (g_command_args.m_nCount == 0)
 {
-/* CommandArgs set. Obtain argv[0]. */
-rtl_uString_assign (ppustrFile, g_command_args.m_ppArgs[0]);
-result = osl_Process_E_None;
+pthread_mutex_unlock

[Libreoffice-commits] core.git: opencl/README

2014-11-27 Thread Tor Lillqvist

 opencl/README |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit bb5e219aee06a754d99e6a81570e3ed569b68898
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 13:04:08 2014 +0200

Add a README file

Change-Id: Id0f8a146ca90efe6f84c7a0c377ad3f83ba7da8d

diff --git a/opencl/README b/opencl/README
new file mode 100644
index 000..c5699e7
--- /dev/null
+++ b/opencl/README
@@ -0,0 +1,7 @@
+OpenCL-related code that is not specific to any particular
+functionality OpenCL is used for. (Like formula group calculation in
+Calc.)
+
+Not compiled on platforms where OpenCL is not available (iOS and
+Android). On other platforms OpenCL is optional at run-time, but not
+at build time.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-11-27 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=75025

Timur gti...@gmail.com changed:

   What|Removed |Added

 Depends on|70223   |

-- 
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: xmloff/source

2014-11-27 Thread Caolán McNamara

 xmloff/source/draw/ximpshap.cxx |   32 
 1 file changed, 24 insertions(+), 8 deletions(-)

New commits:
commit 751e5b32c5c361995bf0ba3295f773341fd92c23
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 27 11:30:45 2014 +

Resolves: fdo#84043 don't create duplicate Mirrored[X|Y] properties

regression from 13ef16423e78d3ea825172594f08c47d2f9bfd09

commit 13ef16423e78d3ea825172594f08c47d2f9bfd09
Author: Armin Le Grand a...@apache.org
Date:   Wed Nov 21 13:23:01 2012 +

For backward compatibility take mirrorings in setTransformation into 
account

Also found an error in SdrObjCustomShape::TRGetBaseGeometry when 
MirrorY was used

(cherry picked from commit 4116c33b12d3787c406f0348f89efcb1cf409507)

Change-Id: I7bfb5dea32b8ab8498e3d92975c49b830c81e6fb

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 74bb00c..6a8c77a 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3832,22 +3832,38 @@ void SdXMLCustomShapeContext::EndElement()
 
 if(bFlippedX || bFlippedY)
 {
-beans::PropertyValue aNewPoroperty;
+OUString sName;
 
 if(bFlippedX)
+sName = MirroredX;
+else
+sName = MirroredY;
+
+//fdo#84043 overwrite the property if it already exists, otherwise 
append it
+beans::PropertyValue* pItem;
+std::vector beans::PropertyValue ::iterator 
aI(maCustomShapeGeometry.begin());
+std::vector beans::PropertyValue ::iterator 
aE(maCustomShapeGeometry.end());
+while (aI != aE)
+{
+if (aI-Name == sName)
+break;
+++aI;
+}
+if (aI != aE)
 {
-aNewPoroperty.Name = MirroredX;
+beans::PropertyValue rItem = *aI;
+pItem = rItem;
 }
 else
 {
-aNewPoroperty.Name = MirroredY;
+maCustomShapeGeometry.push_back(beans::PropertyValue());
+pItem = maCustomShapeGeometry.back();
 }
 
-aNewPoroperty.Handle = -1;
-aNewPoroperty.Value = sal_True;
-aNewPoroperty.State = beans::PropertyState_DIRECT_VALUE;
-
-maCustomShapeGeometry.push_back(aNewPoroperty);
+pItem-Name = sName;
+pItem-Handle = -1;
+pItem-Value = sal_True;
+pItem-State = beans::PropertyState_DIRECT_VALUE;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sal/inc sal/osl sal/rtl

2014-11-27 Thread Stephan Bergmann

 sal/inc/getexecutablefile.hxx |   44 --
 sal/osl/unx/process_impl.cxx  |   37 ---
 sal/osl/w32/process.cxx   |   32 ++
 sal/rtl/bootstrap.cxx |   11 +-
 4 files changed, 30 insertions(+), 94 deletions(-)

New commits:
commit ad03461b2fc7df65116823ec0bee80e60e30393b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Nov 27 11:48:34 2014 +0100

Make osl_getExecutableFile work even without a prior osl_setCommandArgs

After 2ad716f406e0fdb9b9294876c64ae92fecbf5e27 Revert 'pyuno: set up fake
command line in getComponentContext(),' e.g. PythonTest_sw_python would 
fail on
Windows, where WinSalGraphics::GetDevFontList 
(vcl/win/source/gdi/salgdi3.cxx)
calls osl_getExecutableFile and is itself called in a python process where
osl_setCommandArgs has not been set up.

This patch makes osl_getExecutableFile on all platforms if 
osl_setCommandArgs
has not (yet) been set fall back to the code that was
osl_bootstrap_getExecutableFile_Impl (which was called from
sal/rtl/bootstrap.cxx, which can now call osl_getExecutableFile).

Change-Id: I6c1bb59205041b3208c830a8b8406e28128b4566
(cherry picked from commit 41565560250294e22fc1c21bc4bab8286255d4cc)

diff --git a/sal/inc/getexecutablefile.hxx b/sal/inc/getexecutablefile.hxx
deleted file mode 100644
index 9ebf872..000
--- a/sal/inc/getexecutablefile.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SAL_INC_GETEXECUTABLEFILE_HXX
-#define INCLUDED_SAL_INC_GETEXECUTABLEFILE_HXX
-
-#include sal/config.h
-
-#include osl/process.h
-#include rtl/ustring.h
-#include sal/types.h
-
-/***
-  osl_bootstrap_getExecutableFile_Impl().
-
-  @internal
-  @see rtl_bootstrap
-  @see #i37371#
-
- **/
-
-extern C oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C();
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 0936b38..7d8cc81 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -34,7 +34,6 @@
 #include file_path_helper.hxx
 
 #include uunxapi.hxx
-#include getexecutablefile.hxx
 #include nlsupport.hxx
 
 #ifdef ANDROID
@@ -44,9 +43,9 @@
 #if defined(MACOSX) || defined(IOS)
 #include mach-o/dyld.h
 
-oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C()
+namespace {
+
+oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL)
 {
 oslProcessError result = osl_Process_E_NotFound;
 
@@ -83,12 +82,14 @@ oslProcessError SAL_CALL 
osl_bootstrap_getExecutableFile_Impl (
 return (result);
 }
 
+}
+
 #else
 #include dlfcn.h
 
-oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C()
+namespace {
+
+oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL)
 {
 oslProcessError result = osl_Process_E_NotFound;
 
@@ -110,13 +111,11 @@ oslProcessError SAL_CALL 
osl_bootstrap_getExecutableFile_Impl (
 }
 }
 
-/* Fallback to ordinary osl_getExecutableFile(). */
-if (result == osl_Process_E_NotFound)
-result = osl_getExecutableFile (ppFileURL);
-
 return (result);
 }
 
+}
+
 #endif
 
 /***
@@ -141,19 +140,17 @@ static struct CommandArgs_Impl g_command_args =
  **/
 oslProcessError SAL_CALL osl_getExecutableFile (rtl_uString ** ppustrFile)
 {
-oslProcessError result = osl_Process_E_NotFound;
-
 pthread_mutex_lock ((g_command_args.m_mutex));
-OSL_ASSERT(g_command_args.m_nCount  0);
-if (g_command_args.m_nCount  0)
+if (g_command_args.m_nCount == 0)
 {
-/* CommandArgs set. Obtain argv[0]. */
-rtl_uString_assign (ppustrFile,

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/collada2gltf

2014-11-27 Thread Matúš Kukan

 external/collada2gltf/UnpackedTarball_collada2gltf.mk   |1 
 external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 |   13 
++
 2 files changed, 14 insertions(+)

New commits:
commit f70e5a711b90f28db57883db023ff30b5e3ff6da
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Wed Nov 26 22:12:01 2014 +0100

collada2gltf: Force GLSL version

Change-Id: Ia5e29cff04c3a38d992a78b956a93103ad1042a3
(cherry picked from commit 76b76049e57319a772b863519d8bbc57460eb6f4)

diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk 
b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
index 16b7fed..e01ca53 100644
--- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
+++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 \
external/collada2gltf/patches/shader_compatibility.patch.1 \
external/collada2gltf/patches/drop_tr1_support.patch.1 \
+   external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git 
a/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 
b/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1
new file mode 100644
index 000..5da2978
--- /dev/null
+++ b/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1
@@ -0,0 +1,13 @@
+diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp 
collada2gltf/shaders/commonProfileShaders.cpp
+--- collada2gltf.org/shaders/commonProfileShaders.cpp  2014-11-26 
22:05:07.445842977 +0100
 collada2gltf/shaders/commonProfileShaders.cpp  2014-11-26 
22:07:24.313844588 +0100
+@@ -367,7 +367,8 @@
+ public:
+ 
+ GLSLShader(shared_ptr GLTFProfile profile) {
+-this-_declarations = #ifdef GL_ES_VERSION_2_0\n;
++this-_declarations = #version 130\n;
++this-_declarations += #ifdef GL_ES_VERSION_2_0\n;
+ this-_declarations += precision highp float;\n;
+ this-_declarations += #endif\n;
+ this-_body = void main(void) {\n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Stephan Bergmann

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

New commits:
commit c9c2e27c95a87aa75513555ef485cac978889b19
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Nov 27 12:51:41 2014 +0100

Adapt for Visual Studio 2013

(Note that the registry keys that find_msms() tries to read are apparently 
only
written after you started Visual Studio at least once.)

Change-Id: I522b70d9bc5d1d2d775254fc7ddedd716062

diff --git a/configure.ac b/configure.ac
index 316bfb0..013f947 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5103,7 +5103,7 @@ find_winsdk()
 
 find_msms()
 {
-for ver in 10.0 11.0; do
+for ver in 10.0 11.0 12.0; do
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
 if test -n $regvalue; then
 if test -e $regvalue/Microsoft_VC${VCVER}_CRT_x86.msm; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/vcl-opengl-integration'

2014-11-27 Thread Louis-Francis Ratté-Boulianne

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

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

2014-11-27 Thread Stephan Bergmann

 configure.ac |   31 +++
 1 file changed, 23 insertions(+), 8 deletions(-)

New commits:
commit 287049d5e074d328abfb4363f60809364935d20f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Nov 27 13:00:13 2014 +0100

Clean up find_msms()

...incorporating insight documented in the commit note of
c9c2e27c95a87aa75513555ef485cac978889b19 Adapt for Visual Studio 2013, and
cloph's idea to use Perl to read that oddly named Windows env var in cygwin.

Change-Id: I55d364f7a24b50d171a7fdca000ca2d747f6db20

diff --git a/configure.ac b/configure.ac
index 013f947..52cff05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5103,26 +5103,41 @@ find_winsdk()
 
 find_msms()
 {
+my_msm_file=Microsoft_VC${VCVER}_CRT_x86.msm
+AC_MSG_CHECKING([for $my_msm_file])
+msmdir=
 for ver in 10.0 11.0 12.0; do
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
 if test -n $regvalue; then
-if test -e $regvalue/Microsoft_VC${VCVER}_CRT_x86.msm; then
+if test -e $regvalue/$my_msm_file; then
 msmdir=$regvalue
 break
 fi
 fi
 done
+dnl Is the following fallback really necessary, or was it added in response
+dnl to never having started Visual Studio on a given machine, so the
+dnl registry keys checked above had presumably not yet been created?
+dnl Anyway, if it really is necessary, it might be worthwhile to extend it
+dnl to also check %CommonProgramFiles(X86)% (typically expanding to
+dnl C:\Program Files (X86)\Common Files compared to %CommonProgramFiles%
+dnl expanding to C:\Program Files\Common Files), which would need
+dnl something like $(perl -e 'print $ENV{CommonProgramFiles(x86)}') to
+dnl obtain its value from cygwin:
 if test -z $msmdir; then
-AC_MSG_NOTICE([no registry entry for Merge Module directory - trying 
${COMMONPROGRAMFILES}/Merge Modules/])
-msmdir=${COMMONPROGRAMFILES}/Merge Modules/
+my_msm_dir=${COMMONPROGRAMFILES}/Merge Modules
+if test -e $my_msm_dir/$my_msm_file; then
+msmdir=$my_msm_dir
+fi
 fi
-msmdir=`cygpath -m $msmdir`
-if test -z $msmdir; then
+if test -n $msmdir; then
+msmdir=`cygpath -m $msmdir`
+AC_MSG_RESULT([$msmdir])
+else
 if test $ENABLE_RELEASE_BUILD = TRUE ; then
-AC_MSG_ERROR([Merge modules not found in $msmdir])
+AC_MSG_ERROR([not found])
 else
-AC_MSG_WARN([Merge modules not found in $msmdir])
-msmdir=
+AC_MSG_WARN([not found])
 fi
 fi
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vcl-opengl-integration' - vcl/opengl

2014-11-27 Thread Markus Mohrhard

 vcl/opengl/gdiimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46278bd8151c6fcdcca7ff71869c5978a2b6d4b0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Nov 27 13:04:11 2014 +0100

Werror, Wunused-variable

Change-Id: I050afafdd9b1dad74876402665b5159a48d9f5d0

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 28f7959..32d7499 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1538,7 +1538,7 @@ void OpenGLSalGraphicsImpl::DoCopyBits( const SalTwoRect 
rPosAry, OpenGLSalGrap
 
 if( pImpl-mbOffscreen )
 {
-Size aSize( pImpl-GetWidth(), pImpl-GetHeight() );
+// Size aSize( pImpl-GetWidth(), pImpl-GetHeight() );
 PreDraw();
 DrawTexture( pImpl-maOffscreenTex, rPosAry );
 PostDraw();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Tor Lillqvist

 sc/inc/formulagroup.hxx  |7 ++-
 sc/source/core/tool/formulagroup.cxx |   23 ++-
 sc/source/ui/unoobj/docuno.cxx   |   12 
 3 files changed, 24 insertions(+), 18 deletions(-)

New commits:
commit 89c4700e6ab6ba105d9084e5dc70325896eba419
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 14:02:01 2014 +0200

Fix OpenCL-less build

Change-Id: I8e049a6df5946344110b38887301d186991a475d

diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 19debee..5bca2d5 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -10,12 +10,16 @@
 #ifndef INCLUDED_SC_INC_FORMULAGROUP_HXX
 #define INCLUDED_SC_INC_FORMULAGROUP_HXX
 
+#include config_features.h
+
 #include address.hxx
 #include types.hxx
 #include stlalgorithm.hxx
 
 #include formula/opcode.hxx
+#if HAVE_FEATURE_OPENCL
 #include opencl/platforminfo.hxx
+#endif
 #include svl/sharedstringpool.hxx
 
 #include set
@@ -122,11 +126,12 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
 
  public:
 static FormulaGroupInterpreter *getStatic();
+#if HAVE_FEATURE_OPENCL
 static void fillOpenCLInfo(std::vectorOpenCLPlatformInfo rPlatforms);
 static bool switchOpenCLDevice(const OUString rDeviceId, bool 
bAutoSelect, bool bForceEvaluation = false);
 static void enableOpenCL(bool bEnable, bool bEnableCompletely = false, 
const std::setOpCodeEnum rSubsetToEnable = std::setOpCodeEnum());
 static void getOpenCLDeviceInfo(sal_Int32 rDeviceId, sal_Int32 
rPlatformId);
-
+#endif
 virtual ScMatrixRef inverseMatrix(const ScMatrix rMat) = 0;
 virtual CompiledFormula* createCompiledFormula(ScDocument rDoc,
const ScAddress rTopPos,
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index 332072c..705029b 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -21,7 +21,9 @@
 
 #include formula/vectortoken.hxx
 #include officecfg/Office/Common.hxx
+#if HAVE_FEATURE_OPENCL
 #include opencl/platforminfo.hxx
+#endif
 #include rtl/bootstrap.hxx
 
 #include vector
@@ -33,9 +35,7 @@
 #include cstdio
 
 #if HAVE_FEATURE_OPENCL
-
 #include openclwrapper.hxx
-
 #endif
 
 namespace sc {
@@ -537,16 +537,13 @@ FormulaGroupInterpreter 
*FormulaGroupInterpreter::getStatic()
 return msInstance;
 }
 
+#if HAVE_FEATURE_OPENCL
 void FormulaGroupInterpreter::fillOpenCLInfo(std::vectorOpenCLPlatformInfo 
rPlatforms)
 {
-#if !HAVE_FEATURE_OPENCL
-(void) rPlatforms;
-#else
 const std::vectorOpenCLPlatformInfo rPlatformsFromWrapper =
 sc::opencl::fillOpenCLInfo();
 
 rPlatforms.assign(rPlatformsFromWrapper.begin(), 
rPlatformsFromWrapper.end());
-#endif
 }
 
 bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString rDeviceId, 
bool bAutoSelect, bool bForceEvaluation)
@@ -566,26 +563,19 @@ bool FormulaGroupInterpreter::switchOpenCLDevice(const 
OUString rDeviceId, bool
 msInstance = new sc::FormulaGroupInterpreterSoftware();
 return true;
 }
-#if HAVE_FEATURE_OPENCL
 bool bSuccess = sc::opencl::switchOpenCLDevice(rDeviceId, bAutoSelect, 
bForceEvaluation);
 if(!bSuccess)
 return false;
-#else
-(void) bAutoSelect;
-#endif
 
 delete msInstance;
 msInstance = NULL;
 
-#if HAVE_FEATURE_OPENCL
 if ( officecfg::Office::Common::Misc::UseOpenCL::get() )
 {
 msInstance = new sc::opencl::FormulaGroupInterpreterOpenCL();
 return msInstance != NULL;
 }
-#else
-(void) bForceEvaluation;
-#endif
+
 return false;
 }
 
@@ -597,15 +587,12 @@ void 
FormulaGroupInterpreter::getOpenCLDeviceInfo(sal_Int32 rDeviceId, sal_Int3
 if(!bOpenCLEnabled)
 return;
 
-#if HAVE_FEATURE_OPENCL
-
 size_t aDeviceId = static_castsize_t(-1);
 size_t aPlatformId = static_castsize_t(-1);
 
 sc::opencl::getOpenCLDeviceInfo(aDeviceId, aPlatformId);
 rDeviceId = aDeviceId;
 rPlatformId = aPlatformId;
-#endif
 }
 
 void FormulaGroupInterpreter::enableOpenCL(bool bEnable, bool 
bEnableCompletely, const std::setOpCodeEnum rSubsetToEnable)
@@ -620,6 +607,8 @@ void FormulaGroupInterpreter::enableOpenCL(bool bEnable, 
bool bEnableCompletely,
 ScInterpreter::SetGlobalConfig(aConfig);
 }
 
+#endif
+
 } // namespace sc
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 2e1ee23..a4de29c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include config_features.h
+
 #include scitems.hxx
 #include svx/fmdpage.hxx
 #include svx/fmview.hxx
@@ -58,7 +60,9 @@
 #include comphelper/servicehelper.hxx
 #include comphelper/string.hxx
 #include cppuhelper/supportsservice.hxx
+#if HAVE_FEATURE_OPENCL
 #include opencl/platforminfo.hxx
+#endif
 
 #include docuno.hxx

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - xmloff/source

2014-11-27 Thread Caolán McNamara

 xmloff/source/draw/ximpshap.cxx |   32 
 1 file changed, 24 insertions(+), 8 deletions(-)

New commits:
commit d3b7bf16a58c02af2d1fdf5db2fa149c6815095c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 27 11:30:45 2014 +

Resolves: fdo#84043 don't create duplicate Mirrored[X|Y] properties

regression from 13ef16423e78d3ea825172594f08c47d2f9bfd09

commit 13ef16423e78d3ea825172594f08c47d2f9bfd09
Author: Armin Le Grand a...@apache.org
Date:   Wed Nov 21 13:23:01 2012 +

For backward compatibility take mirrorings in setTransformation into 
account

Also found an error in SdrObjCustomShape::TRGetBaseGeometry when 
MirrorY was used

(cherry picked from commit 4116c33b12d3787c406f0348f89efcb1cf409507)

Change-Id: I7bfb5dea32b8ab8498e3d92975c49b830c81e6fb
(cherry picked from commit 751e5b32c5c361995bf0ba3295f773341fd92c23)
Reviewed-on: https://gerrit.libreoffice.org/13149
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 74bb00c..6a8c77a 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3832,22 +3832,38 @@ void SdXMLCustomShapeContext::EndElement()
 
 if(bFlippedX || bFlippedY)
 {
-beans::PropertyValue aNewPoroperty;
+OUString sName;
 
 if(bFlippedX)
+sName = MirroredX;
+else
+sName = MirroredY;
+
+//fdo#84043 overwrite the property if it already exists, otherwise 
append it
+beans::PropertyValue* pItem;
+std::vector beans::PropertyValue ::iterator 
aI(maCustomShapeGeometry.begin());
+std::vector beans::PropertyValue ::iterator 
aE(maCustomShapeGeometry.end());
+while (aI != aE)
+{
+if (aI-Name == sName)
+break;
+++aI;
+}
+if (aI != aE)
 {
-aNewPoroperty.Name = MirroredX;
+beans::PropertyValue rItem = *aI;
+pItem = rItem;
 }
 else
 {
-aNewPoroperty.Name = MirroredY;
+maCustomShapeGeometry.push_back(beans::PropertyValue());
+pItem = maCustomShapeGeometry.back();
 }
 
-aNewPoroperty.Handle = -1;
-aNewPoroperty.Value = sal_True;
-aNewPoroperty.State = beans::PropertyState_DIRECT_VALUE;
-
-maCustomShapeGeometry.push_back(aNewPoroperty);
+pItem-Name = sName;
+pItem-Handle = -1;
+pItem-Value = sal_True;
+pItem-State = beans::PropertyState_DIRECT_VALUE;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - xmloff/source

2014-11-27 Thread Caolán McNamara

 xmloff/source/draw/ximpshap.cxx |   32 
 1 file changed, 24 insertions(+), 8 deletions(-)

New commits:
commit 9e57326acebde972df22ea4368b5ce4822d51330
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 27 11:30:45 2014 +

Resolves: fdo#84043 don't create duplicate Mirrored[X|Y] properties

regression from 13ef16423e78d3ea825172594f08c47d2f9bfd09

commit 13ef16423e78d3ea825172594f08c47d2f9bfd09
Author: Armin Le Grand a...@apache.org
Date:   Wed Nov 21 13:23:01 2012 +

For backward compatibility take mirrorings in setTransformation into 
account

Also found an error in SdrObjCustomShape::TRGetBaseGeometry when 
MirrorY was used

(cherry picked from commit 4116c33b12d3787c406f0348f89efcb1cf409507)

Change-Id: I7bfb5dea32b8ab8498e3d92975c49b830c81e6fb
(cherry picked from commit 751e5b32c5c361995bf0ba3295f773341fd92c23)
Reviewed-on: https://gerrit.libreoffice.org/13149
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit d3b7bf16a58c02af2d1fdf5db2fa149c6815095c)
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 2e573ab..74bc681 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3808,22 +3808,38 @@ void SdXMLCustomShapeContext::EndElement()
 
 if(bFlippedX || bFlippedY)
 {
-beans::PropertyValue aNewPoroperty;
+OUString sName;
 
 if(bFlippedX)
+sName = MirroredX;
+else
+sName = MirroredY;
+
+//fdo#84043 overwrite the property if it already exists, otherwise 
append it
+beans::PropertyValue* pItem;
+std::vector beans::PropertyValue ::iterator 
aI(maCustomShapeGeometry.begin());
+std::vector beans::PropertyValue ::iterator 
aE(maCustomShapeGeometry.end());
+while (aI != aE)
+{
+if (aI-Name == sName)
+break;
+++aI;
+}
+if (aI != aE)
 {
-aNewPoroperty.Name = MirroredX;
+beans::PropertyValue rItem = *aI;
+pItem = rItem;
 }
 else
 {
-aNewPoroperty.Name = MirroredY;
+maCustomShapeGeometry.push_back(beans::PropertyValue());
+pItem = maCustomShapeGeometry.back();
 }
 
-aNewPoroperty.Handle = -1;
-aNewPoroperty.Value = sal_True;
-aNewPoroperty.State = beans::PropertyState_DIRECT_VALUE;
-
-maCustomShapeGeometry.push_back(aNewPoroperty);
+pItem-Name = sName;
+pItem-Handle = -1;
+pItem-Value = sal_True;
+pItem-State = beans::PropertyState_DIRECT_VALUE;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - wizards/com wizards/Jar_commonwizards.mk

2014-11-27 Thread Noel Grandin

 wizards/Jar_commonwizards.mk | 
  23 
 wizards/com/sun/star/wizards/common/ConfigGroup.java | 
 166 -
 wizards/com/sun/star/wizards/common/ConfigNode.java  | 
  43 
 wizards/com/sun/star/wizards/common/ConfigSet.java   | 
 428 
 wizards/com/sun/star/wizards/common/Configuration.java   | 
 220 --
 wizards/com/sun/star/wizards/common/DebugHelper.java | 
   9 
 wizards/com/sun/star/wizards/common/Desktop.java | 
 162 -
 wizards/com/sun/star/wizards/common/FileAccess.java  | 
 433 
 wizards/com/sun/star/wizards/common/Helper.java  | 
 176 -
 wizards/com/sun/star/wizards/common/Indexable.java   | 
  24 
 wizards/com/sun/star/wizards/common/InvalidQueryException.java   | 
   4 
 wizards/com/sun/star/wizards/common/JavaTools.java   | 
 127 -
 wizards/com/sun/star/wizards/common/NamedValueCollection.java| 
  20 
 wizards/com/sun/star/wizards/common/NoValidPathException.java| 
   4 
 wizards/com/sun/star/wizards/common/NumberFormatter.java | 
  42 
 wizards/com/sun/star/wizards/common/NumericalHelper.java | 
 993 --
 wizards/com/sun/star/wizards/common/PlaceholderTextElement.java  | 
   9 
 wizards/com/sun/star/wizards/common/PropertySetHelper.java   | 
 118 -
 wizards/com/sun/star/wizards/common/Resource.java| 
  13 
 wizards/com/sun/star/wizards/common/SystemDialog.java| 
 269 --
 wizards/com/sun/star/wizards/common/TemplateElement.java | 
   2 
 wizards/com/sun/star/wizards/common/UCB.java | 
 239 --
 wizards/com/sun/star/wizards/common/XMLHelper.java   | 
  54 
 wizards/com/sun/star/wizards/common/XMLProvider.java | 
  26 
 wizards/com/sun/star/wizards/db/BlindtextCreator.java| 
  10 
 wizards/com/sun/star/wizards/db/ColumnPropertySet.java   | 
  32 
 wizards/com/sun/star/wizards/db/CommandMetaData.java | 
 136 -
 wizards/com/sun/star/wizards/db/CommandName.java | 
   3 
 wizards/com/sun/star/wizards/db/DBMetaData.java  | 
  56 
 wizards/com/sun/star/wizards/db/FieldColumn.java | 
  14 
 wizards/com/sun/star/wizards/db/QueryMetaData.java   | 
  33 
 wizards/com/sun/star/wizards/db/RecordParser.java| 
  11 
 wizards/com/sun/star/wizards/db/RelationController.java  | 
   5 
 wizards/com/sun/star/wizards/db/SQLQueryComposer.java| 
  16 
 wizards/com/sun/star/wizards/db/TableDescriptor.java | 
  34 
 wizards/com/sun/star/wizards/db/TypeInspector.java   | 
  49 
 wizards/com/sun/star/wizards/document/Control.java   | 
  17 
 wizards/com/sun/star/wizards/document/DatabaseControl.java   | 
  24 
 wizards/com/sun/star/wizards/document/FormHandler.java   | 
 129 -
 wizards/com/sun/star/wizards/document/GridControl.java   | 
   1 
 wizards/com/sun/star/wizards/document/OfficeDocument.java| 
 172 -
 wizards/com/sun/star/wizards/document/TimeStampControl.java  | 
   1 
 wizards/com/sun/star/wizards/form/FieldLinker.java   | 
   4 
 wizards/com/sun/star/wizards/form/FormConfiguration.java | 
   3 
 wizards/com/sun/star/wizards/form/FormControlArranger.java   | 
  15 
 wizards/com/sun/star/wizards/form/FormDocument.java  | 
  23 
 wizards/com/sun/star/wizards/form/FormWizard.java| 
  10 
 wizards/com/sun/star/wizards/form/StyleApplier.java  | 
   7 
 wizards/com/sun/star/wizards/query/CallQueryWizard.java  | 
   3 
 wizards/com/sun/star/wizards/query/QuerySummary.java | 
   1 
 wizards/com/sun/star/wizards/query/QueryWizard.java  | 
  13 
 wizards/com/sun/star/wizards/report/DBColumn.java| 
  20 
 wizards/com/sun/star/wizards/report/Dataimport.java  | 
   9 
 wizards/com/sun/star/wizards/report/RecordTable.java | 
   4 
 wizards/com/sun/star/wizards/report/ReportLayouter.java  | 
   1 
 wizards/com/sun/star/wizards/report/ReportTextDocument.java  | 
  72 
 wizards/com/sun/star/wizards/report/ReportTextImplementation.java| 
   8

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmloff/source

2014-11-27 Thread Caolán McNamara

 xmloff/source/draw/ximpshap.cxx |   32 
 1 file changed, 24 insertions(+), 8 deletions(-)

New commits:
commit ecf0d01e091ab0dde5845fe9b0a47ba1a961eda2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 27 11:30:45 2014 +

Resolves: fdo#84043 don't create duplicate Mirrored[X|Y] properties

regression from 13ef16423e78d3ea825172594f08c47d2f9bfd09

commit 13ef16423e78d3ea825172594f08c47d2f9bfd09
Author: Armin Le Grand a...@apache.org
Date:   Wed Nov 21 13:23:01 2012 +

For backward compatibility take mirrorings in setTransformation into 
account

Also found an error in SdrObjCustomShape::TRGetBaseGeometry when 
MirrorY was used

(cherry picked from commit 4116c33b12d3787c406f0348f89efcb1cf409507)

Change-Id: I7bfb5dea32b8ab8498e3d92975c49b830c81e6fb
(cherry picked from commit 751e5b32c5c361995bf0ba3295f773341fd92c23)
Reviewed-on: https://gerrit.libreoffice.org/13149
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit d3b7bf16a58c02af2d1fdf5db2fa149c6815095c)
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 65c3084..d4ec1b8 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3694,22 +3694,38 @@ void SdXMLCustomShapeContext::EndElement()
 
 if(bFlippedX || bFlippedY)
 {
-beans::PropertyValue aNewPoroperty;
+OUString sName;
 
 if(bFlippedX)
+sName = MirroredX;
+else
+sName = MirroredY;
+
+//fdo#84043 overwrite the property if it already exists, otherwise 
append it
+beans::PropertyValue* pItem;
+std::vector beans::PropertyValue ::iterator 
aI(maCustomShapeGeometry.begin());
+std::vector beans::PropertyValue ::iterator 
aE(maCustomShapeGeometry.end());
+while (aI != aE)
+{
+if (aI-Name == sName)
+break;
+++aI;
+}
+if (aI != aE)
 {
-aNewPoroperty.Name = MirroredX;
+beans::PropertyValue rItem = *aI;
+pItem = rItem;
 }
 else
 {
-aNewPoroperty.Name = MirroredY;
+maCustomShapeGeometry.push_back(beans::PropertyValue());
+pItem = maCustomShapeGeometry.back();
 }
 
-aNewPoroperty.Handle = -1;
-aNewPoroperty.Value = sal_True;
-aNewPoroperty.State = beans::PropertyState_DIRECT_VALUE;
-
-maCustomShapeGeometry.push_back(aNewPoroperty);
+pItem-Name = sName;
+pItem-Handle = -1;
+pItem-Value = sal_True;
+pItem-State = beans::PropertyState_DIRECT_VALUE;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Tor Lillqvist

 sc/Library_sc.mk |4 ++--
 sc/source/core/tool/formulagroup.cxx |3 ++-
 sc/source/core/tool/formulaopt.cxx   |3 ++-
 sc/source/ui/unoobj/docuno.cxx   |   12 
 4 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 48abd594bbdbbece71200e64a8bdb2852f23a91d
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 14:16:36 2014 +0200

Fix OpenCL-less build harder

Change-Id: I1627f534505c735455c50f9b4f6e4d1c698ab9d2

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 3ad559f..31643f8 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -661,8 +661,8 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/ui/xmlsource/xmlsourcedlg \
 ))
 
-$(call gb_Helper_optional,OPENCL,\
-$(eval $(call gb_Library_add_exception_objects,sc,\
+$(eval $(call gb_Helper_optional,OPENCL,\
+$(call gb_Library_add_exception_objects,sc,\
 sc/source/core/opencl/formulagroupcl \
 sc/source/core/opencl/openclwrapper \
 sc/source/core/opencl/opencl_device \
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index 705029b..328e3c3 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -523,10 +523,11 @@ FormulaGroupInterpreter 
*FormulaGroupInterpreter::getStatic()
 
 if ( !msInstance )
 {
+#if HAVE_FEATURE_OPENCL
 const ScCalcConfig rConfig = ScInterpreter::GetGlobalConfig();
 if (officecfg::Office::Common::Misc::UseOpenCL::get())
 switchOpenCLDevice(rConfig.maOpenCLDevice, 
rConfig.mbOpenCLAutoSelect, false);
-
+#endif
 if ( !msInstance ) // software fallback
 {
 SAL_INFO(sc.formulagroup, Create S/W interpreter);
diff --git a/sc/source/core/tool/formulaopt.cxx 
b/sc/source/core/tool/formulaopt.cxx
index b0f76c8..60378df 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -649,10 +649,11 @@ void ScFormulaCfg::Commit()
 break;
 }
 }
+#if HAVE_FEATURE_OPENCL
 if(bSetOpenCL)
 sc::FormulaGroupInterpreter::switchOpenCLDevice(
 GetCalcConfig().maOpenCLDevice, 
GetCalcConfig().mbOpenCLAutoSelect);
-
+#endif
 PutProperties(aNames, aValues);
 }
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index a4de29c..bf89e00 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2353,7 +2353,11 @@ void ScModelObj::enableAutomaticDeviceSelection(sal_Bool 
bForce)
 ScFormulaOptions aOptions = SC_MOD()-GetFormulaOptions();
 aOptions.SetCalcConfig(aConfig);
 SC_MOD()-SetFormulaOptions(aOptions);
+#if !HAVE_FEATURE_OPENCL
+(void) bForce;
+#else
 sc::FormulaGroupInterpreter::switchOpenCLDevice(OUString(), true, bForce);
+#endif
 }
 
 void ScModelObj::disableAutomaticDeviceSelection()
@@ -2392,19 +2396,27 @@ void ScModelObj::selectOpenCLDevice( sal_Int32 
nPlatform, sal_Int32 nDevice )
 sal_Int32 ScModelObj::getPlatformID()
 throw (uno::RuntimeException, std::exception)
 {
+#if !HAVE_FEATURE_OPENCL
+return -1;
+#else
 sal_Int32 nPlatformId;
 sal_Int32 nDeviceId;
 sc::FormulaGroupInterpreter::getOpenCLDeviceInfo(nDeviceId, nPlatformId);
 return nPlatformId;
+#endif
 }
 
 sal_Int32 ScModelObj::getDeviceID()
 throw (uno::RuntimeException, std::exception)
 {
+#if !HAVE_FEATURE_OPENCL
+return -1;
+#else
 sal_Int32 nPlatformId;
 sal_Int32 nDeviceId;
 sc::FormulaGroupInterpreter::getOpenCLDeviceInfo(nDeviceId, nPlatformId);
 return nDeviceId;
+#endif
 }
 
 uno::Sequence sheet::opencl::OpenCLPlatform  ScModelObj::getOpenCLPlatforms()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Chris Sherlock

 vcl/source/gdi/pdfwriter_impl.cxx |   43 +++---
 1 file changed, 31 insertions(+), 12 deletions(-)

New commits:
commit ba3ad2b6db555ec0c36f7be39f3148699b2ee4f6
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Thu Nov 27 23:28:20 2014 +1100

vcl: make PDFWriterImpl get SalGraphics instance more robustly

Change-Id: I7a9772468f2f774187570ff5e80d47e8b13c1bfe

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 06a7fe0..ad68895 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2946,15 +2946,23 @@ std::map sal_Int32, sal_Int32  
PDFWriterImpl::emitSystemFont( const PhysicalFo
 aInfo.m_aPSName = pFont-GetFamilyName();
 sal_Int32 pWidths[256];
 memset( pWidths, 0, sizeof(pWidths) );
+
+SalGraphics *pGraphics = m_pReferenceDevice-GetGraphics();
+
+assert(pGraphics);
+
 if( pFont-IsEmbeddable() )
 {
 const unsigned char* pFontData = NULL;
 long nFontLen = 0;
 sal_Ucs nEncodedCodes[256];
 sal_Int32 pEncWidths[256];
-if( (pFontData = (const unsigned 
char*)m_pReferenceDevice-mpGraphics-GetEmbedFontData( pFont, nEncodedCodes, 
pEncWidths, aInfo, nFontLen )) != NULL )
+
+pFontData = (const unsigned char*)pGraphics-GetEmbedFontData( pFont, 
nEncodedCodes, pEncWidths, aInfo, nFontLen );
+
+if( pFontData )
 {
-m_pReferenceDevice-mpGraphics-FreeEmbedFontData( pFontData, 
nFontLen );
+pGraphics-FreeEmbedFontData( pFontData, nFontLen );
 for( int i = 0; i  256; i++ )
 {
 if( nEncodedCodes[i] = 32  nEncodedCodes[i]  256 )
@@ -2969,7 +2977,7 @@ std::map sal_Int32, sal_Int32  
PDFWriterImpl::emitSystemFont( const PhysicalFo
 aSubType = OString( /TrueType );
 Int32Vector aGlyphWidths;
 Ucs2UIntMap aUnicodeMap;
-m_pReferenceDevice-mpGraphics-GetGlyphWidths( pFont, false, 
aGlyphWidths, aUnicodeMap );
+pGraphics-GetGlyphWidths( pFont, false, aGlyphWidths, aUnicodeMap );
 
 OUString aTmpName;
 osl_createTempFile( NULL, NULL, aTmpName.pData );
@@ -2989,7 +2997,7 @@ std::map sal_Int32, sal_Int32  
PDFWriterImpl::emitSystemFont( const PhysicalFo
 pWidths[ c ] = aGlyphWidths[ aUnicodeMap[ c ] ];
 }
 
-m_pReferenceDevice-mpGraphics-CreateFontSubset( aTmpName, pFont, 
aGlyphIds, pEncoding, pDuWidths, 256, aInfo );
+pGraphics-CreateFontSubset( aTmpName, pFont, aGlyphIds, pEncoding, 
pDuWidths, 256, aInfo );
 osl_removeFile( aTmpName.pData );
 }
 else
@@ -3079,8 +3087,12 @@ std::map sal_Int32, sal_Int32  
PDFWriterImpl::emitEmbeddedFont( const Physical
 sal_Int32 nStreamObject = 0;
 sal_Int32 nFontDescriptor = 0;
 
+SalGraphics *pGraphics = m_pReferenceDevice-GetGraphics();
+
+assert(pGraphics);
+
 // prepare font encoding
-const Ucs2SIntMap* pEncoding = 
m_pReferenceDevice-mpGraphics-GetFontEncodingVector( pFont, NULL );
+const Ucs2SIntMap* pEncoding = pGraphics-GetFontEncodingVector( pFont, 
NULL );
 sal_Int32 nToUnicodeStream = 0;
 sal_uInt8 nEncoding[256];
 sal_Ucs nEncodedCodes[256];
@@ -3115,7 +3127,7 @@ std::map sal_Int32, sal_Int32  
PDFWriterImpl::emitEmbeddedFont( const Physical
 sal_Int32 nLength1, nLength2;
 try
 {
-if( (pFontData = (const unsigned 
char*)m_pReferenceDevice-mpGraphics-GetEmbedFontData( pFont, nEncodedCodes, 
pWidths, aInfo, nFontLen )) != NULL )
+if( (pFontData = (const unsigned char*)pGraphics-GetEmbedFontData( 
pFont, nEncodedCodes, pWidths, aInfo, nFontLen )) != NULL )
 {
 if( (aInfo.m_nFontType  FontSubsetInfo::ANY_TYPE1) == 0 )
 throw FontException();
@@ -3628,7 +3640,7 @@ std::map sal_Int32, sal_Int32  
PDFWriterImpl::emitEmbeddedFont( const Physical
 }
 
 if( pFontData )
-m_pReferenceDevice-mpGraphics-FreeEmbedFontData( pFontData, nFontLen 
);
+pGraphics-FreeEmbedFontData( pFontData, nFontLen );
 
 return aRet;
 }
@@ -3846,7 +3858,9 @@ void PDFWriterImpl::appendBuiltinFontsToDict( 
OStringBuffer rDict ) const
 
 bool PDFWriterImpl::emitFonts()
 {
-if (!m_pReferenceDevice-AcquireGraphics())
+SalGraphics *pGraphics = m_pReferenceDevice-GetGraphics();
+
+if (!pGraphics)
 return false;
 
 OStringBuffer aLine( 1024 );
@@ -3897,7 +3911,7 @@ bool PDFWriterImpl::emitFonts()
 }
 }
 FontSubsetInfo aSubsetInfo;
-if( m_pReferenceDevice-mpGraphics-CreateFontSubset( aTmpName, 
it-first, aGlyphIds, pEncoding, pWidths, nGlyphs, aSubsetInfo ) )
+if( pGraphics-CreateFontSubset( aTmpName, it-first, aGlyphIds, 
pEncoding, pWidths, nGlyphs, aSubsetInfo ) )
 {
 // create font stream
 osl::File aFontFile(aTmpName);
@@ -7017,6 +7031,11 @@ bool PDFWriterImpl::registerGlyphs(

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - include/vcl vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/opengl vcl/source vcl/unx

2014-11-27 Thread Louis-Francis Ratté-Boulianne

 include/vcl/opengl/OpenGLContext.hxx |   15 +++
 vcl/Library_vcl.mk   |1 
 vcl/Library_vclplug_gen.mk   |1 
 vcl/inc/opengl/framebuffer.hxx   |   45 ++
 vcl/inc/opengl/salbmp.hxx|1 
 vcl/inc/opengl/texture.hxx   |3 
 vcl/inc/opengl/win/gdiimpl.hxx   |2 
 vcl/inc/opengl/x11/gdiimpl.hxx   |2 
 vcl/inc/opengl/x11/salvd.hxx |   55 
 vcl/inc/openglgdiimpl.hxx|   15 +--
 vcl/inc/svdata.hxx   |2 
 vcl/inc/unx/salgdi.h |4 
 vcl/inc/unx/salvd.h  |   15 ---
 vcl/opengl/framebuffer.cxx   |   70 
 vcl/opengl/gdiimpl.cxx   |  138 +--
 vcl/opengl/salbmp.cxx|   17 ++-
 vcl/opengl/scale.cxx |   35 +++-
 vcl/opengl/win/gdiimpl.cxx   |2 
 vcl/opengl/x11/gdiimpl.cxx   |   66 +++
 vcl/opengl/x11/salvd.cxx |  102 +++
 vcl/source/gdi/salgdilayout.cxx  |2 
 vcl/source/opengl/OpenGLContext.cxx  |  126 ++---
 vcl/unx/generic/gdi/gdiimpl.cxx  |   10 +-
 vcl/unx/generic/gdi/salgdi.cxx   |   14 +--
 vcl/unx/generic/gdi/salvd.cxx|  151 ++-
 25 files changed, 614 insertions(+), 280 deletions(-)

New commits:
commit db003eb66fbae558b09218190f12498ecfb67e1d
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Wed Nov 26 09:22:25 2014 -0500

vcl: Use the current OpenGL context for VirtualDevice and Bitmap if possible

Change-Id: I17f6ce66fb8b5bc027d35b4016ae56c24ee0a738

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index 9be9c59..1b21851 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -55,6 +55,9 @@ class NSOpenGLView;
 #include tools/gen.hxx
 #include vcl/syschild.hxx
 
+class OpenGLFramebuffer;
+class OpenGLTexture;
+
 /// Holds the information of our new child window
 struct GLWindow
 {
@@ -177,6 +180,13 @@ public:
 void AddRef();
 void DeRef();
 
+// use these methods right after setting a context to make sure drawing 
happens
+// in the right FBO (default one is for onscreen painting)
+bool   AcquireDefaultFramebuffer();
+bool   AcquireFramebuffer( OpenGLFramebuffer* pFramebuffer );
+OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture rTexture );
+void   ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer );
+
 void makeCurrent();
 void resetCurrent();
 void swapBuffers();
@@ -229,6 +239,11 @@ private:
 bool mbPixmap; // is a pixmap instead of a window
 #endif
 
+int mnFramebufferCount;
+OpenGLFramebuffer* mpCurrentFramebuffer;
+OpenGLFramebuffer* mpFirstFramebuffer;
+OpenGLFramebuffer* mpLastFramebuffer;
+
 public:
 vcl::Region maClipRegion;
 int mnPainting;
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 81f774a..a231dae 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/gdiimpl \
vcl/opengl/salbmp \
vcl/opengl/scale \
+   vcl/opengl/framebuffer \
vcl/opengl/texture \
 vcl/source/opengl/OpenGLContext \
 vcl/source/opengl/OpenGLHelper \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 76be2c1..29695e9 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
 vcl/unx/x11/x11sys \
 vcl/unx/x11/xlimits \
vcl/opengl/x11/gdiimpl \
+   vcl/opengl/x11/salvd \
 ))
 
 # ultimately we want to split the x11 dependencies out
diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
new file mode 100644
index 000..4ccc1c5
--- /dev/null
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -0,0 +1,45 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+#define INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+#include GL/glew.h
+#include vcl/dllapi.h
+
+#include opengl/texture.hxx
+
+class VCL_PLUGIN_PUBLIC OpenGLFramebuffer
+{
+private:
+GLuintmnId;
+OpenGLTexture maAttachedTexture;
+
+public:
+OpenGLFramebuffer();
+virtual ~OpenGLFramebuffer();
+
+GLuint  Id() const { return mnId; };
+
+voidBind();
+voidUnbind();
+
+boolIsFree() const;
+boolIsAttached( const OpenGLTexture rTexture ) const;
+voidAttachTexture(

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

2014-11-27 Thread Yousuf Philips

 icon-themes/tango/cmd/lc_crop.png |binary
 icon-themes/tango/cmd/sc_crop.png |binary
 2 files changed

New commits:
commit 4191c3befe108faf5140373e6ceab4fdb49ce0d4
Author: Yousuf Philips philip...@hotmail.com
Date:   Thu Nov 27 05:26:14 2014 +0400

TANGO: Copied crop icon from human

Change-Id: I7bab9151c588ec624099cd34335ce433fb760f16
Reviewed-on: https://gerrit.libreoffice.org/13145
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/icon-themes/tango/cmd/lc_crop.png 
b/icon-themes/tango/cmd/lc_crop.png
new file mode 100644
index 000..e294a2c
Binary files /dev/null and b/icon-themes/tango/cmd/lc_crop.png differ
diff --git a/icon-themes/tango/cmd/sc_crop.png 
b/icon-themes/tango/cmd/sc_crop.png
new file mode 100644
index 000..76be879
Binary files /dev/null and b/icon-themes/tango/cmd/sc_crop.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/tango

2014-11-27 Thread Yousuf Philips

 icon-themes/tango/cmd/lc_crop.png |binary
 icon-themes/tango/cmd/sc_crop.png |binary
 2 files changed

New commits:
commit 00db931139e88c5025dbb5c95355d6ca0c2b6271
Author: Yousuf Philips philip...@hotmail.com
Date:   Thu Nov 27 05:26:14 2014 +0400

TANGO: Copied crop icon from human

Change-Id: I7bab9151c588ec624099cd34335ce433fb760f16
Reviewed-on: https://gerrit.libreoffice.org/13146
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/icon-themes/tango/cmd/lc_crop.png 
b/icon-themes/tango/cmd/lc_crop.png
new file mode 100644
index 000..e294a2c
Binary files /dev/null and b/icon-themes/tango/cmd/lc_crop.png differ
diff --git a/icon-themes/tango/cmd/sc_crop.png 
b/icon-themes/tango/cmd/sc_crop.png
new file mode 100644
index 000..76be879
Binary files /dev/null and b/icon-themes/tango/cmd/sc_crop.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Yousuf Philips

 sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml |   17 +
 sw/uiconfig/swriter/toolbar/standardbar.xml   |   15 ---
 sw/uiconfig/swriter/toolbar/textobjectbar.xml |   17 -
 3 files changed, 33 insertions(+), 16 deletions(-)

New commits:
commit 3452d8ba0f2069a39a793fa05b89153ea73d4a93
Author: Yousuf Philips philip...@hotmail.com
Date:   Thu Nov 27 03:46:01 2014 +0400

fdo#81475 rearrange, add and remove entries from toolbars

Change-Id: Ibc01c13947524c272c143058f451a75ad087913d
Reviewed-on: https://gerrit.libreoffice.org/13143
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
index 5db228b..fc21f10 100644
--- a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
@@ -21,25 +21,34 @@
  toolbar:toolbaritem xlink:href=.uno:CharFontName/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:FontHeight/
+ toolbar:toolbaritem xlink:href=.uno:Grow/
+ toolbar:toolbaritem xlink:href=.uno:Shrink/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:Bold/
  toolbar:toolbaritem xlink:href=.uno:Italic/
  toolbar:toolbaritem xlink:href=.uno:Underline/
+ toolbar:toolbaritem xlink:href=.uno:Strikeout toolbar:visible=false/
+ toolbar:toolbaritem xlink:href=.uno:Overline toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SuperScript/
  toolbar:toolbaritem xlink:href=.uno:SubScript/
- toolbar:toolbaritem xlink:href=.uno:Grow/
- toolbar:toolbaritem xlink:href=.uno:Shrink/
+ toolbar:toolbaritem xlink:href=.uno:Shadowed/
+ toolbar:toolbaritem xlink:href=.uno:OutlineFont/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:Color toolbar:style=dropdown/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:LeftPara toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:CenterPara toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:RightPara toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:JustifyPara toolbar:style=radio/
  toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:LineSpacing/
  toolbar:toolbaritem xlink:href=.uno:SpacePara1 toolbar:style=radio 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SpacePara15 toolbar:style=radio 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SpacePara2 toolbar:style=radio 
toolbar:visible=false/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:Color toolbar:style=dropdown 
toolbar:visible=false/
+ toolbar:toolbaritem xlink:href=.uno:CellVertTop/
+ toolbar:toolbaritem xlink:href=.uno:CellVertCenter/
+ toolbar:toolbaritem xlink:href=.uno:CellVertBottom/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:ParaLeftToRight toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:ParaRightToLeft toolbar:style=radio/
@@ -50,4 +59,4 @@
  toolbar:toolbaritem xlink:href=.uno:SelectAll/
  toolbar:toolbaritem xlink:href=.uno:FontDialog/
  toolbar:toolbaritem xlink:href=.uno:ParagraphDialog/
-/toolbar:toolbar
\ No newline at end of file
+/toolbar:toolbar
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 5b5a8fb..1cffa61 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -52,23 +52,24 @@
  toolbar:toolbaritem xlink:href=.uno:Gallery toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:InsertObjectChart 
toolbar:helpid=10140/
  toolbar:toolbaritem xlink:href=.uno:InsertObjectStarMath 
toolbar:visible=false/
+ toolbar:toolbaritem xlink:href=.uno:DrawText toolbar:helpid=10253/
+ toolbar:toolbaritem xlink:href=.uno:VerticalText toolbar:helpid=10905 
toolbar:visible=false/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:InsertPagebreak/
+ toolbar:toolbaritem xlink:href=.uno:InsertFieldCtrl 
toolbar:helpid=52824/
+ toolbar:toolbaritem xlink:href=.uno:InsertSymbol toolbar:helpid=20328/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:InsertFootnote toolbar:helpid=20399/
  toolbar:toolbaritem xlink:href=.uno:InsertEndnote toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:InsertBookmark 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:InsertReferenceField 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:InsertIndexesEntry 
toolbar:visible=false/
- toolbar:toolbaritem xlink:href=.uno:InsertPagebreak/
- toolbar:toolbaritem xlink:href=.uno:InsertAnnotation 
toolbar:helpid=20329/
- toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:HyperlinkDialog toolbar:helpid=5678/
- toolbar:toolbaritem xlink:href=.uno:InsertSymbol toolbar:helpid=20328/
- toolbar:toolbaritem xlink:href=.uno:InsertFieldCtrl 
toolbar:helpid=52824/
+ toolbar:toolbaritem xlink:href=.uno:InsertAnnotation

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/uiconfig

2014-11-27 Thread Yousuf Philips

 sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml |   17 +
 sw/uiconfig/swriter/toolbar/standardbar.xml   |   15 ---
 sw/uiconfig/swriter/toolbar/textobjectbar.xml |   17 -
 3 files changed, 33 insertions(+), 16 deletions(-)

New commits:
commit de39032e3877dcbe41f11d3d62d1ed1b4cc2b841
Author: Yousuf Philips philip...@hotmail.com
Date:   Thu Nov 27 03:46:01 2014 +0400

fdo#81475 rearrange, add and remove entries from toolbars

Change-Id: Ibc01c13947524c272c143058f451a75ad087913d
Reviewed-on: https://gerrit.libreoffice.org/13144
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
index 5db228b..fc21f10 100644
--- a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
@@ -21,25 +21,34 @@
  toolbar:toolbaritem xlink:href=.uno:CharFontName/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:FontHeight/
+ toolbar:toolbaritem xlink:href=.uno:Grow/
+ toolbar:toolbaritem xlink:href=.uno:Shrink/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:Bold/
  toolbar:toolbaritem xlink:href=.uno:Italic/
  toolbar:toolbaritem xlink:href=.uno:Underline/
+ toolbar:toolbaritem xlink:href=.uno:Strikeout toolbar:visible=false/
+ toolbar:toolbaritem xlink:href=.uno:Overline toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SuperScript/
  toolbar:toolbaritem xlink:href=.uno:SubScript/
- toolbar:toolbaritem xlink:href=.uno:Grow/
- toolbar:toolbaritem xlink:href=.uno:Shrink/
+ toolbar:toolbaritem xlink:href=.uno:Shadowed/
+ toolbar:toolbaritem xlink:href=.uno:OutlineFont/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:Color toolbar:style=dropdown/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:LeftPara toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:CenterPara toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:RightPara toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:JustifyPara toolbar:style=radio/
  toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:LineSpacing/
  toolbar:toolbaritem xlink:href=.uno:SpacePara1 toolbar:style=radio 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SpacePara15 toolbar:style=radio 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SpacePara2 toolbar:style=radio 
toolbar:visible=false/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:Color toolbar:style=dropdown 
toolbar:visible=false/
+ toolbar:toolbaritem xlink:href=.uno:CellVertTop/
+ toolbar:toolbaritem xlink:href=.uno:CellVertCenter/
+ toolbar:toolbaritem xlink:href=.uno:CellVertBottom/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:ParaLeftToRight toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:ParaRightToLeft toolbar:style=radio/
@@ -50,4 +59,4 @@
  toolbar:toolbaritem xlink:href=.uno:SelectAll/
  toolbar:toolbaritem xlink:href=.uno:FontDialog/
  toolbar:toolbaritem xlink:href=.uno:ParagraphDialog/
-/toolbar:toolbar
\ No newline at end of file
+/toolbar:toolbar
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 97802cf..75b2f15 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -52,23 +52,24 @@
  toolbar:toolbaritem xlink:href=.uno:Gallery toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:InsertObjectChart 
toolbar:helpid=10140/
  toolbar:toolbaritem xlink:href=.uno:InsertObjectStarMath 
toolbar:visible=false/
+ toolbar:toolbaritem xlink:href=.uno:DrawText toolbar:helpid=10253/
+ toolbar:toolbaritem xlink:href=.uno:VerticalText toolbar:helpid=10905 
toolbar:visible=false/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:InsertPagebreak/
+ toolbar:toolbaritem xlink:href=.uno:InsertFieldCtrl 
toolbar:helpid=52824/
+ toolbar:toolbaritem xlink:href=.uno:InsertSymbol toolbar:helpid=20328/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:InsertFootnote toolbar:helpid=20399/
  toolbar:toolbaritem xlink:href=.uno:InsertEndnote toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:InsertBookmark 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:InsertReferenceField 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:InsertIndexesEntry 
toolbar:visible=false/
- toolbar:toolbaritem xlink:href=.uno:InsertPagebreak/
- toolbar:toolbaritem xlink:href=.uno:InsertAnnotation 
toolbar:helpid=20329/
- toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:HyperlinkDialog toolbar:helpid=5678/
- toolbar:toolbaritem xlink:href=.uno:InsertSymbol toolbar:helpid=20328/
- toolbar:toolbaritem xlink:href=.uno:InsertFieldCtrl 
toolbar:helpid=52824/
+ toolbar:toolbaritem xlink:href=.uno:InsertAnnotation

[Libreoffice-commits] dev-tools.git: ciabot/config-example.cfg

2014-11-27 Thread Robinson Tryon

 ciabot/config-example.cfg |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ff56afdb6ca0f64aff38f9fc572673504456169
Author: Robinson Tryon qu...@runcibility.com
Date:   Thu Nov 27 08:12:06 2014 -0500

ciabot: Replace FDO Bugzilla url (to facilitate migration)

Change-Id: I7fe177f11985a87f657fb5eb5487cde8dd150066

diff --git a/ciabot/config-example.cfg b/ciabot/config-example.cfg
index 3671e1a..4d383ac 100644
--- a/ciabot/config-example.cfg
+++ b/ciabot/config-example.cfg
@@ -2,6 +2,6 @@
 location = /home/moggi/devel/libo_push/
 
 [bugzilla]
-url = bugs.freedesktop.org/xmlrpc.cgi
+url = bugs.libreoffice.org/xmlrpc.cgi
 user = your.user.n...@bugs.com
 password = MySecretPassword
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Tor Lillqvist

 solenv/gbuild/platform/IOS_ARM_GCC.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6fc36030e2678ca3bad0fcca0c22289c866bdb21
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 15:28:30 2014 +0200

Fix iOS build, need gb_Library_get_sdk_link_dir

Change-Id: I1c22b33c15417cb23ed726b048cde1e452d23b9b

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index c5938d4..e17df72 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -179,6 +179,7 @@ endef
 
 gb_Library__set_soversion_script_platform =
 
+gb_Library_get_sdk_link_dir = $(WORKDIR)/LinkTarget/Library
 
 # Executable class
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Matthew J . Francis

 sc/source/filter/excel/xetable.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d83b031346799bff0a3298387f76b16baad2e5cf
Author: Matthew J. Francis mjay.fran...@gmail.com
Date:   Thu Nov 27 12:08:07 2014 +0800

fdo#86687 Avoid deadlock updating progress bar

Change-Id: I13f93372fedc67bfd25d36a5bee10a004fe9f8f6
Reviewed-on: https://gerrit.libreoffice.org/13147
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 01c286d..66df5d6 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2087,9 +2087,12 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData 
rDefRowData, const ScfUInt
 for ( itr = itrBeg; itr != itrEnd; ++itr, ++nIdx )
 pTasks[ nIdx % nThreads ]-push_back( itr-second.get() );
 
-for ( size_t i = 0; i  nThreads; i++ )
+for ( size_t i = 1; i  nThreads; i++ )
 rPool.pushTask( pTasks[ i ] );
 
+// Progress bar updates must be synchronous to avoid deadlock
+pTasks[0]-doWork();
+
 rPool.waitUntilEmpty();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Matthew J . Francis

 sc/source/filter/excel/xetable.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e678a333c1f4a7a1bf8594d888938e598ed2f6a1
Author: Matthew J. Francis mjay.fran...@gmail.com
Date:   Thu Nov 27 12:08:07 2014 +0800

fdo#86687 Avoid deadlock updating progress bar

Change-Id: I13f93372fedc67bfd25d36a5bee10a004fe9f8f6
Reviewed-on: https://gerrit.libreoffice.org/13147
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 01c286d..66df5d6 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2087,9 +2087,12 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData 
rDefRowData, const ScfUInt
 for ( itr = itrBeg; itr != itrEnd; ++itr, ++nIdx )
 pTasks[ nIdx % nThreads ]-push_back( itr-second.get() );
 
-for ( size_t i = 0; i  nThreads; i++ )
+for ( size_t i = 1; i  nThreads; i++ )
 rPool.pushTask( pTasks[ i ] );
 
+// Progress bar updates must be synchronous to avoid deadlock
+pTasks[0]-doWork();
+
 rPool.waitUntilEmpty();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/opencl opencl/inc opencl/Library_opencl.mk opencl/source sc/Library_sc.mk sc/source

2014-11-27 Thread Tor Lillqvist

 include/opencl/openclwrapper.hxx|  109 +++
 opencl/Library_opencl.mk|7 
 opencl/inc/opencl_device.hxx|   25 
 opencl/inc/opencl_device_selection.h|  641 +++
 opencl/source/opencl_device.cxx |  598 +
 opencl/source/openclwrapper.cxx |  804 +++
 sc/Library_sc.mk|2 
 sc/source/core/inc/openclwrapper.hxx|  108 ---
 sc/source/core/opencl/formulagroupcl.cxx|   42 -
 sc/source/core/opencl/opencl_device.cxx |  597 -
 sc/source/core/opencl/opencl_device.hxx |   26 
 sc/source/core/opencl/opencl_device_selection.h |  642 ---
 sc/source/core/opencl/openclwrapper.cxx |  806 
 sc/source/core/tool/formulagroup.cxx|8 
 sc/source/core/tool/formulaopt.cxx  |4 
 15 files changed, 2212 insertions(+), 2207 deletions(-)

New commits:
commit afcb67bd0645a0ddd2ae024d13becc118b8c40b0
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 15:32:45 2014 +0200

WaE: variable 'bSetOpenCL' set but not used

Change-Id: I897accf5b4259a4a01198118421abaa55465207e

diff --git a/sc/source/core/tool/formulaopt.cxx 
b/sc/source/core/tool/formulaopt.cxx
index 60378df..5da7b01 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -649,7 +649,9 @@ void ScFormulaCfg::Commit()
 break;
 }
 }
-#if HAVE_FEATURE_OPENCL
+#if !HAVE_FEATURE_OPENCL
+(void) bSetOpenCL;
+#else
 if(bSetOpenCL)
 sc::FormulaGroupInterpreter::switchOpenCLDevice(
 GetCalcConfig().maOpenCLDevice, 
GetCalcConfig().mbOpenCLAutoSelect);
commit a70b717ef872c0ac652883ecd2a82c4cc29763e2
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 15:13:12 2014 +0200

Move more Calc-independent OpenCL stuff from the sc to the opencl module

No cleanups yet. Just removed the sc namespace parts now when this stuff 
is
no longer Calc-specific. There is still horribly confusing use of the same
OpenCLDevice name for both a class and as a namespace, for instance. And the
OpenCLDevice class has only public static members even, so effectively it 
acts
as just a namespace anyway... Etc.

Change-Id: Idc5f30a721df0101426c676f04a85e02c5dc8443

diff --git a/sc/source/core/inc/openclwrapper.hxx 
b/include/opencl/openclwrapper.hxx
similarity index 87%
rename from sc/source/core/inc/openclwrapper.hxx
rename to include/opencl/openclwrapper.hxx
index 9dad747..ba7aada 100644
--- a/sc/source/core/inc/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -11,16 +11,19 @@
 #define INCLUDED_SC_SOURCE_CORE_OPENCL_OPENCLWRAPPER_HXX
 
 #include config_features.h
-#include sal/detail/log.h
-#include opencl/platforminfo.hxx
-#include osl/file.hxx
+
+#include cassert
 #include vector
+
 #include boost/shared_ptr.hpp
-#include cassert
+#include clew.h
 
+#include sal/detail/log.h
+#include opencl/opencldllapi.h
+#include opencl/platforminfo.hxx
+#include osl/file.hxx
 #include rtl/string.hxx
 
-#include clew.h
 
 #define CHECK_OPENCL(status,name)\
 if( status != CL_SUCCESS )\
@@ -40,9 +43,7 @@ struct KernelEnv
 cl_program mpkProgram;
 };
 
-namespace sc { namespace opencl {
-
-typedef unsigned int uint;
+namespace opencl {
 
 struct OpenCLEnv
 {
@@ -67,7 +68,7 @@ struct GPUEnv
 bool mnAmdFp64Flag;
 };
 
-class OpenCLDevice
+class OPENCL_DLLPUBLIC OpenCLDevice
 {
 public:
 static GPUEnv gpuEnv;
@@ -86,7 +87,7 @@ public:
 static void setKernelEnv( KernelEnv *envInfo );
 };
 
-const std::vectorOpenCLPlatformInfo fillOpenCLInfo();
+OPENCL_DLLPUBLIC const std::vectorOpenCLPlatformInfo fillOpenCLInfo();
 
 /**
  * Used to set or switch between OpenCL devices.
@@ -96,12 +97,12 @@ const std::vectorOpenCLPlatformInfo fillOpenCLInfo();
  *
  * @return returns true if there is a valid opencl device that has been set up
  */
-bool switchOpenCLDevice(const OUString* pDeviceId, bool bAutoSelect,
-bool bForceEvaluation);
+OPENCL_DLLPUBLIC bool switchOpenCLDevice(const OUString* pDeviceId, bool 
bAutoSelect,
+ bool bForceEvaluation);
 
-void getOpenCLDeviceInfo(size_t rDeviceId, size_t rPlatformId);
+OPENCL_DLLPUBLIC void getOpenCLDeviceInfo(size_t rDeviceId, size_t 
rPlatformId);
 
-}}
+}
 
 #endif
 
diff --git a/opencl/Library_opencl.mk b/opencl/Library_opencl.mk
index 51ca62c..ad1af37 100644
--- a/opencl/Library_opencl.mk
+++ b/opencl/Library_opencl.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Library_Library,opencl))
 
+$(eval $(call gb_Library_set_include,opencl,\
+-I$(SRCDIR)/opencl/inc \
+$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_add_defs,opencl,\
 -DOPENCL_DLLIMPLEMENTATION \
 ))
@@ -36,6 +41,8 @@ $(eval $(call gb_Library_use_libraries,opencl,\
 
 $(eval $(call

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

2014-11-27 Thread Tor Lillqvist

 opencl/source/openclconfig.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 79d6813609ffe05e4d8b678bc608fbfd1482aeb9
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 15:41:49 2014 +0200

Use correct SAL_INFO log area

Change-Id: I47e6dcf18fe141b8dba33a8c3cd83f80950045cd

diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
index aa7a07a..dd50649 100644
--- a/opencl/source/openclconfig.cxx
+++ b/opencl/source/openclconfig.cxx
@@ -159,12 +159,12 @@ bool match(const OpenCLConfig::ImplMatcherSet rList, 
const OpenCLPlatformInfo
 {
 for (auto i = rList.cbegin(); i != rList.end(); ++i)
 {
-SAL_INFO(sc.opencl, Looking for match for platform=  rPlatform 
 , device=  rDevice 
+SAL_INFO(opencl, Looking for match for platform=  rPlatform  
, device=  rDevice 
   in   sKindOfList   entry=  *i);
 
 if (match(*i, rPlatform, rDevice))
 {
-SAL_INFO(sc.opencl, Match!);
+SAL_INFO(opencl, Match!);
 return true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] mso-dumper.git: msodumper/xlsrecord.py

2014-11-27 Thread Andras Timar

 msodumper/xlsrecord.py |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1523a605f4ea7e8d3ef8e1242a91b19c51e1f9b2
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Nov 27 14:50:58 2014 +0100

add build id of Excel 2010

diff --git a/msodumper/xlsrecord.py b/msodumper/xlsrecord.py
index 8c2a607..5370e83 100644
--- a/msodumper/xlsrecord.py
+++ b/msodumper/xlsrecord.py
@@ -737,7 +737,8 @@ class BOF(BaseRecordHandler):
 buildId = {
 0x0DBB: 'Excel 97',
 0x0EDE: 'Excel 97',
-0x2775: 'Excel XP'
+0x2775: 'Excel XP',
+0x3267: 'Excel 2010'
 }
 
 def getBuildIdName (self, value):
@@ -778,7 +779,7 @@ class BOF(BaseRecordHandler):
 self.betaAny = 0
 self.riscAny = 0
 self.lowestExcelVer = 0
-
+
 def parseBytes (self):
 self.__parseBytes()
 # BIFF version
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - canvas/source

2014-11-27 Thread Michael Jaumann

 canvas/source/opengl/ogl_renderHelper.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ef908a07c2edf558321966f00bba4eb6257d4323
Author: Michael Jaumann meta_...@yahoo.com
Date:   Thu Nov 27 13:51:33 2014 +

fill glbufferdata with the right verticecount

Change-Id: I0efe1b6ec94daa3bac97d7e4f0768aea8d32d738

diff --git a/canvas/source/opengl/ogl_renderHelper.cxx 
b/canvas/source/opengl/ogl_renderHelper.cxx
index 70f1769..8d95f46 100644
--- a/canvas/source/opengl/ogl_renderHelper.cxx
+++ b/canvas/source/opengl/ogl_renderHelper.cxx
@@ -49,7 +49,7 @@ namespace oglcanvas
 
 void RenderHelper::SetVP(const float width, const float height)
 {
-m_VP = glm::ortho(0.0f, width, 0.0f, height);
+m_VP = glm::ortho(0.0f, width, height, 0.0f);
 
 }
 
@@ -62,10 +62,10 @@ namespace oglcanvas
 void RenderHelper::renderVertexConstColor(const std::vectorglm::vec2 
rVertices, glm::vec4 color, GLenum mode) const
 {
 glBindBuffer(GL_ARRAY_BUFFER, m_vertexBuffer);
-glBufferData(GL_ARRAY_BUFFER, rVertices.size()*2, rVertices[0].x, 
GL_STATIC_DRAW);
 
 glUseProgram(m_texProgID);
 
+glBufferData(GL_ARRAY_BUFFER, sizeof(rVertices), rVertices[0].x, 
GL_STATIC_DRAW);
 glUniform4fv(m_texColorUnf, 1, color[0]);
 glUniformMatrix4fv(m_texMVPUnf, 1, GL_FALSE, m_MVP[0][0]);
 glEnableVertexAttribArray(m_texPosAttrb); //vertices
@@ -91,10 +91,10 @@ namespace oglcanvas
 void RenderHelper::renderVertexUVTex(const std::vectorglm::vec2 
rVertices, const std::vectorglm::vec2 rUVcoords, glm::vec4 color, GLenum 
mode) const
 {
 glBindBuffer(GL_ARRAY_BUFFER, m_vertexBuffer);
-glBufferData(GL_ARRAY_BUFFER, rVertices.size()*2, rVertices[0].x, 
GL_STATIC_DRAW);
+glBufferData(GL_ARRAY_BUFFER, sizeof(rVertices), rVertices[0].x, 
GL_STATIC_DRAW);
 
 glBindBuffer(GL_ARRAY_BUFFER, m_uvBuffer);
-glBufferData(GL_ARRAY_BUFFER, rUVcoords.size()*2, rUVcoords[0].x, 
GL_STATIC_DRAW);
+glBufferData(GL_ARRAY_BUFFER, sizeof(rUVcoords), rUVcoords[0].x, 
GL_STATIC_DRAW);
 
 glUseProgram(m_simpleProgID);
 
@@ -148,7 +148,7 @@ namespace oglcanvas
 void RenderHelper::renderVertexTex(const std::vectorglm::vec2 
rVertices, GLfloat fWidth, GLfloat fHeight, glm::vec4 color, GLenum mode) const
 {
 glBindBuffer(GL_ARRAY_BUFFER, m_vertexBuffer);
-glBufferData(GL_ARRAY_BUFFER, rVertices.size()*2, rVertices[0].x, 
GL_STATIC_DRAW);
+glBufferData(GL_ARRAY_BUFFER, sizeof(rVertices), rVertices[0].x, 
GL_STATIC_DRAW);
 
 glUseProgram(m_texManProgID);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/source

2014-11-27 Thread Maxim Monastirsky

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 16bfe15d9175f52030bcb1265f8f48728786f910
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Wed Nov 26 22:26:39 2014 +0200

sidebar: Try to fix initial spacing values

Process SID_ATTR_METRIC status before any other,
and call SetMax methods before SetValue, so indent
values won't be truncated by a wrong max value.

Change-Id: I36d8c0cce9561902aa2c4d531740f56c80207012
(cherry picked from commit 9a410f9cedbce5276aea48479812ff68210712b0)

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 2867a5c..0cfc697 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -568,7 +568,6 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 
/*nSID*/, SfxItemStat
 
 long nVal = OutputDevice::LogicToLogic( maTxtLeft, 
(MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
 nVal = (long)mpLeftIndent-Normalize( (long)nVal );
-mpLeftIndent-SetValue( nVal, FUNIT_100TH_MM );
 
 if ( maContext.GetCombinedContext_DI() != 
CombinedEnumContext(Application_WriterVariants, Context_Text)
   maContext.GetCombinedContext_DI() != 
CombinedEnumContext(Application_WriterVariants, Context_Default)
@@ -579,11 +578,6 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 
/*nSID*/, SfxItemStat
 
 long nrVal = OutputDevice::LogicToLogic( aTxtRight, 
(MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
 nrVal = (long)mpRightIndent-Normalize( (long)nrVal );
-mpRightIndent-SetValue( nrVal, FUNIT_100TH_MM );
-
-long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, 
(MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
-nfVal = (long)mpFLineIndent-Normalize( (long)nfVal );
-mpFLineIndent-SetValue( nfVal, FUNIT_100TH_MM );
 
 switch (maContext.GetCombinedContext_DI())
 {
@@ -610,6 +604,13 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 
/*nSID*/, SfxItemStat
 }
 }
 
+mpLeftIndent-SetValue( nVal, FUNIT_100TH_MM );
+mpRightIndent-SetValue( nrVal, FUNIT_100TH_MM );
+
+long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, 
(MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
+nfVal = (long)mpFLineIndent-Normalize( (long)nfVal );
+mpFLineIndent-SetValue( nfVal, FUNIT_100TH_MM );
+
 mpTbxIndent_IncDec-Enable();
 
 const sal_uInt16 nIdIncrIndent  = 
mpTbxIndent_IncDec-GetItemId(UNO_INCREMENTINDENT);
@@ -843,6 +844,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
 get(mpTbxUL_IncDec, paraspacing);
 
 initial();
+m_aMetricCtl.RequestUpdate();
 }
 
 } } // end of namespace svx::sidebar
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: opencl/Library_opencl.mk

2014-11-27 Thread Tor Lillqvist

 opencl/Library_opencl.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit d73d1e8a4f9937ef1ea90cf45f49bfc822ef2c41
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 16:15:22 2014 +0200

Need -lrt for clock_gettime() with older glibc versions

Change-Id: I4651f74a89b8707cbf0ebdd3b950df3a5b99177a

diff --git a/opencl/Library_opencl.mk b/opencl/Library_opencl.mk
index ad1af37..eb83220 100644
--- a/opencl/Library_opencl.mk
+++ b/opencl/Library_opencl.mk
@@ -46,4 +46,10 @@ $(eval $(call gb_Library_add_exception_objects,opencl,\
 opencl/source/platforminfo \
 ))
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,opencl,\
+-lrt \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] libpagemaker 0.0.2 has been released

2014-11-27 Thread David Tardon

List of changes:

- Use record type to identify records in the trailer, instead of expecting
  that they are always at a specific position. This fixes reading of some
  real-world documents.
- Use symbol visibility on Linux. The library only exports the two public
  functions now.
- Fix several crashes and hangs when reading broken files, found with the help
  of american-fuzzy-lop.
- Fix several minor issues reported by Coverity.

Home page: https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker
Download from: http://dev-www.libreoffice.org/src/libpagemaker/

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

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

2014-11-27 Thread Winfried Donkers

 sc/source/ui/app/inputhdl.cxx |   23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 5456abc4d734583664a55c01a0e750e3051b03c9
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Wed Nov 12 11:18:35 2014 +0100

fdo#86169 fix completion of function name crash

function names with dot or underscore were not completed
correctly, leading to incorrect results or even crashes

Change-Id: Iacb6af29c609ab39746185c71d4443537bf46b5e
Reviewed-on: https://gerrit.libreoffice.org/12380
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 05a7186..08cba8b 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1147,16 +1147,23 @@ void completeFunction( EditView* pView, const OUString 
rInsert, bool rParInser
 aSel = pView-GetSelection();
 ESelection aOldSelection = aSel;
 OUString aSelectedText = pView-GetSelected();
-while(needToExtendSelection(aSelectedText, rInsert))
+if ( needToExtendSelection( aSelectedText, rInsert ) )
 {
-assert(aSel.nStartPos  0);
---aSel.nStartPos;
---aSel.nEndPos = aSel.nStartPos;
-pView-SetSelection(aSel);
-pView-SelectCurrentWord();
-aSelectedText = pView-GetSelected();
+while(needToExtendSelection(aSelectedText, rInsert))
+{
+assert(aSel.nStartPos  0);
+--aSel.nStartPos;
+aSel.nEndPos = aSel.nStartPos;
+pView-SetSelection(aSel);
+pView-SelectCurrentWord();
+aSelectedText = pView-GetSelected();
+}
+aSel.nStartPos = aSel.nEndPos - ( aSelectedText.getLength() - 
1 );
+}
+else
+{
+aSel.nStartPos = aSel.nEndPos - aSelectedText.getLength();
 }
-aSel.nStartPos -= ( aSelectedText.getLength() - 1 );
 aSel.nEndPos = aOldSelection.nEndPos;
 pView-SetSelection(aSel);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Winfried Donkers

 sc/source/ui/app/inputhdl.cxx |   23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 2618f8a724481b1a47a0ec8ca6ed2cad6fc21597
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Wed Nov 12 11:18:35 2014 +0100

fdo#86169 fix completion of function name crash

function names with dot or underscore were not completed
correctly, leading to incorrect results or even crashes

Change-Id: Iacb6af29c609ab39746185c71d4443537bf46b5e
Reviewed-on: https://gerrit.libreoffice.org/12380
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
(cherry picked from commit 5456abc4d734583664a55c01a0e750e3051b03c9)
Reviewed-on: https://gerrit.libreoffice.org/13153

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 05a7186..08cba8b 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1147,16 +1147,23 @@ void completeFunction( EditView* pView, const OUString 
rInsert, bool rParInser
 aSel = pView-GetSelection();
 ESelection aOldSelection = aSel;
 OUString aSelectedText = pView-GetSelected();
-while(needToExtendSelection(aSelectedText, rInsert))
+if ( needToExtendSelection( aSelectedText, rInsert ) )
 {
-assert(aSel.nStartPos  0);
---aSel.nStartPos;
---aSel.nEndPos = aSel.nStartPos;
-pView-SetSelection(aSel);
-pView-SelectCurrentWord();
-aSelectedText = pView-GetSelected();
+while(needToExtendSelection(aSelectedText, rInsert))
+{
+assert(aSel.nStartPos  0);
+--aSel.nStartPos;
+aSel.nEndPos = aSel.nStartPos;
+pView-SetSelection(aSel);
+pView-SelectCurrentWord();
+aSelectedText = pView-GetSelected();
+}
+aSel.nStartPos = aSel.nEndPos - ( aSelectedText.getLength() - 
1 );
+}
+else
+{
+aSel.nStartPos = aSel.nEndPos - aSelectedText.getLength();
 }
-aSel.nStartPos -= ( aSelectedText.getLength() - 1 );
 aSel.nEndPos = aOldSelection.nEndPos;
 pView-SetSelection(aSel);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/moggi/windows-blacklist' - vcl/inc vcl/opengl

2014-11-27 Thread Markus Mohrhard

 vcl/inc/opengl/win/WinDeviceInfo.hxx |   66 ++
 vcl/opengl/win/WinDeviceInfo.cxx |  346 +++
 2 files changed, 411 insertions(+), 1 deletion(-)

New commits:
commit 8bc98bfccd6b7adaff3cc17291dec842c0345308
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Nov 27 15:46:27 2014 +0100

port blacklist from mozilla code to LibreOffice, part2

Change-Id: Ia5810aa5f9e1e169b5f0217f6f176a253dc1439d

diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx 
b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 140662e..524198b 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -71,6 +71,67 @@ enum DeviceVendor {
 DeviceVendorMax
 };
 
+struct DriverInfo
+{
+typedef std::vectorOUString DeviceFamilyVector;
+
+// If |ownDevices| is true, you are transferring ownership of the devices
+// array, and it will be deleted when this GfxDriverInfo is destroyed.
+
+DriverInfo(OperatingSystem os, const OUString vendor, DeviceFamilyVector* 
devices,
+VersionComparisonOp op,
+uint64_t driverVersion, const char *suggestedVersion = nullptr,
+bool ownDevices = false);
+
+DriverInfo();
+DriverInfo(const DriverInfo);
+~DriverInfo();
+
+OperatingSystem meOperatingSystem;
+uint32_t mnOperatingSystemVersion;
+
+OUString maAdapterVendor;
+
+static DeviceFamilyVector* const allDevices;
+DeviceFamilyVector* mpDevices;
+
+// Whether the mDevices array should be deleted when this structure is
+// deallocated. False by default.
+bool mbDeleteDevices;
+
+VersionComparisonOp meComparisonOp;
+
+/* versions are assumed to be A.B.C.D packed as 0x */
+uint64_t mnDriverVersion;
+uint64_t mnDriverVersionMax;
+static uint64_t allDriverVersions;
+
+static const DeviceFamilyVector* GetDeviceFamily(DeviceFamily id);
+static DeviceFamilyVector* mpDeviceFamilies[DeviceFamilyMax];
+
+OUString maModel, maHardware, maProduct, maManufacturer;
+};
+
+#define GFX_DRIVER_VERSION(a,b,c,d) \
+((uint64_t(a)48) | (uint64_t(b)32) | (uint64_t(c)16) | uint64_t(d))
+
+inline uint64_t V(uint32_t a, uint32_t b, uint32_t c, uint32_t d)
+{
+// We make sure every driver number is padded by 0s, this will allow us the
+// easiest 'compare as if decimals' approach. See ParseDriverVersion for a
+// more extensive explanation of this approach.
+while (b  0  b  1000) {
+b *= 10;
+}
+while (c  0  c  1000) {
+c *= 10;
+}
+while (d  0  d  1000) {
+d *= 10;
+}
+return GFX_DRIVER_VERSION(a, b, c, d);
+}
+
 }
 
 class WinOpenGLDeviceInfo : public OpenGLDeviceInfo
@@ -105,12 +166,15 @@ private:
 bool mbRDP;
 
 void GetData();
-OUString GetDeviceVendor(wgl::DeviceVendor eVendor);
+void FillBlacklist();
 
 static OUString* mpDeviceVendors[wgl::DeviceVendorMax];
+static std::vectorwgl::DriverInfo maDriverInfo;
 
 public:
 WinOpenGLDeviceInfo();
+
+static OUString GetDeviceVendor(wgl::DeviceVendor eVendor);
 virtual ~WinOpenGLDeviceInfo();
 
 virtual bool isDeviceBlocked();
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index b1ddf2f..e319c43 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -14,6 +14,22 @@
 #include cstdint
 
 OUString* WinOpenGLDeviceInfo::mpDeviceVendors[wgl::DeviceVendorMax];
+std::vectorwgl::DriverInfo WinOpenGLDeviceInfo::maDriverInfo;
+
+#define APPEND_TO_DRIVER_BLOCKLIST(os, vendor, devices, driverComparator, 
driverVersion, suggestedVersion) \
+maDriverInfo.push_back(wgl::DriverInfo(os, vendor, devices, 
driverComparator, driverVersion, suggestedVersion))
+#define APPEND_TO_DRIVER_BLOCKLIST2(os, vendor, devices, driverComparator, 
driverVersion) \
+maDriverInfo.push_back(wgl::DriverInfo(os, vendor, devices, 
driverComparator, driverVersion))
+
+#define APPEND_TO_DRIVER_BLOCKLIST_RANGE(os, vendor, devices, 
driverComparator, driverVersion, driverVersionMax, suggestedVersion) \
+do { \
+assert(driverComparator == wgl::DRIVER_BETWEEN_EXCLUSIVE || \
+driverComparator == wgl::DRIVER_BETWEEN_INCLUSIVE || \
+driverComparator == wgl::DRIVER_BETWEEN_INCLUSIVE_START); \
+wgl::DriverInfo info(os, vendor, devices, driverComparator, 
driverVersion, suggestedVersion); \
+info.mnDriverVersionMax = driverVersionMax; \
+maDriverInfo.push_back(info); \
+} while (false)
 
 namespace {
 
@@ -318,6 +334,211 @@ templatetypename T void 
appendIntegerWithPadding(OUString rString, T value, s
 #define DEVICE_KEY_PREFIX L\\Registry\\Machine\\
 }
 
+namespace wgl {
+
+uint64_t DriverInfo::allDriverVersions = ~(uint64_t(0));
+DriverInfo::DeviceFamilyVector* const DriverInfo::allDevices = nullptr;
+
+DriverInfo::DeviceFamilyVector* DriverInfo::mpDeviceFamilies[DeviceFamilyMax];
+

[Libreoffice-commits] dev-tools.git: scripts/Bugzilla.pm

2014-11-27 Thread Robinson Tryon

 scripts/Bugzilla.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7d8bc9bf8fa27cb5a7affbebd565a554e0277d5
Author: Robinson Tryon qu...@runcibility.com
Date:   Thu Nov 27 09:44:37 2014 -0500

scripts/Bugzilla: Update FDO Bugzilla domain - TDF domain

Tested the output and it looks the same (bugs.documentfoundation.org
is pointing to bugs.freedesktop.org, so we'd definitely expect that!
:-)

Change-Id: Ie52adfd329d42db12a88797093f9961457125919

diff --git a/scripts/Bugzilla.pm b/scripts/Bugzilla.pm
index ecd71a3..175721c 100644
--- a/scripts/Bugzilla.pm
+++ b/scripts/Bugzilla.pm
@@ -9,7 +9,7 @@ our @EXPORT_OK = qw(bugserver get_url get_deps get_query 
read_bugstats);
 
 # Please take the time to check that the script still runs
 # before changing this to something else.
-$bugserver = bugs.freedesktop.org;
+$bugserver = bugs.documentfoundation.org;
 
 # use me for testing XML pretty printing etc.
 my $fast_debug = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Winfried Donkers

 sc/source/ui/app/inputhdl.cxx |   23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit d4aa91aa4cf7a01915cb9a2b1e4d52e20bf7454b
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Wed Nov 12 11:18:35 2014 +0100

fdo#86169 fix completion of function name crash

function names with dot or underscore were not completed
correctly, leading to incorrect results or even crashes

Change-Id: Iacb6af29c609ab39746185c71d4443537bf46b5e
Reviewed-on: https://gerrit.libreoffice.org/12380
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
(cherry picked from commit 5456abc4d734583664a55c01a0e750e3051b03c9)
Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index aa1c955..961cbcd 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1149,16 +1149,23 @@ void completeFunction( EditView* pView, const OUString 
rInsert, bool rParInser
 aSel = pView-GetSelection();
 ESelection aOldSelection = aSel;
 OUString aSelectedText = pView-GetSelected();
-while(needToExtendSelection(aSelectedText, rInsert))
+if ( needToExtendSelection( aSelectedText, rInsert ) )
 {
-assert(aSel.nStartPos  0);
---aSel.nStartPos;
---aSel.nEndPos = aSel.nStartPos;
-pView-SetSelection(aSel);
-pView-SelectCurrentWord();
-aSelectedText = pView-GetSelected();
+while(needToExtendSelection(aSelectedText, rInsert))
+{
+assert(aSel.nStartPos  0);
+--aSel.nStartPos;
+aSel.nEndPos = aSel.nStartPos;
+pView-SetSelection(aSel);
+pView-SelectCurrentWord();
+aSelectedText = pView-GetSelected();
+}
+aSel.nStartPos = aSel.nEndPos - ( aSelectedText.getLength() - 
1 );
+}
+else
+{
+aSel.nStartPos = aSel.nEndPos - aSelectedText.getLength();
 }
-aSel.nStartPos -= ( aSelectedText.getLength() - 1 );
 aSel.nEndPos = aOldSelection.nEndPos;
 pView-SetSelection(aSel);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Caolán McNamara

 svtools/source/svhtml/parhtml.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 69a16331d0c60ae3d0f376d2265e83ab805ec13b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 27 14:51:27 2014 +

don't access contents of empty string, e.g. with kde96709-1.html

Change-Id: Ifa6db0dc7b5c67b65c5bc17c16fb3a61793c833a

diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index 98445ed..4d4da1d 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -233,8 +233,8 @@ void HTMLOption::GetColor( Color rColor ) const
 
 OUString aTmp(aValue.toAsciiLowerCase());
 sal_uInt32 nColor = SAL_MAX_UINT32;
-if( '#' != aTmp[0] )
-nColor = GetHTMLColor( aTmp );
+if (!aTmp.isEmpty()  aTmp[0] != '#')
+nColor = GetHTMLColor(aTmp);
 
 if( SAL_MAX_UINT32 == nColor )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svtools/source

2014-11-27 Thread Caolán McNamara

 svtools/source/svhtml/parhtml.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e9fd03e6c36be7b99dad622207411a3479f69174
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 27 14:51:27 2014 +

don't access contents of empty string, e.g. with kde96709-1.html

Change-Id: Ifa6db0dc7b5c67b65c5bc17c16fb3a61793c833a
(cherry picked from commit 69a16331d0c60ae3d0f376d2265e83ab805ec13b)

diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index 98445ed..4d4da1d 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -233,8 +233,8 @@ void HTMLOption::GetColor( Color rColor ) const
 
 OUString aTmp(aValue.toAsciiLowerCase());
 sal_uInt32 nColor = SAL_MAX_UINT32;
-if( '#' != aTmp[0] )
-nColor = GetHTMLColor( aTmp );
+if (!aTmp.isEmpty()  aTmp[0] != '#')
+nColor = GetHTMLColor(aTmp);
 
 if( SAL_MAX_UINT32 == nColor )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Miklos Vajna

 sw/source/filter/ww8/writerwordglue.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 57ee81602a3a0647a174f9c3b65547249873d225
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Nov 27 16:05:48 2014 +0100

HdFtDistanceGlue ctor: unused using

Change-Id: I753ad1580e589a2acea41394a7fdb04f9cd3e2a4

diff --git a/sw/source/filter/ww8/writerwordglue.cxx 
b/sw/source/filter/ww8/writerwordglue.cxx
index ce22c37..eee2364 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -410,8 +410,6 @@ namespace sw
 dyaTop = dyaHdrTop;
 dyaBottom = dyaHdrBottom;
 
-using sw::types::msword_cast;
-
 const SwFmtHeader *pHd = HasItemSwFmtHeader(rPage, RES_HEADER);
 if (pHd  pHd-IsActive()  pHd-GetHeaderFmt())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - canvas/source

2014-11-27 Thread Michael Jaumann

 canvas/source/opengl/ogl_renderHelper.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 95c6e4f420c2e604325151706f95f8f7d4ff9403
Author: Michael Jaumann meta_...@yahoo.com
Date:   Thu Nov 27 13:51:33 2014 +

fill glbufferdata with the right verticecount

Change-Id: I0efe1b6ec94daa3bac97d7e4f0768aea8d32d738

diff --git a/canvas/source/opengl/ogl_renderHelper.cxx 
b/canvas/source/opengl/ogl_renderHelper.cxx
index 8d95f46..f53ab33 100644
--- a/canvas/source/opengl/ogl_renderHelper.cxx
+++ b/canvas/source/opengl/ogl_renderHelper.cxx
@@ -65,7 +65,7 @@ namespace oglcanvas
 
 glUseProgram(m_texProgID);
 
-glBufferData(GL_ARRAY_BUFFER, sizeof(rVertices), rVertices[0].x, 
GL_STATIC_DRAW);
+glBufferData(GL_ARRAY_BUFFER, rVertices.size()*sizeof(float), 
rVertices[0].x, GL_STATIC_DRAW);
 glUniform4fv(m_texColorUnf, 1, color[0]);
 glUniformMatrix4fv(m_texMVPUnf, 1, GL_FALSE, m_MVP[0][0]);
 glEnableVertexAttribArray(m_texPosAttrb); //vertices
@@ -91,10 +91,10 @@ namespace oglcanvas
 void RenderHelper::renderVertexUVTex(const std::vectorglm::vec2 
rVertices, const std::vectorglm::vec2 rUVcoords, glm::vec4 color, GLenum 
mode) const
 {
 glBindBuffer(GL_ARRAY_BUFFER, m_vertexBuffer);
-glBufferData(GL_ARRAY_BUFFER, sizeof(rVertices), rVertices[0].x, 
GL_STATIC_DRAW);
+glBufferData(GL_ARRAY_BUFFER, rVertices.size()*sizeof(float), 
rVertices[0].x, GL_STATIC_DRAW);
 
 glBindBuffer(GL_ARRAY_BUFFER, m_uvBuffer);
-glBufferData(GL_ARRAY_BUFFER, sizeof(rUVcoords), rUVcoords[0].x, 
GL_STATIC_DRAW);
+glBufferData(GL_ARRAY_BUFFER, rUVcoords.size()*sizeof(float), 
rUVcoords[0].x, GL_STATIC_DRAW);
 
 glUseProgram(m_simpleProgID);
 
@@ -148,7 +148,7 @@ namespace oglcanvas
 void RenderHelper::renderVertexTex(const std::vectorglm::vec2 
rVertices, GLfloat fWidth, GLfloat fHeight, glm::vec4 color, GLenum mode) const
 {
 glBindBuffer(GL_ARRAY_BUFFER, m_vertexBuffer);
-glBufferData(GL_ARRAY_BUFFER, sizeof(rVertices), rVertices[0].x, 
GL_STATIC_DRAW);
+glBufferData(GL_ARRAY_BUFFER, rVertices.size()*sizeof(float), 
rVertices[0].x, GL_STATIC_DRAW);
 
 glUseProgram(m_texManProgID);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Maxim Monastirsky

 include/svx/verttexttbxctrl.hxx |3 ---
 svx/source/tbxctrls/verttexttbxctrl.cxx |5 +
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 19262f43def3ff72cd46a142fd22bbfc9b030149
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Thu Nov 27 17:53:11 2014 +0200

bCheckVertical is not used

Change-Id: I092098a2520c4856f1d394ddbe288bbc444e7db8

diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx
index b49e5e8..bc6ce5a 100644
--- a/include/svx/verttexttbxctrl.hxx
+++ b/include/svx/verttexttbxctrl.hxx
@@ -27,15 +27,12 @@
  */
 class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl
 {
-bool bCheckVertical; //determines whether vertical mode or CTL mode has to 
be checked
 public:
 SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox rTbx );
 virtual ~SvxVertCTLTextTbxCtrl();
 
 virtual voidStateChanged( sal_uInt16 nSID, SfxItemState 
eState,
   const SfxPoolItem* pState ) 
SAL_OVERRIDE;
-voidSetVert(bool bSet) {bCheckVertical = bSet;}
-
 };
 
 class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx 
b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 36a5e93..d9834b5 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -33,20 +33,17 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem);
 SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, 
ToolBox rTbx ) :
 SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
 {
-SetVert(false);
 addStatusListener( OUString( .uno:CTLFontState ));
 }
 
 SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, 
ToolBox rTbx ) :
 SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
 {
-SetVert(true);
 addStatusListener( OUString( .uno:VerticalTextState ));
 }
 
 SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 
nId, ToolBox rTbx ) :
-SfxToolBoxControl( nSlotId, nId, rTbx ),
-bCheckVertical(true)
+SfxToolBoxControl( nSlotId, nId, rTbx )
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice extensions to ODF: Improving documentation

2014-11-27 Thread Robinson Tryon

On Wed, Nov 26, 2014 at 11:06 AM, Michael Stahl mst...@redhat.com wrote:
 sounds nice, except:

 ! ODF Version(s) Extended  !-- e.g. 1.2+ --

 this should generally be the latest ODF version that the LO release
 supports, ... so what's the benefit of tracking this?

I expect that there will be features in ODF 1.3 that were implemented
as extensions to ODF 1.2 in LibreOffice. If a user of LO 6.5 saves a
file in ODF 1.2 for backwards compatibility, I wanted to be clear
about whether the file created would use this extension.

 and if you select to store your files in a specific,
 non-extended version in Tools-Options you don't (or at least shouldn't)
 get any extensions...

I totally agree :-)  My reasoning was that once ODF 1.3 comes out, ODF
1.2 Extended might still be a user-selectable option. But perhaps that
won't be the case?

 ! Validation Errors  !-- Any errors/warnings this feature will
 trigger in an ODF validator, or none --

 i'm not sure if this is so useful - you can tell the validator if you
 want to check strictly against the schema or allow extensions:

  -c: Check conformance (default for ODF 1.2 documents)
  -e: Check extended conformance (ODF 1.2 documents only)

That sounds good to me! In the past at least I tried validating
generated documents against the extended conforming option of the
OpenDoc Society's online validator
(http://odf-validator.rhcloud.com/), and got several errors. Assuming
that the documents are indeed extended conforming, I wouldn't expect
any errors.

 if the extensions are properly name-spaced then validation with -e
 should not report any errors, and validating a document stored as
 extended with strict conformance will inevitably report problems, so
 don't do that.

Oh, certainly -- one of my main goals here was to clarify what to
expect when one validates a document. As long as the docs are expected
to pass the corresponding category of strict, conforming, or extended
conforming tests, then I think we can remove that column, or perhaps
just rename it to False Positive Validation Errors, in case one of
the validators is incorrectly flagging the documents LO generates.


Thanks!
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-11-27 Thread Eike Rathke

 sc/source/ui/app/inputhdl.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a02a54f51367f276544f45e67023338a32d22ee6
Author: Eike Rathke er...@redhat.com
Date:   Thu Nov 27 17:16:11 2014 +0100

remove SAL_DEBUG

Change-Id: I08cbc7bab69daa19dfac1a1b27113fb87bc7a272

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 08cba8b..482a56f 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1124,7 +1124,6 @@ namespace {
 
 bool needToExtendSelection(const OUString rSelectedText, const OUString 
rInsertText)
 {
-SAL_DEBUG(rSelectedText);
 return !rInsertText.startsWithIgnoreAsciiCase(rSelectedText);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2014-11-27 Thread Michael Meeks

* Present:
+ Lionel, Stephan, Eike, Miklos, Robinson, Jacobo, Andras, Markus,
  Michael M., Ptyl, Cloph, Norbert, Florian, Bjoern, Jan-Marek,
  Muthu, Michael S., Adam
 
* Completed Action Items:
+ look at regressions associated with a SUSE bugzilla bugfix (Timar)
[ went through them, but no low hanging fruit, but no need to access
  original documents there, for most there are unit tests. Will check
  all are public ]
+ look at sorting spreadsheet / use-cases etc. (Eike)
cf. https://bugs.freedesktop.org/attachment.cgi?id=108990 ]
ongoing, a mix of real bugs, wrong expectations and misconception about 
references
[ worked through the document, and added a comment to the bug,
  cherry-picked some fixes missing on the 4.2.x branch, fixed
  2-3 cases on all other branches.
  Suggest we do a 4.2.8 last-release ].
 
* Pending Action Items:
+ start building bibisect repositories (Robinson)
[ works on his local machine, but ... needs access to Bertha ]
AI:   get Robinson access to Bertha etc. (Cloph)
+ see also: https://redmine.documentfoundation.org/issues/597#note-21
 
* Bugzilla migration update (Robinson)
+ going well
+ http://vm150.documentfoundation.org/
+ please test out your tools vs. that.
+ bugzilla notification - needed for IRC  git commit daemons
+ can we login ? (Miklos)
+ all passwords need a reset.
+ if anyone wants admin access - mail Robinson
+ Aiming for 3rd week in January - Wed / Jan 14th
+ why not when people are not using it ? (Norbert)
+ happy to have another day (Robinson)
+ presumably a weekend-night of down-time will screw
  over fewer fdo users (Norbert)
+ Aim for calendar week 3 (Florian)
+ so we have infra etc. available end of week 2 etc.
+ now safe to go - if we can move forward; reach out to
  Tollef, and arrange a date with him.
AI: + reach out to Tollef to organise a date/time (Robinson)
+ load-testing ? (Michael)
+ handful of people on the current VM, the
  file-system is not optimized.
+ do we have stats on the fdo load ? (Michael)
AI:  + will get from Tollef (Robinson)
+ do we have the web-page / password reset done ? (Norbert)
+ see an un-pretty, but working notification (Robinson)
+ needs to just have enough to grok the migration (Norbert)
 + says we've migrated bugzilla etc. (Robinson)
+ Testing BSA
+ needs to be fixed vs. current version of bugzilla on fdo
+ current BSA is broken vs. fdo - due to upgrade of bugzilla
  a few weeks ago.
+ their HTML layout changed, and all scripts that parsed that
  are broken (Markus)
 + best to switch to XML-RPC
 + BSA - already use XML-RPC but doesn't work (Cloph)
 + will setup a test system so we can get that fixed (Cloph)
 
* Release Engineering update (Cloph)
+ 4.2.8 release
AI: + come up with a proposal timing-wise (Cloph)
   + next week 4.4 Beta 2, etc. every week has a release
   + better to have it in the 4.4 beta phase
   + Eike is confident.
   + plan a 1-RC release.
   + have been pushing that out to Ubuntu/PPA (Bjoern)
   + lack of 'murder' screaming out there.
= late this week or early next week.
   + can we ask people to test ? (Robinson)
   + always pushed to the dev-builds server  announced (Cloph)
   + lets not invite re-opening wounds (Bjoern)
   + its a ton better in its current state (Michael)
   + Cudos to Eike (Bjoern)
+ 4.3.5 RC1 status
+ currently synching to the mirrors, can be announced to the public
  after the call.
+ 4.4.0 Beta 2
+ ensure everything committed to master is cherry-picked to 4.4 branch
+ string freeze is with RC1 - due in week 51 - Dec 15th.
+ Lateish Feature collection:
+ OpenGL rendering for Windows by default for good drivers (various)
+ Blacklisting for Linux and Windows (Markus)
[ mostly done, Linux in master, Windows in-progress,
  currently porting the Mozilla code here; but mostly
  tested; comes from Mozilla - with some tweaks - eg.
  remove DirectX bits; switched string classes etc.
  Lots of registry lookups ].
+ OpenGL/CL JPEG de-compression to texture (jpeg-turbo patch)
 [ patch pending here ].
+ images*.zip layering ? (Kendy)
 + saves 5Mb of zipped installation size, we open the zip
   files and do the fallback at run-time.
   + packimages  impimagetree.cxx bits (Kendy)
   + cold-start ? (Michael)

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

2014-11-27 Thread Eike Rathke

 sc/source/ui/app/inputhdl.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit adda0955d0f06dd8d75bd9108bc6b5ba5a909fe0
Author: Eike Rathke er...@redhat.com
Date:   Thu Nov 27 17:16:11 2014 +0100

remove SAL_DEBUG

Change-Id: I08cbc7bab69daa19dfac1a1b27113fb87bc7a272
(cherry picked from commit a02a54f51367f276544f45e67023338a32d22ee6)

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 08cba8b..482a56f 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1124,7 +1124,6 @@ namespace {
 
 bool needToExtendSelection(const OUString rSelectedText, const OUString 
rInsertText)
 {
-SAL_DEBUG(rSelectedText);
 return !rInsertText.startsWithIgnoreAsciiCase(rSelectedText);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LIbreOffice 4.3.5 RC1 available

2014-11-27 Thread Christian Lohmaier

Dear Community,

The Document Foundation is pleased to announce the first release
candidate of LibreOffice 4.3.5. The upcoming 4.3.5 will be the fifth
in a sequence of frequent bugfix releases for our feature-packed 4.3
line. Please be aware that LibreOffice 4.3.5 RC1 has not been flagged
as ready for production use yet, however feel free to give it a try
instead of 4.3.4.

A work-in-progress list of new features in LibreOffice 4.3 can be
found at https://wiki.documentfoundation.org/ReleaseNotes/4.3

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Developers and QA might also be interested in the symbol server for
windows debug information (see the release notes linked below for
details)

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/community/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 4.3.5 RC1 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/4.3.5/RC1

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

On behalf of the Community,

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

[Libreoffice-commits] core.git: Branch 'private/moggi/windows-blacklist' - vcl/inc vcl/opengl

2014-11-27 Thread Markus Mohrhard

 vcl/inc/opengl/win/WinDeviceInfo.hxx |3 
 vcl/opengl/win/WinDeviceInfo.cxx |  132 +--
 2 files changed, 130 insertions(+), 5 deletions(-)

New commits:
commit 4685558dfe86c6147df7893fb27760fd1cb872cb
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Nov 27 19:12:31 2014 +0100

connect all pieces for OpenGL windows blacklist, part 3

Change-Id: Iaaafe7da8e717f7b127ab5806773a5a5d75b82d5

diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx 
b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 524198b..7e0b80f 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -109,7 +109,7 @@ struct DriverInfo
 static const DeviceFamilyVector* GetDeviceFamily(DeviceFamily id);
 static DeviceFamilyVector* mpDeviceFamilies[DeviceFamilyMax];
 
-OUString maModel, maHardware, maProduct, maManufacturer;
+OUString maSuggestedVersion;
 };
 
 #define GFX_DRIVER_VERSION(a,b,c,d) \
@@ -167,6 +167,7 @@ private:
 
 void GetData();
 void FillBlacklist();
+bool FindBlocklistedDeviceInList();
 
 static OUString* mpDeviceVendors[wgl::DeviceVendorMax];
 static std::vectorwgl::DriverInfo maDriverInfo;
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index e319c43..86614e8 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -87,7 +87,8 @@ void GetDLLVersion(const sal_Unicode* aDLLPath, OUString 
aVersion)
 templatetypename T, size_t N
 size_t ArrayLength(T (aArr)[N])
 {
-  return N;
+(void) aArr;
+return N;
 }
 
 #define GFX_DRIVER_VERSION(a,b,c,d) \
@@ -201,6 +202,29 @@ enum {
 kWindows10 = 0x60004
 };
 
+
+wgl::OperatingSystem WindowsVersionToOperatingSystem(int32_t aWindowsVersion)
+{
+switch(aWindowsVersion) {
+case kWindowsXP:
+return wgl::DRIVER_OS_WINDOWS_XP;
+case kWindowsServer2003:
+return wgl::DRIVER_OS_WINDOWS_SERVER_2003;
+case kWindowsVista:
+return wgl::DRIVER_OS_WINDOWS_VISTA;
+case kWindows7:
+return wgl::DRIVER_OS_WINDOWS_7;
+case kWindows8:
+return wgl::DRIVER_OS_WINDOWS_8;
+case kWindows8_1:
+return wgl::DRIVER_OS_WINDOWS_8_1;
+case kWindowsUnknown:
+default:
+return wgl::DRIVER_OS_UNKNOWN;
+};
+}
+
+
 int32_t WindowsOSVersion()
 {
 static int32_t winVersion = kWindowsUnknown;
@@ -321,7 +345,7 @@ templatetypename T void 
appendIntegerWithPadding(OUString rString, T value, s
 {
 OUString aValue = OUString::number(value, 16);
 sal_Int32 nLength = aValue.getLength();
-sal_Int32 nPadLength = nChars - nLength;
+sal_uInt32 nPadLength = nChars - nLength;
 assert(nPadLength = 0);
 OUStringBuffer aBuffer;
 for (sal_uInt32 i = 0; i  nPadLength; ++i)
@@ -366,7 +390,10 @@ DriverInfo::DriverInfo(OperatingSystem os, const OUString 
vendor,
 meComparisonOp(op),
 mnDriverVersion(driverVersion),
 mnDriverVersionMax(0)
-{}
+{
+if (suggestedVersion)
+maSuggestedVersion = OStringToOUString(OString(suggestedVersion), 
RTL_TEXTENCODING_UTF8);
+}
 
 DriverInfo::DriverInfo(const DriverInfo aOrig)
 : meOperatingSystem(aOrig.meOperatingSystem),
@@ -551,6 +578,97 @@ WinOpenGLDeviceInfo::~WinOpenGLDeviceInfo()
 {
 }
 
+bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList()
+{
+uint64_t driverVersion;
+ParseDriverVersion(maDriverVersion, driverVersion);
+
+wgl::OperatingSystem eOS = 
WindowsVersionToOperatingSystem(mnWindowsVersion);
+bool match = false;
+uint32_t i = 0;
+for (; i  maDriverInfo.size(); i++) {
+if (maDriverInfo[i].meOperatingSystem != wgl::DRIVER_OS_ALL 
+maDriverInfo[i].meOperatingSystem != eOS)
+{
+continue;
+}
+
+if (maDriverInfo[i].mnOperatingSystemVersion  
maDriverInfo[i].mnOperatingSystemVersion != mnWindowsVersion) {
+continue;
+}
+
+if 
(!maDriverInfo[i].maAdapterVendor.equalsIgnoreAsciiCase(GetDeviceVendor(wgl::VendorAll))
 
+
!maDriverInfo[i].maAdapterVendor.equalsIgnoreAsciiCase(maAdapterVendorID)) {
+continue;
+}
+
+if (maDriverInfo[i].mpDevices != wgl::DriverInfo::allDevices  
maDriverInfo[i].mpDevices-size()) {
+bool deviceMatches = false;
+for (uint32_t j = 0; j  maDriverInfo[i].mpDevices-size(); j++) {
+if 
((*maDriverInfo[i].mpDevices)[j].equalsIgnoreAsciiCase(maAdapterDeviceID)) {
+deviceMatches = true;
+break;
+}
+}
+
+if (!deviceMatches) {
+continue;
+}
+}
+
+#if defined(XP_WIN) || defined(ANDROID)
+switch (maDriverInfo[i].meComparisonOp) {
+case DRIVER_LESS_THAN:
+match = driverVersion  maDriverInfo[i].mnDriverVersion;
+

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

2014-11-27 Thread Tor Lillqvist

 include/opencl/openclwrapper.hxx |   35 +--
 opencl/inc/opencl_device.hxx |2 
 opencl/source/opencl_device.cxx  |3 
 opencl/source/openclwrapper.cxx  |  141 ---
 sc/source/core/opencl/formulagroupcl.cxx |   58 ++--
 5 files changed, 110 insertions(+), 129 deletions(-)

New commits:
commit abeef65da71732d8fd401fce52cc37a364aa7781
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 18:03:35 2014 +0200

Put the KernelEnv struct inside the opencl namespace, too

Change-Id: I33d51b0e30445c34c792210e7c656c1d48159019

diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index 6e520a7..5fd76ea 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -36,6 +36,8 @@ if( status != CL_SUCCESS )\
 
 #include cstdio
 
+namespace opencl {
+
 struct KernelEnv
 {
 cl_context mpkContext;
@@ -43,8 +45,6 @@ struct KernelEnv
 cl_program mpkProgram;
 };
 
-namespace opencl {
-
 struct GPUEnv
 {
 //share vb in all modules in hb library
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 6ac2a5f..4fa3c5f 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -113,7 +113,7 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int, 
cl_program )
 throw Unhandled();
 }
 // Obtain cl context
-KernelEnv kEnv;
+::opencl::KernelEnv kEnv;
 ::opencl::setKernelEnv(kEnv);
 cl_int err;
 if (pHostBuffer)
@@ -204,7 +204,7 @@ public:
 }
 // marshaling
 // Obtain cl context
-KernelEnv kEnv;
+::opencl::KernelEnv kEnv;
 ::opencl::setKernelEnv(kEnv);
 // Pass the scalar result back to the rest of the formula kernel
 cl_int err = clSetKernelArg(k, argno, sizeof(cl_uint), 
(void*)hashCode);
@@ -388,7 +388,7 @@ size_t DynamicKernelStringArgument::Marshal( cl_kernel k, 
int argno, int, cl_pro
 {
 FormulaToken* ref = mFormulaTree-GetFormulaToken();
 // Obtain cl context
-KernelEnv kEnv;
+::opencl::KernelEnv kEnv;
 ::opencl::setKernelEnv(kEnv);
 cl_int err;
 formula::VectorRefArray vRef;
@@ -1131,7 +1131,7 @@ public:
 {
 assert(Base::mpClmem == NULL);
 // Obtain cl context
-KernelEnv kEnv;
+::opencl::KernelEnv kEnv;
 ::opencl::setKernelEnv(kEnv);
 cl_int err;
 size_t nInput = mpDVR-GetArrayLength();
@@ -1912,7 +1912,7 @@ public:
 if (OpGeoMean* OpSumCodeGen = 
dynamic_castOpGeoMean*(mpCodeGen.get()))
 {
 // Obtain cl context
-KernelEnv kEnv;
+::opencl::KernelEnv kEnv;
 ::opencl::setKernelEnv(kEnv);
 cl_int err;
 cl_mem pClmem2;
@@ -1970,7 +1970,7 @@ public:
 if (OpSumIfs* OpSumCodeGen = dynamic_castOpSumIfs*(mpCodeGen.get()))
 {
 // Obtain cl context
-KernelEnv kEnv;
+::opencl::KernelEnv kEnv;
 ::opencl::setKernelEnv(kEnv);
 cl_int err;
 DynamicKernelArgument* Arg = mvSubArguments[0].get();
@@ -3354,7 +3354,7 @@ public:
 void Launch( size_t nr )
 {
 // Obtain cl context
-KernelEnv kEnv;
+::opencl::KernelEnv kEnv;
 ::opencl::setKernelEnv(kEnv);
 cl_int err;
 // The results
@@ -3416,7 +3416,7 @@ void DynamicKernel::CreateKernel()
 std::string kname = DynamicKernel + mKernelSignature;
 // Compile kernel here!!!
 // Obtain cl context
-KernelEnv kEnv;
+::opencl::KernelEnv kEnv;
 ::opencl::setKernelEnv(kEnv);
 const char* src = mFullProgramSrc.c_str();
 static std::string lastOneKernelHash = ;
@@ -3667,7 +3667,7 @@ bool FormulaGroupInterpreterOpenCL::interpret( 
ScDocument rDoc,
 try
 {
 // Obtain cl context
-KernelEnv kEnv;
+::opencl::KernelEnv kEnv;
 ::opencl::setKernelEnv(kEnv);
 // Run the kernel.
 pKernel-Launch(xGroup-mnLength);
commit 52f9606ed0af7acdf330eb70b84d7c9bd6abdd52
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 27 17:56:21 2014 +0200

The OpenCLEnv struct is used only inside openclwrapper.cxx

Change-Id: I95fbee302213e6ced469dd7a2a1c254178159357

diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index 1a392e5..6e520a7 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -45,14 +45,6 @@ struct KernelEnv
 
 namespace opencl {
 
-struct OpenCLEnv
-{
-cl_platform_id mpOclPlatformID;
-cl_context mpOclContext;
-cl_device_id mpOclDevsID;
-cl_command_queue mpOclCmdQueue;
-};
-
 struct GPUEnv
 {
 //share vb in all modules in hb library
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index b181375..9ce2481 100644
---

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

2014-11-27 Thread Caolán McNamara

 sw/source/core/crsr/swcrsr.cxx |   14 +++---
 sw/source/core/doc/docruby.cxx |2 +-
 sw/source/filter/html/htmlfldw.cxx |2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 383535196f9924202fc997c388e34a7865a2250e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 15 10:45:41 2014 +

Related: #i17171# identify places where -1 was cast to 0x in the past

try and do so anyway. Could be picking that sort of lint out of writer
for a while to come :-(

(cherry picked from commit 16c565461b40c6876e69dc7bcc18f7c4db7fb94d)

Note: this fixes fdo#80571

Note: for backport, removed any changes where the variables are still
xub_StrLen; only sal_Int32 variables may have values  0.

Signed-off-by: Michael Stahl mst...@redhat.com

Conflicts:
sw/source/core/crsr/swcrsr.cxx
sw/source/core/text/porfld.cxx
sw/source/core/text/txthyph.cxx
sw/source/core/txtnode/fntcap.cxx
sw/source/core/txtnode/txtedt.cxx

Change-Id: I4efb94e5ed33025f7f416c096af25ba358ef45af

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index d27ebca..971c1b7 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1233,7 +1233,7 @@ sal_Bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
 nWordType,
 sal_False ).startPos;
 
-if (nPtPos  pTxtNd-GetTxt().getLength())
+if (nPtPos  pTxtNd-GetTxt().getLength()  nPtPos = 0)
 {
 GetPoint()-nContent = nPtPos;
 if( !IsSelOvr() )
@@ -1257,7 +1257,7 @@ sal_Bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
 nWordType,
 sal_True ).endPos;
 
-if (nPtPos = pTxtNd-GetTxt().getLength() 
+if (nPtPos = pTxtNd-GetTxt().getLength()  nPtPos = 0 
 GetPoint()-nContent.GetIndex() != nPtPos )
 {
 GetPoint()-nContent = nPtPos;
@@ -1282,7 +1282,7 @@ sal_Bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
 g_pBreakIt-GetLocale( pTxtNd-GetLang( nPtPos, 1 ) ),
 nWordType ).startPos;
 
-if (nPtPos  pTxtNd-GetTxt().getLength())
+if (nPtPos  pTxtNd-GetTxt().getLength()  nPtPos = 0)
 {
 GetPoint()-nContent = nPtPos;
 if( !IsSelOvr() )
@@ -1309,7 +1309,7 @@ sal_Bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
 g_pBreakIt-GetLocale( pTxtNd-GetLang( nPtPos, 1 ) ),
 nWordType ).startPos;
 
-if (nPtPos  pTxtNd-GetTxt().getLength())
+if (nPtPos  pTxtNd-GetTxt().getLength()  nPtPos = 0)
 {
 GetPoint()-nContent = nPtPos;
 if( !IsSelOvr() )
@@ -1474,7 +1474,7 @@ sal_Bool SwCursor::GoSentence( SentenceMoveType eMoveType 
)
 
 // it is allowed to place the PaM just behind the last
 // character in the text thus = ...Len
-if (nPtPos = pTxtNd-GetTxt().getLength())
+if (nPtPos = pTxtNd-GetTxt().getLength()  nPtPos = 0)
 {
 GetPoint()-nContent = nPtPos;
 if( !IsSelOvr() )
@@ -1511,12 +1511,12 @@ sal_Bool SwCursor::ExpandToSentenceBorders()
 // it is allowed to place the PaM just behind the last
 // character in the text thus = ...Len
 bool bChanged = false;
-if (nStartPos = pStartNd-GetTxt().getLength())
+if (nStartPos = pStartNd-GetTxt().getLength()  nStartPos = 0)
 {
 GetMark()-nContent = nStartPos;
 bChanged = true;
 }
-if (nEndPos = pEndNd-GetTxt().getLength())
+if (nEndPos = pEndNd-GetTxt().getLength()  nEndPos = 0)
 {
 GetPoint()-nContent = nEndPos;
 bChanged = true;
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index acc91a0..44d7915 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -235,7 +235,7 @@ sal_Bool SwDoc::_SelectNextRubyChars( SwPaM rPam, 
SwRubyListEntry rEntry, sal_
 g_pBreakIt-GetLocale( pTNd-GetLang( nStart )),
 WordType::ANYWORD_IGNOREWHITESPACES,
 sal_True ).startPos;
-if( nWordStt  nStart  -1 != nWordStt )
+if (nWordStt  nStart  nWordStt = 0)
 {
 nStart = nWordStt;
 pPos-nContent = nStart;
diff --git a/sw/source/filter/html/htmlfldw.cxx 
b/sw/source/filter/html/htmlfldw.cxx
index 29c9c76..a77c95d 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -315,7 +315,7 @@ static Writer OutHTML_SwField( Writer rWrt, const 
SwField* pFld,
 
 sal_uInt16 nScript =
 SwHTMLWriter::GetCSS1ScriptForScriptType( nScriptType );
-if( nPos  sExpand.getLength() || nScript != rHTMLWrt.nCSS1Script )
+if( (nPos

Re: LibreOffice extensions to ODF: Improving documentation

2014-11-27 Thread Michael Stahl

On 27.11.2014 15:07, Robinson Tryon wrote:
 On Wed, Nov 26, 2014 at 11:06 AM, Michael Stahl mst...@redhat.com wrote:
 sounds nice, except:

 ! ODF Version(s) Extended  !-- e.g. 1.2+ --

 this should generally be the latest ODF version that the LO release
 supports, ... so what's the benefit of tracking this?
 
 I expect that there will be features in ODF 1.3 that were implemented
 as extensions to ODF 1.2 in LibreOffice. If a user of LO 6.5 saves a
 file in ODF 1.2 for backwards compatibility, I wanted to be clear
 about whether the file created would use this extension.

hmm if the user says ODF 1.2 then no, if ODF 1.2 extended then yes,
but see below ...

 and if you select to store your files in a specific,
 non-extended version in Tools-Options you don't (or at least shouldn't)
 get any extensions...
 
 I totally agree :-)  My reasoning was that once ODF 1.3 comes out, ODF
 1.2 Extended might still be a user-selectable option. But perhaps that
 won't be the case?

well i don't think it's likely, we don't have ODF 1.1 extended now for
a counter-example; i don't think that it existed after OOo 3.0 added ODF
1.2...  indeed my install of OOo 3.0.1 has only ODF 1.0/1.1 and ODF
1.2 as options.

 ! Validation Errors  !-- Any errors/warnings this feature will
 trigger in an ODF validator, or none --

 i'm not sure if this is so useful - you can tell the validator if you
 want to check strictly against the schema or allow extensions:

  -c: Check conformance (default for ODF 1.2 documents)
  -e: Check extended conformance (ODF 1.2 documents only)
 
 That sounds good to me! In the past at least I tried validating
 generated documents against the extended conforming option of the
 OpenDoc Society's online validator
 (http://odf-validator.rhcloud.com/), and got several errors. Assuming
 that the documents are indeed extended conforming, I wouldn't expect
 any errors.

there were some errors there in the past because extension elements and
attributes used standard ODF namespaces, which is not allowed.
hopefully those should be fixed now.


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

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

2014-11-27 Thread Miklos Vajna

 sw/source/filter/ww8/wrtw8sty.cxx |   78 +++---
 1 file changed, 39 insertions(+), 39 deletions(-)

New commits:
commit b97600ff196f620145d0b56dbb589238bc6a9cbd
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Nov 27 20:26:04 2014 +0100

WW8_WrPlcSubDoc::WriteGenericTxt: fix missing indentation

Change-Id: I21e47d004e011c706a1e7e591f9204beb9b6f70f

diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 7593e99..cd6b3e9 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2158,53 +2158,53 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export rWrt, 
sal_uInt8 nTTyp,
 
 if( aCntnt[ i ] != NULL )
 {
-// is it an writer or sdr - textbox?
-const SdrObject rObj = *(SdrObject*)aCntnt[ i ];
-if (rObj.GetObjInventor() == FmFormInventor)
-{
-sal_uInt8 nOldTyp = rWrt.nTxtTyp;
-rWrt.nTxtTyp = nTTyp;
-rWrt.GetOCXExp().ExportControl(rWrt,rObj);
-rWrt.nTxtTyp = nOldTyp;
-}
-else if( rObj.ISA( SdrTextObj ) )
-rWrt.WriteSdrTextObj(rObj, nTTyp);
-else
-{
-const SwFrmFmt* pFmt = ::FindFrmFmt( rObj );
-OSL_ENSURE( pFmt, where is the format? );
-
-const SwNodeIndex* pNdIdx = pFmt-GetCntnt().GetCntntIdx();
-OSL_ENSURE( pNdIdx, where is the StartNode of the 
Textbox? );
-rWrt.WriteSpecialText( pNdIdx-GetIndex() + 1,
-   
pNdIdx-GetNode().EndOfSectionIndex(),
-   nTTyp );
+// is it an writer or sdr - textbox?
+const SdrObject rObj = *(SdrObject*)aCntnt[ i ];
+if (rObj.GetObjInventor() == FmFormInventor)
+{
+sal_uInt8 nOldTyp = rWrt.nTxtTyp;
+rWrt.nTxtTyp = nTTyp;
+rWrt.GetOCXExp().ExportControl(rWrt,rObj);
+rWrt.nTxtTyp = nOldTyp;
+}
+else if( rObj.ISA( SdrTextObj ) )
+rWrt.WriteSdrTextObj(rObj, nTTyp);
+else
 {
-SwNodeIndex aContentIdx = *pNdIdx;
-++aContentIdx;
-if ( aContentIdx.GetNode().IsTableNode() )
+const SwFrmFmt* pFmt = ::FindFrmFmt( rObj );
+OSL_ENSURE( pFmt, where is the format? );
+
+const SwNodeIndex* pNdIdx = 
pFmt-GetCntnt().GetCntntIdx();
+OSL_ENSURE( pNdIdx, where is the StartNode of the 
Textbox? );
+rWrt.WriteSpecialText( pNdIdx-GetIndex() + 1,
+   
pNdIdx-GetNode().EndOfSectionIndex(),
+   nTTyp );
 {
-bool bContainsOnlyTables = true;
-do {
-aContentIdx = 
*(aContentIdx.GetNode().EndOfSectionNode());
-++aContentIdx;
-if ( !aContentIdx.GetNode().IsTableNode() 
- aContentIdx.GetIndex() != 
pNdIdx-GetNode().EndOfSectionIndex() )
+SwNodeIndex aContentIdx = *pNdIdx;
+++aContentIdx;
+if ( aContentIdx.GetNode().IsTableNode() )
+{
+bool bContainsOnlyTables = true;
+do {
+aContentIdx = 
*(aContentIdx.GetNode().EndOfSectionNode());
+++aContentIdx;
+if ( !aContentIdx.GetNode().IsTableNode() 

+ aContentIdx.GetIndex() != 
pNdIdx-GetNode().EndOfSectionIndex() )
+{
+bContainsOnlyTables = false;
+}
+} while ( aContentIdx.GetNode().IsTableNode() 
);
+if ( bContainsOnlyTables )
 {
-bContainsOnlyTables = false;
+// Additional paragraph containing a space 
to
+// assure that by WW created RTF from 
written WW8
+// does not crash WW.
+rWrt.WriteStringAsPara( OUString( ) );
 }
-

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

2014-11-27 Thread Winfried Donkers

 formula/source/core/api/FormulaCompiler.cxx |   14 +-
 formula/source/core/api/token.cxx   |  190 +---
 include/formula/tokenarray.hxx  |   13 +
 3 files changed, 195 insertions(+), 22 deletions(-)

New commits:
commit 4feaf96f50fa89eccb4e7a638220099e9a8482f1
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Fri Aug 8 17:39:04 2014 +0200

fdo#81596 export to OOXML that need argument changes

Change-Id: I3a99e416be9f3f04175939e4560f8f7c55497185
Reviewed-on: https://gerrit.libreoffice.org/10831
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 6c4f617..870d8f2 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1737,12 +1737,22 @@ void FormulaCompiler::CreateStringFromTokenArray( 
OUStringBuffer rBuffer )
 
 FormulaTokenArray* pSaveArr = pArr;
 bool bODFF = FormulaGrammar::isODFF( meGrammar);
+MissingConventionPOF aConv( bODFF);
 if (bODFF || FormulaGrammar::isPODF( meGrammar) )
 {
 // Scan token array for missing args and re-write if present.
-MissingConvention aConv( bODFF);
 if (pArr-NeedsPofRewrite( aConv))
-pArr = pArr-RewriteMissingToPof( aConv);
+pArr = pArr-RewriteMissing( false, aConv );
+}
+else
+{
+// fdo#81596
+if ( FormulaGrammar::isOOXML( meGrammar ) )
+{
+// Scan token array for missing args and rewrite if present.
+if ( pArr-NeedsOOXMLRewrite() )
+pArr = pArr-RewriteMissing( true, aConv );
+}
 }
 
 // At least one character per token, plus some are references, some are
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 92486dc..5e43ea0 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -995,11 +995,9 @@ bool FormulaTokenArray::HasMatrixDoubleRefOps()
 return false;
 }
 
-
-
 // --- POF (plain old formula) rewrite of a token array -
 
-inline bool MissingConvention::isRewriteNeeded( OpCode eOp ) const
+inline bool MissingConventionPOF::isRewriteNeeded( OpCode eOp ) const
 {
 switch (eOp)
 {
@@ -1026,11 +1024,13 @@ class FormulaMissingContext
 voidClear() { mpFunc = NULL; mnCurArg = 0; }
 inline  boolAddDefaultArg( FormulaTokenArray* pNewArr, int 
nArg, double f ) const;
 boolAddMissingExternal( FormulaTokenArray* pNewArr ) 
const;
-boolAddMissing( FormulaTokenArray *pNewArr, const 
MissingConvention  rConv  ) const;
-voidAddMoreArgs( FormulaTokenArray *pNewArr, const 
MissingConvention  rConv  ) const;
+boolAddMissingPOF( FormulaTokenArray *pNewArr, const 
MissingConventionPOF  rConv  ) const;
+voidAddMoreArgsPOF( FormulaTokenArray *pNewArr, const 
MissingConventionPOF  rConv  ) const;
+boolAddMissingOOXML( FormulaTokenArray *pNewArr ) 
const;
+voidAddMoreArgsOOXML( FormulaTokenArray *pNewArr ) 
const;
 };
 
-void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const 
MissingConvention  rConv  ) const
+void FormulaMissingContext::AddMoreArgsPOF( FormulaTokenArray *pNewArr, const 
MissingConventionPOF  rConv  ) const
 {
 if ( !mpFunc )
 return;
@@ -1082,6 +1082,76 @@ void FormulaMissingContext::AddMoreArgs( 
FormulaTokenArray *pNewArr, const Missi
 }
 }
 
+void FormulaMissingContext::AddMoreArgsOOXML( FormulaTokenArray *pNewArr ) 
const
+{
+if ( !mpFunc )
+return;
+
+switch (mpFunc-GetOpCode())
+{
+case ocIf:
+if( mnCurArg == 0 )
+{
+// Excel needs at least two parameters in IF function
+pNewArr-AddOpCode( ocSep );
+pNewArr-AddDouble( 1.0 );  // 2nd, true()
+}
+break;
+
+case ocEuroConvert:
+if ( mnCurArg == 2 )
+{
+pNewArr-AddOpCode( ocSep );
+pNewArr-AddDouble( 0.0 );  // 4th, FullPrecision = false()
+}
+break;
+
+case ocPoissonDist:
+if (mnCurArg == 1)
+{
+pNewArr-AddOpCode( ocSep );
+pNewArr-AddDouble( 1.0 );  // 3rd, Cumulative=true()
+}
+break;
+
+case ocGammaDist:
+case ocNormDist:
+if (mnCurArg == 2)
+{
+pNewArr-AddOpCode( ocSep );
+pNewArr-AddDouble( 1.0 );  // 4th, Cumulative=true()
+}
+break;
+
+case ocLogNormDist:
+if ( mnCurArg == 0 )
+{
+pNewArr-AddOpCode(

Re: LibreOffice extensions to ODF: Improving documentation

2014-11-27 Thread Terrence Enger

On Thu, 2014-11-27 at 09:07 -0500, Robinson Tryon wrote:
 On Wed, Nov 26, 2014 at 11:06 AM, Michael Stahl mst...@redhat.com wrote:
  and if you select to store your files in a specific,
  non-extended version in Tools-Options you don't (or at least shouldn't)
  get any extensions...
 
 I totally agree :-)  My reasoning was that once ODF 1.3 comes out, ODF
 1.2 Extended might still be a user-selectable option. But perhaps that
 won't be the case?

Is there a cost to keeping 1.2 Extended?  I can imagine it might be
useful for people sharing documents with users of an older, pre-1.3,
LibreOffice.

Terry.


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

[Libreoffice-commits] core.git: 4 commits - vcl/inc vcl/Library_vcl.mk vcl/opengl vcl/source

2014-11-27 Thread Markus Mohrhard

 vcl/Library_vcl.mk   |2 
 vcl/inc/opengl/win/WinDeviceInfo.hxx |  186 +
 vcl/opengl/win/WinDeviceInfo.cxx | 1099 +++
 vcl/source/opengl/OpenGLHelper.cxx   |5 
 4 files changed, 1292 insertions(+)

New commits:
commit 51171a71169599043bb8cf7255030acf81178b4b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Nov 27 21:15:47 2014 +0100

fix few problems

Change-Id: I4216ec60c7cf07bd92a157f4a86e2560cdbdca93

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 86614e8..0a11426 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -343,6 +343,7 @@ bool ParseDriverVersion(const OUString aVersion, uint64_t 
*aNumericVersion)
 
 templatetypename T void appendIntegerWithPadding(OUString rString, T value, 
sal_uInt32 nChars)
 {
+rString += 0x;
 OUString aValue = OUString::number(value, 16);
 sal_Int32 nLength = aValue.getLength();
 sal_uInt32 nPadLength = nChars - nLength;
@@ -572,6 +573,7 @@ WinOpenGLDeviceInfo::WinOpenGLDeviceInfo():
 mbRDP(false)
 {
 GetData();
+FillBlacklist();
 }
 
 WinOpenGLDeviceInfo::~WinOpenGLDeviceInfo()
@@ -616,36 +618,35 @@ bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList()
 }
 }
 
-#if defined(XP_WIN) || defined(ANDROID)
 switch (maDriverInfo[i].meComparisonOp) {
-case DRIVER_LESS_THAN:
+case wgl::DRIVER_LESS_THAN:
 match = driverVersion  maDriverInfo[i].mnDriverVersion;
 break;
-case DRIVER_LESS_THAN_OR_EQUAL:
+case wgl::DRIVER_LESS_THAN_OR_EQUAL:
 match = driverVersion = maDriverInfo[i].mnDriverVersion;
 break;
-case DRIVER_GREATER_THAN:
+case wgl::DRIVER_GREATER_THAN:
 match = driverVersion  maDriverInfo[i].mnDriverVersion;
 break;
-case DRIVER_GREATER_THAN_OR_EQUAL:
+case wgl::DRIVER_GREATER_THAN_OR_EQUAL:
 match = driverVersion = maDriverInfo[i].mnDriverVersion;
 break;
-case DRIVER_EQUAL:
+case wgl::DRIVER_EQUAL:
 match = driverVersion == maDriverInfo[i].mnDriverVersion;
 break;
-case DRIVER_NOT_EQUAL:
+case wgl::DRIVER_NOT_EQUAL:
 match = driverVersion != maDriverInfo[i].mnDriverVersion;
 break;
-case DRIVER_BETWEEN_EXCLUSIVE:
+case wgl::DRIVER_BETWEEN_EXCLUSIVE:
 match = driverVersion  maDriverInfo[i].mnDriverVersion  
driverVersion  maDriverInfo[i].mnDriverVersionMax;
 break;
-case DRIVER_BETWEEN_INCLUSIVE:
+case wgl::DRIVER_BETWEEN_INCLUSIVE:
 match = driverVersion = maDriverInfo[i].mnDriverVersion  
driverVersion = maDriverInfo[i].mnDriverVersionMax;
 break;
-case DRIVER_BETWEEN_INCLUSIVE_START:
+case wgl::DRIVER_BETWEEN_INCLUSIVE_START:
 match = driverVersion = maDriverInfo[i].mnDriverVersion  
driverVersion  maDriverInfo[i].mnDriverVersionMax;
 break;
-case DRIVER_COMPARISON_IGNORED:
+case wgl::DRIVER_COMPARISON_IGNORED:
 // We don't have a comparison op, so we match everything.
 match = true;
 break;
@@ -653,11 +654,6 @@ bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList()
 SAL_WARN(vcl.opengl, Bogus op in GfxDriverInfo);
 break;
 }
-#else
-// We don't care what driver version it was. We only check OS version 
and if
-// the device matches.
-match = true;
-#endif
 
 if (match || maDriverInfo[i].mnDriverVersion == 
wgl::DriverInfo::allDriverVersions) {
 match = true;
commit 5b5d154d0b2de8a3a9d82e0a078cf7e835062d13
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Nov 27 19:12:31 2014 +0100

connect all pieces for OpenGL windows blacklist, part 3

Change-Id: Iaaafe7da8e717f7b127ab5806773a5a5d75b82d5

diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx 
b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 524198b..7e0b80f 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -109,7 +109,7 @@ struct DriverInfo
 static const DeviceFamilyVector* GetDeviceFamily(DeviceFamily id);
 static DeviceFamilyVector* mpDeviceFamilies[DeviceFamilyMax];
 
-OUString maModel, maHardware, maProduct, maManufacturer;
+OUString maSuggestedVersion;
 };
 
 #define GFX_DRIVER_VERSION(a,b,c,d) \
@@ -167,6 +167,7 @@ private:
 
 void GetData();
 void FillBlacklist();
+bool FindBlocklistedDeviceInList();
 
 static OUString* mpDeviceVendors[wgl::DeviceVendorMax];
 static std::vectorwgl::DriverInfo maDriverInfo;
diff --git

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

2014-11-27 Thread Michael Stahl

 configure.ac |   14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 20d1e20d16ac377c160d47b53ff487a75fbd166f
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 21:27:28 2014 +0100

configure: do not default to system libjpeg on Linux

There are multiple different sonames of libjpeg in different distros,
so use a system one only when system libs are requested.

Change-Id: I164433a31ab0fb4723da6843eb1f1132c8447d9e

diff --git a/configure.ac b/configure.ac
index 52cff05..27d6bd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1574,7 +1574,7 @@ AC_ARG_WITH(system-zlib,
 AC_ARG_WITH(system-jpeg,
 AS_HELP_STRING([--with-system-jpeg],
 [Use jpeg already on system.]),,
-[with_system_jpeg=auto])
+[with_system_jpeg=$with_system_libs])
 
 AC_ARG_WITH(system-libgltf,
 AS_HELP_STRING([--with-system-libgltf],
@@ -7330,18 +7330,6 @@ AC_SUBST(SYSTEM_ZLIB)
 dnl ===
 dnl Check for system jpeg
 dnl ===
-AC_MSG_CHECKING([which jpeg to use])
-if test $with_system_jpeg = auto; then
-case $_os in
-WINNT|Darwin|iOS|Android)
-with_system_jpeg=$with_system_libs
-;;
-*)
-with_system_jpeg=yes
-;;
-esac
-fi
-
 if test $with_jpeg_turbo = auto; then
 # TODO use jpeg-turbo on Darwin too
 case $_os in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Michael Stahl

 configure.ac |   14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 2cab36dda4074ddfb20fc959fd7aa56c1b2b9463
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 21:27:28 2014 +0100

configure: do not default to system libjpeg on Linux

There are multiple different sonames of libjpeg in different distros,
so use a system one only when system libs are requested.

Change-Id: I164433a31ab0fb4723da6843eb1f1132c8447d9e
(cherry picked from commit 20d1e20d16ac377c160d47b53ff487a75fbd166f)

diff --git a/configure.ac b/configure.ac
index 627483f..383acfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1580,7 +1580,7 @@ AC_ARG_WITH(system-zlib,
 AC_ARG_WITH(system-jpeg,
 AS_HELP_STRING([--with-system-jpeg],
 [Use jpeg already on system.]),,
-[with_system_jpeg=auto])
+[with_system_jpeg=$with_system_libs])
 
 AC_ARG_WITH(system-libgltf,
 AS_HELP_STRING([--with-system-libgltf],
@@ -7321,18 +7321,6 @@ AC_SUBST(SYSTEM_ZLIB)
 dnl ===
 dnl Check for system jpeg
 dnl ===
-AC_MSG_CHECKING([which jpeg to use])
-if test $with_system_jpeg = auto; then
-case $_os in
-WINNT|Darwin|iOS|Android)
-with_system_jpeg=$with_system_libs
-;;
-*)
-with_system_jpeg=yes
-;;
-esac
-fi
-
 if test $with_jpeg_turbo = auto; then
 # TODO use jpeg-turbo on Darwin too
 case $_os in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: 2 commits - src/lib

2014-11-27 Thread David Tardon

 src/lib/VSDParser.cpp |   19 +--
 src/lib/VSDParser.h   |4 
 2 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 770e649b1b30e2b43e62d00ed06b4ff33f8305e0
Author: David Tardon dtar...@redhat.com
Date:   Thu Nov 27 21:36:48 2014 +0100

avoid infinite recursion when reading a broken file

Change-Id: Icb292ae4b4c286be52ee81e5d08b43efccb1892d

diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 9fe8080..c5c7541 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -26,7 +26,7 @@ libvisio::VSDParser::VSDParser(librevenge::RVNGInputStream 
*input, librevenge::R
 m_currentShapeLevel(0), m_currentShapeID(MINUS_ONE), 
m_extractStencils(false), m_colours(),
 m_isBackgroundPage(false), m_isShapeStarted(false), m_shadowOffsetX(0.0), 
m_shadowOffsetY(0.0),
 m_currentGeometryList(0), m_currentGeomListCount(0), m_fonts(), m_names(), 
m_namesMapMap(),
-m_currentPageName()
+m_currentPageName(), m_handledStreams()
 {}
 
 libvisio::VSDParser::~VSDParser()
@@ -112,6 +112,7 @@ bool libvisio::VSDParser::parseMain()
 
   Pointer trailerPointer;
   readPointer(m_input, trailerPointer);
+  m_handledStreams.insert(trailerPointer.Offset);
   bool compressed = ((trailerPointer.Format  2) == 2);
   unsigned shift = 0;
   if (compressed)
@@ -131,6 +132,8 @@ bool libvisio::VSDParser::parseMain()
 return false;
 
   _handleLevelChange(0);
+  m_handledStreams.clear();
+  m_handledStreams.insert(trailerPointer.Offset);
 
   VSDStyles styles = stylesCollector.getStyleSheets();
 
@@ -204,6 +207,15 @@ void 
libvisio::VSDParser::handleStreams(librevenge::RVNGInputStream *input, unsi
   if (ptr.Type == 0)
 continue;
 
+  std::setunsigned::iterator it = m_handledStreams.find(ptr.Offset);
+  if (it != m_handledStreams.end())
+  {
+VSD_DEBUG_MSG((Stream at offset %d has already been handled. 
Skipping...\n, ptr.Offset));
+continue;
+  }
+
+  m_handledStreams.insert(it, ptr.Offset);
+
   if (ptr.Type == VSD_FONTFACES)
 FontFaces[i] = ptr;
   else if (ptr.Type == VSD_NAME_LIST2)
diff --git a/src/lib/VSDParser.h b/src/lib/VSDParser.h
index 5864b49..8df2cac 100644
--- a/src/lib/VSDParser.h
+++ b/src/lib/VSDParser.h
@@ -12,6 +12,7 @@
 
 #include stdio.h
 #include iostream
+#include set
 #include vector
 #include stack
 #include map
@@ -164,6 +165,9 @@ protected:
   std::mapunsigned, std::mapunsigned, VSDName  m_namesMapMap;
   VSDName m_currentPageName;
 
+  // Sanity check, to avoid problems with broken files.
+  std::setunsigned m_handledStreams;
+
 private:
   VSDParser();
   VSDParser(const VSDParser );
commit f5cc89fd3303fa60764e13addb3bee84adf7bbb5
Author: David Tardon dtar...@redhat.com
Date:   Thu Nov 27 21:16:10 2014 +0100

move the check a bit up, in preparation for next commit

Change-Id: I9d7f98fecf96f162e2def0cd1af6931886fcb740

diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index a30ba2a..9fe8080 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -201,13 +201,16 @@ void 
libvisio::VSDParser::handleStreams(librevenge::RVNGInputStream *input, unsi
 {
   Pointer ptr;
   readPointer(input, ptr);
+  if (ptr.Type == 0)
+continue;
+
   if (ptr.Type == VSD_FONTFACES)
 FontFaces[i] = ptr;
   else if (ptr.Type == VSD_NAME_LIST2)
 NameList[i] = ptr;
   else if (ptr.Type == VSD_NAMEIDX || ptr.Type == VSD_NAMEIDX123)
 NameIDX[i] = ptr;
-  else if (ptr.Type != 0)
+  else if (ptr.Type)
 PtrList[i] = ptr;
 }
 if (listSize = 1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Michael Stahl

 extras/source/glade/libreoffice-catalog.xml.in |2 +-
 svx/uiconfig/ui/xformspage.ui  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8505c7970ac05a3fda13789f1b2c50d6d979294e
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 21:58:15 2014 +0100

fdo#86557: svx: fix crash when creating new XML Form Document

Strangely it doesn't crash on Linux.

(regression from 713735fc89b9e0222d8b62d051153da6932b3ebd)

Change-Id: Ie29c795f5edec7d8fdf949027359c0c509edb15c

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 2d1bb24..fff2991 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -776,7 +776,7 @@
 glade-widget-class title=Statusbar name=svxlo-StatusBar
 generic-name=Statusbar parent=GtkStatusbar
 icon-name=widget-gtk-statusbar/
-glade-widget-class title=DataTreeListBox name=svxlo-DataTreeListBox
+glade-widget-class title=DataTreeListBox 
name=svxcorelo-DataTreeListBox
 generic-name=DataTreeListBox parent=GtkTreeView
 icon-name=widget-gtk-treeview/
 
diff --git a/svx/uiconfig/ui/xformspage.ui b/svx/uiconfig/ui/xformspage.ui
index b5ad229..ad51aea 100644
--- a/svx/uiconfig/ui/xformspage.ui
+++ b/svx/uiconfig/ui/xformspage.ui
@@ -94,7 +94,7 @@
   /packing
 /child
 child
-  object class=svxlo-DataTreeListBox id=items:border
+  object class=svxcorelo-DataTreeListBox id=items:border
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=hexpandTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - extras/source svx/uiconfig

2014-11-27 Thread Michael Stahl

 extras/source/glade/libreoffice-catalog.xml.in |2 +-
 svx/uiconfig/ui/xformspage.ui  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 533c0c3d9ccbdb3c5a8725b43b84a3dd8d65f1cb
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 21:58:15 2014 +0100

fdo#86557: svx: fix crash when creating new XML Form Document

Strangely it doesn't crash on Linux.

(regression from 713735fc89b9e0222d8b62d051153da6932b3ebd)

Change-Id: Ie29c795f5edec7d8fdf949027359c0c509edb15c
(cherry picked from commit 8505c7970ac05a3fda13789f1b2c50d6d979294e)

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 2d1bb24..fff2991 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -776,7 +776,7 @@
 glade-widget-class title=Statusbar name=svxlo-StatusBar
 generic-name=Statusbar parent=GtkStatusbar
 icon-name=widget-gtk-statusbar/
-glade-widget-class title=DataTreeListBox name=svxlo-DataTreeListBox
+glade-widget-class title=DataTreeListBox 
name=svxcorelo-DataTreeListBox
 generic-name=DataTreeListBox parent=GtkTreeView
 icon-name=widget-gtk-treeview/
 
diff --git a/svx/uiconfig/ui/xformspage.ui b/svx/uiconfig/ui/xformspage.ui
index b5ad229..ad51aea 100644
--- a/svx/uiconfig/ui/xformspage.ui
+++ b/svx/uiconfig/ui/xformspage.ui
@@ -94,7 +94,7 @@
   /packing
 /child
 child
-  object class=svxlo-DataTreeListBox id=items:border
+  object class=svxcorelo-DataTreeListBox id=items:border
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=hexpandTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Julien Nabet

 svx/source/dialog/_bmpmask.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dcbf3ce47400e6f3f0af8900efb96a2718c2a185
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Nov 27 22:47:25 2014 +0100

svx/_bmpmask sal_Bool - bool

Change-Id: I1e1a0ea67f2c8656bd98d478a10183312eb76950

diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index c720a73..5570bc8 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -760,7 +760,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile rMtf )
 Color   pDstCols[4];
 sal_uIntPtr pTols[4];
 sal_uInt16  nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
-sal_BoolpTrans[4];
+boolpTrans[4];
 
 // If no color is selected, we copy only the Mtf
 if( !nCount )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Andras Timar

 filter/source/msfilter/msdffimp.cxx  |   17 -
 include/filter/msfilter/msdffimp.hxx |2 --
 sc/source/filter/excel/xiescher.cxx  |5 -
 sc/source/filter/inc/xiescher.hxx|2 --
 4 files changed, 4 insertions(+), 22 deletions(-)

New commits:
commit 5b940edaf66ab8371192ef67ef9171c0d40f7e18
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Nov 27 23:04:25 2014 +0100

unused function Calc_nBLIPPos

Change-Id: Iaa4073e2f1c0ccea7a5d63d24e34ac5647a0e7b0

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index d1ca581..22eda40 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5863,10 +5863,6 @@ void SvxMSDffManager::GetDrawingGroupContainerData( 
SvStream rSt, sal_uLong nLe
 if( (!nBLIPPos)  (nBLIPLen  nLenFBSE) )
 nBLIPPos = rSt.Tell() + 4;
 
-// That worked great!
-// We store, that we do have one FBSE more in the pointer 
array.
-nBLIPPos = Calc_nBLIPPos(nBLIPPos, rSt.Tell());
-
 if( USHRT_MAX == nBLIPCount )
 nBLIPCount = 1;
 else
@@ -6485,11 +6481,6 @@ void SvxMSDffManager::ProcessClientAnchor2( SvStream /* 
rSt */, DffRecordHeader
 return;  // will be overloaded by SJ in Draw
 }
 
-sal_uLong SvxMSDffManager::Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong /* 
nStreamPos */ ) const
-{
-return nOrgVal;
-}
-
 bool SvxMSDffManager::GetOLEStorageName( long /* nOLEId */, OUString, 
SvStorageRef, uno::Reference  embed::XStorage  ) const
 {
 return false;
diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index 4523462..f129ec8 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -504,8 +504,6 @@ protected :
void* pData,
Rectangle rTextRect,
SdrObject* pObj = NULL);
-virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal,
- sal_uLong nStreamPos ) const;
 virtual bool GetColorFromPalette(sal_uInt16 nNum, Color rColor) const;
 
 // Fontwork objects use a new implementation of ReadObjText because the old
diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index bc25d5a..3da59ae 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3534,11 +3534,6 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream 
rDffStrm, DffObjData rDffO
 return xSdrObj.release();
 }
 
-sal_uLong XclImpDffConverter::Calc_nBLIPPos( sal_uLong /*nOrgVal*/, sal_uLong 
nStreamPos ) const
-{
-return nStreamPos + 4;
-}
-
 bool XclImpDffConverter::InsertControl( const Reference XFormComponent  
rxFormComp,
 const ::com::sun::star::awt::Size /*rSize*/, Reference XShape * 
pxShape,
 bool /*bFloatingCtrl*/ )
diff --git a/sc/source/filter/inc/xiescher.hxx 
b/sc/source/filter/inc/xiescher.hxx
index 0a936ef..dc2be34 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -977,8 +977,6 @@ private:
 void* pClientData,
 Rectangle rTextRect,
 SdrObject* pOldSdrObj = 0 ) SAL_OVERRIDE;
-/** Returns the BLIP stream position, based on the passed DFF stream 
position. */
-virtual sal_uLong   Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong 
nStreamPos ) const SAL_OVERRIDE;
 
 // virtual functions of SvxMSConvertOCXControls
 
commit 6945971c79d70d77c5c8bb6593b3f25ef46b0887
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Nov 27 20:56:32 2014 +0100

fdo#84686 prevent std::bad_alloc exception by stricter input check

The bugdoc has invalid length (rh.recLen) in header of blipStore's
OfficeArtFBSE record. Therefore LibreOffice read junk for the next
BLIP, and tried to seek to an invalid stream position, which caused
bad allocation exception on 32-bit systems.

Change-Id: I72fae4c2b00216b57736f4409a32c62a40f25785

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 0defb0a..d1ca581 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5798,8 +5798,7 @@ void SvxMSDffManager::GetCtrlData( sal_uInt32 nOffsDgg_ )
 }
 
 
-// from here on: Drawing Group Container  i.e. Ddocument-wide valid data
-//  ===   
+// from here on: Drawing Group Container  i.e. document-wide valid data
 
 void SvxMSDffManager::GetDrawingGroupContainerData( SvStream rSt, sal_uLong 
nLenDgg )
 {
@@ -5839,7 +5838,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( 
SvStream rSt, sal_uLong nLe
 {
 if(!ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return;

Crash test update

2014-11-27 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/13c619c58c8ffa7862b491547c252fdcad1e9d9d/


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: Branch 'libreoffice-4-4' - filter/source

2014-11-27 Thread Andras Timar

 filter/source/msfilter/msdffimp.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 544ad733b8a97b62a68c7d0f60f13c8f699407dd
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Nov 27 20:56:32 2014 +0100

fdo#84686 prevent std::bad_alloc exception by stricter input check

The bugdoc has invalid length (rh.recLen) in header of blipStore's
OfficeArtFBSE record. Therefore LibreOffice read junk for the next
BLIP, and tried to seek to an invalid stream position, which caused
bad allocation exception on 32-bit systems.

Change-Id: I72fae4c2b00216b57736f4409a32c62a40f25785
(cherry picked from commit 6945971c79d70d77c5c8bb6593b3f25ef46b0887)

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 466faf6..be3c003 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5798,8 +5798,7 @@ void SvxMSDffManager::GetCtrlData( sal_uInt32 nOffsDgg_ )
 }
 
 
-// from here on: Drawing Group Container  i.e. Ddocument-wide valid data
-//  ===   
+// from here on: Drawing Group Container  i.e. document-wide valid data
 
 void SvxMSDffManager::GetDrawingGroupContainerData( SvStream rSt, sal_uLong 
nLenDgg )
 {
@@ -5839,7 +5838,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( 
SvStream rSt, sal_uLong nLe
 {
 if(!ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return;
 nRead += DFF_COMMON_RECORD_HEADER_SIZE + nLength;
-if( DFF_msofbtBSE == nFbt )
+if( DFF_msofbtBSE == nFbt  /* magic value from spec */ 0x2 == nVer )
 {
 nLenFBSE = nLength;
 // is FBSE big enough for our data
@@ -5876,8 +5875,9 @@ void SvxMSDffManager::GetDrawingGroupContainerData( 
SvStream rSt, sal_uLong nLe
 // now save the info for later access
 pBLIPInfos-push_back( new SvxMSDffBLIPInfo( nInst, nBLIPPos, 
nBLIPLen ) );
 }
+rSt.SeekRel( nLength );
 }
-rSt.SeekRel( nLength );
+else return; // invalid input
 }
 while( nRead  nLenBStoreCont );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-11-27 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 79303, which changed state.

Bug 79303 Summary: Page Numbering restarts when paragraph width is adjusted
https://bugs.freedesktop.org/show_bug.cgi?id=79303

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
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: 3 commits - cui/source svl/source sw/source

2014-11-27 Thread Michael Stahl

 cui/source/tabpages/paragrph.cxx  |2 +-
 svl/source/items/itempool.cxx |2 +-
 svl/source/items/poolio.cxx   |2 +-
 sw/source/uibase/utlui/uitool.cxx |5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit c865da007a8d781801ef73612be27f129dd0989b
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 23:41:20 2014 +0100

svl: deploy some asserts in SfxItemPool, those are bugs

Change-Id: Ifa28f3b02640720855a6e40ddd7a5f752904e8bd

diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 8550543..2cfcb31 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -878,7 +878,7 @@ const SfxPoolItem SfxItemPool::GetDefaultItem( sal_uInt16 
nWhich ) const
 {
 if ( pImp-mpSecondary )
 return pImp-mpSecondary-GetDefaultItem( nWhich );
-SFX_ASSERT( false, nWhich, unknown which - dont ask me for defaults 
);
+assert(!unknown which - dont ask me for defaults);
 }
 
 DBG_ASSERT( pImp-ppStaticDefaults, no defaults known - dont ask me for 
defaults );
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index cf71978..4a026cf 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -695,7 +695,7 @@ SvStream SfxItemPool::Load(SvStream rStream)
 
 sal_uInt16 SfxItemPool::GetIndex_Impl(sal_uInt16 nWhich) const
 {
-DBG_ASSERT(nWhich = pImp-mnStart  nWhich = pImp-mnEnd, WhichId not 
within the Pool range);
+assert(nWhich = pImp-mnStart  nWhich = pImp-mnEnd);
 return nWhich - pImp-mnStart;
 }
 
commit 9c1a1b98776ca2216d82af303394a09f2bac0471
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 23:38:38 2014 +0100

fdo#70861: cui: fix crash in SvxExtParagraphTabPage

SvxExtParagraphTabPage::Reset() must not request a pool default for
SID_ATTR_PARA_PAGENUM because it simply does not exist; the item is
backed by a member of SwPageDesc in Writer.

Change-Id: I9b157f048cd986566f9b01f3677b53d5974b6c8d

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index f5b2148..09a3894 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1552,7 +1552,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* 
rSet )
 
 _nWhich = GetWhich( SID_ATTR_PARA_PAGENUM );
 
-if ( rSet-GetItemState(_nWhich) = SfxItemState::DEFAULT )
+if (rSet-GetItemState(_nWhich) = SfxItemState::SET)
 {
 const sal_uInt16 nPageNum =
 static_castconst SfxUInt16Item(rSet-Get( _nWhich ) 
).GetValue();
commit a69ef2d84c3562da5e3bfda34e643c5044b4584a
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 22:30:15 2014 +0100

fdo#79303: Revert fdo#70861 SwToSfxPageDescAttr: fix call to ...

... SvxExtParagraphTabPage

This reverts commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4.

It is now simply wrong to claim that a SID_ATTR_PARA_PAGENUM item with
value 0 is set, when that is a valid offset value.

SwTxtShell::Execute() will call SfxToSwPageDescAttr() which pulls the
SID_ATTR_PARA_PAGENUM out of the item set and sets it.

Change-Id: If5a155c2874486b3ef7d01883fe73f8e5fca46fe

diff --git a/sw/source/uibase/utlui/uitool.cxx 
b/sw/source/uibase/utlui/uitool.cxx
index 6eedf32..2b8c718 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -650,10 +650,9 @@ void SwToSfxPageDescAttr( SfxItemSet rCoreSet )
 bPut = false;
 }
 
-// TODO for now always pass a page number to cui, it can't make a
-// difference between 0 and no page number at the moment.
+if (oNumOffset)
 {
-SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset ? 
oNumOffset.get() : 0 );
+SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset.get() );
 rCoreSet.Put( aPageNum );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - cui/source sw/source

2014-11-27 Thread Michael Stahl

 cui/source/tabpages/paragrph.cxx  |2 +-
 sw/source/uibase/utlui/uitool.cxx |5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f89fa7ab44b05decebc9280696948f7df77414c5
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 23:38:38 2014 +0100

fdo#70861: cui: fix crash in SvxExtParagraphTabPage

SvxExtParagraphTabPage::Reset() must not request a pool default for
SID_ATTR_PARA_PAGENUM because it simply does not exist; the item is
backed by a member of SwPageDesc in Writer.

Change-Id: I9b157f048cd986566f9b01f3677b53d5974b6c8d
(cherry picked from commit 9c1a1b98776ca2216d82af303394a09f2bac0471)

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index f5b2148..09a3894 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1552,7 +1552,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* 
rSet )
 
 _nWhich = GetWhich( SID_ATTR_PARA_PAGENUM );
 
-if ( rSet-GetItemState(_nWhich) = SfxItemState::DEFAULT )
+if (rSet-GetItemState(_nWhich) = SfxItemState::SET)
 {
 const sal_uInt16 nPageNum =
 static_castconst SfxUInt16Item(rSet-Get( _nWhich ) 
).GetValue();
commit c083c5a3b358f7d2ec4807ced5e96530d461fe7d
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 22:30:15 2014 +0100

fdo#79303: Revert fdo#70861 SwToSfxPageDescAttr: fix call to ...

... SvxExtParagraphTabPage

This reverts commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4.

It is now simply wrong to claim that a SID_ATTR_PARA_PAGENUM item with
value 0 is set, when that is a valid offset value.

SwTxtShell::Execute() will call SfxToSwPageDescAttr() which pulls the
SID_ATTR_PARA_PAGENUM out of the item set and sets it.

Change-Id: If5a155c2874486b3ef7d01883fe73f8e5fca46fe
(cherry picked from commit a69ef2d84c3562da5e3bfda34e643c5044b4584a)

diff --git a/sw/source/uibase/utlui/uitool.cxx 
b/sw/source/uibase/utlui/uitool.cxx
index b354bb2..07e8a77 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -650,10 +650,9 @@ void SwToSfxPageDescAttr( SfxItemSet rCoreSet )
 bPut = false;
 }
 
-// TODO for now always pass a page number to cui, it can't make a
-// difference between 0 and no page number at the moment.
+if (oNumOffset)
 {
-SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset ? 
oNumOffset.get() : 0 );
+SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset.get() );
 rCoreSet.Put( aPageNum );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Two unit-tests fail by segmentation fault when using clang

2014-11-27 Thread Jean-Baptiste Faure

Hi,

Le 26/11/2014 13:33, Michael Stahl a écrit :
 On 24.11.2014 06:20, Jean-Baptiste Faure wrote:
 Hi,

 I try to build LibreOffice 4.4 and master on Ubuntu 14.10 x86-64 using
 clang (version 3.5.0) instead of gcc (version 4.9).
 I get two unit-test fails by segmentation fault:
 CppunitTest_basic_enable
 CppunitTest_basic_nested_struct

 It worked with gcc, so I guess the errors are related to the use of
 clang. Is there something I can do from my side?
 
 please (turn on --enable-debug or --enable-dbgutil if you haven't
 already and) run the tests in a debugger with:
 
 CPPUNITTRACE=gdb --args  make CppunitTest_basic_enable
 
 and when it crashes use bt to get a backtrace and post it here.

I first did a complete rebuild with --enable-debug turned on and all
went fine, no crash.
Then I did a complete rebuild with --enable-debug turned off and it
failed CppunitTest_basic_enable with segmentation fault.
So I turned on --enable-debug again, set export CPPUNITTRACE=gdb
--args and did only make CppunitTest_basic_enable

The gdb session gave that:

Reading symbols from
[...]/LibO/master/workdir/LinkTarget/Executable/cppunittester...(no
debugging symbols found)...done.
(gdb) run
Starting program:
[...]/LibO/master/workdir/LinkTarget/Executable/cppunittester
[...]/LibO/master/workdir/LinkTarget/CppunitTest/libtest_basic_enable.so
--headless -env:BRAND_BASE_DIR=file://[...]/LibO/master/instdir
-env:BRAND_SHARE_SUBDIR=share
-env:UserInstallation=file://[...]/LibO/master/workdir/CppunitTest/basic_enable.test.user
-env:CONFIGURATION_LAYERS=xcsxcu:file://[...]/LibO/master/instdir/share/registry
-env:UNO_TYPES=file://[...]/LibO/master/instdir/program/types/offapi.rdb\ 
file://[...]/LibO/master/instdir/ure/share/misc/types.rdb
-env:UNO_SERVICES=file://[...]/LibO/master/workdir/Rdb/ure/services.rdb\
file://[...]/LibO/master/workdir/ComponentTarget/configmgr/source/configmgr.component\
file://[...]/LibO/master/workdir/ComponentTarget/i18npool/util/i18npool.component
-env:URE_INTERNAL_LIB_DIR=file://[...]/LibO/master/instdir/ure/lib
-env:LO_LIB_DIR=file://[...]/LibO/master/instdir/program
-env:LO_JAVA_DIR=file://[...]/LibO/master/instdir/program/classes
--protector
[...]/LibO/master/workdir/LinkTarget/Library/unoexceptionprotector.so
unoexceptionprotector --protector
[...]/LibO/master/workdir/LinkTarget/Library/unobootstrapprotector.so
unobootstrapprotector --protector
[...]/LibO/master/workdir/LinkTarget/Library/libvclbootstrapprotector.so
vclbootstrapprotector
[Thread debugging using libthread_db enabled]
Using host libthread_db library /lib/x86_64-linux-gnu/libthread_db.so.1.
[New Thread 0x2c5e2700 (LWP 15364)]

Program received signal SIGSEGV, Segmentation fault.
0x2aaabbf34464 in SbClassFactory::RemoveClassModule(SbModule*) ()
   from [...]/LibO/master/instdir/program/libsblo.so
(gdb) bt
#0  0x2aaabbf34464 in SbClassFactory::RemoveClassModule(SbModule*) ()
   from [...]/LibO/master/instdir/program/libsblo.so
#1  0x2aaabbf6d8d0 in SbiCodeGen::Save() () from
[...]/LibO/master/instdir/program/libsblo.so
#2  0x2aaabbf797fe in SbModule::Compile() () from
[...]/LibO/master/instdir/program/libsblo.so
#3  0x2aaabbca69ae in MacroSnippet::Compile() ()
   from
[...]/LibO/master/workdir/LinkTarget/CppunitTest/libtest_basic_enable.so
#4  0x2aaabbca5d87 in (anonymous
namespace)::EnableTest::testEnableRuntime() ()
   from
[...]/LibO/master/workdir/LinkTarget/CppunitTest/libtest_basic_enable.so
#5  0x2ad2876e in CppUnit::TestCaseMethodFunctor::operator()()
const ()
   from
[...]/LibO/master/workdir/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit-1.13.so.0
#6  0x2ad251a8 in
CppUnit::ProtectorChain::ProtectFunctor::operator()() const ()
   from
[...]/LibO/master/workdir/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit-1.13.so.0
#7  0x2ad251a8 in
CppUnit::ProtectorChain::ProtectFunctor::operator()() const ()
   from
[...]/LibO/master/workdir/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit-1.13.so.0
#8  0x2cb6d6a3 in (anonymous
namespace)::Prot::protect(CppUnit::Functor const,
CppUnit::ProtectorContext const) () from
[...]/LibO/master/workdir/LinkTarget/Library/unoexceptionprotector.so
#9  0x2ad251a8 in
CppUnit::ProtectorChain::ProtectFunctor::operator()() const ()
   from
[...]/LibO/master/workdir/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit-1.13.so.0
#10 0x2ad17620 in
CppUnit::DefaultProtector::protect(CppUnit::Functor const,
CppUnit::ProtectorContext const)
() from
[...]/LibO/master/workdir/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit-1.13.so.0
#11 0x2ad251a8 in
CppUnit::ProtectorChain::ProtectFunctor::operator()() const ()
   from
[...]/LibO/master/workdir/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit-1.13.so.0
#12 0x2ad2265e in
CppUnit::ProtectorChain::protect(CppUnit::Functor const,
CppUnit::ProtectorContext const)
---Type return to continue, or q return to quit---
() from

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

2014-11-27 Thread Eike Rathke

 formula/source/core/api/FormulaCompiler.cxx |   17 
 formula/source/core/api/token.cxx   |  493 +---
 include/formula/tokenarray.hxx  |   48 ++
 3 files changed, 290 insertions(+), 268 deletions(-)

New commits:
commit 8f031861f590ba914321816657a003375d93ef5d
Author: Eike Rathke er...@redhat.com
Date:   Fri Nov 28 02:03:06 2014 +0100

write TRUE() for 2nd IF() parameter, fdo#81596 related

Change-Id: I52d0b43b19e10bee82109b635b3b7ce4f43650a3

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index a8e9e43..a414a4b 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1149,7 +1149,9 @@ void FormulaMissingContext::AddMoreArgs( 
FormulaTokenArray *pNewArr, const Missi
 {
 // Excel needs at least two parameters in IF 
function
 pNewArr-AddOpCode( ocSep );
-pNewArr-AddDouble( 1.0 );  // 2nd, true()
+pNewArr-AddOpCode( ocTrue );   // 2nd, true() as 
function
+pNewArr-AddOpCode( ocOpen );   // so the result 
is of logical type
+pNewArr-AddOpCode( ocClose );  // and survives 
roundtrip
 }
 break;
 
commit 14aabee5a73e57e26b2062b1ebf00c3f1dff1250
Author: Eike Rathke er...@redhat.com
Date:   Fri Nov 28 01:39:24 2014 +0100

simplify RewriteMissing() and switch in Add...(), fdo#81596 related

Change-Id: If2ca37e1fda87ce56282fc2d2fc57a0784851139

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index cfdae59..0e56d0e 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1737,19 +1737,19 @@ void FormulaCompiler::CreateStringFromTokenArray( 
OUStringBuffer rBuffer )
 
 FormulaTokenArray* pSaveArr = pArr;
 bool bODFF = FormulaGrammar::isODFF( meGrammar);
-MissingConventionPOF aConv( bODFF);
 if (bODFF || FormulaGrammar::isPODF( meGrammar) )
 {
 // Scan token array for missing args and re-write if present.
-if (pArr-NeedsPofRewrite( aConv))
-pArr = pArr-RewriteMissing( false, aConv );
+MissingConventionODF aConv( bODFF);
+if (pArr-NeedsPodfRewrite( aConv))
+pArr = pArr-RewriteMissing( aConv );
 }
 else if ( FormulaGrammar::isOOXML( meGrammar ) )
 {
-// fdo#81596
 // Scan token array for missing args and rewrite if present.
-if ( pArr-NeedsOOXMLRewrite() )
-pArr = pArr-RewriteMissing( true, aConv );
+MissingConventionOOXML aConv;
+if (pArr-NeedsOoxmlRewrite( aConv))
+pArr = pArr-RewriteMissing( aConv );
 }
 
 // At least one character per token, plus some are references, some are
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 5e43ea0..a8e9e43 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -995,9 +995,9 @@ bool FormulaTokenArray::HasMatrixDoubleRefOps()
 return false;
 }
 
-// --- POF (plain old formula) rewrite of a token array -
+// --- Formula rewrite of a token array
 
-inline bool MissingConventionPOF::isRewriteNeeded( OpCode eOp ) const
+inline bool MissingConventionODF::isRewriteNeeded( OpCode eOp ) const
 {
 switch (eOp)
 {
@@ -1009,7 +1009,62 @@ inline bool MissingConventionPOF::isRewriteNeeded( 
OpCode eOp ) const
 return true;
 case ocMissing:
 case ocLog:
-return !isODFF();   // rewrite only for PODF
+return isPODF();// rewrite only for PODF
+default:
+return false;
+}
+}
+
+/*
+ * fdo 81596
+Test status ( . : in progress , v : tested , - not applicable )
+finished:
+- ocCosecant:  // for OOXML not rewritten anymore
+- ocSecant:// for OOXML not rewritten anymore
+- ocCot:   // for OOXML not rewritten anymore
+- ocCosecantHyp:   // for OOXML not rewritten anymore
+- ocSecantHyp: // for OOXML not rewritten anymore
+- ocCotHyp:// for OOXML not rewritten anymore
+- ocArcCot:// for OOXML not rewritten anymore
+- ocArcCotHyp: // ACOTH(x), not needed for Excel2013 and later
+- ocChose: // CHOOSE() - no rewrite needed, it seems
+v ocEuroConvert:
+v ocIf:
+v ocRound:
+v ocRoundUp:
+v ocRoundDown:
+v ocGammaDist:
+v ocPoissonDist:
+v ocNormDist:
+v ocLogNormDist:
+
+To be implemented yet:
+  ocExternal:?
+  ocMacro:   ?
+  ocIndex:   INDEX() ?
+  ocFDist: // later, fdo40835
+*/
+inline bool MissingConventionOOXML::isRewriteNeeded( OpCode eOp ) const
+{
+switch (eOp)
+{
+case ocIf:
+
+case ocExternal:
+case ocEuroConvert:
+case ocMacro:

ODF extension elements

2014-11-27 Thread Markus Mohrhard

Hey,

so I was just looking through some of out calc issues and found a
surprising validation error. According to odfvalidator the following
snippet is invalid.

number:number-style style:name=N125P1 style:volatile=true
  loext:text-/loext:text
  loext:fill-character /loext:fill-character
  number:number number:decimal-places=2
number:min-integer-digits=1 number:grouping=true/
  number:text SIT /number:text
/number:number-style


It took me some time to understand why it complains but at least to my
understanding that snippet is valid. odfvalidator seems to strip the loext
entries and leaves the - resulting in the following xml snippet:

number:number-style style:name=N125P1 style:volatile=true
  -number:number number:decimal-places=2
number:min-integer-digits=1 number:grouping=true/
  number:text SIT /number:text
/number:number-style

which is of course an invalid xml file.

Now looking at the ODF 1.2 spec about handling of foreign elements we find
the following paragraph:











*If a foreign element has a text:h or text:p ancestor element, and is a
child element of anelement for which the OpenDocument schema permits the
inclusion of character data, and if theOpenDocument schema permits the
inclusion of character data for all its ancestors up to thetext:p or
text:h element ancestor element, then the element's content may
beinterpreted by conforming OpenDocument consumers, and the document itself
shall be validagainst the OpenDocument schema as if the foreign element's
start- and end-tags or its empty-element-tag are removed.For a foreign
element that occurs at another location, conforming consumers should not
interpretthe element's content, but may preserve its content.*
My interpretation of that paragraph that it is valid to include character
data in foreign elements and that they should be stripped similar to the
xml element. Is my reading of the spec wrong?

Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-11-27 Thread Yousuf Philips

 icon-themes/galaxy/svx/res/fr01.png  |binary
 icon-themes/galaxy/svx/res/fr010.png |binary
 icon-themes/galaxy/svx/res/fr011.png |binary
 icon-themes/galaxy/svx/res/fr012.png |binary
 icon-themes/galaxy/svx/res/fr02.png  |binary
 icon-themes/galaxy/svx/res/fr03.png  |binary
 icon-themes/galaxy/svx/res/fr04.png  |binary
 icon-themes/galaxy/svx/res/fr05.png  |binary
 icon-themes/galaxy/svx/res/fr06.png  |binary
 icon-themes/galaxy/svx/res/fr07.png  |binary
 icon-themes/galaxy/svx/res/fr08.png  |binary
 icon-themes/galaxy/svx/res/fr09.png  |binary
 icon-themes/galaxy/svx/res/pr01.png  |binary
 icon-themes/galaxy/svx/res/pr017.png |binary
 icon-themes/galaxy/svx/res/pr018.png |binary
 icon-themes/galaxy/svx/res/pr019.png |binary
 icon-themes/galaxy/svx/res/pr02.png  |binary
 icon-themes/galaxy/svx/res/pr020.png |binary
 icon-themes/galaxy/svx/res/pr021.png |binary
 icon-themes/galaxy/svx/res/pr03.png  |binary
 icon-themes/galaxy/svx/res/pr04.png  |binary
 icon-themes/galaxy/svx/res/pr06.png  |binary
 icon-themes/galaxy/svx/res/sh01.png  |binary
 icon-themes/galaxy/svx/res/sh02.png  |binary
 icon-themes/galaxy/svx/res/sh03.png  |binary
 icon-themes/galaxy/svx/res/sh04.png  |binary
 icon-themes/galaxy/svx/res/sh05.png  |binary
 27 files changed

New commits:
commit d3fa6eae3efe1a0bdbeea597fce7df0db30e633e
Author: Yousuf Philips philip...@hotmail.com
Date:   Thu Nov 27 02:12:01 2014 +0400

fdo#86472 added white backgrounds to images so they appear fine in dark 
themes

Change-Id: Iaae21bc2205b62520b3dbe6564099e24d87beaf6
Reviewed-on: https://gerrit.libreoffice.org/13140
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git a/icon-themes/galaxy/svx/res/fr01.png 
b/icon-themes/galaxy/svx/res/fr01.png
index e1e8192..863a58b 100644
Binary files a/icon-themes/galaxy/svx/res/fr01.png and 
b/icon-themes/galaxy/svx/res/fr01.png differ
diff --git a/icon-themes/galaxy/svx/res/fr010.png 
b/icon-themes/galaxy/svx/res/fr010.png
index dd79016..c79b685 100644
Binary files a/icon-themes/galaxy/svx/res/fr010.png and 
b/icon-themes/galaxy/svx/res/fr010.png differ
diff --git a/icon-themes/galaxy/svx/res/fr011.png 
b/icon-themes/galaxy/svx/res/fr011.png
index f3bbd62..a188a2c 100644
Binary files a/icon-themes/galaxy/svx/res/fr011.png and 
b/icon-themes/galaxy/svx/res/fr011.png differ
diff --git a/icon-themes/galaxy/svx/res/fr012.png 
b/icon-themes/galaxy/svx/res/fr012.png
index 446fea2..f8190d36 100644
Binary files a/icon-themes/galaxy/svx/res/fr012.png and 
b/icon-themes/galaxy/svx/res/fr012.png differ
diff --git a/icon-themes/galaxy/svx/res/fr02.png 
b/icon-themes/galaxy/svx/res/fr02.png
index e54ddd0..f72e7fa 100644
Binary files a/icon-themes/galaxy/svx/res/fr02.png and 
b/icon-themes/galaxy/svx/res/fr02.png differ
diff --git a/icon-themes/galaxy/svx/res/fr03.png 
b/icon-themes/galaxy/svx/res/fr03.png
index 6520eda..9be4bac 100644
Binary files a/icon-themes/galaxy/svx/res/fr03.png and 
b/icon-themes/galaxy/svx/res/fr03.png differ
diff --git a/icon-themes/galaxy/svx/res/fr04.png 
b/icon-themes/galaxy/svx/res/fr04.png
index 9620ab3..658b21c 100644
Binary files a/icon-themes/galaxy/svx/res/fr04.png and 
b/icon-themes/galaxy/svx/res/fr04.png differ
diff --git a/icon-themes/galaxy/svx/res/fr05.png 
b/icon-themes/galaxy/svx/res/fr05.png
index 0d381a3..a5780ee 100644
Binary files a/icon-themes/galaxy/svx/res/fr05.png and 
b/icon-themes/galaxy/svx/res/fr05.png differ
diff --git a/icon-themes/galaxy/svx/res/fr06.png 
b/icon-themes/galaxy/svx/res/fr06.png
index 6e64911..9d9fdec 100644
Binary files a/icon-themes/galaxy/svx/res/fr06.png and 
b/icon-themes/galaxy/svx/res/fr06.png differ
diff --git a/icon-themes/galaxy/svx/res/fr07.png 
b/icon-themes/galaxy/svx/res/fr07.png
index 0abceae..d331192 100644
Binary files a/icon-themes/galaxy/svx/res/fr07.png and 
b/icon-themes/galaxy/svx/res/fr07.png differ
diff --git a/icon-themes/galaxy/svx/res/fr08.png 
b/icon-themes/galaxy/svx/res/fr08.png
index 6a8fbb3..3db595f 100644
Binary files a/icon-themes/galaxy/svx/res/fr08.png and 
b/icon-themes/galaxy/svx/res/fr08.png differ
diff --git a/icon-themes/galaxy/svx/res/fr09.png 
b/icon-themes/galaxy/svx/res/fr09.png
index 69ef7e9..654cfd3 100644
Binary files a/icon-themes/galaxy/svx/res/fr09.png and 
b/icon-themes/galaxy/svx/res/fr09.png differ
diff --git a/icon-themes/galaxy/svx/res/pr01.png 
b/icon-themes/galaxy/svx/res/pr01.png
index 8bb4691..ae7a4d3 100644
Binary files a/icon-themes/galaxy/svx/res/pr01.png and 
b/icon-themes/galaxy/svx/res/pr01.png differ
diff --git a/icon-themes/galaxy/svx/res/pr017.png 
b/icon-themes/galaxy/svx/res/pr017.png
index b0c4873..cdc6ecf 100644
Binary files a/icon-themes/galaxy/svx/res/pr017.png and 
b/icon-themes/galaxy/svx/res/pr017.png differ
diff --git a/icon-themes/galaxy/svx/res/pr018.png 
b/icon-themes/galaxy/svx/res/pr018.png
index e93dfab..d25a902 100644
Binary files a/icon-themes/galaxy/svx/res/pr018.png and

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/galaxy

2014-11-27 Thread Yousuf Philips

 icon-themes/galaxy/svx/res/fr01.png  |binary
 icon-themes/galaxy/svx/res/fr010.png |binary
 icon-themes/galaxy/svx/res/fr011.png |binary
 icon-themes/galaxy/svx/res/fr012.png |binary
 icon-themes/galaxy/svx/res/fr02.png  |binary
 icon-themes/galaxy/svx/res/fr03.png  |binary
 icon-themes/galaxy/svx/res/fr04.png  |binary
 icon-themes/galaxy/svx/res/fr05.png  |binary
 icon-themes/galaxy/svx/res/fr06.png  |binary
 icon-themes/galaxy/svx/res/fr07.png  |binary
 icon-themes/galaxy/svx/res/fr08.png  |binary
 icon-themes/galaxy/svx/res/fr09.png  |binary
 icon-themes/galaxy/svx/res/pr01.png  |binary
 icon-themes/galaxy/svx/res/pr017.png |binary
 icon-themes/galaxy/svx/res/pr018.png |binary
 icon-themes/galaxy/svx/res/pr019.png |binary
 icon-themes/galaxy/svx/res/pr02.png  |binary
 icon-themes/galaxy/svx/res/pr020.png |binary
 icon-themes/galaxy/svx/res/pr021.png |binary
 icon-themes/galaxy/svx/res/pr03.png  |binary
 icon-themes/galaxy/svx/res/pr04.png  |binary
 icon-themes/galaxy/svx/res/pr06.png  |binary
 icon-themes/galaxy/svx/res/sh01.png  |binary
 icon-themes/galaxy/svx/res/sh02.png  |binary
 icon-themes/galaxy/svx/res/sh03.png  |binary
 icon-themes/galaxy/svx/res/sh04.png  |binary
 icon-themes/galaxy/svx/res/sh05.png  |binary
 27 files changed

New commits:
commit 718d6b046ef2f0b4903d33e1ab0df096495c06e8
Author: Yousuf Philips philip...@hotmail.com
Date:   Thu Nov 27 02:12:01 2014 +0400

fdo#86472 added white backgrounds to images so they appear fine in dark 
themes

Change-Id: Iaae21bc2205b62520b3dbe6564099e24d87beaf6
Reviewed-on: https://gerrit.libreoffice.org/13141
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git a/icon-themes/galaxy/svx/res/fr01.png 
b/icon-themes/galaxy/svx/res/fr01.png
index e1e8192..863a58b 100644
Binary files a/icon-themes/galaxy/svx/res/fr01.png and 
b/icon-themes/galaxy/svx/res/fr01.png differ
diff --git a/icon-themes/galaxy/svx/res/fr010.png 
b/icon-themes/galaxy/svx/res/fr010.png
index dd79016..c79b685 100644
Binary files a/icon-themes/galaxy/svx/res/fr010.png and 
b/icon-themes/galaxy/svx/res/fr010.png differ
diff --git a/icon-themes/galaxy/svx/res/fr011.png 
b/icon-themes/galaxy/svx/res/fr011.png
index f3bbd62..a188a2c 100644
Binary files a/icon-themes/galaxy/svx/res/fr011.png and 
b/icon-themes/galaxy/svx/res/fr011.png differ
diff --git a/icon-themes/galaxy/svx/res/fr012.png 
b/icon-themes/galaxy/svx/res/fr012.png
index 446fea2..f8190d36 100644
Binary files a/icon-themes/galaxy/svx/res/fr012.png and 
b/icon-themes/galaxy/svx/res/fr012.png differ
diff --git a/icon-themes/galaxy/svx/res/fr02.png 
b/icon-themes/galaxy/svx/res/fr02.png
index e54ddd0..f72e7fa 100644
Binary files a/icon-themes/galaxy/svx/res/fr02.png and 
b/icon-themes/galaxy/svx/res/fr02.png differ
diff --git a/icon-themes/galaxy/svx/res/fr03.png 
b/icon-themes/galaxy/svx/res/fr03.png
index 6520eda..9be4bac 100644
Binary files a/icon-themes/galaxy/svx/res/fr03.png and 
b/icon-themes/galaxy/svx/res/fr03.png differ
diff --git a/icon-themes/galaxy/svx/res/fr04.png 
b/icon-themes/galaxy/svx/res/fr04.png
index 9620ab3..658b21c 100644
Binary files a/icon-themes/galaxy/svx/res/fr04.png and 
b/icon-themes/galaxy/svx/res/fr04.png differ
diff --git a/icon-themes/galaxy/svx/res/fr05.png 
b/icon-themes/galaxy/svx/res/fr05.png
index 0d381a3..a5780ee 100644
Binary files a/icon-themes/galaxy/svx/res/fr05.png and 
b/icon-themes/galaxy/svx/res/fr05.png differ
diff --git a/icon-themes/galaxy/svx/res/fr06.png 
b/icon-themes/galaxy/svx/res/fr06.png
index 6e64911..9d9fdec 100644
Binary files a/icon-themes/galaxy/svx/res/fr06.png and 
b/icon-themes/galaxy/svx/res/fr06.png differ
diff --git a/icon-themes/galaxy/svx/res/fr07.png 
b/icon-themes/galaxy/svx/res/fr07.png
index 0abceae..d331192 100644
Binary files a/icon-themes/galaxy/svx/res/fr07.png and 
b/icon-themes/galaxy/svx/res/fr07.png differ
diff --git a/icon-themes/galaxy/svx/res/fr08.png 
b/icon-themes/galaxy/svx/res/fr08.png
index 6a8fbb3..3db595f 100644
Binary files a/icon-themes/galaxy/svx/res/fr08.png and 
b/icon-themes/galaxy/svx/res/fr08.png differ
diff --git a/icon-themes/galaxy/svx/res/fr09.png 
b/icon-themes/galaxy/svx/res/fr09.png
index 69ef7e9..654cfd3 100644
Binary files a/icon-themes/galaxy/svx/res/fr09.png and 
b/icon-themes/galaxy/svx/res/fr09.png differ
diff --git a/icon-themes/galaxy/svx/res/pr01.png 
b/icon-themes/galaxy/svx/res/pr01.png
index 8bb4691..ae7a4d3 100644
Binary files a/icon-themes/galaxy/svx/res/pr01.png and 
b/icon-themes/galaxy/svx/res/pr01.png differ
diff --git a/icon-themes/galaxy/svx/res/pr017.png 
b/icon-themes/galaxy/svx/res/pr017.png
index b0c4873..cdc6ecf 100644
Binary files a/icon-themes/galaxy/svx/res/pr017.png and 
b/icon-themes/galaxy/svx/res/pr017.png differ
diff --git a/icon-themes/galaxy/svx/res/pr018.png 
b/icon-themes/galaxy/svx/res/pr018.png
index e93dfab..d25a902 100644
Binary files a/icon-themes/galaxy/svx/res/pr018.png and

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

2014-11-27 Thread Matthias Freund

 icon-themes/sifr/cmd/lc_alignverticalcenter.png |binary
 icon-themes/sifr/cmd/lc_selectobject.png|binary
 icon-themes/sifr/cmd/lc_wrapcontour.png |binary
 icon-themes/sifr/cmd/lc_wrapideal.png   |binary
 icon-themes/sifr/cmd/lc_wrapleft.png|binary
 icon-themes/sifr/cmd/lc_wrapoff.png |binary
 icon-themes/sifr/cmd/lc_wrapon.png  |binary
 icon-themes/sifr/cmd/lc_wrapright.png   |binary
 icon-themes/sifr/cmd/lc_wraptext.png|binary
 icon-themes/sifr/cmd/lc_wrapthrough.png |binary
 icon-themes/sifr/cmd/sc_aligncenter.png |binary
 icon-themes/sifr/cmd/sc_alignverticalcenter.png |binary
 icon-themes/sifr/cmd/sc_selectobject.png|binary
 icon-themes/sifr/cmd/sc_wrapcontour.png |binary
 icon-themes/sifr/cmd/sc_wrapideal.png   |binary
 icon-themes/sifr/cmd/sc_wrapleft.png|binary
 icon-themes/sifr/cmd/sc_wrapoff.png |binary
 icon-themes/sifr/cmd/sc_wrapon.png  |binary
 icon-themes/sifr/cmd/sc_wrapright.png   |binary
 icon-themes/sifr/cmd/sc_wraptext.png|binary
 icon-themes/sifr/cmd/sc_wrapthrough.png |binary
 21 files changed

New commits:
commit ac1e7aea753ef78ca0a0df793731e49fdabcad80
Author: Matthias Freund matti...@secure.mailbox.org
Date:   Fri Nov 28 08:59:00 2014 +0400

fdo#75256 Improve sifr icontheme

Add new wrap icons, modify wraptext, selectobject, inserthyperlink and 
rename alignvcenter to alignverticalcenter

Change-Id: If80d520da672d756440d709dcc3bc5eb16be9fd2
Reviewed-on: https://gerrit.libreoffice.org/13161
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git a/icon-themes/sifr/cmd/lc_alignverticalcenter.png 
b/icon-themes/sifr/cmd/lc_alignverticalcenter.png
new file mode 100644
index 000..e22825b
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_alignverticalcenter.png 
differ
diff --git a/icon-themes/sifr/cmd/lc_selectobject.png 
b/icon-themes/sifr/cmd/lc_selectobject.png
index cfa978b..5dbbcca 100644
Binary files a/icon-themes/sifr/cmd/lc_selectobject.png and 
b/icon-themes/sifr/cmd/lc_selectobject.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapcontour.png 
b/icon-themes/sifr/cmd/lc_wrapcontour.png
new file mode 100644
index 000..53dea02
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapcontour.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapideal.png 
b/icon-themes/sifr/cmd/lc_wrapideal.png
new file mode 100644
index 000..28825e4
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapideal.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapleft.png 
b/icon-themes/sifr/cmd/lc_wrapleft.png
new file mode 100644
index 000..e2f3149
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapleft.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapoff.png 
b/icon-themes/sifr/cmd/lc_wrapoff.png
new file mode 100644
index 000..1302e7b
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapoff.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapon.png 
b/icon-themes/sifr/cmd/lc_wrapon.png
new file mode 100644
index 000..f13d6ce
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapon.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapright.png 
b/icon-themes/sifr/cmd/lc_wrapright.png
new file mode 100644
index 000..41bab4d
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapright.png differ
diff --git a/icon-themes/sifr/cmd/lc_wraptext.png 
b/icon-themes/sifr/cmd/lc_wraptext.png
index c14615e..a75c87a 100644
Binary files a/icon-themes/sifr/cmd/lc_wraptext.png and 
b/icon-themes/sifr/cmd/lc_wraptext.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapthrough.png 
b/icon-themes/sifr/cmd/lc_wrapthrough.png
new file mode 100644
index 000..a6067882b
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapthrough.png differ
diff --git a/icon-themes/sifr/cmd/sc_aligncenter.png 
b/icon-themes/sifr/cmd/sc_aligncenter.png
index 609d45a..38b729b 100644
Binary files a/icon-themes/sifr/cmd/sc_aligncenter.png and 
b/icon-themes/sifr/cmd/sc_aligncenter.png differ
diff --git a/icon-themes/sifr/cmd/sc_alignverticalcenter.png 
b/icon-themes/sifr/cmd/sc_alignverticalcenter.png
new file mode 100644
index 000..4278da4
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_alignverticalcenter.png 
differ
diff --git a/icon-themes/sifr/cmd/sc_selectobject.png 
b/icon-themes/sifr/cmd/sc_selectobject.png
index 3d9a11a..2829cf7 100644
Binary files a/icon-themes/sifr/cmd/sc_selectobject.png and 
b/icon-themes/sifr/cmd/sc_selectobject.png differ
diff --git a/icon-themes/sifr/cmd/sc_wrapcontour.png 
b/icon-themes/sifr/cmd/sc_wrapcontour.png
new file mode 100644
index 000..0e3ae22
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_wrapcontour.png differ
diff --git a/icon-themes/sifr/cmd/sc_wrapideal.png 
b/icon-themes/sifr/cmd/sc_wrapideal.png
new file mode 100644
index 000..2357a65
Binary

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/sifr

2014-11-27 Thread Matthias Freund

 icon-themes/sifr/cmd/lc_alignverticalcenter.png |binary
 icon-themes/sifr/cmd/lc_selectobject.png|binary
 icon-themes/sifr/cmd/lc_wrapcontour.png |binary
 icon-themes/sifr/cmd/lc_wrapideal.png   |binary
 icon-themes/sifr/cmd/lc_wrapleft.png|binary
 icon-themes/sifr/cmd/lc_wrapoff.png |binary
 icon-themes/sifr/cmd/lc_wrapon.png  |binary
 icon-themes/sifr/cmd/lc_wrapright.png   |binary
 icon-themes/sifr/cmd/lc_wraptext.png|binary
 icon-themes/sifr/cmd/lc_wrapthrough.png |binary
 icon-themes/sifr/cmd/sc_aligncenter.png |binary
 icon-themes/sifr/cmd/sc_alignverticalcenter.png |binary
 icon-themes/sifr/cmd/sc_selectobject.png|binary
 icon-themes/sifr/cmd/sc_wrapcontour.png |binary
 icon-themes/sifr/cmd/sc_wrapideal.png   |binary
 icon-themes/sifr/cmd/sc_wrapleft.png|binary
 icon-themes/sifr/cmd/sc_wrapoff.png |binary
 icon-themes/sifr/cmd/sc_wrapon.png  |binary
 icon-themes/sifr/cmd/sc_wrapright.png   |binary
 icon-themes/sifr/cmd/sc_wraptext.png|binary
 icon-themes/sifr/cmd/sc_wrapthrough.png |binary
 21 files changed

New commits:
commit 6d622c4e45cace4a40ffc84fcf65ccff0d4f53a5
Author: Matthias Freund matti...@secure.mailbox.org
Date:   Fri Nov 28 08:59:00 2014 +0400

fdo#75256 Improve sifr icontheme

Add new wrap icons, modify wraptext, selectobject, inserthyperlink and 
rename alignvcenter to alignverticalcenter

Change-Id: If80d520da672d756440d709dcc3bc5eb16be9fd2
Reviewed-on: https://gerrit.libreoffice.org/13161
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com
(cherry picked from commit ac1e7aea753ef78ca0a0df793731e49fdabcad80)
Reviewed-on: https://gerrit.libreoffice.org/13162

diff --git a/icon-themes/sifr/cmd/lc_alignverticalcenter.png 
b/icon-themes/sifr/cmd/lc_alignverticalcenter.png
new file mode 100644
index 000..e22825b
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_alignverticalcenter.png 
differ
diff --git a/icon-themes/sifr/cmd/lc_selectobject.png 
b/icon-themes/sifr/cmd/lc_selectobject.png
index cfa978b..5dbbcca 100644
Binary files a/icon-themes/sifr/cmd/lc_selectobject.png and 
b/icon-themes/sifr/cmd/lc_selectobject.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapcontour.png 
b/icon-themes/sifr/cmd/lc_wrapcontour.png
new file mode 100644
index 000..53dea02
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapcontour.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapideal.png 
b/icon-themes/sifr/cmd/lc_wrapideal.png
new file mode 100644
index 000..28825e4
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapideal.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapleft.png 
b/icon-themes/sifr/cmd/lc_wrapleft.png
new file mode 100644
index 000..e2f3149
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapleft.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapoff.png 
b/icon-themes/sifr/cmd/lc_wrapoff.png
new file mode 100644
index 000..1302e7b
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapoff.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapon.png 
b/icon-themes/sifr/cmd/lc_wrapon.png
new file mode 100644
index 000..f13d6ce
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapon.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapright.png 
b/icon-themes/sifr/cmd/lc_wrapright.png
new file mode 100644
index 000..41bab4d
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapright.png differ
diff --git a/icon-themes/sifr/cmd/lc_wraptext.png 
b/icon-themes/sifr/cmd/lc_wraptext.png
index c14615e..a75c87a 100644
Binary files a/icon-themes/sifr/cmd/lc_wraptext.png and 
b/icon-themes/sifr/cmd/lc_wraptext.png differ
diff --git a/icon-themes/sifr/cmd/lc_wrapthrough.png 
b/icon-themes/sifr/cmd/lc_wrapthrough.png
new file mode 100644
index 000..a6067882b
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_wrapthrough.png differ
diff --git a/icon-themes/sifr/cmd/sc_aligncenter.png 
b/icon-themes/sifr/cmd/sc_aligncenter.png
index 609d45a..38b729b 100644
Binary files a/icon-themes/sifr/cmd/sc_aligncenter.png and 
b/icon-themes/sifr/cmd/sc_aligncenter.png differ
diff --git a/icon-themes/sifr/cmd/sc_alignverticalcenter.png 
b/icon-themes/sifr/cmd/sc_alignverticalcenter.png
new file mode 100644
index 000..4278da4
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_alignverticalcenter.png 
differ
diff --git a/icon-themes/sifr/cmd/sc_selectobject.png 
b/icon-themes/sifr/cmd/sc_selectobject.png
index 3d9a11a..2829cf7 100644
Binary files a/icon-themes/sifr/cmd/sc_selectobject.png and 
b/icon-themes/sifr/cmd/sc_selectobject.png differ
diff --git a/icon-themes/sifr/cmd/sc_wrapcontour.png 
b/icon-themes/sifr/cmd/sc_wrapcontour.png
new file mode 100644
index 000..0e3ae22
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_wrapcontour.png differ
diff --git

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

2014-11-27 Thread Yousuf Philips

 icon-themes/sifr/cmd/lc_color.png|binary
 icon-themes/sifr/cmd/lc_currencyfield.png|binary
 icon-themes/sifr/cmd/lc_datasort.png |binary
 icon-themes/sifr/cmd/lc_decrementindent.png  |binary
 icon-themes/sifr/cmd/lc_fontcolor.png|binary
 icon-themes/sifr/cmd/lc_incrementindent.png  |binary
 icon-themes/sifr/cmd/lc_togglemergecells.png |binary
 7 files changed

New commits:
commit 044f4c0f454870d56442c8d985c1baf415733cfd
Author: Yousuf Philips philip...@hotmail.com
Date:   Fri Nov 28 08:47:34 2014 +0400

fdo#75256 addition of sort icon and minor changes to other sifr icons

Change-Id: I7cfdd13ae6a9969759ae23c3a5680707ba0ac458
Reviewed-on: https://gerrit.libreoffice.org/13160
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git a/icon-themes/sifr/cmd/lc_color.png 
b/icon-themes/sifr/cmd/lc_color.png
index 6520a1d..ded99ed 100644
Binary files a/icon-themes/sifr/cmd/lc_color.png and 
b/icon-themes/sifr/cmd/lc_color.png differ
diff --git a/icon-themes/sifr/cmd/lc_currencyfield.png 
b/icon-themes/sifr/cmd/lc_currencyfield.png
index 152c330..c05115d 100644
Binary files a/icon-themes/sifr/cmd/lc_currencyfield.png and 
b/icon-themes/sifr/cmd/lc_currencyfield.png differ
diff --git a/icon-themes/sifr/cmd/lc_datasort.png 
b/icon-themes/sifr/cmd/lc_datasort.png
new file mode 100644
index 000..37ccd14
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_datasort.png differ
diff --git a/icon-themes/sifr/cmd/lc_decrementindent.png 
b/icon-themes/sifr/cmd/lc_decrementindent.png
index 9a645fb..f3bbab8 100644
Binary files a/icon-themes/sifr/cmd/lc_decrementindent.png and 
b/icon-themes/sifr/cmd/lc_decrementindent.png differ
diff --git a/icon-themes/sifr/cmd/lc_fontcolor.png 
b/icon-themes/sifr/cmd/lc_fontcolor.png
index 5997697..c5e70d0 100644
Binary files a/icon-themes/sifr/cmd/lc_fontcolor.png and 
b/icon-themes/sifr/cmd/lc_fontcolor.png differ
diff --git a/icon-themes/sifr/cmd/lc_incrementindent.png 
b/icon-themes/sifr/cmd/lc_incrementindent.png
index b89fa6a..63c7ab9 100644
Binary files a/icon-themes/sifr/cmd/lc_incrementindent.png and 
b/icon-themes/sifr/cmd/lc_incrementindent.png differ
diff --git a/icon-themes/sifr/cmd/lc_togglemergecells.png 
b/icon-themes/sifr/cmd/lc_togglemergecells.png
index 2bcc44e..fb74520 100644
Binary files a/icon-themes/sifr/cmd/lc_togglemergecells.png and 
b/icon-themes/sifr/cmd/lc_togglemergecells.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/sifr

2014-11-27 Thread Yousuf Philips

 icon-themes/sifr/cmd/lc_color.png|binary
 icon-themes/sifr/cmd/lc_currencyfield.png|binary
 icon-themes/sifr/cmd/lc_datasort.png |binary
 icon-themes/sifr/cmd/lc_decrementindent.png  |binary
 icon-themes/sifr/cmd/lc_fontcolor.png|binary
 icon-themes/sifr/cmd/lc_incrementindent.png  |binary
 icon-themes/sifr/cmd/lc_togglemergecells.png |binary
 7 files changed

New commits:
commit 0613b3c273dbe93bf5ac49bfe8f650d24e059fc3
Author: Yousuf Philips philip...@hotmail.com
Date:   Fri Nov 28 08:47:34 2014 +0400

fdo#75256 addition of sort icon and minor changes to other sifr icons

Change-Id: I7cfdd13ae6a9969759ae23c3a5680707ba0ac458
Reviewed-on: https://gerrit.libreoffice.org/13160
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com
(cherry picked from commit 044f4c0f454870d56442c8d985c1baf415733cfd)
Reviewed-on: https://gerrit.libreoffice.org/13163

diff --git a/icon-themes/sifr/cmd/lc_color.png 
b/icon-themes/sifr/cmd/lc_color.png
index 6520a1d..ded99ed 100644
Binary files a/icon-themes/sifr/cmd/lc_color.png and 
b/icon-themes/sifr/cmd/lc_color.png differ
diff --git a/icon-themes/sifr/cmd/lc_currencyfield.png 
b/icon-themes/sifr/cmd/lc_currencyfield.png
index 152c330..c05115d 100644
Binary files a/icon-themes/sifr/cmd/lc_currencyfield.png and 
b/icon-themes/sifr/cmd/lc_currencyfield.png differ
diff --git a/icon-themes/sifr/cmd/lc_datasort.png 
b/icon-themes/sifr/cmd/lc_datasort.png
new file mode 100644
index 000..37ccd14
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_datasort.png differ
diff --git a/icon-themes/sifr/cmd/lc_decrementindent.png 
b/icon-themes/sifr/cmd/lc_decrementindent.png
index 9a645fb..f3bbab8 100644
Binary files a/icon-themes/sifr/cmd/lc_decrementindent.png and 
b/icon-themes/sifr/cmd/lc_decrementindent.png differ
diff --git a/icon-themes/sifr/cmd/lc_fontcolor.png 
b/icon-themes/sifr/cmd/lc_fontcolor.png
index 5997697..c5e70d0 100644
Binary files a/icon-themes/sifr/cmd/lc_fontcolor.png and 
b/icon-themes/sifr/cmd/lc_fontcolor.png differ
diff --git a/icon-themes/sifr/cmd/lc_incrementindent.png 
b/icon-themes/sifr/cmd/lc_incrementindent.png
index b89fa6a..63c7ab9 100644
Binary files a/icon-themes/sifr/cmd/lc_incrementindent.png and 
b/icon-themes/sifr/cmd/lc_incrementindent.png differ
diff --git a/icon-themes/sifr/cmd/lc_togglemergecells.png 
b/icon-themes/sifr/cmd/lc_togglemergecells.png
index 2bcc44e..fb74520 100644
Binary files a/icon-themes/sifr/cmd/lc_togglemergecells.png and 
b/icon-themes/sifr/cmd/lc_togglemergecells.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2014-11-28

2014-11-27 Thread gerrit

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ fdo#51741 Mark document as modified on bookmark rename / delete
  in https://gerrit.libreoffice.org/12436 from Renato Ferreira
  about module sw
+ fdo#84938: replace EVENT_ constants with enum
  in https://gerrit.libreoffice.org/13134 from Tobias Madl
  about module basctl, chart2, cui, dbaccess, desktop, extensions, filter, 
forms, formula, fpicker, framework, include, reportdesign, sc, sd, sfx2, 
svtools, svx, sw, vcl
+ De-/Increase fontsize when multi-sized text
  in https://gerrit.libreoffice.org/13152 from Daniel Sikeler
  about module sw
+ fdo#39468: Translated some german comments
  in https://gerrit.libreoffice.org/13154 from Daniel Sikeler
  about module include
+ fdo#86745 - Possible exception/segfault in jurt jpipe.dll under Windows .
  in https://gerrit.libreoffice.org/13148 from juegen funk
  about module jurt
+ start detection of kf5 stuff in configure.ac
  in https://gerrit.libreoffice.org/13079 from Jonathan Riddell
  about module build
+ fdo#65209 attempt to enable daylight saving time
  in https://gerrit.libreoffice.org/11441 from Lim Jing
  about module tools
+ Unittest for autocorrect in writer
  in https://gerrit.libreoffice.org/13131 from Daniel Sikeler
  about module sw, test
+ Second preparation of the LibreOfficeKit for Windows
  in https://gerrit.libreoffice.org/13017 from juegen funk
  about module include, smoketest
 End of freshness 

+ fdo#82312 - Excel chart has a wrong size
  in https://gerrit.libreoffice.org/13151 from Noel Grandin
  about module sc
+ Fix Python build in debug mode for x64 Windows
  in https://gerrit.libreoffice.org/13089 from David Ostrovsky
  about module external


* Merged changes on master for project core changed in the last 25 hours:

+ fdo#75256 Improve sifr icontheme
  in https://gerrit.libreoffice.org/13161 from Yousuf Philips
+ fdo#75256 addition of sort icon and minor changes to other sifr icons
  in https://gerrit.libreoffice.org/13160 from Yousuf Philips
+ fdo#86472 added white backgrounds to images so they appear fine in dark t
  in https://gerrit.libreoffice.org/13140 from Yousuf Philips
+ fdo#81596 export to OOXML that need argument changes
  in https://gerrit.libreoffice.org/10831 from Winfried Donkers
+ fdo#86169 fix completion of function name crash
  in https://gerrit.libreoffice.org/12380 from Winfried Donkers
+ fdo#86687 Avoid deadlock updating progress bar
  in https://gerrit.libreoffice.org/13147 from Matthew Francis
+ fdo#81475 rearrange, add and remove entries from toolbars
  in https://gerrit.libreoffice.org/13143 from Yousuf Philips
+ TANGO: Copied crop icon from human
  in https://gerrit.libreoffice.org/13145 from Yousuf Philips


* Abandoned changes on master for project core changed in the last 25 hours:

+ fdo#75256 Improve sifr icontheme
  in https://gerrit.libreoffice.org/13031 from Matthias Freund
+ fdo#75256 addition of sort icon and minor changes to other sifr icons
  in https://gerrit.libreoffice.org/13038 from Yousuf Philips


* Open changes needing tweaks, but being untouched for more than a week:

+ Removed useless includes in accessibility/ tree
  in https://gerrit.libreoffice.org/12948 from Andrea Gelmini
+ Don’t Save -- Don't Save.
  in https://gerrit.libreoffice.org/12399 from Kevin Suo
+ fdo#77569 - Add Choose Theme to Format Menu
  in https://gerrit.libreoffice.org/12275 from Joel Madero
+ Perftest for loading autocorrect dictionaries, related fdo#79761
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ android: Show document browser back in the menu
  in https://gerrit.libreoffice.org/12108 from Jacobo Aragunde Pérez
+ coverity#1242459 Identical code for different branches
  in https://gerrit.libreoffice.org/11772 from Caolán McNamara
+ jvmfwk: Apple  Oracle's JRE detection for OS X 10.8+
  in https://gerrit.libreoffice.org/12057 from Robert Antoni Buj i Gelonch
+ HIG-ification of GSoC Color Picker dialog
  in https://gerrit.libreoffice.org/11494 from Olivier Hallot
+ WIP: fdo#43090: Add an option to disable autoclose brackets
  in https://gerrit.libreoffice.org/12024 from Marcos Paulo de Souza
+ fdo#39625 Make existing CppUnittests work
  in https://gerrit.libreoffice.org/11605 from Tobias Madl
+ fdo#58194 - export DOCX Automatic indent as firstLine indent
  in https://gerrit.libreoffice.org/10425 from Joren De Cuyper
+ WIP (do not merge): remove custom impl of bidirectional list
  in https://gerrit.libreoffice.org/11001 from Chris Laplante
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ fdo#81426 : Data from header and footer is getting lost.
  in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest

[Libreoffice-commits] core.git: 2 commits - include/opencl sc/Library_scui.mk

2014-11-27 Thread Tor Lillqvist

 include/opencl/platforminfo.hxx |3 ---
 sc/Library_scui.mk  |4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 81e3c00d411014f4a139a494816e689a9f498a4c
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 28 09:28:14 2014 +0200

The compiler-generated dtor is good enough, no need for this

Change-Id: Ib72e0df4ac3ca90d440a32359e711d77e758cca0

diff --git a/include/opencl/platforminfo.hxx b/include/opencl/platforminfo.hxx
index 28c7ba8..6c40c43 100644
--- a/include/opencl/platforminfo.hxx
+++ b/include/opencl/platforminfo.hxx
@@ -43,9 +43,6 @@ struct OPENCL_DLLPUBLIC OpenCLPlatformInfo
 std::vectorOpenCLDeviceInfo maDevices;
 
 OpenCLPlatformInfo();
-~OpenCLPlatformInfo()
-{
-}
 };
 
 OPENCL_DLLPUBLIC std::ostream operator(std::ostream rStream, const 
OpenCLPlatformInfo rPlatform);
commit a20269a5a818bea1c171102cc27eabdf426e939d
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 28 09:26:55 2014 +0200

scui needs the opencl library at least on Windows

Change-Id: I4183b957d59bb81b8df7a5f51418be94c879b3fe

diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index a00e81a..781b2e9 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_use_sdk_api,scui))
 
 $(eval $(call gb_Library_use_externals,scui,\
boost_headers \
-$(call gb_Helper_optional,OPENCL,clew) \
+   $(call gb_Helper_optional,OPENCL,clew) \
mdds_headers \
 ))
 
@@ -36,6 +36,8 @@ $(eval $(call gb_Library_use_libraries,scui,\
for \
forui \
i18nlangtag \
+   $(call gb_Helper_optional,OPENCL, \
+   opencl) \
sal \
sc \
sfx \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-27 Thread Tor Lillqvist

 cui/uiconfig/ui/blackorwhitelistentrydialog.ui |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 2e71ef8ef4aec2ccf6e74a54d9a2de109e265ee9
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 28 09:45:27 2014 +0200

Fix packing overlap

Change-Id: I3fa211be09daf3089b0ac54f885a3fb7d1753b2f

diff --git a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui 
b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
index 3c2b238..12feaa3 100644
--- a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
+++ b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
@@ -106,7 +106,7 @@
   /object
   packing
 property name=left_attach0/property
-property name=top_attach0/property
+property name=top_attach1/property
   /packing
 /child
 child
@@ -120,7 +120,7 @@
   /object
   packing
 property name=left_attach0/property
-property name=top_attach0/property
+property name=top_attach2/property
   /packing
 /child
 child
@@ -132,7 +132,7 @@
   /object
   packing
 property name=left_attach0/property
-property name=top_attach1/property
+property name=top_attach3/property
   /packing
 /child
 child
@@ -146,7 +146,7 @@
   /object
   packing
 property name=left_attach0/property
-property name=top_attach2/property
+property name=top_attach4/property
   /packing
 /child
 child
@@ -158,7 +158,7 @@
   /object
   packing
 property name=left_attach0/property
-property name=top_attach3/property
+property name=top_attach5/property
   /packing
 /child
 child
@@ -172,7 +172,7 @@
   /object
   packing
 property name=left_attach0/property
-property name=top_attach4/property
+property name=top_attach6/property
   /packing
 /child
 child
@@ -184,7 +184,7 @@
   /object
   packing
 property name=left_attach0/property
-property name=top_attach5/property
+property name=top_attach7/property
   /packing
 /child
 child
@@ -198,7 +198,7 @@
   /object
   packing
 property name=left_attach0/property
-property name=top_attach6/property
+property name=top_attach8/property
   /packing
 /child
 child
@@ -210,7 +210,7 @@
   /object
   packing
 property name=left_attach0/property
-property name=top_attach7/property
+property name=top_attach9/property
   /packing
 /child
   /object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - officecfg/registry

2014-11-27 Thread Caolán McNamara

 officecfg/registry/data/org/openoffice/Office/Embedding.xcu |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9f9fbda1030df4ef94fe07c07e55da7adac41ea4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Nov 26 15:42:46 2014 +

Resolves: fdo#75408 go back to the old way of doing things

Revert Resolves: rhbz#1012353 fdo#48846 allow starmath objects to be 
resized

This reverts commit 1b717e5686f34c3ce798310a6216f7ea98fb2cd9.

Change-Id: Iaf8410fc1e5611cda04356d32e37ee25a7f59898
(cherry picked from commit 51221bbf0c7cca0a329393dac2059818006ab338)
(cherry picked from commit 2babe1baf46dcad936703d12cbd847393f5e467b)
Reviewed-on: https://gerrit.libreoffice.org/13136
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu 
b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index 44031e8..e39af5d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
@@ -236,7 +236,9 @@
   prop oor:name=ObjectDocumentServiceName
 valuecom.sun.star.formula.FormulaProperties/value
   /prop
-  prop oor:name=ObjectMiscStatus/
+  prop oor:name=ObjectMiscStatus
+value8589934592/value
+  /prop
   prop oor:name=ObjectVerbs
 valuePRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE SAVECOPYAS/value
   /prop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] [ANN] LibreOffice 4.3.5 rc1 test builds available

2014-11-27 Thread ape

Hi, Christian!

Two bugs:

- Bug 79834 (Linux) - [FILEOPEN] SVG Insert-From File takes 2+ time longer
in 4.3;
- Bug 80198 (Windows} - Insert SVG file breaks the program;

that are fixed by V Stuart Foote, are not specified in files:

- bugs-changelog-libreoffice-4-3-5-release-4.3.5.1.log;
- bugs-libreoffice-4-3-5-release-4.3.5.1.log;
- bugs-libreoffice-4-3-5-release-4.3.5.1.wiki.

--
ape



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-ANN-LibreOffice-4-3-5-rc1-test-builds-available-tp4130470p4130543.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] TDF Bugzilla 4.4.6 test install

2014-11-27 Thread Robinson Tryon

On Wed, Nov 26, 2014 at 2:07 PM, Robinson Tryon
bishop.robin...@gmail.com wrote:
 On Wed, Nov 26, 2014 at 1:26 PM, bfoman bfo.bugm...@spamgourmet.com wrote:
 Hi!
 I used this old-new test install and checked the control points I added to
 https://wiki.documentfoundation.org/Talk:QA/Bugzilla/TDF_Bugzilla_Proposal

 - change password link works, but as Base URL is not configured, so there
 are no working links in the change password message

 Yeah, sorry -- I've been testing out how to store the data/params file
 in git and/or salt, so the interface for vm144 (bugzilla-test) might
 be slightly broken today as I get a new test VM up and running. I'll
 try to get vm144 put back together by tonight.

vm144 is back in action

(Side note: If anyone wants to geek-out on the details of figuring out
what config should live in salt and which should live in bugzilla,
ping me on IRC and we'll chat. I'd really like to make it easy for
people to grab our config and test/play with it locally :-)

 - Old Chart system doesn't work - seems data dir was not copied or copied
 and permissions are wrong

 - New Charts - data is not updated, stalled in March - seems collectstats.pl
 is not enabled in cron

Okay, graphviz is now installed locally (ATT shut down their public
dot server), and the collectstats.pl script is cronified
appropriately.

(Interesting side note: If the collectstats script hasn't been run,
Bugzilla freaks out with a crazy error. I'm surprised it doesn't just
display a nice message asking the admin to set it up. If I ever have
any time to spare, I'll try to give them a patch)

 - Whining schedules - schedules are imported, but Whining still doesn't work

Okay, I was a bit cautious about enabling whining again because I
didn't want people to get pinged accidentally by our test install, but
I deleted the whining schedules so people can now re-add them as they
like.

 -  seems whine.pl is not enabled in cron (or emailing issue - but password
 reset is working, or interval settings are not set to 15 minutes)

Just enabled cron job. Please try testing this again :-)

 - FDO Bugzilla UI patches or additional pages (like
 page.cgi?id=weekly-bug-summary.html) are missing - seems template/additional
 files are not copied from FDO install

 Yep -- I only have a db dump right now.

I'd be happy to ask for tools such as the weekly-bug-summary script,
but perhaps people would like more of a break with the particular
theming used on the existing Bugzilla install. What do people think
about the FDO UI?

Best,
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] [ANN] LibreOffice 4.3.5 rc1 test builds available

2014-11-27 Thread Christian Lohmaier

Hi Ape, *,

On Thu, Nov 27, 2014 at 9:47 AM, ape os...@yandex.ru wrote:

 Two bugs:

 - Bug 79834 (Linux) - [FILEOPEN] SVG Insert-From File takes 2+ time longer
 in 4.3;
 - Bug 80198 (Windows} - Insert SVG file breaks the program;

 that are fixed by V Stuart Foote, are not specified in files:

 - bugs-changelog-libreoffice-4-3-5-release-4.3.5.1.log;
 - bugs-libreoffice-4-3-5-release-4.3.5.1.log;
 - bugs-libreoffice-4-3-5-release-4.3.5.1.wiki.

Those are autogenerated by parsing the commit messages for references
to the bugtrackers. so when there is no string like fdo#79834 in the
commit message, it won't show up in the above lists.

the commits-*.log contains the unfiltered list of commits.

http://dev-builds.libreoffice.org/pre-releases/src/commits-libreoffice-4-3-5-release-4.3.5.1.log

The script that is used for those list is
http://cgit.freedesktop.org/libreoffice/core/tree/bin/lo-commit-stat

However, the first one 79834 as well as the second one 80198 link to a
commit from October (and not by Stuart himself, he pointed to it), so
that's already included in a previous release and thus doesn't show up
in the list of changes compared to 4.3.4

Furthermore, as those two bugs were fixed by the same fix as for
another bug (84729), you'll not find it with the duplicat's numbers,
but instead with the number for the referenced bug here:
https://wiki.documentfoundation.org/Releases/4.3.4/RC1

53. fdo#84729 buffer cache grows to over 9000 unused entries [Caolán McNamara]

ciao
Christian
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] [ANN] LibreOffice 4.3.5 rc1 test builds available

2014-11-27 Thread Christian Lohmaier

Hi Ape, *,

On Thu, Nov 27, 2014 at 2:59 PM, ape os...@yandex.ru wrote:

 Thank You, but you're wrong in this statement:

 'Furthermore, as those two bugs were fixed by the same fix as for
 another bug (84729),

OK, both point to the other one suggesting that would have fixed both.

 LibreOffice_4.3.4 (Windows) crashes when you insert SVG file as image. It is
 possible that the  fdo#84729-patch by Caolán McNamara was not included in
 LibreOffice_4.3.4.

Or more likely some additional patch fixed that crasher.
The point is: There's no commit that explicitly mentions to have fixed
the two you were missing, rather those two are fixed by other commits
that then show up either in the bug- logs (when they list a
bug-number) or only in the commit-logs (when there is no bug number in
the commit-message)

But as the list is autogenerated, the other case can also happen: The
bugs logs might list a bugnumber that wasn't actually fixed. This can
happen when a commit contains something like see also fdo#1234 for
remaining problem - the script thinks the commit did fix bug 1234,
but the statement is just a note/reference to another bug that still
exists.

ciao
Christian
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] minutes of ESC call ...

2014-11-27 Thread Michael Meeks

* Present:
+ Lionel, Stephan, Eike, Miklos, Robinson, Jacobo, Andras, Markus,
  Michael M., Ptyl, Cloph, Norbert, Florian, Bjoern, Jan-Marek,
  Muthu, Michael S., Adam
 
* Completed Action Items:
+ look at regressions associated with a SUSE bugzilla bugfix (Timar)
[ went through them, but no low hanging fruit, but no need to access
  original documents there, for most there are unit tests. Will check
  all are public ]
+ look at sorting spreadsheet / use-cases etc. (Eike)
cf. https://bugs.freedesktop.org/attachment.cgi?id=108990 ]
ongoing, a mix of real bugs, wrong expectations and misconception about 
references
[ worked through the document, and added a comment to the bug,
  cherry-picked some fixes missing on the 4.2.x branch, fixed
  2-3 cases on all other branches.
  Suggest we do a 4.2.8 last-release ].
 
* Pending Action Items:
+ start building bibisect repositories (Robinson)
[ works on his local machine, but ... needs access to Bertha ]
AI:   get Robinson access to Bertha etc. (Cloph)
+ see also: https://redmine.documentfoundation.org/issues/597#note-21
 
* Bugzilla migration update (Robinson)
+ going well
+ http://vm150.documentfoundation.org/
+ please test out your tools vs. that.
+ bugzilla notification - needed for IRC  git commit daemons
+ can we login ? (Miklos)
+ all passwords need a reset.
+ if anyone wants admin access - mail Robinson
+ Aiming for 3rd week in January - Wed / Jan 14th
+ why not when people are not using it ? (Norbert)
+ happy to have another day (Robinson)
+ presumably a weekend-night of down-time will screw
  over fewer fdo users (Norbert)
+ Aim for calendar week 3 (Florian)
+ so we have infra etc. available end of week 2 etc.
+ now safe to go - if we can move forward; reach out to
  Tollef, and arrange a date with him.
AI: + reach out to Tollef to organise a date/time (Robinson)
+ load-testing ? (Michael)
+ handful of people on the current VM, the
  file-system is not optimized.
+ do we have stats on the fdo load ? (Michael)
AI:  + will get from Tollef (Robinson)
+ do we have the web-page / password reset done ? (Norbert)
+ see an un-pretty, but working notification (Robinson)
+ needs to just have enough to grok the migration (Norbert)
 + says we've migrated bugzilla etc. (Robinson)
+ Testing BSA
+ needs to be fixed vs. current version of bugzilla on fdo
+ current BSA is broken vs. fdo - due to upgrade of bugzilla
  a few weeks ago.
+ their HTML layout changed, and all scripts that parsed that
  are broken (Markus)
 + best to switch to XML-RPC
 + BSA - already use XML-RPC but doesn't work (Cloph)
 + will setup a test system so we can get that fixed (Cloph)
 
* Release Engineering update (Cloph)
+ 4.2.8 release
AI: + come up with a proposal timing-wise (Cloph)
   + next week 4.4 Beta 2, etc. every week has a release
   + better to have it in the 4.4 beta phase
   + Eike is confident.
   + plan a 1-RC release.
   + have been pushing that out to Ubuntu/PPA (Bjoern)
   + lack of 'murder' screaming out there.
= late this week or early next week.
   + can we ask people to test ? (Robinson)
   + always pushed to the dev-builds server  announced (Cloph)
   + lets not invite re-opening wounds (Bjoern)
   + its a ton better in its current state (Michael)
   + Cudos to Eike (Bjoern)
+ 4.3.5 RC1 status
+ currently synching to the mirrors, can be announced to the public
  after the call.
+ 4.4.0 Beta 2
+ ensure everything committed to master is cherry-picked to 4.4 branch
+ string freeze is with RC1 - due in week 51 - Dec 15th.
+ Lateish Feature collection:
+ OpenGL rendering for Windows by default for good drivers (various)
+ Blacklisting for Linux and Windows (Markus)
[ mostly done, Linux in master, Windows in-progress,
  currently porting the Mozilla code here; but mostly
  tested; comes from Mozilla - with some tweaks - eg.
  remove DirectX bits; switched string classes etc.
  Lots of registry lookups ].
+ OpenGL/CL JPEG de-compression to texture (jpeg-turbo patch)
 [ patch pending here ].
+ images*.zip layering ? (Kendy)
 + saves 5Mb of zipped installation size, we open the zip
   files and do the fallback at run-time.
   + packimages  impimagetree.cxx bits (Kendy)
   + cold-start ? (Michael)

[Libreoffice-qa] [ANN] LIbreOffice 4.3.5 RC1 available

2014-11-27 Thread Christian Lohmaier

Dear Community,

The Document Foundation is pleased to announce the first release
candidate of LibreOffice 4.3.5. The upcoming 4.3.5 will be the fifth
in a sequence of frequent bugfix releases for our feature-packed 4.3
line. Please be aware that LibreOffice 4.3.5 RC1 has not been flagged
as ready for production use yet, however feel free to give it a try
instead of 4.3.4.

A work-in-progress list of new features in LibreOffice 4.3 can be
found at https://wiki.documentfoundation.org/ReleaseNotes/4.3

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Developers and QA might also be interested in the symbol server for
windows debug information (see the release notes linked below for
details)

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/community/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 4.3.5 RC1 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/4.3.5/RC1

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

On behalf of the Community,

Christian
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

1 2 3 4 >

1 - 100 of 351 matches

Mail list logo