date:20141024

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 703 commits - accessibility/inc accessibility/source android/experimental avmedia/Library_avmedia.mk avmedia/Module_avmedia.mk avmedi

2014-10-24 Thread Douglas Mencken

Rebased ref, commits from common ancestor:
commit 39cb8cc33afcb239e2c7d9ac7d1293cd1a4f9556
Author: Douglas Mencken 
Date:   Wed Oct 8 10:38:28 2014 -0400

use GNU objc ABI/runtime instead of NeXT ABI/runtime when compiler is GCC

with workaround for "cannot find interface declaration for NXConstantString"

also, include  when OBJC_EXPORT is not defined

Change-Id: I5f0df322435be8244d372642dee1c21d783306f1

diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index d952518..143a1bd 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -215,6 +215,9 @@
 #ifdef MACOSX
 #define __OPENTRANSPORTPROVIDERS__ // these are already defined
 #define TimeValue CFTimeValue  // Do not conflict with TimeValue in 
sal/inc/osl/time.h
+#ifndef OBJC_EXPORT
+#include 
+#endif
 #include 
 #undef TimeValue
 #   ifndef ETIME
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 185fb26..52a0b5a 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -59,9 +59,21 @@ gb_CXXFLAGS := \
 
 # these are to get g++ to switch to Objective-C++ mode
 # (see toolkit module for a case where it is necessary to do it this way)
-gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
-
-gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
+gb_OBJCXXFLAGS := \
+   -x objective-c++ \
+   -fobjc-exceptions \
+   $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,\
+   -fgnu-runtime \
+   -fconstant-string-class=NSConstantString \
+   )
+
+gb_OBJCFLAGS := \
+   -x objective-c \
+   -fobjc-exceptions \
+   $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,\
+   -fgnu-runtime \
+   -fconstant-string-class=NSConstantString \
+   )
 
 # LinkTarget class
 
diff --git a/vcl/inc/osx/a11yfactory.h b/vcl/inc/osx/a11yfactory.h
index c739f3e..4e92126 100644
--- a/vcl/inc/osx/a11yfactory.h
+++ b/vcl/inc/osx/a11yfactory.h
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_VCL_INC_OSX_A11YFACTORY_H
 #define INCLUDED_VCL_INC_OSX_A11YFACTORY_H
 
+#ifndef OBJC_EXPORT
+#include 
+#endif
+
 #include "osxvcltypes.h"
 #include "a11ywrapper.h"
 #include 
diff --git a/vcl/inc/osx/osxvcltypes.h b/vcl/inc/osx/osxvcltypes.h
index f1659c4..96edccc 100644
--- a/vcl/inc/osx/osxvcltypes.h
+++ b/vcl/inc/osx/osxvcltypes.h
@@ -21,6 +21,9 @@
 #define INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
 
 #include "premac.h"
+#ifndef OBJC_EXPORT
+#include 
+#endif
 #import 
 #import 
 #include "postmac.h"
diff --git a/vcl/inc/osx/printview.h b/vcl/inc/osx/printview.h
index e396bd8..b63900b 100644
--- a/vcl/inc/osx/printview.h
+++ b/vcl/inc/osx/printview.h
@@ -21,6 +21,9 @@
 #define INCLUDED_VCL_INC_OSX_PRINTVIEW_H
 
 #include "premac.h"
+#ifndef OBJC_EXPORT
+#include 
+#endif
 #include 
 #include "postmac.h"
 
diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx
index 413754b..1665b06 100644
--- a/vcl/inc/osx/saldata.hxx
+++ b/vcl/inc/osx/saldata.hxx
@@ -23,6 +23,9 @@
 #include 
 
 #include "premac.h"
+#ifndef OBJC_EXPORT
+#include 
+#endif
 #include 
 #include "postmac.h"
 
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 8a88a26..4efcbe0 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -25,6 +25,9 @@
 #include "osl/conditn.h"
 
 #ifdef MACOSX
+#ifndef OBJC_EXPORT
+#include 
+#endif
 #include "osx/osxvcltypes.h"
 #endif
 
diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h
index b751a81..e663c65 100644
--- a/vcl/inc/osx/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -21,6 +21,9 @@
 #define INCLUDED_VCL_INC_OSX_SALTIMER_H
 
 #include "premac.h"
+#ifndef OBJC_EXPORT
+#include 
+#endif
 #include 
 #include "postmac.h"
 
diff --git a/vcl/inc/osx/vclnsapp.h b/vcl/inc/osx/vclnsapp.h
index 541b509..675cacc 100644
--- a/vcl/inc/osx/vclnsapp.h
+++ b/vcl/inc/osx/vclnsapp.h
@@ -23,6 +23,9 @@
 #include 
 
 #include "premac.h"
+#ifndef OBJC_EXPORT
+#include 
+#endif
 #include "Cocoa/Cocoa.h"
 #include "postmac.h"
 
diff --git a/vcl/inc/quartz/utils.h b/vcl/inc/quartz/utils.h
index e408250..ac264ec 100644
--- a/vcl/inc/quartz/utils.h
+++ b/vcl/inc/quartz/utils.h
@@ -23,6 +23,9 @@
 #include 
 
 #include 
+#ifndef OBJC_EXPORT
+#include 
+#endif
 #include 
 #include 
 #ifdef MACOSX
commit cfcd7e0de488918cddb7440618bf054253202d7f
Author: Douglas Mencken 
Date:   Sun Oct 5 18:02:00 2014 -0400

vcl-quartz: restore conditional code for SDKs < 10.8

Fixes: fatal error: CoreGraphics/CoreGraphics.h: No such file or directory

Related commit: 4fa8282816cb39692678e9da6b6693e821a3039b

Change-Id: I158339662c45059a77f025254c2e5ec4a734c328

diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx
index 40c2a0a..b6d1a1d 100644
--- a/vcl/quartz/CTRunData.hxx
+++ b/vcl/quartz/CTRunData.hxx
@@ -10,8 +10,20 @@
 #define CTRunData_Included
 
 #include "premac.h"
+#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080
+#include 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+// The following symbols are SPI (System

LibreOffice Gerrit News for core on 2014-10-25

2014-10-24 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ nss: add libnsspem.dylib to macosx-change-install-names.pl call
  in https://gerrit.libreoffice.org/12079 from Robert Antoni Buj i Gelonch
  about module external
+ jvmfwk: Apple & Oracle's JRE detection for OS X 10.8+
  in https://gerrit.libreoffice.org/12057 from Robert Antoni Buj i Gelonch
  about module jvmfwk
+ fdo#80403: Basesclasses implement Fastinterfaces
  in https://gerrit.libreoffice.org/12082 from Daniel Sikeler
  about module include, xmloff
+ fdo#80403: AutoCorrect uses XFastParser
  in https://gerrit.libreoffice.org/12083 from Daniel Sikeler
  about module editeng
 End of freshness 

+ Use rtl/character.hxx and dobjectize basiccharclass
  in https://gerrit.libreoffice.org/11979 from Arnaud Versini
  about module basic
+ fdo#50950 make Calc functions (ISO)WEEKNUM comply with ODFF1.2
  in https://gerrit.libreoffice.org/12089 from Winfried Donkers
  about module formula, include, sc, scaddins
+ RFC: ref-counting vcl::Window subclasses
  in https://gerrit.libreoffice.org/11972 from Noel Grandin
  about module extensions, include, svtools, vcl
+ In the read-only installset case use just one xcd file
  in https://gerrit.libreoffice.org/12084 from Tor Lillqvist
  about module build, postprocess
+ Rendering support for  multiStop GradientFill (OOXML LINEAR)
  in https://gerrit.libreoffice.org/12056 from Vinaya Mandke
  about module UnoControls, chart2, drawinglayer, filter, include, offapi, oox, 
sc, sd, sfx2, svx, sw, toolkit, vbahelper, vcl, xmloff


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

+ Rename color picker button and add an icon to it
  in https://gerrit.libreoffice.org/12086 from Adolfo Jayme Barrientos
+ fdo#85340 - Better tooltip for paragraph spacing buttons
  in https://gerrit.libreoffice.org/12076 from Yousuf Philips
+ Resolves fdo#71781: CMIS: Default Alfresco 4 URL not working
  in https://gerrit.libreoffice.org/12071 from Julien Nabet
+ Fract: enable tests
  in https://gerrit.libreoffice.org/12080 from Juan Picca
+ fdo#84168 change writerperfect filters to use a new base class template
  in https://gerrit.libreoffice.org/12072 from Takeshi Abe


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

None

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

+ convert ScHint ID's to an enum
  in https://gerrit.libreoffice.org/11986 from Noel Grandin
+ fdo#39625 Make existing CppUnittests work
  in https://gerrit.libreoffice.org/11605 from Tobias Madl
+ Sane configure GStreamer handling
  in https://gerrit.libreoffice.org/11912 from Jan-Marek Glogowski
+ 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#83003 Startcenter: No method for returnin Recent Docs
  in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ Perftest for loading autocorrect dictionaries (fdo#79761)
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ fdo#81956 : Rendering of vml group shape was wrong.
  in https://gerrit.libreoffice.org/11013 from sushil_shinde
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ fdo#81426 : Data from header and footer is getting lost.
  in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji
+ fdo#79541 :Corrupt: Shape  enclosed within a floating table
  in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji
+ fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT
  in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


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 mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/inc vcl/source vcl/unx

2014-10-24 Thread Markus Mohrhard

 vcl/inc/openglgdiimpl.hxx   |2 ++
 vcl/source/opengl/OpenGLContext.cxx |2 +-
 vcl/unx/generic/gdi/salgdi.cxx  |9 +
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit b6e1483ff7596aa5cb4cbb22db11782bd91b62a6
Author: Markus Mohrhard 
Date:   Sat Oct 25 02:18:15 2014 +0200

that should be a SAL_WARN

Change-Id: I331b635c1e5518e4fd70a5b6bf5ced7cbc51782a

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index b29c7a1..cd69fc7 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -635,7 +635,7 @@ bool OpenGLContext::ImplInit()
 #elif defined( UNX )
 if( !glXMakeCurrent( m_aGLWin.dpy, m_aGLWin.win, m_aGLWin.ctx ) )
 {
-SAL_INFO("vcl.opengl", "unable to select current GLX context");
+SAL_WARN("vcl.opengl", "unable to select current GLX context");
 return false;
 }
 
commit e4a5ba4a97320e696e3c7f4a3a870264602f211a
Author: Markus Mohrhard 
Date:   Sat Oct 25 02:16:51 2014 +0200

add OpenGLContext to OpenGL vcl rendering code

Change-Id: I05d1033c04d892638262d4a6a3e76897470e1467

diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 6ce94cb..1a3b6e7 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -34,6 +34,8 @@ private:
 public:
 virtual ~OpenGLSalGraphicsImpl ();
 
+OpenGLContext& GetOpenGLContext() { return maContext; }
+
 virtual void freeResources() SAL_OVERRIDE;
 
 virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 65a9ab6..94d03a9 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -151,6 +151,15 @@ void X11SalGraphics::SetDrawable( Drawable aDrawable, 
SalX11Screen nXScreen )
 pImpl->mnPenPixel  = GetPixel( pImpl->mnPenColor );
 pImpl->mnBrushPixel= GetPixel( pImpl->mnBrushColor );
 }
+else
+{
+OpenGLSalGraphicsImpl* pOpenGLImpl = 
dynamic_cast(mpImpl.get());
+if (pOpenGLImpl)
+{
+pOpenGLImpl->GetOpenGLContext().init(GetXDisplay(),
+GetDisplay()->GetDrawable(m_nXScreen), 
m_nXScreen.getXScreen());
+}
+}
 nTextPixel_ = GetPixel( nTextColor_ );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Registration of LO extensions

2014-10-24 Thread Sebastian Humenda

Hi again,

Rene Engelhard schrieb am 12.10.2014, 19:40 +0200:
>Does it have a proper description.xml? (And or META-INF/manifest.xml)?
The manifest.xml looks as expected, all files referenced are available.

Thanks
Sebastian
-- 
Web: http://www.crustulus.de | Blog: 
http://www.crustulus.de/cgi-bin/blog.cgi?de-0
Freies Latein-Deutsch-Wörterbuch: http://www.crustulus.de/freedict.de.html
FreeDict: Free multilingual dictionary databases - http://www.freedict.org


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

Re: Registration of LO extensions

2014-10-24 Thread Sebastian Humenda

Hi,

Rene Engelhard schrieb am 12.10.2014, 19:40 +0200:
>On Sun, Oct 12, 2014 at 02:42:15PM +0100, Sebastian Humenda wrote:
>> >It's supposed to pick it up automatically.
>> >
>> >> get debugging information if Libreoffice didn't pick up the extension for 
>> >> some
>> >> reason?
>> >
>> >What does unopkg list --bundled (or validate --bundled) say. Does it appear
>> $ unopkg list --bundled
>> All deployed bundled extensions:
>> 
>> 
>
>And validate --bundled?
>If also not, it probably isn't seen at all...
No, nothing.

>> Searching the web, I was not able to find information about which files are
>> relevant for this recognition process at all, only about how to invoke unopkg
>> with an OXT extension.
>
>Yeah, because this is supposed to be only used for "bundled" extensions.
Hence the word :).

>Does it have a proper description.xml? (And or META-INF/manifest.xml)?
>But when  that isn't present a unopkg add .oxt shouldn't have worked either.
>Does that work?
It turns out that it doesn't.

$ unopg  add -v *.oxt

ERROR: unsatisfied dependencies
   Cause: (com.sun.star.deployment.DependencyException) { { Message = 
"unsatisfied dependencies", Context = (com.sun.star.uno.XInterface) @91ec368 }, 
UnsatisfiedDependencies = ([]com.sun.star.xml.dom.XElement) { @91f7c8c } }

unopkg failed.

I've attached the description.xml, which you probably already have seen. Is it
because it depends on OO instead of LO?

Thanks
Sebastian
-- 
Web: http://www.crustulus.de | Blog: 
http://www.crustulus.de/cgi-bin/blog.cgi?de-0
Freies Latein-Deutsch-Wörterbuch: http://www.crustulus.de/freedict.de.html
FreeDict: Free multilingual dictionary databases - http://www.freedict.org


description.xml
Description: XML document


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 21 commits - basctl/source configure.ac connectivity/source dbaccess/qa dbaccess/source dbaccess/uiconfig download.lst external/nss

2014-10-24 Thread Caolán McNamara

 basctl/source/basicide/moduldl2.cxx |   10 
 configure.ac|2 
 connectivity/source/commontools/DateConversion.cxx  |6 
 connectivity/source/parse/sqlbison.y|8 
 dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java |2 
 dbaccess/source/core/api/RowSet.cxx |2 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx  |2 
 dbaccess/uiconfig/ui/specialsettingspage.ui |2 
 download.lst|2 
 external/nss/ExternalProject_nss.mk |2 
 external/nss/nss-linux-x86.patch.0  |   12 
 external/nss/nss-pem.patch  |   17 +
 external/nss/nss.aix.patch  |  133 -
 external/nss/nss.patch  |  160 ++--
 external/nss/nss_macosx.patch   |   41 +--
 filter/source/graphicfilter/icgm/actimpr.cxx|   67 +
 filter/source/graphicfilter/icgm/bundles.cxx|   10 
 filter/source/graphicfilter/icgm/cgm.cxx|   41 ++-
 filter/source/graphicfilter/icgm/cgm.hxx|5 
 filter/source/graphicfilter/icgm/outact.cxx |   35 --
 i18npool/source/localedata/data/lt_LT.xml   |9 
 readlicense_oo/docs/readme.xrm  |2 
 sc/source/core/data/column.cxx  |6 
 sc/source/core/data/document10.cxx  |4 
 sc/source/core/data/formulacell.cxx |2 
 sc/source/ui/undo/undoblk3.cxx  |   23 -
 sc/source/ui/view/viewfun6.cxx  |   24 +
 svtools/source/contnr/svimpbox.cxx  |2 
 sw/CppunitTest_sw_odfimport.mk  |3 
 sw/qa/extras/odfimport/data/bnc800714.fodt  |   35 ++
 sw/qa/extras/odfimport/odfimport.cxx|   11 
 sw/qa/extras/rtfimport/data/fdo84679.rtf|   12 
 sw/qa/extras/rtfimport/rtfimport.cxx|   11 
 sw/source/core/bastyp/breakit.cxx   |2 
 sw/source/core/text/frmform.cxx |7 
 sw/source/core/uibase/docvw/edtwin2.cxx |   17 +
 sw/source/core/uibase/inc/edtwin.hxx|5 
 vcl/source/control/edit.cxx |2 
 vcl/source/gdi/pdfwriter_impl.cxx   |2 
 vcl/source/outdev/text.cxx  |2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |   11 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |9 
 42 files changed, 443 insertions(+), 317 deletions(-)

New commits:
commit 52f771da33675841d0d9854c5bbd2561760e2afd
Author: CaolÃ¡n McNamara 
Date:   Tue Oct 14 13:16:49 2014 +0100

valgrind: multiple problems in cgm filter

valgrind: Mismatched free() / delete / delete []

(cherry picked from commit 4d82ccb1edcc700f1ff8387ec51ac8114d5d77e3)

valgrind: Mismatched free() / delete / delete []

(cherry picked from commit 61550120b45640898677c7f765a491737445954f)

valgrind: Source and destination overlap in memcpy

(cherry picked from commit b2b5bc10b6574e4717f651602c970bdb20abd1a7)

sal_True->true

(cherry picked from commit aeea1cab4300371797fc1283c1e8623fa8238908)

check for short reads

(cherry picked from commit 2e234939874575a41673b3ceb4a759afa3b333aa)

valgrind: multiple errors

(cherry picked from commit b251762c6549639975a7e9962c9fb5b365ef2063)

stray ;s all other the place

(cherry picked from commit 740617901dc2e7a1effd211c755ea9d00b32094b)

valgrind: init GroupLevels

(cherry picked from commit b13591d48f58b45f4465ce03bd1248ec1e95584f)

Change-Id: Idccebc826ade29a507e115108d20fd461b7bb4ec
Reviewed-on: https://gerrit.libreoffice.org/11977
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx 
b/filter/source/graphicfilter/icgm/actimpr.cxx
index 8db2cc3..ba96bde 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -74,9 +74,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const 
uno::Reference< frame::XMod
 }
 mpCGM->mbStatus = bStatRet;
 }
-};
-
-
+}
 
 bool CGMImpressOutAct::ImplInitPage()
 {
@@ -176,9 +174,7 @@ void CGMImpressOutAct::ImplSetLineBundle()
 aAny <<= aLineDash;
 maXPropSet->setPropertyValue( "LineDash", aAny );
 }
-};
-
-
+}
 
 void CGMImpressOutAct::ImplSetFillBundle()
 {
@@ -343,9 +339,7 @@ voi

[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - 6 commits - chart2/inc chart2/source

2014-10-24 Thread Kohei Yoshida

 chart2/inc/ChartModel.hxx |  576 --
 chart2/inc/ChartView.hxx  |1 
 chart2/source/inc/macros.hxx  |1 
 chart2/source/view/axes/VCoordinateSystem.cxx |   30 +
 chart2/source/view/inc/VCoordinateSystem.hxx  |   10 
 chart2/source/view/main/ChartView.cxx |   86 +--
 6 files changed, 370 insertions(+), 334 deletions(-)

New commits:
commit 7d0df998f7eb9e3a6f65f3a44c26d94e1a1ced7e
Author: Kohei Yoshida 
Date:   Fri Oct 17 11:20:10 2014 -0400

Add macro to enable/disable axis shape caching.

Disabled for now.

Change-Id: I6aa4e9b28222633abccb80b33d1068c57046448d

diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index d155c45..4308dbe 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -211,7 +211,6 @@ private: //methods
   , bool bUseHighContrast );
 SdrPage* getSdrPage();
 
-void impl_deleteCoordinateSystems();
 void impl_notifyModeChangeListener( const OUString& rNewMode );
 
 void impl_refreshAddIn();
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 2319afe..9e620f5 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -31,6 +31,7 @@
 ex.Message )
 
 #define ENABLE_GL3D_BARCHART 1
+#define ENABLE_AXIS_SHAPE_CACHE 0
 
 #endif
 
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx 
b/chart2/source/view/axes/VCoordinateSystem.cxx
index 7b6e02b..25b7149 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -94,6 +94,7 @@ VCoordinateSystem::~VCoordinateSystem()
 {
 }
 
+#if ENABLE_AXIS_SHAPE_CACHE
 void VCoordinateSystem::reset()
 {
 m_xLogicTargetForGrids.clear();
@@ -120,6 +121,7 @@ void VCoordinateSystem::reset()
 
 m_aAxisMap.clear(); // TODO : switch to reset() later.
 }
+#endif
 
 void VCoordinateSystem::initPlottingTargets(  const Reference< 
drawing::XShapes >& xLogicTarget
, const Reference< drawing::XShapes >& xFinalTarget
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx 
b/chart2/source/view/inc/VCoordinateSystem.hxx
index f94beba..482fdc5 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -24,6 +24,7 @@
 #include "ThreeDHelper.hxx"
 #include "ExplicitCategoriesProvider.hxx"
 #include "chartview/ExplicitScaleValues.hxx"
+#include 
 
 #include 
 #include 
@@ -51,7 +52,9 @@ public:
 static VCoordinateSystem* createCoordinateSystem( const 
::com::sun::star::uno::Reference<
 ::com::sun::star::chart2::XCoordinateSystem >& 
xCooSysModel );
 
+#if ENABLE_AXIS_SHAPE_CACHE
 void reset();
+#endif
 
 virtual void initPlottingTargets(
   const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 439d1f6..9774a29 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -378,14 +378,31 @@ VCoordinateSystem* addCooSysToList( std::vector< 
VCoordinateSystem* >& rVCooSysL
 return pVCooSys;
 }
 
+void deleteCoordinateSystems( std::vector& rVCooSysList )
+{
+::std::vector< VCoordinateSystem* > aVectorToDeleteObjects;
+aVectorToDeleteObjects.swap(rVCooSysList); //#i109770#
+::std::vector< VCoordinateSystem* >::const_iterator   aIter = 
aVectorToDeleteObjects.begin();
+const ::std::vector< VCoordinateSystem* >::const_iterator aEnd  = 
aVectorToDeleteObjects.end();
+for( ; aIter != aEnd; ++aIter )
+{
+delete *aIter;
+}
+aVectorToDeleteObjects.clear();
+}
+
 void SeriesPlotterContainer::resetCoordinateSystems()
 {
+#if ENABLE_AXIS_SHAPE_CACHE
 std::vector::iterator it = m_rVCooSysList.begin(), 
itEnd = m_rVCooSysList.end();
 for (; it != itEnd; ++it)
 {
 VCoordinateSystem* p = *it;
 p->reset();
 }
+#else
+deleteCoordinateSystems(m_rVCooSysList);
+#endif
 }
 
 void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
@@ -1184,21 +1201,7 @@ ChartView::~ChartView()
 m_pDrawModelWrapper.reset();
 }
 m_xDrawPage = NULL;
-impl_deleteCoordinateSystems();
-}
-
-void ChartView::impl_deleteCoordinateSystems()
-{
-//delete all coordinate systems
-::std::vector< VCoordinateSystem* > aVectorToDeleteObjects;
-::std::swap( aVectorToDeleteObjects, m_aVCooSysList );//#i109770#
-::std::vector< VCoordinateSystem* >::const_iterator   aIter = 
aVectorToDeleteObjects.begin();
-const ::std::vector< VCoordinateSystem* >::const_iterator aEnd  = 
aVectorToDeleteObjects.end();
-for( ; aIter != aEnd; ++aIter )
-{
-delete *aIter;
-}
-aVectorToDeleteObjects.clear();
+deleteCoordinateSystems(m_aVCooSysList);
 }
 
 // datatransfer::XTransferable
commit e01fece99fdbb62cf9e0003a7463f91a1d540b99
Author: Kohei Yoshida 
Date:   Thu Oc

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

2014-10-24 Thread Michael Stahl

 chart2/qa/extras/chart2export.cxx |   11 ++-
 chart2/qa/extras/chart2import.cxx |   12 ++--
 sd/source/ui/unoidl/unomodel.cxx  |2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit f5e135bb250e3f5fdae9e7b48cc4e92f027b65d8
Author: Michael Stahl 
Date:   Thu Oct 16 22:35:10 2014 +0200

chart2: fix temp file leaks in Chart2ExportTest

Change-Id: Id128f19dee056189a34a02156fd0bf3ac14c2454

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 38bd92f..fc29305 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -40,6 +40,8 @@ public:
 void test();
 void testErrorBarXLSX();
 void testTrendline();
+void testTrendlineOOXML();
+void testTrendlineXLS();
 void testStockChart();
 void testBarChart();
 void testCrosses();
@@ -82,6 +84,8 @@ public:
 CPPUNIT_TEST(test);
 CPPUNIT_TEST(testErrorBarXLSX);
 CPPUNIT_TEST(testTrendline);
+CPPUNIT_TEST(testTrendlineOOXML);
+CPPUNIT_TEST(testTrendlineXLS);
 CPPUNIT_TEST(testStockChart);
 CPPUNIT_TEST(testBarChart);
 CPPUNIT_TEST(testCrosses);
@@ -410,17 +414,22 @@ void Chart2ExportTest::testTrendline()
 checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
 reload("calc8");
 checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
+}
 
+void Chart2ExportTest::testTrendlineOOXML()
+{
 load("/chart2/qa/extras/data/ods/", "trendline.ods");
 checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
 reload("Calc Office Open XML");
 checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
+}
 
+void Chart2ExportTest::testTrendlineXLS()
+{
 load("/chart2/qa/extras/data/ods/", "trendline.ods");
 checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
 reload("MS Excel 97");
 checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
-
 }
 
 void Chart2ExportTest::testStockChart()
commit 9a1889f0cb87fe50bb1f6b2afd7ff7c3ebe20590
Author: Michael Stahl 
Date:   Thu Oct 16 18:44:32 2014 +0200

chart2: fix temp file leak caused by missing tearDown() between tests

Change-Id: Ia4ee76743c640c0c5b92ec169e619f6c8788480e

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 0a70fc9..4d0eb23 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -54,6 +54,7 @@ public:
 void testFlatODSStackedColumnChart();
 void testFdo78080();
 void testFdo54361();
+void testFdo54361_1();
 void testAutoBackgroundXLSX();
 void testTextCanOverlapXLSX();
 void testNumberFormatsXLSX();
@@ -84,6 +85,7 @@ public:
 CPPUNIT_TEST(testFlatODSStackedColumnChart);
 CPPUNIT_TEST(testFdo78080);
 CPPUNIT_TEST(testFdo54361);
+CPPUNIT_TEST(testFdo54361_1);
 CPPUNIT_TEST(testAutoBackgroundXLSX);
 CPPUNIT_TEST(testTextCanOverlapXLSX);
 CPPUNIT_TEST(testNumberFormatsXLSX);
@@ -610,9 +612,13 @@ void Chart2ImportTest::testTransparentBackground(OUString 
const & filename)
 
 CPPUNIT_ASSERT_MESSAGE("Background needs to be with solid fill style", 
aStyle == 1);
 }
+// 2 test methods here so that tearDown() can dispose the document
 void Chart2ImportTest::testFdo54361()
 {
 testTransparentBackground("fdo54361.xlsx");
+}
+void Chart2ImportTest::testFdo54361_1()
+{
 testTransparentBackground("fdo54361-1.xlsx");
 }
 
commit 6e355d95614e04282620574c89ff63fd3405c14e
Author: Michael Stahl 
Date:   Thu Oct 16 13:27:27 2014 +0200

Revert "at least fix the crash when calling SdXImpressDocument::dispose

... for now"

This reverts commit 599473a13e3c5ba669d995c913ad415bd674a16c.

moggi says the unspecified crash happened with the tests following the
comment in chart2import.cxx:75, but the tests run fine in valgrind now.

The commit creates a memory leak in the CppunitTests as
SfxBaseModel::dispose() returns early, because mbDisposed is set.

Change-Id: I987dce6a4090784d166a4a3b2e7f9e2c0cddd289

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 3b1f1e7..0a70fc9 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -71,12 +71,6 @@ public:
 CPPUNIT_TEST(testODTChartSeries);
 CPPUNIT_TEST(testDOCChartSeries);
 CPPUNIT_TEST(testDOCXChartSeries);
-/*
- *  Disabling Impress Uts.
- *  ChartTest::tearDown() calls dispose of mxComponent
- *  this causes the UT to crash in sd.
- *  sd::DrawView::Notify tries to reset by calling 
sd::DrawViewShell::ResetActualPage
- */
 CPPUNIT_TEST(testPPTChartSeries);
 CPPUNIT_TEST(testPPTXChartSeries);
 CPPUNIT_TEST(testPPTXHiddenDataSeries);
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index be94ae7..f5e7065 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2399,8 +2399,8 @@ void S

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

2014-10-24 Thread Noel Grandin

 o3tl/qa/test-typed_flags.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9a5e03b8c9d422de43e899e3f880a03dc5c50d84
Author: Noel Grandin 
Date:   Tue Oct 14 14:36:44 2014 +0200

need explicit bool conversions here

to make some tinderboxes happy

Change-Id: I136895674cec8eda874acda0bf5c7a96b3a22778

diff --git a/o3tl/qa/test-typed_flags.cxx b/o3tl/qa/test-typed_flags.cxx
index de6e080..d5b5ff7 100644
--- a/o3tl/qa/test-typed_flags.cxx
+++ b/o3tl/qa/test-typed_flags.cxx
@@ -42,10 +42,10 @@ public:
 CPPUNIT_ASSERT( ~ConfigurationChangedHint::ONE );
 
 nHint |= ConfigurationChangedHint::ONE;
-CPPUNIT_ASSERT( nHint |= ConfigurationChangedHint::ONE );
+CPPUNIT_ASSERT( bool(nHint |= ConfigurationChangedHint::ONE) );
 
 nHint &= ConfigurationChangedHint::ONE;
-CPPUNIT_ASSERT( nHint &= ConfigurationChangedHint::ONE );
+CPPUNIT_ASSERT( bool(nHint &= ConfigurationChangedHint::ONE) );
 }
 
 // Change the following lines only, if you add, remove or rename
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - instsetoo_native/CustomTarget_install.mk

2014-10-24 Thread Andras Timar

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

New commits:
commit 561581cd39022e82a0bc961be7c2406dfb1b94f3
Author: Andras Timar 
Date:   Tue Jun 3 11:29:52 2014 +0200

Multilingual Mac OS X DMG for Collabora

Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index ea03413..3febfad 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -110,7 +110,7 @@ ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk
 endif
 else # LIBO_TEST_INSTALL
-   $(call instsetoo_native_install_command,openoffice,$(if $(filter 
WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
+   $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT 
MACOSX,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT))
 endif
@@ -118,7 +118,7 @@ ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter 
MACOSX,$(OS)))
$(foreach lang,$(gb_HELP_LANGS),\
$(call 
instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT)))
 endif
-ifneq (WNT,$(OS))
+ifeq (,$(filter WNT MACOSX,$(OS)))
$(foreach lang,$(instsetoo_native_WITH_LANG),\
$(call 
instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT)))
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/am source/as source/es source/hr source/lt source/nl source/ru source/th source/uk source/zh-CN

2014-10-24 Thread Christian Lohmaier

 source/am/helpcontent2/source/text/shared/04.po   |   10 
 source/as/readlicense_oo/docs.po  |   58 +-
 source/as/xmlsecurity/uiconfig/ui.po  |   31 -
 source/es/basic/source/classes.po |8 
 source/es/cui/source/dialogs.po   |   14 
 source/es/dbaccess/source/ui/querydesign.po   |8 
 source/es/extensions/source/dbpilots.po   |8 
 source/es/extensions/source/propctrlr.po  |8 
 source/es/helpcontent2/source/text/shared/02.po   |8 
 source/es/helpcontent2/source/text/shared/05.po   |8 
 source/es/helpcontent2/source/text/shared/guide.po|8 
 source/es/helpcontent2/source/text/shared/optionen.po |   46 -
 source/es/helpcontent2/source/text/swriter.po |   16 
 source/es/helpcontent2/source/text/swriter/01.po  |   12 
 source/es/helpcontent2/source/text/swriter/02.po  |8 
 source/es/helpcontent2/source/text/swriter/04.po  |   10 
 source/es/helpcontent2/source/text/swriter/guide.po   |6 
 source/es/officecfg/registry/data/org/openoffice/Office/UI.po |   10 
 source/es/sc/source/ui/src.po |6 
 source/es/svtools/source/dialogs.po   |   10 
 source/es/svx/source/src.po   |8 
 source/es/sw/source/core/uibase/lingu.po  |8 
 source/es/sw/source/ui/dialog.po  |8 
 source/es/sw/source/ui/dochdl.po  |8 
 source/es/sw/uiconfig/swriter/ui.po   |   10 
 source/es/swext/mediawiki/help.po |6 
 source/hr/sc/uiconfig/scalc/ui.po |   83 +--
 source/lt/cui/source/dialogs.po   |6 
 source/lt/cui/source/tabpages.po  |   20 
 source/lt/cui/uiconfig/ui.po  |  241 --
 source/lt/officecfg/registry/data/org/openoffice/Office.po|6 
 source/lt/officecfg/registry/data/org/openoffice/Office/UI.po |6 
 source/lt/reportdesign/source/ui/report.po|   10 
 source/lt/sc/source/ui/StatisticsDialogs.po   |   90 +--
 source/lt/sc/source/ui/src.po |   84 +--
 source/lt/sc/source/ui/styleui.po |   10 
 source/lt/sc/uiconfig/scalc/ui.po |6 
 source/lt/sfx2/uiconfig/ui.po |   10 
 source/lt/svtools/uiconfig/ui.po  |   20 
 source/lt/xmlsecurity/uiconfig/ui.po  |   47 +
 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po |   10 
 source/ru/helpcontent2/source/text/swriter/01.po  |   36 -
 source/ru/vcl/source/src.po   |   24 
 source/ru/wizards/source/euro.po  |8 
 source/ru/wizards/source/template.po  |   11 
 source/th/sc/source/ui/src.po |6 
 source/uk/helpcontent2/source/text/sbasic/shared.po   |   84 +--
 source/zh-CN/helpcontent2/source/text/schart/01.po|   14 
 source/zh-CN/helpcontent2/source/text/shared/01.po|   18 
 49 files changed, 590 insertions(+), 601 deletions(-)

New commits:
commit 4e45711904895e392a4b95433f3996e9c6625871
Author: Christian Lohmaier 
Date:   Sun Oct 19 22:15:24 2014 +0200

another update before 4.4.0.0alpha1

Change-Id: Ic4cbf04e49ee64106c0a13ed5ce74e897a24e233

diff --git a/source/am/helpcontent2/source/text/shared/04.po 
b/source/am/helpcontent2/source/text/shared/04.po
index c0c7bea..b4adfb6 100644
--- a/source/am/helpcontent2/source/text/shared/04.po
+++ b/source/am/helpcontent2/source/text/shared/04.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2013-11-20 13:02+0100\n"
-"PO-Revision-Date: 2013-12-30 23:56+\n"
+"POT-Creation-Date: 2014-05-02 00:10+0200\n"
+"PO-Revision-Date: 2014-10-18 15:07+\n"
 "Last-Translator: Samson \n"
 "Language-Team: LANGUAGE \n"
 "Language: am\n"
@@ -12,9 +12,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Pootle 2.5.1\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1388447779.0\n"
+"X-POOTLE-MTIME: 1413644869.00\n"
 
 #: 0101.xhp
 msgctxt ""
@@ -2134,7 +2134,7 @@ msgctxt ""
 "343\n"
 "help.text"
 msgid "Activates the first drawing object in the document."
-msgstr ""
+msgstr "á

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

2014-10-24 Thread YiiChang Yen

 solenv/bin/modules/installer/windows/msiglobal.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a001eab07650402a39948af086e836a043412e00
Author: YiiChang Yen 
Date:   Thu Oct 16 12:37:40 2014 +0800

Fix MSI comment when productname contains whitespace

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

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index f65dada..11340fd 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -625,7 +625,7 @@ sub write_summary_into_msi_database
 my $title = "\"Installation database\"";
 my $author = get_author_for_sis();
 my $subject = get_subject_for_sis($allvariableshashref);
-my $comment = $allvariableshashref->{'PRODUCTNAME'};
+my $comment = "\"" . $allvariableshashref->{'PRODUCTNAME'} ."\"";
 my $keywords = "\"Install,MSI\"";
 my $appname = "\"Windows Installer\"";
 my $security = get_security_for_sis();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Stephan Bergmann

 sc/source/filter/excel/xltools.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 413210a5036486dc1777565c3c69b2eda68b3f93
Author: Stephan Bergmann 
Date:   Thu Oct 23 15:27:37 2014 +0200

Avoid left shift of negative values (ubsan)

Change-Id: Ie4f6a4e3e54770c00741cc268ed9e27ecafac500

diff --git a/sc/source/filter/excel/xltools.cxx 
b/sc/source/filter/excel/xltools.cxx
index 38b6dd0..3c6d0f2 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -135,9 +135,10 @@ bool XclTools::GetRKFromDouble( sal_Int32& rnRKValue, 
double fValue )
 fFrac = modf( fValue, &fInt );
 if( (fFrac == 0.0) && (fInt >= -536870912.0) && (fInt <= 536870911.0) ) // 
2^29
 {
-rnRKValue = static_cast< sal_Int32 >( fInt );
-rnRKValue <<= 2;
-rnRKValue |= EXC_RK_INT;
+rnRKValue
+= static_cast(
+static_cast(static_cast(fInt)) << 2)
+| EXC_RK_INT;
 return true;
 }
 
@@ -145,9 +146,10 @@ bool XclTools::GetRKFromDouble( sal_Int32& rnRKValue, 
double fValue )
 fFrac = modf( fValue * 100.0, &fInt );
 if( (fFrac == 0.0) && (fInt >= -536870912.0) && (fInt <= 536870911.0) )
 {
-rnRKValue = static_cast< sal_Int32 >( fInt );
-rnRKValue <<= 2;
-rnRKValue |= EXC_RK_INT100;
+rnRKValue
+= static_cast(
+static_cast(static_cast(fInt)) << 2)
+| EXC_RK_INT100;
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/perfwork2' - 0 commits -

2014-10-24 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

OS X: coinmp is not using install_name_tool

2014-10-24 Thread Robert Antoni Buj i Gelonch

otool -L /Applications/LibreOfficeDev.app/Contents/Frameworks/*.dylib |
grep coinmp

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib
(compatibility version 12.0.0, current version 12.8.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib
(compatibility version 10.0.0, current version 10.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib
(compatibility version 13.0.0, current version 13.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib
(compatibility version 13.0.0, current version 13.11.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbcSolver.3.dylib
(compatibility version 12.0.0, current version 12.8.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib
(compatibility version 10.0.0, current version 10.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib
(compatibility version 13.0.0, current version 13.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib
(compatibility version 13.0.0, current version 13.11.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib
(compatibility version 12.0.0, current version 12.8.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib
(compatibility version 10.0.0, current version 10.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib
(compatibility version 13.0.0, current version 13.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib
(compatibility version 13.0.0, current version 13.11.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib
(compatibility version 13.0.0, current version 13.11.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinMP.1.dylib
(compatibility version 9.0.0, current version 9.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbcSolver.3.dylib
(compatibility version 12.0.0, current version 12.8.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib
(compatibility version 12.0.0, current version 12.8.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib
(compatibility version 10.0.0, current version 10.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib
(compatibility version 13.0.0, current version 13.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib
(compatibility version 13.0.0, current version 13.11.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib
(compatibility version 13.0.0, current version 13.11.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib
(compatibility version 13.0.0, current version 13.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib
(compatibility version 13.0.0, current version 13.11.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib
(compatibility version 13.0.0, current version 13.5.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib
(compatibility version 13.0.0, current version 13.11.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib
(compatibility version 14.0.0, current version 14.6.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib
(compatibility version 12.0.0, current version 12.8.0)

/Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbcSolver.3.dylib
(compatibility version 12.0.0, current version 12.8.0)

/Volumes/Maste

Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8

2014-10-24 Thread Alexander Thurgood

Le 20/10/2014 10:03, Tor Lillqvist a écrit :
> Stephan pointed me to old discussion
> in https://bugs.libreoffice.org/show_bug.cgi?id=74877 , and that is
> relevant also for OS X 10.10 and Java 1.8, it seems that one (sadly)
> really needs to install the Apple-supplied Java 1.6 in order to use an
> Oracle-supplied leading-edge Java (1.7 or 1.8) with LibreOffice.
> 

I encountrered this very same problem, and solved it by installing the
appropriate  JavaforOSX2014-001.dmg, which allowed my build to complete
the debug tests, but this apparently also has consequences for use of
third party jdbc drivers that rely on JDK 1.8


Alex

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

[Libreoffice-commits] core.git: 8 commits - officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk reportdesign/source scp2/source scripting/source sc/source sd/s

2014-10-24 Thread Caolán McNamara

 officecfg/Configuration_officecfg.mk |1 
 officecfg/registry/data/org/openoffice/Office/Common.xcu |5 -
 postprocess/CustomTarget_registry.mk |5 -
 reportdesign/source/ui/dlg/CondFormat.cxx|2 
 sc/source/ui/miscdlgs/conflictsdlg.cxx   |4 -
 scp2/source/ooo/common_brand.scp |8 --
 scripting/source/provider/ActiveMSPList.cxx  |   43 +++
 scripting/source/provider/ActiveMSPList.hxx  |5 +
 sd/source/ui/controller/slidelayoutcontroller.cxx|2 
 sw/source/core/layout/paintfrm.cxx   |2 
 unoidl/source/sourcefileprovider.cxx |5 -
 11 files changed, 32 insertions(+), 50 deletions(-)

New commits:
commit e0108fa4fc954f39ef56b841dceb6a2d27d5618c
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 24 12:51:33 2014 +0100

make Korean ReplaceSingleQuote the same as everyone else

I can find no evidence that Korean out of all languages on earth needs a
different default for ReplaceSingleQuote

This appeared in

commit e9f10288e0e5f2519ff3da1e2de2c20a99fd9779
Date:   Mon Jul 5 12:32:15 2004 +
2004/06/07 18:46:25 jb 1.14.78.1: #i25937# Add module settings 
(migrated from scp2) to xcu source files

but that's a migration of the original
GID_CONFIGURATIONITEM_SWRITER_KOREAN_ENABLE_SINGLEQUOTE which existed in the
original scp (pre scp2) and appeared between OpenOffice.org 1.0 and 1.1.5, 
but
the cvs repos to explain all that are long dead and there is no sign of a 
bug
in a bugzilla query, so it suggests this was an internal StarOffice thing.

Change-Id: I14dfe75d28d3ec5a68b262f768c7dbe73e94131d

diff --git a/officecfg/Configuration_officecfg.mk 
b/officecfg/Configuration_officecfg.mk
index 5f345b7..7e2af03 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -94,7 +94,6 @@ $(eval $(call 
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Common-cjk.xcu \
org/openoffice/Office/Common-ctl.xcu \
org/openoffice/Office/Common-ctlseqcheck.xcu \
-   org/openoffice/Office/Common-korea.xcu \
org/openoffice/Office/DataAccess-evoab2.xcu \
org/openoffice/Office/DataAccess-reportbuilder.xcu \
org/openoffice/Office/Paths-macosx.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 6225b9e..407be35 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -139,11 +139,6 @@
   ${DICT_REPO_URL}
 
   
-  
-
-  true
-
-  
   
 
   
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 878be8d..a568832 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -27,7 +27,6 @@ postprocess_XCDS := \
draw.xcd \
graphicfilter.xcd \
impress.xcd \
-   korea.xcd \
librelogo.xcd \
lingucomponent.xcd \
main.xcd \
@@ -113,10 +112,6 @@ postprocess_FILES_librelogo := \
$(postprocess_MOD)/org/openoffice/Office/Addons-librelogo.xcu \

$(postprocess_MOD)/org/openoffice/Office/UI/WriterWindowState-librelogo.xcu
 
-postprocess_DEPS_korea := main
-postprocess_FILES_korea := \
-   $(postprocess_MOD)/org/openoffice/Office/Common-korea.xcu
-
 postprocess_DEPS_lingucomponent := main
 postprocess_FILES_lingucomponent := \

$(SRCDIR)/lingucomponent/config/Linguistic-lingucomponent-hyphenator.xcu \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 0551e95..8c08811 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -104,7 +104,6 @@ Module gid_Module_Langpack_Brand_Template
 gid_Brand_Dir_Readme);
 Files = (gid_Brand_File_Readme_Readme,
  gid_Brand_File_Share_Registry_Cjk_Xcd,
- gid_Brand_File_Share_Registry_Korea_Xcd,
  gid_Brand_File_Txt_Readme);
 End
 
@@ -621,13 +620,6 @@ File gid_Brand_File_Share_Registry_Cjk_Xcd
 Name (zh-TW) = "cjk.xcd";
 End
 
-File gid_Brand_File_Share_Registry_Korea_Xcd
-TXT_FILE_BODY;
-Styles = (PACKED);
-Dir = gid_Brand_Dir_Share_Registry;
-Name (ko) = "korea.xcd";
-End
-
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Base
 TXT_FILE_BODY;
commit 7fd9b8268f87831e2728b5def34cc5e97ed16ab0
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 24 11:46:14 2014 +0100

coverity#1212506 no need for ? : here

Change-Id: I771a59979ffa628c93421d65b2078292e104eeed

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 57cbeb7..8c177fc 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/

RE: tracking down reference counting memory leaks

2014-10-24 Thread nicholas ferguson

>Michael wrote
>but the advantage is that searching for "hack_acquire" in valgrind's output
very quickly finds the actual leak.

what is your analysis of why there is a leak in uno::Reference, and where
did you find it.  Was your correction  a small bit of?



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

[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configmgr/source configure.ac solenv/gbuild

2014-10-24 Thread Tor Lillqvist

 config_host.mk.in |1 +
 configmgr/source/parsemanager.cxx |5 -
 configmgr/source/parsemanager.hxx |1 +
 configure.ac  |9 +
 solenv/gbuild/gbuild.mk   |6 ++
 5 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 6addde24f43d4d77cd459ef1d34df84cdad49d8f
Author: Tor Lillqvist 
Date:   Thu Oct 23 12:58:56 2014 +0300

Add --enable-sal-info

Change-Id: I014d70ace7ce34b804ea2a018d3de8f94f7e0cbc

diff --git a/config_host.mk.in b/config_host.mk.in
index e55b3f5..4de9201 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -165,6 +165,7 @@ export ENABLE_RANDR=@ENABLE_RANDR@
 export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
 export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
 export ENABLE_RUNTIME_OPTIMIZATIONS=@ENABLE_RUNTIME_OPTIMIZATIONS@
+export ENABLE_SAL_INFO=@ENABLE_SAL_INFO@
 export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
 export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
diff --git a/configure.ac b/configure.ac
index 9507847..a72e4a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1015,6 +1015,10 @@ AC_ARG_ENABLE(debug,
 [Include debugging information, disable compiler optimization and 
inlining plus
  extra debugging code like assertions. Extra large build! (enables -g 
compiler flag).]))
 
+AC_ARG_ENABLE(sal-info,
+AS_HELP_STRING([--enable-sal-info],
+[Make SAL_INFO and SAL_WARN calls do something even in a non-debug 
build.]))
+
 AC_ARG_ENABLE(selective-debuginfo,
 AS_HELP_STRING([--enable-selective-debuginfo],
 [If --enable-debug or --enable-dbgutil is used, build debugging 
information
@@ -3801,6 +3805,11 @@ AC_SUBST(ENABLE_DEBUG)
 AC_SUBST(ANDROID_DEBUGGABLE)
 AC_SUBST(ANDROID_INSTALL_LOCATION)
 
+if test "$enable_sal_info" = yes; then
+ENABLE_SAL_INFO=TRUE
+fi
+AC_SUBST(ENABLE_SAL_INFO)
+
 dnl Selective debuginfo
 ENABLE_DEBUGINFO_FOR=
 if test -n "$ENABLE_DEBUG"; then
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 294c7d1..5c02a19 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -239,6 +239,12 @@ gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
+ifeq ($(ENABLE_SAL_INFO),TRUE)
+gb_GLOBALDEFS += -DSAL_LOG_INFO \
+-DSAL_LOG_WARN \
+
+endif
+
 else
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 -DSAL_LOG_WARN \
commit 2593d96b8d03fd1d4f17b05882a09687c47471c5
Author: Tor Lillqvist 
Date:   Thu Oct 23 12:31:58 2014 +0300

Log parsing time of each xcd file

Change-Id: I290e2c84b17b9b5063139c6027b72f6cd3a78a99

diff --git a/configmgr/source/parsemanager.cxx 
b/configmgr/source/parsemanager.cxx
index fcbb190..008f2bf 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -35,7 +35,7 @@ namespace configmgr {
 
 ParseManager::ParseManager(
 OUString const & url, rtl::Reference< Parser > const & parser)
-   : reader_(url), parser_(parser), itemNamespaceId_(-1)
+   : url_(url), reader_(url), parser_(parser), itemNamespaceId_(-1)
 {
 assert(parser.is());
 int id;
@@ -56,6 +56,7 @@ ParseManager::ParseManager(
 }
 
 bool ParseManager::parse(std::set< OUString > const * existingDependencies) {
+sal_uInt32 startTime( osl_getGlobalTimer() );
 for (;;) {
 switch (itemData_.is()
 ? xmlreader::XmlReader::RESULT_BEGIN
@@ -66,6 +67,7 @@ bool ParseManager::parse(std::set< OUString > const * 
existingDependencies) {
 if (!parser_->startElement(
 reader_, itemNamespaceId_, itemData_, 
existingDependencies))
 {
+SAL_INFO("configmgr", "parsing " << url_ << " took " << 
(osl_getGlobalTimer() - startTime) << " ms, fail");
 return false;
 }
 break;
@@ -76,6 +78,7 @@ bool ParseManager::parse(std::set< OUString > const * 
existingDependencies) {
 parser_->characters(itemData_);
 break;
 case xmlreader::XmlReader::RESULT_DONE:
+SAL_INFO("configmgr", "parsing " << url_ << " took " << 
(osl_getGlobalTimer() - startTime) << " ms, success");
 return true;
 }
 itemData_.clear();
diff --git a/configmgr/source/parsemanager.hxx 
b/configmgr/source/parsemanager.hxx
index 85ed3c5..74fa131 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -47,6 +47,7 @@ public:
 enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
 
 private:
+OUString url_;
 virtual ~ParseManager();
 
 xmlreader::XmlReader reader_;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Stephan Bergmann

 sw/source/filter/basflt/fltini.cxx |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 5da5340a9f3dc938060323bda430ff671833d58f
Author: Stephan Bergmann 
Date:   Fri Oct 24 14:40:16 2014 +0200

Cater for gb_CppunitTest_use_library_objects,*,sw

...where the msword lib would not be located next to the test lib.  Probably
cleaner this way anyway.

Change-Id: I083503ef61fa8b6eabf6966a8a98bc7a225749eb

diff --git a/sw/source/filter/basflt/fltini.cxx 
b/sw/source/filter/basflt/fltini.cxx
index fca7555..74a4dc9 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -56,7 +56,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 using namespace utl;
 using namespace com::sun::star::uno;
@@ -113,16 +113,6 @@ inline void _SetFltPtr( sal_uInt16 rPos, SwRead pReader )
 aReaderWriter[ rPos ].pReader = pReader;
 }
 
-namespace {
-
-#ifndef DISABLE_DYNLOADING
-
-extern "C" { static void SAL_CALL thisModule() {} }
-
-#endif
-
-}
-
 namespace sw {
 
 Filters::Filters()
@@ -151,7 +141,9 @@ oslGenericFunction Filters::GetMswordLibSymbol( const char 
*pSymbol )
 {
 if (!msword_.is())
 {
-bool ok = msword_.loadRelative( &thisModule, SVLIBRARY( "msword" ), 
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
+OUString url("$LO_LIB_DIR/" SVLIBRARY("msword"));
+rtl::Bootstrap::expandMacros(url);
+bool ok = msword_.load( url, SAL_LOADMODULE_GLOBAL | 
SAL_LOADMODULE_LAZY );
 SAL_WARN_IF(!ok, "sw", "failed to load msword library");
 }
 if (msword_.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 24 commits - basic/source chart2/source codemaker/source connectivity/source cui/source filter/source framework/source idlc/source oox/source reportdesign/source sc/sou

2014-10-24 Thread Caolán McNamara

 basic/source/comp/exprnode.cxx  |5 
 chart2/source/controller/main/DrawCommandDispatch.cxx   |2 
 codemaker/source/cppumaker/cppumaker.cxx|9 
 codemaker/source/javamaker/javamaker.cxx|9 
 connectivity/source/drivers/jdbc/PreparedStatement.cxx  |2 
 cui/source/dialogs/pastedlg.cxx |8 
 filter/source/graphicfilter/icgm/cgm.cxx|5 
 filter/source/msfilter/escherex.cxx |6 
 filter/source/placeware/tempfile.cxx|   23 -
 framework/source/uielement/generictoolbarcontroller.cxx |6 
 idlc/source/idlcmain.cxx|  211 
 oox/source/drawingml/diagram/diagram.cxx|   15 -
 reportdesign/source/core/sdr/ReportDrawPage.cxx |   24 -
 reportdesign/source/core/sdr/RptPage.cxx|4 
 reportdesign/source/ui/report/SectionView.cxx   |4 
 sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx  |2 
 sd/source/ui/animations/CustomAnimationPane.cxx |   12 
 svx/source/table/tablecontroller.cxx|   24 -
 sw/source/core/undo/undobj1.cxx |1 
 sw/source/filter/html/htmlform.cxx  |4 
 sw/source/filter/ww8/ww8par.cxx |   13 
 21 files changed, 199 insertions(+), 190 deletions(-)

New commits:
commit d9dde5e57262e2fb91636ca5d1ee91cdb647ba05
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 24 09:22:57 2014 +0100

improve Sttb dumping for truncated case

Change-Id: Ie4c1d01540274e3782487d376168f561766b7a39

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0f049a4..90fcc8c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -458,9 +458,10 @@ public:
 OUString getStringAtIndex( sal_uInt32 );
 };
 
-Sttb::Sttb() : fExtend( 0 )
-,cData( 0 )
-,cbExtra( 0 )
+Sttb::Sttb()
+: fExtend(0)
+, cData(0)
+, cbExtra(0)
 {
 }
 
@@ -499,8 +500,12 @@ void Sttb::Print( FILE* fp )
 
 if ( cData )
 {
-for ( sal_Int32 index = 0; index < cData; ++index )
+for (sal_Int32 index = 0; index < cData; ++index)
+{
+if (index >= dataItems.size())
+fprintf(fp, "   Sttb truncated at entry %d(0x%x)\n", 
static_cast< int >( index ), static_cast< unsigned int >( index ));
 fprintf(fp,"   string dataItem[ %d(0x%x) ] has name %s\n", 
static_cast< int >( index ), static_cast< unsigned int >( index ), 
OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() );
+}
 }
 }
 #endif
commit a52028d55427aa1a2bc51aff307a2436f68576ad
Author: CaolÃ¡n McNamara 
Date:   Thu Oct 23 17:32:06 2014 +0100

coverity#1000601 Dereference after null check

Change-Id: I62a2c4661c9cca62e600ea2b679f2491c746210b

diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx 
b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index d75c081..4330c97 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -311,7 +311,7 @@ void ScChangeTrackingExportHelper::WriteEditCell(const 
ScCellValue& rCell)
 
 rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING);
 SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, 
XML_CHANGE_TRACK_TABLE_CELL, true, true);
-if (!sString.isEmpty())
+if (rCell.mpEditText && !sString.isEmpty())
 {
 if (!pEditTextObj)
 {
commit 927603576a8021fc1ce984ff6230fdda95b10517
Author: CaolÃ¡n McNamara 
Date:   Thu Oct 23 17:29:10 2014 +0100

coverity#1130394 Missing break in switch

Change-Id: I44d08e9ff9591afba1d0ceb3980292d62729d392

diff --git a/sw/source/filter/html/htmlform.cxx 
b/sw/source/filter/html/htmlform.cxx
index b4353db..cbd2e2f 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -2228,6 +2228,7 @@ void SwHTMLParser::NewSelect()
 
 case HTML_O_SDONFOCUS:
 eScriptType2 = STARBASIC;
+//fall-through
 case HTML_O_ONFOCUS:
 nEvent = HTML_ET_ONGETFOCUS;
 bSetEvent = true;
@@ -2235,6 +2236,7 @@ void SwHTMLParser::NewSelect()
 
 case HTML_O_SDONBLUR:
 eScriptType2 = STARBASIC;
+//fall-through
 case HTML_O_ONBLUR:
 nEvent = HTML_ET_ONLOSEFOCUS;
 bSetEvent = true;
@@ -2242,6 +2244,7 @@ void SwHTMLParser::NewSelect()
 
 case HTML_O_SDONCLICK:
 eScriptType2 = STARBASIC;
+//fall-through
 case HTML_O_ONCLICK:
 nEvent = HTML_ET_ONCLICK;
 bSetEvent = true;
@@ -2249,6 +2252,7 @@ void SwHTMLParser::NewSelect()
 
 case HTML_O_SDONCHANGE:
 eScriptType2 = STARBASIC;
+//fall-through
 case HTML_O_ONCHANGE:

Re: python in autogen

2014-10-24 Thread timllloyd

okay, I shall hang my head in shame and admit I didn't read the instructions
correctly (far easier to post than review your actions).

I issued a command "sudo yum-builddep libreofficeffice", didn't bother to
monitor what happened and just saw the "$" prompt.

I am now in a position to run the make.

Thanks Miklos & Christian



--
View this message in context: 
http://nabble.documentfoundation.org/python-in-autogen-tp4125657p4125834.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Minutes of ESC call: 2014-10-16

2014-10-24 Thread Jan Holesovsky

* Present: Caolán, Jacobo, Kendy, Andras, Miklos, Cloph, Muthu, Norbert, David, 
Bjoern, Robinson,
   Thorsten, LibreBaby, Michael S., Stephan, Eike

* Completed Action Items:
+ review https://gerrit #/c/11700/ (Andras, Caolan, Cloph etc.)
+ acquired magic number from Redhat (Caolan)
+ back-port calc sorting option to 4.3 - and drop the UI bits (Michael)
[ pending review by Eike? ]
+ comment & close fdo#84352 for 4.4 (Norbert)
 
* Pending Action Items:
+ Ask Bjoern B. to do a survey on the wrench icons (Kendy)
+ get BZ migration roadmap done before Seattle Hackfest (Robinson)
+ https://redmine.documentfoundation.org/issues/591
+ get a clear use-case & description of what doesn't work vs. master wrt. 
Calc sorting (JBF)
 
* Release Engineering update (Cloph)
+ 4.2.7 RC2
+ tagged yesterday, still building on Windows
+ will be announced later today
+ 4.3.3 RC2 is in ~1x weeks.
+ anything open there? (Bjoern)
+ quite a few for 4.3.x, but nothing for 4.3.3
+ 4.4
+ tomorrow the 1st Alpha: from master
+ feature freeze 5 weeks away still
+ should we use VS 2013 for that?
+ not sure what's the current state in master
+ IIRC the idea was to use the same as LLVM - that is 2012 (Miklos)
+ maybe better C++11 support? (Norbert)
+ there was a compiler bug that was not present in 2013 (Cloph)
+ some benefits of using 2013 (Stephan)
+ tinderboxes? (Norbert)
+ have both on my tinderbox (Cloph)
+ what about others?
+ the idea of alpha is to test if the tooling is in shape (Kendy)
+ conclusion: let's try to build Alpha with 2013 & see
+ Android Remote
 
* Crashtest update (Miklos)
+ 
http://dev-builds.libreoffice.org/crashtest/86c4762790823c338f018fb2f06c4a5fa4497916/
 (13-Oct-2014)
+ several hundred crashers caused by tools refactoring / boost (Miklos)
+ actually it was caused by another commit (David)
+ now fixed (Miklos)
+ the next round should be better again
+ the remaining is nothing outstanding

* Writer Regression Status (Bjoern)
+ went through the regressions (Bjoern)
+ 55 new worth bibisecting; the rest somehow bibisected or so pre-triaged
+ Norbert's new OSX bibisect repo going to the deeper history may be 
helpful too
AI  + take-away for QA: bring the prebibisect ones to the OSX QA guys 
(Robinson)
AI  + take-away for QA: focus on the ~half of these that is older than 
2014-08 (Robinson)
+ some "regressions" are just a change of behavior
AI  + Andras will have a look at those identified to a SUSE bugzilla bugfix
+ if the original behavior was only by luck / chance, worth closing as 
wontfix (Bjoern)
+ need a bugzilla query for the bugs that have been bisected to a single 
commit (Miklos)
AI  + can do that (Bjoern)
+ we have a keyword "bisected", can use that for those with exact commit
   + done: 
https://bugs.freedesktop.org/buglist.cgi?bug_status=NEW&component=Writer&keywords=bisected%2C%20&keywords_type=allwords&list_id=481507&product=LibreOffice&query_format=advanced
 
* LibreOffice 4.4 bibisects repo creation (Bjoern)
+ Bjoern creating, but Robinson should take over
+ but has time for that? - bugzilla migration a priority... (Bjoern)
+ Bjoern can do that at the time of the tag, but then is traveling
+ will update the baseline to Ubuntu 14.04 LTS
+ and not add to the 10GB 43all repo. Lets start a new repo with this 
release and baseline
+ we are still stuck with gcc 4.6 anyway (Stephan)
+ the old binary will still work on the 14.04 LTS (Norbert)
+ use Amazon's EC2? (Cloph)
+ can only update the baseline, and run it, nothing more (Bjoern)
 
* Hackfests
+ Seattle 'Libre-Fest' (Robinson)
https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest
+ October 26, 2014
+ ~20 people anticipated
+ Cloph can provide virtual machines for the hackfest on EC2
AI  + poke Cloph for access (Robinson)
+ Robinson will bring the bibisect repo locally, so that it is not
  necessary to download 10G
+ Toulouse Hackfest (Arnaud)
+ Confirmed for Nov. 15-16th
+ more details: 
https://wiki.documentfoundation.org/Hackfest/Toulouse2014
+ budget reserved (Eur 2k) - poke Bjoern.
+ [ just booked - Michael ]
+ Munich hack-fest (Jan-Marek):
http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/
+ jmux (IRC) can add you if you don't want to create an account
+ will have a BSP come-together; if someone says they're coming
  just show up etc.
   + November 21st-23rd, 2014
   https://wiki.debian.org/BSP/2014/11/de/Munich
   + we should drop by with 2 or 3 developers, if pos

Re: [Libreoffice-qa] Minutes of ESC call: 2014-10-16

2014-10-24 Thread Bjoern Michaelsen

On Fri, Oct 17, 2014 at 11:01:51AM -0400, Terrence Enger wrote:
> I have created a debian-sid chroot environment to avoid complaints
> about old libraries from the bibisect versions.  For example in
> debian-wheezy (i.e., stable), 43all version latest complains:

The alpha1 bibisect update is already building, I hope I can upload it still
before travelling.

Beyond that: Volunteers welcome, Im handing this over to Robinson for the 4.4
beta anyway -- after the Bugzilla migration, which currently has priority for
Robinson.

Best,

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-10-24 Thread bugzilla-daemon

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

Bug 84752 Summary: Document With Form Controls Unusable Speed
https://bugs.freedesktop.org/show_bug.cgi?id=84752

   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: cui/source include/vcl vcl/source

2014-10-24 Thread Stephan Bergmann

 cui/source/options/personalization.cxx |1 +
 include/vcl/builder.hxx|2 +-
 vcl/source/window/builder.cxx  |1 +
 vcl/source/window/window.cxx   |2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f5fc81616ccf45edd180cfb8c7002eb50284f90d
Author: Stephan Bergmann 
Date:   Wed Oct 22 13:14:43 2014 +0200

Avoid unnecessary #include

Change-Id: I6ec5de40ce2f4cbcce751dcae16dae60abbc1a37

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 5f02689..5399dab 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -18,6 +18,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index c314134..9d952c0 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -16,7 +16,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -39,6 +38,7 @@ class DateField;
 class TimeField;
 class VclExpander;
 class VclMultiLineEdit;
+namespace xmlreader { class XmlReader; }
 
 class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable
 {
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e534e41..e1e70c6 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f773bc2..8c1fe90 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -18,7 +18,7 @@
  */
 
 #include 
-
+#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

2014-10-24 Thread bugzilla-daemon

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

tommy27  changed:

   What|Removed |Added

 Depends on||85076

--- Comment #13 from tommy27  ---
I add Bug 85076 - F11 "Styles and Formatting" not working when sidebar hidden

probably a side effect of sidebar incorporation of that floating panel in 4.4.x
see: https://wiki.documentfoundation.org/ReleaseNotes/4.4#Sidebar_changes

-- 
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] dictionaries.git: Changes to 'refs/tags/cp-4.2-18'

2014-10-24 Thread Olivier R

Tag 'cp-4.2-18' created by Andras Timar  at 
2014-10-23 08:14 -0700

cp-4.2-18

Changes since cp-4.2-9:
Olivier R (1):
  French dictionary update: v5.2

---
 fr_FR/README_fr.txt   |   13 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |14658 +++---
 fr_FR/fr.dic  |15695 ++
 4 files changed, 15644 insertions(+), 14724 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Caolán McNamara

 sd/source/ui/animations/SlideTransitionPane.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 92360e7413daf35d6b3acf2e77cf3c6063c5f11f
Author: CaolÃ¡n McNamara 
Date:   Tue Oct 21 14:33:57 2014 +0100

Resolves: fdo#84417 restore focus window after preview

regression due to changes of sd/source/ui/slideshow/slideshow.cxx
in cc5518ca61b209408a9d5262bbdcc39efccdd72d

commit cc5518ca61b209408a9d5262bbdcc39efccdd72d
Author: Steve Yin 
Date:   Thu Nov 28 12:09:19 2013 +
Integrate branch of IAccessible2

Change-Id: I6b399d68c1f3ef32b702135b981100a23760569b

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index d319e9e..8221625 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -847,6 +847,8 @@ void SlideTransitionPane::applyToSelectedPages()
 {
 if( ! mbUpdatingControls )
 {
+Window *pFocusWindow = Application::GetFocusWindow();
+
 ::sd::slidesorter::SharedPageSelection pSelectedPages( 
getSelectedPages());
 impl::TransitionEffect aEffect = getTransitionEffectFromControls();
 if( ! pSelectedPages->empty())
@@ -863,6 +865,9 @@ void SlideTransitionPane::applyToSelectedPages()
 else
 stopEffects();
 }
+
+if (pFocusWindow)
+pFocusWindow->GrabFocus();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Andras Timar

 scp2/source/ooo/module_helppack.ulf |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit af24b627370f2eecc9222b555fc5c1ef393f5850
Author: Andras Timar 
Date:   Wed Oct 22 21:42:18 2014 +0200

scp2: fix language codes for sr-Latn and ca-valencia

Change-Id: I0fe5d3b305c5105e987fcae90f2733b373fecc73

diff --git a/scp2/source/ooo/module_helppack.ulf 
b/scp2/source/ooo/module_helppack.ulf
index 13e9ddd..2fcc6e5 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -15,7 +15,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
- 
+
 [STR_NAME_MODULE_ROOT_HELPPACK]
 en-US = "Additional help packs"
 
@@ -286,10 +286,10 @@ en-US = "Catalan"
 [STR_DESC_MODULE_HELPPACK_CA]
 en-US = "Installs Catalan help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_CA_XV]
+[STR_NAME_MODULE_HELPPACK_CA_VALENCIA]
 en-US = "Catalan (Valencian)"
 
-[STR_DESC_MODULE_HELPPACK_CA_XV]
+[STR_DESC_MODULE_HELPPACK_CA_VALENCIA]
 en-US = "Installs Catalan (Valencian) help in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_HELPPACK_DA]
@@ -400,10 +400,10 @@ en-US = "Galician"
 [STR_DESC_MODULE_HELPPACK_GL]
 en-US = "Installs Galician help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_SH]
+[STR_NAME_MODULE_HELPPACK_SR_LATN]
 en-US = "Serbian (Latin)"
 
-[STR_DESC_MODULE_HELPPACK_SH]
+[STR_DESC_MODULE_HELPPACK_SR_LATN]
 en-US = "Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_HELPPACK_GA]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 2 commits - android/mobile-config.py

2014-10-24 Thread Tor Lillqvist

 android/mobile-config.py |   33 +++--
 1 file changed, 7 insertions(+), 26 deletions(-)

New commits:
commit c7b363466023169c1aab5733c86b86713db80375
Author: Tor Lillqvist 
Date:   Wed Oct 22 11:54:22 2014 +0300

Bin duplicates

Change-Id: Ie6347ed6b9c1b8bee7a08950d5c67d4a2039fba5

diff --git a/android/mobile-config.py b/android/mobile-config.py
index d28c7c0..4cc6fa6 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -25,13 +25,11 @@ main_xcd_discard = [
 'org.openoffice.Office.UI/GenericCommands',
 'org.openoffice.Office/Accelerators',
 'org.openoffice.Office/UI',
-
 'org.openoffice.Office.UI/DrawImpressCommands',
 'org.openoffice.Office.UI/Sidebar',
 'org.openoffice.Office.UI/ChartCommands',
 'org.openoffice.Office.UI/DbuCommands',
 'org.openoffice.Office.UI/Controller',
-'org.openoffice.Office/UI',
 'org.openoffice.Office.UI/StartModuleCommands',
 'org.openoffice.Office.UI/BasicIDEWindowState',
 'org.openoffice.Office.UI/GenericCategories',
@@ -39,38 +37,18 @@ main_xcd_discard = [
 'org.openoffice.Office.UI/Factories',
 'org.openoffice.Office.UI/BaseWindowState',
 'org.openoffice.Office.UI/BasicIDECommands',
-'org.openoffice.Office.UI/Sidebar',
 'org.openoffice.Office.UI/BibliographyCommands',
 'org.openoffice.Office.UI/DbQueryWindowState',
 'org.openoffice.Office.UI/WindowState',
-'org.openoffice.Office.UI/Controller',
 'org.openoffice.Office.UI/DbRelationWindowState',
 'org.openoffice.Office.UI/DbTableWindowState',
 'org.openoffice.Office.UI/DbTableDataWindowState',
 'org.openoffice.Office.UI/DbBrowserWindowState',
 'org.openoffice.Office.UI/WindowContentFactories',
-'org.openoffice.Office.UI/Factories',
 'org.openoffice.Office.UI/StartModuleWindowState',
 'org.openoffice.Office.UI/GlobalSettings',
 'org.openoffice.Office.UI/Commands',
-'org.openoffice.Office.UI/BibliographyCommands',
-'org.openoffice.Office.UI/StartModuleCommands',
-'org.openoffice.Office.UI/DrawImpressCommands',
-'org.openoffice.Office.UI/BasicIDECommands',
-'org.openoffice.Office.UI/GenericCommands',
-'org.openoffice.Office.UI/ChartCommands',
-'org.openoffice.Office.UI/DbuCommands',
 'org.openoffice.Office.UI/BibliographyWindowState',
-'org.openoffice.Office.UI/StartModuleWindowState',
-'org.openoffice.Office.UI/DbTableDataWindowState',
-'org.openoffice.Office.UI/DbRelationWindowState',
-'org.openoffice.Office.UI/DbBrowserWindowState',
-'org.openoffice.Office.UI/BasicIDEWindowState',
-'org.openoffice.Office.UI/DbTableWindowState',
-'org.openoffice.Office.UI/DbQueryWindowState',
-'org.openoffice.Office.UI/ChartWindowState',
-'org.openoffice.Office.UI/BaseWindowState',
-'org.openoffice.Office.UI/GenericCategories',
 'org.openoffice.Office.UI/Category',
 ]
 
@@ -92,4 +70,11 @@ if __name__ == '__main__':
 saved = saved + size
 
 print "saved %d of %d bytes: %2.f%%" % (saved, total, saved*100.0/total)
+
+# The namespace prefixes xs and oor are present in attribute *values*, and 
namespace
+# declarations for them are needed, even if no actual elements or 
attributes with these
+# namespace prefixes are present. Fun.
+root.set('xmlns:xs', 'http://www.w3.org/2001/XMLSchema')
+root.set('xmlns:oor', 'http://openoffice.org/2001/registry')
+
 tree.write(sys.argv[2], 'UTF-8', True)
commit ef6f481ca7bb65d5a6ba9ac540e7407fc414ecc8
Author: Tor Lillqvist 
Date:   Tue Oct 21 18:22:11 2014 +0300

Cosmetics

Change-Id: I4d819f59ecb2462aee5998628ad034657bf3b0f9

diff --git a/android/mobile-config.py b/android/mobile-config.py
index 6f29297..d28c7c0 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -14,7 +14,6 @@
 import sys
 import xml.etree.ElementTree as ET
 
-
 main_xcd_discard = [
 'org.openoffice.Office/TableWizard', # huge
 
@@ -75,12 +74,10 @@ main_xcd_discard = [
 'org.openoffice.Office.UI/Category',
 ]
 
-
 if __name__ == '__main__':
 tree = ET.parse(sys.argv[1])
 root = tree.getroot()
 
-print "Foo\n"
 saved = 0
 total = 0
 for child in root:
@@ -96,4 +93,3 @@ if __name__ == '__main__':
 
 print "saved %d of %d bytes: %2.f%%" % (saved, total, saved*100.0/total)
 tree.write(sys.argv[2], 'UTF-8', True)
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Christian Lohmaier

Tag 'libreoffice-4.3.3.2' created by Christian Lohmaier 
 at 2014-10-23 12:33 -0700

Tag libreoffice-4.3.3.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUSOd8AAoJEPQ0oe+v7q6jA2oP/0U6peXHzRKgk3xj4aY4YghH
GIdIkj1dZVnglbPJ5PexKVvCd8NGI4QTOC71Bqgq3+NDI5o2+TT+/ZOvkIh2en8w
AiHBOTx+Cwp2Uq1BM4pVIIcXr2WFNwQmKXntN/hH5D9sTIvjg/rrE0dgxkfo8ERv
sKEi2Rnp52H8eLozCV3Sdr6NSukwkR8BoQIsj82dBwe3FPQsza4WEE1QDTxVXFI5
GrUH6MTx/AUjZ58cSmBCWvqXtusXBoG/5/hCq/dIMJkoNWyP5t7erYOo1G0dfUEw
pVHNRtZ1qIQvfxNlzAFFtzrSYRzlGPONH0JYj+e8gc28tST9kfdz3Jd48AJuHWAy
t2JjZBDENspYxLuI63aAh603UM78bZKmmxvTP8cOiWqdqXjoFOs9tqlwuZeU/6Fg
EuYsTiJFoCkzTtGaOn44r1OyBU7UInLC08EQcaKec7V+Wy6g6VUcCZTDp35/8TYW
+0Bb9o5czmx57w0OoAaLp2y1lSZZ4bbAhQxFpDnaXtLHtN4V25cxBh7R1IFaooG0
euZmAtimZ8T+ilWL1hV7DOEmTwm7M4Oj23QFhWhA1xuPu1kkhBNBqOdsTytn56wl
86txeWYG+zVAPipmBrXA2fDg2YOywpRSZqkHfPxkGtK5VqP3UYFyiHT/TsFxAQR0
+s1Peuhk5v9ZXtb8MmOV
=FvQp
-END PGP SIGNATURE-

Changes since lof-4.3-branch-point-80:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - scp2/source

2014-10-24 Thread Andras Timar

 scp2/source/ooo/ure.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 13a7a5998bd5cf1624bfba0e0aee009f2aa52954
Author: Andras Timar 
Date:   Fri Sep 12 07:05:34 2014 -0700

scp2: fix non-OSX build

Change-Id: Id80906ca0f754bb839e8998a73e8cfb81825e7a3

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 9a501a2..097a8a0 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -91,7 +91,7 @@ Directory gid_Dir_Ure_Share_Misc
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 ParentID = gid_Brand_Dir_Share_Ure_Share;
 #else
-ParentID = gid_Dir_Ure_Share;
+ParentID = SCP2_URE_SHARE_DIR;
 #endif
 DosName = "misc";
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Caolán McNamara

 svx/uiconfig/ui/floatingundoredo.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7ce03365e8e655c4c9636d1acbc02c530114b2ce
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 20 15:53:26 2014 +0100

Related: fdo#84676 set floating undo bits to the same as the color pickers

Change-Id: I153d92e94319bd1e7f0d425288f184bd8d13542d

diff --git a/svx/uiconfig/ui/floatingundoredo.ui 
b/svx/uiconfig/ui/floatingundoredo.ui
index 2c48f82..66f30a6 100644
--- a/svx/uiconfig/ui/floatingundoredo.ui
+++ b/svx/uiconfig/ui/floatingundoredo.ui
@@ -11,6 +11,7 @@
 True
 popup-menu
 True
+False
 False
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building LO fails with autogen

2014-10-24 Thread Miklos Vajna

Hi Jens,

On Thu, Oct 09, 2014 at 08:05:48PM +0200, Jens Tröger 
 wrote:
> This is with the default GNU autoconf 2.52.  When I change line 158 in
> autogen.sh to use autoconf-2.69 I get this:

autoconf 2.69 is known to work.

>   libreoffice > ./autogen.sh
>   configure.ac:57: error: possibly undefined macro: AC_MSG_WARN
>   If this token and others are legitimate, please use m4_pattern_allow.
>   See the Autoconf documentation.
>   configure.ac:117: error: possibly undefined macro: AC_MSG_CHECKING
>   configure.ac:123: error: possibly undefined macro: AC_MSG_RESULT
>   configure.ac:266: error: possibly undefined macro: AC_DEFINE
>   configure.ac:3206: error: possibly undefined macro: AC_LANG_SOURCE
>   configure.ac:3685: error: possibly undefined macro: AC_LANG_PUSH
>   configure.ac:3698: error: possibly undefined macro: AC_LANG_POP
>   configure.ac:4885: error: possibly undefined macro: AC_RUN_IFELSE
>   Failed to run autoconf at ./autogen.sh line 158.

autogen.sh runs aclocal (part of automake) before autoconf. What's your
automake version? E.g. 1.13.4 is known to work.

Regards,

Miklos


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

[Libreoffice-commits] core.git: 6 commits - include/sfx2 include/svtools include/svx RepositoryExternal.mk sc/inc sc/source svx/inc svx/source sw/inc sw/source tools/source

2014-10-24 Thread David Tardon

 RepositoryExternal.mk |1 +
 include/sfx2/ipclient.hxx |5 ++---
 include/sfx2/viewfrm.hxx  |3 ++-
 include/sfx2/viewsh.hxx   |2 +-
 include/svtools/imap.hxx  |2 +-
 include/svtools/imapcirc.hxx  |4 ++--
 include/svtools/imappoly.hxx  |4 ++--
 include/svtools/imaprect.hxx  |4 ++--
 include/svx/sdr/properties/properties.hxx |3 ++-
 sc/inc/column.hxx |2 +-
 sc/inc/patattr.hxx|3 ++-
 sc/source/ui/inc/drawutil.hxx |3 ++-
 svx/inc/sdr/properties/itemsettools.hxx   |7 +++
 svx/source/svdraw/svdoashp.cxx|6 ++
 svx/source/svdraw/svdobj.cxx  |4 ++--
 svx/source/svdraw/svdocirc.cxx|4 ++--
 svx/source/svdraw/svdograf.cxx|4 ++--
 svx/source/svdraw/svdogrp.cxx |8 
 svx/source/svdraw/svdotxtr.cxx|4 ++--
 svx/source/svdraw/svdview.cxx |6 --
 svx/source/unodraw/unoshape.cxx   |8 ++--
 sw/inc/pagepreviewlayout.hxx  |2 +-
 sw/source/core/inc/viewimp.hxx|2 +-
 tools/source/generic/rational.cxx |4 ++--
 24 files changed, 51 insertions(+), 44 deletions(-)

New commits:
commit a3dc4db870ac3c08c480131ed18d144e42ec18b2
Author: David Tardon 
Date:   Tue Oct 14 15:43:23 2014 +0200

make sure the denominator is not 0

Change-Id: Ia618379a8d33048b6716f22ad1e5dcbca0bbf307

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index c3d17a5..3fb2591 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1219,8 +1219,12 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
 
 if(mpObj->GetObjInventor() == SdrInventor && mpObj->GetObjIdentifier() 
== OBJ_MEASURE )
 {
-boost::rational 
aWdt(aLocalSize.Width(),aRect.Right()-aRect.Left());
-boost::rational 
aHgt(aLocalSize.Height(),aRect.Bottom()-aRect.Top());
+boost::rational aWdt;
+if (aRect.Right()-aRect.Left() > 0)
+aWdt.assign(aLocalSize.Width(),aRect.Right()-aRect.Left());
+boost::rational aHgt;
+if (aRect.Bottom()-aRect.Top() > 0)
+aHgt.assign(aLocalSize.Height(),aRect.Bottom()-aRect.Top());
 Point aPt = mpObj->GetSnapRect().TopLeft();
 mpObj->Resize(aPt,aWdt,aHgt);
 }
commit e19fb51d89fd8fa747594ba7aa3fdac67262f646
Author: David Tardon 
Date:   Tue Oct 14 15:36:26 2014 +0200

make sure the denominator is not 0

Change-Id: Ic32e0f354bb290ad77f1d7709bee89858e1889b7

diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index e3a50cd..19f9834 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 
 #include "svx/svdstr.hrc"
@@ -478,8 +480,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, 
SdrViewEvent& rVEvt) co
 // account for FitToSize
 bool bFitToSize(pTextObj->IsFitToSize());
 if (bFitToSize) {
-boost::rational 
aX(aTextRect.GetWidth()-1,aAnchor.GetWidth()-1);
-boost::rational 
aY(aTextRect.GetHeight()-1,aAnchor.GetHeight()-1);
+boost::rational aX(aTextRect.GetWidth()-1, 
std::max(aAnchor.GetWidth()-1, 1L));
+boost::rational aY(aTextRect.GetHeight()-1, 
std::max(aAnchor.GetHeight()-1, 1L));
 ResizePoint(aTemporaryTextRelativePosition,Point(),aX,aY);
 }
 // account for rotation
commit ad1f796b1dc710a02ade17c95e99d11412f1280a
Author: David Tardon 
Date:   Tue Oct 14 15:26:44 2014 +0200

simplify condition

Change-Id: Idceac888c57cc27142877d0cf83dd525ab3f92ca

diff --git a/tools/source/generic/rational.cxx 
b/tools/source/generic/rational.cxx
index fd1fbea..73b9f4e 100644
--- a/tools/source/generic/rational.cxx
+++ b/tools/source/generic/rational.cxx
@@ -116,7 +116,7 @@ static int impl_NumberOfBits( unsigned long nNum )
 */
 void rational_ReduceInaccurate(boost::rational& rRational, unsigned 
nSignificantBits)
 {
-if ( !rRational.numerator() || !rRational.denominator() )
+if ( !rRational )
 return;
 
 // Count with unsigned longs only
commit 8afab33d161ddd39a3e6094b5daa08b156ef0421
Author: David Tardon 
Date:   Tue Oct 14 15:21:44 2014 +0200

just check if the fraction is < 0

Change-Id: I23f631898f29d8285d3da333686da8d3f28a00f8

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 858772c..454b73c 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1583,13 +1583,11 @@ void SdrObjCus

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

2014-10-24 Thread Caolán McNamara

 vcl/source/control/edit.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c88c13e769bc4c521f3f966c02ea21a3cb8d928
Author: CaolÃ¡n McNamara 
Date:   Wed Oct 15 13:47:09 2014 +0100

Resolves: fdo#85032 max len property of -1 -> crash

Change-Id: Ief903c619204f01784e93fd5e2d582632cef032e
(cherry picked from commit e45136f1ff9d817dfec27a6a20ba29fffc6c54bf)
Reviewed-on: https://gerrit.libreoffice.org/11985
Reviewed-by: Matthew Francis 
Tested-by: Matthew Francis 
Reviewed-by: CaolÃ¡n McNamara 

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f117e3f..906355f 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2437,7 +2437,7 @@ bool Edit::IsInsertMode() const
 
 void Edit::SetMaxTextLen(sal_Int32 nMaxLen)
 {
-mnMaxTextLen = nMaxLen ? nMaxLen : EDIT_NOLIMIT;
+mnMaxTextLen = nMaxLen > 0 ? nMaxLen : EDIT_NOLIMIT;
 
 if ( mpSubEdit )
 mpSubEdit->SetMaxTextLen( mnMaxTextLen );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - package/inc package/source

2014-10-24 Thread Matúš Kukan

 package/inc/ZipPackageStream.hxx   |   21 
 package/source/zippackage/ZipPackageStream.cxx |   41 +
 2 files changed, 22 insertions(+), 40 deletions(-)

New commits:
commit 5c69355d94dc6a93d593dde33ac294a47be967e5
Author: MatÃºÅ¡ Kukan 
Date:   Wed Oct 15 13:07:43 2014 +0200

Remove pointless functions now that saveChild() is ZipPackageStream's member

Change-Id: Id43ec2e7ddb1035d3306170523764bb9a74c03b8

diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 3fec409..8f9b76a 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -75,9 +75,6 @@ private:
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > 
GetOwnSeekStream();
 
 public:
-bool HasOwnKey () const  { return m_bHaveOwnKey;}
-bool IsToBeCompressed () const { return m_bToBeCompressed;}
-bool IsToBeEncrypted () const { return m_bToBeEncrypted;}
 bool IsEncrypted () const{ return m_bIsEncrypted;}
 bool IsPackageMember () const { return m_nStreamMode == 
PACKAGE_STREAM_PACKAGEMEMBER;}
 
@@ -90,20 +87,6 @@ public:
 
 sal_Int32 GetStartKeyGenID();
 
-const com::sun::star::uno::Sequence < sal_Int8 > getInitialisationVector 
() const
-{ return m_xBaseEncryptionData->m_aInitVector;}
-const com::sun::star::uno::Sequence < sal_Int8 > getDigest () const
-{ return m_xBaseEncryptionData->m_aDigest;}
-const com::sun::star::uno::Sequence < sal_Int8 > getSalt () const
-{ return m_xBaseEncryptionData->m_aSalt;}
-sal_Int32 getIterationCount () const
-{ return m_xBaseEncryptionData->m_nIterationCount;}
-sal_Int64 getSize () const
-{ return aEntry.nSize;}
-
-sal_uInt8 GetStreamMode() const { return m_nStreamMode; }
-sal_uInt32 GetMagicalHackPos() const { return m_nMagicalHackPos; }
-sal_uInt32 GetMagicalHackSize() const { return m_nMagicalHackSize; }
 sal_Int32 GetEncryptionAlgorithm() const;
 sal_Int32 GetBlockSize() const;
 
@@ -123,8 +106,6 @@ public:
 }
 void SetPackageMember (bool bNewValue);
 
-void setKey (const com::sun::star::uno::Sequence < sal_Int8 >& rNewKey )
-{ m_aEncryptionKey = rNewKey; m_aStorageEncryptionKeys.realloc( 0 ); }
 void setInitialisationVector (const com::sun::star::uno::Sequence < 
sal_Int8 >& rNewVector )
 { m_xBaseEncryptionData->m_aInitVector = rNewVector;}
 void setSalt (const com::sun::star::uno::Sequence < sal_Int8 >& rNewSalt )
@@ -135,8 +116,6 @@ public:
 { m_xBaseEncryptionData->m_nIterationCount = nNewCount;}
 void setSize (const sal_Int64 nNewSize);
 
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > 
GetOwnStreamNoWrap() { return m_xStream; }
-
 void CloseOwnStreamIfAny();
 
 ZipPackageStream( ZipPackage & rNewPackage,
diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 1f161cd..4ff73ce 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -175,8 +175,8 @@ uno::Reference< io::XInputStream > 
ZipPackageStream::GetRawEncrStreamNoHeaderCop
 throw ZipIOException(THROW_WHERE "The stream must be seekable!" );
 
 // skip header
-xSeek->seek( n_ConstHeaderSize + getInitialisationVector().getLength() +
-getSalt().getLength() + getDigest().getLength() );
+xSeek->seek( n_ConstHeaderSize + 
m_xBaseEncryptionData->m_aInitVector.getLength() +
+m_xBaseEncryptionData->m_aSalt.getLength() + 
m_xBaseEncryptionData->m_aDigest.getLength() );
 
 // create temporary stream
 uno::Reference < io::XTempFile > xTempFile = 
io::TempFile::create(m_xContext);
@@ -485,8 +485,8 @@ bool ZipPackageStream::saveChild(
 pTempEntry->sPath = rPath;
 pTempEntry->nPathLen = (sal_Int16)( OUStringToOString( pTempEntry->sPath, 
RTL_TEXTENCODING_UTF8 ).getLength() );
 
-bool bToBeEncrypted = IsToBeEncrypted() && (rEncryptionKey.getLength() || 
HasOwnKey());
-bool bToBeCompressed = bToBeEncrypted ? sal_True : IsToBeCompressed();
+bool bToBeEncrypted = m_bToBeEncrypted && (rEncryptionKey.getLength() || 
m_bHaveOwnKey);
+bool bToBeCompressed = bToBeEncrypted ? sal_True : m_bToBeCompressed;
 
 aPropSet[PKG_MNFST_MEDIATYPE].Name = sMediaTypeProperty;
 aPropSet[PKG_MNFST_MEDIATYPE].Value <<= GetMediaType( );
@@ -495,18 +495,18 @@ bool ZipPackageStream::saveChild(
 aPropSet[PKG_MNFST_FULLPATH].Name = sFullPathProperty;
 aPropSet[PKG_MNFST_FULLPATH].Value <<= pTempEntry->sPath;
 
-OSL_ENSURE( GetStreamMode() != PACKAGE_STREAM_NOTSET, "Unacceptable 
ZipPackageStream mode!" );
+OSL_ENSURE( m_nStreamMode != PACKAGE_STREAM_NOTSET, "Unacceptable 
ZipPackageStream mode!" );
 
 bool bRawStream = false;
-if ( GetStreamMode() == PACKAGE_STREAM_DETECT )
+if ( m_nStreamMode == PACKAGE_STREAM_DETECT )
 bRawStream = ParsePackageR

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

2014-10-24 Thread Michael Meeks

 vcl/source/bitmap/bitmapscalesuper.cxx |  522 +
 1 file changed, 213 insertions(+), 309 deletions(-)

New commits:
commit d2ccf8434aa1917409de1eb6d160092494224b2c
Author: Michael Meeks 
Date:   Tue Oct 14 20:10:08 2014 -0300

vcl: re-factor scaling to use a single fn. pointer based invocation.

Change-Id: Ide61808dbfa82ce67794150f44b6bac4f3c8e302

diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx 
b/vcl/source/bitmap/bitmapscalesuper.cxx
index e808562..29819c9 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -923,47 +923,39 @@ bool BitmapScaleSuper::filter(Bitmap& rBitmap)
pReadAccess->Height(),
pWriteAccess->Height(),
bVMirr, bHMirr );
+void (*scaleRangeFn)(ScaleContext &rCtx, long nStartY, long nEndY);
+
+bool bScaleUp = fScaleX >= fScaleThresh && fScaleY >= fScaleThresh;
 if( pReadAccess->HasPalette() )
 {
-if( pReadAccess->GetScanlineFormat() == BMP_FORMAT_8BIT_PAL )
+switch( pReadAccess->GetScanlineFormat() )
 {
-if( fScaleX >= fScaleThresh && fScaleY >= fScaleThresh )
-scalePallete8bit(aContext, nStartY, nEndY);
-else
-scalePallete8bit2(aContext, nStartY, nEndY);
-}
-else
-{
-if( fScaleX >= fScaleThresh && fScaleY >= fScaleThresh )
-scalePalleteGeneral(aContext, nStartY, nEndY);
-else
-scalePalleteGeneral2(aContext, nStartY, nEndY);
+case BMP_FORMAT_8BIT_PAL:
+scaleRangeFn = bScaleUp ? scalePallete8bit : scalePallete8bit2;
+break;
+default:
+scaleRangeFn = bScaleUp ? scalePalleteGeneral
+: scalePalleteGeneral2;
+break;
 }
 }
 else
 {
-if( pReadAccess->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_BGR )
-{
-if( fScaleX >= fScaleThresh && fScaleY >= fScaleThresh )
-scale24bitBGR(aContext, nStartY, nEndY);
-else
-scale24bitBGR2(aContext, nStartY, nEndY);
-}
-else if( pReadAccess->GetScanlineFormat() == 
BMP_FORMAT_24BIT_TC_RGB )
-{
-if( fScaleX >= fScaleThresh && fScaleY >= fScaleThresh )
-scale24bitRGB(aContext, nStartY, nEndY);
-else
-scale24bitRGB2(aContext, nStartY, nEndY);
-}
-else
+switch( pReadAccess->GetScanlineFormat() )
 {
-if( fScaleX >= fScaleThresh && fScaleY >= fScaleThresh )
-scaleNonPalleteGeneral(aContext, nStartY, nEndY);
-else
-scaleNonPalleteGeneral2(aContext, nStartY, nEndY);
+case BMP_FORMAT_24BIT_TC_BGR:
+scaleRangeFn = bScaleUp ? scale24bitBGR : scale24bitBGR2;
+break;
+case BMP_FORMAT_24BIT_TC_RGB:
+scaleRangeFn = bScaleUp ? scale24bitRGB : scale24bitRGB2;
+break;
+default:
+scaleRangeFn = bScaleUp ? scaleNonPalleteGeneral
+: scaleNonPalleteGeneral2;
+break;
 }
 }
+scaleRangeFn( aContext, nStartY, nEndY );
 
 bRet = true;
 }
commit 618c0f8fd8658acd20e875ed3a7350786c3dc1e3
Author: Michael Meeks 
Date:   Tue Oct 14 19:52:16 2014 -0300

vcl: Re-factor to use the ScaleContext to pass parameters.

Change-Id: If4359a6b776b4a94a6934e9fd02ede475a0612a7

diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx 
b/vcl/source/bitmap/bitmapscalesuper.cxx
index dc5404c..e808562 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -43,8 +43,8 @@ void generateMap(long nW, long nDstW, bool bHMirr, long* 
pMapIX, long* pMapFX)
 }
 
 struct ScaleContext {
-BitmapReadAccess *mpSrc;   // was pAcc
-BitmapWriteAccess *mpDest; // was pWAcc
+BitmapReadAccess  *mpSrc;
+BitmapWriteAccess *mpDest;
 long mnSrcW, mnDestW;
 long mnSrcH, mnDestH;
 bool mbHMirr, mbVMirr;
@@ -58,7 +58,7 @@ struct ScaleContext {
   long nSrcH, long nDestH,
   bool bHMirr, bool bVMirr)
 : mpSrc( pSrc ), mpDest( pDest )
-, mnSrcW( nSrcW ), mnDestW( nDestH )
+, mnSrcW( nSrcW ), mnDestW( nDestW )
 , mnSrcH( nSrcH ), mnDestH( nDestH )
 , mbHMirr( bHMirr ), mbVMirr( bVMirr )
 , mpMapIX( new long[ nDestW ] )
@@ -71,34 +71,26 @@ struct ScaleContext {
 }
 };
 
-void scalePallete8bit(BitmapReadAccess* pAcc, BitmapWriteAccess* pWAcc,
-  lon

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

2014-10-24 Thread David Tardon

 filter/source/msfilter/svdfppt.cxx  |   22 +++---
 include/filter/msfilter/svdfppt.hxx |3 ++-
 2 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 7d05bbd50d5b3a9fff467b44e033bedb12a46a2d
Author: David Tardon 
Date:   Wed Oct 15 11:38:34 2014 +0200

avoid double-delete

This is a regression from commit b1d48f0d9a3442c11adae6e36325a463d89ce44e.

Change-Id: Iffd39782c1d1fd7be14f4d657919f704807a40f5

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index b6300bb..494949c 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2443,14 +2443,14 @@ void SdrPowerPointImport::SetPageNum( sal_uInt16 
nPageNum, PptPageKind eKind )
 PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
 if ( pPageList && nMasterIndex < pPageList->size() )
 {
-PptSlidePersistEntry& rMasterPersist = (*pPageList)[ nMasterIndex 
];
-if ( ( rMasterPersist.pStyleSheet == NULL ) && 
rMasterPersist.aSlideAtom.nMasterId )
+PptSlidePersistEntry* pMasterPersist = &(*pPageList)[ nMasterIndex 
];
+if ( ( pMasterPersist->pStyleSheet == NULL ) && 
pMasterPersist->aSlideAtom.nMasterId )
 {
-nMasterIndex = pMasterPages->FindPage( 
rMasterPersist.aSlideAtom.nMasterId );
+nMasterIndex = pMasterPages->FindPage( 
pMasterPersist->aSlideAtom.nMasterId );
 if ( nMasterIndex != PPTSLIDEPERSIST_ENTRY_NOTFOUND )
-rMasterPersist = (*pPageList)[ nMasterIndex ];
+pMasterPersist = &(*pPageList)[ nMasterIndex ];
 }
-pPPTStyleSheet = rMasterPersist.pStyleSheet;
+pPPTStyleSheet = pMasterPersist->pStyleSheet;
  }
 }
 if ( !pPPTStyleSheet )
@@ -2753,21 +2753,21 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, 
const PptSlidePersistEntry*
 {
 sal_uInt16 nMasterNum = 
GetMasterPageIndex( nAktPageNum, eAktPageKind );
 PptSlidePersistList* pPageList = 
GetPageList( PPT_MASTERPAGE );
-PptSlidePersistEntry& rE = 
(*pPageList)[ nMasterNum ];
-while( ( rE.aSlideAtom.nFlags & 4 
) && rE.aSlideAtom.nMasterId )
+PptSlidePersistEntry* pE = 
&(*pPageList)[ nMasterNum ];
+while( ( pE->aSlideAtom.nFlags & 4 
) && pE->aSlideAtom.nMasterId )
 {
-sal_uInt16 nNextMaster = 
pMasterPages->FindPage( rE.aSlideAtom.nMasterId );
+sal_uInt16 nNextMaster = 
pMasterPages->FindPage( pE->aSlideAtom.nMasterId );
 if ( nNextMaster == 
PPTSLIDEPERSIST_ENTRY_NOTFOUND )
 break;
 else
-rE = (*pPageList)[ 
nNextMaster ];
+pE = &(*pPageList)[ 
nNextMaster ];
 }
-if ( rE.nBackgroundOffset )
+if ( pE->nBackgroundOffset )
 {
 // do not follow master 
colorscheme?
 bool bTemporary = ( 
rSlidePersist.aSlideAtom.nFlags & 2 ) != 0;
 sal_uInt32 nPos = 
rStCtrl.Tell();
-rStCtrl.Seek( 
rE.nBackgroundOffset );
+rStCtrl.Seek( 
pE->nBackgroundOffset );
 rSlidePersist.pBObj = 
ImportObj( rStCtrl, (void*)&aProcessData, aPageSize, aPageSize );
 rSlidePersist.bBObjIsTemporary 
= bTemporary;
 rStCtrl.Seek( nPos );
diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index 9fed6d0..bc19a42 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -315,7 +316,7 @@ public:
 struct ProcessData;
 struct PPTStyleSheet;
 struct HeaderFooterEntry;
-struct PptSlidePersistEntry
+struct PptSlidePersistEntry : private boost::noncopyable
 {
 PptSlidePersistAtom aPersistAtom;
 PptSlideAtomaSlideAtom;
___
Libreoffice-commits

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

2014-10-24 Thread Miklos Vajna

 writerfilter/inc/resourcemodel/TableManager.hxx  |7 +--
 writerfilter/source/dmapper/DomainMapper.cxx |   14 +-
 writerfilter/source/dmapper/GraphicImport.cxx|8 +---
 writerfilter/source/dmapper/NumberingManager.cxx |   14 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx  |   16 ++--
 5 files changed, 10 insertions(+), 49 deletions(-)

New commits:
commit cf1c3b5c5ae7f691cbd7330f49713d65822f1c1f
Author: Miklos Vajna 
Date:   Wed Oct 15 22:13:21 2014 +0200

writerfilter: call to SAL_WARN() is not expensive

So guards like '#if OSL_DEBUG_LEVEL > 0' around it can be dropped in
most cases. Also, dumping the hex value of token IDs no longer makes
sense, now that doctok is gone.

Change-Id: I2c0d466e4bdde63d271a83aa4e7eebb52294e363

diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx 
b/writerfilter/inc/resourcemodel/TableManager.hxx
index bdb6504..02700d8 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -31,9 +31,7 @@
 #include "util.hxx"
 #include "TagLogger.hxx"
 
-#if OSL_DEBUG_LEVEL > 0
-#   include 
-#endif
+#include 
 
 namespace writerfilter
 {
@@ -1047,10 +1045,7 @@ void TableManager::resolveCurrentTable()
 }
 catch (css::uno::Exception const& e)
 {
-(void) e;
-#if OSL_DEBUG_LEVEL > 0
 SAL_WARN("writerfilter", "resolving of current table failed with: 
" << e.Message);
-#endif
 }
 }
 resetTableProps();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index d1aec85..01101c2 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1022,19 +1022,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "val", 
sStringValue);
 break;
 default:
-{
-#if OSL_DEBUG_LEVEL > 0
-OString sMessage("DomainMapper::attribute() - Id: ");
-sMessage += OString::number( nName, 10 );
-sMessage += " / 0x";
-sMessage += OString::number( nName, 16 );
-sMessage += " value: ";
-sMessage += OString::number( nIntValue, 10 );
-sMessage += " / 0x";
-sMessage += OString::number( nIntValue, 16 );
-SAL_WARN("writerfilter", sMessage.getStr());
-#endif
-}
+SAL_WARN("writerfilter", "DomainMapper::lcl_attribute: unhandled 
token: " << nName);
 }
 }
 
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index c44ac41..7562c01 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1122,13 +1122,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
 }
 break;
 default:
-#if OSL_DEBUG_LEVEL > 0
-OString sMessage( "GraphicImport::sprm() - Id: ");
-sMessage += OString::number( nSprmId, 10 );
-sMessage += " / 0x";
-sMessage += OString::number( nSprmId, 16 );
-SAL_WARN("writerfilter", sMessage.getStr());
-#endif
+SAL_WARN("writerfilter", "GraphicImport::lcl_sprm: unhandled 
token: " << nSprmId);
 break;
 }
 }
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 2bafbb6..63c44e2 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -809,19 +809,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
 m_pCurrentNumPicBullet->SetId(rVal.getString().toInt32());
 break;
 default:
-{
-#if OSL_DEBUG_LEVEL > 0
-OString sMessage( "ListTable::attribute() - Id: ");
-sMessage += OString::number( nName, 10 );
-sMessage += " / 0x";
-sMessage += OString::number( nName, 16 );
-sMessage += " value: ";
-sMessage += OString::number( nIntValue, 10 );
-sMessage += " / 0x";
-sMessage += OString::number( nIntValue, 16 );
-SAL_WARN("writerfilter", sMessage.getStr());
-#endif
-}
+SAL_WARN("writerfilter", "ListsManager::lcl_attribute: unhandled 
token: " << nName);
 }
 }
 
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index a8a8a8d..bd40814 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1174,19 +1174,15 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr 
rFontTable )
 catch( const lang::WrappedTargetException& rWrapped)
 {
 (void) rWrapped;
-

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

2014-10-24 Thread Stephan Bergmann

 include/o3tl/typed_flags_set.hxx |   76 +--
 1 file changed, 41 insertions(+), 35 deletions(-)

New commits:
commit 950995222509f059037ff7d73e09d5d9ea2b9b2a
Author: Stephan Bergmann 
Date:   Tue Oct 14 14:41:04 2014 +0200

Reintroduce SFINAE-based selective enablement of &=, |=

...they had erroneously become unconditionally enabled.  Also, rename Self 
to
Wrap.

Change-Id: I574662012bf74114b18f3bab0c1c5825a2bd61bb

diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx
index 1aac625..016f8eb 100644
--- a/include/o3tl/typed_flags_set.hxx
+++ b/include/o3tl/typed_flags_set.hxx
@@ -54,9 +54,11 @@ struct is_typed_flags {
 static_assert(
 M >= 0, "is_typed_flags expects only non-negative bit values");
 
-class Self {
+typedef E Self;
+
+class Wrap {
 public:
-explicit Self(O3TL_STD_UNDERLYING_TYPE_E value):
+explicit Wrap(O3TL_STD_UNDERLYING_TYPE_E value):
 value_(value)
 { assert(value >= 0); }
 
@@ -82,102 +84,102 @@ struct is_typed_flags {
 }
 
 template
-inline typename o3tl::typed_flags::Self operator ~(E rhs) {
+inline typename o3tl::typed_flags::Wrap operator ~(E rhs) {
 assert(static_cast(rhs) >= 0);
-return static_cast::Self>(
+return static_cast::Wrap>(
 o3tl::typed_flags::mask
 & ~static_cast(rhs));
 }
 
 template
-inline typename o3tl::typed_flags::Self operator ~(
-typename o3tl::typed_flags::Self rhs)
+inline typename o3tl::typed_flags::Wrap operator ~(
+typename o3tl::typed_flags::Wrap rhs)
 {
-return static_cast::Self>(
+return static_cast::Wrap>(
 o3tl::typed_flags::mask
 & ~static_cast(rhs));
 }
 
 template
-inline typename o3tl::typed_flags::Self operator &(E lhs, E rhs) {
+inline typename o3tl::typed_flags::Wrap operator &(E lhs, E rhs) {
 assert(static_cast(lhs) >= 0);
 assert(static_cast(rhs) >= 0);
-return static_cast::Self>(
+return static_cast::Wrap>(
 static_cast(lhs)
 & static_cast(rhs));
 }
 
 template
-inline typename o3tl::typed_flags::Self operator &(
-E lhs, typename o3tl::typed_flags::Self rhs)
+inline typename o3tl::typed_flags::Wrap operator &(
+E lhs, typename o3tl::typed_flags::Wrap rhs)
 {
 assert(static_cast(lhs) >= 0);
-return static_cast::Self>(
+return static_cast::Wrap>(
 static_cast(lhs)
 & static_cast(rhs));
 }
 
 template
-inline typename o3tl::typed_flags::Self operator &(
-typename o3tl::typed_flags::Self lhs, E rhs)
+inline typename o3tl::typed_flags::Wrap operator &(
+typename o3tl::typed_flags::Wrap lhs, E rhs)
 {
 assert(static_cast(rhs) >= 0);
-return static_cast::Self>(
+return static_cast::Wrap>(
 static_cast(lhs)
 & static_cast(rhs));
 }
 
 template
-inline typename o3tl::typed_flags::Self operator &(
-typename o3tl::typed_flags::Self lhs,
-typename o3tl::typed_flags::Self rhs)
+inline typename o3tl::typed_flags::Wrap operator &(
+typename o3tl::typed_flags::Wrap lhs,
+typename o3tl::typed_flags::Wrap rhs)
 {
-return static_cast::Self>(
+return static_cast::Wrap>(
 static_cast(lhs)
 & static_cast(rhs));
 }
 
 template
-inline typename o3tl::typed_flags::Self operator |(E lhs, E rhs) {
+inline typename o3tl::typed_flags::Wrap operator |(E lhs, E rhs) {
 assert(static_cast(lhs) >= 0);
 assert(static_cast(rhs) >= 0);
-return static_cast::Self>(
+return static_cast::Wrap>(
 static_cast(lhs)
 | static_cast(rhs));
 }
 
 template
-inline typename o3tl::typed_flags::Self operator |(
-E lhs, typename o3tl::typed_flags::Self rhs)
+inline typename o3tl::typed_flags::Wrap operator |(
+E lhs, typename o3tl::typed_flags::Wrap rhs)
 {
 assert(static_cast(lhs) >= 0);
-return static_cast::Self>(
+return static_cast::Wrap>(
 static_cast(lhs)
 | static_cast(rhs));
 }
 
 template
-inline typename o3tl::typed_flags::Self operator |(
-typename o3tl::typed_flags::Self lhs, E rhs)
+inline typename o3tl::typed_flags::Wrap operator |(
+typename o3tl::typed_flags::Wrap lhs, E rhs)
 {
 assert(static_cast(rhs) >= 0);
-return static_cast::Self>(
+return static_cast::Wrap>(
 static_cast(lhs)
 | static_cast(rhs));
 }
 
 template
-inline typename o3tl::typed_flags::Self operator |(
-typename o3tl::typed_flags::Self lhs,
-typename o3tl::typed_flags::Self rhs)
+inline typename o3tl::typed_flags::Wrap operator |(
+typename o3tl::typed_flags::Wrap lhs,
+typename o3tl::typed_flags::Wrap rhs)
 {
-return static_cast::Self>(
+return static_cast::Wrap>(
 static_cast(lhs)
 | static_cast(rhs));
 }
 
 template
-inline E operator &=(E & lhs, E rhs) {
+inline typename o3tl::typed_flags::Self operator &=(E & lhs, E rhs) {
 assert(static_cast(lhs) >= 0);
 assert(static_cast(rhs) >= 0);
 lhs = lhs & rhs

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

2014-10-24 Thread Stephan Bergmann

 writerfilter/inc/resourcemodel/TableManager.hxx  |   46 +--
 writerfilter/source/dmapper/DomainMapper.cxx |   26 +++---
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   10 +-
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |8 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|   16 ++--
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|2 
 writerfilter/source/dmapper/FormControlHelper.hxx|2 
 writerfilter/source/dmapper/GraphicImport.cxx|2 
 writerfilter/source/dmapper/NumberingManager.cxx |6 -
 writerfilter/source/dmapper/StyleSheetTable.cxx  |   14 +--
 writerfilter/source/dmapper/TablePropertiesHandler.cxx   |   10 +-
 writerfilter/source/dmapper/TblStylePrHandler.cxx|2 
 writerfilter/source/dmapper/TextEffectsHandler.cxx   |2 
 writerfilter/source/filter/ImportFilter.cxx  |2 
 writerfilter/source/filter/WriterFilter.cxx  |8 +-
 writerfilter/source/ooxml/Handler.cxx|4 -
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx  |2 
 writerfilter/source/ooxml/OOXMLFactory.cxx   |   12 +--
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx|   58 +++
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx   |8 +-
 writerfilter/source/ooxml/OOXMLParserState.cxx   |   18 ++--
 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx   |   30 +++
 writerfilter/source/resourcemodel/TagLogger.cxx  |   14 +--
 writerfilter/source/resourcemodel/qnametostrcore.cxx |2 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   34 
 25 files changed, 169 insertions(+), 169 deletions(-)

New commits:
commit fda06137cc2cac8e223149195c225aded28a13ef
Author: Stephan Bergmann 
Date:   Fri Oct 17 10:58:49 2014 +0200

Work around Clang 3.2 -Wnull-conversion bug

...by running all of writerfilter through loplugin:nullptr rewriter

Change-Id: Ie6ec5dd989dc2035ccd10941bc38e557e128be0f

diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx 
b/writerfilter/inc/resourcemodel/TableManager.hxx
index 4b2a3d6..c13303c 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -643,7 +643,7 @@ template 
 void TableManager::cellDepth(sal_uInt32 nDepth)
 {
 #ifdef DEBUG_WRITERFILTER
-if (mpTableLogger != NULL)
+if (mpTableLogger != nullptr)
 {
 mpTableLogger->startElement("tablemanager.cellDepth");
 mpTableLogger->attribute("depth", nDepth);
@@ -658,7 +658,7 @@ template 
 void TableManager::inCell()
 {
 #ifdef DEBUG_WRITERFILTER
-if (mpTableLogger != NULL)
+if (mpTableLogger != nullptr)
 mpTableLogger->element("tablemanager.inCell");
 #endif
 setInCell(true);
@@ -671,7 +671,7 @@ template 
 void TableManager::endCell()
 {
 #ifdef DEBUG_WRITERFILTER
-if (mpTableLogger != NULL)
+if (mpTableLogger != nullptr)
 mpTableLogger->element("tablemanager.endCell");
 #endif
 
@@ -682,7 +682,7 @@ template 
 void TableManager::endRow()
 {
 #ifdef DEBUG_WRITERFILTER
-if (mpTableLogger != NULL)
+if (mpTableLogger != nullptr)
 mpTableLogger->element("tablemanager.endRow");
 #endif
 
@@ -724,7 +724,7 @@ template 
 void TableManager::startLevel()
 {
 #ifdef DEBUG_WRITERFILTER
-if (mpTableLogger != NULL)
+if (mpTableLogger != nullptr)
 {
 typename TableData::Pointer_t pTableData;
 
@@ -734,7 +734,7 @@ void TableManager::startLevel()
 mpTableLogger->startElement("tablemanager.startLevel");
 mpTableLogger->attribute("level", mTableDataStack.size());
 
-if (pTableData.get() != NULL)
+if (pTableData.get() != nullptr)
 mpTableLogger->attribute("openCell",
  pTableData->isCellOpen() ? "yes" : "no");
 
@@ -764,7 +764,7 @@ void TableManager::startLevel()
 template 
 void TableManager::endLevel()
 {
-if (mpTableDataHandler.get() != NULL)
+if (mpTableDataHandler.get() != nullptr)
 resolveCurrentTable();
 
 // Store the unfinished row as it will be used for the next table
@@ -774,7 +774,7 @@ void TableManager::endLevel()
 mTableDataStack.pop();
 
 #ifdef DEBUG_WRITERFILTER
-if (mpTableLogger != NULL)
+if (mpTableLogger != nullptr)
 {
 typename TableData::Pointer_t pTableData;
 
@@ -784,7 +784,7 @@ void TableManager::endLevel()
 mpTableLogger->startElement("tablemanager.endLevel");
 mpTableLogger->attribute("level", mTableDataStack.size());
 
-if (pTableData.get() != NULL)
+if (pTableData.get() != nullptr)
 mpTableLogger->attribute("openCell",
  pTableData->isCellOpen() ? "yes" : "no");
 
@@ -886,7 +886,7 @@ template 
 void TableManager::handle0x7()
 {
 #ifdef DEBUG_WRITERFILTER
-if (mpTableLogger != NULL)

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

2014-10-24 Thread Caolán McNamara

 lotuswordpro/source/filter/lwpdrawobj.cxx  |   33 +++--
 lotuswordpro/source/filter/lwptools.hxx|6 
 sc/source/ui/condformat/colorformat.cxx|4 +--
 sc/source/ui/condformat/condformatdlgentry.cxx |2 -
 sc/source/ui/miscdlgs/datafdlg.cxx |5 +--
 5 files changed, 37 insertions(+), 13 deletions(-)

New commits:
commit ac68cab1f1e6991bc95fe482f4d9be1538b827c4
Author: CaolÃ¡n McNamara 
Date:   Tue Oct 14 15:21:27 2014 +0100

coverity#1242739 Untrusted loop bound

and

coverity#1242739 Untrusted loop bound

Change-Id: I2cab9b3c531befc42c1522dd0d4beb59df7ae315

diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 4ae6279..2ca16ad 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -1209,10 +1209,14 @@ void LwpDrawTextArt::Read()
 sal_uInt16 nPointNumber;
 sal_Int16 nX, nY;
 m_pStream->ReadUInt16( nPointNumber );
+
+size_t nPoints = nPointNumber*3+1;
+if (nPoints > m_pStream->remainingSize() / 4)
+throw BadRead();
+
 m_aTextArtRec.aPath[0].n = nPointNumber;
-m_aTextArtRec.aPath[0].pPts = new SdwPoint [nPointNumber*3+1];
-sal_uInt16 nPt = 0;
-for ( nPt = 0; nPt <= nPointNumber*3; nPt++)
+m_aTextArtRec.aPath[0].pPts = new SdwPoint[nPoints];
+for (size_t nPt = 0; nPt < nPoints; ++nPt)
 {
 m_pStream->ReadInt16( nX );
 m_pStream->ReadInt16( nY );
@@ -1221,9 +1225,14 @@ void LwpDrawTextArt::Read()
 }
 
 m_pStream->ReadUInt16( nPointNumber );
+
+nPoints = nPointNumber*3+1;
+if (nPoints > m_pStream->remainingSize() / 4)
+throw BadRead();
+
 m_aTextArtRec.aPath[1].n = nPointNumber;
-m_aTextArtRec.aPath[1].pPts = new SdwPoint [nPointNumber*3+1];
-for (nPt = 0; nPt <= nPointNumber*3; nPt++)
+m_aTextArtRec.aPath[1].pPts = new SdwPoint[nPoints];
+for (size_t nPt = 0; nPt < nPoints; ++nPt)
 {
 m_pStream->ReadInt16( nX );
 m_pStream->ReadInt16( nY );
@@ -1251,6 +1260,10 @@ void LwpDrawTextArt::Read()
 - 
(m_aTextArtRec.aPath[0].n*3 + 1)*4
 - 
(m_aTextArtRec.aPath[1].n*3 + 1)*4;
 
+
+if (m_aTextArtRec.nTextLen > m_pStream->remainingSize())
+throw BadRead();
+
 m_aTextArtRec.pTextString = new sal_uInt8 [m_aTextArtRec.nTextLen];
 m_pStream->Read(m_aTextArtRec.pTextString, m_aTextArtRec.nTextLen);
 m_aTextArtRec.pTextString[m_aTextArtRec.nTextLen-1] = 0;
commit da859a7949238e74e5287f1bacc61886b4294858
Author: CaolÃ¡n McNamara 
Date:   Tue Oct 14 15:13:01 2014 +0100

coverity#1242791 Untrusted loop bound

Change-Id: Iba6d6b77fe30e11f50e16c1ee899b71ea4337355

diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index f357f9d..4ae6279 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -591,7 +591,10 @@ void LwpDrawPolygon::Read()
 this->ReadClosedObjStyle();
 m_pStream->ReadUInt16( m_nNumPoints );
 
-m_pVector = new SdwPoint [m_nNumPoints];
+if (m_nNumPoints > m_pStream->remainingSize() / 4)
+throw BadRead();
+
+m_pVector = new SdwPoint[m_nNumPoints];
 
 for (sal_uInt16 nC = 0; nC < m_nNumPoints; nC++)
 {
commit e4ebd97a9b5dc3a25a142109d2a0dbe41925e431
Author: CaolÃ¡n McNamara 
Date:   Tue Oct 14 15:12:05 2014 +0100

coverity#1242918 Untrusted loop bound

Change-Id: I8575a43a095165a81417f169463aaf2c4ab337e8

diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 4be146f..f357f9d 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -505,7 +505,10 @@ void LwpDrawPolyLine::Read()
 m_pStream->ReadUChar( m_aPolyLineRec.aPenColor.unused );
 m_pStream->ReadUInt16( m_aPolyLineRec.nNumPoints );
 
-m_pVector= new SdwPoint [m_aPolyLineRec.nNumPoints];
+if (m_aPolyLineRec.nNumPoints > m_pStream->remainingSize() / 4)
+throw BadRead();
+
+m_pVector= new SdwPoint[m_aPolyLineRec.nNumPoints];
 
 for (sal_uInt16 nC = 0; nC < m_aPolyLineRec.nNumPoints; nC++)
 {
diff --git a/lotuswordpro/source/filter/lwptools.hxx 
b/lotuswordpro/source/filter/lwptools.hxx
index 51680bd..f240214 100644
--- a/lotuswordpro/source/filter/lwptools.hxx
+++ b/lotuswordpro/source/filter/lwptools.hxx
@@ -148,6 +148,12 @@ public:
 BadSeek() : std::runtime_error("Lotus Word Pro Bad Seek") { }
 };
 
+class BadRead: public std::runtime_error
+{
+public:
+BadRead() : std::runtime_error("Lotus Word Pro Bad Read") { }
+};
+
 class BadDecompress : public std::runtime_error
 {
 public:
commit 902a3df2daa196e2182b0741f0ec3849d158f42b
Author: CaolÃ¡n McNamara 
Date:   Tue Oct 14 13:46:46 2014 +0100

coverity#735315 Unche

[Libreoffice-commits] core.git: 4 commits - chart2/source

2014-10-24 Thread Kohei Yoshida

 chart2/source/view/axes/Tickmarks.cxx|6 -
 chart2/source/view/axes/VAxisProperties.cxx  |   48 
 chart2/source/view/axes/VAxisProperties.hxx  |   17 ++
 chart2/source/view/axes/VCartesianAxis.cxx   |  102 +
 chart2/source/view/axes/VCartesianAxis.hxx   |4 
 chart2/source/view/axes/VPolarRadiusAxis.cxx |6 -
 chart2/source/view/main/ChartView.cxx|  155 ---
 7 files changed, 192 insertions(+), 146 deletions(-)

New commits:
commit 2d6dacc1c93bfd4a9086f8fde6b0edbfdeb573c9
Author: Kohei Yoshida 
Date:   Mon Oct 13 19:32:15 2014 -0400

More on documenting the methods.

Change-Id: Ibdbc1b26521e56de5dcba1b9572bb0221fc0fff5

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 3de0c47..4ba924b 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -255,11 +255,23 @@ public:
  * largest axis label text object prior to calling this method.
  *
  * The new axis scaling data will be stored in the VCoordinateSystem
- * objects.
+ * objects.  The label alignment direction for each axis will also get
+ * determined during this process, and stored in VAxis.
  */
 void doAutoScaling( ChartModel& rModel );
+
+/**
+ * After auto-scaling is performed, call this method to set the explicit
+ * scaling and increment data to all relevant VAxis objects.
+ */
 void updateScalesAndIncrementsOnAxes();
+
+/**
+ * After auto-scaling is performed, call this method to set the explicit
+ * scaling data to all the plotters.
+ */
 void setScalesFromCooSysToPlotter();
+
 void setNumberFormatsFromAxes();
 drawing::Direction3D getPreferredAspectRatio();
 
commit 942731076de057f5caea2c42a41ae8cf541bba9f
Author: Kohei Yoshida 
Date:   Mon Oct 13 15:24:33 2014 -0400

Scope level reduction & explain what the max axis index really is.

The concept of axis index and dimension index is quite confusing in the
chart2 code

Change-Id: I035af0a225396bd5394089d6f584f78dcaf0ad31

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 732d01e..3de0c47 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -276,7 +276,15 @@ private:
 SeriesPlottersType m_aSeriesPlotterList;
 std::vector< VCoordinateSystem* >& m_rVCooSysList;
 ::std::map< uno::Reference< XAxis >, AxisUsage > m_aAxisUsageList;
+
+/**
+ * Max axis index of all dimensions.  Currently this can be either 0 or 1
+ * since we only support primary and secondary axes per dimension.  The
+ * value of 0 means all dimensions have only primary axis, while 1 means
+ * at least one dimension has a secondary axis.
+ */
 sal_Int32 m_nMaxAxisIndex;
+
 bool m_bChartTypeUsesShiftedCategoryPositionPerDefault;
 sal_Int32 m_nDefaultDateNumberFormat;
 };
@@ -778,85 +786,85 @@ void 
SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel&
 continue;
 
 uno::Reference< XDiagram > xDiagram( rModel.getFirstDiagram() );
-if( xDiagram.is() )
+if (!xDiagram.is())
+continue;
+
+bool bSeriesAttachedToThisAxis = false;
+sal_Int32 nAttachedAxisIndex = -1;
 {
-bool bSeriesAttachedToThisAxis = false;
-sal_Int32 nAttachedAxisIndex = -1;
+::std::vector< Reference< XDataSeries > > aSeriesVector( 
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+::std::vector< Reference< XDataSeries > >::const_iterator 
aIter = aSeriesVector.begin();
+for( ; aIter != aSeriesVector.end(); ++aIter )
 {
-::std::vector< Reference< XDataSeries > > aSeriesVector( 
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
-::std::vector< Reference< XDataSeries > >::const_iterator 
aIter = aSeriesVector.begin();
-for( ; aIter != aSeriesVector.end(); ++aIter )
+sal_Int32 nCurrentIndex = 
DataSeriesHelper::getAttachedAxisIndex( *aIter );
+if( nAxisIndex == nCurrentIndex )
 {
-sal_Int32 nCurrentIndex = 
DataSeriesHelper::getAttachedAxisIndex( *aIter );
-if( nAxisIndex == nCurrentIndex )
-{
-bSeriesAttachedToThisAxis = true;
-break;
-}
-else if( nAttachedAxisIndex<0 || 
nAttachedAxisIndex>nCurrentIndex )
-nAttachedAxisIndex=nCurrentIndex;
+bSeriesAttachedToThisAxis = true;
+break;
 }
+else if( nAttachedAxisIndex<0 || 
nAttachedA

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

2014-10-24 Thread Chris Sherlock

 vcl/inc/salframe.hxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9fef4810b49b04194c1e00b97ac340d14114
Author: Chris Sherlock 
Date:   Tue Oct 14 22:50:56 2014 +1100

vcl: cleanup salframe.hxx

Change-Id: I0f331a2589d0fab5cf3843bf7531333e07067997

diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index f594977..f427c24 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -99,12 +99,12 @@ struct SystemParentData;
 class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier
 {
 // the VCL window corresponding to this frame
-vcl::Window* m_pWindow;
+vcl::Window*m_pWindow;
 SALFRAMEPROCm_pProc;
 
 public:
-SalFrame() : m_pWindow( NULL ), m_pProc( NULL ) {}
-virtual ~SalFrame();
+SalFrame() : m_pWindow( NULL ), m_pProc( NULL ) {}
+virtual ~SalFrame();
 
 SalFrameGeometrymaGeometry;
 
@@ -181,7 +181,7 @@ public:
 
 virtual voidUpdateSettings( AllSettings& rSettings ) = 0;
 
-virtual voidBeep() = 0;
+virtual voidBeep() = 0;
 
 // returns system data (most prominent: window handle)
 virtual const SystemEnvData*
@@ -233,7 +233,7 @@ public:
 { m_pWindow = pWindow; m_pProc = pProc; }
 
 // returns the instance set
-vcl::Window* GetWindow() const { return m_pWindow; }
+vcl::Window*GetWindow() const { return m_pWindow; }
 
 // Call the callback set; this sometimes necessary for implementation 
classes
 // that should not know more than necessary about the SalFrame 
implementation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/CppunitTest_sw_odfimport.mk sw/qa sw/source

2014-10-24 Thread Miklos Vajna

 sw/CppunitTest_sw_odfimport.mk |3 ++
 sw/qa/extras/odfimport/data/bnc800714.fodt |   35 +
 sw/qa/extras/odfimport/odfimport.cxx   |   11 +
 sw/source/core/text/frmform.cxx|7 -
 4 files changed, 55 insertions(+), 1 deletion(-)

New commits:
commit 05e9de8d69dd9a2194f6f561fa77c0c61534e9a8
Author: Miklos Vajna 
Date:   Tue Oct 14 16:31:13 2014 +0200

bnc#800714 SwTxtFrm::FormatAdjust: still call SplitFrm if we have columns

Regression from c5a8a2c3cbcee0175127a0662e3d820ea4deea22 (sw34bf05:
i#84870 - method  - do not split text frame
which only contains on as-character anchored object, 2011-03-11), the
i#84870 fix was for a document which didn't have columns, and didn't
consider that this causes a layout loop in case:

1) There are two paragraphs in a section, having multiple columns.

2) The second paragraph has fo:keep-together="always".

In this case originally we tried to call SplitFrm(), realized that it
didn't help, and then gave up. But after the change, we kept trying to
satisfy the two conflicting requirements (balance content in the 3
columns vs keep the second paragraph with the first one).

Fix the problem by not calling SplitFrm() only in case we're not inside
columns.

(cherry picked from commit 2d35baed5e87ffe7ca371986391cdb3983cdd2b1)

Conflicts:
sw/CppunitTest_sw_odfimport.mk
sw/qa/extras/odfimport/odfimport.cxx

Change-Id: I64e969ef5e8f519314f5613f8e6fae626ae085ce

diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index a37b438..41357be 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -56,6 +56,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
 configmgr/source/configmgr \
embeddedobj/util/embobj \
 filter/source/config/cache/filterconfig1 \
+   filter/source/odfflatxml/odfflatxml \
+   filter/source/xmlfilterdetect/xmlfd \
+   filter/source/xmlfilteradaptor/xmlfa \
 framework/util/fwk \
 i18npool/util/i18npool \
lingucomponent/source/languageguessing/guesslang \
diff --git a/sw/qa/extras/odfimport/data/bnc800714.fodt 
b/sw/qa/extras/odfimport/data/bnc800714.fodt
new file mode 100644
index 000..a759b7c
--- /dev/null
+++ b/sw/qa/extras/odfimport/data/bnc800714.fodt
@@ -0,0 +1,35 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+ 
+ 
+ 
+
+   
+  
+ 
+ 
+  
+   Before.
+   
+
+  
+   
+  
+ 
+Frame.
+   
+   After.
+  
+ 
+
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index e7fa8fb..f1651bd 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -462,6 +463,16 @@ DECLARE_ODFIMPORT_TEST(testSpellmenuRedline, 
"spellmenu-redline.odt")
 CPPUNIT_ASSERT_EQUAL(sal_uInt16(FN_REDLINE_PREV_CHANGE), 
aPopup.GetItemId(aPopup.GetItemCount() - 1));
 }
 
+DECLARE_ODFIMPORT_TEST(testBnc800714, "bnc800714.fodt"

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

2014-10-24 Thread Samuel Mehrbrodt

 include/svx/svxcommands.h |1 +
 sd/source/ui/app/menuids_tmpl.src |8 
 sd/source/ui/app/popup2_tmpl.src  |1 +
 3 files changed, 10 insertions(+)

New commits:
commit 1175b25bf2353c95111fb5c0459feee751b3c764
Author: Samuel Mehrbrodt 
Date:   Mon Oct 13 21:20:23 2014 +0200

fdo#84213 Add show/hide ruler to sd context menu

Change-Id: Iee42ab31a82ed4459f956706cef513afcf70ef94

diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index 1cd454f..fdcc227 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -86,6 +86,7 @@
 #define CMD_SID_OUTLINE_MAKE".uno:Group"
 #define CMD_SID_INSERT_POSTIT   ".uno:InsertAnnotation"
 #define CMD_SID_REPLYTO_POSTIT  ".uno:ReplyToAnnotation"
+#define CMD_SID_RULER   ".uno:ShowRuler"
 #define CMD_SID_DELETE_POSTIT   ".uno:DeleteAnnotation"
 #define CMD_SID_DELETEALL_POSTIT".uno:DeleteAllAnnotation"
 #define CMD_SID_DELETEALLBYAUTHOR_POSTIT
".uno:DeleteAllAnnotationByAuthor"
diff --git a/sd/source/ui/app/menuids_tmpl.src 
b/sd/source/ui/app/menuids_tmpl.src
index c78ff25..77273dd 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -959,6 +959,14 @@
 RadioCheck = TRUE ; \
 Text [ en-US ] = "Fixed Ver~tical Bottom" ; \
 };
+#define MN_RULER\
+MenuItem\
+{\
+Identifier = SID_RULER ; \
+HelpId = CMD_SID_RULER ; \
+Checkable = TRUE ; \
+Text [ en-US ] = "Display ~Ruler" ; \
+};
 
 #define MN_GRID_VISIBLE\
 MenuItem\
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index fed9de8..7d54ed5 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -528,6 +528,7 @@
 MN_PRESENTATION
 #endif
 SEPARATOR
+MN_RULER
 MN_GRID
 MN_HELPLINES
 MN_CAPTUREPOINT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Stephan Bergmann

 include/sfx2/templatedlg.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d24f6ba270127ad330dc733e0fef3144319d07e
Author: Stephan Bergmann 
Date:   Tue Oct 14 20:32:15 2014 +0200

Missing ModelessDialog -> ModalDialog

Change-Id: I83a3eb34138c75dbc5a0239a9d761d22c6cd98a0

diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index b9597cb..8b133f4 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -42,7 +42,7 @@ namespace com {
 }   }   }
 }
 
-class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public ModelessDialog
+class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public ModalDialog
 {
 typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const 
ThumbnailViewItem*);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

2014-10-24 Thread bugzilla-daemon

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

Joel Madero  changed:

   What|Removed |Added

 Depends on||84854

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 79641] LibreOffice 4.4 most annoying bugs

2014-10-24 Thread bugzilla-daemon

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

--- Comment #12 from Joel Madero  ---
Added bug 84854 - critical regression.

Spreadsheet is not drawing correctly when it loads - resulting in massive black
areas on the sheet and inability to use it at all. So far only confirmed with:
TinderBox: Win-x86@42.

Does not affect: TinderBox: Win-x86@39

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

Re: Unittest fails building on OS X 10.9

2014-10-24 Thread Alexander Thurgood

Le 09/10/2014 21:38, Joost Eekhoorn a écrit :

Hi Joost,

> ./autogen.sh
> --with-ant-home="/usr/local/bin/apache-ant"
> --wiithout-junit

I have something similar to the above, except that my ant installation
is outside of my system tree


> --enable-python=internal

Not quite sure why you needed this python directive, I don't and my
build works


> --disable-cve-tests

I don't need to disable any of the unit tests specifically, unless
something has changed in that regard since Wednesday.


> 
> I could not found instdir/program/soffice to start the program, but used:
> instdir/LibreOfficeDev.app/Contents/MacOS/soffice

Yes, the binary is in the app bundle.


Alex

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

[Libreoffice-commits] core.git: qadevOOo/runner

2014-10-24 Thread Robert Antoni Buj i Gelonch

 qadevOOo/runner/helper/OfficeProvider.java |4 
 1 file changed, 4 deletions(-)

New commits:
commit ab06f67ee26e730f209a3ff8c4717901f70765fe
Author: Robert Antoni Buj i Gelonch 
Date:   Sun Oct 12 11:38:58 2014 +0200

runner: code will never be executed

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

diff --git a/qadevOOo/runner/helper/OfficeProvider.java 
b/qadevOOo/runner/helper/OfficeProvider.java
index 58fdd01..cfb2e232 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -297,10 +297,6 @@ public class OfficeProvider implements AppProvider
 {
 System.out.println("Could not connect an Office and cannot 
start one.\n".concat("please start an office with following parameter:\n").
 concat("\nsoffice --accept=").concat((String) 
param.get("ConnectionString")).concat(";urp;\n"));
-if (bAppExecutionHasWarning)
-{
-System.out.println(errorMessage);
-}
 }
 }
 
___
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-10-24 Thread bugzilla-daemon

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

Karel Hruska  changed:

   What|Removed |Added

 Depends on||84294

-- 
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: 13 commits - connectivity/source dbaccess/source filter/source sc/source sw/source

2014-10-24 Thread Caolán McNamara

 connectivity/source/drivers/jdbc/Array.cxx |2 
 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx  |   48 +--
 connectivity/source/drivers/jdbc/InputStream.cxx   |2 
 connectivity/source/drivers/jdbc/JConnection.cxx   |8 -
 connectivity/source/drivers/jdbc/JStatement.cxx|   19 ++--
 connectivity/source/drivers/jdbc/Object.cxx|   53 +
 connectivity/source/drivers/jdbc/PreparedStatement.cxx |2 
 connectivity/source/drivers/jdbc/ResultSet.cxx |   16 +--
 connectivity/source/drivers/jdbc/ResultSetMetaData.cxx |2 
 connectivity/source/drivers/jdbc/SQLException.cxx  |2 
 connectivity/source/inc/java/lang/Object.hxx   |9 +-
 dbaccess/source/core/dataaccess/databasedocument.cxx   |   41 +-
 dbaccess/source/sdbtools/connection/datasourcemetadata.cxx |2 
 dbaccess/source/sdbtools/connection/objectnames.cxx|2 
 dbaccess/source/sdbtools/connection/tablename.cxx  |3 
 filter/source/svg/svgreader.cxx|2 
 sc/source/ui/unoobj/nameuno.cxx|5 -
 sw/source/core/doc/DocumentContentOperationsManager.cxx|2 
 sw/source/core/doc/docnew.cxx  |4 
 sw/source/filter/ww8/ww8par5.cxx   |2 
 sw/source/ui/frmdlg/frmpage.cxx|2 
 21 files changed, 126 insertions(+), 102 deletions(-)

New commits:
commit 246cd66af254687628b7cbd5aa64cb9bfa87f28d
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 11 21:10:23 2014 +0100

coverity#706421 Uncaught exception

Change-Id: I91a6ac9d9bda0ea25f1f5385bbac71ea9d22d573

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 45199e9..c520f92 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1088,6 +1088,18 @@ void ODatabaseDocument::impl_storeAs_throw( const 
OUString& _rURL, const ::comph
 if ( bIsInitializationProcess )
 impl_setInitialized();
 }
+catch( const IOException& )
+{
+if ( !bIsInitializationProcess )
+m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? 
"OnSaveFailed" : "OnSaveAsFailed", NULL, makeAny( _rURL ) );
+throw;
+}
+catch( const RuntimeException& )
+{
+if ( !bIsInitializationProcess )
+m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? 
"OnSaveFailed" : "OnSaveAsFailed", NULL, makeAny( _rURL ) );
+throw;
+}
 catch( const Exception& )
 {
 Any aError = ::cppu::getCaughtException();
@@ -1096,14 +1108,6 @@ void ODatabaseDocument::impl_storeAs_throw( const 
OUString& _rURL, const ::comph
 if ( !bIsInitializationProcess )
 m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? 
"OnSaveFailed" : "OnSaveAsFailed", NULL, makeAny( _rURL ) );
 
-if  (   aError.isExtractableTo( ::cppu::UnoType< IOException >::get() )
-||  aError.isExtractableTo( ::cppu::UnoType< RuntimeException 
>::get() )
-)
-{
-// allowed to leave
-throw;
-}
-
 impl_throwIOExceptionCausedBySave_throw( aError, _rURL );
 }
 
commit e7d3f4b704c42a9035891700cf57f35aeca2aec7
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 11 21:08:39 2014 +0100

coverity#706404 Uncaught exception

Change-Id: I7717b61e89d95cb6d89bb273c22c0503b0853d96

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 29dd1f4..45199e9 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -732,18 +732,21 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const 
OUString& i_SourceLocati
 impl_attachResource( sLogicalDocumentURL, 
aMediaDescriptor.getPropertyValues(), aGuard );
 // <- SYNCHRONIZED
 }
+catch( const IOException& )
+{
+throw;
+}
+catch( const RuntimeException& )
+{
+throw;
+}
+catch( const WrappedTargetException& )
+{
+throw;
+}
 catch( const Exception& )
 {
 Any aError = ::cppu::getCaughtException();
-if  (   aError.isExtractableTo( ::cppu::UnoType< IOException >::get() )
-||  aError.isExtractableTo( ::cppu::UnoType< RuntimeException 
>::get() )
-||  aError.isExtractableTo( ::cppu::UnoType< 
WrappedTargetException >::get() )
-)
-{
-// allowed to leave
-throw;
-}
-
 throw WrappedTargetException( OUString(), *this, aError );
 }
 }
commit 32db3f5dc4fccecc8c66b1cb4ff2e517e648
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 11 20:55:27 2014 +0100

coverity#706331 Un

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svgio/inc svgio/source

2014-10-24 Thread Armin Le Grand

 svgio/inc/svgio/svgreader/svgtools.hxx|4 ++
 svgio/source/svgreader/svgdocumenthandler.cxx |   11 +
 svgio/source/svgreader/svgtools.cxx   |   51 ++
 3 files changed, 65 insertions(+), 1 deletion(-)

New commits:
commit 7b071b828a5f602cc30c17ddd871a75426a53faf
Author: Armin Le Grand 
Date:   Fri Oct 10 15:52:52 2014 +

i125325 added code to handle block comments in Css style definitions

diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx 
b/svgio/inc/svgio/svgreader/svgtools.hxx
index a138d83..607d238 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -236,6 +236,10 @@ namespace svgio
 rtl::OUString whiteSpaceHandlingDefault(const rtl::OUString& 
rCandidate);
 rtl::OUString whiteSpaceHandlingPreserve(const rtl::OUString& 
rCandidate);
 
+// #125325# removes block comment of the general form '/* ... */', 
returns
+// an adapted string or the original if no comments included
+rtl::OUString removeBlockComments(const rtl::OUString& rCandidate);
+
 } // end of namespace svgreader
 } // end of namespace svgio
 
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx 
b/svgio/source/svgreader/svgdocumenthandler.cxx
index 4378f20..a26e723 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -512,7 +512,16 @@ namespace svgio
 if(maCssContents.size())
 {
 // need to interpret css styles and remember them as 
StyleSheets
-pCssStyle->addCssStyleSheet(*(maCssContents.end() - 
1));
+// #125325# Caution! the Css content may contain block 
comments
+// (see 
http://www.w3.org/wiki/CSS_basics#CSS_comments). These need
+// to be removed first
+const rtl::OUString 
aCommentFreeSource(removeBlockComments(*(maCssContents.end() - 1)));
+
+if(aCommentFreeSource.getLength())
+{
+pCssStyle->addCssStyleSheet(aCommentFreeSource);
+}
+
 maCssContents.pop_back();
 }
 else
diff --git a/svgio/source/svgreader/svgtools.cxx 
b/svgio/source/svgreader/svgtools.cxx
index ee0da7f..987ddd8 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -1538,6 +1538,57 @@ namespace svgio
 return rCandidate;
 }
 
+// #125325#
+rtl::OUString removeBlockComments(const rtl::OUString& rCandidate)
+{
+const sal_Int32 nLen(rCandidate.getLength());
+
+if(nLen)
+{
+sal_Int32 nPos(0);
+rtl::OUStringBuffer aBuffer;
+bool bChanged(false);
+sal_Int32 nInsideComment(0);
+const sal_Unicode aCommentSlash('/');
+const sal_Unicode aCommentStar('*');
+
+while(nPos < nLen)
+{
+const sal_Unicode aChar(rCandidate[nPos]);
+const bool bStart(aCommentSlash == aChar && nPos + 1 < 
nLen && aCommentStar == rCandidate[nPos + 1]);
+const bool bEnd(aCommentStar == aChar && nPos + 1 < nLen 
&& aCommentSlash == rCandidate[nPos + 1]);
+
+if(bStart)
+{
+nPos += 2;
+nInsideComment++;
+bChanged = true;
+}
+else if(bEnd)
+{
+nPos += 2;
+nInsideComment--;
+}
+else
+{
+if(!nInsideComment)
+{
+aBuffer.append(aChar);
+}
+
+nPos++;
+}
+}
+
+if(bChanged)
+{
+return aBuffer.makeStringAndClear();
+}
+}
+
+return rCandidate;
+}
+
 rtl::OUString consolidateContiguosSpace(const rtl::OUString& 
rCandidate)
 {
 const sal_Int32 nLen(rCandidate.getLength());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: toolkit/test

2014-10-24 Thread Robert Antoni Buj i Gelonch

 toolkit/test/accessibility/AccessibilityTree.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 581234b21368311d865fd1600c7ca62422ebb186
Author: Robert Antoni Buj i Gelonch 
Date:   Sat Oct 11 19:26:08 2014 +0200

accessibility: Calling String.toString()

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

diff --git a/toolkit/test/accessibility/AccessibilityTree.java 
b/toolkit/test/accessibility/AccessibilityTree.java
index b21249a..6f94847 100644
--- a/toolkit/test/accessibility/AccessibilityTree.java
+++ b/toolkit/test/accessibility/AccessibilityTree.java
@@ -265,7 +265,7 @@ public class AccessibilityTree
 for( int i = 0; i < aActions.size(); i++ )
 {
 aMenu.add( new NodeAction(
-   aActions.get(i).toString(),
+   aActions.get(i),
aNode, i ) );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Tor Lillqvist

 vcl/workben/icontest.cxx |  344 +++
 1 file changed, 171 insertions(+), 173 deletions(-)

New commits:
commit 2abd4cf4f47ec7537da4cd5b7453ee440bb057a3
Author: Tor Lillqvist 
Date:   Fri Oct 10 15:58:29 2014 +0300

More hacking on 'icontest'

What we want is to test is not loading and displaying many images. It is 
just
to test just one. So simplify. (Yes, the name 'icontest' is even more
misleading now.)

Check whether the OpenGL context supports non-power-of-two textures, and 
also
check the maximum texture size, and scale / pad appropriately.

Change-Id: I02bccd33e08749d972652173a881aa40870c12d8

diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 477be4c..6e8bd7e 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -18,6 +18,8 @@
 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -41,6 +43,10 @@
 
 using namespace com::sun::star;
 
+namespace {
+const int WIDTH = 1000, HEIGHT = 800;
+}
+
 class MyWorkWindow : public WorkWindow
 {
 public:
@@ -51,16 +57,19 @@ public:
 
 class MyOpenGLWorkWindow : public MyWorkWindow
 {
-private:
+public:
+bool mbHaveTexture;
 OpenGLWindow *mpOpenGLWindow;
+Graphic maGraphic;
+GLuint mnTextureName;
+float mnTextureAspect;
+
+void LoadTexture();
 
-public:
 MyOpenGLWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
 
 virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
 
-std::vectormaTextureName;
-std::vectormaTextureAspect;
 };
 
 MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle ) :
@@ -72,79 +81,151 @@ MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits 
nWinStyle ) :
 MyOpenGLWorkWindow::MyOpenGLWorkWindow( vcl::Window* pParent, WinBits 
nWinStyle ) :
 MyWorkWindow( pParent, nWinStyle )
 {
+mbHaveTexture = false;
 mpOpenGLWindow = new OpenGLWindow( this );
-mpOpenGLWindow->SetSizePixel( Size( 1000, 800 ) );
+mpOpenGLWindow->SetSizePixel( Size( WIDTH, HEIGHT ) );
 mpOpenGLWindow->Show();
 mpOpenGLWindow->EnableInput();
 }
 
-void MyOpenGLWorkWindow::Paint( const Rectangle& )
+void MyOpenGLWorkWindow::LoadTexture()
 {
-const int WIDTH = 1000, HEIGHT = 800;
+mbHaveTexture = true;
 
-SAL_INFO("vcl.icontest", "==> Paint! (OpenGL) " << GetSizePixel());
-OpenGLContext& aCtx = mpOpenGLWindow->getContext();
-aCtx.requestLegacyContext();
-aCtx.setWinSize( Size( WIDTH, HEIGHT ) );
+glEnable(GL_TEXTURE_2D);
+CHECK_GL_ERROR();
 
+glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 CHECK_GL_ERROR();
 
-aCtx.makeCurrent();
+glGenTextures( 1, &mnTextureName );
 CHECK_GL_ERROR();
 
-Size aSize(WIDTH, HEIGHT);
-glViewport( 0, 0, aSize.Width(), aSize.Height() );
+glBindTexture(GL_TEXTURE_2D, mnTextureName);
+CHECK_GL_ERROR();
 
-glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+CHECK_GL_ERROR();
+glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+CHECK_GL_ERROR();
+glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+CHECK_GL_ERROR();
+glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 CHECK_GL_ERROR();
 
-float nThumbWidth = 2.0f / (WIDTH / 100.0f);
-float nThumbHeight = 2.0f / (HEIGHT / 100.0f);
+BitmapEx aBitmap( maGraphic.GetBitmapEx( ) );
+Size aBitmapSize( aBitmap.GetSizePixel() );
 
-float nStepX = 2.0f / (WIDTH / (100.0f + 10));
-float nStepY = 2.0f / (HEIGHT / (100.0f + 10));
+GLint maxTexSize;
+glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTexSize);
+CHECK_GL_ERROR();
 
-float nX = -1, nY = -1;
+SAL_INFO("vcl.icontest", "GL_MAX_TEXTURE_SIZE: " << maxTexSize);
 
-for (size_t i = 0; i < maTextureName.size(); ++i)
+if (aBitmapSize.Width() > maxTexSize || aBitmapSize.Height() > maxTexSize)
 {
-glBindTexture(GL_TEXTURE_2D, maTextureName[i]);
-CHECK_GL_ERROR();
+Size aNewSize(aBitmapSize);
+if (aNewSize.Width() > maxTexSize)
+{
+aNewSize.setHeight(aNewSize.Height() * (((float) maxTexSize) / 
aNewSize.Width()));
+aNewSize.setWidth(maxTexSize);
+}
+if (aNewSize.Height() > maxTexSize)
+{
+aNewSize.setWidth(aNewSize.Width() * (((float) maxTexSize) / 
aNewSize.Height()));
+aNewSize.setHeight(maxTexSize);
+}
+SAL_INFO("vcl.icontest", "Scaling to " << aNewSize);
+aBitmap.Scale(aNewSize, BMP_SCALE_SUPER);
+aBitmapSize = aNewSize;
+}
 
-glPushMatrix();
-CHECK_GL_ERROR();
+SAL_INFO("vcl.icontest", "GLEW_ARB_texture_non_power_of_two: " << 
(GLEW_ARB_texture_non_power_of_two ? "YES" : "NO"));
 
-glTranslatef(nX, nY, 0);
+GLsizei texWidth(aBitmapSize.Width()), texHeight(aBitmapSize.Height());
 
-if (maTextureAspect[i] >= 1)
-

Re: [Lightproof] "Binary URP bridge disposed during call"

2014-10-24 Thread Stephan Bergmann


On 10/09/2014 09:18 PM, Adrian Chaves Fernandez wrote:

$ ulimit -c unlimited
$ libreoffice lightproof_hu-1.5.oxt
$ ls
doc/  META-INF/  __pycache__/  pythonpath/  src/  ChangeLog  COPYING
description.xml  Dialog.py  lightproof_hu-1.5.oxt  Lightproof.py
Linguistic.xcu  make.py  NEWS  README  THANKS  VERSION

So either no file is generated or it is not being generated in $(pwd). I did


Hm, no idea off the top of my head if there's any cwd involved there. 
Another angle of attack could be to instead use "unopkg add" to install 
the extension, and see if its output gives more of a clue.  (Maybe after 
removing remnants of previous attempts at installing the extension, see 
"unopkg list" and "unopkg remove").


Stephan

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

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

2014-10-24 Thread Robert Antoni Buj i Gelonch

 connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1210ad69d8536da6506d945b6f4ebd0fd33d
Author: Robert Antoni Buj i Gelonch 
Date:   Mon Oct 13 00:50:25 2014 +0200

connectivity: the value of Math.asin(0.0) is zero

Change-Id: Ic72750fcea93edf3457ccea4a357e9d2929a646c
Reviewed-on: https://gerrit.libreoffice.org/11941
Reviewed-by: Matthew Francis 
Tested-by: Matthew Francis 

diff --git 
a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java 
b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
index f18b35c..4006910 100644
--- a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
@@ -359,7 +359,7 @@ public class DBaseNumericFunctions extends SubTestCase
 private void asin(final XRowSet xRowRes) throws 
com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
 {
 final XRow row = execute(xRowRes, "ASIN(0) ");
-assure("ASIN(0) failed!", (float) row.getDouble(1) == (float) 
Math.asin(0.0));
+assure("ASIN(0) failed!", (float) row.getDouble(1) == 0.0);
 }
 
 private void atan(final XRowSet xRowRes) throws 
com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
___
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-10-24 Thread Kohei Yoshida

 sc/source/core/data/column.cxx  |6 ++
 sc/source/core/data/formulacell.cxx |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 4b2f0915f9f3bff7d2476ec41a272e5263fbb312
Author: Kohei Yoshida 
Date:   Sun Oct 12 10:18:09 2014 -0400

fdo#83901: ROW() and COLUMN() to be properly recalculated on cell move.

For cases where ROW or COLUMN references another cell that has shifted.

Change-Id: Ic4bef8672dab811ceff6886d9af0388306a66485
(cherry picked from commit 0b29a16d1dcffd75e49bd7ad3da867b0d0ebfa38)
Reviewed-on: https://gerrit.libreoffice.org/11934
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 1676e1b..42da658 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2096,6 +2096,12 @@ class UpdateRefOnNonCopy : 
std::unary_function
 if (pCode->IsRecalcModeOnRefMove())
 aRes.mbValueChanged = true;
 }
+else if (aRes.mbReferenceModified && pCode->IsRecalcModeOnRefMove())
+{
+// The cell itself hasn't shifted. But it may have ROW or COLUMN
+// referencing another cell that has.
+aRes.mbValueChanged = true;
+}
 
 if (aRes.mbNameModified)
 recompileTokenArray(*pTop);
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 2059aee..96eb323 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2758,7 +2758,7 @@ bool ScFormulaCell::UpdateReferenceOnShift(
 
 if (bOnRefMove)
 // Cell may reference itself, e.g. ocColumn, ocRow without parameter
-bOnRefMove = (bValChanged || (aPos != aOldPos));
+bOnRefMove = (bValChanged || (aPos != aOldPos) || bRefModified);
 
 bool bNewListening = false;
 bool bInDeleteUndo = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/LibreOfficeMacOSX64.conf distro-configs/LibreOfficeMacOSX.conf

2014-10-24 Thread Norbert Thiebaud

 distro-configs/LibreOfficeMacOSX.conf   |1 -
 distro-configs/LibreOfficeMacOSX64.conf |   15 ---
 2 files changed, 16 deletions(-)

New commits:
commit 938e7cf3e84c16a63b49a1049268fe3a3f772d4b
Author: Norbert Thiebaud 
Date:   Fri Oct 10 03:37:08 2014 -0500

Mac distro config is always 64 bits these days & remove --with-vendor

Change-Id: I0f0f4c8b511335ec2a6bf69c054cff8aaca8170a

diff --git a/distro-configs/LibreOfficeMacOSX.conf 
b/distro-configs/LibreOfficeMacOSX.conf
index 1298b9d..ffba841 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,4 +1,3 @@
---with-vendor=The Document Foundation
 --enable-epm
 --enable-scripting-beanshell
 --enable-scripting-javascript
diff --git a/distro-configs/LibreOfficeMacOSX64.conf 
b/distro-configs/LibreOfficeMacOSX64.conf
deleted file mode 100644
index c93ed7c..000
--- a/distro-configs/LibreOfficeMacOSX64.conf
+++ /dev/null
@@ -1,15 +0,0 @@
---with-vendor=The Document Foundation
---enable-64-bit
---enable-epm
---enable-scripting-beanshell
---enable-scripting-javascript
---enable-ext-nlpsolver
---enable-extension-integration
---enable-online-update
---without-system-postgresql
---disable-gtk
---with-help
---with-myspell-dicts
---with-package-format=dmg
---with-macosx-sdk=10.8
---with-macosx-version-min-required=10.8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - filter/source framework/source include/vbahelper sd/source vbahelper/source writerfilter/source

2014-10-24 Thread Noel Grandin

 filter/source/config/cache/filtercache.cxx|2 +-
 filter/source/config/cache/filtercache.hxx|2 +-
 framework/source/inc/loadenv/loadenv.hxx  |8 
 framework/source/loadenv/loadenv.cxx  |8 
 include/vbahelper/vbadocumentsbase.hxx|2 +-
 sd/source/ui/unoidl/UnoDocumentSettings.cxx   |4 ++--
 vbahelper/source/vbahelper/vbadocumentsbase.cxx   |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   14 ++
 8 files changed, 24 insertions(+), 18 deletions(-)

New commits:
commit fb365e63ab46ee58adcb05f9e70cf2c2cc700df0
Author: Noel Grandin 
Date:   Fri Oct 10 10:12:03 2014 +0200

cid#1244955 Uncaught exception

Change-Id: Iedf06cc78cda022112699be3db650d11c7249adc

diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx 
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index fc81e53..91430e7 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -111,7 +111,7 @@ namespace sd
 
 protected:
 virtual void _setPropertyValues( const comphelper::PropertyMapEntry** 
ppEntries, const ::com::sun::star::uno::Any* pValues ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::beans::PropertyVetoException, 
::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::lang::WrappedTargetException, RuntimeException ) SAL_OVERRIDE;
-virtual void _getPropertyValues( const comphelper::PropertyMapEntry** 
ppEntries, ::com::sun::star::uno::Any* pValue ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::lang::WrappedTargetException, RuntimeException ) SAL_OVERRIDE;
+virtual void _getPropertyValues( const comphelper::PropertyMapEntry** 
ppEntries, ::com::sun::star::uno::Any* pValue ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::lang::WrappedTargetException, RuntimeException, 
std::exception ) SAL_OVERRIDE;
 
 private:
 bool LoadList( XPropertyListType t, const OUString &rPath,
@@ -980,7 +980,7 @@ void DocumentSettings::ExtractURL( XPropertyListType t, 
Any* pValue )
 void
 DocumentSettings::_getPropertyValues(
 const PropertyMapEntry** ppEntries, Any* pValue)
-throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
+throw (UnknownPropertyException, WrappedTargetException, RuntimeException, 
std::exception)
 {
 ::SolarMutexGuard aGuard;
 
commit 277e98edce56e0d1c37403dce1f389eeb9018d30
Author: Noel Grandin 
Date:   Fri Oct 10 10:09:51 2014 +0200

cid#1244948 Uncaught exception

Change-Id: I421f245fd3be90f0e1d08ad92b0723a64121ae12

diff --git a/framework/source/inc/loadenv/loadenv.hxx 
b/framework/source/inc/loadenv/loadenv.hxx
index 3abba6f..95367eb 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -522,7 +522,7 @@ private:
 the whole runtime can't be used any longer.
  */
 css::uno::Reference< css::frame::XFrame > impl_searchRecycleTarget()
-throw(LoadEnvException, css::uno::RuntimeException);
+throw(LoadEnvException, css::uno::RuntimeException, std::exception);
 
 /** @short  because showing of a frame is needed more than once ...
 it's implemented as an separate method .-)
diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 570f4d9..f6526dd 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1387,7 +1387,7 @@ bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const 
css::uno::Reference< css::
 }
 
 css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
-throw(LoadEnvException, css::uno::RuntimeException)
+throw(LoadEnvException, css::uno::RuntimeException, std::exception)
 {
 // SAFE -> ..
 osl::ClearableMutexGuard aReadLock(m_mutex);
commit 71540e1e47bcb1cea34861e13a47a558a88757e1
Author: Noel Grandin 
Date:   Fri Oct 10 09:45:44 2014 +0200

cid#1244949 Uncaught exception

Change-Id: Ic33d60a435ee875e8e342420046aae436739c123

diff --git a/include/vbahelper/vbadocumentsbase.hxx 
b/include/vbahelper/vbadocumentsbase.hxx
index c4e002f..b87702f 100644
--- a/include/vbahelper/vbadocumentsbase.hxx
+++ b/include/vbahelper/vbadocumentsbase.hxx
@@ -50,7 +50,7 @@ public:
 virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource 
) SAL_OVERRIDE = 0;
 
 protected:
-css::uno::Any createDocument() throw (css::uno::RuntimeException);
+css::uno::Any createDocument() throw (css::uno::RuntimeException, 
std::exception);
 void closeDocuments() throw (css::uno::RuntimeException);
 css::uno::Any openDocument( const OUString& Filename, const css::uno::Any& 
ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw 
(css::uno::RuntimeException);
 };
diff --git a/vbahelper/sou

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

2014-10-24 Thread Stephan Bergmann

 sw/source/core/undo/undobj.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c30d2566d521cfc574cf6e3f9ef69e847f3c
Author: Stephan Bergmann 
Date:   Fri Oct 10 17:51:06 2014 +0200

UBSan: Do not downcast to SwFlyFrmFmt prematurely

Change-Id: Ifcc05a5b23630fffed3a2f2636909bd1e1dff1fe

diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 4eeccd4..c85e74af 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -561,14 +561,14 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& 
rMark,
 if( !rSpzArr.empty() )
 {
 const bool bDelFwrd = rMark.nNode.GetIndex() <= 
rPoint.nNode.GetIndex();
-SwFlyFrmFmt* pFmt;
+SwFrmFmt* pFmt;
 const SwFmtAnchor* pAnchor;
 size_t n = rSpzArr.size();
 const SwPosition* pAPos;
 
 while( n && !rSpzArr.empty() )
 {
-pFmt = (SwFlyFrmFmt*)rSpzArr[--n];
+pFmt = rSpzArr[--n];
 pAnchor = &pFmt->GetAnchor();
 switch( pAnchor->GetAnchorId() )
 {
@@ -630,7 +630,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& 
rMark,
 }
 else
 {
-pHistory->Add( *pFmt, nChainInsPos );
+pHistory->Add( *static_cast(pFmt), nChainInsPos );
 // reset n so that no Format is skipped
 n = n >= rSpzArr.size() ?
 rSpzArr.size() : n+1;
@@ -648,7 +648,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& 
rMark,
 if (IsDestroyFrameAnchoredAtChar(
 *pAPos, *pStt, *pEnd, pDoc, nDelCntntType))
 {
-pHistory->Add( *pFmt, nChainInsPos );
+pHistory->Add( *static_cast(pFmt), 
nChainInsPos );
 n = n >= rSpzArr.size() ? rSpzArr.size() : n+1;
 }
 else if( !( nsDelCntntType::DELCNT_CHKNOCNTNT & 
nDelCntntType ) )
@@ -677,7 +677,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& 
rMark,
 if( !pHistory )
 pHistory = new SwHistory;
 
-pHistory->Add( *pFmt, nChainInsPos );
+pHistory->Add( *static_cast(pFmt), 
nChainInsPos );
 
 // reset n so that no Format is skipped
 n = n >= rSpzArr.size() ? rSpzArr.size() : n+1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java scripting/workben

2014-10-24 Thread David Ostrovsky

 dev/null   
  |binary
 scripting/java/manifest.mf 
  |   26 
 scripting/java/org/openoffice/idesupport/CommandLineTools.java 
  |  337 -
 scripting/java/org/openoffice/idesupport/ExtensionFinder.java  
  |   81 
 scripting/java/org/openoffice/idesupport/JavaFinder.java   
  |  231 -
 scripting/java/org/openoffice/idesupport/LocalOffice.java  
  |   54 
 scripting/java/org/openoffice/idesupport/MethodFinder.java 
  |   26 
 scripting/java/org/openoffice/idesupport/OfficeDocument.java   
  |  106 
 scripting/java/org/openoffice/idesupport/OfficeInstallation.java   
  |   85 
 scripting/java/org/openoffice/idesupport/SVersionRCFile.java   
  |  226 -
 scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
  |   39 
 scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java  
  |   44 
 scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
  |   45 
 scripting/java/org/openoffice/idesupport/filter/FileFilter.java
  |   23 
 scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java  
  |  131 
 scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
  |  223 -
 scripting/java/org/openoffice/idesupport/ui/MethodPanel.java   
  |  164 
 scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java   
  |  199 
 scripting/java/org/openoffice/idesupport/xml/Manifest.java 
  |  125 
 scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java 
  |  159 
 scripting/java/org/openoffice/netbeans/editor/JavaKit.java 
  |  237 -
 scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java  
  |  197 
 scripting/java/org/openoffice/netbeans/editor/OOo.jcb  
  |5 
 scripting/java/org/openoffice/netbeans/editor/OOo.jcs  
  |   21 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
 |   60 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
   |   35 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
 |   61 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
|  238 -
 
scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
   |   62 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
 |   61 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
  |   32 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
 |  133 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java 
 |   32 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
 |  136 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
  |   32 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
 |  107 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
|   32 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
   |  242 -
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
 |  175 
 
scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle.properties
   |   61 
 
scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
| 1182 -
 
scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
|  110 
 scripting/java/org/openoffice/netbeans/modules/office/loader/Bundle.properties 
  |   30 
 
scripting/java/org/ope

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

2014-10-24 Thread Caolán McNamara

 svtools/source/contnr/svimpbox.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fef9bf4e39b041c7f13e4d1584e3086068e781fc
Author: CaolÃ¡n McNamara 
Date:   Thu Oct 9 13:50:20 2014 +0100

Resolves: fdo#82270 Grabbing focus can invalidate the entries

Change-Id: Ie9b4f936cebdcf2a37e66abef456c6b0c0e26201

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index c2fb5bd..aed04d3 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2049,6 +2049,8 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
 nCurTabPos = FIRST_ENTRY_TAB;
 nFlags &= (~F_FILLING);
 pView->GrabFocus();
+//fdo#82270 Grabbing focus can invalidate the entries, re-fetch
+pEntry = GetEntry(aPos);
 // the entry can still be invalid!
 if( !pEntry || !pView->GetViewData( pEntry ))
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - android/experimental Makefile.in

2014-10-24 Thread Jan Holesovsky

 Makefile.in|1 +
 android/experimental/LOAndroid3/AndroidManifest.xml.in |3 +++
 2 files changed, 4 insertions(+)

New commits:
commit c7c2b4b54d8ab81150e9b71433970c2f338ed063
Author: Jan Holesovsky 
Date:   Fri Oct 10 08:21:25 2014 +0200

android: Disable LibreOfficeUIActivity for now.

We should provide just one activity in the .apk; the browser should probably
show up when LibreOffice Viewer is started with no file to open...

Change-Id: I624afa00f7e8ddc649a272c1b08899e8aac887c9

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in 
b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index cfd369a..989a43c 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -71,6 +71,8 @@
 
 
 
+
 
 
 
commit 712d67eb1a39e996be6b248ff7409f2e3f260e39
Author: Jan Holesovsky 
Date:   Fri Oct 10 08:20:58 2014 +0200

android: Re-autogen when AndroidManifest.xml.in changes.

Change-Id: I53cf6bf10f25702d9ae42afb6846411a3e31c187

diff --git a/Makefile.in b/Makefile.in
index 75a2f56..c13deb4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,6 +42,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
$(SRCDIR)/configure.ac \
$(SRCDIR)/config_host/*.h.in \
+   
$(SRCDIR)/android/experimental/LOAndroid3/AndroidManifest.xml.in \
$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \
)
___
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' - sw/source

2014-10-24 Thread Caolán McNamara

 sw/source/core/uibase/docvw/edtwin2.cxx |   17 +++--
 sw/source/core/uibase/inc/edtwin.hxx|5 +
 2 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit d5482208ba905df70e4012f5f5f0d9bc8bac443a
Author: CaolÃ¡n McNamara 
Date:   Thu Oct 9 10:38:34 2014 +0100

Resolves: fdo#55546 center ellipsis tooltips that don't fit on screen

(cherry picked from commit 912ecaf565e68d2ca3fb9584712313e712749f75)

Conflicts:
sw/source/uibase/docvw/edtwin2.cxx
sw/source/uibase/inc/edtwin.hxx

Change-Id: Ic44c9032878892fa33c839e5aaac1996e7bed943
Reviewed-on: https://gerrit.libreoffice.org/11874
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/uibase/docvw/edtwin2.cxx 
b/sw/source/core/uibase/docvw/edtwin2.cxx
index bbcaaf1..9fd7355 100644
--- a/sw/source/core/uibase/docvw/edtwin2.cxx
+++ b/sw/source/core/uibase/docvw/edtwin2.cxx
@@ -94,6 +94,17 @@ static OUString lcl_GetRedlineHelp( const SwRangeRedline& 
rRedl, bool bBalloon )
 return sBuf.makeStringAndClear();
 }
 
+OUString SwEditWin::ClipLongToolTip(const OUString& rTxt)
+{
+OUString sDisplayTxt(rTxt);
+long nTextWidth = GetTextWidth(sDisplayTxt);
+long nMaxWidth = GetDesktopRectPixel().GetWidth() * 2 / 3;
+nMaxWidth = PixelToLogic(Size(nMaxWidth, 0)).Width();
+if (nTextWidth > nMaxWidth)
+sDisplayTxt = GetEllipsisString(sDisplayTxt, nMaxWidth, 
TEXT_DRAW_CENTERELLIPSIS);
+return sDisplayTxt;
+}
+
 void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 {
 SwWrtShell &rSh = m_rView.GetWrtShell();
@@ -369,7 +380,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 aPt = OutputToScreenPixel( LogicToPixel( 
aRect.BottomRight() ));
 aRect.Right()  = aPt.X();
 aRect.Bottom() = aPt.Y();
-Help::ShowQuickHelp( this, aRect, sTxt, nStyle );
+OUString sDisplayTxt(ClipLongToolTip(sTxt));
+Help::ShowQuickHelp(this, aRect, sDisplayTxt, nStyle);
 }
 }
 
@@ -410,7 +422,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 sTxt = SW_RESSTR(nTabRes);
 Size aTxtSize( GetTextWidth(sTxt), GetTextHeight());
 Rectangle aRect(rEvt.GetMousePosPixel(), aTxtSize);
-Help::ShowQuickHelp(this, aRect, sTxt);
+OUString sDisplayTxt(ClipLongToolTip(sTxt));
+Help::ShowQuickHelp(this, aRect, sDisplayTxt);
 }
 bContinue = false;
 }
diff --git a/sw/source/core/uibase/inc/edtwin.hxx 
b/sw/source/core/uibase/inc/edtwin.hxx
index aade966..7e5396d 100644
--- a/sw/source/core/uibase/inc/edtwin.hxx
+++ b/sw/source/core/uibase/inc/edtwin.hxx
@@ -285,6 +285,11 @@ public:
 voidSetUseInputLanguage( bool bNew );
 boolIsUseInputLanguage() const { return m_bUseInputLanguage; }
 
+/** fdo#55546 cut very long tooltips to 2/3 of the width of the screen
+via center ellipsis
+ */
+OUString ClipLongToolTip(const OUString& rTxt);
+
 SwFrameControlsManager& GetFrameControlsManager() { return 
m_aFrameControlsManager; }
 
 SwEditWin(Window *pParent, SwView &);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Stephan Bergmann

 chart2/source/view/main/ChartView.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0c06f9c5bb002c0aac1811ea973787f6f94d4758
Author: Stephan Bergmann 
Date:   Fri Oct 10 08:35:58 2014 +0200

Further fallout from git mis-merge?

...in a80f74add22c303327dd3203d9be5eeb901a73a4 "Put SeriesPlotterContainer 
into
CreateShapeParam2D."

Change-Id: I9e2f700a1999070069ff87fc3030c00a045372c6

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index f5ef610..9d3b54c 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -360,11 +360,10 @@ void 
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 xDiaProp->getPropertyValue( "IncludeHiddenCells" ) >>= 
bIncludeHiddenCells;
 xDiaProp->getPropertyValue( "StartingAngle" ) >>= nStartingAngle;
 
-if( m_pDrawModelWrapper.get() )
-{
-SolarMutexGuard aSolarGuard;
-EndListening( m_pDrawModelWrapper->getSdrModel(), false /*bAllDups*/ );
-m_pDrawModelWrapper.reset();
+if (nDimensionCount == 3)
+{
+xDiaProp->getPropertyValue( "3DRelativeHeight" ) >>= 
n3DRelativeHeight;
+}
 }
 catch( const uno::Exception & ex )
 {
@@ -1106,10 +1105,11 @@ ChartView::~ChartView()
 if ( xComp.is() )
 xComp->dispose();
 
-if (nDimensionCount == 3)
-{
- xDiaProp->getPropertyValue( "3DRelativeHeight" ) >>= 
n3DRelativeHeight;
-}
+if( m_pDrawModelWrapper.get() )
+{
+SolarMutexGuard aSolarGuard;
+EndListening( m_pDrawModelWrapper->getSdrModel(), false /*bAllDups*/ );
+m_pDrawModelWrapper.reset();
 }
 m_xDrawPage = NULL;
 impl_deleteCoordinateSystems();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source external/unixODBC include/filter sw/inc sw/source writerfilter/source

2014-10-24 Thread Julien Nabet

 basic/source/runtime/stdobj.cxx   |2 
 external/unixODBC/inc/odbc/sqltypes.h |2 
 include/filter/msfilter/msocximex.hxx |2 
 sw/inc/doc.hxx|4 
 sw/source/core/doc/docnew.cxx |4 
 sw/source/core/inc/DocumentSettingManager.hxx |2 
 sw/source/filter/ww8/wrtww8.cxx   |6 
 sw/source/filter/ww8/ww8par.cxx   |6 
 sw/source/filter/ww8/ww8scan.cxx  |  200 +-
 sw/source/filter/ww8/ww8scan.hxx  |  100 ++---
 sw/source/ui/dbui/mmoutputpage.cxx|4 
 sw/source/uibase/dbui/dbmgr.cxx   |2 
 sw/source/uibase/dochdl/swdtflvr.cxx  |2 
 writerfilter/source/dmapper/PropertyMap.cxx   |2 
 14 files changed, 169 insertions(+), 169 deletions(-)

New commits:
commit 4c12951a0304d257a6b0e6b5aa2ecbbe60393c8d
Author: Julien Nabet 
Date:   Sun Oct 12 13:00:46 2014 +0200

Typo: compatability->compatibility

Change-Id: If0b98a30452a9d1fcc340173deb6856755926471

diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 6550157..664d76c 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -37,7 +37,7 @@
 // allow us space for a flag to blacklist some functions in vba mode
 
 #define _ARGSMASK   0x003F  // 63 Arguments
-#define _COMPTMASK  0x00C0  // COMPATABILITY mask
+#define _COMPTMASK  0x00C0  // COMPATIBILITY mask
 #define _COMPATONLY 0x0080  // procedure is visible in vba mode only
 #define _NORMONLY   0x0040  // procedure is visible in normal mode only
 
diff --git a/external/unixODBC/inc/odbc/sqltypes.h 
b/external/unixODBC/inc/odbc/sqltypes.h
index 9e05bc3..5cadacb 100644
--- a/external/unixODBC/inc/odbc/sqltypes.h
+++ b/external/unixODBC/inc/odbc/sqltypes.h
@@ -4,7 +4,7 @@
  * This is the lowest level include in unixODBC. It defines
  * the basic types required by unixODBC and is heavily based
  * upon the MS include of the same name (it has to be for
- * binary compatability between drivers developed under different
+ * binary compatibility between drivers developed under different
  * packages).
  *
  * You can include this file directly but it is almost always
diff --git a/include/filter/msfilter/msocximex.hxx 
b/include/filter/msfilter/msocximex.hxx
index c3877d7..caa91f7 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -74,7 +74,7 @@ public:
 com::sun::star::drawing::XShape >* /*pShape*/,
 bool /*bFloatingCtrl*/ ) {return false;}
 
-/*begin: Backwards compatability with office 95 import, modify later*/
+/*begin: Backwards compatibility with office 95 import, modify later*/
 const com::sun::star::uno::Reference<
 com::sun::star::lang::XMultiServiceFactory > & GetServiceFactory();
 protected:
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index c072fd1..60d1ce5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -898,8 +898,8 @@ public:
 // Replace all property defaults with those from rSource.
 void ReplaceDefaults( const SwDoc& rSource );
 
-// Replace all compatability options with those from rSource.
-void ReplaceCompatabilityOptions( const SwDoc& rSource );
+// Replace all compatibility options with those from rSource.
+void ReplaceCompatibilityOptions( const SwDoc& rSource );
 
 /** Replace all user defined document properties with xSourceDocProps.
 
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 710db73..0ba8fb2 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -877,7 +877,7 @@ void SwDoc::ReplaceDefaults(const SwDoc& rSource)
 SetDefault(aNewDefaults);
 }
 
-void SwDoc::ReplaceCompatabilityOptions(const SwDoc& rSource)
+void SwDoc::ReplaceCompatibilityOptions(const SwDoc& rSource)
 {
 
m_pDocumentSettingManager->ReplaceCompatibilityOptions(rSource.GetDocumentSettingManager());
 }
@@ -908,7 +908,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
 
 pRet->ReplaceDefaults(*this);
 
-pRet->ReplaceCompatabilityOptions(*this);
+pRet->ReplaceCompatibilityOptions(*this);
 
 pRet->ReplaceStyles(*this);
 
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx 
b/sw/source/core/inc/DocumentSettingManager.hxx
index 252d126..66cc76c 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -171,7 +171,7 @@ public:
 virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType 
) SAL_OVERRIDE;
 
 
-// Replace all compatability options with those from rSource.
+// Replace all compatibility options with those from rSource.
 void ReplaceCompatibilityOptions(const DocumentSettingManager& rSource);
 
 sal_uInt32 Getn32DummyCompatibilityOptions1() const SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww

[Libreoffice-commits] core.git: Branch 'feature/perfwork' - package/inc package/Library_package2.mk package/source

2014-10-24 Thread Matúš Kukan

 package/Library_package2.mk|1 
 package/inc/ZipOutputEntry.hxx |   79 +
 package/inc/ZipOutputStream.hxx|   49 ---
 package/inc/ZipPackageFolder.hxx   |5 
 package/source/zipapi/ZipOutputEntry.cxx   |  367 +
 package/source/zipapi/ZipOutputStream.cxx  |  351 ---
 package/source/zippackage/ZipPackage.cxx   |   36 +-
 package/source/zippackage/ZipPackageFolder.cxx |   31 +-
 8 files changed, 504 insertions(+), 415 deletions(-)

New commits:
commit 8af7873c5d957d5091d6914b84400f22157a09cd
Author: MatÃºÅ¡ Kukan 
Date:   Thu Oct 9 15:22:54 2014 +0200

package: Add ZipOutputEntry to isolate deflating of streams.

Preparation commit for deflating streams in parallel.
We still use the same single XOutputStream (ByteChucker :-) for
sequential writing but this can now be changed more easily.

Change-Id: Idf26cc2187461660e31ac2e12c4708e761596fb2

diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 269cf81..f563d0a 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_exception_objects,package2,\
package/source/zipapi/XUnbufferedStream \
package/source/zipapi/ZipEnumeration \
package/source/zipapi/ZipFile \
+   package/source/zipapi/ZipOutputEntry \
package/source/zipapi/ZipOutputStream \
package/source/zippackage/wrapstreamforshare \
package/source/zippackage/zipfileaccess \
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
new file mode 100644
index 000..a1d03d3
--- /dev/null
+++ b/package/inc/ZipOutputEntry.hxx
@@ -0,0 +1,79 @@
+/* -*- 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_PACKAGE_INC_ZIPOUTPUTENTRY_HXX
+#define INCLUDED_PACKAGE_INC_ZIPOUTPUTENTRY_HXX
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+struct ZipEntry;
+class ZipPackageStream;
+
+class ZipOutputEntry
+{
+::com::sun::star::uno::Sequence< sal_Int8 > m_aDeflateBuffer;
+ZipUtils::Deflater  m_aDeflater;
+
+::com::sun::star::uno::Reference< 
::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext;
+::com::sun::star::uno::Reference< 
::com::sun::star::xml::crypto::XDigestContext > m_xDigestContext;
+
+CRC32   m_aCRC;
+ByteChucker &m_rChucker;
+ZipEntry*m_pCurrentEntry;
+sal_Int16   m_nDigested;
+boolm_bEncryptCurrentEntry;
+ZipPackageStream*   m_pCurrentStream;
+
+public:
+ZipOutputEntry(
+const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext >& rxContext,
+ByteChucker& rChucker, ZipEntry& rEntry, ZipPackageStream* pStream, 
bool bEncrypt = false);
+
+~ZipOutputEntry();
+
+// rawWrite to support a direct write to the output stream
+void SAL_CALL rawWrite( ::com::sun::star::uno::Sequence< sal_Int8 >& 
rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
+throw(::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException);
+void SAL_CALL rawCloseEntry(  )
+throw(::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException);
+
+// XZipOutputEntry interfaces
+void SAL_CALL closeEntry(  )
+throw(::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException);
+void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& 
rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
+throw(::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException);
+static sal_uInt32 getCurrentDosTime ( );
+
+private:
+void doDeflate();
+sal_Int32 writeLOC( const ZipEntry &rEntry )
+throw(::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException);
+void writeEXT( const ZipEntry &rEntry )
+throw(::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException);
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4

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

2014-10-24 Thread Tor Lillqvist

 comphelper/source/misc/random.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit d1fbbb04f9c12614a7b64e4c1eb92dc6a5ea3fc7
Author: Tor Lillqvist 
Date:   Tue Oct 7 10:32:52 2014 +0300

I shouldn't be shy, just assert()

Stephan dislikes "defensive programming" and I trust him.

Change-Id: Ic4864de98a5155129179eb89873f3ffdc8921614

diff --git a/comphelper/source/misc/random.cxx 
b/comphelper/source/misc/random.cxx
index 9071765..bcdd8e6 100644
--- a/comphelper/source/misc/random.cxx
+++ b/comphelper/source/misc/random.cxx
@@ -80,9 +80,7 @@ size_t uniform_int_distribution(size_t a, size_t b)
 // uniform size_t [a,b) distribution
 double uniform_real_distribution(double a, double b)
 {
-// Probably too rude to just assert(a < b), so instead...
-if (a >= b)
-return a;
+assert(a < b);
 boost::random::uniform_real_distribution dist(a, b);
 return dist(theRandomNumberGenerator::get().global_rng);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Jan Holesovsky

 sfx2/source/control/unoctitm.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8d1749430fa4158d402e8f8ab540f5e41d468981
Author: Jan Holesovsky 
Date:   Wed Oct 8 11:33:06 2014 +0200

Fix build.

Change-Id: I9676e38029c511678efed1679f9488f1f15f4f8d

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 662114f..9bcbcea 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -64,6 +64,8 @@
 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Charu Tyagi

 sw/source/ui/misc/linenum.cxx   |   47 
 sw/source/uibase/inc/linenum.hxx|3 --
 sw/uiconfig/swriter/ui/linenumbering.ui |   16 ++
 3 files changed, 64 insertions(+), 2 deletions(-)

New commits:
commit 8f6a9117d6ad4cb6cc1f6017ca534cd773ee2b4f
Author: Charu Tyagi 
Date:   Wed Oct 1 10:42:13 2014 +0530

fdo#84504: UI- LineNumbering for header/footer

Change-Id: I5b432273ce24d8575ac36f5336717669db733c35
Reviewed-on: https://gerrit.libreoffice.org/11730
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 48e6732..0828625 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -31,9 +31,34 @@
 #include "lineinfo.hxx"
 #include "linenum.hxx"
 #include "uitool.hxx"
+#include 
 
 #include 
 
+static rtl::Reference lcl_getDocStyleSheet(OUString rName, 
SwWrtShell *pSh)
+{
+sal_uInt16 nFamily = SFX_STYLE_FAMILY_PARA;
+SfxStyleSheetBasePool* mpBase =  
pSh->GetView().GetDocShell()->GetStyleSheetPool();
+SfxStyleSheetBase* pStyle = mpBase->Find(rName, (SfxStyleFamily)nFamily);
+SAL_WARN_IF( !pStyle, "linenumbering.ui", "Style not found" );
+if(!pStyle)
+return NULL;
+return new SwDocStyleSheet(*(SwDocStyleSheet*)pStyle);
+}
+
+static void lcl_setLineNumbering(OUString rName, SwWrtShell* pSh, bool 
bLineNumber)
+{
+rtl::Reference xStyleSheet = lcl_getDocStyleSheet(rName, 
pSh);
+if(!xStyleSheet.is())
+return;
+SfxItemSet& rSet = xStyleSheet->GetItemSet();
+SwFmtLineNumber aFmt;
+aFmt.SetCountLines(bLineNumber);
+rSet.Put(aFmt);
+xStyleSheet->MergeIndentAttrsOfListStyle( rSet );
+xStyleSheet->SetItemSet(rSet, false);
+}
+
 SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
 : SfxModalDialog( &pVw->GetViewFrame()->GetWindow(), "LineNumberingDialog",
 "modules/swriter/ui/linenumbering.ui" )
@@ -53,6 +78,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
 get(m_pCountFrameLinesCB, "linesintextframes");
 get(m_pRestartEachPageCB, "restarteverynewpage");
 get(m_pNumberingOnCB, "shownumbering");
+get(m_pNumberingOnFooterHeader, "showfooterheadernumbering");
 
 OUString sIntervalName = m_pDivIntervalFT->GetAccessibleName();
 sIntervalName += "(";
@@ -119,6 +145,19 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
 
 m_pNumberingOnCB->Check(rInf.IsPaintLineNumbers());
 
+// Header/Footer Line Numbering
+rtl::Reference< SwDocStyleSheet > xStyleSheet = 
lcl_getDocStyleSheet("Footer", pSh);
+if(xStyleSheet.is())
+{
+SfxItemSet& rSet = xStyleSheet->GetItemSet();
+SwFmtLineNumber &aFmt = (SwFmtLineNumber&)(rSet.Get(RES_LINENUMBER));
+if(aFmt.IsCount())
+m_pNumberingOnFooterHeader->SetState(TRISTATE_TRUE);
+else
+m_pNumberingOnFooterHeader->SetState(TRISTATE_FALSE);
+}
+
+// Line Numbering
 m_pNumberingOnCB->SetClickHdl(LINK(this, SwLineNumberingDlg, 
LineOnOffHdl));
 m_pDivisorED->SetModifyHdl(LINK(this, SwLineNumberingDlg, ModifyHdl));
 ModifyHdl();
@@ -181,6 +220,14 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl)
 
 pSh->SetLineNumberInfo(aInf);
 
+// Set LineNumber explicitly for Header and Footer
+lcl_setLineNumbering("Footer",pSh,m_pNumberingOnFooterHeader->IsChecked());
+lcl_setLineNumbering("Header",pSh,m_pNumberingOnFooterHeader->IsChecked());
+if( m_pNumberingOnFooterHeader->IsChecked())
+   m_pNumberingOnFooterHeader->SetState(TRISTATE_TRUE);
+else
+   m_pNumberingOnFooterHeader->SetState(TRISTATE_FALSE);
+
 EndDialog( RET_OK );
 
 return 0;
diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx
index 0e7db9c..7b3f073 100644
--- a/sw/source/uibase/inc/linenum.hxx
+++ b/sw/source/uibase/inc/linenum.hxx
@@ -47,14 +47,13 @@ private:
 CheckBox* m_pCountFrameLinesCB;
 CheckBox* m_pRestartEachPageCB;
 CheckBox* m_pNumberingOnCB;
-
+CheckBox* m_pNumberingOnFooterHeader;
 DECL_LINK(OKHdl, void *);
 DECL_LINK(LineOnOffHdl, void * = 0);
 DECL_LINK(ModifyHdl, void * = 0);
 
 public:
 SwWrtShell* GetWrtShell() const { return pSh; }
-
 SwLineNumberingDlg(SwView *pVw);
 virtual ~SwLineNumberingDlg();
 };
diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui 
b/sw/uiconfig/swriter/ui/linenumbering.ui
index dbb2ea3..941b709 100644
--- a/sw/uiconfig/swriter/ui/linenumbering.ui
+++ b/sw/uiconfig/swriter/ui/linenumbering.ui
@@ -501,6 +501,22 @@
 2
   
 
+
+  
+Include footer/header in Line Numbering
+True
+True
+False
+

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

2014-10-24 Thread David Tardon

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

New commits:
commit 53fd61faef7100e4609076a517e349e3b2ff2109
Author: David Tardon 
Date:   Mon Oct 6 20:24:52 2014 +0200

avoid use of ref. to possibly deleted object

Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69
(cherry picked from commit ce5cc7afb0f1c99237d04e0c754527c725d8491c)
Reviewed-on: https://gerrit.libreoffice.org/11832
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 24f0343..77d7d1d 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2386,9 +2386,9 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const 
ScDocument* pOldDoc, cons
 sal_uInt16 nFileId;
 GetExternalTableData(pOldDoc, pNewDoc, rRef.Tab(), 
aTabName, nFileId);
 //replace with ScExternalSingleRefToken and adjust 
references
-pCode[j]->DecRef();
 ScExternalSingleRefToken* pToken = new 
ScExternalSingleRefToken(nFileId, aTabName, rRef);
 pToken->IncRef();
+pCode[j]->DecRef(); // ATTENTION: rRef can't be used after 
this point
 pCode[j] = pToken;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Michaël Lefèvre

 sfx2/source/appl/linksrc.cxx |   28 +---
 1 file changed, 21 insertions(+), 7 deletions(-)

New commits:
commit 9769a69f49c77599053ab8f15b149506af555134
Author: MichaÃ«l LefÃ¨vre 
Date:   Mon Oct 6 11:39:22 2014 +0200

fdo#75757: remove inheritance to std::vector

Change-Id: I17b1057c2551f41b15547d7563434e3344ab6be8
Reviewed-on: https://gerrit.libreoffice.org/11822
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 8b8ee27..d5ff585 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -91,22 +91,36 @@ SvLinkSource_Entry_Impl::~SvLinkSource_Entry_Impl()
 {
 }
 
-class SvLinkSource_Array_Impl : public std::vector
+class SvLinkSource_Array_Impl
 {
+private :
+std::vector mvData;
+
 public:
+SvLinkSource_Array_Impl() : mvData() {}
+
+size_t size() const { return mvData.size(); }
+SvLinkSource_Entry_Impl *operator[](size_t idx) const { return 
mvData[idx]; }
+std::vector::iterator begin() { return 
mvData.begin(); }
+std::vector::iterator end() { return 
mvData.end(); }
+std::vector::const_iterator cbegin() const { 
return mvData.cbegin(); }
+std::vector::const_iterator cend() const { 
return mvData.cend(); }
+void clear() { mvData.clear(); }
+void push_back(SvLinkSource_Entry_Impl* rData) { mvData.push_back(rData); }
+
 void DeleteAndDestroy(SvLinkSource_Entry_Impl* p)
 {
-iterator it = std::find(begin(), end(), p);
-if (it != end())
+std::vector::iterator it = 
std::find(mvData.begin(), mvData.end(), p);
+if (it != mvData.end())
 {
-erase(it);
+mvData.erase(it);
 delete p;
 }
 }
 
 ~SvLinkSource_Array_Impl()
 {
-for(const_iterator it = begin(); it != end(); ++it)
+for(std::vector::const_iterator it = 
mvData.begin(); it != mvData.end(); ++it)
 delete *it;
 }
 };
@@ -138,7 +152,7 @@ SvLinkSource_EntryIter_Impl::~SvLinkSource_EntryIter_Impl()
 bool SvLinkSource_EntryIter_Impl::IsValidCurrValue( SvLinkSource_Entry_Impl* 
pEntry )
 {
 return ( nPos < aArr.size() && aArr[nPos] == pEntry
-   && std::find( rOrigArr.begin(), rOrigArr.end(), pEntry ) != 
rOrigArr.end() );
+   && std::find( rOrigArr.cbegin(), rOrigArr.cend(), pEntry ) != 
rOrigArr.cend() );
 }
 
 SvLinkSource_Entry_Impl* SvLinkSource_EntryIter_Impl::Next()
@@ -155,7 +169,7 @@ SvLinkSource_Entry_Impl* SvLinkSource_EntryIter_Impl::Next()
 // then we must search the current (or the next) in the orig
 do {
 pRet = aArr[ nPos ];
-if( std::find(rOrigArr.begin(), rOrigArr.end(), pRet ) != 
rOrigArr.end() )
+if( std::find(rOrigArr.cbegin(), rOrigArr.cend(), pRet ) != 
rOrigArr.cend() )
 break;
 pRet = 0;
 ++nPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac

2014-10-24 Thread Andras Timar

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

New commits:
commit 1efecdfac65b5eafa7b56d8eafb70d39107144ce
Author: Andras Timar 
Date:   Mon Oct 6 21:58:07 2014 +0200

Bump version to 4.2-17

Change-Id: If617f1ebf76d20fc79ce5e01b4e293fa3f6c37fd

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

LibreOffice Gerrit News for core on 2014-10-08

2014-10-24 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ fdo#83141: optimize slow performance after when using replaceall or searc
  in https://gerrit.libreoffice.org/11829 from Seyeong Kim
  about module sc
+ l10ntools-transex3: core refactoring and improvements
  in https://gerrit.libreoffice.org/11317 from Douglas Mencken
  about module l10ntools
+ drop -Wno-long-double compiler flag
  in https://gerrit.libreoffice.org/11819 from Douglas Mencken
  about module build, external, solenv
+ related to #fdo71248 - ActiveDocument not tracking ThisWordDoc
  in https://gerrit.libreoffice.org/11842 from Justin Luth
  about module sw
 End of freshness 

+ vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMap
  in https://gerrit.libreoffice.org/11823 from Chris Sherlock
  about module include, vcl
+ Related fdo#84073: Query Incorrect Syntax
  in https://gerrit.libreoffice.org/11812 from Julien Nabet
  about module connectivity
+ fdo#80927: css.office.Quickstart should be single-instance service.
  in https://gerrit.libreoffice.org/11766 from Matúš Kukan
  about module cppuhelper, postprocess, sfx2
+ convert vcl StateChangedType to enum class
  in https://gerrit.libreoffice.org/11843 from Noel Grandin
  about module avmedia, cui, dbaccess, extensions, forms, framework, include, 
sc, sd, sfx2, starmath, svtools, svx, sw, vcl
+ create template library class for implementing bit-flags types
  in https://gerrit.libreoffice.org/11835 from Noel Grandin
  about module cppcanvas, drawinglayer, filter, include, sw, vcl
+ bump nss from 3.15.3 to 3.16.5
  in https://gerrit.libreoffice.org/11700 from Caolán McNamara
  about module build, external
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11840 from Takeshi Abe
  about module filter, include, sw


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

+ Better title for color picker dialog
  in https://gerrit.libreoffice.org/11845 from Adolfo Jayme Barrientos
+ Fix fdo#84591 Styles dropdown disappears when clicked on submenu
  in https://gerrit.libreoffice.org/11841 from juegen funk
+ fdo#83292 add stub locale data for Catalan (Valencian)
  in https://gerrit.libreoffice.org/11776 from Andras Timar
+ Avoid accessing 1 character after a string
  in https://gerrit.libreoffice.org/11830 from Matthew Francis
+ xmerge: reuse the value of node.getNodeName() and remove duplicated const
  in https://gerrit.libreoffice.org/11836 from Robert Antoni Buj i Gelonch
+ fdo#81475 Finalizing new layout of Writer formatting toolbar
  in https://gerrit.libreoffice.org/11817 from Yousuf Philips


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

None

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

+ fdo#83003 Startcenter: No method for returnin Recent Docs
  in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ HIG-ification of GSoC Color Picker dialog
  in https://gerrit.libreoffice.org/11494 from Olivier Hallot
+ Perftest for loading autocorrect dictionaries (fdo#79761)
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ fdo#81956 : Rendering of vml group shape was wrong.
  in https://gerrit.libreoffice.org/11013 from sushil_shinde
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ fdo#81426 : Data from header and footer is getting lost.
  in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji
+ fdo#79541 :Corrupt: Shape  enclosed within a floating table
  in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji
+ fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT
  in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


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 mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-10-24 Thread Michael Stahl

 sw/qa/extras/odfimport/data/fdo79269.odt|binary
 sw/qa/extras/odfimport/data/fdo79269_header.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx|   35 
 sw/source/core/unocore/unostyle.cxx |   35 +---
 4 files changed, 55 insertions(+), 15 deletions(-)

New commits:
commit ccfea9417df8e628a76e019712e862f5f0840caa
Author: Michael Stahl 
Date:   Tue Sep 30 17:59:08 2014 +0200

fdo#79269: fix ODF import of style:footer-first

The implementation of SwXStyle's FirstIsShared property is busted, and
that causes xmloff to write the footer-first content into the master
footer.

This is a re-implementation of 0f21f932081471b2a5eda820fa1a194fbf3ab85c
because unostyle.cxx is very different on master...

Reviewed-on: https://gerrit.libreoffice.org/11722
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 902de8a1cbdb86c1eb1a05c8307b109fd75f493c)

Conflicts:
sw/source/core/unocore/unostyle.cxx

Change-Id: I485d8089c1fb5ba3ca369fbfe8f3115bf700ba13
Reviewed-on: https://gerrit.libreoffice.org/11752
Reviewed-by: BjÃ¶rn Michaelsen 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/odfimport/data/fdo79269.odt 
b/sw/qa/extras/odfimport/data/fdo79269.odt
new file mode 100644
index 000..2e3bf1e
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269.odt differ
diff --git a/sw/qa/extras/odfimport/data/fdo79269_header.odt 
b/sw/qa/extras/odfimport/data/fdo79269_header.odt
new file mode 100644
index 000..6f1a839
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269_header.odt 
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index e7fa8fb..68ec3c1 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -271,6 +271,41 @@ DECLARE_ODFIMPORT_TEST(testFdo60842, "fdo60842.odt")
 getCell(xTable, "E1", "01/04/2012");
 }
 
+DECLARE_ODFIMPORT_TEST(testFdo79269, "fdo79269.odt")
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+xCursor->jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+
+// The problem was that the first-footer was shared.
+uno::Reference 
xPropSet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getProperty(xPropSet, "FirstIsShared"));
+
+uno::Reference xFooter1 = getProperty< 
uno::Reference >(xPropSet, "FooterTextFirst");
+CPPUNIT_ASSERT_EQUAL(OUString("forst"), xFooter1->getString());
+uno::Reference xFooter = getProperty< 
uno::Reference >(xPropSet, "FooterText");
+CPPUNIT_ASSERT_EQUAL(OUString("second"), xFooter->getString());
+}
+
+DECLARE_ODFIMPORT_TEST(testFdo79269_header, "fdo79269_header.odt")
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+xCursor->jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+
+uno::Reference 
xPropSet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getProperty(xPropSet, "FirstIsShared"));
+
+uno::Reference xFooter1 = getProperty< 
uno::Reference >(xPropSet, "HeaderTextFirst");
+CPPUNIT_ASSERT_EQUAL(OUString("forst"), xFooter1->getString());
+uno::Reference xFooter = getProperty< 
uno::Reference >(xPropSet, "HeaderText");
+CPPUNIT_ASSERT_EQUAL(OUString("second"), xFooter->getString());
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
 {
 uno::Reference xShape = getShape(1);
diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 4963b68..35b929c 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -466,6 +466,24 @@ SwXStyleFamily::~SwXStyleFamily()
 
 }
 
+static bool lcl_GetHeaderFooterItem(
+SfxItemSet const& rSet, OUString const& rPropName, bool const bFooter,
+SvxSetItem const*& o_rpItem)
+{
+SfxItemState eState = rSet.GetItemState(
+(bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+false, reinterpret_cast(&o_rpItem));
+if (SFX_ITEM_SET != eState &&
+rPropName == "FirstIsShared")
+{   // fdo#79269 header may not exist, check footer then
+eState = rSet.GetItemState(
+(!bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+false, reinterpret_cast(&o_rpItem));
+}
+return SFX_ITEM_SET == eState;
+}
+
+
 static sal_Int32 lcl_GetCountOrName(const SwDoc

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

2014-10-24 Thread Noel Grandin

 sd/source/ui/animations/CustomAnimationCreateDialog.cxx |8 
 sd/source/ui/animations/CustomAnimationPane.cxx |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 62aa0f83fa64c560e56f0af8629d81f327d39b5e
Author: Noel Grandin 
Date:   Wed Oct 8 12:40:41 2014 +0200

fix build after PathKind enum commit

after my hasty commit
bc00203  "convert PathKind enum in SD to enum class"

Change-Id: I97263e907bf7363121dc1b437eaf564efdb66ad2

diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx 
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 4be2448..6a68229 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -376,22 +376,22 @@ CustomAnimationPresetPtr 
CustomAnimationCreateTabPage::getSelectedPreset() const
 
 PathKind CustomAnimationCreateTabPage::getCreatePathKind() const
 {
-PathKind eKind = NONE;
+PathKind eKind = PathKind::NONE;
 
 if( mpLBEffects->GetSelectEntryCount() == 1 )
 {
 const sal_Int32 nPos = mpLBEffects->GetSelectEntryPos();
 if( nPos == mnCurvePathPos )
 {
-eKind = CURVE;
+eKind = PathKind::CURVE;
 }
 else if( nPos == mnPolygonPathPos )
 {
-eKind = POLYGON;
+eKind = PathKind::POLYGON;
 }
 else if( nPos == mnFreeformPathPos )
 {
-eKind = FREEFORM;
+eKind = PathKind::FREEFORM;
 }
 }
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index e457476..0c29199 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1793,7 +1793,7 @@ void CustomAnimationPane::onChange( bool bCreate )
 else
 {
 PathKind eKind = pDlg->getCreatePathKind();
-if( eKind != NONE )
+if( eKind != PathKind::NONE )
 createPath( eKind, aTargets, fDuration );
 }
 mrBase.GetDocShell()->SetModified();
@@ -1813,9 +1813,9 @@ void CustomAnimationPane::createPath( PathKind eKind, 
std::vector< Any >& rTarge
 
 switch( eKind )
 {
-case CURVE: nSID = SID_DRAW_BEZIER_NOFILL; break;
-case POLYGON:   nSID = SID_DRAW_POLYGON_NOFILL; break;
-case FREEFORM:  nSID = SID_DRAW_FREELINE_NOFILL; break;
+case PathKind::CURVE: nSID = SID_DRAW_BEZIER_NOFILL; break;
+case PathKind::POLYGON:   nSID = SID_DRAW_POLYGON_NOFILL; break;
+case PathKind::FREEFORM:  nSID = SID_DRAW_FREELINE_NOFILL; break;
 default: break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Justin Luth

 sfx2/source/doc/objxtor.cxx |2 +-
 sw/inc/unoprnms.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4108bd9b7a41eaa0f3bf8b8173f27f57e009ee34
Author: Justin Luth 
Date:   Tue Sep 30 14:37:59 2014 -0400

fdo#71248 Excel VBA: ActiveDocument is not tracking currently selected Doc

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

diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 92c5a1d..dcb115d 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -131,7 +131,7 @@ OString lclGetVBAGlobalConstName( const Reference< 
XInterface >& rxComponent )
 if( xProps.is() ) try
 {
 OUString aConstName;
-xProps->getPropertyValue("ThisVBADocObj") >>= aConstName;
+xProps->getPropertyValue("VBAGlobalConstantName") >>= aConstName;
 return OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US );
 }
 catch (const uno::Exception&) // not supported
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 1a89a01..fbfbe94 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -856,7 +856,7 @@
 #define UNO_NAME_DESCRIPTION "Description"
 #define UNO_NAME_META "InContentMetadata"
 #define UNO_NAME_IS_TEMPLATE "IsTemplate"
-#define UNO_NAME_VBA_DOCOBJ "ThisVBADocObj"
+#define UNO_NAME_VBA_DOCOBJ "VBAGlobalConstantName"
 #define UNO_NAME_NESTED_TEXT_CONTENT "NestedTextContent"
 #define UNO_NAME_SEPARATOR_LINE_STYLE "SeparatorLineStyle"
 #define UNO_NAME_FOOTNOTE_LINE_STYLE "FootnoteLineStyle"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: X-KDE-Protocols=...,smb,...

2014-10-24 Thread Stephan Bergmann


On 09/25/2014 02:32 PM, Stephan Bergmann wrote:

If program/libucpgvfs1lo.so is installed, LO accesses smb URLs via
GNOME's deprecated GnomeVFS framework.  For that GnomeVFS framework to
successfully handle smb URLs, at least on Fedora in a GNOME environment
a package gnome-vfs2-smb must be installed.  On a Fedora KDE spin, not
even that appears to suffice, there must be some further magic that's
missing.


The magic I was missing why program/libucpgvfs1lo.so is not working 
under KDE is the


  aDesktopEnvironment == "GNOME"

check as discussed at 
 comment 41 to " 
FILEOPEN: LO can't open files over SMB from KDE because of missing 
dependencies - wants to repair! [summary in comment 59]."


Stephan

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

[Libreoffice-commits] core.git: vcl/Executable_vcldemo.mk

2014-10-24 Thread Matthew J . Francis

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

New commits:
commit 0b7631bccb2a47ab71a0c1edbabe8a5892ff5f9c
Author: Matthew J. Francis 
Date:   Sun Oct 5 07:36:00 2014 +0800

vcl: Fix vcldemo linkage - was missing tk

Change-Id: I74d395c0fdcbdb5117584af329e6a023414d46af
Reviewed-on: https://gerrit.libreoffice.org/11806
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index fb29b9a..878ab62 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Executable_set_include,vcldemo,\
 
 $(eval $(call gb_Executable_use_libraries,vcldemo,\
 tl \
+tk \
 sal \
 vcl \
 cppu \
___
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/svx svx/source xmlsecurity/source

2014-10-24 Thread Noel Grandin

 filter/source/config/cache/basecontainer.cxx|2 
 filter/source/config/cache/configflush.cxx  |2 
 filter/source/flash/swfexporter.cxx |2 
 filter/source/flash/swfwriter1.cxx  |   70 ++---
 filter/source/graphicfilter/eos2met/eos2met.cxx |   94 +++
 filter/source/graphicfilter/epict/epict.cxx |   68 ++---
 filter/source/graphicfilter/eps/eps.cxx |  150 ++--
 filter/source/graphicfilter/icgm/class5.cxx |   10 
 filter/source/graphicfilter/icgm/elements.cxx   |   10 
 filter/source/graphicfilter/idxf/dxf2mtf.cxx|   40 +--
 filter/source/graphicfilter/idxf/dxfreprd.cxx   |   20 -
 filter/source/graphicfilter/ipict/ipict.cxx |6 
 filter/source/msfilter/escherex.cxx |   24 -
 filter/source/msfilter/msdffimp.cxx |   55 ++--
 filter/source/msfilter/svdfppt.cxx  |   60 ++--
 filter/source/pdf/impdialog.cxx |   24 -
 filter/source/svg/svgexport.cxx |   10 
 filter/source/svg/svgfontexport.cxx |8 
 filter/source/svg/svgwriter.cxx |  100 
 filter/source/xsltdialog/xmlfiltertestdialog.cxx|2 
 include/svx/extrud3d.hxx|   16 -
 include/svx/obj3d.hxx   |   24 -
 include/svx/scene3d.hxx |   62 ++--
 include/svx/sdasitm.hxx |1 
 svx/source/items/customshapeitem.cxx|9 
 xmlsecurity/source/dialogs/certificatechooser.cxx   |4 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx  |6 
 xmlsecurity/source/dialogs/macrosecurity.cxx|2 
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx |2 
 29 files changed, 448 insertions(+), 435 deletions(-)

New commits:
commit addf55184a1433c6432e8c727ee5232d6c4dc9f9
Author: Noel Grandin 
Date:   Thu Oct 2 15:36:13 2014 +0200

loplugin: cstylecast

Change-Id: I37d7c3e59f1debbee8d92e76f4d08fff773000b3

diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx 
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 4ad295d..c475a3c 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -43,7 +43,7 @@ sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) 
const
 
 SvTreeListEntry* pSel = m_pCertLB->FirstSelected();
 if( pSel )
-nSel = (sal_uInt16) ( sal_uIntPtr ) pSel->GetUserData();
+nSel = (sal_uInt16) reinterpret_cast( pSel->GetUserData() 
);
 
 return (sal_uInt16) nSel;
 }
@@ -173,7 +173,7 @@ void CertificateChooser::ImplInitialize()
 SvTreeListEntry* pEntry = m_pCertLB->InsertEntry( 
XmlSec::GetContentPart( maCerts[ nC ]->getSubjectName() )
 + "\t" + XmlSec::GetContentPart( maCerts[ nC 
]->getIssuerName() )
 + "\t" + XmlSec::GetDateString( maCerts[ nC 
]->getNotValidAfter() ) );
-pEntry->SetUserData( ( void* )(sal_IntPtr)nC ); // missuse user 
data as index
+pEntry->SetUserData( reinterpret_cast(nC) ); // missuse 
user data as index
 }
 
 // enable/disable buttons
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 7cfde0f..3aad10c 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -513,7 +513,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl)
 {
 try
 {
-sal_uInt16 nSelected = (sal_uInt16) (sal_uIntPtr) 
m_pSignaturesLB->FirstSelected()->GetUserData();
+sal_uInt16 nSelected = (sal_uInt16) reinterpret_cast( 
m_pSignaturesLB->FirstSelected()->GetUserData() );
 maCurrentSignatureInformations.erase( 
maCurrentSignatureInformations.begin()+nSelected );
 
 // Export all other signatures...
@@ -671,7 +671,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 m_pSignaturesLB->SetEntryText( aSubject, pEntry, 1 );
 m_pSignaturesLB->SetEntryText( aIssuer, pEntry, 2 );
 m_pSignaturesLB->SetEntryText( aDateTimeStr, pEntry, 3 );
-pEntry->SetUserData( ( void* ) n ); // missuse user data as 
index
+pEntry->SetUserData( reinterpret_cast(n) ); // missuse 
user data as index
 }
 }
 
@@ -726,7 +726,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
 {
 if( m_pSignaturesLB->FirstSelected() )
 {
-sal_uInt16 nSelected = (sal_uInt16) (sal_uIntPtr) 
m_pSignaturesLB->FirstSelected()->GetUserData();
+sal

Re: OASIS JIRA report | Proposal: hint for complex content

2014-10-24 Thread Miklos Vajna

Hi Regina,

On Fri, Oct 03, 2014 at 12:08:06PM +0200, Regina Henschel 
 wrote:
> No, I do not know any. But I don't know, what MS does, when it
> converts the own complex shapes to ODF.

Try it yourself: if you have e.g. a triangle containing a table, then
they simply write the content of the table (but not the table itself) to
ODF, to produce valid ODF. That's a discussion for an other proposal,
though.

> Yes. But the element text:p is not simple. See the possible child
> elements listed in 5.1.3
> 
> For your purpose relevant is, that it can have a child .
> And this in turn can have all you want, see the list in
> 10.4.2. Especially the child  is possible.

So you propose to add a fake paragraph and a fake frame to hack in a
table into a shape content when you describe that in ODF, instead of
simply allowing table:table inside e.g. draw:custom-shape? That sounds
suboptimal to me. :-) But again, this is not proposed yet, so outside of
the scope of the current discussion.

> It depends on the children of  what renderer is needed. That
> should be detected on parsing.
>
> I disagree here. An implementation should be able to analyze the XML
> tree and react according to existing or not existing child elements.

Please be aware of that LO's xmloff uses a SAX parser, so this is not
easily possible. This list is to discuss patches to the LO codebase, not
to discuss theoretical problems. ;-) (Or instructing developers what
their implementation should do.)

However, now that you mentioned that an alternative way to describe a
shape with a TextBox is to (mis-)use some existing ODF markup, instead
of using an explicit new optional attribute, I reimplemented sw
textboxes in xmloff in commit 9835a5823e0f559aabbc0e15ea126c82229c4bc7.
It uses the same (somewhat ugly) trick how we detect draw vs sw shapes,
just in this case for the content of customshapes.

HTH,

Miklos

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

LibreOffice Gerrit News for core on 2014-10-06

2014-10-24 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ drop -Wno-long-double compiler flag
  in https://gerrit.libreoffice.org/11819 from Douglas Mencken
  about module build, external, solenv
+ gbuild: introduce add_objcxxcppobjects and add_objcxxcppobject
  in https://gerrit.libreoffice.org/11815 from Douglas Mencken
  about module solenv
+ Library_sal.mk: adapt to add_objcxxcppobject
  in https://gerrit.libreoffice.org/11818 from Douglas Mencken
  about module sal
+ fdo#81475 Finalizing new layout of Writer formatting toolbar
  in https://gerrit.libreoffice.org/11817 from Yousuf Philips
  about module sw
+ vcl: don't force gb_OBJCXXFLAGS (objective-c++ mode) for all .cxx files
  in https://gerrit.libreoffice.org/11816 from Douglas Mencken
  about module vcl
+ vcl/source: drop unused svsys.h includes (3 occurrences)
  in https://gerrit.libreoffice.org/11814 from Douglas Mencken
  about module vcl
+ fdo#71248 "Excel VBA: ActiveDocument is not tracking currently selected D
  in https://gerrit.libreoffice.org/11725 from Justin Luth
  about module sfx2, sw
+ Refactor giant SwDocTest::testModelToViewHelper() into smaller tests
  in https://gerrit.libreoffice.org/11808 from Matthew Francis
  about module sw
 End of freshness 

+ fdo#73151 Always open Styles&Formatting dialog in the sidebar
  in https://gerrit.libreoffice.org/11648 from Samuel Mehrbrodt
  about module include, officecfg, qadevOOo, sc, sd, sfx2, svx, sw
+ fdo#65864: dont't traverse defs-nodes when in shape writing mode
  in https://gerrit.libreoffice.org/11793 from Christina Roßmanith
  about module filter
+ Related fdo#84073: Query Incorrect Syntax
  in https://gerrit.libreoffice.org/11812 from Julien Nabet
  about module connectivity
+ Handle ftp proxies
  in https://gerrit.libreoffice.org/11787 from Mathieu Parent
  about module ucb


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

+ vcl: FontCharMap to use intrusive_ptr ImplFontCharMap
  in https://gerrit.libreoffice.org/11804 from Chris Sherlock
+ FDO#80652 (part) help for page CMIS file access
  in https://gerrit.libreoffice.org/11801 from Olivier Hallot
+ use isEmpty() instead of getLength() where appropriate
  in https://gerrit.libreoffice.org/11813 from Christina Roßmanith
+ related fdo#70998 use plural for Objects/Images option
  in https://gerrit.libreoffice.org/11811 from Stanislav Horáček
+ fdo#84629 Inclusion of new tango icons for new toolbar buttons
  in https://gerrit.libreoffice.org/11790 from Yousuf Philips
+ Related: fdo#62081 Add missing ellipsis to Edit Style command
  in https://gerrit.libreoffice.org/11805 from Adolfo Jayme Barrientos
+ fdo#55903 - add new large zoom mode icons to galaxy and tango icon sets
  in https://gerrit.libreoffice.org/11729 from Yousuf Philips
+ logerrit: Simplify SSH config
  in https://gerrit.libreoffice.org/11788 from Mathieu Parent


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

None

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

+ fdo#83003 Startcenter: No method for returnin Recent Docs
  in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ HIG-ification of GSoC Color Picker dialog
  in https://gerrit.libreoffice.org/11494 from Olivier Hallot
+ l10ntools-transex3: convert 'int' to 'bool' where it's logical
  in https://gerrit.libreoffice.org/11317 from Douglas Mencken
+ Perftest for loading autocorrect dictionaries (fdo#79761)
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ fdo#81956 : Rendering of vml group shape was wrong.
  in https://gerrit.libreoffice.org/11013 from sushil_shinde
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ fdo#81426 : Data from header and footer is getting lost.
  in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji
+ fdo#79541 :Corrupt: Shape  enclosed within a floating table
  in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji
+ fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT
  in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


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 mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-10-24 Thread Norbert Thiebaud

 cui/source/dialogs/thesdlg.cxx |   11 +--
 sc/source/ui/condformat/colorformat.cxx|2 +-
 sc/source/ui/condformat/condformatdlgentry.cxx |   12 +++-
 vcl/source/window/window.cxx   |9 ++---
 4 files changed, 19 insertions(+), 15 deletions(-)

New commits:
commit ced24ffba2fa1754c466b7944b0ee06d21292706
Author: Norbert Thiebaud 
Date:   Sat Oct 4 14:58:02 2014 -0500

coverity#1242365: Unchecked return value

Change-Id: Iddb8b1bad29bf372f9485514e2cde195237e3cc3

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 27beb71..8b52d5c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1292,8 +1292,11 @@ SalGraphics* Window::ImplGetFrameGraphics() const
 }
 else
 {
-OutputDevice *pFrameWinOutDev = mpWindowImpl->mpFrameWindow;
-pFrameWinOutDev->AcquireGraphics();
+OutputDevice* pFrameWinOutDev = mpWindowImpl->mpFrameWindow;
+if ( ! pFrameWinOutDev->AcquireGraphics() )
+{
+return NULL;
+}
 }
 mpWindowImpl->mpFrameWindow->mpGraphics->ResetClipRegion();
 return mpWindowImpl->mpFrameWindow->mpGraphics;
commit 9ae4b6b996d6d1c4924be3a2c507f8c29fcbbb23
Author: Norbert Thiebaud 
Date:   Sat Oct 4 14:50:43 2014 -0500

coverity#1242366: Unchecked return value

Change-Id: I3f3b5b5a7ce5e387dc2acddc086d9f8a2fa2b12b

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d230bb5..27beb71 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1124,7 +1124,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits 
nStyle, SystemParentData* p
 SetBackground( Wallpaper( rStyleSettings.GetWindowColor() ) );
 }
 
-ImplUpdatePos();
+(void)ImplUpdatePos();
 
 // calculate app font res (except for the Intro Window or the default 
window)
 if ( mpWindowImpl->mbFrame && !pSVData->maGDIData.mnAppFontX && ! (nStyle 
& (WB_INTROWIN|WB_DEFAULTWIN)) )
commit 873f0e07087f80dac2f4a09633ccc3be72640dfd
Author: Norbert Thiebaud 
Date:   Sat Oct 4 14:47:03 2014 -0500

coverity#1242368: Unchecked return value

Change-Id: I6aaad60cf08349aee6c07621764a1a6c071ad2b6

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 5f92b61..ce1db4d 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -674,10 +674,6 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry& 
rEntry, ListBox& rLbType,
 
 void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, 
const Edit& rValue, ScDocument* pDoc, const ScAddress& rPos, bool bDataBar )
 {
-sal_uInt32 nIndex = 0;
-double nVal = 0;
-SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
-pNumberFormatter->IsNumberFormat(rValue.GetText(), nIndex, nVal);
 
 // color scale does not have the automatic entry
 sal_Int32 nPos = rType.GetSelectEntryPos();
@@ -694,7 +690,13 @@ void SetColorScaleEntry( ScColorScaleEntry* pEntry, const 
ListBox& rType, const
 case COLORSCALE_PERCENTILE:
 case COLORSCALE_VALUE:
 case COLORSCALE_PERCENT:
-pEntry->SetValue(nVal);
+{
+sal_uInt32 nIndex = 0;
+double nVal = 0;
+SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
+(void)pNumberFormatter->IsNumberFormat(rValue.GetText(), 
nIndex, nVal);
+pEntry->SetValue(nVal);
+}
 break;
 case COLORSCALE_FORMULA:
 pEntry->SetFormula(rValue.GetText(), pDoc, rPos);
commit 35f66cb2f2fb4316e52fa579c3629071088b3f40
Author: Norbert Thiebaud 
Date:   Sat Oct 4 14:42:28 2014 -0500

coverity#1242369: Unchecked return value

Change-Id: Ib5a938d9a8a0ac1f2f5dfb299c948951bb845349

diff --git a/sc/source/ui/condformat/colorformat.cxx 
b/sc/source/ui/condformat/colorformat.cxx
index b3fa94e..4590ea3 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -39,7 +39,7 @@ void GetType(const ListBox& rLstBox, const Edit& rEd, 
ScColorScaleEntry* pEntry,
 case COLORSCALE_PERCENTILE:
 case COLORSCALE_VALUE:
 case COLORSCALE_PERCENT:
-pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal );
+(void)pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, 
nVal );
 pEntry->SetValue(nVal);
 break;
 case COLORSCALE_FORMULA:
commit 22ca3bf1b9dedec65a57ac70a124bf69cd242e0e
Author: Norbert Thiebaud 
Date:   Sat Oct 4 14:36:24 2014 -0500

coverity#1242370: Unchecked return value

Change-Id: I11d80ddea4a38ce69ad7076af6da0bf173bd8551

diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index a9d30d6..1a67ee8 100644
--- a/cui/source/dialogs/th

Re: [Libreoffice-qa] "No activity" warnings - EasyHacks

2014-10-24 Thread Tommy

On Fri, 24 Oct 2014 18:35:30 +0200, Joel Madero   
wrote:




On 10/24/2014 02:59 AM, Jan Holesovsky wrote:

Hi,

I've seen a

"Your bug was confirmed at least 1 year ago and has not had any activity
on it for over a year. Your bug is still set to NEW which means that it
is open and confirmed. It would be nice to have the bug confirmed on a
newer version than the version reported in the original report to know
that the bug is still present -- sometimes a bug is inadvertently fixed
over time and just never closed."

warning in one of the EasyHacks
(https://bugs.freedesktop.org/show_bug.cgi?id=30425).

I suppose we shouldn't be sending these to EasyHacks - I guess it's
worth treating them separately :-)  Is it possible to skip EasyHacks
when sending these, please?

What would be the rationale for skipping them for easy hacks? These get
fixed just as inadvertently as other bugs. Just curious

Best,
Joel


maybe Jan is complaining of the spam that is generated in the dev list by  
any "retest ping" message that hits easy hacks.


AFAIK every time an easy hack receives a new comment a notification is  
sent to the dev list.


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

IAccessible2 bridgecomponent context fails

2014-10-24 Thread sleeping.pillow


Hi




Since last week I’m having some troubles with my Windows build and I can no 
longer get the IAccessible2 parts to work. I get the following warning when 
opening LibreOffice with NVDA screen reader running:

warn:vcl:8004:12820:vcl/source/app/svdata.cxx:265: got no IAccessible2 
bridgecomponent context fails to supply service 
'com.sun.star.accessibility.MSAAService' of type 
'com.sun.star.accessibility.XMSAAService'




The daily builds does not seem to suffer from these warnings and do, unlike my 
builds have working accessibility support. 




Does anyone have any ideas at to what might be wrong in my case, or where I 
might start looking to try and track down what goes wrong. Note that I had 
working builds with this machine last week. But have done a make clean last 
weekend during the time Windows did not build.

I have master checked out without any changes made to it. 




For my latest build I used the following switches:

--with-external-tar=/cygdrive/c/sources/lo-ext-src
--with-junit=/cygdrive/c/sources/junit-4.10.jar
--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.4
--enable-pch
--enable-debug
--disable-ccache
--disable-opencl
--disable-cve-tests
--without-helppack-integration
--with-package-format=msi
--with-windows-sdk=7.1A



--

Thanks,

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

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - avmedia/Library_avmedia.mk avmedia/Library_avmediaogl.mk canvas/Library_oglcanvas.mk chart2/Library_chartcontroller.mk chart2/

2014-10-24 Thread Markus Mohrhard

 Repository.mk  |1 
 avmedia/Library_avmedia.mk |1 
 avmedia/Library_avmediaogl.mk  |1 
 canvas/Library_oglcanvas.mk|1 
 chart2/Library_chartcontroller.mk  |1 
 chart2/Library_chartcore.mk|2 
 chart2/Library_chartopengl.mk  |1 
 sc/CppunitTest_sc_ucalc.mk |1 
 sc/Library_sc.mk   |1 
 slideshow/Library_OGLTrans.mk  |1 
 slideshow/Library_slideshow.mk |1 
 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 
 svx/Library_svxcore.mk |1 
 vcl/Executable_icontest.mk |1 
 vcl/Library_vcl.mk |   27 +++
 vcl/Library_vclopengl.mk   |   88 -
 vcl/Module_vcl.mk  |1 
 vcl/inc/openglgdiimpl.hxx  |6 +
 18 files changed, 32 insertions(+), 105 deletions(-)

New commits:
commit e5be87590e237225077e847b972af043d600a01e
Author: Markus Mohrhard 
Date:   Fri Oct 24 18:53:31 2014 +0200

merge vcllo and vclopengllo

Change-Id: I419ca67dc1f87dd9ac751aa5a094fecf58136edb

diff --git a/Repository.mk b/Repository.mk
index 729c1d3..c31342a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -391,7 +391,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
vcl \
vclcanvas \
-   vclopengl \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
vclplug_gen \
$(if $(ENABLE_TDE),vclplug_tde) \
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 6bfc791..ec70670 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
tl \
utl \
vcl \
-   vclopengl \
$(gb_UWINAPI) \
 ))
 
diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk
index 3bbebe8..3ff9818 100644
--- a/avmedia/Library_avmediaogl.mk
+++ b/avmedia/Library_avmediaogl.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,avmediaogl,\
 salhelper \
 tl \
 vcl \
-vclopengl \
 $(gb_UWINAPI) \
 ))
 
diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk
index b5d3377..589e601 100644
--- a/canvas/Library_oglcanvas.mk
+++ b/canvas/Library_oglcanvas.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Library_use_libraries,oglcanvas,\
cppuhelper \
comphelper \
vcl \
-   vclopengl \
tk \
tl \
i18nlangtag \
diff --git a/chart2/Library_chartcontroller.mk 
b/chart2/Library_chartcontroller.mk
index b147fc1..f77ef70 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
 ucbhelper \
 utl \
 vcl \
-vclopengl \
$(gb_UWINAPI) \
 ))
 
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 2543eaa..3440653 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -57,8 +57,6 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
 ucbhelper \
 utl \
 vcl \
-$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)), \
-vclopengl) \
$(gb_UWINAPI) \
 ))
 
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index bd47e89..83d52d8 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\
 ucbhelper \
 utl \
 vcl \
-vclopengl \
 $(gb_UWINAPI) \
 ))
 
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 7fa3369..97b4c7a 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
 utl \
 vbahelper \
 vcl \
-vclopengl \
 xo \
$(gb_UWINAPI) \
 ))
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 20460ee..36f706b 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -88,7 +88,6 @@ $(eval $(call gb_Library_use_libraries,sc,\
 $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
 vbahelper) \
 vcl \
-   vclopengl \
 xo \
 $(gb_UWINAPI) \
 ))
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 6a9d2ac..809ca14 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\
 cppuhelper \
 sal \
 vcl \
-vclopengl \
$(gb_UWINAPI) \
 ))
 
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index d5af9a1..5d01391 100644
--- a/slideshow/Library_slideshow.mk
+++ b

Re: [Libreoffice-qa] "No activity" warnings - EasyHacks

2014-10-24 Thread Joel Madero


On 10/24/2014 02:59 AM, Jan Holesovsky wrote:
> Hi,
>
> I've seen a
>
> "Your bug was confirmed at least 1 year ago and has not had any activity
> on it for over a year. Your bug is still set to NEW which means that it
> is open and confirmed. It would be nice to have the bug confirmed on a
> newer version than the version reported in the original report to know
> that the bug is still present -- sometimes a bug is inadvertently fixed
> over time and just never closed."
>
> warning in one of the EasyHacks
> (https://bugs.freedesktop.org/show_bug.cgi?id=30425).
>
> I suppose we shouldn't be sending these to EasyHacks - I guess it's
> worth treating them separately :-)  Is it possible to skip EasyHacks
> when sending these, please?
What would be the rationale for skipping them for easy hacks? These get
fixed just as inadvertently as other bugs. Just curious

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

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

2014-10-24 Thread Michael Stahl

 svx/source/sdr/contact/objectcontactofpageview.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 1df0656c4bb139606081625fb19e39fbef9f8890
Author: Michael Stahl 
Date:   Fri Oct 24 17:58:27 2014 +0200

fdo#83664: svx: don't try to paint on empty OutputDevice

ObjectContactOfPageView::DoProcessDisplay() initalizes an empty
aViewRange, which later code assumes to mean "paint everything", but
actually the OutputDevice has 0 size so nothing can be painted.

Change-Id: I1e47e8d38c1fad5e08027bb76fce4b54c5b3358b

diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx 
b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 6fd3674..390c5bd 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -141,6 +141,15 @@ namespace sdr
 // OutputDevices then the given ones.
 void ObjectContactOfPageView::DoProcessDisplay(DisplayInfo& 
rDisplayInfo)
 {
+OutputDevice& rTargetOutDev = 
GetPageWindow().GetPaintWindow().GetTargetOutputDevice();
+const Size aOutputSizePixel(rTargetOutDev.GetOutputSizePixel());
+if (!isOutputToRecordingMetaFile() // do those have outdev too?
+&& (0 == aOutputSizePixel.getWidth() ||
+0 == aOutputSizePixel.getHeight()))
+{
+return;
+}
+
 // visualize entered group when that feature is switched on and 
it's not
 // a print output. #i29129# No ghosted display for printing.
 bool bVisualizeEnteredGroup(DoVisualizeEnteredGroup() && 
!isOutputToPrinter());
@@ -170,7 +179,6 @@ namespace sdr
 
 // update current ViewInformation2D at the ObjectContact
 const double fCurrentTime(getPrimitiveAnimator().GetTime());
-OutputDevice& rTargetOutDev = 
GetPageWindow().GetPaintWindow().GetTargetOutputDevice();
 basegfx::B2DRange aViewRange;
 
 // create ViewRange
@@ -194,7 +202,6 @@ namespace sdr
 else
 {
 // use visible pixels, but transform to world coordinates
-const Size 
aOutputSizePixel(rTargetOutDev.GetOutputSizePixel());
 aViewRange = basegfx::B2DRange(0.0, 0.0, 
aOutputSizePixel.getWidth(), aOutputSizePixel.getHeight());
 
 // if a clip region is set, use it
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Yousuf Philips

 svx/uiconfig/ui/sidebarparagraph.ui |   25 ++---
 1 file changed, 2 insertions(+), 23 deletions(-)

New commits:
commit 94a1e5b614496fd067e2c5369613acf86a6c9a6d
Author: Yousuf Philips 
Date:   Thu Oct 23 15:07:32 2014 +0400

fdo#85340 - Better tooltip for paragraph spacing buttons

Change-Id: I9bb83df5e7ee9517a8f6f88213fc6951c53593bd
Reviewed-on: https://gerrit.libreoffice.org/12076
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index cc58e51..ed298f0 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -24,7 +24,6 @@
 True
 False
 True
-Bullets and 
Numbering
 Bullets and 
Numbering
 False
 
@@ -32,7 +31,6 @@
 True
 False
 True
-Bullets
 Bullets
 True
 .uno:DefaultBullet
@@ -48,7 +46,6 @@
 True
 False
 True
-Numbering
 Numbering
 True
 .uno:DefaultNumbering
@@ -72,7 +69,6 @@
 True
 False
 True
-Paragraph 
Background Color
 Paragraph 
Background Color
 end
 
@@ -106,7 +102,6 @@
 True
 False
 True
-Horizontal 
Alignment
 Horizontal 
Alignment
 start
 False
@@ -208,7 +203,6 @@
 True
 False
 True
-Vertical 
Alignment
 Vertical 
Alignment
 end
 True
@@ -292,7 +286,6 @@
 True
 False
 True
-Spacing
 Spacing
 False
 
@@ -302,8 +295,7 @@
 True
 False
 True
-Increase Spacing
-Increase 
Spacing
+Increase 
Paragraph Spacing
 .uno:ParaspaceIncrease
 True
   
@@ -317,8 +309,7 @@
 True
 False
 True
-Decrease Spacing
-Decrease 
Spacing
+Decrease 
Paragraph Spacing
 .uno:ParaspaceDecrease
 True
   
@@ -358,7 +349,6 @@
 True
 True
 True
-Above 
Paragraph Spacing
 Above 
Paragraph Spacing
 True
 â¢
@@ -402,7 +392,6 @@
 True
 True
 True
-Below 
Paragraph Spacing
 Below 
Paragraph Spacing
 True
 â¢
@@ -427,7 +416,6 @@
 True
 False
 True
-Line 
Spacing
 Line 
Spacing
 True
 
@@ -435,7 +423,6 @@
 True
 False
 True
-Line 
Spacing
 Line 
Spacing
 .uno:LineSpacing
 True
@@ -491,7 +478,6 @@
 True
 False
 True
-Indent
 Indent
 False
 
@@ -499,7 +485,6 @@
 True
 False
 True
-Decrease Indent
 Decrease Indent
 .uno:DecrementIndent
 True
@@ -516,7 +501,6 @@
 True
 False
 True
-Increase Indent
 Increase Indent
 .uno:IncrementIndent
 True
@@ -531,7 +515,6 @@
 True
 False
 True
-Switch to Hanging Indent
 Switch to Hanging Indent
 .uno:HangingIndent
 True
@@ -553,7 +536,6 @@
 True
 False
 True
-Indent
 Indent
 False
 
@@ -563,7 +545,6 @@
 True
 False
 True
-Increase Ind

[Libreoffice-commits] core.git: sal/Library_sal.mk

2014-10-24 Thread Stephan Bergmann

 sal/Library_sal.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 93de2f6b5c4ec349244066178d4b2624c409a89a
Author: Stephan Bergmann 
Date:   Fri Oct 24 17:21:49 2014 +0200

And $(ENABLE_CRASHDUMP) is "TRUE" or "", never "YES"

Change-Id: I626bd8d29a7efe967608efbb21fda87e5692c0c8

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 0b7e39c..abeec1d 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -181,8 +181,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/time \
 ))
 $(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \
-   $(if $(filter $(ENABLE_CRASHDUMP),YES), \
-   -DSAL_ENABLE_CRASH_REPORT) \
+   $(if $(ENABLE_CRASHDUMP),-DSAL_ENABLE_CRASH_REPORT) \
 ))
 
 # Note that the uunxapi.mm file just includes the uunxapi.cxx one
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Adolfo Jayme Barrientos

 svx/uiconfig/ui/colorwindow.ui |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit bfe02672a969a921a2ec954f4035af0671a82149
Author: Adolfo Jayme Barrientos 
Date:   Fri Oct 24 09:03:41 2014 -0500

Rename color picker button and add an icon to it

Change-Id: I24def42d6167c6e7a7a4d5871f2a6e3b51230d58
Reviewed-on: https://gerrit.libreoffice.org/12086
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 66ac451..1c2978e 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -2,13 +2,21 @@
 
 
   
-  
+  
+  
+True
+False
+6
+0
+cmd/sc_colorsettings.png
+1
+  
   
 True
 False
 True
 True
-6
+4
 False
 True
 popup-menu
@@ -84,7 +92,7 @@
   
 True
 False
-0.01999552965164
+0.1
 Recent
   
   
@@ -118,11 +126,14 @@
 
 
   
-Color picker
+Custom Colorâ¦
 True
 True
 True
+custom_color_icon
 none
+0
+True
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/Library_sal.mk

2014-10-24 Thread Stephan Bergmann

 sal/Library_sal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd0c63fbf86a724624f707d393a0acfc5f504dd2
Author: Stephan Bergmann 
Date:   Fri Oct 24 17:18:18 2014 +0200

The if(xmlout&&stackout&&checksumout) stack-walking can take obscenely long

...in sal/osl/unx/signal.c ReportCrash, so do not implicitly burden that on 
every
--enable-dbgutil --disable-crashdump build.

Change-Id: I2d03ea2715697bf7960ca7e9e55c72489ce24bae

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 12f5551..0b7e39c 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -181,7 +181,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/time \
 ))
 $(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \
-   $(if $(filter $(ENABLE_CRASHDUMP),YES)$(filter $(ENABLE_DBGUTIL),TRUE), 
\
+   $(if $(filter $(ENABLE_CRASHDUMP),YES), \
-DSAL_ENABLE_CRASH_REPORT) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Markus Mohrhard

 include/vcl/opengl/OpenGLContext.hxx |9 +++
 vcl/source/opengl/OpenGLContext.cxx  |   94 +++
 2 files changed, 72 insertions(+), 31 deletions(-)

New commits:
commit bafc045bccffd2314d246f93d84dbaf80bf6eacc
Author: Markus Mohrhard 
Date:   Fri Oct 24 17:03:39 2014 +0200

add a OpenGLContext::init for unix backend

That one does not need the indirection through a Window instance to get
to the X resources that are necessary for a GLX context.

Change-Id: I3195a5f2b447172434881bd9b0b230c8992c1c87

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index 2c92103..a99e6c3 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -158,6 +158,12 @@ public:
 bool init(vcl::Window* pParent = 0);
 bool init(SystemChildWindow* pChildWindow);
 
+// these methods are for the deep platform layer, don't use them in normal code
+// only in vcl's platform code
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
+bool init(Display* dpy, Window win, int screen);
+#endif
+
 void makeCurrent();
 void resetCurrent();
 void swapBuffers();
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index e5b75c6..b29c7a1 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -428,6 +428,30 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int& 
nBestFBC)
 return pFBC;
 }
 
+// we need them before glew can initialize them
+// glew needs an OpenGL context so we need to get the address manually
+void initOpenGLFunctionPointers()
+{
+glXChooseFBConfig = (GLXFBConfig*(*)(Display *dpy, int screen, const int 
*attrib_list, int 
*nelements))glXGetProcAddressARB((GLubyte*)"glXChooseFBConfig");
+glXGetVisualFromFBConfig = (XVisualInfo*(*)(Display *dpy, GLXFBConfig 
config))glXGetProcAddressARB((GLubyte*)"glXGetVisualFromFBConfig");// try 
to find a visual for the current set of attributes
+glXGetFBConfigAttrib = (int(*)(Display *dpy, GLXFBConfig config, int 
attribute, int* value))glXGetProcAddressARB((GLubyte*)"glXGetFBConfigAttrib");
+glXCreateContextAttribsARB = (GLXContext(*) (Display*, GLXFBConfig, 
GLXContext, Bool, const int*)) glXGetProcAddressARB((const GLubyte *) 
"glXCreateContextAttribsARB");;
+}
+
+XVisualInfo* getVisualInfo(Display* dpy, Window win)
+{
+initOpenGLFunctionPointers();
+
+int best_fbc = -1;
+GLXFBConfig* pFBC = getFBConfig(dpy, win, best_fbc);
+
+XVisualInfo* vi = glXGetVisualFromFBConfig( dpy, pFBC[best_fbc] );
+
+XFree(pFBC);
+
+return vi;
+}
+
 }
 
 #endif
@@ -458,6 +482,33 @@ bool OpenGLContext::init(SystemChildWindow* pChildWindow)
 return ImplInit();
 }
 
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
+bool OpenGLContext::init(Display* dpy, Window win, int screen)
+{
+if(mbInitialized)
+return true;
+
+if (!dpy)
+return false;
+
+m_aGLWin.dpy = dpy;
+m_aGLWin.win = win;
+m_aGLWin.screen = screen;
+
+XVisualInfo* vi = getVisualInfo(dpy, win);
+Visual* pVisual = NULL;
+
+if( vi )
+{
+SAL_INFO("vcl.opengl", "using VisualID " << vi->visualid);
+pVisual = vi->visual;
+}
+initGLWindow(pVisual);
+
+return ImplInit();
+}
+#endif
+
 bool OpenGLContext::ImplInit()
 {
 SAL_INFO("vcl.opengl", "OpenGLContext::ImplInitstart");
@@ -828,34 +879,6 @@ SystemWindowData 
OpenGLContext::generateWinData(vcl::Window* /*pParent*/, bool b
 
 #elif defined( UNX )
 
-namespace {
-
-// we need them before glew can initialize them
-// glew needs an OpenGL context so we need to get the address manually
-void initOpenGLFunctionPointers()
-{
-glXChooseFBConfig = (GLXFBConfig*(*)(Display *dpy, int screen, const int 
*attrib_list, int 
*nelements))glXGetProcAddressARB((GLubyte*)"glXChooseFBConfig");
-glXGetVisualFromFBConfig = (XVisualInfo*(*)(Display *dpy, GLXFBConfig 
config))glXGetProcAddressARB((GLubyte*)"glXGetVisualFromFBConfig");// try 
to find a visual for the current set of attributes
-glXGetFBConfigAttrib = (int(*)(Display *dpy, GLXFBConfig config, int 
attribute, int* value))glXGetProcAddressARB((GLubyte*)"glXGetFBConfigAttrib");
-glXCreateContextAttribsARB = (GLXContext(*) (Display*, GLXFBConfig, 
GLXContext, Bool, const int*)) glXGetProcAddressARB((const GLubyte *) 
"glXCreateContextAttribsARB");;
-}
-
-}
-
-XVisualInfo* getVisualInfo(Display* dpy, Window win)
-{
-initOpenGLFunctionPointers();
-
-int best_fbc = -1;
-GLXFBConfig* pFBC = getFBConfig(dpy, win, best_fbc);
-
-XVisualInfo* vi = glXGetVisualFromFBConfig( dpy, pFBC[best_fbc] );
-
-XFree(pFBC);
-
-return vi;
-}
-
 SystemWindowData OpenGLContext::generateWinData(vcl::Window* pParent, bool)
 {
 SystemWindowData aWinData;
commit 2e24c7de8e185556fe7cb2bf013ff9019b08ca0c
Author: Markus Mohrhard 
Date:   Fri Oct

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

2014-10-24 Thread Tor Lillqvist

 external/glm/UnpackedTarball_glm.mk  |1 +
 external/glm/Wunused-parameter.patch |   18 ++
 2 files changed, 19 insertions(+)

New commits:
commit 142dbf27c10535af51f2c722d9166b59e550aa22
Author: Tor Lillqvist 
Date:   Fri Oct 24 17:50:01 2014 +0300

WaE: unused parameter

Change-Id: Ifcdef5ed474b36e60604dde96bba4dd152e829b6

diff --git a/external/glm/UnpackedTarball_glm.mk 
b/external/glm/UnpackedTarball_glm.mk
index 86e9d16..82f4a2c 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
 $(eval $(call gb_UnpackedTarball_add_patches,glm, \
 external/glm/Wshadow-patch-fix.patch \
 external/glm/Wsign-compare.patch.0 \
+external/glm/Wunused-parameter.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/glm/Wunused-parameter.patch 
b/external/glm/Wunused-parameter.patch
new file mode 100644
index 000..de12397
--- /dev/null
+++ b/external/glm/Wunused-parameter.patch
@@ -0,0 +1,18 @@
+--- glm/glm/gtx/bit.inl
 glm/glm/gtx/bit.inl
+@@ -572,6 +572,7 @@
+   int const & ToBit
+   )
+   {
++  (void) FromBit;
+   assert(FromBit <= ToBit);
+   assert(ToBit <= sizeof(genIUType) * std::size_t(8));
+ 
+@@ -589,6 +589,7 @@
+   int const & ToBit
+   )
+   {
++  (void) FromBit;
+   assert(FromBit <= ToBit);
+   assert(ToBit <= sizeof(genIUType) * std::size_t(8));
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Stephan Bergmann

 configmgr/source/parsemanager.cxx |6 +++---
 configmgr/source/parsemanager.hxx |1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c57fb9ea459f08c33a4b8c129938411a59a19b77
Author: Stephan Bergmann 
Date:   Fri Oct 24 16:44:24 2014 +0200

Use xmlreader::XmlReader::getUrl

Change-Id: Idd59fd1324615e575ed812e0c2a7cdfd84a9aeb2

diff --git a/configmgr/source/parsemanager.cxx 
b/configmgr/source/parsemanager.cxx
index 008f2bf..dab0c49 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -35,7 +35,7 @@ namespace configmgr {
 
 ParseManager::ParseManager(
 OUString const & url, rtl::Reference< Parser > const & parser)
-   : url_(url), reader_(url), parser_(parser), itemNamespaceId_(-1)
+   : reader_(url), parser_(parser), itemNamespaceId_(-1)
 {
 assert(parser.is());
 int id;
@@ -67,7 +67,7 @@ bool ParseManager::parse(std::set< OUString > const * 
existingDependencies) {
 if (!parser_->startElement(
 reader_, itemNamespaceId_, itemData_, 
existingDependencies))
 {
-SAL_INFO("configmgr", "parsing " << url_ << " took " << 
(osl_getGlobalTimer() - startTime) << " ms, fail");
+SAL_INFO("configmgr", "parsing " << reader_.getUrl() << " took 
" << (osl_getGlobalTimer() - startTime) << " ms, fail");
 return false;
 }
 break;
@@ -78,7 +78,7 @@ bool ParseManager::parse(std::set< OUString > const * 
existingDependencies) {
 parser_->characters(itemData_);
 break;
 case xmlreader::XmlReader::RESULT_DONE:
-SAL_INFO("configmgr", "parsing " << url_ << " took " << 
(osl_getGlobalTimer() - startTime) << " ms, success");
+SAL_INFO("configmgr", "parsing " << reader_.getUrl() << " took " 
<< (osl_getGlobalTimer() - startTime) << " ms, success");
 return true;
 }
 itemData_.clear();
diff --git a/configmgr/source/parsemanager.hxx 
b/configmgr/source/parsemanager.hxx
index 74fa131..85ed3c5 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -47,7 +47,6 @@ public:
 enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
 
 private:
-OUString url_;
 virtual ~ParseManager();
 
 xmlreader::XmlReader reader_;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental

2014-10-24 Thread Tor Lillqvist

 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
|4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fa57c94e868a5cd06b057aecbed28d9e88ed4354
Author: Tor Lillqvist 
Date:   Fri Oct 24 17:17:35 2014 +0300

Revert "Temporarily do more verbose logging"

This reverts commit 00d2482326af17ac61d3c2aaa21d837f0e72bb37.

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index a63bf4c..1bc6499 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -36,7 +36,7 @@ public class LOKitTileProvider implements TileProvider {
 mTileWidth = pixelToTwip(TILE_SIZE, mDPI);
 mTileHeight = pixelToTwip(TILE_SIZE, mDPI);
 
-LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO");
+LibreOfficeKit.putenv("SAL_LOG=-WARN+INFO.lok");
 LibreOfficeKit.init(LibreOfficeMainActivity.mAppContext);
 
 mOffice = new Office(LibreOfficeKit.getLibreOfficeKitHandle());
@@ -54,7 +54,7 @@ public class LOKitTileProvider implements TileProvider {
 mOffice = new Office(handle);
 Log.i(LOGTAG, "> new Office created");
 mDocument = mOffice.documentLoad(input);
-LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO.lok");
+LibreOfficeKit.putenv("SAL_LOG=-WARN+INFO.lok");
 }
 
 Log.i(LOGTAG, "> mDocument = " + mDocument);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 130 matches

Mail list logo