date:20151126

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

2015-11-26 Thread Miklos Vajna

 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit dc269d07e8e5d71818bc0a546c3daef4d50eb1c7
Author: Miklos Vajna 
Date:   Fri Nov 27 08:34:41 2015 +0100

Use comphelper::containerToSequence()

Change-Id: Ic4a8521192e07f6851ebff47e83f41c5b1c7d8ce

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 812f0d9..12ad491 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -624,7 +624,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & 
/*rStream*/)
 {
 
 uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs = 
xRelationshipAccess->getAllRelationships();
-uno::Sequence > 
xGlossaryDomListTemp(aSeqs.getLength());
+std::vector< uno::Sequence > aGlossaryDomList;
  sal_Int32 counter = 0;
  for (sal_Int32 j = 0; j < aSeqs.getLength(); j++)
  {
@@ -694,13 +694,12 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & 
/*rStream*/)
   glossaryTuple[2] = uno::makeAny(gType);
   glossaryTuple[3] = uno::makeAny(gTarget);
   glossaryTuple[4] = uno::makeAny(contentType);
-  xGlossaryDomListTemp[counter] = glossaryTuple;
+  aGlossaryDomList.push_back(glossaryTuple);
   counter++;
   }
   }
   }
-  xGlossaryDomListTemp.realloc(counter);
-  mxGlossaryDomList = xGlossaryDomListTemp;
+  mxGlossaryDomList = 
comphelper::containerToSequence(aGlossaryDomList);
   }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: QA Meeting About How To Move Regressions Forward

2015-11-26 Thread Tommy


Joel Madero wrote:

Hi All,

QA is going to have a meeting second week of December about regressions
and what we (QA) can realistically do to help move things forward.

> ...

4) In the past we tried a hardHack list that we ultimately retired.
Would it be possible to have a weekly 1-2 fully triaged (bisected
regressions with good steps and all) brought up during the ESC to see if
there are any takers?

Any other thoughts really appreciated :)

Best,
Joel



the number 4 seems a very good idea. +1


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

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

2015-11-26 Thread Michael Meeks


On Thu, 2015-11-26 at 19:03 +0100, Markus Mohrhard wrote:
> please add a performance test that ensures that future refactorings
> won't regress here. In general any patch claiming performance
> improvements should be accompanied by a performance test to make sure

Great idea =) and easy to do too; Kendy ?

> Related to the code I wanted to mention that the getenv calls should
> be cached in a static variable as they might become expensive when

I was concerned by that too =) I believe the plan is to bin those; but
yes - good to check the perf tests for sure; and to have some nice
before/after step here.

ATB,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

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

2015-11-26 Thread Michael Meeks

 solenv/gbuild/Gallery.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit bc910480d685576faa13c92ec7d0b6c0e3c968ed
Author: Michael Meeks 
Date:   Thu Nov 26 18:22:52 2015 +

Attempt to improve gallery generation dependencies.

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

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 2ce708d..c286339 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -68,7 +68,10 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_Gallery_get_target,%) : \
-   $(call gb_Executable_get_runtime_dependencies,gengal)
+   $(call gb_Executable_get_runtime_dependencies,gengal) \
+   $(INSTDIR)/program/$(call gb_Helper_get_rcfile,gengal) \
+   $(call gb_ComponentTarget_get_target,ucb/source/core/ucb1) \
+   $(call gb_ComponentTarget_get_target,ucb/source/ucp/file/ucpfile1)
$(call gb_Gallery__command,$@,$*)
 
 $(call gb_Gallery__get_final_target,%) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - i18npool/source

2015-11-26 Thread Eike Rathke

 i18npool/source/search/textsearch.cxx |   36 --
 1 file changed, 22 insertions(+), 14 deletions(-)

New commits:
commit a38963a40eed7f1d85767b393a316870c31bff5c
Author: Eike Rathke 
Date:   Wed Nov 25 15:58:01 2015 +0100

regex result offsets can be negative if a group was not matched, tdf#94810

"(abc)|(def)" matches "def" with result offset sequences
{0,-1,0},{3,-1,3}

And thus the assert() calls introduced with
4cf1d290bab29e18e1312b63ff862f5102e00387 and
ce91f3c1292f3e9b84157acf10b67ad9ca16719d were hit.

Change-Id: I571b6c7d47349a2cc7b1d1e34193b2865012a49f
(cherry picked from commit 4dd2d40673299966ad639d799e925e64ae5560cf)
Reviewed-on: https://gerrit.libreoffice.org/20174
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/i18npool/source/search/textsearch.cxx 
b/i18npool/source/search/textsearch.cxx
index 472d509..97cceee 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -301,18 +301,22 @@ SearchResult TextSearch::searchForward( const OUString& 
searchStr, sal_Int32 sta
 for ( sal_Int32 k = 0; k < nGroups; k++ )
 {
 const sal_Int32 nStart = sres.startOffset[k] - nExtraOffset;
-assert(nStart >= 0);
-sres.startOffset[k] = (nStart < nOffsets ? offset[nStart] : 
(offset[nOffsets - 1] + 1));
+// Result offsets are negative (-1) if a group expression was
+// not matched.
+if (nStart >= 0)
+sres.startOffset[k] = (nStart < nOffsets ? offset[nStart] 
: (offset[nOffsets - 1] + 1));
 // JP 20.6.2001: end is ever exclusive and then don't return
 //   the position of the next character - return 
the
 //   next position behind the last found character!
 //   "a b c" find "b" must return 2,3 and not 
2,4!!!
 const sal_Int32 nStop = sres.endOffset[k] - nExtraOffset;
-assert(nStop >= 0);
-if (nStop > 0)
-sres.endOffset[k] = offset[(nStop <= nOffsets ? nStop : 
nOffsets) - 1] + 1;
-else
-sres.endOffset[k] = offset[0];
+if (nStop >= 0)
+{
+if (nStop > 0)
+sres.endOffset[k] = offset[(nStop <= nOffsets ? nStop 
: nOffsets) - 1] + 1;
+else
+sres.endOffset[k] = offset[0];
+}
 }
 }
 }
@@ -404,18 +408,22 @@ SearchResult TextSearch::searchBackward( const OUString& 
searchStr, sal_Int32 st
 for ( sal_Int32 k = 0; k < nGroups; k++ )
 {
 const sal_Int32 nStart = sres.startOffset[k];
-assert(nStart >= 0);
-if (nStart > 0)
-sres.startOffset[k] = offset[(nStart <= nOffsets ? nStart 
: nOffsets) - 1] + 1;
-else
-sres.startOffset[k] = offset[0];
+// Result offsets are negative (-1) if a group expression was
+// not matched.
+if (nStart >= 0)
+{
+if (nStart > 0)
+sres.startOffset[k] = offset[(nStart <= nOffsets ? 
nStart : nOffsets) - 1] + 1;
+else
+sres.startOffset[k] = offset[0];
+}
 // JP 20.6.2001: end is ever exclusive and then don't return
 //   the position of the next character - return 
the
 //   next position behind the last found character!
 //   "a b c" find "b" must return 2,3 and not 
2,4!!!
 const sal_Int32 nStop = sres.endOffset[k];
-assert(nStop >= 0);
-sres.endOffset[k] = (nStop < nOffsets ? offset[nStop] : 
(offset[nOffsets - 1] + 1));
+if (nStop >= 0)
+sres.endOffset[k] = (nStop < nOffsets ? offset[nStop] : 
(offset[nOffsets - 1] + 1));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/headless

2015-11-26 Thread Caolán McNamara

 vcl/headless/svpgdi.cxx |  173 +---
 1 file changed, 151 insertions(+), 22 deletions(-)

New commits:
commit 7eb8f82a493b416203546a5bab6066f3e78fef33
Author: CaolÃ¡n McNamara 
Date:   Fri Nov 20 11:18:52 2015 +

Resolves: tdf#92687 implement drawPolyPolygon via cairo

modeled on the quartz impl

(cherry picked from commit 742da70e6dd2407641835cbcac54b09aeddcb9db)

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

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index ed2fe18..effbeda 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -134,6 +135,27 @@ void SvpSalGraphics::clipRegion(cairo_t* cr)
 cairo_clip(cr);
 }
 }
+namespace
+{
+cairo_rectangle_int_t getFillDamage(cairo_t* cr)
+{
+cairo_rectangle_int_t extents;
+double x1, y1, x2, y2;
+
+cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
+extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height 
= y2-y1;
+cairo_region_t *region = cairo_region_create_rectangle(&extents);
+
+cairo_fill_extents(cr, &x1, &y1, &x2, &y2);
+extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height 
= y2-y1;
+cairo_region_intersect_rectangle(region, &extents);
+
+cairo_region_get_extents(region, &extents);
+cairo_region_destroy(region);
+
+return extents;
+}
+}
 
 #endif
 
@@ -144,7 +166,10 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long 
nWidth, long nHeight,
 #if ENABLE_CAIRO_CANVAS
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
 if (m_bUseLineColor || !m_bUseFillColor)
-return bRet;
+{
+SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawAlphaRect case");
+return false;
+}
 
 cairo_t* cr = createCairoContext(m_aDevice);
 if (!cr)
@@ -165,24 +190,10 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long 
nWidth, long nHeight,
   fTransparency);
 cairo_rectangle(cr, nX, nY, nWidth, nHeight);
 
-
 cairo_rectangle_int_t extents;
 basebmp::IBitmapDeviceDamageTrackerSharedPtr 
xDamageTracker(m_aDevice->getDamageTracker());
 if (xDamageTracker)
-{
-double x1, y1, x2, y2;
-
-cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height 
= y2-y1;
-cairo_region_t *region = cairo_region_create_rectangle(&extents);
-
-cairo_fill_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height 
= y2-y1;
-cairo_region_intersect_rectangle(region, &extents);
-
-cairo_region_get_extents(region, &extents);
-cairo_region_destroy(region);
-}
+extents = getFillDamage(cr);
 
 cairo_fill(cr);
 
@@ -644,10 +655,118 @@ bool SvpSalGraphics::drawPolyPolygonBezier( sal_uInt32,
 return false;
 }
 
-bool SvpSalGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double 
/*fTransparency*/ )
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
+static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, 
bool bClosePath)
 {
-// TODO: maybe BaseBmp can draw B2DPolyPolygons directly
-return false;
+// short circuit if there is nothing to do
+const int nPointCount = rPolygon.count();
+if( nPointCount <= 0 )
+{
+return;
+}
+
+const bool bHasCurves = rPolygon.areControlPointsUsed();
+for( int nPointIdx = 0, nPrevIdx = 0;; nPrevIdx = nPointIdx++ )
+{
+int nClosedIdx = nPointIdx;
+if( nPointIdx >= nPointCount )
+{
+// prepare to close last curve segment if needed
+if( bClosePath && (nPointIdx == nPointCount) )
+{
+nClosedIdx = 0;
+}
+else
+{
+break;
+}
+}
+
+basegfx::B2DPoint aPoint = rPolygon.getB2DPoint( nClosedIdx );
+
+if( !nPointIdx )
+{
+// first point => just move there
+cairo_move_to(cr, aPoint.getX(), aPoint.getY());
+continue;
+}
+
+bool bPendingCurve = false;
+if( bHasCurves )
+{
+bPendingCurve = rPolygon.isNextControlPointUsed( nPrevIdx );
+bPendingCurve |= rPolygon.isPrevControlPointUsed( nClosedIdx );
+}
+
+if( !bPendingCurve )// line segment
+{
+cairo_line_to(cr, aPoint.getX(), aPoint.getY());
+}
+else// cubic bezier segment
+{
+basegfx::B2DPoint aCP1 = rPolygon.getNextControlPoint( nPrevIdx );
+basegfx::B2DPoint aCP

QA Meeting About How To Move Regressions Forward

2015-11-26 Thread Joel Madero

Hi All,

QA is going to have a meeting second week of December about regressions
and what we (QA) can realistically do to help move things forward. The
goal is to address all concerns/suggestions, talk about the realities of
the project, and discuss what has already been rejected by ESC (such as
a long-term "fix only" release).

If you're at all interested in taking part please monitor the QA list
(or ping me directly). I think having at least a couple experienced
developers who can patiently explain the realities of the project and
can/will not/and might be possible would be great. Finally, if there are
specific things that developers can think of that QA members can do to
help move regressions forward please share those ideas.

As a question to you all:
1) How important is bibisected/bisect when determining what to fix?
2) How important is accurate priority/severity + keyword tagging?
3) Is "highest" still monitored like MAB is?
4) In the past we tried a hardHack list that we ultimately retired.
Would it be possible to have a weekly 1-2 fully triaged (bisected
regressions with good steps and all) brought up during the ESC to see if
there are any takers?

Any other thoughts really appreciated :)


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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/osl

2015-11-26 Thread Damjan Jovanovic

 sal/osl/unx/backtrace.c |2 +-
 sal/osl/unx/backtrace.h |2 --
 sal/osl/unx/diagnose.c  |   42 +-
 3 files changed, 38 insertions(+), 8 deletions(-)

New commits:
commit 87451f66edfa425e51289ac6f12ee110d7109a02
Author: Damjan Jovanovic 
Date:   Thu Nov 26 19:02:59 2015 +

Implement osl_diagnose_backtrace_Impl() on FreeBSD. Also fix the value of 
FRAME_PTR_OFFSET

in both backtrace.c and diagnose.c - it's 3 because of the EBP/RBP 
register's position
in the jmp_buf 
(https://github.com/freebsd/freebsd/blob/master/lib/libc/amd64/gen/_setjmp.S
and 
https://github.com/freebsd/freebsd/blob/master/lib/libc/i386/gen/_setjmp.S).
This gets backtracing to fully work on FreeBSD.

Patch by: me

diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 2e57fb6..1b0b8a8 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -143,7 +143,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 #include 
 #include "backtrace.h"
 
-#define FRAME_PTR_OFFSET 1
+#define FRAME_PTR_OFFSET 3
 #define FRAME_OFFSET 0
 
 int backtrace( void **buffer, int max_frames )
diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index b1bcb0d..0f05fbe 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -26,9 +26,9 @@
 
 #ifndef HAVE_DLFCN_H
 
-#if defined(LINUX) || defined(SOLARIS)
+#if defined(LINUX) || defined(SOLARIS) || defined(FREEBSD)
 #define HAVE_DLFCN_H
-#endif  /* LINUX || SOLARIS */
+#endif  /* LINUX || SOLARIS || FREEBSD */
 
 #endif  /* HAVE_DLFCN_H */
 
@@ -73,7 +73,7 @@ static void osl_diagnose_backtrace_Impl (
 #define OSL_DIAGNOSE_OUTPUTMESSAGE(f, s) \
 ((f != 0) ? (*(f))((s)) : (void)fprintf(stderr, "%s", (s)))
 
-#if defined (LINUX) || defined (SOLARIS)
+#if defined (LINUX) || defined (SOLARIS) || defined(FREEBSD)
 //
 /* osl_diagnose_frame_Impl */
 //
@@ -194,14 +194,46 @@ static void osl_diagnose_backtrace_Impl 
(oslDebugMessageFunc f)
 }
 }
 
-#else  /* (LINUX || SOLARIS) */
+#elif defined(FREEBSD)
+
+#include 
+#include "backtrace.h" /* for struct frame */
+
+#if defined(X86) || defined(X86_64)
+
+#define FRAME_PTR_OFFSET 3
+#define FRAME_OFFSET 0
+
+#endif /* (X86 || X86_64) */
+
+static void osl_diagnose_backtrace_Impl (oslDebugMessageFunc f)
+{
+struct frame * fp;
+jmp_bufctx;
+inti;
+
+setjmp (ctx);
+fp = (struct frame*)(((long*)(ctx))[FRAME_PTR_OFFSET]);
+
+for (i = 0; (i < FRAME_OFFSET) && (fp != 0); i++)
+fp = fp->fr_savfp;
+
+for (i = 0; (fp != 0) && (fp->fr_savpc != 0); i++)
+{
+struct frame * prev = fp->fr_savfp;
+osl_diagnose_frame_Impl (f, i, (void*)(fp->fr_savpc));
+fp = (prev > fp) ? prev : 0;
+}
+}
+
+#else  /* (LINUX || SOLARIS || FREEBSD) */
 
 static void osl_diagnose_backtrace_Impl (oslDebugMessageFunc f)
 {
 /* not yet implemented */
 }
 
-#endif /* (LINUX || SOLARIS) */
+#endif /* (LINUX || SOLARIS || FREEBSD) */
 
 //
 /* osl_assertFailedLine */
commit 0faee39deac292694d036d753b7dc1c4513e045f
Author: Damjan Jovanovic 
Date:   Thu Nov 26 18:33:01 2015 +

Fix the stack frame layout for backtraces on FreeBSD.

Patch by: me

diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
index 29bf3e0..a3667e6 100644
--- a/sal/osl/unx/backtrace.h
+++ b/sal/osl/unx/backtrace.h
@@ -37,8 +37,6 @@ void backtrace_symbols_fd( void **buffer, int size, int fd );
 /* no frame.h on FreeBSD */
 #if defined FREEBSD
 struct frame {
-longarg0[8];
-longarg1[6];
 struct frame *fr_savfp;
 longfr_savpc;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source

2015-11-26 Thread Caolán McNamara

 cui/source/inc/autocdlg.hxx  |   33 +++
 cui/source/tabpages/autocdlg.cxx |   47 +--
 2 files changed, 50 insertions(+), 30 deletions(-)

New commits:
commit 6213ce4ab8621ad307df25c1fd2bfeb8de5dd1f6
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 4 13:04:00 2015 +

Resolves: tdf#95352 resize the columns when the edits reposition

instead of assuming they are in their final position when the
top level dialog resizes. Cause there's a timer/idle involved
so the final position isn't known yet

(cherry picked from commit d4d4e00a5a449bdf46608ce0cecbfa07c340e555)

Change-Id: I713e938b0e275f181514315cb4ce4531f36191ca

loplugin:vclwidgets

(cherry picked from commit 4882664e39718109e2ae80348da8b914eb8b2ae6)

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

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 1ff86e7..4302e0a 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -183,21 +183,39 @@ public:
 class AutoCorrEdit : public Edit
 {
 Link<>  aActionLink;
-boolbSpaces;
+VclPtr m_xReplaceTLB;
+sal_Int32 m_nCol;
+bool bSpaces;
 
-public:
-AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) :
-Edit(pParent, rResId), bSpaces(false){}
-AutoCorrEdit(vcl::Window* pParent) :
-Edit(pParent), bSpaces(false){}
+void dispose() override;
+
+public:
+AutoCorrEdit(vcl::Window* pParent, const ResId& rResId)
+: Edit(pParent, rResId)
+, m_nCol(0)
+, bSpaces(false)
+{
+}
+
+AutoCorrEdit(vcl::Window* pParent)
+: Edit(pParent)
+, m_nCol(0)
+, bSpaces(false)
+{
+}
+
+virtual ~AutoCorrEdit();
 
 voidSetActionHdl( const Link<>& rLink )
 { aActionLink = rLink;}
 
+voidConnectColumn(const VclPtr& rTable, 
sal_Int32 nCol);
+
 voidSetSpaces(bool bSet)
 {bSpaces = bSet;}
 
 virtual voidKeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE;
+virtual voidResize() SAL_OVERRIDE;
 };
 
 // class OfaAutocorrReplacePage --
@@ -259,7 +277,6 @@ private:
 LanguageType eOldLanguage,
 LanguageType eNewLanguage);
 
-void setTabs();
 public:
 OfaAutocorrReplacePage( vcl::Window* pParent, const 
SfxItemSet& rSet );
 virtual ~OfaAutocorrReplacePage();
@@ -271,8 +288,6 @@ public:
 virtual voidReset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 virtual voidActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
 virtual sfxpg   DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
-virtual voidResize() SAL_OVERRIDE;
-virtual voidStateChanged(StateChangedType nStateChange) 
SAL_OVERRIDE;
 
 voidSetLanguage(LanguageType eSet);
 voidDeleteEntry(const OUString& sShort, const OUString& sLong);
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index c720d67..5b06d92 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -906,28 +906,9 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( 
vcl::Window* pParent,
 
 m_pReplaceED->SetSpaces(true);
 m_pShortED->SetSpaces(true);
-}
-
-void OfaAutocorrReplacePage::setTabs()
-{
-m_pReplaceTLB->SetTab(0, m_pShortED->GetPosPixel().X(), MAP_PIXEL);
-m_pReplaceTLB->SetTab(1, m_pReplaceED->GetPosPixel().X(), MAP_PIXEL);
-}
-
-void OfaAutocorrReplacePage::StateChanged(StateChangedType nStateChange)
-{
-SfxTabPage::StateChanged(nStateChange);
 
-if (nStateChange == StateChangedType::InitShow)
-{
-setTabs();
-}
-}
-
-void OfaAutocorrReplacePage::Resize()
-{
-SfxTabPage::Resize();
-setTabs();
+m_pShortED->ConnectColumn(m_pReplaceTLB, 0);
+m_pReplaceED->ConnectColumn(m_pReplaceTLB, 1);
 }
 
 OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
@@ -1752,6 +1733,22 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
 
 VCL_BUILDER_FACTORY(AutoCorrEdit)
 
+void AutoCorrEdit::dispose()
+{
+m_xReplaceTLB.disposeAndClear();
+Edit::dispose();
+}
+
+AutoCorrEdit::~AutoCorrEdit() {
+disposeOnce();
+}
+
+void AutoCorrEdit::ConnectColumn(const VclPtr& rTable, sal_Int32 
nCol)
+{
+m_xReplaceTLB = rTable;
+m_nCol = nCol;
+}
+
 void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt )
 {
 const vcl::KeyCode aKeyCode = rKEvt.GetKeyCode();
@@ -1767,6 +1764,14 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt )
 Edit::KeyInput(rKEvt);
 }
 
+void AutoCorrEdit::Resize()
+{
+Ed

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

2015-11-26 Thread Michael Stahl

 vcl/source/outdev/text.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 273be431c62aaf5fabe218cae57e8f3f9fe049e1
Author: Michael Stahl 
Date:   Wed Nov 25 22:42:16 2015 +0100

vcl: OutputDevice::GetTextArray() should always init pDXAry

CppunitTest_writerperfect_writer file libmwaw/pass/Acta_1.0.hqx uses the
font "Courier", and for unknown reasons we can't properly load that
font, because the PhysicalFontFamily::mpFirst for "courier" is null.

This causes OutputDevice::GetTextArray() to fail to create a SalLayout
and return early before initializing the passed pDXAry, which then
generates lots of DrMemory warnings.

Let's hope the callers are happy about an all-0 pDXAry.

Change-Id: I07b29a59660cf5cd060fd77da5d96021f9d8f9f5
(cherry picked from commit e6e409b684f9b046dcde9f0615018508f769c369)
Reviewed-on: https://gerrit.libreoffice.org/20206
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index faf8fa9..173aa52 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1007,7 +1007,7 @@ long OutputDevice::GetTextArray( const OUString& rStr, 
long* pDXAry,
 }
 
 if( nIndex >= rStr.getLength() )
-return 0;
+return 0; // TODO: this looks like a buggy caller?
 
 if( nLen < 0 || nIndex + nLen >= rStr.getLength() )
 {
@@ -1017,7 +1017,19 @@ long OutputDevice::GetTextArray( const OUString& rStr, 
long* pDXAry,
 SalLayout *const pSalLayout = ImplLayout(rStr, nIndex, nLen,
 Point(0,0), 0, nullptr, SalLayoutFlags::NONE, pLayoutCache);
 if( !pSalLayout )
+{
+// The caller expects this to init the elements of pDXAry.
+// Adapting all the callers to check that GetTextArray succeeded seems
+// too much work.
+// Init here to 0 only in the (rare) error case, so that any missing
+// element init in the happy case will still be found by tools,
+// and hope that is sufficient.
+if (pDXAry)
+{
+memset(pDXAry, 0, nLen * sizeof(*pDXAry));
+}
 return 0;
+}
 #if VCL_FLOAT_DEVICE_PIXEL
 DeviceCoordinate* pDXPixelArray = NULL;
 if(pDXAry)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py

2015-11-26 Thread Miklos Vajna

 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 120f31ed6973f82021487516d53fe792d5eddbdd
Author: Miklos Vajna 
Date:   Thu Nov 26 20:25:27 2015 +0100

ciabot: master is now 5.2

Change-Id: Ie2e4ae04b488ba9afd9138181e40e140f8ec4212

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index eb7340e..075fe47 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "5.1.0"
+master_target = "5.2.0"
 bug_regex = "(?:tdf|fdo)#(\d+)"
 dry_run = False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: lo-submodules-from-bundles.sh

2015-11-26 Thread Christian Lohmaier

 lo-submodules-from-bundles.sh |   25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 869ad5b2b905f0283429303d857fca753598d847
Author: Christian Lohmaier 
Date:   Thu Nov 26 20:12:29 2015 +0100

lo-submodules-from-bundles.sh:  make script more portable and bullet-proof

* use perl instead of sed (mac/bsd sed vs gnu sed is not worth the hassle
* accept both wget or curl
* check for used commands on startup (git, perl, wget or curl)
* recommend "./g pull -r" instead of "git pull; git submodule update"

diff --git a/lo-submodules-from-bundles.sh b/lo-submodules-from-bundles.sh
index b75044c..20eebc6 100755
--- a/lo-submodules-from-bundles.sh
+++ b/lo-submodules-from-bundles.sh
@@ -19,7 +19,7 @@ $0 -a [-d downloaddir] [-t targetdir] SUBMODULES
  in this directory before downloading them
  (directory must exist)
 -t target directory, defaults to Â»$target_dirÂ« (directory must
-not yet exist unless used with -a, then an existing directory
+ not yet exist unless used with -a, then an existing directory
  must be specified)
 -a   add submodules to an existing checkout without
  submodules (be careful with that one)
@@ -64,11 +64,21 @@ help=false
 translations=false
 add_to_existing=false
 superrepo="libo"
+downloadtool="wget"
 
 function download {
 if ${!1}; then
+bundle="libreoffice-$1.tar.bz2"
 cd "$download_dir"
-wget -nc "$bundleurl/libreoffice-$1.tar.bz2"
+if [ -e "$bundle" ]; then
+echo "$bundle already exists - skipping download"
+else
+if [ $downloadtool = "wget" ]; then
+wget "$bundleurl/$bundle"
+else
+curl -O "$bundleurl/$bundle"
+fi
+fi
 cd "$workdir"
 fi
 }
@@ -94,7 +104,7 @@ function submodulesetup {
 mv $reponame/.git $superrepo/.git/modules/$directory
 mv $reponame $superrepo/$directory
 echo "gitdir: ../.git/modules/$directory" > $superrepo/$directory/.git
-sed -e "/logallrefupdates/a\\\tworktree = ../../../$directory" -e 
's#anongit\.freedesktop\.org/libreoffice/#gerrit.libreoffice.org/#' -i 
$superrepo/.git/modules/$directory/config
+perl -ni -e 
's#anongit\.freedesktop\.org/libreoffice/#gerrit.libreoffice.org/# ; print ; 
print "\tworkdir = ../../../'$directory'\n" if /logallrefupdates/;' 
$superrepo/.git/modules/$directory/config
 cat <> $superrepo/.git/config
 [submodule "$directory"]
url = git://gerrit.libreoffice.org/$reponame
@@ -120,6 +130,13 @@ while [ "${1:-}" != "" ] ; do
 shift
 done
 
+command -v wget >/dev/null 2>&1 || {
+downloadtool="curl";
+command -v curl >/dev/null 2>&1 || { echo >&2 "This script requires wget 
or curl - Aborting."; exit 1; }
+}
+command -v git  >/dev/null 2>&1 || { echo >&2 "This script requires git - 
Aborting."; exit 1; }
+command -v perl >/dev/null 2>&1 || { echo >&2 "This script requires perl - 
Aborting."; exit 1; }
+
 currentdir=$(pwd)
 if $add_to_existing ; then
 if [ ! -e "$target_dir" ] ; then
@@ -176,4 +193,4 @@ git submodule status
 
 cd $currentdir
 echo "everything done - your clone is in Â»$target_dirÂ«"
-echo "do Â»git pullÂ« (and Â»git submodule updateÂ«) to get the latest changes"
+echo "do Â»./g pull -rÂ« from within $target_dir to get the latest changes"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Michael Meeks

 smoketest/README |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 1fb58d29f771441bbe550af52c9e85483125a47c
Author: Michael Meeks 
Date:   Thu Nov 26 18:36:17 2015 +

smoketest: improve docs.

Change-Id: I794c4b10d9ba5cf694c51bb9a32244fdb07e49bd

diff --git a/smoketest/README b/smoketest/README
index 1027041..b1d250d 100644
--- a/smoketest/README
+++ b/smoketest/README
@@ -1 +1,15 @@
 Smoke test for each component of LibreOffice.
+
+* smoketest:
+
+   The main smoketest.cxx is launched connects via binary UNO
+over a socket to a remote LibreOffice instance. This loads a document
+which is zipped at build time into the workdir/ from the data/
+directory. This in turn contains a set of macros in
+data/Basic/Standard.
+
+   Smoketest.cxx does a remote the StartTestWithDefaultOptions
+macro and waits for a dispatchFinished from the macro's execution. To
+debug this best load workdir/Zip/smoketestdoc.sxw - and hit 'start
+smoketest' - this will launch a number of components and build a
+suitable report in the form of a table.
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Markus Mohrhard

Hey Michael, Keny, Eike,

On Thu, Nov 26, 2015 at 5:51 PM, Michael Meeks 
wrote:

>
> + calc s/w interpreter-related patch
> [ also got in before the freeze; an 18x speedup on CPU for
>   some test sheets; currently guarded by a variable - and
>   subsetting to just some sheets.
>  + plan to test with crash-testing sheets & enable by
> default
>   Would like to look at it (Eike)
>  + dislike env.vars set - avoids the unit-tests
> + plan to remove it before ship (Kendy)
> + turn into normal config & default ->
> testable.
> + would like to turn it on now - default on for
> user-testing (Kendy)
> + optional B2 in the release-plan (Cloph)
> + can have an intermediate release.
>  + goal of the code - vectors of doubles
> + formula results (Michael)
> + moves big chunk of ptr chasing & branching
> from inner loop.
> ]
>

please add a performance test that ensures that future refactorings won't
regress here. In general any patch claiming performance improvements should
be accompanied by a performance test to make sure that we can still
refactor the code without someone complaining that we introduced huge
performance regression.

Related to the code I wanted to mention that the getenv calls should be
cached in a static variable as they might become expensive when called
repeatedly and that the new virtual method calls are not free so I would
like to see some before and after numbers for both the supposed 18x speedup
case and our normal matrix handling code.

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

minutes of ESC call ...

2015-11-26 Thread Michael Meeks

* Present:
+ Cloph, Sophie, Stephan, Jan-Marek, JanI, Michael M, Miklos, Andras,
  Caolan, Bjoern, Lionel, Bubli, Armin, Michael S, Kendy, Eike, Robinson, 
Thorsten
 
* Completed Action Items:
+ UserAgent - drop bundled-languages (Michael)
+ UserAgent - produce a patch for review (Michael)
+ disable openGL by default for 5.0.4 (Cloph)
+ run the sw renaming script just before branch-off (Robinson)
[ needed a fix to a test document, accidentally touched,
  kendy fixed for the future ]
+ improve new contributors Wiki, write blogpost, promote git-review etc. 
(JanI)
[ v. open-ended: in-progress ]
+ setup FOSDEM Hackfest wiki page with dates (Samuel stole this AI ;) )
[ https://wiki.documentfoundation.org/Hackfest/FOSDEM2016 ]
 
* Pending Action Items:
+ come up with a proposal for "abandoned" / "insufficient data"
  resolution in the bug-flow graph (Robinson)
[ lively discussion, following up, decision by the end of the week ]
+ book FOSDEM conf. room for board meeting (Florian)
[ perhaps after not before to avoid hackfest conflict ]
+ list of developers who havn't contributed in a while (JanI)
+ check mDNSResponder & move it to external/ (Michael S.)
[ hidden 5x directories deep in impress ]
+ double-check libmar/src, update/src, remove the duplicate, etc. (Kendy)
 
* Release Engineering update (Cloph)
+ 4.4.7 RC2
+ tagged, Linux + Mac built.
+ Windows delayed; since VM died; buying replacement H/W etc.
+ will start build today.
+ 5.0.4 status
+ RC1 / freeze - Monday
+ tagging due later today / tomorrow.
+ all fixes from gerrit are integrated
+ very last minute fixes today / tomorrow.
+ 5.1.0 branch / feature-freeze: this week.
+ branch created, and beta1 tag this week.
+ windows build breakage just before tagging.
+ a buildfix1 tag -> corresponding fixes.
+ re-created tar-balls from this.
+ Avoiding large-scale cosmetic cleanups
+ until when ? (Stephan)
+ consensus so-far; try to do just before branch-off (Miklos)
+ one idea mass-run through code-formatting tool (Bjoern)
+ start with config / code-style we want to use
+ by the time we do the next release: finally look at it.
   + 6 months to bike-shed.
+ afraid, can't agree on include order, not ideal (Miklos)
+ removing parameters, defaulted etc. (Stephan)
+ calming down for a couple of point-release to help bug-fixers 
(Michael)
+ makes sense (Bjoern)
+ concern, never a good time for doing these (Stephan)
+ concern - size, and non-functionality are deadly annoying when
  back-porting bug-fixes (Michael)
+ if a volunteer; doing rename member variables (Bjoern)
+ if 1st commit - makes sense perhaps.
+ agree with a quiet period (Eike)
+ will pile up changes in gerrit; but need reviewing.
+ piling makes them un-merge-able over time (Bjoern)
+ say - we discourage until .2 (as in the past) (Miklos)
+ not black / white - please try to avoid those.
=> avoid large non-functional cleanups until x.y.2
+ Late Features:
+ OpenGL - switch to simpler double-buffering.
+ Slide Transitions: artwork & polish
[ Jay and Andreas making new images - much appreciated ]
+ UserAgent display & tweakage
[ in modulo tweaking, cf. discussing a setting later ]
+ calc s/w interpreter-related patch
[ also got in before the freeze; an 18x speedup on CPU for
  some test sheets; currently guarded by a variable - and
  subsetting to just some sheets.
 + plan to test with crash-testing sheets & enable by 
default
  Would like to look at it (Eike)
 + dislike env.vars set - avoids the unit-tests
+ plan to remove it before ship (Kendy)
+ turn into normal config & default -> testable.
+ would like to turn it on now - default on for 
user-testing (Kendy)
+ optional B2 in the release-plan (Cloph)
+ can have an intermediate release.
 + goal of the code - vectors of doubles
+ formula results (Michael)
+ moves big chunk of ptr chasing & branching from 
inner loop.
]
+ Android & iOS Remote
+ delayed, due to B1 delay.
 
* Idle re-work (Michael)
+ graphical event processing issue
+ scheduler cleanup
+ true 'idle' behavi

Re: building cppunit on open suse linux 64 bit

2015-11-26 Thread Michael Stahl

On 26.11.2015 15:00, ginu samuel wrote:
> Hello,
> We have a project requirement to have parallel builds output for
> cppunit 32 bit and 64 bit.
> 
> Although the lib files are created in separate directories lib and
> lib64, the .o files are not kept separately. 
>After doing the build for 32 bit, 'clean' has to be done before
> building for 64 bit.

since cppunit is using GNU autotools, this should already work (if you
know how).

for every build configuration, create a separate directory next to the
source directory, cd into the build directory and then invoke configure
via the path to the source directory. then no build files will be
generated in the source directory, so no conflict.

mkdir build_32 && cd build_32 && ../cppunit-x.y.z/configure --with-foo
--enable-bar && make

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

Additions required to the AppData file

2015-11-26 Thread Richard Hughes (semi-automated)

Hi!

First, apologies for the direct email. I'm emailing you directly as you've been 
listed as the update contact in one or more AppData files. In future versions 
of the appstream-builder (the program used by distributions to merge all the 
AppData files in packages into AppStream metadata) we're going to be running a 
lot less crazy plugins. At the moment we're doing things like parsing .gir 
files, running nm on binaries and looking up things from arrays of hardcoded 
data just so we can try and work out what kudos the application deserves. This 
doesn't scale, and means the machine generating the metadata needs to have all 
kinds of extra build tools installed.

So, what do I want you to do? Basically, I would like you to:

Add the following data into libreoffice-draw.appdata.xml

  
HiDpiIcon
ModernToolkit
  

Add the following data into libreoffice-base.appdata.xml

  
HiDpiIcon
ModernToolkit
  

Add the following data into libreoffice-writer.appdata.xml

  
HiDpiIcon
ModernToolkit
  

Add the following data into libreoffice-impress.appdata.xml

  
HiDpiIcon
ModernToolkit
  

Of course, you don't have to do a release with this fix straight away, and if 
you have a stable branch it would be a good thing to backport this as well. 
Nothing bad will happen if we run the automated tools with the kudos already 
set in the AppData file. If you think any of the other kudos might apply[1], 
please email me back and we can discuss any new additions.

When you've changed the file and committed, please email me back and I'll mark 
your application as completed. If you don't want to hear from me ever again 
just edit the  in the AppData file and change it to somebody 
else. I'm not planning on emailing any of you again this year, so don't worry 
about me spamming you with even more work to do. If you don't add the manual 
 then your application will still be visible in the various software 
centers, but it may loose some of the stars it got auto-assigned.

Thanks,

Richard

[1] https://git.gnome.org/browse/gnome-software/plain/doc/kudos.md

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

building cppunit on open suse linux 64 bit

2015-11-26 Thread ginu samuel

Hello,
We have a project requirement to have parallel builds output for
cppunit 32 bit and 64 bit.

Although the lib files are created in separate directories lib and lib64,
the .o files are not kept separately.
   After doing the build for 32 bit, 'clean' has to be done before
building for 64 bit.

What changes needs to be done so that object files are created in separate
directories for 32 and 64 bit builds.
 Since, for 64 bit builds, the lib path is generated as lib64, it must be
possible to append 64 to the build directories which contain the object
files

Any help would be useful.

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

Re: Crash test update

2015-11-26 Thread Armin Le Grand

Hi,

that is what I did in aw080, works well...

--
ALG (iPad)

> Am 23.11.2015 um 13:20 schrieb Stephan Bergmann :
> 
>> On 11/23/2015 11:58 AM, Noel Grandin wrote:
>> Perhaps we need a clang plugin to verify that all subclasses of
>> SfxPoolItem have clone methods?
> 
> ...or potentially are removed completely if they are just trivial 
> sub-subclasses, as in the case of 
> 
>  "Consistency around SdrMetricItem" and any of the later "Consistency around 
> *Item" commits.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-11-26 Thread Lionel Elie Mamane

 cui/source/customize/macropg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bffd15ec2ee472b32672589240f8a11c2261dd60
Author: Lionel Elie Mamane 
Date:   Wed Nov 25 16:21:19 2015 +0100

assign macro dialog: correct event name "errorOccured"

"errorOccured" is an English spelling mistake, but is the
name of the event, which cannot / should not be changed for
backwards compatibility reasons.

Spelling was boguously "corrected" in:

  commit 60a9b5172bcbd90b5764125b76279c189dd5563c
  Author: Takeshi Abe 
  Date:   Sat Dec 4 12:56:38 2010 +0900

  Replace all occured, occurance etc.

This was leading to impossibility of assigning a macro
to that event, since it was not appearing in this dialog.

Change-Id: Ib0373501cba8af8f4abb1c62faddf8d65c926a7e

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 0944bb1..4861380 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -324,7 +324,7 @@ void _SvxMacroTabPage::InitResources()
 aDisplayNames.push_back( EventDisplayName( "approveCursorMove", 
RID_SVXSTR_EVENT_POSITIONING ) );
 aDisplayNames.push_back( EventDisplayName( "cursorMoved",   
RID_SVXSTR_EVENT_POSITIONED ) );
 aDisplayNames.push_back( EventDisplayName( "approveParameter",  
RID_SVXSTR_EVENT_APPROVEPARAMETER ) );
-aDisplayNames.push_back( EventDisplayName( "errorOccurred",  
RID_SVXSTR_EVENT_ERROROCCURRED ) );
+aDisplayNames.push_back( EventDisplayName( "errorOccured",  
RID_SVXSTR_EVENT_ERROROCCURRED ) );
 aDisplayNames.push_back( EventDisplayName( "adjustmentValueChanged",   
RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Stephan Bergmann

 sw/source/ui/vba/vbatabstop.cxx  |2 +-
 sw/source/ui/vba/vbatabstop.hxx  |4 +---
 sw/source/ui/vba/vbatabstops.cxx |   12 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 88b78bfb16a564b012559ebaf324e93835cfd6c4
Author: Stephan Bergmann 
Date:   Thu Nov 26 16:28:49 2015 +0100

-Werror,-Wunused-private-field

Change-Id: If8faa69302775cdd24bc6f45713eb246c9210745

diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx
index 55b32f6..8979ebc 100644
--- a/sw/source/ui/vba/vbatabstop.cxx
+++ b/sw/source/ui/vba/vbatabstop.cxx
@@ -23,7 +23,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface 
>& rParent, const uno::Reference< uno::XComponentContext >& rContext, const 
uno::Reference< beans::XPropertySet >& xParaProps, const style::TabStop& 
aTabStop ) throw ( uno::RuntimeException ) : SwVbaTabStop_BASE( rParent, 
rContext ), mxParaProps( xParaProps ), maTabStop( aTabStop )
+SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface 
>& rParent, const uno::Reference< uno::XComponentContext >& rContext, const 
uno::Reference< beans::XPropertySet >& xParaProps ) throw ( 
uno::RuntimeException ) : SwVbaTabStop_BASE( rParent, rContext ), mxParaProps( 
xParaProps )
 {
 }
 
diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx
index 857b55e..9c5f5c4 100644
--- a/sw/source/ui/vba/vbatabstop.hxx
+++ b/sw/source/ui/vba/vbatabstop.hxx
@@ -21,7 +21,6 @@
 
 #include 
 #include 
-#include 
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTabStop > 
SwVbaTabStop_BASE;
 
@@ -29,10 +28,9 @@ class SwVbaTabStop : public SwVbaTabStop_BASE
 {
 private:
 css::uno::Reference< css::beans::XPropertySet > mxParaProps;
-css::style::TabStop maTabStop;
 
 public:
-SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& 
rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
const css::uno::Reference< css::beans::XPropertySet >& xParaProps, const 
css::style::TabStop& aTabStop ) throw ( css::uno::RuntimeException );
+SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& 
rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( 
css::uno::RuntimeException );
 virtual ~SwVbaTabStop();
 
 // XHelperInterface
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index 8315b16..6a90074 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -19,6 +19,7 @@
 #include "vbatabstops.hxx"
 #include "vbatabstop.hxx"
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -69,27 +70,26 @@ private:
 uno::Reference< XHelperInterface > mxParent;
 uno::Reference< uno::XComponentContext > mxContext;
 uno::Reference< beans::XPropertySet > mxParaProps;
-uno::Sequence< style::TabStop > maTabStops;
+sal_Int32 mnTabStops;
 
 public:
 TabStopCollectionHelper( const css::uno::Reference< ov::XHelperInterface 
>& xParent, const css::uno::Reference< css::uno::XComponentContext > & 
xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) 
throw ( css::uno::RuntimeException ): mxParent( xParent ), mxContext( xContext 
), mxParaProps( xParaProps )
 {
-maTabStops = lcl_getTabStops( xParaProps );
+mnTabStops = lcl_getTabStops( xParaProps ).getLength();
 }
 
 virtual ~TabStopCollectionHelper() {}
 
 virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, 
std::exception) override
 {
-return maTabStops.getLength();
+return mnTabStops;
 }
 virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw 
(lang::IndexOutOfBoundsException, lang::WrappedTargetException, 
uno::RuntimeException, std::exception) override
 {
 if ( Index < 0 || Index >= getCount() )
 throw css::lang::IndexOutOfBoundsException();
 
-const style::TabStop* pTabs = maTabStops.getConstArray();
-return uno::makeAny( uno::Reference< word::XTabStop >( new 
SwVbaTabStop( mxParent, mxContext, mxParaProps, pTabs[ Index ] ) ) );
+return uno::makeAny( uno::Reference< word::XTabStop >( new 
SwVbaTabStop( mxParent, mxContext, mxParaProps ) ) );
 }
 virtual uno::Type SAL_CALL getElementType(  ) throw 
(uno::RuntimeException, std::exception) override
 {
@@ -222,7 +222,7 @@ uno::Reference< word::XTabStop > SAL_CALL 
SwVbaTabStops::Add( float Position, co
 else
 lcl_setTabStops( mxParaProps, aNewTabs );
 
-return uno::Reference< word::XTabStop >( new SwVbaTabStop( this, 
mxContext, mxParaProps, aTab ) );
+return uno::Reference< word::XTabStop >( new SwVbaTabStop( this, 
mxContext, mxParaProps ) );
 }
 
 void SAL_CALL SwVbaTabStops::ClearAll() throw (uno::RuntimeExcept

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - officecfg/registry

2015-11-26 Thread Caolán McNamara

 officecfg/registry/data/org/openoffice/Office/Common.xcu |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 65bdad52a04dc1f5d771bdfdc8bce23e9ba74296
Author: CaolÃ¡n McNamara 
Date:   Fri Nov 13 11:19:04 2015 +

Default off OpenGL until 5.1

Needs a bit more work, so lets play it safer and default off for
windows for now and leave it on for 5.1

This partially reverts...

commit 1bc91425e43f8bd30e3dcdec4a30771de54c55c8

tdf#93662 - allow GL by default only on recent drivers on recent windows.

Feature for triple review for 5.0.2 - enables GL by default for some subset 
of
very recent GL drivers, on Windows 7+.

Change-Id: I7a12540afd9f1889db15810db448db466b35241d
Reviewed-on: https://gerrit.libreoffice.org/19950
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 5013176..ffca153 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -139,13 +139,6 @@
   ${DICT_REPO_URL}
 
   
-  
-
-  false
-  false
-  true
-
-  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Michael Stahl

 include/formula/funcutl.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6b203d5050b5ca2aa556246e104eae0e7209e67f
Author: Michael Stahl 
Date:   Thu Nov 26 15:23:16 2015 +0100

formula: fix build, undef Idle

Change-Id: If256bba5d8207a955c06713db7141831b53324c7

diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index f0ea363..e6d03be 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 namespace formula {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] voting.git: vote/include

2015-11-26 Thread Jan Holesovsky

 vote/include/election-sql.php |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 57230ac9f65c5bc9450ff4514353ec2b0d6a017f
Author: Jan Holesovsky 
Date:   Thu Nov 26 12:16:53 2015 +0100

Present the candidates in random order, for improved fairness.

The order is important in STV, yet many people do not know that.  The
randomized order of candidates gives equal chances to all, even in the cases
when the person voting does not care about an exact order.

Change-Id: I32e57f15396251d2d417e0ccb8c9f9d5c79087e8
Reviewed-on: https://gerrit.libreoffice.org/20201
Reviewed-by: David Jourdain 
Reviewed-by: Charles-H. Schulz 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/vote/include/election-sql.php b/vote/include/election-sql.php
index 09991c3..c3a7563 100644
--- a/vote/include/election-sql.php
+++ b/vote/include/election-sql.php
@@ -158,7 +158,7 @@ function elec_choices_get ($handle, $election_id) {
 
   $query = "SELECT choice, id FROM " . $choices_table;
   $query .= " WHERE election_id = '".$escaped_election_id."'";
-  $query .= " ORDER BY id";
+  $query .= " ORDER BY RAND()";
 
   $result = mysql_query ($query, $handle);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Stephan Bergmann

 sc/source/ui/vba/vbaformatconditions.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit f354cf8cc0065a62c8e57430d1a06cb380458967
Author: Stephan Bergmann 
Date:   Thu Nov 26 15:20:54 2015 +0100

-Werror,-Wunused-private-field

Change-Id: I71f5aacb3b9370c1ff137faeb6f98ad889010f03

diff --git a/sc/source/ui/vba/vbaformatconditions.hxx 
b/sc/source/ui/vba/vbaformatconditions.hxx
index 7980b7a..ece34c0 100644
--- a/sc/source/ui/vba/vbaformatconditions.hxx
+++ b/sc/source/ui/vba/vbaformatconditions.hxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -42,7 +41,6 @@
 
 class ScVbaFormatConditions: public CollTestImplHelper< 
ov::excel::XFormatConditions >
 {
-css::table::CellAddress maCellAddress;
 css::uno::Reference< css::sheet::XSheetConditionalEntries > 
mxSheetConditionalEntries;
 css::uno::Reference< ov::excel::XStyles > mxStyles;
 css::uno::Reference< ov::excel::XRange > mxRangeParent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Michael Meeks

 svtools/source/control/tabbar.cxx |1 +
 vcl/source/window/toolbox2.cxx|1 +
 2 files changed, 2 insertions(+)

New commits:
commit 5304bef5ffe7c7269f5293683916d19d3997a1c2
Author: Michael Meeks 
Date:   Thu Nov 26 13:56:54 2015 +

Cleanup last, partial include redux patch.

Change-Id: I1f6f9d4a1b7fae33529ae386e8733b5063de53b0

diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index eb2f5aa..a71036b 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index aabf95c..dddb65f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -25,6 +25,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Michael Stahl

 vcl/source/window/toolbox2.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e1628be85186ac695e8b343a99687c58ba579ca5
Author: Michael Stahl 
Date:   Thu Nov 26 14:58:20 2015 +0100

vcl: fix build

Change-Id: I51d992e9befc78f6e429480e29bfb78e9be87ac2

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 72a3b58..aabf95c 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -357,7 +357,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool 
bFullPaint )
 {
 Invalidate( Rectangle( mnLeftBorder, mnTopBorder,
mnDX-mnRightBorder-1, mnDY-mnBottomBorder-1 
) );
-maIdle.Stop();
+mpIdle->Stop();
 }
 }
 else
@@ -368,7 +368,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool 
bFullPaint )
 
 // do we need to redraw?
 if ( IsReallyVisible() && IsUpdateMode() )
-maIdle.Start();
+mpIdle->Start();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/Library_mork.mk connectivity/source

2015-11-26 Thread David Ostrovsky

 connectivity/Library_mork.mk|3 
 connectivity/source/drivers/mork/MConnection.cxx|7 
 connectivity/source/drivers/mork/MConnection.hxx|3 
 connectivity/source/drivers/mork/MDriver.cxx|   25 ++
 connectivity/source/drivers/mork/MDriver.hxx|2 
 connectivity/source/drivers/mork/MNSFolders.cxx |  160 --
 connectivity/source/drivers/mork/MNSFolders.hxx |   34 ---
 connectivity/source/drivers/mork/MNSINIParser.cxx   |   95 
 connectivity/source/drivers/mork/MNSINIParser.hxx   |   68 --
 connectivity/source/drivers/mork/MNSProfileDiscover.cxx |  173 
 connectivity/source/drivers/mork/MNSProfileDiscover.hxx |   85 ---
 connectivity/source/drivers/mork/mork_helper.cxx|   27 +-
 12 files changed, 38 insertions(+), 644 deletions(-)

New commits:
commit db8074cb7b1e8453d05ca361030b0ccd1801d368
Author: David Ostrovsky 
Date:   Sat Nov 21 22:31:33 2015 +0100

Mork: Reuse profile discovery from mozilla bootstrap

Mozilla bootstrap driver is used in xmlsecurity to discover default
profile and induce the path to the public keys file location from
certification authorities. The same profile discovery code is used
in mork driver. Remove duplicated code and re-use the service from
mozilla bootstrap driver in mork driver.

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

diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 18917c5..dd655ca 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -44,9 +44,6 @@ $(eval $(call gb_Library_use_sdk_api,mork))
 $(eval $(call gb_Library_add_exception_objects,mork, \
 connectivity/source/drivers/mork/MColumns \
 connectivity/source/drivers/mork/MColumnAlias \
-connectivity/source/drivers/mork/MNSFolders \
-connectivity/source/drivers/mork/MNSINIParser \
-connectivity/source/drivers/mork/MNSProfileDiscover \
 connectivity/source/drivers/mork/MorkParser \
 connectivity/source/drivers/mork/MCatalog \
 connectivity/source/drivers/mork/MConnection \
diff --git a/connectivity/source/drivers/mork/MConnection.cxx 
b/connectivity/source/drivers/mork/MConnection.cxx
index e836938..3016c79 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "MNSProfileDiscover.hxx"
 #include "MConnection.hxx"
 #include "MDriver.hxx"
 #include "MDatabaseMetaData.hxx"
@@ -51,7 +50,6 @@ OConnection::OConnection(MorkDriver* _pDriver)
 ,m_aColumnAlias( _pDriver->getFactory() )
 {
 m_pDriver->acquire();
-m_pProfileAccess = new ProfileAccess();
 m_pBook = new MorkParser();
 m_pHistory = new MorkParser();
 }
@@ -62,7 +60,6 @@ OConnection::~OConnection()
 close();
 m_pDriver->release();
 m_pDriver = nullptr;
-delete m_pProfileAccess;
 delete m_pBook;
 delete m_pHistory;
 }
@@ -121,9 +118,7 @@ void OConnection::construct(const OUString& url,const 
Sequence< PropertyValue >&
 // production?
 if (unittestIndex == -1)
 {
-OUString defaultProfile = 
m_pProfileAccess->getDefaultProfile(::com::sun::star::mozilla::MozillaProductType_Thunderbird);
-OUString path = 
m_pProfileAccess->getProfilePath(::com::sun::star::mozilla::MozillaProductType_Thunderbird,
 defaultProfile);
-SAL_INFO("connectivity.mork", "DefaultProfile: " << defaultProfile);
+OUString path = m_pDriver->getProfilePath();
 SAL_INFO("connectivity.mork", "ProfilePath: " << path);
 abook = path + "/abook.mab";
 history = path + "/history.mab";
diff --git a/connectivity/source/drivers/mork/MConnection.hxx 
b/connectivity/source/drivers/mork/MConnection.hxx
index ad65d18..fd101a2 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -30,7 +30,6 @@ namespace connectivity
 namespace mork
 {
 class MorkDriver;
-class ProfileAccess;
 class ErrorDescriptor;
 
 typedef connectivity::OMetaConnection OConnection_BASE; // implements 
basics and text encoding
@@ -48,8 +47,6 @@ namespace connectivity
 MorkDriver* m_pDriver;  //  
Pointer to the owning
 //  driver 
object
 OColumnAliasm_aColumnAlias;
-// Profile Access
-ProfileAccess* m_pProfileAccess;
 // Mork Parser (abook)
 MorkParser* m_pBook;
 // Mork Parser (history)
diff --git a/connectivity/source/drivers/mork/MDriver.cxx 
b/connectivity/source/drivers/mork/MDriver.cxx
index

[Libreoffice-commits] core.git: 2 commits - include/sfx2 include/vcl instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk sfx2/source vcl/source

2015-11-26 Thread Michael Meeks

 include/sfx2/objsh.hxx |   12 
 include/vcl/dialog.hxx |1 -
 include/vcl/edit.hxx   |6 +++---
 include/vcl/toolbox.hxx|7 +++
 instsetoo_native/CustomTarget_setup.mk |9 +
 instsetoo_native/Package_setup.mk  |1 +
 sfx2/source/inc/objshimp.hxx   |   12 
 vcl/source/control/edit.cxx|6 ++
 vcl/source/window/toolbox.cxx  |9 +++--
 9 files changed, 41 insertions(+), 22 deletions(-)

New commits:
commit 795c61e052671d4de6a3b9cf77f9c0ad117e064d
Author: Michael Meeks 
Date:   Thu Nov 26 13:46:14 2015 +

gengal: create an ini / rc file - to bootstrap services properly.

Change-Id: Ib2042d6419dafcd62aaec95efb844cb09833c266

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index e4cdd53..3edf1b8 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -12,6 +12,7 @@ $(eval $(call 
gb_CustomTarget_CustomTarget,instsetoo_native/setup))
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
+   $(call gb_Helper_get_rcfile,gengal) \
$(call gb_Helper_get_rcfile,louno) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
@@ -23,6 +24,7 @@ $(eval $(call 
gb_CustomTarget_register_targets,instsetoo_native/setup,\
 
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,bootstrap) \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,fundamental) \
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,gengal) \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,louno) \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,redirect) \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,setup) \
@@ -120,6 +122,13 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call 
gb_Helper_get_rcfile,fundamental)' \
) > $@
 
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,gengal) :
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+   ( \
+   echo '[Bootstrap]' \
+   && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call 
gb_Helper_get_rcfile,fundamental)' \
+   ) > $@
+
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,uno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
diff --git a/instsetoo_native/Package_setup.mk 
b/instsetoo_native/Package_setup.mk
index 5b1e427..2c67544 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -12,6 +12,7 @@ $(eval $(call 
gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
 $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
+   $(call gb_Helper_get_rcfile,gengal) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
$(call gb_Helper_get_rcfile,setup) \
commit ed6aceab08e1c3951e1e33aa3d8070c57589b5db
Author: Michael Meeks 
Date:   Thu Nov 26 11:15:11 2015 +

vcl: reduce pointless timer / scheduler / idle includes.

Change-Id: I8bf7f8d6ba1a54f2969e055956fadc52ff6c8673

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 8eca878..09f8f07 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -805,17 +804,6 @@ inline SfxObjectShellLock & SfxObjectShellLock::
 inline SfxObjectShellLock & SfxObjectShellLock::operator = ( SfxObjectShell * 
pObjP )
 { return *this = SfxObjectShellLock( pObjP ); }
 
-class AutoReloadTimer_Impl : public Timer
-{
-OUString  aUrl;
-SfxObjectShell*   pObjSh;
-
-public:
-AutoReloadTimer_Impl( const OUString& rURL, sal_uInt32 nTime,
-  SfxObjectShell* pSh );
-virtual void Invoke() override;
-};
-
 class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem
 {
 SfxObjectShell* pObjSh;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index d4bbe5c..eb4a2fd 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 // - Dialog -
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index da5dc16..3e

[Libreoffice-commits] website.git: Branch 'tinderbox' - local_conf/TreeData.pm

2015-11-26 Thread Christian Lohmaier

 local_conf/TreeData.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d54caa0fbf589a4b48e5438461c94c583f225b80
Author: Christian Lohmaier 
Date:   Thu Nov 26 14:27:36 2015 +0100

drop libreoffice-4-3 branch and add libreoffice-5-1 instead

diff --git a/local_conf/TreeData.pm b/local_conf/TreeData.pm
index be672e1..d2206ff 100644
--- a/local_conf/TreeData.pm
+++ b/local_conf/TreeData.pm
@@ -231,10 +231,10 @@ $VERSION = '#tinder_version#';
branch => 'master',
VCS  => 'GIT',
   },
-'libreoffice-4-3' =>  {
+'libreoffice-5-1' =>  {
root => 
'git://anongit.freedesktop.org/git/libreoffice/core',
module => 'all',
-   branch => 'libreoffice-4-3',
+   branch => 'libreoffice-5-1',
VCS  => 'GIT',
   },
 'libreoffice-4-4' =>  {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Michael Stahl

 sw/qa/complex/writer/testdocuments/TESTXMLID.odt |binary
 1 file changed

New commits:
commit 9f76aa7794e6620810b93af439f1744573ebc9f2
Author: Michael Stahl 
Date:   Wed Nov 25 21:34:55 2015 +0100

sw: un-break JunitTest_sw_complex

49c2b9808df8a6b197dec666dfc0cda6321a4306 changed a binary test doc

Change-Id: I77cd86ce3eccfc701f54630870045e04244ac048

diff --git a/sw/qa/complex/writer/testdocuments/TESTXMLID.odt 
b/sw/qa/complex/writer/testdocuments/TESTXMLID.odt
index ba7ceab..063d392 100644
Binary files a/sw/qa/complex/writer/testdocuments/TESTXMLID.odt and 
b/sw/qa/complex/writer/testdocuments/TESTXMLID.odt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Stephan Bergmann

 chart2/source/view/main/DummyXShape.cxx|   17 ---
 chart2/source/view/main/DummyXShape.hxx|   28 ++---
 chart2/source/view/main/OpenglShapeFactory.cxx |   15 ++---
 3 files changed, 11 insertions(+), 49 deletions(-)

New commits:
commit bc8dcb2b5db706c8c5bdd6cf3ac1311d6625d962
Author: Stephan Bergmann 
Date:   Thu Nov 26 14:17:38 2015 +0100

-Werror,-Wunused-private-field

Change-Id: I70e753b1532fe465d378b8b4b0bbd2b7582130fe

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index a6f9ed1..efadcbc 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -453,13 +453,6 @@ void DummyPieSegment2D::render()
 
 }
 
-DummyPieSegment::DummyPieSegment(
-const drawing::Direction3D& rOffset, const drawing::HomogenMatrix& 
rUnitCircleToScene ):
-maOffset(rOffset),
-maUnitCircleToScene(rUnitCircleToScene)
-{
-}
-
 DummyStripe::DummyStripe(const Stripe& rStripe, const uno::Reference< 
beans::XPropertySet > & xPropSet,
 const tPropertyNameMap& rPropertyNameMap ):
 maStripe(rStripe)
@@ -467,11 +460,6 @@ DummyStripe::DummyStripe(const Stripe& rStripe, const 
uno::Reference< beans::XPr
 setProperties(xPropSet, rPropertyNameMap, maProperties);
 }
 
-DummyArea3D::DummyArea3D(const drawing::PolyPolygonShape3D& rShape):
-maShapes(rShape)
-{
-}
-
 DummyArea2D::DummyArea2D(const drawing::PointSequenceSequence& rShape):
 maShapes(rShape)
 {
@@ -505,8 +493,6 @@ void DummyArea2D::render()
 
 DummySymbol2D::DummySymbol2D(const drawing::Position3D& rPos, const 
drawing::Direction3D& rSize,
 sal_Int32 nStandardSymbol, sal_Int32 nFillColor):
-mrPosition(rPos),
-mrSize(rSize),
 mnStandardSymbol(nStandardSymbol),
 mnFillColor(nFillColor)
 {
@@ -592,8 +578,7 @@ void setProperties( const VLineProperties& rLineProperties, 
std::map
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -227,16 +226,7 @@ private:
 css::drawing::HomogenMatrix maUnitCircleToScene;
 };
 
-class DummyPieSegment : public DummyXShape
-{
-public:
-DummyPieSegment(
-const css::drawing::Direction3D& rOffset, const 
css::drawing::HomogenMatrix& rUnitCircleToScene);
-
-private:
-css::drawing::Direction3D maOffset;
-css::drawing::HomogenMatrix maUnitCircleToScene;
-};
+class DummyPieSegment : public DummyXShape {};
 
 class DummyStripe : public DummyXShape
 {
@@ -248,14 +238,7 @@ private:
 Stripe maStripe;
 };
 
-class DummyArea3D : public DummyXShape
-{
-public:
-explicit DummyArea3D(const css::drawing::PolyPolygonShape3D& rShape);
-
-private:
-css::drawing::PolyPolygonShape3D maShapes;
-};
+class DummyArea3D : public DummyXShape {};
 
 class DummyArea2D : public DummyXShape
 {
@@ -275,8 +258,6 @@ public:
 sal_Int32 nStandardSymbol, sal_Int32 nFillColor);
 void render() override;
 private:
-css::drawing::Position3D mrPosition;
-css::drawing::Direction3D mrSize;
 sal_Int32 mnStandardSymbol;
 sal_Int32 mnFillColor;
 };
@@ -302,10 +283,7 @@ public:
 class DummyLine3D : public DummyXShape
 {
 public:
-DummyLine3D(const css::drawing::PolyPolygonShape3D& rPoints, const 
VLineProperties& rProperties);
-
-private:
-css::drawing::PolyPolygonShape3D maPoints;
+DummyLine3D(const VLineProperties& rProperties);
 };
 
 class DummyLine2D : public DummyXShape
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx 
b/chart2/source/view/main/OpenglShapeFactory.cxx
index 666ab98..244855e 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -205,12 +205,11 @@ uno::Reference< drawing::XShape >
 const uno::Reference< drawing::XShapes >& xTarget
 , double, double
 , double, double
-, const drawing::Direction3D& rOffset
-, const drawing::HomogenMatrix& rUnitCircleToScene
+, const drawing::Direction3D&
+, const drawing::HomogenMatrix&
 , double )
 {
-dummy::DummyPieSegment* pSegment = new dummy::DummyPieSegment(
-rOffset, rUnitCircleToScene);
+dummy::DummyPieSegment* pSegment = new dummy::DummyPieSegment;
 
 xTarget->add(pSegment);
 return pSegment;
@@ -233,10 +232,10 @@ uno::Reference< drawing::XShape >
 
 uno::Reference< drawing::XShape >
 OpenglShapeFactory::createArea3D( const uno::Reference< 
drawing::XShapes >& xTarget
-, const drawing::PolyPolygonShape3D& rPolyPolygon
+, const drawing::PolyPolygonShape3D&
 , double )
 {
-dummy::DummyArea3D* pArea = new dummy::DummyArea3D(rPolyPolygon);
+dummy::DummyArea3D* pArea = new dummy::DummyArea3D;
 xTarget->add(pArea);
 return pArea;
 }
@@ -323,10 +322,10 @@ uno::Reference< drawing::XShape >
 
 un

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

2015-11-26 Thread Stephan Bergmann

 xmlhelp/source/cxxhelp/provider/content.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit e65233abd48c290448c361a75a90a0a9e5652062
Author: Stephan Bergmann 
Date:   Thu Nov 26 13:47:16 2015 +0100

-Werror,-Wunused-private-field

Change-Id: I4649381a330bc4e9d4f419137f0393f6f35bea17

diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx 
b/xmlhelp/source/cxxhelp/provider/content.cxx
index fbffd7a..c035546 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -169,7 +169,6 @@ private:
 uno::Reference< uno::XComponentContext > m_xContext;
 uno::Reference< ucb::XContentProvider >  m_xProvider;
 uno::Sequence< beans::Property > m_seq;
-uno::Sequence< ucb::NumberedSortingInfo >m_seqSort;
 URLParameter m_aURLParameter;
 Databases*   m_pDatabases;
 
@@ -179,13 +178,11 @@ public:
 const uno::Reference< uno::XComponentContext >& xContext,
 const uno::Reference< ucb::XContentProvider >&  xProvider,
 const uno::Sequence< beans::Property >& seq,
-const uno::Sequence< ucb::NumberedSortingInfo >& seqSort,
 const URLParameter& rURLParameter,
 Databases* pDatabases )
 : m_xContext( xContext ),
   m_xProvider( xProvider ),
   m_seq( seq ),
-  m_seqSort( seqSort ),
   m_aURLParameter( rURLParameter ),
   m_pDatabases( pDatabases )
 {
@@ -209,7 +206,6 @@ private:
 uno::Reference< uno::XComponentContext > m_xContext;
 uno::Reference< ucb::XContentProvider >  m_xProvider;
 uno::Sequence< beans::Property > m_seq;
-uno::Sequence< ucb::NumberedSortingInfo >m_seqSort;
 URLParameter m_aURLParameter;
 Databases*   m_pDatabases;
 
@@ -219,13 +215,11 @@ public:
 const uno::Reference< uno::XComponentContext >& rxContext,
 const uno::Reference< ucb::XContentProvider >&  xProvider,
 const uno::Sequence< beans::Property >& seq,
-const uno::Sequence< ucb::NumberedSortingInfo >& seqSort,
 const URLParameter& rURLParameter,
 Databases* pDatabases )
 : m_xContext( rxContext ),
   m_xProvider( xProvider ),
   m_seq( seq ),
-  m_seqSort( seqSort ),
   m_aURLParameter( rURLParameter ),
   m_pDatabases( pDatabases )
 {
@@ -343,7 +337,6 @@ uno::Any SAL_CALL Content::execute(
 m_xContext,
 m_xProvider.get(),
 aOpenCommand.Properties,
-aOpenCommand.SortingInfo,
 m_aURLParameter,
 m_pDatabases));
 aRet <<= xSet;
@@ -360,7 +353,6 @@ uno::Any SAL_CALL Content::execute(
 m_xContext,
 m_xProvider.get(),
 aOpenCommand.Properties,
-aOpenCommand.SortingInfo,
 m_aURLParameter,
 m_pDatabases ) );
 aRet <<= xSet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Julien Nabet

 sw/source/core/bastyp/calc.cxx |   23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 238a02cb567768ff0d7338ddab87441ec5e5d470
Author: Julien Nabet 
Date:   Sun Nov 22 17:42:08 2015 +0100

tdf#61228: Wrong function names in Formula Writer are considered as SUM

Unknown names make the formula fail
PythonTest_sw_python, especially set_expression is ok
Variables are taken into account

Thanks to Mike Kaganski for his help on this patch.

Change-Id: Ia6f9c54d90ce88138fd9c9df9422b34ce8223ca2
Reviewed-on: https://gerrit.libreoffice.org/20122
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
(cherry picked from commit d667e3210b12c7ce3b3727e2a0e369a520fbaaa4)
Reviewed-on: https://gerrit.libreoffice.org/20159
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 1eb97f3..4e82bb4 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1317,16 +1317,21 @@ SwSbxValue SwCalc::Prim()
 break;
 
 case CALC_NAME:
-if( GetToken() == CALC_ASSIGN )
+switch(SwCalcOper nOper = GetToken())
 {
-SwCalcExp* n = VarInsert( aVarName );
-GetToken();
-nErg = n->nValue = Expr();
-}
-else
-{
-nErg = VarLook( aVarName )->nValue;
-bChkPow = true;
+case CALC_ASSIGN:
+{
+SwCalcExp* n = VarInsert(aVarName);
+GetToken();
+nErg = n->nValue = Expr();
+}
+break;
+default:
+nErg = VarLook(aVarName)->nValue;
+if (nErg.IsVoidValue() && (nOper == CALC_LP))
+eError = CALC_SYNTAX;
+else
+bChkPow = true;
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - canvas/source

2015-11-26 Thread Tor Lillqvist

 canvas/source/directx/dx_surfacebitmap.cxx |   27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

New commits:
commit f7d1ea37a557d904caecb080deab162bd70e1a87
Author: Tor Lillqvist 
Date:   Fri Oct 30 19:03:10 2015 +0200

tdf#92272: We need to twiddle the bytes from BGR to RGB

As far as I see, the surfaces created in the DX canvas are of
D3DFMT_A8R8G8B8 or D3DFMT_X8R8G8B8 format, which means that the bytes
(in memory order, on little-endian Windows) are B,G,R,A/X. So if the
desired destination wants R,G,B,A, we need to swap the blue and red
bytes.

Let's hope this doesn't break anything else...

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

diff --git a/canvas/source/directx/dx_surfacebitmap.cxx 
b/canvas/source/directx/dx_surfacebitmap.cxx
index abff201..529c37c 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -19,6 +19,8 @@
 
 #include 
 
+#include 
+
 #include "dx_surfacebitmap.hxx"
 #include "dx_impltools.hxx"
 #include "dx_surfacegraphics.hxx"
@@ -438,7 +440,7 @@ namespace dxcanvas
 // DXSurfaceBitmap::getData
 
 
-uno::Sequence< sal_Int8 > DXSurfaceBitmap::getData( 
rendering::IntegerBitmapLayout& /*bitmapLayout*/,
+uno::Sequence< sal_Int8 > DXSurfaceBitmap::getData( 
rendering::IntegerBitmapLayout& rBitmapLayout,
 const 
geometry::IntegerRectangle2D& rect )
 {
 if(hasAlpha())
@@ -483,6 +485,11 @@ namespace dxcanvas
 D3DLOCKED_RECT aLockedRect;
 
if(FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)))
 return uno::Sequence< sal_Int8 >();
+D3DSURFACE_DESC aDesc;
+if(FAILED(mpSurface->GetDesc(&aDesc)))
+return uno::Sequence< sal_Int8 >();
+
+assert(aDesc.Format == D3DFMT_A8R8G8B8 || aDesc.Format == 
D3DFMT_X8R8G8B8);
 
 sal_uInt8 *pSrc = (sal_uInt8 *)BYTE 
*)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1);
 sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray();
@@ -494,6 +501,24 @@ namespace dxcanvas
 pSrc += aLockedRect.Pitch;
 }
 
+if(rBitmapLayout.ColorSpace->getComponentTags().getArray()[0] == 
rendering::ColorComponentTag::RGB_RED &&
+   rBitmapLayout.ColorSpace->getComponentTags().getArray()[2] == 
rendering::ColorComponentTag::RGB_BLUE)
+{
+pDst = (sal_uInt8 *)aRes.getArray();
+for(sal_uInt32 y=0; yUnlockRect();
 return aRes;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - jurt/com

2015-11-26 Thread Caolán McNamara

 jurt/com/sun/star/uno/AnyConverter.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b4b35f65e24f6665bd8dd96d341758bb15b24ada
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 25 15:09:40 2015 +

coverity#1340230 Dereference before null check

ah!, the original code had a type in it. That's
why it was refactored to remove the null check.

Now a proper fix for cids: 1326180<->1326190

Change-Id: Iba7fd47c03eb5c157f878e0e297e8688f20ae348
(cherry picked from commit 8244fc2655e37f178f32d63133edf08def8f62c8)
Reviewed-on: https://gerrit.libreoffice.org/20179
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/jurt/com/sun/star/uno/AnyConverter.java 
b/jurt/com/sun/star/uno/AnyConverter.java
index 61c8c7e..94542e6 100644
--- a/jurt/com/sun/star/uno/AnyConverter.java
+++ b/jurt/com/sun/star/uno/AnyConverter.java
@@ -621,7 +621,7 @@ public class AnyConverter
 break;
 case TypeClass.ENUM_value:
 if (tc == TypeClass.ENUM_value &&
-(null == destTClass || destType.equals( type ) /* optional 
destType */))
+(null == destType || destType.equals( type ) /* optional 
destType */))
 {
 return object;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Caolán McNamara

 sd/source/ui/view/ViewShellBase.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d8e6bc709ad77047320491148acf7076186a51d2
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 25 14:56:51 2015 +

coverity#1340226 Missing break in switch

Change-Id: Ibd1c15ce65501d4dc6d0cea8c8e5f4e683d1b7a4
(cherry picked from commit c5bfac3f26dab2308b5a9797876927d410ac7876)
Reviewed-on: https://gerrit.libreoffice.org/20177
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index 41ad725..42f0403 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1255,6 +1255,7 @@ void ViewShellBase::Implementation::GetSlotState 
(SfxItemSet& rSet)
 pFrameView = mrBase.GetMainViewShell()->GetFrameView();
 bState = pFrameView->GetViewShEditMode() == 
EM_MASTERPAGE
 && pFrameView->GetPageKind() == PK_STANDARD;
+break;
 
 case SID_SLIDE_SORTER_MULTI_PANE_GUI:
 case SID_SLIDE_SORTER_MODE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Caolán McNamara

 sd/source/ui/view/ViewShellBase.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3b3ef6aba2f6a8b27bda420f60859ccecf15a970
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 25 14:57:18 2015 +

coverity#1340227 Missing break in switch

Change-Id: I30ea6cea81ae1b4f344e253c7a51cfef4d844128
(cherry picked from commit f4ac785494ac056535d2ff12ac59b909dafa4bab)
Reviewed-on: https://gerrit.libreoffice.org/20178
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index 42f0403..30d881c 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1290,6 +1290,7 @@ void ViewShellBase::Implementation::GetSlotState 
(SfxItemSet& rSet)
 pFrameView = mrBase.GetMainViewShell()->GetFrameView();
 bState = pFrameView->GetViewShEditMode() == 
EM_MASTERPAGE
 && pFrameView->GetPageKind() == PK_NOTES;
+break;
 
 case SID_TOGGLE_TABBAR_VISIBILITY:
 bState = GetUserWantsTabBar();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Caolán McNamara

 vcl/source/gdi/virdev.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 98d00292861a8addef571523cc8556b36b0b1129
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 25 14:53:55 2015 +

coverity#1340225 Missing break in switch

Change-Id: I9f76340ccdb32f4337d0ebe85e9957fe8a3b19f9
(cherry picked from commit 43e2b417970cb7968430a1e9ef2a5fb54af8434c)
Reviewed-on: https://gerrit.libreoffice.org/20176
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index cab8fa3..085237f 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -165,6 +165,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* 
pOutDev,
 {
 case DeviceFormat::BITMASK:
 mnBitCount = 1;
+break;
 default:
 mnBitCount = pOutDev->GetBitCount();
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Caolán McNamara

 writerfilter/source/dmapper/OLEHandler.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 49fb1b398698db6faa56d340694ee38b1a867a8d
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 25 14:49:24 2015 +

crashtesting: failure on File_1404.docx

Change-Id: Id984cc1f5954be38fbe3a1a15bfe811d7cdfe99d
(cherry picked from commit d05ae550316e3dc5afe799c7d6cf83f02e37d69b)
Reviewed-on: https://gerrit.libreoffice.org/20175
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/writerfilter/source/dmapper/OLEHandler.cxx 
b/writerfilter/source/dmapper/OLEHandler.cxx
index 6208750..d282c7b 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -236,6 +236,8 @@ void 
OLEHandler::importStream(uno::Reference xComponentC
 uno::Reference xImporter(xInterface, uno::UNO_QUERY);
 uno::Reference xSupplier(xOLE, 
uno::UNO_QUERY);
 uno::Reference 
xEmbeddedObject(xSupplier->getEmbeddedObject(), uno::UNO_QUERY);
+if (!xEmbeddedObject.is())
+return;
 xImporter->setTargetDocument( xEmbeddedObject );
 
 // Import the input stream.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Noel Grandin

 xmlscript/source/inc/misc.hxx|   10 -
 xmlscript/source/inc/xml_import.hxx  |6 
 xmlscript/source/xml_helper/xml_impctx.cxx   |2 
 xmlscript/source/xmlflat_imexp/xmlbas_export.hxx |   50 +++---
 xmlscript/source/xmlflat_imexp/xmlbas_import.cxx |2 
 xmlscript/source/xmlflat_imexp/xmlbas_import.hxx |  170 +++
 xmlscript/source/xmllib_imexp/xmllib_export.cxx  |2 
 xmlscript/source/xmllib_imexp/xmllib_import.cxx  |4 
 8 files changed, 123 insertions(+), 123 deletions(-)

New commits:
commit 93ca2247212118695d27ec13d6eedc4d3e512960
Author: Noel Grandin 
Date:   Thu Nov 26 09:02:49 2015 +0200

com::sun::star->css in xmlscript/

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

diff --git a/xmlscript/source/inc/misc.hxx b/xmlscript/source/inc/misc.hxx
index e8ece5e..7671dea 100644
--- a/xmlscript/source/inc/misc.hxx
+++ b/xmlscript/source/inc/misc.hxx
@@ -26,19 +26,19 @@ namespace xmlscript
 {
 
 template< typename T >
-inline void extract_throw( T * p, ::com::sun::star::uno::Any const & a )
+inline void extract_throw( T * p, css::uno::Any const & a )
 {
 if (! (a >>= *p))
 {
-throw ::com::sun::star::uno::RuntimeException(
+throw css::uno::RuntimeException(
 "expected " + cppu::UnoType::get().getTypeName(),
-::com::sun::star::uno::Reference<
-::com::sun::star::uno::XInterface>() );
+css::uno::Reference<
+css::uno::XInterface>() );
 }
 }
 
 template< typename T >
-inline T extract_throw( ::com::sun::star::uno::Any const & a )
+inline T extract_throw( css::uno::Any const & a )
 {
 T v = T();
 extract_throw( &v, a );
diff --git a/xmlscript/source/inc/xml_import.hxx 
b/xmlscript/source/inc/xml_import.hxx
index 6f3cacd..f14e3e5 100644
--- a/xmlscript/source/inc/xml_import.hxx
+++ b/xmlscript/source/inc/xml_import.hxx
@@ -48,10 +48,10 @@ namespace xmlscript
 @return
 document handler for parser
 */
-::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler 
>
+css::uno::Reference< css::xml::sax::XDocumentHandler >
 SAL_CALL createDocumentHandler(
-::com::sun::star::uno::Reference<
-::com::sun::star::xml::input::XRoot > const & xRoot,
+css::uno::Reference<
+css::xml::input::XRoot > const & xRoot,
 bool bSingleThreadedUse = true );
 
 }
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx 
b/xmlscript/source/xml_helper/xml_impctx.cxx
index a553186..694b8ed 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -93,7 +93,7 @@ class DocumentHandlerImpl :
 public ::cppu::WeakImplHelper< xml::sax::XDocumentHandler,
 xml::input::XNamespaceMapping,
 lang::XInitialization,
-com::sun::star::lang::XServiceInfo >
+css::lang::XServiceInfo >
 {
 friend class ExtendedAttributes;
 
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx 
b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
index 7e75ba5..10746ea 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
@@ -35,41 +35,41 @@ namespace xmlscript
 // class XMLBasicExporterBase
 
 typedef ::cppu::WeakImplHelper<
-::com::sun::star::lang::XServiceInfo,
-::com::sun::star::lang::XInitialization,
-::com::sun::star::document::XXMLBasicExporter > 
XMLBasicExporterBase_BASE;
+css::lang::XServiceInfo,
+css::lang::XInitialization,
+css::document::XXMLBasicExporter > XMLBasicExporterBase_BASE;
 
 class XMLBasicExporterBase : public XMLBasicExporterBase_BASE
 {
 private:
-::osl::Mutex   
 m_aMutex;
-::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext >m_xContext;
-::com::sun::star::uno::Reference< 
::com::sun::star::xml::sax::XDocumentHandler >m_xHandler;
-::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
 m_xModel;
-bool   
 m_bOasis;
+::osl::Mutex  m_aMutex;
+css::uno::Reference< css::uno::XComponentContext >m_xContext;
+css::uno::Reference< css::xml::sax::XDocumentHandler >m_xHandler;
+css::uno::Reference< css::frame::XModel > m_xModel;
+bool  m_bOasis;
 
 public:
 XMLBasicExporterBase(
-const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentCon

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

2015-11-26 Thread Xisco Fauli

 filter/source/svg/units.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit fa17cfd7e006c73f1360a5a974f38d9875f347c5
Author: Xisco Fauli 
Date:   Wed Nov 25 20:03:19 2015 +0100

tdf#96046 SVG: Parse 'em' and 'ex' units correctly

the problem is that real_p parses the 'e' in 'em' and 'ex' as the 
exponential
operator instead of as a str.
Change it to parse sequencies like: (11) (1.1) (1,1) (.1) (,1) (1.) (1,)
but now the parser returns a std::string so we need to convert it to double,
and make sure the commas are converted to dots too.

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

diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx
index d0165b1..691305e 100644
--- a/filter/source/svg/units.cxx
+++ b/filter/source/svg/units.cxx
@@ -71,12 +71,12 @@ double convLength( const OUString& sValue, const State& 
rState, char dir )
 OString aUTF8 = OUStringToOString( sValue,
  RTL_TEXTENCODING_UTF8 );
 
-double  nVal=0.0;
+std::string sVal;
 SvgUnit eUnit=SVG_LENGTH_UNIT_PX;
 const bool bRes = parse(aUTF8.getStr(),
 //  Begin grammar
 (
-real_p[assign_a(nVal)]
+(*digit_p >> *((str_p(".") | str_p(",")) >> 
*digit_p))[assign_a(sVal)]
 >> (  str_p("cm") [assign_a(eUnit,SVG_LENGTH_UNIT_CM)]
 | str_p("em") [assign_a(eUnit,SVG_LENGTH_UNIT_EM)]
 | str_p("ex") [assign_a(eUnit,SVG_LENGTH_UNIT_EX)]
@@ -95,7 +95,9 @@ double convLength( const OUString& sValue, const State& 
rState, char dir )
 if( !bRes )
 return 0.0;
 
-return convLength(nVal,eUnit,rState,dir);
+OUString oVal = 
OUString::createFromAscii(sVal.c_str()).replaceAll(",",".");
+
+return convLength(oVal.toDouble(),eUnit,rState,dir);
 }
 
 } // namespace svgi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Tor Lillqvist

 vcl/source/gdi/sallayout.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit b8711f6600216ca482627a928099a33612008734
Author: Tor Lillqvist 
Date:   Wed Nov 25 13:24:09 2015 +0200

tdf#95783: Don't calculate width of text with glyph fallback as way too wide

The old code in MultiSalLayout::GetTextBreak() only makes sense if the
base level character width is zero where a fallback level has a
non-zero character width, and vice versa. But this is not the case for
Windows, at least not any more now when using UniscribeLayout and not
SimpleWinLayout.

This simple change fixes that: Only use the width from a fallback
level if the width at the base level is zero. Hopefully it does not
cause regressions for other documents or on other platforms. (But, I
repeat, I find it hard to believe that the intent of the code could
really have been to ever add two or more non-zero widths for the same
character from different levels of fallback and use that.)

Change-Id: Ic66c55db4b7463f9e04fcedec76f1c44f5e62e03
(cherry picked from commit a0d112a53023758a28d180ffd12766b4d325bf52)
Reviewed-on: https://gerrit.libreoffice.org/20172
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 4bd388d..7edfc7f 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1979,9 +1979,12 @@ sal_Int32 MultiSalLayout::GetTextBreak( DeviceCoordinate 
nMaxWidth, DeviceCoordi
 fUnitMul /= rLayout.GetUnitsPerPixel();
 for( int i = 0; i < nCharCount; ++i )
 {
-DeviceCoordinate w = pCharWidths[ i + nCharCount ];
-w = (DeviceCoordinate)(w * fUnitMul + 0.5);
-pCharWidths[ i ] += w;
+if( pCharWidths[ i ] == 0 )
+{
+DeviceCoordinate w = pCharWidths[ i + nCharCount ];
+w = (DeviceCoordinate)(w * fUnitMul + 0.5);
+pCharWidths[ i ] = w;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source

2015-11-26 Thread Lionel Elie Mamane

 cui/source/customize/macropg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5847c76dc3476f565cc40d2506808e6f34cb2f01
Author: Lionel Elie Mamane 
Date:   Wed Nov 25 16:21:19 2015 +0100

assign macro dialog: correct event name "errorOccured"

"errorOccured" is an English spelling mistake, but is the
name of the event, which cannot / should not be changed for
backwards compatibility reasons.

Spelling was boguously "corrected" in:

  commit 60a9b5172bcbd90b5764125b76279c189dd5563c
  Author: Takeshi Abe 
  Date:   Sat Dec 4 12:56:38 2010 +0900

  Replace all occured, occurance etc.

This was leading to impossibility of assigning a macro
to that event, since it was not appearing in this dialog.

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

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 6211bcc..6400cff 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -327,7 +327,7 @@ void _SvxMacroTabPage::InitResources()
 aDisplayNames.push_back( EventDisplayName( "approveCursorMove", 
RID_SVXSTR_EVENT_POSITIONING ) );
 aDisplayNames.push_back( EventDisplayName( "cursorMoved",   
RID_SVXSTR_EVENT_POSITIONED ) );
 aDisplayNames.push_back( EventDisplayName( "approveParameter",  
RID_SVXSTR_EVENT_APPROVEPARAMETER ) );
-aDisplayNames.push_back( EventDisplayName( "errorOccurred",  
RID_SVXSTR_EVENT_ERROROCCURRED ) );
+aDisplayNames.push_back( EventDisplayName( "errorOccured",  
RID_SVXSTR_EVENT_ERROROCCURRED ) );
 aDisplayNames.push_back( EventDisplayName( "adjustmentValueChanged",   
RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/generic

2015-11-26 Thread Mark Hung

 vcl/generic/glyphs/gcach_layout.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 48cf2d9fe9eea5e6fae310058b6f705553996635
Author: Mark Hung 
Date:   Wed Nov 18 00:45:13 2015 +0800

tdf#91288 Does not display traditional Chinese variant of

Noto fonts correctly.

LanguageTag()::getLanguage() would always return "zh" despite
traditional Chinese were choose. hb_language_from_string()
requires iso639-3 language tag except for Chinese, so
we use use Bcp47() language tag for Chinese to differ zh-CN and
the others.

Change-Id: I6700a79a9c49a97d840b430def77741912935f72
Reviewed-on: https://gerrit.libreoffice.org/20027
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 4424daa225e73d291a3fd64d369cdda5857f3d51)
Reviewed-on: https://gerrit.libreoffice.org/20204

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 6b3f0ae..4ada683 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -461,8 +461,10 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 int nEndRunPos = it->mnEnd;
 int nRunLen = nEndRunPos - nMinRunPos;
 maHbScript = it->maScript;
+// hb_language_from_string() accept ISO639-3 language tag except 
for Chinese.
+LanguageTag &rTag = rArgs.maLanguageTag;
+OString sLanguage = OUStringToOString( 
MsLangId::isChinese(rTag.getLanguageType()) ? 
rTag.getBcp47():rTag.getLanguage() , RTL_TEXTENCODING_UTF8 );
 
-OString sLanguage = 
OUStringToOString(rArgs.maLanguageTag.getLanguage(), RTL_TEXTENCODING_UTF8);
 
 static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/generic

2015-11-26 Thread Mark Hung

 vcl/generic/glyphs/gcach_layout.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ff592b85f02a1e16aa1668c874e71e4e242b
Author: Mark Hung 
Date:   Wed Nov 18 00:45:13 2015 +0800

tdf#91288 Does not display traditional Chinese variant of

Noto fonts correctly.

LanguageTag()::getLanguage() would always return "zh" despite
traditional Chinese were choose. hb_language_from_string()
requires iso639-3 language tag except for Chinese, so
we use use Bcp47() language tag for Chinese to differ zh-CN and
the others.

Change-Id: I6700a79a9c49a97d840b430def77741912935f72
Reviewed-on: https://gerrit.libreoffice.org/20027
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 4424daa225e73d291a3fd64d369cdda5857f3d51)
Reviewed-on: https://gerrit.libreoffice.org/20203

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 38ea6ac..127dd06 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -466,8 +466,10 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 int nEndRunPos = it->mnEnd;
 int nRunLen = nEndRunPos - nMinRunPos;
 maHbScript = it->maScript;
+// hb_language_from_string() accept ISO639-3 language tag except 
for Chinese.
+LanguageTag &rTag = rArgs.maLanguageTag;
+OString sLanguage = OUStringToOString( 
MsLangId::isChinese(rTag.getLanguageType()) ? 
rTag.getBcp47():rTag.getLanguage() , RTL_TEXTENCODING_UTF8 );
 
-OString sLanguage = 
OUStringToOString(rArgs.maLanguageTag.getLanguage(), RTL_TEXTENCODING_UTF8);
 
 static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Mark Hung

 vcl/generic/glyphs/gcach_layout.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4424daa225e73d291a3fd64d369cdda5857f3d51
Author: Mark Hung 
Date:   Wed Nov 18 00:45:13 2015 +0800

tdf#91288 Does not display traditional Chinese variant of

Noto fonts correctly.

LanguageTag()::getLanguage() would always return "zh" despite
traditional Chinese were choose. hb_language_from_string()
requires iso639-3 language tag except for Chinese, so
we use use Bcp47() language tag for Chinese to differ zh-CN and
the others.

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

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 38ea6ac..127dd06 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -466,8 +466,10 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 int nEndRunPos = it->mnEnd;
 int nRunLen = nEndRunPos - nMinRunPos;
 maHbScript = it->maScript;
+// hb_language_from_string() accept ISO639-3 language tag except 
for Chinese.
+LanguageTag &rTag = rArgs.maLanguageTag;
+OString sLanguage = OUStringToOString( 
MsLangId::isChinese(rTag.getLanguageType()) ? 
rTag.getBcp47():rTag.getLanguage() , RTL_TEXTENCODING_UTF8 );
 
-OString sLanguage = 
OUStringToOString(rArgs.maLanguageTag.getLanguage(), RTL_TEXTENCODING_UTF8);
 
 static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Stephan Bergmann

 sdext/source/presenter/PresenterSlideSorter.cxx |1 -
 sdext/source/presenter/PresenterSlideSorter.hxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit e0147611615e22414669d49b639e8d9a4b843c5b
Author: Stephan Bergmann 
Date:   Thu Nov 26 13:07:17 2015 +0100

-Werror,-Wunused-private-field

Change-Id: I7e00f9b90fb910a8ac0fa934887d276ef2e0ba89

diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx 
b/sdext/source/presenter/PresenterSlideSorter.cxx
index 3ce9138..ad7d6a4 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -261,7 +261,6 @@ PresenterSlideSorter::PresenterSlideSorter (
   mnCurrentSlideIndex(-1),
   mnSeparatorY(0),
   maSeparatorColor(0x00ff),
-  maCloseButtonCenter(),
   maCurrentSlideFrameBoundingBox(),
   mpCurrentSlideFrameRenderer(),
   mxPreviewFrame()
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx 
b/sdext/source/presenter/PresenterSlideSorter.hxx
index a610b7b..b6c93ba 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -173,7 +173,6 @@ private:
 sal_Int32 mnCurrentSlideIndex;
 sal_Int32 mnSeparatorY;
 css::util::Color maSeparatorColor;
-css::awt::Point maCloseButtonCenter;
 css::awt::Rectangle maCurrentSlideFrameBoundingBox;
 class CurrentSlideFrameRenderer;
 std::shared_ptr mpCurrentSlideFrameRenderer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] voting.git: vote/include

2015-11-26 Thread Jan Holesovsky

 vote/include/schema.sql |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1554866c6260b57b962220432d11b5f201011537
Author: Jan Holesovsky 
Date:   Tue Nov 24 16:42:19 2015 +0100

Fix syntax errors.

Change-Id: I14a5968c7da5f761bd449a7f509a4d64b07b653e
Reviewed-on: https://gerrit.libreoffice.org/20200
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/vote/include/schema.sql b/vote/include/schema.sql
index 4b756f8..fdf415b 100644
--- a/vote/include/schema.sql
+++ b/vote/include/schema.sql
@@ -9,7 +9,7 @@
`voting_start` datetime default NULL,
`voting_end` datetime default '-00-00 00:00:00',
`choices_nb` int(11) NOT NULL default '0',
-   'enforce_nb'BOOL NOT NULL default '0',
+   `enforce_nb`BOOL NOT NULL default '0',
`question` text NOT NULL,
PRIMARY KEY  (`id`) 
  ) DEFAULT CHARSET=utf8;
@@ -32,7 +32,7 @@
`id` int(11) NOT NULL auto_increment,
`election_id` int(11) NOT NULL default '0',
`member_id` int(11) NOT NULL default '0',
-   `tmp_token` varchar(200) NOT NULL default ''
+   `tmp_token` varchar(200) NOT NULL default '',
PRIMARY KEY  (`id`)
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Michael Meeks

 include/vcl/scheduler.hxx  |6 --
 toolkit/source/awt/vclxtoolkit.cxx |2 +-
 vcl/source/app/scheduler.cxx   |   19 ++-
 3 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit fbdeef6b7f74a3602792d178b1e750020b2cac89
Author: Michael Meeks 
Date:   Thu Nov 26 10:42:10 2015 +

vcl: fix event processing to idle - for JUnit tests.

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

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 6dd8030..13d1687 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -92,8 +92,10 @@ public:
 static void CallbackTaskScheduling( bool ignore );
 /// Calculate minimum timeout - and return its value.
 static sal_uInt64 CalculateMinimumTimeout( bool &bHasActiveIdles );
-/// Process one pending task ahead of time with highhest priority.
-static void   ProcessTaskScheduling( bool bTimer );
+/// Process one pending task ahead of time with highest priority.
+static bool   ProcessTaskScheduling( bool bTimerOnly );
+/// Process all events until we are idle
+static void   ProcessEventsToIdle();
 };
 
 #endif // INCLUDED_VCL_SCHEDULER_HXX
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 00c0a14..bf1a3ad 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1912,7 +1912,7 @@ void SAL_CALL VCLXToolkit::processEventsToIdle()
 throw (css::uno::RuntimeException, std::exception)
 {
 SolarMutexGuard aSolarGuard;
-Scheduler::ProcessTaskScheduling(false);
+Scheduler::ProcessEventsToIdle();
 }
 
 OUString SAL_CALL VCLXToolkit::getHWOSConfInfo()
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index e3c6abf..9450393 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -157,7 +157,7 @@ void Scheduler::CallbackTaskScheduling(bool ignore)
 Scheduler::ProcessTaskScheduling( false );
 }
 
-void Scheduler::ProcessTaskScheduling( bool bTimerOnly )
+bool Scheduler::ProcessTaskScheduling( bool bTimerOnly )
 {
 ImplSchedulerData* pSchedulerData;
 
@@ -168,6 +168,23 @@ void Scheduler::ProcessTaskScheduling( bool bTimerOnly )
 
 pSchedulerData->mnUpdateTime = tools::Time::GetSystemTicks();
 pSchedulerData->Invoke();
+return true;
+}
+else
+return false;
+}
+
+void Scheduler::ProcessEventsToIdle()
+{
+// FIXME: really we should process incoming OS events too ...
+int nSanity = 1000;
+while (Scheduler::ProcessTaskScheduling(false))
+{
+if (nSanity-- < 0)
+{
+SAL_WARN("vcl.schedule", "Unexpected volume of events to process");
+break;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Stephan Bergmann

 include/xmloff/xmlnumfi.hxx   |1 -
 xmloff/source/chart/SchXMLChartContext.hxx|1 -
 xmloff/source/chart/SchXMLPlotAreaContext.cxx |2 --
 xmloff/source/chart/SchXMLPlotAreaContext.hxx |2 --
 xmloff/source/chart/SchXMLSeries2Context.cxx  |4 ++--
 5 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit efa5c54373f6fbfdbb993bd3e1c30dab42e323c6
Author: Stephan Bergmann 
Date:   Thu Nov 26 12:59:32 2015 +0100

-Werror,-Wunused-private-field

Change-Id: I3f328023d99d3505ab2ce2a80eef82d84d81446e

diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 7f05728..e124917 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -129,7 +129,6 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public 
SvXMLStyleContext
 //  OUString   sMapName;
 OUString   sCalendar;
 LanguageType   nFormatLang;
-css::lang::LocaleaLocale;
 boolbAutoOrder;
 boolbFromSystem;
 boolbTruncate;
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx 
b/xmloff/source/chart/SchXMLChartContext.hxx
index e5e67c7..de69e1e 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -93,7 +93,6 @@ private:
 SchXMLImportHelper& mrImportHelper;
 
 OUString maMainTitle, maSubTitle;
-css::awt::Point maMainTitlePos, maSubTitlePos, maLegendPos;
 OUString m_aXLinkHRefAttributeToIndicateDataProvider;
 bool m_bHasRangeAtPlotArea;
 bool m_bHasTableElement;
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx 
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 813a90e..c7f9ae3 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -969,7 +969,6 @@ 
SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext(
 ::std::list< DataRowPointStyle >& rStyleList,
 const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
 ContextType eContextType,
-const awt::Size & rChartSize,
 tSchXMLLSequencesPerIndex & rLSequencesPerIndex) :
 
 SvXMLImportContext( rImport, nPrefix, rLocalName ),
@@ -977,7 +976,6 @@ 
SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext(
 mrStyleList( rStyleList ),
 m_xSeries( xSeries ),
 meContextType( eContextType ),
-maChartSize( rChartSize ),
 maSeriesStyleName( rSeriesStyleName),
 mrLSequencesPerIndex(rLSequencesPerIndex)
 {}
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx 
b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index f9cae3e..487ab35 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -245,7 +245,6 @@ public:
 ::std::list< DataRowPointStyle >& rStyleList,
 const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
 ContextType eContextType,
-const css::awt::Size & rChartSize,
 tSchXMLLSequencesPerIndex & rLSequencesPerIndex );
 
 virtual ~SchXMLStatisticsObjectContext();
@@ -261,7 +260,6 @@ private:
 ::std::list< DataRowPointStyle > & mrStyleList;
 css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
 ContextTypemeContextType;
-css::awt::Size maChartSize;
 OUString maSeriesStyleName;
 tSchXMLLSequencesPerIndex& mrLSequencesPerIndex;
 };
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx 
b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 4f23d15..644052d 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -661,7 +661,7 @@ SvXMLImportContext* 
SchXMLSeries2Context::CreateChildContext(
 nPrefix, rLocalName, msAutoStyleName,
 mrStyleList, m_xSeries,
 SchXMLStatisticsObjectContext::CONTEXT_TYPE_MEAN_VALUE_LINE,
-maChartSize, mrLSequencesPerIndex );
+mrLSequencesPerIndex );
 break;
 case XML_TOK_SERIES_REGRESSION_CURVE:
 pContext = new SchXMLRegressionCurveObjectContext(
@@ -675,7 +675,7 @@ SvXMLImportContext* 
SchXMLSeries2Context::CreateChildContext(
 nPrefix, rLocalName, msAutoStyleName,
 mrStyleList, m_xSeries,
 SchXMLStatisticsObjectContext::CONTEXT_TYPE_ERROR_INDICATOR,
-maChartSize, mrLSequencesPerIndex );
+mrLSequencesPerIndex );
 break;
 
 case XML_TOK_SERIES_DATA_POINT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Stephan Bergmann

 include/svx/msdffdef.hxx |   21 -
 1 file changed, 21 deletions(-)

New commits:
commit e336d7f80fd9f7ada4b12c37f9434df411d28466
Author: Stephan Bergmann 
Date:   Thu Nov 26 12:40:26 2015 +0100

Remove unused MSO_ShadeType

 vmiklos, any idea how useful the definition of enum MSO_ShadeType in
include/svx/msdffdef.hxx is?  Neither the type nor any of its enumerators 
are
used anywhere, so it's rather glorious documentation of some (presumed) MS 
API

vmiklos> sberg: doesn't look too useful, i guess the context is color 
shading in
binary MSO files, but then that's handled in
filter/source/msfilter/msdffimp.cxx:1069, and the ShadeColor struct already
describes what is in the spec.

Change-Id: Iae4c12828179173368ff17128bcaa80edaa3db23

diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index fc2f7af..d4f132b 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -673,27 +673,6 @@ enum MSO_FillType {
mso_fillBackground // Use the background fill color/pattern
 };
 
-// MSO_SHADETYPE - how to interpret the colors in a shaded fill.
-enum MSO_ShadeType {
-   mso_shadeNone  = 0,// Interpolate without correction between RGBs
-   mso_shadeGamma = 1,// Apply gamma correction to colors
-   mso_shadeSigma = 2,// Apply a sigma transfer function to position
-   mso_shadeBand  = 4,// Add a flat band at the start of the shade
-   mso_shadeOneColor = 8, // This is a one color shade
-
-   /* A parameter for the band or sigma function can be stored in the top
-  16 bits of the value - this is a proportion of *each* band of the
-  shade to make flat (or the approximate equal value for a sigma
-  function).  NOTE: the parameter is not used for the sigma function,
-  instead a built in value is used.  This value should not be changed
-  from the default! */
-   mso_shadeParameterShift = 16,
-   mso_shadeParameterMask  = 0x,
-
-   mso_shadeDefault = (mso_shadeGamma|mso_shadeSigma|
- (16384

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

2015-11-26 Thread Stephan Bergmann

 comphelper/source/misc/configuration.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c4ecd6c49307127823375b8ed6e3033441325015
Author: Stephan Bergmann 
Date:   Thu Nov 26 12:36:54 2015 +0100

That SB variable was a temporary debugging aid

...inadvertently checked in with 7bcf64c29a0f5d3d2d60fe98afadab6e48dbe8b3 
"Add
isReadOnly() support to simplified configuration access"

Change-Id: I9b8b477f682605fcdcf65f8e1255524d010495be

diff --git a/comphelper/source/misc/configuration.cxx 
b/comphelper/source/misc/configuration.cxx
index 69b4aea..5d14d67 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -128,8 +128,10 @@ 
comphelper::detail::ConfigurationWrapper::~ConfigurationWrapper() {}
 bool comphelper::detail::ConfigurationWrapper::isReadOnly(OUString const & 
path)
 const
 {
-css::beans::Property SB(access_->getPropertyByHierarchicalName(path));
-return (SB.Attributes & css::beans::PropertyAttribute::READONLY) != 0;
+return
+(access_->getPropertyByHierarchicalName(path).Attributes
+ & css::beans::PropertyAttribute::READONLY)
+!= 0;
 }
 
 css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Michael Stahl

 vcl/source/outdev/font.cxx |6 ++
 vcl/source/outdev/text.cxx |   14 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit e6e409b684f9b046dcde9f0615018508f769c369
Author: Michael Stahl 
Date:   Wed Nov 25 22:42:16 2015 +0100

vcl: OutputDevice::GetTextArray() should always init pDXAry

CppunitTest_writerperfect_writer file libmwaw/pass/Acta_1.0.hqx uses the
font "Courier", and for unknown reasons we can't properly load that
font, because the PhysicalFontFamily::mpFirst for "courier" is null.

This causes OutputDevice::GetTextArray() to fail to create a SalLayout
and return early before initializing the passed pDXAry, which then
generates lots of DrMemory warnings.

Let's hope the callers are happy about an all-0 pDXAry.

Change-Id: I07b29a59660cf5cd060fd77da5d96021f9d8f9f5

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 097d21c..8bb7778 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1006,7 +1006,7 @@ long OutputDevice::GetTextArray( const OUString& rStr, 
long* pDXAry,
 }
 
 if( nIndex >= rStr.getLength() )
-return 0;
+return 0; // TODO: this looks like a buggy caller?
 
 if( nLen < 0 || nIndex + nLen >= rStr.getLength() )
 {
@@ -1016,7 +1016,19 @@ long OutputDevice::GetTextArray( const OUString& rStr, 
long* pDXAry,
 SalLayout *const pSalLayout = ImplLayout(rStr, nIndex, nLen,
 Point(0,0), 0, nullptr, SalLayoutFlags::NONE, pLayoutCache);
 if( !pSalLayout )
+{
+// The caller expects this to init the elements of pDXAry.
+// Adapting all the callers to check that GetTextArray succeeded seems
+// too much work.
+// Init here to 0 only in the (rare) error case, so that any missing
+// element init in the happy case will still be found by tools,
+// and hope that is sufficient.
+if (pDXAry)
+{
+memset(pDXAry, 0, nLen * sizeof(*pDXAry));
+}
 return 0;
+}
 #if VCL_FLOAT_DEVICE_PIXEL
 std::unique_ptr pDXPixelArray;
 if(pDXAry)
commit b6e354b26bfe2c0790c5817cba3cc3a6dad910b9
Author: Michael Stahl 
Date:   Wed Nov 25 21:49:43 2015 +0100

vcl: warn if we can't set a new font in OutputDevice

Change-Id: I7708590d0c8564271f76e8b80adc566022e6916e

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 5f9f07d..f2885f0 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1546,7 +1546,10 @@ bool OutputDevice::ImplNewFont() const
 
 // we need a graphics
 if ( !mpGraphics && !AcquireGraphics() )
+{
+SAL_WARN("vcl.gdi", "OutputDevice::ImplNewFont(): no Graphics, no 
Font");
 return false;
+}
 SalGraphics* pGraphics = mpGraphics;
 ImplInitFontList();
 
@@ -1577,7 +1580,10 @@ bool OutputDevice::ImplNewFont() const
 ImplFontEntry* pFontEntry = mpFontEntry;
 
 if (!pFontEntry)
+{
+SAL_WARN("vcl.gdi", "OutputDevice::ImplNewFont(): no ImplFontEntry, no 
Font");
 return false;
+}
 
 // mark when lower layers need to get involved
 mbNewFont = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - chart2/source codemaker/source comphelper/source compilerplugins/clang cui/source embeddedobj/source extensions/source framework/source reportdesign/source

2015-11-26 Thread Noel Grandin

 chart2/source/view/main/ChartView.cxx |1 
 codemaker/source/cppumaker/cpputype.cxx   |   65 +-
 comphelper/source/misc/configuration.cxx  |7 -
 compilerplugins/clang/unusedfields.py |   21 ++-
 cui/source/dialogs/pastedlg.cxx   |1 
 embeddedobj/source/commonembedding/specialobject.cxx  |1 
 extensions/source/propctrlr/cellbindinghelper.cxx |1 
 extensions/source/propctrlr/formcomponenthandler.cxx  |2 
 framework/source/layoutmanager/toolbarlayoutmanager.cxx   |4 
 reportdesign/source/ui/misc/UITools.cxx   |1 
 sc/source/filter/excel/xichart.cxx|4 
 sc/source/filter/xml/xmlexprt.cxx |1 
 scripting/source/stringresource/stringresource.cxx|3 
 sd/source/ui/accessibility/AccessiblePageShape.cxx|2 
 sd/source/ui/func/fuinsert.cxx|2 
 sd/source/ui/view/sdview.cxx  |1 
 sdext/source/presenter/PresenterAccessibility.cxx |2 
 sdext/source/presenter/PresenterSlideSorter.cxx   |1 
 sfx2/source/dialog/filtergrouping.cxx |3 
 sot/source/base/formats.cxx   |1 
 svtools/source/contnr/imivctl.hxx |3 
 svtools/source/control/vclxaccessibleheaderbaritem.cxx|2 
 svtools/source/misc/transfer.cxx  |1 
 svx/inc/galbrws2.hxx  |1 
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx |2 
 svx/source/dialog/imapwnd.hxx |6 
 svx/source/inc/frmselimpl.hxx |1 
 svx/source/stbctrls/xmlsecctrl.cxx|2 
 svx/source/svdraw/svdocirc.cxx|1 
 svx/source/svdraw/svdomeas.cxx|1 
 sw/source/core/access/acccontext.hxx  |1 
 sw/source/core/frmedt/fefly1.cxx  |1 
 sw/source/uibase/config/cfgitems.cxx  |3 
 sw/source/uibase/inc/cfgitems.hxx |2 
 sw/source/uibase/inc/drawbase.hxx |3 
 sw/source/uibase/inc/navipi.hxx   |1 
 test/source/sheet/xsheetoutline.cxx   |2 
 tools/source/inet/inetmime.cxx|6 
 ucb/source/cacher/cachedcontentresultset.cxx  |   14 --
 ucb/source/ucp/ftp/ftpcontent.cxx |1 
 ucb/source/ucp/ftp/ftpresultsetI.cxx  |3 
 ucb/source/ucp/ftp/ftpresultsetI.hxx  |1 
 ucb/source/ucp/ftp/ftpresultsetbase.cxx   |4 
 ucb/source/ucp/ftp/ftpresultsetbase.hxx   |   28 +---
 ucbhelper/source/provider/contentidentifier.cxx   |1 
 unotools/source/config/dynamicmenuoptions.cxx |1 
 unoxml/source/dom/notation.cxx|1 
 unoxml/source/dom/notation.hxx|3 
 uui/source/iahndl.hxx |1 
 vcl/source/filter/graphicfilter.cxx   |1 
 xmlhelp/source/cxxhelp/provider/content.cxx   |2 
 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx |4 
 xmlhelp/source/cxxhelp/provider/resultsetbase.hxx |4 
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx |3 
 xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx |1 
 xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx  |3 
 xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx  |1 
 xmloff/source/chart/SchXMLExport.cxx  |1 
 xmloff/source/draw/shapeexport.cxx|2 
 xmloff/source/forms/attriblistmerge.hxx   |1 
 60 files changed, 110 insertions(+), 134 deletions(-)

New commits:
commit a508f639a033cefe10ad78a09d3b3c46c162aad9
Author: Noel Grandin 
Date:   Wed Nov 25 17:17:47 2015 +0200

mark UNO structs as SAL_WARN_UNUSED, where possible

Change-Id: Ie3de518f60c9f1313c68df54dbdc1fb2804f1f0d

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 9814f3c..30c19c0 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1735,7 +1735,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( 
const CreateShapeParam2D
 if(2==nDimensionCount)
 pSeriesPlotter->setTransformationSceneToScreen( 
pVCooSys->get

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ab/b9cd92ab4614d606df8ced0d57916dcb04289c

2015-11-26 Thread Caolán McNamara

 ab/b9cd92ab4614d606df8ced0d57916dcb04289c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9c89984cba8d30545738c36784bdb9c256f2e087
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 26 11:21:13 2015 +

Notes added by 'git notes add'

diff --git a/ab/b9cd92ab4614d606df8ced0d57916dcb04289c 
b/ab/b9cd92ab4614d606df8ced0d57916dcb04289c
new file mode 100644
index 000..05381d6
--- /dev/null
+++ b/ab/b9cd92ab4614d606df8ced0d57916dcb04289c
@@ -0,0 +1 @@
+merged as: 7c2edb3a67cf2e156f2134dc8f56fb6aac3045e2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Pedro Giffuni

 desktop/source/deployment/misc/dp_platform.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7c2edb3a67cf2e156f2134dc8f56fb6aac3045e2
Author: Pedro Giffuni 
Date:   Wed Nov 25 21:52:49 2015 +

i126615 - Allow build on FreeBSD Mac PowerPCG5

These appear to have been missed from earlier effort

Brave attempt by: Curtis Hamilton

(cherry picked from commit abb9cd92ab4614d606df8ced0d57916dcb04289c)

Change-Id: Ia778e090c46220d83388ea1a9485b9009787f191

diff --git a/desktop/source/deployment/misc/dp_platform.cxx 
b/desktop/source/deployment/misc/dp_platform.cxx
index dd8648e..ece6182 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -55,6 +55,7 @@
 #define PLATFORM_SOLARIS_SPARC  "solaris_sparc"
 #define PLATFORM_SOLARIS_SPARC64"solaris_sparc64"
 #define PLATFORM_SOLARIS_X86"solaris_x86"
+#define PLATFORM_FREEBSD_POWERPC"freebsd_powerpc"
 #define PLATFORM_FREEBSD_X86"freebsd_x86"
 #define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
 #define PLATFORM_NETBSD_X86 "netbsd_x86"
@@ -171,6 +172,8 @@ namespace
 ret = checkOSandCPU("FreeBSD", "x86");
 else if (token == PLATFORM_FREEBSD_X86_64)
 ret = checkOSandCPU("FreeBSD", "X86_64");
+else if (token == PLATFORM_FREEBSD_POWERPC)
+ret = checkOSandCPU("FreeBSD", "PowerPC");
 else if (token == PLATFORM_NETBSD_X86)
 ret = checkOSandCPU("NetBSD", "x86");
 else if (token == PLATFORM_NETBSD_X86_64)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Stephan Bergmann

 include/editeng/splwrap.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bb1b341c94837915f86eafa2360d0af0cd52efe3
Author: Stephan Bergmann 
Date:   Thu Nov 26 12:10:47 2015 +0100

Avoid implicitly declared members of EDITENG_DLLPUBLIC class

...implicit definitions of which, under the MSVC ABI, would need to be 
emitted
into every editeng .cxx that happens to include this file, but which would 
fail
for the

  VclPtr pWin;

member wherever vcl::Window happens to be incomplete.

Change-Id: I0a1cc61af086f3a3235a995c34834bc131531b84

diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 4f3d762..bde5681 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -71,6 +71,9 @@ private:
 EDITENG_DLLPRIVATE bool SpellNext();// select next area
 boolFindSpellError();   // Check for errors (over areas)
 
+SvxSpellWrapper(SvxSpellWrapper const &) = delete;
+void operator =(SvxSpellWrapper const &) = delete;
+
 public:
 SvxSpellWrapper( vcl::Window* pWn,
  css::uno::Reference< css::linguistic2::XSpellChecker1 >  
&xSpellChecker,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Eike Rathke

 sc/source/filter/excel/excdoc.cxx   |7 +++
 sc/source/filter/excel/xedbdata.cxx |   19 ---
 sc/source/filter/inc/xedbdata.hxx   |7 +++
 3 files changed, 18 insertions(+), 15 deletions(-)

New commits:
commit fa18c83e4e2bddf8f25e4dc3b93ba667ec2a8c11
Author: Eike Rathke 
Date:   Thu Nov 26 11:30:18 2015 +0100

TableRef: write  before , resolves tdf#96049

Excel expects this order, so let XclExpTables be managed as
XclExpRecordBase in the sheet's XclExpRecordList.

Change-Id: If2cefc255c74688661e861a26218564117b1e3ce
(cherry picked from commit 4112ecadd53f7ae48e007dd5024f077aca305062)

diff --git a/sc/source/filter/excel/excdoc.cxx 
b/sc/source/filter/excel/excdoc.cxx
index f5d5393..75a7677 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -678,6 +678,9 @@ void ExcTable::FillAsTableXml()
 if (pImgData)
 aRecList.AppendRecord(std::shared_ptr(pImgData));
 
+//  after  and before 
+aRecList.AppendRecord( GetTablesManager().GetTablesBySheet( mnScTab));
+
 aRecList.AppendRecord( xExtLst );
 }
 
@@ -744,10 +747,6 @@ void ExcTable::WriteXml( XclExpXmlStream& rStrm )
 if (pPT)
 pPT->SaveXml(rStrm);
 
-XclExpTables* pTables = GetTablesManager().GetTablesBySheet(mnScTab);
-if (pTables)
-pTables->SaveXml(rStrm);
-
 rStrm.GetCurrentStream()->endElement( XML_worksheet );
 rStrm.PopStream();
 }
diff --git a/sc/source/filter/excel/xedbdata.cxx 
b/sc/source/filter/excel/xedbdata.cxx
index 6613c37..5be286d 100644
--- a/sc/source/filter/excel/xedbdata.cxx
+++ b/sc/source/filter/excel/xedbdata.cxx
@@ -133,27 +133,32 @@ void XclExpTablesManager::Initialize()
 TablesMapType::iterator it = maTablesMap.find( nTab);
 if (it == maTablesMap.end())
 {
-XclExpTables* pNew;
+::std::shared_ptr< XclExpTables > pNew;
 switch( GetBiff() )
 {
 case EXC_BIFF5:
-pNew = new XclExpTablesImpl5( GetRoot());
+pNew.reset( new XclExpTablesImpl5( GetRoot()));
 break;
 case EXC_BIFF8:
-pNew = new XclExpTablesImpl8( GetRoot());
+pNew.reset( new XclExpTablesImpl8( GetRoot()));
 break;
 default:
 assert(!"Unknown BIFF type!");
 continue;   // for
 }
-it = maTablesMap.insert( nTab, pNew).first;
+::std::pair< TablesMapType::iterator, bool > ins( 
maTablesMap.insert( ::std::make_pair( nTab, pNew)));
+if (!ins.second)
+{
+assert(!"XclExpTablesManager::Initialize - XclExpTables insert 
failed");
+continue;   // for
+}
+it = ins.first;
 }
-XclExpTables* p = it->second;
-p->AppendTable( pDBData, ++nTableId);
+it->second->AppendTable( pDBData, ++nTableId);
 }
 }
 
-XclExpTables* XclExpTablesManager::GetTablesBySheet( SCTAB nTab )
+::std::shared_ptr< XclExpTables > XclExpTablesManager::GetTablesBySheet( SCTAB 
nTab )
 {
 TablesMapType::iterator it = maTablesMap.find(nTab);
 return it == maTablesMap.end() ? nullptr : it->second;
diff --git a/sc/source/filter/inc/xedbdata.hxx 
b/sc/source/filter/inc/xedbdata.hxx
index f5dd980..4b31ffe 100644
--- a/sc/source/filter/inc/xedbdata.hxx
+++ b/sc/source/filter/inc/xedbdata.hxx
@@ -22,7 +22,6 @@
 
 #include "xeroot.hxx"
 #include "xerecord.hxx"
-#include 
 
 class ScDBData;
 class XclExpTablesManagerImpl;
@@ -44,7 +43,7 @@ protected:
 Entry( const ScDBData* pData, sal_Int32 nTableId );
 };
 
-typedef std::vector TablesType;
+typedef ::std::vector TablesType;
 TablesType maTables;
 
 static void SaveTableXml( XclExpXmlStream& rStrm, const Entry& 
rEntry );
@@ -59,10 +58,10 @@ public:
 virtual ~XclExpTablesManager();
 
 voidInitialize();
-XclExpTables*   GetTablesBySheet( SCTAB nTab );
+::std::shared_ptr< XclExpTables > GetTablesBySheet( SCTAB nTab );
 
 private:
-typedef boost::ptr_map< SCTAB, XclExpTables > TablesMapType;
+typedef ::std::map< SCTAB, ::std::shared_ptr< XclExpTables > > 
TablesMapType;
 TablesMapType maTablesMap;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Eike Rathke

 sc/source/filter/excel/excdoc.cxx   |7 +++
 sc/source/filter/excel/xedbdata.cxx |   19 ---
 sc/source/filter/inc/xedbdata.hxx   |7 +++
 3 files changed, 18 insertions(+), 15 deletions(-)

New commits:
commit 4112ecadd53f7ae48e007dd5024f077aca305062
Author: Eike Rathke 
Date:   Thu Nov 26 11:30:18 2015 +0100

TableRef: write  before , resolves tdf#96049

Excel expects this order, so let XclExpTables be managed as
XclExpRecordBase in the sheet's XclExpRecordList.

Change-Id: If2cefc255c74688661e861a26218564117b1e3ce

diff --git a/sc/source/filter/excel/excdoc.cxx 
b/sc/source/filter/excel/excdoc.cxx
index f5d5393..75a7677 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -678,6 +678,9 @@ void ExcTable::FillAsTableXml()
 if (pImgData)
 aRecList.AppendRecord(std::shared_ptr(pImgData));
 
+//  after  and before 
+aRecList.AppendRecord( GetTablesManager().GetTablesBySheet( mnScTab));
+
 aRecList.AppendRecord( xExtLst );
 }
 
@@ -744,10 +747,6 @@ void ExcTable::WriteXml( XclExpXmlStream& rStrm )
 if (pPT)
 pPT->SaveXml(rStrm);
 
-XclExpTables* pTables = GetTablesManager().GetTablesBySheet(mnScTab);
-if (pTables)
-pTables->SaveXml(rStrm);
-
 rStrm.GetCurrentStream()->endElement( XML_worksheet );
 rStrm.PopStream();
 }
diff --git a/sc/source/filter/excel/xedbdata.cxx 
b/sc/source/filter/excel/xedbdata.cxx
index 6613c37..5be286d 100644
--- a/sc/source/filter/excel/xedbdata.cxx
+++ b/sc/source/filter/excel/xedbdata.cxx
@@ -133,27 +133,32 @@ void XclExpTablesManager::Initialize()
 TablesMapType::iterator it = maTablesMap.find( nTab);
 if (it == maTablesMap.end())
 {
-XclExpTables* pNew;
+::std::shared_ptr< XclExpTables > pNew;
 switch( GetBiff() )
 {
 case EXC_BIFF5:
-pNew = new XclExpTablesImpl5( GetRoot());
+pNew.reset( new XclExpTablesImpl5( GetRoot()));
 break;
 case EXC_BIFF8:
-pNew = new XclExpTablesImpl8( GetRoot());
+pNew.reset( new XclExpTablesImpl8( GetRoot()));
 break;
 default:
 assert(!"Unknown BIFF type!");
 continue;   // for
 }
-it = maTablesMap.insert( nTab, pNew).first;
+::std::pair< TablesMapType::iterator, bool > ins( 
maTablesMap.insert( ::std::make_pair( nTab, pNew)));
+if (!ins.second)
+{
+assert(!"XclExpTablesManager::Initialize - XclExpTables insert 
failed");
+continue;   // for
+}
+it = ins.first;
 }
-XclExpTables* p = it->second;
-p->AppendTable( pDBData, ++nTableId);
+it->second->AppendTable( pDBData, ++nTableId);
 }
 }
 
-XclExpTables* XclExpTablesManager::GetTablesBySheet( SCTAB nTab )
+::std::shared_ptr< XclExpTables > XclExpTablesManager::GetTablesBySheet( SCTAB 
nTab )
 {
 TablesMapType::iterator it = maTablesMap.find(nTab);
 return it == maTablesMap.end() ? nullptr : it->second;
diff --git a/sc/source/filter/inc/xedbdata.hxx 
b/sc/source/filter/inc/xedbdata.hxx
index f5dd980..4b31ffe 100644
--- a/sc/source/filter/inc/xedbdata.hxx
+++ b/sc/source/filter/inc/xedbdata.hxx
@@ -22,7 +22,6 @@
 
 #include "xeroot.hxx"
 #include "xerecord.hxx"
-#include 
 
 class ScDBData;
 class XclExpTablesManagerImpl;
@@ -44,7 +43,7 @@ protected:
 Entry( const ScDBData* pData, sal_Int32 nTableId );
 };
 
-typedef std::vector TablesType;
+typedef ::std::vector TablesType;
 TablesType maTables;
 
 static void SaveTableXml( XclExpXmlStream& rStrm, const Entry& 
rEntry );
@@ -59,10 +58,10 @@ public:
 virtual ~XclExpTablesManager();
 
 voidInitialize();
-XclExpTables*   GetTablesBySheet( SCTAB nTab );
+::std::shared_ptr< XclExpTables > GetTablesBySheet( SCTAB nTab );
 
 private:
-typedef boost::ptr_map< SCTAB, XclExpTables > TablesMapType;
+typedef ::std::map< SCTAB, ::std::shared_ptr< XclExpTables > > 
TablesMapType;
 TablesMapType maTablesMap;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/oox oox/source sd/qa sd/source

2015-11-26 Thread Mark Hung

 include/oox/export/drawingml.hxx |4 ++-
 oox/source/export/drawingml.cxx  |   33 +++
 sd/qa/unit/data/odp/tdf80224.odp |binary
 sd/qa/unit/export-tests.cxx  |   21 +++
 sd/source/filter/eppt/epptbase.hxx   |1 
 sd/source/filter/eppt/pptx-epptbase.cxx  |4 +++
 sd/source/filter/eppt/pptx-epptooxml.cxx |5 +++-
 7 files changed, 54 insertions(+), 14 deletions(-)

New commits:
commit 0b5e3885bc706ed02acac1c682c90171700b0cac
Author: Mark Hung 
Date:   Sun Aug 2 14:40:18 2015 +0800

Fix tdf#80224 Custom text color changed to black on .PPTX export

1) Write endParaRPr so that PowerPoint display them properly.
2) Original design forbid properites with default value to be exprted, now 
fixed.
3) Automatic colors are written as white or black based on
   whether background is dark.

Note that tdf#77881,tdf#80520,tdf#89525 depend on this.

Change-Id: I255c16f35149b738be2daf2800b1c90389f2c7cf
Reviewed-on: https://gerrit.libreoffice.org/17472
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 
Reviewed-on: https://gerrit.libreoffice.org/19862
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index bf5669a..fcfb638 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -103,6 +103,7 @@ protected:
 ::oox::core::XmlFilterBase* mpFB;
 /// If set, this is the parent of the currently handled shape.
 com::sun::star::uno::Reference m_xParent;
+bool mbIsBackgroundDark;
 
 bool GetProperty( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& aName );
 bool GetPropertyAndState( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet,
@@ -122,7 +123,7 @@ protected:
 
 public:
 DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* 
pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* 
pTextExport = 0 )
-: meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS( 
pFS ), mpFB( pFB ) {}
+: meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS( 
pFS ), mpFB( pFB ), mbIsBackgroundDark( false ) {}
 void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; }
 ::sax_fastparser::FSHelperPtr GetFS() { return mpFS; }
 ::oox::core::XmlFilterBase* GetFB() { return mpFB; }
@@ -130,6 +131,7 @@ public:
 /// The application-specific text exporter callback, if there is one.
 DMLTextExport* GetTextExport() { return mpTextExport; }
 
+void SetBackgroundDark(bool bIsDark) { mbIsBackgroundDark = bIsDark; }
 /// If bRelPathToMedia is true add "../" to image folder path while adding 
the image relationship
 OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia = 
false);
 
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 493a894..67a5dad 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -113,6 +113,9 @@ namespace drawingml {
 if ( GETA(propName) ) \
 mAny >>= variable;
 
+#define CGETAD(propName) \
+(( bCheckDirect && GetPropertyAndState( rXPropSet, rXPropState, OUString( 
#propName ), eState ) && eState == beans::PropertyState_DIRECT_VALUE 
)||GetProperty( rXPropSet, OUString( #propName ) ))
+
 // not thread safe
 int DrawingML::mnImageCounter = 1;
 int DrawingML::mnWdpImageCounter = 1;
@@ -1214,7 +1217,7 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, bool bIsFiel
 sal_Int32 nSize = 1800;
 sal_Int32 nCharEscapement = 0;
 sal_Int32 nCharKerning = 0;
-
+bool bCheckDirect = XML_endParaRPr != nElement ;
 if( GETA( CharHeight ) )
 nSize = (sal_Int32) (100*(*static_cast(mAny.getValue(;
 
@@ -1245,7 +1248,7 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, bool bIsFiel
 break;
 }
 
-if ( GETAD( CharUnderline ) )
+if ( CGETAD( CharUnderline ) )
 {
 switch ( *static_cast(mAny.getValue()) )
 {
@@ -1300,7 +1303,7 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, bool bIsFiel
 }
 }
 
-if ( GETAD( CharStrikeout ) )
+if ( CGETAD( CharStrikeout ) )
 {
 switch ( *static_cast(mAny.getValue()) )
 {
@@ -1374,16 +1377,14 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, bool bIsFiel
   FSEND );
 
 // mso doesn't like text color to be placed after typeface
-if( GETAD( CharColor ) )
+if( CGETAD( CharColor ) )
 {
 sal_uInt32 color = *static_cast(mAny.getValue());
 DBG(fprintf(stderr, "run color: %x auto: %x\n", static_cast( color ), static_cast( COL_AUTO )));
 
 if( color == COL_AUTO )  // nCharColor depends

[Libreoffice-commits] core.git: 2 commits - bridges/Library_cpp_uno.mk vcl/headless

2015-11-26 Thread Caolán McNamara

 bridges/Library_cpp_uno.mk |   64 -
 vcl/headless/svpgdi.cxx|8 -
 2 files changed, 46 insertions(+), 26 deletions(-)

New commits:
commit 7caa7ed28356490cd00eb12832509758300da8fd
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 26 09:42:21 2015 +

restrict this for > cairo 1.10.0 for now

Change-Id: I845a1b045a4e83c35cf1a837c7e520e3b0890c29

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 477b33e..a940e36 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -873,6 +873,9 @@ bool SvpSalGraphics::drawPolyLine(
 basegfx::B2DLineJoin eLineJoin,
 css::drawing::LineCap eLineCap)
 {
+bool bRet = false;
+(void)rPolyLine; (void)fTransparency; (void)rLineWidths; (void)eLineJoin; 
(void)eLineCap;
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
 // short circuit if there is nothing to do
 const int nPointCount = rPolyLine.count();
 if (nPointCount <= 0)
@@ -971,8 +974,9 @@ bool SvpSalGraphics::drawPolyLine(
 xDamageTracker->damaged(basegfx::B2IBox(extents.x, extents.y, 
extents.x + extents.width,
 extents.y + extents.height));
 }
-
-return true;
+bRet = true;
+#endif
+return bRet;
 }
 
 bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32,
commit 5d7bd6b9299946ea2cc5760c5fd2338b3ec4a902
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 26 09:33:37 2015 +

default to trying the linux bridge for all linuxy like things

Change-Id: I1fcf3afadefcd5af472523fd8fca123fb3ab4095

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 702d462..3206a53 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -9,13 +9,7 @@
 
 $(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno))
 
-ifeq ($(OS)-$(CPUNAME),AIX-POWERPC)
-
-bridges_SELECTED_BRIDGE := gcc3_aix_powerpc
-bridge_exception_objects := except
-bridge_cxx_objects := cpp2uno uno2cpp
-
-else ifeq ($(CPUNAME),ARM)
+ifeq ($(CPUNAME),ARM)
 
 ifeq ($(OS),IOS)
 $(eval $(call gb_Library_use_sdk_api,gcc3_uno))
@@ -25,7 +19,7 @@ bridge_exception_objects := cpp2uno cpp2uno-arm cpp2uno-arm64 
cpp2uno-i386 excep
 $(eval $(call gb_Library_use_custom_headers,gcc3_uno,\
bridges/source/cpp_uno/gcc3_ios_arm \
 ))
-else ifneq ($(filter LINUX ANDROID,$(OS)),)
+else ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_arm
 bridge_noopt_objects := cpp2uno except uno2cpp
 # HACK
@@ -35,8 +29,9 @@ $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
 endif
 
-else ifneq (,$(filter ANDROID-AARCH64 LINUX-AARCH64,$(OS)-$(CPUNAME)))
+else ifeq ($(CPUNAME),AARCH64)
 
+ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_aarch64
 bridge_exception_objects := abi callvirtualfunction uno2cpp
 
@@ -46,23 +41,30 @@ $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno, 
\
 $(gb_LinkTarget_EXCEPTIONFLAGS) \
 $(call gb_LinkTarget__get_cxxflags,$(gb_CPPU_ENV)_uno)) \
 ))
+endif
 
-else ifeq ($(OS)-$(CPUNAME),LINUX-AXP)
+else ifeq ($(CPUNAME),AXP)
 
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_alpha
 bridge_exception_objects := cpp2uno except uno2cpp
+endif
 
-else ifeq ($(OS)-$(CPUNAME),LINUX-HPPA)
+else ifeq ($(CPUNAME),HPPA)
 
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_hppa
 bridge_noopt_objects := call cpp2uno except uno2cpp
+endif
 
-else ifeq ($(OS)-$(CPUNAME),LINUX-IA64)
+else ifeq ($(CPUNAME),IA64)
 
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_ia64
 bridge_asm_objects := call
 bridge_exception_objects := except
 bridge_noopt_objects := cpp2uno uno2cpp
+endif
 
 else ifeq ($(CPUNAME),INTEL)
 
@@ -86,10 +88,12 @@ bridge_noopt_objects := uno2cpp
 bridge_exception_objects := callvirtualmethod cpp2uno dllinit except 
smallstruct
 endif
 
-else ifeq ($(OS)-$(CPUNAME),LINUX-M68K)
+else ifeq ($(CPUNAME),M68K)
 
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_m68k
 bridge_noopt_objects := cpp2uno except uno2cpp
+endif
 
 else ifeq ($(CPUNAME),GODSON)
 
@@ -108,34 +112,52 @@ bridge_noopt_objects := cpp2uno uno2cpp
 bridge_exception_objects := except
 endif
 
-else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC)
+else ifeq ($(CPUNAME),POWERPC)
 
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_powerpc
 bridge_noopt_objects := uno2cpp
 bridge_exception_objects := cpp2uno except
+else ifeq ($(OS),AIX)
+bridges_SELECTED_BRIDGE := gcc3_aix_powerpc
+bridge_exception_objects := except
+bridge_cxx_objects :

LibreOffice Server Mode

2015-11-26 Thread Juan Antonio Gonzalez Cano

Hi, I'm going to run LibreOffice in linux server ("/usr/bin/libreoffice
--nologo --norestore --invisible --headless --accept=
'socket,host=0,port=8997,tcpNoDelay=1;urp;'"), I need know the
system requirements, any ideas?

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

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

2015-11-26 Thread Caolán McNamara

 sc/source/ui/view/hdrcont.cxx  |4 ++--
 toolkit/source/awt/vclxtoolkit.cxx |2 +-
 vcl/source/window/mouse.cxx|4 ++--
 vcl/source/window/window.cxx   |6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 4584e3a6df74b1d83c077f3b33a6515c2aab1aa5
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 26 09:19:23 2015 +

test for IsMouseCaptured before releasing mouse

like the other call sites do

Change-Id: I77250f172f9d9ce97e5982bafbc8f042e9343acc

diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 2018821..690e5d1 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -879,8 +879,8 @@ void ScHeaderControl::StopMarking()
 
 //  don't call pSelEngine->Reset, so selection across the parts of
 //  a split/frozen view is possible
-
-ReleaseMouse();
+if (IsMouseCaptured())
+ReleaseMouse();
 }
 
 void ScHeaderControl::ShowDragHelp()
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 198e4cd..330cb70 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -468,10 +468,10 @@ void Window::ReleaseMouse()
 
 ImplSVData* pSVData = ImplGetSVData();
 
-SAL_WARN_IF( pSVData->maWinData.mpCaptureWin.get() != this, "vcl",
+SAL_WARN_IF(!IsMouseCaptured(), "vcl",
"Window::ReleaseMouse(): window doesn't have the mouse 
capture" );
 
-if ( pSVData->maWinData.mpCaptureWin.get() == this )
+if (IsMouseCaptured())
 {
 pSVData->maWinData.mpCaptureWin = nullptr;
 mpWindowImpl->mpFrame->CaptureMouse( false );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 48be717..8901512 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -249,13 +249,13 @@ void Window::dispose()
 
 DBG_ASSERT( pSVData->maWinData.mpTrackWin.get() != this,
 "Window::~Window(): Window is in TrackingMode" );
-DBG_ASSERT( pSVData->maWinData.mpCaptureWin.get() != this,
-"Window::~Window(): Window has the mouse captured" );
+DBG_ASSERT(!IsMouseCaptured(),
+"Window::~Window(): Window has the mouse captured");
 
 // due to old compatibility
 if ( pSVData->maWinData.mpTrackWin == this )
 EndTracking();
-if ( pSVData->maWinData.mpCaptureWin == this )
+if (IsMouseCaptured())
 ReleaseMouse();
 if ( pSVData->maWinData.mpDefDialogParent == this )
 pSVData->maWinData.mpDefDialogParent = nullptr;
commit 5e1546ccbce1c8fcea16c191edc1409da04c9193
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 26 09:19:06 2015 +

downgrade warning to info

Change-Id: Ia607226f73020396e3f47a13d304272b0143668c

diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index a1100a8..00c0a14 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1269,7 +1269,7 @@ css::uno::Reference< css::awt::XWindowPeer > 
VCLXToolkit::ImplCreateWindow(
 pNewWindow = ImplCreateWindow( &pNewComp, rDescriptor, pParent, 
nWinBits );
 
 DBG_ASSERT( pNewWindow, "createWindow: Unknown Component!" );
-SAL_WARN_IF( !pNewComp, "toolkit", "createWindow: No special Interface!" );
+SAL_INFO_IF( !pNewComp, "toolkit", "createWindow: No special Interface!" );
 
 if ( pNewWindow )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Miklos Vajna

 compilerplugins/clang/badstatics.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16677bbdb8584b9cca195deaeba736cb62babe19
Author: Miklos Vajna 
Date:   Thu Nov 26 10:17:41 2015 +0100

compilerplugins: adapt comment

...after 49c2b9808df8a6b197dec666dfc0cda6321a4306
"bin/rename-sw-abbreviations.sh"

Change-Id: Ibd74246403bead8100d181b335f9145013f31e5e

diff --git a/compilerplugins/clang/badstatics.cxx 
b/compilerplugins/clang/badstatics.cxx
index 5900f49..26773a8 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -123,7 +123,7 @@ public:
 || name == "s_pGallery" // this is not entirely clear but 
apparently the GalleryThemeCacheEntry are deleted by 
GalleryBrowser2::SelectTheme() or GalleryBrowser2::dispose()
 || name == "s_ExtMgr" // TheExtensionManager::disposing()
 || name == "s_pDocLockedInsertingLinks" // not owning
-|| name == "s_pVout" // _FrmFinit()
+|| name == "s_pVout" // _FrameFinit()
 || name == "s_pPaintQueue" // SwPaintQueue::Remove()
 || name == "gProp" // only owned (VclPtr) member cleared again
 || name == "g_pColumnCacheLastTabFrame" // not owning
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Stephan Bergmann

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

New commits:
commit d972dd9ad80fcfb007ad1689a6afdbcbe24d0f54
Author: Stephan Bergmann 
Date:   Thu Nov 26 10:11:14 2015 +0100

SfxStyleSheetBasePool::Count returns sal_uInt16

Change-Id: I2485fd38d03bd63ae83e3643771767e533c7da83

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index 810315e..37d8bad 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -427,11 +427,11 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, bool 
bInfoBox )
 
 if ( pEE->pImpEditEngine->GetStyleSheetPool() )
 {
-sal_uLong nStyles = pEE->pImpEditEngine->GetStyleSheetPool() ? 
pEE->pImpEditEngine->GetStyleSheetPool()->Count() : 0;
+sal_uInt16 nStyles = pEE->pImpEditEngine->GetStyleSheetPool() ? 
pEE->pImpEditEngine->GetStyleSheetPool()->Count() : 0;
 fprintf( fp, 
"\n\n"
 );
 fprintf( fp, "\n==   Stylesheets   
=" );
 fprintf( fp, 
"\n"
 );
-fprintf( fp, "\n#Template:   %lu\n", nStyles );
+fprintf( fp, "\n#Template:   %" SAL_PRIuUINT32 "\n", 
sal_uInt32(nStyles) );
 SfxStyleSheetIterator aIter( pEE->pImpEditEngine->GetStyleSheetPool(), 
SFX_STYLE_FAMILY_ALL );
 SfxStyleSheetBase* pStyle = aIter.First();
 while ( pStyle )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-26 Thread Stephan Bergmann

 compilerplugins/clang/badstatics.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 88309564142eecc86e4d30a917032637d5c48e2b
Author: Stephan Bergmann 
Date:   Thu Nov 26 09:58:15 2015 +0100

Adapt whitelisted names

...after 49c2b9808df8a6b197dec666dfc0cda6321a4306
"bin/rename-sw-abbreviations.sh"

Change-Id: I90cec551bdc52ea4d76dd9e32b45692e8a3be70f

diff --git a/compilerplugins/clang/badstatics.cxx 
b/compilerplugins/clang/badstatics.cxx
index 394c33e..5900f49 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -126,10 +126,10 @@ public:
 || name == "s_pVout" // _FrmFinit()
 || name == "s_pPaintQueue" // SwPaintQueue::Remove()
 || name == "gProp" // only owned (VclPtr) member cleared again
-|| name == "g_pColumnCacheLastTabFrm" // not owning
-|| name == "g_pColumnCacheLastCellFrm" // not owning
-|| name == "g_pRowCacheLastTabFrm" // not owning
-|| name == "g_pRowCacheLastCellFrm" // not owning
+|| name == "g_pColumnCacheLastTabFrame" // not owning
+|| name == "g_pColumnCacheLastCellFrame" // not owning
+|| name == "g_pRowCacheLastTabFrame" // not owning
+|| name == "g_pRowCacheLastCellFrame" // not owning
 || name == "g_OszCtrl" // SwCrsrOszControl::Exit()
 || name == "g_pSpellIter" // SwEditShell::SpellEnd()
 || name == "g_pConvIter" // SwEditShell::SpellEnd()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - libreofficekit/qa

2015-11-26 Thread Miklos Vajna

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   38 +---
 1 file changed, 26 insertions(+), 12 deletions(-)

New commits:
commit 21713893a4a4ac199d0bf3edb00a1c50082b03d8
Author: Miklos Vajna 
Date:   Thu Nov 26 09:27:47 2015 +0100

cid#1340232 uncaught exception

Change-Id: Idb80a055aca67a3fb90aef597ace932f47af8e05

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 2364ea1..fee5266 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -307,16 +307,23 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* 
pDocView, GdkEventConfi
 gtk_widget_queue_draw(rWindow.m_pRowBar->m_pDrawingArea);
 
 rWindow.m_pColumnBar->m_aHeaders.clear();
-for (boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("columns"))
+try
 {
-int nSize = 
std::round(lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), 
std::atof(rValue.second.get("size").c_str(;
-if (nSize >= rWindow.m_pColumnBar->m_nPositionPixel)
+for (boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("columns"))
 {
-int nScrolledSize = nSize - 
rWindow.m_pColumnBar->m_nPositionPixel;
-Header aHeader(nScrolledSize, 
rValue.second.get("text"));
-rWindow.m_pColumnBar->m_aHeaders.push_back(aHeader);
+int nSize = 
std::round(lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), 
std::atof(rValue.second.get("size").c_str(;
+if (nSize >= rWindow.m_pColumnBar->m_nPositionPixel)
+{
+int nScrolledSize = nSize - 
rWindow.m_pColumnBar->m_nPositionPixel;
+Header aHeader(nScrolledSize, 
rValue.second.get("text"));
+rWindow.m_pColumnBar->m_aHeaders.push_back(aHeader);
+}
 }
 }
+catch (boost::property_tree::ptree_bad_path& rException)
+{
+std::cerr << "TiledRowColumnBar::docConfigureEvent: failed to get 
columns: " << rException.what() << std::endl;
+}
 gtk_widget_show(rWindow.m_pColumnBar->m_pDrawingArea);
 gtk_widget_queue_draw(rWindow.m_pColumnBar->m_pDrawingArea);
 gtk_widget_show(rWindow.m_pFormulabarEntry);
commit ca8a0396443be9351d673559ad38776f45340d57
Author: Miklos Vajna 
Date:   Thu Nov 26 09:27:36 2015 +0100

cid#1340231 uncaught exception

Change-Id: I69f2078093c2c23ae0a02a6a292e51fdbdde9ed4

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 77021bf..2364ea1 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -286,16 +286,23 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* 
pDocView, GdkEventConfi
 gtk_widget_show(rWindow.m_pCornerButton->m_pDrawingArea);
 
 rWindow.m_pRowBar->m_aHeaders.clear();
-for (boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("rows"))
+try
 {
-int nSize = 
std::round(lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), 
std::atof(rValue.second.get("size").c_str(;
-if (nSize >= rWindow.m_pRowBar->m_nPositionPixel)
+for (boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("rows"))
 {
-int nScrolledSize = nSize - 
rWindow.m_pRowBar->m_nPositionPixel;
-Header aHeader(nScrolledSize, 
rValue.second.get("text"));
-rWindow.m_pRowBar->m_aHeaders.push_back(aHeader);
+int nSize = 
std::round(lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), 
std::atof(rValue.second.get("size").c_str(;
+if (nSize >= rWindow.m_pRowBar->m_nPositionPixel)
+{
+int nScrolledSize = nSize - 
rWindow.m_pRowBar->m_nPositionPixel;
+Header aHeader(nScrolledSize, 
rValue.second.get("text"));
+rWindow.m_pRowBar->m_aHeaders.push_back(aHeader);
+}
 }
 }
+catch (boost::property_tree::ptree_bad_path& rException)
+{
+std::cerr << "TiledRowColumnBar::docConfigureEvent: failed to get 
rows: " << rException.what() << std::endl;
+}
 gtk_widget_show(rWindow.m_pRowBar->m_pDrawingArea);
 gtk_widget_queue_draw(rWindow.m_pRowBar->m_pDrawingArea);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 include/svx officecfg/registry sfx2/sdi svx/Library_svx.mk svx/source svx/util sw/AllLangResTarget_sw.mk sw/inc sw/Library_sw.mk sw/source

2015-11-26 Thread Maxim Monastirsky

 include/sfx2/sfxsids.hrc|1 
 include/svx/svxids.hrc  |2 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   11 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |5 
 sfx2/sdi/sfx.sdi|2 
 svx/Library_svx.mk  |1 
 svx/source/items/SmartTagItem.cxx   |   16 
 svx/source/mnuctrls/smarttagmenu.cxx|  246 
++
 svx/util/svx.component  |4 
 sw/AllLangResTarget_sw.mk   |1 
 sw/Library_sw.mk|1 
 sw/inc/crsrsh.hxx   |8 
 sw/inc/rcid.hrc |5 
 sw/inc/view.hxx |2 
 sw/source/core/crsr/crsrsh.cxx  |   11 
 sw/source/uibase/inc/stmenu.hxx |   72 --
 sw/source/uibase/smartmenu/stmenu.cxx   |  167 
--
 sw/source/uibase/smartmenu/stmenu.hrc   |   33 -
 sw/source/uibase/smartmenu/stmenu.src   |   37 -
 sw/source/uibase/uiview/view.cxx|2 
 sw/source/uibase/uiview/viewling.cxx|   42 +
 21 files changed, 314 insertions(+), 355 deletions(-)

New commits:
commit ff35d252ff247c55c1004cce6676af8f881a2e68
Author: Maxim Monastirsky 
Date:   Wed Nov 25 17:33:45 2015 +0200

tdf#93837 Add UNO-based SmartTag menu controller

... and use it for the standalone context menu. The sfx2
controller (SvxSmartTagsControl) is still used for the
submenu variation, and is due to be removed after the new
context menu implementation is in place.

Change-Id: I2f889428eb777149f43d74cf3d081e19ab0ebb4a
Reviewed-on: https://gerrit.libreoffice.org/20169
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 4ba4679..081b69c 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -586,6 +586,7 @@
 #define SID_ATTR_CHAR_COLOR2(SID_SVX_START + 537)
 #define SID_COMP_BIBLIOGRAPHY   (SID_SVX_START + 880)
 #define SID_ADDRESS_DATA_SOURCE (SID_SVX_START + 934)
+#define SID_OPEN_SMARTTAGOPTIONS(SID_SVX_START + 1062)
 
 #define FID_SVX_START   (SID_LIB_START + 500)
 #define FID_SEARCH_NOW  (FID_SVX_START + 2)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 1ec7daa..8fe69e1 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -916,7 +916,7 @@
 #define SID_INSERT_ZWNBSP   ( SID_SVX_START + 1059 
)   /* insert ZWNJ - invisible space, forces linebreak*/
 #define SID_OPTIONS_DATABASES   ( SID_SVX_START + 1060 
)
 #define SID_OPEN_SMARTTAGMENU   ( SID_SVX_START + 1061 
)
-#define SID_OPEN_SMARTTAGOPTIONS( SID_SVX_START + 1062 
)
+// (SID_SVX_START + 1062) is in include/sfx2/sfxsids.hrc
 #define SID_INSERT_TREECONTROL  ( SID_SVX_START + 1063 
)
 #define SID_ATTR_VIEWLAYOUT ( SID_SVX_START + 1064 
)
 #define SID_ATTR_ZOOMSLIDER ( SID_SVX_START + 1065 
)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 23b95fe..977d669 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -196,6 +196,17 @@
   com.sun.star.comp.framework.ThesaurusMenuController
 
   
+  
+
+  .uno:OpenSmartTagMenuOnCursor
+
+
+  
+
+
+  com.sun.star.comp.svx.SmartTagMenuController
+
+  
 
 
   
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 1ad103d..d68d4cc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2359,6 +2359,11 @@
   1
 
   
+  
+
+  Smart ~Tag Options...
+
+  
 
 
   
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index f151bc7..92266bc 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -7272,7 +7272,7 @@ SfxBoolItem CheckP

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

2015-11-26 Thread Noel Grandin

 include/vcl/bitmap.hxx |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 8d6136206f26dbee773ffaea18a0f37c17e55024
Author: Noel Grandin 
Date:   Thu Nov 26 10:01:20 2015 +0200

Revert "no-one passes explicit values for these defaulted params"

This reverts commit 97978f7f015e042e72ec2bf0f3ba1652ecbcc5c5.

breaks unit test CppunitTest_sw_ooxmlimport

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 142795b..c49b4f0 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -152,32 +152,33 @@ class VCL_DLLPUBLIC BmpFilterParam
 {
 public:
 
-BmpFilterParam() :
-meFilter( BMP_FILTER_UNKNOWN ), mnProgressStart( 0 ), mnProgressEnd( 0 
) {}
+BmpFilterParam( sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) 
:
+meFilter( BMP_FILTER_UNKNOWN ), mnProgressStart( nProgressStart ), 
mnProgressEnd( nProgressEnd ) {}
 
-BmpFilterParam( sal_uInt8 cSolarGreyThreshold) :
-meFilter( BMP_FILTER_SOLARIZE ), mnProgressStart( 0 ), mnProgressEnd( 
0 ),
+BmpFilterParam( sal_uInt8 cSolarGreyThreshold, sal_uLong nProgressStart = 
0, sal_uLong nProgressEnd = 0 ) :
+meFilter( BMP_FILTER_SOLARIZE ), mnProgressStart( nProgressStart ), 
mnProgressEnd( nProgressEnd ),
 mcSolarGreyThreshold( cSolarGreyThreshold ) {}
 
-BmpFilterParam( double nRadius) :
-meFilter( BMP_FILTER_SMOOTH ), mnProgressStart( 0 ), mnProgressEnd( 0 
),
+BmpFilterParam( double nRadius, sal_uLong nProgressStart = 0, sal_uLong 
nProgressEnd = 0 ) :
+meFilter( BMP_FILTER_SMOOTH ), mnProgressStart( nProgressStart ), 
mnProgressEnd( nProgressEnd ),
 mnRadius( nRadius ) {}
 
-BmpFilterParam( sal_uInt16 nSepiaPercent) :
-meFilter( BMP_FILTER_SEPIA ), mnProgressStart( 0 ), mnProgressEnd( 0 ),
+BmpFilterParam( sal_uInt16 nSepiaPercent, sal_uLong nProgressStart = 0, 
sal_uLong nProgressEnd = 0 ) :
+meFilter( BMP_FILTER_SEPIA ), mnProgressStart( nProgressStart ), 
mnProgressEnd( nProgressEnd ),
 mnSepiaPercent( nSepiaPercent )
 {
 assert(nSepiaPercent<=100);
 }
 
-BmpFilterParam( const Size& rMosaicTileSize) :
-meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( 0 ), mnProgressEnd( 0 )
+BmpFilterParam( const Size& rMosaicTileSize, sal_uLong nProgressStart = 0, 
sal_uLong nProgressEnd = 0 ) :
+meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( nProgressStart ), 
mnProgressEnd( nProgressEnd )
 {
 maMosaicTileSize.mnTileWidth = rMosaicTileSize.Width();
 maMosaicTileSize.mnTileHeight= rMosaicTileSize.Height();
 }
-BmpFilterParam( sal_uInt16 nEmbossAzimuthAngle100, sal_uInt16 
nEmbossElevationAngle100) :
-meFilter( BMP_FILTER_EMBOSS_GREY ), mnProgressStart( 0 ), 
mnProgressEnd( 0 )
+BmpFilterParam( sal_uInt16 nEmbossAzimuthAngle100, sal_uInt16 
nEmbossElevationAngle100,
+sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) 
:
+meFilter( BMP_FILTER_EMBOSS_GREY ), mnProgressStart( nProgressStart ), 
mnProgressEnd( nProgressEnd )
 {
 maEmbossAngles.mnAzimuthAngle100 = nEmbossAzimuthAngle100;
 maEmbossAngles.mnElevationAngle100 = nEmbossElevationAngle100;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

70 matches

Mail list logo